From c2a8e6f6ce955e5ced234904aace85881446f5a7 Mon Sep 17 00:00:00 2001
From: Hrvoje Jasak <h.jasak@wikki.co.uk>
Date: Wed, 20 Oct 2010 20:57:08 +0100
Subject: [PATCH] Checks and updates on global static primitive constants

---
 src/OpenFOAM/primitives/DiagTensor/DiagTensorI.H     |  2 +-
 .../primitives/DiagTensor/diagTensor/diagTensor.H    |  1 -
 .../labelSphericalTensor/labelSphericalTensor.H      |  2 +-
 .../sphericalTensor/sphericalTensor.H                |  9 ++++-----
 .../sphericalTensor2D/sphericalTensor2D.H            |  4 ++--
 .../primitives/Vector/complexVector/complexVector.H  | 12 ++++++++++--
 .../primitives/Vector/complexVector/complexVectorI.H |  6 +++++-
 .../primitives/Vector/labelVector/labelVector.H      |  1 -
 src/OpenFOAM/primitives/Vector/vector/vector.C       |  1 +
 src/OpenFOAM/primitives/Vector/vector/vector.H       |  1 -
 src/OpenFOAM/primitives/Vector2D/vector2D/vector2D.H |  1 -
 11 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/src/OpenFOAM/primitives/DiagTensor/DiagTensorI.H b/src/OpenFOAM/primitives/DiagTensor/DiagTensorI.H
index 58ebf382c..6922173a9 100644
--- a/src/OpenFOAM/primitives/DiagTensor/DiagTensorI.H
+++ b/src/OpenFOAM/primitives/DiagTensor/DiagTensorI.H
@@ -299,7 +299,7 @@ inline Cmpt det(const DiagTensor<Cmpt>& t)
 template <class Cmpt>
 inline DiagTensor<Cmpt> inv(const DiagTensor<Cmpt>& dt)
 {
-    return DiagTensor<Cmpt>(1.0/dt.xx(), 1.0/dt.yy(), 1.0/dt.zz()); 
+    return DiagTensor<Cmpt>(1.0/dt.xx(), 1.0/dt.yy(), 1.0/dt.zz());
 }
 
 
diff --git a/src/OpenFOAM/primitives/DiagTensor/diagTensor/diagTensor.H b/src/OpenFOAM/primitives/DiagTensor/diagTensor/diagTensor.H
index 471a264d5..9f662b8ef 100644
--- a/src/OpenFOAM/primitives/DiagTensor/diagTensor/diagTensor.H
+++ b/src/OpenFOAM/primitives/DiagTensor/diagTensor/diagTensor.H
@@ -48,7 +48,6 @@ namespace Foam
 
 typedef DiagTensor<scalar> diagTensor;
 
-
 //- Data associated with diagTensor type are contiguous
 template<>
 inline bool contiguous<diagTensor>() {return true;}
diff --git a/src/OpenFOAM/primitives/SphericalTensor/labelSphericalTensor/labelSphericalTensor.H b/src/OpenFOAM/primitives/SphericalTensor/labelSphericalTensor/labelSphericalTensor.H
index 945737fb0..17660ec03 100644
--- a/src/OpenFOAM/primitives/SphericalTensor/labelSphericalTensor/labelSphericalTensor.H
+++ b/src/OpenFOAM/primitives/SphericalTensor/labelSphericalTensor/labelSphericalTensor.H
@@ -48,7 +48,7 @@ namespace Foam
 
 typedef SphericalTensor<label> labelSphericalTensor;
 
-//- Identity labelTensor
+//- Global identity labelTensor
 static const labelSphericalTensor labelI(1);
 
 //- Data associated with labelSphericalTensor type are contiguous
diff --git a/src/OpenFOAM/primitives/SphericalTensor/sphericalTensor/sphericalTensor.H b/src/OpenFOAM/primitives/SphericalTensor/sphericalTensor/sphericalTensor.H
index 2cb62a151..0ed6821e9 100644
--- a/src/OpenFOAM/primitives/SphericalTensor/sphericalTensor/sphericalTensor.H
+++ b/src/OpenFOAM/primitives/SphericalTensor/sphericalTensor/sphericalTensor.H
@@ -48,12 +48,11 @@ namespace Foam
 
 typedef SphericalTensor<scalar> sphericalTensor;
 
+// Global spherical tensor definitions
 
-// Identity tensor
-static const sphericalTensor I;
-
-static const sphericalTensor oneThirdI;
-static const sphericalTensor twoThirdsI;
+static const sphericalTensor I(1);
+static const sphericalTensor oneThirdI(1.0/3.0);
+static const sphericalTensor twoThirdsI(2.0/3.0);
 
 
 //- Specify data associated with sphericalTensor type are contiguous
