Commit e8e0c997 authored by Henry's avatar Henry
Browse files

DyM solvers: rationalized handling of time update

parent 74990ee9
......@@ -70,18 +70,20 @@ int main(int argc, char *argv[])
while (runTime.run())
{
#include "readControls.H"
#include "compressibleCourantNo.H"
#include "setDeltaT.H"
{
// Store divrhoU from the previous time-step/mesh for the correctPhi
// Store divrhoU from the previous mesh so that it can be mapped
// and used in correctPhi to ensure the corrected phi has the
// same divergence
volScalarField divrhoU
(
"divrhoU",
fvc::div(fvc::absolute(phi, rho, U))
);
#include "compressibleCourantNo.H"
#include "setDeltaT.H"
runTime++;
Info<< "Time = " << runTime.timeName() << nl << endl;
......
......@@ -66,18 +66,20 @@ int main(int argc, char *argv[])
while (runTime.run())
{
#include "readControls.H"
#include "compressibleCourantNo.H"
#include "setDeltaT.H"
{
// Store divrhoU from the previous time-step/mesh for the correctPhi
// Store divrhoU from the previous mesh so that it can be mapped
// and used in correctPhi to ensure the corrected phi has the
// same divergence
volScalarField divrhoU
(
"divrhoU",
fvc::div(fvc::absolute(phi, rho, U))
);
#include "compressibleCourantNo.H"
#include "setDeltaT.H"
runTime++;
Info<< "Time = " << runTime.timeName() << nl << endl;
......
......@@ -67,24 +67,19 @@ int main(int argc, char *argv[])
while (runTime.run())
{
#include "readControls.H"
#include "CourantNo.H"
#include "setDeltaT.H"
runTime++;
Info<< "Time = " << runTime.timeName() << nl << endl;
{
#include "CourantNo.H"
#include "setDeltaT.H"
scalar timeBeforeMeshUpdate = runTime.elapsedCpuTime();
runTime++;
// Do any mesh changes
mesh.update();
Info<< "Time = " << runTime.timeName() << nl << endl;
if (mesh.changing())
{
Info<< "Execution time for mesh.update() = "
<< runTime.elapsedCpuTime() - timeBeforeMeshUpdate
<< " s" << endl;
// Do any mesh changes
mesh.update();
if (correctPhi)
if (mesh.changing() && correctPhi)
{
// Calculate absolute flux from the mapped surface velocity
phi = mesh.Sf() & Uf;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment