From c2256e51f35954cd430acfe9720de995ad68508d Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@Germany>
Date: Tue, 17 Feb 2009 08:47:42 +0100
Subject: [PATCH] change solvers, utilities, etc. to use while (..)
time-looping idiom
- this (now deprecated) idiom:
for (runTime++; !runTime.end(); runTime++) { ... }
has a few problems:
* stop-on-next-write will be off-by-one (ie, doesn't work)
* function objects are not executed on exit with runTime.end()
Fixing these problems is not really possible.
- this idiom
while (runTime.run())
{
runTime++;
...
}
works without the above problems.
---
applications/solvers/DNS/dnsFoam/dnsFoam.C | 3 ++-
applications/solvers/basic/laplacianFoam/laplacianFoam.C | 3 ++-
.../solvers/basic/scalarTransportFoam/scalarTransportFoam.C | 3 ++-
applications/solvers/combustion/dieselFoam/dieselFoam.C | 2 +-
.../compressible/rhoPorousSimpleFoam/rhoPorousSimpleFoam.C | 3 ++-
.../solvers/compressible/rhoSimpleFoam/rhoSimpleFoam.C | 3 ++-
applications/solvers/compressible/rhoSonicFoam/rhoSonicFoam.C | 3 ++-
.../solvers/compressible/rhopSonicFoam/rhopSonicFoam.C | 3 ++-
applications/solvers/compressible/sonicDyMFoam/sonicDyMFoam.C | 3 ++-
applications/solvers/compressible/sonicFoam/sonicFoam.C | 3 ++-
.../solvers/compressible/sonicLiquidFoam/sonicLiquidFoam.C | 3 ++-
.../electromagnetics/electrostaticFoam/electrostaticFoam.C | 3 ++-
applications/solvers/electromagnetics/mhdFoam/mhdFoam.C | 3 ++-
applications/solvers/financial/financialFoam/financialFoam.C | 3 ++-
.../heatTransfer/buoyantBoussinesqFoam/buoyantBoussinesqFoam.C | 3 ++-
.../buoyantBoussinesqSimpleFoam/buoyantBoussinesqSimpleFoam.C | 3 ++-
.../solvers/heatTransfer/buoyantSimpleFoam/buoyantSimpleFoam.C | 3 ++-
.../buoyantSimpleRadiationFoam/buoyantSimpleRadiationFoam.C | 3 ++-
.../heatTransfer/chtMultiRegionFoam/chtMultiRegionFoam.C | 2 +-
.../solvers/incompressible/boundaryFoam/boundaryFoam.C | 3 ++-
applications/solvers/incompressible/channelFoam/channelFoam.C | 3 ++-
applications/solvers/incompressible/icoFoam/icoFoam.C | 3 ++-
.../incompressible/nonNewtonianIcoFoam/nonNewtonianIcoFoam.C | 3 ++-
applications/solvers/incompressible/pisoFoam/pisoFoam.C | 3 ++-
applications/solvers/incompressible/simpleFoam/simpleFoam.C | 3 ++-
applications/solvers/multiphase/bubbleFoam/bubbleFoam.C | 3 ++-
applications/solvers/multiphase/settlingFoam/settlingFoam.C | 3 ++-
.../multiphase/twoLiquidMixingFoam/twoLiquidMixingFoam.C | 3 ++-
.../solidDisplacementFoam/solidDisplacementFoam.C | 3 ++-
.../solidEquilibriumDisplacementFoam.C | 3 ++-
applications/test/LduMatrix/LduMatrixTest3.C | 3 ++-
applications/test/nearWallDist-wave/testWallDist2.C | 3 ++-
.../mesh/manipulation/moveDynamicMesh/moveDynamicMesh.C | 3 ++-
.../mesh/manipulation/moveEngineMesh/moveEngineMesh.C | 3 ++-
applications/utilities/mesh/manipulation/moveMesh/moveMesh.C | 3 ++-
tutorials/MRFSimpleFoam/MRFSimpleFoam/MRFSimpleFoam.C | 3 ++-
tutorials/simpleSRFFoam/simpleSRFFoam/simpleSRFFoam.C | 3 ++-
37 files changed, 72 insertions(+), 37 deletions(-)
diff --git a/applications/solvers/DNS/dnsFoam/dnsFoam.C b/applications/solvers/DNS/dnsFoam/dnsFoam.C
index 277a78002d1..cc41c039693 100644
--- a/applications/solvers/DNS/dnsFoam/dnsFoam.C
+++ b/applications/solvers/DNS/dnsFoam/dnsFoam.C
@@ -55,8 +55,9 @@ int main(int argc, char *argv[])
Info<< nl << "Starting time loop" << endl;
- for (runTime++; !runTime.end(); runTime++)
+ while (runTime.run())
{
+ runTime++;
Info<< "Time = " << runTime.timeName() << nl << endl;
# include "readPISOControls.H"
diff --git a/applications/solvers/basic/laplacianFoam/laplacianFoam.C b/applications/solvers/basic/laplacianFoam/laplacianFoam.C
index 4a804d01bb2..5b56c72a8c9 100644
--- a/applications/solvers/basic/laplacianFoam/laplacianFoam.C
+++ b/applications/solvers/basic/laplacianFoam/laplacianFoam.C
@@ -48,8 +48,9 @@ int main(int argc, char *argv[])
Info<< "\nCalculating temperature distribution\n" << endl;
- for (runTime++; !runTime.end(); runTime++)
+ while (runTime.run())
{
+ runTime++;
Info<< "Time = " << runTime.timeName() << nl << endl;
# include "readSIMPLEControls.H"
diff --git a/applications/solvers/basic/scalarTransportFoam/scalarTransportFoam.C b/applications/solvers/basic/scalarTransportFoam/scalarTransportFoam.C
index d2d2eb4e6db..ad0107319f8 100644
--- a/applications/solvers/basic/scalarTransportFoam/scalarTransportFoam.C
+++ b/applications/solvers/basic/scalarTransportFoam/scalarTransportFoam.C
@@ -50,8 +50,9 @@ int main(int argc, char *argv[])
# include "CourantNo.H"
- for (runTime++; !runTime.end(); runTime++)
+ while (runTime.run())
{
+ runTime++;
Info<< "Time = " << runTime.timeName() << nl << endl;
# include "readSIMPLEControls.H"
diff --git a/applications/solvers/combustion/dieselFoam/dieselFoam.C b/applications/solvers/combustion/dieselFoam/dieselFoam.C
index 64df8bcc8fd..4c41a0db2d7 100644
--- a/applications/solvers/combustion/dieselFoam/dieselFoam.C
+++ b/applications/solvers/combustion/dieselFoam/dieselFoam.C
@@ -63,7 +63,7 @@ int main(int argc, char *argv[])
Info << "\nStarting time loop\n" << endl;
- while(runTime.run())
+ while (runTime.run())
{
# include "readPISOControls.H"
# include "compressibleCourantNo.H"
diff --git a/applications/solvers/compressible/rhoPorousSimpleFoam/rhoPorousSimpleFoam.C b/applications/solvers/compressible/rhoPorousSimpleFoam/rhoPorousSimpleFoam.C
index b0bd54d3b3f..b1b11a7cec9 100644
--- a/applications/solvers/compressible/rhoPorousSimpleFoam/rhoPorousSimpleFoam.C
+++ b/applications/solvers/compressible/rhoPorousSimpleFoam/rhoPorousSimpleFoam.C
@@ -51,8 +51,9 @@ int main(int argc, char *argv[])
Info<< "\nStarting time loop\n" << endl;
- for (runTime++; !runTime.end(); runTime++)
+ while (runTime.run())
{
+ 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 ba2b0afd606..d985abe25d8 100644
--- a/applications/solvers/compressible/rhoSimpleFoam/rhoSimpleFoam.C
+++ b/applications/solvers/compressible/rhoSimpleFoam/rhoSimpleFoam.C
@@ -49,8 +49,9 @@ int main(int argc, char *argv[])
Info<< "\nStarting time loop\n" << endl;
- for (runTime++; !runTime.end(); runTime++)
+ while (runTime.run())
{
+ 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 662a4f0ad30..b4bdc9e4933 100644
--- a/applications/solvers/compressible/rhoSonicFoam/rhoSonicFoam.C
+++ b/applications/solvers/compressible/rhoSonicFoam/rhoSonicFoam.C
@@ -47,8 +47,9 @@ int main(int argc, char *argv[])
Info<< "\nStarting time loop\n" << endl;
- for (runTime++; !runTime.end(); runTime++)
+ while (runTime.run())
{
+ runTime++;
Info<< "Time = " << runTime.timeName() << nl << endl;
surfaceScalarField phiv
diff --git a/applications/solvers/compressible/rhopSonicFoam/rhopSonicFoam.C b/applications/solvers/compressible/rhopSonicFoam/rhopSonicFoam.C
index b1be4d711ee..b3f1c8e06d4 100644
--- a/applications/solvers/compressible/rhopSonicFoam/rhopSonicFoam.C
+++ b/applications/solvers/compressible/rhopSonicFoam/rhopSonicFoam.C
@@ -53,8 +53,9 @@ int main(int argc, char *argv[])
Info<< "\nStarting time loop\n" << endl;
- for (runTime++; !runTime.end(); runTime++)
+ while (runTime.run())
{
+ runTime++;
Info<< "Time = " << runTime.value() << nl << endl;
# include "readPISOControls.H"
diff --git a/applications/solvers/compressible/sonicDyMFoam/sonicDyMFoam.C b/applications/solvers/compressible/sonicDyMFoam/sonicDyMFoam.C
index 34faaf78fac..593bc742cf9 100644
--- a/applications/solvers/compressible/sonicDyMFoam/sonicDyMFoam.C
+++ b/applications/solvers/compressible/sonicDyMFoam/sonicDyMFoam.C
@@ -52,8 +52,9 @@ int main(int argc, char *argv[])
autoPtr<Foam::motionSolver> motionPtr = motionSolver::New(mesh);
- for (runTime++; !runTime.end(); runTime++)
+ while (runTime.run())
{
+ runTime++;
Info<< "Time = " << runTime.timeName() << nl << endl;
#include "readPISOControls.H"
diff --git a/applications/solvers/compressible/sonicFoam/sonicFoam.C b/applications/solvers/compressible/sonicFoam/sonicFoam.C
index 08d1f85fec0..741141c1c4e 100644
--- a/applications/solvers/compressible/sonicFoam/sonicFoam.C
+++ b/applications/solvers/compressible/sonicFoam/sonicFoam.C
@@ -49,8 +49,9 @@ int main(int argc, char *argv[])
Info<< "\nStarting time loop\n" << endl;
- for (runTime++; !runTime.end(); runTime++)
+ while (runTime.run())
{
+ runTime++;
Info<< "Time = " << runTime.timeName() << nl << endl;
#include "readPISOControls.H"
diff --git a/applications/solvers/compressible/sonicLiquidFoam/sonicLiquidFoam.C b/applications/solvers/compressible/sonicLiquidFoam/sonicLiquidFoam.C
index 90243b2322c..87dcf947b03 100644
--- a/applications/solvers/compressible/sonicLiquidFoam/sonicLiquidFoam.C
+++ b/applications/solvers/compressible/sonicLiquidFoam/sonicLiquidFoam.C
@@ -50,8 +50,9 @@ int main(int argc, char *argv[])
Info<< "\nStarting time loop\n" << endl;
- for (runTime++; !runTime.end(); runTime++)
+ while (runTime.run())
{
+ runTime++;
Info<< "Time = " << runTime.timeName() << nl << endl;
# include "readPISOControls.H"
diff --git a/applications/solvers/electromagnetics/electrostaticFoam/electrostaticFoam.C b/applications/solvers/electromagnetics/electrostaticFoam/electrostaticFoam.C
index 13438974ac8..11daf2e0b4a 100644
--- a/applications/solvers/electromagnetics/electrostaticFoam/electrostaticFoam.C
+++ b/applications/solvers/electromagnetics/electrostaticFoam/electrostaticFoam.C
@@ -47,8 +47,9 @@ int main(int argc, char *argv[])
Info<< "\nStarting iteration loop\n" << endl;
- for (runTime++; !runTime.end(); runTime++)
+ while (runTime.run())
{
+ runTime++;
Info<< "Iteration = " << runTime.timeName() << nl << endl;
solve
diff --git a/applications/solvers/electromagnetics/mhdFoam/mhdFoam.C b/applications/solvers/electromagnetics/mhdFoam/mhdFoam.C
index 9da017da3a7..e121150c7a3 100644
--- a/applications/solvers/electromagnetics/mhdFoam/mhdFoam.C
+++ b/applications/solvers/electromagnetics/mhdFoam/mhdFoam.C
@@ -71,8 +71,9 @@ int main(int argc, char *argv[])
Info<< nl << "Starting time loop" << endl;
- for (runTime++; !runTime.end(); runTime++)
+ while (runTime.run())
{
+ runTime++;
# include "readPISOControls.H"
# include "readBPISOControls.H"
diff --git a/applications/solvers/financial/financialFoam/financialFoam.C b/applications/solvers/financial/financialFoam/financialFoam.C
index eabbafaf739..9edd07a8d0a 100644
--- a/applications/solvers/financial/financialFoam/financialFoam.C
+++ b/applications/solvers/financial/financialFoam/financialFoam.C
@@ -55,8 +55,9 @@ int main(int argc, char *argv[])
Info<< "Starting time loop\n" << endl;
- for (runTime++; !runTime.end(); runTime++)
+ while (runTime.run())
{
+ runTime++;
delta == fvc::grad(V)().component(Foam::vector::X);
solve
diff --git a/applications/solvers/heatTransfer/buoyantBoussinesqFoam/buoyantBoussinesqFoam.C b/applications/solvers/heatTransfer/buoyantBoussinesqFoam/buoyantBoussinesqFoam.C
index 72aab39ac04..db767bb0c91 100644
--- a/applications/solvers/heatTransfer/buoyantBoussinesqFoam/buoyantBoussinesqFoam.C
+++ b/applications/solvers/heatTransfer/buoyantBoussinesqFoam/buoyantBoussinesqFoam.C
@@ -69,8 +69,9 @@ int main(int argc, char *argv[])
Info<< "\nStarting time loop\n" << endl;
- for (runTime++; !runTime.end(); runTime++)
+ while (runTime.run())
{
+ 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 5e9deff7644..c8e62813e8f 100644
--- a/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/buoyantBoussinesqSimpleFoam.C
+++ b/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/buoyantBoussinesqSimpleFoam.C
@@ -66,8 +66,9 @@ int main(int argc, char *argv[])
Info<< "\nStarting time loop\n" << endl;
- for (runTime++; !runTime.end(); runTime++)
+ while (runTime.run())
{
+ 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 ebe0f4579a2..e9c48b937f8 100644
--- a/applications/solvers/heatTransfer/buoyantSimpleFoam/buoyantSimpleFoam.C
+++ b/applications/solvers/heatTransfer/buoyantSimpleFoam/buoyantSimpleFoam.C
@@ -51,8 +51,9 @@ int main(int argc, char *argv[])
Info<< "\nStarting time loop\n" << endl;
- for (runTime++; !runTime.end(); runTime++)
+ while (runTime.run())
{
+ 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 21059f50649..21e4912ae70 100644
--- a/applications/solvers/heatTransfer/buoyantSimpleRadiationFoam/buoyantSimpleRadiationFoam.C
+++ b/applications/solvers/heatTransfer/buoyantSimpleRadiationFoam/buoyantSimpleRadiationFoam.C
@@ -54,8 +54,9 @@ int main(int argc, char *argv[])
Info<< "\nStarting time loop\n" << endl;
- for (runTime++; !runTime.end(); runTime++)
+ while (runTime.run())
{
+ 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 84c7c118063..8a19fd0264c 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionFoam.C
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionFoam.C
@@ -64,7 +64,7 @@ int main(int argc, char *argv[])
# include "setInitialDeltaT.H"
}
- while(runTime.run())
+ while (runTime.run())
{
# include "readTimeControls.H"
diff --git a/applications/solvers/incompressible/boundaryFoam/boundaryFoam.C b/applications/solvers/incompressible/boundaryFoam/boundaryFoam.C
index a8e063c2dbc..2360fb6677c 100644
--- a/applications/solvers/incompressible/boundaryFoam/boundaryFoam.C
+++ b/applications/solvers/incompressible/boundaryFoam/boundaryFoam.C
@@ -58,8 +58,9 @@ int main(int argc, char *argv[])
Info<< "\nStarting time loop\n" << endl;
- for (runTime++; !runTime.end(); runTime++)
+ while (runTime.run())
{
+ runTime++;
Info<< "Time = " << runTime.timeName() << nl << endl;
fvVectorMatrix divR = turbulence->divDevReff(U);
diff --git a/applications/solvers/incompressible/channelFoam/channelFoam.C b/applications/solvers/incompressible/channelFoam/channelFoam.C
index fe245ed82db..94d8f4acd4d 100644
--- a/applications/solvers/incompressible/channelFoam/channelFoam.C
+++ b/applications/solvers/incompressible/channelFoam/channelFoam.C
@@ -51,8 +51,9 @@ int main(int argc, char *argv[])
Info<< "\nStarting time loop\n" << endl;
- for(runTime++; !runTime.end(); runTime++)
+ while (runTime.run())
{
+ runTime++;
Info<< "Time = " << runTime.timeName() << nl << endl;
#include "readPISOControls.H"
diff --git a/applications/solvers/incompressible/icoFoam/icoFoam.C b/applications/solvers/incompressible/icoFoam/icoFoam.C
index 993f328905e..d8c549668f5 100644
--- a/applications/solvers/incompressible/icoFoam/icoFoam.C
+++ b/applications/solvers/incompressible/icoFoam/icoFoam.C
@@ -48,8 +48,9 @@ int main(int argc, char *argv[])
Info<< "\nStarting time loop\n" << endl;
- for (runTime++; !runTime.end(); runTime++)
+ while (runTime.run())
{
+ runTime++;
Info<< "Time = " << runTime.timeName() << nl << endl;
# include "readPISOControls.H"
diff --git a/applications/solvers/incompressible/nonNewtonianIcoFoam/nonNewtonianIcoFoam.C b/applications/solvers/incompressible/nonNewtonianIcoFoam/nonNewtonianIcoFoam.C
index b1ce2450174..f949b39cfc6 100644
--- a/applications/solvers/incompressible/nonNewtonianIcoFoam/nonNewtonianIcoFoam.C
+++ b/applications/solvers/incompressible/nonNewtonianIcoFoam/nonNewtonianIcoFoam.C
@@ -49,8 +49,9 @@ int main(int argc, char *argv[])
Info<< "\nStarting time loop\n" << endl;
- for (runTime++; !runTime.end(); runTime++)
+ while (runTime.run())
{
+ runTime++;
Info<< "Time = " << runTime.timeName() << nl << endl;
# include "readPISOControls.H"
diff --git a/applications/solvers/incompressible/pisoFoam/pisoFoam.C b/applications/solvers/incompressible/pisoFoam/pisoFoam.C
index 01b349e9fa0..95b4bc0843c 100644
--- a/applications/solvers/incompressible/pisoFoam/pisoFoam.C
+++ b/applications/solvers/incompressible/pisoFoam/pisoFoam.C
@@ -52,8 +52,9 @@ int main(int argc, char *argv[])
Info<< "\nStarting time loop\n" << endl;
- for (runTime++; !runTime.end(); runTime++)
+ while (runTime.run())
{
+ runTime++;
Info<< "Time = " << runTime.timeName() << nl << endl;
# include "readPISOControls.H"
diff --git a/applications/solvers/incompressible/simpleFoam/simpleFoam.C b/applications/solvers/incompressible/simpleFoam/simpleFoam.C
index d5b99e33ea5..ec0515aa19e 100644
--- a/applications/solvers/incompressible/simpleFoam/simpleFoam.C
+++ b/applications/solvers/incompressible/simpleFoam/simpleFoam.C
@@ -49,8 +49,9 @@ int main(int argc, char *argv[])
Info<< "\nStarting time loop\n" << endl;
- for (runTime++; !runTime.end(); runTime++)
+ while (runTime.run())
{
+ runTime++;
Info<< "Time = " << runTime.timeName() << nl << endl;
# include "readSIMPLEControls.H"
diff --git a/applications/solvers/multiphase/bubbleFoam/bubbleFoam.C b/applications/solvers/multiphase/bubbleFoam/bubbleFoam.C
index 4344f5d4719..4a6f845fd89 100644
--- a/applications/solvers/multiphase/bubbleFoam/bubbleFoam.C
+++ b/applications/solvers/multiphase/bubbleFoam/bubbleFoam.C
@@ -53,8 +53,9 @@ int main(int argc, char *argv[])
Info<< "\nStarting time loop\n" << endl;
- for (runTime++; !runTime.end(); runTime++)
+ while (runTime.run())
{
+ runTime++;
Info<< "Time = " << runTime.timeName() << nl << endl;
# include "readBubbleFoamControls.H"
diff --git a/applications/solvers/multiphase/settlingFoam/settlingFoam.C b/applications/solvers/multiphase/settlingFoam/settlingFoam.C
index 70fe56a37c0..a43dd5408b7 100644
--- a/applications/solvers/multiphase/settlingFoam/settlingFoam.C
+++ b/applications/solvers/multiphase/settlingFoam/settlingFoam.C
@@ -57,8 +57,9 @@ int main(int argc, char *argv[])
Info<< "\nStarting time loop\n" << endl;
- for (runTime++; !runTime.end(); runTime++)
+ while (runTime.run())
{
+ runTime++;
Info<< "Time = " << runTime.timeName() << nl << endl;
# include "readPISOControls.H"
diff --git a/applications/solvers/multiphase/twoLiquidMixingFoam/twoLiquidMixingFoam.C b/applications/solvers/multiphase/twoLiquidMixingFoam/twoLiquidMixingFoam.C
index 6501f24a503..dbc8b2774f5 100644
--- a/applications/solvers/multiphase/twoLiquidMixingFoam/twoLiquidMixingFoam.C
+++ b/applications/solvers/multiphase/twoLiquidMixingFoam/twoLiquidMixingFoam.C
@@ -52,8 +52,9 @@ int main(int argc, char *argv[])
Info<< "\nStarting time loop\n" << endl;
- for (runTime++; !runTime.end(); runTime++)
+ while (runTime.run())
{
+ runTime++;
Info<< "Time = " << runTime.timeName() << nl << endl;
# include "readPISOControls.H"
diff --git a/applications/solvers/stressAnalysis/solidDisplacementFoam/solidDisplacementFoam.C b/applications/solvers/stressAnalysis/solidDisplacementFoam/solidDisplacementFoam.C
index 4405652cd40..afa3c660010 100644
--- a/applications/solvers/stressAnalysis/solidDisplacementFoam/solidDisplacementFoam.C
+++ b/applications/solvers/stressAnalysis/solidDisplacementFoam/solidDisplacementFoam.C
@@ -57,8 +57,9 @@ int main(int argc, char *argv[])
Info<< "\nCalculating displacement field\n" << endl;
- for (runTime++; !runTime.end(); runTime++)
+ while (runTime.run())
{
+ runTime++;
Info<< "Iteration: " << runTime.value() << nl << endl;
# include "readSolidDisplacementFoamControls.H"
diff --git a/applications/solvers/stressAnalysis/solidEquilibriumDisplacementFoam/solidEquilibriumDisplacementFoam.C b/applications/solvers/stressAnalysis/solidEquilibriumDisplacementFoam/solidEquilibriumDisplacementFoam.C
index f0f93112b9d..00a98b25310 100644
--- a/applications/solvers/stressAnalysis/solidEquilibriumDisplacementFoam/solidEquilibriumDisplacementFoam.C
+++ b/applications/solvers/stressAnalysis/solidEquilibriumDisplacementFoam/solidEquilibriumDisplacementFoam.C
@@ -55,8 +55,9 @@ int main(int argc, char *argv[])
Info<< "\nCalculating displacement field\n" << endl;
- for (runTime++; !runTime.end(); runTime++)
+ while (runTime.run())
{
+ runTime++;
Info<< "Iteration: " << runTime.value() << nl << endl;
# include "readSteadyStressFoamControls.H"
diff --git a/applications/test/LduMatrix/LduMatrixTest3.C b/applications/test/LduMatrix/LduMatrixTest3.C
index 18f3a7391fe..729bc593295 100644
--- a/applications/test/LduMatrix/LduMatrixTest3.C
+++ b/applications/test/LduMatrix/LduMatrixTest3.C
@@ -53,8 +53,9 @@ int main(int argc, char *argv[])
Info<< "\nStarting time loop\n" << endl;
- for (runTime++; !runTime.end(); runTime++)
+ while (runTime.run())
{
+ runTime++;
Info<< "Time = " << runTime.timeName() << nl << endl;
# include "readPISOControls.H"
diff --git a/applications/test/nearWallDist-wave/testWallDist2.C b/applications/test/nearWallDist-wave/testWallDist2.C
index c84b7fb118c..304cdba3d65 100644
--- a/applications/test/nearWallDist-wave/testWallDist2.C
+++ b/applications/test/nearWallDist-wave/testWallDist2.C
@@ -120,8 +120,9 @@ int main(int argc, char *argv[])
Info<< "\nStarting time loop\n" << endl;
- for (runTime++; !runTime.end(); runTime++)
+ while (runTime.run())
{
+ runTime++;
Info<< "Time = " << runTime.timeName() << endl;
diff --git a/applications/utilities/mesh/manipulation/moveDynamicMesh/moveDynamicMesh.C b/applications/utilities/mesh/manipulation/moveDynamicMesh/moveDynamicMesh.C
index 1e2ec46744c..64d65e3affa 100644
--- a/applications/utilities/mesh/manipulation/moveDynamicMesh/moveDynamicMesh.C
+++ b/applications/utilities/mesh/manipulation/moveDynamicMesh/moveDynamicMesh.C
@@ -46,8 +46,9 @@ int main(int argc, char *argv[])
# include "createTime.H"
# include "createDynamicFvMesh.H"
- for (runTime++; !runTime.end(); runTime++)
+ while (runTime.run())
{
+ 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 75cd8ef583d..a10782b553c 100644
--- a/applications/utilities/mesh/manipulation/moveEngineMesh/moveEngineMesh.C
+++ b/applications/utilities/mesh/manipulation/moveEngineMesh/moveEngineMesh.C
@@ -47,8 +47,9 @@ int main(int argc, char *argv[])
Info<< "\nStarting time loop\n" << endl;
- for (runTime++; !runTime.end(); runTime++)
+ while (runTime.run())
{
+ runTime++;
Info<< "Time = " << runTime.theta() << " CA-deg\n" << endl;
mesh.move();
diff --git a/applications/utilities/mesh/manipulation/moveMesh/moveMesh.C b/applications/utilities/mesh/manipulation/moveMesh/moveMesh.C
index da82839b1b7..82e6e45a752 100644
--- a/applications/utilities/mesh/manipulation/moveMesh/moveMesh.C
+++ b/applications/utilities/mesh/manipulation/moveMesh/moveMesh.C
@@ -46,8 +46,9 @@ int main(int argc, char *argv[])
autoPtr<Foam::motionSolver> motionPtr = motionSolver::New(mesh);
- for (runTime++; !runTime.end(); runTime++)
+ while (runTime.run())
{
+ runTime++;
Info<< "Time = " << runTime.timeName() << endl;
mesh.movePoints(motionPtr->newPoints());
diff --git a/tutorials/MRFSimpleFoam/MRFSimpleFoam/MRFSimpleFoam.C b/tutorials/MRFSimpleFoam/MRFSimpleFoam/MRFSimpleFoam.C
index 7e1faab8057..9fc36826fe6 100644
--- a/tutorials/MRFSimpleFoam/MRFSimpleFoam/MRFSimpleFoam.C
+++ b/tutorials/MRFSimpleFoam/MRFSimpleFoam/MRFSimpleFoam.C
@@ -52,8 +52,9 @@ int main(int argc, char *argv[])
Info<< "\nStarting time loop\n" << endl;
- for (runTime++; !runTime.end(); runTime++)
+ while (runTime.run())
{
+ runTime++;
Info<< "Time = " << runTime.timeName() << nl << endl;
# include "readSIMPLEControls.H"
diff --git a/tutorials/simpleSRFFoam/simpleSRFFoam/simpleSRFFoam.C b/tutorials/simpleSRFFoam/simpleSRFFoam/simpleSRFFoam.C
index 9098e63bc59..269ac013aeb 100644
--- a/tutorials/simpleSRFFoam/simpleSRFFoam/simpleSRFFoam.C
+++ b/tutorials/simpleSRFFoam/simpleSRFFoam/simpleSRFFoam.C
@@ -54,8 +54,9 @@ int main(int argc, char *argv[])
Info<< "\nStarting time loop\n" << endl;
- for (runTime++; !runTime.end(); runTime++)
+ while (runTime.run())
{
+ runTime++;
Info<< "Time = " << runTime.timeName() << nl << endl;
# include "readSIMPLEControls.H"
--
GitLab