diff --git a/applications/utilities/mesh/conversion/datToFoam/datToFoam.C b/applications/utilities/mesh/conversion/datToFoam/datToFoam.C index 11255ced731357992a2f1afc458b1594fa386f25..7cc4fbffb86cc8963724e708ff35918424c66846 100644 --- a/applications/utilities/mesh/conversion/datToFoam/datToFoam.C +++ b/applications/utilities/mesh/conversion/datToFoam/datToFoam.C @@ -122,7 +122,7 @@ int main(int argc, char *argv[]) fileName pointsFile(runTime.constantPath()/"points.tmp"); OFstream pFile(pointsFile); - const scalar a = 0.1_deg; + const scalar a = degToRad(0.1); tensor rotateZ = tensor ( diff --git a/applications/utilities/mesh/conversion/kivaToFoam/readKivaGrid.H b/applications/utilities/mesh/conversion/kivaToFoam/readKivaGrid.H index e97a717f0346229e59a86efacb1de10f07b56ed2..5e3afb3b3a898523dc1d740b9975960a61fe6af8 100644 --- a/applications/utilities/mesh/conversion/kivaToFoam/readKivaGrid.H +++ b/applications/utilities/mesh/conversion/kivaToFoam/readKivaGrid.H @@ -419,7 +419,7 @@ if (pFaces[WEDGE].size() && pFaces[WEDGE][0].size()) { // Distribute the points to be +/- 2.5deg from the x-z plane - const scalar tanTheta = Foam::tan(2.5_deg); + const scalar tanTheta = Foam::tan(degToRad(2.5)); SLList<face>::iterator iterf = pFaces[WEDGE][0].begin(); SLList<face>::iterator iterb = pFaces[WEDGE][1].begin(); diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshConformToSurface.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshConformToSurface.C index df009f30830afb543a73b9fc6c7e5b4ab5a543b4..575bf8de69f1e9e93e151893788ebc71bf73a351 100644 --- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshConformToSurface.C +++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshConformToSurface.C @@ -33,10 +33,10 @@ License using namespace Foam::vectorTools; const Foam::scalar Foam::conformalVoronoiMesh::searchConeAngle - = Foam::cos(30.0_deg); + = Foam::cos(degToRad(30.0)); const Foam::scalar Foam::conformalVoronoiMesh::searchAngleOppositeSurface - = Foam::cos(150.0_deg); + = Foam::cos(degToRad(150.0)); // * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * * // diff --git a/src/dynamicMesh/meshCut/cellLooper/topoCellLooper.C b/src/dynamicMesh/meshCut/cellLooper/topoCellLooper.C index 97f35afa23cc26e0342fafeeb620587f72884779..70a1347169b231358c61ffc706346f9741c103f6 100644 --- a/src/dynamicMesh/meshCut/cellLooper/topoCellLooper.C +++ b/src/dynamicMesh/meshCut/cellLooper/topoCellLooper.C @@ -43,7 +43,7 @@ namespace Foam } // Angle for polys to be considered splitHexes. -const Foam::scalar Foam::topoCellLooper::featureCos = Foam::cos(10.0_deg); +const Foam::scalar Foam::topoCellLooper::featureCos = Foam::cos(degToRad(10.0)); // * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // diff --git a/src/dynamicMesh/meshCut/meshModifiers/undoableMeshCutter/undoableMeshCutter.C b/src/dynamicMesh/meshCut/meshModifiers/undoableMeshCutter/undoableMeshCutter.C index 689d112f67474f523e934de1949d62075750cc14..71623907fde7ea916639400177b0174e958e4248 100644 --- a/src/dynamicMesh/meshCut/meshModifiers/undoableMeshCutter/undoableMeshCutter.C +++ b/src/dynamicMesh/meshCut/meshModifiers/undoableMeshCutter/undoableMeshCutter.C @@ -184,7 +184,7 @@ Foam::undoableMeshCutter::undoableMeshCutter faceRemover_ ( mesh, - Foam::cos(30.0_deg) + Foam::cos(degToRad(30.0)) ) {} diff --git a/src/fvOptions/sources/derived/rotorDiskSource/trimModel/targetCoeff/targetCoeffTrim.C b/src/fvOptions/sources/derived/rotorDiskSource/trimModel/targetCoeff/targetCoeffTrim.C index a8c5d41858977dc4d0a49961daf7158e26626450..683e356b238998310d0fb63758608a52f9d74084 100644 --- a/src/fvOptions/sources/derived/rotorDiskSource/trimModel/targetCoeff/targetCoeffTrim.C +++ b/src/fvOptions/sources/derived/rotorDiskSource/trimModel/targetCoeff/targetCoeffTrim.C @@ -204,7 +204,7 @@ Foam::targetCoeffTrim::targetCoeffTrim nIter_(50), tol_(1e-8), relax_(1.0), - dTheta_(0.1_deg), + dTheta_(degToRad(0.1)), alpha_(1.0) { read(dict); diff --git a/src/mesh/snappyHexMesh/meshRefinement/meshRefinementBaffles.C b/src/mesh/snappyHexMesh/meshRefinement/meshRefinementBaffles.C index 931501b342d5a485b24c61240160a582730573b6..99d642c1bd3428f137922b19341a3023ca08bb32 100644 --- a/src/mesh/snappyHexMesh/meshRefinement/meshRefinementBaffles.C +++ b/src/mesh/snappyHexMesh/meshRefinement/meshRefinementBaffles.C @@ -148,14 +148,14 @@ Foam::label Foam::meshRefinement::createBaffle // { // return true; // } -// else if (mag(n1&n2) > cos(30.0_deg)) +// else if (mag(n1&n2) > cos(degToRad(30.0))) // { // // Both normals aligned. Check that test vector perpendicularish to // // surface normal // scalar magTestDir = mag(testDir); // if (magTestDir > VSMALL) // { -// if (mag(n1&(testDir/magTestDir)) < cos(45.0_deg)) +// if (mag(n1&(testDir/magTestDir)) < cos(degToRad(45.0))) // { // //Pout<< "** disabling baffling face " // // << mesh_.faceCentres()[faceI] << endl; diff --git a/src/mesh/snappyHexMesh/meshRefinement/meshRefinementGapRefine.C b/src/mesh/snappyHexMesh/meshRefinement/meshRefinementGapRefine.C index 6b301662ee3136b3d471f9e9d6c3ca1440462822..dc87b9376facd72386d0c05a7c13d2d86429c1f8 100644 --- a/src/mesh/snappyHexMesh/meshRefinement/meshRefinementGapRefine.C +++ b/src/mesh/snappyHexMesh/meshRefinement/meshRefinementGapRefine.C @@ -526,7 +526,7 @@ Foam::label Foam::meshRefinement::markSurfaceGapRefinement // const indexedOctree<treeDataTriSurface>& tree = s.tree(); // // -// const scalar searchCos = Foam::cos(30.0_deg); +// const scalar searchCos = Foam::cos(degToRad(30.0)); // // // Normals for ray shooting and inside/outside detection // vectorField nearNormal; diff --git a/src/mesh/snappyHexMesh/meshRefinement/meshRefinementRefine.C b/src/mesh/snappyHexMesh/meshRefinement/meshRefinementRefine.C index f46eaf6ca8395e7f2fb4c9a797ba12ea143270a1..5d69b69098d80ed4acec1db750b8a759d0ddef84 100644 --- a/src/mesh/snappyHexMesh/meshRefinement/meshRefinementRefine.C +++ b/src/mesh/snappyHexMesh/meshRefinement/meshRefinementRefine.C @@ -1632,7 +1632,7 @@ bool Foam::meshRefinement::isNormalGap d /= magD; // Check average normal with respect to intersection locations - if (mag(avg&d) > Foam::cos(45.0_deg)) + if (mag(avg&d) > Foam::cos(degToRad(45.0))) { return true; } diff --git a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyRefineDriver.C b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyRefineDriver.C index 140b4f0c2db430376bae5fe8f3ab89779da4fa83..1040094bb1410ec2faaf2ff2e2de4f29e3375032 100644 --- a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyRefineDriver.C +++ b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyRefineDriver.C @@ -1134,7 +1134,7 @@ Foam::label Foam::snappyRefineDriver::refinementInterfaceRefine // } //} - const scalar oppositeCos = Foam::cos(135.0_deg); + const scalar oppositeCos = Foam::cos(degToRad(135.0)); forAllConstIter(cellSet, transitionCells, iter) { @@ -1861,8 +1861,8 @@ void Foam::snappyRefineDriver::mergePatchFaces { meshRefiner_.mergePatchFacesUndo ( - Foam::cos(45.0_deg), - Foam::cos(45.0_deg), + Foam::cos(degToRad(45.0)), + Foam::cos(degToRad(45.0)), meshRefiner_.meshedPatches(), motionDict, labelList(mesh.nFaces(), -1) @@ -1873,8 +1873,8 @@ void Foam::snappyRefineDriver::mergePatchFaces // Still merge refined boundary faces if all four are on same patch meshRefiner_.mergePatchFaces ( - Foam::cos(45.0_deg), - Foam::cos(45.0_deg), + Foam::cos(degToRad(45.0)), + Foam::cos(degToRad(45.0)), 4, // only merge faces split into 4 meshRefiner_.meshedPatches() ); @@ -1885,7 +1885,7 @@ void Foam::snappyRefineDriver::mergePatchFaces meshRefiner_.checkData(); } - meshRefiner_.mergeEdgesUndo(Foam::cos(45.0_deg), motionDict); + meshRefiner_.mergeEdgesUndo(Foam::cos(degToRad(45.0)), motionDict); if (debug) { diff --git a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappySnapDriver.C b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappySnapDriver.C index b0d7e484257286fdc0748649a48ce31b1c09a65f..79100022ffb50745d9b061251be4144587d88962 100644 --- a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappySnapDriver.C +++ b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappySnapDriver.C @@ -1117,7 +1117,7 @@ void Foam::snappySnapDriver::detectNearSurfaces //// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // //{ - // const scalar cos45 = Foam::cos(45.0_deg); + // const scalar cos45 = Foam::cos(degToRad(45.0)); // vector n(cos45, cos45, cos45); // n /= mag(n); // diff --git a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappySnapDriverFeature.C b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappySnapDriverFeature.C index 8f9ec62cc7528cad0edbe6e252d2df6b5d9038b4..ec9e7f3936d5ddd3020c449e35d1ee09b864b71a 100644 --- a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappySnapDriverFeature.C +++ b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappySnapDriverFeature.C @@ -2839,7 +2839,7 @@ void Foam::snappySnapDriver::determineBaffleFeatures // Detect baffle edges. Assume initial mesh will have 0,90 or 180 // (baffle) degree angles so smoothing should make 0,90 // to be less than 90. Choose reasonable value - const scalar baffleFeatureCos = Foam::cos(110.0_deg); + const scalar baffleFeatureCos = Foam::cos(degToRad(110.0)); autoPtr<OBJstream> baffleEdgeStr; diff --git a/src/meshTools/AMIInterpolation/AMIInterpolation/AMIMethod/AMIMethod/AMIMethod.C b/src/meshTools/AMIInterpolation/AMIInterpolation/AMIMethod/AMIMethod/AMIMethod.C index 9511881b8a6c5de535168209590ed717ee60d457..cf5273892572827e2946c7453ccca63600a26ce7 100644 --- a/src/meshTools/AMIInterpolation/AMIInterpolation/AMIMethod/AMIMethod/AMIMethod.C +++ b/src/meshTools/AMIInterpolation/AMIInterpolation/AMIMethod/AMIMethod/AMIMethod.C @@ -299,9 +299,9 @@ void Foam::AMIMethod<SourcePatch, TargetPatch>::appendNbrFaces const vector& n1 = patch.faceNormals()[facei]; const vector& n2 = patch.faceNormals()[nbrFacei]; - scalar cosI = n1 & n2; + const scalar cosI = n1 & n2; - if (cosI > Foam::cos(89.0_deg)) + if (cosI > Foam::cos(degToRad(89.0))) { faceIDs.append(nbrFacei); } diff --git a/src/meshTools/edgeMesh/extendedEdgeMesh/extendedEdgeMesh.C b/src/meshTools/edgeMesh/extendedEdgeMesh/extendedEdgeMesh.C index 43adc8695d8f63505fc8640b8888c7b6f25366d6..8758a9662ae6928346167f011a4e8e66f5d7c1b1 100644 --- a/src/meshTools/edgeMesh/extendedEdgeMesh/extendedEdgeMesh.C +++ b/src/meshTools/edgeMesh/extendedEdgeMesh/extendedEdgeMesh.C @@ -85,7 +85,8 @@ Foam::extendedEdgeMesh::sideVolumeTypeNames_ }; -Foam::scalar Foam::extendedEdgeMesh::cosNormalAngleTol_ = Foam::cos(0.1_deg); +Foam::scalar Foam::extendedEdgeMesh::cosNormalAngleTol_ = + Foam::cos(degToRad(0.1)); Foam::label Foam::extendedEdgeMesh::convexStart_ = 0; diff --git a/src/meshTools/sets/cellSources/shapeToCell/shapeToCell.C b/src/meshTools/sets/cellSources/shapeToCell/shapeToCell.C index 1c1b4bf1744feecf33e94bccc4e9b4d360f345fe..a6c033a84d391a74ca1f4d14b57552fc19521532 100644 --- a/src/meshTools/sets/cellSources/shapeToCell/shapeToCell.C +++ b/src/meshTools/sets/cellSources/shapeToCell/shapeToCell.C @@ -55,7 +55,7 @@ Foam::topoSetSource::addToUsageTable Foam::shapeToCell::usage_ // Angle for polys to be considered splitHexes. -Foam::scalar Foam::shapeToCell::featureCos = Foam::cos(10.0_deg); +Foam::scalar Foam::shapeToCell::featureCos = Foam::cos(degToRad(10.0)); // * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // diff --git a/src/meshTools/triSurface/booleanOps/surfaceIntersection/edgeIntersections.C b/src/meshTools/triSurface/booleanOps/surfaceIntersection/edgeIntersections.C index cc77026b9260250858ed23fc249ec3dd785a689f..2f9101a461d7bb52db7c49b3d64dc3d0bed351e8 100644 --- a/src/meshTools/triSurface/booleanOps/surfaceIntersection/edgeIntersections.C +++ b/src/meshTools/triSurface/booleanOps/surfaceIntersection/edgeIntersections.C @@ -43,7 +43,7 @@ namespace Foam defineTypeNameAndDebug(edgeIntersections, 0); } -Foam::scalar Foam::edgeIntersections::alignedCos_ = Foam::cos(89.0_deg); +Foam::scalar Foam::edgeIntersections::alignedCos_ = Foam::cos(degToRad(89.0)); // * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // diff --git a/src/meshTools/triSurface/surfaceFeatures/surfaceFeatures.C b/src/meshTools/triSurface/surfaceFeatures/surfaceFeatures.C index a251d856a3eef9813db41c1a616cd397be8571ff..c727121a60144f4854e012946b37f35c50500496 100644 --- a/src/meshTools/triSurface/surfaceFeatures/surfaceFeatures.C +++ b/src/meshTools/triSurface/surfaceFeatures/surfaceFeatures.C @@ -41,7 +41,7 @@ namespace Foam { defineTypeNameAndDebug(surfaceFeatures, 0); - const scalar surfaceFeatures::parallelTolerance = sin(1.0_deg); + const scalar surfaceFeatures::parallelTolerance = sin(degToRad(1.0)); //! \cond fileScope