diff --git a/applications/solvers/combustion/XiFoam/PDRFoam/setDeltaT.H b/applications/solvers/combustion/XiFoam/PDRFoam/setDeltaT.H index d523d0d0db..98682b6af6 100644 --- a/applications/solvers/combustion/XiFoam/PDRFoam/setDeltaT.H +++ b/applications/solvers/combustion/XiFoam/PDRFoam/setDeltaT.H @@ -33,13 +33,9 @@ Description if (adjustTimeStep) { - scalar maxDeltaT = maxCo*runTime.deltaTValue()/(CoNum + StCoNum + small); - - maxDeltaT = min(maxDeltaT, fvModels.maxDeltaT()); - - const scalar deltaT = - min(min(maxDeltaT, 1.0 + 0.1*maxDeltaT), 1.2*runTime.deltaTValue()); - + scalar deltaT = maxCo*runTime.deltaTValue()/(CoNum + StCoNum + small); + deltaT = min(deltaT, fvModels.maxDeltaT()); + deltaT = min(min(deltaT, 1.0 + 0.1*deltaT), 1.2*runTime.deltaTValue()); runTime.setDeltaT(min(deltaT, maxDeltaT)); Info<< "deltaT = " << runTime.deltaTValue() << endl; diff --git a/applications/solvers/compressible/rhoCentralFoam/setDeltaT.H b/applications/solvers/compressible/rhoCentralFoam/setDeltaT.H index 7f7ac838af..235313dda6 100644 --- a/applications/solvers/compressible/rhoCentralFoam/setDeltaT.H +++ b/applications/solvers/compressible/rhoCentralFoam/setDeltaT.H @@ -33,11 +33,8 @@ Description if (adjustTimeStep) { - scalar maxDeltaT = maxCo*runTime.deltaTValue()/(CoNum + small); - - const scalar deltaT = - min(min(maxDeltaT, 1.0 + 0.1*maxDeltaT), 1.2*runTime.deltaTValue()); - + scalar deltaT = maxCo*runTime.deltaTValue()/(CoNum + small); + deltaT = min(min(deltaT, 1.0 + 0.1*deltaT), 1.2*runTime.deltaTValue()); runTime.setDeltaT(min(deltaT, maxDeltaT)); Info<< "deltaT = " << runTime.deltaTValue() << endl; diff --git a/applications/solvers/multiphase/twoLiquidMixingFoam/setDeltaT.H b/applications/solvers/multiphase/twoLiquidMixingFoam/setDeltaT.H index 51ec1d29a8..7b683fa736 100644 --- a/applications/solvers/multiphase/twoLiquidMixingFoam/setDeltaT.H +++ b/applications/solvers/multiphase/twoLiquidMixingFoam/setDeltaT.H @@ -33,13 +33,10 @@ Description if (adjustTimeStep) { - scalar maxDeltaT = + scalar deltaT = min(maxCo/(CoNum + small), maxAlphaCo/(alphaCoNum + small)) *runTime.deltaTValue(); - - const scalar deltaT = - min(min(maxDeltaT, 1.0 + 0.1*maxDeltaT), 1.2*runTime.deltaTValue()); - + deltaT = min(min(deltaT, 1.0 + 0.1*deltaT), 1.2*runTime.deltaTValue()); runTime.setDeltaT(min(deltaT, maxDeltaT)); Info<< "deltaT = " << runTime.deltaTValue() << endl; diff --git a/src/finiteVolume/cfdTools/general/include/setDeltaT.H b/src/finiteVolume/cfdTools/general/include/setDeltaT.H index df3961401f..e17ce9ccef 100644 --- a/src/finiteVolume/cfdTools/general/include/setDeltaT.H +++ b/src/finiteVolume/cfdTools/general/include/setDeltaT.H @@ -33,13 +33,9 @@ Description if (adjustTimeStep) { - scalar maxDeltaT = maxCo*runTime.deltaTValue()/(CoNum + small); - - maxDeltaT = min(maxDeltaT, fvModels.maxDeltaT()); - - const scalar deltaT = - min(min(maxDeltaT, 1.0 + 0.1*maxDeltaT), 1.2*runTime.deltaTValue()); - + scalar deltaT = maxCo*runTime.deltaTValue()/(CoNum + small); + deltaT = min(deltaT, fvModels.maxDeltaT()); + deltaT = min(min(deltaT, 1.0 + 0.1*deltaT), 1.2*runTime.deltaTValue()); runTime.setDeltaT(min(deltaT, maxDeltaT)); Info<< "deltaT = " << runTime.deltaTValue() << endl; diff --git a/src/twoPhaseModels/twoPhaseMixture/VoF/setDeltaT.H b/src/twoPhaseModels/twoPhaseMixture/VoF/setDeltaT.H index 1b01659054..1e943bff9d 100644 --- a/src/twoPhaseModels/twoPhaseMixture/VoF/setDeltaT.H +++ b/src/twoPhaseModels/twoPhaseMixture/VoF/setDeltaT.H @@ -33,15 +33,11 @@ Description if (adjustTimeStep) { - scalar maxDeltaT = + scalar deltaT = min(maxCo/(CoNum + small), maxAlphaCo/(alphaCoNum + small)) *runTime.deltaTValue(); - - maxDeltaT = min(maxDeltaT, fvModels.maxDeltaT()); - - const scalar deltaT = - min(min(maxDeltaT, 1.0 + 0.1*maxDeltaT), 1.2*runTime.deltaTValue()); - + deltaT = min(deltaT, fvModels.maxDeltaT()); + deltaT = min(min(deltaT, 1.0 + 0.1*deltaT), 1.2*runTime.deltaTValue()); runTime.setDeltaT(min(deltaT, maxDeltaT)); Info<< "deltaT = " << runTime.deltaTValue() << endl;