Removed name clashes in lnInclude for foam/ directory

src/foam/containers/Dictionaries/Dictionary/DictionaryTemplate.C

@@ -25,7 +25,7 @@ Description
 
 \*---------------------------------------------------------------------------*/
 
-#include "Dictionary.H"
+#include "DictionaryTemplate.H"
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 

src/foam/containers/Dictionaries/Dictionary/DictionaryTemplate.H

@@ -32,12 +32,12 @@ Description
     of intrusive doubly-linked list of \<T\>.
 
 SourceFiles
-    Dictionary.C
+    DictionaryTemplate.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef Dictionary_H
-#define Dictionary_H
+#ifndef DictionaryTemplate_H
+#define DictionaryTemplate_H
 
 #include "DictionaryBase.H"
 #include "IDLList.H"
@@ -83,7 +83,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "Dictionary.C"
+#   include "DictionaryTemplate.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

src/foam/meshes/ProcessorTopology/ProcessorTopologyTemplate.C

@@ -23,7 +23,7 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "ProcessorTopology.H"
+#include "ProcessorTopologyTemplate.H"
 #include "ListOps.H"
 #include "Pstream.H"
 #include "commSchedule.H"

src/foam/meshes/ProcessorTopology/ProcessorTopologyTemplate.H

@@ -31,12 +31,12 @@ Description
     *this[procI] gives the list of neighbouring processors.
 
 SourceFiles
-    ProcessorTopology.C
+    ProcessorTopologyTemplate.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef ProcessorTopology_H
-#define ProcessorTopology_H
+#ifndef ProcessorTopologyTemplate_H
+#define ProcessorTopologyTemplate_H
 
 #include "labelList.H"
 #include "lduSchedule.H"
@@ -108,7 +108,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "ProcessorTopology.C"
+#   include "ProcessorTopologyTemplate.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

src/foam/meshes/polyMesh/globalMeshData/processorTopology.H

@@ -26,7 +26,7 @@ License
 #ifndef processorTopology_H
 #define processorTopology_H
 
-#include "ProcessorTopology.H"
+#include "ProcessorTopologyTemplate.H"
 #include "processorPolyPatch.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

src/foam/primitives/DiagTensor/DiagTensorTemplate.H

@@ -32,14 +32,14 @@ Description
     outer-product operators.
 
 SourceFiles
-    DiagTensorI.H
+    DiagTensorTemplateI.H
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef DiagTensor_H
-#define DiagTensor_H
+#ifndef DiagTensorTemplate_H
+#define DiagTensoTemplater_H
 
-#include "Tensor.H"
+#include "TensorTemplate.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -116,7 +116,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 // Include inline implementations
-#include "DiagTensorI.H"
+#include "DiagTensorTemplateI.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 

src/foam/primitives/DiagTensor/DiagTensorTemplateI.H

@@ -23,7 +23,7 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "SphericalTensor.H"
+#include "SphericalTensorTemplate.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 

src/foam/primitives/DiagTensor/diagTensor/diagTensor.H

@@ -35,7 +35,7 @@ SourceFiles
 #ifndef diagTensor_H
 #define diagTensor_H
 
-#include "DiagTensor.H"
+#include "DiagTensorTemplate.H"
 #include "contiguous.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

src/foam/primitives/DiagTensor/labelDiagTensor/labelDiagTensor.H

@@ -35,7 +35,7 @@ SourceFiles
 #ifndef labelDiagTensor_H
 #define labelDiagTensor_H
 
-#include "DiagTensor.H"
+#include "DiagTensorTemplate.H"
 #include "contiguous.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

src/foam/primitives/Scalar/ScalarTemplate.H

@@ -28,7 +28,7 @@ Description
     Single floating point number
 
 SourceFiles
-    Scalar.C
+    ScalarTemplate.C
 
 \*---------------------------------------------------------------------------*/
 

src/foam/primitives/Scalar/doubleScalar/doubleScalar.C

@@ -34,7 +34,7 @@ License
 #define ScalarVGREAT doubleScalarVGREAT
 #define ScalarVSMALL doubleScalarVSMALL
 #define readScalar readDoubleScalar
-#include "Scalar.C"
+#include "ScalarTemplate.C"
 #undef Scalar
 #undef ScalarVGREAT
 #undef ScalarVSMALL

src/foam/primitives/Scalar/doubleScalar/doubleScalar.H

@@ -75,7 +75,7 @@ inline Scalar func(const Scalar s) \
     return ::func(s);              \
 }
 
