Resolves bug-report http://www.openfoam.org/mantisbt/view.php?id=1938 Because C++ does not support overloading based on the return-type there is a problem defining both const and non-const member functions which are resolved based on the const-ness of the object for which they are called rather than the intent of the programmer declared via the const-ness of the returned type. The issue for the "boundaryField()" member function is that the non-const version increments the event-counter and checks the state of the stored old-time fields in case the returned value is altered whereas the const version has no side-effects and simply returns the reference. If the the non-const function is called within the patch-loop the event-counter may overflow. To resolve this it in necessary to avoid calling the non-const form of "boundaryField()" if the results is not altered and cache the reference outside the patch-loop when mutation of the patch fields is needed. The most straight forward way of resolving this problem is to name the const and non-const forms of the member functions differently e.g. the non-const form could be named: mutableBoundaryField() mutBoundaryField() nonConstBoundaryField() boundaryFieldRef() Given that in C++ a reference is non-const unless specified as const: "T&" vs "const T&" the logical convention would be boundaryFieldRef() boundaryFieldConstRef() and given that the const form which is more commonly used is it could simply be named "boundaryField()" then the logical convention is GeometricBoundaryField& boundaryFieldRef(); inline const GeometricBoundaryField& boundaryField() const; This is also consistent with the new "tmp" class for which non-const access to the stored object is obtained using the ".ref()" member function. This new convention for non-const access to the components of GeometricField will be applied to "dimensionedInternalField()" and "internalField()" in the future, i.e. "dimensionedInternalFieldRef()" and "internalFieldRef()".
212 lines
5.4 KiB
C
212 lines
5.4 KiB
C
{
|
|
word alphaScheme("div(phi,alpha)");
|
|
word alpharScheme("div(phirb,alpha)");
|
|
|
|
tmp<fv::ddtScheme<scalar>> ddtAlpha
|
|
(
|
|
fv::ddtScheme<scalar>::New
|
|
(
|
|
mesh,
|
|
mesh.ddtScheme("ddt(alpha)")
|
|
)
|
|
);
|
|
|
|
// Set the off-centering coefficient according to ddt scheme
|
|
scalar ocCoeff = 0;
|
|
if
|
|
(
|
|
isType<fv::EulerDdtScheme<scalar>>(ddtAlpha())
|
|
|| isType<fv::localEulerDdtScheme<scalar>>(ddtAlpha())
|
|
)
|
|
{
|
|
ocCoeff = 0;
|
|
}
|
|
else if (isType<fv::CrankNicolsonDdtScheme<scalar>>(ddtAlpha()))
|
|
{
|
|
if (nAlphaSubCycles > 1)
|
|
{
|
|
FatalErrorInFunction
|
|
<< "Sub-cycling is not supported "
|
|
"with the CrankNicolson ddt scheme"
|
|
<< exit(FatalError);
|
|
}
|
|
|
|
ocCoeff =
|
|
refCast<const fv::CrankNicolsonDdtScheme<scalar>>(ddtAlpha())
|
|
.ocCoeff();
|
|
}
|
|
else
|
|
{
|
|
FatalErrorInFunction
|
|
<< "Only Euler and CrankNicolson ddt schemes are supported"
|
|
<< exit(FatalError);
|
|
}
|
|
|
|
scalar cnCoeff = 1.0/(1.0 + ocCoeff);
|
|
|
|
// Standard face-flux compression coefficient
|
|
surfaceScalarField phic(mixture.cAlpha()*mag(phi/mesh.magSf()));
|
|
|
|
// Add the optional isotropic compression contribution
|
|
if (icAlpha > 0)
|
|
{
|
|
phic *= (1.0 - icAlpha);
|
|
phic += (mixture.cAlpha()*icAlpha)*fvc::interpolate(mag(U));
|
|
}
|
|
|
|
surfaceScalarField::GeometricBoundaryField& phicBf =
|
|
phic.boundaryFieldRef();
|
|
|
|
// Do not compress interface at non-coupled boundary faces
|
|
// (inlets, outlets etc.)
|
|
forAll(phic.boundaryField(), patchi)
|
|
{
|
|
fvsPatchScalarField& phicp = phicBf[patchi];
|
|
|
|
if (!phicp.coupled())
|
|
{
|
|
phicp == 0;
|
|
}
|
|
}
|
|
|
|
tmp<surfaceScalarField> phiCN(phi);
|
|
|
|
// Calculate the Crank-Nicolson off-centred volumetric flux
|
|
if (ocCoeff > 0)
|
|
{
|
|
phiCN = cnCoeff*phi + (1.0 - cnCoeff)*phi.oldTime();
|
|
}
|
|
|
|
if (MULESCorr)
|
|
{
|
|
fvScalarMatrix alpha1Eqn
|
|
(
|
|
(
|
|
LTS
|
|
? fv::localEulerDdtScheme<scalar>(mesh).fvmDdt(alpha1)
|
|
: fv::EulerDdtScheme<scalar>(mesh).fvmDdt(alpha1)
|
|
)
|
|
+ fv::gaussConvectionScheme<scalar>
|
|
(
|
|
mesh,
|
|
phiCN,
|
|
upwind<scalar>(mesh, phiCN)
|
|
).fvmDiv(phiCN, alpha1)
|
|
);
|
|
|
|
alpha1Eqn.solve();
|
|
|
|
Info<< "Phase-1 volume fraction = "
|
|
<< alpha1.weightedAverage(mesh.Vsc()).value()
|
|
<< " Min(" << alpha1.name() << ") = " << min(alpha1).value()
|
|
<< " Max(" << alpha1.name() << ") = " << max(alpha1).value()
|
|
<< endl;
|
|
|
|
tmp<surfaceScalarField> talphaPhiUD(alpha1Eqn.flux());
|
|
alphaPhi = talphaPhiUD();
|
|
|
|
if (alphaApplyPrevCorr && talphaPhiCorr0.valid())
|
|
{
|
|
Info<< "Applying the previous iteration compression flux" << endl;
|
|
MULES::correct(alpha1, alphaPhi, talphaPhiCorr0.ref(), 1, 0);
|
|
|
|
alphaPhi += talphaPhiCorr0();
|
|
}
|
|
|
|
// Cache the upwind-flux
|
|
talphaPhiCorr0 = talphaPhiUD;
|
|
|
|
alpha2 = 1.0 - alpha1;
|
|
|
|
mixture.correct();
|
|
}
|
|
|
|
|
|
for (int aCorr=0; aCorr<nAlphaCorr; aCorr++)
|
|
{
|
|
surfaceScalarField phir(phic*mixture.nHatf());
|
|
|
|
tmp<surfaceScalarField> talphaPhiUn
|
|
(
|
|
fvc::flux
|
|
(
|
|
phi,
|
|
alpha1,
|
|
alphaScheme
|
|
)
|
|
+ fvc::flux
|
|
(
|
|
-fvc::flux(-phir, alpha2, alpharScheme),
|
|
alpha1,
|
|
alpharScheme
|
|
)
|
|
);
|
|
|
|
// Calculate the Crank-Nicolson off-centred alpha flux
|
|
if (ocCoeff > 0)
|
|
{
|
|
talphaPhiUn =
|
|
cnCoeff*talphaPhiUn + (1.0 - cnCoeff)*alphaPhi.oldTime();
|
|
}
|
|
|
|
if (MULESCorr)
|
|
{
|
|
tmp<surfaceScalarField> talphaPhiCorr(talphaPhiUn() - alphaPhi);
|
|
volScalarField alpha10("alpha10", alpha1);
|
|
|
|
MULES::correct(alpha1, talphaPhiUn(), talphaPhiCorr.ref(), 1, 0);
|
|
|
|
// Under-relax the correction for all but the 1st corrector
|
|
if (aCorr == 0)
|
|
{
|
|
alphaPhi += talphaPhiCorr();
|
|
}
|
|
else
|
|
{
|
|
alpha1 = 0.5*alpha1 + 0.5*alpha10;
|
|
alphaPhi += 0.5*talphaPhiCorr();
|
|
}
|
|
}
|
|
else
|
|
{
|
|
alphaPhi = talphaPhiUn;
|
|
|
|
MULES::explicitSolve(alpha1, phiCN, alphaPhi, 1, 0);
|
|
}
|
|
|
|
alpha2 = 1.0 - alpha1;
|
|
|
|
mixture.correct();
|
|
}
|
|
|
|
if (alphaApplyPrevCorr && MULESCorr)
|
|
{
|
|
talphaPhiCorr0 = alphaPhi - talphaPhiCorr0;
|
|
}
|
|
|
|
if
|
|
(
|
|
word(mesh.ddtScheme("ddt(rho,U)"))
|
|
== fv::EulerDdtScheme<vector>::typeName
|
|
)
|
|
{
|
|
rhoPhi = alphaPhi*(rho1 - rho2) + phiCN*rho2;
|
|
}
|
|
else
|
|
{
|
|
if (ocCoeff > 0)
|
|
{
|
|
// Calculate the end-of-time-step alpha flux
|
|
alphaPhi = (alphaPhi - (1.0 - cnCoeff)*alphaPhi.oldTime())/cnCoeff;
|
|
}
|
|
|
|
// Calculate the end-of-time-step mass flux
|
|
rhoPhi = alphaPhi*(rho1 - rho2) + phi*rho2;
|
|
}
|
|
|
|
Info<< "Phase-1 volume fraction = "
|
|
<< alpha1.weightedAverage(mesh.Vsc()).value()
|
|
<< " Min(" << alpha1.name() << ") = " << min(alpha1).value()
|
|
<< " Max(" << alpha1.name() << ") = " << max(alpha1).value()
|
|
<< endl;
|
|
}
|