Added labelSphericalTensor to handle labelI correctly.

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

src/OpenFOAM/primitives/labelSphericalTensor/labelSphericalTensor.C

+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  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
+
+// ************************************************************************* //

src/OpenFOAM/primitives/labelSphericalTensor/labelSphericalTensor.H

+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  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
+
+// ************************************************************************* //

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

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

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.

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.