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.
This commit is contained in:
Mark Olesen
2009-02-18 08:57:10 +01:00
parent 8b5457a829
commit 4b60453cf1
125 changed files with 398 additions and 367 deletions

View File

@ -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;
}

View File

@ -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;
}

View File

@ -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;
}

View File

@ -108,7 +108,7 @@ int main(int argc, char *argv[])
Info<< "End\n" << endl;
return(0);
return 0;
}

View File

@ -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;
}

View File

@ -130,7 +130,7 @@ scalar StCoNum = 0.0;
Info<< "\n end\n";
return(0);
return 0;
}

View File

@ -195,7 +195,7 @@ scalar StCoNum = 0.0;
Info<< "\n end\n";
return(0);
return 0;
}

View File

@ -120,7 +120,7 @@ int main(int argc, char *argv[])
Info<< "End\n" << endl;
return(0);
return 0;
}

View File

@ -94,7 +94,7 @@ int main(int argc, char *argv[])
Info<< "End\n" << endl;
return(0);
return 0;
}

View File

@ -132,7 +132,7 @@ int main(int argc, char *argv[])
Info<< "End\n" << endl;
return(0);
return 0;
}

View File

@ -124,7 +124,7 @@ int main(int argc, char *argv[])
Info<< "End\n" << endl;
return(0);
return 0;
}

View File

@ -128,7 +128,7 @@ int main(int argc, char *argv[])
Info<< "End\n" << endl;
return(0);
return 0;
}

View File

@ -97,7 +97,7 @@ int main(int argc, char *argv[])
Info<< "End\n" << endl;
return(0);
return 0;
}

View File

@ -220,7 +220,7 @@ int main(int argc, char *argv[])
Info<< "End\n" << endl;
return(0);
return 0;
}
// ************************************************************************* //

View File

@ -88,7 +88,7 @@ int main(int argc, char *argv[])
Info<< "End\n" << endl;
return(0);
return 0;
}

View File

@ -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"

View File

@ -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"

View File

@ -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;
}

View File

@ -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;
}

View File

@ -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;
}

View File

@ -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;
}

View File

@ -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;
}

View File

@ -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;
}

View File

@ -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;
}

View File

@ -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;
}

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -105,7 +105,7 @@ int main(int argc, char *argv[])
Info << "End\n" << endl;
return(0);
return 0;
}

View File

@ -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;
}

View File

@ -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;
}

View File

@ -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;
}

View File

@ -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;
}

View File

@ -165,7 +165,7 @@ int main(int argc, char *argv[])
Info<< "End\n" << endl;
return(0);
return 0;
}

View File

@ -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;
}

View File

@ -156,7 +156,7 @@ int main(int argc, char *argv[])
Info<< "End\n" << endl;
return(0);
return 0;
}

View File

@ -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;
}

View File

@ -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;
}

View File

@ -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;
}

View File

@ -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;
}

View File

@ -89,7 +89,7 @@ int main(int argc, char *argv[])
Info<< "\n end \n";
return(0);
return 0;
}

View File

@ -139,7 +139,7 @@ int main(int argc, char *argv[])
Info<< "End\n" << endl;
return(0);
return 0;
}

View File

@ -99,7 +99,7 @@ int main(int argc, char *argv[])
Info<< "End\n" << endl;
return(0);
return 0;
}

View File

@ -138,7 +138,7 @@ int main(int argc, char *argv[])
Info<< "End\n" << endl;
return(0);
return 0;
}

View File

@ -102,7 +102,7 @@ int main(int argc, char *argv[])
Info<< "End\n" << endl;
return(0);
return 0;
}

View File

@ -106,7 +106,7 @@ int main(int argc, char *argv[])
Info<< "End\n" << endl;
return(0);
return 0;
}

View File

@ -94,7 +94,7 @@ int main(int argc, char *argv[])
Info<< "\n end \n";
return(0);
return 0;
}

View File

@ -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;
}

View File

@ -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;
}

View File

@ -108,7 +108,7 @@ int main(int argc, char *argv[])
Info<< "End\n" << endl;
return(0);
return 0;
}

View File

@ -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;
}

View File

@ -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;
}

View File

@ -43,5 +43,5 @@ int main()
} while (wind.waitForEvent());
return(0);
return 0;
}

View File

@ -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;
}

View File

@ -79,7 +79,7 @@ int main(int argc, char *argv[])
Info<< "End\n" << endl;
return(0);
return 0;
}

View File

@ -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;
}

View File

@ -60,7 +60,7 @@ int main()
Info<< "end" << endl;
return(0);
return 0;
}

View File

@ -28,5 +28,5 @@ int main(int argc, char *argv[])
cout << "allocated " << i*nBytes/(1024U*1024U) << " Mbytes" << endl;
}
return(0);
return 0;
}

View File

@ -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;

View File

@ -103,7 +103,7 @@ int main(int argc, char *argv[])
Info<< "End\n" << endl;
return(0);
return 0;
}

View File

