songtianlun/openfoam
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of /home/dm4/OpenFOAM/OpenFOAM-dev

Browse Source
This commit is contained in:
andy 2012-01-03 18:23:16 +00:00
commit b2cb10010b
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/OpenFOAM/primitives/Tensor/tensor/tensor.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-2012 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -183,17 +183,17 @@ vector eigenValues(const tensor& t)
// Sort the eigenvalues into ascending order
if (mag(i) > mag(ii))
if (i > ii)
{
Swap(i, ii);
}
if (mag(ii) > mag(iii))
if (ii > iii)
{
Swap(ii, iii);
}
if (mag(i) > mag(ii))
if (i > ii)
{
Swap(i, ii);
}
@ -384,17 +384,17 @@ vector eigenValues(const symmTensor& t)
// Sort the eigenvalues into ascending order
if (mag(i) > mag(ii))
if (i > ii)
{
Swap(i, ii);
}
if (mag(ii) > mag(iii))
if (ii > iii)
{
Swap(ii, iii);
}
if (mag(i) > mag(ii))
if (i > ii)
{
Swap(i, ii);
}

4
src/OpenFOAM/primitives/Tensor2D/tensor2D/tensor2D.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-2012 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -116,7 +116,7 @@ vector2D eigenValues(const tensor2D& t)
}
// Sort the eigenvalues into ascending order
if (mag(i) > mag(ii))
if (i > ii)
{
Swap(i, ii);
}