diff --git a/src/OpenFOAM/primitives/SphericalTensor2D/sphericalTensor2D/sphericalTensor2D.H b/src/OpenFOAM/primitives/SphericalTensor2D/sphericalTensor2D/sphericalTensor2D.H
index 4eea56d65..87f184a3f 100644
--- a/src/OpenFOAM/primitives/SphericalTensor2D/sphericalTensor2D/sphericalTensor2D.H
+++ b/src/OpenFOAM/primitives/SphericalTensor2D/sphericalTensor2D/sphericalTensor2D.H
@@ -49,9 +49,9 @@ namespace Foam
 
 typedef SphericalTensor2D<scalar> sphericalTensor2D;
 
-//- Identity tensor
-static const sphericalTensor2D I2D(1);
+// Global spherical tensor definitions
 
+static const sphericalTensor2D I2D(1);
 static const sphericalTensor2D oneThirdI2D(1.0/3.0);
 static const sphericalTensor2D twoThirdsI2D(2.0/3.0);
 
diff --git a/src/OpenFOAM/primitives/Vector/complexVector/complexVector.H b/src/OpenFOAM/primitives/Vector/complexVector/complexVector.H
index 83f226b66..a3da1bbe0 100644
--- a/src/OpenFOAM/primitives/Vector/complexVector/complexVector.H
+++ b/src/OpenFOAM/primitives/Vector/complexVector/complexVector.H
@@ -44,8 +44,16 @@ SourceFiles
 
 namespace Foam
 {
-    typedef Vector<complex> complexVector;
-}
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+typedef Vector<complex> complexVector;
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #include "complexVectorI.H"
 
diff --git a/src/OpenFOAM/primitives/Vector/complexVector/complexVectorI.H b/src/OpenFOAM/primitives/Vector/complexVector/complexVectorI.H
index 284b3c4a8..f03162509 100644
--- a/src/OpenFOAM/primitives/Vector/complexVector/complexVectorI.H
+++ b/src/OpenFOAM/primitives/Vector/complexVector/complexVectorI.H
@@ -94,7 +94,11 @@ inline complex operator&(const complexVector& v1, const complexVector& v2)
 
 // complexVector cross product
 
-inline complexVector operator^(const complexVector& v1, const complexVector& v2)
+inline complexVector operator^
+(
+    const complexVector& v1,
+    const complexVector& v2
+)
 {
     return complexVector
     (
diff --git a/src/OpenFOAM/primitives/Vector/labelVector/labelVector.H b/src/OpenFOAM/primitives/Vector/labelVector/labelVector.H
index 1aec5f140..d5598e927 100644
--- a/src/OpenFOAM/primitives/Vector/labelVector/labelVector.H
+++ b/src/OpenFOAM/primitives/Vector/labelVector/labelVector.H
@@ -49,7 +49,6 @@ namespace Foam
 
 typedef Vector<label> labelVector;
 
-
 //- Data associated with labelVector type are contiguous
 template<>
 inline bool contiguous<labelVector>() {return true;}
diff --git a/src/OpenFOAM/primitives/Vector/vector/vector.C b/src/OpenFOAM/primitives/Vector/vector/vector.C
index e5d2feb0b..f0a020742 100644
--- a/src/OpenFOAM/primitives/Vector/vector/vector.C
+++ b/src/OpenFOAM/primitives/Vector/vector/vector.C
@@ -54,6 +54,7 @@ const vector vector::max(VGREAT, VGREAT, VGREAT);
 template<>
 const vector vector::min(-VGREAT, -VGREAT, -VGREAT);
 
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam
diff --git a/src/OpenFOAM/primitives/Vector/vector/vector.H b/src/OpenFOAM/primitives/Vector/vector/vector.H
index 13a57f184..1bc482ee3 100644
--- a/src/OpenFOAM/primitives/Vector/vector/vector.H
+++ b/src/OpenFOAM/primitives/Vector/vector/vector.H
@@ -49,7 +49,6 @@ namespace Foam
 
 typedef Vector<scalar> vector;
 
-
 //- Data associated with vector type are contiguous
 template<>
 inline bool contiguous<vector>() {return true;}
diff --git a/src/OpenFOAM/primitives/Vector2D/vector2D/vector2D.H b/src/OpenFOAM/primitives/Vector2D/vector2D/vector2D.H
index 257a7cd88..0e85ff2ee 100644
--- a/src/OpenFOAM/primitives/Vector2D/vector2D/vector2D.H
+++ b/src/OpenFOAM/primitives/Vector2D/vector2D/vector2D.H
@@ -49,7 +49,6 @@ namespace Foam
 
 typedef Vector2D<scalar> vector2D;
 
-
 //- Data associated with vector2D type are contiguous
 template<>
 inline bool contiguous<vector2D>() {return true;}