diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.C b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.C
index da14f559bef29cf6a1df068d64b2868f5d84c117..344c606f23395ba82c69d21ff48972fec8c542a3 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd |
+ \\ / A nd | Copyright (C) 2019 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
| Copyright (C) 2011-2017 OpenFOAM Foundation
@@ -27,7 +27,7 @@ License
#include "JohnsonJacksonFrictionalStress.H"
#include "addToRunTimeSelectionTable.H"
-#include "mathematicalConstants.H"
+#include "unitConversion.H"
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@@ -66,7 +66,7 @@ JohnsonJackson
phi_("phi", dimless, coeffDict_),
alphaDeltaMin_("alphaDeltaMin", dimless, coeffDict_)
{
- phi_ *= constant::mathematical::pi/180.0;
+ phi_ *= degToRad();
}
@@ -139,7 +139,7 @@ bool Foam::kineticTheoryModels::frictionalStressModels::JohnsonJackson::read()
p_.read(coeffDict_);
phi_.read(coeffDict_);
- phi_ *= constant::mathematical::pi/180.0;
+ phi_ *= degToRad();
alphaDeltaMin_.read(coeffDict_);
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJacksonSchaeffer/JohnsonJacksonSchaefferFrictionalStress.C b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJacksonSchaeffer/JohnsonJacksonSchaefferFrictionalStress.C
index fe89a15b90250d3581f64766025537243d9ea58f..7ea51b8a2195d2885d812183ded995d79979654f 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJacksonSchaeffer/JohnsonJacksonSchaefferFrictionalStress.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJacksonSchaeffer/JohnsonJacksonSchaefferFrictionalStress.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd |
+ \\ / A nd | Copyright (C) 2019 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
| Copyright (C) 2016-2017 OpenFOAM Foundation
@@ -27,7 +27,7 @@ License
#include "JohnsonJacksonSchaefferFrictionalStress.H"
#include "addToRunTimeSelectionTable.H"
-#include "mathematicalConstants.H"
+#include "unitConversion.H"
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@@ -66,7 +66,7 @@ JohnsonJacksonSchaeffer::JohnsonJacksonSchaeffer
phi_("phi", dimless, coeffDict_),
alphaDeltaMin_("alphaDeltaMin", dimless, coeffDict_)
{
- phi_ *= constant::mathematical::pi/180.0;
+ phi_ *= degToRad();
}
@@ -199,7 +199,7 @@ JohnsonJacksonSchaeffer::read()
p_.read(coeffDict_);
phi_.read(coeffDict_);
- phi_ *= constant::mathematical::pi/180.0;
+ phi_ *= degToRad();
alphaDeltaMin_.read(coeffDict_);
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.C b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.C
index 2bb056347f484d8578948878726254662dcc1d1f..996af183fcf490ef444a4c320bcaadc860a73bd6 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd |
+ \\ / A nd | Copyright (C) 2019 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
| Copyright (C) 2011-2017 OpenFOAM Foundation
@@ -27,6 +27,7 @@ License
#include "SchaefferFrictionalStress.H"
#include "addToRunTimeSelectionTable.H"
+#include "unitConversion.H"
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@@ -60,7 +61,7 @@ Foam::kineticTheoryModels::frictionalStressModels::Schaeffer::Schaeffer
coeffDict_(dict.optionalSubDict(typeName + "Coeffs")),
phi_("phi", dimless, coeffDict_)
{
- phi_ *= constant::mathematical::pi/180.0;
+ phi_ *= degToRad();
}
@@ -183,7 +184,7 @@ bool Foam::kineticTheoryModels::frictionalStressModels::Schaeffer::read()
coeffDict_ <<= dict_.optionalSubDict(typeName + "Coeffs");
phi_.read(coeffDict_);
- phi_ *= constant::mathematical::pi/180.0;
+ phi_ *= degToRad();
return true;
}
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.C b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.C
index da14f559bef29cf6a1df068d64b2868f5d84c117..344c606f23395ba82c69d21ff48972fec8c542a3 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd |
+ \\ / A nd | Copyright (C) 2019 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
| Copyright (C) 2011-2017 OpenFOAM Foundation
@@ -27,7 +27,7 @@ License
#include "JohnsonJacksonFrictionalStress.H"
#include "addToRunTimeSelectionTable.H"
-#include "mathematicalConstants.H"
+#include "unitConversion.H"
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@@ -66,7 +66,7 @@ JohnsonJackson
phi_("phi", dimless, coeffDict_),
alphaDeltaMin_("alphaDeltaMin", dimless, coeffDict_)
{
- phi_ *= constant::mathematical::pi/180.0;
+ phi_ *= degToRad();
}
@@ -139,7 +139,7 @@ bool Foam::kineticTheoryModels::frictionalStressModels::JohnsonJackson::read()
p_.read(coeffDict_);
phi_.read(coeffDict_);
- phi_ *= constant::mathematical::pi/180.0;
+ phi_ *= degToRad();
alphaDeltaMin_.read(coeffDict_);
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJacksonSchaeffer/JohnsonJacksonSchaefferFrictionalStress.C b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJacksonSchaeffer/JohnsonJacksonSchaefferFrictionalStress.C
index fe89a15b90250d3581f64766025537243d9ea58f..7ea51b8a2195d2885d812183ded995d79979654f 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJacksonSchaeffer/JohnsonJacksonSchaefferFrictionalStress.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJacksonSchaeffer/JohnsonJacksonSchaefferFrictionalStress.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd |
+ \\ / A nd | Copyright (C) 2019 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
| Copyright (C) 2016-2017 OpenFOAM Foundation
@@ -27,7 +27,7 @@ License
#include "JohnsonJacksonSchaefferFrictionalStress.H"
#include "addToRunTimeSelectionTable.H"
-#include "mathematicalConstants.H"
+#include "unitConversion.H"
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@@ -66,7 +66,7 @@ JohnsonJacksonSchaeffer::JohnsonJacksonSchaeffer
phi_("phi", dimless, coeffDict_),
alphaDeltaMin_("alphaDeltaMin", dimless, coeffDict_)
{
- phi_ *= constant::mathematical::pi/180.0;
+ phi_ *= degToRad();
}
@@ -199,7 +199,7 @@ JohnsonJacksonSchaeffer::read()
p_.read(coeffDict_);
phi_.read(coeffDict_);
- phi_ *= constant::mathematical::pi/180.0;
+ phi_ *= degToRad();
alphaDeltaMin_.read(coeffDict_);
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.C b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.C
index 2bb056347f484d8578948878726254662dcc1d1f..996af183fcf490ef444a4c320bcaadc860a73bd6 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd |
+ \\ / A nd | Copyright (C) 2019 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
| Copyright (C) 2011-2017 OpenFOAM Foundation
@@ -27,6 +27,7 @@ License
#include "SchaefferFrictionalStress.H"
#include "addToRunTimeSelectionTable.H"
+#include "unitConversion.H"
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@@ -60,7 +61,7 @@ Foam::kineticTheoryModels::frictionalStressModels::Schaeffer::Schaeffer
coeffDict_(dict.optionalSubDict(typeName + "Coeffs")),
phi_("phi", dimless, coeffDict_)
{
- phi_ *= constant::mathematical::pi/180.0;
+ phi_ *= degToRad();
}
@@ -183,7 +184,7 @@ bool Foam::kineticTheoryModels::frictionalStressModels::Schaeffer::read()
coeffDict_ <<= dict_.optionalSubDict(typeName + "Coeffs");
phi_.read(coeffDict_);
- phi_ *= constant::mathematical::pi/180.0;
+ phi_ *= degToRad();
return true;
}
diff --git a/applications/test/quaternion/Test-quaternion.C b/applications/test/quaternion/Test-quaternion.C
index ac8c8655cd8a2fa666746edd9f96379b0ecd2fe5..1f72daf5794939b90b398d68801c77407109bd44 100644
--- a/applications/test/quaternion/Test-quaternion.C
+++ b/applications/test/quaternion/Test-quaternion.C
@@ -199,13 +199,13 @@ int main(int argc, char *argv[])
<< Ra
(
axisAngle.first() / mag(axisAngle.first()),
- axisAngle.second() * constant::mathematical::pi/180.0
+ degToRad(axisAngle.second())
) << nl;
Info<< "-ve Ra = "
<< Ra
(
axisAngle.first() / mag(axisAngle.first()),
- -axisAngle.second() * constant::mathematical::pi/180.0
+ degToRad(-axisAngle.second())
) << nl;
}
diff --git a/applications/utilities/mesh/manipulation/transformPoints/transformPoints.C b/applications/utilities/mesh/manipulation/transformPoints/transformPoints.C
index 28ca4be84737727bda87617119f4e759a0058711..698ec7f601d811eaebea0a70502c88f1f1e3abfb 100644
--- a/applications/utilities/mesh/manipulation/transformPoints/transformPoints.C
+++ b/applications/utilities/mesh/manipulation/transformPoints/transformPoints.C
@@ -73,10 +73,9 @@ Usage
#include "pointFields.H"
#include "transformField.H"
#include "transformGeometricField.H"
-#include "mathematicalConstants.H"
+#include "unitConversion.H"
using namespace Foam;
-using namespace Foam::constant::mathematical;
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -310,7 +309,7 @@ int main(int argc, char *argv[])
const quaternion quat
(
axisAngle.first(),
- axisAngle.second() * pi/180.0 // degToRad
+ degToRad(axisAngle.second())
);
Info<< "Rotating points by quaternion " << quat << endl;
@@ -328,8 +327,7 @@ int main(int argc, char *argv[])
<< " pitch " << v.y() << nl
<< " yaw " << v.z() << nl;
- // degToRad
- v *= pi/180.0;
+ v *= degToRad();
const quaternion quat(quaternion::rotationSequence::XYZ, v);
@@ -348,8 +346,7 @@ int main(int argc, char *argv[])
<< " pitch " << v.y() << nl
<< " roll " << v.z() << nl;
- // degToRad
- v *= pi/180.0;
+ v *= degToRad();
const quaternion quat(quaternion::rotationSequence::ZYX, v);
diff --git a/applications/utilities/surface/surfaceTransformPoints/surfaceTransformPoints.C b/applications/utilities/surface/surfaceTransformPoints/surfaceTransformPoints.C
index 7cf999cee873c5d83201087f6dc85ec0c4351452..229df4d1b9bb4feae949ca0c5a15f6536c59c7c0 100644
--- a/applications/utilities/surface/surfaceTransformPoints/surfaceTransformPoints.C
+++ b/applications/utilities/surface/surfaceTransformPoints/surfaceTransformPoints.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2017 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2017-2019 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
| Copyright (C) 2011-2016 OpenFOAM Foundation
@@ -49,12 +49,11 @@ Description
#include "Pair.H"
#include "Tuple2.H"
#include "quaternion.H"
-#include "mathematicalConstants.H"
+#include "unitConversion.H"
#include "MeshedSurfaces.H"
using namespace Foam;
-using namespace Foam::constant::mathematical;
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -200,7 +199,7 @@ int main(int argc, char *argv[])
const quaternion quat
(
axisAngle.first(),
- axisAngle.second() * pi/180.0 // degToRad
+ degToRad(axisAngle.second())
);
Info<< "Rotating points by quaternion " << quat << endl;
@@ -213,8 +212,7 @@ int main(int argc, char *argv[])
<< " pitch " << v.y() << nl
<< " yaw " << v.z() << nl;
- // degToRad
- v *= pi/180.0;
+ v *= degToRad();
const quaternion quat(quaternion::rotationSequence::XYZ, v);
@@ -228,8 +226,7 @@ int main(int argc, char *argv[])
<< " pitch " << v.y() << nl
<< " roll " << v.z() << nl;
- // degToRad
- v *= pi/180.0;
+ v *= degToRad();
const quaternion quat(quaternion::rotationSequence::ZYX, v);
diff --git a/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/oscillatingRotatingMotion/oscillatingRotatingMotion.C b/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/oscillatingRotatingMotion/oscillatingRotatingMotion.C
index 95052481c87935082cb8d2437c627c509d10e6c1..e0c7f4284515e1735939853f8249eb9b6611f189 100644
--- a/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/oscillatingRotatingMotion/oscillatingRotatingMotion.C
+++ b/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/oscillatingRotatingMotion/oscillatingRotatingMotion.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd |
+ \\ / A nd | Copyright (C) 2019 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
| Copyright (C) 2011-2016 OpenFOAM Foundation
@@ -27,9 +27,7 @@ License
#include "oscillatingRotatingMotion.H"
#include "addToRunTimeSelectionTable.H"
-#include "mathematicalConstants.H"
-
-using namespace Foam::constant::mathematical;
+#include "unitConversion.H"
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@@ -81,7 +79,7 @@ transformation() const
vector eulerAngles = amplitude_*sin(omega_*t);
// Convert the rotational motion from deg to rad
- eulerAngles *= pi/180.0;
+ eulerAngles *= degToRad();
quaternion R(quaternion::XYZ, eulerAngles);
septernion TR(septernion(-origin_)*R*septernion(origin_));
diff --git a/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/tabulated6DoFMotion/tabulated6DoFMotion.C b/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/tabulated6DoFMotion/tabulated6DoFMotion.C
index e458d748ac65478aba52425064c6ca85f956767e..2a5574e40b65baadbd0e5690f86d0a3689a9a207 100644
--- a/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/tabulated6DoFMotion/tabulated6DoFMotion.C
+++ b/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/tabulated6DoFMotion/tabulated6DoFMotion.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd |
+ \\ / A nd | Copyright (C) 2019 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
| Copyright (C) 2011-2016 OpenFOAM Foundation
@@ -30,9 +30,8 @@ License
#include "Tuple2.H"
#include "IFstream.H"
#include "interpolateSplineXY.H"
-#include "mathematicalConstants.H"
+#include "unitConversion.H"
-using namespace Foam::constant::mathematical;
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@@ -104,7 +103,7 @@ Foam::solidBodyMotionFunctions::tabulated6DoFMotion::transformation() const
);
// Convert the rotational motion from deg to rad
- TRV[1] *= pi/180.0;
+ TRV[1] *= degToRad();
quaternion R(quaternion::XYZ, TRV[1]);
septernion TR(septernion(-CofG_ + -TRV[0])*R*septernion(CofG_));
diff --git a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleErosion/ParticleErosion.C b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleErosion/ParticleErosion.C
index fa5eb769bef3aafd2cd913646552386fc05d1595..61562e338af40052c81a87a6ea04f4e1b0a4bbef 100644
--- a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleErosion/ParticleErosion.C
+++ b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleErosion/ParticleErosion.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd |
+ \\ / A nd | Copyright (C) 2019 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
| Copyright (C) 2011-2017 OpenFOAM Foundation
@@ -185,7 +185,7 @@ void Foam::ParticleErosion<CloudType>::postPatch
const vector Udir = U/magU;
// determine impact angle, alpha
- const scalar alpha = mathematical::pi/2.0 - acos(nw & Udir);
+ const scalar alpha = mathematical::piByTwo - acos(nw & Udir);
const scalar coeff = p.nParticle()*p.mass()*sqr(magU)/(p_*psi_*K_);
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeNozzleInjection/ConeNozzleInjection.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeNozzleInjection/ConeNozzleInjection.C
index 1821b93d66ad41e96508f5af066555f94dcb12ee..0bf44589b78a4ac0c0b70ab4aa4e66ae3df913a9 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeNozzleInjection/ConeNozzleInjection.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeNozzleInjection/ConeNozzleInjection.C
@@ -27,7 +27,7 @@ License
#include "ConeNozzleInjection.H"
#include "TimeFunction1.H"
-#include "mathematicalConstants.H"
+#include "unitConversion.H"
#include "distributionModel.H"
using namespace Foam::constant;
@@ -417,14 +417,11 @@ void Foam::ConeNozzleInjection<CloudType>::setProperties
Random& rndGen = this->owner().rndGen();
// Set particle velocity
- const scalar deg2Rad = mathematical::pi/180.0;
-
scalar t = time - this->SOI_;
scalar ti = thetaInner_.value(t);
scalar to = thetaOuter_.value(t);
- scalar coneAngle = rndGen.sample01<scalar>()*(to - ti) + ti;
+ scalar coneAngle = degToRad(rndGen.sample01<scalar>()*(to - ti) + ti);
- coneAngle *= deg2Rad;
scalar alpha = sin(coneAngle);
scalar dcorr = cos(coneAngle);
diff --git a/src/lagrangian/intermediate/submodels/Thermodynamic/SurfaceFilmModel/ThermoSurfaceFilm/ThermoSurfaceFilm.C b/src/lagrangian/intermediate/submodels/Thermodynamic/SurfaceFilmModel/ThermoSurfaceFilm/ThermoSurfaceFilm.C
index 5d0e7ec52033d01d27bc84516b04a07d5f75689e..e449e0ad8988159d0aea0e3265d519489788c6bf 100644
--- a/src/lagrangian/intermediate/submodels/Thermodynamic/SurfaceFilmModel/ThermoSurfaceFilm/ThermoSurfaceFilm.C
+++ b/src/lagrangian/intermediate/submodels/Thermodynamic/SurfaceFilmModel/ThermoSurfaceFilm/ThermoSurfaceFilm.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd |
+ \\ / A nd | Copyright (C) 2019 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
| Copyright (C) 2011-2017 OpenFOAM Foundation
@@ -27,7 +27,7 @@ License
#include "ThermoSurfaceFilm.H"
#include "addToRunTimeSelectionTable.H"
-#include "mathematicalConstants.H"
+#include "unitConversion.H"
#include "Pstream.H"
using namespace Foam::constant::mathematical;
@@ -114,7 +114,7 @@ Foam::vector Foam::ThermoSurfaceFilm<CloudType>::splashDirection
const scalar phiSi = twoPi*rndGen_.sample01<scalar>();
// Ejection angle [rad]
- const scalar thetaSi = pi/180.0*(rndGen_.sample01<scalar>()*(50 - 5) + 5);
+ const scalar thetaSi = degToRad(rndGen_.sample01<scalar>()*(50 - 5) + 5);
// Direction vector of new parcel
const scalar alpha = sin(thetaSi);
@@ -311,7 +311,7 @@ void Foam::ThermoSurfaceFilm<CloudType>::wetSplashInteraction
else if ((We >= 2) && (We < 20)) // Bounce
{
// Incident angle of impingement
- const scalar theta = pi/2 - acos(U/mag(U) & nf);
+ const scalar theta = piByTwo - acos(U/mag(U) & nf);
// Restitution coefficient
const scalar epsilon = 0.993 - theta*(1.76 - theta*(1.56 - theta*0.49));
diff --git a/src/lagrangian/molecularDynamics/molecule/moleculeCloud/moleculeCloud.C b/src/lagrangian/molecularDynamics/molecule/moleculeCloud/moleculeCloud.C
index e9ae8c838ba99dd28c8fdc51f8d33cdac8f77611..aa26e5fe37a03d187ccb21ea429b011e9a58408a 100644
--- a/src/lagrangian/molecularDynamics/molecule/moleculeCloud/moleculeCloud.C
+++ b/src/lagrangian/molecularDynamics/molecule/moleculeCloud/moleculeCloud.C
@@ -27,9 +27,7 @@ License
#include "moleculeCloud.H"
#include "fvMesh.H"
-#include "mathematicalConstants.H"
-
-using namespace Foam::constant::mathematical;
+#include "unitConversion.H"
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@@ -610,11 +608,9 @@ void Foam::moleculeCloud::initialiseMolecules
zoneDict.get<vector>("orientationAngles")
);
- scalar phi(orientationAngles.x()*pi/180.0);
-
- scalar theta(orientationAngles.y()*pi/180.0);
-
- scalar psi(orientationAngles.z()*pi/180.0);
+ const scalar phi(degToRad(orientationAngles.x()));
+ const scalar theta(degToRad(orientationAngles.y()));
+ const scalar psi(degToRad(orientationAngles.z()));
const tensor R
(
@@ -984,11 +980,9 @@ void Foam::moleculeCloud::createMolecule
{
pi = equipartitionAngularMomentum(temperature, cP);
- scalar phi(rndGen_.sample01<scalar>()*twoPi);
-
- scalar theta(rndGen_.sample01<scalar>()*twoPi);
-
- scalar psi(rndGen_.sample01<scalar>()*twoPi);
+ const scalar phi(rndGen_.sample01<scalar>()*mathematical::twoPi);
+ const scalar theta(rndGen_.sample01<scalar>()*mathematical::twoPi);
+ const scalar psi(rndGen_.sample01<scalar>()*mathematical::twoPi);
Q = tensor
(
diff --git a/src/sampling/sampledSet/circle/circleSet.C b/src/sampling/sampledSet/circle/circleSet.C
index 125bcb142267ff57dac95a0f6fa53c08970a3d7b..01d64f82b68f1ac193437812ee9ca2d39fa5df65 100644
--- a/src/sampling/sampledSet/circle/circleSet.C
+++ b/src/sampling/sampledSet/circle/circleSet.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd |
+ \\ / A nd | Copyright (C) 2019 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
| Copyright (C) 2011-2016 OpenFOAM Foundation
@@ -32,7 +32,7 @@ License
#include "polyMesh.H"
#include "addToRunTimeSelectionTable.H"
#include "word.H"
-#include "mathematicalConstants.H"
+#include "unitConversion.H"
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@@ -72,7 +72,7 @@ void Foam::circleSet::calcSamples
}
// Add remaining points
- const scalar alpha = constant::mathematical::pi/180.0*dTheta_;
+ const scalar alpha = degToRad(dTheta_);
const scalar sinAlpha = sin(alpha);
const scalar cosAlpha = cos(alpha);
@@ -107,10 +107,7 @@ void Foam::circleSet::calcSamples
samplingCells.append(celli);
samplingFaces.append(-1);
samplingSegments.append(nPoint);
- samplingCurveDist.append
- (
- radius*constant::mathematical::pi/180.0*theta
- );
+ samplingCurveDist.append(radius*degToRad(theta));
++nPoint;
}