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: Update Test-Matrix.C to check solutions for symmetric square matrices

Browse Source
This commit is contained in:
laurence
2013-03-21 10:22:47 +00:00
parent 7db513e35e
commit 55253a89a9
1 changed files with 62 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

97
applications/test/Matrix/Test-Matrix.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -25,6 +25,7 @@ License
#include "scalarMatrices.H"
#include "vector.H"
#include "IFstream.H"
using namespace Foam;
@ -55,9 +56,9 @@ int main(int argc, char *argv[])
Info<< hmm << endl;
//SquareMatrix<scalar> hmm3(Sin);
SquareMatrix<scalar> hmm3(Sin);
//Info<< hmm3 << endl;
Info<< hmm3 << endl;
SquareMatrix<scalar> hmm4;
@ -70,38 +71,6 @@ int main(int argc, char *argv[])
hmm4 = hmm5;
Info<< hmm5 << endl;
{
scalarSymmetricSquareMatrix symmMatrix(3, 3, 0);
symmMatrix(0, 0) = 4;
symmMatrix(1, 0) = 12;
symmMatrix(1, 1) = 37;
symmMatrix(2, 0) = -16;
symmMatrix(2, 1) = -43;
symmMatrix(2, 2) = 98;
Info<< "Symmetric Square Matrix = " << symmMatrix << endl;
Info<< "Inverse = " << inv(symmMatrix) << endl;
Info<< "Determinant = " << det(symmMatrix) << endl;
scalarSymmetricSquareMatrix symmMatrix2(symmMatrix);
LUDecompose(symmMatrix2);
Info<< "Inverse = " << invDecomposed(symmMatrix2) << endl;
Info<< "Determinant = " << detDecomposed(symmMatrix2) << endl;
scalarDiagonalMatrix rhs(3, 0);
rhs[0] = 1;
rhs[1] = 2;
rhs[2] = 3;
LUsolve(symmMatrix, rhs);
Info<< "Decomposition = " << symmMatrix << endl;
Info<< "Solution = " << rhs << endl;
}
{
scalarSquareMatrix squareMatrix(3, 3, 0);
@ -128,6 +97,64 @@ int main(int argc, char *argv[])
Info<< "Solution = " << rhs << endl;
}
{
scalarSymmetricSquareMatrix symmMatrix(4, 4, 0);
symmMatrix(0, 0) = 3.44854;
symmMatrix(1, 0) = -2.70766;
symmMatrix(1, 1) = 5.49922;
symmMatrix(2, 0) = -0.96245;
symmMatrix(2, 1) = 2.40948;
symmMatrix(2, 2) = 1.56918;
symmMatrix(3, 0) = 1.95912;
symmMatrix(3, 1) = -3.46118;
symmMatrix(3, 2) = -1.01410;
symmMatrix(3, 3) = 3.24753;
Info<< "Symmetric Square Matrix = " << symmMatrix << endl;
Info<< "Inverse = " << inv(symmMatrix) << endl;
Info<< "Determinant = " << det(symmMatrix) << endl;
scalarSymmetricSquareMatrix symmMatrix2(symmMatrix);
LUDecompose(symmMatrix2);
Info<< "Inverse = " << invDecomposed(symmMatrix2) << endl;
Info<< "Determinant = " << detDecomposed(symmMatrix2) << endl;
scalarDiagonalMatrix rhs(4, 0);
rhs[0] = 1;
rhs[1] = 2;
rhs[2] = 3;
rhs[3] = 4;
LUsolve(symmMatrix, rhs);
Info<< "Decomposition = " << symmMatrix << endl;
Info<< "Solution = " << rhs << endl;
}
{
IFstream str("datafile");
scalarSymmetricSquareMatrix symmMatrix(str);
Info<< "Symmetric Square Matrix = " << symmMatrix << endl;
Info<< "Inverse = " << inv(symmMatrix) << endl;
Info<< "Determinant (ans = 0.24130) = " << det(symmMatrix) << endl;
scalarDiagonalMatrix rhs(4, 0);
rhs[0] = 1;
rhs[1] = 2;
rhs[2] = 3;
rhs[3] = 4;
LUsolve(symmMatrix, rhs);
Info<< "Solution = " << rhs << endl;
}
Info<< "\nEnd\n" << endl;
return 0;