diff --git a/src/dynamicMesh/polyMeshFilter/polyMeshFilter.C b/src/dynamicMesh/polyMeshFilter/polyMeshFilter.C index 3a776611f8..0aebc63a0d 100644 --- a/src/dynamicMesh/polyMeshFilter/polyMeshFilter.C +++ b/src/dynamicMesh/polyMeshFilter/polyMeshFilter.C @@ -123,7 +123,7 @@ void Foam::polyMeshFilter::checkMeshEdgesAndRelaxEdges } } - syncTools::syncEdgeList(mesh_, minEdgeLen_, minEqOp(), 0.0); + syncTools::syncEdgeList(mesh_, minEdgeLen_, minEqOp(), scalar(0.0)); for (label smoothIter = 0; smoothIter < maxSmoothIters_; ++smoothIter) { @@ -154,7 +154,13 @@ void Foam::polyMeshFilter::checkMeshEdgesAndRelaxEdges ); } - syncTools::syncEdgeList(mesh_, minEdgeLen_, minEqOp(), 0.0); + syncTools::syncEdgeList + ( + mesh_, + minEdgeLen_, + minEqOp(), + scalar(0.0) + ); } } @@ -343,7 +349,7 @@ void Foam::polyMeshFilter::mapOldMeshEdgeFieldToNewMesh newMesh, newMeshMinEdgeLen, maxEqOp(), - 0.0 + scalar(0.0) ); } diff --git a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/inclinedFilmNusseltHeight/inclinedFilmNusseltHeightFvPatchScalarField.C b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/inclinedFilmNusseltHeight/inclinedFilmNusseltHeightFvPatchScalarField.C index b36832a1d3..617af63382 100644 --- a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/inclinedFilmNusseltHeight/inclinedFilmNusseltHeightFvPatchScalarField.C +++ b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/inclinedFilmNusseltHeight/inclinedFilmNusseltHeightFvPatchScalarField.C @@ -158,7 +158,7 @@ void Foam::inclinedFilmNusseltHeightFvPatchScalarField::updateCoeffs() const volScalarField& rho = film.rho(); const scalarField rhop(rho.boundaryField()[patchI].patchInternalField()); - const scalarField Re(max(G, 0.0)/mup); + const scalarField Re(max(G, scalar(0.0))/mup); // TODO: currently re-evaluating the entire gTan field to return this patch const scalarField gTan(film.gTan()().boundaryField()[patchI] & n); diff --git a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/inclinedFilmNusseltInletVelocity/inclinedFilmNusseltInletVelocityFvPatchVectorField.C b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/inclinedFilmNusseltInletVelocity/inclinedFilmNusseltInletVelocityFvPatchVectorField.C index 7f21d9a2e4..923a559dfa 100644 --- a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/inclinedFilmNusseltInletVelocity/inclinedFilmNusseltInletVelocityFvPatchVectorField.C +++ b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/inclinedFilmNusseltInletVelocity/inclinedFilmNusseltInletVelocityFvPatchVectorField.C @@ -158,7 +158,7 @@ void Foam::inclinedFilmNusseltInletVelocityFvPatchVectorField::updateCoeffs() const volScalarField& rho = film.rho(); const scalarField rhop(rho.boundaryField()[patchI].patchInternalField()); - const scalarField Re(max(G, 0.0)/mup); + const scalarField Re(max(G, scalar(0.0))/mup); // TODO: currently re-evaluating the entire gTan field to return this patch const scalarField gTan(film.gTan()().boundaryField()[patchI] & n); diff --git a/src/turbulenceModels/compressible/RAS/v2f/v2f.C b/src/turbulenceModels/compressible/RAS/v2f/v2f.C index 0fb834ac49..36e04932d7 100644 --- a/src/turbulenceModels/compressible/RAS/v2f/v2f.C +++ b/src/turbulenceModels/compressible/RAS/v2f/v2f.C @@ -407,7 +407,8 @@ void v2f::correct() 1.0/T*((C1_ - N)*v2_ - 2.0/3.0*k_*(C1_ - 1.0)) ); - tmp Ceps1 = 1.4*(1.0 + 0.05*min(sqrt(k_/v2_), 100.0)); + tmp Ceps1 = + 1.4*(1.0 + 0.05*min(sqrt(k_/v2_), scalar(100.0))); // Update epsilon (and possibly G) at the wall epsilon_.boundaryField().updateCoeffs(); diff --git a/src/turbulenceModels/incompressible/RAS/v2f/v2f.C b/src/turbulenceModels/incompressible/RAS/v2f/v2f.C index b8d20d2624..642dc819bf 100644 --- a/src/turbulenceModels/incompressible/RAS/v2f/v2f.C +++ b/src/turbulenceModels/incompressible/RAS/v2f/v2f.C @@ -374,7 +374,8 @@ void v2f::correct() ); - tmp Ceps1 = 1.4*(1.0 + 0.05*min(sqrt(k_/v2_), 100.0)); + tmp Ceps1 = + 1.4*(1.0 + 0.05*min(sqrt(k_/v2_), scalar(100.0))); // Update epsilon (and possibly G) at the wall epsilon_.boundaryField().updateCoeffs();