Merge branch 'master' into particleInteractions

2025-11-28 03:28:01 +00:00 · 2009-10-21 16:40:45 +01:00
parent 8488977784 9221793088
commit 34d8f73153
112 changed files with 289 additions and 252 deletions
--- a/applications/solvers/DNS/dnsFoam/readTurbulenceProperties.H
+++ b/applications/solvers/DNS/dnsFoam/readTurbulenceProperties.H
@ -13,7 +13,7 @@
    );

    volVectorField force =
-        U/dimensionedScalar("dt", dimTime, runTime.deltaT().value());
+        U/dimensionedScalar("dt", dimTime, runTime.deltaTValue());

    Kmesh K(mesh);
-    UOprocess forceGen(K, runTime.deltaT().value(), turbulenceProperties);
+    UOprocess forceGen(K, runTime.deltaTValue(), turbulenceProperties);
--- a/applications/solvers/combustion/PDRFoam/StCourantNo.H
+++ b/applications/solvers/combustion/PDRFoam/StCourantNo.H
@ -41,11 +41,11 @@ Description

        StCoNum =
            max(SfUfbyDelta/mesh.magSf()).value()
-           *runTime.deltaT().value();
+           *runTime.deltaTValue();

        meanStCoNum =
            (sum(SfUfbyDelta)/sum(mesh.magSf())).value()
-        *runTime.deltaT().value();
+        *runTime.deltaTValue();
    }

    Info<< "St courant Number mean: " << meanStCoNum
--- a/applications/solvers/combustion/PDRFoam/setDeltaT.H
+++ b/applications/solvers/combustion/PDRFoam/setDeltaT.H
@ -41,12 +41,12 @@ if (adjustTimeStep)
    (
        min
        (
-            deltaTFact*runTime.deltaT().value(),
+            deltaTFact*runTime.deltaTValue(),
            maxDeltaT
        )
    );
    
-    Info<< "deltaT = " <<  runTime.deltaT().value() << endl;
+    Info<< "deltaT = " <<  runTime.deltaTValue() << endl;
 }

 // ************************************************************************* //
--- a/applications/solvers/combustion/XiFoam/bEqn.H
+++ b/applications/solvers/combustion/XiFoam/bEqn.H
@ -40,7 +40,7 @@ if (ign.ignited())
    (
        mesh.surfaceInterpolation::deltaCoeffs()
       *mag(phiSt)/(fvc::interpolate(rho)*mesh.magSf())
-    ).value()*runTime.deltaT().value();
+    ).value()*runTime.deltaTValue();

    Info<< "Max St-Courant Number = " << StCoNum << endl;

--- a/applications/solvers/combustion/dieselEngineFoam/dieselEngineFoam.C
+++ b/applications/solvers/combustion/dieselEngineFoam/dieselEngineFoam.C
@ -89,8 +89,8 @@ int main(int argc, char *argv[])

        chemistry.solve
        (
-            runTime.value() - runTime.deltaT().value(),
-            runTime.deltaT().value()
+            runTime.value() - runTime.deltaTValue(),
+            runTime.deltaTValue()
        );

        // turbulent time scale
--- a/applications/solvers/combustion/dieselFoam/dieselFoam.C
+++ b/applications/solvers/combustion/dieselFoam/dieselFoam.C
@ -80,8 +80,8 @@ int main(int argc, char *argv[])

        chemistry.solve
        (
-            runTime.value() - runTime.deltaT().value(),
-            runTime.deltaT().value()
+            runTime.value() - runTime.deltaTValue(),
+            runTime.deltaTValue()
        );

        // turbulent time scale
--- a/applications/solvers/combustion/reactingFoam/chemistry.H
+++ b/applications/solvers/combustion/reactingFoam/chemistry.H
@ -3,8 +3,8 @@

    chemistry.solve
    (
-        runTime.value() - runTime.deltaT().value(),
-        runTime.deltaT().value()
+        runTime.value() - runTime.deltaTValue(),
+        runTime.deltaTValue()
    );

    // turbulent time scale
--- a/applications/solvers/combustion/rhoReactingFoam/chemistry.H
+++ b/applications/solvers/combustion/rhoReactingFoam/chemistry.H
@ -3,8 +3,8 @@

    chemistry.solve
    (
-        runTime.value() - runTime.deltaT().value(),
-        runTime.deltaT().value()
+        runTime.value() - runTime.deltaTValue(),
+        runTime.deltaTValue()
    );

    // turbulent time scale
