STYLE: avoid namespace { ... } in functionObject source code

src/postProcessing/functionObjects/IO/writeRegisteredObject/writeRegisteredObject.C

@@ -29,10 +29,7 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-namespace Foam
+defineTypeNameAndDebug(Foam::writeRegisteredObject, 0);
-{
-    defineTypeNameAndDebug(writeRegisteredObject, 0);
-}
 
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //

src/postProcessing/functionObjects/field/fieldMinMax/fieldMinMax.C

@@ -31,10 +31,7 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-namespace Foam
+defineTypeNameAndDebug(Foam::fieldMinMax, 0);
-{
-    defineTypeNameAndDebug(fieldMinMax, 0);
-}
 
 
 template<>

src/postProcessing/functionObjects/field/fieldValues/cellSource/cellSource.C

@@ -30,31 +30,27 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-namespace Foam
+defineTypeNameAndDebug(Foam::fieldValues::cellSource, 0);
+
+template<>
+const char* Foam::NamedEnum<Foam::fieldValues::cellSource::sourceType, 1>::
+names[] =
 {
-    namespace fieldValues
+    "cellZone"
-    {
+};
-        defineTypeNameAndDebug(cellSource, 0);
-    }
 
-    template<>
+const Foam::NamedEnum<Foam::fieldValues::cellSource::sourceType, 1>
-    const char* NamedEnum<fieldValues::cellSource::sourceType, 1>::
+    Foam::fieldValues::cellSource::sourceTypeNames_;
-        names[] = {"cellZone"};
 
-    const NamedEnum<fieldValues::cellSource::sourceType, 1>
+template<>
-        fieldValues::cellSource::sourceTypeNames_;
+const char* Foam::NamedEnum<Foam::fieldValues::cellSource::operationType, 5>::
+names[] =
+{
+    "none", "sum", "volAverage", "volIntegrate", "weightedAverage"
+};
 
-    template<>
+const Foam::NamedEnum<Foam::fieldValues::cellSource::operationType, 5>
-    const char* NamedEnum<fieldValues::cellSource::operationType, 5>::
+    Foam::fieldValues::cellSource::operationTypeNames_;
-        names[] =
-        {
-            "none", "sum", "volAverage", "volIntegrate", "weightedAverage"
-        };
-
-    const NamedEnum<fieldValues::cellSource::operationType, 5>
-        fieldValues::cellSource::operationTypeNames_;
-
-}
 
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
@@ -238,4 +234,3 @@ void Foam::fieldValues::cellSource::write()
 
 
 // ************************************************************************* //
-

src/postProcessing/functionObjects/field/fieldValues/faceSource/faceSource.C

@@ -34,31 +34,27 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-namespace Foam
+defineTypeNameAndDebug(Foam::fieldValues::faceSource, 0);
+
+template<>
+const char* Foam::NamedEnum<Foam::fieldValues::faceSource::sourceType, 2>::
+names[] =
 {
-    namespace fieldValues
+    "faceZone", "patch"
-    {
+};
-        defineTypeNameAndDebug(faceSource, 0);
-    }
 
-    template<>
+const Foam::NamedEnum<Foam::fieldValues::faceSource::sourceType, 2>
-    const char* NamedEnum<fieldValues::faceSource::sourceType, 2>::
+    Foam::fieldValues::faceSource::sourceTypeNames_;
-        names[] = {"faceZone", "patch"};
 
-    const NamedEnum<fieldValues::faceSource::sourceType, 2>
+template<>
-        fieldValues::faceSource::sourceTypeNames_;
+const char* Foam::NamedEnum<Foam::fieldValues::faceSource::operationType, 5>::
+names[] =
+{
+    "none", "sum", "areaAverage", "areaIntegrate", "weightedAverage"
+};
 