@ -65,7 +65,7 @@ int main(int argc, char *argv[])
Info<< "End\n" << endl;
return(0);
return 0;
}

View File

@ -107,7 +107,7 @@ int main(int argc, char *argv[])
Info<< Sf << endl;
return(0);
return 0;
}

View File

@ -46,7 +46,7 @@ int main(int argc, char *argv[])
Info<< ((sf1 + sf2) & (sf1 + sf2)) << endl;
return(0);
return 0;
}

View File

@ -52,7 +52,7 @@ int main(int argc, char *argv[])
Info<< symm(tf1) << endl;
return(0);
return 0;
}

View File

@ -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;
}

View File

@ -36,5 +36,5 @@ int main()
Info<< "tet circumRadius = "
<< tetrahedron<point, point>(a, b, c, d).circumRadius() << endl;
return(0);
return 0;
}

View File

@ -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;
}

View File

@ -77,7 +77,7 @@ int main(int argc, char *argv[])
pointVectorField pU(pInterp.interpolate(U));
pU.write();
return(0);
return 0;
}

View File

@ -134,7 +134,7 @@ int main(int argc, char *argv[])
Info<< "End\n" << endl;
return(0);
return 0;
}

View File

@ -131,7 +131,7 @@ int main(int argc, char *argv[])
Info<< "End\n" << endl;
return(0);
return 0;
}

View File

@ -190,7 +190,7 @@ int main(int argc, char *argv[])
Info<< "End\n" << endl;
return(0);
return 0;
}

View File

@ -186,7 +186,7 @@ int main(int argc, char *argv[])
Info<< "End\n" << endl;
return(0);
return 0;
}

View File

@ -69,7 +69,7 @@ int main(int argc, char *argv[])
Info<< nl << "End" << nl << endl;
return(0);
return 0;
}

View File

@ -69,7 +69,7 @@ int main(int argc, char *argv[])
Info<< nl << "End" << nl << endl;
return(0);
return 0;
}

View File

@ -435,7 +435,7 @@ int main(int argc, char *argv[])
Info<< "End\n" << endl;
return(0);
return 0;
}

View File

@ -70,7 +70,7 @@ int main(int argc, char *argv[])
Info<< "End\n" << endl;
return(0);
return 0;
}

View File

@ -142,7 +142,7 @@ int main(int argc, char *argv[])
Info<< "End\n" << endl;
return(0);
return 0;
}

View File

@ -99,7 +99,7 @@ int main(int argc, char *argv[])
Info<< "End\n" << endl;
return(0);
return 0;
}

View File

@ -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;
}

View File

@ -377,7 +377,7 @@ int main(int argc, char *argv[])
Info<< "End\n" << endl;
return(0);
return 0;
}

View File

@ -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();

View File

@ -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;
}

View File

@ -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());

View File

@ -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;
}

View File

@ -59,7 +59,7 @@ int main(int argc, char *argv[])
Info<< "End\n" << endl;
return(0);
return 0;
}

View File

@ -723,7 +723,7 @@ int main(int argc, char *argv[])
Info<< "\nEnd.\n" << endl;
return(0);
return 0;
}

View File

@ -92,7 +92,7 @@ int main(int argc, char *argv[])
Info << "Vmax/Vmin = " << Vmax/Vmin << endl;
Info << "\n end\n";
return(0);
return 0;
}

View File

@ -145,7 +145,7 @@ int main(int argc, char *argv[])
Info<< endl;
}
return(0);
return 0;
}

View File

@ -124,7 +124,7 @@ int main(int argc, char *argv[])
wdot.write();
}
return(0);
return 0;
}

View File

@ -112,7 +112,7 @@ int main(int argc, char *argv[])
Info<< endl;
}
return(0);
return 0;
}

View File

@ -222,7 +222,7 @@ int main(int argc, char *argv[])
Info<< "End" << endl;
return(0);
return 0;
}

View File

@ -65,7 +65,7 @@ int main(int argc, char *argv[])
Info<< "End" << endl;
return(0);
return 0;
}

View File

@ -133,7 +133,7 @@ int main(int argc, char *argv[])
Info<< "\nEnd\n" << endl;
return(0);
return 0;
}

View File

@ -204,7 +204,7 @@ int main(int argc, char *argv[])
Info<< "End\n" << endl;
return(0);
return 0;
}

View File

@ -72,7 +72,7 @@ int main(int argc, char *argv[])
Info<< "end" << endl;
return(0);
return 0;
}

View File

@ -75,7 +75,7 @@ int main(int argc, char *argv[])
Info << "\n end\n";
return(0);
return 0;
}

View File

@ -186,7 +186,7 @@ int main(int argc, char *argv[])
Info<< nl << "end" << endl;
return(0);
return 0;
}

View File

@ -273,7 +273,7 @@ int main(int argc, char *argv[])
Info<< nl << "end" << endl;
return(0);
return 0;
}

View File

@ -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;
}

Some files were not shown because too many files have changed in this diff Show More