Merge branch 'HrvojeJasak'

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;}

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

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(1);
-static const sphericalTensor I;
+static const sphericalTensor oneThirdI(1.0/3.0);
-
+static const sphericalTensor twoThirdsI(2.0/3.0);
-static const sphericalTensor oneThirdI;
-static const sphericalTensor twoThirdsI;
 
 
 //- Specify data associated with sphericalTensor type are contiguous

src/OpenFOAM/primitives/SphericalTensor2D/sphericalTensor2D/sphericalTensor2D.H

@@ -49,9 +49,9 @@ namespace Foam
 
 typedef SphericalTensor2D<scalar> sphericalTensor2D;
 
-//- Identity tensor
+// Global spherical tensor definitions
-static const sphericalTensor2D I2D(1);
 
+static const sphericalTensor2D I2D(1);
 static const sphericalTensor2D oneThirdI2D(1.0/3.0);
 static const sphericalTensor2D twoThirdsI2D(2.0/3.0);
 

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"
 

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
     (

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;}

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

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;}

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;}