From a0162ece8a3005fd1b5ac1cd1a81b06095183c8d Mon Sep 17 00:00:00 2001
From: Hrvoje Jasak <h.jasak@wikki.co.uk>
Date: Thu, 20 Jan 2011 00:49:41 +0000
Subject: [PATCH] Hack clean-up: Vector<bool>

---
 .../Fields/symmTensorField/symmTensorField.C  | 26 ++++++++---------
 .../fields/Fields/tensorField/tensorField.C   | 28 ++++++++++---------
 2 files changed, 28 insertions(+), 26 deletions(-)

diff --git a/src/OpenFOAM/fields/Fields/symmTensorField/symmTensorField.C b/src/OpenFOAM/fields/Fields/symmTensorField/symmTensorField.C
index bfd09b417..f2e7beff4 100644
--- a/src/OpenFOAM/fields/Fields/symmTensorField/symmTensorField.C
+++ b/src/OpenFOAM/fields/Fields/symmTensorField/symmTensorField.C
@@ -61,45 +61,45 @@ void inv(Field<symmTensor>& tf, const UList<symmTensor>& tf1)
     }
 
     scalar scale = magSqr(tf1[0]);
-    Vector<bool> removeCmpts
-    (
-        magSqr(tf1[0].xx())/scale < SMALL,
-        magSqr(tf1[0].yy())/scale < SMALL,
-        magSqr(tf1[0].zz())/scale < SMALL
-    );
 
-    if (removeCmpts.x() || removeCmpts.y() || removeCmpts.z())
+    // Fixed terrible hack.  HJ, 20/Jan/2011
+    boolList removeCmpts(3);
+    removeCmpts[0] =  magSqr(tf1[0].xx())/scale < SMALL;
+    removeCmpts[1] =  magSqr(tf1[0].yy())/scale < SMALL;
+    removeCmpts[2] =  magSqr(tf1[0].zz())/scale < SMALL;
+
+    if (removeCmpts[0] || removeCmpts[1] || removeCmpts[2])
     {
         symmTensorField tf1Plus(tf1);
 
-        if (removeCmpts.x())
+        if (removeCmpts[0])
         {
             tf1Plus += symmTensor(1,0,0,0,0,0);
         }
 
-        if (removeCmpts.y())
+        if (removeCmpts[1])
         {
             tf1Plus += symmTensor(0,0,0,1,0,0);
         }
 
-        if (removeCmpts.z())
+        if (removeCmpts[2])
         {
             tf1Plus += symmTensor(0,0,0,0,0,1);
         }
 
         TFOR_ALL_F_OP_FUNC_F(symmTensor, tf, =, inv, symmTensor, tf1Plus)
 
-        if (removeCmpts.x())
+        if (removeCmpts[0])
         {
             tf -= symmTensor(1,0,0,0,0,0);
         }
 
-        if (removeCmpts.y())
+        if (removeCmpts[1])
         {
             tf -= symmTensor(0,0,0,1,0,0);
         }
 
-        if (removeCmpts.z())
+        if (removeCmpts[2])
         {
             tf -= symmTensor(0,0,0,0,0,1);
         }
diff --git a/src/OpenFOAM/fields/Fields/tensorField/tensorField.C b/src/OpenFOAM/fields/Fields/tensorField/tensorField.C
index 5b3a0c10b..2878746b3 100644
--- a/src/OpenFOAM/fields/Fields/tensorField/tensorField.C
+++ b/src/OpenFOAM/fields/Fields/tensorField/tensorField.C
@@ -26,6 +26,7 @@ License
 
 #include "tensorField.H"
 #include "transformField.H"
+#include "boolList.H"
 
 #define TEMPLATE
 #include "FieldFunctionsM.C"
@@ -61,45 +62,46 @@ void inv(Field<tensor>& tf, const UList<tensor>& tf1)
     }
 
     scalar scale = magSqr(tf1[0]);
-    Vector<bool> removeCmpts
-    (
-        magSqr(tf1[0].xx())/scale < SMALL,
-        magSqr(tf1[0].yy())/scale < SMALL,
-        magSqr(tf1[0].zz())/scale < SMALL
-    );
 
-    if (removeCmpts.x() || removeCmpts.y() || removeCmpts.z())
+    // Fixed terrible hack.  HJ, 20/Jan/2011
+    boolList removeCmpts(3);
+    removeCmpts[0] = magSqr(tf1[0].xx())/scale < SMALL;
+    removeCmpts[1] = magSqr(tf1[0].yy())/scale < SMALL;
+    removeCmpts[2] = magSqr(tf1[0].zz())/scale < SMALL;
+
+
+    if (removeCmpts[0] || removeCmpts[1] || removeCmpts[2])
     {
         tensorField tf1Plus(tf1);
 
-        if (removeCmpts.x())
+        if (removeCmpts[0])
         {
             tf1Plus += tensor(1,0,0,0,0,0,0,0,0);
         }
 
-        if (removeCmpts.y())
+        if (removeCmpts[1])
         {
             tf1Plus += tensor(0,0,0,0,1,0,0,0,0);
         }
 
-        if (removeCmpts.z())
+        if (removeCmpts[2])
         {
             tf1Plus += tensor(0,0,0,0,0,0,0,0,1);
         }
 
         TFOR_ALL_F_OP_FUNC_F(tensor, tf, =, inv, tensor, tf1Plus)
 
-        if (removeCmpts.x())
+        if (removeCmpts[0])
         {
             tf -= tensor(1,0,0,0,0,0,0,0,0);
         }
 
-        if (removeCmpts.y())
+        if (removeCmpts[1])
         {
             tf -= tensor(0,0,0,0,1,0,0,0,0);
         }
 
-        if (removeCmpts.z())
+        if (removeCmpts[2])
         {
             tf -= tensor(0,0,0,0,0,0,0,0,1);
         }