zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

SP build: use scalar(1) rather than 1.0

Browse Source
This commit is contained in:
Henry
2011-11-29 22:16:11 +00:00
parent 50fef5da8b
commit 4b31cf0407
4 changed files with 17 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/combustionModels/FSD/FSD.C
View File

@ -199,7 +199,7 @@ void FSD<CombThermoType, ThermoType>::calculateSourceNorm()
);
// Linear correlation between delta and flame thickness
volScalarField omegaF(max(deltaF*(4.0/3.0) + (2.0/3.0), 1.0));
volScalarField omegaF(max(deltaF*(4.0/3.0) + (2.0/3.0), scalar(1)));
scalar deltaFt = 1.0/ftDim_;
@ -319,9 +319,9 @@ void FSD<CombThermoType, ThermoType>::calculateSourceNorm()
products += Yp;
}
volScalarField c(max(scalar(1.0) - products/max(pc, 1e-5), 0.0));
volScalarField c(max(scalar(1) - products/max(pc, scalar(1e-5)), scalar(0)));
pc = min(C_*c, scalar(1.0));
pc = min(C_*c, scalar(1));
const volScalarField fres(this->singleMixture_.fres(fuelI));

20
src/turbulenceModels/incompressible/RAS/kkLOmega/kkLOmega.C
View File

@ -77,7 +77,7 @@ tmp<volScalarField> kkLOmega::Cmu(const volScalarField& S) const
tmp<volScalarField> kkLOmega::BetaTS(const volScalarField& Rew) const
{
return(scalar(1.0) - exp(-sqr(max(Rew - CtsCrit_, 0.0))/Ats_));
return(scalar(1) - exp(-sqr(max(Rew - CtsCrit_, scalar(0)))/Ats_));
}
@ -89,7 +89,7 @@ tmp<volScalarField> kkLOmega::fTaul
{
return
(
scalar(1.0)
scalar(1)
- exp
(
-CtauL_*ktL
@ -130,7 +130,7 @@ tmp<volScalarField> kkLOmega::fOmega
{
return
(
scalar(1.0)
scalar(1)
- exp
(
-0.41
@ -159,15 +159,12 @@ tmp<volScalarField> kkLOmega::gammaBP(const volScalarField& omega) const
max
(
kt_/nu()
/
(
/ (
omega
+ dimensionedScalar("ROTVSMALL", omega.dimensions(), ROOTVSMALL)
)
-
CbpCrit_
,
0.0
- CbpCrit_,
scalar(0)
)
);
}
@ -187,9 +184,8 @@ tmp<volScalarField> kkLOmega::gammaNAT
- CnatCrit_
/ (
fNatCrit + dimensionedScalar("ROTVSMALL", dimless, ROOTVSMALL)
)
,
0.0
),
scalar(0)
)
);
}