--- a/applications/solvers/compressible/rhoCentralFoam/compressibleCourantNo.H
+++ b/applications/solvers/compressible/rhoCentralFoam/compressibleCourantNo.H
@ -38,11 +38,11 @@ if (mesh.nInternalFaces())
    surfaceScalarField amaxSfbyDelta =
        mesh.surfaceInterpolation::deltaCoeffs()*amaxSf;

-    CoNum = max(amaxSfbyDelta/mesh.magSf()).value()*runTime.deltaT().value();
+    CoNum = max(amaxSfbyDelta/mesh.magSf()).value()*runTime.deltaTValue();

    meanCoNum =
        (sum(amaxSfbyDelta)/sum(mesh.magSf())).value()
-       *runTime.deltaT().value();
+       *runTime.deltaTValue();
 }

 Info<< "Mean and max Courant Numbers = "
--- a/applications/solvers/compressible/rhoSonicFoam/rhoSonicFoam.C
+++ b/applications/solvers/compressible/rhoSonicFoam/rhoSonicFoam.C
@ -68,7 +68,7 @@ int main(int argc, char *argv[])
        (
            mesh.surfaceInterpolation::deltaCoeffs()
           *mag(phiv)/mesh.magSf()
-        ).value()*runTime.deltaT().value();
+        ).value()*runTime.deltaTValue();

        Info<< "\nMax Courant Number = " << CoNum << endl;

--- a/applications/solvers/compressible/rhopSonicFoam/rhopSonicFoam.C
+++ b/applications/solvers/compressible/rhopSonicFoam/rhopSonicFoam.C
@ -65,7 +65,7 @@ int main(int argc, char *argv[])
        (
            mesh.surfaceInterpolation::deltaCoeffs()
           *mag(phiv)/mesh.magSf()
-        ).value()*runTime.deltaT().value();
+        ).value()*runTime.deltaTValue();

        Info<< "Max Courant Number = " << CoNum << endl;

--- a/applications/solvers/electromagnetics/mhdFoam/magneticFieldErr.H
+++ b/applications/solvers/electromagnetics/mhdFoam/magneticFieldErr.H
@ -1,4 +1,4 @@
 Info<< "magnetic flux divergence error = "
-    << runTime.deltaT().value()
+    << runTime.deltaTValue()
      *mag(fvc::div(phiB))().weightedAverage(mesh.V()).value()
    << endl;
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/compressibleCourantNo.C
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/compressibleCourantNo.C
@ -47,10 +47,10 @@ Foam::scalar Foam::compressibleCourantNo
          / fvc::interpolate(rho);

        CoNum = max(SfUfbyDelta/mesh.magSf())
-            .value()*runTime.deltaT().value();
+            .value()*runTime.deltaTValue();

        meanCoNum = (sum(SfUfbyDelta)/sum(mesh.magSf()))
-            .value()*runTime.deltaT().value();
+            .value()*runTime.deltaTValue();
    }

    Info<< "Region: " << mesh.name() << " Courant Number mean: " << meanCoNum
--- a/applications/solvers/incompressible/shallowWaterFoam/CourantNo.H
+++ b/applications/solvers/incompressible/shallowWaterFoam/CourantNo.H
@ -42,10 +42,10 @@ if (mesh.nInternalFaces())
       *mag(phi)/fvc::interpolate(h);

    CoNum = max(SfUfbyDelta/mesh.magSf())
-        .value()*runTime.deltaT().value();
+        .value()*runTime.deltaTValue();

    meanCoNum = (sum(SfUfbyDelta)/sum(mesh.magSf()))
-        .value()*runTime.deltaT().value();
+        .value()*runTime.deltaTValue();

    // Gravity wave Courant number
    waveCoNum =
@ -53,7 +53,7 @@ if (mesh.nInternalFaces())
        (
            mesh.surfaceInterpolation::deltaCoeffs()
           *sqrt(fvc::interpolate(h))
-        ).value()*sqrt(magg).value()*runTime.deltaT().value();
+        ).value()*sqrt(magg).value()*runTime.deltaTValue();
 }

 Info<< "Courant number mean: " << meanCoNum
