diff --git a/applications/solvers/modules/isothermalFilm/correctAlpha.C b/applications/solvers/modules/isothermalFilm/correctAlpha.C index 3c0e7347e4..ec6af6b9b4 100644 --- a/applications/solvers/modules/isothermalFilm/correctAlpha.C +++ b/applications/solvers/modules/isothermalFilm/correctAlpha.C @@ -66,7 +66,7 @@ void Foam::solvers::isothermalFilm::correctAlpha() const surfaceScalarField alphaf ( - constrainedField(max(fvc::interpolate(alpha), 0.0)) + constrainedField(max(fvc::interpolate(alpha), scalar(0))) ); const surfaceScalarField alpharAUf diff --git a/applications/solvers/modules/isothermalFilm/predictAlpha.C b/applications/solvers/modules/isothermalFilm/predictAlpha.C index 35776f0688..3d1ad55227 100644 --- a/applications/solvers/modules/isothermalFilm/predictAlpha.C +++ b/applications/solvers/modules/isothermalFilm/predictAlpha.C @@ -53,7 +53,7 @@ void Foam::solvers::isothermalFilm::predictAlpha() void Foam::solvers::isothermalFilm::correctDelta() { - delta_ = max(alpha, 0.0)*VbyA; + delta_ = max(alpha, scalar(0))*VbyA; delta_.correctBoundaryConditions(); } diff --git a/src/twoPhaseModels/interfaceProperties/contactAngleModels/dynamic/dynamicContactAngle.C b/src/twoPhaseModels/interfaceProperties/contactAngleModels/dynamic/dynamicContactAngle.C index e11f0cdbba..e06b140f9b 100644 --- a/src/twoPhaseModels/interfaceProperties/contactAngleModels/dynamic/dynamicContactAngle.C +++ b/src/twoPhaseModels/interfaceProperties/contactAngleModels/dynamic/dynamicContactAngle.C @@ -82,8 +82,8 @@ Foam::contactAngleModels::dynamic::cosTheta return cos ( degToRad(theta0_) - + degToRad(thetaRec_ - theta0_)*max(uCoeff, 0.0) - - degToRad(thetaAdv_ - theta0_)*min(uCoeff, 0.0) + + degToRad(thetaRec_ - theta0_)*max(uCoeff, scalar(0)) + - degToRad(thetaAdv_ - theta0_)*min(uCoeff, scalar(0)) ); } diff --git a/src/twoPhaseModels/interfaceProperties/contactAngleModels/gravitational/gravitationalContactAngle.C b/src/twoPhaseModels/interfaceProperties/contactAngleModels/gravitational/gravitationalContactAngle.C index 619be2e9e8..4f85758e57 100644 --- a/src/twoPhaseModels/interfaceProperties/contactAngleModels/gravitational/gravitationalContactAngle.C +++ b/src/twoPhaseModels/interfaceProperties/contactAngleModels/gravitational/gravitationalContactAngle.C @@ -74,8 +74,8 @@ Foam::contactAngleModels::gravitational::cosTheta return cos ( degToRad(theta0_) - + degToRad(thetaRec_ - theta0_)*max(uCoeff, 0.0) - - degToRad(thetaAdv_ - theta0_)*min(uCoeff, 0.0) + + degToRad(thetaRec_ - theta0_)*max(uCoeff, scalar(0)) + - degToRad(thetaAdv_ - theta0_)*min(uCoeff, scalar(0)) ); }