zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-12-28 03:37:59 +00:00
Code Issues 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

7
src/phaseSystemModels/multiphaseInter/phasesSystem/MassTransferPhaseSystem/MassTransferPhaseSystem.C
View File

@ -600,11 +600,8 @@ void Foam::MassTransferPhaseSystem<BasePhaseSystem>::alphaTransfer
if (includeDivU)
{
SuPhase1 +=
fvc::div(phi)*min(max(alpha1, scalar(0)), scalar(1));
SuPhase2 +=
fvc::div(phi)*min(max(alpha2, scalar(0)), scalar(1));
SuPhase1 += fvc::div(phi)*clamp(alpha1, zero_one{});
SuPhase2 += fvc::div(phi)*clamp(alpha2, zero_one{});
}
// NOTE: dmdtNet is distributed in terms =

14
src/phaseSystemModels/multiphaseInter/phasesSystem/massTransferModels/Lee/Lee.C
View File

@ -57,7 +57,7 @@ Foam::meltingEvaporationModels::Lee<Thermo, OtherThermo>::Kexp
{
const volScalarField from
(
min(max(this->pair().from(), scalar(0)), scalar(1))
clamp(this->pair().from(), zero_one{})
);
const volScalarField coeff
@ -95,9 +95,9 @@ Foam::meltingEvaporationModels::Lee<Thermo, OtherThermo>::KSp
{
if (this->modelVariable_ == variable)
{
volScalarField from
const volScalarField from
(
min(max(this->pair().from(), scalar(0)), scalar(1))
clamp(this->pair().from(), zero_one{})
);
const volScalarField coeff
@ -123,7 +123,7 @@ Foam::meltingEvaporationModels::Lee<Thermo, OtherThermo>::KSp
}
else
{
return tmp<volScalarField> ();
return nullptr;
}
}
@ -138,9 +138,9 @@ Foam::meltingEvaporationModels::Lee<Thermo, OtherThermo>::KSu
{
if (this->modelVariable_ == variable)
{
volScalarField from
const volScalarField from
(
min(max(this->pair().from(), scalar(0)), scalar(1))
clamp(this->pair().from(), zero_one{})
);
const volScalarField coeff
@ -165,7 +165,7 @@ Foam::meltingEvaporationModels::Lee<Thermo, OtherThermo>::KSu
}
else
{
return tmp<volScalarField> ();
return nullptr;
}
}

8
src/phaseSystemModels/multiphaseInter/phasesSystem/multiphaseInterSystem/multiphaseInterSystem.C
View File

@ -1277,12 +1277,12 @@ Foam::tmp<Foam::volVectorField> Foam::multiphaseInterSystem::nVolHatfv
{
const volScalarField alpha1m
(
min(max(alpha1, scalar(0)), scalar(1))
clamp(alpha1, zero_one{})
);
const volScalarField alpha2m
(
min(max(alpha2, scalar(0)), scalar(1))
clamp(alpha2, zero_one{})
);
const volVectorField gradAlphaf
@ -1311,12 +1311,12 @@ Foam::tmp<Foam::surfaceVectorField> Foam::multiphaseInterSystem::nHatfv
const volScalarField alpha1b
(
min(max(alpha1, scalar(0)), scalar(1))
clamp(alpha1, zero_one{})
);
const volScalarField alpha2b
(
min(max(alpha2, scalar(0)), scalar(1))
clamp(alpha2, zero_one{})
);
surfaceVectorField gradAlphaf

3
src/phaseSystemModels/multiphaseInter/phasesSystem/multiphaseSystem/multiphaseSystem.C
View File

@ -286,8 +286,7 @@ void Foam::multiphaseInter::multiphaseSystem::solveAlphas()
// Add alpha*div(U)
//const volScalarField& alpha = phase;
//Su_[phase.name()] +=
// fvc::div(phi)*min(max(alpha, scalar(0)), scalar(1));
//Su_[phase.name()] += fvc::div(phi)*clamp(alpha, zero_one{});
}
// Fill Su and Sp