diff --git a/applications/solvers/combustion/PDRFoam/PDRModels/XiEqModels/basicXiSubXiEq/basicXiSubXiEq.H b/applications/solvers/combustion/PDRFoam/PDRModels/XiEqModels/basicXiSubXiEq/basicXiSubXiEq.H
index 41622357981916d9ba3355d51314299555366e3e..a74fa5c154702677ee6a9c31fc8e711bcd991610 100644
--- a/applications/solvers/combustion/PDRFoam/PDRModels/XiEqModels/basicXiSubXiEq/basicXiSubXiEq.H
+++ b/applications/solvers/combustion/PDRFoam/PDRModels/XiEqModels/basicXiSubXiEq/basicXiSubXiEq.H
@@ -128,9 +128,8 @@ public:
);
- // Destructor
-
- virtual ~basicSubGrid();
+ //- Destructor
+ virtual ~basicSubGrid();
// Member Functions
diff --git a/applications/solvers/combustion/PDRFoam/PDRModels/XiGModels/basicXiSubG/basicXiSubG.H b/applications/solvers/combustion/PDRFoam/PDRModels/XiGModels/basicXiSubG/basicXiSubG.H
index 5761805d8f8703a1cd8f8c964b3ad4d65becba18..a068130df6556b4e5009a58edca1cd57c93e2508 100644
--- a/applications/solvers/combustion/PDRFoam/PDRModels/XiGModels/basicXiSubG/basicXiSubG.H
+++ b/applications/solvers/combustion/PDRFoam/PDRModels/XiGModels/basicXiSubG/basicXiSubG.H
@@ -107,9 +107,8 @@ public:
);
- // Destructor
-
- virtual ~basicSubGrid();
+ //- Destructor
+ virtual ~basicSubGrid();
// Member Functions
diff --git a/applications/solvers/combustion/PDRFoam/PDRModels/dragModels/PDRDragModel/PDRDragModel.H b/applications/solvers/combustion/PDRFoam/PDRModels/dragModels/PDRDragModel/PDRDragModel.H
index 5935ac889ed8bb9db027b9b81ab4bba180971995..5a680e44791c2e6536a1cf3c27e2057d6f788dbe 100644
--- a/applications/solvers/combustion/PDRFoam/PDRModels/dragModels/PDRDragModel/PDRDragModel.H
+++ b/applications/solvers/combustion/PDRFoam/PDRModels/dragModels/PDRDragModel/PDRDragModel.H
@@ -137,9 +137,8 @@ public:
);
- // Destructor
-
- virtual ~PDRDragModel();
+ //- Destructor
+ virtual ~PDRDragModel();
// Member Functions
diff --git a/applications/solvers/combustion/PDRFoam/PDRModels/dragModels/basic/basic.H b/applications/solvers/combustion/PDRFoam/PDRModels/dragModels/basic/basic.H
index be29419738c5ae702d93116df3e97efcd4cbc256..37a99488b95696f257ccda711330ea00f604d686 100644
--- a/applications/solvers/combustion/PDRFoam/PDRModels/dragModels/basic/basic.H
+++ b/applications/solvers/combustion/PDRFoam/PDRModels/dragModels/basic/basic.H
@@ -135,9 +135,8 @@ public:
);
- // Destructor
-
- virtual ~basic();
+ //- Destructor
+ virtual ~basic();
// Member Functions
diff --git a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/Gulder/Gulder.H b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/Gulder/Gulder.H
index 3c3dad96a5a2ec6aad6f22b61393694f2ba9dde8..358408fd1d3fda45305f7eead8cfe884b985d1b6 100644
--- a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/Gulder/Gulder.H
+++ b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/Gulder/Gulder.H
@@ -86,9 +86,8 @@ public:
);
- // Destructor
-
- virtual ~Gulder();
+ //- Destructor
+ virtual ~Gulder();
// Member Functions
diff --git a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/SCOPEBlendXiEq/SCOPEBlendXiEq.H b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/SCOPEBlendXiEq/SCOPEBlendXiEq.H
index 66a903c2ba00cf5d5cf93a74804a16b3aa418872..94dd8f8f9fe27205ca47fb8272ac06d118b0fdf2 100644
--- a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/SCOPEBlendXiEq/SCOPEBlendXiEq.H
+++ b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/SCOPEBlendXiEq/SCOPEBlendXiEq.H
@@ -91,9 +91,8 @@ public:
);
- // Destructor
-
- virtual ~SCOPEBlend();
+ //- Destructor
+ virtual ~SCOPEBlend();
// Member Functions
diff --git a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/SCOPEXiEq/SCOPEXiEq.H b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/SCOPEXiEq/SCOPEXiEq.H
index 4c16d0e3df85a253fedcc05d95f6fa2f2e479b6d..11828420d55f2aa33ee49e7b2000ba329cd9039b 100644
--- a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/SCOPEXiEq/SCOPEXiEq.H
+++ b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/SCOPEXiEq/SCOPEXiEq.H
@@ -96,9 +96,8 @@ public:
);
- // Destructor
-
- virtual ~SCOPEXiEq();
+ //- Destructor
+ virtual ~SCOPEXiEq();
// Member Functions
diff --git a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel/XiEqModel.H b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel/XiEqModel.H
index b29ee73741b8bc85dd7c87f6186dd4831fe0d007..20aa33ca4dd9f736070b8bc157fc689c6234bc6f 100644
--- a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel/XiEqModel.H
+++ b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel/XiEqModel.H
@@ -132,9 +132,8 @@ public:
);
- // Destructor
-
- virtual ~XiEqModel();
+ //- Destructor
+ virtual ~XiEqModel();
// Member Functions
diff --git a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/instabilityXiEq/instabilityXiEq.H b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/instabilityXiEq/instabilityXiEq.H
index a746ceb89fdbcd3f1b5ee7d691b2d3417c8406b9..d703b30308ed8a2525f79cbd30bb8b3d820375c6 100644
--- a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/instabilityXiEq/instabilityXiEq.H
+++ b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/instabilityXiEq/instabilityXiEq.H
@@ -90,9 +90,8 @@ public:
);
- // Destructor
-
- virtual ~instability();
+ //- Destructor
+ virtual ~instability();
// Member Functions
diff --git a/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/KTS/KTS.H b/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/KTS/KTS.H
index 15738977771e93bcac325dbc65130d075e751770..82b801df0d0962f0bcc8333c049d375112b6f919 100644
--- a/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/KTS/KTS.H
+++ b/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/KTS/KTS.H
@@ -85,9 +85,8 @@ public:
);
- // Destructor
-
- virtual ~KTS();
+ //- Destructor
+ virtual ~KTS();
// Member Functions
diff --git a/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/XiGModel/XiGModel.H b/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/XiGModel/XiGModel.H
index 8080ea8f768cae23728115319a8432864e03b31f..d9fd7eafc683711b8b913b35d2ad66d84570e8da 100644
--- a/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/XiGModel/XiGModel.H
+++ b/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/XiGModel/XiGModel.H
@@ -129,9 +129,8 @@ public:
);
- // Destructor
-
- virtual ~XiGModel();
+ //- Destructor
+ virtual ~XiGModel();
// Member Functions
diff --git a/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/instabilityG/instabilityG.H b/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/instabilityG/instabilityG.H
index 75337b40d07b49996e2d467bae537f46eff0a6da..bf8ad5af85424fe33dcb39cc5bcda3815733e167 100644
--- a/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/instabilityG/instabilityG.H
+++ b/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/instabilityG/instabilityG.H
@@ -94,9 +94,8 @@ public:
);
- // Destructor
-
- virtual ~instabilityG();
+ //- Destructor
+ virtual ~instabilityG();
// Member Functions
diff --git a/applications/solvers/combustion/PDRFoam/XiModels/XiModel/XiModel.H b/applications/solvers/combustion/PDRFoam/XiModels/XiModel/XiModel.H
index 9fb27b3df07fda62d597f4c516daa0a4b7998be5..bfa0b30523e6391e9305b5ba898e4657f5af6d1c 100644
--- a/applications/solvers/combustion/PDRFoam/XiModels/XiModel/XiModel.H
+++ b/applications/solvers/combustion/PDRFoam/XiModels/XiModel/XiModel.H
@@ -200,9 +200,8 @@ public:
);
- // Destructor
-
- virtual ~XiModel();
+ //- Destructor
+ virtual ~XiModel();
// Member Functions
diff --git a/applications/solvers/combustion/PDRFoam/XiModels/algebraic/algebraic.H b/applications/solvers/combustion/PDRFoam/XiModels/algebraic/algebraic.H
index 78366ccb240900a1574187c225fb5c3bcce3847b..9093c0dd454172a5b93f84d6a6dcf799a0b09bd3 100644
--- a/applications/solvers/combustion/PDRFoam/XiModels/algebraic/algebraic.H
+++ b/applications/solvers/combustion/PDRFoam/XiModels/algebraic/algebraic.H
@@ -95,9 +95,8 @@ public:
);
- // Destructor
-
- virtual ~algebraic();
+ //- Destructor
+ virtual ~algebraic();
// Member Functions
diff --git a/applications/solvers/combustion/PDRFoam/XiModels/fixed/fixed.H b/applications/solvers/combustion/PDRFoam/XiModels/fixed/fixed.H
index 79399d66b857a1be945313dfec18e8fd37edbe65..50252b94d27280047fb359f7f4ca607a9dbd0cbc 100644
--- a/applications/solvers/combustion/PDRFoam/XiModels/fixed/fixed.H
+++ b/applications/solvers/combustion/PDRFoam/XiModels/fixed/fixed.H
@@ -83,9 +83,8 @@ public:
);
- // Destructor
-
- virtual ~fixed();
+ //- Destructor
+ virtual ~fixed();
// Member Functions
diff --git a/applications/solvers/combustion/PDRFoam/XiModels/transport/transport.H b/applications/solvers/combustion/PDRFoam/XiModels/transport/transport.H
index f39f3b34ecf766a44c8f3ec2679c8692f66da21b..b6b000cc78dd12befa6453d42791847b261a6411 100644
--- a/applications/solvers/combustion/PDRFoam/XiModels/transport/transport.H
+++ b/applications/solvers/combustion/PDRFoam/XiModels/transport/transport.H
@@ -95,9 +95,8 @@ public:
);
- // Destructor
-
- virtual ~transport();
+ //- Destructor
+ virtual ~transport();
// Member Functions
diff --git a/applications/solvers/combustion/PDRFoam/laminarFlameSpeed/SCOPE/SCOPELaminarFlameSpeed.H b/applications/solvers/combustion/PDRFoam/laminarFlameSpeed/SCOPE/SCOPELaminarFlameSpeed.H
index 30703dbdf4158d0e6e556122f0f3d6f19b8a84a4..29c43803b5e560b020598623c5d67fcf71ed22aa 100644
--- a/applications/solvers/combustion/PDRFoam/laminarFlameSpeed/SCOPE/SCOPELaminarFlameSpeed.H
+++ b/applications/solvers/combustion/PDRFoam/laminarFlameSpeed/SCOPE/SCOPELaminarFlameSpeed.H
@@ -194,7 +194,7 @@ public:
);
- // Destructor
+ //- Destructor
~SCOPE();
diff --git a/applications/solvers/combustion/fireFoam/combustionModels/infinitelyFastChemistry/infinitelyFastChemistry.H b/applications/solvers/combustion/fireFoam/combustionModels/infinitelyFastChemistry/infinitelyFastChemistry.H
index a6e6ed9a8c1c51fc0581d70adb9e0651946cf493..ad8b8837e31c92f6940eaed7dbe2084dbdc9ff47 100644
--- a/applications/solvers/combustion/fireFoam/combustionModels/infinitelyFastChemistry/infinitelyFastChemistry.H
+++ b/applications/solvers/combustion/fireFoam/combustionModels/infinitelyFastChemistry/infinitelyFastChemistry.H
@@ -88,9 +88,8 @@ public:
);
- // Destructor
-
- virtual ~infinitelyFastChemistry();
+ //- Destructor
+ virtual ~infinitelyFastChemistry();
// Member Functions
diff --git a/applications/solvers/combustion/fireFoam/combustionModels/noCombustion/noCombustion.H b/applications/solvers/combustion/fireFoam/combustionModels/noCombustion/noCombustion.H
index a183313ab17a6510c30c22200e77a1f6b26282bd..1ff9a95d770c91128bfec7cdcd01ebe74c408f92 100644
--- a/applications/solvers/combustion/fireFoam/combustionModels/noCombustion/noCombustion.H
+++ b/applications/solvers/combustion/fireFoam/combustionModels/noCombustion/noCombustion.H
@@ -83,9 +83,8 @@ public:
);
- // Destructor
-
- virtual ~noCombustion();
+ //- Destructor
+ virtual ~noCombustion();
// Member Functions
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/regionProperties/regionProperties.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/regionProperties/regionProperties.H
index 599ef1070ce06b0462eeba8a67b23635bfef1879..5c23d3d4213074f399c02c81b5c940dcba1db564 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/regionProperties/regionProperties.H
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/regionProperties/regionProperties.H
@@ -77,9 +77,8 @@ public:
regionProperties(const Time& runTime);
- // Destructor
-
- ~regionProperties();
+ //- Destructor
+ ~regionProperties();
// Member Functions
diff --git a/applications/solvers/incompressible/ajointShapeOptimizationFoam/Make/files b/applications/solvers/incompressible/adjointShapeOptimizationFoam/Make/files
similarity index 100%
rename from applications/solvers/incompressible/ajointShapeOptimizationFoam/Make/files
rename to applications/solvers/incompressible/adjointShapeOptimizationFoam/Make/files
diff --git a/applications/solvers/incompressible/ajointShapeOptimizationFoam/Make/options b/applications/solvers/incompressible/adjointShapeOptimizationFoam/Make/options
similarity index 100%
rename from applications/solvers/incompressible/ajointShapeOptimizationFoam/Make/options
rename to applications/solvers/incompressible/adjointShapeOptimizationFoam/Make/options
diff --git a/applications/solvers/incompressible/ajointShapeOptimizationFoam/adjointContinuityErrs.H b/applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointContinuityErrs.H
similarity index 100%
rename from applications/solvers/incompressible/ajointShapeOptimizationFoam/adjointContinuityErrs.H
rename to applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointContinuityErrs.H
diff --git a/applications/solvers/incompressible/ajointShapeOptimizationFoam/adjointOutletPressure/adjointOutletPressureFvPatchScalarField.C b/applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointOutletPressure/adjointOutletPressureFvPatchScalarField.C
similarity index 100%
rename from applications/solvers/incompressible/ajointShapeOptimizationFoam/adjointOutletPressure/adjointOutletPressureFvPatchScalarField.C
rename to applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointOutletPressure/adjointOutletPressureFvPatchScalarField.C
diff --git a/applications/solvers/incompressible/ajointShapeOptimizationFoam/adjointOutletPressure/adjointOutletPressureFvPatchScalarField.H b/applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointOutletPressure/adjointOutletPressureFvPatchScalarField.H
similarity index 100%
rename from applications/solvers/incompressible/ajointShapeOptimizationFoam/adjointOutletPressure/adjointOutletPressureFvPatchScalarField.H
rename to applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointOutletPressure/adjointOutletPressureFvPatchScalarField.H
diff --git a/applications/solvers/incompressible/ajointShapeOptimizationFoam/adjointOutletVelocity/adjointOutletVelocityFvPatchVectorField.C b/applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointOutletVelocity/adjointOutletVelocityFvPatchVectorField.C
similarity index 100%
rename from applications/solvers/incompressible/ajointShapeOptimizationFoam/adjointOutletVelocity/adjointOutletVelocityFvPatchVectorField.C
rename to applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointOutletVelocity/adjointOutletVelocityFvPatchVectorField.C
diff --git a/applications/solvers/incompressible/ajointShapeOptimizationFoam/adjointOutletVelocity/adjointOutletVelocityFvPatchVectorField.H b/applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointOutletVelocity/adjointOutletVelocityFvPatchVectorField.H
similarity index 100%
rename from applications/solvers/incompressible/ajointShapeOptimizationFoam/adjointOutletVelocity/adjointOutletVelocityFvPatchVectorField.H
rename to applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointOutletVelocity/adjointOutletVelocityFvPatchVectorField.H
diff --git a/applications/solvers/incompressible/ajointShapeOptimizationFoam/adjointShapeOptimizationFoam.C b/applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointShapeOptimizationFoam.C
similarity index 100%
rename from applications/solvers/incompressible/ajointShapeOptimizationFoam/adjointShapeOptimizationFoam.C
rename to applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointShapeOptimizationFoam.C
diff --git a/applications/solvers/incompressible/ajointShapeOptimizationFoam/createFields.H b/applications/solvers/incompressible/adjointShapeOptimizationFoam/createFields.H
similarity index 100%
rename from applications/solvers/incompressible/ajointShapeOptimizationFoam/createFields.H
rename to applications/solvers/incompressible/adjointShapeOptimizationFoam/createFields.H
diff --git a/applications/solvers/incompressible/ajointShapeOptimizationFoam/createPhia.H b/applications/solvers/incompressible/adjointShapeOptimizationFoam/createPhia.H
similarity index 100%
rename from applications/solvers/incompressible/ajointShapeOptimizationFoam/createPhia.H
rename to applications/solvers/incompressible/adjointShapeOptimizationFoam/createPhia.H
diff --git a/applications/solvers/lagrangian/reactingParcelFilmFoam/createFields.H b/applications/solvers/lagrangian/reactingParcelFilmFoam/createFields.H
index f7c2caf8c6e1921f05e54b91aac7d94a0ad042b2..9c196e290564f3889ceafb0ad8d84d76d2c1aa98 100644
--- a/applications/solvers/lagrangian/reactingParcelFilmFoam/createFields.H
+++ b/applications/solvers/lagrangian/reactingParcelFilmFoam/createFields.H
@@ -84,7 +84,7 @@
multivariateSurfaceInterpolationScheme<scalar>::fieldTable fields;
- forAll (Y, i)
+ forAll(Y, i)
{
fields.add(Y[i]);
}
diff --git a/applications/solvers/lagrangian/reactingParcelFilmFoam/rhoEqn.H b/applications/solvers/lagrangian/reactingParcelFilmFoam/rhoEqn.H
index 4e711c31ec28852c71d23b4730b51d8e31e07c6a..b9b2d6a13f9ccfcced687b62d96a2c7adbb3b217 100644
--- a/applications/solvers/lagrangian/reactingParcelFilmFoam/rhoEqn.H
+++ b/applications/solvers/lagrangian/reactingParcelFilmFoam/rhoEqn.H
@@ -8,10 +8,10 @@
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 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 3 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
@@ -19,8 +19,7 @@ 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
+ along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Global
rhoEqn
diff --git a/applications/solvers/multiphase/interMixingFoam/incompressibleThreePhaseMixture/threePhaseMixture.H b/applications/solvers/multiphase/interMixingFoam/incompressibleThreePhaseMixture/threePhaseMixture.H
index c2bbf31d120b2c0bac770372362edbd68557e544..4ac6a84b4156ae126086533a012522953bc16605 100644
--- a/applications/solvers/multiphase/interMixingFoam/incompressibleThreePhaseMixture/threePhaseMixture.H
+++ b/applications/solvers/multiphase/interMixingFoam/incompressibleThreePhaseMixture/threePhaseMixture.H
@@ -94,10 +94,9 @@ public:
);
- // Destructor
-
- ~threePhaseMixture()
- {}
+ //- Destructor
+ ~threePhaseMixture()
+ {}
// Member Functions
diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Kunz/Kunz.H b/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Kunz/Kunz.H
index 0145b596af2e266b6d2b26dba2d66ba61941c01b..46999b972a04a95fa29c87699e4fd548ec5efaa6 100644
--- a/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Kunz/Kunz.H
+++ b/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Kunz/Kunz.H
@@ -96,10 +96,9 @@ public:
);
- // Destructor
-
- virtual ~Kunz()
- {}
+ //- Destructor
+ virtual ~Kunz()
+ {}
// Member Functions
diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Merkle/Merkle.H b/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Merkle/Merkle.H
index a9fdb8ac9c1c713edfdc97cff908f37aaa79fd87..b173a55601ec4744c24171abf8d9331597b72b40 100644
--- a/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Merkle/Merkle.H
+++ b/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Merkle/Merkle.H
@@ -90,10 +90,9 @@ public:
);
- // Destructor
-
- virtual ~Merkle()
- {}
+ //- Destructor
+ virtual ~Merkle()
+ {}
// Member Functions
diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/SchnerrSauer/SchnerrSauer.H b/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/SchnerrSauer/SchnerrSauer.H
index ea84887b88da8ec4737d584898f42ba712628d62..0d67ef1b620740eb0d3b64fda5460fb29088e108 100644
--- a/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/SchnerrSauer/SchnerrSauer.H
+++ b/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/SchnerrSauer/SchnerrSauer.H
@@ -103,10 +103,9 @@ public:
);
- // Destructor
-
- virtual ~SchnerrSauer()
- {}
+ //- Destructor
+ virtual ~SchnerrSauer()
+ {}
// Member Functions
diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/phaseChangeTwoPhaseMixture/phaseChangeTwoPhaseMixture.H b/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/phaseChangeTwoPhaseMixture/phaseChangeTwoPhaseMixture.H
index 0749c3ae1fd334496e53d2423d38523d37350e7d..0aa466b06ef803a758cdd816c9ac26eff6294956 100644
--- a/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/phaseChangeTwoPhaseMixture/phaseChangeTwoPhaseMixture.H
+++ b/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/phaseChangeTwoPhaseMixture/phaseChangeTwoPhaseMixture.H
@@ -121,10 +121,9 @@ public:
);
- // Destructor
-
- virtual ~phaseChangeTwoPhaseMixture()
- {}
+ //- Destructor
+ virtual ~phaseChangeTwoPhaseMixture()
+ {}
// Member Functions
diff --git a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.H b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.H
index 3249bfd3bd25e8698e501b394d38455319138813..1d94d47e915cebd30ada7bed7450aae92a502757 100644
--- a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.H
+++ b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.H
@@ -209,10 +209,9 @@ public:
);
- // Destructor
-
- ~multiphaseMixture()
- {}
+ //- Destructor
+ ~multiphaseMixture()
+ {}
// Member Functions
diff --git a/applications/test/DLList/DLListTest.C b/applications/test/DLList/DLListTest.C
index 92db3b665153932bd81a340a676571cf29e4c2fa..4000dc90a1045a103ada23adf7af2086e4b3a7ce 100644
--- a/applications/test/DLList/DLListTest.C
+++ b/applications/test/DLList/DLListTest.C
@@ -51,12 +51,7 @@ int main(int argc, char *argv[])
Info<< nl << "And again using STL iterator: " << nl << endl;
- for
- (
- DLList<scalar>::iterator iter = myList.begin();
- iter != myList.end();
- ++iter
- )
+ forAllIter(DLList<scalar>, myList, iter)
{
Info<< "element:" << *iter << endl;
}
@@ -64,12 +59,7 @@ int main(int argc, char *argv[])
Info<< nl << "And again using the same STL iterator: " << nl << endl;
- for
- (
- DLList<scalar>::iterator iter = myList.begin();
- iter != myList.end();
- ++iter
- )
+ forAllIter(DLList<scalar>, myList, iter)
{
Info<< "Removing " << myList.remove(iter) << endl;
}
@@ -82,12 +72,7 @@ int main(int argc, char *argv[])
const DLList<scalar>& const_myList = myList;
- for
- (
- DLList<scalar>::const_iterator iter = const_myList.begin();
- iter != const_myList.end();
- ++iter
- )
+ forAllConstIter(DLList<scalar>, const_myList, iter)
{
Info<< "element:" << *iter << endl;
}
@@ -95,12 +80,7 @@ int main(int argc, char *argv[])
myList.swapUp(myList.DLListBase::first());
myList.swapUp(myList.DLListBase::last());
- for
- (
- DLList<scalar>::const_iterator iter = const_myList.begin();
- iter != const_myList.end();
- ++iter
- )
+ forAllConstIter(DLList<scalar>, const_myList, iter)
{
Info<< "element:" << *iter << endl;
}
@@ -108,19 +88,14 @@ int main(int argc, char *argv[])
myList.swapDown(myList.DLListBase::first());
myList.swapDown(myList.DLListBase::last());
- for
- (
- DLList<scalar>::const_iterator iter = const_myList.begin();
- iter != const_myList.end();
- ++iter
- )
+ forAllConstIter(DLList<scalar>, const_myList, iter)
{
Info<< "element:" << *iter << endl;
}
- Info<< nl << "Testing transfer: " << nl << endl;
- Info<< "original: " << myList << endl;
+ Info<< nl << "Testing transfer: " << nl << nl
+ << "original: " << myList << endl;
DLList<scalar> newList;
newList.transfer(myList);
diff --git a/applications/test/Dictionary/DictionaryTest.C b/applications/test/Dictionary/DictionaryTest.C
index 138c185f4a2996507261d1061b424b05007d0ce5..2844489f728e83338845e69f7b3b797f4ec85bf3 100644
--- a/applications/test/Dictionary/DictionaryTest.C
+++ b/applications/test/Dictionary/DictionaryTest.C
@@ -114,12 +114,7 @@ int main(int argc, char *argv[])
dict.swapDown(dict.first());
- for
- (
- Dictionary<ent>::const_iterator iter = dict.begin();
- iter != dict.end();
- ++iter
- )
+ forAllConstIter(Dictionary<ent>, dict, iter)
{
Info<< "element : " << *iter;
}
@@ -159,12 +154,7 @@ int main(int argc, char *argv[])
}
Info<< nl << "scalarDict1: " << endl;
- for
- (
- PtrDictionary<Scalar>::const_iterator iter = scalarDict.begin();
- iter != scalarDict.end();
- ++iter
- )
+ forAllConstIter(PtrDictionary<Scalar>, scalarDict, iter)
{
Info<< " = " << iter() << endl;
}
@@ -176,12 +166,7 @@ int main(int argc, char *argv[])
scalarDict2.insert(key, new Scalar(1.3*i));
}
Info<< nl << "scalarDict2: " << endl;
- for
- (
- PtrDictionary<Scalar>::const_iterator iter = scalarDict2.begin();
- iter != scalarDict2.end();
- ++iter
- )
+ forAllConstIter(PtrDictionary<Scalar>, scalarDict2, iter)
{
Info<< "elem = " << *iter << endl;
}
diff --git a/applications/test/DynamicList/DynamicListTest.C b/applications/test/DynamicList/DynamicListTest.C
index be04a87c67f8c4e83f7ee7a94045f29920e685d8..822ee3cacb842e6ed73b595263a276b2ecae9d0c 100644
--- a/applications/test/DynamicList/DynamicListTest.C
+++ b/applications/test/DynamicList/DynamicListTest.C
@@ -27,6 +27,7 @@ Description
#include "DynamicList.H"
#include "IOstreams.H"
+#include "ListOps.H"
using namespace Foam;
@@ -185,6 +186,9 @@ int main(int argc, char *argv[])
dlE3 = dlE2; // assign identical
Info<< "<dlE3>" << dlE3 << "</dlE3>" << endl;
+ DynamicList<label> dlE4(reorder(identity(dlE3.size()), dlE3));
+ Info<< "<dlE4>" << dlE4 << "</dlE4>" << endl;
+
Info<< "\nEnd\n";
diff --git a/applications/test/ISLList/ISLListTest.C b/applications/test/ISLList/ISLListTest.C
index bd390f38d324450ad410f52e97b0288190a1fdab..1991aa4f24f5ccc7989c2608c1f67d3c04505c54 100644
--- a/applications/test/ISLList/ISLListTest.C
+++ b/applications/test/ISLList/ISLListTest.C
@@ -78,12 +78,7 @@ int main(int argc, char *argv[])
Info<< nl << "And again using STL iterator: " << nl << endl;
- for
- (
- SLList<scalar>::iterator iter = myList.begin();
- iter != myList.end();
- ++iter
- )
+ forAllIter(SLList<scalar>, myList, iter)
{
Info<< "element:" << *iter << endl;
}
@@ -92,14 +87,9 @@ int main(int argc, char *argv[])
const ISLList<Scalar>& const_myList = myList;
- for
- (
- SLList<scalar>::const_iterator iter2 = const_myList.begin();
- iter2 != const_myList.end();
- ++iter2
- )
+ forAllConstIter(SLList<scalar>, const_myList, iter)
{
- Info<< "element:" << *iter2 << endl;
+ Info<< "element:" << *iter << endl;
}
diff --git a/applications/test/PackedList2/PackedListTest2.C b/applications/test/PackedList2/PackedListTest2.C
index 5a04ece83202a2b8a5627f5e10832f25521e393f..362e5cd8d0d7a6f04a2042b60a53fdd98aac4439 100644
--- a/applications/test/PackedList2/PackedListTest2.C
+++ b/applications/test/PackedList2/PackedListTest2.C
@@ -188,12 +188,7 @@ int main(int argc, char *argv[])
sum = 0;
for (label iter = 0; iter < nIters; ++iter)
{
- for
- (
- PackedBoolList::iterator it = packed.begin();
- it != packed.end();
- ++it
- )
+ forAllIter(PackedBoolList, packed, it)
{
sum += it;
}
@@ -207,12 +202,7 @@ int main(int argc, char *argv[])
sum = 0;
for (label iter = 0; iter < nIters; ++iter)
{
- for
- (
- PackedBoolList::const_iterator cit = packed.cbegin();
- cit != packed.cend();
- ++cit
- )
+ forAllConstIter(PackedBoolList, packed, cit)
{
sum += cit();
}
@@ -333,12 +323,7 @@ int main(int argc, char *argv[])
// Write packed
for (label iter = 0; iter < nIters; ++iter)
{
- for
- (
- PackedBoolList::iterator it = packed.begin();
- it != packed.end();
- ++it
- )
+ forAllIter(PackedBoolList, packed, it)
{
it() = 1;
}
diff --git a/applications/test/SLList/SLListTest.C b/applications/test/SLList/SLListTest.C
index 3d40182df31651d03b3b432d48c7be9066eb3830..9a9e81c21f43764910f70c2c37a662801945ba68 100644
--- a/applications/test/SLList/SLListTest.C
+++ b/applications/test/SLList/SLListTest.C
@@ -51,12 +51,7 @@ int main(int argc, char *argv[])
Info<< nl << "And again using STL iterator: " << nl << endl;
- for
- (
- SLList<scalar>::iterator iter = myList.begin();
- iter != myList.end();
- ++iter
- )
+ forAllIter(SLList<scalar>, myList, iter)
{
Info<< "element:" << *iter << endl;
}
@@ -65,39 +60,23 @@ int main(int argc, char *argv[])
const SLList<scalar>& const_myList = myList;
- for
- (
- SLList<scalar>::const_iterator iter2 = const_myList.begin();
- iter2 != const_myList.end();
- ++iter2
- )
+ forAllConstIter(SLList<scalar>, const_myList, iter)
{
- Info<< "element:" << *iter2 << endl;
+ Info<< "element:" << *iter << endl;
}
- for
- (
- SLList<scalar>::iterator iter = myList.begin();
- iter != myList.end();
- ++iter
- )
+ forAllIter(SLList<scalar>, myList, iter)
{
Info<< "Removing element:" << *iter << endl;
myList.remove(iter);
}
- for
- (
- SLList<scalar>::const_iterator iter2 = const_myList.begin();
- iter2 != const_myList.end();
- ++iter2
- )
+ forAllConstIter(SLList<scalar>, const_myList, iter)
{
- Info<< "element:" << *iter2 << endl;
+ Info<< "element:" << *iter << endl;
}
-
for (int i = 0; i<10; i++)
{
myList.append(1.3*i);
diff --git a/applications/test/UDictionary/UDictionaryTest.C b/applications/test/UDictionary/UDictionaryTest.C
index 13571ffab41e6ab77a0ab088b4222cf493ea5f27..57fc55c0b3dd928dababe498a3acb1427758ade4 100644
--- a/applications/test/UDictionary/UDictionaryTest.C
+++ b/applications/test/UDictionary/UDictionaryTest.C
@@ -81,12 +81,7 @@ int main(int argc, char *argv[])
dict.swapDown(dict.first());
- for
- (
- UDictionary<ent>::const_iterator iter = dict.begin();
- iter != dict.end();
- ++iter
- )
+ forAllConstIter(UDictionary<ent>, dict, iter)
{
Info<< "element : " << *iter;
}
diff --git a/applications/test/ensightFoamReader/udr_checker-82.c b/applications/test/ensightFoamReader/udr_checker-90.c
similarity index 100%
rename from applications/test/ensightFoamReader/udr_checker-82.c
rename to applications/test/ensightFoamReader/udr_checker-90.c
diff --git a/applications/utilities/mesh/advanced/autoRefineMesh/autoRefineMesh.C b/applications/utilities/mesh/advanced/autoRefineMesh/autoRefineMesh.C
index 01c428016e1caa622f4fe1999ce9c3d99cc06925..c2f3640f2d14a44ddf5a4c300e774e34f81b7b52 100644
--- a/applications/utilities/mesh/advanced/autoRefineMesh/autoRefineMesh.C
+++ b/applications/utilities/mesh/advanced/autoRefineMesh/autoRefineMesh.C
@@ -292,20 +292,14 @@ void addCutNeighbours
labelHashSet addCutFaces(cutCells.size());
- for
- (
- labelHashSet::const_iterator iter = cutCells.begin();
- iter != cutCells.end();
- ++iter
- )
+ forAllConstIter(labelHashSet, cutCells, iter)
{
- label cellI = iter.key();
-
+ const label cellI = iter.key();
const labelList& cFaces = mesh.cells()[cellI];
forAll(cFaces, i)
{
- label faceI = cFaces[i];
+ const label faceI = cFaces[i];
if (mesh.isInternalFace(faceI))
{
@@ -331,12 +325,7 @@ void addCutNeighbours
Info<< " Selected an additional " << addCutFaces.size()
<< " neighbours of cutCells to refine" << endl;
- for
- (
- labelHashSet::const_iterator iter = addCutFaces.begin();
- iter != addCutFaces.end();
- ++iter
- )
+ forAllConstIter(labelHashSet, addCutFaces, iter)
{
cutCells.insert(iter.key());
}
@@ -386,21 +375,15 @@ bool limitRefinementLevel
labelHashSet addCutCells(cutCells.size());
- for
- (
- labelHashSet::const_iterator iter = cutCells.begin();
- iter != cutCells.end();
- ++iter
- )
+ forAllConstIter(labelHashSet, cutCells, iter)
{
// cellI will be refined.
- label cellI = iter.key();
-
+ const label cellI = iter.key();
const labelList& cCells = mesh.cellCells()[cellI];
forAll(cCells, i)
{
- label nbr = cCells[i];
+ const label nbr = cCells[i];
if (!excludeCells.found(nbr) && !cutCells.found(nbr))
{
@@ -419,12 +402,8 @@ bool limitRefinementLevel
Info<< "Added an additional " << addCutCells.size() << " cells"
<< " to satisfy 1:" << limitDiff << " refinement level"
<< endl;
- for
- (
- labelHashSet::const_iterator iter = addCutCells.begin();
- iter != addCutCells.end();
- ++iter
- )
+
+ forAllConstIter(labelHashSet, addCutCells, iter)
{
cutCells.insert(iter.key());
}
diff --git a/applications/utilities/mesh/advanced/modifyMesh/cellSplitter.H b/applications/utilities/mesh/advanced/modifyMesh/cellSplitter.H
index 89fb95f9a96c9abcc185eb32cfbb9bf6f41fb205..4b6347aac04c0c8949623902a2eafb4c9a0a00c5 100644
--- a/applications/utilities/mesh/advanced/modifyMesh/cellSplitter.H
+++ b/applications/utilities/mesh/advanced/modifyMesh/cellSplitter.H
@@ -108,9 +108,8 @@ public:
cellSplitter(const polyMesh& mesh);
- // Destructor
-
- ~cellSplitter();
+ //- Destructor
+ ~cellSplitter();
// Member Functions
diff --git a/applications/utilities/mesh/advanced/refineWallLayer/refineWallLayer.C b/applications/utilities/mesh/advanced/refineWallLayer/refineWallLayer.C
index fb7b97a32d72873c816a676bf1ed08f7387ef44c..5e0ce9248ff6a51dc095b34403b31dcc88c67b0e 100644
--- a/applications/utilities/mesh/advanced/refineWallLayer/refineWallLayer.C
+++ b/applications/utilities/mesh/advanced/refineWallLayer/refineWallLayer.C
@@ -112,12 +112,7 @@ int main(int argc, char *argv[])
<< cells.instance()/cells.local()/cells.name()
<< nl << endl;
- for
- (
- cellSet::const_iterator iter = cells.begin();
- iter != cells.end();
- ++iter
- )
+ forAllConstIter(cellSet, cells, iter)
{
cutCells.erase(iter.key());
}
@@ -131,7 +126,7 @@ int main(int argc, char *argv[])
forAll(meshPoints, pointI)
{
- label meshPointI = meshPoints[pointI];
+ const label meshPointI = meshPoints[pointI];
vertOnPatch[meshPointI] = true;
}
@@ -151,8 +146,7 @@ int main(int argc, char *argv[])
forAll(pEdges, pEdgeI)
{
- label edgeI = pEdges[pEdgeI];
-
+ const label edgeI = pEdges[pEdgeI];
const edge& e = mesh.edges()[edgeI];
label otherPointI = e.otherVertex(meshPointI);
diff --git a/applications/utilities/mesh/advanced/splitCells/splitCells.C b/applications/utilities/mesh/advanced/splitCells/splitCells.C
index 1a55fd52f173efc006fa900125bba363e5984389..19828287bc5bd93fac891746a2f5e8197b826765 100644
--- a/applications/utilities/mesh/advanced/splitCells/splitCells.C
+++ b/applications/utilities/mesh/advanced/splitCells/splitCells.C
@@ -392,15 +392,9 @@ void collectCuts
boolList edgeIsCut(mesh.nEdges(), false);
scalarField edgeWeight(mesh.nEdges(), -GREAT);
- for
- (
- cellSet::const_iterator iter = cellsToCut.begin();
- iter != cellsToCut.end();
- ++iter
- )
+ forAllConstIter(cellSet, cellsToCut, iter)
{
- label cellI = iter.key();
-
+ const label cellI = iter.key();
const labelList& cEdges = cellEdges[cellI];
forAll(cEdges, i)
diff --git a/applications/utilities/mesh/conversion/ansysToFoam/ansysToFoam.L b/applications/utilities/mesh/conversion/ansysToFoam/ansysToFoam.L
index 52a29eb03fb86be41d374a52f6a0683b645dd7f0..2fb1c7704325d58c9465550e93e47c2b284af7df 100644
--- a/applications/utilities/mesh/conversion/ansysToFoam/ansysToFoam.L
+++ b/applications/utilities/mesh/conversion/ansysToFoam/ansysToFoam.L
@@ -268,13 +268,8 @@ int main(int argc, char *argv[])
pointField points(slPoints.size());
- label i=0;
- for
- (
- SLList<point>::iterator pointIter = slPoints.begin();
- pointIter != slPoints.end();
- ++pointIter
- )
+ label i = 0;
+ forAllConstIter(SLList<point>, slPoints, pointIter)
{
// Scale points for the given scale factor
points[i++] = scaleFactor * pointIter();
@@ -283,13 +278,8 @@ int main(int argc, char *argv[])
labelList pointMap(maxNodei+1);
- i=0;
- for
- (
- SLList<label>::iterator pointMapIter = slPointMap.begin();
- pointMapIter != slPointMap.end();
- ++pointMapIter
- )
+ i = 0;
+ forAllConstIter(SLList<label>, slPointMap, pointMapIter)
{
pointMap[pointMapIter()] = i++;
}
@@ -298,13 +288,8 @@ int main(int argc, char *argv[])
labelList cellMap(maxCelli+1);
- i=0;
- for
- (
- SLList<label>::iterator cellMapIter = slCellMap.begin();
- cellMapIter != slCellMap.end();
- ++cellMapIter
- )
+ i = 0;
+ forAllConstIter(SLList<label>, slCellMap, cellMapIter)
{
cellMap[cellMapIter()] = i++;
}
@@ -323,12 +308,7 @@ int main(int argc, char *argv[])
cellShapeList cellShapes(slCellLabels.size());
label nCells = 0;
- for
- (
- SLPtrList<labelList>::iterator cellIter = slCellLabels.begin();
- cellIter != slCellLabels.end();
- ++cellIter
- )
+ forAllConstIter(SLPtrList<labelList>, slCellLabels, cellIter)
{
if // Tetrahedron
(
diff --git a/applications/utilities/mesh/conversion/cfx4ToFoam/block.H b/applications/utilities/mesh/conversion/cfx4ToFoam/block.H
index 510fbe1b668b892cc990dda178dde6de74792d8b..b315407be2f9dab2d5bb6a02175a7cb4a7df80e0 100644
--- a/applications/utilities/mesh/conversion/cfx4ToFoam/block.H
+++ b/applications/utilities/mesh/conversion/cfx4ToFoam/block.H
@@ -100,9 +100,8 @@ public:
return autoPtr<block>(NULL);
}
- // Destructor
-
- ~block();
+ //- Destructor
+ ~block();
// Member Functions
diff --git a/applications/utilities/mesh/conversion/kivaToFoam/readKivaGrid.H b/applications/utilities/mesh/conversion/kivaToFoam/readKivaGrid.H
index 71b82cfb07d9539fb55a67ec3c9ff496bd2e5df7..6c50c02fcde098aa6ee40450cf9838fc6173be7d 100644
--- a/applications/utilities/mesh/conversion/kivaToFoam/readKivaGrid.H
+++ b/applications/utilities/mesh/conversion/kivaToFoam/readKivaGrid.H
@@ -327,12 +327,7 @@ if
{
scalar minz = GREAT;
- for
- (
- SLList<face>::iterator iter = pFaces[CYLINDERHEAD][0].begin();
- iter != pFaces[CYLINDERHEAD][0].end();
- ++iter
- )
+ forAllConstIter(SLList<face>, pFaces[CYLINDERHEAD][0], iter)
{
const face& pf = iter();
@@ -346,12 +341,7 @@ if
SLList<face> newLinerFaces;
- for
- (
- SLList<face>::iterator iter = pFaces[LINER][0].begin();
- iter != pFaces[LINER][0].end();
- ++iter
- )
+ forAllConstIter(SLList<face>, pFaces[LINER][0], iter)
{
const face& pf = iter();
@@ -380,12 +370,7 @@ if
SLList<face> newCylinderHeadFaces;
- for
- (
- SLList<face>::iterator iter = pFaces[CYLINDERHEAD][0].begin();
- iter != pFaces[CYLINDERHEAD][0].end();
- ++iter
- )
+ forAllConstIter(SLList<face>, pFaces[CYLINDERHEAD][0], iter)
{
const face& pf = iter();
@@ -456,12 +441,7 @@ if (pFaces[WEDGE].size() && pFaces[WEDGE][0].size())
{
pFaces[CYCLIC].setSize(1);
pFaces[CYCLIC][0] = pFaces[WEDGE][0];
- for
- (
- SLList<face>::iterator iterb = pFaces[WEDGE][1].begin();
- iterb != pFaces[WEDGE][1].end();
- ++iterb
- )
+ forAllIter(SLList<face>, pFaces[WEDGE][1], iterb)
{
pFaces[CYCLIC][0].append(iterb());
}
diff --git a/applications/utilities/mesh/conversion/sammToFoam/sammMesh.H b/applications/utilities/mesh/conversion/sammToFoam/sammMesh.H
index c6d37eb7f147750da54b4603643e87d6105b0855..68bf227f9f89852f2936c6c322f21bd1ae44ea5e 100644
--- a/applications/utilities/mesh/conversion/sammToFoam/sammMesh.H
+++ b/applications/utilities/mesh/conversion/sammToFoam/sammMesh.H
@@ -238,9 +238,8 @@ public:
);
- // Destructor
-
- ~sammMesh();
+ //- Destructor
+ ~sammMesh();
// Member Functions
diff --git a/applications/utilities/mesh/conversion/star3ToFoam/starMesh.H b/applications/utilities/mesh/conversion/star3ToFoam/starMesh.H
index 60b575ad6008c35c021e3fcbbfd770625a788111..b2efc519b356108c8b67d4a7416db4f7989c313c 100644
--- a/applications/utilities/mesh/conversion/star3ToFoam/starMesh.H
+++ b/applications/utilities/mesh/conversion/star3ToFoam/starMesh.H
@@ -299,9 +299,8 @@ public:
);
- // Destructor
-
- ~starMesh();
+ //- Destructor
+ ~starMesh();
// Member Functions
diff --git a/applications/utilities/mesh/conversion/tetgenToFoam/tetgenToFoam.C b/applications/utilities/mesh/conversion/tetgenToFoam/tetgenToFoam.C
index a3bf1a76e9523424292dd4ff6b0e2dfc630c2713..fedbe4061072735ba149eb5a80249e7360e703e1 100644
--- a/applications/utilities/mesh/conversion/tetgenToFoam/tetgenToFoam.C
+++ b/applications/utilities/mesh/conversion/tetgenToFoam/tetgenToFoam.C
@@ -468,12 +468,7 @@ int main(int argc, char *argv[])
// Print region to patch mapping
Info<< "Regions:" << endl;
- for
- (
- Map<label>::const_iterator iter = regionToPatch.begin();
- iter != regionToPatch.end();
- ++iter
- )
+ forAllConstIter(Map<label>, regionToPatch, iter)
{
Info<< " region:" << iter.key() << '\t' << "patch:"
<< iter() << endl;
diff --git a/applications/utilities/mesh/conversion/writeMeshObj/writeMeshObj.C b/applications/utilities/mesh/conversion/writeMeshObj/writeMeshObj.C
index a3a493258bfbf68b43981e545bcd25ee2c473688..d0e067a07094b82f30d0b9ce05d144e156beb81d 100644
--- a/applications/utilities/mesh/conversion/writeMeshObj/writeMeshObj.C
+++ b/applications/utilities/mesh/conversion/writeMeshObj/writeMeshObj.C
@@ -356,12 +356,7 @@ void writePointCells
label vertI = 0;
- for
- (
- labelHashSet::const_iterator iter = allEdges.begin();
- iter != allEdges.end();
- ++iter
- )
+ forAllConstIter(labelHashSet, allEdges, iter)
{
const edge& e = mesh.edges()[iter.key()];
diff --git a/applications/utilities/mesh/generation/extrudeToRegionMesh/extrudeToRegionMesh.C b/applications/utilities/mesh/generation/extrudeToRegionMesh/extrudeToRegionMesh.C
index 5496835381d06921e3a47095fce18fdcacb43d0c..dfcfb914711b8020d5a19939a93174e8dc22cc15 100644
--- a/applications/utilities/mesh/generation/extrudeToRegionMesh/extrudeToRegionMesh.C
+++ b/applications/utilities/mesh/generation/extrudeToRegionMesh/extrudeToRegionMesh.C
@@ -143,12 +143,7 @@ void addPatchFields(fvMesh& mesh, const word& patchFieldType)
mesh.objectRegistry::lookupClass<GeoField>()
);
- for
- (
- typename HashTable<const GeoField*>::const_iterator iter = flds.begin();
- iter != flds.end();
- ++iter
- )
+ forAllConstIter(typename HashTable<const GeoField*>, flds, iter)
{
const GeoField& fld = *iter();
@@ -183,12 +178,7 @@ void trimPatchFields(fvMesh& mesh, const label nPatches)
mesh.objectRegistry::lookupClass<GeoField>()
);
- for
- (
- typename HashTable<const GeoField*>::const_iterator iter = flds.begin();
- iter != flds.end();
- ++iter
- )
+ forAllConstIter(typename HashTable<const GeoField*>, flds, iter)
{
const GeoField& fld = *iter();
@@ -209,12 +199,7 @@ void reorderPatchFields(fvMesh& mesh, const labelList& oldToNew)
mesh.objectRegistry::lookupClass<GeoField>()
);
- for
- (
- typename HashTable<const GeoField*>::const_iterator iter = flds.begin();
- iter != flds.end();
- ++iter
- )
+ forAllConstIter(typename HashTable<const GeoField*>, flds, iter)
{
const GeoField& fld = *iter();
@@ -1461,7 +1446,7 @@ int main(int argc, char *argv[])
mesh.setInstance(meshInstance);
}
-
+
// Change master and slave boundary conditions on originating mesh
diff --git a/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMeshDict b/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMeshDict
index 31a841b80fc3733ea0f0a1090e610a097a4881f9..957010dc1090b9416fe439d07208b84d622c4a3c 100644
--- a/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMeshDict
+++ b/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMeshDict
@@ -261,7 +261,8 @@ addLayersControls
//- If points get not extruded do nGrow layers of connected faces that are
// also not grown. This helps convergence of the layer addition process
// close to features.
- nGrow 1;
+ // Note: changed(corrected) w.r.t 16x! (didn't do anything in 16x)
+ nGrow 0;
// Advanced settings
diff --git a/applications/utilities/mesh/manipulation/mergeMeshes/mergePolyMesh.H b/applications/utilities/mesh/manipulation/mergeMeshes/mergePolyMesh.H
index 559bab78eb35041b75d87f9eb277bca445e6dd04..e5750935db4d7d2fd5ff79e0e938b0887f0387c1 100644
--- a/applications/utilities/mesh/manipulation/mergeMeshes/mergePolyMesh.H
+++ b/applications/utilities/mesh/manipulation/mergeMeshes/mergePolyMesh.H
@@ -102,10 +102,9 @@ public:
mergePolyMesh(const IOobject& io);
- // Destructor
-
- virtual ~mergePolyMesh()
- {}
+ //- Destructor
+ virtual ~mergePolyMesh()
+ {}
// Member Functions
diff --git a/applications/utilities/mesh/manipulation/mirrorMesh/mirrorFvMesh.H b/applications/utilities/mesh/manipulation/mirrorMesh/mirrorFvMesh.H
index 9d1f6ea0dd3f4e2e8a81c2f33989e4e7df1b382f..dbfe36c36ef516840c623a2e45e757aef4d833ae 100644
--- a/applications/utilities/mesh/manipulation/mirrorMesh/mirrorFvMesh.H
+++ b/applications/utilities/mesh/manipulation/mirrorMesh/mirrorFvMesh.H
@@ -76,9 +76,8 @@ public:
mirrorFvMesh(const IOobject& io);
- // Destructor
-
- ~mirrorFvMesh();
+ //- Destructor
+ ~mirrorFvMesh();
// Member Functions
diff --git a/applications/utilities/mesh/manipulation/setsToZones/setsToZones.C b/applications/utilities/mesh/manipulation/setsToZones/setsToZones.C
index bb41dd57d0280f80767c82481472ce5154f730dc..8a30d3bdf89cdcf2f8688b3faa48c30b2bef5da2 100644
--- a/applications/utilities/mesh/manipulation/setsToZones/setsToZones.C
+++ b/applications/utilities/mesh/manipulation/setsToZones/setsToZones.C
@@ -100,12 +100,7 @@ int main(int argc, char *argv[])
//Pout<< "pointSets:" << pointObjects.names() << endl;
- for
- (
- IOobjectList::const_iterator iter = pointObjects.begin();
- iter != pointObjects.end();
- ++iter
- )
+ forAllConstIter(IOobjectList, pointObjects, iter)
{
// Not in memory. Load it.
pointSet set(*iter());
@@ -149,12 +144,7 @@ int main(int argc, char *argv[])
//Pout<< "faceSets:" << faceObjects.names() << endl;
- for
- (
- IOobjectList::const_iterator iter = faceObjects.begin();
- iter != faceObjects.end();
- ++iter
- )
+ forAllConstIter(IOobjectList, faceObjects, iter)
{
// Not in memory. Load it.
faceSet set(*iter());
@@ -288,12 +278,7 @@ int main(int argc, char *argv[])
//Pout<< "cellSets:" << cellObjects.names() << endl;
- for
- (
- IOobjectList::const_iterator iter = cellObjects.begin();
- iter != cellObjects.end();
- ++iter
- )
+ forAllConstIter(IOobjectList, cellObjects, iter)
{
if (!slaveCellSets.found(iter.key()))
{
diff --git a/applications/utilities/mesh/manipulation/splitMesh/regionSide.C b/applications/utilities/mesh/manipulation/splitMesh/regionSide.C
index e36c1aca0a8990f21897ba7ecc9321716979d320..103d0f909782c0dde556765b46a9e40ee8fd6fe0 100644
--- a/applications/utilities/mesh/manipulation/splitMesh/regionSide.C
+++ b/applications/utilities/mesh/manipulation/splitMesh/regionSide.C
@@ -81,8 +81,7 @@ Foam::label Foam::regionSide::otherEdge
forAll(fEdges, fEdgeI)
{
- label otherEdgeI = fEdges[fEdgeI];
-
+ const label otherEdgeI = fEdges[fEdgeI];
const edge& otherE = mesh.edges()[otherEdgeI];
if
@@ -300,15 +299,9 @@ void Foam::regionSide::walkAllPointConnectedFaces
//
labelHashSet regionEdges(4*regionFaces.size());
- for
- (
- labelHashSet::const_iterator iter = regionFaces.begin();
- iter != regionFaces.end();
- ++iter
- )
+ forAllConstIter(labelHashSet, regionFaces, iter)
{
- label faceI = iter.key();
-
+ const label faceI = iter.key();
const labelList& fEdges = mesh.faceEdges()[faceI];
forAll(fEdges, fEdgeI)
@@ -326,12 +319,7 @@ void Foam::regionSide::walkAllPointConnectedFaces
labelHashSet visitedPoint(4*regionFaces.size());
// Insert fence points so we don't visit them
- for
- (
- labelHashSet::const_iterator iter = fencePoints.begin();
- iter != fencePoints.end();
- ++iter
- )
+ forAllConstIter(labelHashSet, fencePoints, iter)
{
visitedPoint.insert(iter.key());
}
@@ -344,14 +332,9 @@ void Foam::regionSide::walkAllPointConnectedFaces
Info<< "Excluding visit of points:" << visitedPoint << endl;
}
- for
- (
- labelHashSet::const_iterator iter = regionFaces.begin();
- iter != regionFaces.end();
- ++iter
- )
+ forAllConstIter(labelHashSet, regionFaces, iter)
{
- label faceI = iter.key();
+ const label faceI = iter.key();
// Get side of face.
label cellI;
@@ -459,12 +442,7 @@ Foam::regionSide::regionSide
labelHashSet fencePoints(fenceEdges.size());
- for
- (
- labelHashSet::const_iterator iter = fenceEdges.begin();
- iter != fenceEdges.end();
- ++iter
- )
+ forAllConstIter(labelHashSet, fenceEdges, iter)
{
const edge& e = mesh.edges()[iter.key()];
diff --git a/applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C b/applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C
index 7da3c2226908e908245cd1dcd1a2b6bcd986bb81..1bac3a554bebc8923649589425cfd317ea6ac889 100644
--- a/applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C
+++ b/applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C
@@ -99,12 +99,7 @@ void addPatchFields(fvMesh& mesh, const word& patchFieldType)
mesh.objectRegistry::lookupClass<GeoField>()
);
- for
- (
- typename HashTable<const GeoField*>::const_iterator iter = flds.begin();
- iter != flds.end();
- ++iter
- )
+ forAllConstIter(typename HashTable<const GeoField*>, flds, iter)
{
const GeoField& fld = *iter();
@@ -139,12 +134,7 @@ void trimPatchFields(fvMesh& mesh, const label nPatches)
mesh.objectRegistry::lookupClass<GeoField>()
);
- for
- (
- typename HashTable<const GeoField*>::const_iterator iter = flds.begin();
- iter != flds.end();
- ++iter
- )
+ forAllConstIter(typename HashTable<const GeoField*>, flds, iter)
{
const GeoField& fld = *iter();
@@ -165,12 +155,7 @@ void reorderPatchFields(fvMesh& mesh, const labelList& oldToNew)
mesh.objectRegistry::lookupClass<GeoField>()
);
- for
- (
- typename HashTable<const GeoField*>::const_iterator iter = flds.begin();
- iter != flds.end();
- ++iter
- )
+ forAllConstIter(typename HashTable<const GeoField*>, flds, iter)
{
const GeoField& fld = *iter();
diff --git a/applications/utilities/mesh/manipulation/stitchMesh/stitchMesh.C b/applications/utilities/mesh/manipulation/stitchMesh/stitchMesh.C
index 999884ddae2c007580f1caf4d1c2d35b1dc178db..3b7bb42a1ce129de399dcf40fd328c0132a66484 100644
--- a/applications/utilities/mesh/manipulation/stitchMesh/stitchMesh.C
+++ b/applications/utilities/mesh/manipulation/stitchMesh/stitchMesh.C
@@ -360,7 +360,7 @@ int main(int argc, char *argv[])
labelList osf(slavePatch.size());
- forAll (osf, i)
+ forAll(osf, i)
{
osf[i] = slavePatch.start() + i;
}
diff --git a/applications/utilities/miscellaneous/foamInfoExec/foamInfoExec.C b/applications/utilities/miscellaneous/foamInfoExec/foamInfoExec.C
index 20bff4cc015e716a8d456ea3fd093b5dfe729de2..8945c0cf5e50f53d35f5cd1e74d9cfc13a0e229e 100644
--- a/applications/utilities/miscellaneous/foamInfoExec/foamInfoExec.C
+++ b/applications/utilities/miscellaneous/foamInfoExec/foamInfoExec.C
@@ -76,12 +76,7 @@ int main(int argc, char *argv[])
if (args.optionFound("keywords") && !args.optionFound("entry"))
{
- for
- (
- IDLList<entry>::iterator iter = dict.begin();
- iter != dict.end();
- ++iter
- )
+ forAllConstIter(dictionary, dict, iter)
{
Info<< iter().keyword() << endl;
}
@@ -137,13 +132,8 @@ int main(int argc, char *argv[])
}
*/
- const dictionary& dict(entPtr->dict());
- for
- (
- IDLList<entry>::const_iterator iter = dict.begin();
- iter != dict.end();
- ++iter
- )
+ const dictionary& dict = entPtr->dict();
+ forAllConstIter(dictionary, dict, iter)
{
Info<< iter().keyword() << endl;
}
diff --git a/applications/utilities/parallelProcessing/decomposePar/domainDecomposition.H b/applications/utilities/parallelProcessing/decomposePar/domainDecomposition.H
index 1b22246090f89ce00cfe0fe818de5f7efb205825..b9dbb74c6fbff5deac8ec0e07fd837c140c22148 100644
--- a/applications/utilities/parallelProcessing/decomposePar/domainDecomposition.H
+++ b/applications/utilities/parallelProcessing/decomposePar/domainDecomposition.H
@@ -126,9 +126,8 @@ public:
domainDecomposition(const IOobject& io);
- // Destructor
-
- ~domainDecomposition();
+ //- Destructor
+ ~domainDecomposition();
// Member Functions
diff --git a/applications/utilities/parallelProcessing/decomposePar/domainDecompositionMesh.C b/applications/utilities/parallelProcessing/decomposePar/domainDecompositionMesh.C
index 959aaf70314fa38845bfa4a340ecaa78923f9461..d7487dc58e6ee6cb3b94091a88577638f3aba1fc 100644
--- a/applications/utilities/parallelProcessing/decomposePar/domainDecompositionMesh.C
+++ b/applications/utilities/parallelProcessing/decomposePar/domainDecompositionMesh.C
@@ -506,12 +506,7 @@ void Foam::domainDecomposition::decomposeMesh()
// Add internal and boundary faces
// Remember to increment the index by one such that the
// turning index works properly.
- for
- (
- SLList<label>::iterator curProcFacesIter = curProcFaces.begin();
- curProcFacesIter != curProcFaces.end();
- ++curProcFacesIter
- )
+ forAllConstIter(SLList<label>, curProcFaces, curProcFacesIter)
{
curProcFaceAddressing[nFaces] = curProcFacesIter() + 1;
nFaces++;
@@ -564,12 +559,11 @@ void Foam::domainDecomposition::decomposeMesh()
// add faces for this processor boundary
- for
+ forAllConstIter
(
- SLList<label>::iterator curFacesIter =
- curInterProcBFacesIter().begin();
- curFacesIter != curInterProcBFacesIter().end();
- ++curFacesIter
+ SLList<label>,
+ curInterProcBFacesIter(),
+ curFacesIter
)
{
// add the face
diff --git a/applications/utilities/parallelProcessing/decomposePar/fvFieldDecomposer.H b/applications/utilities/parallelProcessing/decomposePar/fvFieldDecomposer.H
index b1cfd1008adade9a03d9990c03935e7b6935a12f..9a1a4e16d8d304c438691b4afe74041a313db377 100644
--- a/applications/utilities/parallelProcessing/decomposePar/fvFieldDecomposer.H
+++ b/applications/utilities/parallelProcessing/decomposePar/fvFieldDecomposer.H
@@ -230,9 +230,8 @@ public:
);
- // Destructor
-
- ~fvFieldDecomposer();
+ //- Destructor
+ ~fvFieldDecomposer();
// Member Functions
diff --git a/applications/utilities/parallelProcessing/decomposePar/lagrangianFieldDecomposer.C b/applications/utilities/parallelProcessing/decomposePar/lagrangianFieldDecomposer.C
index fa0510765bda3084cb695849b61b48ad746301dd..010bb3758a2494475941993789f2caaa6716310d 100644
--- a/applications/utilities/parallelProcessing/decomposePar/lagrangianFieldDecomposer.C
+++ b/applications/utilities/parallelProcessing/decomposePar/lagrangianFieldDecomposer.C
@@ -55,7 +55,7 @@ Foam::lagrangianFieldDecomposer::lagrangianFieldDecomposer
{
SLList<indexedParticle*>& particlePtrs = *cellParticles[celli];
- forAllIter(SLList<indexedParticle*>, particlePtrs, iter)
+ forAllConstIter(SLList<indexedParticle*>, particlePtrs, iter)
{
const indexedParticle& ppi = *iter();
particleIndices_[pi++] = ppi.index();
diff --git a/applications/utilities/parallelProcessing/decomposePar/pointFieldDecomposer.H b/applications/utilities/parallelProcessing/decomposePar/pointFieldDecomposer.H
index b684ac580875909535a5737417a5e978efd3fa4f..3bfdbb7f937ba318d255b80bd6b5e27f07def0af 100644
--- a/applications/utilities/parallelProcessing/decomposePar/pointFieldDecomposer.H
+++ b/applications/utilities/parallelProcessing/decomposePar/pointFieldDecomposer.H
@@ -138,9 +138,8 @@ public:
);
- // Destructor
-
- ~pointFieldDecomposer();
+ //- Destructor
+ ~pointFieldDecomposer();
// Member Functions
diff --git a/applications/utilities/parallelProcessing/decomposePar/readFields.C b/applications/utilities/parallelProcessing/decomposePar/readFields.C
index d6e05dd5cb619809c14ab4c7cd514079185ff515..026e6948299b4ea8d9105bf30e0a990c4bb11db8 100644
--- a/applications/utilities/parallelProcessing/decomposePar/readFields.C
+++ b/applications/utilities/parallelProcessing/decomposePar/readFields.C
@@ -48,22 +48,13 @@ void Foam::readFields
// Construct the vol scalar fields
fields.setSize(fieldObjects.size());
- label fieldi=0;
- for
- (
- IOobjectList::iterator iter = fieldObjects.begin();
- iter != fieldObjects.end();
- ++iter
- )
+ label fieldI = 0;
+ forAllIter(IOobjectList, fieldObjects, iter)
{
fields.set
(
- fieldi++,
- new GeoField
- (
- *iter(),
- mesh
- )
+ fieldI++,
+ new GeoField(*iter(), mesh)
);
}
}
diff --git a/applications/utilities/postProcessing/dataConversion/foamDataToFluent/foamDataToFluent.C b/applications/utilities/postProcessing/dataConversion/foamDataToFluent/foamDataToFluent.C
index d4b6d13b95ecd77b679de640ed845f28ad561740..d469054ca311380efba1d5ef8e96c09245715124 100644
--- a/applications/utilities/postProcessing/dataConversion/foamDataToFluent/foamDataToFluent.C
+++ b/applications/utilities/postProcessing/dataConversion/foamDataToFluent/foamDataToFluent.C
@@ -110,34 +110,21 @@ int main(int argc, char *argv[])
// Search list of objects for volScalarFields
IOobjectList scalarFields(objects.lookupClass("volScalarField"));
- for
- (
- IOobjectList::iterator scalarFieldIter = scalarFields.begin();
- scalarFieldIter != scalarFields.end();
- ++scalarFieldIter
- )
+ forAllIter(IOobjectList, scalarFields, iter)
{
// Read field
- volScalarField field
- (
- *scalarFieldIter(),
- mesh
- );
+ volScalarField field(*iter(), mesh);
- // lookup field from dictionary
- if (foamDataToFluentDict.found(field.name()))
+ // lookup field from dictionary and convert field
+ label unitNumber;
+ if
+ (
+ foamDataToFluentDict.readIfPresent(field.name(), unitNumber)
+ && unitNumber > 0
+ )
{
- label unitNumber
- (
- readLabel(foamDataToFluentDict.lookup(field.name()))
- );
-
- // Convert field
- if (unitNumber > 0)
- {
- Info<< " Converting field " << field.name() << endl;
- writeFluentField(field, unitNumber, fluentDataFile);
- }
+ Info<< " Converting field " << field.name() << endl;
+ writeFluentField(field, unitNumber, fluentDataFile);
}
}
@@ -148,34 +135,21 @@ int main(int argc, char *argv[])
// Search list of objects for volVectorFields
IOobjectList vectorFields(objects.lookupClass("volVectorField"));
- for
- (
- IOobjectList::iterator vectorFieldIter = vectorFields.begin();
- vectorFieldIter != vectorFields.end();
- ++vectorFieldIter
- )
+ forAllIter(IOobjectList, vectorFields, iter)
{
// Read field
- volVectorField field
- (
- *vectorFieldIter(),
- mesh
- );
+ volVectorField field(*iter(), mesh);
- // lookup field from dictionary
- if (foamDataToFluentDict.found(field.name()))
+ // lookup field from dictionary and convert field
+ label unitNumber;
+ if
+ (
+ foamDataToFluentDict.readIfPresent(field.name(), unitNumber)
+ && unitNumber > 0
+ )
{
- label unitNumber
- (
- readLabel(foamDataToFluentDict.lookup(field.name()))
- );
-
- // Convert field
- if (unitNumber > 0)
- {
- Info<< " Converting field " << field.name() << endl;
- writeFluentField(field, unitNumber, fluentDataFile);
- }
+ Info<< " Converting field " << field.name() << endl;
+ writeFluentField(field, unitNumber, fluentDataFile);
}
}
diff --git a/applications/utilities/postProcessing/dataConversion/foamToGMV/gmvOutput.H b/applications/utilities/postProcessing/dataConversion/foamToGMV/gmvOutput.H
index 124bab141197f36f8e01883dd9fc0ca991a14ffe..a49c4e188e0562d102f60ae93699d6df1cda9db5 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToGMV/gmvOutput.H
+++ b/applications/utilities/postProcessing/dataConversion/foamToGMV/gmvOutput.H
@@ -22,11 +22,11 @@ for (label i=0; i < nTypes; i++)
if (fieldTypes[i] == "volScalarField")
{
- volScalarField gmvScalarField(fieldObject, mesh);
+ volScalarField fld(fieldObject, mesh);
gmvFile << fieldName << " 0" << nl;
for (label indx=0;indx<mesh.nCells();indx++)
{
- gmvFile << gmvScalarField[indx] << " ";
+ gmvFile << fld[indx] << " ";
}
gmvFile << nl;
}
@@ -35,19 +35,19 @@ for (label i=0; i < nTypes; i++)
{
if (fieldName == vComp)
{
- volVectorField gmvVectorField(fieldObject, mesh);
+ volVectorField fld(fieldObject, mesh);
gmvFile << "velocity 0" << nl;
for (label indx=0;indx<mesh.nCells();indx++)
{
- gmvFile << gmvVectorField[indx].x() << " ";
+ gmvFile << fld[indx].x() << " ";
}
for (label indx=0;indx<mesh.nCells();indx++)
{
- gmvFile << gmvVectorField[indx].y() << " ";
+ gmvFile << fld[indx].y() << " ";
}
for (label indx=0;indx<mesh.nCells();indx++)
{
- gmvFile << gmvVectorField[indx].z() << " ";
+ gmvFile << fld[indx].z() << " ";
}
gmvFile << nl;
}
diff --git a/applications/utilities/postProcessing/dataConversion/foamToGMV/gmvOutputLagrangian.H b/applications/utilities/postProcessing/dataConversion/foamToGMV/gmvOutputLagrangian.H
index a99b94133ef4f31e7cdec776da9ff8ad554e6f96..3d7c4827a026d35d8d4aca8d930b36a8dfb88e81 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToGMV/gmvOutputLagrangian.H
+++ b/applications/utilities/postProcessing/dataConversion/foamToGMV/gmvOutputLagrangian.H
@@ -1,42 +1,27 @@
gmvFile << "tracers " << particles.size() << nl;
-for
-(
- Cloud<passiveParticle>::iterator elmnt = particles.begin();
- elmnt != particles.end();
- ++elmnt
-)
+forAllConstIter(Cloud<passiveParticle>, particles, iter)
{
- gmvFile << elmnt().position().x() << " ";
+ gmvFile << iter().position().x() << ' ';
}
gmvFile << nl;
-for
-(
- Cloud<passiveParticle>::iterator elmnt = particles.begin();
- elmnt != particles.end();
- ++elmnt
-)
+forAllConstIter(Cloud<passiveParticle>, particles, iter)
{
- gmvFile << elmnt().position().y() << " ";
+ gmvFile << iter().position().y() << ' ';
}
gmvFile << nl;
-for
-(
- Cloud<passiveParticle>::iterator elmnt = particles.begin();
- elmnt != particles.end();
- ++elmnt
-)
+forAllConstIter(Cloud<passiveParticle>, particles, iter)
{
- gmvFile << elmnt().position().z() << " ";
+ gmvFile << iter().position().z() << ' ';
}
gmvFile << nl;
forAll(lagrangianScalarNames, i)
{
- word name = lagrangianScalarNames[i];
+ const word& name = lagrangianScalarNames[i];
- IOField<scalar> s
+ IOField<scalar> fld
(
IOobject
(
@@ -49,13 +34,13 @@ forAll(lagrangianScalarNames, i)
)
);
- if (s.size())
+ if (fld.size())
{
gmvFile << name << nl;
- for (label n = 0; n < s.size(); n++)
+ forAll(fld, n)
{
- gmvFile << s[n] << token::SPACE;
+ gmvFile << fld[n] << token::SPACE;
}
gmvFile << nl;
}
@@ -65,9 +50,9 @@ forAll(lagrangianScalarNames, i)
forAll(lagrangianVectorNames, i)
{
- word name = lagrangianVectorNames[i];
+ const word& name = lagrangianVectorNames[i];
- IOField<vector> v
+ IOField<vector> fld
(
IOobject
(
@@ -80,29 +65,29 @@ forAll(lagrangianVectorNames, i)
)
);
- if (v.size())
+ if (fld.size())
{
gmvFile << name + "x" << nl;
- for (label n = 0; n < v.size(); n++)
+ forAll(fld, n)
{
- gmvFile << v[n].x() << token::SPACE;
+ gmvFile << fld[n].x() << token::SPACE;
}
gmvFile << nl;
gmvFile << name + "y" << nl;
- for (label n = 0; n < v.size(); n++)
+ forAll(fld, n)
{
- gmvFile << v[n].y() << token::SPACE;
+ gmvFile << fld[n].y() << token::SPACE;
}
gmvFile << nl;
gmvFile << name + "z" << nl;
- for (label n = 0; n < v.size(); n++)
+ forAll(fld, n)
{
- gmvFile << v[n].z() << token::SPACE;
+ gmvFile << fld[n].z() << token::SPACE;
}
gmvFile << nl;
}
diff --git a/applications/utilities/postProcessing/dataConversion/foamToGMV/gmvOutputParcels.H b/applications/utilities/postProcessing/dataConversion/foamToGMV/gmvOutputParcels.H
index 196169f894d461951c3bfc72498704af261e7c75..ad46f671094a505314f2006b14af3c789c986e5b 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToGMV/gmvOutputParcels.H
+++ b/applications/utilities/postProcessing/dataConversion/foamToGMV/gmvOutputParcels.H
@@ -1,81 +1,48 @@
gmvFile << "tracers " << particles.size() << nl;
-for
-(
- discretePhase::iterator elmnt = particles.begin();
- elmnt != particles.end();
- ++elmnt
-)
+forAllConstIter(discretePhase, particles, iter)
{
- gmvFile << elmnt().position().x() << " ";
+ gmvFile << iter().position().x() << " ";
}
gmvFile << nl;
-for
-(
- discretePhase::iterator elmnt = particles.begin();
- elmnt != particles.end();
- ++elmnt
-)
+
+forAllConstIter(discretePhase, particles, iter)
{
- gmvFile << elmnt().position().y() << " ";
+ gmvFile << iter().position().y() << " ";
}
gmvFile << nl;
-for
-(
- discretePhase::iterator elmnt = particles.begin();
- elmnt != particles.end();
- ++elmnt
-)
+
+forAllConstIter(discretePhase, particles, iter)
{
- gmvFile << elmnt().position().z() << " ";
+ gmvFile << iter().position().z() << " ";
}
gmvFile << nl;
gmvFile << "U" << nl;
-for
-(
- discretePhase::iterator elmnt = particles.begin();
- elmnt != particles.end();
- ++elmnt
-)
+forAllConstIter(discretePhase, particles, iter)
{
- gmvFile << elmnt().velocity().x() << " ";
+ gmvFile << iter().velocity().x() << " ";
}
gmvFile << nl;
+
gmvFile << "V" << nl;
-for
-(
- discretePhase::iterator elmnt = particles.begin();
- elmnt != particles.end();
- ++elmnt
-)
+forAllConstIter(discretePhase, particles, iter)
{
- gmvFile << elmnt().velocity().y() << " ";
+ gmvFile << iter().velocity().y() << " ";
}
gmvFile << nl;
gmvFile << "W" << nl;
-for
-(
- discretePhase::iterator elmnt = particles.begin();
- elmnt != particles.end();
- ++elmnt
-)
+forAllConstIter(discretePhase, particles, iter)
{
- gmvFile << elmnt().velocity().z() << " ";
+{
+ gmvFile << iter().velocity().z() << " ";
}
gmvFile << nl;
gmvFile << "Diam" << nl;
-
-for
-(
- discretePhase::iterator elmnt = particles.begin();
- elmnt != particles.end();
- ++elmnt
-)
+forAllConstIter(discretePhase, particles, iter)
{
- gmvFile << elmnt().d() << " ";
+ gmvFile << iter().d() << " ";
}
-
gmvFile << "endtrace"<< nl;
diff --git a/applications/utilities/postProcessing/dataConversion/foamToGMV/gmvOutputSpray.H b/applications/utilities/postProcessing/dataConversion/foamToGMV/gmvOutputSpray.H
index 3c4f629235aa0bd0dca08fb69793a397b0c076a1..725bf836aa9cb5de3c171fa617fca035795a3ac3 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToGMV/gmvOutputSpray.H
+++ b/applications/utilities/postProcessing/dataConversion/foamToGMV/gmvOutputSpray.H
@@ -1,32 +1,19 @@
gmvFile << "tracers " << particles.size() << nl;
-for
-(
- Cloud<passiveParticle>::iterator elmnt = particles.begin();
- elmnt != particles.end();
- ++elmnt
-)
+forAllConstIter(Cloud<passiveParticle>, particles, iter)
{
- gmvFile << elmnt().position().x() << " ";
+ gmvFile << iter().position().x() << " ";
}
gmvFile << nl;
-for
-(
- Cloud<passiveParticle>::iterator elmnt = particles.begin();
- elmnt != particles.end();
- ++elmnt
-)
+
+forAllConstIter(Cloud<passiveParticle>, particles, iter)
{
- gmvFile << elmnt().position().y() << " ";
+ gmvFile << iter().position().y() << " ";
}
gmvFile << nl;
-for
-(
- Cloud<passiveParticles>::iterator elmnt = particles.begin();
- elmnt != particles.end();
- ++elmnt
-)
+
+forAllConstIter(Cloud<passiveParticle>, particles, iter)
{
- gmvFile << elmnt().position().z() << " ";
+ gmvFile << iter().position().z() << " ";
}
gmvFile << nl;
@@ -51,15 +38,13 @@ forAll(lagrangianScalarNames, i)
{
gmvFile << name << nl;
- for (label n = 0; n < s.size(); n++)
+ forAll(s, n)
{
gmvFile << s[n] << token::SPACE;
}
gmvFile << nl;
}
-
}
-
gmvFile << "endtrace"<< nl;
diff --git a/applications/utilities/postProcessing/dataConversion/foamToGMV/gmvOutputTail.H b/applications/utilities/postProcessing/dataConversion/foamToGMV/gmvOutputTail.H
index 4afa84809b3a95d5f5e9a54a7fcd419040f19592..e649658d197bda6a9e2d10c45a847a8241d1a8a9 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToGMV/gmvOutputTail.H
+++ b/applications/utilities/postProcessing/dataConversion/foamToGMV/gmvOutputTail.H
@@ -1,2 +1,3 @@
-gmvFile << "probtime " << runTime.timeName() << nl;
-gmvFile << "endgmv" << nl;
+gmvFile
+ << "probtime " << runTime.timeName() << nl
+ << "endgmv" << nl;
diff --git a/applications/utilities/postProcessing/dataConversion/foamToGMV/readConversionProperties.H b/applications/utilities/postProcessing/dataConversion/foamToGMV/readConversionProperties.H
index 35f30932b4afce83a14691d634ddeeaa1763d8e1..c1a0cd7c78f95958dbb00e9e454ca30cce96eef7 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToGMV/readConversionProperties.H
+++ b/applications/utilities/postProcessing/dataConversion/foamToGMV/readConversionProperties.H
@@ -26,13 +26,14 @@ word format
conversionProperties.lookup("format")
);
-if ( (format != "ascii") && (format != "ieeei4r8") )
+if ((format != "ascii") && (format != "ieeei4r8"))
{
FatalError << "format type: " << format << " unknown."
<< " Valid options are: ascii ieeei4r8"
<< abort(FatalError);
}
+
word cells
(
conversionProperties.lookup("cells")
diff --git a/applications/utilities/postProcessing/dataConversion/foamToTecplot360/readFields.C b/applications/utilities/postProcessing/dataConversion/foamToTecplot360/readFields.C
index 238c421b9a4fe78562c61ec69005e513eb6f25c0..6f66553f1855032464ca572aa16b3acaf0808383 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToTecplot360/readFields.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToTecplot360/readFields.C
@@ -50,12 +50,7 @@ void readFields
label nFields = fields.size();
fields.setSize(nFields + fieldObjects.size());
- for
- (
- IOobjectList::iterator iter = fieldObjects.begin();
- iter != fieldObjects.end();
- ++iter
- )
+ forAllIter(IOobjectList, fieldObjects, iter)
{
if (selectedFields.empty() || selectedFields.found(iter()->name()))
{
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/readFields.C b/applications/utilities/postProcessing/dataConversion/foamToVTK/readFields.C
index 4d9453f2fe2cd14ac2b94d918d543099ea1e8427..d626249dcf2bdbde893f61584f2c46b91cea9617 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/readFields.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/readFields.C
@@ -50,12 +50,7 @@ void readFields
fields.setSize(fieldObjects.size());
label nFields = 0;
- for
- (
- IOobjectList::iterator iter = fieldObjects.begin();
- iter != fieldObjects.end();
- ++iter
- )
+ forAllIter(IOobjectList, fieldObjects, iter)
{
if (selectedFields.empty() || selectedFields.found(iter()->name()))
{
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/writeFaceSet.C b/applications/utilities/postProcessing/dataConversion/foamToVTK/writeFaceSet.C
index e5b9e61b154173850ba3ad658a2c4f390e160d9e..a1a19b90a637ea1361db39f08b0b1733ea954739 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/writeFaceSet.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/writeFaceSet.C
@@ -27,14 +27,9 @@ License
#include "OFstream.H"
#include "writeFuns.H"
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
// * * * * * * * * * * * * * * * Global Functions * * * * * * * * * * * * * //
-void writeFaceSet
+void Foam::writeFaceSet
(
const bool binary,
const vtkMesh& vMesh,
@@ -73,12 +68,7 @@ void writeFaceSet
labelList setFaceLabels(set.size());
label setFaceI = 0;
- for
- (
- faceSet::const_iterator iter = set.begin();
- iter != set.end();
- ++iter
- )
+ forAllConstIter(faceSet, set, iter)
{
setFaceLabels[setFaceI] = iter.key();
setFaces[setFaceI] = faces[iter.key()];
@@ -139,8 +129,5 @@ void writeFaceSet
writeFuns::write(pStream, binary, setFaceLabels);
}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
// ************************************************************************* //
diff --git a/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/PV3FoamReader/vtkPV3FoamReader.h b/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/PV3FoamReader/vtkPV3FoamReader.h
index 99ffed64e8a6316450d8e9aa6b7b125c5d2dada0..b286aea477ef04474653748e27b7ef7930f7f4f6 100644
--- a/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/PV3FoamReader/vtkPV3FoamReader.h
+++ b/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/PV3FoamReader/vtkPV3FoamReader.h
@@ -187,7 +187,6 @@ protected:
);
//- Get the mesh/fields for a particular time
- //- Destructor
virtual int RequestData
(
vtkInformation*,
diff --git a/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3Foam.H b/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3Foam.H
index bf471550855f6c92ba1e55a9b094aa0442ff0f75..7b874029d6175c599ec4cec6258093bcb9f14fd4 100644
--- a/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3Foam.H
+++ b/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3Foam.H
@@ -693,8 +693,7 @@ public:
//- Destructor
-
- ~vtkPV3Foam();
+ ~vtkPV3Foam();
// Member Functions
diff --git a/applications/utilities/postProcessing/graphics/PV3Readers/PV3blockMeshReader/vtkPV3blockMesh/vtkPV3blockMesh.H b/applications/utilities/postProcessing/graphics/PV3Readers/PV3blockMeshReader/vtkPV3blockMesh/vtkPV3blockMesh.H
index 1c0322a4258742135b66f4ed04c071aef051125e..aac26fdd3597dc671d3e046fece7061427e34cde 100644
--- a/applications/utilities/postProcessing/graphics/PV3Readers/PV3blockMeshReader/vtkPV3blockMesh/vtkPV3blockMesh.H
+++ b/applications/utilities/postProcessing/graphics/PV3Readers/PV3blockMeshReader/vtkPV3blockMesh/vtkPV3blockMesh.H
@@ -312,8 +312,7 @@ public:
//- Destructor
-
- ~vtkPV3blockMesh();
+ ~vtkPV3blockMesh();
// Member Functions
diff --git a/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_part_coords.H b/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_part_coords.H
index 68ebbf768e5fab26c2a1b0efcf1ff4ddb043bab2..de8c90d7aef90cd0687ac43d80a70b5927c391ce 100644
--- a/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_part_coords.H
+++ b/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_part_coords.H
@@ -47,19 +47,13 @@ int USERD_get_part_coords
}
else if (part_number == nPatches+2)
{
-
label indx = 1;
- for
- (
- Cloud<passiveParticle>::iterator elmnt = sprayPtr->begin();
- elmnt != sprayPtr->end();
- ++elmnt
- )
+ forAllConstIter(Cloud<passiveParticle>, *sprayPtr, iter)
{
- coord_array[0][indx] = (float)elmnt().position().x();
- coord_array[1][indx] = (float)elmnt().position().y();
- coord_array[2][indx] = (float)elmnt().position().z();
+ coord_array[0][indx] = (float)iter().position().x();
+ coord_array[1][indx] = (float)iter().position().y();
+ coord_array[2][indx] = (float)iter().position().z();
indx++;
}
diff --git a/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_part_node_ids.H b/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_part_node_ids.H
index c05af41ccd674ead3f2058c7c9938451a26a60a4..b270a1b57b0658ebb3208c7277f90d5fc1724890 100644
--- a/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_part_node_ids.H
+++ b/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_part_node_ids.H
@@ -17,7 +17,7 @@ int USERD_get_part_node_ids
nodeid_array[indx] = indx + 1;
}
}
- else if (part_number < nPatches+2)
+ else if (part_number < nPatches+2)
{
label patchi = part_number-2;
@@ -32,18 +32,14 @@ int USERD_get_part_node_ids
}
}
- else if (part_number == nPatches+2)
+ else if (part_number == nPatches+2)
{
label indx = 0;
- for
- (
- Cloud<passiveParticle>::iterator elmnt = sprayPtr->begin();
- elmnt != sprayPtr->end();
- ++elmnt
- )
+
+ forAllConstIter(Cloud<passiveParticle>, *sprayPtr, iter)
{
- nodeid_array[indx] = indx + 1;
- indx++;
+ nodeid_array[indx] = indx + 1;
+ indx++;
}
}
else
diff --git a/applications/utilities/postProcessing/graphics/fieldview9Reader/readerDatabase.H b/applications/utilities/postProcessing/graphics/fieldview9Reader/readerDatabase.H
index da0e634839665cc6119e9bfd0a5687e9090d766b..211c78b39e7a87f89c2cb4b71a2defd6e2de8c5f 100644
--- a/applications/utilities/postProcessing/graphics/fieldview9Reader/readerDatabase.H
+++ b/applications/utilities/postProcessing/graphics/fieldview9Reader/readerDatabase.H
@@ -116,9 +116,8 @@ public:
readerDatabase();
- // Destructor
-
- ~readerDatabase();
+ //- Destructor
+ ~readerDatabase();
// Member Functions
diff --git a/applications/utilities/preProcessing/mapFields/MapConsistentVolFields.H b/applications/utilities/preProcessing/mapFields/MapConsistentVolFields.H
index e18a7d55c3c156bddb6adbf0b93f06b8a37ff545..fd8d4163dfee25c520caea0fd93dd7d649fb0749 100644
--- a/applications/utilities/preProcessing/mapFields/MapConsistentVolFields.H
+++ b/applications/utilities/preProcessing/mapFields/MapConsistentVolFields.H
@@ -52,12 +52,7 @@ void MapConsistentVolFields
IOobjectList fields = objects.lookupClass(fieldClassName);
- for
- (
- IOobjectList::iterator fieldIter = fields.begin();
- fieldIter != fields.end();
- ++fieldIter
- )
+ forAllIter(IOobjectList, fields, fieldIter)
{
Info<< " interpolating " << fieldIter()->name()
<< endl;
diff --git a/applications/utilities/preProcessing/mapFields/MapVolFields.H b/applications/utilities/preProcessing/mapFields/MapVolFields.H
index c8b360f98fb786f75a2adfd19ba08574c3baa7be..7bc16c3c4e7a910551222d6aaf731eadc98a6096 100644
--- a/applications/utilities/preProcessing/mapFields/MapVolFields.H
+++ b/applications/utilities/preProcessing/mapFields/MapVolFields.H
@@ -52,12 +52,7 @@ void MapVolFields
IOobjectList fields = objects.lookupClass(fieldClassName);
- for
- (
- IOobjectList::iterator fieldIter = fields.begin();
- fieldIter != fields.end();
- ++fieldIter
- )
+ forAllIter(IOobjectList, fields, fieldIter)
{
IOobject fieldTargetIOobject
(
diff --git a/applications/utilities/preProcessing/mapFields/UnMapped.H b/applications/utilities/preProcessing/mapFields/UnMapped.H
index bd480e4cfa3e4cb392e4c77f6c3faee4bd76b0f4..8e5ee427923e34f4b5fee4708f6e80c6399f1000 100644
--- a/applications/utilities/preProcessing/mapFields/UnMapped.H
+++ b/applications/utilities/preProcessing/mapFields/UnMapped.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 1991-2009 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 1991-2010 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -39,12 +39,7 @@ void UnMapped(const IOobjectList& objects)
{
IOobjectList fields = objects.lookupClass(Type::typeName);
- for
- (
- IOobjectList::iterator fieldIter = fields.begin();
- fieldIter != fields.end();
- ++fieldIter
- )
+ forAllConstIter(IOobjectList, fields, fieldIter)
{
mvBak(fieldIter()->objectPath(), "unmapped");
}
diff --git a/applications/utilities/surface/surfaceSplitNonManifolds/surfaceSplitNonManifolds.C b/applications/utilities/surface/surfaceSplitNonManifolds/surfaceSplitNonManifolds.C
index 2d58fcd313f5988ac6ad78a9f3e8577188a91b1e..ce32c54206e54bb19b2e86bd923e9aad761042ef 100644
--- a/applications/utilities/surface/surfaceSplitNonManifolds/surfaceSplitNonManifolds.C
+++ b/applications/utilities/surface/surfaceSplitNonManifolds/surfaceSplitNonManifolds.C
@@ -126,18 +126,13 @@ void dumpFaces
OFstream os(fName);
- for
- (
- Map<label>::const_iterator iter = connectedFaces.begin();
- iter != connectedFaces.end();
- ++iter
- )
+ forAllConstIter(Map<label>, connectedFaces, iter)
{
const labelledTri& f = surf.localFaces()[iter.key()];
point ctr(f.centre(surf.localPoints()));
- os << "v " << ctr.x() << ' ' << ctr.y() << ' ' << ctr.z() << endl;
+ os << "v " << ctr.x() << ' ' << ctr.y() << ' ' << ctr.z() << endl;
}
}
@@ -502,14 +497,9 @@ void calcPointVecs
boolList edgeDone(surf.nEdges(), false);
- for
- (
- Map<label>::const_iterator iter = faceToEdge.begin();
- iter != faceToEdge.end();
- ++iter
- )
+ forAllConstIter(Map<label>, faceToEdge, iter)
{
- label edgeI = iter();
+ const label edgeI = iter();
if (!edgeDone[edgeI])
{
@@ -610,15 +600,9 @@ void renumberFaces
List<labelledTri>& newTris
)
{
- for
- (
- Map<label>::const_iterator iter = faceToEdge.begin();
- iter != faceToEdge.end();
- ++iter
- )
+ forAllConstIter(Map<label>, faceToEdge, iter)
{
- label faceI = iter.key();
-
+ const label faceI = iter.key();
const labelledTri& f = surf.localFaces()[faceI];
forAll(f, fp)
diff --git a/applications/utilities/thermophysical/equilibriumCO/equilibriumCO.C b/applications/utilities/thermophysical/equilibriumCO/equilibriumCO.C
index 2a791d3bb436a8ae1dae8cb7404bdfcdf8a73661..c9c02d199b4c5e5685a3cddba0ceb31234f471ca 100644
--- a/applications/utilities/thermophysical/equilibriumCO/equilibriumCO.C
+++ b/applications/utilities/thermophysical/equilibriumCO/equilibriumCO.C
@@ -51,7 +51,6 @@ int main(int argc, char *argv[])
{
# include "setRootCase.H"
-
# include "createTime.H"
Info<< nl << "Reading Burcat data IOdictionary" << endl;
@@ -119,17 +118,11 @@ int main(int argc, char *argv[])
);
- for
- (
- SLPtrList<thermo>::iterator EQreactionsIter = EQreactions.begin();
- EQreactionsIter != EQreactions.end();
- ++EQreactionsIter
- )
+ forAllConstIter(SLPtrList<thermo>, EQreactions, iter)
{
- Info<< "Kc(EQreactions) = " << EQreactionsIter().Kc(T) << endl;
+ Info<< "Kc(EQreactions) = " << iter().Kc(T) << endl;
}
-
Info<< nl << "end" << endl;
return 0;
diff --git a/bin/foamCopySettings b/bin/foamCopySettings
index cfa9d901e42362950a55e11016c915fe97ffe3d7..9e1969c96bd3c48886194760309882e9e1650996 100755
--- a/bin/foamCopySettings
+++ b/bin/foamCopySettings
@@ -37,9 +37,12 @@
# to add any custom rsync options.
#-------------------------------------------------------------------------------
Script=${0##*/}
-if [ "$1" = "-h" -o "$1" = "-help" -o "$#" -ne 2 ]
-then
+
+#------------------------------------------------------------------------------
+usage() {
+ while [ "$#" -ge 1 ]; do echo "$1" 1>&2; shift; done
cat <<USAGE 1>&2
+
Usage: $Script srcDir dstDir
Copy OpenFOAM settings from one case to another, without copying
@@ -52,7 +55,29 @@ Note
USAGE
exit 1
-fi
+}
+#------------------------------------------------------------------------------
+
+# parse options
+while [ "$#" -gt 0 ]
+do
+ case "$1" in
+ -h | -help)
+ usage
+ ;;
+ -*)
+ usage "unknown option: '$*'"
+ ;;
+ *)
+ break
+ ;;
+ esac
+done
+
+# need rsync
+type rsync >/dev/null 2>&1 || usage "Error: 'rsync' seems to be missing"
+
+[ "$#" -eq 2 ] || usage "Error: incorrect number of arguments"
srcDir=${1%/}
dstDir=${2%/}
diff --git a/bin/foamNewCase b/bin/foamNewCase
index 6d83d5c5dd37c8434423ec427fd4577222e8a62d..52cd516bb695f44160f40c1398667ba6d4a7a049 100755
--- a/bin/foamNewCase
+++ b/bin/foamNewCase
@@ -55,7 +55,6 @@ USAGE
exit 1
}
#------------------------------------------------------------------------------
-
unset appName caseName listOpt
# parse options
@@ -84,12 +83,19 @@ do
version="$2"
shift 2
;;
+ -*)
+ usage "unknown option: '$*'"
+ ;;
*)
- usage "unknown option/argument: '$*'"
+ usage "unexpected argument: '$*'"
;;
esac
done
+# need rsync, except for when listing
+type rsync >/dev/null 2>&1 || [ "$listOpt" = true ] || usage "Error: 'rsync' seems to be missing"
+
+
#------------------------------------------------------------------------------
[ -n "$version" ] || {
diff --git a/doc/codingStyleGuide.org b/doc/codingStyleGuide.org
index 27725cf1cd0addeeba79b5e658b9d52d6f5c6551..abd7bd1a0095736f204b12b7a484a80aca165d20 100644
--- a/doc/codingStyleGuide.org
+++ b/doc/codingStyleGuide.org
@@ -2,7 +2,7 @@
#
#+TITLE: OpenFOAM C++ style guide
#+AUTHOR: OpenCFD Ltd.
-#+DATE: November 2009
+#+DATE: April 2010
#+LINK: http://www.opencfd.co.uk
#+OPTIONS: author:nil ^:{}
@@ -18,97 +18,116 @@
made with 'break' or 'continue' as part of a control structure.
+ stream output
- =<<= is always four characters after the start of the stream,
- so that the =<<= symbols align, i.e.
+ + =<<= is always four characters after the start of the stream,
+ so that the =<<= symbols align, i.e.
- :Info<< ...
- :os << ...
+#+BEGIN_EXAMPLE
+ Info<< ...
+ os << ...
+#+END_EXAMPLE
so
- :WarningIn("className::functionName()")
- : << "Warning message"
+#+BEGIN_EXAMPLE
+ WarningIn("className::functionName()")
+ << "Warning message"
+#+END_EXAMPLE
NOT
- :WarningIn("className::functionName()")
- :<< "Warning message"
+#+BEGIN_EXAMPLE
+ WarningIn("className::functionName()")
+ << "Warning message"
+#+END_EXAMPLE
+ no unnecessary class section headers, i.e. remove
- :// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
- :
- :// Check
- :
- :// Edit
- :
- :// Write
+#+BEGIN_EXAMPLE
+ // * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
+
+ // Check
+
+ // Edit
+
+ // Write
+#+END_EXAMPLE
+
if they contain nothing, even if planned for 'future use'
+ class titles are centred
- :/*---------------------------------------------------------------------------*\
- : Class exampleClass Declaration
- :\*---------------------------------------------------------------------------*/
+#+BEGIN_EXAMPLE
+ /*---------------------------------------------------------------------------*\
+ Class exampleClass Declaration
+ \*---------------------------------------------------------------------------*/
+#+END_EXAMPLE
NOT
- :/*---------------------------------------------------------------------------*\
- : Class exampleClass Declaration
- :\*---------------------------------------------------------------------------*/
+#+BEGIN_EXAMPLE
+ /*---------------------------------------------------------------------------*\
+ Class exampleClass Declaration
+ \*---------------------------------------------------------------------------*/
+#+END_EXAMPLE
*** The =.H= Files
+ header file spacing
- Leave two empty lines between sections (as per functions in the =.C= file etc)
+ + Leave two empty lines between sections
+ (as per functions in the =.C= file etc)
+ use "//- Comment" comments in header file
+ add descriptions to class data and functions
+ destructor
- If adding a comment to the destructor - use //- and code as a normal function:
+ + If adding a comment to the destructor -
+ use //- and code as a normal function:
- ://- Destructor
- :~className();
+#+BEGIN_EXAMPLE
+ //- Destructor
+ ~className();
+#+END_EXAMPLE
+ inline functions
- Use inline functions where appropriate in a separate classNameI.H file.
- Avoid cluttering the header file with function bodies.
+ + Use inline functions where appropriate in a separate classNameI.H file.
+ Avoid cluttering the header file with function bodies.
*** The =.C= Files
+ Do not open/close namespaces in a =.C= file
- Fully scope the function name, i.e.
+ + Fully scope the function name, i.e.
- :Foam::returnType Foam::className::functionName()
+#+BEGIN_EXAMPLE
+ Foam::returnType Foam::className::functionName()
+#+END_EXAMPLE
NOT
- :namespace Foam
- :{
- : ...
- :
- : returnType className::functionName()
- :
- : ...
- :}
+#+BEGIN_EXAMPLE
+ namespace Foam
+ {
+ ...
+ returnType className::functionName()
+ ...
+ }
+#+END_EXAMPLE
EXCEPTION
When there are multiple levels of namespace, they may be used in the =.C=
file, i.e.
- :namespace Foam
- :{
- :namespace compressible
- :{
- :namespace RASModels
- :{
- :
- : ...
- :
- :} // End namespace RASModels
- :} // End namespace compressible
- :} // End namespace Foam
+#+BEGIN_EXAMPLE
+ namespace Foam
+ {
+ namespace compressible
+ {
+ namespace RASModels
+ {
+ ...
+ } // End namespace RASModels
+ } // End namespace compressible
+ } // End namespace Foam
+#+END_EXAMPLE
+ Use two empty lines between functions
@@ -131,64 +150,95 @@
If a class is virtual - make all derived classes virtual.
*** Conditional Statements
- :if (condition)
- :{
- : code;
- :}
+#+BEGIN_EXAMPLE
+ if (condition)
+ {
+ code;
+ }
+#+END_EXAMPLE
OR
- :if
- :(
- : long condition
- :)
- :{
- : code;
- :}
+#+BEGIN_EXAMPLE
+ if
+ (
+ long condition
+ )
+ {
+ code;
+ }
+#+END_EXAMPLE
NOT (no space between "if" and "(")
- :if(condition)
- :{
- : code;
- :}
+#+BEGIN_EXAMPLE
+ if(condition)
+ {
+ code;
+ }
+#+END_EXAMPLE
*** =for= and =while= Loops
- :for (i = 0; i < maxI; i++)
- :{
- : code;
- :}
+
+#+BEGIN_EXAMPLE
+ for (i = 0; i < maxI; i++)
+ {
+ code;
+ }
+#+END_EXAMPLE
OR
- :for
- :(
- : i = 0;
- : i < maxI;
- : i++
- :)
- :{
- : code;
- :}
+#+BEGIN_EXAMPLE
+ for
+ (
+ i = 0;
+ i < maxI;
+ i++
+ )
+ {
+ code;
+ }
+#+END_EXAMPLE
NOT (no space between "for" and "(")
- :for(i = 0; i < maxI; i++)
- :{
- : code;
- :}
+#+BEGIN_EXAMPLE
+ for(i = 0; i < maxI; i++)
+ {
+ code;
+ }
+#+END_EXAMPLE
Note that when indexing through iterators, it is often slightly more
efficient to use the pre-increment form. Eg, =++iter= instead of =iter++=
-*** =forAll= , =forAllIter=, etc. loops
+*** =forAll=, =forAllIter=, =forAllConstIter=, etc. loops
like =for= loops, but
- :forAll(
+#+BEGIN_EXAMPLE
+ forAll(
+#+END_EXAMPLE
NOT
- :forAll (
+#+BEGIN_EXAMPLE
+ forAll (
+#+END_EXAMPLE
+
+ Using the =forAllIter= and =forAllConstIter= macros is generally
+ advantageous - less typing, easier to find later. However, since
+ they are macros, they will fail if the iterated object contains
+ any commas.
+
+ The following will FAIL!:
+
+#+BEGIN_EXAMPLE
+ forAllIter(HashTable<labelPair, edge, Hash<edge> >, foo, iter)
+#+END_EXAMPLE
+
+ These convenience macros are also generally avoided in other
+ container classes and OpenFOAM primitive classes.
*** Splitting Over Multiple Lines
@@ -198,64 +248,81 @@
+ do not put "const" onto its own line - use a split to keep it with
the function name and arguments.
- so:
+ so
- :const Foam::longReturnTypeName&
- :Foam::longClassName::longFunctionName const
+#+BEGIN_EXAMPLE
+ const Foam::longReturnTypeName&
+ Foam::longClassName::longFunctionName const
+#+END_EXAMPLE
NOT
- :const Foam::longReturnTypeName&
- : Foam::longClassName::longFunctionName const
+#+BEGIN_EXAMPLE
+ const Foam::longReturnTypeName&
+ Foam::longClassName::longFunctionName const
+#+END_EXAMPLE
NOR
- :const Foam::longReturnTypeName& Foam::longClassName::longFunctionName
- :const
+#+BEGIN_EXAMPLE
+ const Foam::longReturnTypeName& Foam::longClassName::longFunctionName
+ const
+#+END_EXAMPLE
NOR
- :const Foam::longReturnTypeName& Foam::longClassName::
- :longFunctionName const
-
+#+BEGIN_EXAMPLE
+ const Foam::longReturnTypeName& Foam::longClassName::
+ longFunctionName const
+#+END_EXAMPLE
+ if it needs to be split again, split at the function name (leaving
behind the preceding scoping "::"s), and again, left align, i.e.
For example,
- :const Foam::longReturnTypeName&
- :Foam::veryveryveryverylongClassName::
- :veryveryveryverylongFunctionName const
+#+BEGIN_EXAMPLE
+ const Foam::longReturnTypeName&
+ Foam::veryveryveryverylongClassName::
+ veryveryveryverylongFunctionName const
+#+END_EXAMPLE
**** Splitting long lines at an "="
Indent after split
- :variableName =
- : longClassName.longFunctionName(longArgument);
+#+BEGIN_EXAMPLE
+ variableName =
+ longClassName.longFunctionName(longArgument);
+#+END_EXAMPLE
OR (where necessary)
- :variableName =
- : longClassName.longFunctionName
- : (
- : longArgument1,
- : longArgument2
- : );
+#+BEGIN_EXAMPLE
+ variableName =
+ longClassName.longFunctionName
+ (
+ longArgument1,
+ longArgument2
+ );
+#+END_EXAMPLE
NOT
- :variableName =
- :longClassName.longFunctionName(longArgument);
+#+BEGIN_EXAMPLE
+ variableName =
+ longClassName.longFunctionName(longArgument);
+#+END_EXAMPLE
NOR
- :variableName = longClassName.longFunctionName
- :(
- : longArgument1,
- : longArgument2
- :);
+#+BEGIN_EXAMPLE
+ variableName = longClassName.longFunctionName
+ (
+ longArgument1,
+ longArgument2
+ );
+#+END_EXAMPLE
*** Maths and Logic
+ operator spacing
@@ -267,34 +334,41 @@
+ a || b, a && b
+ splitting formulae over several lines
+
Split and indent as per "splitting long lines at an "=""
with the operator on the lower line. Align operator so that first
variable, function or bracket on the next line is 4 spaces indented i.e.
- :variableName =
- : a * (a + b)
- : - exp(c/d)
- : * (k + t);
+#+BEGIN_EXAMPLE
+ variableName =
+ a * (a + b)
+ - exp(c/d)
+ * (k + t);
+#+END_EXAMPLE
This is sometime more legible when surrounded by extra parentheses:
- :variableName =
- :(
- : a * (a + b)
- : - exp(c/d)
- : * (k + t)
- :);
+#+BEGIN_EXAMPLE
+ variableName =
+ (
+ a * (a + b)
+ - exp(c/d)
+ * (k + t)
+ );
+#+END_EXAMPLE
+ splitting logical tests over several lines
outdent the operator so that the next variable to test is aligned with
the four space indentation, i.e.
- :if
- :(
- : a == true
- : && b == c
- :)
+#+BEGIN_EXAMPLE
+ if
+ (
+ a == true
+ && b == c
+ )
+#+END_EXAMPLE
** Documentation
@@ -315,14 +389,16 @@
For example,
- :Class
- : Foam::myClass
- :
- :Description
- : A class for specifying the documentation style.
- :
- : The class is implemented as a set of recommendations that may
- : sometimes be useful.
+#+BEGIN_EXAMPLE
+ Class
+ Foam::myClass
+
+ Description
+ A class for specifying the documentation style.
+
+ The class is implemented as a set of recommendations that may
+ sometimes be useful.
+#+END_EXAMPLE
+ The class name must be qualified by its namespace, otherwise Doxygen
will think you are documenting some other class.
@@ -332,11 +408,13 @@
finding these under-documented classes later.
- :Class
- : Foam::myUnderDocumentedClass
- :
- :Description
- : Foam::myUnderDocumentedClass
+#+BEGIN_EXAMPLE
+ Class
+ Foam::myUnderDocumentedClass
+
+ Description
+ Foam::myUnderDocumentedClass
+#+END_EXAMPLE
+ Use 'Class' and 'Namespace' tags in the header files.
@@ -346,11 +424,13 @@
The Description block then applies to documenting the file itself.
- :InClass
- : Foam::myClass
- :
- :Description
- : Implements the read and writing of files.
+#+BEGIN_EXAMPLE
+ InClass
+ Foam::myClass
+
+ Description
+ Implements the read and writing of files.
+#+END_EXAMPLE
*** Doxygen Special Commands
@@ -368,29 +448,31 @@
Doxygen commmands can be inserted within the block without problems.
- :InClass
- : Foam::myClass
- :
- :Description
- : Implements the read and writing of files.
- :
- : An example input file:
- : @verbatim
- : patchName
- : {
- : type myPatchType;
- : refValue 100;
- : value uniform 1;
- : }
- : @endverbatim
- :
- : Within the implementation, a loop over all patches is done:
- : @code
- : forAll(patches, patchI)
- : {
- : ... // some operation
- : }
- : @endcode
+#+BEGIN_EXAMPLE
+ InClass
+ Foam::myClass
+
+ Description
+ Implements the read and writing of files.
+
+ An example input file:
+ @verbatim
+ patchName
+ {
+ type myPatchType;
+ refValue 100;
+ value uniform 1;
+ }
+ @endverbatim
+
+ Within the implementation, a loop over all patches is done:
+ @code
+ forAll(patches, patchI)
+ {
+ ... // some operation
+ }
+ @endcode
+#+END_EXAMPLE
*** HTML Special Commands
@@ -399,28 +481,34 @@
Doxygen to complain, but seem to work anyhow.
eg,
- + The template with type <HR> is a bad example.
+ + The template with type =<HR>= is a bad example.
- + The template with type \<HR\> is a better example.
+ + The template with type =\<HR\>= is a better example.
- + The template with type <Type> causes Doxygen to complain about an
+ + The template with type =<Type>= causes Doxygen to complain about an
unknown html type, but it seems to work okay anyhow.
*** Documenting Namespaces
- + If namespaces are explictly declared with the Namespace() macro,
+ + If namespaces are explictly declared with the =Namespace()= macro,
they should be documented there.
+ If the namespaces is used to hold sub-models, the namespace can be
documented in the same file as the class with the model selector.
eg,
- :documented namespace 'Foam::functionEntries' within the
- :class 'Foam::functionEntry'
+
+#+BEGIN_EXAMPLE
+ documented namespace 'Foam::functionEntries' within the
+ class 'Foam::functionEntry'
+#+END_EXAMPLE
+ If nothing else helps, find some sensible header.
eg,
- :namespace 'Foam' is documented in the foamVersion.H file
+
+#+BEGIN_EXAMPLE
+ namespace 'Foam' is documented in the foamVersion.H file
+#+END_EXAMPLE
*** Documenting Typedefs and classes defined via macros
@@ -459,7 +547,9 @@
Press.
Eg,
- :myClass.initialize()
+#+BEGIN_EXAMPLE
+ myClass.initialize()
+#+END_EXAMPLE
The word "its" (possesive) vs. "it's" (colloquial for "it is" or "it has")
@@ -468,4 +558,3 @@
Any remaining "it's" are likely an incorrect spelling of "its".
-
diff --git a/src/ODE/ODE/ODE.H b/src/ODE/ODE/ODE.H
index 91660dc2e18d66ad9556b799f111ccf2a8bf8941..0523e334b1fd168b760fb5463fc24a4a8be20037 100644
--- a/src/ODE/ODE/ODE.H
+++ b/src/ODE/ODE/ODE.H
@@ -56,10 +56,9 @@ public:
{}
- // Destructor
-
- virtual ~ODE()
- {}
+ //- Destructor
+ virtual ~ODE()
+ {}
// Member Functions
diff --git a/src/ODE/ODESolvers/ODESolver/ODESolver.H b/src/ODE/ODESolvers/ODESolver/ODESolver.H
index 7dde5e108d8ea630b727175e4650bc4d7ee8e61c..ea3607e008ea748c7f96ff3f6e052b52d11d3e6d 100644
--- a/src/ODE/ODESolvers/ODESolver/ODESolver.H
+++ b/src/ODE/ODESolvers/ODESolver/ODESolver.H
@@ -103,10 +103,9 @@ public:
);
- // Destructor
-
- virtual ~ODESolver()
- {}
+ //- Destructor
+ virtual ~ODESolver()
+ {}
// Member Functions
diff --git a/src/OSspecific/POSIX/regExp.H b/src/OSspecific/POSIX/regExp.H
index 2aae9b38a02a9d45c872ae438fcd403b815f9f1c..7eb609b246866bc1a21ec9b2be7d5b0de8a76ff8 100644
--- a/src/OSspecific/POSIX/regExp.H
+++ b/src/OSspecific/POSIX/regExp.H
@@ -102,9 +102,8 @@ public:
//- Construct from std::string (or string), optionally ignoring case
regExp(const std::string&, const bool ignoreCase=false);
- // Destructor
-
- ~regExp();
+ //- Destructor
+ ~regExp();
// Member functions
diff --git a/src/OSspecific/POSIX/signals/sigFpe.H b/src/OSspecific/POSIX/signals/sigFpe.H
index 8cdfa2207169a511bff5ada6fcb1d7a6275da79d..549efb992875b72f146f6731b8b4506870308294 100644
--- a/src/OSspecific/POSIX/signals/sigFpe.H
+++ b/src/OSspecific/POSIX/signals/sigFpe.H
@@ -99,9 +99,8 @@ public:
sigFpe();
- // Destructor
-
- ~sigFpe();
+ //- Destructor
+ ~sigFpe();
// Member functions
diff --git a/src/OSspecific/POSIX/signals/sigInt.H b/src/OSspecific/POSIX/signals/sigInt.H
index 1344fedf90ea364568ad17bf985665678fc32294..4c2f15ba2ef37f1274e71a2520a4aadf16507f7d 100644
--- a/src/OSspecific/POSIX/signals/sigInt.H
+++ b/src/OSspecific/POSIX/signals/sigInt.H
@@ -70,9 +70,8 @@ public:
sigInt();
- // Destructor
-
- ~sigInt();
+ //- Destructor
+ ~sigInt();
// Member functions
diff --git a/src/OSspecific/POSIX/signals/sigQuit.H b/src/OSspecific/POSIX/signals/sigQuit.H
index 46b110dda1c79edb8a31a50f47f7e39a0e559678..108ad94d794549827cc5f7754a37d26ea2e280c8 100644
--- a/src/OSspecific/POSIX/signals/sigQuit.H
+++ b/src/OSspecific/POSIX/signals/sigQuit.H
@@ -70,9 +70,8 @@ public:
sigQuit();
- // Destructor
-
- ~sigQuit();
+ //- Destructor
+ ~sigQuit();
// Member functions
diff --git a/src/OSspecific/POSIX/signals/sigSegv.H b/src/OSspecific/POSIX/signals/sigSegv.H
index 4dc1ab73895abaf89bdfe89cd6fde3f9a81c3f20..276644e2571fce6c455d40ebd13df2a4fce2589d 100644
--- a/src/OSspecific/POSIX/signals/sigSegv.H
+++ b/src/OSspecific/POSIX/signals/sigSegv.H
@@ -70,9 +70,8 @@ public:
sigSegv();
- // Destructor
-
- ~sigSegv();
+ //- Destructor
+ ~sigSegv();
// Member functions
diff --git a/src/OSspecific/POSIX/timer.H b/src/OSspecific/POSIX/timer.H
index 861fccbb4bccfee8ea0c713908c2a9f489827704..c74b08f2d3880ef25300f9f99ef722f472ae3b6c 100644
--- a/src/OSspecific/POSIX/timer.H
+++ b/src/OSspecific/POSIX/timer.H
@@ -117,9 +117,8 @@ public:
timer(const unsigned int newTimeOut);
- // Destructor
-
- ~timer();
+ //- Destructor
+ ~timer();
};
diff --git a/src/OpenFOAM/algorithms/subCycle/subCycle.H b/src/OpenFOAM/algorithms/subCycle/subCycle.H
index 5a5d907cfb04f7ac6380736d4e0bd59ed8a0b500..6dd105e334e3ab7331d2c6c5811a26f3506193c5 100644
--- a/src/OpenFOAM/algorithms/subCycle/subCycle.H
+++ b/src/OpenFOAM/algorithms/subCycle/subCycle.H
@@ -40,7 +40,7 @@ namespace Foam
{
/*---------------------------------------------------------------------------*\
- Class subCycle Declaration
+ Class subCycle Declaration
\*---------------------------------------------------------------------------*/
template<class GeometricField>
@@ -79,21 +79,19 @@ public:
{}
- // Destructor
+ //- Destructor
+ ~subCycle()
+ {
+ // End the subCycleTime, which restores the time state
+ endSubCycle();
- ~subCycle()
- {
- // End the subCycleTime which restores the time state
- endSubCycle();
+ // Correct the time index of the field to correspond to the global time
+ gf_.timeIndex() = gf_.time().timeIndex();
- // Correct the time index of the field to correspond to the global
- // time
- gf_.timeIndex() = gf_.time().timeIndex();
-
- // Reset the old-time field value
- gf_.oldTime() = gf0_;
- gf_.oldTime().timeIndex() = gf_.time().timeIndex();
- }
+ // Reset the old-time field value
+ gf_.oldTime() = gf0_;
+ gf_.oldTime().timeIndex() = gf_.time().timeIndex();
+ }
};
diff --git a/src/OpenFOAM/containers/HashTables/HashPtrTable/HashPtrTable.H b/src/OpenFOAM/containers/HashTables/HashPtrTable/HashPtrTable.H
index 1ca2f7c6413bc5efd3cf11b701967b844e1c4fc2..e355a803fe24face6faa1000b05afba4858e9dd8 100644
--- a/src/OpenFOAM/containers/HashTables/HashPtrTable/HashPtrTable.H
+++ b/src/OpenFOAM/containers/HashTables/HashPtrTable/HashPtrTable.H
@@ -95,9 +95,8 @@ public:
HashPtrTable(const HashPtrTable<T, Key, Hash>&);
- // Destructor
-
- ~HashPtrTable();
+ //- Destructor
+ ~HashPtrTable();
// Member Functions
diff --git a/src/OpenFOAM/containers/Identifiers/Keyed/KeyedI.H b/src/OpenFOAM/containers/Identifiers/Keyed/KeyedI.H
index 0c7e24d65f1d2c5eba8c9cd82d33c5e8f124f263..6bb7c256bd47d8e4a45995f69963c593fdefa78e 100644
--- a/src/OpenFOAM/containers/Identifiers/Keyed/KeyedI.H
+++ b/src/OpenFOAM/containers/Identifiers/Keyed/KeyedI.H
@@ -80,7 +80,7 @@ Foam::Keyed<T>::createList(const List<T>& lst, const label key)
{
List<Keyed<T> > newList(lst.size());
- forAll (lst, elemI)
+ forAll(lst, elemI)
{
newList[elemI] = Keyed(lst[elemI], key);
}
@@ -106,7 +106,7 @@ Foam::Keyed<T>::createList(const List<T>& lst, const List<label>& keys)
List<Keyed<T> > newList(lst.size());
- forAll (lst, elemI)
+ forAll(lst, elemI)
{
newList[elemI] = Keyed(lst[elemI], keys[elemI]);
}
diff --git a/src/OpenFOAM/containers/LinkedLists/accessTypes/ILList/ILList.H b/src/OpenFOAM/containers/LinkedLists/accessTypes/ILList/ILList.H
index d4ac883754650b303aaaf9ef388a3b38a3bf4585..a5bec70c4c2f2500c150ae434d0e306c6dd8e1f6 100644
--- a/src/OpenFOAM/containers/LinkedLists/accessTypes/ILList/ILList.H
+++ b/src/OpenFOAM/containers/LinkedLists/accessTypes/ILList/ILList.H
@@ -120,9 +120,8 @@ public:
ILList(Istream&, const INew&);
- // Destructor
-
- ~ILList();
+ //- Destructor
+ ~ILList();
// Member Functions
diff --git a/src/OpenFOAM/containers/LinkedLists/accessTypes/LList/LList.H b/src/OpenFOAM/containers/LinkedLists/accessTypes/LList/LList.H
index c245ba84d7d832b78ad2d04d90bb704b00fd1b2f..90187dbcc7deb8003c651fced516d8b29f5ed1ef 100644
--- a/src/OpenFOAM/containers/LinkedLists/accessTypes/LList/LList.H
+++ b/src/OpenFOAM/containers/LinkedLists/accessTypes/LList/LList.H
@@ -122,9 +122,8 @@ public:
LList(const LList<LListBase, T>&);
- // Destructor
-
- ~LList();
+ //- Destructor
+ ~LList();
// Member Functions
diff --git a/src/OpenFOAM/containers/LinkedLists/accessTypes/LPtrList/LPtrList.H b/src/OpenFOAM/containers/LinkedLists/accessTypes/LPtrList/LPtrList.H
index 18d6f61e85b1b2ae241f355d811ea2060b9db47e..136f34556fcf8bdaa10dfe7713caf250b8611cbf 100644
--- a/src/OpenFOAM/containers/LinkedLists/accessTypes/LPtrList/LPtrList.H
+++ b/src/OpenFOAM/containers/LinkedLists/accessTypes/LPtrList/LPtrList.H
@@ -112,9 +112,8 @@ public:
LPtrList(const LPtrList&);
- // Destructor
-
- ~LPtrList();
+ //- Destructor
+ ~LPtrList();
// Member Functions
diff --git a/src/OpenFOAM/containers/LinkedLists/linkTypes/DLListBase/DLListBase.H b/src/OpenFOAM/containers/LinkedLists/linkTypes/DLListBase/DLListBase.H
index 9e0742025f90feee5d276783dfe2225731c204a5..d59cf4232d34a94f0044f354a54ce20cb4efa2b0 100644
--- a/src/OpenFOAM/containers/LinkedLists/linkTypes/DLListBase/DLListBase.H
+++ b/src/OpenFOAM/containers/LinkedLists/linkTypes/DLListBase/DLListBase.H
@@ -110,9 +110,8 @@ public:
inline DLListBase(link*);
- // Destructor
-
- ~DLListBase();
+ //- Destructor
+ ~DLListBase();
// Member Functions
diff --git a/src/OpenFOAM/containers/LinkedLists/linkTypes/SLListBase/SLListBase.H b/src/OpenFOAM/containers/LinkedLists/linkTypes/SLListBase/SLListBase.H
index c4dda77aa749b9ac7ff4792b560eed7f0abd5ef2..91ce9dc5ac1f887f4425350a4abd66b3dee5acf4 100644
--- a/src/OpenFOAM/containers/LinkedLists/linkTypes/SLListBase/SLListBase.H
+++ b/src/OpenFOAM/containers/LinkedLists/linkTypes/SLListBase/SLListBase.H
@@ -107,9 +107,8 @@ public:
inline SLListBase(link*);
- // Destructor
-
- ~SLListBase();
+ //- Destructor
+ ~SLListBase();
// Member Functions
diff --git a/src/OpenFOAM/containers/Lists/DynamicList/DynamicList.H b/src/OpenFOAM/containers/Lists/DynamicList/DynamicList.H
index 0efe82bed6a3af0598a398cf4da4928a623e5e6a..794a6a72c23ffd09b556762c8ac0777b9063e0a6 100644
--- a/src/OpenFOAM/containers/Lists/DynamicList/DynamicList.H
+++ b/src/OpenFOAM/containers/Lists/DynamicList/DynamicList.H
@@ -101,10 +101,7 @@ public:
explicit inline DynamicList(const label);
//- Construct copy.
- inline DynamicList
- (
- const DynamicList<T, SizeInc, SizeMult, SizeDiv>&
- );
+ inline DynamicList(const DynamicList<T, SizeInc, SizeMult, SizeDiv>&);
//- Construct from UList. Size set to UList size.
// Also constructs from DynamicList with different sizing parameters.
@@ -141,7 +138,8 @@ public:
// setting values (as per List usage).
inline void setSize(const label);
- //- Alter the addressed list size and fill new space with a constant.
+ //- Alter the addressed list size and fill new space with a
+ // constant.
inline void setSize(const label, const T&);
//- Alter the addressed list size.
@@ -150,7 +148,8 @@ public:
// setting values (as per List usage).
inline void resize(const label);
- //- Alter the addressed list size and fill new space with a constant.
+ //- Alter the addressed list size and fill new space with a
+ // constant.
inline void resize(const label, const T&);
//- Reserve allocation space for at least this size.
@@ -168,10 +167,10 @@ public:
// Returns a reference to the DynamicList.
inline DynamicList<T, SizeInc, SizeMult, SizeDiv>& shrink();
- //- Transfer contents of the argument List into this DynamicList
+ //- Transfer contents of the argument List into this.
inline void transfer(List<T>&);
- //- Transfer contents of the argument DynamicList into this DynamicList
+ //- Transfer contents of the argument DynamicList into this.
inline void transfer(DynamicList<T, SizeInc, SizeMult, SizeDiv>&);
//- Transfer contents to the Xfer container as a plain List
@@ -192,7 +191,8 @@ public:
//- Remove and return the top element
inline T remove();
- //- Return non-const access to an element, resizing list if necessary
+ //- Return non-const access to an element, resizing list if
+ // necessary
inline T& operator()(const label);
//- Assignment of all addressed entries to the given value
diff --git a/src/OpenFOAM/db/Callback/Callback.H b/src/OpenFOAM/db/Callback/Callback.H
index 7117e3400d28a42c154112436d64a61ab8d71b00..991f0e58486c776625b7504a9676f460c67da471 100644
--- a/src/OpenFOAM/db/Callback/Callback.H
+++ b/src/OpenFOAM/db/Callback/Callback.H
@@ -76,9 +76,8 @@ public:
Callback(const Callback<CallbackType>&);
- // Destructor
-
- virtual ~Callback();
+ //- Destructor
+ virtual ~Callback();
// Member functions
diff --git a/src/OpenFOAM/db/CallbackRegistry/CallbackRegistry.H b/src/OpenFOAM/db/CallbackRegistry/CallbackRegistry.H
index c812eceefbccf7081d47d5e1f3fe55c0eef2e43d..655bec7b9fcac0690dc6e49a807dc53b68d3a001 100644
--- a/src/OpenFOAM/db/CallbackRegistry/CallbackRegistry.H
+++ b/src/OpenFOAM/db/CallbackRegistry/CallbackRegistry.H
@@ -86,9 +86,8 @@ public:
CallbackRegistry();
- // Destructor
-
- virtual ~CallbackRegistry();
+ //- Destructor
+ virtual ~CallbackRegistry();
};
diff --git a/src/OpenFOAM/db/IOobject/IOobject.H b/src/OpenFOAM/db/IOobject/IOobject.H
index d6befd123d8bc0d71a4a28299099bb7233c68d56..32ce285bfd811d95ac48b3f52b9590f0df21057b 100644
--- a/src/OpenFOAM/db/IOobject/IOobject.H
+++ b/src/OpenFOAM/db/IOobject/IOobject.H
@@ -219,9 +219,8 @@ public:
}
- // Destructor
-
- virtual ~IOobject();
+ //- Destructor
+ virtual ~IOobject();
// Member Functions
diff --git a/src/OpenFOAM/db/IOobjectList/IOobjectList.C b/src/OpenFOAM/db/IOobjectList/IOobjectList.C
index 02640c095bc6d11220a5d211a0a862ebdd3db89b..de9a64c2a105bed382d6ba0823ec46808dd61c58 100644
--- a/src/OpenFOAM/db/IOobjectList/IOobjectList.C
+++ b/src/OpenFOAM/db/IOobjectList/IOobjectList.C
@@ -152,12 +152,7 @@ Foam::IOobjectList Foam::IOobjectList::lookupClass(const word& ClassName) const
{
IOobjectList objectsOfClass(size());
- for
- (
- HashPtrTable<IOobject>::const_iterator iter = begin();
- iter != end();
- ++iter
- )
+ forAllConstIter(HashPtrTable<IOobject>, *this, iter)
{
if (iter()->headerClassName() == ClassName)
{
@@ -192,12 +187,7 @@ Foam::wordList Foam::IOobjectList::names(const word& ClassName) const
wordList objectNames(size());
label count = 0;
- for
- (
- HashPtrTable<IOobject>::const_iterator iter = begin();
- iter != end();
- ++iter
- )
+ forAllConstIter(HashPtrTable<IOobject>, *this, iter)
{
if (iter()->headerClassName() == ClassName)
{
diff --git a/src/OpenFOAM/db/IOobjectList/IOobjectList.H b/src/OpenFOAM/db/IOobjectList/IOobjectList.H
index 4348af6fdfcf3abd7f151213d1f038f7be4dde67..3b6204945223ec0b19f59e7207cf5ebaa2f47e6b 100644
--- a/src/OpenFOAM/db/IOobjectList/IOobjectList.H
+++ b/src/OpenFOAM/db/IOobjectList/IOobjectList.H
@@ -76,9 +76,8 @@ public:
IOobjectList(const IOobjectList&);
- // Destructor
-
- ~IOobjectList();
+ //- Destructor
+ ~IOobjectList();
// Member functions
diff --git a/src/OpenFOAM/db/IOobjects/IOField/IOField.H b/src/OpenFOAM/db/IOobjects/IOField/IOField.H
index ac0df4d91a0efc934e4be18e003aae7b25d2652f..9c003f80207a5805a8b43ff6bfe66ba4bf4acded 100644
--- a/src/OpenFOAM/db/IOobjects/IOField/IOField.H
+++ b/src/OpenFOAM/db/IOobjects/IOField/IOField.H
@@ -74,9 +74,8 @@ public:
IOField(const IOobject&, const Xfer<Field<Type> >&);
- // Destructor
-
- virtual ~IOField();
+ //- Destructor
+ virtual ~IOField();
// Member functions
diff --git a/src/OpenFOAM/db/IOobjects/IOList/IOList.H b/src/OpenFOAM/db/IOobjects/IOList/IOList.H
index 3ef8ee667b277b97d24e350001ede18ce3a39c25..55c9817b23d3fcad9b11e2e6ea026388b77f6da6 100644
--- a/src/OpenFOAM/db/IOobjects/IOList/IOList.H
+++ b/src/OpenFOAM/db/IOobjects/IOList/IOList.H
@@ -75,9 +75,8 @@ public:
IOList(const IOobject&, const Xfer<List<T> >&);
- // Destructor
-
- virtual ~IOList();
+ //- Destructor
+ virtual ~IOList();
// Member functions
diff --git a/src/OpenFOAM/db/IOobjects/IOMap/IOMap.H b/src/OpenFOAM/db/IOobjects/IOMap/IOMap.H
index ed9669b349ccf7d0213b4836856b523788d45f34..5fd5ba30513e3d0e215f95b6d40f22f00d7ca6bf 100644
--- a/src/OpenFOAM/db/IOobjects/IOMap/IOMap.H
+++ b/src/OpenFOAM/db/IOobjects/IOMap/IOMap.H
@@ -75,9 +75,8 @@ public:
IOMap(const IOobject&, const Xfer<Map<T> >&);
- // Destructor
-
- virtual ~IOMap();
+ //- Destructor
+ virtual ~IOMap();
// Member functions
diff --git a/src/OpenFOAM/db/IOobjects/IOPtrList/IOPtrList.H b/src/OpenFOAM/db/IOobjects/IOPtrList/IOPtrList.H
index 0787e84d9ab95ae956295286fb44f7d5e5cbb1f3..4a78b76c254881ad19458633401d0a6a9c05008d 100644
--- a/src/OpenFOAM/db/IOobjects/IOPtrList/IOPtrList.H
+++ b/src/OpenFOAM/db/IOobjects/IOPtrList/IOPtrList.H
@@ -79,9 +79,8 @@ public:
IOPtrList(const IOobject&, const Xfer<PtrList<T> >&);
- // Destructor
-
- virtual ~IOPtrList();
+ //- Destructor
+ virtual ~IOPtrList();
// Member functions
diff --git a/src/OpenFOAM/db/IOobjects/IOdictionary/IOdictionary.H b/src/OpenFOAM/db/IOobjects/IOdictionary/IOdictionary.H
index c680dc691536d07c55804489ae67e1bfebabe77a..138daa24d873ce9e78bd069a909426c1b79e14f4 100644
--- a/src/OpenFOAM/db/IOobjects/IOdictionary/IOdictionary.H
+++ b/src/OpenFOAM/db/IOobjects/IOdictionary/IOdictionary.H
@@ -71,9 +71,8 @@ public:
IOdictionary(const IOobject&, const dictionary&);
- // Destructor
-
- virtual ~IOdictionary();
+ //- Destructor
+ virtual ~IOdictionary();
// Member functions
diff --git a/src/OpenFOAM/db/IOstreams/Fstreams/IFstream.H b/src/OpenFOAM/db/IOstreams/Fstreams/IFstream.H
index 9cf2327425c4c092f6b881aa0e36d82a53f28c6d..be61d2f6a6d51d166c0153cfccddacec74e395c0 100644
--- a/src/OpenFOAM/db/IOstreams/Fstreams/IFstream.H
+++ b/src/OpenFOAM/db/IOstreams/Fstreams/IFstream.H
@@ -70,9 +70,8 @@ class IFstreamAllocator
IFstreamAllocator(const fileName& pathname);
- // Destructor
-
- ~IFstreamAllocator();
+ //- Destructor
+ ~IFstreamAllocator();
};
@@ -106,9 +105,8 @@ public:
);
- // Destructor
-
- ~IFstream();
+ //- Destructor
+ ~IFstream();
// Member functions
diff --git a/src/OpenFOAM/db/IOstreams/Fstreams/OFstream.H b/src/OpenFOAM/db/IOstreams/Fstreams/OFstream.H
index cc496c582306a41b5c24124254867087222600d8..58e3a2f7a362dfce8130dbaf2b5c523ab3b5384b 100644
--- a/src/OpenFOAM/db/IOstreams/Fstreams/OFstream.H
+++ b/src/OpenFOAM/db/IOstreams/Fstreams/OFstream.H
@@ -69,9 +69,8 @@ class OFstreamAllocator
IOstream::compressionType compression=IOstream::UNCOMPRESSED
);
- // Destructor
-
- ~OFstreamAllocator();
+ //- Destructor
+ ~OFstreamAllocator();
};
@@ -108,9 +107,8 @@ public:
);
- // Destructor
-
- ~OFstream();
+ //- Destructor
+ ~OFstream();
// Member functions
diff --git a/src/OpenFOAM/db/IOstreams/IOstreams/IOstream.H b/src/OpenFOAM/db/IOstreams/IOstreams/IOstream.H
index 33f24c985796e8da47ca74857310f706770911bb..3897b26444a79ad313e0fae86fdedd64beaf02c3 100644
--- a/src/OpenFOAM/db/IOstreams/IOstreams/IOstream.H
+++ b/src/OpenFOAM/db/IOstreams/IOstreams/IOstream.H
@@ -288,10 +288,9 @@ public:
}
- // Destructor
-
- virtual ~IOstream()
- {}
+ //- Destructor
+ virtual ~IOstream()
+ {}
// Member functions
diff --git a/src/OpenFOAM/db/IOstreams/IOstreams/Istream.H b/src/OpenFOAM/db/IOstreams/IOstreams/Istream.H
index 52fddbb408ab1b5bc3a7efa7727620ba10524909..d546395cbd74a9f60c928b4e017a4fdf243f0363 100644
--- a/src/OpenFOAM/db/IOstreams/IOstreams/Istream.H
+++ b/src/OpenFOAM/db/IOstreams/IOstreams/Istream.H
@@ -85,10 +85,9 @@ public:
{}
- // Destructor
-
- virtual ~Istream()
- {}
+ //- Destructor
+ virtual ~Istream()
+ {}
// Member functions
diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/PstreamBuffers.H b/src/OpenFOAM/db/IOstreams/Pstreams/PstreamBuffers.H
index e70eccfabbbeeec88040fa24c314448c6e456020..2229cd72dccafee08b1bc22acad81acd30382c5c 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/PstreamBuffers.H
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/PstreamBuffers.H
@@ -131,9 +131,8 @@ public:
IOstream::versionNumber version=IOstream::currentVersion
);
- // Destructor
-
- ~PstreamBuffers();
+ //- Destructor
+ ~PstreamBuffers();
// Member functions
diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/UIPstream.H b/src/OpenFOAM/db/IOstreams/Pstreams/UIPstream.H
index b848eeb587382dd94458017d18ead840a58b6362..2378d76ac9ba3b23ae23db6b0b19c2e7c04fc79f 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/UIPstream.H
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/UIPstream.H
@@ -106,9 +106,8 @@ public:
UIPstream(const int fromProcNo, PstreamBuffers&);
- // Destructor
-
- ~UIPstream();
+ //- Destructor
+ ~UIPstream();
// Member functions
diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/UOPstream.H b/src/OpenFOAM/db/IOstreams/Pstreams/UOPstream.H
index e88e84d8a31148b0a8cd76f61fbe88eb5c6033e4..bea3a9442358017086748e20fc10edfc9c339281 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/UOPstream.H
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/UOPstream.H
@@ -102,9 +102,8 @@ public:
UOPstream(const int toProcNo, PstreamBuffers&);
- // Destructor
-
- ~UOPstream();
+ //- Destructor
+ ~UOPstream();
// Member functions
diff --git a/src/OpenFOAM/db/IOstreams/Sstreams/ISstream.H b/src/OpenFOAM/db/IOstreams/Sstreams/ISstream.H
index d1454cbff258c2be067b98ebbcb474db6cdb15cf..48d18bd6e8551f49d035f020a9c97934dd032940 100644
--- a/src/OpenFOAM/db/IOstreams/Sstreams/ISstream.H
+++ b/src/OpenFOAM/db/IOstreams/Sstreams/ISstream.H
@@ -86,10 +86,9 @@ public:
);
- // Destructor
-
- virtual ~ISstream()
- {}
+ //- Destructor
+ virtual ~ISstream()
+ {}
// Member functions
diff --git a/src/OpenFOAM/db/IOstreams/StringStreams/IStringStream.H b/src/OpenFOAM/db/IOstreams/StringStreams/IStringStream.H
index b2e0990357d770d68cb2fda5015fd616918b31e4..1dc1001eac2549b23b35df642ea2da99652b3b59 100644
--- a/src/OpenFOAM/db/IOstreams/StringStreams/IStringStream.H
+++ b/src/OpenFOAM/db/IOstreams/StringStreams/IStringStream.H
@@ -92,12 +92,11 @@ public:
{}
- // Destructor
-
- ~IStringStream()
- {
- delete &dynamic_cast<std::istringstream&>(stdStream());
- }
+ //- Destructor
+ ~IStringStream()
+ {
+ delete &dynamic_cast<std::istringstream&>(stdStream());
+ }
// Member functions
diff --git a/src/OpenFOAM/db/IOstreams/StringStreams/OStringStream.H b/src/OpenFOAM/db/IOstreams/StringStreams/OStringStream.H
index 72bfd08e7a093c109039eaa5181c60b134ab0c86..e32e156f2a8462b5ff0b7b46066d36a94b97043f 100644
--- a/src/OpenFOAM/db/IOstreams/StringStreams/OStringStream.H
+++ b/src/OpenFOAM/db/IOstreams/StringStreams/OStringStream.H
@@ -93,12 +93,11 @@ public:
{}
- // Destructor
-
- ~OStringStream()
- {
- delete &dynamic_cast<std::ostringstream&>(stdStream());
- }
+ //- Destructor
+ ~OStringStream()
+ {
+ delete &dynamic_cast<std::ostringstream&>(stdStream());
+ }
// Member functions
diff --git a/src/OpenFOAM/db/IOstreams/hashes/OSHA1stream.H b/src/OpenFOAM/db/IOstreams/hashes/OSHA1stream.H
index 5c16ec54bb6138eca6451f451d5a6b4117b4319b..9754a65afea11059cf0fbf9c2e748205bcc3123e 100644
--- a/src/OpenFOAM/db/IOstreams/hashes/OSHA1stream.H
+++ b/src/OpenFOAM/db/IOstreams/hashes/OSHA1stream.H
@@ -165,12 +165,11 @@ public:
{}
- // Destructor
-
- ~OSHA1stream()
- {
- delete &dynamic_cast<osha1stream&>(stdStream());
- }
+ //- Destructor
+ ~OSHA1stream()
+ {
+ delete &dynamic_cast<osha1stream&>(stdStream());
+ }
// Member functions
diff --git a/src/OpenFOAM/db/IOstreams/token/CompoundToken.H b/src/OpenFOAM/db/IOstreams/token/CompoundToken.H
index 1c0f8e7039d634b36de624f53c605cf06d26c81d..5cc12994e5cf57b2e23d66b2031965733afabed5 100644
--- a/src/OpenFOAM/db/IOstreams/token/CompoundToken.H
+++ b/src/OpenFOAM/db/IOstreams/token/CompoundToken.H
@@ -99,9 +99,8 @@ public:
static autoPtr<CompoundToken> New(const word& type, Istream& is);
- // Destructor
-
- virtual ~CompoundToken();
+ //- Destructor
+ virtual ~CompoundToken();
// Member Functions
diff --git a/src/OpenFOAM/db/IOstreams/token/token.H b/src/OpenFOAM/db/IOstreams/token/token.H
index acf7852c8843d6c2c6a4dd0d0e21acd9e72856c7..fc7d1d6ee7279424b9a20e6fc7a00ca90f558c7e 100644
--- a/src/OpenFOAM/db/IOstreams/token/token.H
+++ b/src/OpenFOAM/db/IOstreams/token/token.H
@@ -167,9 +167,8 @@ public:
static autoPtr<compound> New(const word& type, Istream&);
- // Destructor
-
- virtual ~compound();
+ //- Destructor
+ virtual ~compound();
// Member Functions
@@ -309,9 +308,8 @@ public:
token(Istream&);
- // Destructor
-
- inline ~token();
+ //- Destructor
+ inline ~token();
// Member functions
diff --git a/src/OpenFOAM/db/Time/Time.H b/src/OpenFOAM/db/Time/Time.H
index a5e39b751b3ba5ff3f8c222e672c493331f5cf46..7596fee0c9bee183effc5dedabc18855be1f6ff0 100644
--- a/src/OpenFOAM/db/Time/Time.H
+++ b/src/OpenFOAM/db/Time/Time.H
@@ -209,10 +209,8 @@ public:
);
- // Destructor
-
- //- Virtual destructor
- virtual ~Time();
+ //- Destructor
+ virtual ~Time();
// Member functions
diff --git a/src/OpenFOAM/db/Time/subCycleTime.H b/src/OpenFOAM/db/Time/subCycleTime.H
index 677ea12fe45dcb2aecae724b53ca01c8ab946e8f..02224cfed5ac0dd524b2efdeaae1f2e610daa93a 100644
--- a/src/OpenFOAM/db/Time/subCycleTime.H
+++ b/src/OpenFOAM/db/Time/subCycleTime.H
@@ -63,9 +63,8 @@ public:
subCycleTime(Time&, const label nSubCycles);
- // Destructor
-
- ~subCycleTime();
+ //- Destructor
+ ~subCycleTime();
// Member functions
diff --git a/src/OpenFOAM/db/dictionary/dictionary.C b/src/OpenFOAM/db/dictionary/dictionary.C
index 6e463f8b3b3b5e7614c9beffb47d082399db0371..e2a054dcb1a1bee5013cedb722924ec3b749a110 100644
--- a/src/OpenFOAM/db/dictionary/dictionary.C
+++ b/src/OpenFOAM/db/dictionary/dictionary.C
@@ -502,7 +502,7 @@ Foam::wordList Foam::dictionary::toc() const
wordList keys(size());
label nKeys = 0;
- forAllConstIter(IDLList<entry>::const_iterator, *this, iter)
+ forAllConstIter(IDLList<entry>, *this, iter)
{
keys[nKeys++] = iter().keyword();
}
diff --git a/src/OpenFOAM/db/dictionary/dictionary.H b/src/OpenFOAM/db/dictionary/dictionary.H
index 759287482c9abac259b4a5dc493f4010c96ffbec..c483aed55709ce442f65f56a3ff9a953a8e3c61d 100644
--- a/src/OpenFOAM/db/dictionary/dictionary.H
+++ b/src/OpenFOAM/db/dictionary/dictionary.H
@@ -218,9 +218,8 @@ public:
static autoPtr<dictionary> New(Istream&);
- // Destructor
-
- ~dictionary();
+ //- Destructor
+ ~dictionary();
// Member functions
diff --git a/src/OpenFOAM/db/dlLibraryTable/dlLibraryTable.C b/src/OpenFOAM/db/dlLibraryTable/dlLibraryTable.C
index 2cc16bbec83416db8356090f0b8691ecca72de48..90cf9e5b0e262257483a3616a940137d8d29caff 100644
--- a/src/OpenFOAM/db/dlLibraryTable/dlLibraryTable.C
+++ b/src/OpenFOAM/db/dlLibraryTable/dlLibraryTable.C
@@ -54,7 +54,7 @@ Foam::dlLibraryTable::readDlLibrary::readDlLibrary
Foam::dlLibraryTable::~dlLibraryTable()
{
- forAllIter(dlLibraryTable, *this, iter)
+ forAllConstIter(dlLibraryTable, *this, iter)
{
dlclose(iter.key());
}
diff --git a/src/OpenFOAM/db/dlLibraryTable/dlLibraryTable.H b/src/OpenFOAM/db/dlLibraryTable/dlLibraryTable.H
index e43ccde86b523f29884631766ad6663cee660dd3..cc7bdac50d87270375ea793340a50e52dcaa46d9 100644
--- a/src/OpenFOAM/db/dlLibraryTable/dlLibraryTable.H
+++ b/src/OpenFOAM/db/dlLibraryTable/dlLibraryTable.H
@@ -88,9 +88,8 @@ public:
dlLibraryTable();
- // Destructor
-
- ~dlLibraryTable();
+ //- Destructor
+ ~dlLibraryTable();
// Member Functions
diff --git a/src/OpenFOAM/db/error/error.H b/src/OpenFOAM/db/error/error.H
index 25f837fd6fbe48bca0168c6dfcb966a17d069dc2..9ad11f7a0f63e8e033485b1e71dc25de0b1bdd84 100644
--- a/src/OpenFOAM/db/error/error.H
+++ b/src/OpenFOAM/db/error/error.H
@@ -97,9 +97,8 @@ public:
error(const error&);
- // Destructor
-
- virtual ~error() throw();
+ //- Destructor
+ virtual ~error() throw();
// Member functions
@@ -213,9 +212,8 @@ public:
IOerror(const dictionary&);
- // Destructor
-
- virtual ~IOerror() throw();
+ //- Destructor
+ virtual ~IOerror() throw();
// Member functions
diff --git a/src/OpenFOAM/db/functionObjects/functionObject/functionObject.H b/src/OpenFOAM/db/functionObjects/functionObject/functionObject.H
index 8f4baa22b856f31fc3b59b4de4de068a5432b59d..bc223bedb1bb7a9b662c88cb5092446b9a8197bd 100644
--- a/src/OpenFOAM/db/functionObjects/functionObject/functionObject.H
+++ b/src/OpenFOAM/db/functionObjects/functionObject/functionObject.H
@@ -135,9 +135,8 @@ public:
);
- // Destructor
-
- virtual ~functionObject();
+ //- Destructor
+ virtual ~functionObject();
// Member Functions
diff --git a/src/OpenFOAM/db/functionObjects/outputFilterOutputControl/outputFilterOutputControl.H b/src/OpenFOAM/db/functionObjects/outputFilterOutputControl/outputFilterOutputControl.H
index 87599a3c1bfdecea174e5bc6828409f797a2e0dd..865e4cb2c4d265c62933b13737f76147c1c135fd 100644
--- a/src/OpenFOAM/db/functionObjects/outputFilterOutputControl/outputFilterOutputControl.H
+++ b/src/OpenFOAM/db/functionObjects/outputFilterOutputControl/outputFilterOutputControl.H
@@ -91,8 +91,8 @@ public:
outputFilterOutputControl(const Time&, const dictionary&);
- // Destructor
- ~outputFilterOutputControl();
+ //- Destructor
+ ~outputFilterOutputControl();
// Member Functions
diff --git a/src/OpenFOAM/db/objectRegistry/objectRegistry.H b/src/OpenFOAM/db/objectRegistry/objectRegistry.H
index 433c5ac59a37ccb95534e2f20fd0ba36752e4f46..10165b3e97742918742d0e3d0629bf4677b65773 100644
--- a/src/OpenFOAM/db/objectRegistry/objectRegistry.H
+++ b/src/OpenFOAM/db/objectRegistry/objectRegistry.H
@@ -101,9 +101,8 @@ public:
);
- // Destructor
-
- virtual ~objectRegistry();
+ //- Destructor
+ virtual ~objectRegistry();
// Member functions
diff --git a/src/OpenFOAM/db/regIOobject/regIOobject.H b/src/OpenFOAM/db/regIOobject/regIOobject.H
index 7db81dcec7dcd2375a6e00e2d15abd9dd08d86ea..f3c2cc83f8bc72915e4abf609e3710d6d1796520 100644
--- a/src/OpenFOAM/db/regIOobject/regIOobject.H
+++ b/src/OpenFOAM/db/regIOobject/regIOobject.H
@@ -110,9 +110,8 @@ public:
regIOobject(const regIOobject&, bool registerCopy);
- // Destructor
-
- virtual ~regIOobject();
+ //- Destructor
+ virtual ~regIOobject();
// Member functions
diff --git a/src/OpenFOAM/fields/Fields/Field/FieldMapper.H b/src/OpenFOAM/fields/Fields/Field/FieldMapper.H
index 38ef887f40303aeed178dfa42fd37cd2990a4474..13c4c572ac2eaf81799d09808ee03a8f8e07fa01 100644
--- a/src/OpenFOAM/fields/Fields/Field/FieldMapper.H
+++ b/src/OpenFOAM/fields/Fields/Field/FieldMapper.H
@@ -53,10 +53,9 @@ public:
{}
- // Destructor
-
- virtual ~FieldMapper()
- {}
+ //- Destructor
+ virtual ~FieldMapper()
+ {}
// Member Functions
diff --git a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricBoundaryField.C b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricBoundaryField.C
index 549b6627197c84a8026739f43d3cdfe32bf7d13d..705505a716081df3513281f978d2d0735eb80d15 100644
--- a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricBoundaryField.C
+++ b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricBoundaryField.C
@@ -379,7 +379,7 @@ interfaces() const
{
lduInterfaceFieldPtrsList interfaces(this->size());
- forAll (interfaces, patchi)
+ forAll(interfaces, patchi)
{
if (isA<lduInterfaceField>(this->operator[](patchi)))
{
diff --git a/src/OpenFOAM/fields/GeometricFields/SlicedGeometricField/SlicedGeometricField.C b/src/OpenFOAM/fields/GeometricFields/SlicedGeometricField/SlicedGeometricField.C
index 6fae84d14bceff44cbc374d41a7f84c0ac0f2c09..65d1a7542feffec178cc927b8249b0562894e4c8 100644
--- a/src/OpenFOAM/fields/GeometricFields/SlicedGeometricField/SlicedGeometricField.C
+++ b/src/OpenFOAM/fields/GeometricFields/SlicedGeometricField/SlicedGeometricField.C
@@ -50,7 +50,7 @@ slicedBoundaryField
FieldField<PatchField, Type>& bf = tbf();
- forAll (mesh.boundary(), patchi)
+ forAll(mesh.boundary(), patchi)
{
if (preserveCouples && mesh.boundary()[patchi].coupled())
{
@@ -119,7 +119,7 @@ slicedBoundaryField
FieldField<PatchField, Type>& bf = tbf();
- forAll (mesh.boundary(), patchi)
+ forAll(mesh.boundary(), patchi)
{
if (preserveCouples && mesh.boundary()[patchi].coupled())
{
diff --git a/src/OpenFOAM/fields/GeometricFields/SlicedGeometricField/SlicedGeometricField.H b/src/OpenFOAM/fields/GeometricFields/SlicedGeometricField/SlicedGeometricField.H
index b3ffb50c3c2e9820ea9908ed419010d00c664411..362ddde906a3088bd61f344d3d4dfb3f4179efd2 100644
--- a/src/OpenFOAM/fields/GeometricFields/SlicedGeometricField/SlicedGeometricField.H
+++ b/src/OpenFOAM/fields/GeometricFields/SlicedGeometricField/SlicedGeometricField.H
@@ -158,9 +158,8 @@ public:
);
- // Destructor
-
- ~SlicedGeometricField();
+ //- Destructor
+ ~SlicedGeometricField();
// Member functions
@@ -202,9 +201,8 @@ public:
);
- // Destructor
-
- ~DimensionedInternalField();
+ //- Destructor
+ ~DimensionedInternalField();
};
diff --git a/src/OpenFOAM/fields/cloud/mapClouds.H b/src/OpenFOAM/fields/cloud/mapClouds.H
index b52d15d5405abbdc6b757e2088b3ea453a960932..898fbbdf0f400fe2acca3ce7dd0f78f9d406d5d5 100644
--- a/src/OpenFOAM/fields/cloud/mapClouds.H
+++ b/src/OpenFOAM/fields/cloud/mapClouds.H
@@ -49,12 +49,7 @@ inline void mapClouds(const objectRegistry& db, const mapPolyMesh& mapper)
{
HashTable<const cloud*> clouds(db.lookupClass<cloud>());
- for
- (
- HashTable<const cloud*>::iterator iter = clouds.begin();
- iter != clouds.end();
- ++iter
- )
+ forAllIter(HashTable<const cloud*>, clouds, iter)
{
cloud& c = const_cast<cloud&>(*iter());
diff --git a/src/OpenFOAM/fields/pointPatchFields/constraint/processor/processorPointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/constraint/processor/processorPointPatchField.H
index 17bcfc1cb8a7c1189a48ae080723462ae48ef366..b5474e46d7a20cd6ee8b125516d1b926e5e3f0e8 100644
--- a/src/OpenFOAM/fields/pointPatchFields/constraint/processor/processorPointPatchField.H
+++ b/src/OpenFOAM/fields/pointPatchFields/constraint/processor/processorPointPatchField.H
@@ -126,9 +126,8 @@ public:
}
- // Destructor
-
- ~processorPointPatchField();
+ //- Destructor
+ ~processorPointPatchField();
// Member functions
diff --git a/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchField.C b/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchField.C
index 8185f4ae422615cadd4c47f003e2cb37ca734ae3..1b18dbdc218497f86751e78a2091e23f63833c83 100644
--- a/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchField.C
+++ b/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchField.C
@@ -144,7 +144,7 @@ tmp<Field<Type1> > pointPatchField<Type>::patchInternalField
tmp<Field<Type1> > tvalues(new Field<Type1>(meshPoints.size()));
Field<Type1>& values = tvalues();
- forAll (meshPoints, pointI)
+ forAll(meshPoints, pointI)
{
values[pointI] = iF[meshPoints[pointI]];
}
@@ -202,7 +202,7 @@ void pointPatchField<Type>::addToInternalField
// Get the addressing
const labelList& mp = patch().meshPoints();
- forAll (mp, pointI)
+ forAll(mp, pointI)
{
iF[mp[pointI]] += pF[pointI];
}
@@ -292,7 +292,7 @@ void pointPatchField<Type>::setInInternalField
<< abort(FatalError);
}
- forAll (meshPoints, pointI)
+ forAll(meshPoints, pointI)
{
iF[meshPoints[pointI]] = pF[pointI];
}
diff --git a/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchField.H
index ae6ce5eb9395ee522bff010a4987e4f77e5b9b96..8961fbb9dbebe63aed7637ad76ce04847a6f2df6 100644
--- a/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchField.H
+++ b/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchField.H
@@ -229,10 +229,9 @@ public:
);
- // Destructor
-
- virtual ~pointPatchField<Type>()
- {}
+ //- Destructor
+ virtual ~pointPatchField<Type>()
+ {}
// Member functions
diff --git a/src/OpenFOAM/global/JobInfo/JobInfo.H b/src/OpenFOAM/global/JobInfo/JobInfo.H
index 633fad11df6c2417aac351a383dd16b73578261d..61d1c870f433b8d5f6466ef877e781143bc1590f 100644
--- a/src/OpenFOAM/global/JobInfo/JobInfo.H
+++ b/src/OpenFOAM/global/JobInfo/JobInfo.H
@@ -78,9 +78,8 @@ public:
JobInfo();
- // Destructor
-
- ~JobInfo();
+ //- Destructor
+ ~JobInfo();
// Member Functions
diff --git a/src/OpenFOAM/graph/graph.C b/src/OpenFOAM/graph/graph.C
index 04e233cd82c81d0cb7ce703901e126641a58561b..12573776082cb1ced9bbe256ed17352d0cbda818 100644
--- a/src/OpenFOAM/graph/graph.C
+++ b/src/OpenFOAM/graph/graph.C
@@ -47,7 +47,7 @@ void graph::readCurves(Istream& is)
x_.setSize(xyData.size());
scalarField y(xyData.size());
- forAll (xyData, i)
+ forAll(xyData, i)
{
x_[i] = xyData[i].x_;
y[i] = xyData[i].y_;
@@ -191,18 +191,13 @@ void graph::writeTable(Ostream& os) const
{
forAll(x_, xi)
{
- os << setw(10) << x_[xi];
+ os << setw(10) << x_[xi];
- for
- (
- graph::const_iterator iter = begin();
- iter != end();
- ++iter
- )
+ forAllConstIter(graph, *this, iter)
{
- os << token::SPACE << setw(10) << (*iter())[xi];
+ os << token::SPACE << setw(10) << (*iter())[xi];
}
- os << endl;
+ os << endl;
}
}
diff --git a/src/OpenFOAM/graph/graph.H b/src/OpenFOAM/graph/graph.H
index fe600590f7c143f18f218479ba7d0e0b2b951b15..57876270b9244448b8c3e707a75464efb5596349 100644
--- a/src/OpenFOAM/graph/graph.H
+++ b/src/OpenFOAM/graph/graph.H
@@ -226,10 +226,9 @@ public:
{}
- // Destructor
-
- virtual ~writer()
- {}
+ //- Destructor
+ virtual ~writer()
+ {}
// Member Functions
diff --git a/src/OpenFOAM/graph/writers/gnuplotGraph/gnuplotGraph.C b/src/OpenFOAM/graph/writers/gnuplotGraph/gnuplotGraph.C
index a36c14503b67f9fb52dfb26ef97fe18a05575825..48085787b7026740eb62599683f54a995d514f88 100644
--- a/src/OpenFOAM/graph/writers/gnuplotGraph/gnuplotGraph.C
+++ b/src/OpenFOAM/graph/writers/gnuplotGraph/gnuplotGraph.C
@@ -51,7 +51,7 @@ void Foam::gnuplotGraph::write(const graph& g, Ostream& os) const
bool firstField = true;
- for (graph::const_iterator iter = g.begin(); iter != g.end(); ++iter)
+ forAllConstIter(graph, g, iter)
{
if (!firstField)
{
@@ -64,9 +64,9 @@ void Foam::gnuplotGraph::write(const graph& g, Ostream& os) const
os << "; pause -1" << endl;
- for (graph::const_iterator iter = g.begin(); iter != g.end(); ++iter)
+ forAllConstIter(graph, g, iter)
{
- os << endl;
+ os << endl;
writeXY(g.x(), *iter(), os);
}
}
diff --git a/src/OpenFOAM/graph/writers/gnuplotGraph/gnuplotGraph.H b/src/OpenFOAM/graph/writers/gnuplotGraph/gnuplotGraph.H
index 812a8db5790d8d598f3d506de4a9ce98e1c26034..f5317a9c9588249165a7e3a13b98ecf99b0bef9f 100644
--- a/src/OpenFOAM/graph/writers/gnuplotGraph/gnuplotGraph.H
+++ b/src/OpenFOAM/graph/writers/gnuplotGraph/gnuplotGraph.H
@@ -67,10 +67,9 @@ public:
{}
- // Destructor
-
- ~gnuplotGraph()
- {}
+ //- Destructor
+ ~gnuplotGraph()
+ {}
// Member Functions
diff --git a/src/OpenFOAM/graph/writers/jplotGraph/jplotGraph.C b/src/OpenFOAM/graph/writers/jplotGraph/jplotGraph.C
index 2b60df990063dc18a37539c664659cdeb1d27a21..eff00c0d6833c438368238358887f62d5f2c58bc 100644
--- a/src/OpenFOAM/graph/writers/jplotGraph/jplotGraph.C
+++ b/src/OpenFOAM/graph/writers/jplotGraph/jplotGraph.C
@@ -41,12 +41,12 @@ namespace Foam
void Foam::jplotGraph::write(const graph& g, Ostream& os) const
{
- os << "# JPlot file" << endl
+ os << "# JPlot file" << nl
<< "# column 1: " << g.xName() << endl;
label fieldI = 0;
- for (graph::const_iterator iter = g.begin(); iter != g.end(); ++iter)
+ forAllConstIter(graph, g, iter)
{
os << "# column " << fieldI + 2 << ": " << (*iter()).name() << endl;
fieldI++;
diff --git a/src/OpenFOAM/graph/writers/jplotGraph/jplotGraph.H b/src/OpenFOAM/graph/writers/jplotGraph/jplotGraph.H
index 942ab78fdeac4d20f31e0971f6ba750c1c61bea2..8b329604c3afa88b7e64e56416fee5c7f97c6e4e 100644
--- a/src/OpenFOAM/graph/writers/jplotGraph/jplotGraph.H
+++ b/src/OpenFOAM/graph/writers/jplotGraph/jplotGraph.H
@@ -67,10 +67,9 @@ public:
{}
- // Destructor
-
- ~jplotGraph()
- {}
+ //- Destructor
+ ~jplotGraph()
+ {}
// Member Functions
diff --git a/src/OpenFOAM/graph/writers/rawGraph/rawGraph.H b/src/OpenFOAM/graph/writers/rawGraph/rawGraph.H
index 9a526d71a416fb0cb1ae53fa738e87b169c17670..707a0212d40a24986b3743fd0f470acc34f3c42d 100644
--- a/src/OpenFOAM/graph/writers/rawGraph/rawGraph.H
+++ b/src/OpenFOAM/graph/writers/rawGraph/rawGraph.H
@@ -67,10 +67,9 @@ public:
{}
- // Destructor
-
- ~rawGraph()
- {}
+ //- Destructor
+ ~rawGraph()
+ {}
// Member Functions
diff --git a/src/OpenFOAM/graph/writers/xmgrGraph/xmgrGraph.C b/src/OpenFOAM/graph/writers/xmgrGraph/xmgrGraph.C
index 94fbe319cc0353a1800d81edaa112c511d674c89..4d9b07bde6f54f3ad7d831b1e2bdf2bd56ff2431 100644
--- a/src/OpenFOAM/graph/writers/xmgrGraph/xmgrGraph.C
+++ b/src/OpenFOAM/graph/writers/xmgrGraph/xmgrGraph.C
@@ -42,17 +42,17 @@ namespace Foam
void Foam::xmgrGraph::write(const graph& g, Ostream& os) const
{
- os << "@title " << g.title() << endl
- << "@xaxis label " << g.xName() << endl
+ os << "@title " << g.title() << nl
+ << "@xaxis label " << g.xName() << nl
<< "@yaxis label " << g.yName() << endl;
label fieldI = 0;
- for (graph::const_iterator iter = g.begin(); iter != g.end(); ++iter)
+ forAllConstIter(graph, g, iter)
{
os << "@s" << fieldI << " legend "
- << iter()->name() << endl
- << "@target G0.S" << fieldI << endl
+ << iter()->name() << nl
+ << "@target G0.S" << fieldI << nl
<< "@type xy" << endl;
writeXY(g.x(), *iter(), os);
diff --git a/src/OpenFOAM/graph/writers/xmgrGraph/xmgrGraph.H b/src/OpenFOAM/graph/writers/xmgrGraph/xmgrGraph.H
index e6d4321767b8dcb3ad5bfcbaffc64a3ce54754d4..d7e866b856e8a08f215abf158aa2ca3dbf9dc24a 100644
--- a/src/OpenFOAM/graph/writers/xmgrGraph/xmgrGraph.H
+++ b/src/OpenFOAM/graph/writers/xmgrGraph/xmgrGraph.H
@@ -68,10 +68,9 @@ public:
{}
- // Destructor
-
- ~xmgrGraph()
- {}
+ //- Destructor
+ ~xmgrGraph()
+ {}
// Member Functions
diff --git a/src/OpenFOAM/interpolations/patchToPatchInterpolation/CalcPatchToPatchWeights.C b/src/OpenFOAM/interpolations/patchToPatchInterpolation/CalcPatchToPatchWeights.C
index e119b1a059593885cece66745f34a25e073baa55..e101977abd6365a1f9df84b5532d8823774178de 100644
--- a/src/OpenFOAM/interpolations/patchToPatchInterpolation/CalcPatchToPatchWeights.C
+++ b/src/OpenFOAM/interpolations/patchToPatchInterpolation/CalcPatchToPatchWeights.C
@@ -73,7 +73,7 @@ void PatchToPatchInterpolation<FromPatch, ToPatch>::calcPointAddressing() const
bool doWeights = false;
- forAll (pointAddressing, pointI)
+ forAll(pointAddressing, pointI)
{
doWeights = false;
@@ -146,7 +146,7 @@ void PatchToPatchInterpolation<FromPatch, ToPatch>::calcPointAddressing() const
edgeList hitFaceEdges =
fromPatchFaces[proj[pointI].hitObject()].edges();
- forAll (hitFaceEdges, edgeI)
+ forAll(hitFaceEdges, edgeI)
{
minEdgeLength =
min
@@ -158,7 +158,7 @@ void PatchToPatchInterpolation<FromPatch, ToPatch>::calcPointAddressing() const
const labelList& curEdges = toPatchPointEdges[pointI];
- forAll (curEdges, edgeI)
+ forAll(curEdges, edgeI)
{
minEdgeLength =
min
@@ -208,7 +208,7 @@ void PatchToPatchInterpolation<FromPatch, ToPatch>::calcPointAddressing() const
pointField hitFacePoints = hitFace.points(fromPatchPoints);
- forAll (hitFacePoints, masterPointI)
+ forAll(hitFacePoints, masterPointI)
{
pointWeights[pointI][masterPointI] =
1.0/
@@ -252,7 +252,7 @@ void PatchToPatchInterpolation<FromPatch, ToPatch>::calcFaceAddressing() const
vectorField fromPatchFaceCentres(fromPatchFaces.size());
- forAll (fromPatchFaceCentres, faceI)
+ forAll(fromPatchFaceCentres, faceI)
{
fromPatchFaceCentres[faceI] =
fromPatchFaces[faceI].centre(fromPatchPoints);
@@ -275,7 +275,7 @@ void PatchToPatchInterpolation<FromPatch, ToPatch>::calcFaceAddressing() const
faceAddressingPtr_ = new labelList(proj.size(), -1);
labelList& faceAddressing = *faceAddressingPtr_;
- forAll (faceAddressing, faceI)
+ forAll(faceAddressing, faceI)
{
if (proj[faceI].hit())
{
@@ -327,7 +327,7 @@ void PatchToPatchInterpolation<FromPatch, ToPatch>::calcFaceAddressing() const
faceWeights[faceI][0] = 1.0/m;
- forAll (neighbours, nI)
+ forAll(neighbours, nI)
{
faceWeights[faceI][nI + 1] =
1.0/
diff --git a/src/OpenFOAM/interpolations/patchToPatchInterpolation/PatchToPatchInterpolate.C b/src/OpenFOAM/interpolations/patchToPatchInterpolation/PatchToPatchInterpolate.C
index 5b5fdc7a5f904c84df54f711fb0188768b8cc05f..a2bad68c2652c02cd9781151a4e9d7198ca4d941 100644
--- a/src/OpenFOAM/interpolations/patchToPatchInterpolation/PatchToPatchInterpolate.C
+++ b/src/OpenFOAM/interpolations/patchToPatchInterpolation/PatchToPatchInterpolate.C
@@ -71,7 +71,7 @@ PatchToPatchInterpolation<FromPatch, ToPatch>::pointInterpolate
const labelList& addr = pointAddr();
- forAll (result, pointI)
+ forAll(result, pointI)
{
const scalarField& curWeights = weights[pointI];
@@ -80,7 +80,7 @@ PatchToPatchInterpolation<FromPatch, ToPatch>::pointInterpolate
const labelList& hitFacePoints =
fromPatchLocalFaces[addr[pointI]];
- forAll (curWeights, wI)
+ forAll(curWeights, wI)
{
result[pointI] += curWeights[wI]*pf[hitFacePoints[wI]];
}
@@ -142,7 +142,7 @@ PatchToPatchInterpolation<FromPatch, ToPatch>::faceInterpolate
const labelList& addr = faceAddr();
- forAll (result, faceI)
+ forAll(result, faceI)
{
const scalarField& curWeights = weights[faceI];
diff --git a/src/OpenFOAM/interpolations/patchToPatchInterpolation/PatchToPatchInterpolation.H b/src/OpenFOAM/interpolations/patchToPatchInterpolation/PatchToPatchInterpolation.H
index c2aecf3aa7061386b77fb65dc4582f73b7aa6285..5c744df1bad2314bd9d43947dd470f6af325e045 100644
--- a/src/OpenFOAM/interpolations/patchToPatchInterpolation/PatchToPatchInterpolation.H
+++ b/src/OpenFOAM/interpolations/patchToPatchInterpolation/PatchToPatchInterpolation.H
@@ -163,9 +163,8 @@ public:
);
- // Destructor
-
- ~PatchToPatchInterpolation();
+ //- Destructor
+ ~PatchToPatchInterpolation();
// Member Functions
diff --git a/src/OpenFOAM/interpolations/primitivePatchInterpolation/PrimitivePatchInterpolation.H b/src/OpenFOAM/interpolations/primitivePatchInterpolation/PrimitivePatchInterpolation.H
index fc8417855b957b1878962b16dbd17fc14aa3be47..9c07ba575f8fcd24c451b9f6179265e4dfee8e5c 100644
--- a/src/OpenFOAM/interpolations/primitivePatchInterpolation/PrimitivePatchInterpolation.H
+++ b/src/OpenFOAM/interpolations/primitivePatchInterpolation/PrimitivePatchInterpolation.H
@@ -99,9 +99,8 @@ public:
PrimitivePatchInterpolation(const Patch& p);
- // Destructor
-
- ~PrimitivePatchInterpolation();
+ //- Destructor
+ ~PrimitivePatchInterpolation();
// Member Functions
diff --git a/src/OpenFOAM/matrices/Matrix/Matrix.H b/src/OpenFOAM/matrices/Matrix/Matrix.H
index 9baa4f0fb1e09ca4f71eb03b275d01ca544f71d9..c7b561914eced39ddccbaaeaedd1c47d12a099f4 100644
--- a/src/OpenFOAM/matrices/Matrix/Matrix.H
+++ b/src/OpenFOAM/matrices/Matrix/Matrix.H
@@ -116,9 +116,8 @@ public:
inline autoPtr<Matrix<Form, Type> > clone() const;
- // Destructor
-
- ~Matrix();
+ //- Destructor
+ ~Matrix();
// Member Functions
diff --git a/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduAddressing.C b/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduAddressing.C
index fcd50eacd1d50ae2ab8ee154af9597ca3356fc79..87dee6babc7a1009815dffb5494708a4585b619c 100644
--- a/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduAddressing.C
+++ b/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduAddressing.C
@@ -44,7 +44,7 @@ void Foam::lduAddressing::calcLosort() const
const unallocLabelList& nbr = upperAddr();
- forAll (nbr, nbrI)
+ forAll(nbr, nbrI)
{
nNbrOfFace[nbr[nbrI]]++;
}
@@ -52,7 +52,7 @@ void Foam::lduAddressing::calcLosort() const
// Create temporary neighbour addressing
labelListList cellNbrFaces(size());
- forAll (cellNbrFaces, cellI)
+ forAll(cellNbrFaces, cellI)
{
cellNbrFaces[cellI].setSize(nNbrOfFace[cellI]);
}
@@ -61,7 +61,7 @@ void Foam::lduAddressing::calcLosort() const
nNbrOfFace = 0;
// Scatter the neighbour faces
- forAll (nbr, nbrI)
+ forAll(nbr, nbrI)
{
cellNbrFaces[nbr[nbrI]][nNbrOfFace[nbr[nbrI]]] = nbrI;
@@ -76,11 +76,11 @@ void Foam::lduAddressing::calcLosort() const
// Set counter for losort
label lstI = 0;
- forAll (cellNbrFaces, cellI)
+ forAll(cellNbrFaces, cellI)
{
const labelList& curNbr = cellNbrFaces[cellI];
- forAll (curNbr, curNbrI)
+ forAll(curNbr, curNbrI)
{
lst[lstI] = curNbr[curNbrI];
lstI++;
@@ -109,7 +109,7 @@ void Foam::lduAddressing::calcOwnerStart() const
label nOwnStart = 0;
label i = 1;
- forAll (own, faceI)
+ forAll(own, faceI)
{
label curOwn = own[faceI];
@@ -148,7 +148,7 @@ void Foam::lduAddressing::calcLosortStart() const
label nLsrtStart = 0;
label i = 0;
- forAll (lsrt, faceI)
+ forAll(lsrt, faceI)
{
// Get neighbour
const label curNbr = nbr[lsrt[faceI]];
diff --git a/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduAddressing.H b/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduAddressing.H
index 9f971b35107e5bf944b0347e4674aefc10fe18a9..fedeaf60d268ff1e3f1459b08a3b3132ced014c9 100644
--- a/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduAddressing.H
+++ b/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduAddressing.H
@@ -158,9 +158,8 @@ public:
{}
- // Destructor
-
- virtual ~lduAddressing();
+ //- Destructor
+ virtual ~lduAddressing();
// Member Functions
diff --git a/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/cyclicLduInterface.H b/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/cyclicLduInterface.H
index 72e5e9389a48a132c41b30b8d65d488893b35b18..1010c17f9822d969fdd3b0844d3f8f19f6a152f2 100644
--- a/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/cyclicLduInterface.H
+++ b/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/cyclicLduInterface.H
@@ -57,9 +57,8 @@ public:
// Constructors
- // Destructor
-
- virtual ~cyclicLduInterface();
+ //- Destructor
+ virtual ~cyclicLduInterface();
// Member Functions
diff --git a/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/lduInterface.H b/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/lduInterface.H
index 60f6e448e6c374d1a36a8c86595508bba3cc038b..2b65bedf8d772e52191c55293a6895aa69f385fc 100644
--- a/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/lduInterface.H
+++ b/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/lduInterface.H
@@ -75,9 +75,8 @@ public:
{}
- // Destructor
-
- virtual ~lduInterface();
+ //- Destructor
+ virtual ~lduInterface();
// Member Functions
diff --git a/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/processorLduInterface.H b/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/processorLduInterface.H
index 8d39181c10bf49d9433ea091247b206dbab1a9b6..be3d050d7ada66367b2f24a85d2834ca13e215e2 100644
--- a/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/processorLduInterface.H
+++ b/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/processorLduInterface.H
@@ -76,9 +76,8 @@ public:
processorLduInterface();
- // Destructor
-
- virtual ~processorLduInterface();
+ //- Destructor
+ virtual ~processorLduInterface();
// Member Functions
diff --git a/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterfaceFields/cyclicLduInterfaceField/cyclicLduInterfaceField.H b/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterfaceFields/cyclicLduInterfaceField/cyclicLduInterfaceField.H
index 0d3c3ef2e06e190eb25246a564afb63c3cd66c8a..2d35035f579617b815ec6005179ad541d5c557d2 100644
--- a/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterfaceFields/cyclicLduInterfaceField/cyclicLduInterfaceField.H
+++ b/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterfaceFields/cyclicLduInterfaceField/cyclicLduInterfaceField.H
@@ -63,9 +63,8 @@ public:
{}
- // Destructor
-
- virtual ~cyclicLduInterfaceField();
+ //- Destructor
+ virtual ~cyclicLduInterfaceField();
// Member Functions
diff --git a/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterfaceFields/lduInterfaceField/lduInterfaceField.H b/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterfaceFields/lduInterfaceField/lduInterfaceField.H
index 57127bd4dea2ff1347881e9a71a1a0840af1d979..f07f1498a9f9cb574c00933611c92243d19b6274 100644
--- a/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterfaceFields/lduInterfaceField/lduInterfaceField.H
+++ b/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterfaceFields/lduInterfaceField/lduInterfaceField.H
@@ -85,9 +85,8 @@ public:
{}
- // Destructor
-
- virtual ~lduInterfaceField();
+ //- Destructor
+ virtual ~lduInterfaceField();
// Member Functions
diff --git a/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterfaceFields/processorLduInterfaceField/processorLduInterfaceField.H b/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterfaceFields/processorLduInterfaceField/processorLduInterfaceField.H
index a04e57f8e9d660dc765b12739114add63332a1a6..7c3ae2e259d26f73bb5106bbfd410d0db3dc36ad 100644
--- a/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterfaceFields/processorLduInterfaceField/processorLduInterfaceField.H
+++ b/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterfaceFields/processorLduInterfaceField/processorLduInterfaceField.H
@@ -63,9 +63,8 @@ public:
{}
- // Destructor
-
- virtual ~processorLduInterfaceField();
+ //- Destructor
+ virtual ~processorLduInterfaceField();
// Member Functions
diff --git a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrix.H b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrix.H
index 860a593b83333aa083c759f6da3a7e0a183bede1..924c1e51f0e7cf1adc91ad500726d6cf9f7844a3 100644
--- a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrix.H
+++ b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrix.H
@@ -340,10 +340,9 @@ public:
- // Destructor
-
- virtual ~solver()
- {}
+ //- Destructor
+ virtual ~solver()
+ {}
// Member functions
@@ -492,10 +491,9 @@ public:
);
- // Destructor
-
- virtual ~smoother()
- {}
+ //- Destructor
+ virtual ~smoother()
+ {}
// Member functions
@@ -607,10 +605,9 @@ public:
);
- // Destructor
-
- virtual ~preconditioner()
- {}
+ //- Destructor
+ virtual ~preconditioner()
+ {}
// Member functions
@@ -677,9 +674,8 @@ public:
lduMatrix(const lduMesh&, Istream&);
- // Destructor
-
- ~lduMatrix();
+ //- Destructor
+ ~lduMatrix();
// Member functions
diff --git a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixUpdateMatrixInterfaces.C b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixUpdateMatrixInterfaces.C
index b0680fc5d41a55e8242ff0714a7d0dc5b01c6ebc..2d1ff23a596ac7b91e9a52a57ee1e885bc022537 100644
--- a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixUpdateMatrixInterfaces.C
+++ b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixUpdateMatrixInterfaces.C
@@ -42,7 +42,7 @@ void Foam::lduMatrix::initMatrixInterfaces
|| Pstream::defaultCommsType == Pstream::nonBlocking
)
{
- forAll (interfaces, interfaceI)
+ forAll(interfaces, interfaceI)
{
if (interfaces.set(interfaceI))
{
@@ -117,7 +117,7 @@ void Foam::lduMatrix::updateMatrixInterfaces
OPstream::waitRequests();
}
- forAll (interfaces, interfaceI)
+ forAll(interfaces, interfaceI)
{
if (interfaces.set(interfaceI))
{
@@ -138,7 +138,7 @@ void Foam::lduMatrix::updateMatrixInterfaces
const lduSchedule& patchSchedule = this->patchSchedule();
// Loop over all the "normal" interfaces relating to standard patches
- forAll (patchSchedule, i)
+ forAll(patchSchedule, i)
{
label interfaceI = patchSchedule[i].patch;
diff --git a/src/OpenFOAM/matrices/lduMatrix/preconditioners/DICPreconditioner/DICPreconditioner.H b/src/OpenFOAM/matrices/lduMatrix/preconditioners/DICPreconditioner/DICPreconditioner.H
index e1260e0e2ad56e901b8be5fa532cc999dc683a67..02d428ef49d59c25bdc4c5281dd58e7a58b770fe 100644
--- a/src/OpenFOAM/matrices/lduMatrix/preconditioners/DICPreconditioner/DICPreconditioner.H
+++ b/src/OpenFOAM/matrices/lduMatrix/preconditioners/DICPreconditioner/DICPreconditioner.H
@@ -74,10 +74,9 @@ public:
);
- // Destructor
-
- virtual ~DICPreconditioner()
- {}
+ //- Destructor
+ virtual ~DICPreconditioner()
+ {}
// Member Functions
diff --git a/src/OpenFOAM/matrices/lduMatrix/preconditioners/DILUPreconditioner/DILUPreconditioner.H b/src/OpenFOAM/matrices/lduMatrix/preconditioners/DILUPreconditioner/DILUPreconditioner.H
index 89d92001891dfdaa1d6e70d71eb76f59d8192a27..1988b68032bb3ffdcd9be36e151c5d13a1f404a1 100644
--- a/src/OpenFOAM/matrices/lduMatrix/preconditioners/DILUPreconditioner/DILUPreconditioner.H
+++ b/src/OpenFOAM/matrices/lduMatrix/preconditioners/DILUPreconditioner/DILUPreconditioner.H
@@ -74,10 +74,9 @@ public:
);
- // Destructor
-
- virtual ~DILUPreconditioner()
- {}
+ //- Destructor
+ virtual ~DILUPreconditioner()
+ {}
// Member Functions
diff --git a/src/OpenFOAM/matrices/lduMatrix/preconditioners/FDICPreconditioner/FDICPreconditioner.H b/src/OpenFOAM/matrices/lduMatrix/preconditioners/FDICPreconditioner/FDICPreconditioner.H
index 717d7fae84a92fab6cb0506b79731c32d4f1a106..7226d4a320b838ef043156b575d8cc8854a42a9b 100644
--- a/src/OpenFOAM/matrices/lduMatrix/preconditioners/FDICPreconditioner/FDICPreconditioner.H
+++ b/src/OpenFOAM/matrices/lduMatrix/preconditioners/FDICPreconditioner/FDICPreconditioner.H
@@ -87,10 +87,9 @@ public:
);
- // Destructor
-
- virtual ~FDICPreconditioner()
- {}
+ //- Destructor
+ virtual ~FDICPreconditioner()
+ {}
// Member Functions
diff --git a/src/OpenFOAM/matrices/lduMatrix/preconditioners/GAMGPreconditioner/GAMGPreconditioner.H b/src/OpenFOAM/matrices/lduMatrix/preconditioners/GAMGPreconditioner/GAMGPreconditioner.H
index 5a30a2d1eed22bb1b9214db159cd9c0c001e3a0c..01d2303317d4a912cf0143030e16b22bebe57c9b 100644
--- a/src/OpenFOAM/matrices/lduMatrix/preconditioners/GAMGPreconditioner/GAMGPreconditioner.H
+++ b/src/OpenFOAM/matrices/lduMatrix/preconditioners/GAMGPreconditioner/GAMGPreconditioner.H
@@ -79,9 +79,8 @@ public:
);
- // Destructor
-
- virtual ~GAMGPreconditioner();
+ //- Destructor
+ virtual ~GAMGPreconditioner();
// Member Functions
diff --git a/src/OpenFOAM/matrices/lduMatrix/preconditioners/diagonalPreconditioner/diagonalPreconditioner.H b/src/OpenFOAM/matrices/lduMatrix/preconditioners/diagonalPreconditioner/diagonalPreconditioner.H
index 3edce1a953d72f850e414b00303ae769d8ae901a..b19265e2a5c4719d988a33d30369c4f294345e22 100644
--- a/src/OpenFOAM/matrices/lduMatrix/preconditioners/diagonalPreconditioner/diagonalPreconditioner.H
+++ b/src/OpenFOAM/matrices/lduMatrix/preconditioners/diagonalPreconditioner/diagonalPreconditioner.H
@@ -84,10 +84,9 @@ public:
);
- // Destructor
-
- virtual ~diagonalPreconditioner()
- {}
+ //- Destructor
+ virtual ~diagonalPreconditioner()
+ {}
// Member Functions
diff --git a/src/OpenFOAM/matrices/lduMatrix/preconditioners/noPreconditioner/noPreconditioner.H b/src/OpenFOAM/matrices/lduMatrix/preconditioners/noPreconditioner/noPreconditioner.H
index 5792a0c2b5b7ffd447d4b49775b50fdabad3ce19..f97584626590cd7d049e26463575c05431502234 100644
--- a/src/OpenFOAM/matrices/lduMatrix/preconditioners/noPreconditioner/noPreconditioner.H
+++ b/src/OpenFOAM/matrices/lduMatrix/preconditioners/noPreconditioner/noPreconditioner.H
@@ -75,10 +75,9 @@ public:
);
- // Destructor
-
- virtual ~noPreconditioner()
- {}
+ //- Destructor
+ virtual ~noPreconditioner()
+ {}
// Member Functions
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/BICCG/BICCG.H b/src/OpenFOAM/matrices/lduMatrix/solvers/BICCG/BICCG.H
index 74e01d5fbc8089c9d19b16e69b7622630e25148f..7eaaef40ee1fdafecde94dc1b36fa458d413f82b 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/BICCG/BICCG.H
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/BICCG/BICCG.H
@@ -109,10 +109,9 @@ public:
const scalar relTol = 0.0
);
- // Destructor
-
- virtual ~BICCG()
- {}
+ //- Destructor
+ virtual ~BICCG()
+ {}
};
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomerateLduAddressing.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomerateLduAddressing.C
index 78d1e072058a2040778393c8eeaa8770be57413c..e39bb19b5a23edd683d1c77be2f44f3f3fd727b7 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomerateLduAddressing.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomerateLduAddressing.C
@@ -88,7 +88,7 @@ void Foam::GAMGAgglomeration::agglomerateLduAddressing
label nCoarseFaces = 0;
// Loop through all fine faces
- forAll (upperAddr, fineFacei)
+ forAll(upperAddr, fineFacei)
{
label rmUpperAddr = restrictMap[upperAddr[fineFacei]];
label rmLowerAddr = restrictMap[lowerAddr[fineFacei]];
@@ -174,7 +174,7 @@ void Foam::GAMGAgglomeration::agglomerateLduAddressing
label coarseFacei = 0;
- forAll (cCellnFaces, cci)
+ forAll(cCellnFaces, cci)
{
label* cFaces = &cCellFaces[maxNnbrs*cci];
label ccnFaces = cCellnFaces[cci];
@@ -223,7 +223,7 @@ void Foam::GAMGAgglomeration::agglomerateLduAddressing
labelListList coarseInterfaceAddr(fineInterfaces.size());
// Initialise transfer of restrict addressing on the interface
- forAll (fineInterfaces, inti)
+ forAll(fineInterfaces, inti)
{
if (fineInterfaces.set(inti))
{
@@ -236,7 +236,7 @@ void Foam::GAMGAgglomeration::agglomerateLduAddressing
}
// Add the coarse level
- forAll (fineInterfaces, inti)
+ forAll(fineInterfaces, inti)
{
if (fineInterfaces.set(inti))
{
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomeration.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomeration.C
index 1097f35b227595ef199b833fe728b68328dce984..4431db24df5a766e1aa8a61b6d808f646428478a 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomeration.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomeration.C
@@ -202,7 +202,7 @@ Foam::GAMGAgglomeration::~GAMGAgglomeration()
{
lduInterfacePtrsList& curLevel = interfaceLevels_[leveli];
- forAll (curLevel, i)
+ forAll(curLevel, i)
{
if (curLevel.set(i))
{
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomeration.H b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomeration.H
index 2186b7839dba5dd407dc6159a42843971d405f7e..807477f411dbbabb553ef13f7954554ef86e632c 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomeration.H
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomeration.H
@@ -180,9 +180,8 @@ public:
);
- // Destructor
-
- ~GAMGAgglomeration();
+ //- Destructor
+ ~GAMGAgglomeration();
// Member Functions
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/pairGAMGAgglomeration/pairGAMGAgglomerate.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/pairGAMGAgglomeration/pairGAMGAgglomerate.C
index 9129e62ae297b0fda97008908486884cb6fb1846..57d4bdcfa498d2bea0965850c257bf026641a7f7 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/pairGAMGAgglomeration/pairGAMGAgglomerate.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/pairGAMGAgglomeration/pairGAMGAgglomerate.C
@@ -48,18 +48,18 @@ Foam::tmp<Foam::labelField> Foam::pairGAMGAgglomeration::agglomerate
{
labelList nNbrs(nFineCells, 0);
- forAll (upperAddr, facei)
+ forAll(upperAddr, facei)
{
nNbrs[upperAddr[facei]]++;
}
- forAll (lowerAddr, facei)
+ forAll(lowerAddr, facei)
{
nNbrs[lowerAddr[facei]]++;
}
cellFaceOffsets[0] = 0;
- forAll (nNbrs, celli)
+ forAll(nNbrs, celli)
{
cellFaceOffsets[celli+1] = cellFaceOffsets[celli] + nNbrs[celli];
}
@@ -67,7 +67,7 @@ Foam::tmp<Foam::labelField> Foam::pairGAMGAgglomeration::agglomerate
// reset the whole list to use as counter
nNbrs = 0;
- forAll (upperAddr, facei)
+ forAll(upperAddr, facei)
{
cellFaces
[
@@ -77,7 +77,7 @@ Foam::tmp<Foam::labelField> Foam::pairGAMGAgglomeration::agglomerate
nNbrs[upperAddr[facei]]++;
}
- forAll (lowerAddr, facei)
+ forAll(lowerAddr, facei)
{
cellFaces
[
@@ -187,7 +187,7 @@ Foam::tmp<Foam::labelField> Foam::pairGAMGAgglomeration::agglomerate
// (doesn't always help and is sometimes detrimental)
nCoarseCells--;
- forAll (coarseCellMap, celli)
+ forAll(coarseCellMap, celli)
{
coarseCellMap[celli] = nCoarseCells - coarseCellMap[celli];
}
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/pairGAMGAgglomeration/pairGAMGAgglomerationCombineLevels.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/pairGAMGAgglomeration/pairGAMGAgglomerationCombineLevels.C
index 0d210f38f96a60127cb6c0cb7bddf231acb0b271..8e977a6a9b8b3db39ed0c3edf954e30ebbebc347 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/pairGAMGAgglomeration/pairGAMGAgglomerationCombineLevels.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/pairGAMGAgglomeration/pairGAMGAgglomerationCombineLevels.C
@@ -78,7 +78,7 @@ void Foam::pairGAMGAgglomeration::combineLevels(const label curLevel)
const lduInterfacePtrsList& curInterLevel = interfaceLevels_[curLevel+1];
lduInterfacePtrsList& prevInterLevel = interfaceLevels_[prevLevel+1];
- forAll (prevInterLevel, inti)
+ forAll(prevInterLevel, inti)
{
if (prevInterLevel.set(inti))
{
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolver.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolver.C
index f63fad767df92d35164665c844785a618800f14c..7c87a765d40a6bf6b3ac74a14f892bfa089dd2fe 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolver.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolver.C
@@ -127,11 +127,11 @@ Foam::GAMGSolver::GAMGSolver
Foam::GAMGSolver::~GAMGSolver()
{
// Clear the the lists of pointers to the interfaces
- forAll (interfaceLevels_, leveli)
+ forAll(interfaceLevels_, leveli)
{
lduInterfaceFieldPtrsList& curLevel = interfaceLevels_[leveli];
- forAll (curLevel, i)
+ forAll(curLevel, i)
{
if (curLevel.set(i))
{
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolver.H b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolver.H
index baa2621ccb7cecb6134d6ca77bd153b412ae1bf4..54908a720d6bfcf31c09cba32b92f476670cddb7 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolver.H
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolver.H
@@ -223,9 +223,8 @@ public:
);
- // Destructor
-
- virtual ~GAMGSolver();
+ //- Destructor
+ virtual ~GAMGSolver();
// Member Functions
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolverAgglomerateMatrix.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolverAgglomerateMatrix.C
index 1516fb68940233a34e8adddafa6345d523544997..7447c152cd98b97de116a17063c4d641182c55d5 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolverAgglomerateMatrix.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolverAgglomerateMatrix.C
@@ -91,7 +91,7 @@ void Foam::GAMGSolver::agglomerateMatrix(const label fineLevelIndex)
interfaceLevelsIntCoeffs_[fineLevelIndex];
// Add the coarse level
- forAll (fineInterfaces, inti)
+ forAll(fineInterfaces, inti)
{
if (fineInterfaces.set(inti))
{
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolverSolve.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolverSolve.C
index efe3fbb1e542c95490ae4d4bb9f3a2d9677615cf..2aae470a68fa4349e04602e301d2685650c5637f 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolverSolve.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolverSolve.C
@@ -377,7 +377,7 @@ void Foam::GAMGSolver::initVcycle
)
);
- forAll (matrixLevels_, leveli)
+ forAll(matrixLevels_, leveli)
{
coarseCorrFields.set
(
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/cyclicGAMGInterfaceField/cyclicGAMGInterfaceField.H b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/cyclicGAMGInterfaceField/cyclicGAMGInterfaceField.H
index 7ce417d51fd0f1c3ba095f1f01666366768415f4..d1fba2a55e83feb25724835baa75a50348f69fbc 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/cyclicGAMGInterfaceField/cyclicGAMGInterfaceField.H
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/cyclicGAMGInterfaceField/cyclicGAMGInterfaceField.H
@@ -90,9 +90,8 @@ public:
);
- // Destructor
-
- virtual ~cyclicGAMGInterfaceField();
+ //- Destructor
+ virtual ~cyclicGAMGInterfaceField();
// Member Functions
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/processorGAMGInterfaceField/processorGAMGInterfaceField.H b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/processorGAMGInterfaceField/processorGAMGInterfaceField.H
index a4d94de447d5d3eba684c28a5e82962ed399d110..1cdb4add614e66e7bd588977c8af08e36d56fabd 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/processorGAMGInterfaceField/processorGAMGInterfaceField.H
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/processorGAMGInterfaceField/processorGAMGInterfaceField.H
@@ -90,9 +90,8 @@ public:
);
- // Destructor
-
- virtual ~processorGAMGInterfaceField();
+ //- Destructor
+ virtual ~processorGAMGInterfaceField();
// Member Functions
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/GAMGInterface/GAMGInterfaceTemplates.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/GAMGInterface/GAMGInterfaceTemplates.C
index 0d4da4313bbf7ac08738be3a40875cac31d54ed9..5446a83e5ed8ddb630352307880aee990c026b05 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/GAMGInterface/GAMGInterfaceTemplates.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/GAMGInterface/GAMGInterfaceTemplates.C
@@ -36,7 +36,7 @@ Foam::tmp<Foam::Field<Type> > Foam::GAMGInterface::interfaceInternalField
tmp<Field<Type> > tresult(new Field<Type>(size()));
Field<Type>& result = tresult();
- forAll (result, elemI)
+ forAll(result, elemI)
{
result[elemI] = iF[faceCells_[elemI]];
}
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/cyclicGAMGInterface/cyclicGAMGInterface.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/cyclicGAMGInterface/cyclicGAMGInterface.C
index 5971b5af3f8c2390b68041c9f1ff941f352470fc..fa55f71e7289a85dcd4fa40f4f0df065dc345c9f 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/cyclicGAMGInterface/cyclicGAMGInterface.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/cyclicGAMGInterface/cyclicGAMGInterface.C
@@ -144,7 +144,7 @@ Foam::cyclicGAMGInterface::cyclicGAMGInterface
nCoarseFaces = 0;
// On master side, the owner addressing is stored in table of contents
- forAll (contents, masterI)
+ forAll(contents, masterI)
{
SLList<label>& curNbrs = neighboursTable.find(contents[masterI])();
@@ -163,12 +163,7 @@ Foam::cyclicGAMGInterface::cyclicGAMGInterface
{
faceCells_[nCoarseFaces] = contents[masterI];
- for
- (
- SLList<label>::iterator facesIter = faceFacesIter().begin();
- facesIter != faceFacesIter().end();
- ++facesIter
- )
+ forAllConstIter(SLList<label>, faceFacesIter(), facesIter)
{
faceRestrictAddressing_[facesIter()] = nCoarseFaces;
}
@@ -178,7 +173,7 @@ Foam::cyclicGAMGInterface::cyclicGAMGInterface
}
// On slave side, the owner addressing is stored in linked lists
- forAll (contents, masterI)
+ forAll(contents, masterI)
{
SLList<label>& curNbrs = neighboursTable.find(contents[masterI])();
@@ -197,12 +192,7 @@ Foam::cyclicGAMGInterface::cyclicGAMGInterface
{
faceCells_[nCoarseFaces] = nbrsIter();
- for
- (
- SLList<label>::iterator facesIter = faceFacesIter().begin();
- facesIter != faceFacesIter().end();
- ++facesIter
- )
+ forAllConstIter(SLList<label>, faceFacesIter(), facesIter)
{
faceRestrictAddressing_[facesIter() + sizeBy2] = nCoarseFaces;
}
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/cyclicGAMGInterface/cyclicGAMGInterface.H b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/cyclicGAMGInterface/cyclicGAMGInterface.H
index 826ea3c4389b7e20e5f7533f2c9be15f4933c15a..d912cb313cf5591d3d417b59de77511b015a77c7 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/cyclicGAMGInterface/cyclicGAMGInterface.H
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/cyclicGAMGInterface/cyclicGAMGInterface.H
@@ -86,9 +86,8 @@ public:
);
- // Destructor
-
- virtual ~cyclicGAMGInterface();
+ //- Destructor
+ virtual ~cyclicGAMGInterface();
// Member Functions
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/processorGAMGInterface/processorGAMGInterface.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/processorGAMGInterface/processorGAMGInterface.C
index d614355b553a151319fb54ff62ac8a7d31a9a2d0..1d79ac018efaabb66ca822a1135cbe91b95da472 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/processorGAMGInterface/processorGAMGInterface.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/processorGAMGInterface/processorGAMGInterface.C
@@ -71,7 +71,7 @@ Foam::processorGAMGInterface::processorGAMGInterface
label nCoarseFaces = 0;
- forAll (localRestrictAddressing, ffi)
+ forAll(localRestrictAddressing, ffi)
{
label curMaster = -1;
label curSlave = -1;
@@ -159,7 +159,7 @@ Foam::processorGAMGInterface::processorGAMGInterface
if (myProcNo() < neighbProcNo())
{
// On master side, the owner addressing is stored in table of contents
- forAll (contents, masterI)
+ forAll(contents, masterI)
{
SLList<label>& curNbrs = neighboursTable.find(contents[masterI])();
@@ -180,12 +180,7 @@ Foam::processorGAMGInterface::processorGAMGInterface
{
faceCells_[nCoarseFaces] = contents[masterI];
- for
- (
- SLList<label>::iterator facesIter = faceFacesIter().begin();
- facesIter != faceFacesIter().end();
- ++facesIter
- )
+ forAllConstIter(SLList<label>, faceFacesIter(), facesIter)
{
faceRestrictAddressing_[facesIter()] = nCoarseFaces;
}
@@ -197,7 +192,7 @@ Foam::processorGAMGInterface::processorGAMGInterface
else
{
// On slave side, the owner addressing is stored in linked lists
- forAll (contents, masterI)
+ forAll(contents, masterI)
{
SLList<label>& curNbrs = neighboursTable.find(contents[masterI])();
@@ -218,12 +213,7 @@ Foam::processorGAMGInterface::processorGAMGInterface
{
faceCells_[nCoarseFaces] = nbrsIter();
- for
- (
- SLList<label>::iterator facesIter = faceFacesIter().begin();
- facesIter != faceFacesIter().end();
- ++facesIter
- )
+ forAllConstIter(SLList<label>, faceFacesIter(), facesIter)
{
faceRestrictAddressing_[facesIter()] = nCoarseFaces;
}
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/processorGAMGInterface/processorGAMGInterface.H b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/processorGAMGInterface/processorGAMGInterface.H
index 4b6c5fef7dfbc38be3aad2381edff65f002c3a7c..6d24e82db0da11d57d8438ae5cd345fd7a7aa1ae 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/processorGAMGInterface/processorGAMGInterface.H
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/processorGAMGInterface/processorGAMGInterface.H
@@ -86,9 +86,8 @@ public:
);
- // Destructor
-
- virtual ~processorGAMGInterface();
+ //- Destructor
+ virtual ~processorGAMGInterface();
// Member Functions
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/ICCG/ICCG.H b/src/OpenFOAM/matrices/lduMatrix/solvers/ICCG/ICCG.H
index 7d28367a3ca4a285e415658dcf6cb7c0695d2224..90f4245e8cb530080d5b5dad94e8156e8e279ba8 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/ICCG/ICCG.H
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/ICCG/ICCG.H
@@ -108,10 +108,9 @@ public:
const scalar relTol = 0.0
);
- // Destructor
-
- virtual ~ICCG()
- {}
+ //- Destructor
+ virtual ~ICCG()
+ {}
};
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/PBiCG/PBiCG.H b/src/OpenFOAM/matrices/lduMatrix/solvers/PBiCG/PBiCG.H
index 9beac7f25b1c23212826a5e5563faf93935f4866..a1753a1be1f3cb413437c879e969233889723782 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/PBiCG/PBiCG.H
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/PBiCG/PBiCG.H
@@ -80,10 +80,9 @@ public:
);
- // Destructor
-
- virtual ~PBiCG()
- {}
+ //- Destructor
+ virtual ~PBiCG()
+ {}
// Member Functions
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/PCG/PCG.H b/src/OpenFOAM/matrices/lduMatrix/solvers/PCG/PCG.H
index 82b351342b232b29bfd22be4f077de8d99f20de2..481ba0fe11bffbb81d2216f532c95a840e7f4316 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/PCG/PCG.H
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/PCG/PCG.H
@@ -80,10 +80,9 @@ public:
);
- // Destructor
-
- virtual ~PCG()
- {}
+ //- Destructor
+ virtual ~PCG()
+ {}
// Member Functions
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/smoothSolver/smoothSolver.H b/src/OpenFOAM/matrices/lduMatrix/solvers/smoothSolver/smoothSolver.H
index 4be4565bd0770498cee72eaa347447e0fb5a6744..616ffc7f26c181133481ca58e497fdba51d4b947 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/smoothSolver/smoothSolver.H
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/smoothSolver/smoothSolver.H
@@ -85,10 +85,9 @@ public:
);
- // Destructor
-
- virtual ~smoothSolver()
- {}
+ //- Destructor
+ virtual ~smoothSolver()
+ {}
// Member Functions
diff --git a/src/OpenFOAM/memory/Xfer/Xfer.H b/src/OpenFOAM/memory/Xfer/Xfer.H
index 44a10147176f56b212e2ca4fd6b3c383f7a86e3a..786eee96c00cc6c3906192c0c7efc93dc1c615af 100644
--- a/src/OpenFOAM/memory/Xfer/Xfer.H
+++ b/src/OpenFOAM/memory/Xfer/Xfer.H
@@ -107,9 +107,8 @@ public:
//- Construct by transferring the contents
inline Xfer(const Xfer<T>&);
- // Destructor
-
- inline ~Xfer();
+ //- Destructor
+ inline ~Xfer();
// Member Functions
diff --git a/src/OpenFOAM/memory/autoPtr/autoPtr.H b/src/OpenFOAM/memory/autoPtr/autoPtr.H
index 64dcd9d5167cf9113f39d2ffa4ccf310354d19db..5f4afc765acc85403d4c7a512bb44333ad631686 100644
--- a/src/OpenFOAM/memory/autoPtr/autoPtr.H
+++ b/src/OpenFOAM/memory/autoPtr/autoPtr.H
@@ -68,10 +68,8 @@ public:
inline autoPtr(const autoPtr<T>&);
- // Destructor
-
- //- Delete object if pointer is not NULL
- inline ~autoPtr();
+ //- Destructor, delete object if pointer is not NULL
+ inline ~autoPtr();
// Member Functions
diff --git a/src/OpenFOAM/memory/tmp/tmp.H b/src/OpenFOAM/memory/tmp/tmp.H
index 73fdb4a271df3de278812d32120674ce59507f34..90fa6f5684dd523226527d53e2de1162eca9d20e 100644
--- a/src/OpenFOAM/memory/tmp/tmp.H
+++ b/src/OpenFOAM/memory/tmp/tmp.H
@@ -80,10 +80,8 @@ public:
inline tmp(const tmp<T>&);
- // Destructor
-
- //- Delete object when reference count == 0
- inline ~tmp();
+ //- Destructor, delete object when reference count == 0
+ inline ~tmp();
// Member Functions
diff --git a/src/OpenFOAM/meshes/bandCompression/bandCompression.C b/src/OpenFOAM/meshes/bandCompression/bandCompression.C
index acf8a79f6faf9e9e3e06f5064a87ed062555fe37..1a9811388a3c066d4eff0ffbae695dec901b4b15 100644
--- a/src/OpenFOAM/meshes/bandCompression/bandCompression.C
+++ b/src/OpenFOAM/meshes/bandCompression/bandCompression.C
@@ -48,13 +48,13 @@ Foam::labelList Foam::bandCompression(const labelListList& cellCellAddressing)
label cellInOrder = 0;
// reset the visited cells list
- forAll (visited, cellI)
+ forAll(visited, cellI)
{
visited[cellI] = 0;
}
// loop over the cells
- forAll (visited, cellI)
+ forAll(visited, cellI)
{
// find the first cell that has not been visited yet
if (visited[cellI] == 0)
@@ -85,7 +85,7 @@ Foam::labelList Foam::bandCompression(const labelListList& cellCellAddressing)
const labelList& neighbours =
cellCellAddressing[currentCell];
- forAll (neighbours, nI)
+ forAll(neighbours, nI)
{
if (visited[neighbours[nI]] == 0)
{
diff --git a/src/OpenFOAM/meshes/lduMesh/lduMesh.H b/src/OpenFOAM/meshes/lduMesh/lduMesh.H
index 6a70f5c08ce072081c8c542ee3537df5c550d4a8..2f03419fca14c4fa33ed6cc95ad418bacae568e6 100644
--- a/src/OpenFOAM/meshes/lduMesh/lduMesh.H
+++ b/src/OpenFOAM/meshes/lduMesh/lduMesh.H
@@ -59,10 +59,9 @@ public:
// Constructors
- // Destructor
-
- virtual ~lduMesh()
- {}
+ //- Destructor
+ virtual ~lduMesh()
+ {}
// Member Functions
diff --git a/src/OpenFOAM/meshes/lduMesh/lduPrimitiveMesh.H b/src/OpenFOAM/meshes/lduMesh/lduPrimitiveMesh.H
index e0b51748c0afa767cda922c16c31cd4d701ce96c..2eff97aa216d324b5965599d2ffbd0476dfa39fc 100644
--- a/src/OpenFOAM/meshes/lduMesh/lduPrimitiveMesh.H
+++ b/src/OpenFOAM/meshes/lduMesh/lduPrimitiveMesh.H
@@ -123,10 +123,9 @@ public:
{}
- // Destructor
-
- virtual ~lduPrimitiveMesh()
- {}
+ //- Destructor
+ virtual ~lduPrimitiveMesh()
+ {}
// Member Functions
diff --git a/src/OpenFOAM/meshes/meshShapes/cell/cell.C b/src/OpenFOAM/meshes/meshShapes/cell/cell.C
index 080e9681445e01e84abb0f0ca9a9c2a5dfac51df..ab10b577f01cd03cd47c2e3128765e93fd1d5c0b 100644
--- a/src/OpenFOAM/meshes/meshShapes/cell/cell.C
+++ b/src/OpenFOAM/meshes/meshShapes/cell/cell.C
@@ -41,7 +41,7 @@ Foam::labelList Foam::cell::labels(const unallocFaceList& f) const
const labelList& faces = *this;
- forAll (faces, faceI)
+ forAll(faces, faceI)
{
maxVert += f[faces[faceI]].size();
}
@@ -52,7 +52,7 @@ Foam::labelList Foam::cell::labels(const unallocFaceList& f) const
// in the first face there is no duplicates
const labelList& first = f[faces[0]];
- forAll (first, pointI)
+ forAll(first, pointI)
{
p[pointI] = first[pointI];
}
@@ -67,7 +67,7 @@ Foam::labelList Foam::cell::labels(const unallocFaceList& f) const
{
const labelList& curFace = f[faces[faceI]];
- forAll (curFace, pointI)
+ forAll(curFace, pointI)
{
const label curPoint = curFace[pointI];
@@ -126,7 +126,7 @@ Foam::edgeList Foam::cell::edges(const unallocFaceList& f) const
// create a list of edges
label maxNoEdges = 0;
- forAll (curFaces, faceI)
+ forAll(curFaces, faceI)
{
maxNoEdges += f[curFaces[faceI]].nEdges();
}
@@ -134,11 +134,11 @@ Foam::edgeList Foam::cell::edges(const unallocFaceList& f) const
edgeList allEdges(maxNoEdges);
label nEdges = 0;
- forAll (curFaces, faceI)
+ forAll(curFaces, faceI)
{
const edgeList curFaceEdges = f[curFaces[faceI]].edges();
- forAll (curFaceEdges, faceEdgeI)
+ forAll(curFaceEdges, faceEdgeI)
{
const edge& curEdge = curFaceEdges[faceEdgeI];
@@ -197,7 +197,7 @@ Foam::point Foam::cell::centre
const labelList& faces = *this;
- forAll (faces, faceI)
+ forAll(faces, faceI)
{
scalar a = f[faces[faceI]].mag(p);
cEst += f[faces[faceI]].centre(p)*a;
@@ -212,7 +212,7 @@ Foam::point Foam::cell::centre
scalar sumV = 0;
- forAll (faces, faceI)
+ forAll(faces, faceI)
{
// calculate pyramid volume. If it is greater than zero, OK.
// If not, the pyramid is inside-out. Create a face with the opposite
@@ -256,7 +256,7 @@ Foam::scalar Foam::cell::mag
const labelList& faces = *this;
- forAll (faces, faceI)
+ forAll(faces, faceI)
{
cEst += f[faces[faceI]].centre(p);
nCellFaces += 1;
@@ -267,7 +267,7 @@ Foam::scalar Foam::cell::mag
// Calculate the magnitude by summing the mags of the pyramids
scalar v = 0;
- forAll (faces, faceI)
+ forAll(faces, faceI)
{
v += ::Foam::mag(pyramidPointFaceRef(f[faces[faceI]], cEst).mag(p));
}
@@ -288,13 +288,13 @@ bool Foam::operator==(const cell& a, const cell& b)
List<bool> fnd(a.size(), false);
- forAll (b, bI)
+ forAll(b, bI)
{
label curLabel = b[bI];
bool found = false;
- forAll (a, aI)
+ forAll(a, aI)
{
if (a[aI] == curLabel)
{
@@ -313,7 +313,7 @@ bool Foam::operator==(const cell& a, const cell& b)
// check if all faces on a were marked
bool result = true;
- forAll (fnd, aI)
+ forAll(fnd, aI)
{
result = (result && fnd[aI]);
}
diff --git a/src/OpenFOAM/meshes/meshShapes/cell/oppositeCellFace.C b/src/OpenFOAM/meshes/meshShapes/cell/oppositeCellFace.C
index 943686204ee8947328dd742df7d0e8ab5956d541..f7b33d65df23375e86049587126cf5edfe0df7e7 100644
--- a/src/OpenFOAM/meshes/meshShapes/cell/oppositeCellFace.C
+++ b/src/OpenFOAM/meshes/meshShapes/cell/oppositeCellFace.C
@@ -54,7 +54,7 @@ Foam::label Foam::cell::opposingFaceLabel
label oppositeFaceLabel = -1;
- forAll (curFaceLabels, faceI)
+ forAll(curFaceLabels, faceI)
{
// Compare the face with the master
const face& curFace = meshFaces[curFaceLabels[faceI]];
@@ -70,11 +70,11 @@ Foam::label Foam::cell::opposingFaceLabel
// Compare every vertex of the current face agains the
// vertices of the master face
- forAll (curFace, pointI)
+ forAll(curFace, pointI)
{
const label l = curFace[pointI];
- forAll (masterFace, masterPointI)
+ forAll(masterFace, masterPointI)
{
if (masterFace[masterPointI] == l)
{
@@ -149,11 +149,11 @@ Foam::oppositeFace Foam::cell::opposingFace
oppFaceLabel
);
- forAll (masterFace, pointI)
+ forAll(masterFace, pointI)
{
// Go through the list of edges and find the edge from this vertex
// to the slave face
- forAll (e, edgeI)
+ forAll(e, edgeI)
{
if (!usedEdges[edgeI])
{
@@ -166,7 +166,7 @@ Foam::oppositeFace Foam::cell::opposingFace
// Found an edge coming from this vertex.
// Check all vertices of the slave to find out
// if it exists.
- forAll (slaveFace, slavePointI)
+ forAll(slaveFace, slavePointI)
{
if (slaveFace[slavePointI] == otherVertex)
{
diff --git a/src/OpenFOAM/meshes/meshShapes/cellMatcher/cellMatcher.C b/src/OpenFOAM/meshes/meshShapes/cellMatcher/cellMatcher.C
index 55afe5c9e029d65ed5830f67bec384f7e5e30bde..91454b95f4754047059b599590a0984c40f60fa2 100644
--- a/src/OpenFOAM/meshes/meshShapes/cellMatcher/cellMatcher.C
+++ b/src/OpenFOAM/meshes/meshShapes/cellMatcher/cellMatcher.C
@@ -123,14 +123,9 @@ Foam::label Foam::cellMatcher::calcLocalFaces
}
// Create local to global vertex mapping
- for
- (
- Map<label>::iterator iter = localPoint_.begin();
- iter != localPoint_.end();
- ++iter
- )
+ forAllConstIter(Map<label>, localPoint_, iter)
{
- label fp = iter();
+ const label fp = iter();
pointMap_[fp] = iter.key();
}
diff --git a/src/OpenFOAM/meshes/meshShapes/cellMatcher/cellMatcher.H b/src/OpenFOAM/meshes/meshShapes/cellMatcher/cellMatcher.H
index ef5ffbbc63026750627fc737526c58f0e357fbff..96d3fe1674dd186394f8b6066a27cbdde3aa7195 100644
--- a/src/OpenFOAM/meshes/meshShapes/cellMatcher/cellMatcher.H
+++ b/src/OpenFOAM/meshes/meshShapes/cellMatcher/cellMatcher.H
@@ -196,10 +196,9 @@ public:
);
- // Destructor
-
- virtual ~cellMatcher()
- {}
+ //- Destructor
+ virtual ~cellMatcher()
+ {}
// Member Functions
diff --git a/src/OpenFOAM/meshes/meshShapes/cellMatcher/hexMatcher.H b/src/OpenFOAM/meshes/meshShapes/cellMatcher/hexMatcher.H
index 7d86dba30e46f5b92583a54dc9efeeb05be9d37a..0514c87dbdb93ce175dc66701128a1df6453117d 100644
--- a/src/OpenFOAM/meshes/meshShapes/cellMatcher/hexMatcher.H
+++ b/src/OpenFOAM/meshes/meshShapes/cellMatcher/hexMatcher.H
@@ -77,9 +77,8 @@ public:
//- Construct null
hexMatcher();
- // Destructor
-
- ~hexMatcher();
+ //- Destructor
+ ~hexMatcher();
// Member Functions
diff --git a/src/OpenFOAM/meshes/meshShapes/cellMatcher/prismMatcher.H b/src/OpenFOAM/meshes/meshShapes/cellMatcher/prismMatcher.H
index 11c7ec8a93f7485f378df00723781d5fdade2c70..b56b494e0b9e4de0816c36a2aa1cc4e59204f765 100644
--- a/src/OpenFOAM/meshes/meshShapes/cellMatcher/prismMatcher.H
+++ b/src/OpenFOAM/meshes/meshShapes/cellMatcher/prismMatcher.H
@@ -77,9 +77,8 @@ public:
//- Construct
prismMatcher();
- // Destructor
-
- ~prismMatcher();
+ //- Destructor
+ ~prismMatcher();
// Member Functions
diff --git a/src/OpenFOAM/meshes/meshShapes/cellMatcher/pyrMatcher.H b/src/OpenFOAM/meshes/meshShapes/cellMatcher/pyrMatcher.H
index f245939f62418835b88a6ff0c52814c68e9ae352..f58378ef32719034cfd02fee9db881755826a937 100644
--- a/src/OpenFOAM/meshes/meshShapes/cellMatcher/pyrMatcher.H
+++ b/src/OpenFOAM/meshes/meshShapes/cellMatcher/pyrMatcher.H
@@ -77,9 +77,8 @@ public:
//- Construct null
pyrMatcher();
- // Destructor
-
- ~pyrMatcher();
+ //- Destructor
+ ~pyrMatcher();
// Member Functions
diff --git a/src/OpenFOAM/meshes/meshShapes/cellMatcher/tetMatcher.H b/src/OpenFOAM/meshes/meshShapes/cellMatcher/tetMatcher.H
index 5aca827cac7321d42e8dfe47b9b645802b54d9b4..c1c51aef5ebb80e3afb5726b5cccc019c51abbcb 100644
--- a/src/OpenFOAM/meshes/meshShapes/cellMatcher/tetMatcher.H
+++ b/src/OpenFOAM/meshes/meshShapes/cellMatcher/tetMatcher.H
@@ -77,9 +77,8 @@ public:
//- Construct null
tetMatcher();
- // Destructor
-
- ~tetMatcher();
+ //- Destructor
+ ~tetMatcher();
// Member Functions
diff --git a/src/OpenFOAM/meshes/meshShapes/cellMatcher/tetWedgeMatcher.H b/src/OpenFOAM/meshes/meshShapes/cellMatcher/tetWedgeMatcher.H
index 01bbd4446ad073e2f763cb6897ef51f416eed710..cf0cc0ecb8b0048da1550f84f71d0e56ebfbd1b9 100644
--- a/src/OpenFOAM/meshes/meshShapes/cellMatcher/tetWedgeMatcher.H
+++ b/src/OpenFOAM/meshes/meshShapes/cellMatcher/tetWedgeMatcher.H
@@ -77,9 +77,8 @@ public:
//- Construct null
tetWedgeMatcher();
- // Destructor
-
- ~tetWedgeMatcher();
+ //- Destructor
+ ~tetWedgeMatcher();
// Member Functions
diff --git a/src/OpenFOAM/meshes/meshShapes/cellMatcher/wedgeMatcher.H b/src/OpenFOAM/meshes/meshShapes/cellMatcher/wedgeMatcher.H
index e4cc57184fcd4a7c62b35099f9382b6976d40cbe..d5ac9c1b506dc6109601c41a2f1b6a047c61458a 100644
--- a/src/OpenFOAM/meshes/meshShapes/cellMatcher/wedgeMatcher.H
+++ b/src/OpenFOAM/meshes/meshShapes/cellMatcher/wedgeMatcher.H
@@ -77,9 +77,8 @@ public:
//- Construct null
wedgeMatcher();
- // Destructor
-
- ~wedgeMatcher();
+ //- Destructor
+ ~wedgeMatcher();
// Member Functions
diff --git a/src/OpenFOAM/meshes/meshShapes/cellModel/cellModelI.H b/src/OpenFOAM/meshes/meshShapes/cellModel/cellModelI.H
index f07b77e5f1a13ff2d36fd73ccb6f6d44a78598e5..f47909cbc8b45691dfb467743579def378253df8 100644
--- a/src/OpenFOAM/meshes/meshShapes/cellModel/cellModelI.H
+++ b/src/OpenFOAM/meshes/meshShapes/cellModel/cellModelI.H
@@ -107,7 +107,7 @@ inline faceList cellModel::faces(const labelList& pointLabels) const
curFace.setSize(curModelLabels.size());
- forAll (curModelLabels, labelI)
+ forAll(curModelLabels, labelI)
{
curFace[labelI] = pointLabels[curModelLabels[labelI]];
}
diff --git a/src/OpenFOAM/meshes/meshShapes/cellModeller/cellModeller.H b/src/OpenFOAM/meshes/meshShapes/cellModeller/cellModeller.H
index 2df3c286360e810fc288bd9125237c9cda8a0dbb..565a8b90f308055b00bfd281fcc13ce37c09e8a8 100644
--- a/src/OpenFOAM/meshes/meshShapes/cellModeller/cellModeller.H
+++ b/src/OpenFOAM/meshes/meshShapes/cellModeller/cellModeller.H
@@ -71,9 +71,8 @@ public:
//- Construct from central "cellModels" file
cellModeller();
- // Destructor
-
- ~cellModeller();
+ //- Destructor
+ ~cellModeller();
// Member functions
diff --git a/src/OpenFOAM/meshes/meshShapes/face/face.C b/src/OpenFOAM/meshes/meshShapes/face/face.C
index 0f8829bd2e0a22bc10f134488bc5d11a3cf6ff28..84d90959a08820c8bdeac63a2933592116d8882f 100644
--- a/src/OpenFOAM/meshes/meshShapes/face/face.C
+++ b/src/OpenFOAM/meshes/meshShapes/face/face.C
@@ -322,7 +322,7 @@ int Foam::face::compare(const face& a, const face& b)
const label firstA = a[0];
label Bptr = -1;
- forAll (b, i)
+ forAll(b, i)
{
if (b[i] == firstA)
{
@@ -621,7 +621,7 @@ Foam::label Foam::face::which(const label globalIndex) const
label pointInFace = -1;
const labelList& f = *this;
- forAll (f, i)
+ forAll(f, i)
{
if (f[i] == globalIndex)
{
@@ -750,7 +750,7 @@ Foam::edgeList Foam::face::edges() const
int Foam::face::edgeDirection(const edge& e) const
{
- forAll (*this, i)
+ forAll(*this, i)
{
if (operator[](i) == e.start())
{
diff --git a/src/OpenFOAM/meshes/meshShapes/face/faceAreaInContact.C b/src/OpenFOAM/meshes/meshShapes/face/faceAreaInContact.C
index ae6ca88f0eb719f83cdd71634b79de89430a0b03..3d587b74e113a85bf1b8eb7d915e1029191daf3b 100644
--- a/src/OpenFOAM/meshes/meshShapes/face/faceAreaInContact.C
+++ b/src/OpenFOAM/meshes/meshShapes/face/faceAreaInContact.C
@@ -43,7 +43,7 @@ Foam::scalar Foam::face::areaInContact
scalarField vertexValue(labels.size());
- forAll (labels, i)
+ forAll(labels, i)
{
vertexValue[i] = v[labels[i]];
}
@@ -56,7 +56,7 @@ Foam::scalar Foam::face::areaInContact
bool allPositive = true;
bool allNegative = true;
- forAll (vertexValue, vI)
+ forAll(vertexValue, vI)
{
if (vertexValue[vI] > 0)
{
@@ -147,7 +147,7 @@ Foam::scalar Foam::face::areaInContact
// Make a labelList for the sub-face (points are ordered!)
labelList sfl(newFacePoints.size());
- forAll (sfl, sflI)
+ forAll(sfl, sflI)
{
sfl[sflI] = sflI;
}
diff --git a/src/OpenFOAM/meshes/patchIdentifier/patchIdentifier.H b/src/OpenFOAM/meshes/patchIdentifier/patchIdentifier.H
index 0f7eff0b5fe86df789a359e41efd0c99f2ed98ac..2e333e639642e7728f7988e8c5a988873fb1078e 100644
--- a/src/OpenFOAM/meshes/patchIdentifier/patchIdentifier.H
+++ b/src/OpenFOAM/meshes/patchIdentifier/patchIdentifier.H
@@ -97,9 +97,8 @@ public:
);
- // Destructor
-
- virtual ~patchIdentifier();
+ //- Destructor
+ virtual ~patchIdentifier();
// Member Functions
diff --git a/src/OpenFOAM/meshes/pointMesh/pointMeshMapper/pointBoundaryMeshMapper.H b/src/OpenFOAM/meshes/pointMesh/pointMeshMapper/pointBoundaryMeshMapper.H
index 00b97a17ab77aa0acc716fa2c4b63a372db88b65..b1655afa94b5570ef302e40fc031c881d43a557f 100644
--- a/src/OpenFOAM/meshes/pointMesh/pointMeshMapper/pointBoundaryMeshMapper.H
+++ b/src/OpenFOAM/meshes/pointMesh/pointMeshMapper/pointBoundaryMeshMapper.H
@@ -73,7 +73,7 @@ public:
{
const pointBoundaryMesh& patches = mesh.boundary();
- forAll (patches, patchI)
+ forAll(patches, patchI)
{
set
(
diff --git a/src/OpenFOAM/meshes/pointMesh/pointMeshMapper/pointMapper.C b/src/OpenFOAM/meshes/pointMesh/pointMeshMapper/pointMapper.C
index cc72dc0649366848fe291f432f79dfcfe6b42971..2624b84829828700f4b212a35ad9eaf38a3b0469 100644
--- a/src/OpenFOAM/meshes/pointMesh/pointMeshMapper/pointMapper.C
+++ b/src/OpenFOAM/meshes/pointMesh/pointMeshMapper/pointMapper.C
@@ -63,7 +63,7 @@ void Foam::pointMapper::calcAddressing() const
label nInsertedPoints = 0;
- forAll (directAddr, pointI)
+ forAll(directAddr, pointI)
{
if (directAddr[pointI] < 0)
{
@@ -89,7 +89,7 @@ void Foam::pointMapper::calcAddressing() const
// Points created from other points (i.e. points merged into it).
const List<objectMap>& cfc = mpm_.pointsFromPointsMap();
- forAll (cfc, cfcI)
+ forAll(cfc, cfcI)
{
// Get addressing
const labelList& mo = cfc[cfcI].masterObjects();
@@ -115,7 +115,7 @@ void Foam::pointMapper::calcAddressing() const
const labelList& cm = mpm_.pointMap();
- forAll (cm, pointI)
+ forAll(cm, pointI)
{
if (cm[pointI] > -1 && addr[pointI].empty())
{
@@ -132,7 +132,7 @@ void Foam::pointMapper::calcAddressing() const
label nInsertedPoints = 0;
- forAll (addr, pointI)
+ forAll(addr, pointI)
{
if (addr[pointI].empty())
{
@@ -198,7 +198,7 @@ Foam::pointMapper::pointMapper(const pointMesh& pMesh, const mapPolyMesh& mpm)
const List<objectMap>& cfc = mpm_.pointsFromPointsMap();
- forAll (cfc, cfcI)
+ forAll(cfc, cfcI)
{
cm[cfc[cfcI].index()] = 0;
}
diff --git a/src/OpenFOAM/meshes/pointMesh/pointMeshMapper/pointMapper.H b/src/OpenFOAM/meshes/pointMesh/pointMeshMapper/pointMapper.H
index 8130554309cf40b503aadf71d846a09daa31fd68..af7a519e3c4b8a670c8d0ff84586ec6e4e50ee9f 100644
--- a/src/OpenFOAM/meshes/pointMesh/pointMeshMapper/pointMapper.H
+++ b/src/OpenFOAM/meshes/pointMesh/pointMeshMapper/pointMapper.H
@@ -111,9 +111,8 @@ public:
pointMapper(const pointMesh&, const mapPolyMesh& mpm);
- // Destructor
-
- virtual ~pointMapper();
+ //- Destructor
+ virtual ~pointMapper();
// Member Functions
diff --git a/src/OpenFOAM/meshes/pointMesh/pointMeshMapper/pointPatchMapper.H b/src/OpenFOAM/meshes/pointMesh/pointMeshMapper/pointPatchMapper.H
index 32954dd5069998f614e5930044a04526abeaea37..2171c0e49a7b4e198511ccc80bdc1d22ac9cca16 100644
--- a/src/OpenFOAM/meshes/pointMesh/pointMeshMapper/pointPatchMapper.H
+++ b/src/OpenFOAM/meshes/pointMesh/pointMeshMapper/pointPatchMapper.H
@@ -118,9 +118,8 @@ public:
);
- // Destructor
-
- virtual ~pointPatchMapper();
+ //- Destructor
+ virtual ~pointPatchMapper();
// Member Functions
diff --git a/src/OpenFOAM/meshes/pointMesh/pointPatches/basic/coupled/coupledPointPatch.H b/src/OpenFOAM/meshes/pointMesh/pointPatches/basic/coupled/coupledPointPatch.H
index 816020a7562290a989ea2f0c2a19dca4f1b2e809..1123e46ae66a7dedd39c962cedfe2da7ddbdca65 100644
--- a/src/OpenFOAM/meshes/pointMesh/pointPatches/basic/coupled/coupledPointPatch.H
+++ b/src/OpenFOAM/meshes/pointMesh/pointPatches/basic/coupled/coupledPointPatch.H
@@ -95,9 +95,8 @@ public:
coupledPointPatch(const pointBoundaryMesh& bm);
- // Destructor
-
- virtual ~coupledPointPatch();
+ //- Destructor
+ virtual ~coupledPointPatch();
// Member Functions
diff --git a/src/OpenFOAM/meshes/pointMesh/pointPatches/constraint/cyclic/cyclicPointPatch.H b/src/OpenFOAM/meshes/pointMesh/pointPatches/constraint/cyclic/cyclicPointPatch.H
index 91fdb1cf84a36b26701d9a908ad53e8b3d7100f4..4b7090ae432a9ff23ad325115e5c4e9ddb5de585 100644
--- a/src/OpenFOAM/meshes/pointMesh/pointPatches/constraint/cyclic/cyclicPointPatch.H
+++ b/src/OpenFOAM/meshes/pointMesh/pointPatches/constraint/cyclic/cyclicPointPatch.H
@@ -105,9 +105,8 @@ public:
);
- // Destructor
-
- virtual ~cyclicPointPatch();
+ //- Destructor
+ virtual ~cyclicPointPatch();
// Member Functions
diff --git a/src/OpenFOAM/meshes/pointMesh/pointPatches/constraint/processor/processorPointPatch.C b/src/OpenFOAM/meshes/pointMesh/pointPatches/constraint/processor/processorPointPatch.C
index 38efebd45829a3df342b3de8661534f2e6aec1fc..78d961cc483b668b36c0546907efeb2aaf5da20f 100644
--- a/src/OpenFOAM/meshes/pointMesh/pointPatches/constraint/processor/processorPointPatch.C
+++ b/src/OpenFOAM/meshes/pointMesh/pointPatches/constraint/processor/processorPointPatch.C
@@ -62,7 +62,7 @@ void Foam::processorPointPatch::initGeometry(PstreamBuffers& pBufs)
faceList masterFaces(pp.size());
- forAll (pp, faceI)
+ forAll(pp, faceI)
{
masterFaces[faceI] = pp[faceI].reverseFace();
}
diff --git a/src/OpenFOAM/meshes/pointMesh/pointPatches/constraint/processor/processorPointPatch.H b/src/OpenFOAM/meshes/pointMesh/pointPatches/constraint/processor/processorPointPatch.H
index 9cdb82b2e38e4c37252222e6f2184738c2da5d68..ef30fb27f21bb963b75b111e413cf270111366dd 100644
--- a/src/OpenFOAM/meshes/pointMesh/pointPatches/constraint/processor/processorPointPatch.H
+++ b/src/OpenFOAM/meshes/pointMesh/pointPatches/constraint/processor/processorPointPatch.H
@@ -110,9 +110,8 @@ public:
);
- // Destructor
-
- virtual ~processorPointPatch();
+ //- Destructor
+ virtual ~processorPointPatch();
// Member functions
diff --git a/src/OpenFOAM/meshes/pointMesh/pointPatches/derived/coupled/coupledFacePointPatch.H b/src/OpenFOAM/meshes/pointMesh/pointPatches/derived/coupled/coupledFacePointPatch.H
index 257a3fa5d72023707190676c986bd096a627a794..7237290e0409fec51dfb40d8f71aac9ed14b5a21 100644
--- a/src/OpenFOAM/meshes/pointMesh/pointPatches/derived/coupled/coupledFacePointPatch.H
+++ b/src/OpenFOAM/meshes/pointMesh/pointPatches/derived/coupled/coupledFacePointPatch.H
@@ -94,9 +94,8 @@ public:
);
- // Destructor
-
- virtual ~coupledFacePointPatch();
+ //- Destructor
+ virtual ~coupledFacePointPatch();
// Member Functions
diff --git a/src/OpenFOAM/meshes/pointMesh/pointPatches/facePointPatch/facePointPatch.H b/src/OpenFOAM/meshes/pointMesh/pointPatches/facePointPatch/facePointPatch.H
index 7f1e6d2946e129324211b7ccc9d7437c7d44976d..445eec1ec35926dcb9683edf8c3ab80664770fac 100644
--- a/src/OpenFOAM/meshes/pointMesh/pointPatches/facePointPatch/facePointPatch.H
+++ b/src/OpenFOAM/meshes/pointMesh/pointPatches/facePointPatch/facePointPatch.H
@@ -140,10 +140,9 @@ public:
);
- // Destructor
-
- virtual ~facePointPatch()
- {}
+ //- Destructor
+ virtual ~facePointPatch()
+ {}
// Member Functions
diff --git a/src/OpenFOAM/meshes/pointMesh/pointPatches/pointPatch/pointPatch.H b/src/OpenFOAM/meshes/pointMesh/pointPatches/pointPatch/pointPatch.H
index 482c10128ff6a506dbf6f86055cc4ecd196757b5..76f04d1d1241534c13ca104ee95d06793b0e7d92 100644
--- a/src/OpenFOAM/meshes/pointMesh/pointPatches/pointPatch/pointPatch.H
+++ b/src/OpenFOAM/meshes/pointMesh/pointPatches/pointPatch/pointPatch.H
@@ -120,10 +120,9 @@ public:
{}
- // Destructor
-
- virtual ~pointPatch()
- {}
+ //- Destructor
+ virtual ~pointPatch()
+ {}
// Member Functions
diff --git a/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.C b/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.C
index 88d02457de3780411b17d95119246570c47a4ce7..3931db5b6a9ce0b2619f6041271cb539df069ddb 100644
--- a/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.C
+++ b/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.C
@@ -64,7 +64,7 @@ void Foam::globalMeshData::initProcAddr()
label nNeighbours = 0;
- forAll (mesh_.boundaryMesh(), patchi)
+ forAll(mesh_.boundaryMesh(), patchi)
{
if (isA<processorPolyPatch>(mesh_.boundaryMesh()[patchi]))
{
@@ -78,7 +78,7 @@ void Foam::globalMeshData::initProcAddr()
if (Pstream::parRun())
{
// Send indices of my processor patches to my neighbours
- forAll (processorPatches_, i)
+ forAll(processorPatches_, i)
{
label patchi = processorPatches_[i];
@@ -1122,6 +1122,9 @@ void Foam::globalMeshData::clearOut()
deleteDemandDrivenData(sharedEdgeAddrPtr_);
coupledPatchPtr_.clear();
+ coupledPatchMeshEdgesPtr_.clear();
+ coupledPatchMeshEdgeMapPtr_.clear();
+
// Point
globalPointNumberingPtr_.clear();
globalPointSlavesPtr_.clear();
@@ -1409,6 +1412,45 @@ const Foam::indirectPrimitivePatch& Foam::globalMeshData::coupledPatch() const
}
+const Foam::labelList& Foam::globalMeshData::coupledPatchMeshEdges() const
+{
+ if (!coupledPatchMeshEdgesPtr_.valid())
+ {
+ coupledPatchMeshEdgesPtr_.reset
+ (
+ new labelList
+ (
+ coupledPatch().meshEdges
+ (
+ mesh_.edges(),
+ mesh_.pointEdges()
+ )
+ )
+ );
+ }
+ return coupledPatchMeshEdgesPtr_();
+}
+
+
+const Foam::Map<Foam::label>& Foam::globalMeshData::coupledPatchMeshEdgeMap()
+const
+{
+ if (!coupledPatchMeshEdgeMapPtr_.valid())
+ {
+ const labelList& me = coupledPatchMeshEdges();
+
+ coupledPatchMeshEdgeMapPtr_.reset(new Map<label>(2*me.size()));
+ Map<label>& em = coupledPatchMeshEdgeMapPtr_();
+
+ forAll(me, i)
+ {
+ em.insert(me[i], i);
+ }
+ }
+ return coupledPatchMeshEdgeMapPtr_();
+}
+
+
const Foam::globalIndex& Foam::globalMeshData::globalPointNumbering() const
{
if (!globalPointNumberingPtr_.valid())
diff --git a/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.H b/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.H
index fe2e04731b48fb95e7100db114f20d712fe776cd..b3474ff050be3214d6832ddc2f1c34117250cde7 100644
--- a/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.H
+++ b/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.H
@@ -208,6 +208,10 @@ class globalMeshData
mutable autoPtr<indirectPrimitivePatch> coupledPatchPtr_;
+ mutable autoPtr<labelList> coupledPatchMeshEdgesPtr_;
+
+ mutable autoPtr<Map<label> > coupledPatchMeshEdgeMapPtr_;
+
// Collocated
// Coupled point to collocated coupled points
@@ -358,9 +362,8 @@ public:
globalMeshData(const IOobject& io, const polyMesh& mesh);
- // Destructor
-
- ~globalMeshData();
+ //- Destructor
+ ~globalMeshData();
//- Remove all demand driven data
void clearOut();
@@ -506,6 +509,13 @@ public:
//- Return patch of all coupled faces
const indirectPrimitivePatch& coupledPatch() const;
+ //- Return map from coupledPatch edges to mesh edges
+ const labelList& coupledPatchMeshEdges() const;
+
+ //- Return map from mesh edges to coupledPatch edges
+ const Map<label>& coupledPatchMeshEdgeMap() const;
+
+
// Coupled point to collocated coupled points. Coupled points are
// points on any coupled patch.
diff --git a/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalPoints.C b/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalPoints.C
index 7edd22308c800af3b73f0c58bf3585b1c0fb1691..270be1dd77db4eee18ea8181061d1656602ac185 100644
--- a/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalPoints.C
+++ b/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalPoints.C
@@ -1411,7 +1411,7 @@ void Foam::globalPoints::calculateSharedPoints
// Sort procPoints in incremental order. This will make the master the
// first element.
- forAllIter(Map<label>, meshToProcPoint_, iter)
+ forAllConstIter(Map<label>, meshToProcPoint_, iter)
{
sort(procPoints_[iter()]);
}
diff --git a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/cellMapper/cellMapper.C b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/cellMapper/cellMapper.C
index 192b09d72f921b3347c6948b49ba7eca3b6f89cf..0489d57ded07246ac1537b736749d5f913d2220e 100644
--- a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/cellMapper/cellMapper.C
+++ b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/cellMapper/cellMapper.C
@@ -63,7 +63,7 @@ void Foam::cellMapper::calcAddressing() const
label nInsertedCells = 0;
- forAll (directAddr, cellI)
+ forAll(directAddr, cellI)
{
if (directAddr[cellI] < 0)
{
@@ -88,7 +88,7 @@ void Foam::cellMapper::calcAddressing() const
const List<objectMap>& cfp = mpm_.cellsFromPointsMap();
- forAll (cfp, cfpI)
+ forAll(cfp, cfpI)
{
// Get addressing
const labelList& mo = cfp[cfpI].masterObjects();
@@ -110,7 +110,7 @@ void Foam::cellMapper::calcAddressing() const
const List<objectMap>& cfe = mpm_.cellsFromEdgesMap();
- forAll (cfe, cfeI)
+ forAll(cfe, cfeI)
{
// Get addressing
const labelList& mo = cfe[cfeI].masterObjects();
@@ -132,7 +132,7 @@ void Foam::cellMapper::calcAddressing() const
const List<objectMap>& cff = mpm_.cellsFromFacesMap();
- forAll (cff, cffI)
+ forAll(cff, cffI)
{
// Get addressing
const labelList& mo = cff[cffI].masterObjects();
@@ -154,7 +154,7 @@ void Foam::cellMapper::calcAddressing() const
const List<objectMap>& cfc = mpm_.cellsFromCellsMap();
- forAll (cfc, cfcI)
+ forAll(cfc, cfcI)
{
// Get addressing
const labelList& mo = cfc[cfcI].masterObjects();
@@ -180,7 +180,7 @@ void Foam::cellMapper::calcAddressing() const
const labelList& cm = mpm_.cellMap();
- forAll (cm, cellI)
+ forAll(cm, cellI)
{
if (cm[cellI] > -1 && addr[cellI].empty())
{
@@ -197,7 +197,7 @@ void Foam::cellMapper::calcAddressing() const
label nInsertedCells = 0;
- forAll (addr, cellI)
+ forAll(addr, cellI)
{
if (addr[cellI].empty())
{
@@ -270,28 +270,28 @@ Foam::cellMapper::cellMapper(const mapPolyMesh& mpm)
const List<objectMap>& cfp = mpm_.cellsFromPointsMap();
- forAll (cfp, cfpI)
+ forAll(cfp, cfpI)
{
cm[cfp[cfpI].index()] = 0;
}
const List<objectMap>& cfe = mpm_.cellsFromEdgesMap();
- forAll (cfe, cfeI)
+ forAll(cfe, cfeI)
{
cm[cfe[cfeI].index()] = 0;
}
const List<objectMap>& cff = mpm_.cellsFromFacesMap();
- forAll (cff, cffI)
+ forAll(cff, cffI)
{
cm[cff[cffI].index()] = 0;
}
const List<objectMap>& cfc = mpm_.cellsFromCellsMap();
- forAll (cfc, cfcI)
+ forAll(cfc, cfcI)
{
cm[cfc[cfcI].index()] = 0;
}
diff --git a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/cellMapper/cellMapper.H b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/cellMapper/cellMapper.H
index b2990b9de9bf1ab82b7bc370a15b8a4d61a2aaab..2406f182a1cae4674d9983d6c891739c2b757728 100644
--- a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/cellMapper/cellMapper.H
+++ b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/cellMapper/cellMapper.H
@@ -112,9 +112,8 @@ public:
cellMapper(const mapPolyMesh& mpm);
- // Destructor
-
- virtual ~cellMapper();
+ //- Destructor
+ virtual ~cellMapper();
// Member Functions
diff --git a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/faceMapper/faceMapper.C b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/faceMapper/faceMapper.C
index bbe15fbd30df37cea9f0fefb5c1b92a87c92bd3b..a59d6f8fff64a557a362fad7fb3963d85299d317 100644
--- a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/faceMapper/faceMapper.C
+++ b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/faceMapper/faceMapper.C
@@ -63,7 +63,7 @@ void Foam::faceMapper::calcAddressing() const
label nInsertedFaces = 0;
- forAll (directAddr, faceI)
+ forAll(directAddr, faceI)
{
if (directAddr[faceI] < 0)
{
@@ -88,7 +88,7 @@ void Foam::faceMapper::calcAddressing() const
const List<objectMap>& ffp = mpm_.facesFromPointsMap();
- forAll (ffp, ffpI)
+ forAll(ffp, ffpI)
{
// Get addressing
const labelList& mo = ffp[ffpI].masterObjects();
@@ -110,7 +110,7 @@ void Foam::faceMapper::calcAddressing() const
const List<objectMap>& ffe = mpm_.facesFromEdgesMap();
- forAll (ffe, ffeI)
+ forAll(ffe, ffeI)
{
// Get addressing
const labelList& mo = ffe[ffeI].masterObjects();
@@ -132,7 +132,7 @@ void Foam::faceMapper::calcAddressing() const
const List<objectMap>& fff = mpm_.facesFromFacesMap();
- forAll (fff, fffI)
+ forAll(fff, fffI)
{
// Get addressing
const labelList& mo = fff[fffI].masterObjects();
@@ -157,7 +157,7 @@ void Foam::faceMapper::calcAddressing() const
// so check if addressing size still zero.
const labelList& fm = mpm_.faceMap();
- forAll (fm, faceI)
+ forAll(fm, faceI)
{
if (fm[faceI] > -1 && addr[faceI].empty())
{
@@ -175,7 +175,7 @@ void Foam::faceMapper::calcAddressing() const
label nInsertedFaces = 0;
- forAll (addr, faceI)
+ forAll(addr, faceI)
{
if (addr[faceI].empty())
{
@@ -247,21 +247,21 @@ Foam::faceMapper::faceMapper(const mapPolyMesh& mpm)
const List<objectMap>& ffp = mpm_.facesFromPointsMap();
- forAll (ffp, ffpI)
+ forAll(ffp, ffpI)
{
fm[ffp[ffpI].index()] = 0;
}
const List<objectMap>& ffe = mpm_.facesFromEdgesMap();
- forAll (ffe, ffeI)
+ forAll(ffe, ffeI)
{
fm[ffe[ffeI].index()] = 0;
}
const List<objectMap>& fff = mpm_.facesFromFacesMap();
- forAll (fff, fffI)
+ forAll(fff, fffI)
{
fm[fff[fffI].index()] = 0;
}
diff --git a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/faceMapper/faceMapper.H b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/faceMapper/faceMapper.H
index 98c3b2149c1a4417ce669195689c1958560b51e4..24a32d442eadd9b43b3dc50e4fa104a0fcd4ccd9 100644
--- a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/faceMapper/faceMapper.H
+++ b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/faceMapper/faceMapper.H
@@ -113,9 +113,8 @@ public:
faceMapper(const mapPolyMesh& mpm);
- // Destructor
-
- virtual ~faceMapper();
+ //- Destructor
+ virtual ~faceMapper();
// Member Functions
diff --git a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistribute.C b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistribute.C
index 18f5402428abc7c9d7f3934e45417dfc97ad31b6..b0ecac822b56ebbab5e0e8601fcfe43104b6542e 100644
--- a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistribute.C
+++ b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistribute.C
@@ -371,9 +371,9 @@ Foam::mapDistribute::mapDistribute
label i = 0;
forAllIter(Map<label>, compactMap[procI], iter)
{
+ const label compactI = compactStart[procI] + iter();
remoteElem[i] = iter.key();
- label compactI = compactStart[procI]+iter();
- localElem[i] = compactI;
+ localElem[i] = compactI;
iter() = compactI;
i++;
}
@@ -525,9 +525,9 @@ Foam::mapDistribute::mapDistribute
label i = 0;
forAllIter(Map<label>, compactMap[procI], iter)
{
+ const label compactI = compactStart[procI] + iter();
remoteElem[i] = iter.key();
- label compactI = compactStart[procI]+iter();
- localElem[i] = compactI;
+ localElem[i] = compactI;
iter() = compactI;
i++;
}
diff --git a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/morphFieldMapper.H b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/morphFieldMapper.H
index 07e6f4622975da128d787af924cb1ff37fb772b5..d9f35e51e8c2d47c40a7fe48fe93324e4c05c6ff 100644
--- a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/morphFieldMapper.H
+++ b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/morphFieldMapper.H
@@ -58,10 +58,9 @@ public:
{}
- // Destructor
-
- virtual ~morphFieldMapper()
- {}
+ //- Destructor
+ virtual ~morphFieldMapper()
+ {}
// Member Functions
diff --git a/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.C b/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.C
index 9cd769422d90e9c8ea24f031d3c00fd85259d8f2..1c351ab61d2bdc13896ff10c2fed138b76a469c7 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.C
@@ -120,7 +120,7 @@ Foam::polyBoundaryMesh::~polyBoundaryMesh()
void Foam::polyBoundaryMesh::clearGeom()
{
- forAll (*this, patchi)
+ forAll(*this, patchi)
{
operator[](patchi).clearGeom();
}
@@ -132,7 +132,7 @@ void Foam::polyBoundaryMesh::clearAddressing()
neighbourEdgesPtr_.clear();
patchIDPtr_.clear();
- forAll (*this, patchi)
+ forAll(*this, patchi)
{
operator[](patchi).clearAddressing();
}
@@ -355,7 +355,7 @@ Foam::wordList Foam::polyBoundaryMesh::names() const
wordList t(patches.size());
- forAll (patches, patchI)
+ forAll(patches, patchI)
{
t[patchI] = patches[patchI].name();
}
@@ -370,7 +370,7 @@ Foam::wordList Foam::polyBoundaryMesh::types() const
wordList t(patches.size());
- forAll (patches, patchI)
+ forAll(patches, patchI)
{
t[patchI] = patches[patchI].type();
}
@@ -385,7 +385,7 @@ Foam::wordList Foam::polyBoundaryMesh::physicalTypes() const
wordList t(patches.size());
- forAll (patches, patchI)
+ forAll(patches, patchI)
{
t[patchI] = patches[patchI].physicalType();
}
@@ -398,7 +398,7 @@ Foam::label Foam::polyBoundaryMesh::findPatchID(const word& patchName) const
{
const polyPatchList& patches = *this;
- forAll (patches, patchI)
+ forAll(patches, patchI)
{
if (patches[patchI].name() == patchName)
{
@@ -440,7 +440,7 @@ Foam::label Foam::polyBoundaryMesh::whichPatch(const label faceIndex) const
return -1;
}
- forAll (*this, patchI)
+ forAll(*this, patchI)
{
const polyPatch& bp = operator[](patchI);
@@ -518,7 +518,7 @@ bool Foam::polyBoundaryMesh::checkParallelSync(const bool report) const
label nonProcI = 0;
- forAll (bm, patchI)
+ forAll(bm, patchI)
{
if (!isA<processorPolyPatch>(bm[patchI]))
{
@@ -594,7 +594,7 @@ bool Foam::polyBoundaryMesh::checkDefinition(const bool report) const
bool hasError = false;
- forAll (bm, patchI)
+ forAll(bm, patchI)
{
if (bm[patchI].start() != nextPatchStart && !hasError)
{
diff --git a/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.H b/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.H
index 6b843ecc90c47a50a4637f796d21089586280c49..8fa0eca53497d45e833638013764337e56b09e3b 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.H
+++ b/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.H
@@ -116,9 +116,8 @@ public:
);
- // Destructor
-
- ~polyBoundaryMesh();
+ //- Destructor
+ ~polyBoundaryMesh();
//- Clear geometry at this level and at patches
void clearGeom();
diff --git a/src/OpenFOAM/meshes/polyMesh/polyMesh.C b/src/OpenFOAM/meshes/polyMesh/polyMesh.C
index b459de044e9914fc53fd81c1ad6962ae550120e4..9bb7f27fa5ceda97a012d7189d58c39a02a10903 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyMesh.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyMesh.C
@@ -438,7 +438,7 @@ Foam::polyMesh::polyMesh
oldPointsPtr_(NULL)
{
// Check if the faces and cells are valid
- forAll (faces_, faceI)
+ forAll(faces_, faceI)
{
const face& curFace = faces_[faceI];
@@ -594,7 +594,7 @@ Foam::polyMesh::polyMesh
oldPointsPtr_(NULL)
{
// Check if faces are valid
- forAll (faces_, faceI)
+ forAll(faces_, faceI)
{
const face& curFace = faces_[faceI];
@@ -619,7 +619,7 @@ Foam::polyMesh::polyMesh
cellList cLst(cells);
// Check if cells are valid
- forAll (cLst, cellI)
+ forAll(cLst, cellI)
{
const cell& curCell = cLst[cellI];
@@ -701,7 +701,7 @@ void Foam::polyMesh::resetPrimitives
setInstance(time().timeName());
// Check if the faces and cells are valid
- forAll (faces_, faceI)
+ forAll(faces_, faceI)
{
const face& curFace = faces_[faceI];
@@ -866,7 +866,7 @@ void Foam::polyMesh::addPatches
boundary_.setSize(p.size());
// Copy the patch pointers
- forAll (p, pI)
+ forAll(p, pI)
{
boundary_.set(pI, p[pI]);
}
@@ -918,7 +918,7 @@ void Foam::polyMesh::addZones
pointZones_.setSize(pz.size());
// Copy the zone pointers
- forAll (pz, pI)
+ forAll(pz, pI)
{
pointZones_.set(pI, pz[pI]);
}
@@ -932,7 +932,7 @@ void Foam::polyMesh::addZones
faceZones_.setSize(fz.size());
// Copy the zone pointers
- forAll (fz, fI)
+ forAll(fz, fI)
{
faceZones_.set(fI, fz[fI]);
}
@@ -946,7 +946,7 @@ void Foam::polyMesh::addZones
cellZones_.setSize(cz.size());
// Copy the zone pointers
- forAll (cz, cI)
+ forAll(cz, cI)
{
cellZones_.set(cI, cz[cI]);
}
diff --git a/src/OpenFOAM/meshes/polyMesh/polyMesh.H b/src/OpenFOAM/meshes/polyMesh/polyMesh.H
index 38f521c264975269291c7a77ad046e9313842451..ce82d36de7487d904b5bf46a87d9f4cfc4c9336c 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyMesh.H
+++ b/src/OpenFOAM/meshes/polyMesh/polyMesh.H
@@ -256,9 +256,8 @@ public:
);
- // Destructor
-
- virtual ~polyMesh();
+ //- Destructor
+ virtual ~polyMesh();
// Member Functions
diff --git a/src/OpenFOAM/meshes/polyMesh/polyMeshClear.C b/src/OpenFOAM/meshes/polyMesh/polyMeshClear.C
index d4fc6a80798310d15302dbe3541ad7ece465a98d..88fc61fe1351d6d752cf66a0ac91111af67766d8 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyMeshClear.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyMeshClear.C
@@ -62,7 +62,7 @@ void Foam::polyMesh::clearGeom()
primitiveMesh::clearGeom();
- forAll (boundary_, patchI)
+ forAll(boundary_, patchI)
{
boundary_[patchI].clearGeom();
}
diff --git a/src/OpenFOAM/meshes/polyMesh/polyMeshFromShapeMesh.C b/src/OpenFOAM/meshes/polyMesh/polyMeshFromShapeMesh.C
index 4fd9c4626a763be3c7bc99ee06a5d26b6f6f40a7..464ed465b09175815a82626442ec558ffa078827 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyMeshFromShapeMesh.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyMeshFromShapeMesh.C
@@ -61,7 +61,7 @@ Foam::labelListList Foam::polyMesh::cellShapePointCells
labelListList pointCellAddr(pc.size());
- forAll (pc, pointI)
+ forAll(pc, pointI)
{
pointCellAddr[pointI].transfer(pc[pointI]);
}
@@ -384,7 +384,7 @@ Foam::polyMesh::polyMesh
label nextNei = -1;
label minNei = cells.size();
- forAll (neiCells, ncI)
+ forAll(neiCells, ncI)
{
if (neiCells[ncI] > -1 && neiCells[ncI] < minNei)
{
@@ -433,7 +433,7 @@ Foam::polyMesh::polyMesh
labelList patchSizes(boundaryFaces.size(), -1);
labelList patchStarts(boundaryFaces.size(), -1);
- forAll (boundaryFaces, patchI)
+ forAll(boundaryFaces, patchI)
{
const faceList& patchFaces = boundaryFaces[patchI];
@@ -449,7 +449,7 @@ Foam::polyMesh::polyMesh
// Grab the start label
label curPatchStart = nFaces;
- forAll (patchFaces, faceI)
+ forAll(patchFaces, faceI)
{
const face& curFace = patchFaces[faceI];
@@ -462,7 +462,7 @@ Foam::polyMesh::polyMesh
bool found = false;
- forAll (facesOfCellInside, cellFaceI)
+ forAll(facesOfCellInside, cellFaceI)
{
if (facesOfCellInside[cellFaceI] == curFace)
{
@@ -541,7 +541,7 @@ Foam::polyMesh::polyMesh
// Warning: Patches can only be added once the face list is
// completed, as they hold a subList of the face list
- forAll (boundaryFaces, patchI)
+ forAll(boundaryFaces, patchI)
{
// add the patch to the list
boundary_.set
diff --git a/src/OpenFOAM/meshes/polyMesh/polyMeshIO.C b/src/OpenFOAM/meshes/polyMesh/polyMeshIO.C
index 9c437bdaaafee09e4786a24e8cf0b806cdd816a4..5dcb2464c79d0acc5bd8523fe08f01cc8c789fd8 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyMeshIO.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyMeshIO.C
@@ -185,7 +185,7 @@ Foam::polyMesh::readUpdateState Foam::polyMesh::readUpdate()
wordList oldTypes = boundary_.types();
wordList oldNames = boundary_.names();
- forAll (oldTypes, patchI)
+ forAll(oldTypes, patchI)
{
if
(
@@ -208,14 +208,14 @@ Foam::polyMesh::readUpdateState Foam::polyMesh::readUpdate()
boundary_.clear();
boundary_.setSize(newBoundary.size());
- forAll (newBoundary, patchI)
+ forAll(newBoundary, patchI)
{
boundary_.set(patchI, newBoundary[patchI].clone(boundary_));
}
}
else
{
- forAll (boundary_, patchI)
+ forAll(boundary_, patchI)
{
boundary_[patchI] = polyPatch
(
@@ -296,7 +296,7 @@ Foam::polyMesh::readUpdateState Foam::polyMesh::readUpdate()
}
// Reset existing ones
- forAll (pointZones_, czI)
+ forAll(pointZones_, czI)
{
pointZones_[czI] = newPointZones[czI];
}
@@ -333,7 +333,7 @@ Foam::polyMesh::readUpdateState Foam::polyMesh::readUpdate()
}
// Reset existing ones
- forAll (faceZones_, fzI)
+ forAll(faceZones_, fzI)
{
faceZones_[fzI].resetAddressing
(
@@ -374,7 +374,7 @@ Foam::polyMesh::readUpdateState Foam::polyMesh::readUpdate()
}
// Reset existing ones
- forAll (cellZones_, czI)
+ forAll(cellZones_, czI)
{
cellZones_[czI] = newCellZones[czI];
}
diff --git a/src/OpenFOAM/meshes/polyMesh/polyMeshInitMesh.C b/src/OpenFOAM/meshes/polyMesh/polyMeshInitMesh.C
index 97bf542371d24a30a6c97685e7915fa5ddf733ee..f732de64b26e07b429b25a4ee6a451460d26c926 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyMeshInitMesh.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyMeshInitMesh.C
@@ -111,7 +111,7 @@ void Foam::polyMesh::initMesh(cellList& c)
// get reference to face labels for current cell
const labelList& cellfaces = c[cellI];
- forAll (cellfaces, faceI)
+ forAll(cellfaces, faceI)
{
if (!markedFaces[cellfaces[faceI]])
{
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/basic/coupled/coupledPolyPatch.C b/src/OpenFOAM/meshes/polyMesh/polyPatches/basic/coupled/coupledPolyPatch.C
index fee9dc2da7609a02d1356d0f94978a2f51df5efb..26b892921e8809480eca878ffc47b6397f7a9b77 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/basic/coupled/coupledPolyPatch.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/basic/coupled/coupledPolyPatch.C
@@ -308,7 +308,7 @@ void Foam::coupledPolyPatch::calcTransformTensors
collocated_.setSize(Cf.size());
collocated_ = false;
- forAll (forwardT_, facei)
+ forAll(forwardT_, facei)
{
forwardT_[facei] = rotationTensor(-nr[facei], nf[facei]);
reverseT_[facei] = rotationTensor(nf[facei], -nr[facei]);
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/basic/coupled/coupledPolyPatch.H b/src/OpenFOAM/meshes/polyMesh/polyPatches/basic/coupled/coupledPolyPatch.H
index f5646390147e2e1bb5f679ffd946674d1818df93..423a94ccb7dbc6276120039c036ece0e938a7f4c 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/basic/coupled/coupledPolyPatch.H
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/basic/coupled/coupledPolyPatch.H
@@ -234,9 +234,8 @@ public:
);
- // Destructor
-
- virtual ~coupledPolyPatch();
+ //- Destructor
+ virtual ~coupledPolyPatch();
// Member Functions
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/basic/generic/genericPolyPatch.C b/src/OpenFOAM/meshes/polyMesh/polyPatches/basic/generic/genericPolyPatch.C
index 8c0d66de3f72e2da27d47c4ee9dfaa0feeab5500..ba2067b907c03f1492b8d908ad933719ec36078b 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/basic/generic/genericPolyPatch.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/basic/generic/genericPolyPatch.C
@@ -123,12 +123,7 @@ void Foam::genericPolyPatch::write(Ostream& os) const
os.writeKeyword("nFaces") << size() << token::END_STATEMENT << nl;
os.writeKeyword("startFace") << start() << token::END_STATEMENT << nl;
- for
- (
- dictionary::const_iterator iter = dict_.begin();
- iter != dict_.end();
- ++iter
- )
+ forAllConstIter(dictionary, dict_, iter)
{
if
(
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/basic/generic/genericPolyPatch.H b/src/OpenFOAM/meshes/polyMesh/polyPatches/basic/generic/genericPolyPatch.H
index 567ffc5c89469cb2dabba821c3bb6aaa5382091e..b06a95c279e0a1c60f8d19191d1105208469d33b 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/basic/generic/genericPolyPatch.H
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/basic/generic/genericPolyPatch.H
@@ -154,9 +154,8 @@ public:
}
- // Destructor
-
- ~genericPolyPatch();
+ //- Destructor
+ ~genericPolyPatch();
// Member functions
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.H b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.H
index 94244cdc01cb66d70a2b47599ca7798f16ad5b6a..f8ae312f20e08a1373c2d76a6b3922ea1ea0822f 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.H
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.H
@@ -283,9 +283,8 @@ public:
}
- // Destructor
-
- virtual ~cyclicPolyPatch();
+ //- Destructor
+ virtual ~cyclicPolyPatch();
// Member Functions
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processor/processorPolyPatch.H b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processor/processorPolyPatch.H
index c4bcd7398abd6d7791cf34d804484a2231a6d92b..8b168b9806ae23444d3c907afea901c30ac7cd86 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processor/processorPolyPatch.H
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processor/processorPolyPatch.H
@@ -217,9 +217,8 @@ public:
}
- // Destructor
-
- virtual ~processorPolyPatch();
+ //- Destructor
+ virtual ~processorPolyPatch();
// Member functions
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatch.C b/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatch.C
index fa35e02e76accb14392248d32f40e36fd6cac2e5..37fa6df999dcbedf5c1e09430d561ac1c725ae8e 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatch.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatch.C
@@ -275,7 +275,7 @@ Foam::tmp<Foam::vectorField> Foam::polyPatch::faceCellCentres() const
const unallocLabelList& faceCells = this->faceCells();
- forAll (faceCells, facei)
+ forAll(faceCells, facei)
{
cc[facei] = gcc[faceCells[facei]];
}
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatch.H b/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatch.H
index fb3f45045b568d033ab8375faee1a3a36f1ba695..f9cbfcad9a3973b8e619861feccf4802326ff333 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatch.H
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatch.H
@@ -276,9 +276,8 @@ public:
);
- // Destructor
-
- virtual ~polyPatch();
+ //- Destructor
+ virtual ~polyPatch();
// Member Functions
diff --git a/src/OpenFOAM/meshes/polyMesh/syncTools/syncTools.C b/src/OpenFOAM/meshes/polyMesh/syncTools/syncTools.C
index 84d85ce8ed2e218a063af5a2daf6d7ca5a15976c..8bf68ba40b0527cafd5a67eceb0f398cfc31a56e 100644
--- a/src/OpenFOAM/meshes/polyMesh/syncTools/syncTools.C
+++ b/src/OpenFOAM/meshes/polyMesh/syncTools/syncTools.C
@@ -77,100 +77,18 @@ Foam::PackedBoolList Foam::syncTools::getMasterPoints(const polyMesh& mesh)
PackedBoolList isMasterPoint(mesh.nPoints());
PackedBoolList donePoint(mesh.nPoints());
+ const globalMeshData& globalData = mesh.globalData();
+ const labelList& meshPoints = globalData.coupledPatch().meshPoints();
+ const labelListList& pointSlaves = globalData.globalPointAllSlaves();
- // Do multiple shared points. Min. proc is master
- // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
- const labelList& sharedPointAddr =
- mesh.globalData().sharedPointAddr();
-
- labelList minProc(mesh.globalData().nGlobalPoints(), labelMax);
-
- UIndirectList<label>(minProc, sharedPointAddr) = Pstream::myProcNo();
-
- Pstream::listCombineGather(minProc, minEqOp<label>());
- Pstream::listCombineScatter(minProc);
-
- const labelList& sharedPointLabels =
- mesh.globalData().sharedPointLabels();
-
- forAll(sharedPointAddr, i)
- {
- if (minProc[sharedPointAddr[i]] == Pstream::myProcNo())
- {
- isMasterPoint.set(sharedPointLabels[i], 1u);
- }
- donePoint.set(sharedPointLabels[i], 1u);
- }
-
-
- // Do other points on coupled patches
- // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
- const polyBoundaryMesh& patches = mesh.boundaryMesh();
-
- forAll(patches, patchI)
+ forAll(meshPoints, coupledPointI)
{
- if (patches[patchI].coupled())
+ label meshPointI = meshPoints[coupledPointI];
+ if (pointSlaves[coupledPointI].size() > 0)
{
- if
- (
- Pstream::parRun()
- && isA<processorPolyPatch>(patches[patchI])
- )
- {
- const processorPolyPatch& pp =
- refCast<const processorPolyPatch>(patches[patchI]);
-
- const labelList& meshPoints = pp.meshPoints();
-
- forAll(meshPoints, i)
- {
- label pointI = meshPoints[i];
-
- if (donePoint.get(pointI) == 0u)
- {
- donePoint.set(pointI, 1u);
-
- if (pp.owner())
- {
- isMasterPoint.set(pointI, 1u);
- }
- }
- }
- }
- else if (isA<cyclicPolyPatch>(patches[patchI]))
- {
- const cyclicPolyPatch& pp =
- refCast<const cyclicPolyPatch>(patches[patchI]);
-
- const edgeList& coupledPoints = pp.coupledPoints();
- const labelList& meshPoints = pp.meshPoints();
-
- forAll(coupledPoints, i)
- {
- // First one of couple points is master
-
- const edge& pointPair = coupledPoints[i];
- label p0 = meshPoints[pointPair[0]];
- label p1 = meshPoints[pointPair[1]];
-
- if (donePoint.get(p0) == 0u)
- {
- donePoint.set(p0, 1u);
- isMasterPoint.set(p0, 1u);
- donePoint.set(p1, 1u);
- }
- }
- }
- else
- {
- FatalErrorIn("syncTools::getMasterPoints(const polyMesh&)")
- << "Cannot handle coupled patch " << patches[patchI].name()
- << " of type " << patches[patchI].type()
- << abort(FatalError);
- }
+ isMasterPoint[meshPointI] = true;
}
+ donePoint[meshPointI] = true;
}
@@ -179,10 +97,9 @@ Foam::PackedBoolList Foam::syncTools::getMasterPoints(const polyMesh& mesh)
forAll(donePoint, pointI)
{
- if (donePoint.get(pointI) == 0u)
+ if (!donePoint[pointI])
{
- donePoint.set(pointI, 1u);
- isMasterPoint.set(pointI, 1u);
+ isMasterPoint[pointI] = true;
}
}
@@ -196,100 +113,18 @@ Foam::PackedBoolList Foam::syncTools::getMasterEdges(const polyMesh& mesh)
PackedBoolList isMasterEdge(mesh.nEdges());
PackedBoolList doneEdge(mesh.nEdges());
+ const globalMeshData& globalData = mesh.globalData();
+ const labelList& meshEdges = globalData.coupledPatchMeshEdges();
+ const labelListList& edgeSlaves = globalData.globalEdgeAllSlaves();
- // Do multiple shared edges. Min. proc is master
- // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
- const labelList& sharedEdgeAddr =
- mesh.globalData().sharedEdgeAddr();
-
- labelList minProc(mesh.globalData().nGlobalEdges(), labelMax);
-
- UIndirectList<label>(minProc, sharedEdgeAddr) = Pstream::myProcNo();
-
- Pstream::listCombineGather(minProc, minEqOp<label>());
- Pstream::listCombineScatter(minProc);
-
- const labelList& sharedEdgeLabels =
- mesh.globalData().sharedEdgeLabels();
-
- forAll(sharedEdgeAddr, i)
- {
- if (minProc[sharedEdgeAddr[i]] == Pstream::myProcNo())
- {
- isMasterEdge.set(sharedEdgeLabels[i], 1u);
- }
- doneEdge.set(sharedEdgeLabels[i], 1u);
- }
-
-
- // Do other edges on coupled patches
- // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
- const polyBoundaryMesh& patches = mesh.boundaryMesh();
-
- forAll(patches, patchI)
+ forAll(meshEdges, coupledEdgeI)
{
- if (patches[patchI].coupled())
+ label meshEdgeI = meshEdges[coupledEdgeI];
+ if (edgeSlaves[coupledEdgeI].size() > 0)
{
- if
- (
- Pstream::parRun()
- && isA<processorPolyPatch>(patches[patchI])
- )
- {
- const processorPolyPatch& pp =
- refCast<const processorPolyPatch>(patches[patchI]);
-
- const labelList& meshEdges = pp.meshEdges();
-
- forAll(meshEdges, i)
- {
- label edgeI = meshEdges[i];
-
- if (doneEdge.get(edgeI) == 0u)
- {
- doneEdge.set(edgeI, 1u);
-
- if (pp.owner())
- {
- isMasterEdge.set(edgeI, 1u);
- }
- }
- }
- }
- else if (isA<cyclicPolyPatch>(patches[patchI]))
- {
- const cyclicPolyPatch& pp =
- refCast<const cyclicPolyPatch>(patches[patchI]);
-
- const edgeList& coupledEdges = pp.coupledEdges();
- const labelList& meshEdges = pp.meshEdges();
-
- forAll(coupledEdges, i)
- {
- // First one of couple edges is master
-
- const edge& edgePair = coupledEdges[i];
- label e0 = meshEdges[edgePair[0]];
- label e1 = meshEdges[edgePair[1]];
-
- if (doneEdge.get(e0) == 0u)
- {
- doneEdge.set(e0, 1u);
- isMasterEdge.set(e0, 1u);
- doneEdge.set(e1, 1u);
- }
- }
- }
- else
- {
- FatalErrorIn("syncTools::getMasterEdges(const polyMesh&)")
- << "Cannot handle coupled patch " << patches[patchI].name()
- << " of type " << patches[patchI].type()
- << abort(FatalError);
- }
+ isMasterEdge[meshEdgeI] = true;
}
+ doneEdge[meshEdgeI] = true;
}
@@ -298,10 +133,9 @@ Foam::PackedBoolList Foam::syncTools::getMasterEdges(const polyMesh& mesh)
forAll(doneEdge, edgeI)
{
- if (doneEdge.get(edgeI) == 0u)
+ if (!doneEdge[edgeI])
{
- doneEdge.set(edgeI, 1u);
- isMasterEdge.set(edgeI, 1u);
+ isMasterEdge[edgeI] = true;
}
}
diff --git a/src/OpenFOAM/meshes/polyMesh/syncTools/syncToolsTemplates.C b/src/OpenFOAM/meshes/polyMesh/syncTools/syncToolsTemplates.C
index 16a0ef72bf4e928b6fb017ab3fc7963b3d592472..3591eac7562b6f39225b12d543a06f6d0893a52e 100644
--- a/src/OpenFOAM/meshes/polyMesh/syncTools/syncToolsTemplates.C
+++ b/src/OpenFOAM/meshes/polyMesh/syncTools/syncToolsTemplates.C
@@ -201,12 +201,7 @@ void Foam::syncTools::syncPointMap
// Only update those values which come from neighbour
- forAllConstIter
- (
- typename Map<T>,
- nbrPatchInfo,
- nbrIter
- )
+ forAllConstIter(typename Map<T>, nbrPatchInfo, nbrIter)
{
combine
(
@@ -550,12 +545,7 @@ void Foam::syncTools::syncEdgeMap
// Only update those values which come from neighbour
- forAllConstIter
- (
- typename EdgeMap<T>,
- nbrPatchInfo,
- nbrIter
- )
+ forAllConstIter(typename EdgeMap<T>, nbrPatchInfo, nbrIter)
{
const edge& e = nbrIter.key();
const edge meshEdge(meshPts[e[0]], meshPts[e[1]]);
diff --git a/src/OpenFOAM/meshes/polyMesh/zones/ZoneMesh/ZoneMesh.C b/src/OpenFOAM/meshes/polyMesh/zones/ZoneMesh/ZoneMesh.C
index 546c4bef1aec15a096c528d1cebc523b6e017b0f..7ad51549b1c84f343dbb4720148d0662feffeb4b 100644
--- a/src/OpenFOAM/meshes/polyMesh/zones/ZoneMesh/ZoneMesh.C
+++ b/src/OpenFOAM/meshes/polyMesh/zones/ZoneMesh/ZoneMesh.C
@@ -50,7 +50,7 @@ void ZoneMesh<ZoneType, MeshType>::calcZoneMap() const
// Count number of objects in all zones
label nObjects = 0;
- forAll (*this, zoneI)
+ forAll(*this, zoneI)
{
nObjects += this->operator[](zoneI).size();
}
@@ -60,11 +60,11 @@ void ZoneMesh<ZoneType, MeshType>::calcZoneMap() const
// Fill in objects of all zones into the map. The key is the global
// object index and the result is the zone index
- forAll (*this, zoneI)
+ forAll(*this, zoneI)
{
const labelList& zoneObjects = this->operator[](zoneI);
- forAll (zoneObjects, objI)
+ forAll(zoneObjects, objI)
{
zm.insert(zoneObjects[objI], zoneI);
}
@@ -201,7 +201,7 @@ wordList ZoneMesh<ZoneType, MeshType>::types() const
wordList t(zones.size());
- forAll (zones, zoneI)
+ forAll(zones, zoneI)
{
t[zoneI] = zones[zoneI].type();
}
@@ -218,7 +218,7 @@ wordList ZoneMesh<ZoneType, MeshType>::names() const
wordList t(zones.size());
- forAll (zones, zoneI)
+ forAll(zones, zoneI)
{
t[zoneI] = zones[zoneI].name();
}
@@ -232,7 +232,7 @@ label ZoneMesh<ZoneType, MeshType>::findZoneID(const word& zoneName) const
{
const PtrList<ZoneType>& zones = *this;
- forAll (zones, zoneI)
+ forAll(zones, zoneI)
{
if (zones[zoneI].name() == zoneName)
{
@@ -261,7 +261,7 @@ void ZoneMesh<ZoneType, MeshType>::clearAddressing()
PtrList<ZoneType>& zones = *this;
- forAll (zones, zoneI)
+ forAll(zones, zoneI)
{
zones[zoneI].clearAddressing();
}
@@ -284,7 +284,7 @@ bool ZoneMesh<ZoneType, MeshType>::checkDefinition(const bool report) const
const PtrList<ZoneType>& zones = *this;
- forAll (zones, zoneI)
+ forAll(zones, zoneI)
{
inError |= zones[zoneI].checkDefinition(report);
}
@@ -298,7 +298,7 @@ void ZoneMesh<ZoneType, MeshType>::movePoints(const pointField& p)
{
PtrList<ZoneType>& zones = *this;
- forAll (zones, zoneI)
+ forAll(zones, zoneI)
{
zones[zoneI].movePoints(p);
}
diff --git a/src/OpenFOAM/meshes/polyMesh/zones/ZoneMesh/ZoneMesh.H b/src/OpenFOAM/meshes/polyMesh/zones/ZoneMesh/ZoneMesh.H
index 57404af3209335f20aa6de16f802a0883b04edca..ca1a2dce860d9626349ecd3639e6d07f03ec2d3e 100644
--- a/src/OpenFOAM/meshes/polyMesh/zones/ZoneMesh/ZoneMesh.H
+++ b/src/OpenFOAM/meshes/polyMesh/zones/ZoneMesh/ZoneMesh.H
@@ -105,9 +105,8 @@ public:
const label size
);
- // Destructor
-
- ~ZoneMesh();
+ //- Destructor
+ ~ZoneMesh();
// Member functions
diff --git a/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZone.C b/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZone.C
index 5e900f8feda2699ab5abee8f01f976e47ccf0c57..8c5b79e80a25f8b8b931795dc6b205e74336e1fb 100644
--- a/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZone.C
+++ b/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZone.C
@@ -77,7 +77,7 @@ void Foam::faceZone::calcFaceZonePatch() const
const labelList& addr = *this;
const boolList& flip = flipMap();
- forAll (addr, faceI)
+ forAll(addr, faceI)
{
if (flip[faceI])
{
@@ -133,7 +133,7 @@ void Foam::faceZone::calcCellLayers() const
slaveCellsPtr_ = new labelList(mf.size());
labelList& sc = *slaveCellsPtr_;
- forAll (mf, faceI)
+ forAll(mf, faceI)
{
label ownCellI = own[mf[faceI]];
label neiCellI =
@@ -346,7 +346,7 @@ const Foam::labelList& Foam::faceZone::meshEdges() const
//
//const labelList& faceLabels = *this;
//
- //forAll (faceCells, faceI)
+ //forAll(faceCells, faceI)
//{
// faceCells[faceI] = own[faceLabels[faceI]];
//}
diff --git a/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatch.H b/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatch.H
index 2d0515addd6ad2d328155b872c53f81c4466e37e..6561705652f8d1e70b027754fe0cccbae59dedbd 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatch.H
+++ b/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatch.H
@@ -258,9 +258,8 @@ public:
);
- // Destructor
-
- virtual ~PrimitivePatch();
+ //- Destructor
+ virtual ~PrimitivePatch();
void clearOut();
diff --git a/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchAddressing.C b/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchAddressing.C
index 9c3d10619d18d8cb5a778db01366ac47b74226d3..8722ab98ac4efca84b7ec4614e94653f367f3022 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchAddressing.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchAddressing.C
@@ -78,7 +78,7 @@ calcAddressing() const
// Guess the max number of edges and neighbours for a face
label maxEdges = 0;
- forAll (locFcs, faceI)
+ forAll(locFcs, faceI)
{
maxEdges += locFcs[faceI].size();
}
@@ -103,14 +103,14 @@ calcAddressing() const
// initialise the lists of subshapes for each face to avoid duplication
edgeListList faceIntoEdges(locFcs.size());
- forAll (locFcs, faceI)
+ forAll(locFcs, faceI)
{
faceIntoEdges[faceI] = locFcs[faceI].edges();
labelList& curFaceEdges = faceEdges[faceI];
curFaceEdges.setSize(faceIntoEdges[faceI].size());
- forAll (curFaceEdges, faceEdgeI)
+ forAll(curFaceEdges, faceEdgeI)
{
curFaceEdges[faceEdgeI] = -1;
}
@@ -128,7 +128,7 @@ calcAddressing() const
// in face (i.e. curEdges[0] is edge between f[0] and f[1])
// For all local faces ...
- forAll (locFcs, faceI)
+ forAll(locFcs, faceI)
{
// Get reference to vertices of current face and corresponding edges.
const Face& curF = locFcs[faceI];
@@ -141,7 +141,7 @@ calcAddressing() const
label nNeighbours = 0;
// For all edges ...
- forAll (curEdges, edgeI)
+ forAll(curEdges, edgeI)
{
// If the edge is already detected, skip
if (faceEdges[faceI][edgeI] >= 0) continue;
@@ -155,7 +155,7 @@ calcAddressing() const
const labelList& nbrFaces = pf[e.start()];
- forAll (nbrFaces, nbrFaceI)
+ forAll(nbrFaces, nbrFaceI)
{
// set reference to the current neighbour
label curNei = nbrFaces[nbrFaceI];
@@ -166,7 +166,7 @@ calcAddressing() const
// get the reference to subshapes of the neighbour
const edgeList& searchEdges = faceIntoEdges[curNei];
- forAll (searchEdges, neiEdgeI)
+ forAll(searchEdges, neiEdgeI)
{
if (searchEdges[neiEdgeI] == e)
{
@@ -204,7 +204,7 @@ calcAddressing() const
label nextNei = -1;
label minNei = locFcs.size();
- forAll (neiFaces, nfI)
+ forAll(neiFaces, nfI)
{
if (neiFaces[nfI].size() && neiFaces[nfI][0] < minNei)
{
@@ -229,7 +229,7 @@ calcAddressing() const
curEf.setSize(cnf.size() + 1);
curEf[0] = faceI;
- forAll (cnf, cnfI)
+ forAll(cnf, cnfI)
{
faceEdges[cnf[cnfI]][eonf[cnfI]] = nEdges;
@@ -259,11 +259,11 @@ calcAddressing() const
// Do boundary faces
- forAll (faceEdges, faceI)
+ forAll(faceEdges, faceI)
{
labelList& curEdges = faceEdges[faceI];
- forAll (curEdges, edgeI)
+ forAll(curEdges, edgeI)
{
if (curEdges[edgeI] < 0)
{
@@ -291,7 +291,7 @@ calcAddressing() const
faceFacesPtr_ = new labelListList(locFcs.size());
labelListList& faceFaces = *faceFacesPtr_;
- forAll (faceFaces, faceI)
+ forAll(faceFaces, faceI)
{
faceFaces[faceI].transfer(ff[faceI]);
}
diff --git a/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchLocalPointOrder.C b/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchLocalPointOrder.C
index 5e7cc45fa47da8f99ee22b1815831c27d62a8740..d9d1239a810f47a50a7c1596ba76bd0ab90e0a95 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchLocalPointOrder.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchLocalPointOrder.C
@@ -80,7 +80,7 @@ calcLocalPointOrder() const
label nPoints = 0;
- forAll (lf, faceI)
+ forAll(lf, faceI)
{
if (!visitedFace[faceI])
{
@@ -99,7 +99,7 @@ calcLocalPointOrder() const
const labelList& curPoints = lf[curFace];
// mark points
- forAll (curPoints, pointI)
+ forAll(curPoints, pointI)
{
if (!visitedPoint[curPoints[pointI]])
{
@@ -114,7 +114,7 @@ calcLocalPointOrder() const
// add face neighbours to the list
const labelList& nbrs = ff[curFace];
- forAll (nbrs, nbrI)
+ forAll(nbrs, nbrI)
{
if (!visitedFace[nbrs[nbrI]])
{
diff --git a/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchMeshEdges.C b/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchMeshEdges.C
index 66661c3f7604aebfe27c906030fcda9a5625a6bb..480cb3402bb82c5e247823405705f99e5f488995 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchMeshEdges.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchMeshEdges.C
@@ -67,7 +67,7 @@ meshEdges
// WARNING: Remember that local edges address into local point list;
// local-to-global point label translation is necessary
- forAll (PatchEdges, edgeI)
+ forAll(PatchEdges, edgeI)
{
const edge curEdge
(pp[PatchEdges[edgeI].start()], pp[PatchEdges[edgeI].end()]);
@@ -77,7 +77,7 @@ meshEdges
// get the patch faces sharing the edge
const labelList& curFaces = EdgeFaces[edgeI];
- forAll (curFaces, faceI)
+ forAll(curFaces, faceI)
{
// get the cell next to the face
label curCell = faceCells[curFaces[faceI]];
@@ -85,7 +85,7 @@ meshEdges
// get reference to edges on the cell
const labelList& ce = cellEdges[curCell];
- forAll (ce, cellEdgeI)
+ forAll(ce, cellEdgeI)
{
if (allEdges[ce[cellEdgeI]] == curEdge)
{
@@ -139,14 +139,14 @@ meshEdges
// WARNING: Remember that local edges address into local point list;
// local-to-global point label translation is necessary
- forAll (PatchEdges, edgeI)
+ forAll(PatchEdges, edgeI)
{
const label globalPointI = pp[PatchEdges[edgeI].start()];
const edge curEdge(globalPointI, pp[PatchEdges[edgeI].end()]);
const labelList& pe = pointEdges[globalPointI];
- forAll (pe, i)
+ forAll(pe, i)
{
if (allEdges[pe[i]] == curEdge)
{
@@ -183,7 +183,7 @@ whichEdge
{
const labelList& pe = pointEdges()[e.start()];
- forAll (pe, peI)
+ forAll(pe, peI)
{
if (e == Edges[pe[peI]])
{
diff --git a/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchPointAddressing.C b/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchPointAddressing.C
index f73eae1221f8546d7a55df3cebd27ca600c9ce79..5f9805ef54e660c3611b731af8e0ae9eea52c259 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchPointAddressing.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchPointAddressing.C
@@ -67,7 +67,7 @@ calcPointEdges() const
// set up storage for pointEdges
List<SLList<label> > pointEdges(meshPoints().size());
- forAll (e, edgeI)
+ forAll(e, edgeI)
{
pointEdges[e[edgeI].start()].append(edgeI);
pointEdges[e[edgeI].end()].append(edgeI);
@@ -78,19 +78,16 @@ calcPointEdges() const
labelListList& pe = *pointEdgesPtr_;
- forAll (pointEdges, pointI)
+ forAll(pointEdges, pointI)
{
- pe[pointI].setSize(pointEdges[pointI].size());
+ const SLList<label>& pEdge = pointEdges[pointI];
+
+ pe[pointI].setSize(pEdge.size());
label i = 0;
- for
- (
- SLList<label>::iterator curEdgesIter = pointEdges[pointI].begin();
- curEdgesIter != pointEdges[pointI].end();
- ++curEdgesIter, ++i
- )
+ forAllConstIter(SLList<label>, pEdge, iter)
{
- pe[pointI][i] = curEdgesIter();
+ pe[pointI][i++] = iter();
}
}
@@ -138,11 +135,11 @@ calcPointFaces() const
// set up storage for pointFaces
List<SLList<label> > pointFcs(meshPoints().size());
- forAll (f, faceI)
+ forAll(f, faceI)
{
const Face& curPoints = f[faceI];
- forAll (curPoints, pointI)
+ forAll(curPoints, pointI)
{
pointFcs[curPoints[pointI]].append(faceI);
}
@@ -153,19 +150,14 @@ calcPointFaces() const
labelListList& pf = *pointFacesPtr_;
- forAll (pointFcs, pointI)
+ forAll(pointFcs, pointI)
{
pf[pointI].setSize(pointFcs[pointI].size());
label i = 0;
- for
- (
- SLList<label>::iterator curFacesIter = pointFcs[pointI].begin();
- curFacesIter != pointFcs[pointI].end();
- ++curFacesIter, ++i
- )
+ forAllIter(SLList<label>, pointFcs[pointI], curFacesIter)
{
- pf[pointI][i] = curFacesIter();
+ pf[pointI][i++] = curFacesIter();
}
}
diff --git a/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchProjectPoints.C b/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchProjectPoints.C
index d58231f7ec85e09b0d93210922eb93a8b405997c..a3522bbf835d07d3cfff2018224c06dab5ccf17f 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchProjectPoints.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchProjectPoints.C
@@ -84,7 +84,7 @@ projectPoints
// Estimate face centre of target side
Field<PointType> masterFaceCentres(targetPatch.size());
- forAll (masterFaceCentres, faceI)
+ forAll(masterFaceCentres, faceI)
{
masterFaceCentres[faceI] =
average(masterFaces[faceI].points(masterPoints));
@@ -101,7 +101,7 @@ projectPoints
label curFace = 0;
label nNSquaredSearches = 0;
- forAll (slavePointOrder, pointI)
+ forAll(slavePointOrder, pointI)
{
// Pick up slave point and direction
const label curLocalPointLabel = slavePointOrder[pointI];
@@ -179,7 +179,7 @@ projectPoints
sqrDistance =
magSqr(missPlanePoint - masterFaceCentres[curFace]);
- forAll (masterNbrs, nbrI)
+ forAll(masterNbrs, nbrI)
{
if
(
@@ -224,7 +224,7 @@ projectPoints
result[curLocalPointLabel] = objectHit(false, -1);
scalar minDistance = GREAT;
- forAll (masterFaces, faceI)
+ forAll(masterFaces, faceI)
{
PointHit<PointType> curHit =
masterFaces[faceI].ray
@@ -325,7 +325,7 @@ projectFaceCentres
const typename ToPatch::PointFieldType& masterPoints = targetPatch.points();
- forAll (masterFaceCentres, faceI)
+ forAll(masterFaceCentres, faceI)
{
masterFaceCentres[faceI] =
masterFaces[faceI].centre(masterPoints);
@@ -348,7 +348,7 @@ projectFaceCentres
label curFace = 0;
label nNSquaredSearches = 0;
- forAll (slaveFaceOrder, faceI)
+ forAll(slaveFaceOrder, faceI)
{
// pick up slave point and direction
const label curLocalFaceLabel = slaveFaceOrder[faceI];
@@ -425,7 +425,7 @@ projectFaceCentres
const labelList& masterNbrs = masterFaceFaces[curFace];
- forAll (masterNbrs, nbrI)
+ forAll(masterNbrs, nbrI)
{
if
(
@@ -467,7 +467,7 @@ projectFaceCentres
result[curLocalFaceLabel] = objectHit(false, -1);
scalar minDistance = GREAT;
- forAll (masterFaces, faceI)
+ forAll(masterFaces, faceI)
{
PointHit<PointType> curHit =
masterFaces[faceI].ray
diff --git a/src/OpenFOAM/meshes/primitiveMesh/primitiveMesh.H b/src/OpenFOAM/meshes/primitiveMesh/primitiveMesh.H
index 718df480e00713c8991728542e35faa1bb3c4f22..4b78927de002e4742d6728afebcdd6ad6b403609 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/primitiveMesh.H
+++ b/src/OpenFOAM/meshes/primitiveMesh/primitiveMesh.H
@@ -350,9 +350,8 @@ public:
);
- // Destructor
-
- virtual ~primitiveMesh();
+ //- Destructor
+ virtual ~primitiveMesh();
// Member Functions
diff --git a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCalcCellShapes.C b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCalcCellShapes.C
index d72ae8526e487b714f5478c936f35ffc2a2b0e90..803160e8bebd3b85661113182b3cd3490132fc1b 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCalcCellShapes.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCalcCellShapes.C
@@ -49,7 +49,7 @@ void Foam::primitiveMesh::calcCellShapes() const
cellShapesPtr_ = new cellShapeList(nCells());
cellShapeList& cellShapes = *cellShapesPtr_;
- forAll (cellShapes, celli)
+ forAll(cellShapes, celli)
{
cellShapes[celli] = degenerateMatcher::match(*this, celli);
}
diff --git a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCellCells.C b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCellCells.C
index e4486bb637d63ef7dffd4973e4d0720e770deefd..a698a808339d6a7165bd422500b4300684073a35 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCellCells.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCellCells.C
@@ -63,7 +63,7 @@ void Foam::primitiveMesh::calcCellCells() const
const labelList& own = faceOwner();
const labelList& nei = faceNeighbour();
- forAll (nei, faceI)
+ forAll(nei, faceI)
{
ncc[own[faceI]]++;
ncc[nei[faceI]]++;
@@ -77,13 +77,13 @@ void Foam::primitiveMesh::calcCellCells() const
// 2. Size and fill cellFaceAddr
- forAll (cellCellAddr, cellI)
+ forAll(cellCellAddr, cellI)
{
cellCellAddr[cellI].setSize(ncc[cellI]);
}
ncc = 0;
- forAll (nei, faceI)
+ forAll(nei, faceI)
{
label ownCellI = own[faceI];
label neiCellI = nei[faceI];
diff --git a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCellCentresAndVols.C b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCellCentresAndVols.C
index 0d49452c0d66f8909d05db40d0b8227128d3af8d..fd38491dfa66a154bb75d22b2812ca9b9c73ed8b 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCellCentresAndVols.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCellCentresAndVols.C
@@ -90,13 +90,13 @@ void Foam::primitiveMesh::makeCellCentresAndVols
vectorField cEst(nCells(), vector::zero);
labelField nCellFaces(nCells(), 0);
- forAll (own, facei)
+ forAll(own, facei)
{
cEst[own[facei]] += fCtrs[facei];
nCellFaces[own[facei]] += 1;
}
- forAll (nei, facei)
+ forAll(nei, facei)
{
cEst[nei[facei]] += fCtrs[facei];
nCellFaces[nei[facei]] += 1;
@@ -107,7 +107,7 @@ void Foam::primitiveMesh::makeCellCentresAndVols
cEst[celli] /= nCellFaces[celli];
}
- forAll (own, facei)
+ forAll(own, facei)
{
// Calculate 3*face-pyramid volume
scalar pyr3Vol =
@@ -123,7 +123,7 @@ void Foam::primitiveMesh::makeCellCentresAndVols
cellVols[own[facei]] += pyr3Vol;
}
- forAll (nei, facei)
+ forAll(nei, facei)
{
// Calculate 3*face-pyramid volume
scalar pyr3Vol =
diff --git a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCellEdges.C b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCellEdges.C
index 08d3c6c5b5f764fddb6cd9b06c941e38e87ff02a..98cec1c33709c2882903bd0affdbceeeee88f983 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCellEdges.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCellEdges.C
@@ -69,13 +69,13 @@ void Foam::primitiveMesh::calcCellEdges() const
const labelListList& fe = faceEdges();
// loop through the list again and add edges; checking for duplicates
- forAll (own, faceI)
+ forAll(own, faceI)
{
DynamicList<label, edgesPerCell_>& curCellEdges = ce[own[faceI]];
const labelList& curEdges = fe[faceI];
- forAll (curEdges, edgeI)
+ forAll(curEdges, edgeI)
{
if (findIndex(curCellEdges, curEdges[edgeI]) == -1)
{
@@ -85,13 +85,13 @@ void Foam::primitiveMesh::calcCellEdges() const
}
}
- forAll (nei, faceI)
+ forAll(nei, faceI)
{
DynamicList<label, edgesPerCell_>& curCellEdges = ce[nei[faceI]];
const labelList& curEdges = fe[faceI];
- forAll (curEdges, edgeI)
+ forAll(curEdges, edgeI)
{
if (findIndex(curCellEdges, curEdges[edgeI]) == -1)
{
@@ -105,7 +105,7 @@ void Foam::primitiveMesh::calcCellEdges() const
labelListList& cellEdgeAddr = *cePtr_;
// reset the size
- forAll (ce, cellI)
+ forAll(ce, cellI)
{
cellEdgeAddr[cellI].transfer(ce[cellI]);
}
diff --git a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCells.C b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCells.C
index a117022bb03a0b944492eee2e4d2b497ef9a3f7b..f814bd1eefff0ed2ebee19ce6fefa84405ce72de 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCells.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCells.C
@@ -52,12 +52,12 @@ void Foam::primitiveMesh::calcCells
labelList ncf(nCells, 0);
- forAll (own, faceI)
+ forAll(own, faceI)
{
ncf[own[faceI]]++;
}
- forAll (nei, faceI)
+ forAll(nei, faceI)
{
if (nei[faceI] >= 0)
{
@@ -71,20 +71,20 @@ void Foam::primitiveMesh::calcCells
// 2. Size and fill cellFaceAddr
- forAll (cellFaceAddr, cellI)
+ forAll(cellFaceAddr, cellI)
{
cellFaceAddr[cellI].setSize(ncf[cellI]);
}
ncf = 0;
- forAll (own, faceI)
+ forAll(own, faceI)
{
label cellI = own[faceI];
cellFaceAddr[cellI][ncf[cellI]++] = faceI;
}
- forAll (nei, faceI)
+ forAll(nei, faceI)
{
label cellI = nei[faceI];
diff --git a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCheck/primitiveMeshCheck.C b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCheck/primitiveMeshCheck.C
index f28e9affd09efcd72ac43f738b3de241c4669536..b60caa78d23b1c17b2492bd0ff3be9d991714df8 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCheck/primitiveMeshCheck.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCheck/primitiveMeshCheck.C
@@ -113,7 +113,7 @@ bool Foam::primitiveMesh::checkClosedCells
label nErrorClosed = 0;
- forAll (c, cI)
+ forAll(c, cI)
{
const cell& curCell = c[cI];
@@ -149,14 +149,14 @@ bool Foam::primitiveMesh::checkClosedCells
const labelList& nei = faceNeighbour();
const vectorField& areas = faceAreas();
- forAll (own, faceI)
+ forAll(own, faceI)
{
// Add to owner
sumClosed[own[faceI]] += areas[faceI];
sumMagClosed[own[faceI]] += cmptMag(areas[faceI]);
}
- forAll (nei, faceI)
+ forAll(nei, faceI)
{
// Subtract from neighbour
sumClosed[nei[faceI]] -= areas[faceI];
@@ -172,7 +172,7 @@ bool Foam::primitiveMesh::checkClosedCells
const scalarField& vols = cellVolumes();
// Check the sums
- forAll (sumClosed, cellI)
+ forAll(sumClosed, cellI)
{
scalar maxOpenness = 0;
@@ -281,7 +281,7 @@ bool Foam::primitiveMesh::checkFaceAreas
scalar minArea = GREAT;
scalar maxArea = -GREAT;
- forAll (magFaceAreas, faceI)
+ forAll(magFaceAreas, faceI)
{
if (magFaceAreas[faceI] < VSMALL)
{
@@ -342,7 +342,7 @@ bool Foam::primitiveMesh::checkCellVolumes
label nNegVolCells = 0;
- forAll (vols, cellI)
+ forAll(vols, cellI)
{
if (vols[cellI] < VSMALL)
{
@@ -421,7 +421,7 @@ bool Foam::primitiveMesh::checkFaceOrthogonality
label errorNonOrth = 0;
- forAll (nei, faceI)
+ forAll(nei, faceI)
{
vector d = centres[nei[faceI]] - centres[own[faceI]];
const vector& s = areas[faceI];
@@ -534,7 +534,7 @@ bool Foam::primitiveMesh::checkFacePyramids
label nErrorPyrs = 0;
- forAll (f, faceI)
+ forAll(f, faceI)
{
// Create the owner pyramid - it will have negative volume
scalar pyrVol = pyramidPointFaceRef(f[faceI], ctrs[own[faceI]]).mag(p);
@@ -619,7 +619,7 @@ bool Foam::primitiveMesh::checkFaceTets
label nErrorPyrs = 0;
- forAll (fcs, faceI)
+ forAll(fcs, faceI)
{
// Create the owner tets - they will have negative volume
const face& f = fcs[faceI];
@@ -863,7 +863,7 @@ bool Foam::primitiveMesh::checkPoints
const labelListList& pf = pointFaces();
- forAll (pf, pointI)
+ forAll(pf, pointI)
{
if (pf[pointI].empty())
{
@@ -877,7 +877,7 @@ bool Foam::primitiveMesh::checkPoints
}
- forAll (pf, pointI)
+ forAll(pf, pointI)
{
const labelList& pc = pointCells(pointI);
@@ -1360,7 +1360,7 @@ bool Foam::primitiveMesh::checkUpperTriangular
// and add it to the check list (upper triangular order).
// Once the list is completed, check it against the faceCell list
- forAll (c, cellI)
+ forAll(c, cellI)
{
const labelList& curFaces = c[cellI];
@@ -1498,7 +1498,7 @@ bool Foam::primitiveMesh::checkCellsZipUp
const faceList& f = faces();
const cellList& c = cells();
- forAll (c, cellI)
+ forAll(c, cellI)
{
const labelList& curFaces = c[cellI];
@@ -1506,15 +1506,15 @@ bool Foam::primitiveMesh::checkCellsZipUp
labelList edgeUsage(cellEdges.size(), 0);
- forAll (curFaces, faceI)
+ forAll(curFaces, faceI)
{
edgeList curFaceEdges = f[curFaces[faceI]].edges();
- forAll (curFaceEdges, faceEdgeI)
+ forAll(curFaceEdges, faceEdgeI)
{
const edge& curEdge = curFaceEdges[faceEdgeI];
- forAll (cellEdges, cellEdgeI)
+ forAll(cellEdges, cellEdgeI)
{
if (cellEdges[cellEdgeI] == curEdge)
{
@@ -1528,7 +1528,7 @@ bool Foam::primitiveMesh::checkCellsZipUp
edgeList singleEdges(cellEdges.size());
label nSingleEdges = 0;
- forAll (edgeUsage, edgeI)
+ forAll(edgeUsage, edgeI)
{
if (edgeUsage[edgeI] == 1)
{
@@ -1599,7 +1599,7 @@ bool Foam::primitiveMesh::checkFaceVertices
label nErrorFaces = 0;
- forAll (f, fI)
+ forAll(f, fI)
{
const face& curFace = f[fI];
@@ -1995,7 +1995,7 @@ bool Foam::primitiveMesh::checkCellDeterminant
scalar sumDet = 0;
label nSummed = 0;
- forAll (c, cellI)
+ forAll(c, cellI)
{
const labelList& curFaces = c[cellI];
@@ -2114,7 +2114,7 @@ bool Foam::primitiveMesh::checkConcaveCells
label nConcaveCells = 0;
- forAll (c, cellI)
+ forAll(c, cellI)
{
const cell& cFaces = c[cellI];
diff --git a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCheck/primitiveMeshCheckMotion.C b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCheck/primitiveMeshCheckMotion.C
index 57bdf1a16b1cf60e00fdf008026f23305a446bec..3e6b00665200b3bfd45006004f5456988c927f74 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCheck/primitiveMeshCheckMotion.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCheck/primitiveMeshCheckMotion.C
@@ -68,7 +68,7 @@ bool Foam::primitiveMesh::checkMeshMotion
scalar minVolume = GREAT;
label nNegVols = 0;
- forAll (cellVols, cellI)
+ forAll(cellVols, cellI)
{
if (cellVols[cellI] < VSMALL)
{
@@ -108,7 +108,7 @@ bool Foam::primitiveMesh::checkMeshMotion
label nPyrErrors = 0;
label nDotProductErrors = 0;
- forAll (f, faceI)
+ forAll(f, faceI)
{
const scalar a = Foam::mag(fAreas[faceI]);
diff --git a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshFaceCentresAndAreas.C b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshFaceCentresAndAreas.C
index 9b4bb9998fa284a1870adfb4686e499a40dc0b69..5e25d94e36d8f061edab16211d3319d065d63d5c 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshFaceCentresAndAreas.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshFaceCentresAndAreas.C
@@ -79,7 +79,7 @@ void Foam::primitiveMesh::makeFaceCentresAndAreas
{
const faceList& fs = faces();
- forAll (fs, facei)
+ forAll(fs, facei)
{
const labelList& f = fs[facei];
label nPoints = f.size();
diff --git a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshFindCell.C b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshFindCell.C
index 4d30b3bbd52225d216b90ffa78389c6a8c5163ef..8829a7e88e94ee6a53cd14352fea6bca82fbfe04 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshFindCell.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshFindCell.C
@@ -42,7 +42,7 @@ bool Foam::primitiveMesh::pointInCellBB(const point& p, label celli) const
vector bbmax = -GREAT*vector::one;
vector bbmin = GREAT*vector::one;
- forAll (cellVertices, vertexI)
+ forAll(cellVertices, vertexI)
{
bbmax = max(bbmax, points[cellVertices[vertexI]]);
bbmin = min(bbmin, points[cellVertices[vertexI]]);
diff --git a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshPointCells.C b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshPointCells.C
index ebd136b6f70d78f256055121229d111616734b62..905f1ff4b9259d831f3813022326a269fe969c69 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshPointCells.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshPointCells.C
@@ -63,11 +63,11 @@ void Foam::primitiveMesh::calcPointCells() const
labelList npc(nPoints(), 0);
- forAll (cf, cellI)
+ forAll(cf, cellI)
{
const labelList curPoints = cf[cellI].labels(faces());
- forAll (curPoints, pointI)
+ forAll(curPoints, pointI)
{
label ptI = curPoints[pointI];
@@ -81,18 +81,18 @@ void Foam::primitiveMesh::calcPointCells() const
pcPtr_ = new labelListList(npc.size());
labelListList& pointCellAddr = *pcPtr_;
- forAll (pointCellAddr, pointI)
+ forAll(pointCellAddr, pointI)
{
pointCellAddr[pointI].setSize(npc[pointI]);
}
npc = 0;
- forAll (cf, cellI)
+ forAll(cf, cellI)
{
const labelList curPoints = cf[cellI].labels(faces());
- forAll (curPoints, pointI)
+ forAll(curPoints, pointI)
{
label ptI = curPoints[pointI];
diff --git a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshPointPoints.C b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshPointPoints.C
index ee37aeab097c1b0707ccb4be417857cfb6ad96bd..c7b6280f92afa733f3733308fa672487c16090d5 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshPointPoints.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshPointPoints.C
@@ -60,11 +60,11 @@ void Foam::primitiveMesh::calcPointPoints() const
ppPtr_ = new labelListList(pe.size());
labelListList& pp = *ppPtr_;
- forAll (pe, pointI)
+ forAll(pe, pointI)
{
pp[pointI].setSize(pe[pointI].size());
- forAll (pe[pointI], ppi)
+ forAll(pe[pointI], ppi)
{
if (e[pe[pointI][ppi]].start() == pointI)
{
diff --git a/src/conversion/ensight/file/ensightFile.H b/src/conversion/ensight/file/ensightFile.H
index 9ac5927a490271e80455d488d975f44c0c3efafe..3e4f4e53c7376f50a32751e1e3c45b8a5e9bed79 100644
--- a/src/conversion/ensight/file/ensightFile.H
+++ b/src/conversion/ensight/file/ensightFile.H
@@ -79,7 +79,7 @@ public:
);
- // Destructor
+ //- Destructor
~ensightFile();
diff --git a/src/conversion/ensight/part/ensightPartFaces.C b/src/conversion/ensight/part/ensightPartFaces.C
index 97877a24a245b0936d15f5cd1b87ddbf9148ab16..fb77cc83de640e9825830f6ef0d9dd27d3293022 100644
--- a/src/conversion/ensight/part/ensightPartFaces.C
+++ b/src/conversion/ensight/part/ensightPartFaces.C
@@ -79,7 +79,7 @@ Foam::ensightPartFaces::ensightPartFaces
label nQuad = 0;
label nPoly = 0;
- forAll (pPatch, patchfaceI)
+ forAll(pPatch, patchfaceI)
{
const face& f = pMesh.faces()[patchfaceI + offset_];
diff --git a/src/conversion/meshWriter/starcd/STARCDMeshWriter.C b/src/conversion/meshWriter/starcd/STARCDMeshWriter.C
index 0c850541a8bcc5deb1f0b30ea2105da7db879ff4..db018c7ceac0460b62ab91f5ac0a52deee726f03 100644
--- a/src/conversion/meshWriter/starcd/STARCDMeshWriter.C
+++ b/src/conversion/meshWriter/starcd/STARCDMeshWriter.C
@@ -127,7 +127,7 @@ void Foam::meshWriters::STARCD::getCellTable()
// get the cellZone <-> cellTable correspondence
Info<< "matching cellZones to cellTable" << endl;
- forAll (mesh_.cellZones(), zoneI)
+ forAll(mesh_.cellZones(), zoneI)
{
const cellZone& cZone = mesh_.cellZones()[zoneI];
if (cZone.size())
@@ -144,7 +144,7 @@ void Foam::meshWriters::STARCD::getCellTable()
tableId = cellTable_.append(dict);
}
- forAll (cZone, i)
+ forAll(cZone, i)
{
cellTableId_[cZone[i]] = tableId;
}
@@ -159,7 +159,7 @@ void Foam::meshWriters::STARCD::getCellTable()
dict.add("MaterialType", "fluid");
label tableId = cellTable_.append(dict);
- forAll (cellTableId_, i)
+ forAll(cellTableId_, i)
{
if (cellTableId_[i] < 0)
{
diff --git a/src/conversion/polyDualMesh/polyDualMesh.H b/src/conversion/polyDualMesh/polyDualMesh.H
index 338d6450507beb0a79352a71246f26f711966365..8c3ae117e84b4d04f0ade04daddd9f921b2d5676 100644
--- a/src/conversion/polyDualMesh/polyDualMesh.H
+++ b/src/conversion/polyDualMesh/polyDualMesh.H
@@ -194,9 +194,8 @@ public:
);
- // Destructor
-
- ~polyDualMesh();
+ //- Destructor
+ ~polyDualMesh();
// Member Functions
diff --git a/src/dynamicFvMesh/dynamicFvMesh/dynamicFvMesh.H b/src/dynamicFvMesh/dynamicFvMesh/dynamicFvMesh.H
index 73688cddc17e80d3e251bdce48bbbd9a0f865116..31d68d43efda222d02504406b796b70ba5dcda3e 100644
--- a/src/dynamicFvMesh/dynamicFvMesh/dynamicFvMesh.H
+++ b/src/dynamicFvMesh/dynamicFvMesh/dynamicFvMesh.H
@@ -92,9 +92,8 @@ public:
static autoPtr<dynamicFvMesh> New(const IOobject& io);
- // Destructor
-
- virtual ~dynamicFvMesh();
+ //- Destructor
+ virtual ~dynamicFvMesh();
// Member Functions
diff --git a/src/dynamicFvMesh/dynamicInkJetFvMesh/dynamicInkJetFvMesh.H b/src/dynamicFvMesh/dynamicInkJetFvMesh/dynamicInkJetFvMesh.H
index 9c7ce08ef2f6cd09f1de1617e1dcaa6fbc5c398f..90477072fe4a5d2a76dd15037323c0da4da080d6 100644
--- a/src/dynamicFvMesh/dynamicInkJetFvMesh/dynamicInkJetFvMesh.H
+++ b/src/dynamicFvMesh/dynamicInkJetFvMesh/dynamicInkJetFvMesh.H
@@ -89,9 +89,8 @@ public:
dynamicInkJetFvMesh(const IOobject& io);
- // Destructor
-
- ~dynamicInkJetFvMesh();
+ //- Destructor
+ ~dynamicInkJetFvMesh();
// Member Functions
diff --git a/src/dynamicFvMesh/dynamicMotionSolverFvMesh/dynamicMotionSolverFvMesh.H b/src/dynamicFvMesh/dynamicMotionSolverFvMesh/dynamicMotionSolverFvMesh.H
index 05956fdad97b09c65e0931a37b2854f3cdbb971e..ae4de7f3d1f6005deadd18b920c89f641328a255 100644
--- a/src/dynamicFvMesh/dynamicMotionSolverFvMesh/dynamicMotionSolverFvMesh.H
+++ b/src/dynamicFvMesh/dynamicMotionSolverFvMesh/dynamicMotionSolverFvMesh.H
@@ -78,9 +78,8 @@ public:
dynamicMotionSolverFvMesh(const IOobject& io);
- // Destructor
-
- ~dynamicMotionSolverFvMesh();
+ //- Destructor
+ ~dynamicMotionSolverFvMesh();
// Member Functions
diff --git a/src/dynamicFvMesh/dynamicRefineFvMesh/dynamicRefineFvMesh.H b/src/dynamicFvMesh/dynamicRefineFvMesh/dynamicRefineFvMesh.H
index ffb8bdf8bc2baca51c543a514231bfe7999fa24f..f230aceec7dd56b4a60dde9b323fbe99093867bd 100644
--- a/src/dynamicFvMesh/dynamicRefineFvMesh/dynamicRefineFvMesh.H
+++ b/src/dynamicFvMesh/dynamicRefineFvMesh/dynamicRefineFvMesh.H
@@ -169,9 +169,8 @@ public:
explicit dynamicRefineFvMesh(const IOobject& io);
- // Destructor
-
- virtual ~dynamicRefineFvMesh();
+ //- Destructor
+ virtual ~dynamicRefineFvMesh();
// Member Functions
diff --git a/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/SDA/SDA.H b/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/SDA/SDA.H
index 983914172e180242d3d2cf54779916c5811b8433..ada62f0aa51bccd3a195b673ae1a53638bfb87c4 100644
--- a/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/SDA/SDA.H
+++ b/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/SDA/SDA.H
@@ -119,9 +119,8 @@ public:
);
- // Destructor
-
- virtual ~SDA();
+ //- Destructor
+ virtual ~SDA();
// Member Functions
diff --git a/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/linearMotion/linearMotion.H b/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/linearMotion/linearMotion.H
index a3afdb6b0ceecdb2c514cb0438c34270920ded03..a7e138dce8258f845abc08a80f8563ed964e05ed 100644
--- a/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/linearMotion/linearMotion.H
+++ b/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/linearMotion/linearMotion.H
@@ -85,9 +85,8 @@ public:
);
- // Destructor
-
- virtual ~linearMotion();
+ //- Destructor
+ virtual ~linearMotion();
// Member Functions
diff --git a/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/multiMotion/multiMotion.H b/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/multiMotion/multiMotion.H
index 76b0e3164d8fc2dd545155d123d97edc436cdfc8..9d009feffb55294bf412f5ca5f8d6a4e01ea9c62 100644
--- a/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/multiMotion/multiMotion.H
+++ b/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/multiMotion/multiMotion.H
@@ -85,9 +85,8 @@ public:
);
- // Destructor
-
- virtual ~multiMotion();
+ //- Destructor
+ virtual ~multiMotion();
// Member Functions
diff --git a/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/oscillatingLinearMotion/oscillatingLinearMotion.H b/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/oscillatingLinearMotion/oscillatingLinearMotion.H
index dbfb3ffc9c5b0700805d24e6a8da63cb15dbed2a..13961ff91a5e23bc56d493efa2998e89245fe0a3 100644
--- a/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/oscillatingLinearMotion/oscillatingLinearMotion.H
+++ b/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/oscillatingLinearMotion/oscillatingLinearMotion.H
@@ -88,9 +88,8 @@ public:
);
- // Destructor
-
- virtual ~oscillatingLinearMotion();
+ //- Destructor
+ virtual ~oscillatingLinearMotion();
// Member Functions
diff --git a/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/oscillatingRotatingMotion/oscillatingRotatingMotion.H b/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/oscillatingRotatingMotion/oscillatingRotatingMotion.H
index 52e6d36b767339fe02f49171ff5bdb34105d6502..00c3e60f1b032863f55b447e33a7ba682caf7fad 100644
--- a/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/oscillatingRotatingMotion/oscillatingRotatingMotion.H
+++ b/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/oscillatingRotatingMotion/oscillatingRotatingMotion.H
@@ -91,9 +91,8 @@ public:
);
- // Destructor
-
- virtual ~oscillatingRotatingMotion();
+ //- Destructor
+ virtual ~oscillatingRotatingMotion();
// Member Functions
diff --git a/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/rotatingMotion/rotatingMotion.H b/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/rotatingMotion/rotatingMotion.H
index ce86664c78a731cf8ce73f16020ce6a3eae89700..071e980498b99f911d5a30b92a82dbd1723db082 100644
--- a/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/rotatingMotion/rotatingMotion.H
+++ b/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/rotatingMotion/rotatingMotion.H
@@ -89,9 +89,8 @@ public:
);
- // Destructor
-
- virtual ~rotatingMotion();
+ //- Destructor
+ virtual ~rotatingMotion();
// Member Functions
diff --git a/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/solidBodyMotionFunction/solidBodyMotionFunction.H b/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/solidBodyMotionFunction/solidBodyMotionFunction.H
index a343180f67f7b016858166cbc7eaadf5c73db439..0f0bcb7787b6a128eff1a0776d3b9cb3f3709241 100644
--- a/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/solidBodyMotionFunction/solidBodyMotionFunction.H
+++ b/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/solidBodyMotionFunction/solidBodyMotionFunction.H
@@ -117,9 +117,8 @@ public:
);
- // Destructor
-
- virtual ~solidBodyMotionFunction();
+ //- Destructor
+ virtual ~solidBodyMotionFunction();
// Member Functions
diff --git a/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/tabulated6DoFMotion/tabulated6DoFMotion.H b/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/tabulated6DoFMotion/tabulated6DoFMotion.H
index 0dcbc6c1d07bca8f2363242cf3799d84f645c2dd..3ae0896272842f666fa30a6bb185b952d331e15e 100644
--- a/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/tabulated6DoFMotion/tabulated6DoFMotion.H
+++ b/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/tabulated6DoFMotion/tabulated6DoFMotion.H
@@ -101,9 +101,8 @@ public:
);
- // Destructor
-
- virtual ~tabulated6DoFMotion();
+ //- Destructor
+ virtual ~tabulated6DoFMotion();
// Member Functions
diff --git a/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFvMesh.H b/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFvMesh.H
index e73d3116a3381d7a98053412eb96081e8d46a0e8..a82cec3ca0e4e907111164668e36fb0e2f07686c 100644
--- a/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFvMesh.H
+++ b/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFvMesh.H
@@ -87,9 +87,8 @@ public:
solidBodyMotionFvMesh(const IOobject& io);
- // Destructor
-
- ~solidBodyMotionFvMesh();
+ //- Destructor
+ ~solidBodyMotionFvMesh();
// Member Functions
diff --git a/src/dynamicFvMesh/staticFvMesh/staticFvMesh.H b/src/dynamicFvMesh/staticFvMesh/staticFvMesh.H
index d00fa41341f08bec055fc8f6c53a70914196d2ee..a25879fe9de20c10cd4c9e9f2fdf4a9b46c53818 100644
--- a/src/dynamicFvMesh/staticFvMesh/staticFvMesh.H
+++ b/src/dynamicFvMesh/staticFvMesh/staticFvMesh.H
@@ -71,9 +71,8 @@ public:
staticFvMesh(const IOobject& io);
- // Destructor
-
- ~staticFvMesh();
+ //- Destructor
+ ~staticFvMesh();
// Member Functions
diff --git a/src/dynamicMesh/attachDetach/attachDetach.C b/src/dynamicMesh/attachDetach/attachDetach.C
index 1d0f84b70e065239fd325594c5bdcd228e03950e..8375afe947ea54ebdbe959105a99afb1980f2aa7 100644
--- a/src/dynamicMesh/attachDetach/attachDetach.C
+++ b/src/dynamicMesh/attachDetach/attachDetach.C
@@ -112,7 +112,7 @@ void Foam::attachDetach::checkDefinition()
DynamicList<label> bouFacesInZone(addr.size());
- forAll (addr, faceI)
+ forAll(addr, faceI)
{
if (!mesh.isInternalFace(addr[faceI]))
{
@@ -180,7 +180,7 @@ void Foam::attachDetach::checkDefinition()
DynamicList<label> zoneProblemFaces(addr.size());
- forAll (addr, faceI)
+ forAll(addr, faceI)
{
label facePatch =
mesh.boundaryMesh().whichPatch(addr[faceI]);
diff --git a/src/dynamicMesh/attachDetach/attachDetach.H b/src/dynamicMesh/attachDetach/attachDetach.H
index 2f36d051837676089201d8d0a2ad7bd130d786b4..36c3d252524b0964cb6eaaf6eb3cb7aa3db596f7 100644
--- a/src/dynamicMesh/attachDetach/attachDetach.H
+++ b/src/dynamicMesh/attachDetach/attachDetach.H
@@ -171,9 +171,8 @@ public:
);
- // Destructor
-
- virtual ~attachDetach();
+ //- Destructor
+ virtual ~attachDetach();
// Member Functions
diff --git a/src/dynamicMesh/attachDetach/attachDetachPointMatchMap.C b/src/dynamicMesh/attachDetach/attachDetachPointMatchMap.C
index 04f9e233f0bb94c04e9d376574ea9f5e6d9b9b8c..8cf5c6f3e658eac27c450bebb82c9782c60be1c0 100644
--- a/src/dynamicMesh/attachDetach/attachDetachPointMatchMap.C
+++ b/src/dynamicMesh/attachDetach/attachDetachPointMatchMap.C
@@ -76,7 +76,7 @@ void Foam::attachDetach::calcPointMatchMap() const
const label slavePatchStart = slavePatch.start();
- forAll (reverseSlavePatch, faceI)
+ forAll(reverseSlavePatch, faceI)
{
reverseSlavePatch[faceI] =
faces[slavePatchStart + faceI].reverseFace();
@@ -92,12 +92,12 @@ void Foam::attachDetach::calcPointMatchMap() const
pointMatchMapPtr_ = new Map<label>(2*slaveMeshPoints.size());
Map<label>& removedPointMap = *pointMatchMapPtr_;
- forAll (masterLocalFaces, faceI)
+ forAll(masterLocalFaces, faceI)
{
const face& curMasterPoints = masterLocalFaces[faceI];
const face& curSlavePoints = slaveLocalFaces[faceI];
- forAll (curMasterPoints, pointI)
+ forAll(curMasterPoints, pointI)
{
// If the master and slave point labels are the same, the
// point remains. Otherwise, the slave point is removed and
diff --git a/src/dynamicMesh/attachDetach/attachInterface.C b/src/dynamicMesh/attachDetach/attachInterface.C
index c071637fb715a794313dca30cdfb0bd03a173cb9..e195395e6a26189290ea6f5b9d62bef06c9a7182 100644
--- a/src/dynamicMesh/attachDetach/attachInterface.C
+++ b/src/dynamicMesh/attachDetach/attachInterface.C
@@ -81,7 +81,7 @@ void Foam::attachDetach::attachInterface
const labelList removedPoints = removedPointMap.toc();
- forAll (removedPoints, pointI)
+ forAll(removedPoints, pointI)
{
ref.setAction(polyRemovePoint(removedPoints[pointI]));
}
@@ -100,7 +100,7 @@ void Foam::attachDetach::attachInterface
const boolList& mfFlip = mesh.faceZones()[faceZoneID_.index()].flipMap();
- forAll (masterFaceCells, faceI)
+ forAll(masterFaceCells, faceI)
{
// If slave neighbour is greater than master, face does not need
// turning. Modify it to become internal
@@ -155,11 +155,11 @@ void Foam::attachDetach::attachInterface
// Grab all the faces off the points in the slave patch. If the face has
// not been removed, add it to the map of faces to renumber
- forAll (slaveMeshPoints, pointI)
+ forAll(slaveMeshPoints, pointI)
{
const labelList& curFaces = pf[slaveMeshPoints[pointI]];
- forAll (curFaces, faceI)
+ forAll(curFaces, faceI)
{
if (!ref.faceRemoved(curFaces[faceI]))
{
@@ -171,7 +171,7 @@ void Foam::attachDetach::attachInterface
// Grab the faces to be renumbered
const labelList ftm = facesToModifyMap.toc();
- forAll (ftm, faceI)
+ forAll(ftm, faceI)
{
// For every face to modify, copy the face and re-map the vertices.
// It is known all the faces will be changed since they hang off
@@ -180,7 +180,7 @@ void Foam::attachDetach::attachInterface
face newFace(faces[curFaceID]);
- forAll (newFace, pointI)
+ forAll(newFace, pointI)
{
Map<label>::const_iterator rpmIter =
removedPointMap.find(newFace[pointI]);
@@ -267,7 +267,7 @@ void Foam::attachDetach::modifyMotionPoints
// Calculate the difference in motion point positions
scalar pointDiff = 0;
- forAll (removedPoints, pointI)
+ forAll(removedPoints, pointI)
{
pointDiff +=
mag
@@ -284,7 +284,7 @@ void Foam::attachDetach::modifyMotionPoints
}
// Put the slave point on top of the master point
- forAll (removedPoints, pointI)
+ forAll(removedPoints, pointI)
{
motionPoints[removedPoints[pointI]] =
motionPoints[removedPointMap.find(removedPoints[pointI])()];
diff --git a/src/dynamicMesh/attachDetach/detachInterface.C b/src/dynamicMesh/attachDetach/detachInterface.C
index f1f6f41affbe0ebc3c82596324bc398352561143..4e80d42e003ff4384b8830fc6a9c344431b6b68c 100644
--- a/src/dynamicMesh/attachDetach/detachInterface.C
+++ b/src/dynamicMesh/attachDetach/detachInterface.C
@@ -127,7 +127,7 @@ void Foam::attachDetach::detachInterface
bool edgeIsInternal = true;
- forAll (curFaces, faceI)
+ forAll(curFaces, faceI)
{
if (!mesh.isInternalFace(curFaces[faceI]))
{
@@ -149,7 +149,7 @@ void Foam::attachDetach::detachInterface
// Pout << "addedPoints before point creation: " << addedPoints << endl;
// Create new points for face zone
- forAll (addedPoints, pointI)
+ forAll(addedPoints, pointI)
{
if (addedPoints[pointI] < 0)
{
@@ -181,7 +181,7 @@ void Foam::attachDetach::detachInterface
const labelList& own = mesh.faceOwner();
const labelList& nei = mesh.faceNeighbour();
- forAll (mf, faceI)
+ forAll(mf, faceI)
{
const label curFaceID = mf[faceI];
@@ -190,7 +190,7 @@ void Foam::attachDetach::detachInterface
face newFace(oldFace.size());
- forAll (oldFace, pointI)
+ forAll(oldFace, pointI)
{
newFace[pointI] = addedPoints[oldFace[pointI]];
}
@@ -313,11 +313,11 @@ void Foam::attachDetach::detachInterface
const cellList& cells = mesh.cells();
- forAll (mc, cellI)
+ forAll(mc, cellI)
{
const labelList& curFaces = cells[mc[cellI]];
- forAll (curFaces, faceI)
+ forAll(curFaces, faceI)
{
// Check if the face belongs to the master patch; if not add it
if (zoneMesh.whichZone(curFaces[faceI]) != faceZoneID_.index())
@@ -333,7 +333,7 @@ void Foam::attachDetach::detachInterface
// Make a map of master cells for quick reject
labelHashSet mcMap(2*mc.size());
- forAll (mc, mcI)
+ forAll(mc, mcI)
{
mcMap.insert(mc[mcI]);
}
@@ -343,7 +343,7 @@ void Foam::attachDetach::detachInterface
// faces to the map
const labelList mcf = masterCellFaceMap.toc();
- forAll (mcf, mcfI)
+ forAll(mcf, mcfI)
{
// Do the owner side
const label ownCell = own[mcf[mcfI]];
@@ -353,7 +353,7 @@ void Foam::attachDetach::detachInterface
// Cell not found. Add its faces to the map
const cell& curFaces = cells[ownCell];
- forAll (curFaces, faceI)
+ forAll(curFaces, faceI)
{
masterCellFaceMap.insert(curFaces[faceI]);
}
@@ -369,7 +369,7 @@ void Foam::attachDetach::detachInterface
// Cell not found. Add its faces to the map
const cell& curFaces = cells[neiCell];
- forAll (curFaces, faceI)
+ forAll(curFaces, faceI)
{
masterCellFaceMap.insert(curFaces[faceI]);
}
@@ -381,7 +381,7 @@ void Foam::attachDetach::detachInterface
// Create the master layer point map
Map<label> masterLayerPointMap(2*mp.size());
- forAll (mp, pointI)
+ forAll(mp, pointI)
{
masterLayerPointMap.insert
(
@@ -393,7 +393,7 @@ void Foam::attachDetach::detachInterface
// Grab the list of faces of the master layer
const labelList masterCellFaces = masterCellFaceMap.toc();
- forAll (masterCellFaces, faceI)
+ forAll(masterCellFaces, faceI)
{
// Attempt to renumber the face using the masterLayerPointMap.
// Missing point remain the same
@@ -406,7 +406,7 @@ void Foam::attachDetach::detachInterface
bool changed = false;
- forAll (oldFace, pointI)
+ forAll(oldFace, pointI)
{
if (masterLayerPointMap.found(oldFace[pointI]))
{
diff --git a/src/dynamicMesh/boundaryMesh/boundaryMesh.H b/src/dynamicMesh/boundaryMesh/boundaryMesh.H
index 6d234ea9259909dcf94fc39bbf535e5b3b53f718..4b1ef666341d093475502dd49c3b3ebe083a92e7 100644
--- a/src/dynamicMesh/boundaryMesh/boundaryMesh.H
+++ b/src/dynamicMesh/boundaryMesh/boundaryMesh.H
@@ -190,9 +190,8 @@ public:
boundaryMesh();
- // Destructor
-
- ~boundaryMesh();
+ //- Destructor
+ ~boundaryMesh();
void clearOut();
diff --git a/src/dynamicMesh/boundaryPatch/boundaryPatch.H b/src/dynamicMesh/boundaryPatch/boundaryPatch.H
index e316ab86e6330d729b13f8fbad8344dc9dcd241f..1b83871607141696054a88030405b2b2ccc61b80 100644
--- a/src/dynamicMesh/boundaryPatch/boundaryPatch.H
+++ b/src/dynamicMesh/boundaryPatch/boundaryPatch.H
@@ -89,9 +89,8 @@ public:
autoPtr<boundaryPatch> clone() const;
- // Destructor
-
- ~boundaryPatch();
+ //- Destructor
+ ~boundaryPatch();
// Member Functions
diff --git a/src/dynamicMesh/fvMeshAdder/fvMeshAdder.H b/src/dynamicMesh/fvMeshAdder/fvMeshAdder.H
index 8042ccda7dc1ea8b1370a7a262b2ef63bbd2b7ad..04af5db48bf9f786e686f81847885f419974a090 100644
--- a/src/dynamicMesh/fvMeshAdder/fvMeshAdder.H
+++ b/src/dynamicMesh/fvMeshAdder/fvMeshAdder.H
@@ -90,10 +90,9 @@ private:
{}
- // Destructor
-
- virtual ~directFvPatchFieldMapper()
- {}
+ //- Destructor
+ virtual ~directFvPatchFieldMapper()
+ {}
// Member Functions
diff --git a/src/dynamicMesh/fvMeshDistribute/fvMeshDistributeTemplates.C b/src/dynamicMesh/fvMeshDistribute/fvMeshDistributeTemplates.C
index ab429fb9266198eb5534922142a299d7c3f921bc..588dda7566d4c2141dea3ad061340f7d32a9397b 100644
--- a/src/dynamicMesh/fvMeshDistribute/fvMeshDistributeTemplates.C
+++ b/src/dynamicMesh/fvMeshDistribute/fvMeshDistributeTemplates.C
@@ -35,12 +35,7 @@ void Foam::fvMeshDistribute::printFieldInfo(const fvMesh& mesh)
mesh.objectRegistry::lookupClass<GeoField>()
);
- for
- (
- typename HashTable<const GeoField*>::const_iterator iter = flds.begin();
- iter != flds.end();
- ++iter
- )
+ forAllConstIter(typename HashTable<const GeoField*>, flds, iter)
{
const GeoField& fld = *iter();
@@ -68,12 +63,7 @@ void Foam::fvMeshDistribute::addPatchFields(const word& patchFieldType)
mesh_.objectRegistry::lookupClass<GeoField>()
);
- for
- (
- typename HashTable<const GeoField*>::const_iterator iter = flds.begin();
- iter != flds.end();
- ++iter
- )
+ forAllConstIter(typename HashTable<const GeoField*>, flds, iter)
{
const GeoField& fld = *iter();
@@ -108,12 +98,7 @@ void Foam::fvMeshDistribute::deleteTrailingPatchFields()
mesh_.objectRegistry::lookupClass<GeoField>()
);
- for
- (
- typename HashTable<const GeoField*>::const_iterator iter = flds.begin();
- iter != flds.end();
- ++iter
- )
+ forAllConstIter(typename HashTable<const GeoField*>, flds, iter)
{
const GeoField& fld = *iter();
@@ -147,12 +132,7 @@ void Foam::fvMeshDistribute::saveBoundaryFields
label i = 0;
- for
- (
- typename HashTable<const fldType*>::const_iterator iter = flds.begin();
- iter != flds.end();
- ++iter
- )
+ forAllConstIter(typename HashTable<const fldType*>, flds, iter)
{
const fldType& fld = *iter();
@@ -189,12 +169,7 @@ void Foam::fvMeshDistribute::mapBoundaryFields
label fieldI = 0;
- for
- (
- typename HashTable<const fldType*>::const_iterator iter = flds.begin();
- iter != flds.end();
- ++iter
- )
+ forAllConstIter(typename HashTable<const fldType*>, flds, iter)
{
const fldType& fld = *iter();
typename fldType::GeometricBoundaryField& bfld =
@@ -245,12 +220,7 @@ void Foam::fvMeshDistribute::initPatchFields
mesh_.objectRegistry::lookupClass<GeoField>()
);
- for
- (
- typename HashTable<const GeoField*>::const_iterator iter = flds.begin();
- iter != flds.end();
- ++iter
- )
+ forAllConstIter(typename HashTable<const GeoField*>, flds, iter)
{
const GeoField& fld = *iter();
diff --git a/src/dynamicMesh/layerAdditionRemoval/addCellLayer.C b/src/dynamicMesh/layerAdditionRemoval/addCellLayer.C
index 868d8b694d09f1080db04698b371c7d488cae4bb..70f3e29cb0c918c789842ec4f7fd711fffc5283e 100644
--- a/src/dynamicMesh/layerAdditionRemoval/addCellLayer.C
+++ b/src/dynamicMesh/layerAdditionRemoval/addCellLayer.C
@@ -60,7 +60,7 @@ Foam::tmp<Foam::vectorField> Foam::layerAdditionRemoval::extrusionDir() const
// Detected a valid layer. Grab the point and face collapse mapping
const labelList& ptc = pointsPairing();
- forAll (extrusionDir, mpI)
+ forAll(extrusionDir, mpI)
{
extrusionDir[mpI] = points[ptc[mpI]] - points[mp[mpI]];
}
@@ -125,7 +125,7 @@ void Foam::layerAdditionRemoval::addCellLayer
// Add the new points
labelList addedPoints(mp.size());
- forAll (mp, pointI)
+ forAll(mp, pointI)
{
// Add the point nominal thickness away from the master zone point
// and grab the label
@@ -159,7 +159,7 @@ void Foam::layerAdditionRemoval::addCellLayer
labelList addedCells(mf.size());
- forAll (mf, faceI)
+ forAll(mf, faceI)
{
addedCells[faceI] =
ref.setAction
@@ -187,13 +187,13 @@ void Foam::layerAdditionRemoval::addCellLayer
// owner: if the master cell is equal to the face owner the flux
// remains the same; otherwise it is flipped
- forAll (zoneFaces, faceI)
+ forAll(zoneFaces, faceI)
{
const face oldFace = zoneFaces[faceI].reverseFace();
face newFace(oldFace.size());
- forAll (oldFace, pointI)
+ forAll(oldFace, pointI)
{
newFace[pointI] = addedPoints[oldFace[pointI]];
}
@@ -235,7 +235,7 @@ void Foam::layerAdditionRemoval::addCellLayer
const faceList& faces = mesh.faces();
// Pout << "mfFlip: " << mfFlip << endl;
- forAll (mf, faceI)
+ forAll(mf, faceI)
{
const label curfaceID = mf[faceI];
@@ -381,7 +381,7 @@ void Foam::layerAdditionRemoval::addCellLayer
label patchID = -1;
label zoneID = -1;
- forAll (curFaces, faceI)
+ forAll(curFaces, faceI)
{
const label cf = curFaces[faceI];
@@ -447,11 +447,11 @@ void Foam::layerAdditionRemoval::addCellLayer
const cellList& cells = mesh.cells();
- forAll (mc, cellI)
+ forAll(mc, cellI)
{
const labelList& curFaces = cells[mc[cellI]];
- forAll (curFaces, faceI)
+ forAll(curFaces, faceI)
{
// Check if the face belongs to the master zone; if not add it
if (zoneMesh.whichZone(curFaces[faceI]) != faceZoneID_.index())
@@ -464,7 +464,7 @@ void Foam::layerAdditionRemoval::addCellLayer
// Create the master layer point map
Map<label> masterLayerPointMap(2*mp.size());
- forAll (mp, pointI)
+ forAll(mp, pointI)
{
masterLayerPointMap.insert
(
@@ -476,7 +476,7 @@ void Foam::layerAdditionRemoval::addCellLayer
// Grab the list of faces of the master layer
const labelList masterCellFaces = masterCellFaceMap.toc();
- forAll (masterCellFaces, faceI)
+ forAll(masterCellFaces, faceI)
{
// Attempt to renumber the face using the masterLayerPointMap.
// Missing point remain the same
@@ -489,7 +489,7 @@ void Foam::layerAdditionRemoval::addCellLayer
bool changed = false;
- forAll (oldFace, pointI)
+ forAll(oldFace, pointI)
{
if (masterLayerPointMap.found(oldFace[pointI]))
{
diff --git a/src/dynamicMesh/layerAdditionRemoval/layerAdditionRemoval.C b/src/dynamicMesh/layerAdditionRemoval/layerAdditionRemoval.C
index 6f2041ddfba9acdcca5acbb5344c52060420a5d3..ea79578a5074dd02dedaa1a06eb8bd8336142f4e 100644
--- a/src/dynamicMesh/layerAdditionRemoval/layerAdditionRemoval.C
+++ b/src/dynamicMesh/layerAdditionRemoval/layerAdditionRemoval.C
@@ -207,7 +207,7 @@ bool Foam::layerAdditionRemoval::changeTopology() const
scalar minDelta = GREAT;
scalar maxDelta = 0;
- forAll (fz, faceI)
+ forAll(fz, faceI)
{
scalar curDelta = V[mc[faceI]]/mag(S[fz[faceI]]);
avgDelta += curDelta;
diff --git a/src/dynamicMesh/layerAdditionRemoval/layerAdditionRemoval.H b/src/dynamicMesh/layerAdditionRemoval/layerAdditionRemoval.H
index 2b59c3fbfd35697d45eedb6f4028653de0a87a49..ce715257292e3b357137eb470a90020e7585abe6 100644
--- a/src/dynamicMesh/layerAdditionRemoval/layerAdditionRemoval.H
+++ b/src/dynamicMesh/layerAdditionRemoval/layerAdditionRemoval.H
@@ -165,9 +165,8 @@ public:
);
- // Destructor
-
- virtual ~layerAdditionRemoval();
+ //- Destructor
+ virtual ~layerAdditionRemoval();
// Member Functions
diff --git a/src/dynamicMesh/layerAdditionRemoval/removeCellLayer.C b/src/dynamicMesh/layerAdditionRemoval/removeCellLayer.C
index 90180af091ef7e04405c93349c35490295eb15d1..d8645b18a833e5ff52848cdb398088054741c2a7 100644
--- a/src/dynamicMesh/layerAdditionRemoval/removeCellLayer.C
+++ b/src/dynamicMesh/layerAdditionRemoval/removeCellLayer.C
@@ -57,7 +57,7 @@ bool Foam::layerAdditionRemoval::validCollapse() const
label nBoundaryHits = 0;
- forAll (mf, faceI)
+ forAll(mf, faceI)
{
if
(
@@ -114,7 +114,7 @@ void Foam::layerAdditionRemoval::removeCellLayer
const labelList& mc =
topoChanger().mesh().faceZones()[faceZoneID_.index()].masterCells();
- forAll (mc, cellI)
+ forAll(mc, cellI)
{
ref.setAction(polyRemoveCell(mc[cellI]));
}
@@ -125,11 +125,11 @@ void Foam::layerAdditionRemoval::removeCellLayer
const cellList& cells = mesh.cells();
- forAll (mc, cellI)
+ forAll(mc, cellI)
{
const cell& curCell = cells[mc[cellI]];
- forAll (curCell, faceI)
+ forAll(curCell, faceI)
{
// Check if the face is in the master zone. If not, remove it
if
@@ -149,7 +149,7 @@ void Foam::layerAdditionRemoval::removeCellLayer
}
// Remove all points that will be collapsed
- forAll (ptc, pointI)
+ forAll(ptc, pointI)
{
ref.setAction(polyRemovePoint(ptc[pointI]));
}
@@ -166,7 +166,7 @@ void Foam::layerAdditionRemoval::removeCellLayer
const labelList& meshPoints =
mesh.faceZones()[faceZoneID_.index()]().meshPoints();
- forAll (ptc, pointI)
+ forAll(ptc, pointI)
{
removedPointMap.insert(ptc[pointI], meshPoints[pointI]);
}
@@ -180,11 +180,11 @@ void Foam::layerAdditionRemoval::removeCellLayer
// Make a list of faces to be modified using the map to avoid duplicates
labelHashSet facesToModify(ptc.size()*primitiveMesh::facesPerPoint_);
- forAll (ptc, pointI)
+ forAll(ptc, pointI)
{
const labelList& curFaces = pf[ptc[pointI]];
- forAll (curFaces, faceI)
+ forAll(curFaces, faceI)
{
if (!facesToRemoveMap.found(curFaces[faceI]))
{
@@ -197,7 +197,7 @@ void Foam::layerAdditionRemoval::removeCellLayer
//Pout << "faces to modify: " << ftm << endl;
- forAll (ftm, faceI)
+ forAll(ftm, faceI)
{
// For every face to modify, copy the face and re-map the vertices.
// It is known all the faces will be changed since they hang off
@@ -206,7 +206,7 @@ void Foam::layerAdditionRemoval::removeCellLayer
face newFace(faces[curFaceID]);
- forAll (newFace, pointI)
+ forAll(newFace, pointI)
{
Map<label>::iterator rpmIter =
removedPointMap.find(newFace[pointI]);
@@ -269,7 +269,7 @@ void Foam::layerAdditionRemoval::removeCellLayer
const labelList& mf = mesh.faceZones()[faceZoneID_.index()];
const boolList& mfFlip = mesh.faceZones()[faceZoneID_.index()].flipMap();
- forAll (mf, faceI)
+ forAll(mf, faceI)
{
// Grab the owner and neighbour of the faces to be collapsed and get rid
// of the cell to be removed
diff --git a/src/dynamicMesh/layerAdditionRemoval/setLayerPairing.C b/src/dynamicMesh/layerAdditionRemoval/setLayerPairing.C
index e42896cf61f71f38fb3cd8a8314e06efaa784211..766196f00e48fa549d26ca227487116421678a54 100644
--- a/src/dynamicMesh/layerAdditionRemoval/setLayerPairing.C
+++ b/src/dynamicMesh/layerAdditionRemoval/setLayerPairing.C
@@ -95,7 +95,7 @@ bool Foam::layerAdditionRemoval::setLayerPairing() const
label nPointErrors = 0;
label nFaceErrors = 0;
- forAll (mf, faceI)
+ forAll(mf, faceI)
{
// Get the local master face
face curLocalFace = mlf[faceI];
@@ -128,7 +128,7 @@ bool Foam::layerAdditionRemoval::setLayerPairing() const
ftc[faceI] = lidFace.oppositeIndex();
// Using the local face insert the points into the lid list
- forAll (curLocalFace, pointI)
+ forAll(curLocalFace, pointI)
{
const label clp = curLocalFace[pointI];
diff --git a/src/dynamicMesh/meshCut/cellCuts/cellCuts.H b/src/dynamicMesh/meshCut/cellCuts/cellCuts.H
index 906d238886166f5120a8870db7891cf60c262324..be45a3c70d46063b2dfd62a0abca1a6f5a6c34a3 100644
--- a/src/dynamicMesh/meshCut/cellCuts/cellCuts.H
+++ b/src/dynamicMesh/meshCut/cellCuts/cellCuts.H
@@ -520,9 +520,8 @@ public:
);
- // Destructor
-
- ~cellCuts();
+ //- Destructor
+ ~cellCuts();
//- Clear out demand driven storage
void clearOut();
diff --git a/src/dynamicMesh/meshCut/cellLooper/cellLooper.H b/src/dynamicMesh/meshCut/cellLooper/cellLooper.H
index e7468593577d5810f83cefb6a18c42c351e41e65..37defc1d639f21c526db00bc1f8026a26b702cd1 100644
--- a/src/dynamicMesh/meshCut/cellLooper/cellLooper.H
+++ b/src/dynamicMesh/meshCut/cellLooper/cellLooper.H
@@ -160,9 +160,8 @@ public:
);
- // Destructor
-
- virtual ~cellLooper();
+ //- Destructor
+ virtual ~cellLooper();
// Member Functions
diff --git a/src/dynamicMesh/meshCut/cellLooper/geomCellLooper.H b/src/dynamicMesh/meshCut/cellLooper/geomCellLooper.H
index 9914bd1c6be60763dc61164fa2260aa12e00fb26..eb6b24e429d3f2ab328e64833244794550de9d40 100644
--- a/src/dynamicMesh/meshCut/cellLooper/geomCellLooper.H
+++ b/src/dynamicMesh/meshCut/cellLooper/geomCellLooper.H
@@ -146,9 +146,8 @@ public:
geomCellLooper(const polyMesh& mesh);
- // Destructor
-
- virtual ~geomCellLooper();
+ //- Destructor
+ virtual ~geomCellLooper();
// Member Functions
diff --git a/src/dynamicMesh/meshCut/cellLooper/hexCellLooper.H b/src/dynamicMesh/meshCut/cellLooper/hexCellLooper.H
index 7b7faf8682ce18e77a0a36bdb2f61e6958608906..8e869e9287bc1c593b7948a4e328f48db403e4ea 100644
--- a/src/dynamicMesh/meshCut/cellLooper/hexCellLooper.H
+++ b/src/dynamicMesh/meshCut/cellLooper/hexCellLooper.H
@@ -116,9 +116,8 @@ public:
hexCellLooper(const polyMesh& mesh);
- // Destructor
-
- virtual ~hexCellLooper();
+ //- Destructor
+ virtual ~hexCellLooper();
// Member Functions
diff --git a/src/dynamicMesh/meshCut/cellLooper/topoCellLooper.H b/src/dynamicMesh/meshCut/cellLooper/topoCellLooper.H
index 120bc4918ada7f9878e5094973938a1acec803d5..e747be6470fa4a83828ab44a23b2afb45cc32530 100644
--- a/src/dynamicMesh/meshCut/cellLooper/topoCellLooper.H
+++ b/src/dynamicMesh/meshCut/cellLooper/topoCellLooper.H
@@ -168,9 +168,8 @@ public:
topoCellLooper(const polyMesh& mesh);
- // Destructor
-
- virtual ~topoCellLooper();
+ //- Destructor
+ virtual ~topoCellLooper();
// Member Functions
diff --git a/src/dynamicMesh/meshCut/edgeVertex/edgeVertex.C b/src/dynamicMesh/meshCut/edgeVertex/edgeVertex.C
index 5993d96e3d1c4c99da2ec3c9e8ba7678aa6ba660..e56d7a9c90ece0dd9e4762dba011d9b6323bff7f 100644
--- a/src/dynamicMesh/meshCut/edgeVertex/edgeVertex.C
+++ b/src/dynamicMesh/meshCut/edgeVertex/edgeVertex.C
@@ -68,12 +68,7 @@ void Foam::edgeVertex::updateLabels
// Iterate over map to see if anything changed
bool changed = false;
- for
- (
- Map<label>::const_iterator iter = cellPairs.begin();
- iter != cellPairs.end();
- ++iter
- )
+ forAllConstIter(Map<label>, cellPairs, iter)
{
label newMaster = map[iter.key()];
@@ -97,12 +92,7 @@ void Foam::edgeVertex::updateLabels
{
Map<label> newCellPairs(2*cellPairs.size());
- for
- (
- Map<label>::const_iterator iter = cellPairs.begin();
- iter != cellPairs.end();
- ++iter
- )
+ forAllConstIter(Map<label>, cellPairs, iter)
{
label newMaster = map[iter.key()];
@@ -144,14 +134,9 @@ void Foam::edgeVertex::updateLabels
// Iterate over map to see if anything changed
bool changed = false;
- for
- (
- labelHashSet::const_iterator iter = cells.begin();
- iter != cells.end();
- ++iter
- )
+ forAllConstIter(labelHashSet, cells, iter)
{
- label newCellI = map[iter.key()];
+ const label newCellI = map[iter.key()];
if (newCellI != iter.key())
{
@@ -166,14 +151,9 @@ void Foam::edgeVertex::updateLabels
{
labelHashSet newCells(2*cells.size());
- for
- (
- labelHashSet::const_iterator iter = cells.begin();
- iter != cells.end();
- ++iter
- )
+ forAllConstIter(labelHashSet, cells, iter)
{
- label newCellI = map[iter.key()];
+ const label newCellI = map[iter.key()];
if (newCellI != -1)
{
diff --git a/src/dynamicMesh/meshCut/meshModifiers/boundaryCutter/boundaryCutter.H b/src/dynamicMesh/meshCut/meshModifiers/boundaryCutter/boundaryCutter.H
index b8fe66430f9eeaa021a8ef246faf14e18533f0b5..ca49c74f9bc45f5f1a1caf3d14ccb048b8a5af9c 100644
--- a/src/dynamicMesh/meshCut/meshModifiers/boundaryCutter/boundaryCutter.H
+++ b/src/dynamicMesh/meshCut/meshModifiers/boundaryCutter/boundaryCutter.H
@@ -128,9 +128,8 @@ public:
boundaryCutter(const polyMesh& mesh);
- // Destructor
-
- ~boundaryCutter();
+ //- Destructor
+ ~boundaryCutter();
// Member Functions
diff --git a/src/dynamicMesh/meshCut/meshModifiers/meshCutAndRemove/meshCutAndRemove.C b/src/dynamicMesh/meshCut/meshModifiers/meshCutAndRemove/meshCutAndRemove.C
index a33ac69f570aa2a70884b432d63190aa94b677a0..fc344448a7323f692f77dcdd3721ae9b0145af21 100644
--- a/src/dynamicMesh/meshCut/meshModifiers/meshCutAndRemove/meshCutAndRemove.C
+++ b/src/dynamicMesh/meshCut/meshModifiers/meshCutAndRemove/meshCutAndRemove.C
@@ -887,12 +887,7 @@ void Foam::meshCutAndRemove::setRefinement
const Map<edge>& faceSplitCuts = cuts.faceSplitCut();
- for
- (
- Map<edge>::const_iterator iter = faceSplitCuts.begin();
- iter != faceSplitCuts.end();
- ++iter
- )
+ forAllConstIter(Map<edge>, faceSplitCuts, iter)
{
label faceI = iter.key();
@@ -1310,15 +1305,9 @@ void Foam::meshCutAndRemove::updateMesh(const mapPolyMesh& map)
{
Map<label> newAddedFaces(addedFaces_.size());
- for
- (
- Map<label>::const_iterator iter = addedFaces_.begin();
- iter != addedFaces_.end();
- ++iter
- )
+ forAllConstIter(Map<label>, addedFaces_, iter)
{
label cellI = iter.key();
-
label newCellI = map.reverseCellMap()[cellI];
label addedFaceI = iter();
diff --git a/src/dynamicMesh/meshCut/meshModifiers/meshCutter/meshCutter.C b/src/dynamicMesh/meshCut/meshModifiers/meshCutter/meshCutter.C
index f7e97a488f81352f66f251e8795f4a40d65c40d3..00d0afd67b54274c13a7c85878a84b94b2143639 100644
--- a/src/dynamicMesh/meshCut/meshModifiers/meshCutter/meshCutter.C
+++ b/src/dynamicMesh/meshCut/meshModifiers/meshCutter/meshCutter.C
@@ -737,12 +737,7 @@ void Foam::meshCutter::setRefinement
const Map<edge>& faceSplitCuts = cuts.faceSplitCut();
- for
- (
- Map<edge>::const_iterator iter = faceSplitCuts.begin();
- iter != faceSplitCuts.end();
- ++iter
- )
+ forAllConstIter(Map<edge>, faceSplitCuts, iter)
{
label faceI = iter.key();
@@ -1015,15 +1010,9 @@ void Foam::meshCutter::updateMesh(const mapPolyMesh& morphMap)
// key.
Map<label> newAddedCells(addedCells_.size());
- for
- (
- Map<label>::const_iterator iter = addedCells_.begin();
- iter != addedCells_.end();
- ++iter
- )
+ forAllConstIter(Map<label>, addedCells_, iter)
{
label cellI = iter.key();
-
label newCellI = morphMap.reverseCellMap()[cellI];
label addedCellI = iter();
@@ -1054,15 +1043,9 @@ void Foam::meshCutter::updateMesh(const mapPolyMesh& morphMap)
{
Map<label> newAddedFaces(addedFaces_.size());
- for
- (
- Map<label>::const_iterator iter = addedFaces_.begin();
- iter != addedFaces_.end();
- ++iter
- )
+ forAllConstIter(Map<label>, addedFaces_, iter)
{
label cellI = iter.key();
-
label newCellI = morphMap.reverseCellMap()[cellI];
label addedFaceI = iter();
diff --git a/src/dynamicMesh/meshCut/meshModifiers/meshCutter/meshCutter.H b/src/dynamicMesh/meshCut/meshModifiers/meshCutter/meshCutter.H
index fd34d689babd0ac3f4896f4c4b305633d3942954..981430e33ff133a0619c25f8eac2e062ce4fa632 100644
--- a/src/dynamicMesh/meshCut/meshModifiers/meshCutter/meshCutter.H
+++ b/src/dynamicMesh/meshCut/meshModifiers/meshCutter/meshCutter.H
@@ -274,9 +274,8 @@ public:
meshCutter(const polyMesh& mesh);
- // Destructor
-
- ~meshCutter();
+ //- Destructor
+ ~meshCutter();
// Member Functions
diff --git a/src/dynamicMesh/meshCut/meshModifiers/multiDirRefinement/multiDirRefinement.C b/src/dynamicMesh/meshCut/meshModifiers/multiDirRefinement/multiDirRefinement.C
index 5e1432897405993738cc88d1730892a37a6a5812..bcad8bef9157e09b870395d28934ca25d61008e3 100644
--- a/src/dynamicMesh/meshCut/meshModifiers/multiDirRefinement/multiDirRefinement.C
+++ b/src/dynamicMesh/meshCut/meshModifiers/multiDirRefinement/multiDirRefinement.C
@@ -40,10 +40,7 @@ License
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-namespace Foam
-{
- defineTypeNameAndDebug(multiDirRefinement, 0);
-}
+defineTypeNameAndDebug(Foam::multiDirRefinement, 0);
// * * * * * * * * * * * * * Private Statc Functions * * * * * * * * * * * * //
@@ -93,12 +90,7 @@ void Foam::multiDirRefinement::update
{
field.setSize(field.size() + splitMap.size());
- for
- (
- Map<label>::const_iterator iter = splitMap.begin();
- iter != splitMap.end();
- ++iter
- )
+ forAllConstIter(Map<label>, splitMap, iter)
{
field[iter()] = field[iter.key()];
}
@@ -116,12 +108,7 @@ void Foam::multiDirRefinement::addCells
labels.setSize(labels.size() + splitMap.size());
- for
- (
- Map<label>::const_iterator iter = splitMap.begin();
- iter != splitMap.end();
- ++iter
- )
+ forAllConstIter(Map<label>, splitMap, iter)
{
labels[newCellI++] = iter();
}
@@ -165,12 +152,7 @@ void Foam::multiDirRefinement::addCells
}
- for
- (
- Map<label>::const_iterator iter = splitMap.begin();
- iter != splitMap.end();
- ++iter
- )
+ forAllConstIter(Map<label>, splitMap, iter)
{
label masterI = iter.key();
label newCellI = iter();
@@ -307,7 +289,7 @@ void Foam::multiDirRefinement::refineHex8
// Increment count
forAll(consistentCells, i)
{
- label cellI = consistentCells[i];
+ const label cellI = consistentCells[i];
Map<label>::iterator iter = hexCellSet.find(cellI);
@@ -380,7 +362,7 @@ void Foam::multiDirRefinement::refineHex8
forAll(cellMap, cellI)
{
- label oldCellI = cellMap[cellI];
+ const label oldCellI = cellMap[cellI];
if (addedCells_[oldCellI].size())
{
@@ -439,7 +421,7 @@ void Foam::multiDirRefinement::refineAllDirs
// Non uniform directions.
forAll(refCells, refI)
{
- label cellI = cellLabels_[refI];
+ const label cellI = cellLabels_[refI];
refCells[refI] = refineCell(cellI, dirField[cellI]);
}
diff --git a/src/dynamicMesh/meshCut/meshModifiers/refinementIterator/refinementIterator.C b/src/dynamicMesh/meshCut/meshModifiers/refinementIterator/refinementIterator.C
index de9dd525d127913bb6e2a65d35f85a31c31a34aa..422a98d57aed880c5680df0f636b46013be0431e 100644
--- a/src/dynamicMesh/meshCut/meshModifiers/refinementIterator/refinementIterator.C
+++ b/src/dynamicMesh/meshCut/meshModifiers/refinementIterator/refinementIterator.C
@@ -36,12 +36,7 @@ License
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-namespace Foam
-{
-
-defineTypeNameAndDebug(refinementIterator, 0);
-
-}
+defineTypeNameAndDebug(Foam::refinementIterator, 0);
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
@@ -212,12 +207,7 @@ Foam::Map<Foam::label> Foam::refinementIterator::setRefinement
// from meshRefiner.updateMesh call) and add to global list of added
const Map<label>& addedNow = meshRefiner_.addedCells();
- for
- (
- Map<label>::const_iterator iter = addedNow.begin();
- iter != addedNow.end();
- ++iter
- )
+ forAllConstIter(Map<label>, addedNow, iter)
{
if (!addedCells.insert(iter.key(), iter()))
{
diff --git a/src/dynamicMesh/meshCut/meshModifiers/refinementIterator/refinementIterator.H b/src/dynamicMesh/meshCut/meshModifiers/refinementIterator/refinementIterator.H
index a3335d0f2280c68aa14b57b234f851d22f828383..a0e8fa03f0ff7faa81e86490996dee7683811c68 100644
--- a/src/dynamicMesh/meshCut/meshModifiers/refinementIterator/refinementIterator.H
+++ b/src/dynamicMesh/meshCut/meshModifiers/refinementIterator/refinementIterator.H
@@ -101,9 +101,8 @@ public:
);
- // Destructor
-
- ~refinementIterator();
+ //- Destructor
+ ~refinementIterator();
// Member Functions
diff --git a/src/dynamicMesh/meshCut/meshModifiers/undoableMeshCutter/undoableMeshCutter.C b/src/dynamicMesh/meshCut/meshModifiers/undoableMeshCutter/undoableMeshCutter.C
index 9f27564cf47287ad1109d6e1e933fa916186b9dc..ef2ece26b15322730e72e88cc9609572601daad9 100644
--- a/src/dynamicMesh/meshCut/meshModifiers/undoableMeshCutter/undoableMeshCutter.C
+++ b/src/dynamicMesh/meshCut/meshModifiers/undoableMeshCutter/undoableMeshCutter.C
@@ -36,10 +36,8 @@ License
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-namespace Foam
-{
-defineTypeNameAndDebug(undoableMeshCutter, 0);
-}
+defineTypeNameAndDebug(Foam::undoableMeshCutter, 0);
+
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
@@ -67,12 +65,7 @@ void Foam::undoableMeshCutter::printCellRefTree
// For debugging
void Foam::undoableMeshCutter::printRefTree(Ostream& os) const
{
- for
- (
- Map<splitCell*>::const_iterator iter = liveSplitCells_.begin();
- iter != liveSplitCells_.end();
- ++iter
- )
+ forAllConstIter(Map<splitCell*>, liveSplitCells_, iter)
{
const splitCell* splitPtr = iter();
@@ -113,7 +106,7 @@ void Foam::undoableMeshCutter::updateLabels
bool changed = false;
- forAllConstIter(Map<splitCell*>,liveSplitCells, iter)
+ forAllConstIter(Map<splitCell*>, liveSplitCells, iter)
{
const splitCell* splitPtr = iter();
diff --git a/src/dynamicMesh/meshCut/meshModifiers/undoableMeshCutter/undoableMeshCutter.H b/src/dynamicMesh/meshCut/meshModifiers/undoableMeshCutter/undoableMeshCutter.H
index df188963b6312f021c6ea17f21c4c456034d4ff0..648d6461a6c84c08a1ca652e8bf8b02d931d078c 100644
--- a/src/dynamicMesh/meshCut/meshModifiers/undoableMeshCutter/undoableMeshCutter.H
+++ b/src/dynamicMesh/meshCut/meshModifiers/undoableMeshCutter/undoableMeshCutter.H
@@ -149,9 +149,8 @@ public:
undoableMeshCutter(const polyMesh& mesh, const bool undoable = true);
- // Destructor
-
- ~undoableMeshCutter();
+ //- Destructor
+ ~undoableMeshCutter();
// Member Functions
diff --git a/src/dynamicMesh/meshCut/splitCell/splitCell.H b/src/dynamicMesh/meshCut/splitCell/splitCell.H
index 7143ba2fcfdd875969a33f16fee340b33897f8a0..6595908a7f8793174041e1db23518c842ee35442 100644
--- a/src/dynamicMesh/meshCut/splitCell/splitCell.H
+++ b/src/dynamicMesh/meshCut/splitCell/splitCell.H
@@ -83,9 +83,8 @@ public:
splitCell(const label cellI, splitCell* parent);
- // Destructor
-
- ~splitCell();
+ //- Destructor
+ ~splitCell();
// Member Functions
diff --git a/src/dynamicMesh/motionSmoother/motionSmoother.H b/src/dynamicMesh/motionSmoother/motionSmoother.H
index 57522fd0e3dc910367e0d59d0a9bdfaf4a568639..f5df37e677d5ada11b1384c6769cd0c90770a117 100644
--- a/src/dynamicMesh/motionSmoother/motionSmoother.H
+++ b/src/dynamicMesh/motionSmoother/motionSmoother.H
@@ -305,9 +305,8 @@ public:
);
- // Destructor
-
- ~motionSmoother();
+ //- Destructor
+ ~motionSmoother();
// Member Functions
diff --git a/src/dynamicMesh/motionSolver/motionSolver.H b/src/dynamicMesh/motionSolver/motionSolver.H
index 5e125e05a5f3e921d90669b6673fa027a2156425..44889d937f3269e99e46350aec8e7564090e604b 100644
--- a/src/dynamicMesh/motionSolver/motionSolver.H
+++ b/src/dynamicMesh/motionSolver/motionSolver.H
@@ -97,9 +97,8 @@ public:
motionSolver(const polyMesh& mesh);
- // Destructor
-
- virtual ~motionSolver();
+ //- Destructor
+ virtual ~motionSolver();
// Member Functions
diff --git a/src/dynamicMesh/perfectInterface/perfectInterface.C b/src/dynamicMesh/perfectInterface/perfectInterface.C
index 301091ca8a50e4abeeb7e08eac3ff521f60bf8c4..27370c56cec11cca2466ccf0b39d7599d12b6f7c 100644
--- a/src/dynamicMesh/perfectInterface/perfectInterface.C
+++ b/src/dynamicMesh/perfectInterface/perfectInterface.C
@@ -299,15 +299,9 @@ void Foam::perfectInterface::setRefinement
// 2. Renumber (non patch0/1) faces.
- for
- (
- labelHashSet::const_iterator iter = affectedFaces.begin();
- iter != affectedFaces.end();
- ++iter
- )
+ forAllConstIter(labelHashSet, affectedFaces, iter)
{
- label faceI = iter.key();
-
+ const label faceI = iter.key();
const face& f = mesh.faces()[faceI];
face newFace(f.size());
diff --git a/src/dynamicMesh/perfectInterface/perfectInterface.H b/src/dynamicMesh/perfectInterface/perfectInterface.H
index a1423b5b7732c860e4ed8d2d5eb0bcec50ac6733..f133842b3f700685941a23255e70fc0aff1b0aba 100644
--- a/src/dynamicMesh/perfectInterface/perfectInterface.H
+++ b/src/dynamicMesh/perfectInterface/perfectInterface.H
@@ -114,9 +114,8 @@ public:
);
- // Destructor
-
- virtual ~perfectInterface();
+ //- Destructor
+ virtual ~perfectInterface();
// Member Functions
diff --git a/src/dynamicMesh/polyMeshAdder/faceCoupleInfo.H b/src/dynamicMesh/polyMeshAdder/faceCoupleInfo.H
index 613b915b2aa5945fdc46d224f0038b88713eefb3..d2fbdf3ec5a75ed226b77733a96d02c23e34ac28 100644
--- a/src/dynamicMesh/polyMeshAdder/faceCoupleInfo.H
+++ b/src/dynamicMesh/polyMeshAdder/faceCoupleInfo.H
@@ -419,9 +419,8 @@ public:
);
- // Destructor
-
- ~faceCoupleInfo();
+ //- Destructor
+ ~faceCoupleInfo();
diff --git a/src/dynamicMesh/polyMeshAdder/polyMeshAdder.C b/src/dynamicMesh/polyMeshAdder/polyMeshAdder.C
index 65bca6a2f0e8d1fa83dd9c1de65b4ab3b6f367c7..4eae7a7c6991cdab17fecdf0c9aaa74a8251de02 100644
--- a/src/dynamicMesh/polyMeshAdder/polyMeshAdder.C
+++ b/src/dynamicMesh/polyMeshAdder/polyMeshAdder.C
@@ -930,7 +930,7 @@ void Foam::polyMeshAdder::mergePointZones
from1ToAll.setSize(pz1.size());
- forAll (pz1, zoneI)
+ forAll(pz1, zoneI)
{
from1ToAll[zoneI] = zoneIndex(pz1[zoneI].name(), zoneNames);
}
@@ -996,7 +996,7 @@ void Foam::polyMeshAdder::mergeFaceZones
from1ToAll.setSize(fz1.size());
- forAll (fz1, zoneI)
+ forAll(fz1, zoneI)
{
from1ToAll[zoneI] = zoneIndex(fz1[zoneI].name(), zoneNames);
}
@@ -1096,7 +1096,7 @@ void Foam::polyMeshAdder::mergeCellZones
append(cz0.names(), zoneNames);
from1ToAll.setSize(cz1.size());
- forAll (cz1, zoneI)
+ forAll(cz1, zoneI)
{
from1ToAll[zoneI] = zoneIndex(cz1[zoneI].name(), zoneNames);
}
diff --git a/src/dynamicMesh/polyTopoChange/attachPolyTopoChanger/attachPolyTopoChanger.C b/src/dynamicMesh/polyTopoChange/attachPolyTopoChanger/attachPolyTopoChanger.C
index 460059c2881d88db53368f8e7f35fbcced40dc79..f9da5b125f4506fe8306a099970fb06c885f22cb 100644
--- a/src/dynamicMesh/polyTopoChange/attachPolyTopoChanger/attachPolyTopoChanger.C
+++ b/src/dynamicMesh/polyTopoChange/attachPolyTopoChanger/attachPolyTopoChanger.C
@@ -82,7 +82,7 @@ void Foam::attachPolyTopoChanger::attach(const bool removeEmptyPatches)
List<polyPatch*> newPatches(oldPatches.size());
label nNewPatches = 0;
- forAll (oldPatches, patchI)
+ forAll(oldPatches, patchI)
{
if (oldPatches[patchI].size())
{
diff --git a/src/dynamicMesh/polyTopoChange/attachPolyTopoChanger/attachPolyTopoChanger.H b/src/dynamicMesh/polyTopoChange/attachPolyTopoChanger/attachPolyTopoChanger.H
index c9d61357a97c6038cf680e98244d01e976a32558..b39ebd3bd40ffc9a1c7bc252312007b76166de1d 100644
--- a/src/dynamicMesh/polyTopoChange/attachPolyTopoChanger/attachPolyTopoChanger.H
+++ b/src/dynamicMesh/polyTopoChange/attachPolyTopoChanger/attachPolyTopoChanger.H
@@ -83,10 +83,9 @@ public:
explicit attachPolyTopoChanger(polyMesh&);
- // Destructor
-
- virtual ~attachPolyTopoChanger()
- {}
+ //- Destructor
+ virtual ~attachPolyTopoChanger()
+ {}
// Member Functions
diff --git a/src/dynamicMesh/polyTopoChange/polyMeshModifier/polyMeshModifier.H b/src/dynamicMesh/polyTopoChange/polyMeshModifier/polyMeshModifier.H
index 81300bba04aa8ac89d0b5b31785bf5a9a2af15b0..ad083ee42a4c933f17ec350514203586f1495e10 100644
--- a/src/dynamicMesh/polyTopoChange/polyMeshModifier/polyMeshModifier.H
+++ b/src/dynamicMesh/polyTopoChange/polyMeshModifier/polyMeshModifier.H
@@ -134,9 +134,8 @@ public:
);
- // Destructor
-
- virtual ~polyMeshModifier();
+ //- Destructor
+ virtual ~polyMeshModifier();
// Member Functions
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/combineFaces.C b/src/dynamicMesh/polyTopoChange/polyTopoChange/combineFaces.C
index 37e4b18b664eceed0f4e8b25b7d654d8504026d5..5dc59ad815b8ff84bfb64c6f72d18cad81a90377 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/combineFaces.C
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/combineFaces.C
@@ -36,12 +36,8 @@ License
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-namespace Foam
-{
-
-defineTypeNameAndDebug(combineFaces, 0);
+defineTypeNameAndDebug(Foam::combineFaces, 0);
-}
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/faceCollapser.C b/src/dynamicMesh/polyTopoChange/polyTopoChange/faceCollapser.C
index 22b12be98496f61c5df79389b0a1037ae07b9663..c180f59b7671539a27c321be86ff803d48b8e7f2 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/faceCollapser.C
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/faceCollapser.C
@@ -462,12 +462,7 @@ void Foam::faceCollapser::setRefinement
}
}
- for
- (
- Map<labelList>::const_iterator iter = splitEdges.begin();
- iter != splitEdges.end();
- ++iter
- )
+ forAllConstIter(Map<labelList>, splitEdges, iter)
{
Pout<< "Split edge:" << iter.key()
<< " verts:" << mesh_.edges()[iter.key()]
@@ -500,12 +495,7 @@ void Foam::faceCollapser::setRefinement
// Modify faces affected (but not removed)
//
- for
- (
- labelHashSet::const_iterator iter = affectedFaces.begin();
- iter != affectedFaces.end();
- ++iter
- )
+ forAllConstIter(labelHashSet, affectedFaces, iter)
{
filterFace(splitEdges, iter.key(), meshMod);
}
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChange.C b/src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChange.C
index f2db1f59f5618198d0bf2fffafb19e0c6946de66..1c1b32cced6d5823334610f4877b3bcaefc32cf0 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChange.C
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChange.C
@@ -534,7 +534,7 @@ Foam::label Foam::polyTopoChange::getCellOrder
// loop over the cells
- forAll (visited, cellI)
+ forAll(visited, cellI)
{
// find the first non-removed cell that has not been visited yet
if (!cellRemoved(cellI) && visited[cellI] == 0)
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/topoAction/topoAction.H b/src/dynamicMesh/polyTopoChange/polyTopoChange/topoAction/topoAction.H
index ca068eaf5ec1ddda176f7cf75ebb1dbeb9ddc6c6..09af23ae962ba0261aaad15d52da9182bbe86e6b 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/topoAction/topoAction.H
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/topoAction/topoAction.H
@@ -66,10 +66,9 @@ public:
virtual autoPtr<topoAction> clone() const = 0;
- // Destructor
-
- virtual ~topoAction()
- {}
+ //- Destructor
+ virtual ~topoAction()
+ {}
};
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChanger/polyTopoChanger.C b/src/dynamicMesh/polyTopoChange/polyTopoChanger/polyTopoChanger.C
index 18885d22c99cf3a672d2bf238ae00841361e5d0f..1f7de13abafd66bf8718b3b46279da7287a211c1 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChanger/polyTopoChanger.C
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChanger/polyTopoChanger.C
@@ -130,7 +130,7 @@ Foam::wordList Foam::polyTopoChanger::types() const
wordList t(modifiers.size());
- forAll (modifiers, modifierI)
+ forAll(modifiers, modifierI)
{
t[modifierI] = modifiers[modifierI].type();
}
@@ -146,7 +146,7 @@ Foam::wordList Foam::polyTopoChanger::names() const
wordList t(modifiers.size());
- forAll (modifiers, modifierI)
+ forAll(modifiers, modifierI)
{
t[modifierI] = modifiers[modifierI].name();
}
@@ -163,7 +163,7 @@ bool Foam::polyTopoChanger::changeTopology() const
bool triggerChange = false;
- forAll (topoChanges, morphI)
+ forAll(topoChanges, morphI)
{
if (topoChanges[morphI].active())
{
@@ -211,7 +211,7 @@ Foam::polyTopoChanger::topoChangeRequest() const
polyTopoChange* refPtr(new polyTopoChange(mesh()));
polyTopoChange& ref = *refPtr;
- forAll (topoChanges, morphI)
+ forAll(topoChanges, morphI)
{
if (topoChanges[morphI].active())
{
@@ -228,7 +228,7 @@ void Foam::polyTopoChanger::modifyMotionPoints(pointField& p) const
{
const PtrList<polyMeshModifier>& topoChanges = *this;
- forAll (topoChanges, morphI)
+ forAll(topoChanges, morphI)
{
if (topoChanges[morphI].active())
{
@@ -244,7 +244,7 @@ void Foam::polyTopoChanger::update(const mapPolyMesh& m)
// Go through all mesh modifiers and accumulate the morphing information
PtrList<polyMeshModifier>& topoChanges = *this;
- forAll (topoChanges, morphI)
+ forAll(topoChanges, morphI)
{
topoChanges[morphI].updateMesh(m);
}
@@ -298,7 +298,7 @@ void Foam::polyTopoChanger::addTopologyModifiers
setSize(tm.size());
// Copy the patch pointers
- forAll (tm, tmI)
+ forAll(tm, tmI)
{
if (tm[tmI]->topoChanger() != *this)
{
@@ -323,7 +323,7 @@ Foam::label Foam::polyTopoChanger::findModifierID
{
const PtrList<polyMeshModifier>& topoChanges = *this;
- forAll (topoChanges, morphI)
+ forAll(topoChanges, morphI)
{
if (topoChanges[morphI].name() == modName)
{
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChanger/polyTopoChanger.H b/src/dynamicMesh/polyTopoChange/polyTopoChanger/polyTopoChanger.H
index 71670a485054b3ad33aa6ee017ddd49138ba57c8..8f9ad50a00a65d32c2408cdfcc35563007c81e82 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChanger/polyTopoChanger.H
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChanger/polyTopoChanger.H
@@ -92,10 +92,9 @@ public:
explicit polyTopoChanger(polyMesh&);
- // Destructor
-
- virtual ~polyTopoChanger()
- {}
+ //- Destructor
+ virtual ~polyTopoChanger()
+ {}
// Member functions
diff --git a/src/dynamicMesh/polyTopoChange/repatchPolyTopoChanger/repatchPolyTopoChanger.H b/src/dynamicMesh/polyTopoChange/repatchPolyTopoChanger/repatchPolyTopoChanger.H
index 1158ee6906c8555ac37374739d65a7d6882a33d5..0353c4b0c2dfc35b82a9b2e1932e82a0b53eb28b 100644
--- a/src/dynamicMesh/polyTopoChange/repatchPolyTopoChanger/repatchPolyTopoChanger.H
+++ b/src/dynamicMesh/polyTopoChange/repatchPolyTopoChanger/repatchPolyTopoChanger.H
@@ -80,10 +80,9 @@ public:
explicit repatchPolyTopoChanger(polyMesh& mesh);
- // Destructor
-
- virtual ~repatchPolyTopoChanger()
- {}
+ //- Destructor
+ virtual ~repatchPolyTopoChanger()
+ {}
// Member Functions
diff --git a/src/dynamicMesh/setUpdater/setUpdater.H b/src/dynamicMesh/setUpdater/setUpdater.H
index 7ff6c9edb93cf87eb0999c5f6727901f07d5287d..648155b91546cae1da8f91d422fd55877da030b2 100644
--- a/src/dynamicMesh/setUpdater/setUpdater.H
+++ b/src/dynamicMesh/setUpdater/setUpdater.H
@@ -83,9 +83,8 @@ public:
);
- // Destructor
-
- virtual ~setUpdater();
+ //- Destructor
+ virtual ~setUpdater();
// Member Functions
diff --git a/src/dynamicMesh/setUpdater/setUpdaterTemplates.C b/src/dynamicMesh/setUpdater/setUpdaterTemplates.C
index c2e7b5ce726ffd273c77ea4383375e69e6c71aeb..9ab84988e373c53c99fa1eb3bb0ffee73085e2cf 100644
--- a/src/dynamicMesh/setUpdater/setUpdaterTemplates.C
+++ b/src/dynamicMesh/setUpdater/setUpdaterTemplates.C
@@ -46,12 +46,7 @@ void setUpdater::updateSets(const mapPolyMesh& morphMap) const
HashTable<const Type*> memSets =
morphMap.mesh().objectRegistry::lookupClass<Type>();
- for
- (
- typename HashTable<const Type*>::iterator iter = memSets.begin();
- iter != memSets.end();
- ++iter
- )
+ forAllIter(typename HashTable<const Type*>, memSets, iter)
{
Type& set = const_cast<Type&>(*iter());
@@ -82,12 +77,7 @@ void setUpdater::updateSets(const mapPolyMesh& morphMap) const
IOobjectList fileSets(Objects.lookupClass(Type::typeName));
- for
- (
- IOobjectList::const_iterator iter = fileSets.begin();
- iter != fileSets.end();
- ++iter
- )
+ forAllConstIter(IOobjectList, fileSets, iter)
{
if (!memSets.found(iter.key()))
{
diff --git a/src/dynamicMesh/slidingInterface/coupleSlidingInterface.C b/src/dynamicMesh/slidingInterface/coupleSlidingInterface.C
index 7c4ab7553d2660b979cacaa3f1b18b26d80a209e..410bb1d7105ffe731007f7103682a38dd6a847d9 100644
--- a/src/dynamicMesh/slidingInterface/coupleSlidingInterface.C
+++ b/src/dynamicMesh/slidingInterface/coupleSlidingInterface.C
@@ -157,7 +157,7 @@ void Foam::slidingInterface::coupleInterface(polyTopoChange& ref) const
Map<label>& pointMergeMap = cutPatch.pointMergeMap();
// Create mapping for every merged point of the slave patch
- forAll (slavePointPointHits, pointI)
+ forAll(slavePointPointHits, pointI)
{
if (slavePointPointHits[pointI] >= 0)
{
@@ -175,7 +175,7 @@ void Foam::slidingInterface::coupleInterface(polyTopoChange& ref) const
List<labelHashSet> usedMasterEdges(slaveEdges.size());
// Collect of slave point hits
- forAll (slavePointPointHits, pointI)
+ forAll(slavePointPointHits, pointI)
{
// For point hits, add all point-edges from master side to all point
const labelList& curSlaveEdges = slavePointEdges[pointI];
@@ -187,11 +187,11 @@ void Foam::slidingInterface::coupleInterface(polyTopoChange& ref) const
// Mark all current master edges as used for all the current slave
// edges
- forAll (curSlaveEdges, slaveEdgeI)
+ forAll(curSlaveEdges, slaveEdgeI)
{
labelHashSet& sm = usedMasterEdges[curSlaveEdges[slaveEdgeI]];
- forAll (curMasterEdges, masterEdgeI)
+ forAll(curMasterEdges, masterEdgeI)
{
sm.insert(curMasterEdges[masterEdgeI]);
}
@@ -200,7 +200,7 @@ void Foam::slidingInterface::coupleInterface(polyTopoChange& ref) const
else if (slavePointEdgeHits[pointI] > -1)
{
// For edge hits, add the master edge
- forAll (curSlaveEdges, slaveEdgeI)
+ forAll(curSlaveEdges, slaveEdgeI)
{
usedMasterEdges[curSlaveEdges[slaveEdgeI]].insert
(
@@ -213,7 +213,7 @@ void Foam::slidingInterface::coupleInterface(polyTopoChange& ref) const
// Collect off master point hits
// For every master point that has hit an edge, add all edges coming from
// that point to the slave edge that has been hit
- forAll (masterPointEdgeHits, masterPointI)
+ forAll(masterPointEdgeHits, masterPointI)
{
if (masterPointEdgeHits[masterPointI] > -1)
{
@@ -222,7 +222,7 @@ void Foam::slidingInterface::coupleInterface(polyTopoChange& ref) const
labelHashSet& sm =
usedMasterEdges[masterPointEdgeHits[masterPointI]];
- forAll (curMasterEdges, masterEdgeI)
+ forAll(curMasterEdges, masterEdgeI)
{
sm.insert(curMasterEdges[masterEdgeI]);
}
@@ -230,7 +230,7 @@ void Foam::slidingInterface::coupleInterface(polyTopoChange& ref) const
}
// Pout << "used edges: " << endl;
-// forAll (usedMasterEdges, edgeI)
+// forAll(usedMasterEdges, edgeI)
// {
// Pout << "edge: " << edgeI << " used: " << usedMasterEdges[edgeI].toc() << endl;
// }
@@ -241,7 +241,7 @@ void Foam::slidingInterface::coupleInterface(polyTopoChange& ref) const
List<DynamicList<label> > pointsIntoSlaveEdges(slaveEdges.size());
// Add all points from the slave patch that have hit the edge
- forAll (slavePointEdgeHits, pointI)
+ forAll(slavePointEdgeHits, pointI)
{
if (slavePointEdgeHits[pointI] > -1)
{
@@ -294,7 +294,7 @@ void Foam::slidingInterface::coupleInterface(polyTopoChange& ref) const
}
// Add all points from the slave patch that have hit a face
- forAll (slavePointFaceHits, pointI)
+ forAll(slavePointFaceHits, pointI)
{
if
(
@@ -333,7 +333,7 @@ void Foam::slidingInterface::coupleInterface(polyTopoChange& ref) const
}
}
- forAll (masterPointEdgeHits, pointI)
+ forAll(masterPointEdgeHits, pointI)
{
if (masterPointEdgeHits[pointI] > -1)
{
@@ -402,7 +402,7 @@ void Foam::slidingInterface::coupleInterface(polyTopoChange& ref) const
labelHashSet addedFaces(2*primitiveMesh::edgesPerFace_);
- forAll (slaveEdges, edgeI)
+ forAll(slaveEdges, edgeI)
{
const edge& curEdge = slaveEdges[edgeI];
@@ -443,11 +443,11 @@ void Foam::slidingInterface::coupleInterface(polyTopoChange& ref) const
const labelList cf = addedFaces.toc();
addedFaces.clear();
- forAll (cf, cfI)
+ forAll(cf, cfI)
{
const labelList& curNbrs = masterFaceFaces[cf[cfI]];
- forAll (curNbrs, nbrI)
+ forAll(curNbrs, nbrI)
{
if (!curFaceMap.found(curNbrs[nbrI]))
{
@@ -493,11 +493,11 @@ void Foam::slidingInterface::coupleInterface(polyTopoChange& ref) const
const labelList cf = addedFaces.toc();
addedFaces.clear();
- forAll (cf, cfI)
+ forAll(cf, cfI)
{
const labelList& curNbrs = masterFaceFaces[cf[cfI]];
- forAll (curNbrs, nbrI)
+ forAll(curNbrs, nbrI)
{
if (!curFaceMap.found(curNbrs[nbrI]))
{
@@ -541,7 +541,7 @@ void Foam::slidingInterface::coupleInterface(polyTopoChange& ref) const
const labelList curFaces = curFaceMap.toc();
// Pout << "curFaces: " << curFaces << endl;
- forAll (curFaces, faceI)
+ forAll(curFaces, faceI)
{
// Pout<< "face: " << curFaces[faceI] << " "
// << masterPatch[curFaces[faceI]]
@@ -550,7 +550,7 @@ void Foam::slidingInterface::coupleInterface(polyTopoChange& ref) const
// << endl;
const labelList& me = masterFaceEdges[curFaces[faceI]];
- forAll (me, meI)
+ forAll(me, meI)
{
curMasterEdgesMap.insert(me[meI]);
}
@@ -588,7 +588,7 @@ void Foam::slidingInterface::coupleInterface(polyTopoChange& ref) const
linePointRef curSlaveLine = curEdge.line(projectedSlavePoints);
const scalar curSlaveLineMag = curSlaveLine.mag();
// Pout << "curSlaveLine: " << curSlaveLine << endl;
- forAll (curMasterEdges, masterEdgeI)
+ forAll(curMasterEdges, masterEdgeI)
{
if (!curUme.found(curMasterEdges[masterEdgeI]))
{
@@ -746,14 +746,14 @@ void Foam::slidingInterface::coupleInterface(polyTopoChange& ref) const
// Re-pack the points into edges lists
labelListList pime(pointsIntoMasterEdges.size());
- forAll (pointsIntoMasterEdges, i)
+ forAll(pointsIntoMasterEdges, i)
{
pime[i].transfer(pointsIntoMasterEdges[i]);
}
labelListList pise(pointsIntoSlaveEdges.size());
- forAll (pointsIntoSlaveEdges, i)
+ forAll(pointsIntoSlaveEdges, i)
{
pise[i].transfer(pointsIntoSlaveEdges[i]);
}
@@ -788,7 +788,7 @@ void Foam::slidingInterface::coupleInterface(polyTopoChange& ref) const
boolList orphanedMaster(masterPatch.size(), false);
boolList orphanedSlave(slavePatch.size(), false);
- forAll (cutFaces, faceI)
+ forAll(cutFaces, faceI)
{
const face& curCutFace = cutFaces[faceI];
const label curMaster = cutFaceMaster[faceI];
@@ -889,7 +889,7 @@ void Foam::slidingInterface::coupleInterface(polyTopoChange& ref) const
// Renumber the slave face into merged labels
face rsf(slavePatch[curSlave]);
- forAll (rsf, i)
+ forAll(rsf, i)
{
Map<label>::const_iterator mpIter = pointMergeMap.find(rsf[i]);
@@ -1107,7 +1107,7 @@ void Foam::slidingInterface::coupleInterface(polyTopoChange& ref) const
label nOrphanedMasters = 0;
- forAll (orphanedMaster, faceI)
+ forAll(orphanedMaster, faceI)
{
if (orphanedMaster[faceI])
{
@@ -1138,7 +1138,7 @@ void Foam::slidingInterface::coupleInterface(polyTopoChange& ref) const
label nOrphanedSlaves = 0;
- forAll (orphanedSlave, faceI)
+ forAll(orphanedSlave, faceI)
{
if (orphanedSlave[faceI])
{
@@ -1197,7 +1197,7 @@ void Foam::slidingInterface::coupleInterface(polyTopoChange& ref) const
// Pout << "masterStickOuts: " << masterStickOuts << endl;
// Re-create the master stick-out faces
- forAll (masterStickOuts, faceI)
+ forAll(masterStickOuts, faceI)
{
// Renumber the face and remove additional points
@@ -1211,7 +1211,7 @@ void Foam::slidingInterface::coupleInterface(polyTopoChange& ref) const
face oldFace(oldRichFace.size());
label nOldFace = 0;
- forAll (oldRichFace, pointI)
+ forAll(oldRichFace, pointI)
{
if (ref.pointRemoved(oldRichFace[pointI]))
{
@@ -1230,7 +1230,7 @@ void Foam::slidingInterface::coupleInterface(polyTopoChange& ref) const
// Pout << "old rich master face: " << oldRichFace << " old face: " << oldFace << endl;
DynamicList<label> newFaceLabels(2*oldFace.size());
- forAll (oldFace, pointI)
+ forAll(oldFace, pointI)
{
if (masterMeshPointMap.found(oldFace[pointI]))
{
@@ -1273,7 +1273,7 @@ void Foam::slidingInterface::coupleInterface(polyTopoChange& ref) const
// Find the points on the edge between them
const label localNextLabel = mmpmIter();
- forAll (curEdges, curEdgeI)
+ forAll(curEdges, curEdgeI)
{
if
(
@@ -1306,7 +1306,7 @@ void Foam::slidingInterface::coupleInterface(polyTopoChange& ref) const
scalarField edgePointWeights(curPime.size());
- forAll (curPime, curPimeI)
+ forAll(curPime, curPimeI)
{
edgePointWeights[curPimeI] =
(
@@ -1354,7 +1354,7 @@ void Foam::slidingInterface::coupleInterface(polyTopoChange& ref) const
label nextPoint = -1;
scalar dist = 2;
- forAll (edgePointWeights, wI)
+ forAll(edgePointWeights, wI)
{
if (edgePointWeights[wI] < dist)
{
@@ -1468,7 +1468,7 @@ void Foam::slidingInterface::coupleInterface(polyTopoChange& ref) const
// Re-create the slave stick-out faces
- forAll (slaveStickOuts, faceI)
+ forAll(slaveStickOuts, faceI)
{
// Renumber the face and remove additional points
const label curFaceID = slaveStickOuts[faceI];
@@ -1481,7 +1481,7 @@ void Foam::slidingInterface::coupleInterface(polyTopoChange& ref) const
face oldFace(oldRichFace.size());
label nOldFace = 0;
- forAll (oldRichFace, pointI)
+ forAll(oldRichFace, pointI)
{
if
(
@@ -1517,7 +1517,7 @@ void Foam::slidingInterface::coupleInterface(polyTopoChange& ref) const
DynamicList<label> newFaceLabels(2*oldFace.size());
// Pout << "old rich slave face: " << oldRichFace << " old face: " << oldFace << endl;
- forAll (oldFace, pointI)
+ forAll(oldFace, pointI)
{
// Try to find the point in retired points
label curP = oldFace[pointI];
@@ -1580,7 +1580,7 @@ void Foam::slidingInterface::coupleInterface(polyTopoChange& ref) const
// Find the points on the edge between them
const label localNextLabel = mmpmIter();
- forAll (curEdges, curEdgeI)
+ forAll(curEdges, curEdgeI)
{
if
(
@@ -1613,7 +1613,7 @@ void Foam::slidingInterface::coupleInterface(polyTopoChange& ref) const
scalarField edgePointWeights(curPise.size());
- forAll (curPise, curPiseI)
+ forAll(curPise, curPiseI)
{
edgePointWeights[curPiseI] =
(
@@ -1661,7 +1661,7 @@ void Foam::slidingInterface::coupleInterface(polyTopoChange& ref) const
label nextPoint = -1;
scalar dist = 2;
- forAll (edgePointWeights, wI)
+ forAll(edgePointWeights, wI)
{
if (edgePointWeights[wI] < dist)
{
@@ -1782,7 +1782,7 @@ void Foam::slidingInterface::coupleInterface(polyTopoChange& ref) const
label nRetiredPoints = 0;
- forAll (slaveMeshPoints, pointI)
+ forAll(slaveMeshPoints, pointI)
{
if (pointMergeMap.found(slaveMeshPoints[pointI]))
{
diff --git a/src/dynamicMesh/slidingInterface/decoupleSlidingInterface.C b/src/dynamicMesh/slidingInterface/decoupleSlidingInterface.C
index 1684a7c20df683b44697ec69f0a26858550e5e74..5271b4cdb38334de56d506beca085fde8ba53fd8 100644
--- a/src/dynamicMesh/slidingInterface/decoupleSlidingInterface.C
+++ b/src/dynamicMesh/slidingInterface/decoupleSlidingInterface.C
@@ -82,7 +82,7 @@ void Foam::slidingInterface::decoupleInterface
// Recover faces in master patch
- forAll (masterPatchAddr, faceI)
+ forAll(masterPatchAddr, faceI)
{
// Make a copy of the face and turn it if necessary
face newFace = faces[masterPatchAddr[faceI]];
@@ -128,7 +128,7 @@ void Foam::slidingInterface::decoupleInterface
// Recover faces in slave patch
- forAll (slavePatchAddr, faceI)
+ forAll(slavePatchAddr, faceI)
{
// Make a copy of face and turn it if necessary
face newFace = faces[slavePatchAddr[faceI]];
@@ -139,7 +139,7 @@ void Foam::slidingInterface::decoupleInterface
}
// Recover retired points on the slave side
- forAll (newFace, pointI)
+ forAll(newFace, pointI)
{
Map<label>::const_iterator rpmIter = rpm.find(newFace[pointI]);
if (rpmIter != rpm.end())
@@ -172,7 +172,7 @@ void Foam::slidingInterface::decoupleInterface
// Grab the list of faces in the layer
const labelList& masterStickOuts = masterStickOutFaces();
- forAll (masterStickOuts, faceI)
+ forAll(masterStickOuts, faceI)
{
// Renumber the face and remove additional points
@@ -184,7 +184,7 @@ void Foam::slidingInterface::decoupleInterface
bool changed = false;
- forAll (oldFace, pointI)
+ forAll(oldFace, pointI)
{
// Check if the point is removed
if (ref.pointRemoved(oldFace[pointI]))
@@ -256,11 +256,11 @@ void Foam::slidingInterface::decoupleInterface
primitiveMesh::facesPerCell_*(masterPatch.size() + slavePatch.size())
);
- forAll (slaveFc, faceI)
+ forAll(slaveFc, faceI)
{
const labelList& curFaces = cells[slaveFc[faceI]];
- forAll (curFaces, faceI)
+ forAll(curFaces, faceI)
{
// Check if the face belongs to the slave face zone; and
// if it has been removed; if not add it
@@ -283,7 +283,7 @@ void Foam::slidingInterface::decoupleInterface
// Grab master point mapping
const Map<label>& masterPm = masterPatch.meshPointMap();
- forAll (slaveStickOuts, faceI)
+ forAll(slaveStickOuts, faceI)
{
// Renumber the face and remove additional points
@@ -295,7 +295,7 @@ void Foam::slidingInterface::decoupleInterface
bool changed = false;
- forAll (oldFace, pointI)
+ forAll(oldFace, pointI)
{
// Check if the point is removed or retired
if (rpm.found(oldFace[pointI]))
@@ -378,7 +378,7 @@ void Foam::slidingInterface::decoupleInterface
const labelList& slaveMeshPoints =
mesh.faceZones()[slaveFaceZoneID_.index()]().meshPoints();
- forAll (slaveMeshPoints, pointI)
+ forAll(slaveMeshPoints, pointI)
{
ref.setAction
(
diff --git a/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatch.C b/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatch.C
index 2a4f2f9d691fab1629ef9fa9b7d70133eb072aae..56e70fbd3505c23b1047fc05637c69d57c8d2a02 100644
--- a/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatch.C
+++ b/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatch.C
@@ -68,7 +68,7 @@ void Foam::enrichedPatch::calcLocalFaces() const
Map<label> mpLookup(2*mp.size());
- forAll (mp, mpI)
+ forAll(mp, mpI)
{
mpLookup.insert(mp[mpI], mpI);
}
@@ -78,7 +78,7 @@ void Foam::enrichedPatch::calcLocalFaces() const
localFacesPtr_ = new faceList(faces.size());
faceList& lf = *localFacesPtr_;
- forAll (faces, faceI)
+ forAll(faces, faceI)
{
const face& f = faces[faceI];
@@ -86,7 +86,7 @@ void Foam::enrichedPatch::calcLocalFaces() const
curlf.setSize(f.size());
- forAll (f, pointI)
+ forAll(f, pointI)
{
curlf[pointI] = mpLookup.find(f[pointI])();
}
@@ -108,7 +108,7 @@ void Foam::enrichedPatch::calcLocalPoints() const
localPointsPtr_ = new pointField(mp.size());
pointField& lp = *localPointsPtr_;
- forAll (lp, i)
+ forAll(lp, i)
{
lp[i] = pointMap().find(mp[i])();
}
@@ -225,11 +225,11 @@ bool Foam::enrichedPatch::checkSupport() const
bool error = false;
- forAll (faces, faceI)
+ forAll(faces, faceI)
{
const face& curFace = faces[faceI];
- forAll (curFace, pointI)
+ forAll(curFace, pointI)
{
if (!pointMap().found(curFace[pointI]))
{
diff --git a/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatch.H b/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatch.H
index 7c98aec450eb506c5e1e1cd8784dc4e8e0db8e6b..7c3649aad73f81216749b8835e08ea2ba896c767 100644
--- a/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatch.H
+++ b/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatch.H
@@ -204,9 +204,8 @@ public:
);
- // Destructor
-
- ~enrichedPatch();
+ //- Destructor
+ ~enrichedPatch();
// Member Functions
diff --git a/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatchCutFaces.C b/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatchCutFaces.C
index 5582f44e822f8cfcbe103db07aadd7418907598f..caee3a88c89f5c75381ab1cf027f990845d1a1b3 100644
--- a/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatchCutFaces.C
+++ b/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatchCutFaces.C
@@ -99,7 +99,7 @@ void Foam::enrichedPatch::calcCutFaces() const
(pp.size()*primitiveMesh::edgesPerPoint_);
- forAll (lf, faceI)
+ forAll(lf, faceI)
{
const face& curLocalFace = lf[faceI];
const face& curGlobalFace = enFaces[faceI];
@@ -119,7 +119,7 @@ void Foam::enrichedPatch::calcCutFaces() const
// }
// {
// pointField facePoints = curLocalFace.points(lp);
-// forAll (curLocalFace, pointI)
+// forAll(curLocalFace, pointI)
// {
// Pout << "v " << facePoints[pointI].x() << " "
// << facePoints[pointI].y() << " "
@@ -141,7 +141,7 @@ void Foam::enrichedPatch::calcCutFaces() const
// Insert the edges of current face into the seed list.
edgeList cfe = curLocalFace.edges();
- forAll (curLocalFace, edgeI)
+ forAll(curLocalFace, edgeI)
{
edgeSeeds.append(cfe[edgeI]);
}
@@ -214,7 +214,7 @@ void Foam::enrichedPatch::calcCutFaces() const
scalar atanTurn = -GREAT;
label bestAtanPoint = -1;
- forAll (nextPoints, nextI)
+ forAll(nextPoints, nextI)
{
// Exclude the point we are coming from; there will always
// be more than one edge, so this is safe
@@ -314,7 +314,7 @@ void Foam::enrichedPatch::calcCutFaces() const
// If the edge corresponds to a starting face edge,
// mark the starting face edge as true
- forAll (cutFaceLocal, cutI)
+ forAll(cutFaceLocal, cutI)
{
const edge curCutFaceEdge
(
@@ -424,9 +424,9 @@ void Foam::enrichedPatch::calcCutFaces() const
// For every current face, try to find it in the
// zero-list
- forAll (curMasterFaces, i)
+ forAll(curMasterFaces, i)
{
- forAll (masterFacesOfPZero, j)
+ forAll(masterFacesOfPZero, j)
{
if
(
@@ -444,7 +444,7 @@ void Foam::enrichedPatch::calcCutFaces() const
// If all point are found attempt matching
if (!miss)
{
- forAll (hits, pointI)
+ forAll(hits, pointI)
{
if (hits[pointI] == cutFaceGlobal.size())
{
@@ -522,7 +522,7 @@ void Foam::enrichedPatch::calcCutFaces() const
faceSizeDebug *= 2;
// Check for duplicate points in the face
- forAll (cutFaceGlobalPoints, checkI)
+ forAll(cutFaceGlobalPoints, checkI)
{
for
(
diff --git a/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatchFaces.C b/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatchFaces.C
index 5197d81022477fe19adeff0557900990822b02f3..f92963bb2ca1d863375276e74e3dccb8cb41c403 100644
--- a/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatchFaces.C
+++ b/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatchFaces.C
@@ -84,7 +84,7 @@ void Foam::enrichedPatch::calcEnrichedFaces
// Add slave faces into the enriched faces list
- forAll (slavePatch_, faceI)
+ forAll(slavePatch_, faceI)
{
const face oldFace = slavePatch_[faceI];
const face oldLocalFace = slaveLocalFaces[faceI];
@@ -95,7 +95,7 @@ void Foam::enrichedPatch::calcEnrichedFaces
// Note: The number of points and edges in a face is always identical
// so both can be done is the same loop
- forAll (oldFace, i)
+ forAll(oldFace, i)
{
// Add the point
Map<label>::const_iterator mpIter =
@@ -166,7 +166,7 @@ void Foam::enrichedPatch::calcEnrichedFaces
pointField slavePosOnEdge(slavePointsOnEdge.size());
- forAll (slavePointsOnEdge, edgePointI)
+ forAll(slavePointsOnEdge, edgePointI)
{
slavePosOnEdge[edgePointI] =
pointMap().find(slavePointsOnEdge[edgePointI])();
@@ -207,7 +207,7 @@ void Foam::enrichedPatch::calcEnrichedFaces
label nextPoint = -1;
scalar dist = 2;
- forAll (edgePointWeights, wI)
+ forAll(edgePointWeights, wI)
{
if (edgePointWeights[wI] < dist)
{
@@ -239,7 +239,7 @@ void Foam::enrichedPatch::calcEnrichedFaces
// Add master faces into the enriched faces list
- forAll (masterPatch_, faceI)
+ forAll(masterPatch_, faceI)
{
const face& oldFace = masterPatch_[faceI];
const face& oldLocalFace = masterLocalFaces[faceI];
@@ -250,7 +250,7 @@ void Foam::enrichedPatch::calcEnrichedFaces
// Note: The number of points and edges in a face is always identical
// so both can be done is the same loop
- forAll (oldFace, i)
+ forAll(oldFace, i)
{
// Add the point
Map<label>::const_iterator mpIter =
@@ -317,7 +317,7 @@ void Foam::enrichedPatch::calcEnrichedFaces
pointField masterPosOnEdge(masterPointsOnEdge.size());
- forAll (masterPointsOnEdge, edgePointI)
+ forAll(masterPointsOnEdge, edgePointI)
{
masterPosOnEdge[edgePointI] =
pointMap().find(masterPointsOnEdge[edgePointI])();
@@ -358,7 +358,7 @@ void Foam::enrichedPatch::calcEnrichedFaces
label nextPoint = -1;
scalar dist = 2;
- forAll (edgePointWeights, wI)
+ forAll(edgePointWeights, wI)
{
if (edgePointWeights[wI] < dist)
{
diff --git a/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatchMasterPoints.C b/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatchMasterPoints.C
index 927ad3047d29c020305ff38a4d55cb0812f46365..3a2d6b2aeb9b127e343ea494ff371a4f94a8d050 100644
--- a/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatchMasterPoints.C
+++ b/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatchMasterPoints.C
@@ -56,11 +56,11 @@ void Foam::enrichedPatch::calcMasterPointFaces() const
const faceList& ef = enrichedFaces();
// Add the original face points
- forAll (masterPatch_, faceI)
+ forAll(masterPatch_, faceI)
{
const face& curFace = ef[faceI + slavePatch_.size()];
// Pout << "Cur face in pfAddr: " << curFace << endl;
- forAll (curFace, pointI)
+ forAll(curFace, pointI)
{
Map<DynamicList<label> >::iterator mpfIter =
mpf.find(curFace[pointI]);
@@ -87,7 +87,7 @@ void Foam::enrichedPatch::calcMasterPointFaces() const
// Add the projected points which hit the face
const labelList& slaveMeshPoints = slavePatch_.meshPoints();
- forAll (slavePointFaceHits_, pointI)
+ forAll(slavePointFaceHits_, pointI)
{
if
(
@@ -132,7 +132,7 @@ void Foam::enrichedPatch::calcMasterPointFaces() const
masterPointFacesPtr_ = new Map<labelList>(2*mpfToc.size());
Map<labelList>& masterPointFaceAddr = *masterPointFacesPtr_;
- forAll (mpfToc, mpfTocI)
+ forAll(mpfToc, mpfTocI)
{
labelList l;
l.transfer(mpf.find(mpfToc[mpfTocI])());
diff --git a/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatchPointMap.C b/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatchPointMap.C
index f4125b96c02f3129d86fd338bf45550dfb4e9a47..0fb7b20673643e4b54fea3b1f7cecb08d40a4e88 100644
--- a/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatchPointMap.C
+++ b/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatchPointMap.C
@@ -47,7 +47,7 @@ void Foam::enrichedPatch::completePointMap() const
const labelList& masterMeshPoints = masterPatch_.meshPoints();
const pointField& masterLocalPoints = masterPatch_.localPoints();
- forAll (masterMeshPoints, pointI)
+ forAll(masterMeshPoints, pointI)
{
if (!pmm.found(masterMeshPoints[pointI]))
{
@@ -63,7 +63,7 @@ void Foam::enrichedPatch::completePointMap() const
const labelList& slaveMeshPoints = slavePatch_.meshPoints();
const pointField& slaveLocalPoints = slavePatch_.localPoints();
- forAll (slaveMeshPoints, pointI)
+ forAll(slaveMeshPoints, pointI)
{
if (!pmm.found(slaveMeshPoints[pointI]))
{
diff --git a/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatchPointPoints.C b/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatchPointPoints.C
index 96c89fa810808cc79cf5ea346fe3932c64a798c0..a24586b754a34ddc3ebc39f689c67bfa71dd7ebe 100644
--- a/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatchPointPoints.C
+++ b/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatchPointPoints.C
@@ -53,11 +53,11 @@ void Foam::enrichedPatch::calcPointPoints() const
register bool found = false;
- forAll (lf, faceI)
+ forAll(lf, faceI)
{
const face& curFace = lf[faceI];
- forAll (curFace, pointI)
+ forAll(curFace, pointI)
{
DynamicList<label, primitiveMesh::edgesPerPoint_>&
curPp = pp[curFace[pointI]];
@@ -67,7 +67,7 @@ void Foam::enrichedPatch::calcPointPoints() const
found = false;
- forAll (curPp, i)
+ forAll(curPp, i)
{
if (curPp[i] == next)
{
@@ -85,7 +85,7 @@ void Foam::enrichedPatch::calcPointPoints() const
label prev = curFace.prevLabel(pointI);
found = false;
- forAll (curPp, i)
+ forAll(curPp, i)
{
if (curPp[i] == prev)
{
@@ -105,7 +105,7 @@ void Foam::enrichedPatch::calcPointPoints() const
pointPointsPtr_ = new labelListList(pp.size());
labelListList& ppAddr = *pointPointsPtr_;
- forAll (pp, pointI)
+ forAll(pp, pointI)
{
ppAddr[pointI].transfer(pp[pointI]);
}
diff --git a/src/dynamicMesh/slidingInterface/slidingInterface.C b/src/dynamicMesh/slidingInterface/slidingInterface.C
index 4720d043447afca433dd5140dfc1826bc7462b78..0382b5a5c6742f2619f92a1a2a6f35e3b997f97c 100644
--- a/src/dynamicMesh/slidingInterface/slidingInterface.C
+++ b/src/dynamicMesh/slidingInterface/slidingInterface.C
@@ -465,7 +465,7 @@ void Foam::slidingInterface::modifyMotionPoints(pointField& motionPoints) const
const pointField& slaveLocalPoints = slavePatch.localPoints();
const vectorField& slavePointNormals = slavePatch.pointNormals();
- forAll (cutPoints, pointI)
+ forAll(cutPoints, pointI)
{
// Try to find the cut point in retired points
Map<label>::const_iterator rpmIter = rpm.find(cutPoints[pointI]);
diff --git a/src/dynamicMesh/slidingInterface/slidingInterface.H b/src/dynamicMesh/slidingInterface/slidingInterface.H
index beccc89f6e6235cb42ca6c2d5751af5955deaa4e..8058d5d4a49ae70f74dbeea3820544e9773c968a 100644
--- a/src/dynamicMesh/slidingInterface/slidingInterface.H
+++ b/src/dynamicMesh/slidingInterface/slidingInterface.H
@@ -340,9 +340,8 @@ public:
);
- // Destructor
-
- virtual ~slidingInterface();
+ //- Destructor
+ virtual ~slidingInterface();
// Member Functions
diff --git a/src/dynamicMesh/slidingInterface/slidingInterfaceAttachedAddressing.C b/src/dynamicMesh/slidingInterface/slidingInterfaceAttachedAddressing.C
index 2831aa84538c3690fc116b6e57da2af1ed204729..e43b23c9847d8e3980baf6a2ad7286bde7f2662c 100644
--- a/src/dynamicMesh/slidingInterface/slidingInterfaceAttachedAddressing.C
+++ b/src/dynamicMesh/slidingInterface/slidingInterfaceAttachedAddressing.C
@@ -64,7 +64,7 @@ void Foam::slidingInterface::calcAttachedAddressing() const
masterFaceCellsPtr_ = new labelList(masterPatchFaces.size());
labelList& mfc = *masterFaceCellsPtr_;
- forAll (masterPatchFaces, faceI)
+ forAll(masterPatchFaces, faceI)
{
if (masterFlip[faceI])
{
@@ -90,7 +90,7 @@ void Foam::slidingInterface::calcAttachedAddressing() const
slaveFaceCellsPtr_ = new labelList(slavePatchFaces.size());
labelList& sfc = *slaveFaceCellsPtr_;
- forAll (slavePatchFaces, faceI)
+ forAll(slavePatchFaces, faceI)
{
if (slaveFlip[faceI])
{
@@ -107,7 +107,7 @@ void Foam::slidingInterface::calcAttachedAddressing() const
{
if (debug)
{
- forAll (mfc, faceI)
+ forAll(mfc, faceI)
{
if (mfc[faceI] < 0)
{
@@ -119,7 +119,7 @@ void Foam::slidingInterface::calcAttachedAddressing() const
}
}
- forAll (sfc, faceI)
+ forAll(sfc, faceI)
{
if (sfc[faceI] < 0)
{
@@ -152,11 +152,11 @@ void Foam::slidingInterface::calcAttachedAddressing() const
const labelList& masterMeshPoints = masterPatch.meshPoints();
- forAll (masterMeshPoints, pointI)
+ forAll(masterMeshPoints, pointI)
{
const labelList& curFaces = pointFaces[masterMeshPoints[pointI]];
- forAll (curFaces, faceI)
+ forAll(curFaces, faceI)
{
// Check if the face belongs to the master face zone;
// if not add it
@@ -181,11 +181,11 @@ void Foam::slidingInterface::calcAttachedAddressing() const
const labelList& slaveMeshPoints = slavePatch.meshPoints();
- forAll (slaveMeshPoints, pointI)
+ forAll(slaveMeshPoints, pointI)
{
const labelList& curFaces = pointFaces[slaveMeshPoints[pointI]];
- forAll (curFaces, faceI)
+ forAll(curFaces, faceI)
{
// Check if the face belongs to the slave face zone;
// if not add it
@@ -272,7 +272,7 @@ void Foam::slidingInterface::renumberAttachedAddressing
const labelList& mfzRenumber =
m.faceZoneFaceMap()[masterFaceZoneID_.index()];
- forAll (mfc, faceI)
+ forAll(mfc, faceI)
{
label newCellI = reverseCellMap[mfc[mfzRenumber[faceI]]];
@@ -289,7 +289,7 @@ void Foam::slidingInterface::renumberAttachedAddressing
const labelList& sfzRenumber =
m.faceZoneFaceMap()[slaveFaceZoneID_.index()];
- forAll (sfc, faceI)
+ forAll(sfc, faceI)
{
label newCellI = reverseCellMap[sfc[sfzRenumber[faceI]]];
@@ -325,7 +325,7 @@ void Foam::slidingInterface::renumberAttachedAddressing
labelList* newMsofPtr = new labelList(msof.size(), -1);
labelList& newMsof = *newMsofPtr;
- forAll (msof, faceI)
+ forAll(msof, faceI)
{
label newFaceI = reverseFaceMap[msof[faceI]];
@@ -341,7 +341,7 @@ void Foam::slidingInterface::renumberAttachedAddressing
labelList* newSsofPtr = new labelList(ssof.size(), -1);
labelList& newSsof = *newSsofPtr;
- forAll (ssof, faceI)
+ forAll(ssof, faceI)
{
label newFaceI = reverseFaceMap[ssof[faceI]];
@@ -380,7 +380,7 @@ void Foam::slidingInterface::renumberAttachedAddressing
label key, value;
- forAll (rpmToc, rpmTocI)
+ forAll(rpmToc, rpmTocI)
{
key = reversePointMap[rpmToc[rpmTocI]];
@@ -413,7 +413,7 @@ void Foam::slidingInterface::renumberAttachedAddressing
const labelList cpepmToc = cpepm.toc();
- forAll (cpepmToc, cpepmTocI)
+ forAll(cpepmToc, cpepmTocI)
{
key = reversePointMap[cpepmToc[cpepmTocI]];
@@ -466,7 +466,7 @@ void Foam::slidingInterface::renumberAttachedAddressing
const labelList& sfzPointRenumber =
m.faceZonePointMap()[slaveFaceZoneID_.index()];
- forAll (newProjectedSlavePoints, pointI)
+ forAll(newProjectedSlavePoints, pointI)
{
if (sfzPointRenumber[pointI] > -1)
{
diff --git a/src/dynamicMesh/slidingInterface/slidingInterfaceClearCouple.C b/src/dynamicMesh/slidingInterface/slidingInterfaceClearCouple.C
index 743d36613d910ef40b7850933a887ad85333394e..b89bfbe0e79fca31cbf504d03705fea86709e572 100644
--- a/src/dynamicMesh/slidingInterface/slidingInterfaceClearCouple.C
+++ b/src/dynamicMesh/slidingInterface/slidingInterfaceClearCouple.C
@@ -51,7 +51,7 @@ void Foam::slidingInterface::clearCouple
const labelList& cutPointZoneLabels =
mesh.pointZones()[cutPointZoneID_.index()];
- forAll (cutPointZoneLabels, pointI)
+ forAll(cutPointZoneLabels, pointI)
{
ref.setAction(polyRemovePoint(cutPointZoneLabels[pointI]));
}
@@ -60,7 +60,7 @@ void Foam::slidingInterface::clearCouple
const labelList& cutFaceZoneLabels =
mesh.faceZones()[cutFaceZoneID_.index()];
- forAll (cutFaceZoneLabels, faceI)
+ forAll(cutFaceZoneLabels, faceI)
{
ref.setAction(polyRemoveFace(cutFaceZoneLabels[faceI]));
}
diff --git a/src/dynamicMesh/slidingInterface/slidingInterfaceProjectPoints.C b/src/dynamicMesh/slidingInterface/slidingInterfaceProjectPoints.C
index d4c37ebbbe6b46b01edad619e922e112ee5da905..74ab080d2a0bcde35acab323bbf1ec3af534a419 100644
--- a/src/dynamicMesh/slidingInterface/slidingInterfaceProjectPoints.C
+++ b/src/dynamicMesh/slidingInterface/slidingInterfaceProjectPoints.C
@@ -125,7 +125,7 @@ bool Foam::slidingInterface::projectPoints() const
scalarField minMasterPointLength(masterLocalPoints.size(), GREAT);
scalarField minMasterFaceLength(masterPatch.size(), GREAT);
- forAll (masterEdges, edgeI)
+ forAll(masterEdges, edgeI)
{
const edge& curEdge = masterEdges[edgeI];
@@ -150,7 +150,7 @@ bool Foam::slidingInterface::projectPoints() const
// Do faces
const labelList& curFaces = masterEdgeFaces[edgeI];
- forAll (curFaces, faceI)
+ forAll(curFaces, faceI)
{
minMasterFaceLength[curFaces[faceI]] =
min
@@ -168,7 +168,7 @@ bool Foam::slidingInterface::projectPoints() const
scalarField minSlavePointLength(slaveLocalPoints.size(), GREAT);
scalarField minSlaveFaceLength(slavePatch.size(), GREAT);
- forAll (slaveEdges, edgeI)
+ forAll(slaveEdges, edgeI)
{
const edge& curEdge = slaveEdges[edgeI];
@@ -193,7 +193,7 @@ bool Foam::slidingInterface::projectPoints() const
// Do faces
const labelList& curFaces = slaveEdgeFaces[edgeI];
- forAll (curFaces, faceI)
+ forAll(curFaces, faceI)
{
minSlaveFaceLength[curFaces[faceI]] =
min
@@ -232,7 +232,7 @@ bool Foam::slidingInterface::projectPoints() const
{
label nHits = 0;
- forAll (slavePointFaceHits, pointI)
+ forAll(slavePointFaceHits, pointI)
{
if (slavePointFaceHits[pointI].hit())
{
@@ -267,7 +267,7 @@ bool Foam::slidingInterface::projectPoints() const
<< "Adjusting point projection for integral match: ";
}
- forAll (slavePointFaceHits, pointI)
+ forAll(slavePointFaceHits, pointI)
{
if (slavePointFaceHits[pointI].hit())
{
@@ -343,7 +343,7 @@ bool Foam::slidingInterface::projectPoints() const
}
else if (matchType_ == PARTIAL)
{
- forAll (slavePointFaceHits, pointI)
+ forAll(slavePointFaceHits, pointI)
{
if (slavePointFaceHits[pointI].hit())
{
@@ -385,7 +385,7 @@ bool Foam::slidingInterface::projectPoints() const
scalar el = 0;
label nShortEdges = 0;
- forAll (slaveEdges, edgeI)
+ forAll(slaveEdges, edgeI)
{
el = slaveEdges[edgeI].mag(projectedSlavePoints);
@@ -440,7 +440,7 @@ bool Foam::slidingInterface::projectPoints() const
label nMergedPoints = 0;
- forAll (projectedSlavePoints, pointI)
+ forAll(projectedSlavePoints, pointI)
{
if (slavePointFaceHits[pointI].hit())
{
@@ -455,7 +455,7 @@ bool Foam::slidingInterface::projectPoints() const
scalar mergeDist = GREAT;
// Try all point before deciding on best fit.
- forAll (hitFace, hitPointI)
+ forAll(hitFace, hitPointI)
{
scalar dist =
mag(masterLocalPoints[hitFace[hitPointI]] - curPoint);
@@ -505,7 +505,7 @@ bool Foam::slidingInterface::projectPoints() const
scalar minEdgeLength = GREAT;
scalar el = 0;
- forAll (slaveEdges, edgeI)
+ forAll(slaveEdges, edgeI)
{
el = slaveEdges[edgeI].mag(projectedSlavePoints);
@@ -540,7 +540,7 @@ bool Foam::slidingInterface::projectPoints() const
label nMovedPoints = 0;
- forAll (projectedSlavePoints, pointI)
+ forAll(projectedSlavePoints, pointI)
{
// Eliminate the points merged into points
if (slavePointPointHits[pointI] < 0)
@@ -564,7 +564,7 @@ bool Foam::slidingInterface::projectPoints() const
scalar minDistance = GREAT;
- forAll (hitFaceEdges, edgeI)
+ forAll(hitFaceEdges, edgeI)
{
const edge& curEdge = masterEdges[hitFaceEdges[edgeI]];
@@ -613,7 +613,7 @@ bool Foam::slidingInterface::projectPoints() const
label mergePoint = -1;
scalar mergeDist = GREAT;
- forAll (hitMasterEdge, hmeI)
+ forAll(hitMasterEdge, hmeI)
{
scalar hmeDist =
mag(masterLocalPoints[hitMasterEdge[hmeI]] - curPoint);
@@ -670,7 +670,7 @@ bool Foam::slidingInterface::projectPoints() const
scalar minEdgeLength = GREAT;
scalar el = 0;
- forAll (slaveEdges, edgeI)
+ forAll(slaveEdges, edgeI)
{
el = slaveEdges[edgeI].mag(projectedSlavePoints);
@@ -758,7 +758,7 @@ bool Foam::slidingInterface::projectPoints() const
labelHashSet addedFaces(2*primitiveMesh::edgesPerFace_);
- forAll (slaveEdges, edgeI)
+ forAll(slaveEdges, edgeI)
{
const edge& curEdge = slaveEdges[edgeI];
@@ -801,11 +801,11 @@ bool Foam::slidingInterface::projectPoints() const
const labelList cf = addedFaces.toc();
addedFaces.clear();
- forAll (cf, cfI)
+ forAll(cf, cfI)
{
const labelList& curNbrs = masterFaceFaces[cf[cfI]];
- forAll (curNbrs, nbrI)
+ forAll(curNbrs, nbrI)
{
if (!curFaceMap.found(curNbrs[nbrI]))
{
@@ -852,11 +852,11 @@ bool Foam::slidingInterface::projectPoints() const
const labelList cf = addedFaces.toc();
addedFaces.clear();
- forAll (cf, cfI)
+ forAll(cf, cfI)
{
const labelList& curNbrs = masterFaceFaces[cf[cfI]];
- forAll (curNbrs, nbrI)
+ forAll(curNbrs, nbrI)
{
if (!curFaceMap.found(curNbrs[nbrI]))
{
@@ -900,11 +900,11 @@ bool Foam::slidingInterface::projectPoints() const
const labelList curFaces = curFaceMap.toc();
// Pout << "curFaces: " << curFaces << endl;
- forAll (curFaces, faceI)
+ forAll(curFaces, faceI)
{
const face& f = masterLocalFaces[curFaces[faceI]];
- forAll (f, pointI)
+ forAll(f, pointI)
{
curPointMap.insert(f[pointI]);
}
@@ -956,7 +956,7 @@ bool Foam::slidingInterface::projectPoints() const
edgeNormalInPlane /= mag(edgeNormalInPlane);
- forAll (curMasterPoints, pointI)
+ forAll(curMasterPoints, pointI)
{
const label cmp = curMasterPoints[pointI];
@@ -1185,7 +1185,7 @@ bool Foam::slidingInterface::projectPoints() const
const List<objectHit>& oldPointFaceHits = *slavePointFaceHitsPtr_;
- forAll (slavePointFaceHits, pointI)
+ forAll(slavePointFaceHits, pointI)
{
if
(
diff --git a/src/edgeMesh/edgeFormats/nas/NASedgeFormat.H b/src/edgeMesh/edgeFormats/nas/NASedgeFormat.H
index 8f16a2ee81b3593721444fda3c1d8792a5e4c617..bf834be3da44ae92b35ef95438008a667b5ec9ae 100644
--- a/src/edgeMesh/edgeFormats/nas/NASedgeFormat.H
+++ b/src/edgeMesh/edgeFormats/nas/NASedgeFormat.H
@@ -82,10 +82,9 @@ public:
}
- // Destructor
-
- virtual ~NASedgeFormat()
- {}
+ //- Destructor
+ virtual ~NASedgeFormat()
+ {}
// Member Functions
diff --git a/src/edgeMesh/edgeFormats/obj/OBJedgeFormat.H b/src/edgeMesh/edgeFormats/obj/OBJedgeFormat.H
index 694922c09479e9bd9bf42ffdcf78da27032786e6..dec85d6cd9fc8b85ecc25c56354d856ebfe52c8e 100644
--- a/src/edgeMesh/edgeFormats/obj/OBJedgeFormat.H
+++ b/src/edgeMesh/edgeFormats/obj/OBJedgeFormat.H
@@ -86,10 +86,9 @@ public:
}
- // Destructor
-
- virtual ~OBJedgeFormat()
- {}
+ //- Destructor
+ virtual ~OBJedgeFormat()
+ {}
// Member Functions
diff --git a/src/engine/engineMesh/engineMesh/engineMesh.H b/src/engine/engineMesh/engineMesh/engineMesh.H
index 724edbac98419877b747572f30a82cf09c73636a..7eaa3afb29237ec995ad5fb0e70aa38c316502e6 100644
--- a/src/engine/engineMesh/engineMesh/engineMesh.H
+++ b/src/engine/engineMesh/engineMesh/engineMesh.H
@@ -106,9 +106,8 @@ public:
static autoPtr<engineMesh> New(const IOobject& io);
- // Destructor
-
- virtual ~engineMesh();
+ //- Destructor
+ virtual ~engineMesh();
// Member Functions
diff --git a/src/engine/engineMesh/fvMotionSolverEngineMesh/fvMotionSolverEngineMesh.H b/src/engine/engineMesh/fvMotionSolverEngineMesh/fvMotionSolverEngineMesh.H
index ef16f0f1aae0b6506129c797926b59148c26ad93..343295b6fc9789da872568f3d90af71ba7989652 100644
--- a/src/engine/engineMesh/fvMotionSolverEngineMesh/fvMotionSolverEngineMesh.H
+++ b/src/engine/engineMesh/fvMotionSolverEngineMesh/fvMotionSolverEngineMesh.H
@@ -82,9 +82,8 @@ public:
fvMotionSolverEngineMesh(const IOobject& io);
- // Destructor
-
- ~fvMotionSolverEngineMesh();
+ //- Destructor
+ ~fvMotionSolverEngineMesh();
// Member Functions
diff --git a/src/engine/engineMesh/layeredEngineMesh/layeredEngineMesh.C b/src/engine/engineMesh/layeredEngineMesh/layeredEngineMesh.C
index 3f343a1b48e8ab8ab06d9af9cac0826eb5afc5fa..17ce100ed67c074758cfb1b6440b06ae7db5405f 100644
--- a/src/engine/engineMesh/layeredEngineMesh/layeredEngineMesh.C
+++ b/src/engine/engineMesh/layeredEngineMesh/layeredEngineMesh.C
@@ -28,20 +28,18 @@ License
#include "fvcMeshPhi.H"
#include "surfaceInterpolate.H"
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
namespace Foam
{
+ defineTypeNameAndDebug(layeredEngineMesh, 0);
+ addToRunTimeSelectionTable(engineMesh, layeredEngineMesh, IOobject);
+}
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-defineTypeNameAndDebug(layeredEngineMesh, 0);
-
-addToRunTimeSelectionTable(engineMesh, layeredEngineMesh, IOobject);
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-layeredEngineMesh::layeredEngineMesh(const IOobject& io)
+Foam::layeredEngineMesh::layeredEngineMesh(const IOobject& io)
:
engineMesh(io),
pistonLayers_("pistonLayers", dimLength, 0.0)
@@ -55,13 +53,13 @@ layeredEngineMesh::layeredEngineMesh(const IOobject& io)
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
-layeredEngineMesh::~layeredEngineMesh()
+Foam::layeredEngineMesh::~layeredEngineMesh()
{}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-void layeredEngineMesh::move()
+void Foam::layeredEngineMesh::move()
{
scalar deltaZ = engineDB_.pistonDisplacement().value();
Info<< "deltaZ = " << deltaZ << endl;
@@ -71,7 +69,7 @@ void layeredEngineMesh::move()
pointField newPoints = points();
- forAll (newPoints, pointi)
+ forAll(newPoints, pointi)
{
point& p = newPoints[pointi];
@@ -127,8 +125,4 @@ void layeredEngineMesh::move()
}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
// ************************************************************************* //
diff --git a/src/engine/engineMesh/layeredEngineMesh/layeredEngineMesh.H b/src/engine/engineMesh/layeredEngineMesh/layeredEngineMesh.H
index 881e4d07b3c0231594693cc57edc33b83f2c1f9f..2d32a7944ce7d7f679b090c3a6087b78935aa87c 100644
--- a/src/engine/engineMesh/layeredEngineMesh/layeredEngineMesh.H
+++ b/src/engine/engineMesh/layeredEngineMesh/layeredEngineMesh.H
@@ -77,9 +77,8 @@ public:
layeredEngineMesh(const IOobject& io);
- // Destructor
-
- ~layeredEngineMesh();
+ //- Destructor
+ ~layeredEngineMesh();
// Member Functions
diff --git a/src/engine/engineMesh/staticEngineMesh/staticEngineMesh.H b/src/engine/engineMesh/staticEngineMesh/staticEngineMesh.H
index 272c9a113791e7b68b2670469b2856861e67066f..9dd9b50f2c3e4d787ff2339106c07d40f6bf29fb 100644
--- a/src/engine/engineMesh/staticEngineMesh/staticEngineMesh.H
+++ b/src/engine/engineMesh/staticEngineMesh/staticEngineMesh.H
@@ -71,9 +71,8 @@ public:
staticEngineMesh(const IOobject& io);
- // Destructor
-
- ~staticEngineMesh();
+ //- Destructor
+ ~staticEngineMesh();
// Member Functions
diff --git a/src/engine/engineTime/engineTime.H b/src/engine/engineTime/engineTime.H
index cef172e902082ac8bf44790947066e0b78c27ede..fd349c7ae2c3b890e20d74283fdd0ab0632d234e 100644
--- a/src/engine/engineTime/engineTime.H
+++ b/src/engine/engineTime/engineTime.H
@@ -110,10 +110,9 @@ public:
const fileName& dictName = "engineGeometry"
);
- // Destructor
-
- virtual ~engineTime()
- {}
+ //- Destructor
+ virtual ~engineTime()
+ {}
// Member Functions
diff --git a/src/engine/engineValve/valveBank.H b/src/engine/engineValve/valveBank.H
index dc72f0819dae16a13aa87e4f3ca8a32c9cac986d..4a4199eaeb9f80da27f1971d37853336c11e11ce 100644
--- a/src/engine/engineValve/valveBank.H
+++ b/src/engine/engineValve/valveBank.H
@@ -74,7 +74,7 @@ public:
setSize(valveEntries.size());
- forAll (valveEntries, valveI)
+ forAll(valveEntries, valveI)
{
valveI,
set
diff --git a/src/engine/ignition/ignite.H b/src/engine/ignition/ignite.H
index 3e15c36d150098b4211d3396df4d8ec9b47f2b56..30faf6aaba893fa72df90a602d005a9d4d77a815 100644
--- a/src/engine/ignition/ignite.H
+++ b/src/engine/ignition/ignite.H
@@ -1,4 +1,4 @@
- forAll (ign.sites(), i)
+ forAll(ign.sites(), i)
{
const ignitionSite& ignSite = ign.sites()[i];
diff --git a/src/errorEstimation/errorDrivenRefinement/errorDrivenRefinement.H b/src/errorEstimation/errorDrivenRefinement/errorDrivenRefinement.H
index 53a225fb7a448a62db7841dd1ac6a8956bedb136..1cf3a7b85330a7ff29c5ef24e6b7594c54f39ee5 100644
--- a/src/errorEstimation/errorDrivenRefinement/errorDrivenRefinement.H
+++ b/src/errorEstimation/errorDrivenRefinement/errorDrivenRefinement.H
@@ -89,9 +89,8 @@ public:
);
- // Destructor
-
- virtual ~errorDrivenRefinement();
+ //- Destructor
+ virtual ~errorDrivenRefinement();
// Member Functions
diff --git a/src/errorEstimation/errorEstimate/errorEstimate.C b/src/errorEstimation/errorEstimate/errorEstimate.C
index b90ef3819df35b2713f870bad6c634faed2f803a..2a0db1990ac88111c855d7459e05c1f6cf864574 100644
--- a/src/errorEstimation/errorEstimate/errorEstimate.C
+++ b/src/errorEstimation/errorEstimate/errorEstimate.C
@@ -43,7 +43,7 @@ Foam::wordList Foam::errorEstimate<Type>::errorBCTypes() const
zeroGradientFvPatchField<Type>::typeName
);
- forAll (psi_.boundaryField(), patchI)
+ forAll(psi_.boundaryField(), patchI)
{
if (psi_.boundaryField()[patchI].fixesValue())
{
diff --git a/src/errorEstimation/errorEstimate/errorEstimate.H b/src/errorEstimation/errorEstimate/errorEstimate.H
index 2e1a7ec54e145f9cfd20852113c41930a1e3b0be..9626b976291dad5994e990b8700fe93acf4fd6f3 100644
--- a/src/errorEstimation/errorEstimate/errorEstimate.H
+++ b/src/errorEstimation/errorEstimate/errorEstimate.H
@@ -94,9 +94,8 @@ public:
errorEstimate(const errorEstimate<Type>&);
- // Destructor
-
- ~errorEstimate();
+ //- Destructor
+ ~errorEstimate();
// Member Functions
diff --git a/src/errorEstimation/errorEstimate/resErrorDiv.C b/src/errorEstimation/errorEstimate/resErrorDiv.C
index 0d1a3f141ec1c1f5a7b595ef3ae5d5a1d658383a..c535a7658334c18d64d56d169a7b1c0e21e30d3f 100644
--- a/src/errorEstimation/errorEstimate/resErrorDiv.C
+++ b/src/errorEstimation/errorEstimate/resErrorDiv.C
@@ -66,7 +66,7 @@ div
> gradVf = fvc::grad(vf);
// Internal faces
- forAll (owner, faceI)
+ forAll(owner, faceI)
{
// Calculate the centre of the face
const vector& curFaceCentre = faceCentres[faceI];
@@ -96,7 +96,7 @@ div
aNorm[neighbour[faceI]] -= (1.0 - signF[faceI])*flux[faceI];
}
- forAll (patches, patchI)
+ forAll(patches, patchI)
{
const vectorField& patchFaceCentres =
faceCentres.boundaryField()[patchI];
@@ -106,7 +106,7 @@ div
const labelList& fCells = patches[patchI].faceCells();
- forAll (fCells, faceI)
+ forAll(fCells, faceI)
{
vector d =
patchFaceCentres[faceI] - cellCentres[fCells[faceI]];
diff --git a/src/errorEstimation/errorEstimate/resErrorLaplacian.C b/src/errorEstimation/errorEstimate/resErrorLaplacian.C
index 3a2e41711fdc5c2dfd0e133ffefde242820c0246..821218ee73d6f515da93a1192d5cec5caf887bdf 100644
--- a/src/errorEstimation/errorEstimate/resErrorLaplacian.C
+++ b/src/errorEstimation/errorEstimate/resErrorLaplacian.C
@@ -140,7 +140,7 @@ laplacian
> gradVf = fvc::grad(vf);
// Internal faces
- forAll (owner, faceI)
+ forAll(owner, faceI)
{
// Owner
@@ -160,7 +160,7 @@ laplacian
}
- forAll (patches, patchI)
+ forAll(patches, patchI)
{
const vectorField& patchSf = Sf.boundaryField()[patchI];
const scalarField& patchMagSf = magSf.boundaryField()[patchI];
@@ -169,7 +169,7 @@ laplacian
const labelList& fCells = patches[patchI].faceCells();
- forAll (fCells, faceI)
+ forAll(fCells, faceI)
{
// Subtract diffusion
res[fCells[faceI]] -=
diff --git a/src/finiteVolume/cfdTools/general/SRF/SRFModel/SRFModel/SRFModel.H b/src/finiteVolume/cfdTools/general/SRF/SRFModel/SRFModel/SRFModel.H
index 195d65dbe6c8fd02c6fbcee1ede81fa446782e69..b8bfefa28f3042ee46717dcdff0aeda4fefd9582 100644
--- a/src/finiteVolume/cfdTools/general/SRF/SRFModel/SRFModel/SRFModel.H
+++ b/src/finiteVolume/cfdTools/general/SRF/SRFModel/SRFModel/SRFModel.H
@@ -135,9 +135,8 @@ public:
);
- // Destructor
-
- virtual ~SRFModel();
+ //- Destructor
+ virtual ~SRFModel();
// Member Functions
diff --git a/src/finiteVolume/cfdTools/general/SRF/SRFModel/rpm/rpm.H b/src/finiteVolume/cfdTools/general/SRF/SRFModel/rpm/rpm.H
index 99034170da1be1d1bdf4f4208924ea1bfb566068..c2959275b312b614f48759306e8e48c26f009edc 100644
--- a/src/finiteVolume/cfdTools/general/SRF/SRFModel/rpm/rpm.H
+++ b/src/finiteVolume/cfdTools/general/SRF/SRFModel/rpm/rpm.H
@@ -81,9 +81,8 @@ public:
rpm(const volVectorField& U);
- // Destructor
-
- ~rpm();
+ //- Destructor
+ ~rpm();
// Member functions
diff --git a/src/finiteVolume/cfdTools/general/adjustPhi/adjustPhi.C b/src/finiteVolume/cfdTools/general/adjustPhi/adjustPhi.C
index 287b0556d60a8649e3c82c19e56136ba9f92a441..55a0e3d9156a47851cb10136946f633b7c601445 100644
--- a/src/finiteVolume/cfdTools/general/adjustPhi/adjustPhi.C
+++ b/src/finiteVolume/cfdTools/general/adjustPhi/adjustPhi.C
@@ -46,7 +46,7 @@ bool Foam::adjustPhi
scalar fixedMassOut = 0.0;
scalar adjustableMassOut = 0.0;
- forAll (phi.boundaryField(), patchi)
+ forAll(phi.boundaryField(), patchi)
{
const fvPatchVectorField& Up = U.boundaryField()[patchi];
const fvsPatchScalarField& phip = phi.boundaryField()[patchi];
@@ -122,7 +122,7 @@ bool Foam::adjustPhi
<< exit(FatalError);
}
- forAll (phi.boundaryField(), patchi)
+ forAll(phi.boundaryField(), patchi)
{
const fvPatchVectorField& Up = U.boundaryField()[patchi];
fvsPatchScalarField& phip = phi.boundaryField()[patchi];
diff --git a/src/finiteVolume/cfdTools/general/porousMedia/porousZoneTemplates.C b/src/finiteVolume/cfdTools/general/porousMedia/porousZoneTemplates.C
index fb6de8d568806888224000b6058a2c6baa6766ea..46a60ca7824b3e3c63d7466a3aa5cd460efb7d4b 100644
--- a/src/finiteVolume/cfdTools/general/porousMedia/porousZoneTemplates.C
+++ b/src/finiteVolume/cfdTools/general/porousMedia/porousZoneTemplates.C
@@ -57,7 +57,7 @@ void Foam::porousZone::addPowerLawResistance
const scalar C0 = C0_;
const scalar C1m1b2 = (C1_ - 1.0)/2.0;
- forAll (cells, i)
+ forAll(cells, i)
{
Udiag[cells[i]] +=
V[cells[i]]*rho[cells[i]]*C0*pow(magSqr(U[cells[i]]), C1m1b2);
@@ -80,7 +80,7 @@ void Foam::porousZone::addViscousInertialResistance
const tensor& D = D_.value();
const tensor& F = F_.value();
- forAll (cells, i)
+ forAll(cells, i)
{
tensor dragCoeff = mu[cells[i]]*D + (rho[cells[i]]*mag(U[cells[i]]))*F;
scalar isoDragCoeff = tr(dragCoeff);
@@ -104,7 +104,7 @@ void Foam::porousZone::addPowerLawResistance
const scalar C0 = C0_;
const scalar C1m1b2 = (C1_ - 1.0)/2.0;
- forAll (cells, i)
+ forAll(cells, i)
{
AU[cells[i]] = AU[cells[i]]
+ I*(rho[cells[i]]*C0*pow(magSqr(U[cells[i]]), C1m1b2));
@@ -125,7 +125,7 @@ void Foam::porousZone::addViscousInertialResistance
const tensor& D = D_.value();
const tensor& F = F_.value();
- forAll (cells, i)
+ forAll(cells, i)
{
AU[cells[i]] += mu[cells[i]]*D + (rho[cells[i]]*mag(U[cells[i]]))*F;
}
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/sliced/slicedFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/basic/sliced/slicedFvPatchField.H
index 75746e1228850d6669db6b08c5c44c083fb6a2f0..c991551b7849af9792204585cddaeefebf8563e0 100644
--- a/src/finiteVolume/fields/fvPatchFields/basic/sliced/slicedFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/basic/sliced/slicedFvPatchField.H
@@ -119,9 +119,8 @@ public:
) const;
- // Destructor
-
- virtual ~slicedFvPatchField<Type>();
+ //- Destructor
+ virtual ~slicedFvPatchField<Type>();
// Member functions
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchField.H
index 4986b103ef8382d2b876cae1715d0b8eeac91960..306dbeb438d9810f9c2ee2b1579cc3176a410717 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchField.H
@@ -132,9 +132,8 @@ public:
}
- // Destructor
-
- ~processorFvPatchField();
+ //- Destructor
+ ~processorFvPatchField();
// Member functions
diff --git a/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.H b/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.H
index 1ea04896372f381069a34ad4f4759c1ae9895fe6..1a8720af0651e5b6660da43fd145214de74bc733 100644
--- a/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.H
@@ -254,10 +254,9 @@ public:
);
- // Destructor
-
- virtual ~fvPatchField<Type>()
- {}
+ //- Destructor
+ virtual ~fvPatchField<Type>()
+ {}
// Member functions
diff --git a/src/finiteVolume/fields/fvsPatchFields/basic/sliced/slicedFvsPatchField.H b/src/finiteVolume/fields/fvsPatchFields/basic/sliced/slicedFvsPatchField.H
index d22a936f7f1b58e0b8156f04ec3f7c73b997ca6b..be3b7c37b6f7868435402905dc07b139100516b2 100644
--- a/src/finiteVolume/fields/fvsPatchFields/basic/sliced/slicedFvsPatchField.H
+++ b/src/finiteVolume/fields/fvsPatchFields/basic/sliced/slicedFvsPatchField.H
@@ -119,9 +119,8 @@ public:
) const;
- // Destructor
-
- virtual ~slicedFvsPatchField<Type>();
+ //- Destructor
+ virtual ~slicedFvsPatchField<Type>();
// Member functions
diff --git a/src/finiteVolume/fields/fvsPatchFields/constraint/processor/processorFvsPatchField.H b/src/finiteVolume/fields/fvsPatchFields/constraint/processor/processorFvsPatchField.H
index 453f1f36b4392b395fddb160d700156651df9d13..c77420531adaaa1c4a6b5f50ecde569647c338eb 100644
--- a/src/finiteVolume/fields/fvsPatchFields/constraint/processor/processorFvsPatchField.H
+++ b/src/finiteVolume/fields/fvsPatchFields/constraint/processor/processorFvsPatchField.H
@@ -130,9 +130,8 @@ public:
}
- // Destructor
-
- ~processorFvsPatchField();
+ //- Destructor
+ ~processorFvsPatchField();
// Member functions
diff --git a/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchField.H b/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchField.H
index ef3b0ad166a28c190e586d6d45f058daa5ff3555..b98fdcd4538f465ddab087fe473b34cd6d9ba48b 100644
--- a/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchField.H
+++ b/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchField.H
@@ -244,10 +244,9 @@ public:
);
- // Destructor
-
- virtual ~fvsPatchField<Type>()
- {}
+ //- Destructor
+ virtual ~fvsPatchField<Type>()
+ {}
// Member functions
diff --git a/src/finiteVolume/finiteVolume/convectionSchemes/convectionScheme/convectionScheme.H b/src/finiteVolume/finiteVolume/convectionSchemes/convectionScheme/convectionScheme.H
index c09b03c1f8ba76ae10b927f67f74eda1473e1020..405a4da9ef85c019ecb21677dad1ab3bcdff3161 100644
--- a/src/finiteVolume/finiteVolume/convectionSchemes/convectionScheme/convectionScheme.H
+++ b/src/finiteVolume/finiteVolume/convectionSchemes/convectionScheme/convectionScheme.H
@@ -147,9 +147,8 @@ public:
);
- // Destructor
-
- virtual ~convectionScheme();
+ //- Destructor
+ virtual ~convectionScheme();
// Member Functions
diff --git a/src/finiteVolume/finiteVolume/d2dt2Schemes/d2dt2Scheme/d2dt2Scheme.H b/src/finiteVolume/finiteVolume/d2dt2Schemes/d2dt2Scheme/d2dt2Scheme.H
index aefe24fb6681203466bacad87df1d14288e3ae09..a5ab514607abfed691d380b5496250da120bb782 100644
--- a/src/finiteVolume/finiteVolume/d2dt2Schemes/d2dt2Scheme/d2dt2Scheme.H
+++ b/src/finiteVolume/finiteVolume/d2dt2Schemes/d2dt2Scheme/d2dt2Scheme.H
@@ -126,9 +126,8 @@ public:
);
- // Destructor
-
- virtual ~d2dt2Scheme();
+ //- Destructor
+ virtual ~d2dt2Scheme();
// Member Functions
diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/ddtScheme/ddtScheme.C b/src/finiteVolume/finiteVolume/ddtSchemes/ddtScheme/ddtScheme.C
index 40d7e8a40e3fad4b2588a2fb203e96bd5f51b71f..71022e571f0ce1de97cab0b5249b5a99a5ba471d 100644
--- a/src/finiteVolume/finiteVolume/ddtSchemes/ddtScheme/ddtScheme.C
+++ b/src/finiteVolume/finiteVolume/ddtSchemes/ddtScheme/ddtScheme.C
@@ -113,7 +113,7 @@ tmp<surfaceScalarField> ddtScheme<Type>::fvcDdtPhiCoeff
surfaceScalarField& ddtCouplingCoeff = tddtCouplingCoeff();
- forAll (U.boundaryField(), patchi)
+ forAll(U.boundaryField(), patchi)
{
if (U.boundaryField()[patchi].fixesValue())
{
@@ -154,7 +154,7 @@ tmp<surfaceScalarField> ddtScheme<Type>::fvcDdtPhiCoeff
surfaceScalarField& ddtCouplingCoeff = tddtCouplingCoeff();
- forAll (U.boundaryField(), patchi)
+ forAll(U.boundaryField(), patchi)
{
if (U.boundaryField()[patchi].fixesValue())
{
@@ -199,7 +199,7 @@ tmp<surfaceScalarField> ddtScheme<Type>::fvcDdtPhiCoeff
surfaceScalarField& ddtCouplingCoeff = tddtCouplingCoeff();
- forAll (rhoU.boundaryField(), patchi)
+ forAll(rhoU.boundaryField(), patchi)
{
if (rhoU.boundaryField()[patchi].fixesValue())
{
diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/ddtScheme/ddtScheme.H b/src/finiteVolume/finiteVolume/ddtSchemes/ddtScheme/ddtScheme.H
index 0c8bf6c4b40812e9aa1adc23250c954cf9ebd7d9..0d421572c9903fe5ffb213fb2afde295d1c86810 100644
--- a/src/finiteVolume/finiteVolume/ddtSchemes/ddtScheme/ddtScheme.H
+++ b/src/finiteVolume/finiteVolume/ddtSchemes/ddtScheme/ddtScheme.H
@@ -126,9 +126,8 @@ public:
);
- // Destructor
-
- virtual ~ddtScheme();
+ //- Destructor
+ virtual ~ddtScheme();
// Member Functions
diff --git a/src/finiteVolume/finiteVolume/divSchemes/divScheme/divScheme.H b/src/finiteVolume/finiteVolume/divSchemes/divScheme/divScheme.H
index 26a5cbff6c1e353d3ed27920e60676536b5915eb..affa31e39c468552eac8e32c4b3d2d3276040446 100644
--- a/src/finiteVolume/finiteVolume/divSchemes/divScheme/divScheme.H
+++ b/src/finiteVolume/finiteVolume/divSchemes/divScheme/divScheme.H
@@ -129,9 +129,8 @@ public:
);
- // Destructor
-
- virtual ~divScheme();
+ //- Destructor
+ virtual ~divScheme();
// Member Functions
diff --git a/src/finiteVolume/finiteVolume/gradSchemes/extendedLeastSquaresGrad/extendedLeastSquaresVectors.C b/src/finiteVolume/finiteVolume/gradSchemes/extendedLeastSquaresGrad/extendedLeastSquaresVectors.C
index cd1c15a1ac9fce47dcaa21f707c9583ef13975d8..0eb7683d4e2ec10a0270279f1f286f91abaeca1a 100644
--- a/src/finiteVolume/finiteVolume/gradSchemes/extendedLeastSquaresGrad/extendedLeastSquaresVectors.C
+++ b/src/finiteVolume/finiteVolume/gradSchemes/extendedLeastSquaresGrad/extendedLeastSquaresVectors.C
@@ -29,10 +29,7 @@ License
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-namespace Foam
-{
- defineTypeNameAndDebug(extendedLeastSquaresVectors, 0);
-}
+defineTypeNameAndDebug(Foam::extendedLeastSquaresVectors, 0);
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
@@ -160,7 +157,7 @@ void Foam::extendedLeastSquaresVectors::makeLeastSquaresVectors() const
additionalCellsPtr_ = new List<labelPair>(maxNaddCells);
List<labelPair>& additionalCells_ = *additionalCellsPtr_;
- forAll (detdd, i)
+ forAll(detdd, i)
{
label count = 0;
diff --git a/src/finiteVolume/finiteVolume/gradSchemes/extendedLeastSquaresGrad/extendedLeastSquaresVectors.H b/src/finiteVolume/finiteVolume/gradSchemes/extendedLeastSquaresGrad/extendedLeastSquaresVectors.H
index 0ebded6f52efb357e3c238666dce4977676d7110..785f1c4a510a42b6b0a60bdff1cae8878674b648 100644
--- a/src/finiteVolume/finiteVolume/gradSchemes/extendedLeastSquaresGrad/extendedLeastSquaresVectors.H
+++ b/src/finiteVolume/finiteVolume/gradSchemes/extendedLeastSquaresGrad/extendedLeastSquaresVectors.H
@@ -88,9 +88,8 @@ public:
);
- // Destructor
-
- virtual ~extendedLeastSquaresVectors();
+ //- Destructor
+ virtual ~extendedLeastSquaresVectors();
// Member functions
diff --git a/src/finiteVolume/finiteVolume/gradSchemes/leastSquaresGrad/leastSquaresVectors.C b/src/finiteVolume/finiteVolume/gradSchemes/leastSquaresGrad/leastSquaresVectors.C
index 8fc633292b0b38d78cc357c5a39875eed16b0516..4239c522a6d7d39899b460058e3d149f8968b78c 100644
--- a/src/finiteVolume/finiteVolume/gradSchemes/leastSquaresGrad/leastSquaresVectors.C
+++ b/src/finiteVolume/finiteVolume/gradSchemes/leastSquaresGrad/leastSquaresVectors.C
@@ -29,10 +29,7 @@ License
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-namespace Foam
-{
- defineTypeNameAndDebug(leastSquaresVectors, 0);
-}
+defineTypeNameAndDebug(Foam::leastSquaresVectors, 0);
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
@@ -248,7 +245,7 @@ void Foam::leastSquaresVectors::makeLeastSquaresVectors() const
const surfaceVectorField& Sf = mesh.Sf();
const surfaceScalarField& w = mesh.weights();
- forAll (dd, celli)
+ forAll(dd, celli)
{
if (det(dd[celli]) < 3)
{
diff --git a/src/finiteVolume/finiteVolume/gradSchemes/leastSquaresGrad/leastSquaresVectors.H b/src/finiteVolume/finiteVolume/gradSchemes/leastSquaresGrad/leastSquaresVectors.H
index 2d052b46b76a4d76affbbf4dc414965c5270a8fc..bc98a619df218bc0738e06bf652094d1413ec328 100644
--- a/src/finiteVolume/finiteVolume/gradSchemes/leastSquaresGrad/leastSquaresVectors.H
+++ b/src/finiteVolume/finiteVolume/gradSchemes/leastSquaresGrad/leastSquaresVectors.H
@@ -78,9 +78,8 @@ public:
explicit leastSquaresVectors(const fvMesh&);
- // Destructor
-
- virtual ~leastSquaresVectors();
+ //- Destructor
+ virtual ~leastSquaresVectors();
// Member functions
diff --git a/src/finiteVolume/finiteVolume/laplacianSchemes/gaussLaplacianScheme/gaussLaplacianScheme.H b/src/finiteVolume/finiteVolume/laplacianSchemes/gaussLaplacianScheme/gaussLaplacianScheme.H
index 6bdb300c35bed72d9c0900a7ccc33532048d4338..7dea92b4d51b2684e4d674d5a9b6683499621e54 100644
--- a/src/finiteVolume/finiteVolume/laplacianSchemes/gaussLaplacianScheme/gaussLaplacianScheme.H
+++ b/src/finiteVolume/finiteVolume/laplacianSchemes/gaussLaplacianScheme/gaussLaplacianScheme.H
@@ -109,10 +109,9 @@ public:
{}
- // Destructor
-
- virtual ~gaussLaplacianScheme()
- {}
+ //- Destructor
+ virtual ~gaussLaplacianScheme()
+ {}
// Member Functions
diff --git a/src/finiteVolume/finiteVolume/laplacianSchemes/laplacianScheme/laplacianScheme.H b/src/finiteVolume/finiteVolume/laplacianSchemes/laplacianScheme/laplacianScheme.H
index acb085a4c3bfac0e6a709288872c949146bf48f2..0033c3f96bddbabd47b34712fa44e3c685ab2bd6 100644
--- a/src/finiteVolume/finiteVolume/laplacianSchemes/laplacianScheme/laplacianScheme.H
+++ b/src/finiteVolume/finiteVolume/laplacianSchemes/laplacianScheme/laplacianScheme.H
@@ -156,9 +156,8 @@ public:
);
- // Destructor
-
- virtual ~laplacianScheme();
+ //- Destructor
+ virtual ~laplacianScheme();
// Member Functions
diff --git a/src/finiteVolume/finiteVolume/snGradSchemes/correctedSnGrad/correctedSnGrad.H b/src/finiteVolume/finiteVolume/snGradSchemes/correctedSnGrad/correctedSnGrad.H
index 10dbc9dce780d9d4766d304b5b58aba7c2f62b54..a4ce51315374de6e5f722326064ffb0e7638a107 100644
--- a/src/finiteVolume/finiteVolume/snGradSchemes/correctedSnGrad/correctedSnGrad.H
+++ b/src/finiteVolume/finiteVolume/snGradSchemes/correctedSnGrad/correctedSnGrad.H
@@ -84,9 +84,8 @@ public:
{}
- // Destructor
-
- virtual ~correctedSnGrad();
+ //- Destructor
+ virtual ~correctedSnGrad();
// Member Functions
diff --git a/src/finiteVolume/finiteVolume/snGradSchemes/limitedSnGrad/limitedSnGrad.H b/src/finiteVolume/finiteVolume/snGradSchemes/limitedSnGrad/limitedSnGrad.H
index d70cfd5dd4eb53fda7013054a751ecc2fad75811..fdbc29855d93e1d6e92d3b9085434cbe972a4cf2 100644
--- a/src/finiteVolume/finiteVolume/snGradSchemes/limitedSnGrad/limitedSnGrad.H
+++ b/src/finiteVolume/finiteVolume/snGradSchemes/limitedSnGrad/limitedSnGrad.H
@@ -108,9 +108,8 @@ public:
}
- // Destructor
-
- virtual ~limitedSnGrad();
+ //- Destructor
+ virtual ~limitedSnGrad();
// Member Functions
diff --git a/src/finiteVolume/finiteVolume/snGradSchemes/quadraticFitSnGrad/quadraticFitSnGrad.H b/src/finiteVolume/finiteVolume/snGradSchemes/quadraticFitSnGrad/quadraticFitSnGrad.H
index 402ade64c7760514db2f4832e9936c97018e62f3..e837cd22e36b27e747dbf7660f4bded22e5599e9 100644
--- a/src/finiteVolume/finiteVolume/snGradSchemes/quadraticFitSnGrad/quadraticFitSnGrad.H
+++ b/src/finiteVolume/finiteVolume/snGradSchemes/quadraticFitSnGrad/quadraticFitSnGrad.H
@@ -97,9 +97,8 @@ public:
{}
- // Destructor
-
- virtual ~quadraticFitSnGrad() {}
+ //- Destructor
+ virtual ~quadraticFitSnGrad() {}
// Member Functions
diff --git a/src/finiteVolume/finiteVolume/snGradSchemes/quadraticFitSnGrad/quadraticFitSnGradData.H b/src/finiteVolume/finiteVolume/snGradSchemes/quadraticFitSnGrad/quadraticFitSnGradData.H
index 46d9c3b759d9efee0ae48cca5c7b1dab9be7a993..45cda211070da24f2c3ba6e1466363601ce2d2aa 100644
--- a/src/finiteVolume/finiteVolume/snGradSchemes/quadraticFitSnGrad/quadraticFitSnGradData.H
+++ b/src/finiteVolume/finiteVolume/snGradSchemes/quadraticFitSnGrad/quadraticFitSnGradData.H
@@ -97,10 +97,9 @@ public:
);
- // Destructor
-
- virtual ~quadraticFitSnGradData()
- {};
+ //- Destructor
+ virtual ~quadraticFitSnGradData()
+ {};
// Member functions
diff --git a/src/finiteVolume/finiteVolume/snGradSchemes/snGradScheme/snGradScheme.H b/src/finiteVolume/finiteVolume/snGradSchemes/snGradScheme/snGradScheme.H
index fc85304826adb4ff689608f941a28d81e6fa6194..fef3c418324d5eb5ee652f24f6aee29f77a449f4 100644
--- a/src/finiteVolume/finiteVolume/snGradSchemes/snGradScheme/snGradScheme.H
+++ b/src/finiteVolume/finiteVolume/snGradSchemes/snGradScheme/snGradScheme.H
@@ -111,9 +111,8 @@ public:
);
- // Destructor
-
- virtual ~snGradScheme();
+ //- Destructor
+ virtual ~snGradScheme();
// Member Functions
diff --git a/src/finiteVolume/finiteVolume/snGradSchemes/uncorrectedSnGrad/uncorrectedSnGrad.H b/src/finiteVolume/finiteVolume/snGradSchemes/uncorrectedSnGrad/uncorrectedSnGrad.H
index 733920c6eab7640fd5284f9c2dcaad6eacf80e70..5ea58581967e5c1027066005a04a617d9812d5bd 100644
--- a/src/finiteVolume/finiteVolume/snGradSchemes/uncorrectedSnGrad/uncorrectedSnGrad.H
+++ b/src/finiteVolume/finiteVolume/snGradSchemes/uncorrectedSnGrad/uncorrectedSnGrad.H
@@ -84,9 +84,8 @@ public:
{}
- // Destructor
-
- virtual ~uncorrectedSnGrad();
+ //- Destructor
+ virtual ~uncorrectedSnGrad();
// Member Functions
diff --git a/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C b/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C
index fae03f59f76057b66f56dc2657f20b73143c63e0..fcb479465b1a04d8d453ff99ef6c42be173f6dfb 100644
--- a/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C
+++ b/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C
@@ -203,7 +203,7 @@ Foam::fvMatrix<Type>::fvMatrix
}
// Initialise coupling coefficients
- forAll (psi.mesh().boundary(), patchI)
+ forAll(psi.mesh().boundary(), patchI)
{
internalCoeffs_.set
(
@@ -348,7 +348,7 @@ Foam::fvMatrix<Type>::fvMatrix
}
// Initialise coupling coefficients
- forAll (psi.mesh().boundary(), patchI)
+ forAll(psi.mesh().boundary(), patchI)
{
internalCoeffs_.set
(
diff --git a/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.H b/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.H
index ad70ea1ef0656e916931b7b3048b3068e0989521..748d713a354b17e5a6949a97eba9747a7fb63efb 100644
--- a/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.H
+++ b/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.H
@@ -253,9 +253,8 @@ public:
fvMatrix(const GeometricField<Type, fvPatchField, volMesh>&, Istream&);
- // Destructor
-
- virtual ~fvMatrix();
+ //- Destructor
+ virtual ~fvMatrix();
// Member functions
diff --git a/src/finiteVolume/fvMatrices/solvers/MULES/MULESTemplates.C b/src/finiteVolume/fvMatrices/solvers/MULES/MULESTemplates.C
index 67dfdb442516121f2ba8907e0db3e70d61e07599..2fe12f0317b013b5daa1d850119614ffb9778354 100644
--- a/src/finiteVolume/fvMatrices/solvers/MULES/MULESTemplates.C
+++ b/src/finiteVolume/fvMatrices/solvers/MULES/MULESTemplates.C
@@ -527,7 +527,7 @@ void Foam::MULES::limiter
}
}
- forAll (sumlPhip, celli)
+ forAll(sumlPhip, celli)
{
sumlPhip[celli] =
max(min
diff --git a/src/finiteVolume/fvMesh/extendedStencil/cellToFace/MeshObjects/centredCECCellToFaceStencilObject.H b/src/finiteVolume/fvMesh/extendedStencil/cellToFace/MeshObjects/centredCECCellToFaceStencilObject.H
index 246b8038f6c19590c1960f793ca57cf42f253d7e..6a9ed1427c1bc20078c3062e06e862929e787f97 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/cellToFace/MeshObjects/centredCECCellToFaceStencilObject.H
+++ b/src/finiteVolume/fvMesh/extendedStencil/cellToFace/MeshObjects/centredCECCellToFaceStencilObject.H
@@ -76,10 +76,9 @@ public:
}
- // Destructor
-
- virtual ~centredCECCellToFaceStencilObject()
- {}
+ //- Destructor
+ virtual ~centredCECCellToFaceStencilObject()
+ {}
};
diff --git a/src/finiteVolume/fvMesh/extendedStencil/cellToFace/MeshObjects/centredCPCCellToFaceStencilObject.H b/src/finiteVolume/fvMesh/extendedStencil/cellToFace/MeshObjects/centredCPCCellToFaceStencilObject.H
index db5118cb76b0b067343cd36985b0f44388b702c4..30e0f47f5ec3d5e4eac20dc97f5dc52f75677975 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/cellToFace/MeshObjects/centredCPCCellToFaceStencilObject.H
+++ b/src/finiteVolume/fvMesh/extendedStencil/cellToFace/MeshObjects/centredCPCCellToFaceStencilObject.H
@@ -76,10 +76,9 @@ public:
}
- // Destructor
-
- virtual ~centredCPCCellToFaceStencilObject()
- {}
+ //- Destructor
+ virtual ~centredCPCCellToFaceStencilObject()
+ {}
};
diff --git a/src/finiteVolume/fvMesh/extendedStencil/cellToFace/MeshObjects/centredFECCellToFaceStencilObject.H b/src/finiteVolume/fvMesh/extendedStencil/cellToFace/MeshObjects/centredFECCellToFaceStencilObject.H
index 2e4be9b242f613f1e8356c1c3eba898408b60eb7..91c78f07475cd4fd33d2540ea0913715003a6998 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/cellToFace/MeshObjects/centredFECCellToFaceStencilObject.H
+++ b/src/finiteVolume/fvMesh/extendedStencil/cellToFace/MeshObjects/centredFECCellToFaceStencilObject.H
@@ -76,10 +76,9 @@ public:
}
- // Destructor
-
- virtual ~centredFECCellToFaceStencilObject()
- {}
+ //- Destructor
+ virtual ~centredFECCellToFaceStencilObject()
+ {}
};
diff --git a/src/finiteVolume/fvMesh/extendedStencil/cellToFace/MeshObjects/pureUpwindCFCCellToFaceStencilObject.H b/src/finiteVolume/fvMesh/extendedStencil/cellToFace/MeshObjects/pureUpwindCFCCellToFaceStencilObject.H
index 1df77bab41df0dd6d130b9ac462444ba34282d0f..51262a1d9df58250ee69b1d9aed129f8013aa084 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/cellToFace/MeshObjects/pureUpwindCFCCellToFaceStencilObject.H
+++ b/src/finiteVolume/fvMesh/extendedStencil/cellToFace/MeshObjects/pureUpwindCFCCellToFaceStencilObject.H
@@ -76,10 +76,9 @@ public:
}
- // Destructor
-
- virtual ~pureUpwindCFCCellToFaceStencilObject()
- {}
+ //- Destructor
+ virtual ~pureUpwindCFCCellToFaceStencilObject()
+ {}
};
diff --git a/src/finiteVolume/fvMesh/extendedStencil/cellToFace/MeshObjects/upwindCECCellToFaceStencilObject.H b/src/finiteVolume/fvMesh/extendedStencil/cellToFace/MeshObjects/upwindCECCellToFaceStencilObject.H
index 73451fad10387477184fd93dc16f3e6291148e5b..4c11e0c4feaedbd6b0a5aa48dc40bc50829e8fe5 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/cellToFace/MeshObjects/upwindCECCellToFaceStencilObject.H
+++ b/src/finiteVolume/fvMesh/extendedStencil/cellToFace/MeshObjects/upwindCECCellToFaceStencilObject.H
@@ -83,10 +83,9 @@ public:
}
- // Destructor
-
- virtual ~upwindCECCellToFaceStencilObject()
- {}
+ //- Destructor
+ virtual ~upwindCECCellToFaceStencilObject()
+ {}
};
diff --git a/src/finiteVolume/fvMesh/extendedStencil/cellToFace/MeshObjects/upwindCFCCellToFaceStencilObject.H b/src/finiteVolume/fvMesh/extendedStencil/cellToFace/MeshObjects/upwindCFCCellToFaceStencilObject.H
index 7ea2dd5378bf26d28dfe16089d7a4383b8173350..921b165b2c3ba85925646e0552cc199703e9d6e5 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/cellToFace/MeshObjects/upwindCFCCellToFaceStencilObject.H
+++ b/src/finiteVolume/fvMesh/extendedStencil/cellToFace/MeshObjects/upwindCFCCellToFaceStencilObject.H
@@ -83,10 +83,9 @@ public:
}
- // Destructor
-
- virtual ~upwindCFCCellToFaceStencilObject()
- {}
+ //- Destructor
+ virtual ~upwindCFCCellToFaceStencilObject()
+ {}
};
diff --git a/src/finiteVolume/fvMesh/extendedStencil/cellToFace/MeshObjects/upwindCPCCellToFaceStencilObject.H b/src/finiteVolume/fvMesh/extendedStencil/cellToFace/MeshObjects/upwindCPCCellToFaceStencilObject.H
index de4502e805d357544a7438a97b308eba9a95e7e7..68de8643f22f9bee0dd6fa08768b4fce65ab44f6 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/cellToFace/MeshObjects/upwindCPCCellToFaceStencilObject.H
+++ b/src/finiteVolume/fvMesh/extendedStencil/cellToFace/MeshObjects/upwindCPCCellToFaceStencilObject.H
@@ -83,10 +83,9 @@ public:
}
- // Destructor
-
- virtual ~upwindCPCCellToFaceStencilObject()
- {}
+ //- Destructor
+ virtual ~upwindCPCCellToFaceStencilObject()
+ {}
};
diff --git a/src/finiteVolume/fvMesh/extendedStencil/cellToFace/MeshObjects/upwindFECCellToFaceStencilObject.H b/src/finiteVolume/fvMesh/extendedStencil/cellToFace/MeshObjects/upwindFECCellToFaceStencilObject.H
index fe97d52a4154f756345ec87e1d0e039d74b2d3c6..e91c7b06aba71c68c9ff81e03a5728c61f6c3061 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/cellToFace/MeshObjects/upwindFECCellToFaceStencilObject.H
+++ b/src/finiteVolume/fvMesh/extendedStencil/cellToFace/MeshObjects/upwindFECCellToFaceStencilObject.H
@@ -83,10 +83,9 @@ public:
}
- // Destructor
-
- virtual ~upwindFECCellToFaceStencilObject()
- {}
+ //- Destructor
+ virtual ~upwindFECCellToFaceStencilObject()
+ {}
};
diff --git a/src/finiteVolume/fvMesh/fvBoundaryMesh/fvBoundaryMesh.C b/src/finiteVolume/fvMesh/fvBoundaryMesh/fvBoundaryMesh.C
index e146c24436f68b2382e1e31a79128b114fab9dfe..92bb9f42d0ea2a122587cfb1d5bf6369ca735a81 100644
--- a/src/finiteVolume/fvMesh/fvBoundaryMesh/fvBoundaryMesh.C
+++ b/src/finiteVolume/fvMesh/fvBoundaryMesh/fvBoundaryMesh.C
@@ -27,14 +27,9 @@ License
#include "fvBoundaryMesh.H"
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
-void fvBoundaryMesh::addPatches(const polyBoundaryMesh& basicBdry)
+void Foam::fvBoundaryMesh::addPatches(const polyBoundaryMesh& basicBdry)
{
setSize(basicBdry.size());
@@ -50,7 +45,7 @@ void fvBoundaryMesh::addPatches(const polyBoundaryMesh& basicBdry)
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-fvBoundaryMesh::fvBoundaryMesh
+Foam::fvBoundaryMesh::fvBoundaryMesh
(
const fvMesh& m
)
@@ -60,7 +55,7 @@ fvBoundaryMesh::fvBoundaryMesh
{}
-fvBoundaryMesh::fvBoundaryMesh
+Foam::fvBoundaryMesh::fvBoundaryMesh
(
const fvMesh& m,
const polyBoundaryMesh& basicBdry
@@ -75,7 +70,7 @@ fvBoundaryMesh::fvBoundaryMesh
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-void fvBoundaryMesh::movePoints()
+void Foam::fvBoundaryMesh::movePoints()
{
forAll(*this, patchi)
{
@@ -89,11 +84,11 @@ void fvBoundaryMesh::movePoints()
}
-lduInterfacePtrsList fvBoundaryMesh::interfaces() const
+Foam::lduInterfacePtrsList Foam::fvBoundaryMesh::interfaces() const
{
lduInterfacePtrsList interfaces(size());
- forAll (interfaces, patchi)
+ forAll(interfaces, patchi)
{
if (isA<lduInterface>(this->operator[](patchi)))
{
@@ -109,15 +104,11 @@ lduInterfacePtrsList fvBoundaryMesh::interfaces() const
}
-void fvBoundaryMesh::readUpdate(const polyBoundaryMesh& basicBdry)
+void Foam::fvBoundaryMesh::readUpdate(const polyBoundaryMesh& basicBdry)
{
clear();
addPatches(basicBdry);
}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
// ************************************************************************* //
diff --git a/src/finiteVolume/fvMesh/fvMesh.C b/src/finiteVolume/fvMesh/fvMesh.C
index f821234b64cf3ea8cd4b356f9ca175a073a993d2..64ea8c41035552e904c6df9beb12d9c51ac14bfb 100644
--- a/src/finiteVolume/fvMesh/fvMesh.C
+++ b/src/finiteVolume/fvMesh/fvMesh.C
@@ -594,7 +594,7 @@ Foam::tmp<Foam::scalarField> Foam::fvMesh::movePoints(const pointField& p)
const fvPatchList& patches = boundary();
- forAll (patches, patchI)
+ forAll(patches, patchI)
{
phi.boundaryField()[patchI] = patches[patchI].patchSlice(sweptVols);
phi.boundaryField()[patchI] *= rDeltaT;
diff --git a/src/finiteVolume/fvMesh/fvMesh.H b/src/finiteVolume/fvMesh/fvMesh.H
index 772c30cf9a22ad77f6fbba7cc18dcd4201570df4..68ca4eeed93824d7f78a0c7da82acd1bb75ea4d8 100644
--- a/src/finiteVolume/fvMesh/fvMesh.H
+++ b/src/finiteVolume/fvMesh/fvMesh.H
@@ -197,9 +197,8 @@ public:
);
- // Destructor
-
- virtual ~fvMesh();
+ //- Destructor
+ virtual ~fvMesh();
// Member Functions
diff --git a/src/finiteVolume/fvMesh/fvMeshLduAddressing.H b/src/finiteVolume/fvMesh/fvMeshLduAddressing.H
index e0c8a0514e5bc59afa94142836ab0582261e062d..803a568ead8d4e03c765d2e7551c1a69f4ea95f5 100644
--- a/src/finiteVolume/fvMesh/fvMeshLduAddressing.H
+++ b/src/finiteVolume/fvMesh/fvMeshLduAddressing.H
@@ -95,17 +95,16 @@ public:
patchAddr_(mesh.boundary().size()),
patchSchedule_(mesh.globalData().patchSchedule())
{
- forAll (mesh.boundary(), patchI)
+ forAll(mesh.boundary(), patchI)
{
patchAddr_[patchI] = &mesh.boundary()[patchI].faceCells();
}
}
- // Destructor
-
- ~fvMeshLduAddressing()
- {}
+ //- Destructor
+ ~fvMeshLduAddressing()
+ {}
// Member Functions
diff --git a/src/finiteVolume/fvMesh/fvMeshMapper/fvBoundaryMeshMapper.H b/src/finiteVolume/fvMesh/fvMeshMapper/fvBoundaryMeshMapper.H
index 24caf57a5eb40bdcd27b1594296d0b4dca001f86..6349467b93c5a2f65b32289d0e6b1b5c2fa2e501 100644
--- a/src/finiteVolume/fvMesh/fvMeshMapper/fvBoundaryMeshMapper.H
+++ b/src/finiteVolume/fvMesh/fvMeshMapper/fvBoundaryMeshMapper.H
@@ -72,7 +72,7 @@ public:
{
const fvBoundaryMesh& patches = mesh.boundary();
- forAll (patches, patchI)
+ forAll(patches, patchI)
{
set
(
diff --git a/src/finiteVolume/fvMesh/fvMeshMapper/fvPatchMapper.C b/src/finiteVolume/fvMesh/fvMeshMapper/fvPatchMapper.C
index c3ef265a18195da04e4d984f6af573457fa72d9f..97fa0b64a31becee06b6a773d9edf29281be6f30 100644
--- a/src/finiteVolume/fvMesh/fvMeshMapper/fvPatchMapper.C
+++ b/src/finiteVolume/fvMesh/fvMeshMapper/fvPatchMapper.C
@@ -70,7 +70,7 @@ void Foam::fvPatchMapper::calcAddressing() const
// Adjust mapping to manage hits into other patches and into
// internal
- forAll (addr, faceI)
+ forAll(addr, faceI)
{
if
(
@@ -118,7 +118,7 @@ void Foam::fvPatchMapper::calcAddressing() const
// Adjust mapping to manage hits into other patches and into
// internal
- forAll (addr, faceI)
+ forAll(addr, faceI)
{
labelList& curAddr = addr[faceI];
scalarList& curW = w[faceI];
@@ -130,7 +130,7 @@ void Foam::fvPatchMapper::calcAddressing() const
)
{
// No adjustment of weights, just subtract patch start
- forAll (curAddr, i)
+ forAll(curAddr, i)
{
curAddr[i] -= oldPatchStart;
}
@@ -142,7 +142,7 @@ void Foam::fvPatchMapper::calcAddressing() const
scalarField newWeights(curAddr.size());
label nActive = 0;
- forAll (curAddr, lfI)
+ forAll(curAddr, lfI)
{
if
(
@@ -178,7 +178,7 @@ void Foam::fvPatchMapper::calcAddressing() const
if (fvMesh::debug)
{
- forAll (addr, i)
+ forAll(addr, i)
{
if (min(addr[i]) < 0)
{
diff --git a/src/finiteVolume/fvMesh/fvMeshMapper/fvPatchMapper.H b/src/finiteVolume/fvMesh/fvMeshMapper/fvPatchMapper.H
index 55addf73517808e802af1ece8cf571c271258e4b..3cf3baad24f7d978fa091bab575c7293af4beff0 100644
--- a/src/finiteVolume/fvMesh/fvMeshMapper/fvPatchMapper.H
+++ b/src/finiteVolume/fvMesh/fvMeshMapper/fvPatchMapper.H
@@ -114,9 +114,8 @@ public:
);
- // Destructor
-
- virtual ~fvPatchMapper();
+ //- Destructor
+ virtual ~fvPatchMapper();
// Member Functions
diff --git a/src/finiteVolume/fvMesh/fvMeshMapper/fvSurfaceMapper.C b/src/finiteVolume/fvMesh/fvMeshMapper/fvSurfaceMapper.C
index d820d0f2456c280788bfa40b6add01bf121f179d..7baa5836e69279843cf8fe945b8fa48403715911 100644
--- a/src/finiteVolume/fvMesh/fvMeshMapper/fvSurfaceMapper.C
+++ b/src/finiteVolume/fvMesh/fvMeshMapper/fvSurfaceMapper.C
@@ -64,7 +64,7 @@ void Foam::fvSurfaceMapper::calcAddressing() const
labelList& addr = *directAddrPtr_;
// Adjust for creation of an internal face from a boundary face
- forAll (addr, faceI)
+ forAll(addr, faceI)
{
if (addr[faceI] > oldNInternal)
{
@@ -90,7 +90,7 @@ void Foam::fvSurfaceMapper::calcAddressing() const
scalarListList& w = *weightsPtr_;
// Adjust for creation of an internal face from a boundary face
- forAll (addr, faceI)
+ forAll(addr, faceI)
{
if (max(addr[faceI]) >= oldNInternal)
{
@@ -112,7 +112,7 @@ void Foam::fvSurfaceMapper::calcAddressing() const
label nIns = 0;
- forAll (insFaces, faceI)
+ forAll(insFaces, faceI)
{
// If the face is internal, keep it here
if (insFaces[faceI] < size())
diff --git a/src/finiteVolume/fvMesh/fvMeshMapper/fvSurfaceMapper.H b/src/finiteVolume/fvMesh/fvMeshMapper/fvSurfaceMapper.H
index 46e88167fd2b38cb71d2139a4816b013f7db3f7d..5260c91032d60e92c9636f64231cec1a649e7766 100644
--- a/src/finiteVolume/fvMesh/fvMeshMapper/fvSurfaceMapper.H
+++ b/src/finiteVolume/fvMesh/fvMeshMapper/fvSurfaceMapper.H
@@ -109,9 +109,8 @@ public:
);
- // Destructor
-
- virtual ~fvSurfaceMapper();
+ //- Destructor
+ virtual ~fvSurfaceMapper();
// Member Functions
diff --git a/src/finiteVolume/fvMesh/fvMeshSubset/fvMeshSubset.C b/src/finiteVolume/fvMesh/fvMeshSubset/fvMeshSubset.C
index 36413f9ab39120a4d863e7685eef2ca325b10ea4..8cd71ce2c206076865c1095c94a7924f0971929a 100644
--- a/src/finiteVolume/fvMesh/fvMeshSubset/fvMeshSubset.C
+++ b/src/finiteVolume/fvMesh/fvMeshSubset/fvMeshSubset.C
@@ -67,7 +67,7 @@ void Foam::fvMeshSubset::markPoints
Map<label>& pointMap
)
{
- forAll (curPoints, pointI)
+ forAll(curPoints, pointI)
{
// Note: insert will only insert if not yet there.
pointMap.insert(curPoints[pointI], 0);
@@ -81,7 +81,7 @@ void Foam::fvMeshSubset::markPoints
labelList& pointMap
)
{
- forAll (curPoints, pointI)
+ forAll(curPoints, pointI)
{
pointMap[curPoints[pointI]] = 0;
}
@@ -103,7 +103,7 @@ void Foam::fvMeshSubset::doCoupledPatches
if (syncPar && Pstream::parRun())
{
// Send face usage across processor patches
- forAll (oldPatches, oldPatchI)
+ forAll(oldPatches, oldPatchI)
{
const polyPatch& pp = oldPatches[oldPatchI];
@@ -125,7 +125,7 @@ void Foam::fvMeshSubset::doCoupledPatches
// Receive face usage count and check for faces that become uncoupled.
- forAll (oldPatches, oldPatchI)
+ forAll(oldPatches, oldPatchI)
{
const polyPatch& pp = oldPatches[oldPatchI];
@@ -144,7 +144,7 @@ void Foam::fvMeshSubset::doCoupledPatches
// Combine with this side.
- forAll (pp, i)
+ forAll(pp, i)
{
if
(
@@ -163,7 +163,7 @@ void Foam::fvMeshSubset::doCoupledPatches
}
// Do same for cyclics.
- forAll (oldPatches, oldPatchI)
+ forAll(oldPatches, oldPatchI)
{
const polyPatch& pp = oldPatches[oldPatchI];
@@ -172,7 +172,7 @@ void Foam::fvMeshSubset::doCoupledPatches
const cyclicPolyPatch& cycPatch =
refCast<const cyclicPolyPatch>(pp);
- forAll (cycPatch, i)
+ forAll(cycPatch, i)
{
label thisFaceI = cycPatch.start() + i;
label otherFaceI = cycPatch.transformGlobalFace(thisFaceI);
@@ -405,12 +405,12 @@ void Foam::fvMeshSubset::setCellSubset
Map<label> facesToSubset(avgNFacesPerCell*nCellsInSet);
- forAll (cellMap_, cellI)
+ forAll(cellMap_, cellI)
{
// Mark all faces from the cell
const labelList& curFaces = oldCells[cellMap_[cellI]];
- forAll (curFaces, faceI)
+ forAll(curFaces, faceI)
{
if (!facesToSubset.found(curFaces[faceI]))
{
@@ -437,7 +437,7 @@ void Foam::fvMeshSubset::setCellSubset
faceMap_.setSize(facesToc.size());
// 1. Get all faces that will be internal to the submesh.
- forAll (facesToc, faceI)
+ forAll(facesToc, faceI)
{
if (facesToSubset[facesToc[faceI]] == 2)
{
@@ -528,7 +528,7 @@ void Foam::fvMeshSubset::setCellSubset
pointMap_ = globalPointMap.toc();
sort(pointMap_);
- forAll (pointMap_, pointI)
+ forAll(pointMap_, pointI)
{
globalPointMap[pointMap_[pointI]] = pointI;
}
@@ -542,7 +542,7 @@ void Foam::fvMeshSubset::setCellSubset
label nNewPoints = 0;
- forAll (pointMap_, pointI)
+ forAll(pointMap_, pointI)
{
newPoints[nNewPoints] = oldPoints[pointMap_[pointI]];
nNewPoints++;
@@ -559,7 +559,7 @@ void Foam::fvMeshSubset::setCellSubset
face newF(oldF.size());
- forAll (newF, i)
+ forAll(newF, i)
{
newF[i] = globalPointMap[oldF[i]];
}
@@ -626,7 +626,7 @@ void Foam::fvMeshSubset::setCellSubset
face newF(oldF.size());
- forAll (newF, i)
+ forAll(newF, i)
{
newF[i] = globalPointMap[oldF[i]];
}
@@ -642,13 +642,13 @@ void Foam::fvMeshSubset::setCellSubset
label nNewCells = 0;
- forAll (cellMap_, cellI)
+ forAll(cellMap_, cellI)
{
const labelList& oldC = oldCells[cellMap_[cellI]];
labelList newC(oldC.size());
- forAll (newC, i)
+ forAll(newC, i)
{
newC[i] = globalFaceMap[oldC[i]];
}
@@ -790,7 +790,7 @@ void Foam::fvMeshSubset::setLargeCellSubset
cellMap_.setSize(oldCells.size());
label nCellsInSet = 0;
- forAll (region, oldCellI)
+ forAll(region, oldCellI)
{
if (region[oldCellI] == currentRegion)
{
@@ -813,7 +813,7 @@ void Foam::fvMeshSubset::setLargeCellSubset
labelList nCellsUsingFace(oldFaces.size(), 0);
label nFacesInSet = 0;
- forAll (oldFaces, oldFaceI)
+ forAll(oldFaces, oldFaceI)
{
bool faceUsed = false;
@@ -936,7 +936,7 @@ void Foam::fvMeshSubset::setLargeCellSubset
label oldFaceI = oldPatch.start();
- forAll (oldPatch, i)
+ forAll(oldPatch, i)
{
if (nCellsUsingFace[oldFaceI] == 1)
{
@@ -1005,7 +1005,7 @@ void Foam::fvMeshSubset::setLargeCellSubset
label oldFaceI = oldPatch.start();
- forAll (oldPatch, i)
+ forAll(oldPatch, i)
{
if (nCellsUsingFace[oldFaceI] == 1)
{
@@ -1068,7 +1068,7 @@ void Foam::fvMeshSubset::setLargeCellSubset
label nNewPoints = 0;
- forAll (pointMap_, pointI)
+ forAll(pointMap_, pointI)
{
newPoints[nNewPoints] = oldPoints[pointMap_[pointI]];
nNewPoints++;
@@ -1085,7 +1085,7 @@ void Foam::fvMeshSubset::setLargeCellSubset
face newF(oldF.size());
- forAll (newF, i)
+ forAll(newF, i)
{
newF[i] = globalPointMap[oldF[i]];
}
@@ -1120,7 +1120,7 @@ void Foam::fvMeshSubset::setLargeCellSubset
// Relabel vertices of the (possibly turned) face.
face newF(oldF.size());
- forAll (newF, i)
+ forAll(newF, i)
{
newF[i] = globalPointMap[oldF[i]];
}
@@ -1136,13 +1136,13 @@ void Foam::fvMeshSubset::setLargeCellSubset
label nNewCells = 0;
- forAll (cellMap_, cellI)
+ forAll(cellMap_, cellI)
{
const labelList& oldC = oldCells[cellMap_[cellI]];
labelList newC(oldC.size());
- forAll (newC, i)
+ forAll(newC, i)
{
newC[i] = globalFaceMap[oldC[i]];
}
diff --git a/src/finiteVolume/fvMesh/fvMeshSubset/fvMeshSubset.H b/src/finiteVolume/fvMesh/fvMeshSubset/fvMeshSubset.H
index 18609a236c0fd791b129d95c89811831424e5419..1c881f8deaba8ff7013192c62f0d2371475f309e 100644
--- a/src/finiteVolume/fvMesh/fvMeshSubset/fvMeshSubset.H
+++ b/src/finiteVolume/fvMesh/fvMeshSubset/fvMeshSubset.H
@@ -93,10 +93,9 @@ public:
directAddressing_(directAddressing)
{}
- // Destructor
-
- virtual ~patchFieldSubset()
- {}
+ //- Destructor
+ virtual ~patchFieldSubset()
+ {}
// Member Functions
@@ -135,10 +134,9 @@ public:
directAddressing_(directAddressing)
{}
- // Destructor
-
- virtual ~pointPatchFieldSubset()
- {}
+ //- Destructor
+ virtual ~pointPatchFieldSubset()
+ {}
// Member Functions
diff --git a/src/finiteVolume/fvMesh/fvMeshSubset/fvMeshSubsetInterpolate.C b/src/finiteVolume/fvMesh/fvMeshSubset/fvMeshSubsetInterpolate.C
index e6afee8dcf592f821912ea1ceb4f612ba6ac18c8..4a7078723c3d1eac1227e02d28c72f0fe84b14b3 100644
--- a/src/finiteVolume/fvMesh/fvMeshSubset/fvMeshSubsetInterpolate.C
+++ b/src/finiteVolume/fvMesh/fvMeshSubset/fvMeshSubsetInterpolate.C
@@ -51,7 +51,7 @@ tmp<GeometricField<Type, fvPatchField, volMesh> > fvMeshSubset::interpolate
// Create and map the patch field values
PtrList<fvPatchField<Type> > patchFields(patchMap.size());
- forAll (patchFields, patchI)
+ forAll(patchFields, patchI)
{
// Set the first one by hand as it corresponds to the
// exposed internal faces. Additional interpolation can be put here
@@ -175,7 +175,7 @@ tmp<GeometricField<Type, fvsPatchField, surfaceMesh> > fvMeshSubset::interpolate
// Create and map the patch field values
PtrList<fvsPatchField<Type> > patchFields(patchMap.size());
- forAll (patchFields, patchI)
+ forAll(patchFields, patchI)
{
// Set the first one by hand as it corresponds to the
// exposed internal faces. Additional interpolation can be put here
@@ -308,7 +308,7 @@ fvMeshSubset::interpolate
// Create and map the patch field values
PtrList<pointPatchField<Type> > patchFields(patchMap.size());
- forAll (patchFields, patchI)
+ forAll(patchFields, patchI)
{
// Set the first one by hand as it corresponds to the
// exposed internal faces. Additional interpolation can be put here
diff --git a/src/finiteVolume/fvMesh/fvPatches/basic/coupled/coupledFvPatch.H b/src/finiteVolume/fvMesh/fvPatches/basic/coupled/coupledFvPatch.H
index 1ebfe11bc2991159b3693cd68491fbb5633f2f72..013c3aa2ac576ae0a60a62c41936f3f811c9c80a 100644
--- a/src/finiteVolume/fvMesh/fvPatches/basic/coupled/coupledFvPatch.H
+++ b/src/finiteVolume/fvMesh/fvPatches/basic/coupled/coupledFvPatch.H
@@ -89,9 +89,8 @@ public:
{}
- // Destructor
-
- virtual ~coupledFvPatch();
+ //- Destructor
+ virtual ~coupledFvPatch();
// Member Functions
diff --git a/src/finiteVolume/fvMesh/fvPatches/fvPatch/fvPatch.C b/src/finiteVolume/fvMesh/fvPatches/fvPatch/fvPatch.C
index 65cb947b6ad2a58779c353c18d4c8cce5d7fe1b1..c546459875ca912c1143b4991138534c5d1d899a 100644
--- a/src/finiteVolume/fvMesh/fvPatches/fvPatch/fvPatch.C
+++ b/src/finiteVolume/fvMesh/fvPatches/fvPatch/fvPatch.C
@@ -114,7 +114,7 @@ tmp<vectorField> fvPatch::Cn() const
// get reference to global cell centres
const vectorField& gcc = boundaryMesh().mesh().cellCentres();
- forAll (faceCells, faceI)
+ forAll(faceCells, faceI)
{
cc[faceI] = gcc[faceCells[faceI]];
}
diff --git a/src/finiteVolume/fvMesh/fvPatches/fvPatch/fvPatch.H b/src/finiteVolume/fvMesh/fvPatches/fvPatch/fvPatch.H
index 8bb0cf0cd419a25b91817461dca7b2957b730051..1b57ab060103065bbad62298d77d8aa129e69f5c 100644
--- a/src/finiteVolume/fvMesh/fvPatches/fvPatch/fvPatch.H
+++ b/src/finiteVolume/fvMesh/fvPatches/fvPatch/fvPatch.H
@@ -131,9 +131,8 @@ public:
static autoPtr<fvPatch> New(const polyPatch&, const fvBoundaryMesh&);
- // Destructor
-
- virtual ~fvPatch();
+ //- Destructor
+ virtual ~fvPatch();
// Member Functions
diff --git a/src/finiteVolume/fvMesh/wallDist/nearWallDist.H b/src/finiteVolume/fvMesh/wallDist/nearWallDist.H
index 326e1d1f795c74013eb4911550148a29b8b4c917..205adb71ae47b16645ca0d23cc272d69cfc8a4b2 100644
--- a/src/finiteVolume/fvMesh/wallDist/nearWallDist.H
+++ b/src/finiteVolume/fvMesh/wallDist/nearWallDist.H
@@ -80,9 +80,8 @@ public:
nearWallDist(const fvMesh& mesh);
- // Destructor
-
- virtual ~nearWallDist();
+ //- Destructor
+ virtual ~nearWallDist();
// Member Functions
diff --git a/src/finiteVolume/fvMesh/wallDist/nearWallDistNoSearch.H b/src/finiteVolume/fvMesh/wallDist/nearWallDistNoSearch.H
index 57f230a2cfa44a0baf0422242035a292080b0039..30e7abfd52062e8c5c81c7cbc12647f8c8d30979 100644
--- a/src/finiteVolume/fvMesh/wallDist/nearWallDistNoSearch.H
+++ b/src/finiteVolume/fvMesh/wallDist/nearWallDistNoSearch.H
@@ -80,9 +80,8 @@ public:
nearWallDistNoSearch(const fvMesh& mesh);
- // Destructor
-
- virtual ~nearWallDistNoSearch();
+ //- Destructor
+ virtual ~nearWallDistNoSearch();
// Member Functions
diff --git a/src/finiteVolume/fvMesh/wallDist/wallDist.H b/src/finiteVolume/fvMesh/wallDist/wallDist.H
index 6c899965ea172d205d6868d9d52e5ecb3d4fa66c..5528707780711cc922ee5c074a9bb05142f17230 100644
--- a/src/finiteVolume/fvMesh/wallDist/wallDist.H
+++ b/src/finiteVolume/fvMesh/wallDist/wallDist.H
@@ -113,9 +113,8 @@ public:
wallDist(const fvMesh& mesh, bool correctWalls = true);
- // Destructor
-
- virtual ~wallDist();
+ //- Destructor
+ virtual ~wallDist();
// Member Functions
diff --git a/src/finiteVolume/fvMesh/wallDist/wallDistData.H b/src/finiteVolume/fvMesh/wallDist/wallDistData.H
index e3f8d04881213a1a375fd6494e4ce87309a8beb0..102a76998bfd3325b4be931675f76560b241a926 100644
--- a/src/finiteVolume/fvMesh/wallDist/wallDistData.H
+++ b/src/finiteVolume/fvMesh/wallDist/wallDistData.H
@@ -103,9 +103,8 @@ public:
);
- // Destructor
-
- virtual ~wallDistData();
+ //- Destructor
+ virtual ~wallDistData();
// Member Functions
diff --git a/src/finiteVolume/interpolation/interpolation/interpolation/interpolation.H b/src/finiteVolume/interpolation/interpolation/interpolation/interpolation.H
index 25d209e80d183d17226d628c7c79d8fb383510e1..c82eadbe874993fd645783882d9488b3bafabb1b 100644
--- a/src/finiteVolume/interpolation/interpolation/interpolation/interpolation.H
+++ b/src/finiteVolume/interpolation/interpolation/interpolation/interpolation.H
@@ -113,10 +113,9 @@ public:
);
- // Destructor
-
- virtual ~interpolation()
- {}
+ //- Destructor
+ virtual ~interpolation()
+ {}
// Member Functions
diff --git a/src/finiteVolume/interpolation/mapping/fvFieldMappers/MapFvSurfaceField.H b/src/finiteVolume/interpolation/mapping/fvFieldMappers/MapFvSurfaceField.H
index b3c314c8ef10edcf34439c0d88997290d1348189..aeaaaf020a0182843dcc445ef514f8911f65ff10 100644
--- a/src/finiteVolume/interpolation/mapping/fvFieldMappers/MapFvSurfaceField.H
+++ b/src/finiteVolume/interpolation/mapping/fvFieldMappers/MapFvSurfaceField.H
@@ -83,7 +83,7 @@ void MapInternalField<Type, MeshMapper, surfaceMesh>::operator()
// Flip the flux
const labelList flipFaces = mapper.surfaceMap().flipFaceFlux().toc();
- forAll (flipFaces, i)
+ forAll(flipFaces, i)
{
if (flipFaces[i] < field.size())
{
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/limitedSurfaceInterpolationScheme/limitedSurfaceInterpolationScheme.H b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/limitedSurfaceInterpolationScheme/limitedSurfaceInterpolationScheme.H
index d2f953238a66899509878e8dba882fed78c616af..d945c8864ae00cd0524cfc5ce44ea2b081f03aa0 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/limitedSurfaceInterpolationScheme/limitedSurfaceInterpolationScheme.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/limitedSurfaceInterpolationScheme/limitedSurfaceInterpolationScheme.H
@@ -156,9 +156,8 @@ public:
);
- // Destructor
-
- virtual ~limitedSurfaceInterpolationScheme();
+ //- Destructor
+ virtual ~limitedSurfaceInterpolationScheme();
// Member Functions
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/multivariateSchemes/multivariateSurfaceInterpolationScheme/multivariateSurfaceInterpolationScheme.H b/src/finiteVolume/interpolation/surfaceInterpolation/multivariateSchemes/multivariateSurfaceInterpolationScheme/multivariateSurfaceInterpolationScheme.H
index 43ff440955559d4aedd3d7cd538778863a890710..45cd10d3dbefaa76944bfef582d0476405920b98 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/multivariateSchemes/multivariateSurfaceInterpolationScheme/multivariateSurfaceInterpolationScheme.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/multivariateSchemes/multivariateSurfaceInterpolationScheme/multivariateSurfaceInterpolationScheme.H
@@ -142,9 +142,8 @@ public:
);
- // Destructor
-
- virtual ~multivariateSurfaceInterpolationScheme();
+ //- Destructor
+ virtual ~multivariateSurfaceInterpolationScheme();
// Member Functions
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/clippedLinear/clippedLinear.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/clippedLinear/clippedLinear.H
index 5a005b8a38589ead10dd373a31f137a1669759dd..525b63a6e1d801a3e5956aeba39b8384d0d23078 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/clippedLinear/clippedLinear.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/clippedLinear/clippedLinear.H
@@ -155,7 +155,7 @@ public:
clippedLinearWeights.internalField() =
max(min(cdWeights.internalField(), 1 - wfLimit_), wfLimit_);
- forAll (mesh.boundary(), patchi)
+ forAll(mesh.boundary(), patchi)
{
if (mesh.boundary()[patchi].coupled())
{
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/cubic/cubic.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/cubic/cubic.H
index f6c01aabd1fdee3a4158f1c2757ef032fa455ce6..934f3739c40cd8e8da2996126aba5823d7b358e3 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/cubic/cubic.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/cubic/cubic.H
@@ -169,7 +169,7 @@ public:
);
}
- forAll (sfCorr.boundaryField(), pi)
+ forAll(sfCorr.boundaryField(), pi)
{
if (!sfCorr.boundaryField()[pi].coupled())
{
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/reverseLinear/reverseLinear.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/reverseLinear/reverseLinear.H
index f250150bd6ce768792a61da2b5c9ff7fa97f1de0..23b12d051f9abead54a0525cc8594ca5cb29ca63 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/reverseLinear/reverseLinear.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/reverseLinear/reverseLinear.H
@@ -127,7 +127,7 @@ public:
reverseLinearWeights.internalField() =
1.0 - cdWeights.internalField();
- forAll (mesh.boundary(), patchI)
+ forAll(mesh.boundary(), patchI)
{
if (mesh.boundary()[patchI].coupled())
{
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/skewCorrected/skewCorrectionVectors.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/skewCorrected/skewCorrectionVectors.H
index 9806b348aea6bafd23e83e80e86277a664763c9d..c20ae3ab149db9996d9a63e2a6e1231d2dd7639b 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/skewCorrected/skewCorrectionVectors.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/skewCorrected/skewCorrectionVectors.H
@@ -76,9 +76,8 @@ public:
explicit skewCorrectionVectors(const fvMesh& mesh);
- // Destructor
-
- virtual ~skewCorrectionVectors();
+ //- Destructor
+ virtual ~skewCorrectionVectors();
// Member functions
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolation/surfaceInterpolation.H b/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolation/surfaceInterpolation.H
index d3380c1c1cd863bc9351b3da44267012496f39ba..3acac2b2d6ea58da950a33027cd879f6813b40fb 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolation/surfaceInterpolation.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolation/surfaceInterpolation.H
@@ -106,9 +106,8 @@ public:
explicit surfaceInterpolation(const fvMesh&);
- // Destructor
-
- ~surfaceInterpolation();
+ //- Destructor
+ ~surfaceInterpolation();
// Member functions
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolationScheme/surfaceInterpolationScheme.C b/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolationScheme/surfaceInterpolationScheme.C
index 2d3bdf425e2337ddc56200873ee60a8a7c267c56..0a51f574f10dd007ea12580c9d9e0427571b2299 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolationScheme/surfaceInterpolationScheme.C
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolationScheme/surfaceInterpolationScheme.C
@@ -213,7 +213,7 @@ surfaceInterpolationScheme<Type>::interpolate
// Interpolate across coupled patches using given lambdas and ys
- forAll (lambdas.boundaryField(), pi)
+ forAll(lambdas.boundaryField(), pi)
{
const fvsPatchScalarField& pLambda = lambdas.boundaryField()[pi];
const fvsPatchScalarField& pY = ys.boundaryField()[pi];
@@ -291,7 +291,7 @@ surfaceInterpolationScheme<Type>::interpolate
// Interpolate across coupled patches using given lambdas
- forAll (lambdas.boundaryField(), pi)
+ forAll(lambdas.boundaryField(), pi)
{
const fvsPatchScalarField& pLambda = lambdas.boundaryField()[pi];
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolationScheme/surfaceInterpolationScheme.H b/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolationScheme/surfaceInterpolationScheme.H
index 26cee56de0e9ad2b139c797515cb2f86785396ff..90cd007b63762765751947df9879a3ef1842ebe1 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolationScheme/surfaceInterpolationScheme.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolationScheme/surfaceInterpolationScheme.H
@@ -133,9 +133,8 @@ public:
);
- // Destructor
-
- virtual ~surfaceInterpolationScheme();
+ //- Destructor
+ virtual ~surfaceInterpolationScheme();
// Member Functions
diff --git a/src/finiteVolume/interpolation/volPointInterpolation/volPointInterpolation.H b/src/finiteVolume/interpolation/volPointInterpolation/volPointInterpolation.H
index cc4a51538153b4758d15c0149a0ca92d6fd556ff..fb46d50a8711cb044089df896700c0cc1bef4eb2 100644
--- a/src/finiteVolume/interpolation/volPointInterpolation/volPointInterpolation.H
+++ b/src/finiteVolume/interpolation/volPointInterpolation/volPointInterpolation.H
@@ -152,9 +152,8 @@ public:
explicit volPointInterpolation(const fvMesh&);
- // Destructor
-
- ~volPointInterpolation();
+ //- Destructor
+ ~volPointInterpolation();
// Member functions
diff --git a/src/fvAgglomerationMethods/MGridGenGamgAgglomeration/MGridGenGAMGAgglomerate.C b/src/fvAgglomerationMethods/MGridGenGamgAgglomeration/MGridGenGAMGAgglomerate.C
index 4f41fdc2a803d2a71c95de5abb88854974d9e677..f310615f82fc3296b214ff367ed78c75fb6a6af0 100644
--- a/src/fvAgglomerationMethods/MGridGenGamgAgglomeration/MGridGenGAMGAgglomerate.C
+++ b/src/fvAgglomerationMethods/MGridGenGamgAgglomeration/MGridGenGAMGAgglomerate.C
@@ -56,12 +56,12 @@ makeCompactCellFaceAddressingAndFaceWeights
// Number of neighbours for each cell
labelList nNbrs(nFineCells, 0);
- forAll (upperAddr, facei)
+ forAll(upperAddr, facei)
{
nNbrs[upperAddr[facei]]++;
}
- forAll (lowerAddr, facei)
+ forAll(lowerAddr, facei)
{
nNbrs[lowerAddr[facei]]++;
}
@@ -73,7 +73,7 @@ makeCompactCellFaceAddressingAndFaceWeights
cellCellOffsets[0] = 0;
- forAll (nNbrs, celli)
+ forAll(nNbrs, celli)
{
cellCellOffsets[celli+1] = cellCellOffsets[celli] + nNbrs[celli];
}
@@ -81,7 +81,7 @@ makeCompactCellFaceAddressingAndFaceWeights
// reset the whole list to use as counter
nNbrs = 0;
- forAll (upperAddr, facei)
+ forAll(upperAddr, facei)
{
label own = upperAddr[facei];
label nei = lowerAddr[facei];
diff --git a/src/fvMotionSolver/fvMotionSolvers/displacement/SBRStress/displacementSBRStressFvMotionSolver.H b/src/fvMotionSolver/fvMotionSolvers/displacement/SBRStress/displacementSBRStressFvMotionSolver.H
index 094c815a32e81a6694bbc46471b4f565d3411898..ffa533412759023b64ed266ac0c326beeff5ec9b 100644
--- a/src/fvMotionSolver/fvMotionSolvers/displacement/SBRStress/displacementSBRStressFvMotionSolver.H
+++ b/src/fvMotionSolver/fvMotionSolvers/displacement/SBRStress/displacementSBRStressFvMotionSolver.H
@@ -94,9 +94,8 @@ public:
);
- // Destructor
-
- ~displacementSBRStressFvMotionSolver();
+ //- Destructor
+ ~displacementSBRStressFvMotionSolver();
// Member Functions
diff --git a/src/fvMotionSolver/fvMotionSolvers/displacement/componentLaplacian/displacementComponentLaplacianFvMotionSolver.H b/src/fvMotionSolver/fvMotionSolvers/displacement/componentLaplacian/displacementComponentLaplacianFvMotionSolver.H
index 36cadb837ea79c4cd4b97ba2a59ec3940785148f..7aac7096da6cebec159e017f30b37c6162a71d68 100644
--- a/src/fvMotionSolver/fvMotionSolvers/displacement/componentLaplacian/displacementComponentLaplacianFvMotionSolver.H
+++ b/src/fvMotionSolver/fvMotionSolvers/displacement/componentLaplacian/displacementComponentLaplacianFvMotionSolver.H
@@ -114,9 +114,8 @@ public:
);
- // Destructor
-
- ~displacementComponentLaplacianFvMotionSolver();
+ //- Destructor
+ ~displacementComponentLaplacianFvMotionSolver();
// Member Functions
diff --git a/src/fvMotionSolver/fvMotionSolvers/displacement/displacementFvMotionSolver/displacementFvMotionSolver.H b/src/fvMotionSolver/fvMotionSolvers/displacement/displacementFvMotionSolver/displacementFvMotionSolver.H
index 125a868caae48359720405a95bc270bafd665571..14b2bd198694ef3c75a21af4836613348f8d6c9f 100644
--- a/src/fvMotionSolver/fvMotionSolvers/displacement/displacementFvMotionSolver/displacementFvMotionSolver.H
+++ b/src/fvMotionSolver/fvMotionSolvers/displacement/displacementFvMotionSolver/displacementFvMotionSolver.H
@@ -84,9 +84,8 @@ public:
);
- // Destructor
-
- ~displacementFvMotionSolver();
+ //- Destructor
+ ~displacementFvMotionSolver();
// Member Functions
diff --git a/src/fvMotionSolver/fvMotionSolvers/displacement/interpolation/displacementInterpolationFvMotionSolver.H b/src/fvMotionSolver/fvMotionSolvers/displacement/interpolation/displacementInterpolationFvMotionSolver.H
index 399a9b99ce44e6a0969db306a361fed4e51c2bce..3c4f626889a303a8d9f76b3a8e2ff8bad2b8e8e1 100644
--- a/src/fvMotionSolver/fvMotionSolvers/displacement/interpolation/displacementInterpolationFvMotionSolver.H
+++ b/src/fvMotionSolver/fvMotionSolvers/displacement/interpolation/displacementInterpolationFvMotionSolver.H
@@ -119,9 +119,8 @@ public:
);
- // Destructor
-
- ~displacementInterpolationFvMotionSolver();
+ //- Destructor
+ ~displacementInterpolationFvMotionSolver();
// Member Functions
diff --git a/src/fvMotionSolver/fvMotionSolvers/displacement/laplacian/displacementLaplacianFvMotionSolver.H b/src/fvMotionSolver/fvMotionSolvers/displacement/laplacian/displacementLaplacianFvMotionSolver.H
index a66dc0b1e5a37409fa49e4b71c5dfa3b4bf56f0a..55cd442b95a05f658616d2e25027e329717beea2 100644
--- a/src/fvMotionSolver/fvMotionSolvers/displacement/laplacian/displacementLaplacianFvMotionSolver.H
+++ b/src/fvMotionSolver/fvMotionSolvers/displacement/laplacian/displacementLaplacianFvMotionSolver.H
@@ -102,9 +102,8 @@ public:
);
- // Destructor
-
- ~displacementLaplacianFvMotionSolver();
+ //- Destructor
+ ~displacementLaplacianFvMotionSolver();
// Member Functions
diff --git a/src/fvMotionSolver/fvMotionSolvers/displacement/layeredSolver/displacementLayeredMotionFvMotionSolver.H b/src/fvMotionSolver/fvMotionSolvers/displacement/layeredSolver/displacementLayeredMotionFvMotionSolver.H
index 4c6fdb6cc15c2d585bf230f8b6b4c1c4975e623e..0fa540d3dd8642ce22a016a234b041598931b783 100644
--- a/src/fvMotionSolver/fvMotionSolvers/displacement/layeredSolver/displacementLayeredMotionFvMotionSolver.H
+++ b/src/fvMotionSolver/fvMotionSolvers/displacement/layeredSolver/displacementLayeredMotionFvMotionSolver.H
@@ -145,9 +145,8 @@ public:
);
- // Destructor
-
- ~displacementLayeredMotionFvMotionSolver();
+ //- Destructor
+ ~displacementLayeredMotionFvMotionSolver();
// Member Functions
diff --git a/src/fvMotionSolver/fvMotionSolvers/fvMotionSolver/fvMotionSolver.H b/src/fvMotionSolver/fvMotionSolvers/fvMotionSolver/fvMotionSolver.H
index dd6fbe6c7e8bf3f5689e0d3030754b5dd32a8324..6cc71bf355c36c7a647b21ee6f6746bbf311e51c 100644
--- a/src/fvMotionSolver/fvMotionSolvers/fvMotionSolver/fvMotionSolver.H
+++ b/src/fvMotionSolver/fvMotionSolvers/fvMotionSolver/fvMotionSolver.H
@@ -90,9 +90,8 @@ public:
fvMotionSolver(const polyMesh& mesh);
- // Destructor
-
- virtual ~fvMotionSolver();
+ //- Destructor
+ virtual ~fvMotionSolver();
// Member Functions
diff --git a/src/fvMotionSolver/fvMotionSolvers/velocity/componentLaplacian/velocityComponentLaplacianFvMotionSolver.H b/src/fvMotionSolver/fvMotionSolvers/velocity/componentLaplacian/velocityComponentLaplacianFvMotionSolver.H
index 8dd8a98a16ddf4444f133b2ea42aab5ce2fcc3d7..f20423e932747ae7eb280c1ca253e430d4325905 100644
--- a/src/fvMotionSolver/fvMotionSolvers/velocity/componentLaplacian/velocityComponentLaplacianFvMotionSolver.H
+++ b/src/fvMotionSolver/fvMotionSolvers/velocity/componentLaplacian/velocityComponentLaplacianFvMotionSolver.H
@@ -100,9 +100,8 @@ public:
);
- // Destructor
-
- ~velocityComponentLaplacianFvMotionSolver();
+ //- Destructor
+ ~velocityComponentLaplacianFvMotionSolver();
// Member Functions
diff --git a/src/fvMotionSolver/fvMotionSolvers/velocity/laplacian/velocityLaplacianFvMotionSolver.H b/src/fvMotionSolver/fvMotionSolvers/velocity/laplacian/velocityLaplacianFvMotionSolver.H
index fa31853737c88de524cc125a8cc07bb36a03df3c..bab48d1db2ac874187d3ce3d374244caa0c52ddf 100644
--- a/src/fvMotionSolver/fvMotionSolvers/velocity/laplacian/velocityLaplacianFvMotionSolver.H
+++ b/src/fvMotionSolver/fvMotionSolvers/velocity/laplacian/velocityLaplacianFvMotionSolver.H
@@ -94,9 +94,8 @@ public:
);
- // Destructor
-
- ~velocityLaplacianFvMotionSolver();
+ //- Destructor
+ ~velocityLaplacianFvMotionSolver();
// Member Functions
diff --git a/src/fvMotionSolver/motionDiffusivity/directional/directionalDiffusivity.H b/src/fvMotionSolver/motionDiffusivity/directional/directionalDiffusivity.H
index 08472e02f6a0c85caaac5e1c70ebeff0acac17e7..789f51987ceab8d386615f946c0a5f2e8dfda035 100644
--- a/src/fvMotionSolver/motionDiffusivity/directional/directionalDiffusivity.H
+++ b/src/fvMotionSolver/motionDiffusivity/directional/directionalDiffusivity.H
@@ -80,9 +80,8 @@ public:
);
- // Destructor
-
- virtual ~directionalDiffusivity();
+ //- Destructor
+ virtual ~directionalDiffusivity();
// Member Functions
diff --git a/src/fvMotionSolver/motionDiffusivity/file/fileDiffusivity.H b/src/fvMotionSolver/motionDiffusivity/file/fileDiffusivity.H
index 2f89d9d2b44ed33e9bf979777ed0f3e2ca589d8d..c22170b04514d48d15dabfc7ded7144033c9e9b6 100644
--- a/src/fvMotionSolver/motionDiffusivity/file/fileDiffusivity.H
+++ b/src/fvMotionSolver/motionDiffusivity/file/fileDiffusivity.H
@@ -86,9 +86,8 @@ public:
);
- // Destructor
-
- virtual ~fileDiffusivity();
+ //- Destructor
+ virtual ~fileDiffusivity();
// Member Functions
diff --git a/src/fvMotionSolver/motionDiffusivity/inverseDistance/inverseDistanceDiffusivity.H b/src/fvMotionSolver/motionDiffusivity/inverseDistance/inverseDistanceDiffusivity.H
index a02cd9011243a583e310f8d0001173e29d745c4e..6fc24af870f0c4693e7f5ecf846fc39a3d3b992d 100644
--- a/src/fvMotionSolver/motionDiffusivity/inverseDistance/inverseDistanceDiffusivity.H
+++ b/src/fvMotionSolver/motionDiffusivity/inverseDistance/inverseDistanceDiffusivity.H
@@ -86,9 +86,8 @@ public:
);
- // Destructor
-
- virtual ~inverseDistanceDiffusivity();
+ //- Destructor
+ virtual ~inverseDistanceDiffusivity();
// Member Functions
diff --git a/src/fvMotionSolver/motionDiffusivity/inverseFaceDistance/inverseFaceDistanceDiffusivity.C b/src/fvMotionSolver/motionDiffusivity/inverseFaceDistance/inverseFaceDistanceDiffusivity.C
index 3132bb1f85295a27f09ad782be591b7b40f77ffe..2ef5a2a1fc337cd1ed3a757d4656805851b7f2a3 100644
--- a/src/fvMotionSolver/motionDiffusivity/inverseFaceDistance/inverseFaceDistanceDiffusivity.C
+++ b/src/fvMotionSolver/motionDiffusivity/inverseFaceDistance/inverseFaceDistanceDiffusivity.C
@@ -76,7 +76,7 @@ void Foam::inverseFaceDistanceDiffusivity::correct()
label nPatchFaces = 0;
- forAll (patchNames_, i)
+ forAll(patchNames_, i)
{
label pID = bdry.findPatchID(patchNames_[i]);
diff --git a/src/fvMotionSolver/motionDiffusivity/inverseFaceDistance/inverseFaceDistanceDiffusivity.H b/src/fvMotionSolver/motionDiffusivity/inverseFaceDistance/inverseFaceDistanceDiffusivity.H
index 7aba8045a7a0e98c5213e0efabc4837b69ee7b0a..11aee5a400233f31761c411d0d72c50064f4be5f 100644
--- a/src/fvMotionSolver/motionDiffusivity/inverseFaceDistance/inverseFaceDistanceDiffusivity.H
+++ b/src/fvMotionSolver/motionDiffusivity/inverseFaceDistance/inverseFaceDistanceDiffusivity.H
@@ -81,9 +81,8 @@ public:
);
- // Destructor
-
- virtual ~inverseFaceDistanceDiffusivity();
+ //- Destructor
+ virtual ~inverseFaceDistanceDiffusivity();
// Member Functions
diff --git a/src/fvMotionSolver/motionDiffusivity/inversePointDistance/inversePointDistanceDiffusivity.C b/src/fvMotionSolver/motionDiffusivity/inversePointDistance/inversePointDistanceDiffusivity.C
index 6e93d1d7922f965a56ba10590f798976264ee0c3..ec47a05a6c7183115f6735b20cd676be4d7b3fb4 100644
--- a/src/fvMotionSolver/motionDiffusivity/inversePointDistance/inversePointDistanceDiffusivity.C
+++ b/src/fvMotionSolver/motionDiffusivity/inversePointDistance/inversePointDistanceDiffusivity.C
@@ -76,7 +76,7 @@ void Foam::inversePointDistanceDiffusivity::correct()
label nPatchEdges = 0;
- forAll (patchNames_, i)
+ forAll(patchNames_, i)
{
label pID = bdry.findPatchID(patchNames_[i]);
diff --git a/src/fvMotionSolver/motionDiffusivity/inversePointDistance/inversePointDistanceDiffusivity.H b/src/fvMotionSolver/motionDiffusivity/inversePointDistance/inversePointDistanceDiffusivity.H
index 928a7bf15c22e81980d33a250cc671f497b16d41..f874a4edbfdc702b6556980c3b781ebb0132d489 100644
--- a/src/fvMotionSolver/motionDiffusivity/inversePointDistance/inversePointDistanceDiffusivity.H
+++ b/src/fvMotionSolver/motionDiffusivity/inversePointDistance/inversePointDistanceDiffusivity.H
@@ -81,9 +81,8 @@ public:
);
- // Destructor
-
- virtual ~inversePointDistanceDiffusivity();
+ //- Destructor
+ virtual ~inversePointDistanceDiffusivity();
// Member Functions
diff --git a/src/fvMotionSolver/motionDiffusivity/inverseVolume/inverseVolumeDiffusivity.H b/src/fvMotionSolver/motionDiffusivity/inverseVolume/inverseVolumeDiffusivity.H
index 3c1d129fa5ca2dea3f71c692d1a1761194e3ced6..5d5918f681785a04adaf2b09e9070c33f51ff8fe 100644
--- a/src/fvMotionSolver/motionDiffusivity/inverseVolume/inverseVolumeDiffusivity.H
+++ b/src/fvMotionSolver/motionDiffusivity/inverseVolume/inverseVolumeDiffusivity.H
@@ -75,9 +75,8 @@ public:
);
- // Destructor
-
- virtual ~inverseVolumeDiffusivity();
+ //- Destructor
+ virtual ~inverseVolumeDiffusivity();
// Member Functions
diff --git a/src/fvMotionSolver/motionDiffusivity/manipulators/exponential/exponentialDiffusivity.H b/src/fvMotionSolver/motionDiffusivity/manipulators/exponential/exponentialDiffusivity.H
index e919a01c6ddc0112b0574d448d967999d65f0550..387d4f23b9b1de0f29f84a8861f4efd6f080afb6 100644
--- a/src/fvMotionSolver/motionDiffusivity/manipulators/exponential/exponentialDiffusivity.H
+++ b/src/fvMotionSolver/motionDiffusivity/manipulators/exponential/exponentialDiffusivity.H
@@ -82,9 +82,8 @@ public:
);
- // Destructor
-
- virtual ~exponentialDiffusivity();
+ //- Destructor
+ virtual ~exponentialDiffusivity();
// Member Functions
diff --git a/src/fvMotionSolver/motionDiffusivity/manipulators/quadratic/quadraticDiffusivity.H b/src/fvMotionSolver/motionDiffusivity/manipulators/quadratic/quadraticDiffusivity.H
index 6e799874c5a233d31dddd759c66012769a5e86da..5706c2825074f936be0d6ced81f6ccfb70f6c548 100644
--- a/src/fvMotionSolver/motionDiffusivity/manipulators/quadratic/quadraticDiffusivity.H
+++ b/src/fvMotionSolver/motionDiffusivity/manipulators/quadratic/quadraticDiffusivity.H
@@ -81,9 +81,8 @@ public:
);
- // Destructor
-
- virtual ~quadraticDiffusivity();
+ //- Destructor
+ virtual ~quadraticDiffusivity();
// Member Functions
diff --git a/src/fvMotionSolver/motionDiffusivity/motionDiffusivity/motionDiffusivity.H b/src/fvMotionSolver/motionDiffusivity/motionDiffusivity/motionDiffusivity.H
index 028a4bcdb2974a5c9aed27725009e777ad0e2914..68b0d5d67c88ba9a94748927d6e629e7b8cf2205 100644
--- a/src/fvMotionSolver/motionDiffusivity/motionDiffusivity/motionDiffusivity.H
+++ b/src/fvMotionSolver/motionDiffusivity/motionDiffusivity/motionDiffusivity.H
@@ -91,9 +91,8 @@ public:
motionDiffusivity(const fvMotionSolver& mSolver);
- // Destructor
-
- virtual ~motionDiffusivity();
+ //- Destructor
+ virtual ~motionDiffusivity();
// Member Functions
diff --git a/src/fvMotionSolver/motionDiffusivity/motionDirectional/motionDirectionalDiffusivity.H b/src/fvMotionSolver/motionDiffusivity/motionDirectional/motionDirectionalDiffusivity.H
index 54505bcca366b93581e9fd3a964caa65fcb43e01..912166b94db6dd30489bf2978d52ed6856e2c59b 100644
--- a/src/fvMotionSolver/motionDiffusivity/motionDirectional/motionDirectionalDiffusivity.H
+++ b/src/fvMotionSolver/motionDiffusivity/motionDirectional/motionDirectionalDiffusivity.H
@@ -80,9 +80,8 @@ public:
);
- // Destructor
-
- virtual ~motionDirectionalDiffusivity();
+ //- Destructor
+ virtual ~motionDirectionalDiffusivity();
// Member Functions
diff --git a/src/fvMotionSolver/motionDiffusivity/uniform/uniformDiffusivity.H b/src/fvMotionSolver/motionDiffusivity/uniform/uniformDiffusivity.H
index 9552ced8356875333bc8108473e5e71b45c45aa1..fe3125be2e85c5fa3b94f58e74bb77f865cba9de 100644
--- a/src/fvMotionSolver/motionDiffusivity/uniform/uniformDiffusivity.H
+++ b/src/fvMotionSolver/motionDiffusivity/uniform/uniformDiffusivity.H
@@ -86,9 +86,8 @@ public:
);
- // Destructor
-
- virtual ~uniformDiffusivity();
+ //- Destructor
+ virtual ~uniformDiffusivity();
// Member Functions
diff --git a/src/genericPatchFields/genericFvPatchField/genericFvPatchField.C b/src/genericPatchFields/genericFvPatchField/genericFvPatchField.C
index d842671b8d8f3172f1b31af9e07e1a77daca2926..aeddeb7ddd47ca1c65146c39b00cc28eb411ef6b 100644
--- a/src/genericPatchFields/genericFvPatchField/genericFvPatchField.C
+++ b/src/genericPatchFields/genericFvPatchField/genericFvPatchField.C
@@ -81,12 +81,7 @@ Foam::genericFvPatchField<Type>::genericFvPatchField
<< exit(FatalIOError);
}
- for
- (
- dictionary::const_iterator iter = dict_.begin();
- iter != dict_.end();
- ++iter
- )
+ forAllConstIter(dictionary, dict_, iter)
{
if (iter().keyword() != "type" && iter().keyword() != "value")
{
@@ -459,34 +454,39 @@ Foam::genericFvPatchField<Type>::genericFvPatchField
actualTypeName_(ptf.actualTypeName_),
dict_(ptf.dict_)
{
- for
+ forAllConstIter
(
- HashPtrTable<scalarField>::const_iterator iter =
- ptf.scalarFields_.begin();
- iter != ptf.scalarFields_.end();
- ++iter
+ HashPtrTable<scalarField>,
+ ptf.scalarFields_,
+ iter
)
{
- scalarFields_.insert(iter.key(), new scalarField(*iter(), mapper));
+ scalarFields_.insert
+ (
+ iter.key(),
+ new scalarField(*iter(), mapper)
+ );
}
- for
+ forAllConstIter
(
- HashPtrTable<vectorField>::const_iterator iter =
- ptf.vectorFields_.begin();
- iter != ptf.vectorFields_.end();
- ++iter
+ HashPtrTable<vectorField>,
+ ptf.vectorFields_,
+ iter
)
{
- vectorFields_.insert(iter.key(), new vectorField(*iter(), mapper));
+ vectorFields_.insert
+ (
+ iter.key(),
+ new vectorField(*iter(), mapper)
+ );
}
- for
+ forAllConstIter
(
- HashPtrTable<sphericalTensorField>::const_iterator iter =
- ptf.sphericalTensorFields_.begin();
- iter != ptf.sphericalTensorFields_.end();
- ++iter
+ HashPtrTable<sphericalTensorField>,
+ ptf.sphericalTensorFields_,
+ iter
)
{
sphericalTensorFields_.insert
@@ -496,12 +496,11 @@ Foam::genericFvPatchField<Type>::genericFvPatchField
);
}
- for
+ forAllConstIter
(
- HashPtrTable<symmTensorField>::const_iterator iter =
- ptf.symmTensorFields_.begin();
- iter != ptf.symmTensorFields_.end();
- ++iter
+ HashPtrTable<symmTensorField>,
+ ptf.symmTensorFields_,
+ iter
)
{
symmTensorFields_.insert
@@ -511,15 +510,18 @@ Foam::genericFvPatchField<Type>::genericFvPatchField
);
}
- for
+ forAllConstIter
(
- HashPtrTable<tensorField>::const_iterator iter =
- ptf.tensorFields_.begin();
- iter != ptf.tensorFields_.end();
- ++iter
+ HashPtrTable<tensorField>,
+ ptf.tensorFields_,
+ iter
)
{
- tensorFields_.insert(iter.key(), new tensorField(*iter(), mapper));
+ tensorFields_.insert
+ (
+ iter.key(),
+ new tensorField(*iter(), mapper)
+ );
}
}
@@ -569,53 +571,51 @@ void Foam::genericFvPatchField<Type>::autoMap
{
calculatedFvPatchField<Type>::autoMap(m);
- for
+ forAllIter
(
- HashPtrTable<scalarField>::iterator iter = scalarFields_.begin();
- iter != scalarFields_.end();
- ++iter
+ HashPtrTable<scalarField>,
+ scalarFields_,
+ iter
)
{
iter()->autoMap(m);
}
- for
+ forAllIter
(
- HashPtrTable<vectorField>::iterator iter = vectorFields_.begin();
- iter != vectorFields_.end();
- ++iter
+ HashPtrTable<vectorField>,
+ vectorFields_,
+ iter
)
{
iter()->autoMap(m);
}
- for
+ forAllIter
(
- HashPtrTable<sphericalTensorField>::iterator iter =
- sphericalTensorFields_.begin();
- iter != sphericalTensorFields_.end();
- ++iter
+ HashPtrTable<sphericalTensorField>,
+ sphericalTensorFields_,
+ iter
)
{
iter()->autoMap(m);
}
- for
+ forAllIter
(
- HashPtrTable<symmTensorField>::iterator iter =
- symmTensorFields_.begin();
- iter != symmTensorFields_.end();
- ++iter
+ HashPtrTable<symmTensorField>,
+ symmTensorFields_,
+ iter
)
{
iter()->autoMap(m);
}
- for
+ forAllIter
(
- HashPtrTable<tensorField>::iterator iter = tensorFields_.begin();
- iter != tensorFields_.end();
- ++iter
+ HashPtrTable<tensorField>,
+ tensorFields_,
+ iter
)
{
iter()->autoMap(m);
@@ -635,11 +635,11 @@ void Foam::genericFvPatchField<Type>::rmap
const genericFvPatchField<Type>& dptf =
refCast<const genericFvPatchField<Type> >(ptf);
- for
+ forAllIter
(
- HashPtrTable<scalarField>::iterator iter = scalarFields_.begin();
- iter != scalarFields_.end();
- ++iter
+ HashPtrTable<scalarField>,
+ scalarFields_,
+ iter
)
{
HashPtrTable<scalarField>::const_iterator dptfIter =
@@ -651,11 +651,11 @@ void Foam::genericFvPatchField<Type>::rmap
}
}
- for
+ forAllIter
(
- HashPtrTable<vectorField>::iterator iter = vectorFields_.begin();
- iter != vectorFields_.end();
- ++iter
+ HashPtrTable<vectorField>,
+ vectorFields_,
+ iter
)
{
HashPtrTable<vectorField>::const_iterator dptfIter =
@@ -667,12 +667,11 @@ void Foam::genericFvPatchField<Type>::rmap
}
}
- for
+ forAllIter
(
- HashPtrTable<sphericalTensorField>::iterator iter =
- sphericalTensorFields_.begin();
- iter != sphericalTensorFields_.end();
- ++iter
+ HashPtrTable<sphericalTensorField>,
+ sphericalTensorFields_,
+ iter
)
{
HashPtrTable<sphericalTensorField>::const_iterator dptfIter =
@@ -684,12 +683,11 @@ void Foam::genericFvPatchField<Type>::rmap
}
}
- for
+ forAllIter
(
- HashPtrTable<symmTensorField>::iterator iter =
- symmTensorFields_.begin();
- iter != symmTensorFields_.end();
- ++iter
+ HashPtrTable<symmTensorField>,
+ symmTensorFields_,
+ iter
)
{
HashPtrTable<symmTensorField>::const_iterator dptfIter =
@@ -701,11 +699,11 @@ void Foam::genericFvPatchField<Type>::rmap
}
}
- for
+ forAllIter
(
- HashPtrTable<tensorField>::iterator iter = tensorFields_.begin();
- iter != tensorFields_.end();
- ++iter
+ HashPtrTable<tensorField>,
+ tensorFields_,
+ iter
)
{
HashPtrTable<tensorField>::const_iterator dptfIter =
@@ -817,12 +815,7 @@ void Foam::genericFvPatchField<Type>::write(Ostream& os) const
{
os.writeKeyword("type") << actualTypeName_ << token::END_STATEMENT << nl;
- for
- (
- dictionary::const_iterator iter = dict_.begin();
- iter != dict_.end();
- ++iter
- )
+ forAllConstIter(dictionary, dict_, iter)
{
if (iter().keyword() != "type" && iter().keyword() != "value")
{
diff --git a/src/genericPatchFields/genericPointPatchField/genericPointPatchField.C b/src/genericPatchFields/genericPointPatchField/genericPointPatchField.C
index f8a0c8b6085fc9374aaa127f64499a4a40f2ff0f..ce09fbef75df04b1bd1e77e8b46ca4b22fb33757 100644
--- a/src/genericPatchFields/genericPointPatchField/genericPointPatchField.C
+++ b/src/genericPatchFields/genericPointPatchField/genericPointPatchField.C
@@ -62,12 +62,7 @@ genericPointPatchField<Type>::genericPointPatchField
actualTypeName_(dict.lookup("type")),
dict_(dict)
{
- for
- (
- dictionary::const_iterator iter = dict_.begin();
- iter != dict_.end();
- ++iter
- )
+ forAllConstIter(dictionary, dict_, iter)
{
if (iter().keyword() != "type")
{
@@ -357,34 +352,39 @@ genericPointPatchField<Type>::genericPointPatchField
actualTypeName_(ptf.actualTypeName_),
dict_(ptf.dict_)
{
- for
+ forAllConstIter
(
- HashPtrTable<scalarField>::const_iterator iter =
- ptf.scalarFields_.begin();
- iter != ptf.scalarFields_.end();
- ++iter
+ HashPtrTable<scalarField>,
+ ptf.scalarFields_,
+ iter
)
{
- scalarFields_.insert(iter.key(), new scalarField(*iter(), mapper));
+ scalarFields_.insert
+ (
+ iter.key(),
+ new scalarField(*iter(), mapper)
+ );
}
- for
+ forAllConstIter
(
- HashPtrTable<vectorField>::const_iterator iter =
- ptf.vectorFields_.begin();
- iter != ptf.vectorFields_.end();
- ++iter
+ HashPtrTable<vectorField>,
+ ptf.vectorFields_,
+ iter
)
{
- vectorFields_.insert(iter.key(), new vectorField(*iter(), mapper));
+ vectorFields_.insert
+ (
+ iter.key(),
+ new vectorField(*iter(), mapper)
+ );
}
- for
+ forAllConstIter
(
- HashPtrTable<sphericalTensorField>::const_iterator iter =
- ptf.sphericalTensorFields_.begin();
- iter != ptf.sphericalTensorFields_.end();
- ++iter
+ HashPtrTable<sphericalTensorField>,
+ ptf.sphericalTensorFields_,
+ iter
)
{
sphericalTensorFields_.insert
@@ -394,12 +394,11 @@ genericPointPatchField<Type>::genericPointPatchField
);
}
- for
+ forAllConstIter
(
- HashPtrTable<symmTensorField>::const_iterator iter =
- ptf.symmTensorFields_.begin();
- iter != ptf.symmTensorFields_.end();
- ++iter
+ HashPtrTable<symmTensorField>,
+ ptf.symmTensorFields_,
+ iter
)
{
symmTensorFields_.insert
@@ -409,15 +408,18 @@ genericPointPatchField<Type>::genericPointPatchField
);
}
- for
+ forAllConstIter
(
- HashPtrTable<tensorField>::const_iterator iter =
- ptf.tensorFields_.begin();
- iter != ptf.tensorFields_.end();
- ++iter
+ HashPtrTable<tensorField>,
+ ptf.tensorFields_,
+ iter
)
{
- tensorFields_.insert(iter.key(), new tensorField(*iter(), mapper));
+ tensorFields_.insert
+ (
+ iter.key(),
+ new tensorField(*iter(), mapper)
+ );
}
}
@@ -448,53 +450,51 @@ void genericPointPatchField<Type>::autoMap
const pointPatchFieldMapper& m
)
{
- for
+ forAllIter
(
- HashPtrTable<scalarField>::iterator iter = scalarFields_.begin();
- iter != scalarFields_.end();
- ++iter
+ HashPtrTable<scalarField>,
+ scalarFields_,
+ iter
)
{
iter()->autoMap(m);
}
- for
+ forAllIter
(
- HashPtrTable<vectorField>::iterator iter = vectorFields_.begin();
- iter != vectorFields_.end();
- ++iter
+ HashPtrTable<vectorField>,
+ vectorFields_,
+ iter
)
{
iter()->autoMap(m);
}
- for
+ forAllIter
(
- HashPtrTable<sphericalTensorField>::iterator iter =
- sphericalTensorFields_.begin();
- iter != sphericalTensorFields_.end();
- ++iter
+ HashPtrTable<sphericalTensorField>,
+ sphericalTensorFields_,
+ iter
)
{
iter()->autoMap(m);
}
- for
+ forAllIter
(
- HashPtrTable<symmTensorField>::iterator iter =
- symmTensorFields_.begin();
- iter != symmTensorFields_.end();
- ++iter
+ HashPtrTable<symmTensorField>,
+ symmTensorFields_,
+ iter
)
{
iter()->autoMap(m);
}
- for
+ forAllIter
(
- HashPtrTable<tensorField>::iterator iter = tensorFields_.begin();
- iter != tensorFields_.end();
- ++iter
+ HashPtrTable<tensorField>,
+ tensorFields_,
+ iter
)
{
iter()->autoMap(m);
@@ -512,11 +512,11 @@ void genericPointPatchField<Type>::rmap
const genericPointPatchField<Type>& dptf =
refCast<const genericPointPatchField<Type> >(ptf);
- for
+ forAllIter
(
- HashPtrTable<scalarField>::iterator iter = scalarFields_.begin();
- iter != scalarFields_.end();
- ++iter
+ HashPtrTable<scalarField>,
+ scalarFields_,
+ iter
)
{
HashPtrTable<scalarField>::const_iterator dptfIter =
@@ -528,11 +528,11 @@ void genericPointPatchField<Type>::rmap
}
}
- for
+ forAllIter
(
- HashPtrTable<vectorField>::iterator iter = vectorFields_.begin();
- iter != vectorFields_.end();
- ++iter
+ HashPtrTable<vectorField>,
+ vectorFields_,
+ iter
)
{
HashPtrTable<vectorField>::const_iterator dptfIter =
@@ -544,12 +544,11 @@ void genericPointPatchField<Type>::rmap
}
}
- for
+ forAllIter
(
- HashPtrTable<sphericalTensorField>::iterator iter =
- sphericalTensorFields_.begin();
- iter != sphericalTensorFields_.end();
- ++iter
+ HashPtrTable<sphericalTensorField>,
+ sphericalTensorFields_,
+ iter
)
{
HashPtrTable<sphericalTensorField>::const_iterator dptfIter =
@@ -561,12 +560,11 @@ void genericPointPatchField<Type>::rmap
}
}
- for
+ forAllIter
(
- HashPtrTable<symmTensorField>::iterator iter =
- symmTensorFields_.begin();
- iter != symmTensorFields_.end();
- ++iter
+ HashPtrTable<symmTensorField>,
+ symmTensorFields_,
+ iter
)
{
HashPtrTable<symmTensorField>::const_iterator dptfIter =
@@ -578,11 +576,11 @@ void genericPointPatchField<Type>::rmap
}
}
- for
+ forAllIter
(
- HashPtrTable<tensorField>::iterator iter = tensorFields_.begin();
- iter != tensorFields_.end();
- ++iter
+ HashPtrTable<tensorField>,
+ tensorFields_,
+ iter
)
{
HashPtrTable<tensorField>::const_iterator dptfIter =
@@ -601,12 +599,7 @@ void genericPointPatchField<Type>::write(Ostream& os) const
{
os.writeKeyword("type") << actualTypeName_ << token::END_STATEMENT << nl;
- for
- (
- dictionary::const_iterator iter = dict_.begin();
- iter != dict_.end();
- ++iter
- )
+ forAllConstIter(dictionary, dict_, iter)
{
if (iter().keyword() != "type")
{
diff --git a/src/lagrangian/basic/Cloud/Cloud.C b/src/lagrangian/basic/Cloud/Cloud.C
index c1b40ee6b55d9efa63536caacccdbe08de6632d3..9248cd4abcc632bac373787be9a397f047f366d3 100644
--- a/src/lagrangian/basic/Cloud/Cloud.C
+++ b/src/lagrangian/basic/Cloud/Cloud.C
@@ -435,12 +435,7 @@ void Foam::Cloud<ParticleType>::move(TrackingData& td)
typename ParticleType::iNew(*this)
);
- forAllIter
- (
- typename Cloud<ParticleType>,
- newParticles,
- newpIter
- )
+ forAllIter(typename Cloud<ParticleType>, newParticles, newpIter)
{
ParticleType& newp = newpIter();
newp.correctAfterParallelTransfer(patchi, td);
diff --git a/src/lagrangian/dieselSpray/spray/spray.H b/src/lagrangian/dieselSpray/spray/spray.H
index fc7d7f6403b17e4199f38179e1bed3888ea5aee6..86859aa17c1fd5570d444d4277b7e5b4277443ee 100644
--- a/src/lagrangian/dieselSpray/spray/spray.H
+++ b/src/lagrangian/dieselSpray/spray/spray.H
@@ -198,9 +198,8 @@ public:
);
- // Destructor
-
- ~spray();
+ //- Destructor
+ ~spray();
// Member Functions
diff --git a/src/lagrangian/dieselSpray/spray/sprayFunctions.C b/src/lagrangian/dieselSpray/spray/sprayFunctions.C
index bbf146e1f890c220852280095eded61edc113f06..23c2e3d39414e5b84f88f2a92ba00f990e904d9c 100644
--- a/src/lagrangian/dieselSpray/spray/sprayFunctions.C
+++ b/src/lagrangian/dieselSpray/spray/sprayFunctions.C
@@ -37,7 +37,7 @@ scalar spray::injectedMass(const scalar t) const
{
scalar sum = 0.0;
- forAll (injectors_, i)
+ forAll(injectors_, i)
{
sum += injectors_[i].properties()->injectedMass(t);
}
@@ -50,7 +50,7 @@ scalar spray::totalMassToInject() const
{
scalar sum = 0.0;
- forAll (injectors_, i)
+ forAll(injectors_, i)
{
sum += injectors_[i].properties()->mass();
}
@@ -67,7 +67,7 @@ scalar spray::injectedEnthalpy
scalar sum = 0.0;
label Nf = fuels_->components().size();
- forAll (injectors_, i)
+ forAll(injectors_, i)
{
scalar T = injectors_[i].properties()->T(time);
scalarField X(injectors_[i].properties()->X());
@@ -93,14 +93,9 @@ scalar spray::liquidMass() const
{
scalar sum = 0.0;
- for
- (
- spray::const_iterator elmnt = begin();
- elmnt != end();
- ++elmnt
- )
+ forAllConstIter(spray, *this, iter)
{
- sum += elmnt().m();
+ sum += iter().m();
}
if (twoD())
@@ -119,30 +114,25 @@ scalar spray::liquidEnthalpy() const
scalar sum = 0.0;
label Nf = fuels().components().size();
- for
- (
- spray::const_iterator elmnt = begin();
- elmnt != end();
- ++elmnt
- )
+ forAllConstIter(spray, *this, iter)
{
- scalar T = elmnt().T();
- scalar pc = p()[elmnt().cell()];
- scalar hlat = fuels().hl(pc, T, elmnt().X());
+ scalar T = iter().T();
+ scalar pc = p()[iter().cell()];
+ scalar hlat = fuels().hl(pc, T, iter().X());
scalar hg = 0.0;
- scalar Wl = fuels().W(elmnt().X());
+ scalar Wl = fuels().W(iter().X());
for (label j=0; j<Nf; j++)
{
label k = liquidToGasIndex_[j];
hg +=
- gasProperties()[k].H(T)*gasProperties()[k].W()*elmnt().X()[j]
+ gasProperties()[k].H(T)*gasProperties()[k].W()*iter().X()[j]
/Wl;
}
scalar h = hg - hlat;
- sum += elmnt().m()*h;
+ sum += iter().m()*h;
}
if (twoD())
@@ -161,33 +151,28 @@ scalar spray::liquidTotalEnthalpy() const
scalar sum = 0.0;
label Nf = fuels().components().size();
- for
- (
- spray::const_iterator elmnt = begin();
- elmnt != end();
- ++elmnt
- )
+ forAllConstIter(spray, *this, iter)
{
- label celli = elmnt().cell();
- scalar T = elmnt().T();
+ label celli = iter().cell();
+ scalar T = iter().T();
scalar pc = p()[celli];
- scalar rho = fuels().rho(pc, T, elmnt().X());
- scalar hlat = fuels().hl(pc, T, elmnt().X());
+ scalar rho = fuels().rho(pc, T, iter().X());
+ scalar hlat = fuels().hl(pc, T, iter().X());
scalar hg = 0.0;
- scalar Wl = fuels().W(elmnt().X());
+ scalar Wl = fuels().W(iter().X());
for (label j=0; j<Nf; j++)
{
label k = liquidToGasIndex_[j];
hg +=
- gasProperties()[k].H(T)*gasProperties()[k].W()*elmnt().X()[j]
+ gasProperties()[k].H(T)*gasProperties()[k].W()*iter().X()[j]
/Wl;
}
- scalar psat = fuels().pv(pc, T, elmnt().X());
+ scalar psat = fuels().pv(pc, T, iter().X());
scalar h = hg - hlat + (pc - psat)/rho;
- sum += elmnt().m()*h;
+ sum += iter().m()*h;
}
if (twoD())
@@ -204,15 +189,11 @@ scalar spray::liquidTotalEnthalpy() const
scalar spray::liquidKineticEnergy() const
{
scalar sum = 0.0;
- for
- (
- spray::const_iterator elmnt = begin();
- elmnt != end();
- ++elmnt
- )
+
+ forAllConstIter(spray, *this, iter)
{
- scalar ke = pow(mag(elmnt().U()), 2.0);
- sum += elmnt().m()*ke;
+ const scalar ke = pow(mag(iter().U()), 2.0);
+ sum += iter().m()*ke;
}
if (twoD())
@@ -286,13 +267,13 @@ scalar spray::liquidPenetration
for
(
- spray::const_iterator elmnt = ++first;
- elmnt != end();
- ++elmnt
+ spray::const_iterator iter = ++first;
+ iter != end();
+ ++iter
)
{
- scalar de = mag(elmnt().position() - ip);
- scalar me = elmnt().m();
+ scalar de = mag(iter().position() - ip);
+ scalar me = iter().m();
mTot += me;
n++;
@@ -357,8 +338,8 @@ scalar spray::liquidPenetration
{
if (Np > 0)
{
- spray::const_iterator elmnt = begin();
- d = mag(elmnt().position() - ip);
+ spray::const_iterator iter = begin();
+ d = mag(iter().position() - ip);
}
}
@@ -372,20 +353,15 @@ scalar spray::smd() const
{
scalar numerator = 0.0, denominator = VSMALL;
- for
- (
- spray::const_iterator elmnt = begin();
- elmnt != end();
- ++elmnt
- )
+ forAllConstIter(spray, *this, iter)
{
- label celli = elmnt().cell();
+ label celli = iter().cell();
scalar Pc = p()[celli];
- scalar T = elmnt().T();
- scalar rho = fuels_->rho(Pc, T, elmnt().X());
+ scalar T = iter().T();
+ scalar rho = fuels_->rho(Pc, T, iter().X());
- scalar tmp = elmnt().N(rho)*pow(elmnt().d(), 2.0);
- numerator += tmp*elmnt().d();
+ scalar tmp = iter().N(rho)*pow(iter().d(), 2.0);
+ numerator += tmp*iter().d();
denominator += tmp;
}
@@ -400,14 +376,9 @@ scalar spray::maxD() const
{
scalar maxD = 0.0;
- for
- (
- spray::const_iterator elmnt = begin();
- elmnt != end();
- ++elmnt
- )
+ forAllConstIter(spray, *this, iter)
{
- maxD = max(maxD, elmnt().d());
+ maxD = max(maxD, iter().d());
}
reduce(maxD, maxOp<scalar>());
diff --git a/src/lagrangian/dieselSpray/spray/sprayOps.C b/src/lagrangian/dieselSpray/spray/sprayOps.C
index 37e6deee020bb35f1377107cf1296b1c5051e600..6210c0196727bd5fa65116a98fb1410477c67c49 100644
--- a/src/lagrangian/dieselSpray/spray/sprayOps.C
+++ b/src/lagrangian/dieselSpray/spray/sprayOps.C
@@ -33,12 +33,7 @@ License
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-void spray::evolve()
+void Foam::spray::evolve()
{
sms_.setSize(rho_.size());
shs_.setSize(rho_.size());
@@ -71,7 +66,7 @@ void spray::evolve()
}
-void spray::move()
+void Foam::spray::move()
{
// Reset Spray Source Terms
sms_ = vector::zero;
@@ -85,9 +80,9 @@ void spray::move()
}
-void spray::breakupLoop()
+void Foam::spray::breakupLoop()
{
- forAllIter(spray::iterator, *this, elmnt)
+ forAllIter(spray, *this, elmnt)
{
// interpolate...
vector velocity = UInterpolator().interpolate
@@ -119,9 +114,9 @@ void spray::breakupLoop()
}
-void spray::atomizationLoop()
+void Foam::spray::atomizationLoop()
{
- forAllIter(spray::iterator, *this, elmnt)
+ forAllIter(spray, *this, elmnt)
{
// interpolate...
vector velocity = UInterpolator().interpolate
@@ -145,8 +140,4 @@ void spray::atomizationLoop()
}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
// ************************************************************************* //
diff --git a/src/lagrangian/dieselSpray/spraySubModels/atomizationModel/LISA/LISA.C b/src/lagrangian/dieselSpray/spraySubModels/atomizationModel/LISA/LISA.C
index 368bc4a98a425003ee6638385dc74b61cc5982af..5334e2295d75dcfde49a993a99cd4a59bff37ac0 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/atomizationModel/LISA/LISA.C
+++ b/src/lagrangian/dieselSpray/spraySubModels/atomizationModel/LISA/LISA.C
@@ -86,7 +86,7 @@ void Foam::LISA::atomizeParcel
scalar Taverage = p.T() + (temperature - p.T())/3.0;
scalar Winv = 0.0;
- forAll (Y, i)
+ forAll(Y, i)
{
Winv += Y[i][cellI]/spray_.gasProperties()[i].W();
}
diff --git a/src/lagrangian/dieselSpray/spraySubModels/breakupModel/noBreakup/noBreakup.H b/src/lagrangian/dieselSpray/spraySubModels/breakupModel/noBreakup/noBreakup.H
index 69f5fbcb01df7dc7ccc757ea8cafb2078b8b62ae..d757d60ace76cab00756e5abdcdac67542029a7d 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/breakupModel/noBreakup/noBreakup.H
+++ b/src/lagrangian/dieselSpray/spraySubModels/breakupModel/noBreakup/noBreakup.H
@@ -64,7 +64,7 @@ public:
noBreakup(const dictionary& dict, spray& sm);
- // Destructor
+ //- Destructor
virtual ~noBreakup();
diff --git a/src/lagrangian/dieselSpray/spraySubModels/dispersionModel/gradientDispersionRAS/gradientDispersionRAS.C b/src/lagrangian/dieselSpray/spraySubModels/dispersionModel/gradientDispersionRAS/gradientDispersionRAS.C
index 340c48325a489664c64dd76c2e5425c93b5d8506..b154974a2643221bd45ae12f10907a5eb8acf285 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/dispersionModel/gradientDispersionRAS/gradientDispersionRAS.C
+++ b/src/lagrangian/dieselSpray/spraySubModels/dispersionModel/gradientDispersionRAS/gradientDispersionRAS.C
@@ -74,20 +74,15 @@ void Foam::gradientDispersionRAS::disperseParcels() const
const volScalarField& epsilon = turbulence().epsilon();
const volVectorField& U = spray_.U();
- for
- (
- spray::iterator elmnt = spray_.begin();
- elmnt != spray_.end();
- ++elmnt
- )
+ forAllIter(spray, spray_, elmnt)
{
- label celli = elmnt().cell();
- scalar UrelMag = mag(elmnt().U() - U[celli] - elmnt().Uturb());
+ const label cellI = elmnt().cell();
+ scalar UrelMag = mag(elmnt().U() - U[cellI] - elmnt().Uturb());
scalar Tturb = min
(
- k[celli]/epsilon[celli],
- cps*pow(k[celli], 1.5)/epsilon[celli]/(UrelMag + SMALL)
+ k[cellI]/epsilon[cellI],
+ cps*pow(k[cellI], 1.5)/epsilon[cellI]/(UrelMag + SMALL)
);
// parcel is perturbed by the turbulence
if (dt < Tturb)
@@ -98,8 +93,8 @@ void Foam::gradientDispersionRAS::disperseParcels() const
{
elmnt().tTurb() = 0.0;
- scalar sigma = sqrt(2.0*k[celli]/3.0);
- vector dir = -gradk[celli]/(mag(gradk[celli]) + SMALL);
+ scalar sigma = sqrt(2.0*k[cellI]/3.0);
+ vector dir = -gradk[cellI]/(mag(gradk[cellI]) + SMALL);
// numerical recipes... Ch. 7. Random Numbers...
scalar x1 = 0.0;
diff --git a/src/lagrangian/dieselSpray/spraySubModels/dispersionModel/stochasticDispersionRAS/stochasticDispersionRAS.C b/src/lagrangian/dieselSpray/spraySubModels/dispersionModel/stochasticDispersionRAS/stochasticDispersionRAS.C
index 6163462653c56c63891e7f0f437a3b8dbf336df0..c7e7e4cd09f36bc7224e14ff8c50e16e95728f38 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/dispersionModel/stochasticDispersionRAS/stochasticDispersionRAS.C
+++ b/src/lagrangian/dieselSpray/spraySubModels/dispersionModel/stochasticDispersionRAS/stochasticDispersionRAS.C
@@ -75,20 +75,15 @@ void Foam::stochasticDispersionRAS::disperseParcels() const
const volScalarField& epsilon = turbulence().epsilon();
const volVectorField& U = spray_.U();
- for
- (
- spray::iterator elmnt = spray_.begin();
- elmnt != spray_.end();
- ++elmnt
- )
+ forAllIter(spray, spray_, elmnt)
{
- label celli = elmnt().cell();
- scalar UrelMag = mag(elmnt().U() - U[celli] - elmnt().Uturb());
+ const label cellI = elmnt().cell();
+ scalar UrelMag = mag(elmnt().U() - U[cellI] - elmnt().Uturb());
scalar Tturb = min
(
- k[celli]/epsilon[celli],
- cps*pow(k[celli], 1.5)/epsilon[celli]/(UrelMag + SMALL)
+ k[cellI]/epsilon[cellI],
+ cps*pow(k[cellI], 1.5)/epsilon[cellI]/(UrelMag + SMALL)
);
// parcel is perturbed by the turbulence
@@ -100,7 +95,7 @@ void Foam::stochasticDispersionRAS::disperseParcels() const
{
elmnt().tTurb() = 0.0;
- scalar sigma = sqrt(2.0*k[celli]/3.0);
+ scalar sigma = sqrt(2.0*k[cellI]/3.0);
vector dir = 2.0*spray_.rndGen().vector01() - one;
dir /= mag(dir) + SMALL;
diff --git a/src/lagrangian/dsmc/submodels/BinaryCollisionModel/BinaryCollisionModel/BinaryCollisionModel.H b/src/lagrangian/dsmc/submodels/BinaryCollisionModel/BinaryCollisionModel/BinaryCollisionModel.H
index 5b88ad93cf1d1542f1fd90690237c56496cab4db..d60eec82daa690cba93d32b5c9d267417eadf7ff 100644
--- a/src/lagrangian/dsmc/submodels/BinaryCollisionModel/BinaryCollisionModel/BinaryCollisionModel.H
+++ b/src/lagrangian/dsmc/submodels/BinaryCollisionModel/BinaryCollisionModel/BinaryCollisionModel.H
@@ -94,7 +94,7 @@ public:
);
- // Destructor
+ //- Destructor
virtual ~BinaryCollisionModel();
diff --git a/src/lagrangian/dsmc/submodels/BinaryCollisionModel/LarsenBorgnakkeVariableHardSphere/LarsenBorgnakkeVariableHardSphere.H b/src/lagrangian/dsmc/submodels/BinaryCollisionModel/LarsenBorgnakkeVariableHardSphere/LarsenBorgnakkeVariableHardSphere.H
index b89b3e88a5e5956b9c44d3538625d27b1bab4626..f01f625e3f7e53a111f8fc0d3c5c89ea59b3c680 100644
--- a/src/lagrangian/dsmc/submodels/BinaryCollisionModel/LarsenBorgnakkeVariableHardSphere/LarsenBorgnakkeVariableHardSphere.H
+++ b/src/lagrangian/dsmc/submodels/BinaryCollisionModel/LarsenBorgnakkeVariableHardSphere/LarsenBorgnakkeVariableHardSphere.H
@@ -83,7 +83,7 @@ public:
);
- // Destructor
+ //- Destructor
virtual ~LarsenBorgnakkeVariableHardSphere();
diff --git a/src/lagrangian/dsmc/submodels/BinaryCollisionModel/VariableHardSphere/VariableHardSphere.H b/src/lagrangian/dsmc/submodels/BinaryCollisionModel/VariableHardSphere/VariableHardSphere.H
index cf58350a61816f5e4f90c5c21ac15b4114d817a9..17e1684ee9f9e25e416a9bc17a54b46d1b754630 100644
--- a/src/lagrangian/dsmc/submodels/BinaryCollisionModel/VariableHardSphere/VariableHardSphere.H
+++ b/src/lagrangian/dsmc/submodels/BinaryCollisionModel/VariableHardSphere/VariableHardSphere.H
@@ -68,7 +68,7 @@ public:
);
- // Destructor
+ //- Destructor
virtual ~VariableHardSphere();
diff --git a/src/lagrangian/dsmc/submodels/InflowBoundaryModel/FreeStream/FreeStream.H b/src/lagrangian/dsmc/submodels/InflowBoundaryModel/FreeStream/FreeStream.H
index ea71882b40fb9268c2244d14a212446e87402af1..e8fc638e550498d19f33a137dc4cfce68ecdbabb 100644
--- a/src/lagrangian/dsmc/submodels/InflowBoundaryModel/FreeStream/FreeStream.H
+++ b/src/lagrangian/dsmc/submodels/InflowBoundaryModel/FreeStream/FreeStream.H
@@ -87,7 +87,7 @@ public:
);
- // Destructor
+ //- Destructor
virtual ~FreeStream();
diff --git a/src/lagrangian/dsmc/submodels/InflowBoundaryModel/NoInflow/NoInflow.H b/src/lagrangian/dsmc/submodels/InflowBoundaryModel/NoInflow/NoInflow.H
index 57205211f28f668cd633a3ee06680257c651a589..e969da048c1ed4d52da4f8763b88de2a1e435f6a 100644
--- a/src/lagrangian/dsmc/submodels/InflowBoundaryModel/NoInflow/NoInflow.H
+++ b/src/lagrangian/dsmc/submodels/InflowBoundaryModel/NoInflow/NoInflow.H
@@ -63,7 +63,7 @@ public:
);
- // Destructor
+ //- Destructor
virtual ~NoInflow();
diff --git a/src/lagrangian/dsmc/submodels/WallInteractionModel/MaxwellianThermal/MaxwellianThermal.H b/src/lagrangian/dsmc/submodels/WallInteractionModel/MaxwellianThermal/MaxwellianThermal.H
index a9a3c1b805ae35f2754676305799e47e71b460b9..f42382b7da04fded732bae43602f15ba69510887 100644
--- a/src/lagrangian/dsmc/submodels/WallInteractionModel/MaxwellianThermal/MaxwellianThermal.H
+++ b/src/lagrangian/dsmc/submodels/WallInteractionModel/MaxwellianThermal/MaxwellianThermal.H
@@ -64,7 +64,7 @@ public:
);
- // Destructor
+ //- Destructor
virtual ~MaxwellianThermal();
diff --git a/src/lagrangian/dsmc/submodels/WallInteractionModel/MixedDiffuseSpecular/MixedDiffuseSpecular.H b/src/lagrangian/dsmc/submodels/WallInteractionModel/MixedDiffuseSpecular/MixedDiffuseSpecular.H
index c2f161638ac11b5d37cd9bdf745e2d0f7ed2c731..f3745dbc907a44c9b7752cda13ef219b39c4bcdb 100644
--- a/src/lagrangian/dsmc/submodels/WallInteractionModel/MixedDiffuseSpecular/MixedDiffuseSpecular.H
+++ b/src/lagrangian/dsmc/submodels/WallInteractionModel/MixedDiffuseSpecular/MixedDiffuseSpecular.H
@@ -70,7 +70,7 @@ public:
);
- // Destructor
+ //- Destructor
virtual ~MixedDiffuseSpecular();
diff --git a/src/lagrangian/dsmc/submodels/WallInteractionModel/SpecularReflection/SpecularReflection.H b/src/lagrangian/dsmc/submodels/WallInteractionModel/SpecularReflection/SpecularReflection.H
index 86d558b3aeae0d7dc0687e1edaad6c75f4b86f79..1c47640fe38c4779f53f188460547312290c3628 100644
--- a/src/lagrangian/dsmc/submodels/WallInteractionModel/SpecularReflection/SpecularReflection.H
+++ b/src/lagrangian/dsmc/submodels/WallInteractionModel/SpecularReflection/SpecularReflection.H
@@ -63,7 +63,7 @@ public:
);
- // Destructor
+ //- Destructor
virtual ~SpecularReflection();
diff --git a/src/lagrangian/dsmc/submodels/WallInteractionModel/WallInteractionModel/WallInteractionModel.H b/src/lagrangian/dsmc/submodels/WallInteractionModel/WallInteractionModel/WallInteractionModel.H
index 691caf7a521c3efe9c771ca26c3f323cc18f291e..049fc99014fb134e714f20ce1b160def01f7f47a 100644
--- a/src/lagrangian/dsmc/submodels/WallInteractionModel/WallInteractionModel/WallInteractionModel.H
+++ b/src/lagrangian/dsmc/submodels/WallInteractionModel/WallInteractionModel/WallInteractionModel.H
@@ -94,7 +94,7 @@ public:
);
- // Destructor
+ //- Destructor
virtual ~WallInteractionModel();
diff --git a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloudI.H b/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloudI.H
index 13a2634a083b18bedea36a3a93471a07e1496bfb..e68f44dba4fa59518e0d801bab14992643e7b6f2 100644
--- a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloudI.H
+++ b/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloudI.H
@@ -112,7 +112,7 @@ Foam::ReactingCloud<ParcelType>::Srho() const
);
scalarField& sourceField = trhoTrans().field();
- forAll (rhoTrans_, i)
+ forAll(rhoTrans_, i)
{
sourceField += rhoTrans_[i];
}
diff --git a/src/lagrangian/intermediate/particleForces/particleForces.C b/src/lagrangian/intermediate/particleForces/particleForces.C
index f08bb68dfd2216ac54349103c4edc965771eea2f..7a07051def2cc55c69074e48a3758d99b3fcc8de 100644
--- a/src/lagrangian/intermediate/particleForces/particleForces.C
+++ b/src/lagrangian/intermediate/particleForces/particleForces.C
@@ -118,7 +118,7 @@ void Foam::particleForces::cacheFields(const bool store)
{
if (store && pressureGradient_)
{
- const volVectorField U = mesh_.lookupObject<volVectorField>(UName_);
+ const volVectorField& U = mesh_.lookupObject<volVectorField>(UName_);
gradUPtr_ = fvc::grad(U).ptr();
}
else
diff --git a/src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.C b/src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.C
index eb0bfc270365e324d9fadfcc0702cce2fde00ccc..bd01c8b2070cbe3b9367cfb406b4cd226c9168d6 100644
--- a/src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.C
+++ b/src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.C
@@ -78,7 +78,7 @@ void Foam::phaseProperties::setGlobalCarrierIds
forAll(names_, i)
{
- forAll (carrierNames, j)
+ forAll(carrierNames, j)
{
if (carrierNames[j] == names_[i])
{
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.H
index c64cfec5671993c199394e5aaf1f0586a3e30059..f2aebb0fd8cdfe224bde3434e65df94a6e258101 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.H
@@ -143,7 +143,7 @@ public:
);
- // Destructor
+ //- Destructor
virtual ~FieldActivatedInjection();
diff --git a/src/lagrangian/intermediate/submodels/addOns/radiation/absorptionEmission/cloudAbsorptionEmission/cloudAbsorptionEmission.H b/src/lagrangian/intermediate/submodels/addOns/radiation/absorptionEmission/cloudAbsorptionEmission/cloudAbsorptionEmission.H
index c35ed67657d4f5083d15170071cf3b79c7468cf2..80054b371132bb69ca3b54ee03fb32796a7d9e24 100644
--- a/src/lagrangian/intermediate/submodels/addOns/radiation/absorptionEmission/cloudAbsorptionEmission/cloudAbsorptionEmission.H
+++ b/src/lagrangian/intermediate/submodels/addOns/radiation/absorptionEmission/cloudAbsorptionEmission/cloudAbsorptionEmission.H
@@ -73,7 +73,7 @@ public:
cloudAbsorptionEmission(const dictionary& dict, const fvMesh& mesh);
- // Destructor
+ //- Destructor
virtual ~cloudAbsorptionEmission();
diff --git a/src/lagrangian/intermediate/submodels/addOns/radiation/scatter/cloudScatter/cloudScatter.H b/src/lagrangian/intermediate/submodels/addOns/radiation/scatter/cloudScatter/cloudScatter.H
index cca9c53059c359261c97d224e1b838eafdb0db3b..df6ce1ef792fee3ada1b0085823bf694e947bf7d 100644
--- a/src/lagrangian/intermediate/submodels/addOns/radiation/scatter/cloudScatter/cloudScatter.H
+++ b/src/lagrangian/intermediate/submodels/addOns/radiation/scatter/cloudScatter/cloudScatter.H
@@ -77,7 +77,7 @@ public:
);
- // Destructor
+ //- Destructor
virtual ~cloudScatter();
diff --git a/src/lagrangian/molecularDynamics/molecularMeasurements/bufferedAccumulator/bufferedAccumulator.H b/src/lagrangian/molecularDynamics/molecularMeasurements/bufferedAccumulator/bufferedAccumulator.H
index ddfd438a2a382525bf8173c88bcb5a9e94ddb6b2..0311ad309655229b9de9d374e66fd5bbedfd056b 100644
--- a/src/lagrangian/molecularDynamics/molecularMeasurements/bufferedAccumulator/bufferedAccumulator.H
+++ b/src/lagrangian/molecularDynamics/molecularMeasurements/bufferedAccumulator/bufferedAccumulator.H
@@ -106,9 +106,8 @@ public:
bufferedAccumulator(const bufferedAccumulator<Type>&);
- // Destructor
-
- ~bufferedAccumulator();
+ //- Destructor
+ ~bufferedAccumulator();
// Member Functions
diff --git a/src/lagrangian/molecularDynamics/molecularMeasurements/correlationFunction/correlationFunction.H b/src/lagrangian/molecularDynamics/molecularMeasurements/correlationFunction/correlationFunction.H
index d3dfb694c90adf67d3a67de604a5cd25abd9b677..f0c26f9b1b96d41079d06736c1ce7c4362601028 100644
--- a/src/lagrangian/molecularDynamics/molecularMeasurements/correlationFunction/correlationFunction.H
+++ b/src/lagrangian/molecularDynamics/molecularMeasurements/correlationFunction/correlationFunction.H
@@ -120,9 +120,8 @@ public:
);
- // Destructor
-
- ~correlationFunction();
+ //- Destructor
+ ~correlationFunction();
// Member Functions
diff --git a/src/lagrangian/molecularDynamics/molecularMeasurements/distribution/distribution.C b/src/lagrangian/molecularDynamics/molecularMeasurements/distribution/distribution.C
index e8f6ecbd50f2e664a4438386e7e44bb9a6be5bb8..1110415d10f58dc7864792b9948af7723586fcef 100644
--- a/src/lagrangian/molecularDynamics/molecularMeasurements/distribution/distribution.C
+++ b/src/lagrangian/molecularDynamics/molecularMeasurements/distribution/distribution.C
@@ -340,7 +340,7 @@ Foam::List<Foam::Pair<Foam::scalar> > Foam::distribution::normalisedShifted
scalar checkNormalisation = 0;
- forAll (oldDist, oD)
+ forAll(oldDist, oD)
{
checkNormalisation += oldDist[oD].second()*binWidth_;
}
@@ -404,7 +404,7 @@ Foam::List<Foam::Pair<Foam::scalar> > Foam::distribution::normalisedShifted
{
scalar checkNormalisation = 0;
- forAll (newDist, nD)
+ forAll(newDist, nD)
{
checkNormalisation += newDist[nD].second()*binWidth_;
}
diff --git a/src/lagrangian/molecularDynamics/molecularMeasurements/distribution/distribution.H b/src/lagrangian/molecularDynamics/molecularMeasurements/distribution/distribution.H
index 25c273f31ad05f30eb19650fd8b946852cbe52f1..02f347d170225cde930268270808f21ce1a00d5e 100644
--- a/src/lagrangian/molecularDynamics/molecularMeasurements/distribution/distribution.H
+++ b/src/lagrangian/molecularDynamics/molecularMeasurements/distribution/distribution.H
@@ -87,9 +87,8 @@ public:
distribution(const distribution&);
- // Destructor
-
- virtual ~distribution();
+ //- Destructor
+ virtual ~distribution();
// Member Functions
diff --git a/src/lagrangian/molecularDynamics/molecule/interactionLists/directInteractionList/directInteractionList.C b/src/lagrangian/molecularDynamics/molecule/interactionLists/directInteractionList/directInteractionList.C
index caefeb483bc927dff574495712157c39bc5bb554..da9511daf543308e132d9c465e448276738d8885 100644
--- a/src/lagrangian/molecularDynamics/molecule/interactionLists/directInteractionList/directInteractionList.C
+++ b/src/lagrangian/molecularDynamics/molecule/interactionLists/directInteractionList/directInteractionList.C
@@ -45,7 +45,7 @@ void Foam::directInteractionList::buildDirectInteractionList
label pointJIndex;
- forAll (mesh.points(), pointIIndex)
+ forAll(mesh.points(), pointIIndex)
{
for
(
diff --git a/src/lagrangian/molecularDynamics/molecule/interactionLists/directInteractionList/directInteractionList.H b/src/lagrangian/molecularDynamics/molecule/interactionLists/directInteractionList/directInteractionList.H
index 79c3401a7ad5a37c4bc51dc0a617809bb6f88801..1c7c6272ee44dfe15770e94ad7d51c062bf557af 100644
--- a/src/lagrangian/molecularDynamics/molecule/interactionLists/directInteractionList/directInteractionList.H
+++ b/src/lagrangian/molecularDynamics/molecule/interactionLists/directInteractionList/directInteractionList.H
@@ -91,9 +91,8 @@ public:
);
- // Destructor
-
- ~directInteractionList();
+ //- Destructor
+ ~directInteractionList();
// Member Functions
diff --git a/src/lagrangian/molecularDynamics/molecule/interactionLists/interactionLists.C b/src/lagrangian/molecularDynamics/molecule/interactionLists/interactionLists.C
index a0201662eead657c8e717cdda403180f92cd555c..c9e7a6aa4e3b3896df023f6ffba810a2a81aa355 100644
--- a/src/lagrangian/molecularDynamics/molecule/interactionLists/interactionLists.C
+++ b/src/lagrangian/molecularDynamics/molecule/interactionLists/interactionLists.C
@@ -271,7 +271,7 @@ bool Foam::interactionLists::testPointFaceDistance
{
const vector& pointPosition(mesh_.points()[p]);
- forAll (refCell.faces(), rCF)
+ forAll(refCell.faces(), rCF)
{
if
(
@@ -524,7 +524,7 @@ const Foam::labelList Foam::interactionLists::realCellsInRangeOfSegment
{
const label f = segmentFaces[sF];
- forAll (mesh_.points(), p)
+ forAll(mesh_.points(), p)
{
if (testPointFaceDistance(p, f))
{
@@ -577,7 +577,7 @@ const Foam::labelList Foam::interactionLists::realCellsInRangeOfSegment
{
const edge& eJ(mesh_.edges()[segmentEdges[sE]]);
- forAll (mesh_.edges(), edgeIIndex)
+ forAll(mesh_.edges(), edgeIIndex)
{
const edge& eI(mesh_.edges()[edgeIIndex]);
diff --git a/src/lagrangian/molecularDynamics/molecule/interactionLists/interactionLists.H b/src/lagrangian/molecularDynamics/molecule/interactionLists/interactionLists.H
index 010b7cfade0a8051e656a63342241a2711cee698..67e053b79e7f6460758da36a4d5e6d740a4b0398 100644
--- a/src/lagrangian/molecularDynamics/molecule/interactionLists/interactionLists.H
+++ b/src/lagrangian/molecularDynamics/molecule/interactionLists/interactionLists.H
@@ -106,9 +106,8 @@ public:
interactionLists(const polyMesh& mesh);
- // Destructor
-
- ~interactionLists();
+ //- Destructor
+ ~interactionLists();
// Member Functions
diff --git a/src/lagrangian/molecularDynamics/molecule/interactionLists/referredCell/referredCell.H b/src/lagrangian/molecularDynamics/molecule/interactionLists/referredCell/referredCell.H
index 2f69dc0295780480125931fa533a6563d498bdff..a954c13f8aa6bbc540e1bdf58f89a6ad19b9f69c 100644
--- a/src/lagrangian/molecularDynamics/molecule/interactionLists/referredCell/referredCell.H
+++ b/src/lagrangian/molecularDynamics/molecule/interactionLists/referredCell/referredCell.H
@@ -162,9 +162,8 @@ public:
);
- // Destructor
-
- virtual ~referredCell();
+ //- Destructor
+ virtual ~referredCell();
// Member Functions
diff --git a/src/lagrangian/molecularDynamics/molecule/interactionLists/referredCellList/referredCellList.C b/src/lagrangian/molecularDynamics/molecule/interactionLists/referredCellList/referredCellList.C
index 16e0c904a173f7761dd8011ae5bc214dc94ed825..32a63258981d35b75052fad5ad6ce896e5662e72 100644
--- a/src/lagrangian/molecularDynamics/molecule/interactionLists/referredCellList/referredCellList.C
+++ b/src/lagrangian/molecularDynamics/molecule/interactionLists/referredCellList/referredCellList.C
@@ -166,7 +166,7 @@ void Foam::referredCellList::buildReferredCellList
procPatchSegMap.setSize(patch.size());
- forAll (patch, pI)
+ forAll(patch, pI)
{
label decomposedMeshFace = patch.start() + pI;
@@ -298,7 +298,7 @@ void Foam::referredCellList::buildReferredCellList
DynamicList<tensor> refTrans;
- forAll (patch, faceI)
+ forAll(patch, faceI)
{
if (processorPatchSegmentMapping[pP][faceI] == nUP)
{
@@ -363,7 +363,7 @@ void Foam::referredCellList::buildReferredCellList
{
label refIntListStartSize = referredInteractionList.size();
- forAll (mesh.boundaryMesh(), patchI)
+ forAll(mesh.boundaryMesh(), patchI)
{
// Treat local cyclics on each processor before processor
// boundaries. Separate treatment allows the serial version to run
@@ -473,7 +473,7 @@ void Foam::referredCellList::buildReferredCellList
const labelList& faceEdges = mesh.faceEdges()[segFace];
- forAll (faceEdges, fE)
+ forAll(faceEdges, fE)
{
const label faceEdge(faceEdges[fE]);
@@ -492,7 +492,7 @@ void Foam::referredCellList::buildReferredCellList
const face& facePoints(mesh.faces()[segFace]);
- forAll (facePoints, fP)
+ forAll(facePoints, fP)
{
const label facePoint(facePoints[fP]);
@@ -703,7 +703,7 @@ void Foam::referredCellList::buildReferredCellList
const labelList& faceEdges = mesh.faceEdges()[segFace];
- forAll (faceEdges, fE)
+ forAll(faceEdges, fE)
{
const label faceEdge(faceEdges[fE]);
@@ -724,7 +724,7 @@ void Foam::referredCellList::buildReferredCellList
const face& facePoints(mesh.faces()[segFace]);
- forAll (facePoints, fP)
+ forAll(facePoints, fP)
{
const label facePoint(facePoints[fP]);
@@ -948,7 +948,7 @@ void Foam::referredCellList::buildReferredCellList
DynamicList<label> meshFacesOnThisSegment;
- forAll (patch, faceI)
+ forAll(patch, faceI)
{
if (processorPatchSegmentMapping[pP][faceI] == nUP)
{
@@ -976,7 +976,7 @@ void Foam::referredCellList::buildReferredCellList
const labelList& faceEdges = mesh.faceEdges()[segFace];
- forAll (faceEdges, fE)
+ forAll(faceEdges, fE)
{
const label faceEdge(faceEdges[fE]);
@@ -997,7 +997,7 @@ void Foam::referredCellList::buildReferredCellList
const face& facePoints(mesh.faces()[segFace]);
- forAll (facePoints, fP)
+ forAll(facePoints, fP)
{
const label facePoint(facePoints[fP]);
@@ -1398,7 +1398,7 @@ void Foam::referredCellList::buildReferredCellList
// scalar rCutMaxSqr = molCloud_.rCutMax()*molCloud_.rCutMax();
//
-// forAll (molCloud_.mesh().points(), pointIIndex)
+// forAll(molCloud_.mesh().points(), pointIIndex)
// {
// const point& ptI
// (
@@ -1485,7 +1485,7 @@ void Foam::referredCellList::referMolecules
{
List<molecule*> realMols = cellOccupancy[sRL[sRLI]];
- forAll (realMols, rM)
+ forAll(realMols, rM)
{
molecule* mol = realMols[rM];
diff --git a/src/lagrangian/molecularDynamics/molecule/interactionLists/referredCellList/referredCellList.H b/src/lagrangian/molecularDynamics/molecule/interactionLists/referredCellList/referredCellList.H
index 61fcb1be54dfe8850e0a84135315edf7315f7a36..5f6f8284c7bcadecd9e420aa734d58c0871c6222 100644
--- a/src/lagrangian/molecularDynamics/molecule/interactionLists/referredCellList/referredCellList.H
+++ b/src/lagrangian/molecularDynamics/molecule/interactionLists/referredCellList/referredCellList.H
@@ -82,9 +82,8 @@ public:
referredCellList (interactionLists& il);
- // Destructor
-
- ~referredCellList();
+ //- Destructor
+ ~referredCellList();
// Member Functions
diff --git a/src/lagrangian/molecularDynamics/molecule/interactionLists/referredMolecule/referredMolecule.H b/src/lagrangian/molecularDynamics/molecule/interactionLists/referredMolecule/referredMolecule.H
index 5832945ba9b5e354928c4216574e96da634fca73..c55c3ba26322adcecbbc48dceb41312ad3915c78 100644
--- a/src/lagrangian/molecularDynamics/molecule/interactionLists/referredMolecule/referredMolecule.H
+++ b/src/lagrangian/molecularDynamics/molecule/interactionLists/referredMolecule/referredMolecule.H
@@ -74,9 +74,8 @@ public:
);
- // Destructor
-
- virtual ~referredMolecule();
+ //- Destructor
+ virtual ~referredMolecule();
// Member Functions
diff --git a/src/lagrangian/molecularDynamics/molecule/mdTools/averageMDFields.H b/src/lagrangian/molecularDynamics/molecule/mdTools/averageMDFields.H
index 4e93070479e69dfaf71c485acf929e7ac8faab0a..5a195aa9389a1a1cd1365f5b1bb0449a5aaf20e4 100644
--- a/src/lagrangian/molecularDynamics/molecule/mdTools/averageMDFields.H
+++ b/src/lagrangian/molecularDynamics/molecule/mdTools/averageMDFields.H
@@ -6,7 +6,7 @@ if (runTime.outputTime())
scalarField totalRhoN_sum(mesh.nCells(), 0.0);
- forAll (allSpeciesRhoN, rN)
+ forAll(allSpeciesRhoN, rN)
{
allSpeciesRhoN[rN].internalField() =
allSpeciesN_RU[rN]
@@ -25,7 +25,7 @@ if (runTime.outputTime())
scalarField totalRhoM_sum(mesh.nCells(), 0.0);
- forAll (allSpeciesRhoM, rM)
+ forAll(allSpeciesRhoM, rM)
{
allSpeciesRhoM[rM].internalField() =
allSpeciesM_RU[rM]
@@ -45,7 +45,7 @@ if (runTime.outputTime())
scalarField totalMass_sum(mesh.nCells(), 0.0);
- forAll (allSpeciesVelocity, v)
+ forAll(allSpeciesVelocity, v)
{
// A check for 1/0 molecules is required.
@@ -99,7 +99,7 @@ if (runTime.outputTime())
scalarField totalN_sum(mesh.nCells(), 0.0);
- forAll (allSpeciesTemperature, t)
+ forAll(allSpeciesTemperature, t)
{
// A check for 1/0 molecules is required.
@@ -170,7 +170,7 @@ if (runTime.outputTime())
scalarField totalKE_sum(mesh.nCells(), 0.0);
- forAll (allSpeciesMeanKE, mKE)
+ forAll(allSpeciesMeanKE, mKE)
{
// A check for 1/0 molecules is required.
diff --git a/src/lagrangian/molecularDynamics/molecule/mdTools/calculateAutoCorrelationFunctions.H b/src/lagrangian/molecularDynamics/molecule/mdTools/calculateAutoCorrelationFunctions.H
index bcbc93db86e93e17a48be5d95d33786033b077d8..eda25d00f73675906e6d38ac074f2a59d6a7374d 100644
--- a/src/lagrangian/molecularDynamics/molecule/mdTools/calculateAutoCorrelationFunctions.H
+++ b/src/lagrangian/molecularDynamics/molecule/mdTools/calculateAutoCorrelationFunctions.H
@@ -25,20 +25,13 @@ License
if (mesh.time().timeIndex() % vacf.sampleSteps() == 0)
{
- IDLList<molecule>::iterator mol(molecules.begin());
-
Field<vector> uVals(molecules.size());
label uV = 0;
- for
- (
- mol = molecules.begin();
- mol != molecules.end();
- ++mol, uV++
- )
+ forAllConstIter(IDLList<molecule>, molecules, mol)
{
- uVals[uV] = mol().U();
+ uVals[uV++] = mol().U();
}
vacf.calculateCorrelationFunction(uVals);
@@ -46,16 +39,9 @@ if (mesh.time().timeIndex() % vacf.sampleSteps() == 0)
if (mesh.time().timeIndex() % pacf.sampleSteps() == 0)
{
- IDLList<molecule>::iterator mol(molecules.begin());
-
vector p = vector::zero;
- for
- (
- mol = molecules.begin();
- mol != molecules.end();
- ++mol
- )
+ forAllConstIter(IDLList<molecule>, molecules, mol)
{
p.x() +=
mol().mass() * mol().U().y() * mol().U().z()
@@ -75,17 +61,9 @@ if (mesh.time().timeIndex() % pacf.sampleSteps() == 0)
if (mesh.time().timeIndex() % hfacf.sampleSteps() == 0)
{
-
- IDLList<molecule>::iterator mol(molecules.begin());
-
vector s = vector::zero;
- for
- (
- mol = molecules.begin();
- mol != molecules.end();
- ++mol
- )
+ forAllConstIter(IDLList<molecule>, molecules, mol)
{
s +=
(
diff --git a/src/lagrangian/molecularDynamics/molecule/mdTools/createMDFields.H b/src/lagrangian/molecularDynamics/molecule/mdTools/createMDFields.H
index 50e82df48ab0ab945297c8c521db9a5be9bac366..6d6617d652084e773ca496e7bdcafa61e9cdaec5 100644
--- a/src/lagrangian/molecularDynamics/molecule/mdTools/createMDFields.H
+++ b/src/lagrangian/molecularDynamics/molecule/mdTools/createMDFields.H
@@ -37,7 +37,7 @@ PtrList<volScalarField> allSpeciesRhoN
molecules.potential().nIds()
);
-forAll (allSpeciesRhoN, rN)
+forAll(allSpeciesRhoN, rN)
{
Info<< " Creating number density field for "
<< molecules.potential().idList()[rN] << endl;
@@ -92,7 +92,7 @@ PtrList<volScalarField> allSpeciesRhoM
molecules.potential().nIds()
);
-forAll (allSpeciesRhoM, rM)
+forAll(allSpeciesRhoM, rM)
{
Info<< " Creating mass density field for "
<< molecules.potential().idList()[rM] << endl;
@@ -147,7 +147,7 @@ PtrList<volVectorField> allSpeciesVelocity
molecules.potential().nIds()
);
-forAll (allSpeciesVelocity, v)
+forAll(allSpeciesVelocity, v)
{
Info<< " Creating velocity field for "
<< molecules.potential().idList()[v] << endl;
@@ -221,7 +221,7 @@ PtrList<volScalarField> allSpeciesTemperature
molecules.potential().nIds()
);
-forAll (allSpeciesTemperature, t)
+forAll(allSpeciesTemperature, t)
{
Info<< " Creating temperature field for "
<< molecules.potential().idList()[t] << endl;
@@ -277,7 +277,7 @@ PtrList<volScalarField> allSpeciesMeanKE
molecules.potential().nIds()
);
-forAll (allSpeciesMeanKE, mKE)
+forAll(allSpeciesMeanKE, mKE)
{
Info<< " Creating mean kinetic energy field for "
<< molecules.potential().idList()[mKE] << endl;
diff --git a/src/lagrangian/molecularDynamics/molecule/mdTools/meanMomentumEnergyAndNMols.H b/src/lagrangian/molecularDynamics/molecule/mdTools/meanMomentumEnergyAndNMols.H
index fb216c7a650fb7b9022efda492cc707cfa5e3526..77ecb7a657784ab9a7f6975de295754485bdb5e0 100644
--- a/src/lagrangian/molecularDynamics/molecule/mdTools/meanMomentumEnergyAndNMols.H
+++ b/src/lagrangian/molecularDynamics/molecule/mdTools/meanMomentumEnergyAndNMols.H
@@ -54,16 +54,9 @@ label singleStepNMols = molecules.size();
label singleStepDOFs = 0;
{
- IDLList<molecule>::iterator mol(molecules.begin());
-
- for
- (
- mol = molecules.begin();
- mol != molecules.end();
- ++mol
- )
+ forAllConstIter(IDLList<molecule>, molecules, mol)
{
- label molId = mol().id();
+ const label molId = mol().id();
scalar molMass(molecules.constProps(molId).mass());
@@ -77,14 +70,9 @@ label singleStepDOFs = 0;
// singleStepCentreOfMass /= singleStepTotalMass;
// }
- for
- (
- mol = molecules.begin();
- mol != molecules.end();
- ++mol
- )
+ forAllConstIter(IDLList<molecule>, molecules, mol)
{
- label molId = mol().id();
+ const label molId = mol().id();
const molecule::constantProperties cP(molecules.constProps(molId));
diff --git a/src/lagrangian/molecularDynamics/molecule/moleculeCloud/moleculeCloud.C b/src/lagrangian/molecularDynamics/molecule/moleculeCloud/moleculeCloud.C
index 1515437030b50a77eaa3741f794701ce3ba3ad61..eb147f6918c2ce1d3218aa0adcf551a10c6468d0 100644
--- a/src/lagrangian/molecularDynamics/molecule/moleculeCloud/moleculeCloud.C
+++ b/src/lagrangian/molecularDynamics/molecule/moleculeCloud/moleculeCloud.C
@@ -348,7 +348,7 @@ void Foam::moleculeCloud::removeHighEnergyOverlaps()
}
}
- forAll (molsToDelete, mTD)
+ forAll(molsToDelete, mTD)
{
deleteParticle(*(molsToDelete[mTD]));
}
@@ -438,7 +438,7 @@ void Foam::moleculeCloud::removeHighEnergyOverlaps()
}
}
- forAll (molsToDelete, mTD)
+ forAll(molsToDelete, mTD)
{
deleteParticle(*(molsToDelete[mTD]));
}
@@ -475,7 +475,7 @@ void Foam::moleculeCloud::initialiseMolecules
<< abort(FatalError);
}
- forAll (cellZones, z)
+ forAll(cellZones, z)
{
const cellZone& zone(cellZones[z]);
@@ -632,7 +632,7 @@ void Foam::moleculeCloud::initialiseMolecules
vector zoneMax = -VGREAT*vector::one;
- forAll (zone, cell)
+ forAll(zone, cell)
{
const point cellCentre = mesh_.cellCentres()[zone[cell]];
diff --git a/src/lagrangian/molecularDynamics/molecule/reducedUnits/reducedUnits.H b/src/lagrangian/molecularDynamics/molecule/reducedUnits/reducedUnits.H
index 5552a4f9ee05ecbf5d98cb9a4b949f2b7fdbeb11..9445ff64da7661ce81086cd4f3a9eb7131f97e10 100644
--- a/src/lagrangian/molecularDynamics/molecule/reducedUnits/reducedUnits.H
+++ b/src/lagrangian/molecularDynamics/molecule/reducedUnits/reducedUnits.H
@@ -120,9 +120,8 @@ public:
reducedUnits(const IOdictionary& reducedUnitsDict);
- // Destructor
-
- ~reducedUnits();
+ //- Destructor
+ ~reducedUnits();
// Member Functions
diff --git a/src/lagrangian/molecularDynamics/potential/electrostaticPotential/electrostaticPotential.H b/src/lagrangian/molecularDynamics/potential/electrostaticPotential/electrostaticPotential.H
index 86e716a55c02b200f8479c6e9c9f9ac47bacdd27..126a42d350c12e8e2e8d3084528d1044909f6a43 100644
--- a/src/lagrangian/molecularDynamics/potential/electrostaticPotential/electrostaticPotential.H
+++ b/src/lagrangian/molecularDynamics/potential/electrostaticPotential/electrostaticPotential.H
@@ -61,10 +61,9 @@ public:
electrostaticPotential();
- // Destructor
-
- ~electrostaticPotential()
- {}
+ //- Destructor
+ ~electrostaticPotential()
+ {}
// Member Functions
diff --git a/src/lagrangian/molecularDynamics/potential/energyScalingFunction/basic/energyScalingFunction.H b/src/lagrangian/molecularDynamics/potential/energyScalingFunction/basic/energyScalingFunction.H
index b4a1e71d69c5b67163e26327510a2121bf6ac275..2bbc55a2423d70af3b7906f49fdad17cd62181ba 100644
--- a/src/lagrangian/molecularDynamics/potential/energyScalingFunction/basic/energyScalingFunction.H
+++ b/src/lagrangian/molecularDynamics/potential/energyScalingFunction/basic/energyScalingFunction.H
@@ -117,10 +117,9 @@ public:
);
- // Destructor
-
- virtual ~energyScalingFunction()
- {}
+ //- Destructor
+ virtual ~energyScalingFunction()
+ {}
// Member Functions
diff --git a/src/lagrangian/molecularDynamics/potential/energyScalingFunction/derived/doubleSigmoid/doubleSigmoid.H b/src/lagrangian/molecularDynamics/potential/energyScalingFunction/derived/doubleSigmoid/doubleSigmoid.H
index 7f34a84feecf1605006dcf434ced5daebff863eb..c77c07a79352841ab8d51ad2ee102754195aa079 100644
--- a/src/lagrangian/molecularDynamics/potential/energyScalingFunction/derived/doubleSigmoid/doubleSigmoid.H
+++ b/src/lagrangian/molecularDynamics/potential/energyScalingFunction/derived/doubleSigmoid/doubleSigmoid.H
@@ -89,10 +89,9 @@ public:
);
- // Destructor
-
- ~doubleSigmoid()
- {}
+ //- Destructor
+ ~doubleSigmoid()
+ {}
// Member Functions
diff --git a/src/lagrangian/molecularDynamics/potential/energyScalingFunction/derived/noScaling/noScaling.H b/src/lagrangian/molecularDynamics/potential/energyScalingFunction/derived/noScaling/noScaling.H
index 0deadcabda6be0298cd82244ccc125a1ac05d193..c266084c97d3b01319118a4f3e7ab335a1dfd86f 100644
--- a/src/lagrangian/molecularDynamics/potential/energyScalingFunction/derived/noScaling/noScaling.H
+++ b/src/lagrangian/molecularDynamics/potential/energyScalingFunction/derived/noScaling/noScaling.H
@@ -70,10 +70,9 @@ public:
);
- // Destructor
-
- ~noScaling()
- {}
+ //- Destructor
+ ~noScaling()
+ {}
// Member Functions
diff --git a/src/lagrangian/molecularDynamics/potential/energyScalingFunction/derived/shifted/shifted.H b/src/lagrangian/molecularDynamics/potential/energyScalingFunction/derived/shifted/shifted.H
index 5f50c172f9d707f0e3e1a0d29c2ccaca7bff877b..e49b0fce3f1ed78229d1256fa638f1024ed2d04f 100644
--- a/src/lagrangian/molecularDynamics/potential/energyScalingFunction/derived/shifted/shifted.H
+++ b/src/lagrangian/molecularDynamics/potential/energyScalingFunction/derived/shifted/shifted.H
@@ -74,10 +74,9 @@ public:
);
- // Destructor
-
- ~shifted()
- {}
+ //- Destructor
+ ~shifted()
+ {}
// Member Functions
diff --git a/src/lagrangian/molecularDynamics/potential/energyScalingFunction/derived/shiftedForce/shiftedForce.H b/src/lagrangian/molecularDynamics/potential/energyScalingFunction/derived/shiftedForce/shiftedForce.H
index c450b0085894270e1370250dedef3fb4f9c8d07f..8fcc2be7720a49f0838b6e30dbb57fd715707234 100644
--- a/src/lagrangian/molecularDynamics/potential/energyScalingFunction/derived/shiftedForce/shiftedForce.H
+++ b/src/lagrangian/molecularDynamics/potential/energyScalingFunction/derived/shiftedForce/shiftedForce.H
@@ -78,10 +78,9 @@ public:
);
- // Destructor
-
- ~shiftedForce()
- {}
+ //- Destructor
+ ~shiftedForce()
+ {}
// Member Functions
diff --git a/src/lagrangian/molecularDynamics/potential/energyScalingFunction/derived/sigmoid/sigmoid.H b/src/lagrangian/molecularDynamics/potential/energyScalingFunction/derived/sigmoid/sigmoid.H
index f508ec841774402a0e4e883996e71ac905fe9ed9..83868e491e56e1663b09dc5362c6486d7d8d0e2d 100644
--- a/src/lagrangian/molecularDynamics/potential/energyScalingFunction/derived/sigmoid/sigmoid.H
+++ b/src/lagrangian/molecularDynamics/potential/energyScalingFunction/derived/sigmoid/sigmoid.H
@@ -87,10 +87,9 @@ public:
);
- // Destructor
-
- ~sigmoid()
- {}
+ //- Destructor
+ ~sigmoid()
+ {}
// Member Functions
diff --git a/src/lagrangian/molecularDynamics/potential/pairPotential/basic/pairPotential.H b/src/lagrangian/molecularDynamics/potential/pairPotential/basic/pairPotential.H
index b3d65a579d01fb343600ecd61886f2365b778383..d99352fad570d64bb565b927d3bb6d81dc7193cc 100644
--- a/src/lagrangian/molecularDynamics/potential/pairPotential/basic/pairPotential.H
+++ b/src/lagrangian/molecularDynamics/potential/pairPotential/basic/pairPotential.H
@@ -131,10 +131,9 @@ public:
);
- // Destructor
-
- virtual ~pairPotential()
- {}
+ //- Destructor
+ virtual ~pairPotential()
+ {}
// Member Functions
diff --git a/src/lagrangian/molecularDynamics/potential/pairPotential/derived/azizChen/azizChen.H b/src/lagrangian/molecularDynamics/potential/pairPotential/derived/azizChen/azizChen.H
index a093823764cc24c0c807a51f06a284fd7f61be3c..c52fdd36a82e09c0eefad31a1ad7b335ce582d11 100644
--- a/src/lagrangian/molecularDynamics/potential/pairPotential/derived/azizChen/azizChen.H
+++ b/src/lagrangian/molecularDynamics/potential/pairPotential/derived/azizChen/azizChen.H
@@ -101,10 +101,9 @@ public:
);
- // Destructor
-
- ~azizChen()
- {}
+ //- Destructor
+ ~azizChen()
+ {}
// Member Functions
diff --git a/src/lagrangian/molecularDynamics/potential/pairPotential/derived/coulomb/coulomb.H b/src/lagrangian/molecularDynamics/potential/pairPotential/derived/coulomb/coulomb.H
index cc26aca0dfb25042cc0fc4d6231a85352303056e..08eb5c55960f175ce1b5cc95a9044671684664ac 100644
--- a/src/lagrangian/molecularDynamics/potential/pairPotential/derived/coulomb/coulomb.H
+++ b/src/lagrangian/molecularDynamics/potential/pairPotential/derived/coulomb/coulomb.H
@@ -72,10 +72,9 @@ public:
);
- // Destructor
-
- ~coulomb()
- {}
+ //- Destructor
+ ~coulomb()
+ {}
// Member Functions
diff --git a/src/lagrangian/molecularDynamics/potential/pairPotential/derived/dampedCoulomb/dampedCoulomb.H b/src/lagrangian/molecularDynamics/potential/pairPotential/derived/dampedCoulomb/dampedCoulomb.H
index 51c8f9d0bc600320324f7e7ca67dd510c60ed23a..a6e66c1aa2fc1890223c70724e987d125c67dbef 100644
--- a/src/lagrangian/molecularDynamics/potential/pairPotential/derived/dampedCoulomb/dampedCoulomb.H
+++ b/src/lagrangian/molecularDynamics/potential/pairPotential/derived/dampedCoulomb/dampedCoulomb.H
@@ -80,10 +80,9 @@ public:
);
- // Destructor
-
- ~dampedCoulomb()
- {}
+ //- Destructor
+ ~dampedCoulomb()
+ {}
// Member Functions
diff --git a/src/lagrangian/molecularDynamics/potential/pairPotential/derived/exponentialRepulsion/exponentialRepulsion.H b/src/lagrangian/molecularDynamics/potential/pairPotential/derived/exponentialRepulsion/exponentialRepulsion.H
index 7696ec2ae09e34da9eaa484803acd11a2096115d..fc0c9b0d5cc9d03b8f370c0c911c85f32b0cf8f1 100644
--- a/src/lagrangian/molecularDynamics/potential/pairPotential/derived/exponentialRepulsion/exponentialRepulsion.H
+++ b/src/lagrangian/molecularDynamics/potential/pairPotential/derived/exponentialRepulsion/exponentialRepulsion.H
@@ -76,10 +76,9 @@ public:
);
- // Destructor
-
- ~exponentialRepulsion()
- {}
+ //- Destructor
+ ~exponentialRepulsion()
+ {}
// Member Functions
diff --git a/src/lagrangian/molecularDynamics/potential/pairPotential/derived/lennardJones/lennardJones.H b/src/lagrangian/molecularDynamics/potential/pairPotential/derived/lennardJones/lennardJones.H
index fa9436d01fa8786bf6b5769d64d2a3ba8182fcf8..03c85d218409d77d567a9e4705256465703402b0 100644
--- a/src/lagrangian/molecularDynamics/potential/pairPotential/derived/lennardJones/lennardJones.H
+++ b/src/lagrangian/molecularDynamics/potential/pairPotential/derived/lennardJones/lennardJones.H
@@ -76,10 +76,9 @@ public:
);
- // Destructor
-
- ~lennardJones()
- {}
+ //- Destructor
+ ~lennardJones()
+ {}
// Member Functions
diff --git a/src/lagrangian/molecularDynamics/potential/pairPotential/derived/maitlandSmith/maitlandSmith.H b/src/lagrangian/molecularDynamics/potential/pairPotential/derived/maitlandSmith/maitlandSmith.H
index 324c9cf99f61f79112efd49f0a393d6ecafc071e..0d33cb2c1f783b95badc2df5e59129ba6667f5c7 100644
--- a/src/lagrangian/molecularDynamics/potential/pairPotential/derived/maitlandSmith/maitlandSmith.H
+++ b/src/lagrangian/molecularDynamics/potential/pairPotential/derived/maitlandSmith/maitlandSmith.H
@@ -104,10 +104,9 @@ public:
);
- // Destructor
-
- ~maitlandSmith()
- {}
+ //- Destructor
+ ~maitlandSmith()
+ {}
// Member Functions
diff --git a/src/lagrangian/molecularDynamics/potential/pairPotential/derived/noInteraction/noInteraction.H b/src/lagrangian/molecularDynamics/potential/pairPotential/derived/noInteraction/noInteraction.H
index ed365088af0d8e1c4dec0d690593e06cb9794c51..162a08c2dbf305765f9847f0d0a755590a6adeb1 100644
--- a/src/lagrangian/molecularDynamics/potential/pairPotential/derived/noInteraction/noInteraction.H
+++ b/src/lagrangian/molecularDynamics/potential/pairPotential/derived/noInteraction/noInteraction.H
@@ -69,10 +69,9 @@ public:
);
- // Destructor
-
- ~noInteraction()
- {}
+ //- Destructor
+ ~noInteraction()
+ {}
// Member Functions
diff --git a/src/lagrangian/molecularDynamics/potential/pairPotential/pairPotentialList/pairPotentialList.H b/src/lagrangian/molecularDynamics/potential/pairPotential/pairPotentialList/pairPotentialList.H
index a877265a5087abeed60411a55590d897053a8d9d..db2f6e965c20dd707512e7c0a3e9bd9a61cdb079 100644
--- a/src/lagrangian/molecularDynamics/potential/pairPotential/pairPotentialList/pairPotentialList.H
+++ b/src/lagrangian/molecularDynamics/potential/pairPotential/pairPotentialList/pairPotentialList.H
@@ -101,9 +101,8 @@ public:
);
- // Destructor
-
- ~pairPotentialList();
+ //- Destructor
+ ~pairPotentialList();
// Member Functions
diff --git a/src/lagrangian/molecularDynamics/potential/potential/potential.H b/src/lagrangian/molecularDynamics/potential/potential/potential.H
index 8f259343e5c4d2b4559d51e9a041eefa64016107..70eda5a5dcfd92386ebce0e826dbc7570c42e3f1 100644
--- a/src/lagrangian/molecularDynamics/potential/potential/potential.H
+++ b/src/lagrangian/molecularDynamics/potential/potential/potential.H
@@ -109,9 +109,8 @@ public:
);
- // Destructor
-
- ~potential();
+ //- Destructor
+ ~potential();
// Member Functions
diff --git a/src/lagrangian/molecularDynamics/potential/tetherPotential/basic/tetherPotential.H b/src/lagrangian/molecularDynamics/potential/tetherPotential/basic/tetherPotential.H
index 878334ec75208c68c0eb9f30d9be827edf648aa9..94211caa4ceb28bd47028f11d928dd7ccee3fb10 100644
--- a/src/lagrangian/molecularDynamics/potential/tetherPotential/basic/tetherPotential.H
+++ b/src/lagrangian/molecularDynamics/potential/tetherPotential/basic/tetherPotential.H
@@ -111,10 +111,9 @@ public:
);
- // Destructor
-
- virtual ~tetherPotential()
- {}
+ //- Destructor
+ virtual ~tetherPotential()
+ {}
// Member Functions
diff --git a/src/lagrangian/molecularDynamics/potential/tetherPotential/derived/harmonicSpring/harmonicSpring.H b/src/lagrangian/molecularDynamics/potential/tetherPotential/derived/harmonicSpring/harmonicSpring.H
index 08dd7a37cbe159b54abefddf828e9a8c985231ba..4e5b78de094fb7bd1d4b236621f3b223d8a82e48 100644
--- a/src/lagrangian/molecularDynamics/potential/tetherPotential/derived/harmonicSpring/harmonicSpring.H
+++ b/src/lagrangian/molecularDynamics/potential/tetherPotential/derived/harmonicSpring/harmonicSpring.H
@@ -75,10 +75,9 @@ public:
);
- // Destructor
-
- ~harmonicSpring()
- {}
+ //- Destructor
+ ~harmonicSpring()
+ {}
// Member Functions
diff --git a/src/lagrangian/molecularDynamics/potential/tetherPotential/derived/pitchForkRing/pitchForkRing.H b/src/lagrangian/molecularDynamics/potential/tetherPotential/derived/pitchForkRing/pitchForkRing.H
index e30d76b984aa03287a13cec89fc41c46fd2ce824..52bb06675899c1e785064108d627a5611fe82852 100644
--- a/src/lagrangian/molecularDynamics/potential/tetherPotential/derived/pitchForkRing/pitchForkRing.H
+++ b/src/lagrangian/molecularDynamics/potential/tetherPotential/derived/pitchForkRing/pitchForkRing.H
@@ -77,10 +77,9 @@ public:
);
- // Destructor
-
- ~pitchForkRing()
- {}
+ //- Destructor
+ ~pitchForkRing()
+ {}
// Member Functions
diff --git a/src/lagrangian/molecularDynamics/potential/tetherPotential/derived/restrainedHarmonicSpring/restrainedHarmonicSpring.H b/src/lagrangian/molecularDynamics/potential/tetherPotential/derived/restrainedHarmonicSpring/restrainedHarmonicSpring.H
index 09bf249729d20357f7edcd5dee4ae51160cb6bf7..ec4a8c8c12c544e376efd3b88d0de6cb570cbed7 100644
--- a/src/lagrangian/molecularDynamics/potential/tetherPotential/derived/restrainedHarmonicSpring/restrainedHarmonicSpring.H
+++ b/src/lagrangian/molecularDynamics/potential/tetherPotential/derived/restrainedHarmonicSpring/restrainedHarmonicSpring.H
@@ -77,10 +77,9 @@ public:
);
- // Destructor
-
- ~restrainedHarmonicSpring()
- {}
+ //- Destructor
+ ~restrainedHarmonicSpring()
+ {}
// Member Functions
diff --git a/src/lagrangian/molecularDynamics/potential/tetherPotential/tetherPotentialList/tetherPotentialList.H b/src/lagrangian/molecularDynamics/potential/tetherPotential/tetherPotentialList/tetherPotentialList.H
index 37e08dbd68e39f9ed9ffa7fab3b0a023f0d892ae..d862824f773f214d1a72a48b39242ffbc455c16d 100644
--- a/src/lagrangian/molecularDynamics/potential/tetherPotential/tetherPotentialList/tetherPotentialList.H
+++ b/src/lagrangian/molecularDynamics/potential/tetherPotential/tetherPotentialList/tetherPotentialList.H
@@ -93,9 +93,8 @@ public:
);
- // Destructor
-
- ~tetherPotentialList();
+ //- Destructor
+ ~tetherPotentialList();
// Member Functions
diff --git a/src/lagrangian/solidParticle/solidParticleIO.C b/src/lagrangian/solidParticle/solidParticleIO.C
index 81748a676830ab3aae88363761a0529f56374685..564c2fa15daa96f6c8252413946b551cba9cea78 100644
--- a/src/lagrangian/solidParticle/solidParticleIO.C
+++ b/src/lagrangian/solidParticle/solidParticleIO.C
@@ -72,7 +72,7 @@ void Foam::solidParticle::readFields(Cloud<solidParticle>& c)
c.checkFieldIOobject(c, U);
label i = 0;
- forAllIter(Cloud<solidParticle>::iterator, c, iter)
+ forAllIter(Cloud<solidParticle>, c, iter)
{
solidParticle& p = iter();
diff --git a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/layerParameters/layerParameters.C b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/layerParameters/layerParameters.C
index 1400c3e5082ab81ffcdcf5faf667e36d4aa104a6..348f9ce4142389f3627ccba8f746e298ff7e7acd 100644
--- a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/layerParameters/layerParameters.C
+++ b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/layerParameters/layerParameters.C
@@ -209,6 +209,15 @@ Foam::layerParameters::layerParameters
nLayerIter_(readLabel(dict.lookup("nLayerIter"))),
nRelaxedIter_(labelMax)
{
+ if (nGrow_ > 0)
+ {
+ WarningIn("layerParameters::layerParameters(..)")
+ << "The nGrow parameter effect has changed with respect to 1.6.x."
+ << endl
+ << "Please set nGrow=0 for 1.6.x behaviour."
+ << endl;
+ }
+
if (dict.found("nRelaxedIter"))
{
dict.lookup("nRelaxedIter") >> nRelaxedIter_;
@@ -285,6 +294,15 @@ Foam::layerParameters::layerParameters
nLayerIter_(readLabel(dict.lookup("nLayerIter"))),
nRelaxedIter_(labelMax)
{
+ if (nGrow_ > 0)
+ {
+ WarningIn("layerParameters::layerParameters(..)")
+ << "The nGrow parameter effect has changed with respect to 1.6.x."
+ << endl
+ << "Please set nGrow=0 for 1.6.x behaviour."
+ << endl;
+ }
+
if (dict.found("nRelaxedIter"))
{
dict.lookup("nRelaxedIter") >> nRelaxedIter_;
diff --git a/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementTemplates.C b/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementTemplates.C
index 6eb0d60a3f9373d0040c9c4c688f917811af4840..a73b502a9cf7e4f4d3a25759c4bc867ae614ccde 100644
--- a/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementTemplates.C
+++ b/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementTemplates.C
@@ -125,12 +125,7 @@ void meshRefinement::addPatchFields(fvMesh& mesh, const word& patchFieldType)
mesh.objectRegistry::lookupClass<GeoField>()
);
- for
- (
- typename HashTable<const GeoField*>::const_iterator iter = flds.begin();
- iter != flds.end();
- ++iter
- )
+ forAllConstIter(typename HashTable<const GeoField*>, flds, iter)
{
const GeoField& fld = *iter();
@@ -165,12 +160,7 @@ void meshRefinement::reorderPatchFields(fvMesh& mesh, const labelList& oldToNew)
mesh.objectRegistry::lookupClass<GeoField>()
);
- for
- (
- typename HashTable<const GeoField*>::const_iterator iter = flds.begin();
- iter != flds.end();
- ++iter
- )
+ forAllConstIter(typename HashTable<const GeoField*>, flds, iter)
{
const GeoField& fld = *iter();
diff --git a/src/mesh/autoMesh/autoHexMesh/trackedParticle/ExactParticle.H b/src/mesh/autoMesh/autoHexMesh/trackedParticle/ExactParticle.H
index 24ca20da1ac3d464a1aed2eb927adfe42f0cf246..83f3a71533d7fae00f9317e7a68a95a296089f14 100644
--- a/src/mesh/autoMesh/autoHexMesh/trackedParticle/ExactParticle.H
+++ b/src/mesh/autoMesh/autoHexMesh/trackedParticle/ExactParticle.H
@@ -123,10 +123,9 @@ public:
};
- // Destructor
-
- virtual ~ExactParticle()
- {}
+ //- Destructor
+ virtual ~ExactParticle()
+ {}
// Member Functions
diff --git a/src/mesh/blockMesh/block/block.H b/src/mesh/blockMesh/block/block.H
index bdd555fb194128ce6824b8a85f186c593e581ea6..dcac3e9501b33628c195117e9a8e8c007d72605e 100644
--- a/src/mesh/blockMesh/block/block.H
+++ b/src/mesh/blockMesh/block/block.H
@@ -121,8 +121,7 @@ public:
//- Destructor
-
- ~block();
+ ~block();
// Member Functions
diff --git a/src/mesh/blockMesh/blockDescriptor/blockDescriptor.H b/src/mesh/blockMesh/blockDescriptor/blockDescriptor.H
index bcf3a1cf36096601e11c0f2a08a5b4e167e78e40..799383de3a63b1e7bd5d5b51d06e19f783a9ed86 100644
--- a/src/mesh/blockMesh/blockDescriptor/blockDescriptor.H
+++ b/src/mesh/blockMesh/blockDescriptor/blockDescriptor.H
@@ -133,9 +133,8 @@ public:
}
- // Destructor
-
- ~blockDescriptor();
+ //- Destructor
+ ~blockDescriptor();
// Member Functions
diff --git a/src/mesh/blockMesh/blockMesh/blockMesh.H b/src/mesh/blockMesh/blockMesh/blockMesh.H
index ab0ac66aaeebc096942968d667884c3719f4ecbb..4d1b1deb0aa285ef7234aaa77013cc55222290c1 100644
--- a/src/mesh/blockMesh/blockMesh/blockMesh.H
+++ b/src/mesh/blockMesh/blockMesh/blockMesh.H
@@ -133,9 +133,8 @@ public:
blockMesh(IOdictionary&);
- // Destructor
-
- ~blockMesh();
+ //- Destructor
+ ~blockMesh();
// Member Functions
diff --git a/src/mesh/blockMesh/curvedEdges/arcEdge.H b/src/mesh/blockMesh/curvedEdges/arcEdge.H
index 51dcdf27e5f1533e5ed2a4d7c874d6f9b3681807..567431f510effd6f286acd2bc0e9794abed95853 100644
--- a/src/mesh/blockMesh/curvedEdges/arcEdge.H
+++ b/src/mesh/blockMesh/curvedEdges/arcEdge.H
@@ -89,9 +89,8 @@ public:
arcEdge(const pointField& points, Istream&);
- // Destructor
-
- virtual ~arcEdge(){}
+ //- Destructor
+ virtual ~arcEdge(){}
// Member Functions
diff --git a/src/mesh/blockMesh/curvedEdges/curvedEdge.H b/src/mesh/blockMesh/curvedEdges/curvedEdge.H
index 2007f3509b34d2057b30be4a0540a94c8d91182f..c7cf157e89b1c04e967ec52141d170bba31ca339 100644
--- a/src/mesh/blockMesh/curvedEdges/curvedEdge.H
+++ b/src/mesh/blockMesh/curvedEdges/curvedEdge.H
@@ -117,9 +117,8 @@ public:
static autoPtr<curvedEdge> New(const pointField&, Istream&);
- // Destructor
-
- virtual ~curvedEdge(){}
+ //- Destructor
+ virtual ~curvedEdge(){}
// Member Functions
diff --git a/src/meshTools/PointEdgeWave/PointEdgeWave.H b/src/meshTools/PointEdgeWave/PointEdgeWave.H
index 326eeaad5e4fb3bc36e6b1c7130db8d64fc0a639..a40edb3b83cd7b8dc068ee121c59f3919c4ae2e5 100644
--- a/src/meshTools/PointEdgeWave/PointEdgeWave.H
+++ b/src/meshTools/PointEdgeWave/PointEdgeWave.H
@@ -279,9 +279,8 @@ public:
);
- // Destructor
-
- ~PointEdgeWave();
+ //- Destructor
+ ~PointEdgeWave();
// Member Functions
diff --git a/src/meshTools/cellClassification/cellClassification.C b/src/meshTools/cellClassification/cellClassification.C
index a2a1594878f914c4373c0d33ed149f12c835d674..dbc8bf29fb8a891c937624fb8af1f6286e5f16be 100644
--- a/src/meshTools/cellClassification/cellClassification.C
+++ b/src/meshTools/cellClassification/cellClassification.C
@@ -36,10 +36,7 @@ License
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-namespace Foam
-{
- defineTypeNameAndDebug(cellClassification, 0);
-}
+defineTypeNameAndDebug(Foam::cellClassification, 0);
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
@@ -829,15 +826,10 @@ Foam::label Foam::cellClassification::fillRegionPoints
label nChanged = 0;
- for
- (
- labelHashSet::const_iterator iter = nonManifoldPoints.begin();
- iter != nonManifoldPoints.end();
- ++iter
- )
+ forAllConstIter(labelHashSet, nonManifoldPoints, iter)
{
// Find a face on fp using point and remove it.
- label patchPointI = meshPointMap[iter.key()];
+ const label patchPointI = meshPointMap[iter.key()];
const labelList& pFaces = fp.pointFaces()[patchPointI];
@@ -846,16 +838,14 @@ Foam::label Foam::cellClassification::fillRegionPoints
// one would be best to remove.
forAll(pFaces, i)
{
- label patchFaceI = pFaces[i];
-
- label ownerCell = outsideOwner[patchFaceI];
+ const label patchFaceI = pFaces[i];
+ const label ownerCell = outsideOwner[patchFaceI];
if (operator[](ownerCell) == meshType)
{
operator[](ownerCell) = fillType;
nChanged++;
-
break;
}
}
diff --git a/src/meshTools/cellDist/patchWave/patchDataWave.H b/src/meshTools/cellDist/patchWave/patchDataWave.H
index 5aec213dd0db71d9fab45216fd2abd0863a46870..548198b3b84275639e8b5baf3d0c73f4d05e9070 100644
--- a/src/meshTools/cellDist/patchWave/patchDataWave.H
+++ b/src/meshTools/cellDist/patchWave/patchDataWave.H
@@ -133,9 +133,8 @@ public:
);
- // Destructor
-
- virtual ~patchDataWave();
+ //- Destructor
+ virtual ~patchDataWave();
// Member Functions
diff --git a/src/meshTools/cellDist/patchWave/patchWave.H b/src/meshTools/cellDist/patchWave/patchWave.H
index 67e440c4273cb58ed6e5e1746453cc6e7a22ce0d..371e7a2c120910a27605672308507255da99d552 100644
--- a/src/meshTools/cellDist/patchWave/patchWave.H
+++ b/src/meshTools/cellDist/patchWave/patchWave.H
@@ -109,9 +109,8 @@ public:
bool correctWalls = true
);
- // Destructor
-
- virtual ~patchWave();
+ //- Destructor
+ virtual ~patchWave();
// Member Functions
diff --git a/src/meshTools/cellFeatures/cellFeatures.H b/src/meshTools/cellFeatures/cellFeatures.H
index 7c0c235e969b64d7c9371b1fe2f0d537565cfdf9..84c8580a5642d2eb583063f0f4019adb1fb0c5ee 100644
--- a/src/meshTools/cellFeatures/cellFeatures.H
+++ b/src/meshTools/cellFeatures/cellFeatures.H
@@ -124,9 +124,8 @@ public:
);
- // Destructor
-
- ~cellFeatures();
+ //- Destructor
+ ~cellFeatures();
// Member Functions
diff --git a/src/meshTools/cellQuality/cellQuality.C b/src/meshTools/cellQuality/cellQuality.C
index 6a6ec541809ef72d4ece4d3f16572c9609dbb245..99afc59181026a03ea9e055d1fdad80efe2e4ee9 100644
--- a/src/meshTools/cellQuality/cellQuality.C
+++ b/src/meshTools/cellQuality/cellQuality.C
@@ -57,7 +57,7 @@ Foam::tmp<Foam::scalarField> Foam::cellQuality::nonOrthogonality() const
const labelList& own = mesh_.faceOwner();
const labelList& nei = mesh_.faceNeighbour();
- forAll (nei, faceI)
+ forAll(nei, faceI)
{
vector d = centres[nei[faceI]] - centres[own[faceI]];
vector s = areas[faceI];
@@ -71,7 +71,7 @@ Foam::tmp<Foam::scalarField> Foam::cellQuality::nonOrthogonality() const
result[nei[faceI]] = max(cosDDotS, result[nei[faceI]]);
}
- forAll (mesh_.boundaryMesh(), patchI)
+ forAll(mesh_.boundaryMesh(), patchI)
{
const unallocLabelList& faceCells =
mesh_.boundaryMesh()[patchI].faceCells();
@@ -119,7 +119,7 @@ Foam::tmp<Foam::scalarField> Foam::cellQuality::skewness() const
const labelList& own = mesh_.faceOwner();
const labelList& nei = mesh_.faceNeighbour();
- forAll (nei, faceI)
+ forAll(nei, faceI)
{
scalar dOwn = mag
(
@@ -144,7 +144,7 @@ Foam::tmp<Foam::scalarField> Foam::cellQuality::skewness() const
result[nei[faceI]] = max(skewness, result[nei[faceI]]);
}
- forAll (mesh_.boundaryMesh(), patchI)
+ forAll(mesh_.boundaryMesh(), patchI)
{
const unallocLabelList& faceCells =
mesh_.boundaryMesh()[patchI].faceCells();
@@ -196,7 +196,7 @@ Foam::tmp<Foam::scalarField> Foam::cellQuality::faceNonOrthogonality() const
const labelList& own = mesh_.faceOwner();
const labelList& nei = mesh_.faceNeighbour();
- forAll (nei, faceI)
+ forAll(nei, faceI)
{
vector d = centres[nei[faceI]] - centres[own[faceI]];
vector s = areas[faceI];
@@ -210,7 +210,7 @@ Foam::tmp<Foam::scalarField> Foam::cellQuality::faceNonOrthogonality() const
label globalFaceI = mesh_.nInternalFaces();
- forAll (mesh_.boundaryMesh(), patchI)
+ forAll(mesh_.boundaryMesh(), patchI)
{
const unallocLabelList& faceCells =
mesh_.boundaryMesh()[patchI].faceCells();
@@ -257,7 +257,7 @@ Foam::tmp<Foam::scalarField> Foam::cellQuality::faceSkewness() const
const labelList& own = mesh_.faceOwner();
const labelList& nei = mesh_.faceNeighbour();
- forAll (nei, faceI)
+ forAll(nei, faceI)
{
scalar dOwn = mag
(
@@ -281,7 +281,7 @@ Foam::tmp<Foam::scalarField> Foam::cellQuality::faceSkewness() const
label globalFaceI = mesh_.nInternalFaces();
- forAll (mesh_.boundaryMesh(), patchI)
+ forAll(mesh_.boundaryMesh(), patchI)
{
const unallocLabelList& faceCells =
mesh_.boundaryMesh()[patchI].faceCells();
diff --git a/src/meshTools/coordinateSystems/coordinateRotation/coordinateRotation.H b/src/meshTools/coordinateSystems/coordinateRotation/coordinateRotation.H
index 9f1a105255bf32fde1d1363639e651d3c2003488..9f477498828d145c29137385ba8c30c321032e0c 100644
--- a/src/meshTools/coordinateSystems/coordinateRotation/coordinateRotation.H
+++ b/src/meshTools/coordinateSystems/coordinateRotation/coordinateRotation.H
@@ -158,10 +158,9 @@ public:
);
- // Destructor
-
- virtual ~coordinateRotation()
- {}
+ //- Destructor
+ virtual ~coordinateRotation()
+ {}
// Member Functions
diff --git a/src/meshTools/meshSearch/meshSearch.C b/src/meshTools/meshSearch/meshSearch.C
index 6bfeadbd6264e640039756c31fca782215144527..4ae5ffc616e98af4193d215caff8233d67a523c3 100644
--- a/src/meshTools/meshSearch/meshSearch.C
+++ b/src/meshTools/meshSearch/meshSearch.C
@@ -360,7 +360,7 @@ Foam::label Foam::meshSearch::findNearestBoundaryFaceWalk
const labelList& myEdges = mesh_.faceEdges()[curFaceI];
- forAll (myEdges, myEdgeI)
+ forAll(myEdges, myEdgeI)
{
const labelList& neighbours = mesh_.edgeFaces()[myEdges[myEdgeI]];
diff --git a/src/meshTools/meshSearch/meshSearch.H b/src/meshTools/meshSearch/meshSearch.H
index 15ead1d53b73ce26f3ebfc19658777a8e2fc481c..dfaf71229b8546e37a303875eec7f38ce46e9c67 100644
--- a/src/meshTools/meshSearch/meshSearch.H
+++ b/src/meshTools/meshSearch/meshSearch.H
@@ -168,9 +168,8 @@ public:
meshSearch(const polyMesh& mesh, const bool faceDecomp = true);
- // Destructor
-
- ~meshSearch();
+ //- Destructor
+ ~meshSearch();
// Member Functions
diff --git a/src/meshTools/octree/octree.H b/src/meshTools/octree/octree.H
index 68262d19b4a15105b31af354c3fdbf54d45e2ff9..5bf0a9a69c1c60d80ecfb34b270c196270f038dc 100644
--- a/src/meshTools/octree/octree.H
+++ b/src/meshTools/octree/octree.H
@@ -212,9 +212,8 @@ public:
);
- // Destructor
-
- ~octree();
+ //- Destructor
+ ~octree();
// Member Functions
diff --git a/src/meshTools/octree/octreeDataEdges.H b/src/meshTools/octree/octreeDataEdges.H
index e262f611f9dfc68a7aa73b506172f8667fb3623c..07f3acea04ec5330d4c94857165d3316f00f0668 100644
--- a/src/meshTools/octree/octreeDataEdges.H
+++ b/src/meshTools/octree/octreeDataEdges.H
@@ -95,9 +95,8 @@ public:
octreeDataEdges(const octreeDataEdges&);
- // Destructor
-
- ~octreeDataEdges();
+ //- Destructor
+ ~octreeDataEdges();
// Member Functions
diff --git a/src/meshTools/octree/octreeDataFace.C b/src/meshTools/octree/octreeDataFace.C
index 7cc8e879057e32517c69d48d659c76d3fff8764e..23d0664ff78e04deadba8af6ea43ff7bae7654fc 100644
--- a/src/meshTools/octree/octreeDataFace.C
+++ b/src/meshTools/octree/octreeDataFace.C
@@ -45,7 +45,7 @@ void Foam::octreeDataFace::calcBb()
allBb_.setSize(meshFaces_.size());
allBb_ = treeBoundBox::invertedBox;
- forAll (meshFaces_, i)
+ forAll(meshFaces_, i)
{
// Update bb of face
treeBoundBox& myBb = allBb_[i];
diff --git a/src/meshTools/octree/octreeDataFace.H b/src/meshTools/octree/octreeDataFace.H
index 79f97e8737b3663351ad7fe94b2953ebc33e6f26..8f041c7349d371103b4b182f77ee8553e017ed1b 100644
--- a/src/meshTools/octree/octreeDataFace.H
+++ b/src/meshTools/octree/octreeDataFace.H
@@ -130,9 +130,8 @@ public:
octreeDataFace(const octreeDataFace&);
- // Destructor
-
- ~octreeDataFace();
+ //- Destructor
+ ~octreeDataFace();
// Member Functions
diff --git a/src/meshTools/octree/octreeLine.H b/src/meshTools/octree/octreeLine.H
index b75198944b44eb78959ac3c054ea4974e4b5c339..99473aeac453515dab4e36a487fd6d748b3b0fbd 100644
--- a/src/meshTools/octree/octreeLine.H
+++ b/src/meshTools/octree/octreeLine.H
@@ -123,9 +123,8 @@ public:
);
- // Destructor
-
- ~octreeLine();
+ //- Destructor
+ ~octreeLine();
// Member Functions
diff --git a/src/meshTools/octree/treeLeaf.H b/src/meshTools/octree/treeLeaf.H
index f0de8ec75ac3e4352729711c5e78a2a9f4ca1c63..f5f3eb7cd141b2aa8fb2e853ef27dcbc66d41675 100644
--- a/src/meshTools/octree/treeLeaf.H
+++ b/src/meshTools/octree/treeLeaf.H
@@ -113,9 +113,8 @@ public:
treeLeaf(Istream&);
- // Destructor
-
- ~treeLeaf();
+ //- Destructor
+ ~treeLeaf();
// Member Functions
diff --git a/src/meshTools/octree/treeNode.H b/src/meshTools/octree/treeNode.H
index 12c33f1858cb8d4518728be0781ec6d4cc1f76d7..af888118e21086548401a10479ffce99d53d2ec4 100644
--- a/src/meshTools/octree/treeNode.H
+++ b/src/meshTools/octree/treeNode.H
@@ -159,9 +159,8 @@ public:
treeNode(Istream&);
- // Destructor
-
- ~treeNode();
+ //- Destructor
+ ~treeNode();
// Member Functions
diff --git a/src/meshTools/polyMeshZipUpCells/polyMeshZipUpCells.C b/src/meshTools/polyMeshZipUpCells/polyMeshZipUpCells.C
index 5c45ea1a01d7dcde097c016f958d2c080e1b1be8..029d85d6a47c67dc9e6c270d59ec55861b30d160 100644
--- a/src/meshTools/polyMeshZipUpCells/polyMeshZipUpCells.C
+++ b/src/meshTools/polyMeshZipUpCells/polyMeshZipUpCells.C
@@ -76,7 +76,7 @@ bool Foam::polyMeshZipUpCells(polyMesh& mesh)
const faceList& oldFaces = mesh.faces();
const labelListList& pFaces = mesh.pointFaces();
- forAll (Cells, cellI)
+ forAll(Cells, cellI)
{
const labelList& curFaces = Cells[cellI];
const edgeList cellEdges = Cells[cellI].edges(oldFaces);
@@ -86,15 +86,15 @@ bool Foam::polyMeshZipUpCells(polyMesh& mesh)
labelList edgeUsage(cellEdges.size(), 0);
- forAll (curFaces, faceI)
+ forAll(curFaces, faceI)
{
edgeList curFaceEdges = oldFaces[curFaces[faceI]].edges();
- forAll (curFaceEdges, faceEdgeI)
+ forAll(curFaceEdges, faceEdgeI)
{
const edge& curEdge = curFaceEdges[faceEdgeI];
- forAll (cellEdges, cellEdgeI)
+ forAll(cellEdges, cellEdgeI)
{
if (cellEdges[cellEdgeI] == curEdge)
{
@@ -108,7 +108,7 @@ bool Foam::polyMeshZipUpCells(polyMesh& mesh)
edgeList singleEdges(cellEdges.size());
label nSingleEdges = 0;
- forAll (edgeUsage, edgeI)
+ forAll(edgeUsage, edgeI)
{
if (edgeUsage[edgeI] == 1)
{
@@ -124,7 +124,7 @@ bool Foam::polyMeshZipUpCells(polyMesh& mesh)
<< "in mesh structure. " << endl;
# ifdef DEBUG_ZIPUP
- forAll (curFaces, faceI)
+ forAll(curFaces, faceI)
{
Info<< "face: " << oldFaces[curFaces[faceI]]
<< endl;
@@ -134,7 +134,7 @@ bool Foam::polyMeshZipUpCells(polyMesh& mesh)
<< "Edge usage: " << edgeUsage << nl
<< "Cell points: " << cellPoints << endl;
- forAll (cellPoints, cpI)
+ forAll(cellPoints, cpI)
{
Info<< "vertex create \"" << cellPoints[cpI]
<< "\" coordinates "
@@ -155,7 +155,7 @@ bool Foam::polyMeshZipUpCells(polyMesh& mesh)
# ifdef DEBUG_ZIPUP
Info<< "Cell " << cellI << endl;
- forAll (curFaces, faceI)
+ forAll(curFaces, faceI)
{
Info<< "face: " << oldFaces[curFaces[faceI]] << endl;
}
@@ -165,7 +165,7 @@ bool Foam::polyMeshZipUpCells(polyMesh& mesh)
<< "Single edges: " << singleEdges << nl
<< "Cell points: " << cellPoints << endl;
- forAll (cellPoints, cpI)
+ forAll(cellPoints, cpI)
{
Info<< "vertex create \"" << cellPoints[cpI]
<< "\" coordinates "
@@ -179,11 +179,11 @@ bool Foam::polyMeshZipUpCells(polyMesh& mesh)
labelList pointUsage(cellPoints.size(), 0);
- forAll (singleEdges, edgeI)
+ forAll(singleEdges, edgeI)
{
const edge& curEdge = singleEdges[edgeI];
- forAll (cellPoints, pointI)
+ forAll(cellPoints, pointI)
{
if
(
@@ -200,7 +200,7 @@ bool Foam::polyMeshZipUpCells(polyMesh& mesh)
// loop through all edges and eliminate the ones that are
// blocked out
- forAll (singleEdges, edgeI)
+ forAll(singleEdges, edgeI)
{
bool blockedHead = false;
bool blockedTail = false;
@@ -209,7 +209,7 @@ bool Foam::polyMeshZipUpCells(polyMesh& mesh)
label newEdgeEnd = singleEdges[edgeI].end();
// check that the edge has not got all ends blocked
- forAll (cellPoints, pointI)
+ forAll(cellPoints, pointI)
{
if (cellPoints[pointI] == newEdgeStart)
{
@@ -242,7 +242,7 @@ bool Foam::polyMeshZipUpCells(polyMesh& mesh)
label nEdgesToInsert = 0;
// Find a good edge
- forAll (singleEdges, edgeI)
+ forAll(singleEdges, edgeI)
{
SLList<label> pointChain;
@@ -266,7 +266,7 @@ bool Foam::polyMeshZipUpCells(polyMesh& mesh)
# endif
// Check if head or tail are blocked
- forAll (cellPoints, pointI)
+ forAll(cellPoints, pointI)
{
if (cellPoints[pointI] == newEdgeStart)
{
@@ -299,7 +299,7 @@ bool Foam::polyMeshZipUpCells(polyMesh& mesh)
{
stopSearching = false;
- forAll (singleEdges, addEdgeI)
+ forAll(singleEdges, addEdgeI)
{
if (!singleEdgeUsage[addEdgeI])
{
@@ -361,7 +361,7 @@ bool Foam::polyMeshZipUpCells(polyMesh& mesh)
<< " curEdgeEnd: " << curEdgeEnd << endl;
# endif
- forAll (cellPoints, pointI)
+ forAll(cellPoints, pointI)
{
if (cellPoints[pointI] == curEdgeStart)
{
@@ -431,7 +431,7 @@ bool Foam::polyMeshZipUpCells(polyMesh& mesh)
# endif
// Insert the edges into a list of faces
- forAll (edgesToInsert, edgeToInsertI)
+ forAll(edgesToInsert, edgeToInsertI)
{
// Order the points of the edge
// Warning: the ordering must be parametric, because in
@@ -460,12 +460,12 @@ bool Foam::polyMeshZipUpCells(polyMesh& mesh)
labelList orderedEdge(unorderedEdge.size(), -1);
boolList used(unorderedEdge.size(), false);
- forAll (orderedEdge, epI)
+ forAll(orderedEdge, epI)
{
label nextPoint = -1;
scalar minDist = GREAT;
- forAll (dist, i)
+ forAll(dist, i)
{
if (!used[i] && dist[i] < minDist)
{
@@ -485,7 +485,7 @@ bool Foam::polyMeshZipUpCells(polyMesh& mesh)
# endif
// check for duplicate points in the ordered edge
- forAll (orderedEdge, checkI)
+ forAll(orderedEdge, checkI)
{
for
(
@@ -520,16 +520,16 @@ bool Foam::polyMeshZipUpCells(polyMesh& mesh)
labelList facesSharingEdge(startPF.size() + endPF.size());
label nfse = 0;
- forAll (startPF, pfI)
+ forAll(startPF, pfI)
{
facesSharingEdge[nfse++] = startPF[pfI];
}
- forAll (endPF, pfI)
+ forAll(endPF, pfI)
{
facesSharingEdge[nfse++] = endPF[pfI];
}
- forAll (facesSharingEdge, faceI)
+ forAll(facesSharingEdge, faceI)
{
bool faceChanges = false;
@@ -539,7 +539,7 @@ bool Foam::polyMeshZipUpCells(polyMesh& mesh)
const edgeList curFaceEdges =
oldFaces[currentFaceIndex].edges();
- forAll (curFaceEdges, cfeI)
+ forAll(curFaceEdges, cfeI)
{
if (curFaceEdges[cfeI] == testEdge)
{
@@ -567,11 +567,11 @@ bool Foam::polyMeshZipUpCells(polyMesh& mesh)
bool allPointsPresent = true;
- forAll (orderedEdge, oeI)
+ forAll(orderedEdge, oeI)
{
bool curPointFound = false;
- forAll (newFace, nfI)
+ forAll(newFace, nfI)
{
if (newFace[nfI] == orderedEdge[oeI])
{
@@ -611,7 +611,7 @@ bool Foam::polyMeshZipUpCells(polyMesh& mesh)
bool edgeAdded = false;
- forAll (newFaceEdges, curFacEdgI)
+ forAll(newFaceEdges, curFacEdgI)
{
// Does the current edge change?
if (newFaceEdges[curFacEdgI] == testEdge)
@@ -679,7 +679,7 @@ bool Foam::polyMeshZipUpCells(polyMesh& mesh)
# endif
// Check for duplicate points in the new face
- forAll (newFace, checkI)
+ forAll(newFace, checkI)
{
for
(
@@ -745,7 +745,7 @@ bool Foam::polyMeshZipUpCells(polyMesh& mesh)
labelList patchSizes(bMesh.size(), 0);
labelList patchStarts(bMesh.size(), 0);
- forAll (bMesh, patchI)
+ forAll(bMesh, patchI)
{
patchSizes[patchI] = bMesh[patchI].size();
patchStarts[patchI] = bMesh[patchI].start();
diff --git a/src/meshTools/searchableSurface/distributedTriSurfaceMesh.C b/src/meshTools/searchableSurface/distributedTriSurfaceMesh.C
index d00d42c8da4ddc3adf20f1504e2d52791d1acf63..70bfa897a933e9bc3833d6f12abff473e524a7aa 100644
--- a/src/meshTools/searchableSurface/distributedTriSurfaceMesh.C
+++ b/src/meshTools/searchableSurface/distributedTriSurfaceMesh.C
@@ -859,7 +859,7 @@ Foam::distributedTriSurfaceMesh::independentlyDistributedBbs
// Do decomposition according to triangle centre
pointField triCentres(s.size());
- forAll (s, triI)
+ forAll(s, triI)
{
triCentres[triI] = s[triI].centre(s.points());
}
@@ -879,7 +879,7 @@ Foam::distributedTriSurfaceMesh::independentlyDistributedBbs
bbs[procI][0].max() = point(-VGREAT, -VGREAT, -VGREAT);
}
- forAll (s, triI)
+ forAll(s, triI)
{
point& bbMin = bbs[distribution[triI]][0].min();
point& bbMax = bbs[distribution[triI]][0].max();
diff --git a/src/meshTools/searchableSurface/distributedTriSurfaceMesh.H b/src/meshTools/searchableSurface/distributedTriSurfaceMesh.H
index bc3555d06158777068817b1ed3cd6d4d417ce3fa..e061389f13587962747f84fdadc44e2f5097b379 100644
--- a/src/meshTools/searchableSurface/distributedTriSurfaceMesh.H
+++ b/src/meshTools/searchableSurface/distributedTriSurfaceMesh.H
@@ -324,9 +324,8 @@ public:
);
- // Destructor
-
- virtual ~distributedTriSurfaceMesh();
+ //- Destructor
+ virtual ~distributedTriSurfaceMesh();
//- Clear storage
void clearOut();
diff --git a/src/meshTools/searchableSurface/searchableBox.H b/src/meshTools/searchableSurface/searchableBox.H
index b79b0dd98f70707daaa17f0325b329c29e9a22fb..c4afd2bb4e6364c28fa93b763a069aeb4e1e571b 100644
--- a/src/meshTools/searchableSurface/searchableBox.H
+++ b/src/meshTools/searchableSurface/searchableBox.H
@@ -105,9 +105,8 @@ public:
const dictionary& dict
);
- // Destructor
-
- virtual ~searchableBox();
+ //- Destructor
+ virtual ~searchableBox();
// Member Functions
diff --git a/src/meshTools/searchableSurface/searchableCylinder.H b/src/meshTools/searchableSurface/searchableCylinder.H
index 0ecc014c34413667086f5aca767c624b4ae80b8f..c08c4a828e595872eedc064f50ed994e47bafed6 100644
--- a/src/meshTools/searchableSurface/searchableCylinder.H
+++ b/src/meshTools/searchableSurface/searchableCylinder.H
@@ -128,9 +128,8 @@ public:
const dictionary& dict
);
- // Destructor
-
- virtual ~searchableCylinder();
+ //- Destructor
+ virtual ~searchableCylinder();
// Member Functions
diff --git a/src/meshTools/searchableSurface/searchablePlane.H b/src/meshTools/searchableSurface/searchablePlane.H
index 9260eb690d30ba16481836859a49da3c7b802a36..686a1bfcfecd5ef4c22e6bc56086193834c8f01a 100644
--- a/src/meshTools/searchableSurface/searchablePlane.H
+++ b/src/meshTools/searchableSurface/searchablePlane.H
@@ -100,9 +100,8 @@ public:
const dictionary& dict
);
- // Destructor
-
- virtual ~searchablePlane();
+ //- Destructor
+ virtual ~searchablePlane();
// Member Functions
diff --git a/src/meshTools/searchableSurface/searchablePlate.H b/src/meshTools/searchableSurface/searchablePlate.H
index 36eb3b910a8b76949ce70f1d1820ff54cd993f4f..4b3dd4f737e29411a841ab7ac2c8deee381845fa 100644
--- a/src/meshTools/searchableSurface/searchablePlate.H
+++ b/src/meshTools/searchableSurface/searchablePlate.H
@@ -123,9 +123,8 @@ public:
const dictionary& dict
);
- // Destructor
-
- virtual ~searchablePlate();
+ //- Destructor
+ virtual ~searchablePlate();
// Member Functions
diff --git a/src/meshTools/searchableSurface/searchableSphere.H b/src/meshTools/searchableSurface/searchableSphere.H
index b97e0916e43141a827e89538cfa9417c90ec01f3..1765d1c698a16f82b4fbb8fc860daea357758e7b 100644
--- a/src/meshTools/searchableSurface/searchableSphere.H
+++ b/src/meshTools/searchableSurface/searchableSphere.H
@@ -111,9 +111,8 @@ public:
const dictionary& dict
);
- // Destructor
-
- virtual ~searchableSphere();
+ //- Destructor
+ virtual ~searchableSphere();
// Member Functions
diff --git a/src/meshTools/searchableSurface/searchableSurface.H b/src/meshTools/searchableSurface/searchableSurface.H
index fae9265305ba0db5fe25c1230529a2b705c93233..a6ac99a71a18390ad5a5521d6fa33a30614f863f 100644
--- a/src/meshTools/searchableSurface/searchableSurface.H
+++ b/src/meshTools/searchableSurface/searchableSurface.H
@@ -166,9 +166,8 @@ public:
);
- // Destructor
-
- virtual ~searchableSurface();
+ //- Destructor
+ virtual ~searchableSurface();
// Member Functions
diff --git a/src/meshTools/searchableSurface/searchableSurfaceCollection.H b/src/meshTools/searchableSurface/searchableSurfaceCollection.H
index 01490e409f36feeab8f80f53fdf504d2ec8ab312..ef5419927c84ddb0dfe4af5b040cfba9fa4df880 100644
--- a/src/meshTools/searchableSurface/searchableSurfaceCollection.H
+++ b/src/meshTools/searchableSurface/searchableSurfaceCollection.H
@@ -130,9 +130,8 @@ public:
const dictionary& dict
);
- // Destructor
-
- virtual ~searchableSurfaceCollection();
+ //- Destructor
+ virtual ~searchableSurfaceCollection();
// Member Functions
diff --git a/src/meshTools/searchableSurface/searchableSurfaceWithGaps.H b/src/meshTools/searchableSurface/searchableSurfaceWithGaps.H
index 416d60ae446ba6abebdd6ed0d2666038d10ca4fa..3ff95dd5f3f11a2152985fd01954cf701d9b3a4c 100644
--- a/src/meshTools/searchableSurface/searchableSurfaceWithGaps.H
+++ b/src/meshTools/searchableSurface/searchableSurfaceWithGaps.H
@@ -120,9 +120,8 @@ public:
const dictionary& dict
);
- // Destructor
-
- virtual ~searchableSurfaceWithGaps();
+ //- Destructor
+ virtual ~searchableSurfaceWithGaps();
// Member Functions
diff --git a/src/meshTools/searchableSurface/triSurfaceMesh.H b/src/meshTools/searchableSurface/triSurfaceMesh.H
index b0ae9a2c719741720c3242268569bbd7bf7af76b..db9b139cbeac4ba49893525959abbb00fc6770b5 100644
--- a/src/meshTools/searchableSurface/triSurfaceMesh.H
+++ b/src/meshTools/searchableSurface/triSurfaceMesh.H
@@ -159,9 +159,8 @@ public:
);
- // Destructor
-
- virtual ~triSurfaceMesh();
+ //- Destructor
+ virtual ~triSurfaceMesh();
//- Clear storage
void clearOut();
diff --git a/src/meshTools/sets/cellSources/boxToCell/boxToCell.H b/src/meshTools/sets/cellSources/boxToCell/boxToCell.H
index 75dc385c4e4d65e2eb4b5403489207eacaf55d14..38df2e703e09701026542efc05e79e36da9b6949 100644
--- a/src/meshTools/sets/cellSources/boxToCell/boxToCell.H
+++ b/src/meshTools/sets/cellSources/boxToCell/boxToCell.H
@@ -96,9 +96,8 @@ public:
);
- // Destructor
-
- virtual ~boxToCell();
+ //- Destructor
+ virtual ~boxToCell();
// Member Functions
diff --git a/src/meshTools/sets/cellSources/cellToCell/cellToCell.H b/src/meshTools/sets/cellSources/cellToCell/cellToCell.H
index 6e076370e0ab660ddafd9d63ab890861dbff34e9..85a0f1af721c381389243d0879be4b5d095bdeb5 100644
--- a/src/meshTools/sets/cellSources/cellToCell/cellToCell.H
+++ b/src/meshTools/sets/cellSources/cellToCell/cellToCell.H
@@ -87,9 +87,8 @@ public:
);
- // Destructor
-
- virtual ~cellToCell();
+ //- Destructor
+ virtual ~cellToCell();
// Member Functions
diff --git a/src/meshTools/sets/cellSources/cylinderToCell/cylinderToCell.H b/src/meshTools/sets/cellSources/cylinderToCell/cylinderToCell.H
index 15cee8c3fb9c03de4d61db5ccd66ac7bd4013a0e..879297cbe679514b1a210c4a736e326c1388af41 100644
--- a/src/meshTools/sets/cellSources/cylinderToCell/cylinderToCell.H
+++ b/src/meshTools/sets/cellSources/cylinderToCell/cylinderToCell.H
@@ -103,9 +103,8 @@ public:
);
- // Destructor
-
- virtual ~cylinderToCell();
+ //- Destructor
+ virtual ~cylinderToCell();
// Member Functions
diff --git a/src/meshTools/sets/cellSources/faceToCell/faceToCell.C b/src/meshTools/sets/cellSources/faceToCell/faceToCell.C
index 39b48a838d1bfa12ec6b0bd753485df8f597fc35..a1ab4a26998163f771f239ba27b252c26cabf256 100644
--- a/src/meshTools/sets/cellSources/faceToCell/faceToCell.C
+++ b/src/meshTools/sets/cellSources/faceToCell/faceToCell.C
@@ -73,18 +73,13 @@ void Foam::faceToCell::combine(topoSet& set, const bool add) const
// Handle owner/neighbour/any selection
- for
- (
- faceSet::const_iterator iter = loadedSet.begin();
- iter != loadedSet.end();
- ++iter
- )
+ forAllConstIter(faceSet, loadedSet, iter)
{
- label faceI = iter.key();
+ const label faceI = iter.key();
if ((option_ == OWNER) || (option_ == ANY))
{
- label cellI = mesh_.faceOwner()[faceI];
+ const label cellI = mesh_.faceOwner()[faceI];
addOrDelete(set, cellI, add);
}
@@ -93,7 +88,7 @@ void Foam::faceToCell::combine(topoSet& set, const bool add) const
{
if ((option_ == NEIGHBOUR) || (option_ == ANY))
{
- label cellI = mesh_.faceNeighbour()[faceI];
+ const label cellI = mesh_.faceNeighbour()[faceI];
addOrDelete(set, cellI, add);
}
@@ -107,16 +102,10 @@ void Foam::faceToCell::combine(topoSet& set, const bool add) const
Map<label> facesPerCell(loadedSet.size());
- for
- (
- faceSet::const_iterator iter = loadedSet.begin();
- iter != loadedSet.end();
- ++iter
- )
+ forAllConstIter(faceSet, loadedSet, iter)
{
- label faceI = iter.key();
-
- label own = mesh_.faceOwner()[faceI];
+ const label faceI = iter.key();
+ const label own = mesh_.faceOwner()[faceI];
Map<label>::iterator fndOwn = facesPerCell.find(own);
@@ -148,14 +137,9 @@ void Foam::faceToCell::combine(topoSet& set, const bool add) const
// Include cells that are referenced as many times as they have faces
// -> all faces in set.
- for
- (
- Map<label>::const_iterator iter = facesPerCell.begin();
- iter != facesPerCell.end();
- ++iter
- )
+ forAllConstIter(Map<label>, facesPerCell, iter)
{
- label cellI = iter.key();
+ const label cellI = iter.key();
if (iter() == mesh_.cells()[cellI].size())
{
diff --git a/src/meshTools/sets/cellSources/faceToCell/faceToCell.H b/src/meshTools/sets/cellSources/faceToCell/faceToCell.H
index 983f25b490bde6164d618ba49efdd5dc8daa618e..c3f6777d8aef3db68b84e51d87e722cbadd19be0 100644
--- a/src/meshTools/sets/cellSources/faceToCell/faceToCell.H
+++ b/src/meshTools/sets/cellSources/faceToCell/faceToCell.H
@@ -113,9 +113,8 @@ public:
);
- // Destructor
-
- virtual ~faceToCell();
+ //- Destructor
+ virtual ~faceToCell();
// Member Functions
diff --git a/src/meshTools/sets/cellSources/faceZoneToCell/faceZoneToCell.H b/src/meshTools/sets/cellSources/faceZoneToCell/faceZoneToCell.H
index b1ae27535576799ad3aca6ddb9776e6a9810cfad..a7227a647921e64441bfc9e6f51ee5093bfefb6b 100644
--- a/src/meshTools/sets/cellSources/faceZoneToCell/faceZoneToCell.H
+++ b/src/meshTools/sets/cellSources/faceZoneToCell/faceZoneToCell.H
@@ -110,9 +110,8 @@ public:
);
- // Destructor
-
- virtual ~faceZoneToCell();
+ //- Destructor
+ virtual ~faceZoneToCell();
// Member Functions
diff --git a/src/meshTools/sets/cellSources/fieldToCell/fieldToCell.H b/src/meshTools/sets/cellSources/fieldToCell/fieldToCell.H
index 2ac69f2039b2a011265860a44862307da130844b..3ab18bdc5f70bb51eff26d9a4446e74001e6fb05 100644
--- a/src/meshTools/sets/cellSources/fieldToCell/fieldToCell.H
+++ b/src/meshTools/sets/cellSources/fieldToCell/fieldToCell.H
@@ -109,9 +109,8 @@ public:
);
- // Destructor
-
- virtual ~fieldToCell();
+ //- Destructor
+ virtual ~fieldToCell();
// Member Functions
diff --git a/src/meshTools/sets/cellSources/labelToCell/labelToCell.H b/src/meshTools/sets/cellSources/labelToCell/labelToCell.H
index d3e5275feb95e4eb82e00fda0470bd0b0e7d7850..2604cbb6ba647bc96e54f5384c55b407c151fd5e 100644
--- a/src/meshTools/sets/cellSources/labelToCell/labelToCell.H
+++ b/src/meshTools/sets/cellSources/labelToCell/labelToCell.H
@@ -94,9 +94,8 @@ public:
);
- // Destructor
-
- virtual ~labelToCell();
+ //- Destructor
+ virtual ~labelToCell();
// Member Functions
diff --git a/src/meshTools/sets/cellSources/nbrToCell/nbrToCell.H b/src/meshTools/sets/cellSources/nbrToCell/nbrToCell.H
index a48d577cabf06cf0e11ec4b74a5dc7b179662220..7aeadce4487d09edf36fc0f14a22ff07b2fadfc8 100644
--- a/src/meshTools/sets/cellSources/nbrToCell/nbrToCell.H
+++ b/src/meshTools/sets/cellSources/nbrToCell/nbrToCell.H
@@ -95,9 +95,8 @@ public:
);
- // Destructor
-
- virtual ~nbrToCell();
+ //- Destructor
+ virtual ~nbrToCell();
// Member Functions
diff --git a/src/meshTools/sets/cellSources/nearestToCell/nearestToCell.H b/src/meshTools/sets/cellSources/nearestToCell/nearestToCell.H
index d7e74b46e94e6c29ad17a19a4ff19910489016df..24e566432fa881e6b2a52a4ab01e790d206c38ae 100644
--- a/src/meshTools/sets/cellSources/nearestToCell/nearestToCell.H
+++ b/src/meshTools/sets/cellSources/nearestToCell/nearestToCell.H
@@ -94,9 +94,8 @@ public:
);
- // Destructor
-
- virtual ~nearestToCell();
+ //- Destructor
+ virtual ~nearestToCell();
// Member Functions
diff --git a/src/meshTools/sets/cellSources/pointToCell/pointToCell.C b/src/meshTools/sets/cellSources/pointToCell/pointToCell.C
index 84913bbc7007757e374bcd40634753fed4a6ae42..42faac845b96b3f62f0cda11027e8c4457b577e9 100644
--- a/src/meshTools/sets/cellSources/pointToCell/pointToCell.C
+++ b/src/meshTools/sets/cellSources/pointToCell/pointToCell.C
@@ -72,15 +72,9 @@ void Foam::pointToCell::combine(topoSet& set, const bool add) const
// Handle any selection
if (option_ == ANY)
{
- for
- (
- pointSet::const_iterator iter = loadedSet.begin();
- iter != loadedSet.end();
- ++iter
- )
+ forAllConstIter(pointSet, loadedSet, iter)
{
- label pointI = iter.key();
-
+ const label pointI = iter.key();
const labelList& pCells = mesh_.pointCells()[pointI];
forAll(pCells, pCellI)
diff --git a/src/meshTools/sets/cellSources/pointToCell/pointToCell.H b/src/meshTools/sets/cellSources/pointToCell/pointToCell.H
index a527bbde57c62a7bf2cd63c1e4e55839f07276b5..572fb5a3eb44648bada85b3b419c0c8cb0658618 100644
--- a/src/meshTools/sets/cellSources/pointToCell/pointToCell.H
+++ b/src/meshTools/sets/cellSources/pointToCell/pointToCell.H
@@ -109,9 +109,8 @@ public:
);
- // Destructor
-
- virtual ~pointToCell();
+ //- Destructor
+ virtual ~pointToCell();
// Member Functions
diff --git a/src/meshTools/sets/cellSources/regionToCell/regionToCell.H b/src/meshTools/sets/cellSources/regionToCell/regionToCell.H
index 985ee2dc3ba21a6e931dd640a1c1770df3c6a6eb..370781d7978efe578bf6aeb19b854cede5adc194 100644
--- a/src/meshTools/sets/cellSources/regionToCell/regionToCell.H
+++ b/src/meshTools/sets/cellSources/regionToCell/regionToCell.H
@@ -99,9 +99,8 @@ public:
);
- // Destructor
-
- virtual ~regionToCell();
+ //- Destructor
+ virtual ~regionToCell();
// Member Functions
diff --git a/src/meshTools/sets/cellSources/rotatedBoxToCell/rotatedBoxToCell.H b/src/meshTools/sets/cellSources/rotatedBoxToCell/rotatedBoxToCell.H
index f680eb45ef507a5385e3edb69a2d00515deeccbf..977c011d3d0955aaebf4e0e90551c330e196bbc0 100644
--- a/src/meshTools/sets/cellSources/rotatedBoxToCell/rotatedBoxToCell.H
+++ b/src/meshTools/sets/cellSources/rotatedBoxToCell/rotatedBoxToCell.H
@@ -105,9 +105,8 @@ public:
rotatedBoxToCell(const polyMesh& mesh, Istream&);
- // Destructor
-
- virtual ~rotatedBoxToCell();
+ //- Destructor
+ virtual ~rotatedBoxToCell();
// Member Functions
diff --git a/src/meshTools/sets/cellSources/shapeToCell/shapeToCell.H b/src/meshTools/sets/cellSources/shapeToCell/shapeToCell.H
index d8ad5d1d87a53a9fa7a014084eafb5e704ca2534..bf3524c085c5f1550146289732f7d949b0d00379 100644
--- a/src/meshTools/sets/cellSources/shapeToCell/shapeToCell.H
+++ b/src/meshTools/sets/cellSources/shapeToCell/shapeToCell.H
@@ -103,9 +103,8 @@ public:
);
- // Destructor
-
- virtual ~shapeToCell();
+ //- Destructor
+ virtual ~shapeToCell();
// Member Functions
diff --git a/src/meshTools/sets/cellSources/sphereToCell/sphereToCell.H b/src/meshTools/sets/cellSources/sphereToCell/sphereToCell.H
index 2e9139d76e27ed742cc24f5cd68cf01a545d95b7..66f4e0296962021362f509960d8d659b3d616ff7 100644
--- a/src/meshTools/sets/cellSources/sphereToCell/sphereToCell.H
+++ b/src/meshTools/sets/cellSources/sphereToCell/sphereToCell.H
@@ -99,9 +99,8 @@ public:
);
- // Destructor
-
- virtual ~sphereToCell();
+ //- Destructor
+ virtual ~sphereToCell();
// Member Functions
diff --git a/src/meshTools/sets/cellSources/surfaceToCell/surfaceToCell.H b/src/meshTools/sets/cellSources/surfaceToCell/surfaceToCell.H
index 17f0f704a1d18787af4ef63d9974c556821db460..376f98f95e5d2ca808fa87aa55b174f3db22bbb1 100644
--- a/src/meshTools/sets/cellSources/surfaceToCell/surfaceToCell.H
+++ b/src/meshTools/sets/cellSources/surfaceToCell/surfaceToCell.H
@@ -189,9 +189,8 @@ public:
);
- // Destructor
-
- virtual ~surfaceToCell();
+ //- Destructor
+ virtual ~surfaceToCell();
// Member Functions
diff --git a/src/meshTools/sets/cellSources/zoneToCell/zoneToCell.H b/src/meshTools/sets/cellSources/zoneToCell/zoneToCell.H
index 3abd63008abde40148eba7ceae5d0d2c48e8ccef..b17a4108801655fa0409b6613081e7dadca48ec9 100644
--- a/src/meshTools/sets/cellSources/zoneToCell/zoneToCell.H
+++ b/src/meshTools/sets/cellSources/zoneToCell/zoneToCell.H
@@ -95,9 +95,8 @@ public:
);
- // Destructor
-
- virtual ~zoneToCell();
+ //- Destructor
+ virtual ~zoneToCell();
// Member Functions
diff --git a/src/meshTools/sets/cellZoneSources/setToCellZone/setToCellZone.H b/src/meshTools/sets/cellZoneSources/setToCellZone/setToCellZone.H
index 7fec89e9c22eba4f7bdc6750f8ad7a42db8442ff..50bc04377b26a3368906ff6406a22c7dab86d1db 100644
--- a/src/meshTools/sets/cellZoneSources/setToCellZone/setToCellZone.H
+++ b/src/meshTools/sets/cellZoneSources/setToCellZone/setToCellZone.H
@@ -87,9 +87,8 @@ public:
);
- // Destructor
-
- virtual ~setToCellZone();
+ //- Destructor
+ virtual ~setToCellZone();
// Member Functions
diff --git a/src/meshTools/sets/faceSources/boundaryToFace/boundaryToFace.H b/src/meshTools/sets/faceSources/boundaryToFace/boundaryToFace.H
index 24b98fedf83d7210930676118517f30eeed69e75..4432b0d764743ddac45559352b0200087e2578cf 100644
--- a/src/meshTools/sets/faceSources/boundaryToFace/boundaryToFace.H
+++ b/src/meshTools/sets/faceSources/boundaryToFace/boundaryToFace.H
@@ -86,9 +86,8 @@ public:
);
- // Destructor
-
- virtual ~boundaryToFace();
+ //- Destructor
+ virtual ~boundaryToFace();
// Member Functions
diff --git a/src/meshTools/sets/faceSources/boxToFace/boxToFace.H b/src/meshTools/sets/faceSources/boxToFace/boxToFace.H
index f5c7398e203475a91d0fce132e89b34bd88bcdc5..575d53c7392340e8e96b3f1ee715719f16a22540 100644
--- a/src/meshTools/sets/faceSources/boxToFace/boxToFace.H
+++ b/src/meshTools/sets/faceSources/boxToFace/boxToFace.H
@@ -95,9 +95,8 @@ public:
);
- // Destructor
-
- virtual ~boxToFace();
+ //- Destructor
+ virtual ~boxToFace();
// Member Functions
diff --git a/src/meshTools/sets/faceSources/cellToFace/cellToFace.C b/src/meshTools/sets/faceSources/cellToFace/cellToFace.C
index 882c0a6e0b98efcbcd948239ae7b07a8a58d2923..431fad348ce007bc895624c1478e033faaad654a 100644
--- a/src/meshTools/sets/faceSources/cellToFace/cellToFace.C
+++ b/src/meshTools/sets/faceSources/cellToFace/cellToFace.C
@@ -79,15 +79,9 @@ void Foam::cellToFace::combine(topoSet& set, const bool add) const
if (option_ == ALL)
{
// Add all faces from cell
- for
- (
- cellSet::const_iterator iter = loadedSet.begin();
- iter != loadedSet.end();
- ++iter
- )
+ forAllConstIter(cellSet, loadedSet, iter)
{
- label cellI = iter.key();
-
+ const label cellI = iter.key();
const labelList& cFaces = mesh_.cells()[cellI];
forAll(cFaces, cFaceI)
@@ -100,7 +94,7 @@ void Foam::cellToFace::combine(topoSet& set, const bool add) const
{
// Add all faces whose both neighbours are in set.
- label nInt = mesh_.nInternalFaces();
+ const label nInt = mesh_.nInternalFaces();
const labelList& own = mesh_.faceOwner();
const labelList& nei = mesh_.faceNeighbour();
const polyBoundaryMesh& patches = mesh_.boundaryMesh();
diff --git a/src/meshTools/sets/faceSources/cellToFace/cellToFace.H b/src/meshTools/sets/faceSources/cellToFace/cellToFace.H
index fbaf55142f46bad7ac34385710c3348c22a021a0..d01e25eb348a1dda86fc95afc029a92d9b5a5dd8 100644
--- a/src/meshTools/sets/faceSources/cellToFace/cellToFace.H
+++ b/src/meshTools/sets/faceSources/cellToFace/cellToFace.H
@@ -114,9 +114,8 @@ public:
);
- // Destructor
-
- virtual ~cellToFace();
+ //- Destructor
+ virtual ~cellToFace();
// Member Functions
diff --git a/src/meshTools/sets/faceSources/faceToFace/faceToFace.H b/src/meshTools/sets/faceSources/faceToFace/faceToFace.H
index 4963145407a0336219480ae9d15c712c27235e9f..c18be1df0548bd554367cdee48309c1d87a6c386 100644
--- a/src/meshTools/sets/faceSources/faceToFace/faceToFace.H
+++ b/src/meshTools/sets/faceSources/faceToFace/faceToFace.H
@@ -87,9 +87,8 @@ public:
);
- // Destructor
-
- virtual ~faceToFace();
+ //- Destructor
+ virtual ~faceToFace();
// Member Functions
diff --git a/src/meshTools/sets/faceSources/labelToFace/labelToFace.H b/src/meshTools/sets/faceSources/labelToFace/labelToFace.H
index c922b3b99f9c4c901f3be749c58b68a7b0b5bdb8..6f923554a4a42cad5a675f2e261f27daa941fce7 100644
--- a/src/meshTools/sets/faceSources/labelToFace/labelToFace.H
+++ b/src/meshTools/sets/faceSources/labelToFace/labelToFace.H
@@ -94,9 +94,8 @@ public:
);
- // Destructor
-
- virtual ~labelToFace();
+ //- Destructor
+ virtual ~labelToFace();
// Member Functions
diff --git a/src/meshTools/sets/faceSources/normalToFace/normalToFace.C b/src/meshTools/sets/faceSources/normalToFace/normalToFace.C
index 85b8b4c9b06cc6dc275fcf1ec14d3dfacc9e17ec..8a1a18a051b1724c59d194d187f51b0f330a2ada 100644
--- a/src/meshTools/sets/faceSources/normalToFace/normalToFace.C
+++ b/src/meshTools/sets/faceSources/normalToFace/normalToFace.C
@@ -150,9 +150,9 @@ void Foam::normalToFace::applyToSet
DynamicList<label> toBeRemoved(set.size()/10);
- forAllIter(topoSet, set, iter)
+ forAllConstIter(topoSet, set, iter)
{
- label faceI = iter.key();
+ const label faceI = iter.key();
vector n = mesh_.faceAreas()[faceI];
n /= mag(n) + VSMALL;
diff --git a/src/meshTools/sets/faceSources/normalToFace/normalToFace.H b/src/meshTools/sets/faceSources/normalToFace/normalToFace.H
index 67583a07444b0118b3bd8c9399b197bd6934f966..c131dbd8dab8361157e03c1ee34f5c5b85ba1e95 100644
--- a/src/meshTools/sets/faceSources/normalToFace/normalToFace.H
+++ b/src/meshTools/sets/faceSources/normalToFace/normalToFace.H
@@ -92,9 +92,8 @@ public:
normalToFace(const polyMesh& mesh, Istream&);
- // Destructor
-
- virtual ~normalToFace();
+ //- Destructor
+ virtual ~normalToFace();
// Member Functions
diff --git a/src/meshTools/sets/faceSources/patchToFace/patchToFace.H b/src/meshTools/sets/faceSources/patchToFace/patchToFace.H
index 11861b4211c9a5074d4e59b38d82d7b9ed96f65b..0853fbbd37554d901e207da257f4347165ab538f 100644
--- a/src/meshTools/sets/faceSources/patchToFace/patchToFace.H
+++ b/src/meshTools/sets/faceSources/patchToFace/patchToFace.H
@@ -95,9 +95,8 @@ public:
);
- // Destructor
-
- virtual ~patchToFace();
+ //- Destructor
+ virtual ~patchToFace();
// Member Functions
diff --git a/src/meshTools/sets/faceSources/pointToFace/pointToFace.C b/src/meshTools/sets/faceSources/pointToFace/pointToFace.C
index b3c7b9aa9c2d907de2212e3bbd33fc3a3a7dc83d..92dd4701499942bf1e90f9fdca300b83e0f850bc 100644
--- a/src/meshTools/sets/faceSources/pointToFace/pointToFace.C
+++ b/src/meshTools/sets/faceSources/pointToFace/pointToFace.C
@@ -73,15 +73,9 @@ void Foam::pointToFace::combine(topoSet& set, const bool add) const
if (option_ == ANY)
{
// Add faces with any point in loadedSet
- for
- (
- pointSet::const_iterator iter = loadedSet.begin();
- iter != loadedSet.end();
- ++iter
- )
+ forAllConstIter(pointSet, loadedSet, iter)
{
- label pointI = iter.key();
-
+ const label pointI = iter.key();
const labelList& pFaces = mesh_.pointFaces()[pointI];
forAll(pFaces, pFaceI)
@@ -99,13 +93,12 @@ void Foam::pointToFace::combine(topoSet& set, const bool add) const
forAllConstIter(pointSet, loadedSet, iter)
{
- label pointI = iter.key();
-
+ const label pointI = iter.key();
const labelList& pFaces = mesh_.pointFaces()[pointI];
forAll(pFaces, pFaceI)
{
- label faceI = pFaces[pFaceI];
+ const label faceI = pFaces[pFaceI];
Map<label>::iterator fndFace = numPoints.find(faceI);
@@ -123,14 +116,9 @@ void Foam::pointToFace::combine(topoSet& set, const bool add) const
// Include faces that are referenced as many times as there are points
// in face -> all points of face
- for
- (
- Map<label>::const_iterator iter = numPoints.begin();
- iter != numPoints.end();
- ++iter
- )
+ forAllConstIter(Map<label>, numPoints, iter)
{
- label faceI = iter.key();
+ const label faceI = iter.key();
if (iter() == mesh_.faces()[faceI].size())
{
diff --git a/src/meshTools/sets/faceSources/pointToFace/pointToFace.H b/src/meshTools/sets/faceSources/pointToFace/pointToFace.H
index d5708cc14b7affee70540a6e1863871e83773530..1893307621b9227332cc86a36882349df6dbfff6 100644
--- a/src/meshTools/sets/faceSources/pointToFace/pointToFace.H
+++ b/src/meshTools/sets/faceSources/pointToFace/pointToFace.H
@@ -112,9 +112,8 @@ public:
);
- // Destructor
-
- virtual ~pointToFace();
+ //- Destructor
+ virtual ~pointToFace();
// Member Functions
diff --git a/src/meshTools/sets/faceSources/zoneToFace/zoneToFace.H b/src/meshTools/sets/faceSources/zoneToFace/zoneToFace.H
index ac98654021c349d10db5830e9f01d8a56e0fb36d..98b2e891ab62889a1739b344f3a50fe2c05ee088 100644
--- a/src/meshTools/sets/faceSources/zoneToFace/zoneToFace.H
+++ b/src/meshTools/sets/faceSources/zoneToFace/zoneToFace.H
@@ -95,9 +95,8 @@ public:
);
- // Destructor
-
- virtual ~zoneToFace();
+ //- Destructor
+ virtual ~zoneToFace();
// Member Functions
diff --git a/src/meshTools/sets/faceZoneSources/faceZoneToFaceZone/faceZoneToFaceZone.H b/src/meshTools/sets/faceZoneSources/faceZoneToFaceZone/faceZoneToFaceZone.H
index 39b8c020585cd3ddb9a25378fdef6a0a52822e05..41ad8b2fca0659d8bb9391a57316c662cc367d61 100644
--- a/src/meshTools/sets/faceZoneSources/faceZoneToFaceZone/faceZoneToFaceZone.H
+++ b/src/meshTools/sets/faceZoneSources/faceZoneToFaceZone/faceZoneToFaceZone.H
@@ -87,9 +87,8 @@ public:
);
- // Destructor
-
- virtual ~faceZoneToFaceZone();
+ //- Destructor
+ virtual ~faceZoneToFaceZone();
// Member Functions
diff --git a/src/meshTools/sets/faceZoneSources/setToFaceZone/setToFaceZone.H b/src/meshTools/sets/faceZoneSources/setToFaceZone/setToFaceZone.H
index c1f85f43e88133cb287c99b121972b7ed445cc30..377c279ae13fa09919a2ea5c35cf85670fe1f0a0 100644
--- a/src/meshTools/sets/faceZoneSources/setToFaceZone/setToFaceZone.H
+++ b/src/meshTools/sets/faceZoneSources/setToFaceZone/setToFaceZone.H
@@ -88,9 +88,8 @@ public:
);
- // Destructor
-
- virtual ~setToFaceZone();
+ //- Destructor
+ virtual ~setToFaceZone();
// Member Functions
diff --git a/src/meshTools/sets/faceZoneSources/setsToFaceZone/setsToFaceZone.H b/src/meshTools/sets/faceZoneSources/setsToFaceZone/setsToFaceZone.H
index 2c88af3e174715419da27c9181d75cbe85e57ce7..306110730d5fd78e2ae6e6fec3f49ad1820a8374 100644
--- a/src/meshTools/sets/faceZoneSources/setsToFaceZone/setsToFaceZone.H
+++ b/src/meshTools/sets/faceZoneSources/setsToFaceZone/setsToFaceZone.H
@@ -91,9 +91,8 @@ public:
);
- // Destructor
-
- virtual ~setsToFaceZone();
+ //- Destructor
+ virtual ~setsToFaceZone();
// Member Functions
diff --git a/src/meshTools/sets/pointSources/boxToPoint/boxToPoint.H b/src/meshTools/sets/pointSources/boxToPoint/boxToPoint.H
index 92160be3896f19038b634e511751ee9841199212..06c5e5ff23303b102c1889b0bf67aaa1556454ab 100644
--- a/src/meshTools/sets/pointSources/boxToPoint/boxToPoint.H
+++ b/src/meshTools/sets/pointSources/boxToPoint/boxToPoint.H
@@ -95,9 +95,8 @@ public:
);
- // Destructor
-
- virtual ~boxToPoint();
+ //- Destructor
+ virtual ~boxToPoint();
// Member Functions
diff --git a/src/meshTools/sets/pointSources/cellToPoint/cellToPoint.C b/src/meshTools/sets/pointSources/cellToPoint/cellToPoint.C
index a33dab098d1402a2e6121b75c2040b47ef2c0201..bd727589fe74cc26c3d520698c455523d1e2653b 100644
--- a/src/meshTools/sets/pointSources/cellToPoint/cellToPoint.C
+++ b/src/meshTools/sets/pointSources/cellToPoint/cellToPoint.C
@@ -68,15 +68,9 @@ void Foam::cellToPoint::combine(topoSet& set, const bool add) const
cellSet loadedSet(mesh_, setName_);
// Add all point from cells in loadedSet
- for
- (
- cellSet::const_iterator iter = loadedSet.begin();
- iter != loadedSet.end();
- ++iter
- )
+ forAllConstIter(cellSet, loadedSet, iter)
{
- label cellI = iter.key();
-
+ const label cellI = iter.key();
const labelList& cFaces = mesh_.cells()[cellI];
forAll(cFaces, cFaceI)
diff --git a/src/meshTools/sets/pointSources/cellToPoint/cellToPoint.H b/src/meshTools/sets/pointSources/cellToPoint/cellToPoint.H
index 327c2180ee56e9a1c33d9ce39f421dc02801669f..0d5e693120d123e8c9fdc74c08aab3fcfa2404f1 100644
--- a/src/meshTools/sets/pointSources/cellToPoint/cellToPoint.H
+++ b/src/meshTools/sets/pointSources/cellToPoint/cellToPoint.H
@@ -109,9 +109,8 @@ public:
);
- // Destructor
-
- virtual ~cellToPoint();
+ //- Destructor
+ virtual ~cellToPoint();
// Member Functions
diff --git a/src/meshTools/sets/pointSources/faceToPoint/faceToPoint.C b/src/meshTools/sets/pointSources/faceToPoint/faceToPoint.C
index 2f906e3d6c33f2d1099755da377440219e6f0b5a..a4fff893dc51c3870722b975c47e2dccb4603969 100644
--- a/src/meshTools/sets/pointSources/faceToPoint/faceToPoint.C
+++ b/src/meshTools/sets/pointSources/faceToPoint/faceToPoint.C
@@ -68,12 +68,7 @@ void Foam::faceToPoint::combine(topoSet& set, const bool add) const
faceSet loadedSet(mesh_, setName_);
// Add all points from faces in loadedSet
- for
- (
- faceSet::const_iterator iter = loadedSet.begin();
- iter != loadedSet.end();
- ++iter
- )
+ forAllConstIter(faceSet, loadedSet, iter)
{
const face& f = mesh_.faces()[iter.key()];
diff --git a/src/meshTools/sets/pointSources/faceToPoint/faceToPoint.H b/src/meshTools/sets/pointSources/faceToPoint/faceToPoint.H
index a8e981bf68debc966e6b9746bb43c7eb9083254a..61d865d14fb9c385bff84176c629b998c7652a25 100644
--- a/src/meshTools/sets/pointSources/faceToPoint/faceToPoint.H
+++ b/src/meshTools/sets/pointSources/faceToPoint/faceToPoint.H
@@ -109,9 +109,8 @@ public:
);
- // Destructor
-
- virtual ~faceToPoint();
+ //- Destructor
+ virtual ~faceToPoint();
// Member Functions
diff --git a/src/meshTools/sets/pointSources/labelToPoint/labelToPoint.H b/src/meshTools/sets/pointSources/labelToPoint/labelToPoint.H
index c2c515f4bf47b35706db5045890a7b4977182114..bdc8e6be3b1fee8666b502a920e443406c3491b4 100644
--- a/src/meshTools/sets/pointSources/labelToPoint/labelToPoint.H
+++ b/src/meshTools/sets/pointSources/labelToPoint/labelToPoint.H
@@ -94,9 +94,8 @@ public:
);
- // Destructor
-
- virtual ~labelToPoint();
+ //- Destructor
+ virtual ~labelToPoint();
// Member Functions
diff --git a/src/meshTools/sets/pointSources/nearestToPoint/nearestToPoint.H b/src/meshTools/sets/pointSources/nearestToPoint/nearestToPoint.H
index 5d0202769143f642de8308e274b73c3839891b45..040cf64c2ca6df84c0f8b751afe6854dff1a8677 100644
--- a/src/meshTools/sets/pointSources/nearestToPoint/nearestToPoint.H
+++ b/src/meshTools/sets/pointSources/nearestToPoint/nearestToPoint.H
@@ -94,9 +94,8 @@ public:
);
- // Destructor
-
- virtual ~nearestToPoint();
+ //- Destructor
+ virtual ~nearestToPoint();
// Member Functions
diff --git a/src/meshTools/sets/pointSources/pointToPoint/pointToPoint.H b/src/meshTools/sets/pointSources/pointToPoint/pointToPoint.H
index 7a8c2677e08493af3b5e9ef5b6fca7647464d21c..5efea5328f40024b64527d563f0112a73fc4545a 100644
--- a/src/meshTools/sets/pointSources/pointToPoint/pointToPoint.H
+++ b/src/meshTools/sets/pointSources/pointToPoint/pointToPoint.H
@@ -87,9 +87,8 @@ public:
);
- // Destructor
-
- virtual ~pointToPoint();
+ //- Destructor
+ virtual ~pointToPoint();
// Member Functions
diff --git a/src/meshTools/sets/pointSources/surfaceToPoint/surfaceToPoint.H b/src/meshTools/sets/pointSources/surfaceToPoint/surfaceToPoint.H
index 03a5bc6bfc25627e99b8d39a93f93cf54e88de09..f7ef86ef5780ca7ed5bd361b4a5c75b3437fa689 100644
--- a/src/meshTools/sets/pointSources/surfaceToPoint/surfaceToPoint.H
+++ b/src/meshTools/sets/pointSources/surfaceToPoint/surfaceToPoint.H
@@ -117,9 +117,8 @@ public:
);
- // Destructor
-
- virtual ~surfaceToPoint();
+ //- Destructor
+ virtual ~surfaceToPoint();
// Member Functions
diff --git a/src/meshTools/sets/pointSources/zoneToPoint/zoneToPoint.H b/src/meshTools/sets/pointSources/zoneToPoint/zoneToPoint.H
index be8801284d56df0bc72614c491acd1d785a97778..f4f2548535a0c95cbbf5f8ff461d3c46ab1a36b7 100644
--- a/src/meshTools/sets/pointSources/zoneToPoint/zoneToPoint.H
+++ b/src/meshTools/sets/pointSources/zoneToPoint/zoneToPoint.H
@@ -95,9 +95,8 @@ public:
);
- // Destructor
-
- virtual ~zoneToPoint();
+ //- Destructor
+ virtual ~zoneToPoint();
// Member Functions
diff --git a/src/meshTools/sets/pointZoneSources/setToPointZone/setToPointZone.H b/src/meshTools/sets/pointZoneSources/setToPointZone/setToPointZone.H
index 85c4aaf9b9f4dccc0ddc76cedd6950c92cb29125..320ac8250c35ced515acf6768372f0863f111852 100644
--- a/src/meshTools/sets/pointZoneSources/setToPointZone/setToPointZone.H
+++ b/src/meshTools/sets/pointZoneSources/setToPointZone/setToPointZone.H
@@ -87,9 +87,8 @@ public:
);
- // Destructor
-
- virtual ~setToPointZone();
+ //- Destructor
+ virtual ~setToPointZone();
// Member Functions
diff --git a/src/meshTools/sets/topoSetSource/topoSetSource.H b/src/meshTools/sets/topoSetSource/topoSetSource.H
index c3271a8a7fd1011d456989f3c37b5bb9db3dafdd..15071da67c559e4d7c549dc0675cdf10f90efe3b 100644
--- a/src/meshTools/sets/topoSetSource/topoSetSource.H
+++ b/src/meshTools/sets/topoSetSource/topoSetSource.H
@@ -254,9 +254,8 @@ public:
);
- // Destructor
-
- virtual ~topoSetSource();
+ //- Destructor
+ virtual ~topoSetSource();
// Member Functions
diff --git a/src/meshTools/sets/topoSets/cellSet.H b/src/meshTools/sets/topoSets/cellSet.H
index d36a4081dbe7859579b618f3811cc75d124df441..61daf2af67b4a1d6fb3e960395599232f55eaeb1 100644
--- a/src/meshTools/sets/topoSets/cellSet.H
+++ b/src/meshTools/sets/topoSets/cellSet.H
@@ -134,9 +134,8 @@ public:
);
- // Destructor
-
- virtual ~cellSet();
+ //- Destructor
+ virtual ~cellSet();
// Member functions
diff --git a/src/meshTools/sets/topoSets/cellZoneSet.H b/src/meshTools/sets/topoSets/cellZoneSet.H
index 99a7346bded8a3315dc45f2420fb530789a933de..af0b6bb878d65bd1b01ff7fc364eafb630493fc2 100644
--- a/src/meshTools/sets/topoSets/cellZoneSet.H
+++ b/src/meshTools/sets/topoSets/cellZoneSet.H
@@ -94,9 +94,8 @@ public:
- // Destructor
-
- virtual ~cellZoneSet();
+ //- Destructor
+ virtual ~cellZoneSet();
// Member functions
diff --git a/src/meshTools/sets/topoSets/faceSet.C b/src/meshTools/sets/topoSets/faceSet.C
index 21c359db05577befd9f4e4a9afd0de4c14c223ee..1dea0b0e9b02c0c5e35cd19f70ec4825dfee40bb 100644
--- a/src/meshTools/sets/topoSets/faceSet.C
+++ b/src/meshTools/sets/topoSets/faceSet.C
@@ -182,7 +182,7 @@ void faceSet::sync(const polyMesh& mesh)
}
// Couple cyclic patches
- forAll (patches, patchI)
+ forAll(patches, patchI)
{
const polyPatch& pp = patches[patchI];
@@ -191,7 +191,7 @@ void faceSet::sync(const polyMesh& mesh)
const cyclicPolyPatch& cycPatch =
refCast<const cyclicPolyPatch>(pp);
- forAll (cycPatch, i)
+ forAll(cycPatch, i)
{
label thisFaceI = cycPatch.start() + i;
label otherFaceI = cycPatch.transformGlobalFace(thisFaceI);
diff --git a/src/meshTools/sets/topoSets/faceSet.H b/src/meshTools/sets/topoSets/faceSet.H
index b698fabb3004452752c39ccc24249a6f2d6109c6..582c8ff05ac13dccd17714705a7a5becc985700d 100644
--- a/src/meshTools/sets/topoSets/faceSet.H
+++ b/src/meshTools/sets/topoSets/faceSet.H
@@ -101,9 +101,8 @@ public:
);
- // Destructor
-
- virtual ~faceSet();
+ //- Destructor
+ virtual ~faceSet();
// Member functions
diff --git a/src/meshTools/sets/topoSets/faceZoneSet.H b/src/meshTools/sets/topoSets/faceZoneSet.H
index e8fd1306cfd50e6b046875ea541dc080711cdd19..c863a7c8d07c450c2e585cf04ba7d0c792060b5e 100644
--- a/src/meshTools/sets/topoSets/faceZoneSet.H
+++ b/src/meshTools/sets/topoSets/faceZoneSet.H
@@ -99,9 +99,8 @@ public:
- // Destructor
-
- virtual ~faceZoneSet();
+ //- Destructor
+ virtual ~faceZoneSet();
// Member functions
diff --git a/src/meshTools/sets/topoSets/pointSet.H b/src/meshTools/sets/topoSets/pointSet.H
index 6adc62d64fea1100367e92800f1790ea648879af..575342588308ad18bef7977a8fd99dd170320e74 100644
--- a/src/meshTools/sets/topoSets/pointSet.H
+++ b/src/meshTools/sets/topoSets/pointSet.H
@@ -101,9 +101,8 @@ public:
);
- // Destructor
-
- virtual ~pointSet();
+ //- Destructor
+ virtual ~pointSet();
// Member functions
diff --git a/src/meshTools/sets/topoSets/pointZoneSet.H b/src/meshTools/sets/topoSets/pointZoneSet.H
index cfdcf79152e568bde9b075c3b3d8fdb2b05ea56a..1f184db68d09f86db9dae6fef78305624585ff1f 100644
--- a/src/meshTools/sets/topoSets/pointZoneSet.H
+++ b/src/meshTools/sets/topoSets/pointZoneSet.H
@@ -97,9 +97,8 @@ public:
- // Destructor
-
- virtual ~pointZoneSet();
+ //- Destructor
+ virtual ~pointZoneSet();
// Member functions
diff --git a/src/meshTools/sets/topoSets/topoSet.C b/src/meshTools/sets/topoSets/topoSet.C
index 152213bad4016bff107fe7adf0427be3dada5c70..c5787717597ed4e7de579649cc92c471557f5bcc 100644
--- a/src/meshTools/sets/topoSets/topoSet.C
+++ b/src/meshTools/sets/topoSets/topoSet.C
@@ -154,12 +154,7 @@ void topoSet::topoSet::updateLabels(const labelList& map)
// Iterate over map to see if anything changed
bool changed = false;
- for
- (
- labelHashSet::const_iterator iter = begin();
- iter != end();
- ++iter
- )
+ forAllConstIter(labelHashSet, *this, iter)
{
if ((iter.key() < 0) || (iter.key() > map.size()))
{
@@ -172,7 +167,7 @@ void topoSet::topoSet::updateLabels(const labelList& map)
<< abort(FatalError);
}
- label newCellI = map[iter.key()];
+ const label newCellI = map[iter.key()];
if (newCellI != iter.key())
{
@@ -187,14 +182,9 @@ void topoSet::topoSet::updateLabels(const labelList& map)
{
labelHashSet newSet(2*size());
- for
- (
- labelHashSet::const_iterator iter = begin();
- iter != end();
- ++iter
- )
+ forAllConstIter(labelHashSet, *this, iter)
{
- label newCellI = map[iter.key()];
+ const label newCellI = map[iter.key()];
if (newCellI >= 0)
{
@@ -209,12 +199,7 @@ void topoSet::topoSet::updateLabels(const labelList& map)
void topoSet::topoSet::check(const label maxLabel)
{
- for
- (
- topoSet::const_iterator iter = begin();
- iter != end();
- ++iter
- )
+ forAllConstIter(topoSet, *this, iter)
{
if ((iter.key() < 0) || (iter.key() > maxLabel))
{
@@ -309,9 +294,7 @@ void topoSet::writeDebug
writeDebug(os, coords, halfLen, iter, n);
- os<< endl
- << " .." << endl
- << endl;
+ os << nl << " .." << nl << endl;
for (; n < size() - halfLen; ++n)
{
@@ -505,12 +488,7 @@ void topoSet::subset(const topoSet& set)
clear();
resize(2*min(currentSet.size(), set.size()));
- for
- (
- labelHashSet::const_iterator iter = currentSet.begin();
- iter != currentSet.end();
- ++iter
- )
+ forAllConstIter(labelHashSet, currentSet, iter)
{
if (set.found(iter.key()))
{
@@ -523,12 +501,7 @@ void topoSet::subset(const topoSet& set)
void topoSet::addSet(const topoSet& set)
{
- for
- (
- topoSet::const_iterator iter = set.begin();
- iter != set.end();
- ++iter
- )
+ forAllConstIter(topoSet, set, iter)
{
insert(iter.key());
}
@@ -537,12 +510,7 @@ void topoSet::addSet(const topoSet& set)
void topoSet::deleteSet(const topoSet& set)
{
- for
- (
- topoSet::const_iterator iter = set.begin();
- iter != set.end();
- ++iter
- )
+ forAllConstIter(topoSet, set, iter)
{
erase(iter.key());
}
@@ -574,9 +542,7 @@ void topoSet::writeDebug(Ostream& os, const label maxLen) const
writeDebug(os, halfLen, iter, n);
- os<< endl
- << " .." << endl
- << endl;
+ os << nl << " .." << nl << endl;
for (; n < size() - halfLen; ++n)
{
diff --git a/src/meshTools/sets/topoSets/topoSet.H b/src/meshTools/sets/topoSets/topoSet.H
index 3d2be2550464332c1341fa521ceda1aa00ff4a8d..466af052bc58345c196d8e1d15877acd7de060f7 100644
--- a/src/meshTools/sets/topoSets/topoSet.H
+++ b/src/meshTools/sets/topoSets/topoSet.H
@@ -257,9 +257,8 @@ public:
);
- // Destructor
-
- virtual ~topoSet();
+ //- Destructor
+ virtual ~topoSet();
// Member functions
diff --git a/src/meshTools/surfaceSets/surfaceSets.C b/src/meshTools/surfaceSets/surfaceSets.C
index e247130ec6c754084be438270e8f451f70fb8e4a..ae286bd0dba2c5ef95b5062649c1663a05f838e1 100644
--- a/src/meshTools/surfaceSets/surfaceSets.C
+++ b/src/meshTools/surfaceSets/surfaceSets.C
@@ -121,12 +121,7 @@ License
// // Snap outside points to surface
// pointField newPoints(points);
//
-// for
-// (
-// labelHashSet::const_iterator iter = flatCandidates.begin();
-// iter != flatCandidates.end();
-// ++iter
-// )
+// forAllConstIter(labelHashSet, flatCandidates, iter)
// {
// const cell& cFaces = cells[iter.key()];
//
@@ -152,12 +147,7 @@ License
//
// // Calculate new volume for mixed cells
// label nRemoved = 0;
-// for
-// (
-// labelHashSet::const_iterator iter = flatCandidates.begin();
-// iter != flatCandidates.end();
-// ++iter
-// )
+// forAllConstIter(labelHashSet, flatCandidates, iter)
// {
// label cellI = iter.key();
//
@@ -404,15 +394,9 @@ Foam::labelHashSet Foam::surfaceSets::getHangingCells
labelHashSet mixedOnlyCells(internalCells.size());
- for
- (
- labelHashSet::const_iterator iter = internalCells.begin();
- iter != internalCells.end();
- ++iter
- )
+ forAllConstIter(labelHashSet, internalCells, iter)
{
- label cellI = iter.key();
-
+ const label cellI = iter.key();
const cell& cFaces = cells[cellI];
label usesMixedOnly = true;
diff --git a/src/meshTools/triSurface/booleanOps/intersectedSurface/edgeSurface.C b/src/meshTools/triSurface/booleanOps/intersectedSurface/edgeSurface.C
index 83075081d006136d08622ac47a858a5be302e97f..faf68b30bdf3191ac1e100a36fddedaae72454c0 100644
--- a/src/meshTools/triSurface/booleanOps/intersectedSurface/edgeSurface.C
+++ b/src/meshTools/triSurface/booleanOps/intersectedSurface/edgeSurface.C
@@ -255,15 +255,10 @@ Foam::edgeSurface::edgeSurface
// Add intersection edges to faceEdges
// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- for
- (
- labelPairLookup::const_iterator iter = inter.facePairToEdge().begin();
- iter != inter.facePairToEdge().end();
- ++iter
- )
+ forAllConstIter(labelPairLookup, inter.facePairToEdge(), iter)
{
// Edge label in intersection
- label edgeI = iter();
+ const label edgeI = iter();
// Get the face from the correct surface
const FixedList<label, 2>& twoFaces = iter.key();
diff --git a/src/meshTools/triSurface/booleanOps/intersectedSurface/intersectedSurface.C b/src/meshTools/triSurface/booleanOps/intersectedSurface/intersectedSurface.C
index 53fd83a0d72bd7940f2ec877184082b7ee3f9f0b..7ae4cffe8c63bdb39921dac8e2826cad97050fda 100644
--- a/src/meshTools/triSurface/booleanOps/intersectedSurface/intersectedSurface.C
+++ b/src/meshTools/triSurface/booleanOps/intersectedSurface/intersectedSurface.C
@@ -329,12 +329,7 @@ Foam::intersectedSurface::calcPointEdgeAddressing
}
// Shrink it
- for
- (
- Map<DynamicList<label> >::iterator iter = facePointEdges.begin();
- iter != facePointEdges.end();
- ++iter
- )
+ forAllIter(Map< DynamicList<label> >, facePointEdges, iter)
{
iter().shrink();
@@ -358,17 +353,13 @@ Foam::intersectedSurface::calcPointEdgeAddressing
{
label edgeI = fEdges[i];
const edge& e = edges[edgeI];
- Pout<< " " << edgeI << ' ' << e << points[e.start()]
+ Pout<< " " << edgeI << ' ' << e
+ << points[e.start()]
<< points[e.end()] << endl;
}
Pout<< " Constructed point-edge adressing:" << endl;
- for
- (
- Map<DynamicList<label> >::iterator iter = facePointEdges.begin();
- iter != facePointEdges.end();
- ++iter
- )
+ forAllConstIter(Map< DynamicList<label> >, facePointEdges, iter)
{
Pout<< " vertex " << iter.key() << " is connected to edges "
<< iter() << endl;
diff --git a/src/meshTools/triSurface/surfaceFeatures/surfaceFeatures.C b/src/meshTools/triSurface/surfaceFeatures/surfaceFeatures.C
index e06f8462c077352b9426844890e107e6b68163b8..ed171db033e9c910b2a4fddf774b9782fd2514b7 100644
--- a/src/meshTools/triSurface/surfaceFeatures/surfaceFeatures.C
+++ b/src/meshTools/triSurface/surfaceFeatures/surfaceFeatures.C
@@ -826,12 +826,7 @@ Foam::Map<Foam::label> Foam::surfaceFeatures::nearestSamples
OFstream objStream("nearestSamples.obj");
label vertI = 0;
- for
- (
- Map<label>::const_iterator iter = nearest.begin();
- iter != nearest.end();
- ++iter
- )
+ forAllConstIter(Map<label>, nearest, iter)
{
meshTools::writeOBJ(objStream, samples[iter.key()]); vertI++;
meshTools::writeOBJ(objStream, surfPoints[iter()]); vertI++;
@@ -957,14 +952,9 @@ Foam::Map<Foam::label> Foam::surfaceFeatures::nearestSamples
OFstream objStream("nearestEdges.obj");
label vertI = 0;
- for
- (
- Map<label>::const_iterator iter = nearest.begin();
- iter != nearest.end();
- ++iter
- )
+ forAllConstIter(Map<label>, nearest, iter)
{
- label sampleI = iter.key();
+ const label sampleI = iter.key();
meshTools::writeOBJ(objStream, samples[sampleI]); vertI++;
@@ -1119,14 +1109,9 @@ Foam::Map<Foam::pointIndexHit> Foam::surfaceFeatures::nearestEdges
OFstream objStream("nearestEdges.obj");
label vertI = 0;
- for
- (
- Map<pointIndexHit>::const_iterator iter = nearest.begin();
- iter != nearest.end();
- ++iter
- )
+ forAllConstIter(Map<pointIndexHit>, nearest, iter)
{
- label sampleEdgeI = iter.key();
+ const label sampleEdgeI = iter.key();
const edge& sampleEdge = sampleEdges[sampleEdgeI];
diff --git a/src/meshTools/triSurface/triSurfaceTools/triSurfaceTools.C b/src/meshTools/triSurface/triSurfaceTools/triSurfaceTools.C
index d615a7453ad3b3d6f30e13cae2cacd47f7cc6449..1fd9d1497884b22b1fa4ae0e05f84b0b487e4a3e 100644
--- a/src/meshTools/triSurface/triSurfaceTools/triSurfaceTools.C
+++ b/src/meshTools/triSurface/triSurfaceTools/triSurfaceTools.C
@@ -2341,17 +2341,10 @@ Foam::triSurface Foam::triSurfaceTools::triangulate
label newPatchI = 0;
- for
- (
- labelHashSet::const_iterator iter = includePatches.begin();
- iter != includePatches.end();
- ++iter
- )
+ forAllConstIter(labelHashSet, includePatches, iter)
{
- label patchI = iter.key();
-
+ const label patchI = iter.key();
const polyPatch& patch = bMesh[patchI];
-
const pointField& points = patch.points();
label nTriTotal = 0;
@@ -2402,19 +2395,12 @@ Foam::triSurface Foam::triSurfaceTools::triangulate
newPatchI = 0;
- for
- (
- labelHashSet::const_iterator iter = includePatches.begin();
- iter != includePatches.end();
- ++iter
- )
+ forAllConstIter(labelHashSet, includePatches, iter)
{
- label patchI = iter.key();
-
+ const label patchI = iter.key();
const polyPatch& patch = bMesh[patchI];
surface.patches()[newPatchI].name() = patch.name();
-
surface.patches()[newPatchI].geometricType() = patch.type();
newPatchI++;
@@ -2460,15 +2446,9 @@ Foam::triSurface Foam::triSurfaceTools::triangulateFaceCentre
label newPatchI = 0;
- for
- (
- labelHashSet::const_iterator iter = includePatches.begin();
- iter != includePatches.end();
- ++iter
- )
+ forAllConstIter(labelHashSet, includePatches, iter)
{
- label patchI = iter.key();
-
+ const label patchI = iter.key();
const polyPatch& patch = bMesh[patchI];
label nTriTotal = 0;
@@ -2518,19 +2498,12 @@ Foam::triSurface Foam::triSurfaceTools::triangulateFaceCentre
newPatchI = 0;
- for
- (
- labelHashSet::const_iterator iter = includePatches.begin();
- iter != includePatches.end();
- ++iter
- )
+ forAllConstIter(labelHashSet, includePatches, iter)
{
- label patchI = iter.key();
-
+ const label patchI = iter.key();
const polyPatch& patch = bMesh[patchI];
surface.patches()[newPatchI].name() = patch.name();
-
surface.patches()[newPatchI].geometricType() = patch.type();
newPatchI++;
diff --git a/src/meshTools/twoDPointCorrector/twoDPointCorrector.C b/src/meshTools/twoDPointCorrector/twoDPointCorrector.C
index e8e7785fb048ff465184c43d873944840f85676b..916557e83d14f8be836e83fff63300b4b5a79a0f 100644
--- a/src/meshTools/twoDPointCorrector/twoDPointCorrector.C
+++ b/src/meshTools/twoDPointCorrector/twoDPointCorrector.C
@@ -56,7 +56,7 @@ void twoDPointCorrector::calcAddressing() const
// Try and find a wedge patch
const polyBoundaryMesh& patches = mesh_.boundaryMesh();
- forAll (patches, patchI)
+ forAll(patches, patchI)
{
if (isA<wedgePolyPatch>(patches[patchI]))
{
@@ -76,7 +76,7 @@ void twoDPointCorrector::calcAddressing() const
// Try to find an empty patch with faces
if (!isWedge)
{
- forAll (patches, patchI)
+ forAll(patches, patchI)
{
if (isA<emptyPolyPatch>(patches[patchI]) && patches[patchI].size())
{
@@ -122,7 +122,7 @@ void twoDPointCorrector::calcAddressing() const
label nNormalEdges = 0;
- forAll (meshEdges, edgeI)
+ forAll(meshEdges, edgeI)
{
vector edgeVector =
meshEdges[edgeI].vec(meshPoints)/
@@ -269,7 +269,7 @@ void twoDPointCorrector::correctPoints(pointField& p) const
const labelList& neIndices = normalEdgeIndices();
const vector& pn = planeNormal();
- forAll (neIndices, edgeI)
+ forAll(neIndices, edgeI)
{
point& pStart = p[meshEdges[neIndices[edgeI]].start()];
diff --git a/src/meshTools/twoDPointCorrector/twoDPointCorrector.H b/src/meshTools/twoDPointCorrector/twoDPointCorrector.H
index 057a8734785cc394adcbc2865805f102bcdad13f..3c61f57236b1cefb984a82f558340cfb6725f6c8 100644
--- a/src/meshTools/twoDPointCorrector/twoDPointCorrector.H
+++ b/src/meshTools/twoDPointCorrector/twoDPointCorrector.H
@@ -105,9 +105,8 @@ public:
twoDPointCorrector(const polyMesh& mesh);
- // Destructor
-
- ~twoDPointCorrector();
+ //- Destructor
+ ~twoDPointCorrector();
// Member Functions
diff --git a/src/parallel/decompose/decompositionMethods/decompositionMethod/decompositionMethod.H b/src/parallel/decompose/decompositionMethods/decompositionMethod/decompositionMethod.H
index 537605e48b1e722f8eb24b66d47a0ca2475d8113..d729fe9bd320a50c29320da81b5909bde8219bb8 100644
--- a/src/parallel/decompose/decompositionMethods/decompositionMethod/decompositionMethod.H
+++ b/src/parallel/decompose/decompositionMethods/decompositionMethod/decompositionMethod.H
@@ -160,10 +160,9 @@ public:
{}
- // Destructor
-
- virtual ~decompositionMethod()
- {}
+ //- Destructor
+ virtual ~decompositionMethod()
+ {}
// Member Functions
diff --git a/src/parallel/decompose/decompositionMethods/hierarchGeomDecomp/hierarchGeomDecomp.H b/src/parallel/decompose/decompositionMethods/hierarchGeomDecomp/hierarchGeomDecomp.H
index 4fe2022b1436720d2d3df4737f43c832599075de..62eef72ae3242457acc9d4cff76a2d8d2dbd8250 100644
--- a/src/parallel/decompose/decompositionMethods/hierarchGeomDecomp/hierarchGeomDecomp.H
+++ b/src/parallel/decompose/decompositionMethods/hierarchGeomDecomp/hierarchGeomDecomp.H
@@ -179,10 +179,9 @@ public:
);
- // Destructor
-
- virtual ~hierarchGeomDecomp()
- {}
+ //- Destructor
+ virtual ~hierarchGeomDecomp()
+ {}
// Member Functions
diff --git a/src/parallel/decompose/decompositionMethods/manualDecomp/manualDecomp.H b/src/parallel/decompose/decompositionMethods/manualDecomp/manualDecomp.H
index 8e8fe35b465b75c745bdce8e27ba77b054ef328f..e3da10ccacf815d369e221a4f3da764a7d436c9e 100644
--- a/src/parallel/decompose/decompositionMethods/manualDecomp/manualDecomp.H
+++ b/src/parallel/decompose/decompositionMethods/manualDecomp/manualDecomp.H
@@ -81,10 +81,9 @@ public:
);
- // Destructor
-
- virtual ~manualDecomp()
- {}
+ //- Destructor
+ virtual ~manualDecomp()
+ {}
// Member Functions
diff --git a/src/parallel/decompose/decompositionMethods/simpleGeomDecomp/simpleGeomDecomp.H b/src/parallel/decompose/decompositionMethods/simpleGeomDecomp/simpleGeomDecomp.H
index db629bd4bba80f030aa655fe8010e6bfec24c0f4..714916f62d6893814f48d4239d736d04620d7064 100644
--- a/src/parallel/decompose/decompositionMethods/simpleGeomDecomp/simpleGeomDecomp.H
+++ b/src/parallel/decompose/decompositionMethods/simpleGeomDecomp/simpleGeomDecomp.H
@@ -84,10 +84,9 @@ public:
);
- // Destructor
-
- virtual ~simpleGeomDecomp()
- {}
+ //- Destructor
+ virtual ~simpleGeomDecomp()
+ {}
// Member Functions
diff --git a/src/parallel/decompose/metisDecomp/metisDecomp.H b/src/parallel/decompose/metisDecomp/metisDecomp.H
index 9e2960e84303d04e187d9340659dfb4ed462e4dd..f18ba8bd0f0731634a22eae4bab72e027517e8ec 100644
--- a/src/parallel/decompose/metisDecomp/metisDecomp.H
+++ b/src/parallel/decompose/metisDecomp/metisDecomp.H
@@ -84,10 +84,9 @@ public:
);
- // Destructor
-
- virtual ~metisDecomp()
- {}
+ //- Destructor
+ virtual ~metisDecomp()
+ {}
// Member Functions
diff --git a/src/parallel/decompose/ptscotchDecomp/ptscotchDecomp.H b/src/parallel/decompose/ptscotchDecomp/ptscotchDecomp.H
index 7317e2cc4a95f2a860e9f8be809a9d361afd006e..45649a0b818d28ce46cca95c2a835aac4605fb78 100644
--- a/src/parallel/decompose/ptscotchDecomp/ptscotchDecomp.H
+++ b/src/parallel/decompose/ptscotchDecomp/ptscotchDecomp.H
@@ -87,10 +87,9 @@ public:
);
- // Destructor
-
- virtual ~ptscotchDecomp()
- {}
+ //- Destructor
+ virtual ~ptscotchDecomp()
+ {}
// Member Functions
diff --git a/src/parallel/decompose/scotchDecomp/scotchDecomp.H b/src/parallel/decompose/scotchDecomp/scotchDecomp.H
index d6cb3bb7871a21119c5c2d03dffe36cb278f9b41..249b191f6c90de9d32dbd5f632dec4dd0655648d 100644
--- a/src/parallel/decompose/scotchDecomp/scotchDecomp.H
+++ b/src/parallel/decompose/scotchDecomp/scotchDecomp.H
@@ -87,10 +87,9 @@ public:
);
- // Destructor
-
- virtual ~scotchDecomp()
- {}
+ //- Destructor
+ virtual ~scotchDecomp()
+ {}
// Member Functions
diff --git a/src/parallel/reconstruct/reconstruct/fvFieldReconstructorReconstructFields.C b/src/parallel/reconstruct/reconstruct/fvFieldReconstructorReconstructFields.C
index c1c3603585881a7dcf1f128cfd06abe3c4b0e13f..5523e079f95c0f71dc63ba159c6e1e7dd156ad73 100644
--- a/src/parallel/reconstruct/reconstruct/fvFieldReconstructorReconstructFields.C
+++ b/src/parallel/reconstruct/reconstruct/fvFieldReconstructorReconstructFields.C
@@ -46,7 +46,7 @@ Foam::fvFieldReconstructor::reconstructFvVolumeField
procMeshes_.size()
);
- forAll (procMeshes_, procI)
+ forAll(procMeshes_, procI)
{
procFields.set
(
@@ -74,7 +74,7 @@ Foam::fvFieldReconstructor::reconstructFvVolumeField
PtrList<fvPatchField<Type> > patchFields(mesh_.boundary().size());
- forAll (procMeshes_, procI)
+ forAll(procMeshes_, procI)
{
const GeometricField<Type, fvPatchField, volMesh>& procField =
procFields[procI];
@@ -244,7 +244,7 @@ Foam::fvFieldReconstructor::reconstructFvSurfaceField
procMeshes_.size()
);
- forAll (procMeshes_, procI)
+ forAll(procMeshes_, procI)
{
procFields.set
(
@@ -272,7 +272,7 @@ Foam::fvFieldReconstructor::reconstructFvSurfaceField
PtrList<fvsPatchField<Type> > patchFields(mesh_.boundary().size());
- forAll (procMeshes_, procI)
+ forAll(procMeshes_, procI)
{
const GeometricField<Type, fvsPatchField, surfaceMesh>& procField =
procFields[procI];
@@ -285,7 +285,7 @@ Foam::fvFieldReconstructor::reconstructFvSurfaceField
{
labelList curAddr(faceProcAddressing_[procI]);
- forAll (curAddr, addrI)
+ forAll(curAddr, addrI)
{
curAddr[addrI] -= 1;
}
diff --git a/src/parallel/reconstruct/reconstruct/pointFieldReconstructor.C b/src/parallel/reconstruct/reconstruct/pointFieldReconstructor.C
index fd6303c836a4d21604f76bf10a331234f6eac364..e9bc8bd9277d588a1b7323235b73ecb8309ad8b1 100644
--- a/src/parallel/reconstruct/reconstruct/pointFieldReconstructor.C
+++ b/src/parallel/reconstruct/reconstruct/pointFieldReconstructor.C
@@ -63,7 +63,7 @@ Foam::pointFieldReconstructor::pointFieldReconstructor
.meshPoints();
// Create the inverse-addressing of the patch point labels.
- forAll (patchPointLabels, pointi)
+ forAll(patchPointLabels, pointi)
{
pointMap[patchPointLabels[pointi]] = pointi;
}
@@ -71,7 +71,7 @@ Foam::pointFieldReconstructor::pointFieldReconstructor
const labelList& procPatchPoints =
procMesh.boundary()[patchi].meshPoints();
- forAll (procPatchPoints, pointi)
+ forAll(procPatchPoints, pointi)
{
procPatchAddr[pointi] =
pointMap
diff --git a/src/parallel/reconstruct/reconstruct/pointFieldReconstructorReconstructFields.C b/src/parallel/reconstruct/reconstruct/pointFieldReconstructorReconstructFields.C
index 5f67a7c48e4b3c80e52df27f91e6f02aef69263b..0d0e29913ebe415463677d0e4337d20597bc19ad 100644
--- a/src/parallel/reconstruct/reconstruct/pointFieldReconstructorReconstructFields.C
+++ b/src/parallel/reconstruct/reconstruct/pointFieldReconstructorReconstructFields.C
@@ -37,7 +37,7 @@ Foam::pointFieldReconstructor::reconstructField(const IOobject& fieldIoObject)
procMeshes_.size()
);
- forAll (procMeshes_, proci)
+ forAll(procMeshes_, proci)
{
procFields.set
(
@@ -65,7 +65,7 @@ Foam::pointFieldReconstructor::reconstructField(const IOobject& fieldIoObject)
PtrList<pointPatchField<Type> > patchFields(mesh_.boundary().size());
- forAll (procMeshes_, proci)
+ forAll(procMeshes_, proci)
{
const GeometricField<Type, pointPatchField, pointMesh>&
procField = procFields[proci];
diff --git a/src/parallel/reconstruct/reconstruct/processorMeshes.C b/src/parallel/reconstruct/reconstruct/processorMeshes.C
index be03bf0ae74ccb8c0ecd472fac2b248913ffd6c6..5e9b27ff44722781e84ff8308d31069ae67bb3b5 100644
--- a/src/parallel/reconstruct/reconstruct/processorMeshes.C
+++ b/src/parallel/reconstruct/reconstruct/processorMeshes.C
@@ -31,7 +31,7 @@ License
void Foam::processorMeshes::read()
{
- forAll (databases_, procI)
+ forAll(databases_, procI)
{
meshes_.set
(
@@ -144,7 +144,7 @@ Foam::fvMesh::readUpdateState Foam::processorMeshes::readUpdate()
{
fvMesh::readUpdateState stat = fvMesh::UNCHANGED;
- forAll (databases_, procI)
+ forAll(databases_, procI)
{
// Check if any new meshes need to be read.
fvMesh::readUpdateState procStat = meshes_[procI].readUpdate();
@@ -196,7 +196,7 @@ void Foam::processorMeshes::reconstructPoints(fvMesh& mesh)
// Read the field for all the processors
PtrList<pointIOField> procsPoints(meshes_.size());
- forAll (meshes_, procI)
+ forAll(meshes_, procI)
{
procsPoints.set
(
@@ -219,7 +219,7 @@ void Foam::processorMeshes::reconstructPoints(fvMesh& mesh)
// Create the new points
vectorField newPoints(mesh.nPoints());
- forAll (meshes_, procI)
+ forAll(meshes_, procI)
{
const vectorField& procPoints = procsPoints[procI];
diff --git a/src/parallel/reconstruct/reconstruct/reconstructLagrangianFields.C b/src/parallel/reconstruct/reconstruct/reconstructLagrangianFields.C
index a2cf670b2bc5339fc41be4a52888c402d9ff55cb..70ac1ee3edd6fb85e44d9ce44c6cd67224cef447 100644
--- a/src/parallel/reconstruct/reconstruct/reconstructLagrangianFields.C
+++ b/src/parallel/reconstruct/reconstruct/reconstructLagrangianFields.C
@@ -96,7 +96,7 @@ void Foam::reconstructLagrangianFields
const IOobjectList& objects
)
{
- word fieldClassName(IOField<Type>::typeName);
+ const word fieldClassName(IOField<Type>::typeName);
IOobjectList fields = objects.lookupClass(fieldClassName);
@@ -105,7 +105,7 @@ void Foam::reconstructLagrangianFields
Info<< " Reconstructing lagrangian "
<< fieldClassName << "s\n" << endl;
- forAllIter(IOobjectList, fields, fieldIter)
+ forAllConstIter(IOobjectList, fields, fieldIter)
{
Info<< " " << fieldIter()->name() << endl;
reconstructLagrangianField<Type>
diff --git a/src/parallel/reconstruct/reconstruct/reconstructLagrangianPositions.C b/src/parallel/reconstruct/reconstruct/reconstructLagrangianPositions.C
index 726c209ee3368655a61f181fcacb71a7b1d19766..683a976b157571c0ff7de76786e1d169942fb28d 100644
--- a/src/parallel/reconstruct/reconstruct/reconstructLagrangianPositions.C
+++ b/src/parallel/reconstruct/reconstruct/reconstructLagrangianPositions.C
@@ -52,7 +52,7 @@ void Foam::reconstructLagrangianPositions
Cloud<passiveParticle> lpi(meshes[i], cloudName, false);
- forAllIter(Cloud<passiveParticle>, lpi, iter)
+ forAllConstIter(Cloud<passiveParticle>, lpi, iter)
{
const passiveParticle& ppi = iter();
diff --git a/src/postProcessing/foamCalcFunctions/basic/addSubtract/addSubtract.H b/src/postProcessing/foamCalcFunctions/basic/addSubtract/addSubtract.H
index eb20eeb3ba53086c8edc736c8ef6c2903bbb989a..63b0b6b142f72a5e81ead4a18b5b7c1ae6296fa0 100644
--- a/src/postProcessing/foamCalcFunctions/basic/addSubtract/addSubtract.H
+++ b/src/postProcessing/foamCalcFunctions/basic/addSubtract/addSubtract.H
@@ -193,9 +193,8 @@ public:
addSubtract();
- // Destructor
-
- virtual ~addSubtract();
+ //- Destructor
+ virtual ~addSubtract();
};
diff --git a/src/postProcessing/foamCalcFunctions/calcType/calcType.H b/src/postProcessing/foamCalcFunctions/calcType/calcType.H
index cb035586903198ff55da0a7915301599880dbaa7..de6fbe17509e789255fb34a18770e5ac6fb98f07 100644
--- a/src/postProcessing/foamCalcFunctions/calcType/calcType.H
+++ b/src/postProcessing/foamCalcFunctions/calcType/calcType.H
@@ -131,9 +131,8 @@ public:
static autoPtr<calcType> New(const word& calcTypeName);
- // Destructor
-
- virtual ~calcType();
+ //- Destructor
+ virtual ~calcType();
// Member Functions
diff --git a/src/postProcessing/foamCalcFunctions/field/components/components.H b/src/postProcessing/foamCalcFunctions/field/components/components.H
index ea710203f056b1adb3d2dcb027ec384f99efcbd5..9f3650d3a8f1616e36eb2703faeb4823897b18c1 100644
--- a/src/postProcessing/foamCalcFunctions/field/components/components.H
+++ b/src/postProcessing/foamCalcFunctions/field/components/components.H
@@ -114,9 +114,8 @@ public:
components();
- // Destructor
-
- virtual ~components();
+ //- Destructor
+ virtual ~components();
};
diff --git a/src/postProcessing/foamCalcFunctions/field/div/div.H b/src/postProcessing/foamCalcFunctions/field/div/div.H
index 42312b4a107ba0346248be8dabee68fbba544e26..ce22a4ddeab4066dd32fd0d5d3dc0a5ea4eadda0 100644
--- a/src/postProcessing/foamCalcFunctions/field/div/div.H
+++ b/src/postProcessing/foamCalcFunctions/field/div/div.H
@@ -114,9 +114,8 @@ public:
div();
- // Destructor
-
- virtual ~div();
+ //- Destructor
+ virtual ~div();
};
diff --git a/src/postProcessing/foamCalcFunctions/field/interpolate/interpolate.H b/src/postProcessing/foamCalcFunctions/field/interpolate/interpolate.H
index aa7db44bdd44a3861a6a941765ffa1180c1ffbc3..e4ed56a0b1a3900a4a2320e9ff8d1e6f1cf9d07d 100644
--- a/src/postProcessing/foamCalcFunctions/field/interpolate/interpolate.H
+++ b/src/postProcessing/foamCalcFunctions/field/interpolate/interpolate.H
@@ -113,9 +113,8 @@ public:
interpolate();
- // Destructor
-
- virtual ~interpolate();
+ //- Destructor
+ virtual ~interpolate();
};
diff --git a/src/postProcessing/foamCalcFunctions/field/mag/mag.H b/src/postProcessing/foamCalcFunctions/field/mag/mag.H
index ac333636c62582ae2f8d027830d6af06c90b8f36..8dc05514f26a27ad45e764c41e87070b01c3b2a6 100644
--- a/src/postProcessing/foamCalcFunctions/field/mag/mag.H
+++ b/src/postProcessing/foamCalcFunctions/field/mag/mag.H
@@ -113,9 +113,8 @@ public:
mag();
- // Destructor
-
- virtual ~mag();
+ //- Destructor
+ virtual ~mag();
};
diff --git a/src/postProcessing/foamCalcFunctions/field/magGrad/magGrad.H b/src/postProcessing/foamCalcFunctions/field/magGrad/magGrad.H
index 19166d3604e30d7dfe73fe23fb62810c8e8a0eae..b027a28b989e98fb621d42b73584d196c9aeceb2 100644
--- a/src/postProcessing/foamCalcFunctions/field/magGrad/magGrad.H
+++ b/src/postProcessing/foamCalcFunctions/field/magGrad/magGrad.H
@@ -114,9 +114,8 @@ public:
magGrad();
- // Destructor
-
- virtual ~magGrad();
+ //- Destructor
+ virtual ~magGrad();
};
diff --git a/src/postProcessing/foamCalcFunctions/field/magSqr/magSqr.H b/src/postProcessing/foamCalcFunctions/field/magSqr/magSqr.H
index 19422b3ed66f256284e45287d1a2ad2c9d1115a5..2e1167d2ba9f7fd83ddfe07747c0486101ba955a 100644
--- a/src/postProcessing/foamCalcFunctions/field/magSqr/magSqr.H
+++ b/src/postProcessing/foamCalcFunctions/field/magSqr/magSqr.H
@@ -113,9 +113,8 @@ public:
magSqr();
- // Destructor
-
- virtual ~magSqr();
+ //- Destructor
+ virtual ~magSqr();
};
diff --git a/src/postProcessing/foamCalcFunctions/field/randomise/randomise.H b/src/postProcessing/foamCalcFunctions/field/randomise/randomise.H
index 2a5b94c44c6e0f02b1d5f7aee5fafd67d3b5a846..446d1731d2fb9a4eb52fac707c7e0b0e30812cfc 100644
--- a/src/postProcessing/foamCalcFunctions/field/randomise/randomise.H
+++ b/src/postProcessing/foamCalcFunctions/field/randomise/randomise.H
@@ -116,9 +116,8 @@ public:
randomise();
- // Destructor
-
- virtual ~randomise();
+ //- Destructor
+ virtual ~randomise();
};
diff --git a/src/postProcessing/functionObjects/IO/writeRegisteredObject/writeRegisteredObject.C b/src/postProcessing/functionObjects/IO/writeRegisteredObject/writeRegisteredObject.C
index 12cb6d197d1980188697a145bef5fa2aac7570ba..841768636d4618af5cde0ea13ff0a14be09595a4 100644
--- a/src/postProcessing/functionObjects/IO/writeRegisteredObject/writeRegisteredObject.C
+++ b/src/postProcessing/functionObjects/IO/writeRegisteredObject/writeRegisteredObject.C
@@ -64,28 +64,6 @@ void Foam::writeRegisteredObject::read(const dictionary& dict)
if (active_)
{
dict.lookup("objectNames") >> objectNames_;
-
- forAll(objectNames_, i)
- {
- if (obr_.foundObject<regIOobject>(objectNames_[i]))
- {
- regIOobject& obj =
- const_cast<regIOobject&>
- (
- obr_.lookupObject<regIOobject>(objectNames_[i])
- );
- obj.writeOpt() = IOobject::NO_WRITE;
- }
- else
- {
- FatalErrorIn
- (
- "Foam::writeRegisteredObject::read(const dictionary&)"
- ) << "Object " << objectNames_[i] << " not found in "
- << "database. Available objects are:" << nl << obr_.toc()
- << nl << exit(FatalError);
- }
- }
}
}
@@ -108,9 +86,27 @@ void Foam::writeRegisteredObject::write()
{
forAll(objectNames_, i)
{
- const regIOobject& obj =
- obr_.lookupObject<regIOobject>(objectNames_[i]);
- obj.write();
+ if (obr_.foundObject<regIOobject>(objectNames_[i]))
+ {
+ regIOobject& obj =
+ const_cast<regIOobject&>
+ (
+ obr_.lookupObject<regIOobject>(objectNames_[i])
+ );
+ // Switch off automatic writing to prevent double write
+ obj.writeOpt() = IOobject::NO_WRITE;
+ obj.write();
+ }
+ else
+ {
+ WarningIn
+ (
+ "Foam::writeRegisteredObject::read(const dictionary&)"
+ ) << "Object " << objectNames_[i] << " not found in "
+ << "database. Available objects are:" << nl << obr_.toc()
+ << endl;
+ }
+
}
}
}
diff --git a/src/postProcessing/functionObjects/field/fieldValues/cellSource/cellSource.C b/src/postProcessing/functionObjects/field/fieldValues/cellSource/cellSource.C
index a741c4560c8cf9d0f1d01400f4defa598ff18304..9d65cefc570b05aa005d9bde38a747fd735c46b6 100644
--- a/src/postProcessing/functionObjects/field/fieldValues/cellSource/cellSource.C
+++ b/src/postProcessing/functionObjects/field/fieldValues/cellSource/cellSource.C
@@ -26,7 +26,6 @@ License
#include "cellSource.H"
#include "fvMesh.H"
#include "volFields.H"
-#include "IOList.H"
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@@ -43,13 +42,14 @@ const Foam::NamedEnum<Foam::fieldValues::cellSource::sourceType, 1>
Foam::fieldValues::cellSource::sourceTypeNames_;
template<>
-const char* Foam::NamedEnum<Foam::fieldValues::cellSource::operationType, 5>::
+const char* Foam::NamedEnum<Foam::fieldValues::cellSource::operationType, 7>::
names[] =
{
- "none", "sum", "volAverage", "volIntegrate", "weightedAverage"
+ "none", "sum", "volAverage",
+ "volIntegrate", "weightedAverage", "min", "max"
};
-const Foam::NamedEnum<Foam::fieldValues::cellSource::operationType, 5>
+const Foam::NamedEnum<Foam::fieldValues::cellSource::operationType, 7>
Foam::fieldValues::cellSource::operationTypeNames_;
diff --git a/src/postProcessing/functionObjects/field/fieldValues/cellSource/cellSource.H b/src/postProcessing/functionObjects/field/fieldValues/cellSource/cellSource.H
index 8cea8087376a7c5e9a6999a7e4526a660ced227d..8108f7891c939302a767d6154fdbfb2c62c48c5e 100644
--- a/src/postProcessing/functionObjects/field/fieldValues/cellSource/cellSource.H
+++ b/src/postProcessing/functionObjects/field/fieldValues/cellSource/cellSource.H
@@ -103,11 +103,13 @@ public:
opSum,
opVolAverage,
opVolIntegrate,
- opWeightedAverage
+ opWeightedAverage,
+ opMin,
+ opMax
};
//- Operation type names
- static const NamedEnum<operationType, 5> operationTypeNames_;
+ static const NamedEnum<operationType, 7> operationTypeNames_;
private:
diff --git a/src/postProcessing/functionObjects/field/fieldValues/cellSource/cellSourceTemplates.C b/src/postProcessing/functionObjects/field/fieldValues/cellSource/cellSourceTemplates.C
index 7e4746e939be360699250374023490f0a3fa0333..beda8dd6b009bcfc9c55df207ff8da673618e073 100644
--- a/src/postProcessing/functionObjects/field/fieldValues/cellSource/cellSourceTemplates.C
+++ b/src/postProcessing/functionObjects/field/fieldValues/cellSource/cellSourceTemplates.C
@@ -25,7 +25,6 @@ License
#include "cellSource.H"
#include "volFields.H"
-#include "IOList.H"
// * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * //
@@ -91,6 +90,16 @@ Type Foam::fieldValues::cellSource::processValues
result = sum(values*weightField)/sum(weightField);
break;
}
+ case opMin:
+ {
+ result = min(values);
+ break;
+ }
+ case opMax:
+ {
+ result = max(values);
+ break;
+ }
default:
{
// Do nothing
@@ -123,7 +132,7 @@ bool Foam::fieldValues::cellSource::writeValues(const word& fieldName)
if (valueOutput_)
{
- IOList<Type>
+ IOField<Type>
(
IOobject
(
diff --git a/src/postProcessing/functionObjects/field/fieldValues/controlDict b/src/postProcessing/functionObjects/field/fieldValues/controlDict
index 5971b3be0e1a0a4d513068b4f76a61ced2bdee48..c7cacc1a8508a8e6f7d4f4c353979a4d7d058131 100644
--- a/src/postProcessing/functionObjects/field/fieldValues/controlDict
+++ b/src/postProcessing/functionObjects/field/fieldValues/controlDict
@@ -51,14 +51,23 @@ functions
{
type faceSource;
functionObjectLibs ("libfieldFunctionObjects.so");
+
enabled true;
outputControl outputTime;
+
+ // Output to log&file (true) or to file only
log true;
+
+ // Output field values as well
valueOutput true;
+
+ // Patch or faceZone to sample
source patch;
sourceName movingWall;
// source faceZone;
// sourceName f0;
+
+ // Operation: areaAverage/sum/weightedAverage ...
operation areaAverage;
fields
diff --git a/src/postProcessing/functionObjects/field/fieldValues/faceSource/faceSource.C b/src/postProcessing/functionObjects/field/fieldValues/faceSource/faceSource.C
index ebcf487b7d8b920216d08c6657d451afe2ffdf3a..b6788e1af272e3ec0ea9f460ed97d9838b18d1d8 100644
--- a/src/postProcessing/functionObjects/field/fieldValues/faceSource/faceSource.C
+++ b/src/postProcessing/functionObjects/field/fieldValues/faceSource/faceSource.C
@@ -30,7 +30,6 @@ License
#include "processorPolyPatch.H"
#include "surfaceFields.H"
#include "volFields.H"
-#include "IOList.H"
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@@ -46,14 +45,16 @@ names[] =
const Foam::NamedEnum<Foam::fieldValues::faceSource::sourceType, 2>
Foam::fieldValues::faceSource::sourceTypeNames_;
+
template<>
-const char* Foam::NamedEnum<Foam::fieldValues::faceSource::operationType, 5>::
+const char* Foam::NamedEnum<Foam::fieldValues::faceSource::operationType, 7>::
names[] =
{
- "none", "sum", "areaAverage", "areaIntegrate", "weightedAverage"
+ "none", "sum", "areaAverage",
+ "areaIntegrate", "weightedAverage", "min", "max"
};
-const Foam::NamedEnum<Foam::fieldValues::faceSource::operationType, 5>
+const Foam::NamedEnum<Foam::fieldValues::faceSource::operationType, 7>
Foam::fieldValues::faceSource::operationTypeNames_;
diff --git a/src/postProcessing/functionObjects/field/fieldValues/faceSource/faceSource.H b/src/postProcessing/functionObjects/field/fieldValues/faceSource/faceSource.H
index b938c70dc1e7b00c011d8758b98e5a175a5cba77..e80e1b31eae3059f11296ae04fa45395365266b5 100644
--- a/src/postProcessing/functionObjects/field/fieldValues/faceSource/faceSource.H
+++ b/src/postProcessing/functionObjects/field/fieldValues/faceSource/faceSource.H
@@ -106,11 +106,13 @@ public:
opSum,
opAreaAverage,
opAreaIntegrate,
- opWeightedAverage
+ opWeightedAverage,
+ opMin,
+ opMax
};
//- Operation type names
- static const NamedEnum<operationType, 5> operationTypeNames_;
+ static const NamedEnum<operationType, 7> operationTypeNames_;
private:
diff --git a/src/postProcessing/functionObjects/field/fieldValues/faceSource/faceSourceTemplates.C b/src/postProcessing/functionObjects/field/fieldValues/faceSource/faceSourceTemplates.C
index e2527e84d0e3b3fceabeddc97249ad21dab6e3b9..7c9ab9dbec2f05b1ad2b404d72507077a2036d74 100644
--- a/src/postProcessing/functionObjects/field/fieldValues/faceSource/faceSourceTemplates.C
+++ b/src/postProcessing/functionObjects/field/fieldValues/faceSource/faceSourceTemplates.C
@@ -26,7 +26,6 @@ License
#include "faceSource.H"
#include "surfaceFields.H"
#include "volFields.H"
-#include "IOList.H"
#include "ListListOps.H"
// * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * //
@@ -103,6 +102,16 @@ Type Foam::fieldValues::faceSource::processValues
result = sum(values*weightField)/sum(weightField);
break;
}
+ case opMin:
+ {
+ result = min(values);
+ break;
+ }
+ case opMax:
+ {
+ result = max(values);
+ break;
+ }
default:
{
// Do nothing
@@ -135,7 +144,7 @@ bool Foam::fieldValues::faceSource::writeValues(const word& fieldName)
if (valueOutput_)
{
- IOList<Type>
+ IOField<Type>
(
IOobject
(
diff --git a/src/postProcessing/functionObjects/field/fieldValues/fieldValue/fieldValue.C b/src/postProcessing/functionObjects/field/fieldValues/fieldValue/fieldValue.C
index 22b0e79974d8914e5c2d25f44d8fe5e158b27aa1..1f0f13b184ad54846d003c69fe3005925ddc184f 100644
--- a/src/postProcessing/functionObjects/field/fieldValues/fieldValue/fieldValue.C
+++ b/src/postProcessing/functionObjects/field/fieldValues/fieldValue/fieldValue.C
@@ -33,10 +33,10 @@ namespace Foam
{
defineTypeNameAndDebug(fieldValue, 0);
- defineTemplateTypeNameAndDebug(IOList<vector>, 0);
- defineTemplateTypeNameAndDebug(IOList<sphericalTensor>, 0);
- defineTemplateTypeNameAndDebug(IOList<symmTensor>, 0);
- defineTemplateTypeNameAndDebug(IOList<tensor>, 0);
+ defineTemplateTypeNameAndDebug(IOField<vector>, 0);
+ defineTemplateTypeNameAndDebug(IOField<sphericalTensor>, 0);
+ defineTemplateTypeNameAndDebug(IOField<symmTensor>, 0);
+ defineTemplateTypeNameAndDebug(IOField<tensor>, 0);
}
diff --git a/src/postProcessing/functionObjects/field/readFields/readFields.C b/src/postProcessing/functionObjects/field/readFields/readFields.C
index e4ae72660a0058656d8a7f1bf7c0ed507836b855..aecea779602d655965ca903d738efe6b04383b9e 100644
--- a/src/postProcessing/functionObjects/field/readFields/readFields.C
+++ b/src/postProcessing/functionObjects/field/readFields/readFields.C
@@ -86,14 +86,29 @@ void Foam::readFields::read(const dictionary& dict)
void Foam::readFields::execute()
{
- Info<< type() << " " << name_ << ":" << nl;
+ //Info<< type() << " " << name_ << ":" << nl;
+
+ // Clear out any previously loaded fields
+ vsf_.clear();
+ vvf_.clear();
+ vSpheretf_.clear();
+ vSymmtf_.clear();
+ vtf_.clear();
+
+ ssf_.clear();
+ svf_.clear();
+ sSpheretf_.clear();
+ sSymmtf_.clear();
+ stf_.clear();
+
forAll(fieldSet_, fieldI)
{
- setField<scalar>(fieldSet_[fieldI]);
- setField<vector>(fieldSet_[fieldI]);
- setField<sphericalTensor>(fieldSet_[fieldI]);
- setField<symmTensor>(fieldSet_[fieldI]);
- setField<tensor>(fieldSet_[fieldI]);
+ // If necessary load field
+ loadField<scalar>(fieldSet_[fieldI], vsf_, ssf_);
+ loadField<vector>(fieldSet_[fieldI], vvf_, svf_);
+ loadField<sphericalTensor>(fieldSet_[fieldI], vSpheretf_, sSpheretf_);
+ loadField<symmTensor>(fieldSet_[fieldI], vSymmtf_, sSymmtf_);
+ loadField<tensor>(fieldSet_[fieldI], vtf_, stf_);
}
}
diff --git a/src/postProcessing/functionObjects/field/readFields/readFields.H b/src/postProcessing/functionObjects/field/readFields/readFields.H
index 52ee6a47aed51fbe5e6ed6ccbd02da9dd7126567..01fced3ead761ac47ab3e597590f7a0649e2e337 100644
--- a/src/postProcessing/functionObjects/field/readFields/readFields.H
+++ b/src/postProcessing/functionObjects/field/readFields/readFields.H
@@ -39,6 +39,8 @@ SourceFiles
#include "OFstream.H"
#include "pointFieldFwd.H"
+#include "volFields.H"
+#include "surfaceFields.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -68,9 +70,22 @@ protected:
//- on/off switch
bool active_;
- //- Fields to assess min/max
+ //- Fields to load
wordList fieldSet_;
+ //- Loaded fields
+ PtrList<volScalarField> vsf_;
+ PtrList<volVectorField> vvf_;
+ PtrList<volSphericalTensorField> vSpheretf_;
+ PtrList<volSymmTensorField> vSymmtf_;
+ PtrList<volTensorField> vtf_;
+
+ PtrList<surfaceScalarField> ssf_;
+ PtrList<surfaceVectorField> svf_;
+ PtrList<surfaceSphericalTensorField> sSpheretf_;
+ PtrList<surfaceSymmTensorField> sSymmtf_;
+ PtrList<surfaceTensorField> stf_;
+
// Protected Member Functions
@@ -81,7 +96,12 @@ protected:
void operator=(const readFields&);
template<class Type>
- void setField(const word& fieldName);
+ void loadField
+ (
+ const word&,
+ PtrList<GeometricField<Type, fvPatchField, volMesh> >&,
+ PtrList<GeometricField<Type, fvsPatchField, surfaceMesh> >&
+ ) const;
public:
diff --git a/src/postProcessing/functionObjects/field/readFields/readFieldsTemplates.C b/src/postProcessing/functionObjects/field/readFields/readFieldsTemplates.C
index f78859d7699d9324549d2adfdf411ef961341ef4..62797b2affca05dbb9f8b64d1f316df15275ceda 100644
--- a/src/postProcessing/functionObjects/field/readFields/readFieldsTemplates.C
+++ b/src/postProcessing/functionObjects/field/readFields/readFieldsTemplates.C
@@ -31,7 +31,12 @@ License
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
template<class Type>
-void Foam::readFields::setField(const word& fieldName)
+void Foam::readFields::loadField
+(
+ const word& fieldName,
+ PtrList<GeometricField<Type, fvPatchField, volMesh> >& vflds,
+ PtrList<GeometricField<Type, fvsPatchField, surfaceMesh> >& sflds
+) const
{
typedef GeometricField<Type, fvPatchField, volMesh> vfType;
typedef GeometricField<Type, fvsPatchField, surfaceMesh> sfType;
@@ -40,53 +45,55 @@ void Foam::readFields::setField(const word& fieldName)
{
if (debug)
{
- Info<< "Field " << fieldName << " already in database" << endl;
+ Info<< "readFields : Field " << fieldName << " already in database"
+ << endl;
}
-
- vfType& vf = const_cast<vfType&>(obr_.lookupObject<vfType>(fieldName));
- vf.checkOut();
}
- if (obr_.foundObject<sfType>(fieldName))
+ else if (obr_.foundObject<sfType>(fieldName))
{
if (debug)
{
- Info<< "Field " << fieldName << " already in database" << endl;
+ Info<< "readFields : Field " << fieldName << " already in database"
+ << endl;
}
-
- sfType& sf = const_cast<sfType&>(obr_.lookupObject<sfType>(fieldName));
- sf.checkOut();
}
+ else
+ {
+ const fvMesh& mesh = refCast<const fvMesh>(obr_);
- const fvMesh& mesh = refCast<const fvMesh>(obr_);
-
- IOobject fieldHeader
- (
- fieldName,
- mesh.time().timeName(),
- mesh,
- IOobject::MUST_READ,
- IOobject::NO_WRITE
- );
+ IOobject fieldHeader
+ (
+ fieldName,
+ mesh.time().timeName(),
+ mesh,
+ IOobject::MUST_READ,
+ IOobject::NO_WRITE
+ );
- if
- (
- fieldHeader.headerOk()
- && fieldHeader.headerClassName() == vfType::typeName
- )
- {
- // store field on the mesh database
- Info<< " Reading " << fieldName << endl;
- obr_.store(new vfType(fieldHeader, mesh));
- }
- else if
- (
- fieldHeader.headerOk()
- && fieldHeader.headerClassName() == sfType::typeName
- )
- {
- // store field on the mesh database
- Info<< " Reading " << fieldName << endl;
- obr_.store(new sfType(fieldHeader, mesh));
+ if
+ (
+ fieldHeader.headerOk()
+ && fieldHeader.headerClassName() == vfType::typeName
+ )
+ {
+ // store field locally
+ Info<< " Reading " << fieldName << endl;
+ label sz = vflds.size();
+ vflds.setSize(sz+1);
+ vflds.set(sz, new vfType(fieldHeader, mesh));
+ }
+ else if
+ (
+ fieldHeader.headerOk()
+ && fieldHeader.headerClassName() == sfType::typeName
+ )
+ {
+ // store field locally
+ Info<< " Reading " << fieldName << endl;
+ label sz = sflds.size();
+ sflds.setSize(sz+1);
+ sflds.set(sz, new sfType(fieldHeader, mesh));
+ }
}
}
diff --git a/src/postProcessing/functionObjects/field/streamLine/streamLine.H b/src/postProcessing/functionObjects/field/streamLine/streamLine.H
index 37d396b90cbd12afd282b1d59c16aa1e06ac8296..fe4f4d287fe25b0f2428e56e67d7614211ae9266 100644
--- a/src/postProcessing/functionObjects/field/streamLine/streamLine.H
+++ b/src/postProcessing/functionObjects/field/streamLine/streamLine.H
@@ -166,8 +166,7 @@ public:
//- Destructor
-
- virtual ~streamLine();
+ virtual ~streamLine();
// Member Functions
diff --git a/src/postProcessing/functionObjects/field/surfaceInterpolateFields/IOsurfaceInterpolateFields.H b/src/postProcessing/functionObjects/field/surfaceInterpolateFields/IOsurfaceInterpolateFields.H
new file mode 100644
index 0000000000000000000000000000000000000000..8fb5387236eacf1ac24f3d8b939a17b200b5de68
--- /dev/null
+++ b/src/postProcessing/functionObjects/field/surfaceInterpolateFields/IOsurfaceInterpolateFields.H
@@ -0,0 +1,49 @@
+/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
+ \\ / O peration |
+ \\ / A nd | Copyright (C) 2010-2010 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 3 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, see <http://www.gnu.org/licenses/>.
+
+Typedef
+ Foam::IOsurfaceInterpolateFields
+
+Description
+ Instance of the generic IOOutputFilter for surfaceInterpolateFields.
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef IOsurfaceInterpolateFields_H
+#define IOsurfaceInterpolateFields_H
+
+#include "surfaceInterpolateFields.H"
+#include "IOOutputFilter.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+ typedef IOOutputFilter<surfaceInterpolateFields> IOsurfaceInterpolateFields;
+}
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/postProcessing/functionObjects/field/surfaceInterpolateFields/surfaceInterpolateFields.C b/src/postProcessing/functionObjects/field/surfaceInterpolateFields/surfaceInterpolateFields.C
new file mode 100644
index 0000000000000000000000000000000000000000..1e785b8479c3d9127d97f271e13652ed20544ac9
--- /dev/null
+++ b/src/postProcessing/functionObjects/field/surfaceInterpolateFields/surfaceInterpolateFields.C
@@ -0,0 +1,121 @@
+/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
+ \\ / O peration |
+ \\ / A nd | Copyright (C) 2010-2010 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 3 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, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "surfaceInterpolateFields.H"
+//#include "dictionary.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+ defineTypeNameAndDebug(surfaceInterpolateFields, 0);
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
+
+Foam::surfaceInterpolateFields::surfaceInterpolateFields
+(
+ const word& name,
+ const objectRegistry& obr,
+ const dictionary& dict,
+ const bool loadFromFiles
+)
+:
+ name_(name),
+ obr_(obr),
+ active_(true),
+ fieldSet_()
+{
+ // Check if the available mesh is an fvMesh otherise deactivate
+ if (!isA<fvMesh>(obr_))
+ {
+ active_ = false;
+ WarningIn
+ (
+ "surfaceInterpolateFields::surfaceInterpolateFields"
+ "("
+ "const word&, "
+ "const objectRegistry&, "
+ "const dictionary&, "
+ "const bool"
+ ")"
+ ) << "No fvMesh available, deactivating."
+ << endl;
+ }
+
+ read(dict);
+}
+
+
+// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
+
+Foam::surfaceInterpolateFields::~surfaceInterpolateFields()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
+
+void Foam::surfaceInterpolateFields::read(const dictionary& dict)
+{
+ if (active_)
+ {
+ dict.lookup("fields") >> fieldSet_;
+ }
+}
+
+
+void Foam::surfaceInterpolateFields::execute()
+{
+ //Info<< type() << " " << name_ << ":" << nl;
+
+ // Clear out any previously loaded fields
+ ssf_.clear();
+ svf_.clear();
+ sSpheretf_.clear();
+ sSymmtf_.clear();
+ stf_.clear();
+
+ interpolateFields<scalar>(ssf_);
+ interpolateFields<vector>(svf_);
+ interpolateFields<sphericalTensor>(sSpheretf_);
+ interpolateFields<symmTensor>(sSymmtf_);
+ interpolateFields<tensor>(stf_);
+}
+
+
+void Foam::surfaceInterpolateFields::end()
+{
+ // Do nothing
+}
+
+
+void Foam::surfaceInterpolateFields::write()
+{
+ // Do nothing
+}
+
+
+// ************************************************************************* //
diff --git a/src/postProcessing/functionObjects/field/surfaceInterpolateFields/surfaceInterpolateFields.H b/src/postProcessing/functionObjects/field/surfaceInterpolateFields/surfaceInterpolateFields.H
new file mode 100644
index 0000000000000000000000000000000000000000..ef804d755c3a887154fb630f1eb24cdda5c8a85a
--- /dev/null
+++ b/src/postProcessing/functionObjects/field/surfaceInterpolateFields/surfaceInterpolateFields.H
@@ -0,0 +1,167 @@
+/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
+ \\ / O peration |
+ \\ / A nd | Copyright (C) 2010-2010 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 3 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, see <http://www.gnu.org/licenses/>.
+
+Class
+ Foam::surfaceInterpolateFields
+
+Description
+ Reads fields from the time folders and adds them to the mesh database
+ for further post-processing.
+
+SourceFiles
+ surfaceInterpolateFields.C
+ IOsurfaceInterpolateFields.H
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef surfaceInterpolateFields_H
+#define surfaceInterpolateFields_H
+
+#include "OFstream.H"
+//#include "pointFieldFwd.H"
+#include "surfaceFields.H"
+#include "Tuple2.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// Forward declaration of classes
+class objectRegistry;
+class dictionary;
+class mapPolyMesh;
+
+/*---------------------------------------------------------------------------*\
+ Class surfaceInterpolateFields Declaration
+\*---------------------------------------------------------------------------*/
+
+class surfaceInterpolateFields
+{
+protected:
+
+ // Protected data
+
+ //- Name of this set of surfaceInterpolateFields object
+ word name_;
+
+ const objectRegistry& obr_;
+
+ //- on/off switch
+ bool active_;
+
+ //- Fields to process
+ //wordList fieldSet_;
+ List<Tuple2<word, word> > fieldSet_;
+
+ //- Locally constructed fields
+ PtrList<surfaceScalarField> ssf_;
+ PtrList<surfaceVectorField> svf_;
+ PtrList<surfaceSphericalTensorField> sSpheretf_;
+ PtrList<surfaceSymmTensorField> sSymmtf_;
+ PtrList<surfaceTensorField> stf_;
+
+
+ // Protected Member Functions
+
+ //- Disallow default bitwise copy construct
+ surfaceInterpolateFields(const surfaceInterpolateFields&);
+
+ //- Disallow default bitwise assignment
+ void operator=(const surfaceInterpolateFields&);
+
+ template<class Type>
+ void interpolateFields
+ (
+ PtrList<GeometricField<Type, fvsPatchField, surfaceMesh> >&
+ ) const;
+
+
+public:
+
+ //- Runtime type information
+ TypeName("surfaceInterpolateFields");
+
+
+ // Constructors
+
+ //- Construct for given objectRegistry and dictionary.
+ // Allow the possibility to load fields from files
+ surfaceInterpolateFields
+ (
+ const word& name,
+ const objectRegistry&,
+ const dictionary&,
+ const bool loadFromFiles = false
+ );
+
+
+ //- Destructor
+ virtual ~surfaceInterpolateFields();
+
+
+ // Member Functions
+
+ //- Return name of the surfaceInterpolateFields object
+ virtual const word& name() const
+ {
+ return name_;
+ }
+
+ //- Read the field min/max data
+ virtual void read(const dictionary&);
+
+ //- Execute, currently does nothing
+ virtual void execute();
+
+ //- Execute at the final time-loop, currently does nothing
+ virtual void end();
+
+ //- Write
+ virtual void write();
+
+ //- Update for changes of mesh
+ virtual void updateMesh(const mapPolyMesh&)
+ {}
+
+ //- Update for changes of mesh
+ virtual void movePoints(const pointField&)
+ {}
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+# include "surfaceInterpolateFieldsTemplates.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/postProcessing/functionObjects/field/surfaceInterpolateFields/surfaceInterpolateFieldsFunctionObject.C b/src/postProcessing/functionObjects/field/surfaceInterpolateFields/surfaceInterpolateFieldsFunctionObject.C
new file mode 100644
index 0000000000000000000000000000000000000000..c535a02b095ac23e64a2ac117b1da1c4c0764eaf
--- /dev/null
+++ b/src/postProcessing/functionObjects/field/surfaceInterpolateFields/surfaceInterpolateFieldsFunctionObject.C
@@ -0,0 +1,42 @@
+/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
+ \\ / O peration |
+ \\ / A nd | Copyright (C) 2010-2010 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 3 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, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "surfaceInterpolateFieldsFunctionObject.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+ defineNamedTemplateTypeNameAndDebug(surfaceInterpolateFieldsFunctionObject, 0);
+
+ addToRunTimeSelectionTable
+ (
+ functionObject,
+ surfaceInterpolateFieldsFunctionObject,
+ dictionary
+ );
+}
+
+// ************************************************************************* //
diff --git a/src/postProcessing/functionObjects/field/surfaceInterpolateFields/surfaceInterpolateFieldsFunctionObject.H b/src/postProcessing/functionObjects/field/surfaceInterpolateFields/surfaceInterpolateFieldsFunctionObject.H
new file mode 100644
index 0000000000000000000000000000000000000000..eb5546a8be986c61573c1cb698814f33670d82ab
--- /dev/null
+++ b/src/postProcessing/functionObjects/field/surfaceInterpolateFields/surfaceInterpolateFieldsFunctionObject.H
@@ -0,0 +1,54 @@
+/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
+ \\ / O peration |
+ \\ / A nd | Copyright (C) 2010-2010 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 3 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, see <http://www.gnu.org/licenses/>.
+
+Typedef
+ Foam::surfaceInterpolateFieldsFunctionObject
+
+Description
+ FunctionObject wrapper around surfaceInterpolateFields to allow them to be created via
+ the functions entry within controlDict.
+
+SourceFiles
+ surfaceInterpolateFieldsFunctionObject.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef surfaceInterpolateFieldsFunctionObject_H
+#define surfaceInterpolateFieldsFunctionObject_H
+
+#include "surfaceInterpolateFields.H"
+#include "OutputFilterFunctionObject.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+ typedef OutputFilterFunctionObject<surfaceInterpolateFields>
+ surfaceInterpolateFieldsFunctionObject;
+}
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/postProcessing/functionObjects/field/surfaceInterpolateFields/surfaceInterpolateFieldsTemplates.C b/src/postProcessing/functionObjects/field/surfaceInterpolateFields/surfaceInterpolateFieldsTemplates.C
new file mode 100644
index 0000000000000000000000000000000000000000..5db07d02ba372bbdb7d4aaa9e34cc7afbb8d4b0f
--- /dev/null
+++ b/src/postProcessing/functionObjects/field/surfaceInterpolateFields/surfaceInterpolateFieldsTemplates.C
@@ -0,0 +1,79 @@
+/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
+ \\ / O peration |
+ \\ / A nd | Copyright (C) 2010-2010 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 3 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, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "surfaceInterpolateFields.H"
+#include "volFields.H"
+#include "linear.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+template<class Type>
+void Foam::surfaceInterpolateFields::interpolateFields
+(
+ PtrList<GeometricField<Type, fvsPatchField, surfaceMesh> >& sflds
+) const
+{
+ typedef GeometricField<Type, fvPatchField, volMesh> vfType;
+ typedef GeometricField<Type, fvsPatchField, surfaceMesh> sfType;
+
+ // Convert field to map
+ HashTable<word> fieldMap(2*fieldSet_.size());
+ forAll(fieldSet_, i)
+ {
+ fieldMap.insert(fieldSet_[i].first(), fieldSet_[i].second());
+ }
+
+
+ HashTable<const vfType*> flds(obr_.lookupClass<vfType>());
+
+ forAllConstIter(typename HashTable<const vfType*>, flds, iter)
+ {
+ const vfType& fld = *iter();
+
+ if (fieldMap.found(fld.name()))
+ {
+ //const word sName = "interpolate(" + fld.name() + ')';
+ const word& sName = fieldMap[fld.name()];
+
+ if (obr_.found(sName))
+ {
+ Info<< " a surfaceField " << sName << " already exists"
+ << endl;
+ }
+ else
+ {
+ label sz = sflds.size();
+ sflds.setSize(sz+1);
+ sflds.set(sz, new sfType(sName, linearInterpolate(fld)));
+
+ Info<< " interpolated " << fld.name() << " to create "
+ << sflds[sz].name() << endl;
+ }
+ }
+ }
+}
+
+
+// ************************************************************************* //
diff --git a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/fixedAxis/fixedAxis.H b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/fixedAxis/fixedAxis.H
index 0051aae41a47b737aa5970ded79a04483b6a97ca..6a17da99c928816c57220ea569b02452c144b590 100644
--- a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/fixedAxis/fixedAxis.H
+++ b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/fixedAxis/fixedAxis.H
@@ -87,9 +87,8 @@ public:
}
- // Destructor
-
- virtual ~fixedAxis();
+ //- Destructor
+ virtual ~fixedAxis();
// Member Functions
diff --git a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/fixedLine/fixedLine.H b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/fixedLine/fixedLine.H
index de956e43012ad9cf5d7693dcdb72f8f555a0f80f..e574769cd7b1fa6c91e1e37a6785b013bb2c6ada 100644
--- a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/fixedLine/fixedLine.H
+++ b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/fixedLine/fixedLine.H
@@ -88,9 +88,8 @@ public:
}
- // Destructor
-
- virtual ~fixedLine();
+ //- Destructor
+ virtual ~fixedLine();
// Member Functions
diff --git a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/fixedOrientation/fixedOrientation.H b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/fixedOrientation/fixedOrientation.H
index a6d904d2bbd3c125892cac237953df3b8e966657..5cdbcf99a391149bb6bd97ed62c7e8b0ca56cc24 100644
--- a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/fixedOrientation/fixedOrientation.H
+++ b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/fixedOrientation/fixedOrientation.H
@@ -82,9 +82,8 @@ public:
}
- // Destructor
-
- virtual ~fixedOrientation();
+ //- Destructor
+ virtual ~fixedOrientation();
// Member Functions
diff --git a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/fixedPlane/fixedPlane.H b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/fixedPlane/fixedPlane.H
index aa5b8184a207b3a32a43388810af2a77703ed151..a16b3211ee37f21cbcb70482f596d739e730ec50 100644
--- a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/fixedPlane/fixedPlane.H
+++ b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/fixedPlane/fixedPlane.H
@@ -86,9 +86,8 @@ public:
}
- // Destructor
-
- virtual ~fixedPlane();
+ //- Destructor
+ virtual ~fixedPlane();
// Member Functions
diff --git a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/fixedPoint/fixedPoint.H b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/fixedPoint/fixedPoint.H
index 6ab09b318b538d7c0de19aa2fc4ba2a40e0f5293..d680f873844587aca872b9618beda91a42c92671 100644
--- a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/fixedPoint/fixedPoint.H
+++ b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/fixedPoint/fixedPoint.H
@@ -87,9 +87,8 @@ public:
}
- // Destructor
-
- virtual ~fixedPoint();
+ //- Destructor
+ virtual ~fixedPoint();
// Member Functions
diff --git a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/sixDoFRigidBodyMotionConstraint/sixDoFRigidBodyMotionConstraint.H b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/sixDoFRigidBodyMotionConstraint/sixDoFRigidBodyMotionConstraint.H
index 85899e1ef204477ecce5394796f8794daa71d861..ccb684ed96e467daf10174663cff0a284adfc906 100644
--- a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/sixDoFRigidBodyMotionConstraint/sixDoFRigidBodyMotionConstraint.H
+++ b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/sixDoFRigidBodyMotionConstraint/sixDoFRigidBodyMotionConstraint.H
@@ -119,9 +119,8 @@ public:
);
- // Destructor
-
- virtual ~sixDoFRigidBodyMotionConstraint();
+ //- Destructor
+ virtual ~sixDoFRigidBodyMotionConstraint();
// Member Functions
diff --git a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/linearAxialAngularSpring/linearAxialAngularSpring.H b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/linearAxialAngularSpring/linearAxialAngularSpring.H
index 8dde21bcdc2f46c3c49170c7a25ed30c32d60ad5..8f009c23f4d825e4a31809c372fe8529b26dbd7d 100644
--- a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/linearAxialAngularSpring/linearAxialAngularSpring.H
+++ b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/linearAxialAngularSpring/linearAxialAngularSpring.H
@@ -94,9 +94,8 @@ public:
}
- // Destructor
-
- virtual ~linearAxialAngularSpring();
+ //- Destructor
+ virtual ~linearAxialAngularSpring();
// Member Functions
diff --git a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/linearSpring/linearSpring.H b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/linearSpring/linearSpring.H
index 5c2747511f4948b8ac731b99341ffafc4fc898e4..a80d3cbc57b3b32cace0dff20b35fa5d4d6c3f7b 100644
--- a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/linearSpring/linearSpring.H
+++ b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/linearSpring/linearSpring.H
@@ -97,9 +97,8 @@ public:
}
- // Destructor
-
- virtual ~linearSpring();
+ //- Destructor
+ virtual ~linearSpring();
// Member Functions
diff --git a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/sixDoFRigidBodyMotionRestraint/sixDoFRigidBodyMotionRestraint.H b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/sixDoFRigidBodyMotionRestraint/sixDoFRigidBodyMotionRestraint.H
index c1c91ed15360e1045da148f48df5d79a7c6b28d5..a5f053d3251941fc32d49a267851b5fa4ef505b7 100644
--- a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/sixDoFRigidBodyMotionRestraint/sixDoFRigidBodyMotionRestraint.H
+++ b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/sixDoFRigidBodyMotionRestraint/sixDoFRigidBodyMotionRestraint.H
@@ -112,9 +112,8 @@ public:
);
- // Destructor
-
- virtual ~sixDoFRigidBodyMotionRestraint();
+ //- Destructor
+ virtual ~sixDoFRigidBodyMotionRestraint();
// Member Functions
diff --git a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/sphericalAngularSpring/sphericalAngularSpring.H b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/sphericalAngularSpring/sphericalAngularSpring.H
index 28d7d05721889b37961a18e254ae1d277c3255ce..f13394499e6610074768202a16f544d48b26e0c2 100644
--- a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/sphericalAngularSpring/sphericalAngularSpring.H
+++ b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/sphericalAngularSpring/sphericalAngularSpring.H
@@ -91,9 +91,8 @@ public:
}
- // Destructor
-
- virtual ~sphericalAngularSpring();
+ //- Destructor
+ virtual ~sphericalAngularSpring();
// Member Functions
diff --git a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/tabulatedAxialAngularSpring/tabulatedAxialAngularSpring.H b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/tabulatedAxialAngularSpring/tabulatedAxialAngularSpring.H
index 9ca1d01b5b5a398581f548b4fa24621ebc42988e..4f270dfa8c4ad5b025c53f171a2154bf57d0ba2f 100644
--- a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/tabulatedAxialAngularSpring/tabulatedAxialAngularSpring.H
+++ b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/tabulatedAxialAngularSpring/tabulatedAxialAngularSpring.H
@@ -101,9 +101,8 @@ public:
}
- // Destructor
-
- virtual ~tabulatedAxialAngularSpring();
+ //- Destructor
+ virtual ~tabulatedAxialAngularSpring();
// Member Functions
diff --git a/src/randomProcesses/noise/noiseFFT.C b/src/randomProcesses/noise/noiseFFT.C
index 687994868b4cee596aec1b26129e6b8434715dc6..a68a88d457e2c88174fa1751040c40dbacf8bff8 100644
--- a/src/randomProcesses/noise/noiseFFT.C
+++ b/src/randomProcesses/noise/noiseFFT.C
@@ -111,7 +111,7 @@ Foam::noiseFFT::noiseFFT(const fileName& pFileName, const label skip)
Foam::graph Foam::noiseFFT::pt() const
{
scalarField t(size());
- forAll (t, i)
+ forAll(t, i)
{
t[i] = i*deltat_;
}
@@ -150,7 +150,7 @@ Foam::tmp<Foam::scalarField> Foam::noiseFFT::window
label offset = ni*windowOffset;
- forAll (pw, i)
+ forAll(pw, i)
{
pw[i] = operator[](i + offset);
}
@@ -162,7 +162,7 @@ Foam::tmp<Foam::scalarField> Foam::noiseFFT::window
Foam::tmp<Foam::scalarField> Foam::noiseFFT::Hanning(const label N) const
{
scalarField t(N);
- forAll (t, i)
+ forAll(t, i)
{
t[i] = i*deltat_;
}
@@ -238,7 +238,7 @@ Foam::graph Foam::noiseFFT::meanPf
scalarField f(MeanPf.size());
scalar deltaf = 1.0/(N*deltat_);
- forAll (f, i)
+ forAll(f, i)
{
f[i] = i*deltaf;
}
@@ -284,7 +284,7 @@ Foam::graph Foam::noiseFFT::RMSmeanPf
scalarField f(RMSMeanPf.size());
scalar deltaf = 1.0/(N*deltat_);
- forAll (f, i)
+ forAll(f, i)
{
f[i] = i*deltaf;
}
diff --git a/src/sampling/meshToMeshInterpolation/meshToMesh/calculateMeshToMeshAddressing.C b/src/sampling/meshToMeshInterpolation/meshToMesh/calculateMeshToMeshAddressing.C
index 4f1a29ed828c04c9bf7be5efc7a4b2a44fe2d117..cfdbc526814fb039e3eca198e3b1b20e9bb0888b 100644
--- a/src/sampling/meshToMeshInterpolation/meshToMesh/calculateMeshToMeshAddressing.C
+++ b/src/sampling/meshToMeshInterpolation/meshToMesh/calculateMeshToMeshAddressing.C
@@ -71,12 +71,12 @@ void Foam::meshToMesh::calcAddressing()
// set reference to boundary
const polyPatchList& patchesFrom = fromMesh_.boundaryMesh();
- forAll (patchesFrom, patchI)
+ forAll(patchesFrom, patchI)
{
// get reference to cells next to the boundary
const unallocLabelList& bCells = patchesFrom[patchI].faceCells();
- forAll (bCells, faceI)
+ forAll(bCells, faceI)
{
boundaryCell[bCells[faceI]] = true;
}
@@ -126,7 +126,7 @@ void Foam::meshToMesh::calcAddressing()
oc
);
- forAll (toMesh_.boundaryMesh(), patchi)
+ forAll(toMesh_.boundaryMesh(), patchi)
{
const polyPatch& toPatch = toMesh_.boundaryMesh()[patchi];
@@ -243,7 +243,7 @@ void Foam::meshToMesh::cellAddresses
const vectorField& centresFrom = fromMesh.cellCentres();
const labelListList& cc = fromMesh.cellCells();
- forAll (points, toI)
+ forAll(points, toI)
{
// pick up target position
const vector& p = points[toI];
@@ -260,7 +260,7 @@ void Foam::meshToMesh::cellAddresses
// set the current list of neighbouring cells
const labelList& neighbours = cc[curCell];
- forAll (neighbours, nI)
+ forAll(neighbours, nI)
{
scalar curDistSqr =
magSqr(p - centresFrom[neighbours[nI]]);
@@ -300,7 +300,7 @@ void Foam::meshToMesh::cellAddresses
// set the current list of neighbouring cells
const labelList& neighbours = cc[curCell];
- forAll (neighbours, nI)
+ forAll(neighbours, nI)
{
// search through all the neighbours.
// If point is in neighbour reset current cell
@@ -319,12 +319,12 @@ void Foam::meshToMesh::cellAddresses
// set the current list of neighbouring cells
const labelList& neighbours = cc[curCell];
- forAll (neighbours, nI)
+ forAll(neighbours, nI)
{
// set the current list of neighbour-neighbouring cells
const labelList& nn = cc[neighbours[nI]];
- forAll (nn, nI)
+ forAll(nn, nI)
{
// search through all the neighbours.
// If point is in neighbour reset current cell
diff --git a/src/sampling/meshToMeshInterpolation/meshToMesh/calculateMeshToMeshWeights.C b/src/sampling/meshToMeshInterpolation/meshToMesh/calculateMeshToMeshWeights.C
index efbd09ad77a429530532fc5e397f0f787a0dfa16..9a942408c0b355fd126f1b3b8a1b1ea4e286bb44 100644
--- a/src/sampling/meshToMeshInterpolation/meshToMesh/calculateMeshToMeshWeights.C
+++ b/src/sampling/meshToMeshInterpolation/meshToMesh/calculateMeshToMeshWeights.C
@@ -50,7 +50,7 @@ void Foam::meshToMesh::calculateInverseDistanceWeights() const
const vectorField& centreFrom = fromMesh_.C().internalField();
const vectorField& centreTo = toMesh_.C().internalField();
- forAll (cellAddressing_, celli)
+ forAll(cellAddressing_, celli)
{
if (cellAddressing_[celli] != -1)
{
@@ -81,7 +81,7 @@ void Foam::meshToMesh::calculateInverseDistanceWeights() const
scalar sumInvDist = invDist;
// now add the neighbours
- forAll (neighbours, ni)
+ forAll(neighbours, ni)
{
invDist = 1.0/mag(target - centreFrom[neighbours[ni]]);
invDistCoeffs[celli][ni + 1] = invDist;
@@ -89,7 +89,7 @@ void Foam::meshToMesh::calculateInverseDistanceWeights() const
}
// divide by the total inverse-distance
- forAll (invDistCoeffs[celli], i)
+ forAll(invDistCoeffs[celli], i)
{
invDistCoeffs[celli][i] /= sumInvDist;
}
diff --git a/src/sampling/meshToMeshInterpolation/meshToMesh/meshToMesh.C b/src/sampling/meshToMeshInterpolation/meshToMesh/meshToMesh.C
index 2b7a021bd2754b8a88abbf137970625698bb403e..e341fef90b474e81a8ac7640c9158a48d75b43df 100644
--- a/src/sampling/meshToMeshInterpolation/meshToMesh/meshToMesh.C
+++ b/src/sampling/meshToMeshInterpolation/meshToMesh/meshToMesh.C
@@ -50,7 +50,7 @@ Foam::meshToMesh::meshToMesh
boundaryAddressing_(toMesh_.boundaryMesh().size()),
inverseDistanceWeightsPtr_(NULL)
{
- forAll (fromMesh_.boundaryMesh(), patchi)
+ forAll(fromMesh_.boundaryMesh(), patchi)
{
fromMeshPatches_.insert
(
@@ -59,7 +59,7 @@ Foam::meshToMesh::meshToMesh
);
}
- forAll (toMesh_.boundaryMesh(), patchi)
+ forAll(toMesh_.boundaryMesh(), patchi)
{
toMeshPatches_.insert
(
@@ -68,7 +68,7 @@ Foam::meshToMesh::meshToMesh
);
}
- forAll (cuttingPatchNames, i)
+ forAll(cuttingPatchNames, i)
{
if (toMeshPatches_.found(cuttingPatchNames[i]))
{
@@ -91,7 +91,7 @@ Foam::meshToMesh::meshToMesh
}
}
- forAll (toMesh_.boundaryMesh(), patchi)
+ forAll(toMesh_.boundaryMesh(), patchi)
{
// Add the processor patches in the toMesh to the cuttingPatches list
if (isA<processorPolyPatch>(toMesh_.boundaryMesh()[patchi]))
@@ -134,7 +134,7 @@ Foam::meshToMesh::meshToMesh
<< exit(FatalError);
}
- forAll (fromMesh_.boundaryMesh(), patchi)
+ forAll(fromMesh_.boundaryMesh(), patchi)
{
if
(
diff --git a/src/sampling/meshToMeshInterpolation/meshToMesh/meshToMesh.H b/src/sampling/meshToMeshInterpolation/meshToMesh/meshToMesh.H
index ac083437cc5b99edb8e5ad8ce61ebf480101ba8b..9398821b2aa6c8325e4861359f18edad0bad6ad4 100644
--- a/src/sampling/meshToMeshInterpolation/meshToMesh/meshToMesh.H
+++ b/src/sampling/meshToMeshInterpolation/meshToMesh/meshToMesh.H
@@ -150,9 +150,8 @@ public:
);
- // Destructor
-
- ~meshToMesh();
+ //- Destructor
+ ~meshToMesh();
//- Patch-field interpolation class
@@ -173,10 +172,9 @@ public:
{}
- // Destructor
-
- virtual ~patchFieldInterpolator()
- {}
+ //- Destructor
+ virtual ~patchFieldInterpolator()
+ {}
// Member Functions
diff --git a/src/sampling/meshToMeshInterpolation/meshToMesh/meshToMeshInterpolate.C b/src/sampling/meshToMeshInterpolation/meshToMesh/meshToMeshInterpolate.C
index 796afdbc7c214c1185a0d7d24c28cf8f3fb1001c..bcaec6d0ff41529e65f6af4e7a23d59bf4648830 100644
--- a/src/sampling/meshToMeshInterpolation/meshToMesh/meshToMeshInterpolate.C
+++ b/src/sampling/meshToMeshInterpolation/meshToMesh/meshToMeshInterpolate.C
@@ -67,7 +67,7 @@ void Foam::meshToMesh::interpolateField
// get reference to cellCells
const labelListList& cc = fromMesh_.cellCells();
- forAll (toF, celli)
+ forAll(toF, celli)
{
if (adr[celli] != -1)
{
@@ -97,7 +97,7 @@ void Foam::meshToMesh::interpolateField
// Cell-Point interpolation
interpolationCellPoint<Type> interpolator(fromVf);
- forAll (toF, celli)
+ forAll(toF, celli)
{
if (adr[celli] != -1)
{
@@ -206,7 +206,7 @@ void Foam::meshToMesh::interpolate
{
interpolateInternalField(toVf, fromVf, ord);
- forAll (toMesh_.boundaryMesh(), patchi)
+ forAll(toMesh_.boundaryMesh(), patchi)
{
const fvPatch& toPatch = toMesh_.boundary()[patchi];
@@ -338,7 +338,7 @@ Foam::meshToMesh::interpolate
boundaryAddressing_.size()
);
- forAll (boundaryAddressing_, patchI)
+ forAll(boundaryAddressing_, patchI)
{
patchFields.set
(
diff --git a/src/sampling/sampledSet/cloud/cloudSet.H b/src/sampling/sampledSet/cloud/cloudSet.H
index dfe2732f981f638ead06dc52ab799065c05473c9..40c451d1c1d9deecead258a65575b0ba71942b34 100644
--- a/src/sampling/sampledSet/cloud/cloudSet.H
+++ b/src/sampling/sampledSet/cloud/cloudSet.H
@@ -104,7 +104,7 @@ public:
);
- // Destructor
+ //- Destructor
virtual ~cloudSet();
};
diff --git a/src/sampling/sampledSet/face/faceOnlySet.H b/src/sampling/sampledSet/face/faceOnlySet.H
index bdb1e240dcf50796dd94391bb629b5e1392c9d27..c02eecb55bc0de8ba0b13175971dccd2ed1f0c38 100644
--- a/src/sampling/sampledSet/face/faceOnlySet.H
+++ b/src/sampling/sampledSet/face/faceOnlySet.H
@@ -121,7 +121,7 @@ public:
);
- // Destructor
+ //- Destructor
virtual ~faceOnlySet();
diff --git a/src/sampling/sampledSet/midPoint/midPointSet.H b/src/sampling/sampledSet/midPoint/midPointSet.H
index 2fff452e1248bd2caf7de5dd6afe2ed3a874fdd5..1092b494bfc4b3546b6036ed7492f48486488d44 100644
--- a/src/sampling/sampledSet/midPoint/midPointSet.H
+++ b/src/sampling/sampledSet/midPoint/midPointSet.H
@@ -88,7 +88,7 @@ public:
);
- // Destructor
+ //- Destructor
virtual ~midPointSet();
};
diff --git a/src/sampling/sampledSet/midPointAndFace/midPointAndFaceSet.H b/src/sampling/sampledSet/midPointAndFace/midPointAndFaceSet.H
index ddf84a58dcf32839ef44e3551da7f26230fa5230..993418d02b5476c1cd71708301a30ca0b9b9b195 100644
--- a/src/sampling/sampledSet/midPointAndFace/midPointAndFaceSet.H
+++ b/src/sampling/sampledSet/midPointAndFace/midPointAndFaceSet.H
@@ -89,7 +89,7 @@ public:
);
- // Destructor
+ //- Destructor
virtual ~midPointAndFaceSet();
};
diff --git a/src/sampling/sampledSet/polyLine/polyLineSet.H b/src/sampling/sampledSet/polyLine/polyLineSet.H
index 91e3478ab7bba78e2d58e2d40ab2b2ae7068670e..ae5250b7058fd126ded1cd566cc723e584637ec1 100644
--- a/src/sampling/sampledSet/polyLine/polyLineSet.H
+++ b/src/sampling/sampledSet/polyLine/polyLineSet.H
@@ -119,7 +119,7 @@ public:
);
- // Destructor
+ //- Destructor
virtual ~polyLineSet();
};
diff --git a/src/sampling/sampledSet/sampledSet/sampledSet.H b/src/sampling/sampledSet/sampledSet/sampledSet.H
index da77332359004c5243f79ed0d51da79c6ac5c313..b1671054c271a647e9301bd000b4eb9c5a108e8d 100644
--- a/src/sampling/sampledSet/sampledSet/sampledSet.H
+++ b/src/sampling/sampledSet/sampledSet/sampledSet.H
@@ -237,7 +237,7 @@ public:
);
- // Destructor
+ //- Destructor
virtual ~sampledSet();
diff --git a/src/sampling/sampledSet/sampledSets/sampledSets.H b/src/sampling/sampledSet/sampledSets/sampledSets.H
index ce180900e7f474cb094fe3e71287346b19ecfb13..95fd360726a4bd947b87056f041becb303b71075 100644
--- a/src/sampling/sampledSet/sampledSets/sampledSets.H
+++ b/src/sampling/sampledSet/sampledSets/sampledSets.H
@@ -267,7 +267,7 @@ public:
);
- // Destructor
+ //- Destructor
virtual ~sampledSets();
diff --git a/src/sampling/sampledSet/triSurfaceMeshPointSet/triSurfaceMeshPointSet.H b/src/sampling/sampledSet/triSurfaceMeshPointSet/triSurfaceMeshPointSet.H
index f9396fe8bff7fb6b4921095a18e36fe5566e1a21..407754275035209380548ad6155d98b9d7d750b2 100644
--- a/src/sampling/sampledSet/triSurfaceMeshPointSet/triSurfaceMeshPointSet.H
+++ b/src/sampling/sampledSet/triSurfaceMeshPointSet/triSurfaceMeshPointSet.H
@@ -95,7 +95,7 @@ public:
);
- // Destructor
+ //- Destructor
virtual ~triSurfaceMeshPointSet();
diff --git a/src/sampling/sampledSet/uniform/uniformSet.H b/src/sampling/sampledSet/uniform/uniformSet.H
index f7489b46a36c08725ecaf7f1de562b587f9a5590..9c0fab333524c645ca6efde5c8ca7bac5410825e 100644
--- a/src/sampling/sampledSet/uniform/uniformSet.H
+++ b/src/sampling/sampledSet/uniform/uniformSet.H
@@ -138,7 +138,7 @@ public:
);
- // Destructor
+ //- Destructor
virtual ~uniformSet();
};
diff --git a/src/sampling/sampledSurface/distanceSurface/distanceSurface.H b/src/sampling/sampledSurface/distanceSurface/distanceSurface.H
index 53eb48c8529a2307de780fc3fee557ef5dd39670..966496f089d390cfacd44630d1a0aa9c72a796fa 100644
--- a/src/sampling/sampledSurface/distanceSurface/distanceSurface.H
+++ b/src/sampling/sampledSurface/distanceSurface/distanceSurface.H
@@ -126,9 +126,8 @@ public:
);
- // Destructor
-
- virtual ~distanceSurface();
+ //- Destructor
+ virtual ~distanceSurface();
// Member Functions
diff --git a/src/sampling/sampledSurface/isoSurface/sampledIsoSurface.H b/src/sampling/sampledSurface/isoSurface/sampledIsoSurface.H
index 1d4ed888d5594971f9d9dca0a9c840d3eefc72e2..a6d5a85d46f4c12562ff5579d7353feb0ec90517 100644
--- a/src/sampling/sampledSurface/isoSurface/sampledIsoSurface.H
+++ b/src/sampling/sampledSurface/isoSurface/sampledIsoSurface.H
@@ -151,9 +151,8 @@ public:
);
- // Destructor
-
- virtual ~sampledIsoSurface();
+ //- Destructor
+ virtual ~sampledIsoSurface();
// Member Functions
diff --git a/src/sampling/sampledSurface/isoSurface/sampledIsoSurfaceCell.H b/src/sampling/sampledSurface/isoSurface/sampledIsoSurfaceCell.H
index 43b25641ee939e75518a10e6f7e2d37c0eb0f063..3f57adc6dfdefa0bd89431afef0e9e1c469fdb80 100644
--- a/src/sampling/sampledSurface/isoSurface/sampledIsoSurfaceCell.H
+++ b/src/sampling/sampledSurface/isoSurface/sampledIsoSurfaceCell.H
@@ -120,9 +120,8 @@ public:
);
- // Destructor
-
- virtual ~sampledIsoSurfaceCell();
+ //- Destructor
+ virtual ~sampledIsoSurfaceCell();
// Member Functions
diff --git a/src/sampling/sampledSurface/sampledCuttingPlane/sampledCuttingPlane.H b/src/sampling/sampledSurface/sampledCuttingPlane/sampledCuttingPlane.H
index 7e4bd9988e8fefedccca82625e631982e9f88d6e..9ca4a2d057d53994cdae5caa04869e2312d48c72 100644
--- a/src/sampling/sampledSurface/sampledCuttingPlane/sampledCuttingPlane.H
+++ b/src/sampling/sampledSurface/sampledCuttingPlane/sampledCuttingPlane.H
@@ -131,9 +131,8 @@ public:
);
- // Destructor
-
- virtual ~sampledCuttingPlane();
+ //- Destructor
+ virtual ~sampledCuttingPlane();
// Member Functions
diff --git a/src/sampling/sampledSurface/sampledPatch/sampledPatch.H b/src/sampling/sampledSurface/sampledPatch/sampledPatch.H
index f0cb3e08bf2d4da5712edf3ab19c9b852aa8fdce..e14f30ec760a99d2486c22443c85e2c6e4c84f0d 100644
--- a/src/sampling/sampledSurface/sampledPatch/sampledPatch.H
+++ b/src/sampling/sampledSurface/sampledPatch/sampledPatch.H
@@ -114,9 +114,8 @@ public:
);
- // Destructor
-
- virtual ~sampledPatch();
+ //- Destructor
+ virtual ~sampledPatch();
// Member Functions
diff --git a/src/sampling/sampledSurface/sampledPlane/sampledPlane.H b/src/sampling/sampledSurface/sampledPlane/sampledPlane.H
index 22cdeb804f6d8c0c2d49ee4fecde473e35316f43..b5dc66508e6c35689f326db88d175726cb9396bb 100644
--- a/src/sampling/sampledSurface/sampledPlane/sampledPlane.H
+++ b/src/sampling/sampledSurface/sampledPlane/sampledPlane.H
@@ -101,9 +101,8 @@ public:
);
- // Destructor
-
- virtual ~sampledPlane();
+ //- Destructor
+ virtual ~sampledPlane();
// Member Functions
diff --git a/src/sampling/sampledSurface/sampledSurface/sampledSurface.H b/src/sampling/sampledSurface/sampledSurface/sampledSurface.H
index 2bf14500ed779c20a677b4dfff44eb91cf587ef1..511cc758c1ad6721e4462dfed0ac0ca7ab968d0d 100644
--- a/src/sampling/sampledSurface/sampledSurface/sampledSurface.H
+++ b/src/sampling/sampledSurface/sampledSurface/sampledSurface.H
@@ -222,9 +222,8 @@ public:
);
- // Destructor
-
- virtual ~sampledSurface();
+ //- Destructor
+ virtual ~sampledSurface();
// Member Functions
diff --git a/src/sampling/sampledSurface/sampledSurfaces/sampledSurfaces.H b/src/sampling/sampledSurface/sampledSurfaces/sampledSurfaces.H
index eb3d379535e652b3d45f26d0eb1005690422996a..e711b64d6cd5b220833eb1eb85e4ddad66a14d5e 100644
--- a/src/sampling/sampledSurface/sampledSurfaces/sampledSurfaces.H
+++ b/src/sampling/sampledSurface/sampledSurfaces/sampledSurfaces.H
@@ -224,9 +224,8 @@ public:
);
- // Destructor
-
- virtual ~sampledSurfaces();
+ //- Destructor
+ virtual ~sampledSurfaces();
// Member Functions
diff --git a/src/sampling/sampledSurface/sampledTriSurfaceMesh/sampledTriSurfaceMesh.H b/src/sampling/sampledSurface/sampledTriSurfaceMesh/sampledTriSurfaceMesh.H
index 0bdbf75b0c9091bd8578bd349242a18b2691cbc7..5ea423583da6ebeeb0d0e6c58f0245bd099e2967 100644
--- a/src/sampling/sampledSurface/sampledTriSurfaceMesh/sampledTriSurfaceMesh.H
+++ b/src/sampling/sampledSurface/sampledTriSurfaceMesh/sampledTriSurfaceMesh.H
@@ -118,9 +118,8 @@ public:
);
- // Destructor
-
- virtual ~sampledTriSurfaceMesh();
+ //- Destructor
+ virtual ~sampledTriSurfaceMesh();
// Member Functions
diff --git a/src/sampling/sampledSurface/thresholdCellFaces/sampledThresholdCellFaces.H b/src/sampling/sampledSurface/thresholdCellFaces/sampledThresholdCellFaces.H
index 056b9126594d6a7155e78955c757d3951359845d..247a78c101db790c15a0c2a38da170783f645884 100644
--- a/src/sampling/sampledSurface/thresholdCellFaces/sampledThresholdCellFaces.H
+++ b/src/sampling/sampledSurface/thresholdCellFaces/sampledThresholdCellFaces.H
@@ -118,9 +118,8 @@ public:
);
- // Destructor
-
- virtual ~sampledThresholdCellFaces();
+ //- Destructor
+ virtual ~sampledThresholdCellFaces();
// Member Functions
diff --git a/src/sampling/sampledSurface/writers/dx/dxSurfaceWriter.H b/src/sampling/sampledSurface/writers/dx/dxSurfaceWriter.H
index 10d73603d8fe0b2f4a075ad124cd6a93d498ad74..5102cd1bb6fbf1d4cdd9dc96dc828e94c96fe7b0 100644
--- a/src/sampling/sampledSurface/writers/dx/dxSurfaceWriter.H
+++ b/src/sampling/sampledSurface/writers/dx/dxSurfaceWriter.H
@@ -71,9 +71,8 @@ public:
dxSurfaceWriter();
- // Destructor
-
- virtual ~dxSurfaceWriter();
+ //- Destructor
+ virtual ~dxSurfaceWriter();
// Member Functions
diff --git a/src/sampling/sampledSurface/writers/foamFile/foamFileSurfaceWriter.H b/src/sampling/sampledSurface/writers/foamFile/foamFileSurfaceWriter.H
index 9e7f46419b2e5e98b1f2754316f2daada3c7fce5..383f3515cde2b3e4474e8a9c5daebd0e7bc72058 100644
--- a/src/sampling/sampledSurface/writers/foamFile/foamFileSurfaceWriter.H
+++ b/src/sampling/sampledSurface/writers/foamFile/foamFileSurfaceWriter.H
@@ -64,9 +64,8 @@ public:
foamFileSurfaceWriter();
- // Destructor
-
- virtual ~foamFileSurfaceWriter();
+ //- Destructor
+ virtual ~foamFileSurfaceWriter();
// Member Functions
diff --git a/src/sampling/sampledSurface/writers/null/nullSurfaceWriter.H b/src/sampling/sampledSurface/writers/null/nullSurfaceWriter.H
index a71ae7b6f25abddf1a2a5166314883cb7242df31..a513bf1783839a37fcbd7adeb271b82a883d3475 100644
--- a/src/sampling/sampledSurface/writers/null/nullSurfaceWriter.H
+++ b/src/sampling/sampledSurface/writers/null/nullSurfaceWriter.H
@@ -63,9 +63,8 @@ public:
nullSurfaceWriter();
- // Destructor
-
- virtual ~nullSurfaceWriter();
+ //- Destructor
+ virtual ~nullSurfaceWriter();
// Member Functions
diff --git a/src/sampling/sampledSurface/writers/proxy/proxySurfaceWriter.H b/src/sampling/sampledSurface/writers/proxy/proxySurfaceWriter.H
index 5c7145e91f10007db0d5f9dcea2203b23c941ba2..5ccf5ea92f9f2c8bd5ab5429f63af6591de33ccd 100644
--- a/src/sampling/sampledSurface/writers/proxy/proxySurfaceWriter.H
+++ b/src/sampling/sampledSurface/writers/proxy/proxySurfaceWriter.H
@@ -68,9 +68,8 @@ public:
proxySurfaceWriter(const word& ext);
- // Destructor
-
- virtual ~proxySurfaceWriter();
+ //- Destructor
+ virtual ~proxySurfaceWriter();
// Member Functions
diff --git a/src/sampling/sampledSurface/writers/raw/rawSurfaceWriter.H b/src/sampling/sampledSurface/writers/raw/rawSurfaceWriter.H
index ec2ca54a9ba1ecafed2c3145743ecd9ba6630f1c..51fb5ecb9b27aea42dec074ae6354385b5f996f2 100644
--- a/src/sampling/sampledSurface/writers/raw/rawSurfaceWriter.H
+++ b/src/sampling/sampledSurface/writers/raw/rawSurfaceWriter.H
@@ -125,9 +125,8 @@ public:
rawSurfaceWriter();
- // Destructor
-
- virtual ~rawSurfaceWriter();
+ //- Destructor
+ virtual ~rawSurfaceWriter();
// Member Functions
diff --git a/src/sampling/sampledSurface/writers/surfaceWriter.H b/src/sampling/sampledSurface/writers/surfaceWriter.H
index 9420b178dfb41e6175a4e7fca0b60d549567bf6a..89a8a444fbc8a015231c19201c220929006b7d06 100644
--- a/src/sampling/sampledSurface/writers/surfaceWriter.H
+++ b/src/sampling/sampledSurface/writers/surfaceWriter.H
@@ -93,9 +93,8 @@ public:
surfaceWriter();
- // Destructor
-
- virtual ~surfaceWriter();
+ //- Destructor
+ virtual ~surfaceWriter();
// Member Functions
diff --git a/src/sampling/sampledSurface/writers/vtk/vtkSurfaceWriter.H b/src/sampling/sampledSurface/writers/vtk/vtkSurfaceWriter.H
index b228f741f868b227d2c0713421e89fa7efde533f..431d952cfa786ed131e21cf23564a76310c88b7e 100644
--- a/src/sampling/sampledSurface/writers/vtk/vtkSurfaceWriter.H
+++ b/src/sampling/sampledSurface/writers/vtk/vtkSurfaceWriter.H
@@ -69,9 +69,8 @@ public:
vtkSurfaceWriter();
- // Destructor
-
- virtual ~vtkSurfaceWriter();
+ //- Destructor
+ virtual ~vtkSurfaceWriter();
// Member Functions
diff --git a/src/surfMesh/MeshedSurface/MeshedSurface.H b/src/surfMesh/MeshedSurface/MeshedSurface.H
index 3210a9bf40a719642e5efe7a869085d2e6c5e837..3fb18124b2e61fc93cf86f007799191b872746b7 100644
--- a/src/surfMesh/MeshedSurface/MeshedSurface.H
+++ b/src/surfMesh/MeshedSurface/MeshedSurface.H
@@ -260,9 +260,8 @@ public:
static autoPtr<MeshedSurface> New(const fileName&);
- // Destructor
-
- virtual ~MeshedSurface();
+ //- Destructor
+ virtual ~MeshedSurface();
// Member Function Selectors
diff --git a/src/surfMesh/MeshedSurfaceProxy/MeshedSurfaceProxy.H b/src/surfMesh/MeshedSurfaceProxy/MeshedSurfaceProxy.H
index 432eed95cdb2cca95ecbc0cc94021cf29849e4e0..1d3f48dfa3f521ad9bb4061f30b1afceea0a8d33 100644
--- a/src/surfMesh/MeshedSurfaceProxy/MeshedSurfaceProxy.H
+++ b/src/surfMesh/MeshedSurfaceProxy/MeshedSurfaceProxy.H
@@ -102,9 +102,8 @@ public:
);
- // Destructor
-
- virtual ~MeshedSurfaceProxy();
+ //- Destructor
+ virtual ~MeshedSurfaceProxy();
// Member Function Selectors
diff --git a/src/surfMesh/surfMesh/surfMesh.H b/src/surfMesh/surfMesh/surfMesh.H
index 3275ea4b1dcea26238da4557abeb5cc79ac664d6..14496ca781a41ed249732cf35d6246feb64e1dc0 100644
--- a/src/surfMesh/surfMesh/surfMesh.H
+++ b/src/surfMesh/surfMesh/surfMesh.H
@@ -176,9 +176,8 @@ public:
);
- // Destructor
-
- virtual ~surfMesh();
+ //- Destructor
+ virtual ~surfMesh();
// Member Functions
diff --git a/src/surfMesh/surfZone/surfZone/surfZoneIOList.H b/src/surfMesh/surfZone/surfZone/surfZoneIOList.H
index eccf8280b094f82103d2107f57673e82a460e1af..8a014add6ea1fb1db17dd9aeed4b7b031df3464d 100644
--- a/src/surfMesh/surfZone/surfZone/surfZoneIOList.H
+++ b/src/surfMesh/surfZone/surfZone/surfZoneIOList.H
@@ -83,9 +83,8 @@ public:
surfZoneIOList(const IOobject&, const Xfer<surfZoneList>&);
- // Destructor
-
- ~surfZoneIOList();
+ //- Destructor
+ ~surfZoneIOList();
// Member Functions
diff --git a/src/surfMesh/surfZone/surfZoneIdentifier/surfZoneIdentifier.H b/src/surfMesh/surfZone/surfZoneIdentifier/surfZoneIdentifier.H
index 7c7ccd372c71812d37920228c22f146f70c7519a..c914164ccc98a1d68de6c28b9de2392f6da02d20 100644
--- a/src/surfMesh/surfZone/surfZoneIdentifier/surfZoneIdentifier.H
+++ b/src/surfMesh/surfZone/surfZoneIdentifier/surfZoneIdentifier.H
@@ -104,9 +104,8 @@ public:
);
- // Destructor
-
- virtual ~surfZoneIdentifier();
+ //- Destructor
+ virtual ~surfZoneIdentifier();
// Member Functions
diff --git a/src/surfMesh/surfaceFormats/ac3d/AC3DsurfaceFormat.H b/src/surfMesh/surfaceFormats/ac3d/AC3DsurfaceFormat.H
index e17eb4b265306914bf3937ed89cb476f013baaf8..c74fd5060fc90b0315b2005286abe53884750a82 100644
--- a/src/surfMesh/surfaceFormats/ac3d/AC3DsurfaceFormat.H
+++ b/src/surfMesh/surfaceFormats/ac3d/AC3DsurfaceFormat.H
@@ -93,10 +93,9 @@ public:
}
- // Destructor
-
- virtual ~AC3DsurfaceFormat()
- {}
+ //- Destructor
+ virtual ~AC3DsurfaceFormat()
+ {}
// Member Functions
diff --git a/src/surfMesh/surfaceFormats/ftr/FTRsurfaceFormat.H b/src/surfMesh/surfaceFormats/ftr/FTRsurfaceFormat.H
index ddd131b9747285c0acc3b6e1d0b702a3b46fdc66..c536ff8b6f4a9867843432d344d2904772a65f6d 100644
--- a/src/surfMesh/surfaceFormats/ftr/FTRsurfaceFormat.H
+++ b/src/surfMesh/surfaceFormats/ftr/FTRsurfaceFormat.H
@@ -114,10 +114,9 @@ public:
}
- // Destructor
-
- virtual ~FTRsurfaceFormat()
- {}
+ //- Destructor
+ virtual ~FTRsurfaceFormat()
+ {}
// Member Functions
diff --git a/src/surfMesh/surfaceFormats/nas/NASsurfaceFormat.H b/src/surfMesh/surfaceFormats/nas/NASsurfaceFormat.H
index 464b4d9e5fdfdea485fc73df2e7fb6691cfd9d3e..e29263031b7f506c09b740415b8e9553108fc2d3 100644
--- a/src/surfMesh/surfaceFormats/nas/NASsurfaceFormat.H
+++ b/src/surfMesh/surfaceFormats/nas/NASsurfaceFormat.H
@@ -94,10 +94,9 @@ public:
}
- // Destructor
-
- virtual ~NASsurfaceFormat()
- {}
+ //- Destructor
+ virtual ~NASsurfaceFormat()
+ {}
// Member Functions
diff --git a/src/surfMesh/surfaceFormats/obj/OBJsurfaceFormat.H b/src/surfMesh/surfaceFormats/obj/OBJsurfaceFormat.H
index df315e2b24316d1f2d19c00290369da76e7c3459..87fdf9a2eb84e2db8c5d17634408ebcf1a5039e5 100644
--- a/src/surfMesh/surfaceFormats/obj/OBJsurfaceFormat.H
+++ b/src/surfMesh/surfaceFormats/obj/OBJsurfaceFormat.H
@@ -86,10 +86,9 @@ public:
}
- // Destructor
-
- virtual ~OBJsurfaceFormat()
- {}
+ //- Destructor
+ virtual ~OBJsurfaceFormat()
+ {}
// Member Functions
diff --git a/src/surfMesh/surfaceFormats/ofs/OFSsurfaceFormat.H b/src/surfMesh/surfaceFormats/ofs/OFSsurfaceFormat.H
index 1a272123eea3d9588af4de4216bc989e2720fe6f..f77e491aec16c907ab110d14ab3a46a4ac2607d1 100644
--- a/src/surfMesh/surfaceFormats/ofs/OFSsurfaceFormat.H
+++ b/src/surfMesh/surfaceFormats/ofs/OFSsurfaceFormat.H
@@ -91,10 +91,9 @@ public:
}
- // Destructor
-
- virtual ~OFSsurfaceFormat()
- {}
+ //- Destructor
+ virtual ~OFSsurfaceFormat()
+ {}
diff --git a/src/surfMesh/surfaceFormats/smesh/SMESHsurfaceFormat.H b/src/surfMesh/surfaceFormats/smesh/SMESHsurfaceFormat.H
index 45890d08b251c3c03d4414626ba52843ba017c20..f8b3fdb36aba46256cb9271d1100a632138eee18 100644
--- a/src/surfMesh/surfaceFormats/smesh/SMESHsurfaceFormat.H
+++ b/src/surfMesh/surfaceFormats/smesh/SMESHsurfaceFormat.H
@@ -78,10 +78,9 @@ public:
SMESHsurfaceFormat();
- // Destructor
-
- virtual ~SMESHsurfaceFormat()
- {}
+ //- Destructor
+ virtual ~SMESHsurfaceFormat()
+ {}
// Member Functions
diff --git a/src/surfMesh/surfaceFormats/stl/STLsurfaceFormatCore.H b/src/surfMesh/surfaceFormats/stl/STLsurfaceFormatCore.H
index 246fdb87aa0898f46c0b3146de408de4a4fb3c67..1ace377235007cd1bbe4dd723658beb5536e78c7 100644
--- a/src/surfMesh/surfaceFormats/stl/STLsurfaceFormatCore.H
+++ b/src/surfMesh/surfaceFormats/stl/STLsurfaceFormatCore.H
@@ -109,9 +109,8 @@ public:
STLsurfaceFormatCore(const fileName&);
- // Destructor
-
- ~STLsurfaceFormatCore();
+ //- Destructor
+ ~STLsurfaceFormatCore();
// Member Functions
diff --git a/src/surfMesh/surfaceFormats/surfaceFormatsCore.H b/src/surfMesh/surfaceFormats/surfaceFormatsCore.H
index 81e76aa2cf0a5ba9fa7e5685d12872f669a71b08..dd773054dcefec95807c93431eecda367056842f 100644
--- a/src/surfMesh/surfaceFormats/surfaceFormatsCore.H
+++ b/src/surfMesh/surfaceFormats/surfaceFormatsCore.H
@@ -116,9 +116,8 @@ public:
surfaceFormatsCore();
- // Destructor
-
- virtual ~surfaceFormatsCore();
+ //- Destructor
+ virtual ~surfaceFormatsCore();
};
diff --git a/src/surfMesh/surfaceFormats/tri/TRIsurfaceFormatCore.H b/src/surfMesh/surfaceFormats/tri/TRIsurfaceFormatCore.H
index 728e9e1dae7ab2e9160a063482846bd47ac93e45..44632da62216aa418795835600a3236ef7ee069f 100644
--- a/src/surfMesh/surfaceFormats/tri/TRIsurfaceFormatCore.H
+++ b/src/surfMesh/surfaceFormats/tri/TRIsurfaceFormatCore.H
@@ -90,9 +90,8 @@ public:
TRIsurfaceFormatCore(const fileName&);
- // Destructor
-
- ~TRIsurfaceFormatCore();
+ //- Destructor
+ ~TRIsurfaceFormatCore();
// Member Functions
diff --git a/src/surfMesh/surfaceFormats/vtk/VTKsurfaceFormat.H b/src/surfMesh/surfaceFormats/vtk/VTKsurfaceFormat.H
index aba403ae14640fcee2c4da735abb5257de167711..3e88ddcdff58019a948503d054f2b5d59bc96028 100644
--- a/src/surfMesh/surfaceFormats/vtk/VTKsurfaceFormat.H
+++ b/src/surfMesh/surfaceFormats/vtk/VTKsurfaceFormat.H
@@ -78,10 +78,9 @@ public:
VTKsurfaceFormat();
- // Destructor
-
- virtual ~VTKsurfaceFormat()
- {}
+ //- Destructor
+ virtual ~VTKsurfaceFormat()
+ {}
// Member Functions
diff --git a/src/surfMesh/surfaceFormats/wrl/WRLsurfaceFormat.H b/src/surfMesh/surfaceFormats/wrl/WRLsurfaceFormat.H
index 28ec213c6a5db311f49eaaf3f201baaf2302761e..c43d050ad974677943688fe773243d4d5032fa72 100644
--- a/src/surfMesh/surfaceFormats/wrl/WRLsurfaceFormat.H
+++ b/src/surfMesh/surfaceFormats/wrl/WRLsurfaceFormat.H
@@ -74,10 +74,9 @@ public:
WRLsurfaceFormat();
- // Destructor
-
- virtual ~WRLsurfaceFormat()
- {}
+ //- Destructor
+ virtual ~WRLsurfaceFormat()
+ {}
// Member Functions
diff --git a/src/surfMesh/surfaceFormats/x3d/X3DsurfaceFormat.H b/src/surfMesh/surfaceFormats/x3d/X3DsurfaceFormat.H
index a8387f0e34d0551674700d6f0b42938f21c7573e..0dae045cc1f7d6216b990b347676a516227e8e58 100644
--- a/src/surfMesh/surfaceFormats/x3d/X3DsurfaceFormat.H
+++ b/src/surfMesh/surfaceFormats/x3d/X3DsurfaceFormat.H
@@ -73,10 +73,9 @@ public:
X3DsurfaceFormat();
- // Destructor
-
- virtual ~X3DsurfaceFormat()
- {}
+ //- Destructor
+ virtual ~X3DsurfaceFormat()
+ {}
// Member Functions
diff --git a/src/surfMesh/surfaceRegistry/surfaceRegistry.H b/src/surfMesh/surfaceRegistry/surfaceRegistry.H
index 768edd4fa9373905e11f4fe25830099df5132ebf..04b5c7b6d83c60e0aa2a9c715a59721b7fe38291 100644
--- a/src/surfMesh/surfaceRegistry/surfaceRegistry.H
+++ b/src/surfMesh/surfaceRegistry/surfaceRegistry.H
@@ -78,9 +78,8 @@ public:
surfaceRegistry(const objectRegistry&, const word& surfName = "");
- // Destructor
-
- virtual ~surfaceRegistry();
+ //- Destructor
+ virtual ~surfaceRegistry();
};
diff --git a/src/thermophysicalModels/barotropicCompressibilityModel/Chung/Chung.H b/src/thermophysicalModels/barotropicCompressibilityModel/Chung/Chung.H
index d199928dbea615b4ca102f3b04c70af47085673d..da9f767b11d8b93a4362fa725f98f167fa605b78 100644
--- a/src/thermophysicalModels/barotropicCompressibilityModel/Chung/Chung.H
+++ b/src/thermophysicalModels/barotropicCompressibilityModel/Chung/Chung.H
@@ -79,10 +79,9 @@ public:
);
- // Destructor
-
- ~Chung()
- {}
+ //- Destructor
+ ~Chung()
+ {}
// Member Functions
diff --git a/src/thermophysicalModels/barotropicCompressibilityModel/Wallis/Wallis.H b/src/thermophysicalModels/barotropicCompressibilityModel/Wallis/Wallis.H
index 2d733fb6524eb4f69e7ba95e72ac1deb57a68574..6c78260e6345a0bce8b499470c3699e825483b8a 100644
--- a/src/thermophysicalModels/barotropicCompressibilityModel/Wallis/Wallis.H
+++ b/src/thermophysicalModels/barotropicCompressibilityModel/Wallis/Wallis.H
@@ -79,10 +79,9 @@ public:
);
- // Destructor
-
- ~Wallis()
- {}
+ //- Destructor
+ ~Wallis()
+ {}
// Member Functions
diff --git a/src/thermophysicalModels/barotropicCompressibilityModel/barotropicCompressibilityModel/barotropicCompressibilityModel.H b/src/thermophysicalModels/barotropicCompressibilityModel/barotropicCompressibilityModel/barotropicCompressibilityModel.H
index e6615bb777ba62b9c70b5f6f48f16971e47ee11e..017c71fd4575286ada44d5b0190646d3293f1e1f 100644
--- a/src/thermophysicalModels/barotropicCompressibilityModel/barotropicCompressibilityModel/barotropicCompressibilityModel.H
+++ b/src/thermophysicalModels/barotropicCompressibilityModel/barotropicCompressibilityModel/barotropicCompressibilityModel.H
@@ -125,10 +125,9 @@ public:
);
- // Destructor
-
- virtual ~barotropicCompressibilityModel()
- {}
+ //- Destructor
+ virtual ~barotropicCompressibilityModel()
+ {}
// Member Functions
diff --git a/src/thermophysicalModels/barotropicCompressibilityModel/linear/linear.H b/src/thermophysicalModels/barotropicCompressibilityModel/linear/linear.H
index 7f8f021000fadb9595a1d93fda929b5552485c46..989bb384bddac4abd869b45a18af7b611f9cb070 100644
--- a/src/thermophysicalModels/barotropicCompressibilityModel/linear/linear.H
+++ b/src/thermophysicalModels/barotropicCompressibilityModel/linear/linear.H
@@ -76,10 +76,9 @@ public:
);
- // Destructor
-
- ~linear()
- {}
+ //- Destructor
+ ~linear()
+ {}
// Member Functions
diff --git a/src/thermophysicalModels/pdfs/general/general.H b/src/thermophysicalModels/pdfs/general/general.H
index c641ea0f66dbd0fe78ce890ac47462a55121849c..5c178443a628ef480a45a8817d33b9b1ba84ff23 100644
--- a/src/thermophysicalModels/pdfs/general/general.H
+++ b/src/thermophysicalModels/pdfs/general/general.H
@@ -83,7 +83,7 @@ public:
);
- // Destructor
+ //- Destructor
virtual ~general();
diff --git a/src/thermophysicalModels/radiation/radiationModel/P1/P1.H b/src/thermophysicalModels/radiation/radiationModel/P1/P1.H
index 25ccb5a6dc88487e00fa3142282f41802f07811e..5300d3718ce94bdf88e19109b2ce060d6cc5d1b3 100644
--- a/src/thermophysicalModels/radiation/radiationModel/P1/P1.H
+++ b/src/thermophysicalModels/radiation/radiationModel/P1/P1.H
@@ -94,7 +94,7 @@ public:
P1(const volScalarField& T);
- // Destructor
+ //- Destructor
virtual ~P1();
diff --git a/src/thermophysicalModels/radiation/radiationModel/fvDOM/absorptionCoeffs/absorptionCoeffs.H b/src/thermophysicalModels/radiation/radiationModel/fvDOM/absorptionCoeffs/absorptionCoeffs.H
index 10756e4c7e8c21ad03683ade893397359cadc6af..9bb61b361b64911a1322135fe909ee142f7b5a06 100644
--- a/src/thermophysicalModels/radiation/radiationModel/fvDOM/absorptionCoeffs/absorptionCoeffs.H
+++ b/src/thermophysicalModels/radiation/radiationModel/fvDOM/absorptionCoeffs/absorptionCoeffs.H
@@ -98,7 +98,7 @@ public:
{}
- // Destructor
+ //- Destructor
~absorptionCoeffs();
diff --git a/src/thermophysicalModels/radiation/radiationModel/fvDOM/blackBodyEmission/blackBodyEmission.H b/src/thermophysicalModels/radiation/radiationModel/fvDOM/blackBodyEmission/blackBodyEmission.H
index bed89bdab22e57a61e6ddee2fbdc7b391461f984..732631fd4e246ddd7fcee216b815669b7b0bce6c 100644
--- a/src/thermophysicalModels/radiation/radiationModel/fvDOM/blackBodyEmission/blackBodyEmission.H
+++ b/src/thermophysicalModels/radiation/radiationModel/fvDOM/blackBodyEmission/blackBodyEmission.H
@@ -99,7 +99,7 @@ public:
);
- // Destructor
+ //- Destructor
~blackBodyEmission();
diff --git a/src/thermophysicalModels/radiation/radiationModel/fvDOM/fvDOM/fvDOM.C b/src/thermophysicalModels/radiation/radiationModel/fvDOM/fvDOM/fvDOM.C
index f73d12199fbf8041373da8fdf4a09d299adca91b..effd9cd63545fbb1d0f1f57418da7b34e05e501d 100644
--- a/src/thermophysicalModels/radiation/radiationModel/fvDOM/fvDOM/fvDOM.C
+++ b/src/thermophysicalModels/radiation/radiationModel/fvDOM/fvDOM/fvDOM.C
@@ -253,7 +253,7 @@ Foam::radiation::fvDOM::fvDOM(const volScalarField& T)
Info<< "fvDOM : Allocated " << IRay_.size()
<< " rays with average orientation:" << nl;
- forAll (IRay_, i)
+ forAll(IRay_, i)
{
Info<< '\t' << IRay_[i].I().name()
<< '\t' << IRay_[i].dAve() << nl;
diff --git a/src/thermophysicalModels/radiation/radiationModel/fvDOM/radiativeIntensityRay/radiativeIntensityRay.H b/src/thermophysicalModels/radiation/radiationModel/fvDOM/radiativeIntensityRay/radiativeIntensityRay.H
index 9182d6d1618521387f8cfd7a51cb7edec65e4014..15c57772b83fd5185fadc8ba890d796bf12264bb 100644
--- a/src/thermophysicalModels/radiation/radiationModel/fvDOM/radiativeIntensityRay/radiativeIntensityRay.H
+++ b/src/thermophysicalModels/radiation/radiationModel/fvDOM/radiativeIntensityRay/radiativeIntensityRay.H
@@ -134,7 +134,7 @@ public:
);
- // Destructor
+ //- Destructor
~radiativeIntensityRay();
diff --git a/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/binaryAbsorptionEmission/binaryAbsorptionEmission.H b/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/binaryAbsorptionEmission/binaryAbsorptionEmission.H
index 397aa49f61de079a1aabd88a9c9e28bdfc112f18..7f36a0cd095a11631d353b5cc5ef6ea9fedad2a1 100644
--- a/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/binaryAbsorptionEmission/binaryAbsorptionEmission.H
+++ b/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/binaryAbsorptionEmission/binaryAbsorptionEmission.H
@@ -80,7 +80,7 @@ public:
);
- // Destructor
+ //- Destructor
virtual ~binaryAbsorptionEmission();
diff --git a/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/constantAbsorptionEmission/constantAbsorptionEmission.H b/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/constantAbsorptionEmission/constantAbsorptionEmission.H
index 64bfaf9707d05ab66868d5f2f25a99e7a4f4a87c..e33afebba37826d818b968938d204b1bf9bf3fff 100644
--- a/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/constantAbsorptionEmission/constantAbsorptionEmission.H
+++ b/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/constantAbsorptionEmission/constantAbsorptionEmission.H
@@ -84,7 +84,7 @@ public:
);
- // Destructor
+ //- Destructor
virtual ~constantAbsorptionEmission();
diff --git a/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/greyMeanAbsorptionEmission/greyMeanAbsorptionEmission.H b/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/greyMeanAbsorptionEmission/greyMeanAbsorptionEmission.H
index 7bfb051cc6c2dc8072cc01c6f609447b3db81de8..7b7c2a46805a55c5ad053e9e88f9c8fcc2750583 100644
--- a/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/greyMeanAbsorptionEmission/greyMeanAbsorptionEmission.H
+++ b/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/greyMeanAbsorptionEmission/greyMeanAbsorptionEmission.H
@@ -159,7 +159,7 @@ public:
);
- // Destructor
+ //- Destructor
virtual ~greyMeanAbsorptionEmission();
diff --git a/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/noAbsorptionEmission/noAbsorptionEmission.H b/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/noAbsorptionEmission/noAbsorptionEmission.H
index cc10e10f846afba61dd22f5719d01bad6478934c..7b3373ed83195bc3cfff9557b135103272112186 100644
--- a/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/noAbsorptionEmission/noAbsorptionEmission.H
+++ b/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/noAbsorptionEmission/noAbsorptionEmission.H
@@ -69,7 +69,7 @@ public:
);
- // Destructor
+ //- Destructor
virtual ~noAbsorptionEmission();
};
diff --git a/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/wideBandAbsorptionEmission/wideBandAbsorptionEmission.H b/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/wideBandAbsorptionEmission/wideBandAbsorptionEmission.H
index 8df317aa6f18391f8fa5b24dd8563d5ec08e117e..d71842feeed9ba29ec94349796d9e1b218f7bb61 100644
--- a/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/wideBandAbsorptionEmission/wideBandAbsorptionEmission.H
+++ b/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/wideBandAbsorptionEmission/wideBandAbsorptionEmission.H
@@ -189,7 +189,7 @@ public:
);
- // Destructor
+ //- Destructor
virtual ~wideBandAbsorptionEmission();
diff --git a/src/thermophysicalModels/radiation/submodels/scatterModel/constantScatter/constantScatter.H b/src/thermophysicalModels/radiation/submodels/scatterModel/constantScatter/constantScatter.H
index 2919c285ef4c4b2779125c23a27d5d39522dd1f9..336d9e19551a52caa1b0e700c76a5a90843567c9 100644
--- a/src/thermophysicalModels/radiation/submodels/scatterModel/constantScatter/constantScatter.H
+++ b/src/thermophysicalModels/radiation/submodels/scatterModel/constantScatter/constantScatter.H
@@ -85,9 +85,8 @@ public:
);
- // Destructor
-
- ~constantScatter();
+ //- Destructor
+ ~constantScatter();
// Member Operators
diff --git a/src/thermophysicalModels/radiation/submodels/scatterModel/scatterModel/scatterModel.H b/src/thermophysicalModels/radiation/submodels/scatterModel/scatterModel/scatterModel.H
index bb3287c24d754a8eb5b4d26819dd9f33e8752bf5..4d97e911bf0b73251b8e7d4b6391b08127157752 100644
--- a/src/thermophysicalModels/radiation/submodels/scatterModel/scatterModel/scatterModel.H
+++ b/src/thermophysicalModels/radiation/submodels/scatterModel/scatterModel/scatterModel.H
@@ -97,9 +97,8 @@ public:
);
- // Destructor
-
- virtual ~scatterModel();
+ //- Destructor
+ virtual ~scatterModel();
// Member Functions
diff --git a/src/thermophysicalModels/reactionThermo/chemistryReaders/chemkinReader/chemkinLexer.L b/src/thermophysicalModels/reactionThermo/chemistryReaders/chemkinReader/chemkinLexer.L
index 8392069679efd42891612e2fd90fde5736663482..6edaa29c2c60d5b5c2b2c0c91655dcf04b328e70 100644
--- a/src/thermophysicalModels/reactionThermo/chemistryReaders/chemkinReader/chemkinLexer.L
+++ b/src/thermophysicalModels/reactionThermo/chemistryReaders/chemkinReader/chemkinLexer.L
@@ -1428,7 +1428,7 @@ bool finishReaction = false;
bool found = false;
- forAll (lrhs, i)
+ forAll(lrhs, i)
{
if (lrhs[i].index == currentSpecieIndex)
{
diff --git a/src/thermophysicalModels/reactionThermo/chemistryReaders/chemkinReader/chemkinReader.C b/src/thermophysicalModels/reactionThermo/chemistryReaders/chemkinReader/chemkinReader.C
index 7a33facf2ffb0badddc24aa18eff9c443139658f..29717a7554a41573e69b6ae761e05ea4e0596f5b 100644
--- a/src/thermophysicalModels/reactionThermo/chemistryReaders/chemkinReader/chemkinReader.C
+++ b/src/thermophysicalModels/reactionThermo/chemistryReaders/chemkinReader/chemkinReader.C
@@ -111,7 +111,7 @@ Foam::scalar Foam::chemkinReader::molecularWeight
{
scalar molWt = 0.0;
- forAll (specieComposition, i)
+ forAll(specieComposition, i)
{
label nAtoms = specieComposition[i].nAtoms;
const word& elementName = specieComposition[i].elementName;
@@ -430,24 +430,24 @@ void Foam::chemkinReader::addReaction
scalarList nAtoms(elementNames_.size(), 0.0);
- forAll (lhs, i)
+ forAll(lhs, i)
{
const List<specieElement>& specieComposition =
specieComposition_[speciesTable_[lhs[i].index]];
- forAll (specieComposition, j)
+ forAll(specieComposition, j)
{
label elementi = elementIndices_[specieComposition[j].elementName];
nAtoms[elementi] += lhs[i].stoichCoeff*specieComposition[j].nAtoms;
}
}
- forAll (rhs, i)
+ forAll(rhs, i)
{
const List<specieElement>& specieComposition =
specieComposition_[speciesTable_[rhs[i].index]];
- forAll (specieComposition, j)
+ forAll(specieComposition, j)
{
label elementi = elementIndices_[specieComposition[j].elementName];
nAtoms[elementi] -= rhs[i].stoichCoeff*specieComposition[j].nAtoms;
@@ -459,7 +459,7 @@ void Foam::chemkinReader::addReaction
// for the change from mol/cm^3 to kmol/m^3 concentraction units
const scalar concFactor = 0.001;
scalar sumExp = 0.0;
- forAll (lhs, i)
+ forAll(lhs, i)
{
sumExp += lhs[i].exponent;
}
@@ -470,7 +470,7 @@ void Foam::chemkinReader::addReaction
if (rType == nonEquilibriumReversible)
{
sumExp = 0.0;
- forAll (rhs, i)
+ forAll(rhs, i)
{
sumExp += rhs[i].exponent;
}
@@ -770,7 +770,7 @@ void Foam::chemkinReader::addReaction
}
- forAll (nAtoms, i)
+ forAll(nAtoms, i)
{
if (mag(nAtoms[i]) > SMALL)
{
diff --git a/src/thermophysicalModels/reactionThermo/chemistryReaders/chemkinReader/chemkinReader.H b/src/thermophysicalModels/reactionThermo/chemistryReaders/chemkinReader/chemkinReader.H
index a82f01f9e20bccd98b50b83f23b260a2ffc5f80e..2390626594457e8d9867442ba8a68217e8081441 100644
--- a/src/thermophysicalModels/reactionThermo/chemistryReaders/chemkinReader/chemkinReader.H
+++ b/src/thermophysicalModels/reactionThermo/chemistryReaders/chemkinReader/chemkinReader.H
@@ -325,10 +325,9 @@ public:
chemkinReader(const dictionary& thermoDict);
- // Destructor
-
- virtual ~chemkinReader()
- {}
+ //- Destructor
+ virtual ~chemkinReader()
+ {}
// Member functions
diff --git a/src/thermophysicalModels/reactionThermo/mixtures/multiComponentMixture/multiComponentMixture.C b/src/thermophysicalModels/reactionThermo/mixtures/multiComponentMixture/multiComponentMixture.C
index 16fff678b74367e5f189c75064cf704b76b6f82e..617349840ccc8bcdbf20ff2a0f6cfb36ef1eadfd 100644
--- a/src/thermophysicalModels/reactionThermo/mixtures/multiComponentMixture/multiComponentMixture.C
+++ b/src/thermophysicalModels/reactionThermo/mixtures/multiComponentMixture/multiComponentMixture.C
@@ -56,7 +56,7 @@ void Foam::multiComponentMixture<ThermoType>::correctMassFractions()
Yt += Y_[n];
}
- forAll (Y_, n)
+ forAll(Y_, n)
{
Y_[n] /= Yt;
}
diff --git a/src/thermophysicalModels/solids/solid/solid.H b/src/thermophysicalModels/solids/solid/solid.H
index a6e4aabae80c53ddb399db59269b35d73852838e..189feba08b30d4c46c020a72200df67c3f766cbe 100644
--- a/src/thermophysicalModels/solids/solid/solid.H
+++ b/src/thermophysicalModels/solids/solid/solid.H
@@ -124,10 +124,9 @@ public:
static autoPtr<solid> New(Istream& is);
- // Destructor
-
- virtual ~solid()
- {}
+ //- Destructor
+ virtual ~solid()
+ {}
// Member Functions
diff --git a/src/thermophysicalModels/specie/reaction/Reactions/IrreversibleReaction/IrreversibleReaction.H b/src/thermophysicalModels/specie/reaction/Reactions/IrreversibleReaction/IrreversibleReaction.H
index 0a4fa8ef5d383ac2acd6f6979972b4494f0cdebb..4ff1606858aae8e84c3d9a42d37f4edbc4e6e74b 100644
--- a/src/thermophysicalModels/specie/reaction/Reactions/IrreversibleReaction/IrreversibleReaction.H
+++ b/src/thermophysicalModels/specie/reaction/Reactions/IrreversibleReaction/IrreversibleReaction.H
@@ -122,10 +122,9 @@ public:
}
- // Destructor
-
- virtual ~IrreversibleReaction()
- {}
+ //- Destructor
+ virtual ~IrreversibleReaction()
+ {}
// Member Functions
diff --git a/src/thermophysicalModels/specie/reaction/Reactions/NonEquilibriumReversibleReaction/NonEquilibriumReversibleReaction.H b/src/thermophysicalModels/specie/reaction/Reactions/NonEquilibriumReversibleReaction/NonEquilibriumReversibleReaction.H
index accf9465233bac490baa42e8461449b0c6f3d68a..983bdfff2cf8135912f616c82ed6a6b893308a33 100644
--- a/src/thermophysicalModels/specie/reaction/Reactions/NonEquilibriumReversibleReaction/NonEquilibriumReversibleReaction.H
+++ b/src/thermophysicalModels/specie/reaction/Reactions/NonEquilibriumReversibleReaction/NonEquilibriumReversibleReaction.H
@@ -125,10 +125,9 @@ public:
}
- // Destructor
-
- virtual ~NonEquilibriumReversibleReaction()
- {}
+ //- Destructor
+ virtual ~NonEquilibriumReversibleReaction()
+ {}
// Member Functions
diff --git a/src/thermophysicalModels/specie/reaction/Reactions/Reaction/Reaction.H b/src/thermophysicalModels/specie/reaction/Reactions/Reaction/Reaction.H
index 04416ee74315e3fb63323da1bd43a5aaf3843b65..a42b8c90c0e7cd12a3e942682b2e2a47d8f89f28 100644
--- a/src/thermophysicalModels/specie/reaction/Reactions/Reaction/Reaction.H
+++ b/src/thermophysicalModels/specie/reaction/Reactions/Reaction/Reaction.H
@@ -238,10 +238,9 @@ public:
);
- // Destructor
-
- virtual ~Reaction()
- {}
+ //- Destructor
+ virtual ~Reaction()
+ {}
// Member Functions
diff --git a/src/thermophysicalModels/specie/reaction/Reactions/ReversibleReaction/ReversibleReaction.H b/src/thermophysicalModels/specie/reaction/Reactions/ReversibleReaction/ReversibleReaction.H
index bd8891328cc0127779a9ca22da31c8bf33de293a..1c3672f04f01f14317829438adf4565d3b0159f3 100644
--- a/src/thermophysicalModels/specie/reaction/Reactions/ReversibleReaction/ReversibleReaction.H
+++ b/src/thermophysicalModels/specie/reaction/Reactions/ReversibleReaction/ReversibleReaction.H
@@ -119,10 +119,9 @@ public:
}
- // Destructor
-
- virtual ~ReversibleReaction()
- {}
+ //- Destructor
+ virtual ~ReversibleReaction()
+ {}
// Member Functions
diff --git a/src/thermophysicalModels/specie/reaction/reactionRate/thirdBodyEfficiencies/thirdBodyEfficienciesI.H b/src/thermophysicalModels/specie/reaction/reactionRate/thirdBodyEfficiencies/thirdBodyEfficienciesI.H
index 04a1b80139f30901aec0975f5808428a1a33b591..1246fc4b362d71eb7269db803497e095e1894344 100644
--- a/src/thermophysicalModels/specie/reaction/reactionRate/thirdBodyEfficiencies/thirdBodyEfficienciesI.H
+++ b/src/thermophysicalModels/specie/reaction/reactionRate/thirdBodyEfficiencies/thirdBodyEfficienciesI.H
@@ -116,7 +116,7 @@ inline Foam::thirdBodyEfficiencies::thirdBodyEfficiencies
inline Foam::scalar Foam::thirdBodyEfficiencies::M(const scalarList& c) const
{
scalar M = 0.0;
- forAll (*this, i)
+ forAll(*this, i)
{
M += operator[](i)*c[i];
}
@@ -169,7 +169,7 @@ inline Foam::Ostream& Foam::operator<<
os << token::BEGIN_LIST << valMaxCount;
- forAll (tbes, i)
+ forAll(tbes, i)
{
if (notEqual(tbes[i], valMaxCount))
{
diff --git a/src/thermophysicalModels/specie/speciesTable/speciesTable.C b/src/thermophysicalModels/specie/speciesTable/speciesTable.C
index ec00f0be73c171283cc554cb8b9a4467e6ff1ac2..ed2929088d6fe9002bd47cd16f18c76c085a6c59 100644
--- a/src/thermophysicalModels/specie/speciesTable/speciesTable.C
+++ b/src/thermophysicalModels/specie/speciesTable/speciesTable.C
@@ -29,7 +29,7 @@ License
void Foam::speciesTable::setIndices()
{
- forAll (*this, i)
+ forAll(*this, i)
{
specieIndices_.insert(wordList::operator[](i), i);
}
@@ -52,7 +52,7 @@ Foam::speciesTable::speciesTable(const label nSpecies, const char** specieNames)
:
wordList(nSpecies)
{
- forAll (*this, i)
+ forAll(*this, i)
{
wordList::operator[](i) = specieNames[i];
}
diff --git a/src/thermophysicalModels/thermalPorousZone/thermalPorousZone/thermalPorousZone.C b/src/thermophysicalModels/thermalPorousZone/thermalPorousZone/thermalPorousZone.C
index 3afdab21573d9911cf9bbab057d25a8d3f3a4fa5..08fecc77a0f0effecf03fa822343856874449416 100644
--- a/src/thermophysicalModels/thermalPorousZone/thermalPorousZone/thermalPorousZone.C
+++ b/src/thermophysicalModels/thermalPorousZone/thermalPorousZone/thermalPorousZone.C
@@ -89,7 +89,7 @@ void Foam::thermalPorousZone::addEnthalpySource
scalarField hZone = thermo.h(scalarField(cells.size(), T_.value()), cells);
scalar rate = 1e6;
- forAll (cells, i)
+ forAll(cells, i)
{
hDiag[cells[i]] += rate*V[cells[i]]*rho[cells[i]];
hSource[cells[i]] += rate*V[cells[i]]*rho[cells[i]]*hZone[i];
diff --git a/src/thermophysicalModels/thermalPorousZone/thermalPorousZone/thermalPorousZoneTemplates.C b/src/thermophysicalModels/thermalPorousZone/thermalPorousZone/thermalPorousZoneTemplates.C
index 04e29059e24efd9155be4216158fa8207c13a542..261abb18e958ccc160b67f5c73116a3e6a221a96 100644
--- a/src/thermophysicalModels/thermalPorousZone/thermalPorousZone/thermalPorousZoneTemplates.C
+++ b/src/thermophysicalModels/thermalPorousZone/thermalPorousZone/thermalPorousZoneTemplates.C
@@ -41,7 +41,7 @@ void Foam::porousZone::addPowerLawResistance
const scalar C0 = C0_;
const scalar C1m1b2 = (C1_ - 1.0)/2.0;
- forAll (cells, i)
+ forAll(cells, i)
{
Udiag[cells[i]] +=
V[cells[i]]*rho[cells[i]]*C0*pow(magSqr(U[cells[i]]), C1m1b2);
@@ -64,7 +64,7 @@ void Foam::porousZone::addViscousInertialResistance
const tensor& D = D_.value();
const tensor& F = F_.value();
- forAll (cells, i)
+ forAll(cells, i)
{
tensor dragCoeff = mu[cells[i]]*D + (rho[cells[i]]*mag(U[cells[i]]))*F;
scalar isoDragCoeff = tr(dragCoeff);
diff --git a/src/thermophysicalModels/thermophysicalFunctions/thermophysicalFunction/thermophysicalFunction.H b/src/thermophysicalModels/thermophysicalFunctions/thermophysicalFunction/thermophysicalFunction.H
index 8243b56003802045313567e935cdb9788f032b48..3baf8c52e362575d4e2b498145bc93019470adce 100644
--- a/src/thermophysicalModels/thermophysicalFunctions/thermophysicalFunction/thermophysicalFunction.H
+++ b/src/thermophysicalModels/thermophysicalFunctions/thermophysicalFunction/thermophysicalFunction.H
@@ -78,10 +78,9 @@ public:
static autoPtr<thermophysicalFunction> New(Istream& is);
- // Destructor
-
- virtual ~thermophysicalFunction()
- {}
+ //- Destructor
+ virtual ~thermophysicalFunction()
+ {}
// Member Functions
diff --git a/src/topoChangerFvMesh/linearValveFvMesh/linearValveFvMesh.C b/src/topoChangerFvMesh/linearValveFvMesh/linearValveFvMesh.C
index 3f5e8eab7c075e24f0cce06d2588d03e218c014f..ac416f50dac770f755035724c32eb7c68e5d32ec 100644
--- a/src/topoChangerFvMesh/linearValveFvMesh/linearValveFvMesh.C
+++ b/src/topoChangerFvMesh/linearValveFvMesh/linearValveFvMesh.C
@@ -89,7 +89,7 @@ void Foam::linearValveFvMesh::addZonesAndModifiers()
labelList isf(innerSlider.size());
- forAll (isf, i)
+ forAll(isf, i)
{
isf[i] = innerSlider.start() + i;
}
@@ -110,7 +110,7 @@ void Foam::linearValveFvMesh::addZonesAndModifiers()
labelList osf(outerSlider.size());
- forAll (osf, i)
+ forAll(osf, i)
{
osf[i] = outerSlider.start() + i;
}
@@ -172,7 +172,7 @@ void Foam::linearValveFvMesh::makeSlidersDead()
const polyTopoChanger& topoChanges = topoChanger_;
// Enable layering
- forAll (topoChanges, modI)
+ forAll(topoChanges, modI)
{
if (isA<slidingInterface>(topoChanges[modI]))
{
@@ -194,7 +194,7 @@ void Foam::linearValveFvMesh::makeSlidersLive()
const polyTopoChanger& topoChanges = topoChanger_;
// Enable sliding interface
- forAll (topoChanges, modI)
+ forAll(topoChanges, modI)
{
if (isA<slidingInterface>(topoChanges[modI]))
{
@@ -217,7 +217,7 @@ bool Foam::linearValveFvMesh::attached() const
bool result = false;
- forAll (topoChanges, modI)
+ forAll(topoChanges, modI)
{
if (isA<slidingInterface>(topoChanges[modI]))
{
@@ -228,7 +228,7 @@ bool Foam::linearValveFvMesh::attached() const
}
// Check thal all sliders are in sync (debug only)
- forAll (topoChanges, modI)
+ forAll(topoChanges, modI)
{
if (isA<slidingInterface>(topoChanges[modI]))
{
diff --git a/src/topoChangerFvMesh/linearValveFvMesh/linearValveFvMesh.H b/src/topoChangerFvMesh/linearValveFvMesh/linearValveFvMesh.H
index 1ae1084767087eeff5cdc2c8ad7a6299037bdf04..2aca2ca6551e77975e82d20fb7493dbe66b445f3 100644
--- a/src/topoChangerFvMesh/linearValveFvMesh/linearValveFvMesh.H
+++ b/src/topoChangerFvMesh/linearValveFvMesh/linearValveFvMesh.H
@@ -94,9 +94,8 @@ public:
explicit linearValveFvMesh(const IOobject& io);
- // Destructor
-
- virtual ~linearValveFvMesh();
+ //- Destructor
+ virtual ~linearValveFvMesh();
// Member Functions
diff --git a/src/topoChangerFvMesh/linearValveLayersFvMesh/linearValveLayersFvMesh.C b/src/topoChangerFvMesh/linearValveLayersFvMesh/linearValveLayersFvMesh.C
index 61395460c949242214cfea87605939bb98ed54ad..9723dcb3201cc2898b84141166183da1005aea83 100644
--- a/src/topoChangerFvMesh/linearValveLayersFvMesh/linearValveLayersFvMesh.C
+++ b/src/topoChangerFvMesh/linearValveLayersFvMesh/linearValveLayersFvMesh.C
@@ -92,7 +92,7 @@ void Foam::linearValveLayersFvMesh::addZonesAndModifiers()
labelList isf(innerSlider.size());
- forAll (isf, i)
+ forAll(isf, i)
{
isf[i] = innerSlider.start() + i;
}
@@ -113,7 +113,7 @@ void Foam::linearValveLayersFvMesh::addZonesAndModifiers()
labelList osf(outerSlider.size());
- forAll (osf, i)
+ forAll(osf, i)
{
osf[i] = outerSlider.start() + i;
}
@@ -148,7 +148,7 @@ void Foam::linearValveLayersFvMesh::addZonesAndModifiers()
labelList lpf(layerPatch.size());
- forAll (lpf, i)
+ forAll(lpf, i)
{
lpf[i] = layerPatch.start() + i;
}
@@ -216,7 +216,7 @@ void Foam::linearValveLayersFvMesh::makeLayersLive()
const polyTopoChanger& topoChanges = topoChanger_;
// Enable layering
- forAll (topoChanges, modI)
+ forAll(topoChanges, modI)
{
if (isA<layerAdditionRemoval>(topoChanges[modI]))
{
@@ -242,7 +242,7 @@ void Foam::linearValveLayersFvMesh::makeSlidersLive()
const polyTopoChanger& topoChanges = topoChanger_;
// Enable sliding interface
- forAll (topoChanges, modI)
+ forAll(topoChanges, modI)
{
if (isA<layerAdditionRemoval>(topoChanges[modI]))
{
@@ -269,7 +269,7 @@ bool Foam::linearValveLayersFvMesh::attached() const
bool result = false;
- forAll (topoChanges, modI)
+ forAll(topoChanges, modI)
{
if (isA<slidingInterface>(topoChanges[modI]))
{
@@ -280,7 +280,7 @@ bool Foam::linearValveLayersFvMesh::attached() const
}
// Check thal all sliders are in sync (debug only)
- forAll (topoChanges, modI)
+ forAll(topoChanges, modI)
{
if (isA<slidingInterface>(topoChanges[modI]))
{
@@ -327,7 +327,7 @@ Foam::tmp<Foam::pointField> Foam::linearValveLayersFvMesh::newPoints() const
motionDict_.lookup("pistonVelocity")
);
- forAll (patchPoints, ppI)
+ forAll(patchPoints, ppI)
{
np[patchPoints[ppI]] += vel*time().deltaTValue();
}
diff --git a/src/topoChangerFvMesh/linearValveLayersFvMesh/linearValveLayersFvMesh.H b/src/topoChangerFvMesh/linearValveLayersFvMesh/linearValveLayersFvMesh.H
index d570f902311333f5d13ce4a89d2cec149cf8d5be..17b7618e3d4157e1aa0aeae7a473874c0fb15857 100644
--- a/src/topoChangerFvMesh/linearValveLayersFvMesh/linearValveLayersFvMesh.H
+++ b/src/topoChangerFvMesh/linearValveLayersFvMesh/linearValveLayersFvMesh.H
@@ -94,9 +94,8 @@ public:
explicit linearValveLayersFvMesh(const IOobject& io);
- // Destructor
-
- virtual ~linearValveLayersFvMesh();
+ //- Destructor
+ virtual ~linearValveLayersFvMesh();
// Member Functions
diff --git a/src/topoChangerFvMesh/mixerFvMesh/mixerFvMesh.C b/src/topoChangerFvMesh/mixerFvMesh/mixerFvMesh.C
index b0f515aaec45aff668767d9fa76af3e72c5fcc93..693e080bd61df04d08873f2a05f41046dd4b1edc 100644
--- a/src/topoChangerFvMesh/mixerFvMesh/mixerFvMesh.C
+++ b/src/topoChangerFvMesh/mixerFvMesh/mixerFvMesh.C
@@ -89,7 +89,7 @@ void Foam::mixerFvMesh::addZonesAndModifiers()
labelList isf(innerSlider.size());
- forAll (isf, i)
+ forAll(isf, i)
{
isf[i] = innerSlider.start() + i;
}
@@ -110,7 +110,7 @@ void Foam::mixerFvMesh::addZonesAndModifiers()
labelList osf(outerSlider.size());
- forAll (osf, i)
+ forAll(osf, i)
{
osf[i] = outerSlider.start() + i;
}
@@ -220,16 +220,16 @@ void Foam::mixerFvMesh::calcMovingMasks() const
const labelList& cellAddr =
cellZones()[cellZones().findZoneID("movingCells")];
- forAll (cellAddr, cellI)
+ forAll(cellAddr, cellI)
{
const cell& curCell = c[cellAddr[cellI]];
- forAll (curCell, faceI)
+ forAll(curCell, faceI)
{
// Mark all the points as moving
const face& curFace = f[curCell[faceI]];
- forAll (curFace, pointI)
+ forAll(curFace, pointI)
{
movingPointsMask[curFace[pointI]] = 1;
}
@@ -245,11 +245,11 @@ void Foam::mixerFvMesh::calcMovingMasks() const
const labelList& innerSliderAddr =
faceZones()[faceZones().findZoneID(innerSliderZoneName)];
- forAll (innerSliderAddr, faceI)
+ forAll(innerSliderAddr, faceI)
{
const face& curFace = f[innerSliderAddr[faceI]];
- forAll (curFace, pointI)
+ forAll(curFace, pointI)
{
movingPointsMask[curFace[pointI]] = 1;
}
@@ -264,11 +264,11 @@ void Foam::mixerFvMesh::calcMovingMasks() const
const labelList& outerSliderAddr =
faceZones()[faceZones().findZoneID(outerSliderZoneName)];
- forAll (outerSliderAddr, faceI)
+ forAll(outerSliderAddr, faceI)
{
const face& curFace = f[outerSliderAddr[faceI]];
- forAll (curFace, pointI)
+ forAll(curFace, pointI)
{
movingPointsMask[curFace[pointI]] = 0;
}
diff --git a/src/topoChangerFvMesh/mixerFvMesh/mixerFvMesh.H b/src/topoChangerFvMesh/mixerFvMesh/mixerFvMesh.H
index 951af279c94aae1be43a5536ba0ced42e8425e80..3eecccd303cf1a7c729b6536654aa61325e34ae5 100644
--- a/src/topoChangerFvMesh/mixerFvMesh/mixerFvMesh.H
+++ b/src/topoChangerFvMesh/mixerFvMesh/mixerFvMesh.H
@@ -99,9 +99,8 @@ public:
explicit mixerFvMesh(const IOobject& io);
- // Destructor
-
- virtual ~mixerFvMesh();
+ //- Destructor
+ virtual ~mixerFvMesh();
// Member Functions
diff --git a/src/topoChangerFvMesh/movingConeTopoFvMesh/movingConeTopoFvMesh.C b/src/topoChangerFvMesh/movingConeTopoFvMesh/movingConeTopoFvMesh.C
index 87f106c59a83810abc31a6d01b2a3db7b3c0ee5a..497c1ec8055d11c81a0cbfdb2cf66caaac903aa0 100644
--- a/src/topoChangerFvMesh/movingConeTopoFvMesh/movingConeTopoFvMesh.C
+++ b/src/topoChangerFvMesh/movingConeTopoFvMesh/movingConeTopoFvMesh.C
@@ -61,7 +61,7 @@ Foam::tmp<Foam::scalarField> Foam::movingConeTopoFvMesh::vertexMarkup
tmp<scalarField> tvertexMarkup(new scalarField(p.size()));
scalarField& vertexMarkup = tvertexMarkup();
- forAll (p, pI)
+ forAll(p, pI)
{
if (p[pI].x() < curLeft - SMALL)
{
@@ -114,7 +114,7 @@ void Foam::movingConeTopoFvMesh::addZonesAndModifiers()
boolList flipZone2(fc.size(), false);
label nZoneFaces2 = 0;
- forAll (fc, faceI)
+ forAll(fc, faceI)
{
if
(
diff --git a/src/topoChangerFvMesh/movingConeTopoFvMesh/movingConeTopoFvMesh.H b/src/topoChangerFvMesh/movingConeTopoFvMesh/movingConeTopoFvMesh.H
index 0d3c4a2c4157520c3cb3e41308307aa91a40d7f5..88fca0b5d3d24b229a0dbcb49b2da01b0f07a907 100644
--- a/src/topoChangerFvMesh/movingConeTopoFvMesh/movingConeTopoFvMesh.H
+++ b/src/topoChangerFvMesh/movingConeTopoFvMesh/movingConeTopoFvMesh.H
@@ -114,9 +114,8 @@ public:
explicit movingConeTopoFvMesh(const IOobject& io);
- // Destructor
-
- virtual ~movingConeTopoFvMesh();
+ //- Destructor
+ virtual ~movingConeTopoFvMesh();
// Member Functions
diff --git a/src/topoChangerFvMesh/rawTopoChangerFvMesh/rawTopoChangerFvMesh.H b/src/topoChangerFvMesh/rawTopoChangerFvMesh/rawTopoChangerFvMesh.H
index f771a049542a565f8a69a0834cc7331337130250..8fc09a4463e70190f6cdea703f1440dfc6472ca4 100644
--- a/src/topoChangerFvMesh/rawTopoChangerFvMesh/rawTopoChangerFvMesh.H
+++ b/src/topoChangerFvMesh/rawTopoChangerFvMesh/rawTopoChangerFvMesh.H
@@ -87,9 +87,8 @@ public:
//- Construct from database
explicit rawTopoChangerFvMesh(const IOobject& io);
- // Destructor
-
- virtual ~rawTopoChangerFvMesh();
+ //- Destructor
+ virtual ~rawTopoChangerFvMesh();
// Member Functions
diff --git a/src/topoChangerFvMesh/topoChangerFvMesh/topoChangerFvMesh.H b/src/topoChangerFvMesh/topoChangerFvMesh/topoChangerFvMesh.H
index 5c7a8f0cbc4c60c3a0f229bf04417b94d67e7162..fb419bef59e3353a01a5007cabbd2183b6d49394 100644
--- a/src/topoChangerFvMesh/topoChangerFvMesh/topoChangerFvMesh.H
+++ b/src/topoChangerFvMesh/topoChangerFvMesh/topoChangerFvMesh.H
@@ -80,9 +80,8 @@ public:
explicit topoChangerFvMesh(const IOobject& io);
- // Destructor
-
- virtual ~topoChangerFvMesh();
+ //- Destructor
+ virtual ~topoChangerFvMesh();
// Member Functions
diff --git a/src/transportModels/incompressible/incompressibleTwoPhaseMixture/twoPhaseMixture.H b/src/transportModels/incompressible/incompressibleTwoPhaseMixture/twoPhaseMixture.H
index 95e936f71a746cfac4be445087ea84c4c37a5796..1dbec9cbca5a569887bc07e53a9a006b1f5fdab4 100644
--- a/src/transportModels/incompressible/incompressibleTwoPhaseMixture/twoPhaseMixture.H
+++ b/src/transportModels/incompressible/incompressibleTwoPhaseMixture/twoPhaseMixture.H
@@ -93,10 +93,9 @@ public:
);
- // Destructor
-
- ~twoPhaseMixture()
- {}
+ //- Destructor
+ ~twoPhaseMixture()
+ {}
// Member Functions
diff --git a/src/transportModels/incompressible/singlePhaseTransportModel/singlePhaseTransportModel.H b/src/transportModels/incompressible/singlePhaseTransportModel/singlePhaseTransportModel.H
index a4ffd78bc2456448a417d586a3931c65d6b64a91..238c39d0204e36f63ebb50b1d30594113502dc32 100644
--- a/src/transportModels/incompressible/singlePhaseTransportModel/singlePhaseTransportModel.H
+++ b/src/transportModels/incompressible/singlePhaseTransportModel/singlePhaseTransportModel.H
@@ -82,9 +82,8 @@ public:
);
- // Destructor
-
- virtual ~singlePhaseTransportModel();
+ //- Destructor
+ virtual ~singlePhaseTransportModel();
// Member Functions
diff --git a/src/transportModels/incompressible/transportModel/transportModel.H b/src/transportModels/incompressible/transportModel/transportModel.H
index 92d101b3935b19b80acd3af6187db97e2a41b260..3c2e220aa11e54392a10fa1e751888d14e66ca8b 100644
--- a/src/transportModels/incompressible/transportModel/transportModel.H
+++ b/src/transportModels/incompressible/transportModel/transportModel.H
@@ -74,9 +74,8 @@ public:
);
- // Destructor
-
- virtual ~transportModel();
+ //- Destructor
+ virtual ~transportModel();
// Member Functions
diff --git a/src/transportModels/incompressible/viscosityModels/BirdCarreau/BirdCarreau.H b/src/transportModels/incompressible/viscosityModels/BirdCarreau/BirdCarreau.H
index b5a486defb707f84681196b309562dacb78b3a1a..514868fa73348f14be4ecb7d1029059d07c264f7 100644
--- a/src/transportModels/incompressible/viscosityModels/BirdCarreau/BirdCarreau.H
+++ b/src/transportModels/incompressible/viscosityModels/BirdCarreau/BirdCarreau.H
@@ -90,10 +90,9 @@ public:
);
- // Destructor
-
- ~BirdCarreau()
- {}
+ //- Destructor
+ ~BirdCarreau()
+ {}
// Member Functions
diff --git a/src/transportModels/incompressible/viscosityModels/CrossPowerLaw/CrossPowerLaw.H b/src/transportModels/incompressible/viscosityModels/CrossPowerLaw/CrossPowerLaw.H
index e49b3bdd70753355e637e7ffff72850a1138ca32..34b189ef3d6ae596c52d6c54e8c654e02198b6e0 100644
--- a/src/transportModels/incompressible/viscosityModels/CrossPowerLaw/CrossPowerLaw.H
+++ b/src/transportModels/incompressible/viscosityModels/CrossPowerLaw/CrossPowerLaw.H
@@ -89,10 +89,9 @@ public:
);
- // Destructor
-
- ~CrossPowerLaw()
- {}
+ //- Destructor
+ ~CrossPowerLaw()
+ {}
// Member Functions
diff --git a/src/transportModels/incompressible/viscosityModels/HerschelBulkley/HerschelBulkley.H b/src/transportModels/incompressible/viscosityModels/HerschelBulkley/HerschelBulkley.H
index 86fdd15b2f7a31fa00db87b0a76d726d9a0d60a4..7ba0c5112c01d6f5cf65782a64893867d0a46919 100644
--- a/src/transportModels/incompressible/viscosityModels/HerschelBulkley/HerschelBulkley.H
+++ b/src/transportModels/incompressible/viscosityModels/HerschelBulkley/HerschelBulkley.H
@@ -90,10 +90,9 @@ public:
);
- // Destructor
-
- ~HerschelBulkley()
- {}
+ //- Destructor
+ ~HerschelBulkley()
+ {}
// Member Functions
diff --git a/src/transportModels/incompressible/viscosityModels/Newtonian/Newtonian.H b/src/transportModels/incompressible/viscosityModels/Newtonian/Newtonian.H
index dee612d470b185a98d2d2e458d3f0336ee163e99..e68d8c9119124f8c72a16578b1b06f8bcf3e8345 100644
--- a/src/transportModels/incompressible/viscosityModels/Newtonian/Newtonian.H
+++ b/src/transportModels/incompressible/viscosityModels/Newtonian/Newtonian.H
@@ -79,10 +79,9 @@ public:
);
- // Destructor
-
- ~Newtonian()
- {}
+ //- Destructor
+ ~Newtonian()
+ {}
// Member Functions
diff --git a/src/transportModels/incompressible/viscosityModels/powerLaw/powerLaw.H b/src/transportModels/incompressible/viscosityModels/powerLaw/powerLaw.H
index dc90eda33661fcecd43862ac15495860cfc1317c..b9810b0e6020d9d7c363d91e79ca5f5ab79e3f6d 100644
--- a/src/transportModels/incompressible/viscosityModels/powerLaw/powerLaw.H
+++ b/src/transportModels/incompressible/viscosityModels/powerLaw/powerLaw.H
@@ -90,10 +90,9 @@ public:
);
- // Destructor
-
- ~powerLaw()
- {}
+ //- Destructor
+ ~powerLaw()
+ {}
// Member Functions
diff --git a/src/triSurface/triSurface/interfaces/OBJ/readOBJ.C b/src/triSurface/triSurface/interfaces/OBJ/readOBJ.C
index c263a1994ebe68930af91107409708b471cff159..dd3d087f9cad416555f8642cbc91ed8e0a4b39df 100644
--- a/src/triSurface/triSurface/interfaces/OBJ/readOBJ.C
+++ b/src/triSurface/triSurface/interfaces/OBJ/readOBJ.C
@@ -173,12 +173,7 @@ bool triSurface::readOBJ(const fileName& OBJfileName)
}
else
{
- for
- (
- HashTable<label>::const_iterator iter = groupToPatch.begin();
- iter != groupToPatch.end();
- ++iter
- )
+ forAllConstIter(HashTable<label>, groupToPatch, iter)
{
patches[iter()] = geometricSurfacePatch
(
diff --git a/src/triSurface/triSurface/interfaces/TRI/readTRI.C b/src/triSurface/triSurface/interfaces/TRI/readTRI.C
index a944f31be93e8f16a986ad51b02ab5b037f87424..ebb1cffe9d6dc26877a09e979c72a2932f79ca78 100644
--- a/src/triSurface/triSurface/interfaces/TRI/readTRI.C
+++ b/src/triSurface/triSurface/interfaces/TRI/readTRI.C
@@ -37,14 +37,9 @@ Description
#include "readHexLabel.H"
#include "stringList.H"
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-bool triSurface::readTRI(const fileName& TRIfileName)
+bool Foam::triSurface::readTRI(const fileName& TRIfileName)
{
IFstream TRIfile(TRIfileName);
@@ -113,12 +108,12 @@ bool triSurface::readTRI(const fileName& TRIfileName)
label region = -1;
- HashTable<label, string>::const_iterator findName =
+ HashTable<label, string>::const_iterator fnd =
STLsolidNames.find(solidName);
- if (findName != STLsolidNames.end())
+ if (fnd != STLsolidNames.end())
{
- region = findName();
+ region = fnd();
}
else
{
@@ -135,22 +130,17 @@ bool triSurface::readTRI(const fileName& TRIfileName)
pointField rawPoints(STLpoints.size());
- label i = 0;
- for
- (
- SLList<STLpoint>::iterator iter = STLpoints.begin();
- iter != STLpoints.end();
- ++iter
- )
+ label pointI = 0;
+ forAllConstIter(SLList<STLpoint>, STLpoints, iter)
{
- rawPoints[i++] = *iter;
+ rawPoints[pointI++] = *iter;
}
setSize(STLlabels.size());
- label pointI = 0;
- SLList<label>::iterator iter = STLlabels.begin();
- forAll (*this, i)
+ pointI = 0;
+ SLList<label>::const_iterator iter = STLlabels.begin();
+ forAll(*this, i)
{
operator[](i)[0] = pointI++;
operator[](i)[1] = pointI++;
@@ -176,8 +166,4 @@ bool triSurface::readTRI(const fileName& TRIfileName)
}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
// ************************************************************************* //
diff --git a/src/triSurface/triSurface/surfacePatch/surfacePatchIOList.H b/src/triSurface/triSurface/surfacePatch/surfacePatchIOList.H
index c14ba93d9ed02388060fd1a6e89b02d9550512aa..0e892745e47a919db8f2f2cc5a4e9e3ce3a74c15 100644
--- a/src/triSurface/triSurface/surfacePatch/surfacePatchIOList.H
+++ b/src/triSurface/triSurface/surfacePatch/surfacePatchIOList.H
@@ -86,9 +86,8 @@ public:
//- Construct from IOobject
surfacePatchIOList(const IOobject& io, const surfacePatchList&);
- // Destructor
-
- ~surfacePatchIOList();
+ //- Destructor
+ ~surfacePatchIOList();
// Member Functions
diff --git a/src/triSurface/triSurface/triSurface.H b/src/triSurface/triSurface/triSurface.H
index 5c49cecd7b5e8d9fe6bd4baa527bc9d50b96ce59..32977087ce253c20c1bba76dc73f73334a746da1 100644
--- a/src/triSurface/triSurface/triSurface.H
+++ b/src/triSurface/triSurface/triSurface.H
@@ -280,9 +280,8 @@ public:
- // Destructor
-
- ~triSurface();
+ //- Destructor
+ ~triSurface();
void clearOut();
diff --git a/src/turbulenceModels/compressible/LES/dynOneEqEddy/dynOneEqEddy.H b/src/turbulenceModels/compressible/LES/dynOneEqEddy/dynOneEqEddy.H
index 2edfe20fe313962e52a464f3df56e5147b74ef97..6685160e8f2ab7f80652e136ea5c082c34e97101 100644
--- a/src/turbulenceModels/compressible/LES/dynOneEqEddy/dynOneEqEddy.H
+++ b/src/turbulenceModels/compressible/LES/dynOneEqEddy/dynOneEqEddy.H
@@ -111,7 +111,7 @@ public:
);
- // Destructor
+ //- Destructor
virtual ~dynOneEqEddy()
{}
diff --git a/src/turbulenceModels/compressible/LES/oneEqEddy/oneEqEddy.H b/src/turbulenceModels/compressible/LES/oneEqEddy/oneEqEddy.H
index 0ce6c3bba97b203cb5122d5f5e2ba6850f02c93c..ac83307700e571f85ef3ed8e5d55deb20b4f3a2f 100644
--- a/src/turbulenceModels/compressible/LES/oneEqEddy/oneEqEddy.H
+++ b/src/turbulenceModels/compressible/LES/oneEqEddy/oneEqEddy.H
@@ -105,7 +105,7 @@ public:
);
- // Destructor
+ //- Destructor
virtual ~oneEqEddy()
{}
diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentTemperatureCoupledBaffle/regionProperties.H b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentTemperatureCoupledBaffle/regionProperties.H
index 599ef1070ce06b0462eeba8a67b23635bfef1879..5c23d3d4213074f399c02c81b5c940dcba1db564 100644
--- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentTemperatureCoupledBaffle/regionProperties.H
+++ b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentTemperatureCoupledBaffle/regionProperties.H
@@ -77,9 +77,8 @@ public:
regionProperties(const Time& runTime);
- // Destructor
-
- ~regionProperties();
+ //- Destructor
+ ~regionProperties();
// Member Functions
diff --git a/src/turbulenceModels/incompressible/LES/SpalartAllmarasIDDES/IDDESDelta/IDDESDelta.H b/src/turbulenceModels/incompressible/LES/SpalartAllmarasIDDES/IDDESDelta/IDDESDelta.H
index 7ecc332665670ea3f46890e4902b54e4ce9838cc..305625ce10d4744f7dc258642da5194a5a60b00c 100644
--- a/src/turbulenceModels/incompressible/LES/SpalartAllmarasIDDES/IDDESDelta/IDDESDelta.H
+++ b/src/turbulenceModels/incompressible/LES/SpalartAllmarasIDDES/IDDESDelta/IDDESDelta.H
@@ -85,10 +85,9 @@ public:
);
- // Destructor
-
- ~IDDESDelta()
- {}
+ //- Destructor
+ ~IDDESDelta()
+ {}
// Member Functions
diff --git a/src/turbulenceModels/incompressible/LES/dynMixedSmagorinsky/dynMixedSmagorinsky.H b/src/turbulenceModels/incompressible/LES/dynMixedSmagorinsky/dynMixedSmagorinsky.H
index 0a96a08bafbd8c701e15cbb038ad67050a9bb06d..0ae54425e033a8843816b55a5d3c4203ec5e008e 100644
--- a/src/turbulenceModels/incompressible/LES/dynMixedSmagorinsky/dynMixedSmagorinsky.H
+++ b/src/turbulenceModels/incompressible/LES/dynMixedSmagorinsky/dynMixedSmagorinsky.H
@@ -103,10 +103,9 @@ public:
);
- // Destructor
-
- ~dynMixedSmagorinsky()
- {}
+ //- Destructor
+ ~dynMixedSmagorinsky()
+ {}
// Member Functions
diff --git a/src/turbulenceModels/incompressible/RAS/LienCubicKE/LienCubicKE.H b/src/turbulenceModels/incompressible/RAS/LienCubicKE/LienCubicKE.H
index a27afc5c6126a76d74ec45eb0601585e3cff6815..d7c616d50b14006c3c8ef0711d4491bab0d55b01 100644
--- a/src/turbulenceModels/incompressible/RAS/LienCubicKE/LienCubicKE.H
+++ b/src/turbulenceModels/incompressible/RAS/LienCubicKE/LienCubicKE.H
@@ -103,7 +103,7 @@ public:
);
- // Destructor
+ //- Destructor
virtual ~LienCubicKE()
{}
diff --git a/src/turbulenceModels/incompressible/RAS/kOmega/kOmega.H b/src/turbulenceModels/incompressible/RAS/kOmega/kOmega.H
index d2759d29274673be2ce3fa1f94f3655bdb2699ba..1027e5eec58f748aa920b66ebf7ac8f55f5baae5 100644
--- a/src/turbulenceModels/incompressible/RAS/kOmega/kOmega.H
+++ b/src/turbulenceModels/incompressible/RAS/kOmega/kOmega.H
@@ -112,7 +112,7 @@ public:
);
- // Destructor
+ //- Destructor
virtual ~kOmega()
{}
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/controlDict b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/controlDict
index f3709cd0011c9968a108a69825d9399a83c82de6..846a89461bb117e4aa5094170f07ecccc900dcbf 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/controlDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/controlDict
@@ -15,6 +15,8 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+libs ("libOpenFOAM.so" "libcompressibleTurbulenceModel.so" "libcompressibleRASModels.so");
+
application chtMultiRegionFoam;
startFrom latestTime;
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/controlDict b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/controlDict
index ed44768bff7696611623cad0b7de579568039d17..2f3a0001ef6d7821fc97e0879ba365d2b4b5588e 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/controlDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/controlDict
@@ -15,6 +15,8 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+libs ("libOpenFOAM.so" "libcompressibleTurbulenceModel.so" "libcompressibleRASModels.so");
+
application snappyHexMesh;
startFrom latestTime;
diff --git a/tutorials/incompressible/simpleFoam/motorBike/system/snappyHexMeshDict b/tutorials/incompressible/simpleFoam/motorBike/system/snappyHexMeshDict
index 1ce2a9bbe6e979eb780c885cc168afb510477860..affc38cb2dafa0c652d7818b9733e60c6db15d37 100644
--- a/tutorials/incompressible/simpleFoam/motorBike/system/snappyHexMeshDict
+++ b/tutorials/incompressible/simpleFoam/motorBike/system/snappyHexMeshDict
@@ -487,7 +487,7 @@ addLayersControls
//- If points get not extruded do nGrow layers of connected faces that are
// also not grown. This helps convergence of the layer addition process
// close to features.
- nGrow 1;
+ nGrow 0;
// Advanced settings
diff --git a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/snappyHexMeshDict b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/snappyHexMeshDict
index 97affa0fd77003812350b512e666a4c0849a42bd..9e2f08ee67ce1e0b4cf9ef220e8e39b6eaee3e8b 100644
--- a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/snappyHexMeshDict
+++ b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/snappyHexMeshDict
@@ -224,7 +224,7 @@ addLayersControls
//- If points get not extruded do nGrow layers of connected faces that are
// also not grown. This helps convergence of the layer addition process
// close to features.
- nGrow 1;
+ nGrow 0;
// Advanced settings