--- a/applications/solvers/lagrangian/coalChemistryFoam/chemistry.H
+++ b/applications/solvers/lagrangian/coalChemistryFoam/chemistry.H
@ -3,8 +3,8 @@

    chemistry.solve
    (
-        runTime.value() - runTime.deltaT().value(),
-        runTime.deltaT().value()
+        runTime.value() - runTime.deltaTValue(),
+        runTime.deltaTValue()
    );

    // turbulent time scale
--- a/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/chemistry.H
+++ b/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/chemistry.H
@ -3,8 +3,8 @@

    chemistry.solve
    (
-        runTime.value() - runTime.deltaT().value(),
-        runTime.deltaT().value()
+        runTime.value() - runTime.deltaTValue(),
+        runTime.deltaTValue()
    );

    // turbulent time scale
--- a/applications/solvers/lagrangian/reactingParcelFoam/chemistry.H
+++ b/applications/solvers/lagrangian/reactingParcelFoam/chemistry.H
@ -3,8 +3,8 @@

    chemistry.solve
    (
-        runTime.value() - runTime.deltaT().value(),
-        runTime.deltaT().value()
+        runTime.value() - runTime.deltaTValue(),
+        runTime.deltaTValue()
    );

    // turbulent time scale
--- a/applications/solvers/multiphase/cavitatingFoam/CourantNo.H
+++ b/applications/solvers/multiphase/cavitatingFoam/CourantNo.H
@ -40,15 +40,15 @@ if (mesh.nInternalFaces())
        mesh.surfaceInterpolation::deltaCoeffs()*mag(phiv);

    CoNum = max(SfUfbyDelta/mesh.magSf())
-        .value()*runTime.deltaT().value();
+        .value()*runTime.deltaTValue();

    meanCoNum = (sum(SfUfbyDelta)/sum(mesh.magSf()))
-        .value()*runTime.deltaT().value();
+        .value()*runTime.deltaTValue();

    acousticCoNum = max
    (
        mesh.surfaceInterpolation::deltaCoeffs()/sqrt(fvc::interpolate(psi))
-    ).value()*runTime.deltaT().value();
+    ).value()*runTime.deltaTValue();
 }

 Info<< "phiv Courant Number mean: " << meanCoNum
--- a/applications/solvers/multiphase/cavitatingFoam/setDeltaT.H
+++ b/applications/solvers/multiphase/cavitatingFoam/setDeltaT.H
@ -43,12 +43,12 @@ if (adjustTimeStep)
    (
        min
        (
-            deltaTFact*runTime.deltaT().value(),
+            deltaTFact*runTime.deltaTValue(),
            maxDeltaT
        )
    );
    
-    Info<< "deltaT = " <<  runTime.deltaT().value() << endl;
+    Info<< "deltaT = " <<  runTime.deltaTValue() << endl;
 }

 // ************************************************************************* //
--- a/applications/solvers/multiphase/cavitatingFoam/setInitialDeltaT.H
+++ b/applications/solvers/multiphase/cavitatingFoam/setInitialDeltaT.H
@ -44,7 +44,7 @@ if (adjustTimeStep)
        (
            min
            (
-                maxDeltaTFact*runTime.deltaT().value(),
+                maxDeltaTFact*runTime.deltaTValue(),
                maxDeltaT
            )
        );
--- a/applications/solvers/multiphase/settlingFoam/compressibleContinuityErrs.H
+++ b/applications/solvers/multiphase/settlingFoam/compressibleContinuityErrs.H
@ -1,5 +1,5 @@
    scalar sumLocalContErr =
-        runTime.deltaT().value()*
+        runTime.deltaTValue()*
        mag
        (
            fvc::ddt(rho)
@ -7,7 +7,7 @@
        )().weightedAverage(rho*mesh.V()).value();

    scalar globalContErr =
-          runTime.deltaT().value()*
+          runTime.deltaTValue()*
          (
              fvc::ddt(rho)
            + fvc::div(phi)
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/CourantNos.H
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/CourantNos.H
@ -5,7 +5,7 @@
    (
        mesh.surfaceInterpolation::deltaCoeffs()*mag(phia - phib)
       /mesh.magSf()
-    ).value()*runTime.deltaT().value();
+    ).value()*runTime.deltaTValue();

    Info<< "Max Ur Courant Number = " << UrCoNum << endl;