-    template<>
+const Foam::NamedEnum<Foam::fieldValues::faceSource::operationType, 5>
-    const char* NamedEnum<fieldValues::faceSource::operationType, 5>::
+    Foam::fieldValues::faceSource::operationTypeNames_;
-        names[] =
-        {
-            "none", "sum", "areaAverage", "areaIntegrate", "weightedAverage"
-        };
-
-    const NamedEnum<fieldValues::faceSource::operationType, 5>
-        fieldValues::faceSource::operationTypeNames_;
-
-}
 
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //

src/postProcessing/functionObjects/field/readFields/readFields.C

@@ -28,10 +28,7 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-namespace Foam
+defineTypeNameAndDebug(Foam::readFields, 0);
-{
-    defineTypeNameAndDebug(readFields, 0);
-}
 
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //

src/postProcessing/functionObjects/field/streamLine/streamLineParticle.C

@@ -31,14 +31,17 @@ License
 namespace Foam
 {
     defineTypeNameAndDebug(streamLineParticle, 0);
+
     defineParticleTypeNameAndDebug(streamLineParticle, 0);
+
     defineTemplateTypeNameAndDebugWithName
     (
         IOField<vectorField>,
         "vectorFieldField",
         0
     );
-};
+}
+
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 

src/postProcessing/functionObjects/field/streamLine/streamLineParticleCloud.C

@@ -30,7 +30,7 @@ License
 namespace Foam
 {
     defineTemplateTypeNameAndDebug(Cloud<streamLineParticle>, 0);
-};
+}
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 

src/postProcessing/functionObjects/forces/forceCoeffs/forceCoeffs.C

@@ -30,10 +30,7 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-namespace Foam
+defineTypeNameAndDebug(Foam::forceCoeffs, 0);
-{
-    defineTypeNameAndDebug(forceCoeffs, 0);
-}
 
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //

src/postProcessing/functionObjects/forces/forces/forces.C

@@ -39,10 +39,8 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-namespace Foam
+defineTypeNameAndDebug(Foam::forces, 0);
-{
+
-    defineTypeNameAndDebug(forces, 0);
-}
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 

src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/fixedAxis/fixedAxis.C

@@ -34,14 +34,15 @@ namespace Foam
 namespace sixDoFRigidBodyMotionConstraints
 {
     defineTypeNameAndDebug(fixedAxis, 0);
+
     addToRunTimeSelectionTable
     (
         sixDoFRigidBodyMotionConstraint,
         fixedAxis,
         dictionary
     );
-};
+}
-};
+}
 
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //

src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/fixedLine/fixedLine.C

@@ -34,14 +34,15 @@ namespace Foam
 namespace sixDoFRigidBodyMotionConstraints
 {
     defineTypeNameAndDebug(fixedLine, 0);
+
     addToRunTimeSelectionTable
     (
         sixDoFRigidBodyMotionConstraint,
         fixedLine,
         dictionary
     );
-};
+}
-};
+}
 
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //

src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/fixedOrientation/fixedOrientation.C

@@ -34,14 +34,15 @@ namespace Foam
 namespace sixDoFRigidBodyMotionConstraints
 {
     defineTypeNameAndDebug(fixedOrientation, 0);
+
     addToRunTimeSelectionTable
     (
         sixDoFRigidBodyMotionConstraint,
         fixedOrientation,
         dictionary
     );
-};
+}
-};
+}
 
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //

src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/fixedPlane/fixedPlane.C

@@ -34,14 +34,15 @@ namespace Foam
 namespace sixDoFRigidBodyMotionConstraints
 {
     defineTypeNameAndDebug(fixedPlane, 0);
+
     addToRunTimeSelectionTable
     (
         sixDoFRigidBodyMotionConstraint,
         fixedPlane,
         dictionary
     );
-};
+}
-};
+}
 
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //

src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/fixedPoint/fixedPoint.C

@@ -34,14 +34,15 @@ namespace Foam
 namespace sixDoFRigidBodyMotionConstraints
 {
     defineTypeNameAndDebug(fixedPoint, 0);
+
     addToRunTimeSelectionTable
     (
         sixDoFRigidBodyMotionConstraint,
         fixedPoint,
         dictionary
     );
-};
+}
-};
+}
 
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //

