zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ENH: STDMD: apply QRMatrix changes

Browse Source
This commit is contained in:
Kutalmis Bercin
2022-05-20 15:43:12 +01:00
committed by Mark Olesen
parent 1ef855cf0b
commit aaa25d105b
1 changed files with 32 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
src/functionObjects/field/DMD/DMDModels/derived/STDMD/STDMD.C
View File

@ -5,7 +5,7 @@
\\ / A nd | www.openfoam.com \\ / A nd | www.openfoam.com
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
Copyright (C) 2020-2021 OpenCFD Ltd. Copyright (C) 2020-2022 OpenCFD Ltd.
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
This file is part of OpenFOAM. This file is part of OpenFOAM.
@ -159,10 +159,11 @@ reducedKoopmanOperator()
QRMatrix<RMatrix> QRM QRMatrix<RMatrix> QRM
( (
Qupper_, Qupper_,
QRMatrix<RMatrix>::outputTypes::REDUCED_R, QRMatrix<RMatrix>::modes::ECONOMY,
QRMatrix<RMatrix>::colPivoting::FALSE QRMatrix<RMatrix>::outputs::ONLY_R
); );
Rx = QRM.R(); RMatrix& R = QRM.R();
Rx.transfer(R);
} }
Rx.round(); Rx.round();
@ -228,14 +229,18 @@ reducedKoopmanOperator()
} }
} }
// Apply interim QR decomposition on Rx of receiver subset masters {
// Apply interim QR decomposition
// on Rx of receiver subset masters
QRMatrix<RMatrix> QRM QRMatrix<RMatrix> QRM
( (
Rx, Rx,
QRMatrix<RMatrix>::outputTypes::REDUCED_R, QRMatrix<RMatrix>::modes::ECONOMY,
QRMatrix<RMatrix>::storeMethods::IN_PLACE, QRMatrix<RMatrix>::outputs::ONLY_R
QRMatrix<RMatrix>::colPivoting::FALSE
); );
RMatrix& R = QRM.R();
Rx.transfer(R);
}
Rx.round(); Rx.round();
} }
@ -281,26 +286,23 @@ reducedKoopmanOperator()
} }
Info<< tab << "Computing TSQR" << endl; Info<< tab << "Computing TSQR" << endl;
{
QRMatrix<RMatrix> QRM QRMatrix<RMatrix> QRM
( (
Rx, Rx,
QRMatrix<RMatrix>::outputTypes::REDUCED_R, QRMatrix<RMatrix>::modes::ECONOMY,
QRMatrix<RMatrix>::storeMethods::IN_PLACE, QRMatrix<RMatrix>::outputs::ONLY_R
QRMatrix<RMatrix>::colPivoting::FALSE
); );
RMatrix& R = QRM.R();
Rx.transfer(R);
}
Rx.round(); Rx.round();
// Rx produced by TSQR is unique up to the sign, hence the revert
for (scalar& x : Rx)
{
x *= -1;
}
Info<< tab << "Computing RxInv" << endl; Info<< tab << "Computing RxInv" << endl;
RxInv_ = pinv(Rx); RxInv_ = MatrixTools::pinv(Rx);
Info<< tab << "Computing A1" << endl; Info<< tab << "Computing A1" << endl;
A1 = RxInv_*RMatrix(pinv(Rx*(G_^Rx))); A1 = RxInv_*RMatrix(MatrixTools::pinv(Rx*(G_^Rx)));
Rx.clear(); Rx.clear();
} }
Pstream::scatter(RxInv_); Pstream::scatter(RxInv_);
@ -323,10 +325,10 @@ reducedKoopmanOperator()
else else
{ {
Info<< tab << "Computing RxInv" << endl; Info<< tab << "Computing RxInv" << endl;
RxInv_ = pinv(Rx); RxInv_ = MatrixTools::pinv(Rx);
Info<< tab << "Computing A1" << endl; Info<< tab << "Computing A1" << endl;
A1 = RxInv_*RMatrix(pinv(Rx*(G_^Rx))); A1 = RxInv_*RMatrix(MatrixTools::pinv(Rx*(G_^Rx)));
Rx.clear(); Rx.clear();
Info<< tab << "Computing A2" << endl; Info<< tab << "Computing A2" << endl;
@ -486,7 +488,7 @@ void Foam::DMDModels::STDMD::amplitudes()
Info<< tab << "Computing amplitudes" << endl; Info<< tab << "Computing amplitudes" << endl;
amps_.resize(R.m()); amps_.resize(R.m());
const RCMatrix pEvecs(pinv(evecs_)); const RCMatrix pEvecs(MatrixTools::pinv(evecs_));
// amps_ = pEvecs*R; // amps_ = pEvecs*R;
for (label i = 0; i < amps_.size(); ++i) for (label i = 0; i < amps_.size(); ++i)