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

Merge commit 'origin/master' into olesenm

Browse Source
This commit is contained in:
Mark Olesen
2008-06-11 15:11:05 +02:00
parent 52c2bfc519 bb034f8ba6
commit e7a33edc7d
3 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
applications/test/tensor/tensorTest.C
View File

@ -38,6 +38,12 @@ int main()
<< (eigenVector(t6, e[2]) & t6) << e[2]*eigenVector(t6, e[2])
<< endl;
Info<< "Check eigenvalues for symmTensor "
<< eigenValues(symm(t6)) - eigenValues(tensor(symm(t6))) << endl;
Info<< "Check eigenvectors for symmTensor "
<< eigenVectors(symm(t6)) - eigenVectors(tensor(symm(t6))) << endl;
tensor t7(1, 2, 3, 2, 4, 5, 3, 5, 6);
Info<< "Check transformation "
@ -49,7 +55,7 @@ int main()
<< transform(t1, st1) << endl;
vector v1(1, 2, 3);
Info<< sqr(v1) << endl;
Info<< symm(t7) << endl;
Info<< twoSymm(t7) << endl;

18
src/OpenFOAM/primitives/tensor/tensor.C
View File

@ -185,7 +185,7 @@ vector eigenValues(const tensor& t)
vector eigenVector(const tensor& t, const scalar lambda)
{
if (lambda < SMALL)
if (mag(lambda) < SMALL)
{
return vector::zero;
}
@ -292,22 +292,22 @@ vector eigenValues(const symmTensor& t)
+ t.xy()*t.xy()*t.zz() + t.xx()*t.yz()*t.yz();
// If there is a zero root
if (mag(c) < SMALL)
if (mag(c) < 1.0e-100)
{
scalar disc = sqr(a) - 4*b;
if (disc > 0)
if (disc >= -SMALL)
{
scalar q = -0.5*(a + sign(a)*sqrt(disc));
scalar q = -0.5*sqrt(max(0.0, disc));
i = 0;
ii = q;
iii = b/q;
ii = -0.5*a + q;
iii = -0.5*a - q;
}
else
{
FatalErrorIn("eigenValues(const symmTensor&)")
<< "zero and complex eigenvalues in symmTensor: " << t
FatalErrorIn("eigenValues(const tensor&)")
<< "zero and complex eigenvalues in tensor: " << t
<< abort(FatalError);
}
}
@ -380,7 +380,7 @@ vector eigenValues(const symmTensor& t)
vector eigenVector(const symmTensor& t, const scalar lambda)
{
if (lambda < SMALL)
if (mag(lambda) < SMALL)
{
return vector::zero;
}

4
src/meshTools/octree/treeBoundBox.C
View File

@ -617,13 +617,13 @@ Foam::label Foam::treeBoundBox::distanceCmp
// * * * * * * * * * * * * * * * Friend Operators * * * * * * * * * * * * * //
bool operator==(const treeBoundBox& a, const treeBoundBox& b)
bool Foam::operator==(const treeBoundBox& a, const treeBoundBox& b)
{
return (a.min() == b.min()) && (a.max() == b.max());
}
bool operator!=(const treeBoundBox& a, const treeBoundBox& b)
bool Foam::operator!=(const treeBoundBox& a, const treeBoundBox& b)
{
return !(a == b);
}