src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/linearAxialAngularSpring/linearAxialAngularSpring.C

@@ -35,14 +35,15 @@ namespace Foam
 namespace sixDoFRigidBodyMotionRestraints
 {
     defineTypeNameAndDebug(linearAxialAngularSpring, 0);
+
     addToRunTimeSelectionTable
     (
         sixDoFRigidBodyMotionRestraint,
         linearAxialAngularSpring,
         dictionary
     );
-};
+}
-};
+}
 
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //

src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/linearSpring/linearSpring.C

@@ -34,14 +34,15 @@ namespace Foam
 namespace sixDoFRigidBodyMotionRestraints
 {
     defineTypeNameAndDebug(linearSpring, 0);
+
     addToRunTimeSelectionTable
     (
         sixDoFRigidBodyMotionRestraint,
         linearSpring,
         dictionary
     );
-};
+}
-};
+}
 
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //

src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/sphericalAngularSpring/sphericalAngularSpring.C

@@ -34,14 +34,15 @@ namespace Foam
 namespace sixDoFRigidBodyMotionRestraints
 {
     defineTypeNameAndDebug(sphericalAngularSpring, 0);
+
     addToRunTimeSelectionTable
     (
         sixDoFRigidBodyMotionRestraint,
         sphericalAngularSpring,
         dictionary
     );
-};
+}
-};
+}
 
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //

src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/tabulatedAxialAngularSpring/tabulatedAxialAngularSpring.C

@@ -36,14 +36,15 @@ namespace Foam
 namespace sixDoFRigidBodyMotionRestraints
 {
     defineTypeNameAndDebug(tabulatedAxialAngularSpring, 0);
+
     addToRunTimeSelectionTable
     (
         sixDoFRigidBodyMotionRestraint,
         tabulatedAxialAngularSpring,
         dictionary
     );
-};
+}
-};
+}
 
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //

src/postProcessing/functionObjects/systemCall/systemCall.C

@@ -29,10 +29,7 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-namespace Foam
+defineTypeNameAndDebug(Foam::systemCall, 0);
-{
-    defineTypeNameAndDebug(systemCall, 0);
-}
 
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //

src/postProcessing/functionObjects/utilities/abortCalculation/abortCalculation.C

@@ -31,10 +31,8 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-namespace Foam
+defineTypeNameAndDebug(Foam::abortCalculation, 0);
-{
+
-    defineTypeNameAndDebug(abortCalculation, 0);
-}
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 

src/postProcessing/functionObjects/utilities/dsmcFields/dsmcFields.C

@@ -34,10 +34,7 @@ using namespace Foam::constant;
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-namespace Foam
+defineTypeNameAndDebug(Foam::dsmcFields, 0);
-{
-    defineTypeNameAndDebug(dsmcFields, 0);
-}
 
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //

src/postProcessing/functionObjects/utilities/staticPressure/staticPressure.C

@@ -29,10 +29,8 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-namespace Foam
+defineTypeNameAndDebug(Foam::staticPressure, 0);
-{
+
-    defineTypeNameAndDebug(staticPressure, 0);
-}
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 

src/postProcessing/functionObjects/utilities/timeActivatedFileUpdate/timeActivatedFileUpdate.C

@@ -30,10 +30,7 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-namespace Foam
+defineTypeNameAndDebug(Foam::timeActivatedFileUpdate, 0);
-{
-    defineTypeNameAndDebug(timeActivatedFileUpdate, 0);
-}
 
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //

src/sampling/sampledSurface/isoSurface/isoSurface.C

@@ -36,10 +36,8 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-namespace Foam
+defineTypeNameAndDebug(Foam::isoSurface, 0);
-{
+
-    defineTypeNameAndDebug(isoSurface, 0);
-}
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 

src/sampling/sampledSurface/isoSurface/isoSurfaceCell.C

@@ -34,10 +34,8 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-namespace Foam
+defineTypeNameAndDebug(Foam::isoSurfaceCell, 0);
-{
+
-    defineTypeNameAndDebug(isoSurfaceCell, 0);
-}
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //