zhyang-dev/OpenFOAM-12
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SquareMatrix, SymmetricSquareMatrix: Changed the constructor from size to require only n

Browse Source 
This avoids the need to check that the m and n dimensions are the same.
This commit is contained in:
Henry Weller
2016-03-22 14:13:48 +00:00
parent feada18b40
commit 055a113f10
14 changed files with 116 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -25,6 +25,7 @@ License
#include "scalarMatrices.H"
#include "vector.H"
#include "tensor.H"
#include "IFstream.H"
using namespace Foam;
@ -50,7 +51,7 @@ int main(int argc, char *argv[])
Info<< max(hmm) << endl;
Info<< min(hmm) << endl;
SquareMatrix<scalar> hmm2(3, 3, 1.0);
SquareMatrix<scalar> hmm2(3, I);
hmm = hmm2;
@ -72,7 +73,14 @@ int main(int argc, char *argv[])
Info<< hmm5 << endl;
{
scalarSymmetricSquareMatrix symmMatrix(3, 3, 0);
RectangularMatrix<scalar> rm1(5, 6, 3.1);
rm1(0, 1) = 4.5;
RectangularMatrix<scalar> rm1b(rm1.block(2, 2, 0, 0));
Info<< "rm1b = " << rm1b << endl;
}
{
scalarSymmetricSquareMatrix symmMatrix(3, Zero);
symmMatrix(0, 0) = 4;
symmMatrix(1, 0) = 12;
@ -104,7 +112,7 @@ int main(int argc, char *argv[])
}
{
scalarSquareMatrix squareMatrix(3, 3, 0);
scalarSquareMatrix squareMatrix(3, Zero);
squareMatrix(0, 0) = 4;
squareMatrix(0, 1) = 12;

3
applications/utilities/preProcessing/viewFactorsGen/viewFactorsGen.C
View File

@ -675,7 +675,6 @@ int main(int argc, char *argv[])
// Matrix sum in j(Fij) for each i (if enclosure sum = 1)
scalarSquareMatrix sumViewFactorPatch
(
totalPatches,
totalPatches,
0.0
);
@ -888,7 +887,7 @@ int main(int argc, char *argv[])
if (Pstream::master())
{
scalarSquareMatrix Fmatrix(totalNCoarseFaces, totalNCoarseFaces, 0.0);
scalarSquareMatrix Fmatrix(totalNCoarseFaces, 0.0);
labelListList globalFaceFaces(visibleFaceFaces.size());

2
applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtract.C
View File

@ -303,7 +303,7 @@ triSurfacePointScalarField calcCurvature
faceCoordSys.normalize();
// Construct the matrix to solve
scalarSymmetricSquareMatrix T(3, 3, 0);
scalarSymmetricSquareMatrix T(3, 0);
scalarDiagonalMatrix Z(3, 0);
// Least Squares