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

Correct for SP build

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

2
src/lagrangian/intermediate/submodels/MPPIC/AveragingMethods/Dual/Dual.C
View File

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

4
src/lagrangian/intermediate/submodels/MPPIC/TimeScaleModels/equilibrium/equilibrium.C
View File

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

2
src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriver.C
View File

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

4
src/meshTools/AMIInterpolation/patches/cyclicACMI/cyclicACMIPolyPatch/cyclicACMIPolyPatch.C
View File

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

8
src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionSolver/sixDoFRigidBodyMotionSolver.C
View File

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