From e6fd82f173803f40d0c3ff0347488b57af791a0e Mon Sep 17 00:00:00 2001
From: Johan Roenby <johan.roenby@gmail.com>
Date: Wed, 13 Jun 2018 11:46:21 +0200
Subject: [PATCH] ENH: interIsoFoam updates
- Reimplemented treatment of alpha1, phi and U in case of
nOuterCorrectors > 1 based on storePrevIter() to avoid cluttering the
solver with unnecessary fields in case of nOuterCorrectors = 1.
---
.../multiphase/interIsoFoam/alphaEqn.H | 62 +++++++++----------
.../multiphase/interIsoFoam/createFields.H | 40 ------------
2 files changed, 30 insertions(+), 72 deletions(-)
diff --git a/applications/solvers/multiphase/interIsoFoam/alphaEqn.H b/applications/solvers/multiphase/interIsoFoam/alphaEqn.H
index a73391a996b..c79afea75d3 100644
--- a/applications/solvers/multiphase/interIsoFoam/alphaEqn.H
+++ b/applications/solvers/multiphase/interIsoFoam/alphaEqn.H
@@ -1,44 +1,42 @@
{
- // Note for AMR implementation:
- // At this point we have just entered the new time step,
- // the mesh has been refined and the alpha, phi and U contain
- // the field values at the beginning of this time step mapped
- // to the new mesh.
-
- // The above assumes that we are in firstIter() of the outer
- // corrector loop. If we are in any subsequent iter of this loop
- // the alpha1, U and phi will be overwritten with the new time step
- // values but still on the same mesh.
-
-
- if (pimple.firstIter())
+ if (pimple.nCorrPIMPLE() > 1)
{
- // Note: This assumes moveMeshOuterCorrectors is false
- // Saving field values before advection in first PIMPLE iteration
- alpha10 = alpha1;
- U0 = U;
- phi0 = phi;
+ // If nOuterCorrectors > 1 then for all but the first loop the advection
+ // of alpha is done using an average, 0.5*phi+0.5*phiNew where phi is
+ // the flux at the beginning of the time step and phiNew is the flux
+ // estimate at the end of the time step from the previous outer
+ // iteration. Similarly we use 0.5*U + 0.5*UNew in later iterations.
+ if (pimple.firstIter())
+ {
+ // To recalculate the alpha1 update in subsequent iterations, we
+ // must store its current value before overwriting with the new
+ // value
+ alpha1.prevIter();
+ // Storing initial phi and U for use in later outer iterations.
+ phi.storePrevIter();
+ U.storePrevIter();
+ }
+ else
+ {
+ // Resetting alpha1 to value before advection in first PIMPLE
+ // iteration.
+ alpha1 = alpha1.prevIter();
+ // Setting U and phi with which to advect interface.
+ U = 0.5*U.prevIter() + 0.5*U;
+ phi = 0.5*phi.prevIter() + 0.5*phi;
+ }
}
- else
- {
- // Resetting alpha1 to value before advection in first PIMPLE iteration
- alpha1 = alpha10;
- // Temporarily setting U and phi to average of old and new value
- // Note: Illegal additions if mesh is topoChanging
- // (e.g. if moveMeshOuterCorrectors and AMR)
- U = 0.5*U0 + 0.5*U;
- phi = 0.5*phi0 + 0.5*phi;
- }
-
+
+ // Updating alpha1
advector.advect();
#include "rhofs.H"
rhoPhi = advector.getRhoPhi(rho1f, rho2f);
if (!pimple.firstIter())
{
- // Resetting U and phi to the new value
- U = 2.0*U - U0;
- phi = 2.0*phi - phi0;
+ // Resetting U and phi to value at latest iteration.
+ U = 2.0*U - U.prevIter();
+ phi = 2.0*phi - phi.prevIter();
}
alpha2 = 1.0 - alpha1;
diff --git a/applications/solvers/multiphase/interIsoFoam/createFields.H b/applications/solvers/multiphase/interIsoFoam/createFields.H
index 76b99381077..7b5a80a9981 100644
--- a/applications/solvers/multiphase/interIsoFoam/createFields.H
+++ b/applications/solvers/multiphase/interIsoFoam/createFields.H
@@ -124,44 +124,4 @@ mesh.setFluxRequired(alpha1.name());
#include "createMRF.H"
#include "createFvOptions.H"
-//Auxiliary fields when nOuterCorrectors > 1
-surfaceScalarField phi0
-(
- IOobject
- (
- "phi0",
- runTime.timeName(),
- mesh,
- IOobject::NO_READ,
- IOobject::NO_WRITE
- ),
- phi
-);
-
-volVectorField U0
-(
- IOobject
- (
- "U0",
- runTime.timeName(),
- mesh,
- IOobject::NO_READ,
- IOobject::NO_WRITE
- ),
- U
-);
-
-volScalarField alpha10
-(
- IOobject
- (
- "alpha10",
- runTime.timeName(),
- mesh,
- IOobject::NO_READ,
- IOobject::NO_WRITE
- ),
- alpha1
-);
-
isoAdvection advector(alpha1, phi, U);
--
GitLab