From 4b60453cf12d2205419cfb85bd1184b893990372 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@Germany>
Date: Wed, 18 Feb 2009 08:57:10 +0100
Subject: [PATCH] use while (runTime.loop() { .. } where possible in solvers
- change system/controlDict to use functions {..} instead of functions (..);
* This is internally more efficient
- fixed formatting of system/controlDict functions entry
- pedantic change: use 'return 0' instead of 'return(0)' in the applications,
since return is a C/C++ keyword, not a function.
---
applications/solvers/DNS/dnsFoam/dnsFoam.C | 5 ++-
.../kinematicParcelFoam/kinematicParcelFoam.C | 6 ++--
.../basic/laplacianFoam/laplacianFoam.C | 5 ++-
.../basic/potentialFoam/potentialFoam.C | 2 +-
.../scalarTransportFoam/scalarTransportFoam.C | 5 ++-
.../solvers/combustion/PDRFoam/PDRFoam.C | 2 +-
.../combustion/PDRFoam/PDRFoamAutoRefine.C | 2 +-
.../solvers/combustion/XiFoam/XiFoam.C | 2 +-
.../coldEngineFoam/coldEngineFoam.C | 2 +-
.../dieselEngineFoam/dieselEngineFoam.C | 2 +-
.../combustion/dieselFoam/dieselFoam.C | 2 +-
.../combustion/engineFoam/engineFoam.C | 2 +-
.../combustion/reactingFoam/reactingFoam.C | 2 +-
.../rhoCentralFoam/rhoCentralFoam.C | 2 +-
.../compressible/rhoPisoFoam/rhoPisoFoam.C | 2 +-
.../rhoPorousSimpleFoam/rhoPorousSimpleFoam.C | 3 +-
.../rhoSimpleFoam/rhoSimpleFoam.C | 3 +-
.../compressible/rhoSonicFoam/rhoSonicFoam.C | 5 ++-
.../rhopSonicFoam/rhopSonicFoam.C | 5 ++-
.../compressible/sonicDyMFoam/sonicDyMFoam.C | 5 ++-
.../compressible/sonicFoam/sonicFoam.C | 5 ++-
.../sonicLiquidFoam/sonicLiquidFoam.C | 5 ++-
.../electrostaticFoam/electrostaticFoam.C | 5 ++-
.../electromagnetics/mhdFoam/mhdFoam.C | 5 ++-
.../financial/financialFoam/financialFoam.C | 5 ++-
.../buoyantBoussinesqPisoFoam.C | 3 +-
.../buoyantBoussinesqSimpleFoam.C | 3 +-
.../buoyantSimpleFoam/buoyantSimpleFoam.C | 3 +-
.../buoyantSimpleRadiationFoam.C | 3 +-
.../chtMultiRegionFoam/chtMultiRegionFoam.C | 2 +-
.../boundaryFoam/boundaryFoam.C | 5 ++-
.../incompressible/channelFoam/channelFoam.C | 5 ++-
.../solvers/incompressible/icoFoam/icoFoam.C | 5 ++-
.../nonNewtonianIcoFoam/nonNewtonianIcoFoam.C | 5 ++-
.../pimpleDyMFoam/pimpleDyMFoam.C | 2 +-
.../incompressible/pisoFoam/pisoFoam.C | 5 ++-
.../shallowWaterFoam/shallowWaterFoam.C | 2 +-
.../incompressible/simpleFoam/simpleFoam.C | 5 ++-
.../mdEquilibrationFoam/mdEquilibrationFoam.C | 5 ++-
.../solvers/molecularDynamics/mdFoam/mdFoam.C | 5 ++-
.../multiphase/bubbleFoam/bubbleFoam.C | 5 ++-
.../cavitatingFoam/cavitatingFoam.C | 2 +-
.../compressibleInterDyMFoam.C | 2 +-
.../compressibleInterFoam.C | 2 +-
.../multiphase/interDyMFoam/interDyMFoam.C | 2 +-
.../solvers/multiphase/interFoam/interFoam.C | 2 +-
.../interPhaseChangeFoam.C | 2 +-
.../multiphaseInterFoam/multiphaseInterFoam.C | 2 +-
.../multiphase/settlingFoam/settlingFoam.C | 5 ++-
.../twoLiquidMixingFoam/twoLiquidMixingFoam.C | 5 ++-
.../twoPhaseEulerFoam/twoPhaseEulerFoam.C | 2 +-
.../solidDisplacementFoam.C | 5 ++-
.../solidEquilibriumDisplacementFoam.C | 5 ++-
applications/test/Gstream/GsTest.C | 2 +-
applications/test/LduMatrix/LduMatrixTest3.C | 5 ++-
applications/test/Map/MapTest.C | 2 +-
applications/test/dataEntry/testDataEntry.C | 2 +-
applications/test/graphXi/graphXi.C | 2 +-
applications/test/maxMem/maxMem.C | 2 +-
.../test/nearWallDist-wave/testWallDist2.C | 3 +-
applications/test/parallel/parallelTest.C | 2 +-
applications/test/pointField/testPointField.C | 2 +-
.../test/slicedField/slicedFieldTest.C | 2 +-
.../sphericalTensorFieldTest.C | 2 +-
.../symmTensorField/symmTensorFieldTest.C | 2 +-
applications/test/tensor/tensorTest.C | 2 +-
applications/test/triTet/triTet.C | 2 +-
applications/test/volField/volFieldTest.C | 2 +-
.../volPointInterpolationTest.C | 2 +-
.../estimateScalarError/estimateScalarError.C | 2 +-
.../icoErrorEstimate/icoErrorEstimate.C | 2 +-
.../icoMomentError/icoMomentError.C | 2 +-
.../momentScalarError/momentScalarError.C | 2 +-
.../mesh/conversion/sammToFoam/sammToFoam.C | 2 +-
.../mesh/conversion/starToFoam/starToFoam.C | 2 +-
.../generation/snappyHexMesh/snappyHexMesh.C | 2 +-
.../mesh/manipulation/attachMesh/attachMesh.C | 2 +-
.../mesh/manipulation/checkMesh/checkMesh.C | 2 +-
.../manipulation/deformedGeom/deformedGeom.C | 2 +-
.../manipulation/flattenMesh/flattenMesh.C | 2 +-
.../mergeOrSplitBaffles/mergeOrSplitBaffles.C | 2 +-
.../moveDynamicMesh/moveDynamicMesh.C | 3 +-
.../moveEngineMesh/moveEngineMesh.C | 5 ++-
.../mesh/manipulation/moveMesh/moveMesh.C | 3 +-
.../transformPoints/transformPoints.C | 2 +-
.../mesh/manipulation/zipUpMesh/zipUpMesh.C | 2 +-
.../decomposePar/decomposePar.C | 2 +-
.../engineCompRatio/engineCompRatio.C | 2 +-
.../postProcessing/miscellaneous/ptot/ptot.C | 2 +-
.../postProcessing/miscellaneous/wdot/wdot.C | 2 +-
.../scalarField/pPrime2/pPrime2.C | 2 +-
.../stressComponents/stressComponents.C | 2 +-
.../utilities/postProcessing/turbulence/R/R.C | 2 +-
.../createTurbulenceFields.C | 2 +-
.../applyBoundaryLayer/applyBoundaryLayer.C | 2 +-
.../utilities/preProcessing/boxTurb/boxTurb.C | 2 +-
.../preProcessing/engineSwirl/engineSwirl.C | 2 +-
.../adiabaticFlameT/adiabaticFlameT.C | 2 +-
.../equilibriumFlameT/equilibriumFlameT.C | 2 +-
.../mixtureAdiabaticFlameT.C | 2 +-
src/OpenFOAM/primitives/random/random.c | 2 +-
.../field/fieldAverage/controlDict | 19 +++++-----
.../rhoPisoTwinParcelFoam.C | 2 +-
.../analyticalCylinder/analyticalCylinder.C | 2 +-
.../XiFoam/les/pitzDaily/system/controlDict | 22 ++++++------
.../XiFoam/les/pitzDaily3D/system/controlDict | 22 ++++++------
.../les/pitzDaily/system/controlDict | 22 ++++++------
.../ras/nacaAirfoil/system/controlDict | 21 ++++++++++-
.../hotRoom/setHotRoom/setHotRoom.C | 2 +-
.../MRFSimpleFoam/MRFSimpleFoam.C | 5 ++-
.../channelFoam/channel395/system/controlDict | 27 +++++++++++++-
.../pimpleFoam/t-junction/system/controlDict | 18 +++++++++-
.../pisoFoam/les/pitzDaily/system/controlDict | 30 ++++++++--------
.../pitzDailyDirectMapped/system/controlDict | 30 ++++++++--------
.../simpleSRFFoam/simpleSRFFoam.C | 5 ++-
.../les/throttle/system/controlDict | 28 +++++++--------
.../les/throttle3D/system/controlDict | 28 +++++++--------
.../sloshingTank2D/system/controlDict | 24 ++++++-------
.../sloshingTank2D3DoF/system/controlDict | 24 ++++++-------
.../sloshingTank3D/system/controlDict | 12 +++----
.../sloshingTank3D3DoF/system/controlDict | 12 +++----
.../sloshingTank3D6DoF/system/controlDict | 12 +++----
.../twoPhaseEulerFoam/bed/system/controlDict | 35 ++++++++++---------
.../twoPhaseEulerFoam/bed2/system/controlDict | 35 ++++++++++---------
.../bubbleColumn/system/controlDict | 35 ++++++++++---------
125 files changed, 398 insertions(+), 367 deletions(-)
diff --git a/applications/solvers/DNS/dnsFoam/dnsFoam.C b/applications/solvers/DNS/dnsFoam/dnsFoam.C
index cc41c039693..ca4e0dcb584 100644
--- a/applications/solvers/DNS/dnsFoam/dnsFoam.C
+++ b/applications/solvers/DNS/dnsFoam/dnsFoam.C
@@ -55,9 +55,8 @@ int main(int argc, char *argv[])
Info<< nl << "Starting time loop" << endl;
- while (runTime.run())
+ while (runTime.loop())
{
- runTime++;
Info<< "Time = " << runTime.timeName() << nl << endl;
# include "readPISOControls.H"
@@ -123,7 +122,7 @@ int main(int argc, char *argv[])
Info<< "End\n" << endl;
- return(0);
+ return 0;
}
diff --git a/applications/solvers/Lagrangian/kinematicParcelFoam/kinematicParcelFoam.C b/applications/solvers/Lagrangian/kinematicParcelFoam/kinematicParcelFoam.C
index e9f223faad7..786146219b6 100644
--- a/applications/solvers/Lagrangian/kinematicParcelFoam/kinematicParcelFoam.C
+++ b/applications/solvers/Lagrangian/kinematicParcelFoam/kinematicParcelFoam.C
@@ -53,10 +53,8 @@ int main(int argc, char *argv[])
Info<< "\nStarting time loop\n" << endl;
- while (runTime.run())
+ while (runTime.loop())
{
- runTime++;
-
Info<< "Time = " << runTime.timeName() << nl << endl;
Info<< "Evolving " << kinematicCloud.name() << endl;
@@ -72,7 +70,7 @@ int main(int argc, char *argv[])
Info<< "End\n" << endl;
- return(0);
+ return 0;
}
diff --git a/applications/solvers/basic/laplacianFoam/laplacianFoam.C b/applications/solvers/basic/laplacianFoam/laplacianFoam.C
index 5b56c72a8c9..7f1a7a00a52 100644
--- a/applications/solvers/basic/laplacianFoam/laplacianFoam.C
+++ b/applications/solvers/basic/laplacianFoam/laplacianFoam.C
@@ -48,9 +48,8 @@ int main(int argc, char *argv[])
Info<< "\nCalculating temperature distribution\n" << endl;
- while (runTime.run())
+ while (runTime.loop())
{
- runTime++;
Info<< "Time = " << runTime.timeName() << nl << endl;
# include "readSIMPLEControls.H"
@@ -72,7 +71,7 @@ int main(int argc, char *argv[])
Info<< "End\n" << endl;
- return(0);
+ return 0;
}
diff --git a/applications/solvers/basic/potentialFoam/potentialFoam.C b/applications/solvers/basic/potentialFoam/potentialFoam.C
index f5ec1ec364e..9d2073bf2e3 100644
--- a/applications/solvers/basic/potentialFoam/potentialFoam.C
+++ b/applications/solvers/basic/potentialFoam/potentialFoam.C
@@ -108,7 +108,7 @@ int main(int argc, char *argv[])
Info<< "End\n" << endl;
- return(0);
+ return 0;
}
diff --git a/applications/solvers/basic/scalarTransportFoam/scalarTransportFoam.C b/applications/solvers/basic/scalarTransportFoam/scalarTransportFoam.C
index ad0107319f8..df0ccb82097 100644
--- a/applications/solvers/basic/scalarTransportFoam/scalarTransportFoam.C
+++ b/applications/solvers/basic/scalarTransportFoam/scalarTransportFoam.C
@@ -50,9 +50,8 @@ int main(int argc, char *argv[])
# include "CourantNo.H"
- while (runTime.run())
+ while (runTime.loop())
{
- runTime++;
Info<< "Time = " << runTime.timeName() << nl << endl;
# include "readSIMPLEControls.H"
@@ -72,7 +71,7 @@ int main(int argc, char *argv[])
Info<< "End\n" << endl;
- return(0);
+ return 0;
}
diff --git a/applications/solvers/combustion/PDRFoam/PDRFoam.C b/applications/solvers/combustion/PDRFoam/PDRFoam.C
index ded711f718a..89a7b7f956d 100644
--- a/applications/solvers/combustion/PDRFoam/PDRFoam.C
+++ b/applications/solvers/combustion/PDRFoam/PDRFoam.C
@@ -130,7 +130,7 @@ scalar StCoNum = 0.0;
Info<< "\n end\n";
- return(0);
+ return 0;
}
diff --git a/applications/solvers/combustion/PDRFoam/PDRFoamAutoRefine.C b/applications/solvers/combustion/PDRFoam/PDRFoamAutoRefine.C
index 53ae8af8bef..1320b19d314 100644
--- a/applications/solvers/combustion/PDRFoam/PDRFoamAutoRefine.C
+++ b/applications/solvers/combustion/PDRFoam/PDRFoamAutoRefine.C
@@ -195,7 +195,7 @@ scalar StCoNum = 0.0;
Info<< "\n end\n";
- return(0);
+ return 0;
}
diff --git a/applications/solvers/combustion/XiFoam/XiFoam.C b/applications/solvers/combustion/XiFoam/XiFoam.C
index 52f513bfb95..d18ef0d2f4b 100644
--- a/applications/solvers/combustion/XiFoam/XiFoam.C
+++ b/applications/solvers/combustion/XiFoam/XiFoam.C
@@ -120,7 +120,7 @@ int main(int argc, char *argv[])
Info<< "End\n" << endl;
- return(0);
+ return 0;
}
diff --git a/applications/solvers/combustion/coldEngineFoam/coldEngineFoam.C b/applications/solvers/combustion/coldEngineFoam/coldEngineFoam.C
index 0e57e0b00b1..ddb4c355300 100644
--- a/applications/solvers/combustion/coldEngineFoam/coldEngineFoam.C
+++ b/applications/solvers/combustion/coldEngineFoam/coldEngineFoam.C
@@ -94,7 +94,7 @@ int main(int argc, char *argv[])
Info<< "End\n" << endl;
- return(0);
+ return 0;
}
diff --git a/applications/solvers/combustion/dieselEngineFoam/dieselEngineFoam.C b/applications/solvers/combustion/dieselEngineFoam/dieselEngineFoam.C
index b62adb9ffcb..927afe9bc28 100644
--- a/applications/solvers/combustion/dieselEngineFoam/dieselEngineFoam.C
+++ b/applications/solvers/combustion/dieselEngineFoam/dieselEngineFoam.C
@@ -132,7 +132,7 @@ int main(int argc, char *argv[])
Info<< "End\n" << endl;
- return(0);
+ return 0;
}
diff --git a/applications/solvers/combustion/dieselFoam/dieselFoam.C b/applications/solvers/combustion/dieselFoam/dieselFoam.C
index 4c41a0db2d7..31d034bc573 100644
--- a/applications/solvers/combustion/dieselFoam/dieselFoam.C
+++ b/applications/solvers/combustion/dieselFoam/dieselFoam.C
@@ -124,7 +124,7 @@ int main(int argc, char *argv[])
Info<< "End\n" << endl;
- return(0);
+ return 0;
}
diff --git a/applications/solvers/combustion/engineFoam/engineFoam.C b/applications/solvers/combustion/engineFoam/engineFoam.C
index b9b4f140bd5..a835e8ea429 100644
--- a/applications/solvers/combustion/engineFoam/engineFoam.C
+++ b/applications/solvers/combustion/engineFoam/engineFoam.C
@@ -128,7 +128,7 @@ int main(int argc, char *argv[])
Info<< "End\n" << endl;
- return(0);
+ return 0;
}
diff --git a/applications/solvers/combustion/reactingFoam/reactingFoam.C b/applications/solvers/combustion/reactingFoam/reactingFoam.C
index 6d1a9d2caaa..e915818bdc1 100644
--- a/applications/solvers/combustion/reactingFoam/reactingFoam.C
+++ b/applications/solvers/combustion/reactingFoam/reactingFoam.C
@@ -97,7 +97,7 @@ int main(int argc, char *argv[])
Info<< "End\n" << endl;
- return(0);
+ return 0;
}
diff --git a/applications/solvers/compressible/rhoCentralFoam/rhoCentralFoam.C b/applications/solvers/compressible/rhoCentralFoam/rhoCentralFoam.C
index 59b0c9e99e6..502406d1322 100644
--- a/applications/solvers/compressible/rhoCentralFoam/rhoCentralFoam.C
+++ b/applications/solvers/compressible/rhoCentralFoam/rhoCentralFoam.C
@@ -220,7 +220,7 @@ int main(int argc, char *argv[])
Info<< "End\n" << endl;
- return(0);
+ return 0;
}
// ************************************************************************* //
diff --git a/applications/solvers/compressible/rhoPisoFoam/rhoPisoFoam.C b/applications/solvers/compressible/rhoPisoFoam/rhoPisoFoam.C
index 26d388ab24a..c349e7520e6 100644
--- a/applications/solvers/compressible/rhoPisoFoam/rhoPisoFoam.C
+++ b/applications/solvers/compressible/rhoPisoFoam/rhoPisoFoam.C
@@ -88,7 +88,7 @@ int main(int argc, char *argv[])
Info<< "End\n" << endl;
- return(0);
+ return 0;
}
diff --git a/applications/solvers/compressible/rhoPorousSimpleFoam/rhoPorousSimpleFoam.C b/applications/solvers/compressible/rhoPorousSimpleFoam/rhoPorousSimpleFoam.C
index b1b11a7cec9..0cd144fce23 100644
--- a/applications/solvers/compressible/rhoPorousSimpleFoam/rhoPorousSimpleFoam.C
+++ b/applications/solvers/compressible/rhoPorousSimpleFoam/rhoPorousSimpleFoam.C
@@ -51,9 +51,8 @@ int main(int argc, char *argv[])
Info<< "\nStarting time loop\n" << endl;
- while (runTime.run())
+ while (runTime.loop())
{
- runTime++;
Info<< "Time = " << runTime.timeName() << nl << endl;
# include "readSIMPLEControls.H"
diff --git a/applications/solvers/compressible/rhoSimpleFoam/rhoSimpleFoam.C b/applications/solvers/compressible/rhoSimpleFoam/rhoSimpleFoam.C
index d985abe25d8..bf6a9f24f33 100644
--- a/applications/solvers/compressible/rhoSimpleFoam/rhoSimpleFoam.C
+++ b/applications/solvers/compressible/rhoSimpleFoam/rhoSimpleFoam.C
@@ -49,9 +49,8 @@ int main(int argc, char *argv[])
Info<< "\nStarting time loop\n" << endl;
- while (runTime.run())
+ while (runTime.loop())
{
- runTime++;
Info<< "Time = " << runTime.timeName() << nl << endl;
#include "readSIMPLEControls.H"
diff --git a/applications/solvers/compressible/rhoSonicFoam/rhoSonicFoam.C b/applications/solvers/compressible/rhoSonicFoam/rhoSonicFoam.C
index b4bdc9e4933..0571ee5082f 100644
--- a/applications/solvers/compressible/rhoSonicFoam/rhoSonicFoam.C
+++ b/applications/solvers/compressible/rhoSonicFoam/rhoSonicFoam.C
@@ -47,9 +47,8 @@ int main(int argc, char *argv[])
Info<< "\nStarting time loop\n" << endl;
- while (runTime.run())
+ while (runTime.loop())
{
- runTime++;
Info<< "Time = " << runTime.timeName() << nl << endl;
surfaceScalarField phiv
@@ -124,7 +123,7 @@ int main(int argc, char *argv[])
Info<< "End\n" << endl;
- return(0);
+ return 0;
}
diff --git a/applications/solvers/compressible/rhopSonicFoam/rhopSonicFoam.C b/applications/solvers/compressible/rhopSonicFoam/rhopSonicFoam.C
index b3f1c8e06d4..7cd692b71dc 100644
--- a/applications/solvers/compressible/rhopSonicFoam/rhopSonicFoam.C
+++ b/applications/solvers/compressible/rhopSonicFoam/rhopSonicFoam.C
@@ -53,9 +53,8 @@ int main(int argc, char *argv[])
Info<< "\nStarting time loop\n" << endl;
- while (runTime.run())
+ while (runTime.loop())
{
- runTime++;
Info<< "Time = " << runTime.value() << nl << endl;
# include "readPISOControls.H"
@@ -187,7 +186,7 @@ int main(int argc, char *argv[])
Info<< "End\n" << endl;
- return(0);
+ return 0;
}
diff --git a/applications/solvers/compressible/sonicDyMFoam/sonicDyMFoam.C b/applications/solvers/compressible/sonicDyMFoam/sonicDyMFoam.C
index 593bc742cf9..57b15a0f9ba 100644
--- a/applications/solvers/compressible/sonicDyMFoam/sonicDyMFoam.C
+++ b/applications/solvers/compressible/sonicDyMFoam/sonicDyMFoam.C
@@ -52,9 +52,8 @@ int main(int argc, char *argv[])
autoPtr<Foam::motionSolver> motionPtr = motionSolver::New(mesh);
- while (runTime.run())
+ while (runTime.loop())
{
- runTime++;
Info<< "Time = " << runTime.timeName() << nl << endl;
#include "readPISOControls.H"
@@ -134,7 +133,7 @@ int main(int argc, char *argv[])
Info<< "End\n" << endl;
- return(0);
+ return 0;
}
diff --git a/applications/solvers/compressible/sonicFoam/sonicFoam.C b/applications/solvers/compressible/sonicFoam/sonicFoam.C
index 741141c1c4e..6ff79607986 100644
--- a/applications/solvers/compressible/sonicFoam/sonicFoam.C
+++ b/applications/solvers/compressible/sonicFoam/sonicFoam.C
@@ -49,9 +49,8 @@ int main(int argc, char *argv[])
Info<< "\nStarting time loop\n" << endl;
- while (runTime.run())
+ while (runTime.loop())
{
- runTime++;
Info<< "Time = " << runTime.timeName() << nl << endl;
#include "readPISOControls.H"
@@ -127,7 +126,7 @@ int main(int argc, char *argv[])
Info<< "End\n" << endl;
- return(0);
+ return 0;
}
diff --git a/applications/solvers/compressible/sonicLiquidFoam/sonicLiquidFoam.C b/applications/solvers/compressible/sonicLiquidFoam/sonicLiquidFoam.C
index 87dcf947b03..0324da82998 100644
--- a/applications/solvers/compressible/sonicLiquidFoam/sonicLiquidFoam.C
+++ b/applications/solvers/compressible/sonicLiquidFoam/sonicLiquidFoam.C
@@ -50,9 +50,8 @@ int main(int argc, char *argv[])
Info<< "\nStarting time loop\n" << endl;
- while (runTime.run())
+ while (runTime.loop())
{
- runTime++;
Info<< "Time = " << runTime.timeName() << nl << endl;
# include "readPISOControls.H"
@@ -118,7 +117,7 @@ int main(int argc, char *argv[])
Info<< "End\n" << endl;
- return(0);
+ return 0;
}
diff --git a/applications/solvers/electromagnetics/electrostaticFoam/electrostaticFoam.C b/applications/solvers/electromagnetics/electrostaticFoam/electrostaticFoam.C
index 11daf2e0b4a..ff0b3ad21a0 100644
--- a/applications/solvers/electromagnetics/electrostaticFoam/electrostaticFoam.C
+++ b/applications/solvers/electromagnetics/electrostaticFoam/electrostaticFoam.C
@@ -47,9 +47,8 @@ int main(int argc, char *argv[])
Info<< "\nStarting iteration loop\n" << endl;
- while (runTime.run())
+ while (runTime.loop())
{
- runTime++;
Info<< "Iteration = " << runTime.timeName() << nl << endl;
solve
@@ -73,7 +72,7 @@ int main(int argc, char *argv[])
Info<< "End\n" << endl;
- return(0);
+ return 0;
}
diff --git a/applications/solvers/electromagnetics/mhdFoam/mhdFoam.C b/applications/solvers/electromagnetics/mhdFoam/mhdFoam.C
index e121150c7a3..d89b636d043 100644
--- a/applications/solvers/electromagnetics/mhdFoam/mhdFoam.C
+++ b/applications/solvers/electromagnetics/mhdFoam/mhdFoam.C
@@ -71,9 +71,8 @@ int main(int argc, char *argv[])
Info<< nl << "Starting time loop" << endl;
- while (runTime.run())
+ while (runTime.loop())
{
- runTime++;
# include "readPISOControls.H"
# include "readBPISOControls.H"
@@ -163,7 +162,7 @@ int main(int argc, char *argv[])
Info<< "End\n" << endl;
- return(0);
+ return 0;
}
diff --git a/applications/solvers/financial/financialFoam/financialFoam.C b/applications/solvers/financial/financialFoam/financialFoam.C
index 9edd07a8d0a..86c18e2ac44 100644
--- a/applications/solvers/financial/financialFoam/financialFoam.C
+++ b/applications/solvers/financial/financialFoam/financialFoam.C
@@ -55,9 +55,8 @@ int main(int argc, char *argv[])
Info<< "Starting time loop\n" << endl;
- while (runTime.run())
+ while (runTime.loop())
{
- runTime++;
delta == fvc::grad(V)().component(Foam::vector::X);
solve
@@ -85,7 +84,7 @@ int main(int argc, char *argv[])
Info<< "End\n" << endl;
- return(0);
+ return 0;
}
diff --git a/applications/solvers/heatTransfer/buoyantBoussinesqPisoFoam/buoyantBoussinesqPisoFoam.C b/applications/solvers/heatTransfer/buoyantBoussinesqPisoFoam/buoyantBoussinesqPisoFoam.C
index 1a9f0232538..bd0ce2ac373 100644
--- a/applications/solvers/heatTransfer/buoyantBoussinesqPisoFoam/buoyantBoussinesqPisoFoam.C
+++ b/applications/solvers/heatTransfer/buoyantBoussinesqPisoFoam/buoyantBoussinesqPisoFoam.C
@@ -69,9 +69,8 @@ int main(int argc, char *argv[])
Info<< "\nStarting time loop\n" << endl;
- while (runTime.run())
+ while (runTime.loop())
{
- runTime++;
Info<< "Time = " << runTime.timeName() << nl << endl;
# include "readTimeControls.H"
diff --git a/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/buoyantBoussinesqSimpleFoam.C b/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/buoyantBoussinesqSimpleFoam.C
index c8e62813e8f..26e732cf9c1 100644
--- a/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/buoyantBoussinesqSimpleFoam.C
+++ b/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/buoyantBoussinesqSimpleFoam.C
@@ -66,9 +66,8 @@ int main(int argc, char *argv[])
Info<< "\nStarting time loop\n" << endl;
- while (runTime.run())
+ while (runTime.loop())
{
- runTime++;
Info<< "Time = " << runTime.timeName() << nl << endl;
# include "readSIMPLEControls.H"
diff --git a/applications/solvers/heatTransfer/buoyantSimpleFoam/buoyantSimpleFoam.C b/applications/solvers/heatTransfer/buoyantSimpleFoam/buoyantSimpleFoam.C
index e9c48b937f8..d91b6398f27 100644
--- a/applications/solvers/heatTransfer/buoyantSimpleFoam/buoyantSimpleFoam.C
+++ b/applications/solvers/heatTransfer/buoyantSimpleFoam/buoyantSimpleFoam.C
@@ -51,9 +51,8 @@ int main(int argc, char *argv[])
Info<< "\nStarting time loop\n" << endl;
- while (runTime.run())
+ while (runTime.loop())
{
- runTime++;
Info<< "Time = " << runTime.timeName() << nl << endl;
# include "readSIMPLEControls.H"
diff --git a/applications/solvers/heatTransfer/buoyantSimpleRadiationFoam/buoyantSimpleRadiationFoam.C b/applications/solvers/heatTransfer/buoyantSimpleRadiationFoam/buoyantSimpleRadiationFoam.C
index 21e4912ae70..5996e6be23b 100644
--- a/applications/solvers/heatTransfer/buoyantSimpleRadiationFoam/buoyantSimpleRadiationFoam.C
+++ b/applications/solvers/heatTransfer/buoyantSimpleRadiationFoam/buoyantSimpleRadiationFoam.C
@@ -54,9 +54,8 @@ int main(int argc, char *argv[])
Info<< "\nStarting time loop\n" << endl;
- while (runTime.run())
+ while (runTime.loop())
{
- runTime++;
Info<< "Time = " << runTime.timeName() << nl << endl;
# include "readSIMPLEControls.H"
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionFoam.C b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionFoam.C
index 8a19fd0264c..faff0edba04 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionFoam.C
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionFoam.C
@@ -105,7 +105,7 @@ int main(int argc, char *argv[])
Info << "End\n" << endl;
- return(0);
+ return 0;
}
diff --git a/applications/solvers/incompressible/boundaryFoam/boundaryFoam.C b/applications/solvers/incompressible/boundaryFoam/boundaryFoam.C
index 2360fb6677c..ab10aab8d47 100644
--- a/applications/solvers/incompressible/boundaryFoam/boundaryFoam.C
+++ b/applications/solvers/incompressible/boundaryFoam/boundaryFoam.C
@@ -58,9 +58,8 @@ int main(int argc, char *argv[])
Info<< "\nStarting time loop\n" << endl;
- while (runTime.run())
+ while (runTime.loop())
{
- runTime++;
Info<< "Time = " << runTime.timeName() << nl << endl;
fvVectorMatrix divR = turbulence->divDevReff(U);
@@ -145,7 +144,7 @@ int main(int argc, char *argv[])
Info<< "End\n" << endl;
- return(0);
+ return 0;
}
diff --git a/applications/solvers/incompressible/channelFoam/channelFoam.C b/applications/solvers/incompressible/channelFoam/channelFoam.C
index 94d8f4acd4d..009a3001616 100644
--- a/applications/solvers/incompressible/channelFoam/channelFoam.C
+++ b/applications/solvers/incompressible/channelFoam/channelFoam.C
@@ -51,9 +51,8 @@ int main(int argc, char *argv[])
Info<< "\nStarting time loop\n" << endl;
- while (runTime.run())
+ while (runTime.loop())
{
- runTime++;
Info<< "Time = " << runTime.timeName() << nl << endl;
#include "readPISOControls.H"
@@ -149,7 +148,7 @@ int main(int argc, char *argv[])
Info<< "End\n" << endl;
- return(0);
+ return 0;
}
diff --git a/applications/solvers/incompressible/icoFoam/icoFoam.C b/applications/solvers/incompressible/icoFoam/icoFoam.C
index d8c549668f5..9ac6bd4fa6f 100644
--- a/applications/solvers/incompressible/icoFoam/icoFoam.C
+++ b/applications/solvers/incompressible/icoFoam/icoFoam.C
@@ -48,9 +48,8 @@ int main(int argc, char *argv[])
Info<< "\nStarting time loop\n" << endl;
- while (runTime.run())
+ while (runTime.loop())
{
- runTime++;
Info<< "Time = " << runTime.timeName() << nl << endl;
# include "readPISOControls.H"
@@ -108,7 +107,7 @@ int main(int argc, char *argv[])
Info<< "End\n" << endl;
- return(0);
+ return 0;
}
diff --git a/applications/solvers/incompressible/nonNewtonianIcoFoam/nonNewtonianIcoFoam.C b/applications/solvers/incompressible/nonNewtonianIcoFoam/nonNewtonianIcoFoam.C
index f949b39cfc6..c5d2b0576c6 100644
--- a/applications/solvers/incompressible/nonNewtonianIcoFoam/nonNewtonianIcoFoam.C
+++ b/applications/solvers/incompressible/nonNewtonianIcoFoam/nonNewtonianIcoFoam.C
@@ -49,9 +49,8 @@ int main(int argc, char *argv[])
Info<< "\nStarting time loop\n" << endl;
- while (runTime.run())
+ while (runTime.loop())
{
- runTime++;
Info<< "Time = " << runTime.timeName() << nl << endl;
# include "readPISOControls.H"
@@ -111,7 +110,7 @@ int main(int argc, char *argv[])
Info<< "End\n" << endl;
- return(0);
+ return 0;
}
diff --git a/applications/solvers/incompressible/pimpleDyMFoam/pimpleDyMFoam.C b/applications/solvers/incompressible/pimpleDyMFoam/pimpleDyMFoam.C
index aee117ab6e6..b705d2bbb76 100644
--- a/applications/solvers/incompressible/pimpleDyMFoam/pimpleDyMFoam.C
+++ b/applications/solvers/incompressible/pimpleDyMFoam/pimpleDyMFoam.C
@@ -165,7 +165,7 @@ int main(int argc, char *argv[])
Info<< "End\n" << endl;
- return(0);
+ return 0;
}
diff --git a/applications/solvers/incompressible/pisoFoam/pisoFoam.C b/applications/solvers/incompressible/pisoFoam/pisoFoam.C
index 95b4bc0843c..555e6e0cfec 100644
--- a/applications/solvers/incompressible/pisoFoam/pisoFoam.C
+++ b/applications/solvers/incompressible/pisoFoam/pisoFoam.C
@@ -52,9 +52,8 @@ int main(int argc, char *argv[])
Info<< "\nStarting time loop\n" << endl;
- while (runTime.run())
+ while (runTime.loop())
{
- runTime++;
Info<< "Time = " << runTime.timeName() << nl << endl;
# include "readPISOControls.H"
@@ -139,7 +138,7 @@ int main(int argc, char *argv[])
Info<< "End\n" << endl;
- return(0);
+ return 0;
}
diff --git a/applications/solvers/incompressible/shallowWaterFoam/shallowWaterFoam.C b/applications/solvers/incompressible/shallowWaterFoam/shallowWaterFoam.C
index 4b9c2311807..162d81ddaab 100644
--- a/applications/solvers/incompressible/shallowWaterFoam/shallowWaterFoam.C
+++ b/applications/solvers/incompressible/shallowWaterFoam/shallowWaterFoam.C
@@ -156,7 +156,7 @@ int main(int argc, char *argv[])
Info<< "End\n" << endl;
- return(0);
+ return 0;
}
diff --git a/applications/solvers/incompressible/simpleFoam/simpleFoam.C b/applications/solvers/incompressible/simpleFoam/simpleFoam.C
index ec0515aa19e..b5ac02c563c 100644
--- a/applications/solvers/incompressible/simpleFoam/simpleFoam.C
+++ b/applications/solvers/incompressible/simpleFoam/simpleFoam.C
@@ -49,9 +49,8 @@ int main(int argc, char *argv[])
Info<< "\nStarting time loop\n" << endl;
- while (runTime.run())
+ while (runTime.loop())
{
- runTime++;
Info<< "Time = " << runTime.timeName() << nl << endl;
# include "readSIMPLEControls.H"
@@ -78,7 +77,7 @@ int main(int argc, char *argv[])
Info<< "End\n" << endl;
- return(0);
+ return 0;
}
diff --git a/applications/solvers/molecularDynamics/mdEquilibrationFoam/mdEquilibrationFoam.C b/applications/solvers/molecularDynamics/mdEquilibrationFoam/mdEquilibrationFoam.C
index 8d61f2ebe75..a124288dc5b 100644
--- a/applications/solvers/molecularDynamics/mdEquilibrationFoam/mdEquilibrationFoam.C
+++ b/applications/solvers/molecularDynamics/mdEquilibrationFoam/mdEquilibrationFoam.C
@@ -52,9 +52,8 @@ int main(int argc, char *argv[])
Info << "\nStarting time loop\n" << endl;
- while (runTime.run())
+ while (runTime.loop())
{
- runTime++;
nAveragingSteps++;
@@ -82,5 +81,5 @@ int main(int argc, char *argv[])
Info << "End\n" << endl;
- return(0);
+ return 0;
}
diff --git a/applications/solvers/molecularDynamics/mdFoam/mdFoam.C b/applications/solvers/molecularDynamics/mdFoam/mdFoam.C
index a1c13246e3d..287065754e3 100644
--- a/applications/solvers/molecularDynamics/mdFoam/mdFoam.C
+++ b/applications/solvers/molecularDynamics/mdFoam/mdFoam.C
@@ -50,9 +50,8 @@ int main(int argc, char *argv[])
Info << "\nStarting time loop\n" << endl;
- while (runTime.run())
+ while (runTime.loop())
{
- runTime++;
nAveragingSteps++;
@@ -78,5 +77,5 @@ int main(int argc, char *argv[])
Info << "End\n" << endl;
- return(0);
+ return 0;
}
diff --git a/applications/solvers/multiphase/bubbleFoam/bubbleFoam.C b/applications/solvers/multiphase/bubbleFoam/bubbleFoam.C
index 4a6f845fd89..66df8cfb9f2 100644
--- a/applications/solvers/multiphase/bubbleFoam/bubbleFoam.C
+++ b/applications/solvers/multiphase/bubbleFoam/bubbleFoam.C
@@ -53,9 +53,8 @@ int main(int argc, char *argv[])
Info<< "\nStarting time loop\n" << endl;
- while (runTime.run())
+ while (runTime.loop())
{
- runTime++;
Info<< "Time = " << runTime.timeName() << nl << endl;
# include "readBubbleFoamControls.H"
@@ -90,7 +89,7 @@ int main(int argc, char *argv[])
Info<< "End\n" << endl;
- return(0);
+ return 0;
}
diff --git a/applications/solvers/multiphase/cavitatingFoam/cavitatingFoam.C b/applications/solvers/multiphase/cavitatingFoam/cavitatingFoam.C
index 81bceab2e58..12a8f4d4999 100644
--- a/applications/solvers/multiphase/cavitatingFoam/cavitatingFoam.C
+++ b/applications/solvers/multiphase/cavitatingFoam/cavitatingFoam.C
@@ -89,7 +89,7 @@ int main(int argc, char *argv[])
Info<< "\n end \n";
- return(0);
+ return 0;
}
diff --git a/applications/solvers/multiphase/compressibleInterDyMFoam/compressibleInterDyMFoam.C b/applications/solvers/multiphase/compressibleInterDyMFoam/compressibleInterDyMFoam.C
index 5696f9420e2..65afde39c2d 100644
--- a/applications/solvers/multiphase/compressibleInterDyMFoam/compressibleInterDyMFoam.C
+++ b/applications/solvers/multiphase/compressibleInterDyMFoam/compressibleInterDyMFoam.C
@@ -139,7 +139,7 @@ int main(int argc, char *argv[])
Info<< "End\n" << endl;
- return(0);
+ return 0;
}
diff --git a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFoam.C b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFoam.C
index bfac075aece..ff5a6691238 100644
--- a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFoam.C
+++ b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFoam.C
@@ -99,7 +99,7 @@ int main(int argc, char *argv[])
Info<< "End\n" << endl;
- return(0);
+ return 0;
}
diff --git a/applications/solvers/multiphase/interDyMFoam/interDyMFoam.C b/applications/solvers/multiphase/interDyMFoam/interDyMFoam.C
index 8f55efd8dec..0386e6625cc 100644
--- a/applications/solvers/multiphase/interDyMFoam/interDyMFoam.C
+++ b/applications/solvers/multiphase/interDyMFoam/interDyMFoam.C
@@ -138,7 +138,7 @@ int main(int argc, char *argv[])
Info<< "End\n" << endl;
- return(0);
+ return 0;
}
diff --git a/applications/solvers/multiphase/interFoam/interFoam.C b/applications/solvers/multiphase/interFoam/interFoam.C
index 512086c9b52..7d2048037a4 100644
--- a/applications/solvers/multiphase/interFoam/interFoam.C
+++ b/applications/solvers/multiphase/interFoam/interFoam.C
@@ -102,7 +102,7 @@ int main(int argc, char *argv[])
Info<< "End\n" << endl;
- return(0);
+ return 0;
}
diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeFoam.C b/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeFoam.C
index e2040bc1073..d50dcc0b0e9 100644
--- a/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeFoam.C
+++ b/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeFoam.C
@@ -106,7 +106,7 @@ int main(int argc, char *argv[])
Info<< "End\n" << endl;
- return(0);
+ return 0;
}
diff --git a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseInterFoam.C b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseInterFoam.C
index 25a77af89d1..d0626cbf05b 100644
--- a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseInterFoam.C
+++ b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseInterFoam.C
@@ -94,7 +94,7 @@ int main(int argc, char *argv[])
Info<< "\n end \n";
- return(0);
+ return 0;
}
diff --git a/applications/solvers/multiphase/settlingFoam/settlingFoam.C b/applications/solvers/multiphase/settlingFoam/settlingFoam.C
index a43dd5408b7..ad8dbe3646c 100644
--- a/applications/solvers/multiphase/settlingFoam/settlingFoam.C
+++ b/applications/solvers/multiphase/settlingFoam/settlingFoam.C
@@ -57,9 +57,8 @@ int main(int argc, char *argv[])
Info<< "\nStarting time loop\n" << endl;
- while (runTime.run())
+ while (runTime.loop())
{
- runTime++;
Info<< "Time = " << runTime.timeName() << nl << endl;
# include "readPISOControls.H"
@@ -93,7 +92,7 @@ int main(int argc, char *argv[])
Info<< "End\n" << endl;
- return(0);
+ return 0;
}
diff --git a/applications/solvers/multiphase/twoLiquidMixingFoam/twoLiquidMixingFoam.C b/applications/solvers/multiphase/twoLiquidMixingFoam/twoLiquidMixingFoam.C
index dbc8b2774f5..be8eea9061b 100644
--- a/applications/solvers/multiphase/twoLiquidMixingFoam/twoLiquidMixingFoam.C
+++ b/applications/solvers/multiphase/twoLiquidMixingFoam/twoLiquidMixingFoam.C
@@ -52,9 +52,8 @@ int main(int argc, char *argv[])
Info<< "\nStarting time loop\n" << endl;
- while (runTime.run())
+ while (runTime.loop())
{
- runTime++;
Info<< "Time = " << runTime.timeName() << nl << endl;
# include "readPISOControls.H"
@@ -87,7 +86,7 @@ int main(int argc, char *argv[])
Info<< "End\n" << endl;
- return(0);
+ return 0;
}
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseEulerFoam.C b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseEulerFoam.C
index 6bc7f9738b4..ce3fb2aa551 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseEulerFoam.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseEulerFoam.C
@@ -108,7 +108,7 @@ int main(int argc, char *argv[])
Info<< "End\n" << endl;
- return(0);
+ return 0;
}
diff --git a/applications/solvers/stressAnalysis/solidDisplacementFoam/solidDisplacementFoam.C b/applications/solvers/stressAnalysis/solidDisplacementFoam/solidDisplacementFoam.C
index afa3c660010..4574ef7f1c5 100644
--- a/applications/solvers/stressAnalysis/solidDisplacementFoam/solidDisplacementFoam.C
+++ b/applications/solvers/stressAnalysis/solidDisplacementFoam/solidDisplacementFoam.C
@@ -57,9 +57,8 @@ int main(int argc, char *argv[])
Info<< "\nCalculating displacement field\n" << endl;
- while (runTime.run())
+ while (runTime.loop())
{
- runTime++;
Info<< "Iteration: " << runTime.value() << nl << endl;
# include "readSolidDisplacementFoamControls.H"
@@ -133,7 +132,7 @@ int main(int argc, char *argv[])
Info<< "End\n" << endl;
- return(0);
+ return 0;
}
diff --git a/applications/solvers/stressAnalysis/solidEquilibriumDisplacementFoam/solidEquilibriumDisplacementFoam.C b/applications/solvers/stressAnalysis/solidEquilibriumDisplacementFoam/solidEquilibriumDisplacementFoam.C
index 00a98b25310..4c14b00cc61 100644
--- a/applications/solvers/stressAnalysis/solidEquilibriumDisplacementFoam/solidEquilibriumDisplacementFoam.C
+++ b/applications/solvers/stressAnalysis/solidEquilibriumDisplacementFoam/solidEquilibriumDisplacementFoam.C
@@ -55,9 +55,8 @@ int main(int argc, char *argv[])
Info<< "\nCalculating displacement field\n" << endl;
- while (runTime.run())
+ while (runTime.loop())
{
- runTime++;
Info<< "Iteration: " << runTime.value() << nl << endl;
# include "readSteadyStressFoamControls.H"
@@ -90,7 +89,7 @@ int main(int argc, char *argv[])
Info<< "\n end \n";
- return(0);
+ return 0;
}
diff --git a/applications/test/Gstream/GsTest.C b/applications/test/Gstream/GsTest.C
index 8589674e702..61e3581ae5d 100644
--- a/applications/test/Gstream/GsTest.C
+++ b/applications/test/Gstream/GsTest.C
@@ -43,5 +43,5 @@ int main()
} while (wind.waitForEvent());
- return(0);
+ return 0;
}
diff --git a/applications/test/LduMatrix/LduMatrixTest3.C b/applications/test/LduMatrix/LduMatrixTest3.C
index 729bc593295..4e9ab70b0c6 100644
--- a/applications/test/LduMatrix/LduMatrixTest3.C
+++ b/applications/test/LduMatrix/LduMatrixTest3.C
@@ -53,9 +53,8 @@ int main(int argc, char *argv[])
Info<< "\nStarting time loop\n" << endl;
- while (runTime.run())
+ while (runTime.loop())
{
- runTime++;
Info<< "Time = " << runTime.timeName() << nl << endl;
# include "readPISOControls.H"
@@ -143,7 +142,7 @@ int main(int argc, char *argv[])
Info<< "End\n" << endl;
- return(0);
+ return 0;
}
diff --git a/applications/test/Map/MapTest.C b/applications/test/Map/MapTest.C
index f382803c5b8..7fb05e76a51 100644
--- a/applications/test/Map/MapTest.C
+++ b/applications/test/Map/MapTest.C
@@ -79,7 +79,7 @@ int main(int argc, char *argv[])
Info<< "End\n" << endl;
- return(0);
+ return 0;
}
diff --git a/applications/test/dataEntry/testDataEntry.C b/applications/test/dataEntry/testDataEntry.C
index ed6cd4ce824..7a7dd94552d 100644
--- a/applications/test/dataEntry/testDataEntry.C
+++ b/applications/test/dataEntry/testDataEntry.C
@@ -82,7 +82,7 @@ int main(int argc, char *argv[])
<< " int(f(x)) lim(x0->x1) = " << dataEntry().integrate(x0, x1) << nl
<< endl;
- return(0);
+ return 0;
}
diff --git a/applications/test/graphXi/graphXi.C b/applications/test/graphXi/graphXi.C
index e366cdc3a45..2c3a5750f37 100644
--- a/applications/test/graphXi/graphXi.C
+++ b/applications/test/graphXi/graphXi.C
@@ -60,7 +60,7 @@ int main()
Info<< "end" << endl;
- return(0);
+ return 0;
}
diff --git a/applications/test/maxMem/maxMem.C b/applications/test/maxMem/maxMem.C
index 0a43faa157d..590c542ee95 100644
--- a/applications/test/maxMem/maxMem.C
+++ b/applications/test/maxMem/maxMem.C
@@ -28,5 +28,5 @@ int main(int argc, char *argv[])
cout << "allocated " << i*nBytes/(1024U*1024U) << " Mbytes" << endl;
}
- return(0);
+ return 0;
}
diff --git a/applications/test/nearWallDist-wave/testWallDist2.C b/applications/test/nearWallDist-wave/testWallDist2.C
index 304cdba3d65..8666e0905c8 100644
--- a/applications/test/nearWallDist-wave/testWallDist2.C
+++ b/applications/test/nearWallDist-wave/testWallDist2.C
@@ -120,9 +120,8 @@ int main(int argc, char *argv[])
Info<< "\nStarting time loop\n" << endl;
- while (runTime.run())
+ while (runTime.loop())
{
- runTime++;
Info<< "Time = " << runTime.timeName() << endl;
diff --git a/applications/test/parallel/parallelTest.C b/applications/test/parallel/parallelTest.C
index 953870c8e92..bf8440ece62 100644
--- a/applications/test/parallel/parallelTest.C
+++ b/applications/test/parallel/parallelTest.C
@@ -103,7 +103,7 @@ int main(int argc, char *argv[])
Info<< "End\n" << endl;
- return(0);
+ return 0;
}
diff --git a/applications/test/pointField/testPointField.C b/applications/test/pointField/testPointField.C
index 4f9f3cede6e..8087dbaa484 100644
--- a/applications/test/pointField/testPointField.C
+++ b/applications/test/pointField/testPointField.C
@@ -65,7 +65,7 @@ int main(int argc, char *argv[])
Info<< "End\n" << endl;
- return(0);
+ return 0;
}
diff --git a/applications/test/slicedField/slicedFieldTest.C b/applications/test/slicedField/slicedFieldTest.C
index 12779c7d92e..a82b4ac7129 100644
--- a/applications/test/slicedField/slicedFieldTest.C
+++ b/applications/test/slicedField/slicedFieldTest.C
@@ -107,7 +107,7 @@ int main(int argc, char *argv[])
Info<< Sf << endl;
- return(0);
+ return 0;
}
diff --git a/applications/test/sphericalTensorField/sphericalTensorFieldTest.C b/applications/test/sphericalTensorField/sphericalTensorFieldTest.C
index e6a62d4d3f3..17c85c1bb60 100644
--- a/applications/test/sphericalTensorField/sphericalTensorFieldTest.C
+++ b/applications/test/sphericalTensorField/sphericalTensorFieldTest.C
@@ -46,7 +46,7 @@ int main(int argc, char *argv[])
Info<< ((sf1 + sf2) & (sf1 + sf2)) << endl;
- return(0);
+ return 0;
}
diff --git a/applications/test/symmTensorField/symmTensorFieldTest.C b/applications/test/symmTensorField/symmTensorFieldTest.C
index f3b6757d032..c98b8dc4764 100644
--- a/applications/test/symmTensorField/symmTensorFieldTest.C
+++ b/applications/test/symmTensorField/symmTensorFieldTest.C
@@ -52,7 +52,7 @@ int main(int argc, char *argv[])
Info<< symm(tf1) << endl;
- return(0);
+ return 0;
}
diff --git a/applications/test/tensor/tensorTest.C b/applications/test/tensor/tensorTest.C
index 4530bc76579..efc7824dd65 100644
--- a/applications/test/tensor/tensorTest.C
+++ b/applications/test/tensor/tensorTest.C
@@ -65,5 +65,5 @@ int main()
Info<< (symm(t7) && t7) - (0.5*(t7 + t7.T()) && t7) << endl;
Info<< (t7 && symm(t7)) - (t7 && 0.5*(t7 + t7.T())) << endl;
- return(0);
+ return 0;
}
diff --git a/applications/test/triTet/triTet.C b/applications/test/triTet/triTet.C
index 53b9cd1399e..5c850a4377e 100644
--- a/applications/test/triTet/triTet.C
+++ b/applications/test/triTet/triTet.C
@@ -36,5 +36,5 @@ int main()
Info<< "tet circumRadius = "
<< tetrahedron<point, point>(a, b, c, d).circumRadius() << endl;
- return(0);
+ return 0;
}
diff --git a/applications/test/volField/volFieldTest.C b/applications/test/volField/volFieldTest.C
index e72cc87c98d..3b7dafef8e4 100644
--- a/applications/test/volField/volFieldTest.C
+++ b/applications/test/volField/volFieldTest.C
@@ -94,7 +94,7 @@ int main(int argc, char *argv[])
solve(fvm::ddt(st) + fvm::div(phi, st) - fvm::laplacian(st));
- return(0);
+ return 0;
}
diff --git a/applications/test/volPointInterpolation/volPointInterpolationTest.C b/applications/test/volPointInterpolation/volPointInterpolationTest.C
index d222b145251..07329ac3492 100644
--- a/applications/test/volPointInterpolation/volPointInterpolationTest.C
+++ b/applications/test/volPointInterpolation/volPointInterpolationTest.C
@@ -77,7 +77,7 @@ int main(int argc, char *argv[])
pointVectorField pU(pInterp.interpolate(U));
pU.write();
- return(0);
+ return 0;
}
diff --git a/applications/utilities/errorEstimation/estimateScalarError/estimateScalarError.C b/applications/utilities/errorEstimation/estimateScalarError/estimateScalarError.C
index 78a0b779dc4..c90594ff24c 100644
--- a/applications/utilities/errorEstimation/estimateScalarError/estimateScalarError.C
+++ b/applications/utilities/errorEstimation/estimateScalarError/estimateScalarError.C
@@ -134,7 +134,7 @@ int main(int argc, char *argv[])
Info<< "End\n" << endl;
- return(0);
+ return 0;
}
diff --git a/applications/utilities/errorEstimation/icoErrorEstimate/icoErrorEstimate.C b/applications/utilities/errorEstimation/icoErrorEstimate/icoErrorEstimate.C
index 0542bab893e..5ce860640d4 100644
--- a/applications/utilities/errorEstimation/icoErrorEstimate/icoErrorEstimate.C
+++ b/applications/utilities/errorEstimation/icoErrorEstimate/icoErrorEstimate.C
@@ -131,7 +131,7 @@ int main(int argc, char *argv[])
Info<< "End\n" << endl;
- return(0);
+ return 0;
}
diff --git a/applications/utilities/errorEstimation/icoMomentError/icoMomentError.C b/applications/utilities/errorEstimation/icoMomentError/icoMomentError.C
index d9fbec87857..5810d64ca78 100644
--- a/applications/utilities/errorEstimation/icoMomentError/icoMomentError.C
+++ b/applications/utilities/errorEstimation/icoMomentError/icoMomentError.C
@@ -190,7 +190,7 @@ int main(int argc, char *argv[])
Info<< "End\n" << endl;
- return(0);
+ return 0;
}
diff --git a/applications/utilities/errorEstimation/momentScalarError/momentScalarError.C b/applications/utilities/errorEstimation/momentScalarError/momentScalarError.C
index d9d18722e67..b1e1395bda0 100644
--- a/applications/utilities/errorEstimation/momentScalarError/momentScalarError.C
+++ b/applications/utilities/errorEstimation/momentScalarError/momentScalarError.C
@@ -186,7 +186,7 @@ int main(int argc, char *argv[])
Info<< "End\n" << endl;
- return(0);
+ return 0;
}
diff --git a/applications/utilities/mesh/conversion/sammToFoam/sammToFoam.C b/applications/utilities/mesh/conversion/sammToFoam/sammToFoam.C
index dade6a0e455..d676581a576 100644
--- a/applications/utilities/mesh/conversion/sammToFoam/sammToFoam.C
+++ b/applications/utilities/mesh/conversion/sammToFoam/sammToFoam.C
@@ -69,7 +69,7 @@ int main(int argc, char *argv[])
Info<< nl << "End" << nl << endl;
- return(0);
+ return 0;
}
diff --git a/applications/utilities/mesh/conversion/starToFoam/starToFoam.C b/applications/utilities/mesh/conversion/starToFoam/starToFoam.C
index 92d718f085e..2f7d9c89803 100644
--- a/applications/utilities/mesh/conversion/starToFoam/starToFoam.C
+++ b/applications/utilities/mesh/conversion/starToFoam/starToFoam.C
@@ -69,7 +69,7 @@ int main(int argc, char *argv[])
Info<< nl << "End" << nl << endl;
- return(0);
+ return 0;
}
diff --git a/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C b/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C
index 1fab34ce947..706866bd2a1 100644
--- a/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C
+++ b/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C
@@ -435,7 +435,7 @@ int main(int argc, char *argv[])
Info<< "End\n" << endl;
- return(0);
+ return 0;
}
diff --git a/applications/utilities/mesh/manipulation/attachMesh/attachMesh.C b/applications/utilities/mesh/manipulation/attachMesh/attachMesh.C
index 1f9a898d431..52e0f2ae56a 100644
--- a/applications/utilities/mesh/manipulation/attachMesh/attachMesh.C
+++ b/applications/utilities/mesh/manipulation/attachMesh/attachMesh.C
@@ -70,7 +70,7 @@ int main(int argc, char *argv[])
Info<< "End\n" << endl;
- return(0);
+ return 0;
}
diff --git a/applications/utilities/mesh/manipulation/checkMesh/checkMesh.C b/applications/utilities/mesh/manipulation/checkMesh/checkMesh.C
index 21e0d7c1cc8..74ab53432af 100644
--- a/applications/utilities/mesh/manipulation/checkMesh/checkMesh.C
+++ b/applications/utilities/mesh/manipulation/checkMesh/checkMesh.C
@@ -142,7 +142,7 @@ int main(int argc, char *argv[])
Info<< "End\n" << endl;
- return(0);
+ return 0;
}
diff --git a/applications/utilities/mesh/manipulation/deformedGeom/deformedGeom.C b/applications/utilities/mesh/manipulation/deformedGeom/deformedGeom.C
index d05cd1a0e2f..7b64177da57 100644
--- a/applications/utilities/mesh/manipulation/deformedGeom/deformedGeom.C
+++ b/applications/utilities/mesh/manipulation/deformedGeom/deformedGeom.C
@@ -99,7 +99,7 @@ int main(int argc, char *argv[])
Info<< "End\n" << endl;
- return(0);
+ return 0;
}
diff --git a/applications/utilities/mesh/manipulation/flattenMesh/flattenMesh.C b/applications/utilities/mesh/manipulation/flattenMesh/flattenMesh.C
index 92bf820c3e2..998929c3b06 100644
--- a/applications/utilities/mesh/manipulation/flattenMesh/flattenMesh.C
+++ b/applications/utilities/mesh/manipulation/flattenMesh/flattenMesh.C
@@ -98,7 +98,7 @@ int main(int argc, char *argv[])
Info << "Writing points into directory " << points.path() << nl << endl;
points.write();
- return(0);
+ return 0;
}
diff --git a/applications/utilities/mesh/manipulation/mergeOrSplitBaffles/mergeOrSplitBaffles.C b/applications/utilities/mesh/manipulation/mergeOrSplitBaffles/mergeOrSplitBaffles.C
index 7f694438e97..f883c3138b3 100644
--- a/applications/utilities/mesh/manipulation/mergeOrSplitBaffles/mergeOrSplitBaffles.C
+++ b/applications/utilities/mesh/manipulation/mergeOrSplitBaffles/mergeOrSplitBaffles.C
@@ -377,7 +377,7 @@ int main(int argc, char *argv[])
Info<< "End\n" << endl;
- return(0);
+ return 0;
}
diff --git a/applications/utilities/mesh/manipulation/moveDynamicMesh/moveDynamicMesh.C b/applications/utilities/mesh/manipulation/moveDynamicMesh/moveDynamicMesh.C
index 64d65e3affa..e024ecda58f 100644
--- a/applications/utilities/mesh/manipulation/moveDynamicMesh/moveDynamicMesh.C
+++ b/applications/utilities/mesh/manipulation/moveDynamicMesh/moveDynamicMesh.C
@@ -46,9 +46,8 @@ int main(int argc, char *argv[])
# include "createTime.H"
# include "createDynamicFvMesh.H"
- while (runTime.run())
+ while (runTime.loop())
{
- runTime++;
Info<< "Time = " << runTime.timeName() << endl;
mesh.update();
diff --git a/applications/utilities/mesh/manipulation/moveEngineMesh/moveEngineMesh.C b/applications/utilities/mesh/manipulation/moveEngineMesh/moveEngineMesh.C
index a10782b553c..c47fa9ec174 100644
--- a/applications/utilities/mesh/manipulation/moveEngineMesh/moveEngineMesh.C
+++ b/applications/utilities/mesh/manipulation/moveEngineMesh/moveEngineMesh.C
@@ -47,9 +47,8 @@ int main(int argc, char *argv[])
Info<< "\nStarting time loop\n" << endl;
- while (runTime.run())
+ while (runTime.loop())
{
- runTime++;
Info<< "Time = " << runTime.theta() << " CA-deg\n" << endl;
mesh.move();
@@ -63,7 +62,7 @@ int main(int argc, char *argv[])
Info<< "\n end\n";
- return(0);
+ return 0;
}
diff --git a/applications/utilities/mesh/manipulation/moveMesh/moveMesh.C b/applications/utilities/mesh/manipulation/moveMesh/moveMesh.C
index 82e6e45a752..d5907632293 100644
--- a/applications/utilities/mesh/manipulation/moveMesh/moveMesh.C
+++ b/applications/utilities/mesh/manipulation/moveMesh/moveMesh.C
@@ -46,9 +46,8 @@ int main(int argc, char *argv[])
autoPtr<Foam::motionSolver> motionPtr = motionSolver::New(mesh);
- while (runTime.run())
+ while (runTime.loop())
{
- runTime++;
Info<< "Time = " << runTime.timeName() << endl;
mesh.movePoints(motionPtr->newPoints());
diff --git a/applications/utilities/mesh/manipulation/transformPoints/transformPoints.C b/applications/utilities/mesh/manipulation/transformPoints/transformPoints.C
index 4b50082e104..f9bd650d154 100644
--- a/applications/utilities/mesh/manipulation/transformPoints/transformPoints.C
+++ b/applications/utilities/mesh/manipulation/transformPoints/transformPoints.C
@@ -203,7 +203,7 @@ int main(int argc, char *argv[])
Info << "Writing points into directory " << points.path() << nl << endl;
points.write();
- return(0);
+ return 0;
}
diff --git a/applications/utilities/mesh/manipulation/zipUpMesh/zipUpMesh.C b/applications/utilities/mesh/manipulation/zipUpMesh/zipUpMesh.C
index 179ff05bf93..d134767702c 100644
--- a/applications/utilities/mesh/manipulation/zipUpMesh/zipUpMesh.C
+++ b/applications/utilities/mesh/manipulation/zipUpMesh/zipUpMesh.C
@@ -59,7 +59,7 @@ int main(int argc, char *argv[])
Info<< "End\n" << endl;
- return(0);
+ return 0;
}
diff --git a/applications/utilities/parallelProcessing/decomposePar/decomposePar.C b/applications/utilities/parallelProcessing/decomposePar/decomposePar.C
index a7328cb4873..fff19e006d6 100644
--- a/applications/utilities/parallelProcessing/decomposePar/decomposePar.C
+++ b/applications/utilities/parallelProcessing/decomposePar/decomposePar.C
@@ -723,7 +723,7 @@ int main(int argc, char *argv[])
Info<< "\nEnd.\n" << endl;
- return(0);
+ return 0;
}
diff --git a/applications/utilities/postProcessing/miscellaneous/engineCompRatio/engineCompRatio.C b/applications/utilities/postProcessing/miscellaneous/engineCompRatio/engineCompRatio.C
index b6acc7806ff..34ebbc75dca 100644
--- a/applications/utilities/postProcessing/miscellaneous/engineCompRatio/engineCompRatio.C
+++ b/applications/utilities/postProcessing/miscellaneous/engineCompRatio/engineCompRatio.C
@@ -92,7 +92,7 @@ int main(int argc, char *argv[])
Info << "Vmax/Vmin = " << Vmax/Vmin << endl;
Info << "\n end\n";
- return(0);
+ return 0;
}
diff --git a/applications/utilities/postProcessing/miscellaneous/ptot/ptot.C b/applications/utilities/postProcessing/miscellaneous/ptot/ptot.C
index 6d09449696e..bb41fb60d46 100644
--- a/applications/utilities/postProcessing/miscellaneous/ptot/ptot.C
+++ b/applications/utilities/postProcessing/miscellaneous/ptot/ptot.C
@@ -145,7 +145,7 @@ int main(int argc, char *argv[])
Info<< endl;
}
- return(0);
+ return 0;
}
diff --git a/applications/utilities/postProcessing/miscellaneous/wdot/wdot.C b/applications/utilities/postProcessing/miscellaneous/wdot/wdot.C
index 4ae3b13ac94..79f23de3e79 100644
--- a/applications/utilities/postProcessing/miscellaneous/wdot/wdot.C
+++ b/applications/utilities/postProcessing/miscellaneous/wdot/wdot.C
@@ -124,7 +124,7 @@ int main(int argc, char *argv[])
wdot.write();
}
- return(0);
+ return 0;
}
diff --git a/applications/utilities/postProcessing/scalarField/pPrime2/pPrime2.C b/applications/utilities/postProcessing/scalarField/pPrime2/pPrime2.C
index 14e722f621e..6729389218f 100644
--- a/applications/utilities/postProcessing/scalarField/pPrime2/pPrime2.C
+++ b/applications/utilities/postProcessing/scalarField/pPrime2/pPrime2.C
@@ -112,7 +112,7 @@ int main(int argc, char *argv[])
Info<< endl;
}
- return(0);
+ return 0;
}
diff --git a/applications/utilities/postProcessing/stressField/stressComponents/stressComponents.C b/applications/utilities/postProcessing/stressField/stressComponents/stressComponents.C
index 723250e3cc3..2c481b89278 100644
--- a/applications/utilities/postProcessing/stressField/stressComponents/stressComponents.C
+++ b/applications/utilities/postProcessing/stressField/stressComponents/stressComponents.C
@@ -222,7 +222,7 @@ int main(int argc, char *argv[])
Info<< "End" << endl;
- return(0);
+ return 0;
}
diff --git a/applications/utilities/postProcessing/turbulence/R/R.C b/applications/utilities/postProcessing/turbulence/R/R.C
index 65cbcc94e89..3beeb708782 100644
--- a/applications/utilities/postProcessing/turbulence/R/R.C
+++ b/applications/utilities/postProcessing/turbulence/R/R.C
@@ -65,7 +65,7 @@ int main(int argc, char *argv[])
Info<< "End" << endl;
- return(0);
+ return 0;
}
diff --git a/applications/utilities/postProcessing/turbulence/createTurbulenceFields/createTurbulenceFields.C b/applications/utilities/postProcessing/turbulence/createTurbulenceFields/createTurbulenceFields.C
index 345548b9d2c..5e15aff046e 100644
--- a/applications/utilities/postProcessing/turbulence/createTurbulenceFields/createTurbulenceFields.C
+++ b/applications/utilities/postProcessing/turbulence/createTurbulenceFields/createTurbulenceFields.C
@@ -133,7 +133,7 @@ int main(int argc, char *argv[])
Info<< "\nEnd\n" << endl;
- return(0);
+ return 0;
}
diff --git a/applications/utilities/preProcessing/applyBoundaryLayer/applyBoundaryLayer.C b/applications/utilities/preProcessing/applyBoundaryLayer/applyBoundaryLayer.C
index f904d1f899b..dac7cd03934 100644
--- a/applications/utilities/preProcessing/applyBoundaryLayer/applyBoundaryLayer.C
+++ b/applications/utilities/preProcessing/applyBoundaryLayer/applyBoundaryLayer.C
@@ -204,7 +204,7 @@ int main(int argc, char *argv[])
Info<< "End\n" << endl;
- return(0);
+ return 0;
}
diff --git a/applications/utilities/preProcessing/boxTurb/boxTurb.C b/applications/utilities/preProcessing/boxTurb/boxTurb.C
index 03e3f77affd..32ae05fa6ca 100644
--- a/applications/utilities/preProcessing/boxTurb/boxTurb.C
+++ b/applications/utilities/preProcessing/boxTurb/boxTurb.C
@@ -72,7 +72,7 @@ int main(int argc, char *argv[])
Info<< "end" << endl;
- return(0);
+ return 0;
}
diff --git a/applications/utilities/preProcessing/engineSwirl/engineSwirl.C b/applications/utilities/preProcessing/engineSwirl/engineSwirl.C
index 6009a08575a..e9171c330cc 100644
--- a/applications/utilities/preProcessing/engineSwirl/engineSwirl.C
+++ b/applications/utilities/preProcessing/engineSwirl/engineSwirl.C
@@ -75,7 +75,7 @@ int main(int argc, char *argv[])
Info << "\n end\n";
- return(0);
+ return 0;
}
diff --git a/applications/utilities/thermophysical/adiabaticFlameT/adiabaticFlameT.C b/applications/utilities/thermophysical/adiabaticFlameT/adiabaticFlameT.C
index 0e294be6472..e893520b065 100644
--- a/applications/utilities/thermophysical/adiabaticFlameT/adiabaticFlameT.C
+++ b/applications/utilities/thermophysical/adiabaticFlameT/adiabaticFlameT.C
@@ -186,7 +186,7 @@ int main(int argc, char *argv[])
Info<< nl << "end" << endl;
- return(0);
+ return 0;
}
diff --git a/applications/utilities/thermophysical/equilibriumFlameT/equilibriumFlameT.C b/applications/utilities/thermophysical/equilibriumFlameT/equilibriumFlameT.C
index 8d8b9f5e6ee..c2186b642df 100644
--- a/applications/utilities/thermophysical/equilibriumFlameT/equilibriumFlameT.C
+++ b/applications/utilities/thermophysical/equilibriumFlameT/equilibriumFlameT.C
@@ -273,7 +273,7 @@ int main(int argc, char *argv[])
Info<< nl << "end" << endl;
- return(0);
+ return 0;
}
diff --git a/applications/utilities/thermophysical/mixtureAdiabaticFlameT/mixtureAdiabaticFlameT.C b/applications/utilities/thermophysical/mixtureAdiabaticFlameT/mixtureAdiabaticFlameT.C
index 8b65251fd90..277a4e787fb 100644
--- a/applications/utilities/thermophysical/mixtureAdiabaticFlameT/mixtureAdiabaticFlameT.C
+++ b/applications/utilities/thermophysical/mixtureAdiabaticFlameT/mixtureAdiabaticFlameT.C
@@ -119,7 +119,7 @@ int main(int argc, char *argv[])
Info << "Adiabatic flame temperature of mixture " << rMix.name() << " = "
<< products.TH(reactants.H(T0), 1000.0) << " K" << endl;
- return(0);
+ return 0;
}
diff --git a/src/OpenFOAM/primitives/random/random.c b/src/OpenFOAM/primitives/random/random.c
index 71273fc4855..5421390cf0c 100644
--- a/src/OpenFOAM/primitives/random/random.c
+++ b/src/OpenFOAM/primitives/random/random.c
@@ -248,7 +248,7 @@ initstate(seed, arg_state, n)
if (n < BREAK_0) {
(void)fprintf(stderr,
"random: not enough state (%d bytes); ignored.\n", n);
- return(0);
+ return 0;
}
if (n < BREAK_1) {
rand_type = TYPE_0;
diff --git a/src/postProcessing/functionObjects/field/fieldAverage/controlDict b/src/postProcessing/functionObjects/field/fieldAverage/controlDict
index e45d47eb263..f9f34b9c058 100644
--- a/src/postProcessing/functionObjects/field/fieldAverage/controlDict
+++ b/src/postProcessing/functionObjects/field/fieldAverage/controlDict
@@ -45,7 +45,7 @@ timePrecision 6;
runTimeModifiable yes;
functions
-(
+{
fieldAverage1
{
// Type of functionObject
@@ -54,23 +54,24 @@ functions
// Where to load it from (if not already in solver)
functionObjectLibs ("libfieldAverage.so");
- // Fields to be averaged - runTime modifiable
+ // Fields to be averaged - runTime modifiable
fields
(
U
{
- mean on;
- prime2Mean on;
- base time;
+ mean on;
+ prime2Mean on;
+ base time;
}
+
p
{
- mean on;
- prime2Mean on;
- base time;
+ mean on;
+ prime2Mean on;
+ base time;
}
);
}
-);
+}
// ************************************************************************* //
diff --git a/tutorials/Lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam.C b/tutorials/Lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam.C
index 0028a30b5be..1082636303c 100644
--- a/tutorials/Lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam.C
+++ b/tutorials/Lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam.C
@@ -107,7 +107,7 @@ int main(int argc, char *argv[])
Info<< "End\n" << endl;
- return(0);
+ return 0;
}
diff --git a/tutorials/basic/potentialFoam/cylinder/analyticalCylinder/analyticalCylinder.C b/tutorials/basic/potentialFoam/cylinder/analyticalCylinder/analyticalCylinder.C
index 2b862843f00..5c3b671271f 100644
--- a/tutorials/basic/potentialFoam/cylinder/analyticalCylinder/analyticalCylinder.C
+++ b/tutorials/basic/potentialFoam/cylinder/analyticalCylinder/analyticalCylinder.C
@@ -64,7 +64,7 @@ int main(int argc, char *argv[])
Info<< "end" << endl;
- return(0);
+ return 0;
}
// ************************************************************************* //
diff --git a/tutorials/combustion/XiFoam/les/pitzDaily/system/controlDict b/tutorials/combustion/XiFoam/les/pitzDaily/system/controlDict
index 0d13ac7ba5c..bc4e09f5148 100644
--- a/tutorials/combustion/XiFoam/les/pitzDaily/system/controlDict
+++ b/tutorials/combustion/XiFoam/les/pitzDaily/system/controlDict
@@ -48,31 +48,31 @@ adjustTimeStep yes;
maxCo 0.5;
functions
-(
+{
fieldAverage1
{
- type fieldAverage;
+ type fieldAverage;
functionObjectLibs ( "libfieldFunctionObjects.so" );
- enabled true;
- outputControl outputTime;
+ enabled true;
+ outputControl outputTime;
fields
(
U
{
- mean on;
- prime2Mean on;
- base time;
+ mean on;
+ prime2Mean on;
+ base time;
}
p
{
- mean on;
- prime2Mean on;
- base time;
+ mean on;
+ prime2Mean on;
+ base time;
}
);
}
-);
+}
// ************************************************************************* //
diff --git a/tutorials/combustion/XiFoam/les/pitzDaily3D/system/controlDict b/tutorials/combustion/XiFoam/les/pitzDaily3D/system/controlDict
index 693d3e125f6..c507917d6c2 100644
--- a/tutorials/combustion/XiFoam/les/pitzDaily3D/system/controlDict
+++ b/tutorials/combustion/XiFoam/les/pitzDaily3D/system/controlDict
@@ -48,31 +48,31 @@ adjustTimeStep yes;
maxCo 0.5;
functions
-(
+{
fieldAverage1
{
- type fieldAverage;
+ type fieldAverage;
functionObjectLibs ( "libfieldFunctionObjects.so" );
- enabled true;
- outputControl outputTime;
+ enabled true;
+ outputControl outputTime;
fields
(
U
{
- mean on;
- prime2Mean on;
- base time;
+ mean on;
+ prime2Mean on;
+ base time;
}
p
{
- mean on;
- prime2Mean on;
- base time;
+ mean on;
+ prime2Mean on;
+ base time;
}
);
}
-);
+}
// ************************************************************************* //
diff --git a/tutorials/compressible/rhoPisoFoam/les/pitzDaily/system/controlDict b/tutorials/compressible/rhoPisoFoam/les/pitzDaily/system/controlDict
index c211c964aef..3fccde63c41 100644
--- a/tutorials/compressible/rhoPisoFoam/les/pitzDaily/system/controlDict
+++ b/tutorials/compressible/rhoPisoFoam/les/pitzDaily/system/controlDict
@@ -44,31 +44,31 @@ timePrecision 6;
runTimeModifiable yes;
functions
-(
+{
fieldAverage1
{
- type fieldAverage;
+ type fieldAverage;
functionObjectLibs ( "libfieldFunctionObjects.so" );
- enabled true;
- outputControl outputTime;
+ enabled true;
+ outputControl outputTime;
fields
(
U
{
- mean on;
- prime2Mean on;
- base time;
+ mean on;
+ prime2Mean on;
+ base time;
}
p
{
- mean on;
- prime2Mean on;
- base time;
+ mean on;
+ prime2Mean on;
+ base time;
}
);
}
-);
+}
// ************************************************************************* //
diff --git a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/system/controlDict b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/system/controlDict
index 2fe2edf6fac..ce2e9218c91 100644
--- a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/system/controlDict
+++ b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/system/controlDict
@@ -43,7 +43,26 @@ timePrecision 6;
runTimeModifiable yes;
-functions ( forces { type forceCoeffs ; functionObjectLibs ( "libforces.so" ) ; patches ( WALL10 ) ; pName p ; UName U ; log true ; rhoInf 1 ; CofR ( 0 0 0 ) ; liftDir ( -0.239733 0.970839 0 ) ; dragDir ( 0.970839 0.239733 0 ) ; pitchAxis ( 0 0 1 ) ; magUInf 618.022 ; lRef 1 ; Aref 1 ; } );
+functions
+{
+ forces
+ {
+ type forceCoeffs;
+ functionObjectLibs ( "libforces.so" );
+ patches ( WALL10 );
+ pName p;
+ UName U;
+ log true;
+ rhoInf 1;
+ CofR ( 0 0 0 );
+ liftDir ( -0.239733 0.970839 0 );
+ dragDir ( 0.970839 0.239733 0 );
+ pitchAxis ( 0 0 1 );
+ magUInf 618.022;
+ lRef 1;
+ Aref 1;
+ }
+}
// ************************************************************************* //
diff --git a/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/setHotRoom/setHotRoom.C b/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/setHotRoom/setHotRoom.C
index 7a039df40dc..aca68d4e1f1 100644
--- a/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/setHotRoom/setHotRoom.C
+++ b/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/setHotRoom/setHotRoom.C
@@ -88,7 +88,7 @@ forAll(Tpatches, patchI)
Info<< "End\n" << endl;
- return(0);
+ return 0;
}
}
diff --git a/tutorials/incompressible/MRFSimpleFoam/MRFSimpleFoam/MRFSimpleFoam.C b/tutorials/incompressible/MRFSimpleFoam/MRFSimpleFoam/MRFSimpleFoam.C
index 9fc36826fe6..004a92b45f5 100644
--- a/tutorials/incompressible/MRFSimpleFoam/MRFSimpleFoam/MRFSimpleFoam.C
+++ b/tutorials/incompressible/MRFSimpleFoam/MRFSimpleFoam/MRFSimpleFoam.C
@@ -52,9 +52,8 @@ int main(int argc, char *argv[])
Info<< "\nStarting time loop\n" << endl;
- while (runTime.run())
+ while (runTime.loop())
{
- runTime++;
Info<< "Time = " << runTime.timeName() << nl << endl;
# include "readSIMPLEControls.H"
@@ -123,7 +122,7 @@ int main(int argc, char *argv[])
Info<< "End\n" << endl;
- return(0);
+ return 0;
}
diff --git a/tutorials/incompressible/channelFoam/channel395/system/controlDict b/tutorials/incompressible/channelFoam/channel395/system/controlDict
index 2ca28c29a11..7af5dca9b62 100644
--- a/tutorials/incompressible/channelFoam/channel395/system/controlDict
+++ b/tutorials/incompressible/channelFoam/channel395/system/controlDict
@@ -43,7 +43,32 @@ timePrecision 6;
runTimeModifiable yes;
-functions ( fieldAverage1 { type fieldAverage ; functionObjectLibs ( "libfieldFunctionObjects.so" ) ; enabled true ; outputControl outputTime ; fields ( U { mean on ; prime2Mean on ; base time ; } p { mean on ; prime2Mean on ; base time ; } ) ; } );
+functions
+{
+ fieldAverage1
+ {
+ type fieldAverage;
+ functionObjectLibs ( "libfieldFunctionObjects.so" );
+ enabled true;
+ outputControl outputTime;
+ fields
+ (
+ U
+ {
+ mean on;
+ prime2Mean on;
+ base time;
+ }
+
+ p
+ {
+ mean on;
+ prime2Mean on;
+ base time;
+ }
+ );
+ }
+}
// ************************************************************************* //
diff --git a/tutorials/incompressible/pimpleFoam/t-junction/system/controlDict b/tutorials/incompressible/pimpleFoam/t-junction/system/controlDict
index e312fcb839f..a5ba827eec1 100644
--- a/tutorials/incompressible/pimpleFoam/t-junction/system/controlDict
+++ b/tutorials/incompressible/pimpleFoam/t-junction/system/controlDict
@@ -47,7 +47,23 @@ adjustTimeStep yes;
maxCo 5;
-functions ( probes { type probes ; functionObjectLibs ( "libsampling.so" ) ; name probes ; probeLocations ( ( 1e-06 0 0.01 ) ( 0.21 -0.20999 0.01 ) ( 0.21 0.20999 0.01 ) ( 0.21 0 0.01 ) ) ; fields ( p U ) ; } );
+functions
+{
+ probes
+ {
+ type probes;
+ name probes;
+ functionObjectLibs ( "libsampling.so" );
+ probeLocations
+ (
+ ( 1e-06 0 0.01 )
+ ( 0.21 -0.20999 0.01 )
+ ( 0.21 0.20999 0.01 )
+ ( 0.21 0 0.01 )
+ );
+ fields ( p U );
+ }
+}
// ************************************************************************* //
diff --git a/tutorials/incompressible/pisoFoam/les/pitzDaily/system/controlDict b/tutorials/incompressible/pisoFoam/les/pitzDaily/system/controlDict
index ba9c0f1c408..a4b46af8cc2 100644
--- a/tutorials/incompressible/pisoFoam/les/pitzDaily/system/controlDict
+++ b/tutorials/incompressible/pisoFoam/les/pitzDaily/system/controlDict
@@ -44,14 +44,14 @@ timePrecision 6;
runTimeModifiable yes;
functions
-(
+{
probes1
{
- type probes;
+ type probes;
functionObjectLibs ( "libsampling.so" );
- enabled true;
- outputControl timeStep;
- outputInterval 1;
+ enabled true;
+ outputControl timeStep;
+ outputInterval 1;
probeLocations
(
( 0.0254 0.0253 0 )
@@ -71,28 +71,28 @@ functions
fieldAverage1
{
- type fieldAverage;
+ type fieldAverage;
functionObjectLibs ( "libfieldFunctionObjects.so" );
- enabled true;
- outputControl outputTime;
+ enabled true;
+ outputControl outputTime;
fields
(
U
{
- mean on;
- prime2Mean on;
- base time;
+ mean on;
+ prime2Mean on;
+ base time;
}
p
{
- mean on;
- prime2Mean on;
- base time;
+ mean on;
+ prime2Mean on;
+ base time;
}
);
}
-);
+}
// ************************************************************************* //
diff --git a/tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/system/controlDict b/tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/system/controlDict
index 2f1e1a9074d..4f36f59c281 100644
--- a/tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/system/controlDict
+++ b/tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/system/controlDict
@@ -44,14 +44,14 @@ timePrecision 6;
runTimeModifiable yes;
functions
-(
+{
probes1
{
- type probes;
+ type probes;
functionObjectLibs ( "libsampling.so" );
- enabled true;
- outputControl timeStep;
- outputInterval 1;
+ enabled true;
+ outputControl timeStep;
+ outputInterval 1;
probeLocations
(
( 0.0254 0.0253 0 )
@@ -70,28 +70,28 @@ functions
fieldAverage1
{
- type fieldAverage;
+ type fieldAverage;
functionObjectLibs ( "libfieldFunctionObjects.so" );
- enabled true;
- outputControl outputTime;
+ enabled true;
+ outputControl outputTime;
fields
(
U
{
- mean on;
- prime2Mean on;
- base time;
+ mean on;
+ prime2Mean on;
+ base time;
}
p
{
- mean on;
- prime2Mean on;
- base time;
+ mean on;
+ prime2Mean on;
+ base time;
}
);
}
-);
+}
// ************************************************************************* //
diff --git a/tutorials/incompressible/simpleSRFFoam/simpleSRFFoam/simpleSRFFoam.C b/tutorials/incompressible/simpleSRFFoam/simpleSRFFoam/simpleSRFFoam.C
index fecc4cb717f..e0cc1cef1ad 100644
--- a/tutorials/incompressible/simpleSRFFoam/simpleSRFFoam/simpleSRFFoam.C
+++ b/tutorials/incompressible/simpleSRFFoam/simpleSRFFoam/simpleSRFFoam.C
@@ -53,9 +53,8 @@ int main(int argc, char *argv[])
Info<< "\nStarting time loop\n" << endl;
- while (runTime.run())
+ while (runTime.loop())
{
- runTime++;
Info<< "Time = " << runTime.timeName() << nl << endl;
# include "readSIMPLEControls.H"
@@ -99,7 +98,7 @@ int main(int argc, char *argv[])
Info<< "End\n" << endl;
- return(0);
+ return 0;
}
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle/system/controlDict b/tutorials/multiphase/cavitatingFoam/les/throttle/system/controlDict
index 073ada6caa4..2ba1fabc2b0 100644
--- a/tutorials/multiphase/cavitatingFoam/les/throttle/system/controlDict
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle/system/controlDict
@@ -48,38 +48,38 @@ maxCo 0.5;
maxAcousticCo 50;
functions
-(
+{
fieldAverage1
{
- type fieldAverage;
+ type fieldAverage;
functionObjectLibs ( "libfieldFunctionObjects.so" );
- enabled false;
- outputControl outputTime;
+ enabled false;
+ outputControl outputTime;
fields
(
U
{
- mean on;
- prime2Mean off;
- base time;
+ mean on;
+ prime2Mean off;
+ base time;
}
p
{
- mean on;
- prime2Mean off;
- base time;
+ mean on;
+ prime2Mean off;
+ base time;
}
gamma
{
- mean on;
- prime2Mean off;
- base time;
+ mean on;
+ prime2Mean off;
+ base time;
}
);
}
-);
+}
// ************************************************************************* //
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/controlDict b/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/controlDict
index 0b3c8764867..c87d60631d3 100644
--- a/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/controlDict
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/controlDict
@@ -48,38 +48,38 @@ maxCo 0.5;
maxAcousticCo 50;
functions
-(
+{
fieldAverage1
{
- type fieldAverage;
+ type fieldAverage;
functionObjectLibs ( "libfieldFunctionObjects.so" );
- enabled false;
- outputControl outputTime;
+ enabled false;
+ outputControl outputTime;
fields
(
U
{
- mean on;
- prime2Mean off;
- base time;
+ mean on;
+ prime2Mean off;
+ base time;
}
p
{
- mean on;
- prime2Mean off;
- base time ;
+ mean on;
+ prime2Mean off;
+ base time;
}
gamma
{
- mean on;
- prime2Mean off;
- base time;
+ mean on;
+ prime2Mean off;
+ base time;
}
);
}
-);
+}
// ************************************************************************* //
diff --git a/tutorials/multiphase/interDyMFoam/sloshingTank2D/system/controlDict b/tutorials/multiphase/interDyMFoam/sloshingTank2D/system/controlDict
index f533a54408a..e4a69588f6e 100644
--- a/tutorials/multiphase/interDyMFoam/sloshingTank2D/system/controlDict
+++ b/tutorials/multiphase/interDyMFoam/sloshingTank2D/system/controlDict
@@ -50,13 +50,13 @@ maxCo 0.5;
maxDeltaT 1;
functions
-(
+{
probes
{
- type probes;
- outputControl timeStep;
- outputInterval 1;
- name probes;
+ type probes;
+ name probes;
+ outputControl timeStep;
+ outputInterval 1;
probeLocations
(
( 0 9.95 19.77 )
@@ -70,11 +70,11 @@ functions
wallPressure
{
- type surfaces;
+ type surfaces;
functionObjectLibs ( "libsampling.so" );
- outputControl timeStep;
- outputInterval 10;
- surfaceFormat raw;
+ outputControl timeStep;
+ outputInterval 10;
+ surfaceFormat raw;
fields
(
p
@@ -84,13 +84,13 @@ functions
(
walls
{
- type patch;
- patchName walls;
+ type patch;
+ patchName walls;
triangulate false;
}
);
}
-);
+}
// ************************************************************************* //
diff --git a/tutorials/multiphase/interDyMFoam/sloshingTank2D3DoF/system/controlDict b/tutorials/multiphase/interDyMFoam/sloshingTank2D3DoF/system/controlDict
index a4e44f2de31..9fe32ebf04f 100644
--- a/tutorials/multiphase/interDyMFoam/sloshingTank2D3DoF/system/controlDict
+++ b/tutorials/multiphase/interDyMFoam/sloshingTank2D3DoF/system/controlDict
@@ -50,13 +50,13 @@ maxCo 0.5;
maxDeltaT 1;
functions
-(
+{
probes
{
- type probes;
- outputControl timeStep;
- outputInterval 10;
- name probes;
+ type probes;
+ name probes;
+ outputControl timeStep;
+ outputInterval 10;
probeLocations
(
( 0 9.95 19.77 )
@@ -70,11 +70,11 @@ functions
wallPressure
{
- type surfaces;
+ type surfaces;
functionObjectLibs ( "libsampling.so" );
- outputControl timeStep;
- outputInterval 10;
- surfaceFormat raw;
+ outputControl timeStep;
+ outputInterval 10;
+ surfaceFormat raw;
fields
(
p
@@ -83,13 +83,13 @@ functions
(
walls
{
- type patch;
- patchName walls;
+ type patch;
+ patchName walls;
triangulate false;
}
);
}
-);
+}
// ************************************************************************* //
diff --git a/tutorials/multiphase/interDyMFoam/sloshingTank3D/system/controlDict b/tutorials/multiphase/interDyMFoam/sloshingTank3D/system/controlDict
index 1b122632d3a..5823d9fbbda 100644
--- a/tutorials/multiphase/interDyMFoam/sloshingTank3D/system/controlDict
+++ b/tutorials/multiphase/interDyMFoam/sloshingTank3D/system/controlDict
@@ -50,13 +50,13 @@ maxCo 0.5;
maxDeltaT 1;
functions
-(
+{
probes
{
- type probes;
- outputControl timeStep;
- outputInterval 1;
- name probes;
+ type probes;
+ name probes;
+ outputControl timeStep;
+ outputInterval 1;
probeLocations
(
( 0 9.95 19.77 )
@@ -67,7 +67,7 @@ functions
p
);
}
-);
+}
// ************************************************************************* //
diff --git a/tutorials/multiphase/interDyMFoam/sloshingTank3D3DoF/system/controlDict b/tutorials/multiphase/interDyMFoam/sloshingTank3D3DoF/system/controlDict
index 1b122632d3a..5823d9fbbda 100644
--- a/tutorials/multiphase/interDyMFoam/sloshingTank3D3DoF/system/controlDict
+++ b/tutorials/multiphase/interDyMFoam/sloshingTank3D3DoF/system/controlDict
@@ -50,13 +50,13 @@ maxCo 0.5;
maxDeltaT 1;
functions
-(
+{
probes
{
- type probes;
- outputControl timeStep;
- outputInterval 1;
- name probes;
+ type probes;
+ name probes;
+ outputControl timeStep;
+ outputInterval 1;
probeLocations
(
( 0 9.95 19.77 )
@@ -67,7 +67,7 @@ functions
p
);
}
-);
+}
// ************************************************************************* //
diff --git a/tutorials/multiphase/interDyMFoam/sloshingTank3D6DoF/system/controlDict b/tutorials/multiphase/interDyMFoam/sloshingTank3D6DoF/system/controlDict
index 1b122632d3a..5823d9fbbda 100644
--- a/tutorials/multiphase/interDyMFoam/sloshingTank3D6DoF/system/controlDict
+++ b/tutorials/multiphase/interDyMFoam/sloshingTank3D6DoF/system/controlDict
@@ -50,13 +50,13 @@ maxCo 0.5;
maxDeltaT 1;
functions
-(
+{
probes
{
- type probes;
- outputControl timeStep;
- outputInterval 1;
- name probes;
+ type probes;
+ name probes;
+ outputControl timeStep;
+ outputInterval 1;
probeLocations
(
( 0 9.95 19.77 )
@@ -67,7 +67,7 @@ functions
p
);
}
-);
+}
// ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed/system/controlDict b/tutorials/multiphase/twoPhaseEulerFoam/bed/system/controlDict
index 766cb875959..8fc8f276690 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/bed/system/controlDict
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bed/system/controlDict
@@ -50,41 +50,44 @@ maxCo 0.5;
maxDeltaT 1;
functions
-(
+{
fieldAverage1
{
- type fieldAverage;
+ type fieldAverage;
functionObjectLibs ( "libfieldFunctionObjects.so" );
- outputControl outputTime;
+ outputControl outputTime;
fields
(
Ua
{
- mean on;
- prime2Mean off;
- base time;
+ mean on;
+ prime2Mean off;
+ base time;
}
+
Ub
{
- mean on;
- prime2Mean off;
- base time;
+ mean on;
+ prime2Mean off;
+ base time;
}
+
alpha
{
- mean on;
- prime2Mean off;
- base time;
+ mean on;
+ prime2Mean off;
+ base time;
}
+
p
{
- mean on;
- prime2Mean off;
- base time;
+ mean on;
+ prime2Mean off;
+ base time;
}
);
}
-);
+}
// ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed2/system/controlDict b/tutorials/multiphase/twoPhaseEulerFoam/bed2/system/controlDict
index e4d35359ada..d5eaba87fe3 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/bed2/system/controlDict
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bed2/system/controlDict
@@ -50,41 +50,44 @@ maxCo 0.9;
maxDeltaT 1e-05;
functions
-(
+{
fieldAverage1
{
- type fieldAverage;
+ type fieldAverage;
functionObjectLibs ( "libfieldFunctionObjects.so" );
- outputControl outputTime;
+ outputControl outputTime;
fields
(
Ua
{
- mean on;
- prime2Mean off;
- base time;
+ mean on;
+ prime2Mean off;
+ base time;
}
+
Ub
{
- mean on;
- prime2Mean off;
- base time;
+ mean on;
+ prime2Mean off;
+ base time;
}
+
alpha
{
- mean on;
- prime2Mean off;
- base time;
+ mean on;
+ prime2Mean off;
+ base time;
}
+
p
{
- mean on;
- prime2Mean off;
- base time;
+ mean on;
+ prime2Mean off;
+ base time;
}
);
}
-);
+}
// ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/system/controlDict b/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/system/controlDict
index d0f78bb5059..1b724308f14 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/system/controlDict
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/system/controlDict
@@ -50,41 +50,44 @@ maxCo 0.5;
maxDeltaT 1;
functions
-(
+{
fieldAverage1
{
- type fieldAverage;
+ type fieldAverage;
functionObjectLibs ( "libfieldFunctionObjects.so" );
- outputControl outputTime;
+ outputControl outputTime;
fields
(
Ua
{
- mean on;
- prime2Mean off;
- base time;
+ mean on;
+ prime2Mean off;
+ base time;
}
+
Ub
{
- mean on;
- prime2Mean off;
- base time;
+ mean on;
+ prime2Mean off;
+ base time;
}
+
alpha
{
- mean on;
- prime2Mean off;
- base time;
+ mean on;
+ prime2Mean off;
+ base time;
}
+
p
{
- mean on;
- prime2Mean off;
- base time;
+ mean on;
+ prime2Mean off;
+ base time;
}
);
}
-);
+}
// ************************************************************************* //
--
GitLab