COMP: intel compiler issues with operator ""_deg (fixes #544)

- this represents a partial revert for commit 6a0a8b99b3
This commit is contained in:
Mark Olesen
2017-07-21 16:40:31 +02:00
parent c0c7c39031
commit b0b4c1aae5
17 changed files with 26 additions and 25 deletions

View File

@ -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);
}

View File

@ -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;

View File

@ -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 * * * * * * * * * * * //

View File

@ -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 * * * * * * * * * * * //

View File

@ -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