From f83e4cbd98fb7301fc926bc5112adcbac0f53c99 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@Germany>
Date: Fri, 27 Feb 2009 17:46:43 +0100
Subject: [PATCH] reorganized locations of some primitives
---
src/OpenFOAM/Make/files | 55 +++++++++++--------
.../{ => DiagTensor}/diagTensor/diagTensor.C | 0
.../{ => DiagTensor}/diagTensor/diagTensor.H | 0
.../labelSphericalTensor.C | 0
.../labelSphericalTensor.H | 0
.../sphericalTensor/sphericalTensor.C | 0
.../sphericalTensor/sphericalTensor.H | 0
.../sphericalTensor2D/sphericalTensor2D.C | 0
.../sphericalTensor2D/sphericalTensor2D.H | 0
.../labelSymmTensor/labelSymmTensor.C | 0
.../labelSymmTensor/labelSymmTensor.H | 2 +-
.../{ => SymmTensor}/symmTensor/symmTensor.C | 0
.../{ => SymmTensor}/symmTensor/symmTensor.H | 2 +-
.../{ => Tensor}/labelTensor/labelTensor.C | 0
.../{ => Tensor}/labelTensor/labelTensor.H | 0
.../primitives/{ => Tensor}/tensor/tensor.C | 0
.../primitives/{ => Tensor}/tensor/tensor.H | 2 +-
.../{ => Tensor2D}/tensor2D/tensor2D.C | 0
.../{ => Tensor2D}/tensor2D/tensor2D.H | 0
.../complexVector/complexVector.C | 0
.../complexVector/complexVector.H | 0
.../complexVector/complexVectorI.H | 0
.../{ => Vector}/labelVector/labelVector.C | 4 --
.../{ => Vector}/labelVector/labelVector.H | 2 +-
.../primitives/{ => Vector}/vector/vector.C | 0
.../primitives/{ => Vector}/vector/vector.H | 0
.../{ => Vector2D}/vector2D/vector2D.C | 0
.../{ => Vector2D}/vector2D/vector2D.H | 0
src/OpenFOAM/primitives/{ => ints}/int/int.H | 0
.../primitives/{ => ints}/int/intIO.C | 0
.../primitives/{ => ints}/label/label.C | 0
.../primitives/{ => ints}/label/label.H | 3 +-
.../primitives/{ => ints}/long/long.H | 2 +-
.../primitives/{ => ints}/long/longIO.C | 0
.../primitives/{ => ints}/longLong/longLong.H | 2 +-
.../{ => ints}/longLong/longLongIO.C | 0
.../primitives/{ => ints}/uLabel/uLabel.C | 0
.../primitives/{ => ints}/uLabel/uLabel.H | 5 +-
.../primitives/{ => ints}/uint/uint.H | 0
.../primitives/{ => ints}/uint/uintIO.C | 0
.../primitives/{ => ints}/ulong/ulong.H | 2 +-
.../primitives/{ => ints}/ulong/ulongIO.C | 5 +-
42 files changed, 45 insertions(+), 41 deletions(-)
rename src/OpenFOAM/primitives/{ => DiagTensor}/diagTensor/diagTensor.C (100%)
rename src/OpenFOAM/primitives/{ => DiagTensor}/diagTensor/diagTensor.H (100%)
rename src/OpenFOAM/primitives/{ => SphericalTensor}/labelSphericalTensor/labelSphericalTensor.C (100%)
rename src/OpenFOAM/primitives/{ => SphericalTensor}/labelSphericalTensor/labelSphericalTensor.H (100%)
rename src/OpenFOAM/primitives/{ => SphericalTensor}/sphericalTensor/sphericalTensor.C (100%)
rename src/OpenFOAM/primitives/{ => SphericalTensor}/sphericalTensor/sphericalTensor.H (100%)
rename src/OpenFOAM/primitives/{ => SphericalTensor2D}/sphericalTensor2D/sphericalTensor2D.C (100%)
rename src/OpenFOAM/primitives/{ => SphericalTensor2D}/sphericalTensor2D/sphericalTensor2D.H (100%)
rename src/OpenFOAM/primitives/{ => SymmTensor}/labelSymmTensor/labelSymmTensor.C (100%)
rename src/OpenFOAM/primitives/{ => SymmTensor}/labelSymmTensor/labelSymmTensor.H (98%)
rename src/OpenFOAM/primitives/{ => SymmTensor}/symmTensor/symmTensor.C (100%)
rename src/OpenFOAM/primitives/{ => SymmTensor}/symmTensor/symmTensor.H (98%)
rename src/OpenFOAM/primitives/{ => Tensor}/labelTensor/labelTensor.C (100%)
rename src/OpenFOAM/primitives/{ => Tensor}/labelTensor/labelTensor.H (100%)
rename src/OpenFOAM/primitives/{ => Tensor}/tensor/tensor.C (100%)
rename src/OpenFOAM/primitives/{ => Tensor}/tensor/tensor.H (99%)
rename src/OpenFOAM/primitives/{ => Tensor2D}/tensor2D/tensor2D.C (100%)
rename src/OpenFOAM/primitives/{ => Tensor2D}/tensor2D/tensor2D.H (100%)
rename src/OpenFOAM/primitives/{ => Vector}/complexVector/complexVector.C (100%)
rename src/OpenFOAM/primitives/{ => Vector}/complexVector/complexVector.H (100%)
rename src/OpenFOAM/primitives/{ => Vector}/complexVector/complexVectorI.H (100%)
rename src/OpenFOAM/primitives/{ => Vector}/labelVector/labelVector.C (97%)
rename src/OpenFOAM/primitives/{ => Vector}/labelVector/labelVector.H (97%)
rename src/OpenFOAM/primitives/{ => Vector}/vector/vector.C (100%)
rename src/OpenFOAM/primitives/{ => Vector}/vector/vector.H (100%)
rename src/OpenFOAM/primitives/{ => Vector2D}/vector2D/vector2D.C (100%)
rename src/OpenFOAM/primitives/{ => Vector2D}/vector2D/vector2D.H (100%)
rename src/OpenFOAM/primitives/{ => ints}/int/int.H (100%)
rename src/OpenFOAM/primitives/{ => ints}/int/intIO.C (100%)
rename src/OpenFOAM/primitives/{ => ints}/label/label.C (100%)
rename src/OpenFOAM/primitives/{ => ints}/label/label.H (98%)
rename src/OpenFOAM/primitives/{ => ints}/long/long.H (99%)
rename src/OpenFOAM/primitives/{ => ints}/long/longIO.C (100%)
rename src/OpenFOAM/primitives/{ => ints}/longLong/longLong.H (98%)
rename src/OpenFOAM/primitives/{ => ints}/longLong/longLongIO.C (100%)
rename src/OpenFOAM/primitives/{ => ints}/uLabel/uLabel.C (100%)
rename src/OpenFOAM/primitives/{ => ints}/uLabel/uLabel.H (98%)
rename src/OpenFOAM/primitives/{ => ints}/uint/uint.H (100%)
rename src/OpenFOAM/primitives/{ => ints}/uint/uintIO.C (100%)
rename src/OpenFOAM/primitives/{ => ints}/ulong/ulong.H (98%)
rename src/OpenFOAM/primitives/{ => ints}/ulong/ulongIO.C (93%)
diff --git a/src/OpenFOAM/Make/files b/src/OpenFOAM/Make/files
index 833be5ccd56..1b2c6a568f5 100644
--- a/src/OpenFOAM/Make/files
+++ b/src/OpenFOAM/Make/files
@@ -3,35 +3,42 @@ global/dimensionedConstants/dimensionedConstants.C
global/argList/argList.C
global/clock/clock.C
-primitives/bools/bool/bool.C
-primitives/bools/bool/boolIO.C
-primitives/bools/Switch/Switch.C
-primitives/bools/Switch/SwitchIO.C
+bools = primitives/bools
+$(bools)/bool/bool.C
+$(bools)/bool/boolIO.C
+$(bools)/Switch/Switch.C
+$(bools)/Switch/SwitchIO.C
+
primitives/char/charIO.C
-primitives/int/intIO.C
-primitives/uint/uintIO.C
-primitives/long/longIO.C
-primitives/longLong/longLongIO.C
-primitives/ulong/ulongIO.C
-primitives/label/label.C
-primitives/uLabel/uLabel.C
+
+ints = primitives/ints
+$(ints)/int/intIO.C
+$(ints)/uint/uintIO.C
+$(ints)/long/longIO.C
+$(ints)/longLong/longLongIO.C
+$(ints)/ulong/ulongIO.C
+$(ints)/label/label.C
+$(ints)/uLabel/uLabel.C
+
primitives/Scalar/doubleScalar/doubleScalar.C
primitives/Scalar/floatScalar/floatScalar.C
primitives/Scalar/scalar/scalar.C
-primitives/labelVector/labelVector.C
-primitives/vector/vector.C
-primitives/vector2D/vector2D.C
-primitives/sphericalTensor/sphericalTensor.C
-primitives/sphericalTensor2D/sphericalTensor2D.C
-primitives/diagTensor/diagTensor.C
-primitives/symmTensor/symmTensor.C
-primitives/tensor/tensor.C
-primitives/tensor2D/tensor2D.C
-primitives/labelSphericalTensor/labelSphericalTensor.C
-primitives/labelSymmTensor/labelSymmTensor.C
-primitives/labelTensor/labelTensor.C
+primitives/DiagTensor/diagTensor/diagTensor.C
+primitives/SphericalTensor/sphericalTensor/sphericalTensor.C
+primitives/SphericalTensor/labelSphericalTensor/labelSphericalTensor.C
+primitives/SymmTensor/labelSymmTensor/labelSymmTensor.C
+primitives/SymmTensor/symmTensor/symmTensor.C
+primitives/Tensor/labelTensor/labelTensor.C
+primitives/Tensor/tensor/tensor.C
+primitives/Vector/complexVector/complexVector.C
+primitives/Vector/labelVector/labelVector.C
+primitives/Vector/vector/vector.C
+
+primitives/Tensor2D/tensor2D/tensor2D.C
+primitives/SphericalTensor2D/sphericalTensor2D/sphericalTensor2D.C
+primitives/Vector2D/vector2D/vector2D.C
+
primitives/complex/complex.C
-primitives/complexVector/complexVector.C
primitives/quaternion/quaternion.C
primitives/septernion/septernion.C
diff --git a/src/OpenFOAM/primitives/diagTensor/diagTensor.C b/src/OpenFOAM/primitives/DiagTensor/diagTensor/diagTensor.C
similarity index 100%
rename from src/OpenFOAM/primitives/diagTensor/diagTensor.C
rename to src/OpenFOAM/primitives/DiagTensor/diagTensor/diagTensor.C
diff --git a/src/OpenFOAM/primitives/diagTensor/diagTensor.H b/src/OpenFOAM/primitives/DiagTensor/diagTensor/diagTensor.H
similarity index 100%
rename from src/OpenFOAM/primitives/diagTensor/diagTensor.H
rename to src/OpenFOAM/primitives/DiagTensor/diagTensor/diagTensor.H
diff --git a/src/OpenFOAM/primitives/labelSphericalTensor/labelSphericalTensor.C b/src/OpenFOAM/primitives/SphericalTensor/labelSphericalTensor/labelSphericalTensor.C
similarity index 100%
rename from src/OpenFOAM/primitives/labelSphericalTensor/labelSphericalTensor.C
rename to src/OpenFOAM/primitives/SphericalTensor/labelSphericalTensor/labelSphericalTensor.C
diff --git a/src/OpenFOAM/primitives/labelSphericalTensor/labelSphericalTensor.H b/src/OpenFOAM/primitives/SphericalTensor/labelSphericalTensor/labelSphericalTensor.H
similarity index 100%
rename from src/OpenFOAM/primitives/labelSphericalTensor/labelSphericalTensor.H
rename to src/OpenFOAM/primitives/SphericalTensor/labelSphericalTensor/labelSphericalTensor.H
diff --git a/src/OpenFOAM/primitives/sphericalTensor/sphericalTensor.C b/src/OpenFOAM/primitives/SphericalTensor/sphericalTensor/sphericalTensor.C
similarity index 100%
rename from src/OpenFOAM/primitives/sphericalTensor/sphericalTensor.C
rename to src/OpenFOAM/primitives/SphericalTensor/sphericalTensor/sphericalTensor.C
diff --git a/src/OpenFOAM/primitives/sphericalTensor/sphericalTensor.H b/src/OpenFOAM/primitives/SphericalTensor/sphericalTensor/sphericalTensor.H
similarity index 100%
rename from src/OpenFOAM/primitives/sphericalTensor/sphericalTensor.H
rename to src/OpenFOAM/primitives/SphericalTensor/sphericalTensor/sphericalTensor.H
diff --git a/src/OpenFOAM/primitives/sphericalTensor2D/sphericalTensor2D.C b/src/OpenFOAM/primitives/SphericalTensor2D/sphericalTensor2D/sphericalTensor2D.C
similarity index 100%
rename from src/OpenFOAM/primitives/sphericalTensor2D/sphericalTensor2D.C
rename to src/OpenFOAM/primitives/SphericalTensor2D/sphericalTensor2D/sphericalTensor2D.C
diff --git a/src/OpenFOAM/primitives/sphericalTensor2D/sphericalTensor2D.H b/src/OpenFOAM/primitives/SphericalTensor2D/sphericalTensor2D/sphericalTensor2D.H
similarity index 100%
rename from src/OpenFOAM/primitives/sphericalTensor2D/sphericalTensor2D.H
rename to src/OpenFOAM/primitives/SphericalTensor2D/sphericalTensor2D/sphericalTensor2D.H
diff --git a/src/OpenFOAM/primitives/labelSymmTensor/labelSymmTensor.C b/src/OpenFOAM/primitives/SymmTensor/labelSymmTensor/labelSymmTensor.C
similarity index 100%
rename from src/OpenFOAM/primitives/labelSymmTensor/labelSymmTensor.C
rename to src/OpenFOAM/primitives/SymmTensor/labelSymmTensor/labelSymmTensor.C
diff --git a/src/OpenFOAM/primitives/labelSymmTensor/labelSymmTensor.H b/src/OpenFOAM/primitives/SymmTensor/labelSymmTensor/labelSymmTensor.H
similarity index 98%
rename from src/OpenFOAM/primitives/labelSymmTensor/labelSymmTensor.H
rename to src/OpenFOAM/primitives/SymmTensor/labelSymmTensor/labelSymmTensor.H
index 771c7b16bd8..c79704484cd 100644
--- a/src/OpenFOAM/primitives/labelSymmTensor/labelSymmTensor.H
+++ b/src/OpenFOAM/primitives/SymmTensor/labelSymmTensor/labelSymmTensor.H
@@ -26,7 +26,7 @@ Typedef
Foam::labelSymmTensor
Description
- SymmTensor or labels.
+ SymmTensor of labels.
SourceFiles
labelSymmTensor.C
diff --git a/src/OpenFOAM/primitives/symmTensor/symmTensor.C b/src/OpenFOAM/primitives/SymmTensor/symmTensor/symmTensor.C
similarity index 100%
rename from src/OpenFOAM/primitives/symmTensor/symmTensor.C
rename to src/OpenFOAM/primitives/SymmTensor/symmTensor/symmTensor.C
diff --git a/src/OpenFOAM/primitives/symmTensor/symmTensor.H b/src/OpenFOAM/primitives/SymmTensor/symmTensor/symmTensor.H
similarity index 98%
rename from src/OpenFOAM/primitives/symmTensor/symmTensor.H
rename to src/OpenFOAM/primitives/SymmTensor/symmTensor/symmTensor.H
index eb5f02ec847..815c0105473 100644
--- a/src/OpenFOAM/primitives/symmTensor/symmTensor.H
+++ b/src/OpenFOAM/primitives/SymmTensor/symmTensor/symmTensor.H
@@ -26,7 +26,7 @@ Typedef
Foam::symmTensor
Description
- SymmTensor or scalars.
+ SymmTensor of scalars.
SourceFiles
symmTensor.C
diff --git a/src/OpenFOAM/primitives/labelTensor/labelTensor.C b/src/OpenFOAM/primitives/Tensor/labelTensor/labelTensor.C
similarity index 100%
rename from src/OpenFOAM/primitives/labelTensor/labelTensor.C
rename to src/OpenFOAM/primitives/Tensor/labelTensor/labelTensor.C
diff --git a/src/OpenFOAM/primitives/labelTensor/labelTensor.H b/src/OpenFOAM/primitives/Tensor/labelTensor/labelTensor.H
similarity index 100%
rename from src/OpenFOAM/primitives/labelTensor/labelTensor.H
rename to src/OpenFOAM/primitives/Tensor/labelTensor/labelTensor.H
diff --git a/src/OpenFOAM/primitives/tensor/tensor.C b/src/OpenFOAM/primitives/Tensor/tensor/tensor.C
similarity index 100%
rename from src/OpenFOAM/primitives/tensor/tensor.C
rename to src/OpenFOAM/primitives/Tensor/tensor/tensor.C
diff --git a/src/OpenFOAM/primitives/tensor/tensor.H b/src/OpenFOAM/primitives/Tensor/tensor/tensor.H
similarity index 99%
rename from src/OpenFOAM/primitives/tensor/tensor.H
rename to src/OpenFOAM/primitives/Tensor/tensor/tensor.H
index 42223abf6ac..297b8b47b9f 100644
--- a/src/OpenFOAM/primitives/tensor/tensor.H
+++ b/src/OpenFOAM/primitives/Tensor/tensor/tensor.H
@@ -26,7 +26,7 @@ Typedef
Foam::tensor
Description
- Tensor or scalars.
+ Tensor of scalars.
SourceFiles
tensor.C
diff --git a/src/OpenFOAM/primitives/tensor2D/tensor2D.C b/src/OpenFOAM/primitives/Tensor2D/tensor2D/tensor2D.C
similarity index 100%
rename from src/OpenFOAM/primitives/tensor2D/tensor2D.C
rename to src/OpenFOAM/primitives/Tensor2D/tensor2D/tensor2D.C
diff --git a/src/OpenFOAM/primitives/tensor2D/tensor2D.H b/src/OpenFOAM/primitives/Tensor2D/tensor2D/tensor2D.H
similarity index 100%
rename from src/OpenFOAM/primitives/tensor2D/tensor2D.H
rename to src/OpenFOAM/primitives/Tensor2D/tensor2D/tensor2D.H
diff --git a/src/OpenFOAM/primitives/complexVector/complexVector.C b/src/OpenFOAM/primitives/Vector/complexVector/complexVector.C
similarity index 100%
rename from src/OpenFOAM/primitives/complexVector/complexVector.C
rename to src/OpenFOAM/primitives/Vector/complexVector/complexVector.C
diff --git a/src/OpenFOAM/primitives/complexVector/complexVector.H b/src/OpenFOAM/primitives/Vector/complexVector/complexVector.H
similarity index 100%
rename from src/OpenFOAM/primitives/complexVector/complexVector.H
rename to src/OpenFOAM/primitives/Vector/complexVector/complexVector.H
diff --git a/src/OpenFOAM/primitives/complexVector/complexVectorI.H b/src/OpenFOAM/primitives/Vector/complexVector/complexVectorI.H
similarity index 100%
rename from src/OpenFOAM/primitives/complexVector/complexVectorI.H
rename to src/OpenFOAM/primitives/Vector/complexVector/complexVectorI.H
diff --git a/src/OpenFOAM/primitives/labelVector/labelVector.C b/src/OpenFOAM/primitives/Vector/labelVector/labelVector.C
similarity index 97%
rename from src/OpenFOAM/primitives/labelVector/labelVector.C
rename to src/OpenFOAM/primitives/Vector/labelVector/labelVector.C
index 4849dc4f3d7..d5fcdf8fe19 100644
--- a/src/OpenFOAM/primitives/labelVector/labelVector.C
+++ b/src/OpenFOAM/primitives/Vector/labelVector/labelVector.C
@@ -22,14 +22,10 @@ License
along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-Description
- Vector of labels.
-
\*---------------------------------------------------------------------------*/
#include "labelVector.H"
-
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
template<>
diff --git a/src/OpenFOAM/primitives/labelVector/labelVector.H b/src/OpenFOAM/primitives/Vector/labelVector/labelVector.H
similarity index 97%
rename from src/OpenFOAM/primitives/labelVector/labelVector.H
rename to src/OpenFOAM/primitives/Vector/labelVector/labelVector.H
index d8a7c7c0d5a..2cbbebad790 100644
--- a/src/OpenFOAM/primitives/labelVector/labelVector.H
+++ b/src/OpenFOAM/primitives/Vector/labelVector/labelVector.H
@@ -26,7 +26,7 @@ Typedef
Foam::labelVector
Description
- labelVector obtained from generic Vector
+ Vector of labels.
SourceFiles
labelVector.C
diff --git a/src/OpenFOAM/primitives/vector/vector.C b/src/OpenFOAM/primitives/Vector/vector/vector.C
similarity index 100%
rename from src/OpenFOAM/primitives/vector/vector.C
rename to src/OpenFOAM/primitives/Vector/vector/vector.C
diff --git a/src/OpenFOAM/primitives/vector/vector.H b/src/OpenFOAM/primitives/Vector/vector/vector.H
similarity index 100%
rename from src/OpenFOAM/primitives/vector/vector.H
rename to src/OpenFOAM/primitives/Vector/vector/vector.H
diff --git a/src/OpenFOAM/primitives/vector2D/vector2D.C b/src/OpenFOAM/primitives/Vector2D/vector2D/vector2D.C
similarity index 100%
rename from src/OpenFOAM/primitives/vector2D/vector2D.C
rename to src/OpenFOAM/primitives/Vector2D/vector2D/vector2D.C
diff --git a/src/OpenFOAM/primitives/vector2D/vector2D.H b/src/OpenFOAM/primitives/Vector2D/vector2D/vector2D.H
similarity index 100%
rename from src/OpenFOAM/primitives/vector2D/vector2D.H
rename to src/OpenFOAM/primitives/Vector2D/vector2D/vector2D.H
diff --git a/src/OpenFOAM/primitives/int/int.H b/src/OpenFOAM/primitives/ints/int/int.H
similarity index 100%
rename from src/OpenFOAM/primitives/int/int.H
rename to src/OpenFOAM/primitives/ints/int/int.H
diff --git a/src/OpenFOAM/primitives/int/intIO.C b/src/OpenFOAM/primitives/ints/int/intIO.C
similarity index 100%
rename from src/OpenFOAM/primitives/int/intIO.C
rename to src/OpenFOAM/primitives/ints/int/intIO.C
diff --git a/src/OpenFOAM/primitives/label/label.C b/src/OpenFOAM/primitives/ints/label/label.C
similarity index 100%
rename from src/OpenFOAM/primitives/label/label.C
rename to src/OpenFOAM/primitives/ints/label/label.C
diff --git a/src/OpenFOAM/primitives/label/label.H b/src/OpenFOAM/primitives/ints/label/label.H
similarity index 98%
rename from src/OpenFOAM/primitives/label/label.H
rename to src/OpenFOAM/primitives/ints/label/label.H
index d1697a55386..a98b27b4fb5 100644
--- a/src/OpenFOAM/primitives/label/label.H
+++ b/src/OpenFOAM/primitives/ints/label/label.H
@@ -26,7 +26,8 @@ Typedef
Foam::label
Description
- A label is an int/long/long long depending on the range wanted.
+ A label is an int/long/long long depending on the range desired.
+
A readLabel function is defined so that label can be constructed from
Istream.
diff --git a/src/OpenFOAM/primitives/long/long.H b/src/OpenFOAM/primitives/ints/long/long.H
similarity index 99%
rename from src/OpenFOAM/primitives/long/long.H
rename to src/OpenFOAM/primitives/ints/long/long.H
index fbcbfc93f65..c2f12c50592 100644
--- a/src/OpenFOAM/primitives/long/long.H
+++ b/src/OpenFOAM/primitives/ints/long/long.H
@@ -26,7 +26,7 @@ Primitive
long
Description
- A long int
+ A long integer
SourceFiles
longIO.C
diff --git a/src/OpenFOAM/primitives/long/longIO.C b/src/OpenFOAM/primitives/ints/long/longIO.C
similarity index 100%
rename from src/OpenFOAM/primitives/long/longIO.C
rename to src/OpenFOAM/primitives/ints/long/longIO.C
diff --git a/src/OpenFOAM/primitives/longLong/longLong.H b/src/OpenFOAM/primitives/ints/longLong/longLong.H
similarity index 98%
rename from src/OpenFOAM/primitives/longLong/longLong.H
rename to src/OpenFOAM/primitives/ints/longLong/longLong.H
index 3466bfc863c..f9fc6999d0d 100644
--- a/src/OpenFOAM/primitives/longLong/longLong.H
+++ b/src/OpenFOAM/primitives/ints/longLong/longLong.H
@@ -26,7 +26,7 @@ Primitive
long long
Description
- A long long (64 bits)
+ A long long (64 bits on many systems)
SourceFiles
longLongIO.C
diff --git a/src/OpenFOAM/primitives/longLong/longLongIO.C b/src/OpenFOAM/primitives/ints/longLong/longLongIO.C
similarity index 100%
rename from src/OpenFOAM/primitives/longLong/longLongIO.C
rename to src/OpenFOAM/primitives/ints/longLong/longLongIO.C
diff --git a/src/OpenFOAM/primitives/uLabel/uLabel.C b/src/OpenFOAM/primitives/ints/uLabel/uLabel.C
similarity index 100%
rename from src/OpenFOAM/primitives/uLabel/uLabel.C
rename to src/OpenFOAM/primitives/ints/uLabel/uLabel.C
diff --git a/src/OpenFOAM/primitives/uLabel/uLabel.H b/src/OpenFOAM/primitives/ints/uLabel/uLabel.H
similarity index 98%
rename from src/OpenFOAM/primitives/uLabel/uLabel.H
rename to src/OpenFOAM/primitives/ints/uLabel/uLabel.H
index cba8fa56aec..d6ca1df61cd 100644
--- a/src/OpenFOAM/primitives/uLabel/uLabel.H
+++ b/src/OpenFOAM/primitives/ints/uLabel/uLabel.H
@@ -26,7 +26,10 @@ Typedef
Foam::uLabel
Description
- A uLabel is an unsigned label. See label.H.
+ A uLabel is an unsigned label.
+
+SeeAlso
+ label.H
\*---------------------------------------------------------------------------*/
diff --git a/src/OpenFOAM/primitives/uint/uint.H b/src/OpenFOAM/primitives/ints/uint/uint.H
similarity index 100%
rename from src/OpenFOAM/primitives/uint/uint.H
rename to src/OpenFOAM/primitives/ints/uint/uint.H
diff --git a/src/OpenFOAM/primitives/uint/uintIO.C b/src/OpenFOAM/primitives/ints/uint/uintIO.C
similarity index 100%
rename from src/OpenFOAM/primitives/uint/uintIO.C
rename to src/OpenFOAM/primitives/ints/uint/uintIO.C
diff --git a/src/OpenFOAM/primitives/ulong/ulong.H b/src/OpenFOAM/primitives/ints/ulong/ulong.H
similarity index 98%
rename from src/OpenFOAM/primitives/ulong/ulong.H
rename to src/OpenFOAM/primitives/ints/ulong/ulong.H
index 5cc09b9420f..3bd6852617d 100644
--- a/src/OpenFOAM/primitives/ulong/ulong.H
+++ b/src/OpenFOAM/primitives/ints/ulong/ulong.H
@@ -26,7 +26,7 @@ Primitive
ulong
Description
- System ulong
+ System unsigned long
SourceFiles
ulongIO.C
diff --git a/src/OpenFOAM/primitives/ulong/ulongIO.C b/src/OpenFOAM/primitives/ints/ulong/ulongIO.C
similarity index 93%
rename from src/OpenFOAM/primitives/ulong/ulongIO.C
rename to src/OpenFOAM/primitives/ints/ulong/ulongIO.C
index e8045f45fcf..871588b1371 100644
--- a/src/OpenFOAM/primitives/ulong/ulongIO.C
+++ b/src/OpenFOAM/primitives/ints/ulong/ulongIO.C
@@ -23,10 +23,7 @@ License
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Description
- Reads an ulong from an input stream, for a given version
- number and File format. If an ascii File is being read,
- then the line numbers are counted and an erroneous read
- ised.
+ Reads a ulong from an input stream.
\*---------------------------------------------------------------------------*/
--
GitLab