diff --git a/src/OpenFOAM/Make/files b/src/OpenFOAM/Make/files
index 3a49df4e218d64d926bb8f3554a994e13e3007fb..c9be7642ba5b3d6dbcd6e20226138f256cd8fabc 100644
--- a/src/OpenFOAM/Make/files
+++ b/src/OpenFOAM/Make/files
@@ -18,14 +18,15 @@ primitives/Scalar/scalar/scalar.C
primitives/labelVector/labelVector.C
primitives/vector/vector.C
primitives/vector2D/vector2D.C
-primitives/labelTensor/labelTensor.C
primitives/sphericalTensor/sphericalTensor.C
primitives/sphericalTensor2D/sphericalTensor2D.C
primitives/diagTensor/diagTensor.C
primitives/symmTensor/symmTensor.C
-primitives/labelSymmTensor/labelSymmTensor.C
primitives/tensor/tensor.C
primitives/tensor2D/tensor2D.C
+primitives/labelSphericalTensor/labelSphericalTensor.C
+primitives/labelSymmTensor/labelSymmTensor.C
+primitives/labelTensor/labelTensor.C
primitives/complex/complex.C
primitives/complexVector/complexVector.C
primitives/quaternion/quaternion.C
diff --git a/src/OpenFOAM/primitives/labelSphericalTensor/labelSphericalTensor.C b/src/OpenFOAM/primitives/labelSphericalTensor/labelSphericalTensor.C
new file mode 100644
index 0000000000000000000000000000000000000000..6b650cec64d19b1254b7a1c5d1dc44f7852a1699
--- /dev/null
+++ b/src/OpenFOAM/primitives/labelSphericalTensor/labelSphericalTensor.C
@@ -0,0 +1,56 @@
+/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
+ \\ / O peration |
+ \\ / A nd | Copyright (C) 1991-2007 OpenCFD Ltd.
+ \\/ M anipulation |
+-------------------------------------------------------------------------------
+License
+ This file is part of OpenFOAM.
+
+ OpenFOAM is free software; you can redistribute it and/or modify it
+ under the terms of the GNU General Public License as published by the
+ Free Software Foundation; either version 2 of the License, or (at your
+ option) any later version.
+
+ OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with OpenFOAM; if not, write to the Free Software Foundation,
+ Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "labelSphericalTensor.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+template<>
+const char* const labelSphericalTensor::typeName = "labelSphericalTensor";
+
+template<>
+const char* labelSphericalTensor::componentNames[] = {"ii"};
+
+template<>
+const labelSphericalTensor labelSphericalTensor::zero(0);
+
+template<>
+const labelSphericalTensor labelSphericalTensor::one(1);
+
+template<>
+const labelSphericalTensor labelSphericalTensor::I(1);
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/labelSphericalTensor/labelSphericalTensor.H b/src/OpenFOAM/primitives/labelSphericalTensor/labelSphericalTensor.H
new file mode 100644
index 0000000000000000000000000000000000000000..81d05a3c1f9bd768667be42156d6a8f7db9fc27c
--- /dev/null
+++ b/src/OpenFOAM/primitives/labelSphericalTensor/labelSphericalTensor.H
@@ -0,0 +1,67 @@
+/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
+ \\ / O peration |
+ \\ / A nd | Copyright (C) 1991-2007 OpenCFD Ltd.
+ \\/ M anipulation |
+-------------------------------------------------------------------------------
+License
+ This file is part of OpenFOAM.
+
+ OpenFOAM is free software; you can redistribute it and/or modify it
+ under the terms of the GNU General Public License as published by the
+ Free Software Foundation; either version 2 of the License, or (at your
+ option) any later version.
+
+ OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with OpenFOAM; if not, write to the Free Software Foundation,
+ Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Type
+ Foam::labelSphericalTensor
+
+Description
+ SphericalTensor of labels.
+
+SourceFiles
+ labelSphericalTensor.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef labelSphericalTensor_H
+#define labelSphericalTensor_H
+
+#include "SphericalTensor.H"
+#include "contiguous.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+typedef SphericalTensor<label> labelSphericalTensor;
+
+// Identity labelTensor
+static const labelSphericalTensor I(1);
+
+//- Specify data associated with labelSphericalTensor type is contiguous
+template<>
+inline bool contiguous<labelSphericalTensor>() {return true;}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/labelSymmTensor/labelSymmTensor.H b/src/OpenFOAM/primitives/labelSymmTensor/labelSymmTensor.H
index 68d5e49c0524200bdc235a103b51568a9f21f4d5..f4a437335c7786b67bf6bc898d9ff766e00d687b 100644
--- a/src/OpenFOAM/primitives/labelSymmTensor/labelSymmTensor.H
+++ b/src/OpenFOAM/primitives/labelSymmTensor/labelSymmTensor.H
@@ -23,7 +23,7 @@ License
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Type
- labelSymmTensor
+ Foam::labelSymmTensor
Description
SymmTensor or labels.
@@ -48,14 +48,6 @@ namespace Foam
typedef SymmTensor<label> labelSymmTensor;
-// Identity labelSymmTensor
-static const labelSymmTensor labelI
-(
- 1, 0, 0,
- 1, 0,
- 1
-);
-
//- Specify data associated with labelSymmTensor type is contiguous
template<>
inline bool contiguous<labelSymmTensor>() {return true;}
diff --git a/src/OpenFOAM/primitives/labelTensor/labelTensor.H b/src/OpenFOAM/primitives/labelTensor/labelTensor.H
index e9695bb8a1f60209518b287a7b714491ff105858..dd20fde6d1feb8a79d6c7ff3e1f02a837306a62a 100644
--- a/src/OpenFOAM/primitives/labelTensor/labelTensor.H
+++ b/src/OpenFOAM/primitives/labelTensor/labelTensor.H
@@ -23,7 +23,7 @@ License
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Type
- labelTensor
+ Foam::labelTensor
Description
3D labelTensor obtained from generic Tensor
@@ -48,15 +48,6 @@ namespace Foam
typedef Tensor<label> labelTensor;
-// Identity labelTensor
-static const labelTensor labelI
-(
- 1, 0, 0,
- 0, 1, 0,
- 0, 0, 1
-);
-
-
//- Specify data associated with labelTensor type is contiguous
template<>
inline bool contiguous<labelTensor>() {return true;}
diff --git a/src/OpenFOAM/primitives/sphericalTensor/sphericalTensor.H b/src/OpenFOAM/primitives/sphericalTensor/sphericalTensor.H
index de2b852413e8d165873436c9a763c00be92df1ab..81c453ff92475ea72b6782f696b9a8c981e51c1d 100644
--- a/src/OpenFOAM/primitives/sphericalTensor/sphericalTensor.H
+++ b/src/OpenFOAM/primitives/sphericalTensor/sphericalTensor.H
@@ -23,7 +23,7 @@ License
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Type
- sphericalTensor
+ Foam::sphericalTensor
Description
SphericalTensor of scalars.
diff --git a/src/OpenFOAM/primitives/tensor/tensor.H b/src/OpenFOAM/primitives/tensor/tensor.H
index 7b83722d877c0773455027391c7a36a2ce86c689..691afc8225359b855122d438ed936ca9f6fafbdc 100644
--- a/src/OpenFOAM/primitives/tensor/tensor.H
+++ b/src/OpenFOAM/primitives/tensor/tensor.H
@@ -23,7 +23,7 @@ License
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Type
- tensor
+ Foam::tensor
Description
Tensor or scalars.