zhyang-dev/openfoam
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

STYLE: use clamp/clamp_range instead of min(max(..., upper), lower)

Browse Source
This commit is contained in:
Mark Olesen
2023-02-01 18:39:19 +01:00
parent ba6667a344
commit 1cc72ea7e3
50 changed files with 122 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.C
View File

@ -90,7 +90,11 @@ Foam::kineticTheoryModels::radialModels::SinclairJackson::g0prime
{
volScalarField aByaMax
(
cbrt(min(max(alpha, scalar(1e-3)), alphaMinFriction)/alphaMax)
cbrt
(
clamp(alpha, scalarMinMax(1e-3, alphaMinFriction.value()))
/ alphaMax
)
);
return (1.0/(3*alphaMax))/sqr(aByaMax - sqr(aByaMax));

2
src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/virtualMassModels/Lamb/Lamb.C
View File

@ -69,7 +69,7 @@ Foam::virtualMassModels::Lamb::~Lamb()
Foam::tmp<Foam::volScalarField> Foam::virtualMassModels::Lamb::Cvm() const
{
volScalarField E(min(max(pair_.E(), SMALL), 1 - SMALL));
volScalarField E(clamp(pair_.E(), scalarMinMax(SMALL, 1 - SMALL)));
volScalarField rtOmEsq(sqrt(1 - sqr(E)));
return