-#include "Scalar.H"
+#include "ScalarTemplate.H"
 
 inline Scalar hypot(const Scalar x, const Scalar y)
 {

src/foam/primitives/Scalar/floatScalar/floatScalar.C

@@ -34,7 +34,7 @@ License
 #define ScalarVGREAT floatScalarVGREAT
 #define ScalarVSMALL floatScalarVSMALL
 #define readScalar readFloatScalar
-#include "Scalar.C"
+#include "ScalarTemplate.C"
 #undef Scalar
 #undef ScalarVSMALL
 #undef ScalarVSMALL

src/foam/primitives/Scalar/floatScalar/floatScalar.H

@@ -75,7 +75,7 @@ inline Scalar func(const Scalar s) \
     return ::func##f(s);           \
 }
 
-#include "Scalar.H"
+#include "ScalarTemplate.H"
 
 inline Scalar hypot(const Scalar x, const Scalar y)
 {

src/foam/primitives/Scalar/longDoubleScalar/longDoubleScalar.C

@@ -34,7 +34,7 @@ License
 #define ScalarVGREAT longDoubleScalarVGREAT
 #define ScalarVSMALL longDoubleScalarVSMALL
 #define readScalar readLongDoubleScalar
-#include "Scalar.C"
+#include "ScalarTemplate.C"
 #undef Scalar
 #undef ScalarVGREAT
 #undef ScalarVSMALL

src/foam/primitives/Scalar/longDoubleScalar/longDoubleScalar.H

@@ -75,7 +75,7 @@ inline Scalar func(const Scalar s) \
     return ::func(s);              \
 }
 
