3d8a6a5433
- newer naming allows for less confusing code.
Eg,
max(lower) -> clamp_min(lower)
min(upper) -> clamp_max(upper)
- prefer combined method, for few operations.
Eg,
max(lower) + min(upper) -> clamp_range(lower, upper)
The updated naming also helps avoid some obvious coding errors.
Eg,
Re.min(1200.0);
Re.max(18800.0);
instead of
Re.clamp_range(1200.0, 18800.0);
- can also use implicit conversion of zero_one to MinMax<Type> for
this type of code:
lambda_.clamp_range(zero_one{});
62 lines
1.2 KiB
C
62 lines
1.2 KiB
C
tmp<fv::convectionScheme<scalar>> mvConvection(nullptr);
|
|
|
|
if (Y.size())
|
|
{
|
|
mvConvection = tmp<fv::convectionScheme<scalar>>
|
|
(
|
|
fv::convectionScheme<scalar>::New
|
|
(
|
|
mesh,
|
|
fields,
|
|
phi,
|
|
mesh.divScheme("div(phi,Yi_h)")
|
|
)
|
|
);
|
|
}
|
|
|
|
{
|
|
reaction.correct();
|
|
Qdot = reaction.Qdot();
|
|
volScalarField Yt
|
|
(
|
|
IOobject("Yt", runTime.timeName(), mesh),
|
|
mesh,
|
|
dimensionedScalar("Yt", dimless, 0)
|
|
);
|
|
|
|
forAll(Y, i)
|
|
{
|
|
if (i != inertIndex && composition.active(i))
|
|
{
|
|
volScalarField& Yi = Y[i];
|
|
|
|
fvScalarMatrix YiEqn
|
|
(
|
|
fvm::ddt(rho, Yi)
|
|
+ mvConvection->fvmDiv(phi, Yi)
|
|
- fvm::laplacian(turbulence.muEff(), Yi)
|
|
==
|
|
reaction.R(Yi)
|
|
+ fvOptions(rho, Yi)
|
|
);
|
|
|
|
YiEqn.relax();
|
|
|
|
fvOptions.constrain(YiEqn);
|
|
|
|
YiEqn.solve(mesh.solver("Yi"));
|
|
|
|
fvOptions.correct(Yi);
|
|
|
|
Yi.clamp_min(0);
|
|
Yt += Yi;
|
|
}
|
|
}
|
|
|
|
if (Y.size())
|
|
{
|
|
Y[inertIndex] = scalar(1) - Yt;
|
|
Y[inertIndex].clamp_min(0);
|
|
}
|
|
}
|