From 6b148718cc7dbb4d9afadaee37b0ddf4bbebe5b9 Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Tue, 3 Jan 2012 16:42:53 +0000
Subject: [PATCH] Change eigenvalue ordering to be ascending value rather than
ascending magnitude
---
src/OpenFOAM/primitives/Tensor/tensor/tensor.C | 14 +++++++-------
.../primitives/Tensor2D/tensor2D/tensor2D.C | 4 ++--
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/OpenFOAM/primitives/Tensor/tensor/tensor.C b/src/OpenFOAM/primitives/Tensor/tensor/tensor.C
index 5063d2b625d..57ecd897b3d 100644
--- a/src/OpenFOAM/primitives/Tensor/tensor/tensor.C
+++ b/src/OpenFOAM/primitives/Tensor/tensor/tensor.C
@@ -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);
}
diff --git a/src/OpenFOAM/primitives/Tensor2D/tensor2D/tensor2D.C b/src/OpenFOAM/primitives/Tensor2D/tensor2D/tensor2D.C
index 7b9952535d5..08bc334e6d8 100644
--- a/src/OpenFOAM/primitives/Tensor2D/tensor2D/tensor2D.C
+++ b/src/OpenFOAM/primitives/Tensor2D/tensor2D/tensor2D.C
@@ -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);
}
--
GitLab