-#include "Scalar.H"
+#include "ScalarTemplate.H"
 
 inline Scalar hypot(const Scalar x, const Scalar y)
 {

src/foam/primitives/SphericalTensor/SphericalTensorTemplate.H

@@ -30,12 +30,12 @@ Description
     inner-product (dot-product) and outer-product operators.
 
 SourceFiles
-    SphericalTensorI.H
+    SphericalTensorTemplateI.H
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef SphericalTensor_H
-#define SphericalTensor_H
+#ifndef SphericalTensorTemplate_H
+#define SphericalTensorTemplate_H
 
 #include "VectorSpace.H"
 
@@ -123,7 +123,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 // Include inline implementations
-#include "SphericalTensorI.H"
+#include "SphericalTensorTemplateI.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 

src/foam/primitives/SphericalTensor/SphericalTensorTemplateI.H

@@ -23,7 +23,7 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "Vector.H"
+#include "VectorTemplate.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 

src/foam/primitives/SphericalTensor/labelSphericalTensor/labelSphericalTensor.H

@@ -35,7 +35,7 @@ SourceFiles
 #ifndef labelSphericalTensor_H
 #define labelSphericalTensor_H
 
-#include "SphericalTensor.H"
+#include "SphericalTensorTemplate.H"
 #include "contiguous.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

src/foam/primitives/SphericalTensor/sphericalTensor/sphericalTensor.H

@@ -35,7 +35,7 @@ SourceFiles
 #ifndef sphericalTensor_H
 #define sphericalTensor_H
 
-#include "SphericalTensor.H"
+#include "SphericalTensorTemplate.H"
 #include "contiguous.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

src/foam/primitives/SphericalTensor2D/SphericalTensor2DTemplate.H

@@ -30,12 +30,12 @@ Description
     inner-product (dot-product) and outer-product operators.
 
 SourceFiles
-    SphericalTensor2DI.H
+    SphericalTensor2DTemplateI.H
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef SphericalTensor2D_H
-#define SphericalTensor2D_H
+#ifndef SphericalTensor2DTemplate_H
+#define SphericalTensor2DTemplate_H
 
 #include "VectorSpace.H"
 
@@ -115,7 +115,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 // Include inline implementations
-#include "SphericalTensor2DI.H"
+#include "SphericalTensor2DTemplateI.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 

src/foam/primitives/SphericalTensor2D/SphericalTensor2DTemplateI.H

@@ -23,7 +23,7 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "Vector2D.H"
+#include "Vector2DTemplate.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 

src/foam/primitives/SphericalTensor2D/sphericalTensor2D/sphericalTensor2D.H

@@ -35,7 +35,7 @@ SourceFiles
 #ifndef sphericalTensor2D_H
 #define sphericalTensor2D_H
 
-#include "SphericalTensor2D.H"
+#include "SphericalTensor2DTemplate.H"
 #include "tensor.H"
 #include "contiguous.H"
 

src/foam/primitives/SymmTensor/SymmTensorTemplate.H

@@ -31,15 +31,15 @@ Description
     (tensor-product) operators.
 
 SourceFiles
-    SymmTensorI.H
+    SymmTensorITemplate.H
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef SymmTensor_H
-#define SymmTensor_H
+#ifndef SymmTensorTemplate_H
+#define SymmTensorTemplate_H
 
 #include "VectorSpace.H"
-#include "SphericalTensor.H"
+#include "SphericalTensorTemplate.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -153,7 +153,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 // Include inline implementations
-#include "SymmTensorI.H"
+#include "SymmTensorTemplateI.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 

src/foam/primitives/SymmTensor/SymmTensorTemplateI.H

@@ -23,8 +23,8 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "Vector.H"
-#include "Tensor.H"
+#include "VectorTemplate.H"
+#include "TensorTemplate.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 

src/foam/primitives/SymmTensor/labelSymmTensor/labelSymmTensor.H

@@ -35,7 +35,7 @@ SourceFiles
 #ifndef labelSymmTensor_H
 #define labelSymmTensor_H
 
-#include "SymmTensor.H"
+#include "SymmTensorTemplate.H"
 #include "contiguous.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

src/foam/primitives/SymmTensor/symmTensor/symmTensor.H

@@ -35,7 +35,7 @@ SourceFiles
 #ifndef symmTensor_H
 #define symmTensor_H
 
-#include "SymmTensor.H"
+#include "SymmTensorTemplate.H"
 #include "vector.H"
 #include "contiguous.H"
 

src/foam/primitives/SymmTensor4thOrder/SymmTensor4thOrderTemplate.H

@@ -44,18 +44,18 @@ Note:
     HJ, 29/Oct/2013
 
 SourceFiles
-    SymmTensor4thOrderI.H
+    SymmTensor4thOrderTemplateI.H
 
 Author
     Philip Cardiff UCD
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef SymmTensor4thOrder_H
-#define SymmTensor4thOrder_H
+#ifndef SymmTensor4thOrderTemplate_H
+#define SymmTensor4thOrderTemplate_H
 
 #include "VectorSpace.H"
-#include "SymmTensor.H"
+#include "SymmTensorTemplate.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -200,7 +200,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 // Include inline implementations
-#include "SymmTensor4thOrderI.H"
+#include "SymmTensor4thOrderTemplateI.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 

src/foam/primitives/SymmTensor4thOrder/SymmTensor4thOrderTemplateI.H

@@ -23,8 +23,8 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "SymmTensor.H"
-#include "Tensor.H"
+#include "SymmTensorTemplate.H"
+#include "TensorTemplate.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -245,7 +245,7 @@ operator&(const SymmTensor4thOrder<Cmpt>& st, const Vector<Cmpt>& v)
     notImplemented
       (
        "operator&(const SymmTensor4thOrder<Cmpt>& st, const Vector<Cmpt>& v)"
-       " not implemented in SymmTensor4thOrderI.H"
+       " not implemented in SymmTensor4thOrderTemplateI.H"
        );
 
     return Vector<Cmpt>
@@ -266,7 +266,7 @@ operator&(const Vector<Cmpt>& v, const SymmTensor4thOrder<Cmpt>& st)
     notImplemented
       (
        "operator&(const Vector<Cmpt>& v, const SymmTensor4thOrder<Cmpt>& st)"
-       " not implemented in SymmTensor4thOrderI.H"
+       " not implemented in SymmTensor4thOrderTemplateI.H"
        );
 
     return Vector<Cmpt>

src/foam/primitives/SymmTensor4thOrder/labelSymmTensor4thOrder/labelSymmTensor4thOrder.H

@@ -35,7 +35,7 @@ SourceFiles
 #ifndef labelSymmTensor4thOrder_H
 #define labelSymmTensor4thOrder_H
 
-#include "SymmTensor4thOrder.H"
+#include "SymmTensor4thOrderTemplate.H"
 #include "contiguous.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

src/foam/primitives/SymmTensor4thOrder/symmTensor4thOrder/symmTensor4thOrder.H

@@ -35,7 +35,7 @@ SourceFiles
 #ifndef symmTensor4thOrder_H
 #define symmTensor4thOrder_H
 
-#include "SymmTensor4thOrder.H"
+#include "SymmTensor4thOrderTemplate.H"
 #include "vector.H"
 #include "contiguous.H"
 

src/foam/primitives/Tensor/TensorTemplate.H

@@ -31,15 +31,15 @@ Description
     (tensor-product) operators.
 
 SourceFiles
-    TensorI.H
+    TensorTemplateI.H
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef Tensor_H
-#define Tensor_H
+#ifndef TensorTemplate_H
+#define TensorTemplate_H
 
-#include "Vector.H"
-#include "SphericalTensor.H"
+#include "VectorTemplate.H"
+#include "SphericalTensorTemplate.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -198,7 +198,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 // Include inline implementations
-#include "TensorI.H"
+#include "TensorTemplateI.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 

src/foam/primitives/Tensor/TensorTemplateI.H

@@ -23,7 +23,7 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "SymmTensor.H"
+#include "SymmTensorTemplate.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 

src/foam/primitives/Tensor/labelTensor/labelTensor.H

@@ -35,7 +35,7 @@ SourceFiles
 #ifndef labelTensor_H
 #define labelTensor_H
 
-#include "Tensor.H"
+#include "TensorTemplate.H"
 #include "contiguous.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

src/foam/primitives/Tensor/tensor/tensor.H

@@ -35,7 +35,7 @@ SourceFiles
 #ifndef tensor_H
 #define tensor_H
 
-#include "Tensor.H"
+#include "TensorTemplate.H"
 #include "vector.H"
 #include "sphericalTensor.H"
 #include "symmTensor.H"

src/foam/primitives/Tensor2D/Tensor2DTemplate.H

@@ -31,15 +31,15 @@ Description
     Vector2Ds (tensor-product) operators.
 
 SourceFiles
-    Tensor2DI.H
+    Tensor2DTemplateI.H
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef Tensor2D_H
-#define Tensor2D_H
+#ifndef Tensor2DTemplate_H
+#define Tensor2DTemplate_H
 
-#include "Vector2D.H"
-#include "SphericalTensor2D.H"
+#include "Vector2DTemplate.H"
+#include "SphericalTensor2DTemplate.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -162,7 +162,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 // Include inline implementations
-#include "Tensor2DI.H"
+#include "Tensor2DTemplateI.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 

src/foam/primitives/Tensor2D/tensor2D/tensor2D.H

@@ -35,7 +35,7 @@ SourceFiles
 #ifndef tensor2D_H
 #define tensor2D_H
 
-#include "Tensor2D.H"
+#include "Tensor2DTemplate.H"
 #include "vector2D.H"
 #include "contiguous.H"
 

src/foam/primitives/Vector/VectorTemplate.H

@@ -34,12 +34,12 @@ Description
     other shapes in the shape hierachy.
 
 SourceFiles
-    VectorI.H
+    VectorTemplateI.H
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef Vector_H
-#define Vector_H
+#ifndef VectorTemplate_H
+#define VectorTemplate_H
 
 #include "VectorSpace.H"
 
@@ -160,7 +160,7 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#include "VectorI.H"
+#include "VectorTemplateI.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 

src/foam/primitives/Vector/labelVector/labelVector.H

@@ -36,7 +36,7 @@ SourceFiles
 #define labelVector_H
 
 #include "label.H"
-#include "Vector.H"
+#include "VectorTemplate.H"
 #include "contiguous.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

src/foam/primitives/Vector/vector/vector.H

@@ -36,7 +36,7 @@ SourceFiles
 #define vector_H
 
 #include "scalar.H"
-#include "Vector.H"
+#include "VectorTemplate.H"
 #include "contiguous.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

src/foam/primitives/Vector2D/Vector2DTemplate.H

@@ -30,12 +30,12 @@ Description
     the inner-product (dot-product).
 
 SourceFiles
-    Vector2DI.H
+    Vector2DTemplateI.H
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef Vector2D_H
-#define Vector2D_H
+#ifndef Vector2DTemplate_H
+#define Vector2DTemplate_H
 
 #include "VectorSpace.H"
 
@@ -130,7 +130,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 // Include inline implementations
-#include "Vector2DI.H"
+#include "Vector2DTemplateI.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 

src/foam/primitives/Vector2D/vector2D/vector2D.H

@@ -36,7 +36,7 @@ SourceFiles
 #define vector2D_H
 
 #include "scalar.H"
-#include "Vector2D.H"
+#include "Vector2DTemplate.H"
 #include "contiguous.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

src/foam/primitives/expandContract/expandTensor.H

@@ -33,7 +33,7 @@ Author
 #ifndef expandTensor_H
 #define expandTensor_H
 
-#include "Tensor.H"
+#include "TensorTemplate.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //