LTS: Formalize the naming of the rDeltaT and rSubDeltaT fields

Now the specification of the LTS time scheme is simply:

ddtSchemes
{
    default         localEuler;
}
This commit is contained in:
Henry Weller
2015-06-28 21:41:40 +01:00
parent af8185c0a6
commit f92d657ab7
20 changed files with 145 additions and 71 deletions

View File

@ -77,11 +77,7 @@ int main(int argc, char *argv[])
{
#include "readTimeControls.H"
if (LTS)
{
#include "setRDeltaT.H"
}
else
if (!LTS)
{
#include "compressibleCourantNo.H"
#include "setDeltaT.H"
@ -93,6 +89,11 @@ int main(int argc, char *argv[])
parcels.evolve();
if (LTS)
{
#include "setRDeltaT.H"
}
#include "rhoEqn.H"
// --- Pressure-velocity PIMPLE corrector loop

View File

@ -79,11 +79,7 @@
(
(
LTS
? fv::localEulerDdtScheme<scalar>
(
mesh,
nAlphaSubCycles > 1 ? "rSubDeltaT" : "rDeltaT"
).fvmDdt(alpha1)
? fv::localEulerDdtScheme<scalar>(mesh).fvmDdt(alpha1)
: fv::EulerDdtScheme<scalar>(mesh).fvmDdt(alpha1)
)
+ fv::gaussConvectionScheme<scalar>

View File

@ -17,10 +17,8 @@ if (nAlphaSubCycles > 1)
if (LTS)
{
trSubDeltaT = tmp<volScalarField>
(
new volScalarField("rSubDeltaT", trDeltaT()*nAlphaSubCycles)
);
trSubDeltaT =
fv::localEulerDdt::localRSubDeltaT(mesh, nAlphaSubCycles);
}
for

View File

@ -75,7 +75,7 @@
if (LTS)
{
const volScalarField& rDeltaT =
mesh.objectRegistry::lookupObject<volScalarField>("rSubDeltaT");
fv::localEulerDdt::localRDeltaT(mesh);
MULES::limiter
(
@ -138,7 +138,7 @@
if (LTS)
{
const volScalarField& rDeltaT =
mesh.objectRegistry::lookupObject<volScalarField>("rSubDeltaT");
fv::localEulerDdt::localRDeltaT(mesh);
MULES::limiter
(

View File

@ -324,16 +324,8 @@ void Foam::twoPhaseSystem::solve()
if (LTS)
{
const volScalarField& rDeltaT =
mesh.objectRegistry::lookupObject<volScalarField>
(
"rDeltaT"
);
trSubDeltaT = tmp<volScalarField>
(
new volScalarField("rSubDeltaT", rDeltaT*nAlphaSubCycles)
);
trSubDeltaT =
fv::localEulerDdt::localRSubDeltaT(mesh, nAlphaSubCycles);
}
for