From 72ceb471050cf1599b0cb1bb6561cfb8798f2e96 Mon Sep 17 00:00:00 2001 From: Dominik Christ Date: Thu, 18 Jun 2015 12:18:21 +0100 Subject: [PATCH] Removed name clashes in lnInclude for foam/ directory --- .../{Dictionary.C => DictionaryTemplate.C} | 2 +- .../{Dictionary.H => DictionaryTemplate.H} | 8 ++++---- ...ocessorTopology.C => ProcessorTopologyTemplate.C} | 2 +- ...ocessorTopology.H => ProcessorTopologyTemplate.H} | 8 ++++---- .../polyMesh/globalMeshData/processorTopology.H | 2 +- .../{DiagTensor.H => DiagTensorTemplate.H} | 10 +++++----- .../{DiagTensorI.H => DiagTensorTemplateI.H} | 2 +- .../primitives/DiagTensor/diagTensor/diagTensor.H | 2 +- .../DiagTensor/labelDiagTensor/labelDiagTensor.H | 2 +- .../primitives/Scalar/{Scalar.C => ScalarTemplate.C} | 0 .../primitives/Scalar/{Scalar.H => ScalarTemplate.H} | 2 +- .../primitives/Scalar/doubleScalar/doubleScalar.C | 2 +- .../primitives/Scalar/doubleScalar/doubleScalar.H | 2 +- src/foam/primitives/Scalar/floatScalar/floatScalar.C | 2 +- src/foam/primitives/Scalar/floatScalar/floatScalar.H | 2 +- .../Scalar/longDoubleScalar/longDoubleScalar.C | 2 +- .../Scalar/longDoubleScalar/longDoubleScalar.H | 2 +- .../{SphericalTensor.H => SphericalTensorTemplate.H} | 8 ++++---- ...SphericalTensorI.H => SphericalTensorTemplateI.H} | 2 +- .../labelSphericalTensor/labelSphericalTensor.H | 2 +- .../sphericalTensor/sphericalTensor.H | 2 +- ...hericalTensor2D.H => SphericalTensor2DTemplate.H} | 8 ++++---- ...ricalTensor2DI.H => SphericalTensor2DTemplateI.H} | 2 +- .../sphericalTensor2D/sphericalTensor2D.H | 2 +- .../{SymmTensor.H => SymmTensorTemplate.H} | 10 +++++----- .../{SymmTensorI.H => SymmTensorTemplateI.H} | 4 ++-- .../SymmTensor/labelSymmTensor/labelSymmTensor.H | 2 +- .../primitives/SymmTensor/symmTensor/symmTensor.H | 2 +- ...Tensor4thOrder.H => SymmTensor4thOrderTemplate.H} | 10 +++++----- ...nsor4thOrderI.H => SymmTensor4thOrderTemplateI.H} | 8 ++++---- .../labelSymmTensor4thOrder.H | 2 +- .../symmTensor4thOrder/symmTensor4thOrder.H | 2 +- .../primitives/Tensor/{Tensor.H => TensorTemplate.H} | 12 ++++++------ .../Tensor/{TensorI.H => TensorTemplateI.H} | 2 +- src/foam/primitives/Tensor/labelTensor/labelTensor.H | 2 +- src/foam/primitives/Tensor/tensor/tensor.H | 2 +- .../Tensor2D/{Tensor2D.H => Tensor2DTemplate.H} | 12 ++++++------ .../Tensor2D/{Tensor2DI.H => Tensor2DTemplateI.H} | 0 src/foam/primitives/Tensor2D/tensor2D/tensor2D.H | 2 +- .../primitives/Vector/{Vector.H => VectorTemplate.H} | 8 ++++---- .../Vector/{VectorI.H => VectorTemplateI.H} | 0 src/foam/primitives/Vector/labelVector/labelVector.H | 2 +- src/foam/primitives/Vector/vector/vector.H | 2 +- .../Vector2D/{Vector2D.H => Vector2DTemplate.H} | 8 ++++---- .../Vector2D/{Vector2DI.H => Vector2DTemplateI.H} | 0 src/foam/primitives/Vector2D/vector2D/vector2D.H | 2 +- src/foam/primitives/expandContract/expandTensor.H | 2 +- 47 files changed, 87 insertions(+), 87 deletions(-) rename src/foam/containers/Dictionaries/Dictionary/{Dictionary.C => DictionaryTemplate.C} (98%) rename src/foam/containers/Dictionaries/Dictionary/{Dictionary.H => DictionaryTemplate.H} (95%) rename src/foam/meshes/ProcessorTopology/{ProcessorTopology.C => ProcessorTopologyTemplate.C} (99%) rename src/foam/meshes/ProcessorTopology/{ProcessorTopology.H => ProcessorTopologyTemplate.H} (95%) rename src/foam/primitives/DiagTensor/{DiagTensor.H => DiagTensorTemplate.H} (95%) rename src/foam/primitives/DiagTensor/{DiagTensorI.H => DiagTensorTemplateI.H} (99%) rename src/foam/primitives/Scalar/{Scalar.C => ScalarTemplate.C} (100%) rename src/foam/primitives/Scalar/{Scalar.H => ScalarTemplate.H} (99%) rename src/foam/primitives/SphericalTensor/{SphericalTensor.H => SphericalTensorTemplate.H} (96%) rename src/foam/primitives/SphericalTensor/{SphericalTensorI.H => SphericalTensorTemplateI.H} (99%) rename src/foam/primitives/SphericalTensor2D/{SphericalTensor2D.H => SphericalTensor2DTemplate.H} (96%) rename src/foam/primitives/SphericalTensor2D/{SphericalTensor2DI.H => SphericalTensor2DTemplateI.H} (99%) rename src/foam/primitives/SymmTensor/{SymmTensor.H => SymmTensorTemplate.H} (96%) rename src/foam/primitives/SymmTensor/{SymmTensorI.H => SymmTensorTemplateI.H} (99%) rename src/foam/primitives/SymmTensor4thOrder/{SymmTensor4thOrder.H => SymmTensor4thOrderTemplate.H} (96%) rename src/foam/primitives/SymmTensor4thOrder/{SymmTensor4thOrderI.H => SymmTensor4thOrderTemplateI.H} (97%) rename src/foam/primitives/Tensor/{Tensor.H => TensorTemplate.H} (97%) rename src/foam/primitives/Tensor/{TensorI.H => TensorTemplateI.H} (99%) rename src/foam/primitives/Tensor2D/{Tensor2D.H => Tensor2DTemplate.H} (96%) rename src/foam/primitives/Tensor2D/{Tensor2DI.H => Tensor2DTemplateI.H} (100%) rename src/foam/primitives/Vector/{Vector.H => VectorTemplate.H} (97%) rename src/foam/primitives/Vector/{VectorI.H => VectorTemplateI.H} (100%) rename src/foam/primitives/Vector2D/{Vector2D.H => Vector2DTemplate.H} (97%) rename src/foam/primitives/Vector2D/{Vector2DI.H => Vector2DTemplateI.H} (100%) diff --git a/src/foam/containers/Dictionaries/Dictionary/Dictionary.C b/src/foam/containers/Dictionaries/Dictionary/DictionaryTemplate.C similarity index 98% rename from src/foam/containers/Dictionaries/Dictionary/Dictionary.C rename to src/foam/containers/Dictionaries/Dictionary/DictionaryTemplate.C index 8b2eed9bb..d3b1b8a9a 100644 --- a/src/foam/containers/Dictionaries/Dictionary/Dictionary.C +++ b/src/foam/containers/Dictionaries/Dictionary/DictionaryTemplate.C @@ -25,7 +25,7 @@ Description \*---------------------------------------------------------------------------*/ -#include "Dictionary.H" +#include "DictionaryTemplate.H" // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // diff --git a/src/foam/containers/Dictionaries/Dictionary/Dictionary.H b/src/foam/containers/Dictionaries/Dictionary/DictionaryTemplate.H similarity index 95% rename from src/foam/containers/Dictionaries/Dictionary/Dictionary.H rename to src/foam/containers/Dictionaries/Dictionary/DictionaryTemplate.H index 768d36e63..0c561263f 100644 --- a/src/foam/containers/Dictionaries/Dictionary/Dictionary.H +++ b/src/foam/containers/Dictionaries/Dictionary/DictionaryTemplate.H @@ -32,12 +32,12 @@ Description of intrusive doubly-linked list of \. 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 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/foam/meshes/ProcessorTopology/ProcessorTopology.C b/src/foam/meshes/ProcessorTopology/ProcessorTopologyTemplate.C similarity index 99% rename from src/foam/meshes/ProcessorTopology/ProcessorTopology.C rename to src/foam/meshes/ProcessorTopology/ProcessorTopologyTemplate.C index 0c19b39c5..ee02af6b2 100644 --- a/src/foam/meshes/ProcessorTopology/ProcessorTopology.C +++ b/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" diff --git a/src/foam/meshes/ProcessorTopology/ProcessorTopology.H b/src/foam/meshes/ProcessorTopology/ProcessorTopologyTemplate.H similarity index 95% rename from src/foam/meshes/ProcessorTopology/ProcessorTopology.H rename to src/foam/meshes/ProcessorTopology/ProcessorTopologyTemplate.H index d86f75da0..6226fd2e3 100644 --- a/src/foam/meshes/ProcessorTopology/ProcessorTopology.H +++ b/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 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/foam/meshes/polyMesh/globalMeshData/processorTopology.H b/src/foam/meshes/polyMesh/globalMeshData/processorTopology.H index f82226801..54b2a1eeb 100644 --- a/src/foam/meshes/polyMesh/globalMeshData/processorTopology.H +++ b/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" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/foam/primitives/DiagTensor/DiagTensor.H b/src/foam/primitives/DiagTensor/DiagTensorTemplate.H similarity index 95% rename from src/foam/primitives/DiagTensor/DiagTensor.H rename to src/foam/primitives/DiagTensor/DiagTensorTemplate.H index d1106ed2a..0d9e80b76 100644 --- a/src/foam/primitives/DiagTensor/DiagTensor.H +++ b/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" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/foam/primitives/DiagTensor/DiagTensorI.H b/src/foam/primitives/DiagTensor/DiagTensorTemplateI.H similarity index 99% rename from src/foam/primitives/DiagTensor/DiagTensorI.H rename to src/foam/primitives/DiagTensor/DiagTensorTemplateI.H index 9aef3e232..fef373011 100644 --- a/src/foam/primitives/DiagTensor/DiagTensorI.H +++ b/src/foam/primitives/DiagTensor/DiagTensorTemplateI.H @@ -23,7 +23,7 @@ License \*---------------------------------------------------------------------------*/ -#include "SphericalTensor.H" +#include "SphericalTensorTemplate.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/foam/primitives/DiagTensor/diagTensor/diagTensor.H b/src/foam/primitives/DiagTensor/diagTensor/diagTensor.H index 5ad3c334e..d9767684f 100644 --- a/src/foam/primitives/DiagTensor/diagTensor/diagTensor.H +++ b/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" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/foam/primitives/DiagTensor/labelDiagTensor/labelDiagTensor.H b/src/foam/primitives/DiagTensor/labelDiagTensor/labelDiagTensor.H index ea683d249..ca7532ee7 100644 --- a/src/foam/primitives/DiagTensor/labelDiagTensor/labelDiagTensor.H +++ b/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" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/foam/primitives/Scalar/Scalar.C b/src/foam/primitives/Scalar/ScalarTemplate.C similarity index 100% rename from src/foam/primitives/Scalar/Scalar.C rename to src/foam/primitives/Scalar/ScalarTemplate.C diff --git a/src/foam/primitives/Scalar/Scalar.H b/src/foam/primitives/Scalar/ScalarTemplate.H similarity index 99% rename from src/foam/primitives/Scalar/Scalar.H rename to src/foam/primitives/Scalar/ScalarTemplate.H index 1186ab55f..3adf20267 100644 --- a/src/foam/primitives/Scalar/Scalar.H +++ b/src/foam/primitives/Scalar/ScalarTemplate.H @@ -28,7 +28,7 @@ Description Single floating point number SourceFiles - Scalar.C + ScalarTemplate.C \*---------------------------------------------------------------------------*/ diff --git a/src/foam/primitives/Scalar/doubleScalar/doubleScalar.C b/src/foam/primitives/Scalar/doubleScalar/doubleScalar.C index 08fe9c19e..1489c6671 100644 --- a/src/foam/primitives/Scalar/doubleScalar/doubleScalar.C +++ b/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 diff --git a/src/foam/primitives/Scalar/doubleScalar/doubleScalar.H b/src/foam/primitives/Scalar/doubleScalar/doubleScalar.H index d8aa34fc2..b2a9bcc65 100644 --- a/src/foam/primitives/Scalar/doubleScalar/doubleScalar.H +++ b/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) { diff --git a/src/foam/primitives/Scalar/floatScalar/floatScalar.C b/src/foam/primitives/Scalar/floatScalar/floatScalar.C index 71e7d7604..1b04b66b7 100644 --- a/src/foam/primitives/Scalar/floatScalar/floatScalar.C +++ b/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 diff --git a/src/foam/primitives/Scalar/floatScalar/floatScalar.H b/src/foam/primitives/Scalar/floatScalar/floatScalar.H index 7a9d76186..3037c519b 100644 --- a/src/foam/primitives/Scalar/floatScalar/floatScalar.H +++ b/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) { diff --git a/src/foam/primitives/Scalar/longDoubleScalar/longDoubleScalar.C b/src/foam/primitives/Scalar/longDoubleScalar/longDoubleScalar.C index f787567b4..07de59b57 100644 --- a/src/foam/primitives/Scalar/longDoubleScalar/longDoubleScalar.C +++ b/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 diff --git a/src/foam/primitives/Scalar/longDoubleScalar/longDoubleScalar.H b/src/foam/primitives/Scalar/longDoubleScalar/longDoubleScalar.H index f15a985e5..cfd6c32d0 100644 --- a/src/foam/primitives/Scalar/longDoubleScalar/longDoubleScalar.H +++ b/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) { diff --git a/src/foam/primitives/SphericalTensor/SphericalTensor.H b/src/foam/primitives/SphericalTensor/SphericalTensorTemplate.H similarity index 96% rename from src/foam/primitives/SphericalTensor/SphericalTensor.H rename to src/foam/primitives/SphericalTensor/SphericalTensorTemplate.H index 964061001..421760583 100644 --- a/src/foam/primitives/SphericalTensor/SphericalTensor.H +++ b/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" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/foam/primitives/SphericalTensor/SphericalTensorI.H b/src/foam/primitives/SphericalTensor/SphericalTensorTemplateI.H similarity index 99% rename from src/foam/primitives/SphericalTensor/SphericalTensorI.H rename to src/foam/primitives/SphericalTensor/SphericalTensorTemplateI.H index cde048a82..9cbbf0e6e 100644 --- a/src/foam/primitives/SphericalTensor/SphericalTensorI.H +++ b/src/foam/primitives/SphericalTensor/SphericalTensorTemplateI.H @@ -23,7 +23,7 @@ License \*---------------------------------------------------------------------------*/ -#include "Vector.H" +#include "VectorTemplate.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/foam/primitives/SphericalTensor/labelSphericalTensor/labelSphericalTensor.H b/src/foam/primitives/SphericalTensor/labelSphericalTensor/labelSphericalTensor.H index b04328162..8c69fbf88 100644 --- a/src/foam/primitives/SphericalTensor/labelSphericalTensor/labelSphericalTensor.H +++ b/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" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/foam/primitives/SphericalTensor/sphericalTensor/sphericalTensor.H b/src/foam/primitives/SphericalTensor/sphericalTensor/sphericalTensor.H index e926267e9..2605fe92b 100644 --- a/src/foam/primitives/SphericalTensor/sphericalTensor/sphericalTensor.H +++ b/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" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/foam/primitives/SphericalTensor2D/SphericalTensor2D.H b/src/foam/primitives/SphericalTensor2D/SphericalTensor2DTemplate.H similarity index 96% rename from src/foam/primitives/SphericalTensor2D/SphericalTensor2D.H rename to src/foam/primitives/SphericalTensor2D/SphericalTensor2DTemplate.H index 373746bf2..27a587cc1 100644 --- a/src/foam/primitives/SphericalTensor2D/SphericalTensor2D.H +++ b/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" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/foam/primitives/SphericalTensor2D/SphericalTensor2DI.H b/src/foam/primitives/SphericalTensor2D/SphericalTensor2DTemplateI.H similarity index 99% rename from src/foam/primitives/SphericalTensor2D/SphericalTensor2DI.H rename to src/foam/primitives/SphericalTensor2D/SphericalTensor2DTemplateI.H index c5892c335..eb712ef49 100644 --- a/src/foam/primitives/SphericalTensor2D/SphericalTensor2DI.H +++ b/src/foam/primitives/SphericalTensor2D/SphericalTensor2DTemplateI.H @@ -23,7 +23,7 @@ License \*---------------------------------------------------------------------------*/ -#include "Vector2D.H" +#include "Vector2DTemplate.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/foam/primitives/SphericalTensor2D/sphericalTensor2D/sphericalTensor2D.H b/src/foam/primitives/SphericalTensor2D/sphericalTensor2D/sphericalTensor2D.H index f793b8d79..f6bd679ce 100644 --- a/src/foam/primitives/SphericalTensor2D/sphericalTensor2D/sphericalTensor2D.H +++ b/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" diff --git a/src/foam/primitives/SymmTensor/SymmTensor.H b/src/foam/primitives/SymmTensor/SymmTensorTemplate.H similarity index 96% rename from src/foam/primitives/SymmTensor/SymmTensor.H rename to src/foam/primitives/SymmTensor/SymmTensorTemplate.H index d7fb34160..80e9b4ca2 100644 --- a/src/foam/primitives/SymmTensor/SymmTensor.H +++ b/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" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/foam/primitives/SymmTensor/SymmTensorI.H b/src/foam/primitives/SymmTensor/SymmTensorTemplateI.H similarity index 99% rename from src/foam/primitives/SymmTensor/SymmTensorI.H rename to src/foam/primitives/SymmTensor/SymmTensorTemplateI.H index 555c23933..0a425cf09 100644 --- a/src/foam/primitives/SymmTensor/SymmTensorI.H +++ b/src/foam/primitives/SymmTensor/SymmTensorTemplateI.H @@ -23,8 +23,8 @@ License \*---------------------------------------------------------------------------*/ -#include "Vector.H" -#include "Tensor.H" +#include "VectorTemplate.H" +#include "TensorTemplate.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/foam/primitives/SymmTensor/labelSymmTensor/labelSymmTensor.H b/src/foam/primitives/SymmTensor/labelSymmTensor/labelSymmTensor.H index b1d1a8e61..470bf906a 100644 --- a/src/foam/primitives/SymmTensor/labelSymmTensor/labelSymmTensor.H +++ b/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" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/foam/primitives/SymmTensor/symmTensor/symmTensor.H b/src/foam/primitives/SymmTensor/symmTensor/symmTensor.H index 2d296ad14..c5772032c 100644 --- a/src/foam/primitives/SymmTensor/symmTensor/symmTensor.H +++ b/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" diff --git a/src/foam/primitives/SymmTensor4thOrder/SymmTensor4thOrder.H b/src/foam/primitives/SymmTensor4thOrder/SymmTensor4thOrderTemplate.H similarity index 96% rename from src/foam/primitives/SymmTensor4thOrder/SymmTensor4thOrder.H rename to src/foam/primitives/SymmTensor4thOrder/SymmTensor4thOrderTemplate.H index da9466cf6..73e6799bd 100644 --- a/src/foam/primitives/SymmTensor4thOrder/SymmTensor4thOrder.H +++ b/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" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/foam/primitives/SymmTensor4thOrder/SymmTensor4thOrderI.H b/src/foam/primitives/SymmTensor4thOrder/SymmTensor4thOrderTemplateI.H similarity index 97% rename from src/foam/primitives/SymmTensor4thOrder/SymmTensor4thOrderI.H rename to src/foam/primitives/SymmTensor4thOrder/SymmTensor4thOrderTemplateI.H index dde280cf1..52cb14eb8 100644 --- a/src/foam/primitives/SymmTensor4thOrder/SymmTensor4thOrderI.H +++ b/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& st, const Vector& v) notImplemented ( "operator&(const SymmTensor4thOrder& st, const Vector& v)" - " not implemented in SymmTensor4thOrderI.H" + " not implemented in SymmTensor4thOrderTemplateI.H" ); return Vector @@ -266,7 +266,7 @@ operator&(const Vector& v, const SymmTensor4thOrder& st) notImplemented ( "operator&(const Vector& v, const SymmTensor4thOrder& st)" - " not implemented in SymmTensor4thOrderI.H" + " not implemented in SymmTensor4thOrderTemplateI.H" ); return Vector diff --git a/src/foam/primitives/SymmTensor4thOrder/labelSymmTensor4thOrder/labelSymmTensor4thOrder.H b/src/foam/primitives/SymmTensor4thOrder/labelSymmTensor4thOrder/labelSymmTensor4thOrder.H index 19fe9e661..f923a7a18 100644 --- a/src/foam/primitives/SymmTensor4thOrder/labelSymmTensor4thOrder/labelSymmTensor4thOrder.H +++ b/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" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/foam/primitives/SymmTensor4thOrder/symmTensor4thOrder/symmTensor4thOrder.H b/src/foam/primitives/SymmTensor4thOrder/symmTensor4thOrder/symmTensor4thOrder.H index 517c9e2fc..7247e64af 100644 --- a/src/foam/primitives/SymmTensor4thOrder/symmTensor4thOrder/symmTensor4thOrder.H +++ b/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" diff --git a/src/foam/primitives/Tensor/Tensor.H b/src/foam/primitives/Tensor/TensorTemplate.H similarity index 97% rename from src/foam/primitives/Tensor/Tensor.H rename to src/foam/primitives/Tensor/TensorTemplate.H index 9fea0b831..c2d90607a 100644 --- a/src/foam/primitives/Tensor/Tensor.H +++ b/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" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/foam/primitives/Tensor/TensorI.H b/src/foam/primitives/Tensor/TensorTemplateI.H similarity index 99% rename from src/foam/primitives/Tensor/TensorI.H rename to src/foam/primitives/Tensor/TensorTemplateI.H index 8dd3b0d13..4e7849f8e 100644 --- a/src/foam/primitives/Tensor/TensorI.H +++ b/src/foam/primitives/Tensor/TensorTemplateI.H @@ -23,7 +23,7 @@ License \*---------------------------------------------------------------------------*/ -#include "SymmTensor.H" +#include "SymmTensorTemplate.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/foam/primitives/Tensor/labelTensor/labelTensor.H b/src/foam/primitives/Tensor/labelTensor/labelTensor.H index ff31b3bd1..c0a2a786b 100644 --- a/src/foam/primitives/Tensor/labelTensor/labelTensor.H +++ b/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" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/foam/primitives/Tensor/tensor/tensor.H b/src/foam/primitives/Tensor/tensor/tensor.H index 6c6614dc3..6c9636606 100644 --- a/src/foam/primitives/Tensor/tensor/tensor.H +++ b/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" diff --git a/src/foam/primitives/Tensor2D/Tensor2D.H b/src/foam/primitives/Tensor2D/Tensor2DTemplate.H similarity index 96% rename from src/foam/primitives/Tensor2D/Tensor2D.H rename to src/foam/primitives/Tensor2D/Tensor2DTemplate.H index aab942646..e028d4de1 100644 --- a/src/foam/primitives/Tensor2D/Tensor2D.H +++ b/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" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/foam/primitives/Tensor2D/Tensor2DI.H b/src/foam/primitives/Tensor2D/Tensor2DTemplateI.H similarity index 100% rename from src/foam/primitives/Tensor2D/Tensor2DI.H rename to src/foam/primitives/Tensor2D/Tensor2DTemplateI.H diff --git a/src/foam/primitives/Tensor2D/tensor2D/tensor2D.H b/src/foam/primitives/Tensor2D/tensor2D/tensor2D.H index 6aaf80e80..654ab446f 100644 --- a/src/foam/primitives/Tensor2D/tensor2D/tensor2D.H +++ b/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" diff --git a/src/foam/primitives/Vector/Vector.H b/src/foam/primitives/Vector/VectorTemplate.H similarity index 97% rename from src/foam/primitives/Vector/Vector.H rename to src/foam/primitives/Vector/VectorTemplate.H index c84e51956..03556ce42 100644 --- a/src/foam/primitives/Vector/Vector.H +++ b/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" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/foam/primitives/Vector/VectorI.H b/src/foam/primitives/Vector/VectorTemplateI.H similarity index 100% rename from src/foam/primitives/Vector/VectorI.H rename to src/foam/primitives/Vector/VectorTemplateI.H diff --git a/src/foam/primitives/Vector/labelVector/labelVector.H b/src/foam/primitives/Vector/labelVector/labelVector.H index d1fb2b739..3f43499bb 100644 --- a/src/foam/primitives/Vector/labelVector/labelVector.H +++ b/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" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/foam/primitives/Vector/vector/vector.H b/src/foam/primitives/Vector/vector/vector.H index de4e1254b..ac5849954 100644 --- a/src/foam/primitives/Vector/vector/vector.H +++ b/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" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/foam/primitives/Vector2D/Vector2D.H b/src/foam/primitives/Vector2D/Vector2DTemplate.H similarity index 97% rename from src/foam/primitives/Vector2D/Vector2D.H rename to src/foam/primitives/Vector2D/Vector2DTemplate.H index b5e2eb6a4..8695331a9 100644 --- a/src/foam/primitives/Vector2D/Vector2D.H +++ b/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" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/foam/primitives/Vector2D/Vector2DI.H b/src/foam/primitives/Vector2D/Vector2DTemplateI.H similarity index 100% rename from src/foam/primitives/Vector2D/Vector2DI.H rename to src/foam/primitives/Vector2D/Vector2DTemplateI.H diff --git a/src/foam/primitives/Vector2D/vector2D/vector2D.H b/src/foam/primitives/Vector2D/vector2D/vector2D.H index 1d79f14dd..10fd38aea 100644 --- a/src/foam/primitives/Vector2D/vector2D/vector2D.H +++ b/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" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/foam/primitives/expandContract/expandTensor.H b/src/foam/primitives/expandContract/expandTensor.H index e2420c7c6..525643f88 100644 --- a/src/foam/primitives/expandContract/expandTensor.H +++ b/src/foam/primitives/expandContract/expandTensor.H @@ -33,7 +33,7 @@ Author #ifndef expandTensor_H #define expandTensor_H -#include "Tensor.H" +#include "TensorTemplate.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //