Correct for SP build

This commit is contained in:
Henry
2013-12-22 14:05:27 +00:00
parent 45b9839203
commit cc780ca2c9
5 changed files with 10 additions and 10 deletions

View File

@ -123,7 +123,7 @@ void Foam::AveragingMethods::Dual<Type>::tetGeometry
tetIs.tet(this->mesh_).barycentric(position, tetCoordinates_); tetIs.tet(this->mesh_).barycentric(position, tetCoordinates_);
tetCoordinates_ = max(tetCoordinates_, 0.0); tetCoordinates_ = max(tetCoordinates_, scalar(0));
} }

View File

@ -85,9 +85,9 @@ Foam::TimeScaleModels::equilibrium::oneByTau
16.0/sqrt(3.0*constant::mathematical::pi) 16.0/sqrt(3.0*constant::mathematical::pi)
*0.25*(1.0 - e_*e_); *0.25*(1.0 - e_*e_);
return return
a a
*alpha*sqrt(max(uSqr, 0.0))/max(r32, SMALL) *alpha*sqrt(max(uSqr, scalar(0)))/max(r32, SMALL)
*alphaPacked_/max(alphaPacked_ - alpha, SMALL); *alphaPacked_/max(alphaPacked_ - alpha, SMALL);
} }

View File

@ -3508,7 +3508,7 @@ void Foam::autoLayerDriver::addLayers
meshRefiner_.updateMesh(map, labelList(0)); meshRefiner_.updateMesh(map, labelList(0));
// Update numbering of faceWantedThickness // Update numbering of faceWantedThickness
meshRefinement::updateList(map().faceMap(), 0.0, faceWantedThickness); meshRefinement::updateList(map().faceMap(), scalar(0), faceWantedThickness);
// Update numbering on baffles // Update numbering on baffles
forAll(baffles, i) forAll(baffles, i)

View File

@ -91,10 +91,10 @@ void Foam::cyclicACMIPolyPatch::resetAMI
); );
srcMask_ = srcMask_ =
min(1.0 - tolerance_, max(tolerance_, AMI().srcWeightsSum())); min(scalar(1) - tolerance_, max(tolerance_, AMI().srcWeightsSum()));
tgtMask_ = tgtMask_ =
min(1.0 - tolerance_, max(tolerance_, AMI().tgtWeightsSum())); min(scalar(1) - tolerance_, max(tolerance_, AMI().tgtWeightsSum()));
forAll(Sf, faceI) forAll(Sf, faceI)
{ {

View File

@ -121,9 +121,9 @@ Foam::sixDoFRigidBodyMotionSolver::sixDoFRigidBodyMotionSolver
max max
( (
(do_ - pDist.internalField())/(do_ - di_), (do_ - pDist.internalField())/(do_ - di_),
0.0 scalar(0)
), ),
1.0 scalar(1)
); );
// Convert the scale function to a cosine // Convert the scale function to a cosine
@ -136,9 +136,9 @@ Foam::sixDoFRigidBodyMotionSolver::sixDoFRigidBodyMotionSolver
- 0.5 - 0.5
*cos(scale_.internalField() *cos(scale_.internalField()
*Foam::constant::mathematical::pi), *Foam::constant::mathematical::pi),
0.0 scalar(0)
), ),
1.0 scalar(1)
); );
scale_.correctBoundaryConditions(); scale_.correctBoundaryConditions();