diff --git a/src/regionModels/pyrolysisModels/reactingOneDim/reactingOneDim.C b/src/regionModels/pyrolysisModels/reactingOneDim/reactingOneDim.C index 90e28643dbaa1cf0b581008d6df9305dc0f288eb..606957c45934ac696dc8136bce79dcaa1b32d16e 100644 --- a/src/regionModels/pyrolysisModels/reactingOneDim/reactingOneDim.C +++ b/src/regionModels/pyrolysisModels/reactingOneDim/reactingOneDim.C @@ -85,7 +85,7 @@ void reactingOneDim::updateQr() // Qr is negative going out the solid // If the surface is emitting the radiative flux is set to zero - Qrp = max(Qrp, 0.0); + Qrp = max(Qrp, scalar(0.0)); } // Propagate Qr through 1-D regions diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForce/contactAngleForce.C b/src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForce/contactAngleForce.C index 21d2e63d28b22da4e5083d81b807baf6219841fa..0fc76cb5a86e34e36780d4c9fc658793cae32dc2 100644 --- a/src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForce/contactAngleForce.C +++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForce/contactAngleForce.C @@ -162,7 +162,7 @@ tmp<fvVectorMatrix> contactAngleForce::correct(volVectorField& U) } } - force /= (max(nHits, 1.0)*magSf); + force /= (max(nHits, scalar(1.0))*magSf); tForce().correctBoundaryConditions(); if (owner_.regionMesh().time().outputTime()) diff --git a/src/thermophysicalModels/combustionModels/infinitelyFastChemistry/infinitelyFastChemistry.C b/src/thermophysicalModels/combustionModels/infinitelyFastChemistry/infinitelyFastChemistry.C index c66099a88c978cecc72ab886bf8fba1b1d55a42e..fb0dbe79b409e3d62409099480e813c6a3e4dbe3 100644 --- a/src/thermophysicalModels/combustionModels/infinitelyFastChemistry/infinitelyFastChemistry.C +++ b/src/thermophysicalModels/combustionModels/infinitelyFastChemistry/infinitelyFastChemistry.C @@ -113,7 +113,7 @@ Foam::combustionModels::infinitelyFastChemistry::R(volScalarField& Y) const const volScalarField wSpecie = wFuelNorm_*singleMixture_.specieStoichCoeffs()[specieI] - / max(fNorm*(Y - fres), 0.001); + / max(fNorm*(Y - fres), scalar(0.001)); return -fNorm*wSpecie*fres + fNorm*fvm::Sp(wSpecie, Y); } diff --git a/src/thermophysicalModels/reactionThermo/mixtures/singleStepReactingMixture/singleStepReactingMixture.C b/src/thermophysicalModels/reactionThermo/mixtures/singleStepReactingMixture/singleStepReactingMixture.C index 57471ce57ba9a132c447fecea69b359abad757ab..65749dca89726f56c0fe752fd4f6791558729623 100644 --- a/src/thermophysicalModels/reactionThermo/mixtures/singleStepReactingMixture/singleStepReactingMixture.C +++ b/src/thermophysicalModels/reactionThermo/mixtures/singleStepReactingMixture/singleStepReactingMixture.C @@ -137,11 +137,11 @@ void Foam::singleStepReactingMixture<ThermoType>::fresCorrect() const label specieI = reaction.lhs()[i].index; if (specieI == fuelIndex_) { - fres_[specieI] = max(YFuel - YO2/s_, 0.0); + fres_[specieI] = max(YFuel - YO2/s_, scalar(0.0)); } else if (specieI == O2Index) { - fres_[specieI] = max(YO2 - YFuel*s_, 0.0); + fres_[specieI] = max(YO2 - YFuel*s_, scalar(0.0)); } } diff --git a/src/thermophysicalModels/solidChemistryModel/ODESolidChemistryModel/ODESolidChemistryModel.C b/src/thermophysicalModels/solidChemistryModel/ODESolidChemistryModel/ODESolidChemistryModel.C index f06c2ef0015ecc9af25a847e9c7b842b788fe5fc..7d716a8a8847ccbf5b28d967d6f386316ed78a81 100644 --- a/src/thermophysicalModels/solidChemistryModel/ODESolidChemistryModel/ODESolidChemistryModel.C +++ b/src/thermophysicalModels/solidChemistryModel/ODESolidChemistryModel/ODESolidChemistryModel.C @@ -140,7 +140,7 @@ ODESolidChemistryModel // Calculate inital values of Ysi0 = rho*delta*Yi Ys0_[fieldI].internalField() = //this->solidThermo().rho()*Ys_[fieldI]*mesh.V(); - this->solidThermo().rho()*max(Ys_[fieldI],0.001)*mesh.V(); + this->solidThermo().rho()*max(Ys_[fieldI],scalar(0.001))*mesh.V(); } forAll(RRg_, fieldI)