mirror of
https://develop.openfoam.com/Development/openfoam.git
synced 2025-11-28 03:28:01 +00:00
Reverted the Americanism "math" back to the original "mathematical" and reverted name of
the include file back to mathematicalConstants.H to make upgrading code slightly easier.
This commit is contained in:
henry
@ -24,7 +24,7 @@ License
|
||||
|
||||
\*---------------------------------------------------------------------------*/
|
||||
|
||||
#include "mathConstants.H"
|
||||
#include "mathematicalConstants.H"
|
||||
#include "universalConstants.H"
|
||||
#include "electromagneticConstants.H"
|
||||
#include "atomicConstants.H"
|
||||
@ -83,7 +83,7 @@ const Foam::dimensionedScalar Foam::constant::atomic::a0
|
||||
(
|
||||
"a0",
|
||||
alpha
|
||||
/(dimensionedScalar("C", dimless, 4.0*constant::math::pi)*Rinf)
|
||||
/(dimensionedScalar("C", dimless, 4.0*constant::mathematical::pi)*Rinf)
|
||||
)
|
||||
)
|
||||
);
|
||||
@ -100,7 +100,7 @@ const Foam::dimensionedScalar Foam::constant::atomic::re
|
||||
"re",
|
||||
sqr(constant::electromagnetic::e)
|
||||
/(
|
||||
dimensionedScalar("C", dimless, 4.0*constant::math::pi)
|
||||
dimensionedScalar("C", dimless, 4.0*constant::mathematical::pi)
|
||||
*constant::electromagnetic::epsilon0
|
||||
*me
|
||||
*sqr(constant::universal::c)
|
||||
|
||||
@ -38,7 +38,7 @@ Description
|
||||
// Dimensionless coefficents
|
||||
|
||||
// Mathematical constants
|
||||
#include "mathConstants.H"
|
||||
#include "mathematicalConstants.H"
|
||||
|
||||
|
||||
// Dimensioned constants
|
||||
|
||||
@ -24,7 +24,7 @@ License
|
||||
|
||||
\*---------------------------------------------------------------------------*/
|
||||
|
||||
#include "mathConstants.H"
|
||||
#include "mathematicalConstants.H"
|
||||
#include "universalConstants.H"
|
||||
#include "electromagneticConstants.H"
|
||||
#include "atomicConstants.H"
|
||||
@ -46,7 +46,7 @@ const Foam::dimensionedScalar Foam::constant::electromagnetic::mu0
|
||||
(
|
||||
"mu0",
|
||||
dimless,
|
||||
4.0*constant::math::pi*1e-07
|
||||
4.0*constant::mathematical::pi*1e-07
|
||||
)
|
||||
)
|
||||
);
|
||||
@ -92,7 +92,7 @@ const Foam::dimensionedScalar Foam::constant::electromagnetic::kappa
|
||||
dimensionedScalar
|
||||
(
|
||||
"kappa",
|
||||
dimensionedScalar("C", dimless, 1.0/(4.0*constant::math::pi))
|
||||
dimensionedScalar("C", dimless, 1.0/(4.0*constant::mathematical::pi))
|
||||
/epsilon0
|
||||
)
|
||||
)
|
||||
|
||||
@ -23,15 +23,15 @@ License
|
||||
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
|
||||
Namespace
|
||||
Foam::constant::math
|
||||
Foam::constant::mathematical
|
||||
|
||||
Description
|
||||
mathematical constants
|
||||
|
||||
\*---------------------------------------------------------------------------*/
|
||||
|
||||
#ifndef mathConstants_H
|
||||
#define mathConstants_H
|
||||
#ifndef mathematicalConstants_H
|
||||
#define mathematicalConstants_H
|
||||
|
||||
#include "scalar.H"
|
||||
|
||||
@ -41,12 +41,12 @@ namespace Foam
|
||||
{
|
||||
namespace constant
|
||||
{
|
||||
namespace math
|
||||
namespace mathematical
|
||||
{
|
||||
|
||||
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
||||
|
||||
static word group = "math";
|
||||
static word group = "mathematical";
|
||||
|
||||
const scalar e(M_E);
|
||||
const scalar pi(M_PI);
|
||||
@ -55,7 +55,7 @@ namespace math
|
||||
|
||||
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
||||
|
||||
} // End namespace math
|
||||
} // End namespace mathematical
|
||||
} // end namespace constant
|
||||
} // End namespace Foam
|
||||
|
||||
@ -64,6 +64,3 @@ namespace math
|
||||
#endif
|
||||
|
||||
// ************************************************************************* //
|
||||
|
||||
|
||||
|
||||
@ -24,7 +24,7 @@ License
|
||||
|
||||
\*---------------------------------------------------------------------------*/
|
||||
|
||||
#include "mathConstants.H"
|
||||
#include "mathematicalConstants.H"
|
||||
#include "universalConstants.H"
|
||||
#include "electromagneticConstants.H"
|
||||
#include "physicoChemicalConstants.H"
|
||||
@ -75,7 +75,7 @@ const Foam::dimensionedScalar Foam::constant::physicoChemical::sigma
|
||||
dimensionedScalar
|
||||
(
|
||||
"sigma",
|
||||
dimensionedScalar("C", dimless, sqr(constant::math::pi)/60.0)
|
||||
dimensionedScalar("C", dimless, sqr(constant::mathematical::pi)/60.0)
|
||||
*pow4(k)/(pow3(constant::universal::hr)*sqr(constant::universal::c))
|
||||
)
|
||||
)
|
||||
@ -107,7 +107,7 @@ const Foam::dimensionedScalar Foam::constant::physicoChemical::c1
|
||||
dimensionedScalar
|
||||
(
|
||||
"c1",
|
||||
dimensionedScalar("C", dimless, constant::math::twoPi)
|
||||
dimensionedScalar("C", dimless, constant::mathematical::twoPi)
|
||||
*constant::universal::h*sqr(constant::universal::c)
|
||||
)
|
||||
)
|
||||
|
||||
@ -25,7 +25,7 @@ License
|
||||
\*---------------------------------------------------------------------------*/
|
||||
|
||||
#include "universalConstants.H"
|
||||
#include "mathConstants.H"
|
||||
#include "mathematicalConstants.H"
|
||||
|
||||
#include "dimensionedConstants.H"
|
||||
|
||||
@ -43,7 +43,7 @@ const Foam::dimensionedScalar Foam::constant::universal::hr
|
||||
dimensionedScalar
|
||||
(
|
||||
"hr",
|
||||
h/(dimensionedScalar("C", dimless, constant::math::twoPi))
|
||||
h/(dimensionedScalar("C", dimless, constant::mathematical::twoPi))
|
||||
)
|
||||
)
|
||||
);
|
||||
|
||||
@ -27,7 +27,7 @@ License
|
||||
#include "face.H"
|
||||
#include "triFace.H"
|
||||
#include "triPointRef.H"
|
||||
#include "mathConstants.H"
|
||||
#include "mathematicalConstants.H"
|
||||
|
||||
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
|
||||
|
||||
@ -99,13 +99,13 @@ Foam::label Foam::face::mostConcaveAngle
|
||||
if ((edgeNormal & n) > 0)
|
||||
{
|
||||
// Concave angle.
|
||||
angle = constant::math::pi + edgeAngle;
|
||||
angle = constant::mathematical::pi + edgeAngle;
|
||||
}
|
||||
else
|
||||
{
|
||||
// Convex angle. Note '-' to take into account that rightEdge
|
||||
// and leftEdge are head-to-tail connected.
|
||||
angle = constant::math::pi - edgeAngle;
|
||||
angle = constant::mathematical::pi - edgeAngle;
|
||||
}
|
||||
|
||||
if (angle > maxAngle)
|
||||
@ -214,7 +214,7 @@ Foam::label Foam::face::split
|
||||
label index = fcIndex(fcIndex(startIndex));
|
||||
|
||||
label minIndex = index;
|
||||
scalar minDiff = constant::math::pi;
|
||||
scalar minDiff = constant::mathematical::pi;
|
||||
|
||||
for(label i = 0; i < size() - 3; i++)
|
||||
{
|
||||
|
||||
@ -27,7 +27,7 @@ License
|
||||
#include "primitiveMesh.H"
|
||||
#include "pyramidPointFaceRef.H"
|
||||
#include "ListOps.H"
|
||||
#include "mathConstants.H"
|
||||
#include "mathematicalConstants.H"
|
||||
#include "SortableList.H"
|
||||
|
||||
|
||||
@ -410,7 +410,7 @@ bool Foam::primitiveMesh::checkFaceOrthogonality
|
||||
|
||||
// Severe nonorthogonality threshold
|
||||
const scalar severeNonorthogonalityThreshold =
|
||||
::cos(nonOrthThreshold_/180.0*constant::math::pi);
|
||||
::cos(nonOrthThreshold_/180.0*constant::mathematical::pi);
|
||||
|
||||
scalar minDDotS = GREAT;
|
||||
|
||||
@ -472,9 +472,9 @@ bool Foam::primitiveMesh::checkFaceOrthogonality
|
||||
if (debug || report)
|
||||
{
|
||||
Info<< " Mesh non-orthogonality Max: "
|
||||
<< ::acos(minDDotS)/constant::math::pi*180.0
|
||||
<< ::acos(minDDotS)/constant::mathematical::pi*180.0
|
||||
<< " average: " <<
|
||||
::acos(sumDDotS/neiSize)/constant::math::pi*180.0
|
||||
::acos(sumDDotS/neiSize)/constant::mathematical::pi*180.0
|
||||
<< endl;
|
||||
}
|
||||
}
|
||||
@ -839,7 +839,7 @@ bool Foam::primitiveMesh::checkFaceAngles
|
||||
<< exit(FatalError);
|
||||
}
|
||||
|
||||
const scalar maxSin = Foam::sin(maxDeg/180.0*constant::math::pi);
|
||||
const scalar maxSin = Foam::sin(maxDeg/180.0*constant::mathematical::pi);
|
||||
|
||||
const pointField& p = points();
|
||||
const faceList& fcs = faces();
|
||||
@ -916,7 +916,7 @@ bool Foam::primitiveMesh::checkFaceAngles
|
||||
{
|
||||
scalar maxConcaveDegr =
|
||||
Foam::asin(Foam::min(1.0, maxEdgeSin))
|
||||
*180.0/constant::math::pi;
|
||||
*180.0/constant::mathematical::pi;
|
||||
|
||||
if (debug || report)
|
||||
{
|
||||
|
||||
@ -31,7 +31,7 @@ Description
|
||||
#include "primitiveMesh.H"
|
||||
#include "pyramidPointFaceRef.H"
|
||||
#include "cell.H"
|
||||
#include "mathConstants.H"
|
||||
#include "mathematicalConstants.H"
|
||||
|
||||
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
||||
|
||||
@ -200,7 +200,7 @@ bool Foam::primitiveMesh::checkMeshMotion
|
||||
) << "Severe non-orthogonality in mesh motion for face "
|
||||
<< faceI
|
||||
<< " between cells " << own[faceI] << " and " << nei[faceI]
|
||||
<< ": Angle = " << ::acos(dDotS)/constant::math::pi*180.0
|
||||
<< ": Angle = " << ::acos(dDotS)/constant::mathematical::pi*180.0
|
||||
<< " deg." << endl;
|
||||
|
||||
nDotProductErrors++;
|
||||
|
||||
@ -26,7 +26,7 @@ License
|
||||
|
||||
#include "IOstreams.H"
|
||||
#include "pointHit.H"
|
||||
#include "mathConstants.H"
|
||||
#include "mathematicalConstants.H"
|
||||
|
||||
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
||||
|
||||
@ -307,7 +307,7 @@ inline scalar triangle<Point, PointRef>::quality() const
|
||||
return
|
||||
mag()
|
||||
/ (
|
||||
constant::math::pi
|
||||
constant::mathematical::pi
|
||||
*Foam::sqr(circumRadius())
|
||||
*0.413497
|
||||
+ VSMALL
|
||||
|
||||
@ -25,7 +25,7 @@ License
|
||||
\*---------------------------------------------------------------------------*/
|
||||
|
||||
#include "tensor.H"
|
||||
#include "mathConstants.H"
|
||||
#include "mathematicalConstants.H"
|
||||
|
||||
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
||||
|
||||
@ -150,8 +150,8 @@ vector eigenValues(const tensor& t)
|
||||
scalar aBy3 = a/3;
|
||||
|
||||
i = m2SqrtQ*cos(theta/3) - aBy3;
|
||||
ii = m2SqrtQ*cos((theta + constant::math::twoPi)/3) - aBy3;
|
||||
iii = m2SqrtQ*cos((theta - constant::math::twoPi)/3) - aBy3;
|
||||
ii = m2SqrtQ*cos((theta + constant::mathematical::twoPi)/3) - aBy3;
|
||||
iii = m2SqrtQ*cos((theta - constant::mathematical::twoPi)/3) - aBy3;
|
||||
}
|
||||
else
|
||||
{
|
||||
@ -343,8 +343,8 @@ vector eigenValues(const symmTensor& t)
|
||||
scalar aBy3 = a/3;
|
||||
|
||||
i = m2SqrtQ*cos(theta/3) - aBy3;
|
||||
ii = m2SqrtQ*cos((theta + constant::math::twoPi)/3) - aBy3;
|
||||
iii = m2SqrtQ*cos((theta - constant::math::twoPi)/3) - aBy3;
|
||||
ii = m2SqrtQ*cos((theta + constant::mathematical::twoPi)/3) - aBy3;
|
||||
iii = m2SqrtQ*cos((theta - constant::mathematical::twoPi)/3) - aBy3;
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
@ -34,7 +34,7 @@ Description
|
||||
#define transform_H
|
||||
|
||||
#include "tensor.H"
|
||||
#include "mathConstants.H"
|
||||
#include "mathematicalConstants.H"
|
||||
|
||||
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
||||
|
||||
@ -205,11 +205,11 @@ inline scalar pseudoAngle
|
||||
|
||||
if (sin < -SMALL)
|
||||
{
|
||||
return (3.0 + cos)*constant::math::piByTwo;
|
||||
return (3.0 + cos)*constant::mathematical::piByTwo;
|
||||
}
|
||||
else
|
||||
{
|
||||
return (1.0 - cos)*constant::math::piByTwo;
|
||||
return (1.0 - cos)*constant::mathematical::piByTwo;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -34,7 +34,7 @@ Description
|
||||
#include "removePoints.H"
|
||||
#include "pointFields.H"
|
||||
#include "motionSmoother.H"
|
||||
#include "mathConstants.H"
|
||||
#include "mathematicalConstants.H"
|
||||
#include "pointSet.H"
|
||||
#include "faceSet.H"
|
||||
#include "cellSet.H"
|
||||
@ -2480,10 +2480,10 @@ void Foam::autoLayerDriver::mergePatchFacesUndo
|
||||
)
|
||||
{
|
||||
scalar minCos =
|
||||
Foam::cos(layerParams.featureAngle()*constant::math::pi/180.0);
|
||||
Foam::cos(layerParams.featureAngle()*constant::mathematical::pi/180.0);
|
||||
|
||||
scalar concaveCos =
|
||||
Foam::cos(layerParams.concaveAngle()*constant::math::pi/180.0);
|
||||
Foam::cos(layerParams.concaveAngle()*constant::mathematical::pi/180.0);
|
||||
|
||||
Info<< nl
|
||||
<< "Merging all faces of a cell" << nl
|
||||
@ -2602,7 +2602,7 @@ void Foam::autoLayerDriver::addLayers
|
||||
(
|
||||
pp,
|
||||
meshEdges,
|
||||
layerParams.featureAngle()*constant::math::pi/180.0,
|
||||
layerParams.featureAngle()*constant::mathematical::pi/180.0,
|
||||
|
||||
patchDisp,
|
||||
patchNLayers,
|
||||
|
||||
@ -681,8 +681,8 @@ void Foam::autoRefineDriver::mergePatchFaces
|
||||
|
||||
meshRefiner_.mergePatchFaces
|
||||
(
|
||||
Foam::cos(45*constant::math::pi/180.0),
|
||||
Foam::cos(45*constant::math::pi/180.0),
|
||||
Foam::cos(45*constant::mathematical::pi/180.0),
|
||||
Foam::cos(45*constant::mathematical::pi/180.0),
|
||||
meshRefiner_.meshedPatches()
|
||||
);
|
||||
|
||||
@ -691,7 +691,7 @@ void Foam::autoRefineDriver::mergePatchFaces
|
||||
meshRefiner_.checkData();
|
||||
}
|
||||
|
||||
meshRefiner_.mergeEdges(Foam::cos(45*constant::math::pi/180.0));
|
||||
meshRefiner_.mergeEdges(Foam::cos(45*constant::mathematical::pi/180.0));
|
||||
|
||||
if (debug)
|
||||
{
|
||||
|
||||
@ -26,7 +26,7 @@ License
|
||||
|
||||
#include "layerParameters.H"
|
||||
#include "polyBoundaryMesh.H"
|
||||
#include "mathConstants.H"
|
||||
#include "mathematicalConstants.H"
|
||||
#include "refinementSurfaces.H"
|
||||
#include "searchableSurfaces.H"
|
||||
#include "regExp.H"
|
||||
@ -192,7 +192,7 @@ Foam::layerParameters::layerParameters
|
||||
),
|
||||
layerTerminationCos_
|
||||
(
|
||||
Foam::cos(0.5*featureAngle_*constant::math::pi/180.0)
|
||||
Foam::cos(0.5*featureAngle_*constant::mathematical::pi/180.0)
|
||||
),
|
||||
maxThicknessToMedialRatio_
|
||||
(
|
||||
@ -201,7 +201,7 @@ Foam::layerParameters::layerParameters
|
||||
minMedianAxisAngleCos_
|
||||
(
|
||||
Foam::cos(readScalar(dict.lookup("minMedianAxisAngle")))
|
||||
*constant::math::pi/180.0
|
||||
*constant::mathematical::pi/180.0
|
||||
),
|
||||
nBufferCellsNoExtrude_
|
||||
(
|
||||
@ -269,7 +269,7 @@ Foam::layerParameters::layerParameters
|
||||
),
|
||||
layerTerminationCos_
|
||||
(
|
||||
Foam::cos(0.5*featureAngle_*constant::math::pi/180.0)
|
||||
Foam::cos(0.5*featureAngle_*constant::mathematical::pi/180.0)
|
||||
),
|
||||
maxThicknessToMedialRatio_
|
||||
(
|
||||
@ -278,7 +278,7 @@ Foam::layerParameters::layerParameters
|
||||
minMedianAxisAngleCos_
|
||||
(
|
||||
Foam::cos(readScalar(dict.lookup("minMedianAxisAngle")))
|
||||
*constant::math::pi/180.0
|
||||
*constant::mathematical::pi/180.0
|
||||
),
|
||||
nBufferCellsNoExtrude_
|
||||
(
|
||||
|
||||
@ -25,7 +25,7 @@ License
|
||||
\*---------------------------------------------------------------------------*/
|
||||
|
||||
#include "refinementParameters.H"
|
||||
#include "mathConstants.H"
|
||||
#include "mathematicalConstants.H"
|
||||
#include "polyMesh.H"
|
||||
#include "globalIndex.H"
|
||||
|
||||
@ -65,7 +65,7 @@ Foam::refinementParameters::refinementParameters(const dictionary& dict)
|
||||
}
|
||||
else
|
||||
{
|
||||
curvature_ = Foam::cos(featAngle*constant::math::pi/180.0);
|
||||
curvature_ = Foam::cos(featAngle*constant::mathematical::pi/180.0);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -37,7 +37,7 @@ License
|
||||
#include "searchableSurfaces.H"
|
||||
#include "polyMeshGeometry.H"
|
||||
#include "IOmanip.H"
|
||||
#include "mathConstants.H"
|
||||
#include "mathematicalConstants.H"
|
||||
|
||||
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
|
||||
|
||||
@ -247,7 +247,7 @@ Foam::Map<Foam::label> Foam::meshRefinement::findEdgeConnectedProblemCells
|
||||
nearestRegion[i]
|
||||
);
|
||||
|
||||
scalar angle = perpendicularAngle[region]/180.0*constant::math::pi;
|
||||
scalar angle = perpendicularAngle[region]/180.0*constant::mathematical::pi;
|
||||
|
||||
if (angle >= 0)
|
||||
{
|
||||
|
||||
@ -10,7 +10,7 @@ solidBodyMotionFunctions = solidBodyMotionFvMesh/solidBodyMotionFunctions
|
||||
$(solidBodyMotionFunctions)/solidBodyMotionFunction/solidBodyMotionFunction.C
|
||||
$(solidBodyMotionFunctions)/solidBodyMotionFunction/newSolidBodyMotionFunction.C
|
||||
$(solidBodyMotionFunctions)/SDA/SDA.C
|
||||
$(solidBodyMotionFunctions)/SKA/SKA.C
|
||||
$(solidBodyMotionFunctions)/tabulated6DoFMotion/tabulated6DoFMotion.C
|
||||
$(solidBodyMotionFunctions)/linearMotion/linearMotion.C
|
||||
$(solidBodyMotionFunctions)/rotatingMotion/rotatingMotion.C
|
||||
$(solidBodyMotionFunctions)/multiMotion/multiMotion.C
|
||||
|
||||
@ -27,7 +27,7 @@ License
|
||||
#include "dynamicInkJetFvMesh.H"
|
||||
#include "addToRunTimeSelectionTable.H"
|
||||
#include "volFields.H"
|
||||
#include "mathConstants.H"
|
||||
#include "mathematicalConstants.H"
|
||||
|
||||
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
|
||||
|
||||
@ -90,7 +90,7 @@ Foam::dynamicInkJetFvMesh::~dynamicInkJetFvMesh()
|
||||
bool Foam::dynamicInkJetFvMesh::update()
|
||||
{
|
||||
scalar scalingFunction =
|
||||
0.5*(::cos(constant::math::twoPi*frequency_*time().value()) - 1.0);
|
||||
0.5*(::cos(constant::mathematical::twoPi*frequency_*time().value()) - 1.0);
|
||||
|
||||
Info<< "Mesh scaling. Time = " << time().value() << " scaling: "
|
||||
<< scalingFunction << endl;
|
||||
|
||||
@ -26,9 +26,9 @@ License
|
||||
|
||||
#include "SDA.H"
|
||||
#include "addToRunTimeSelectionTable.H"
|
||||
#include "mathConstants.H"
|
||||
#include "mathematicalConstants.H"
|
||||
|
||||
using namespace Foam::constant::math;
|
||||
using namespace Foam::constant::mathematical;
|
||||
|
||||
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
|
||||
|
||||
|
||||
@ -26,9 +26,9 @@ License
|
||||
|
||||
#include "oscillatingRotatingMotion.H"
|
||||
#include "addToRunTimeSelectionTable.H"
|
||||
#include "mathConstants.H"
|
||||
#include "mathematicalConstants.H"
|
||||
|
||||
using namespace Foam::constant::math;
|
||||
using namespace Foam::constant::mathematical;
|
||||
|
||||
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
|
||||
|
||||
|
||||
@ -26,9 +26,9 @@ License
|
||||
|
||||
#include "rotatingMotion.H"
|
||||
#include "addToRunTimeSelectionTable.H"
|
||||
#include "mathConstants.H"
|
||||
#include "mathematicalConstants.H"
|
||||
|
||||
using namespace Foam::constant::math;
|
||||
using namespace Foam::constant::mathematical;
|
||||
|
||||
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
|
||||
|
||||
|
||||
@ -24,14 +24,14 @@ License
|
||||
|
||||
\*---------------------------------------------------------------------------*/
|
||||
|
||||
#include "SKA.H"
|
||||
#include "tabulated6DoFMotion.H"
|
||||
#include "addToRunTimeSelectionTable.H"
|
||||
#include "Tuple2.H"
|
||||
#include "IFstream.H"
|
||||
#include "interpolateXY.H"
|
||||
#include "mathConstants.H"
|
||||
#include "mathematicalConstants.H"
|
||||
|
||||
using namespace Foam::constant::math;
|
||||
using namespace Foam::constant::mathematical;
|
||||
|
||||
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
|
||||
|
||||
@ -39,15 +39,20 @@ namespace Foam
|
||||
{
|
||||
namespace solidBodyMotionFunctions
|
||||
{
|
||||
defineTypeNameAndDebug(SKA, 0);
|
||||
addToRunTimeSelectionTable(solidBodyMotionFunction, SKA, dictionary);
|
||||
defineTypeNameAndDebug(tabulated6DoFMotion, 0);
|
||||
addToRunTimeSelectionTable
|
||||
(
|
||||
solidBodyMotionFunction,
|
||||
tabulated6DoFMotion,
|
||||
dictionary
|
||||
);
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
|
||||
|
||||
Foam::solidBodyMotionFunctions::SKA::SKA
|
||||
Foam::solidBodyMotionFunctions::tabulated6DoFMotion::tabulated6DoFMotion
|
||||
(
|
||||
const dictionary& SBMFCoeffs,
|
||||
const Time& runTime
|
||||
@ -61,13 +66,14 @@ Foam::solidBodyMotionFunctions::SKA::SKA
|
||||
|
||||
// * * * * * * * * * * * * * * * * Destructors * * * * * * * * * * * * * * * //
|
||||
|
||||
Foam::solidBodyMotionFunctions::SKA::~SKA()
|
||||
Foam::solidBodyMotionFunctions::tabulated6DoFMotion::~tabulated6DoFMotion()
|
||||
{}
|
||||
|
||||
|
||||
// * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * * //
|
||||
|
||||
Foam::septernion Foam::solidBodyMotionFunctions::SKA::transformation() const
|
||||
Foam::septernion
|
||||
Foam::solidBodyMotionFunctions::tabulated6DoFMotion::transformation() const
|
||||
{
|
||||
scalar t = time_.value();
|
||||
|
||||
@ -75,7 +81,7 @@ Foam::septernion Foam::solidBodyMotionFunctions::SKA::transformation() const
|
||||
{
|
||||
FatalErrorIn
|
||||
(
|
||||
"solidBodyMotionFunctions::SKA::transformation()"
|
||||
"solidBodyMotionFunctions::tabulated6DoFMotion::transformation()"
|
||||
) << "current time (" << t
|
||||
<< ") is less than the minimum in the data table ("
|
||||
<< times_[0] << ')'
|
||||
@ -86,7 +92,7 @@ Foam::septernion Foam::solidBodyMotionFunctions::SKA::transformation() const
|
||||
{
|
||||
FatalErrorIn
|
||||
(
|
||||
"solidBodyMotionFunctions::SKA::transformation()"
|
||||
"solidBodyMotionFunctions::tabulated6DoFMotion::transformation()"
|
||||
) << "current time (" << t
|
||||
<< ") is greater than the maximum in the data table ("
|
||||
<< times_[times_.size()-1] << ')'
|
||||
@ -106,14 +112,17 @@ Foam::septernion Foam::solidBodyMotionFunctions::SKA::transformation() const
|
||||
quaternion R(TRV[1].x(), TRV[1].y(), TRV[1].z());
|
||||
septernion TR(septernion(CofG_ + TRV[0])*R*septernion(-CofG_));
|
||||
|
||||
Info<< "solidBodyMotionFunctions::SKA::transformation(): "
|
||||
Info<< "solidBodyMotionFunctions::tabulated6DoFMotion::transformation(): "
|
||||
<< "Time = " << t << " transformation: " << TR << endl;
|
||||
|
||||
return TR;
|
||||
}
|
||||
|
||||
|
||||
bool Foam::solidBodyMotionFunctions::SKA::read(const dictionary& SBMFCoeffs)
|
||||
bool Foam::solidBodyMotionFunctions::tabulated6DoFMotion::read
|
||||
(
|
||||
const dictionary& SBMFCoeffs
|
||||
)
|
||||
{
|
||||
solidBodyMotionFunction::read(SBMFCoeffs);
|
||||
|
||||
@ -147,7 +156,8 @@ bool Foam::solidBodyMotionFunctions::SKA::read(const dictionary& SBMFCoeffs)
|
||||
{
|
||||
FatalErrorIn
|
||||
(
|
||||
"solidBodyMotionFunctions::SKA::read(const dictionary&)"
|
||||
"solidBodyMotionFunctions::tabulated6DoFMotion::read"
|
||||
"(const dictionary&)"
|
||||
) << "Cannot open time data file " << timeDataFileName_
|
||||
<< exit(FatalError);
|
||||
}
|
||||
|
||||
@ -23,25 +23,22 @@ License
|
||||
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
|
||||
Class
|
||||
Foam::solidBodyMotionFunctions::SKA
|
||||
Foam::solidBodyMotionFunctions::tabulated6DoFMotion
|
||||
|
||||
Description
|
||||
Sea Keeping Analysis (SKA) 6DoF motion function.
|
||||
Tabulated 6DoF motion function.
|
||||
|
||||
Obtained by interpolating tabulated data for surge (x-translation),
|
||||
sway (y-translation), heave (z-translation), roll (rotation about x),
|
||||
pitch (rotation about y) and yaw (rotation about z).
|
||||
|
||||
See Also
|
||||
SDA (Ship design analysis) for 3DoF motion.
|
||||
|
||||
SourceFiles
|
||||
SKA.C
|
||||
tabulated6DoFMotion.C
|
||||
|
||||
\*---------------------------------------------------------------------------*/
|
||||
|
||||
#ifndef SKA_H
|
||||
#define SKA_H
|
||||
#ifndef tabulated6DoFMotion_H
|
||||
#define tabulated6DoFMotion_H
|
||||
|
||||
#include "solidBodyMotionFunction.H"
|
||||
#include "primitiveFields.H"
|
||||
@ -55,10 +52,10 @@ namespace solidBodyMotionFunctions
|
||||
{
|
||||
|
||||
/*---------------------------------------------------------------------------*\
|
||||
Class SKA Declaration
|
||||
Class tabulated6DoFMotion Declaration
|
||||
\*---------------------------------------------------------------------------*/
|
||||
|
||||
class SKA
|
||||
class tabulated6DoFMotion
|
||||
:
|
||||
public solidBodyMotionFunction
|
||||
{
|
||||
@ -83,22 +80,22 @@ class SKA
|
||||
// Private Member Functions
|
||||
|
||||
//- Disallow copy construct
|
||||
SKA(const SKA&);
|
||||
tabulated6DoFMotion(const tabulated6DoFMotion&);
|
||||
|
||||
//- Disallow default bitwise assignment
|
||||
void operator=(const SKA&);
|
||||
void operator=(const tabulated6DoFMotion&);
|
||||
|
||||
|
||||
public:
|
||||
|
||||
//- Runtime type information
|
||||
TypeName("SKA");
|
||||
TypeName("tabulated6DoFMotion");
|
||||
|
||||
|
||||
// Constructors
|
||||
|
||||
//- Construct from components
|
||||
SKA
|
||||
tabulated6DoFMotion
|
||||
(
|
||||
const dictionary& SBMFCoeffs,
|
||||
const Time& runTime
|
||||
@ -107,7 +104,7 @@ public:
|
||||
|
||||
// Destructor
|
||||
|
||||
virtual ~SKA();
|
||||
virtual ~tabulated6DoFMotion();
|
||||
|
||||
|
||||
// Member Functions
|
||||
|
||||
@ -27,7 +27,7 @@ License
|
||||
#include "topoCellLooper.H"
|
||||
#include "cellFeatures.H"
|
||||
#include "polyMesh.H"
|
||||
#include "mathConstants.H"
|
||||
#include "mathematicalConstants.H"
|
||||
#include "DynamicList.H"
|
||||
#include "ListOps.H"
|
||||
#include "meshTools.H"
|
||||
@ -45,7 +45,7 @@ namespace Foam
|
||||
|
||||
// Angle for polys to be considered splitHexes.
|
||||
const Foam::scalar Foam::topoCellLooper::featureCos =
|
||||
Foam::cos(10.0*constant::math::pi/180.0);
|
||||
Foam::cos(10.0*constant::mathematical::pi/180.0);
|
||||
|
||||
|
||||
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
|
||||
|
||||
@ -32,7 +32,7 @@ License
|
||||
#include "cellCuts.H"
|
||||
#include "splitCell.H"
|
||||
#include "mapPolyMesh.H"
|
||||
#include "mathConstants.H"
|
||||
#include "mathematicalConstants.H"
|
||||
#include "meshTools.H"
|
||||
|
||||
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
|
||||
@ -192,7 +192,7 @@ Foam::undoableMeshCutter::undoableMeshCutter
|
||||
faceRemover_
|
||||
(
|
||||
mesh,
|
||||
Foam::cos(30.0/180.0*constant::math::pi)
|
||||
Foam::cos(30.0/180.0*constant::mathematical::pi)
|
||||
)
|
||||
{}
|
||||
|
||||
|
||||
@ -27,7 +27,7 @@ License
|
||||
#include "polyMeshGeometry.H"
|
||||
#include "pyramidPointFaceRef.H"
|
||||
#include "syncTools.H"
|
||||
#include "mathConstants.H"
|
||||
#include "mathematicalConstants.H"
|
||||
|
||||
namespace Foam
|
||||
{
|
||||
@ -248,7 +248,7 @@ Foam::scalar Foam::polyMeshGeometry::checkNonOrtho
|
||||
<< " between cells " << mesh.faceOwner()[faceI]
|
||||
<< " and " << nei
|
||||
<< ": Angle = "
|
||||
<< ::acos(dDotS)/constant::math::pi*180.0
|
||||
<< ::acos(dDotS)/constant::mathematical::pi*180.0
|
||||
<< " deg." << endl;
|
||||
}
|
||||
|
||||
@ -269,7 +269,7 @@ Foam::scalar Foam::polyMeshGeometry::checkNonOrtho
|
||||
<< " between cells " << mesh.faceOwner()[faceI]
|
||||
<< " and " << nei
|
||||
<< ": Angle = "
|
||||
<< ::acos(dDotS)/constant::math::pi*180.0
|
||||
<< ::acos(dDotS)/constant::mathematical::pi*180.0
|
||||
<< " deg." << endl;
|
||||
}
|
||||
|
||||
@ -369,7 +369,7 @@ bool Foam::polyMeshGeometry::checkFaceDotProduct
|
||||
|
||||
// Severe nonorthogonality threshold
|
||||
const scalar severeNonorthogonalityThreshold =
|
||||
::cos(orthWarn/180.0*constant::math::pi);
|
||||
::cos(orthWarn/180.0*constant::mathematical::pi);
|
||||
|
||||
|
||||
// Calculate coupled cell centre
|
||||
@ -504,9 +504,9 @@ bool Foam::polyMeshGeometry::checkFaceDotProduct
|
||||
if (nDDotS > 0)
|
||||
{
|
||||
Info<< "Mesh non-orthogonality Max: "
|
||||
<< ::acos(minDDotS)/constant::math::pi*180.0
|
||||
<< ::acos(minDDotS)/constant::mathematical::pi*180.0
|
||||
<< " average: " <<
|
||||
::acos(sumDDotS/nDDotS)/constant::math::pi*180.0
|
||||
::acos(sumDDotS/nDDotS)/constant::mathematical::pi*180.0
|
||||
<< endl;
|
||||
}
|
||||
}
|
||||
@ -1258,7 +1258,7 @@ bool Foam::polyMeshGeometry::checkFaceAngles
|
||||
<< abort(FatalError);
|
||||
}
|
||||
|
||||
const scalar maxSin = Foam::sin(maxDeg/180.0*constant::math::pi);
|
||||
const scalar maxSin = Foam::sin(maxDeg/180.0*constant::mathematical::pi);
|
||||
|
||||
const faceList& fcs = mesh.faces();
|
||||
|
||||
@ -1339,7 +1339,7 @@ bool Foam::polyMeshGeometry::checkFaceAngles
|
||||
{
|
||||
scalar maxConcaveDegr =
|
||||
Foam::asin(Foam::min(1.0, maxEdgeSin))
|
||||
*180.0/constant::math::pi;
|
||||
*180.0/constant::mathematical::pi;
|
||||
|
||||
Info<< "There are " << nConcave
|
||||
<< " faces with concave angles between consecutive"
|
||||
|
||||
@ -25,7 +25,7 @@ License
|
||||
\*---------------------------------------------------------------------------*/
|
||||
|
||||
#include "engineTime.H"
|
||||
#include "mathConstants.H"
|
||||
#include "mathematicalConstants.H"
|
||||
|
||||
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
|
||||
|
||||
@ -125,7 +125,7 @@ bool Foam::engineTime::read()
|
||||
|
||||
Foam::scalar Foam::engineTime::degToRad(const scalar deg) const
|
||||
{
|
||||
return constant::math::pi*deg/180.0;
|
||||
return constant::mathematical::pi*deg/180.0;
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -27,11 +27,11 @@
|
||||
)
|
||||
);
|
||||
|
||||
Ak = sphereFraction*4.0*constant::math::pi
|
||||
Ak = sphereFraction*4.0*constant::mathematical::pi
|
||||
*pow
|
||||
(
|
||||
3.0*Vk
|
||||
/(sphereFraction*4.0*constant::math::pi),
|
||||
/(sphereFraction*4.0*constant::mathematical::pi),
|
||||
2.0/3.0
|
||||
);
|
||||
}
|
||||
@ -56,11 +56,11 @@
|
||||
)
|
||||
);
|
||||
|
||||
Ak = circleFraction*constant::math::pi*thickness
|
||||
Ak = circleFraction*constant::mathematical::pi*thickness
|
||||
*sqrt
|
||||
(
|
||||
4.0*Vk
|
||||
/(circleFraction*thickness*constant::math::pi)
|
||||
/(circleFraction*thickness*constant::mathematical::pi)
|
||||
);
|
||||
}
|
||||
break;
|
||||
|
||||
@ -26,7 +26,7 @@ License
|
||||
|
||||
#include "rpm.H"
|
||||
#include "addToRunTimeSelectionTable.H"
|
||||
#include "mathConstants.H"
|
||||
#include "mathematicalConstants.H"
|
||||
|
||||
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
|
||||
|
||||
@ -56,7 +56,7 @@ Foam::SRF::rpm::rpm
|
||||
rpm_(readScalar(SRFModelCoeffs_.lookup("rpm")))
|
||||
{
|
||||
// Initialise the angular velocity
|
||||
omega_.value() = axis_*rpm_*constant::math::twoPi/60.0;
|
||||
omega_.value() = axis_*rpm_*constant::mathematical::twoPi/60.0;
|
||||
}
|
||||
|
||||
|
||||
@ -76,7 +76,7 @@ bool Foam::SRF::rpm::read()
|
||||
SRFModelCoeffs_.lookup("rpm") >> rpm_;
|
||||
|
||||
// Update angular velocity
|
||||
omega_.value() = axis_*rpm_*(constant::math::twoPi/60.0);
|
||||
omega_.value() = axis_*rpm_*(constant::mathematical::twoPi/60.0);
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
@ -25,7 +25,7 @@ License
|
||||
\*---------------------------------------------------------------------------*/
|
||||
|
||||
#include "oscillatingFixedValueFvPatchField.H"
|
||||
#include "mathConstants.H"
|
||||
#include "mathematicalConstants.H"
|
||||
|
||||
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
||||
|
||||
@ -40,7 +40,7 @@ scalar oscillatingFixedValueFvPatchField<Type>::currentScale() const
|
||||
return
|
||||
1.0
|
||||
+ amplitude_
|
||||
*sin(constant::math::twoPi*frequency_*this->db().time().value());
|
||||
*sin(constant::mathematical::twoPi*frequency_*this->db().time().value());
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -32,7 +32,7 @@ Description
|
||||
#include "surfaceFields.H"
|
||||
#include "demandDrivenData.H"
|
||||
#include "coupledFvPatch.H"
|
||||
#include "mathConstants.H"
|
||||
#include "mathematicalConstants.H"
|
||||
|
||||
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
||||
|
||||
@ -353,7 +353,7 @@ void surfaceInterpolation::makeCorrectionVectors() const
|
||||
(sum(magSf*mag(corrVecs))/sum(magSf)).value(),
|
||||
1.0
|
||||
)
|
||||
)*180.0/constant::math::pi;
|
||||
)*180.0/constant::mathematical::pi;
|
||||
}
|
||||
|
||||
if (debug)
|
||||
|
||||
@ -25,7 +25,7 @@ License
|
||||
\*---------------------------------------------------------------------------*/
|
||||
|
||||
#include "COxidationDiffusionLimitedRate.H"
|
||||
#include "mathConstants.H"
|
||||
#include "mathematicalConstants.H"
|
||||
|
||||
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
|
||||
|
||||
@ -124,7 +124,7 @@ Foam::scalar Foam::COxidationDiffusionLimitedRate<CloudType>::calculate
|
||||
const scalar YO2 = this->owner().mcCarrierThermo().Y(O2GlobalId_)[cellI];
|
||||
|
||||
// Change in C mass [kg]
|
||||
scalar dmC = 4.0*constant::math::pi*d*D_*YO2*Tc*rhoc/(Sb_*(T + Tc))*dt;
|
||||
scalar dmC = 4.0*constant::mathematical::pi*d*D_*YO2*Tc*rhoc/(Sb_*(T + Tc))*dt;
|
||||
|
||||
// Limit mass transfer by availability of C
|
||||
dmC = min(mass*fComb, dmC);
|
||||
|
||||
@ -25,7 +25,7 @@ License
|
||||
\*---------------------------------------------------------------------------*/
|
||||
|
||||
#include "COxidationKineticDiffusionLimitedRate.H"
|
||||
#include "mathConstants.H"
|
||||
#include "mathematicalConstants.H"
|
||||
|
||||
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
|
||||
|
||||
@ -138,7 +138,7 @@ Foam::scalar Foam::COxidationKineticDiffusionLimitedRate<CloudType>::calculate
|
||||
const scalar Rk = C2_*exp(-E_/(specie::RR*Tc));
|
||||
|
||||
// Particle surface area
|
||||
const scalar Ap = constant::math::pi*sqr(d);
|
||||
const scalar Ap = constant::mathematical::pi*sqr(d);
|
||||
|
||||
// Change in C mass [kg]
|
||||
scalar dmC = Ap*rhoc*specie::RR*Tc*YO2/WO2_*D0*Rk/(D0 + Rk);
|
||||
|
||||
@ -25,7 +25,7 @@ License
|
||||
\*---------------------------------------------------------------------------*/
|
||||
|
||||
#include "COxidationMurphyShaddix.H"
|
||||
#include "mathConstants.H"
|
||||
#include "mathematicalConstants.H"
|
||||
|
||||
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
|
||||
|
||||
@ -134,7 +134,7 @@ Foam::scalar Foam::COxidationMurphyShaddix<CloudType>::calculate
|
||||
}
|
||||
|
||||
// Particle surface area [m^2]
|
||||
const scalar Ap = constant::math::pi*sqr(d);
|
||||
const scalar Ap = constant::mathematical::pi*sqr(d);
|
||||
|
||||
// Calculate diffision constant at continuous phase temperature
|
||||
// and density [m^2/s]
|
||||
|
||||
@ -27,7 +27,7 @@ License
|
||||
#include "commonRailInjector.H"
|
||||
#include "addToRunTimeSelectionTable.H"
|
||||
#include "Random.H"
|
||||
#include "mathConstants.H"
|
||||
#include "mathematicalConstants.H"
|
||||
|
||||
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
|
||||
namespace Foam
|
||||
@ -244,7 +244,7 @@ Foam::vector Foam::commonRailInjector::position
|
||||
{
|
||||
// otherwise, disc injection
|
||||
scalar iRadius = d_*rndGen.scalar01();
|
||||
scalar iAngle = constant::math::twoPi*rndGen.scalar01();
|
||||
scalar iAngle = constant::mathematical::twoPi*rndGen.scalar01();
|
||||
|
||||
return
|
||||
(
|
||||
@ -297,7 +297,7 @@ Foam::scalar Foam::commonRailInjector::mass
|
||||
// correct mass if calculation is 2D
|
||||
if (twoD)
|
||||
{
|
||||
mInj *= 0.5*angleOfWedge/constant::math::pi;
|
||||
mInj *= 0.5*angleOfWedge/constant::mathematical::pi;
|
||||
}
|
||||
|
||||
return mInj;
|
||||
@ -404,7 +404,7 @@ void Foam::commonRailInjector::correctProfiles
|
||||
const scalar referencePressure
|
||||
)
|
||||
{
|
||||
scalar A = 0.25*constant::math::pi*sqr(d_);
|
||||
scalar A = 0.25*constant::mathematical::pi*sqr(d_);
|
||||
scalar pDummy = 1.0e+5;
|
||||
scalar rho = fuel.rho(pDummy, T_, X_);
|
||||
|
||||
|
||||
@ -27,7 +27,7 @@ License
|
||||
#include "definedInjector.H"
|
||||
#include "addToRunTimeSelectionTable.H"
|
||||
#include "Random.H"
|
||||
#include "mathConstants.H"
|
||||
#include "mathematicalConstants.H"
|
||||
|
||||
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
|
||||
namespace Foam
|
||||
@ -226,7 +226,7 @@ Foam::vector Foam::definedInjector::position
|
||||
{
|
||||
// otherwise, disc injection
|
||||
scalar iRadius = d_*rndGen.scalar01();
|
||||
scalar iAngle = constant::math::twoPi*rndGen.scalar01();
|
||||
scalar iAngle = constant::mathematical::twoPi*rndGen.scalar01();
|
||||
|
||||
return
|
||||
(
|
||||
@ -280,7 +280,7 @@ Foam::scalar Foam::definedInjector::mass
|
||||
// correct mass if calculation is 2D
|
||||
if (twoD)
|
||||
{
|
||||
mInj *= 0.5*angleOfWedge/constant::math::pi;
|
||||
mInj *= 0.5*angleOfWedge/constant::mathematical::pi;
|
||||
}
|
||||
|
||||
return mInj;
|
||||
@ -374,7 +374,7 @@ void Foam::definedInjector::correctProfiles
|
||||
const scalar referencePressure
|
||||
)
|
||||
{
|
||||
scalar A = 0.25*constant::math::pi*sqr(d_);
|
||||
scalar A = 0.25*constant::mathematical::pi*sqr(d_);
|
||||
scalar pDummy = 1.0e+5;
|
||||
scalar rho = fuel.rho(pDummy, T_, X_);
|
||||
|
||||
|
||||
@ -27,7 +27,7 @@ License
|
||||
#include "multiHoleInjector.H"
|
||||
#include "addToRunTimeSelectionTable.H"
|
||||
#include "Random.H"
|
||||
#include "mathConstants.H"
|
||||
#include "mathematicalConstants.H"
|
||||
|
||||
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
|
||||
namespace Foam
|
||||
@ -165,7 +165,7 @@ Foam::multiHoleInjector::~multiHoleInjector()
|
||||
|
||||
void Foam::multiHoleInjector::setTangentialVectors()
|
||||
{
|
||||
scalar pi180 = constant::math::pi/180.0;
|
||||
scalar pi180 = constant::mathematical::pi/180.0;
|
||||
scalar alpha = xyAngle_*pi180;
|
||||
scalar phi = zAngle_*pi180;
|
||||
|
||||
@ -267,7 +267,7 @@ Foam::vector Foam::multiHoleInjector::position
|
||||
{
|
||||
// otherwise, disc injection
|
||||
scalar iRadius = d_*rndGen.scalar01();
|
||||
scalar iAngle = constant::math::twoPi*rndGen.scalar01();
|
||||
scalar iAngle = constant::mathematical::twoPi*rndGen.scalar01();
|
||||
|
||||
return
|
||||
(
|
||||
@ -319,7 +319,7 @@ Foam::scalar Foam::multiHoleInjector::mass
|
||||
// correct mass if calculation is 2D
|
||||
if (twoD)
|
||||
{
|
||||
mInj *= 0.5*angleOfWedge/constant::math::pi;
|
||||
mInj *= 0.5*angleOfWedge/constant::mathematical::pi;
|
||||
}
|
||||
|
||||
return mInj;
|
||||
@ -429,7 +429,7 @@ void Foam::multiHoleInjector::correctProfiles
|
||||
const scalar referencePressure
|
||||
)
|
||||
{
|
||||
scalar A = nHoles_*0.25*constant::math::pi*sqr(d_);
|
||||
scalar A = nHoles_*0.25*constant::mathematical::pi*sqr(d_);
|
||||
|
||||
forAll(velocityProfile_, i)
|
||||
{
|
||||
|
||||
@ -27,7 +27,7 @@ License
|
||||
#include "swirlInjector.H"
|
||||
#include "addToRunTimeSelectionTable.H"
|
||||
#include "Random.H"
|
||||
#include "mathConstants.H"
|
||||
#include "mathematicalConstants.H"
|
||||
|
||||
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
|
||||
|
||||
@ -246,7 +246,7 @@ Foam::vector Foam::swirlInjector::position
|
||||
{
|
||||
// otherwise, disc injection
|
||||
scalar iRadius = d_*rndGen.scalar01();
|
||||
scalar iAngle = constant::math::twoPi*rndGen.scalar01();
|
||||
scalar iAngle = constant::mathematical::twoPi*rndGen.scalar01();
|
||||
|
||||
return
|
||||
(
|
||||
@ -300,7 +300,7 @@ Foam::scalar Foam::swirlInjector::mass
|
||||
// correct mass if calculation is 2D
|
||||
if (twoD)
|
||||
{
|
||||
mInj *= 0.5*angleOfWedge/constant::math::pi;
|
||||
mInj *= 0.5*angleOfWedge/constant::mathematical::pi;
|
||||
}
|
||||
|
||||
return mInj;
|
||||
@ -415,7 +415,7 @@ void Foam::swirlInjector::correctProfiles
|
||||
const scalar referencePressure
|
||||
)
|
||||
{
|
||||
scalar A = 0.25*constant::math::pi*sqr(d_);
|
||||
scalar A = 0.25*constant::mathematical::pi*sqr(d_);
|
||||
scalar pDummy = 1.0e+5;
|
||||
scalar rho = fuel.rho(pDummy, T_, X_);
|
||||
|
||||
|
||||
@ -27,7 +27,7 @@ License
|
||||
#include "unitInjector.H"
|
||||
#include "addToRunTimeSelectionTable.H"
|
||||
#include "Random.H"
|
||||
#include "mathConstants.H"
|
||||
#include "mathematicalConstants.H"
|
||||
|
||||
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
|
||||
|
||||
@ -220,7 +220,7 @@ Foam::vector Foam::unitInjector::position
|
||||
{
|
||||
// otherwise, disc injection
|
||||
scalar iRadius = d_*rndGen.scalar01();
|
||||
scalar iAngle = constant::math::twoPi*rndGen.scalar01();
|
||||
scalar iAngle = constant::mathematical::twoPi*rndGen.scalar01();
|
||||
|
||||
return
|
||||
(
|
||||
@ -273,7 +273,7 @@ Foam::scalar Foam::unitInjector::mass
|
||||
// correct mass if calculation is 2D
|
||||
if (twoD)
|
||||
{
|
||||
mInj *= 0.5*angleOfWedge/constant::math::pi;
|
||||
mInj *= 0.5*angleOfWedge/constant::mathematical::pi;
|
||||
}
|
||||
|
||||
return mInj;
|
||||
@ -364,7 +364,7 @@ void Foam::unitInjector::correctProfiles
|
||||
const scalar referencePressure
|
||||
)
|
||||
{
|
||||
scalar A = 0.25*constant::math::pi*sqr(d_);
|
||||
scalar A = 0.25*constant::mathematical::pi*sqr(d_);
|
||||
scalar pDummy = 1.0e+5;
|
||||
|
||||
forAll(velocityProfile_, i)
|
||||
|
||||
@ -25,7 +25,7 @@ License
|
||||
\*---------------------------------------------------------------------------*/
|
||||
|
||||
#include "parcel.H"
|
||||
#include "mathConstants.H"
|
||||
#include "mathematicalConstants.H"
|
||||
|
||||
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
||||
|
||||
@ -102,13 +102,13 @@ scalar parcel::Pr
|
||||
|
||||
scalar parcel::N(const scalar rho) const
|
||||
{
|
||||
return 6.0*m_/(rho*pow3(d_)*constant::math::pi);
|
||||
return 6.0*m_/(rho*pow3(d_)*constant::mathematical::pi);
|
||||
}
|
||||
|
||||
|
||||
scalar parcel::Vd() const
|
||||
{
|
||||
return pow3(d_)*constant::math::pi/6.0;
|
||||
return pow3(d_)*constant::mathematical::pi/6.0;
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -41,7 +41,7 @@ License
|
||||
#include "symmetryPolyPatch.H"
|
||||
#include "wedgePolyPatch.H"
|
||||
|
||||
#include "mathConstants.H"
|
||||
#include "mathematicalConstants.H"
|
||||
|
||||
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
|
||||
|
||||
@ -290,17 +290,17 @@ Foam::spray::spray
|
||||
axisOfWedgeNormal_ /= mag(axisOfWedgeNormal_);
|
||||
|
||||
scalar arcCos = (v1 & v2)/mag(v1);
|
||||
angleOfWedge_ = constant::math::pi - acos(arcCos);
|
||||
angleOfWedge_ = constant::mathematical::pi - acos(arcCos);
|
||||
|
||||
Info<< "Calculated angle of wedge is "
|
||||
<< angleOfWedge_*180/constant::math::pi << " deg."
|
||||
<< angleOfWedge_*180/constant::mathematical::pi << " deg."
|
||||
<< endl;
|
||||
}
|
||||
else
|
||||
{
|
||||
if (symPlaneExist)
|
||||
{
|
||||
angleOfWedge_ = constant::math::pi;
|
||||
angleOfWedge_ = constant::mathematical::pi;
|
||||
Info<< "Constructing 180 deg three dimensional spray injection."
|
||||
<< endl;
|
||||
}
|
||||
|
||||
@ -25,7 +25,7 @@ License
|
||||
\*---------------------------------------------------------------------------*/
|
||||
|
||||
#include "spray.H"
|
||||
#include "mathConstants.H"
|
||||
#include "mathematicalConstants.H"
|
||||
|
||||
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
||||
|
||||
@ -106,7 +106,7 @@ scalar spray::liquidMass() const
|
||||
|
||||
if (twoD())
|
||||
{
|
||||
sum *= constant::math::twoPi/angleOfWedge();
|
||||
sum *= constant::mathematical::twoPi/angleOfWedge();
|
||||
}
|
||||
|
||||
reduce(sum, sumOp<scalar>());
|
||||
@ -148,7 +148,7 @@ scalar spray::liquidEnthalpy() const
|
||||
|
||||
if (twoD())
|
||||
{
|
||||
sum *= constant::math::twoPi/angleOfWedge();
|
||||
sum *= constant::mathematical::twoPi/angleOfWedge();
|
||||
}
|
||||
|
||||
reduce(sum, sumOp<scalar>());
|
||||
@ -193,7 +193,7 @@ scalar spray::liquidTotalEnthalpy() const
|
||||
|
||||
if (twoD())
|
||||
{
|
||||
sum *= constant::math::twoPi/angleOfWedge();
|
||||
sum *= constant::mathematical::twoPi/angleOfWedge();
|
||||
}
|
||||
|
||||
reduce(sum, sumOp<scalar>());
|
||||
@ -218,7 +218,7 @@ scalar spray::liquidKineticEnergy() const
|
||||
|
||||
if (twoD())
|
||||
{
|
||||
sum *= constant::math::twoPi/angleOfWedge();
|
||||
sum *= constant::mathematical::twoPi/angleOfWedge();
|
||||
}
|
||||
|
||||
reduce(sum, sumOp<scalar>());
|
||||
|
||||
@ -27,7 +27,7 @@ License
|
||||
#include "LISA.H"
|
||||
#include "addToRunTimeSelectionTable.H"
|
||||
#include "basicMultiComponentMixture.H"
|
||||
#include "mathConstants.H"
|
||||
#include "mathematicalConstants.H"
|
||||
#include "RosinRammler.H"
|
||||
|
||||
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
||||
@ -155,7 +155,7 @@ void LISA::atomizeParcel
|
||||
|
||||
scalar massFlow = it.massFlowRate(max(0.0,elapsedTime-time));
|
||||
|
||||
scalar hSheet = massFlow/(constant::math::pi*d*rhoFuel*mag(p.U()));
|
||||
scalar hSheet = massFlow/(constant::mathematical::pi*d*rhoFuel*mag(p.U()));
|
||||
|
||||
p.d() = min(hSheet,p.d());
|
||||
|
||||
@ -249,7 +249,7 @@ void LISA::atomizeParcel
|
||||
|
||||
scalar kL = 1.0/(dL*sqrt(0.5 + 1.5*muFuel/sqrt(rhoFuel*sigma*dL)));
|
||||
|
||||
scalar dD = cbrt(3.0*constant::math::pi*sqr(dL)/kL);
|
||||
scalar dD = cbrt(3.0*constant::mathematical::pi*sqr(dL)/kL);
|
||||
|
||||
scalar lisaExp = 0.27;
|
||||
scalar ambientPressure = 1.0e+5;
|
||||
|
||||
@ -27,7 +27,7 @@ License
|
||||
#include "blobsSheetAtomization.H"
|
||||
#include "addToRunTimeSelectionTable.H"
|
||||
#include "basicMultiComponentMixture.H"
|
||||
#include "mathConstants.H"
|
||||
#include "mathematicalConstants.H"
|
||||
#include "RosinRammler.H"
|
||||
|
||||
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
||||
@ -127,7 +127,7 @@ void blobsSheetAtomization::atomizeParcel
|
||||
scalar lBU =
|
||||
B_*sqrt
|
||||
(
|
||||
rhoFuel*sigma*p.d()*cos(angle_*constant::math::pi/360.0)
|
||||
rhoFuel*sigma*p.d()*cos(angle_*constant::mathematical::pi/360.0)
|
||||
/sqr(rhoAverage*U)
|
||||
);
|
||||
|
||||
|
||||
@ -26,7 +26,7 @@ License
|
||||
|
||||
#include "ETAB.H"
|
||||
#include "addToRunTimeSelectionTable.H"
|
||||
#include "mathConstants.H"
|
||||
#include "mathematicalConstants.H"
|
||||
|
||||
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
||||
|
||||
@ -128,7 +128,7 @@ void ETAB::breakupParcel
|
||||
scalar quad = -y2/a;
|
||||
if (quad < 0)
|
||||
{
|
||||
phi = constant::math::twoPi - phit;
|
||||
phi = constant::mathematical::twoPi - phit;
|
||||
}
|
||||
|
||||
scalar tb = 0;
|
||||
@ -139,11 +139,11 @@ void ETAB::breakupParcel
|
||||
|
||||
if (theta < phi)
|
||||
{
|
||||
if (constant::math::twoPi - theta >= phi)
|
||||
if (constant::mathematical::twoPi - theta >= phi)
|
||||
{
|
||||
theta = -theta;
|
||||
}
|
||||
theta += constant::math::twoPi;
|
||||
theta += constant::mathematical::twoPi;
|
||||
}
|
||||
tb = (theta-phi)*romega;
|
||||
|
||||
|
||||
@ -26,7 +26,7 @@ License
|
||||
|
||||
#include "SHF.H"
|
||||
#include "addToRunTimeSelectionTable.H"
|
||||
#include "mathConstants.H"
|
||||
#include "mathematicalConstants.H"
|
||||
|
||||
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
||||
|
||||
@ -196,7 +196,7 @@ void SHF::breakupParcel
|
||||
|
||||
px =
|
||||
x
|
||||
/(2.0*sqrt(constant::math::twoPi)*sigma_)
|
||||
/(2.0*sqrt(constant::mathematical::twoPi)*sigma_)
|
||||
*exp(-0.5*sqr((x-mu_)/sigma_));
|
||||
|
||||
} while (y >= px);
|
||||
@ -227,7 +227,7 @@ void SHF::breakupParcel
|
||||
|
||||
px =
|
||||
x
|
||||
/(2.0*sqrt(constant::math::twoPi)*sigma_)
|
||||
/(2.0*sqrt(constant::mathematical::twoPi)*sigma_)
|
||||
*exp(-0.5*sqr((x-mu_)/sigma_));
|
||||
} while (y >= px);
|
||||
|
||||
|
||||
@ -26,7 +26,7 @@ License
|
||||
|
||||
#include "TAB.H"
|
||||
#include "addToRunTimeSelectionTable.H"
|
||||
#include "mathConstants.H"
|
||||
#include "mathematicalConstants.H"
|
||||
|
||||
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
||||
|
||||
@ -130,7 +130,7 @@ void TAB::breakupParcel
|
||||
scalar quad = -y2/a;
|
||||
if (quad < 0)
|
||||
{
|
||||
phi = constant::math::twoPi - phit;
|
||||
phi = constant::mathematical::twoPi - phit;
|
||||
}
|
||||
|
||||
scalar tb = 0;
|
||||
@ -147,11 +147,11 @@ void TAB::breakupParcel
|
||||
|
||||
if (theta < phi)
|
||||
{
|
||||
if (constant::math::twoPi - theta >= phi)
|
||||
if (constant::mathematical::twoPi - theta >= phi)
|
||||
{
|
||||
theta = -theta;
|
||||
}
|
||||
theta += constant::math::twoPi;
|
||||
theta += constant::mathematical::twoPi;
|
||||
}
|
||||
tb = (theta - phi)/omega;
|
||||
|
||||
|
||||
@ -26,7 +26,7 @@ License
|
||||
|
||||
#include "reitzKHRT.H"
|
||||
#include "addToRunTimeSelectionTable.H"
|
||||
#include "mathConstants.H"
|
||||
#include "mathematicalConstants.H"
|
||||
|
||||
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
||||
|
||||
@ -137,7 +137,7 @@ void reitzKHRT::breakupParcel
|
||||
scalar KRT = sqrt(helpVariable/(3.0*sigma + VSMALL));
|
||||
|
||||
// wavelength of the fastest growing RT frequency
|
||||
scalar lambdaRT = constant::math::twoPi*cRT_/(KRT + VSMALL);
|
||||
scalar lambdaRT = constant::mathematical::twoPi*cRT_/(KRT + VSMALL);
|
||||
|
||||
// if lambdaRT < diameter, then RT waves are growing on the surface
|
||||
// and we start to keep track of how long they have been growing
|
||||
@ -170,7 +170,7 @@ void reitzKHRT::breakupParcel
|
||||
// reduce the diameter according to the rate-equation
|
||||
p.d() = (fraction*dc + p.d())/(1.0 + fraction);
|
||||
|
||||
scalar ms = rhoLiquid*Np*pow3(dc)*constant::math::pi/6.0;
|
||||
scalar ms = rhoLiquid*Np*pow3(dc)*constant::mathematical::pi/6.0;
|
||||
p.ms() += ms;
|
||||
|
||||
// Total number of parcels for the whole injection event
|
||||
|
||||
@ -26,7 +26,7 @@ License
|
||||
|
||||
#include "ORourkeCollisionModel.H"
|
||||
#include "addToRunTimeSelectionTable.H"
|
||||
#include "mathConstants.H"
|
||||
#include "mathematicalConstants.H"
|
||||
|
||||
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
||||
|
||||
|
||||
@ -31,7 +31,7 @@ scalar nMin = pMin().N(rhoMin);
|
||||
|
||||
scalar mdMin = mMin/nMin;
|
||||
|
||||
scalar nu0 = 0.25*constant::math::pi*sumD*sumD*magVRel*dt/vols_[cell1];
|
||||
scalar nu0 = 0.25*constant::mathematical::pi*sumD*sumD*magVRel*dt/vols_[cell1];
|
||||
scalar nu = nMin*nu0;
|
||||
scalar collProb = exp(-nu);
|
||||
scalar xx = rndGen_.scalar01();
|
||||
|
||||
@ -129,7 +129,7 @@ if (vAlign > 0)
|
||||
pMax().d() =
|
||||
pow
|
||||
(
|
||||
6.0*newMaxMass/(rhoMax*constant::math::pi*nMax),
|
||||
6.0*newMaxMass/(rhoMax*constant::mathematical::pi*nMax),
|
||||
1.0/3.0
|
||||
);
|
||||
|
||||
|
||||
@ -26,7 +26,7 @@ License
|
||||
|
||||
#include "trajectoryModel.H"
|
||||
#include "addToRunTimeSelectionTable.H"
|
||||
#include "mathConstants.H"
|
||||
#include "mathematicalConstants.H"
|
||||
|
||||
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
||||
|
||||
|
||||
@ -28,7 +28,7 @@ License
|
||||
|
||||
#include "RutlandFlashBoil.H"
|
||||
#include "addToRunTimeSelectionTable.H"
|
||||
#include "mathConstants.H"
|
||||
#include "mathematicalConstants.H"
|
||||
|
||||
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
||||
|
||||
@ -229,7 +229,7 @@ scalar RutlandFlashBoil::boilingTime
|
||||
|
||||
for (label k=0; k < Niter; k++)
|
||||
{
|
||||
expSum += exp(sqr(-k*constant::math::pi*sqrt(F)/2.0));
|
||||
expSum += exp(sqr(-k*constant::mathematical::pi*sqrt(F)/2.0));
|
||||
if (mag(expSum-expSumOld)/expSum < 1.0e-3)
|
||||
{
|
||||
break;
|
||||
@ -257,7 +257,7 @@ scalar RutlandFlashBoil::boilingTime
|
||||
}
|
||||
|
||||
scalar Gf =
|
||||
4.0*alfaS*dTLB*constant::math::pi*sqr(diameter/2.0)/heatOfVapour;
|
||||
4.0*alfaS*dTLB*constant::mathematical::pi*sqr(diameter/2.0)/heatOfVapour;
|
||||
|
||||
// calculation of the heat transfer vapourization at superheated
|
||||
// conditions (temperature>tBoilingSurface)
|
||||
@ -269,7 +269,7 @@ scalar RutlandFlashBoil::boilingTime
|
||||
mag((vapourFarEnthalpy-vapourSurfaceEnthalpy)/heatOfVapour);
|
||||
|
||||
// 2.0? or 1.0? try 1!
|
||||
scalar B = 1.0*constant::math::pi*kappa/cpGas*diameter*NusseltCorr;
|
||||
scalar B = 1.0*constant::mathematical::pi*kappa/cpGas*diameter*NusseltCorr;
|
||||
scalar nPos = B*log(1.0 + A)/Gf + 1.0;
|
||||
scalar nNeg = (1.0/A)*(exp(Gf/B) - 1.0 - A) + 1.0;
|
||||
|
||||
@ -342,7 +342,7 @@ scalar RutlandFlashBoil::boilingTime
|
||||
}
|
||||
}
|
||||
|
||||
time = (constant::math::pi*pow3(diameter)/6.0)*liquidDensity/(G + Gf);
|
||||
time = (constant::mathematical::pi*pow3(diameter)/6.0)*liquidDensity/(G + Gf);
|
||||
|
||||
time = max(VSMALL, time);
|
||||
}
|
||||
|
||||
@ -26,7 +26,7 @@ License
|
||||
|
||||
#include "Chomiak.H"
|
||||
#include "addToRunTimeSelectionTable.H"
|
||||
#include "mathConstants.H"
|
||||
#include "mathematicalConstants.H"
|
||||
|
||||
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
||||
|
||||
@ -118,11 +118,11 @@ vector ChomiakInjector::direction
|
||||
scalar angle =
|
||||
(d - dMax)*maxSprayAngle_[n]
|
||||
/(dMin - dMax)
|
||||
*constant::math::pi/360.0;
|
||||
*constant::mathematical::pi/360.0;
|
||||
scalar alpha = sin(angle);
|
||||
scalar dcorr = cos(angle);
|
||||
|
||||
scalar beta = constant::math::twoPi*rndGen_.scalar01();
|
||||
scalar beta = constant::mathematical::twoPi*rndGen_.scalar01();
|
||||
|
||||
// randomly distributed vector normal to the injection vector
|
||||
vector normal = vector::zero;
|
||||
@ -132,7 +132,7 @@ vector ChomiakInjector::direction
|
||||
scalar reduce = 0.01;
|
||||
// correct beta if this is a 2D run
|
||||
// map it onto the 'angleOfWedge'
|
||||
beta *= (1.0-2.0*reduce)*0.5*sm_.angleOfWedge()/constant::math::pi;
|
||||
beta *= (1.0-2.0*reduce)*0.5*sm_.angleOfWedge()/constant::mathematical::pi;
|
||||
beta += reduce*sm_.angleOfWedge();
|
||||
|
||||
normal =
|
||||
|
||||
@ -26,7 +26,7 @@ License
|
||||
|
||||
#include "blobsSwirlInjector.H"
|
||||
#include "addToRunTimeSelectionTable.H"
|
||||
#include "mathConstants.H"
|
||||
#include "mathematicalConstants.H"
|
||||
|
||||
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
||||
|
||||
@ -112,7 +112,7 @@ scalar blobsSwirlInjector::d0
|
||||
|
||||
angle_ = coneAngle_[n]/2.0 + c*coneInterval_[n];
|
||||
|
||||
angle_ *= constant::math::pi/180.0;
|
||||
angle_ *= constant::mathematical::pi/180.0;
|
||||
|
||||
scalar injectedMassFlow = it.massFlowRate(t);
|
||||
|
||||
@ -144,7 +144,7 @@ vector blobsSwirlInjector::direction
|
||||
{
|
||||
scalar alpha = sin(angle_);
|
||||
scalar dcorr = cos(angle_);
|
||||
scalar beta = constant::math::twoPi*rndGen_.scalar01();
|
||||
scalar beta = constant::mathematical::twoPi*rndGen_.scalar01();
|
||||
|
||||
// randomly distributed vector normal to the injection vector
|
||||
vector normal = vector::zero;
|
||||
@ -155,7 +155,7 @@ vector blobsSwirlInjector::direction
|
||||
// correct beta if this is a 2D run
|
||||
// map it onto the 'angleOfWedge'
|
||||
|
||||
beta *= (1.0 - 2.0*reduce)*sm_.angleOfWedge()/(constant::math::twoPi);
|
||||
beta *= (1.0 - 2.0*reduce)*sm_.angleOfWedge()/(constant::mathematical::twoPi);
|
||||
beta += reduce*sm_.angleOfWedge();
|
||||
normal =
|
||||
alpha
|
||||
@ -240,7 +240,7 @@ void blobsSwirlInjector::calculateHX
|
||||
(
|
||||
(A_[inj]*cTau_[inj]*muFuel*massFlow*(1.0 + x_))
|
||||
/(
|
||||
constant::math::pi
|
||||
constant::mathematical::pi
|
||||
*injectorDiameter
|
||||
*rhoFuel
|
||||
*dPressure
|
||||
@ -260,7 +260,7 @@ void blobsSwirlInjector::calculateHX
|
||||
(
|
||||
(A_[inj]*cTau_[inj]*muFuel*massFlow*(1.0 + x_))
|
||||
/(
|
||||
constant::math::pi
|
||||
constant::mathematical::pi
|
||||
*injectorDiameter
|
||||
*rhoFuel
|
||||
*dPressure
|
||||
|
||||
@ -26,7 +26,7 @@ License
|
||||
|
||||
#include "constInjector.H"
|
||||
#include "addToRunTimeSelectionTable.H"
|
||||
#include "mathConstants.H"
|
||||
#include "mathematicalConstants.H"
|
||||
|
||||
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
||||
|
||||
@ -133,11 +133,11 @@ vector constInjector::direction
|
||||
v (alpha)
|
||||
*/
|
||||
|
||||
scalar angle = rndGen_.scalar01()*sprayAngle_[n]*constant::math::pi/360.0;
|
||||
scalar angle = rndGen_.scalar01()*sprayAngle_[n]*constant::mathematical::pi/360.0;
|
||||
scalar alpha = sin(angle);
|
||||
scalar dcorr = cos(angle);
|
||||
|
||||
scalar beta = constant::math::twoPi*rndGen_.scalar01();
|
||||
scalar beta = constant::mathematical::twoPi*rndGen_.scalar01();
|
||||
|
||||
// randomly distributed vector normal to the injection vector
|
||||
vector normal = vector::zero;
|
||||
@ -147,7 +147,7 @@ vector constInjector::direction
|
||||
scalar reduce = 0.01;
|
||||
// correct beta if this is a 2D run
|
||||
// map it onto the 'angleOfWedge'
|
||||
beta *= (1.0 - 2.0*reduce)*0.5*sm_.angleOfWedge()/constant::math::pi;
|
||||
beta *= (1.0 - 2.0*reduce)*0.5*sm_.angleOfWedge()/constant::mathematical::pi;
|
||||
beta += reduce*sm_.angleOfWedge();
|
||||
|
||||
normal =
|
||||
|
||||
@ -26,7 +26,7 @@ License
|
||||
|
||||
#include "definedHollowCone.H"
|
||||
#include "addToRunTimeSelectionTable.H"
|
||||
#include "mathConstants.H"
|
||||
#include "mathematicalConstants.H"
|
||||
|
||||
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
||||
|
||||
@ -163,9 +163,9 @@ vector definedHollowConeInjector::direction
|
||||
// use random number to generate angle between inner/outer cone angles
|
||||
scalar angle = angleInner + rndGen_.scalar01()*(angleOuter - angleInner);
|
||||
|
||||
scalar alpha = sin(angle*constant::math::pi/360.0);
|
||||
scalar dcorr = cos(angle*constant::math::pi/360.0);
|
||||
scalar beta = constant::math::twoPi*rndGen_.scalar01();
|
||||
scalar alpha = sin(angle*constant::mathematical::pi/360.0);
|
||||
scalar dcorr = cos(angle*constant::mathematical::pi/360.0);
|
||||
scalar beta = constant::mathematical::twoPi*rndGen_.scalar01();
|
||||
|
||||
// randomly distributed vector normal to the injection vector
|
||||
vector normal = vector::zero;
|
||||
@ -176,7 +176,7 @@ vector definedHollowConeInjector::direction
|
||||
// correct beta if this is a 2D run
|
||||
// map it onto the 'angleOfWedge'
|
||||
|
||||
beta *= (1.0 - 2.0*reduce)*sm_.angleOfWedge()/(constant::math::twoPi);
|
||||
beta *= (1.0 - 2.0*reduce)*sm_.angleOfWedge()/(constant::mathematical::twoPi);
|
||||
beta += reduce*sm_.angleOfWedge();
|
||||
normal =
|
||||
alpha
|
||||
|
||||
@ -26,7 +26,7 @@ License
|
||||
|
||||
#include "definedPressureSwirl.H"
|
||||
#include "addToRunTimeSelectionTable.H"
|
||||
#include "mathConstants.H"
|
||||
#include "mathematicalConstants.H"
|
||||
|
||||
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
||||
|
||||
@ -174,7 +174,7 @@ scalar definedPressureSwirlInjector::d0
|
||||
|
||||
// end modifications
|
||||
|
||||
angle_ *= constant::math::pi/360.0;
|
||||
angle_ *= constant::mathematical::pi/360.0;
|
||||
|
||||
scalar injectedMassFlow = it.massFlowRate(t);
|
||||
|
||||
@ -191,7 +191,7 @@ scalar definedPressureSwirlInjector::d0
|
||||
|
||||
u_ = v*cosAngle;
|
||||
|
||||
scalar A = injectedMassFlow/(constant::math::pi*rhoFuel*u_);
|
||||
scalar A = injectedMassFlow/(constant::mathematical::pi*rhoFuel*u_);
|
||||
|
||||
// Not using the authors definition for sheet thickness
|
||||
// modified by multiplying the sheet tickness for the cone angle cosinus.
|
||||
@ -216,7 +216,7 @@ vector definedPressureSwirlInjector::direction
|
||||
{
|
||||
scalar alpha = sin(angle_);
|
||||
scalar dcorr = cos(angle_);
|
||||
scalar beta = constant::math::twoPi*rndGen_.scalar01();
|
||||
scalar beta = constant::mathematical::twoPi*rndGen_.scalar01();
|
||||
|
||||
// randomly distributed vector normal to the injection vector
|
||||
vector normal = vector::zero;
|
||||
@ -227,7 +227,7 @@ vector definedPressureSwirlInjector::direction
|
||||
// correct beta if this is a 2D run
|
||||
// map it onto the 'angleOfWedge'
|
||||
|
||||
beta *= (1.0 - 2.0*reduce)*sm_.angleOfWedge()/(constant::math::twoPi);
|
||||
beta *= (1.0 - 2.0*reduce)*sm_.angleOfWedge()/(constant::mathematical::twoPi);
|
||||
beta += reduce*sm_.angleOfWedge();
|
||||
normal =
|
||||
alpha
|
||||
@ -296,7 +296,7 @@ scalar definedPressureSwirlInjector::kv
|
||||
|
||||
scalar coneAngle = it.getTableValue(coneAngle_, t);
|
||||
|
||||
coneAngle *= constant::math::pi/360.0;
|
||||
coneAngle *= constant::mathematical::pi/360.0;
|
||||
|
||||
scalar cosAngle = cos(coneAngle);
|
||||
scalar Tav = it.integrateTable(it.T())/(it.teoi() - it.tsoi());
|
||||
@ -309,7 +309,7 @@ scalar definedPressureSwirlInjector::kv
|
||||
it.getTableValue(maxKv_, t),
|
||||
4.0*massFlow
|
||||
*sqrt(rhoFuel/2.0/dPressure)
|
||||
/(constant::math::pi*sqr(injectorDiameter)*rhoFuel*cosAngle)
|
||||
/(constant::mathematical::pi*sqr(injectorDiameter)*rhoFuel*cosAngle)
|
||||
);
|
||||
|
||||
return min(1.0, kv);
|
||||
|
||||
@ -26,7 +26,7 @@ License
|
||||
|
||||
#include "hollowCone.H"
|
||||
#include "addToRunTimeSelectionTable.H"
|
||||
#include "mathConstants.H"
|
||||
#include "mathematicalConstants.H"
|
||||
|
||||
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
||||
|
||||
@ -130,9 +130,9 @@ vector hollowConeInjector::direction
|
||||
{
|
||||
scalar angle =
|
||||
innerAngle_[n] + rndGen_.scalar01()*(outerAngle_[n]-innerAngle_[n]);
|
||||
scalar alpha = sin(angle*constant::math::pi/360.0);
|
||||
scalar dcorr = cos(angle*constant::math::pi/360.0);
|
||||
scalar beta = constant::math::twoPi*rndGen_.scalar01();
|
||||
scalar alpha = sin(angle*constant::mathematical::pi/360.0);
|
||||
scalar dcorr = cos(angle*constant::mathematical::pi/360.0);
|
||||
scalar beta = constant::mathematical::twoPi*rndGen_.scalar01();
|
||||
|
||||
// randomly distributed vector normal to the injection vector
|
||||
vector normal = vector::zero;
|
||||
@ -143,7 +143,7 @@ vector hollowConeInjector::direction
|
||||
// correct beta if this is a 2D run
|
||||
// map it onto the 'angleOfWedge'
|
||||
|
||||
beta *= (1.0 - 2.0*reduce)*sm_.angleOfWedge()/(constant::math::twoPi);
|
||||
beta *= (1.0 - 2.0*reduce)*sm_.angleOfWedge()/(constant::mathematical::twoPi);
|
||||
beta += reduce*sm_.angleOfWedge();
|
||||
normal =
|
||||
alpha
|
||||
|
||||
@ -26,7 +26,7 @@ License
|
||||
|
||||
#include "pressureSwirlInjector.H"
|
||||
#include "addToRunTimeSelectionTable.H"
|
||||
#include "mathConstants.H"
|
||||
#include "mathematicalConstants.H"
|
||||
|
||||
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
||||
|
||||
@ -107,7 +107,7 @@ scalar pressureSwirlInjector::d0
|
||||
scalar c = rndGen_.scalar01();
|
||||
angle_ = coneAngle_[n] + 2.0*coneInterval_[n]*(0.5 - c);
|
||||
|
||||
angle_ *= constant::math::pi/360.0;
|
||||
angle_ *= constant::mathematical::pi/360.0;
|
||||
|
||||
scalar injectedMassFlow = it.massFlowRate(t);
|
||||
|
||||
@ -122,7 +122,7 @@ scalar pressureSwirlInjector::d0
|
||||
|
||||
u_ = v*cosAngle;
|
||||
|
||||
scalar A = injectedMassFlow/(constant::math::pi*rhoFuel*u_);
|
||||
scalar A = injectedMassFlow/(constant::mathematical::pi*rhoFuel*u_);
|
||||
|
||||
return (injectorDiameter-sqrt(pow(injectorDiameter,2)-4.0*A))/2.0;
|
||||
}
|
||||
@ -138,7 +138,7 @@ vector pressureSwirlInjector::direction
|
||||
{
|
||||
scalar alpha = sin(angle_);
|
||||
scalar dcorr = cos(angle_);
|
||||
scalar beta = constant::math::twoPi*rndGen_.scalar01();
|
||||
scalar beta = constant::mathematical::twoPi*rndGen_.scalar01();
|
||||
|
||||
// randomly distributed vector normal to the injection vector
|
||||
vector normal = vector::zero;
|
||||
@ -149,7 +149,7 @@ vector pressureSwirlInjector::direction
|
||||
// correct beta if this is a 2D run
|
||||
// map it onto the 'angleOfWedge'
|
||||
|
||||
beta *= (1.0 - 2.0*reduce)*sm_.angleOfWedge()/(constant::math::twoPi);
|
||||
beta *= (1.0 - 2.0*reduce)*sm_.angleOfWedge()/(constant::mathematical::twoPi);
|
||||
beta += reduce*sm_.angleOfWedge();
|
||||
normal =
|
||||
alpha
|
||||
@ -217,7 +217,7 @@ scalar pressureSwirlInjector::kv
|
||||
|
||||
scalar coneAngle = coneAngle_[inj];
|
||||
|
||||
coneAngle *= constant::math::pi/360.0;
|
||||
coneAngle *= constant::mathematical::pi/360.0;
|
||||
|
||||
scalar cosAngle = cos(coneAngle);
|
||||
scalar Tav = it.integrateTable(it.T())/(it.teoi()-it.tsoi());
|
||||
@ -230,7 +230,7 @@ scalar pressureSwirlInjector::kv
|
||||
maxKv_[inj],
|
||||
4.0*massFlow
|
||||
*sqrt(rhoFuel/2.0/dPressure)
|
||||
/(constant::math::pi*sqr(injectorDiameter)*rhoFuel*cosAngle)
|
||||
/(constant::mathematical::pi*sqr(injectorDiameter)*rhoFuel*cosAngle)
|
||||
);
|
||||
|
||||
return min(1.0, kv);
|
||||
|
||||
@ -27,6 +27,7 @@ License
|
||||
#include "constants.H"
|
||||
|
||||
using namespace Foam::constant;
|
||||
using namespace Foam::constant::mathematical;
|
||||
|
||||
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
|
||||
|
||||
@ -317,7 +318,7 @@ inline Foam::scalar Foam::DsmcCloud<ParcelType>::maxwellianAverageSpeed
|
||||
) const
|
||||
{
|
||||
return
|
||||
2.0*sqrt(2.0*physicoChemical::k.value()*temperature/(math::pi*mass));
|
||||
2.0*sqrt(2.0*physicoChemical::k.value()*temperature/(pi*mass));
|
||||
}
|
||||
|
||||
|
||||
@ -329,7 +330,7 @@ inline Foam::scalarField Foam::DsmcCloud<ParcelType>::maxwellianAverageSpeed
|
||||
) const
|
||||
{
|
||||
return
|
||||
2.0*sqrt(2.0*physicoChemical::k.value()*temperature/(math::pi*mass));
|
||||
2.0*sqrt(2.0*physicoChemical::k.value()*temperature/(pi*mass));
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -24,7 +24,7 @@ License
|
||||
|
||||
\*---------------------------------------------------------------------------*/
|
||||
|
||||
#include "mathConstants.H"
|
||||
#include "mathematicalConstants.H"
|
||||
|
||||
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
|
||||
|
||||
@ -103,7 +103,7 @@ template <class ParcelType>
|
||||
inline Foam::scalar
|
||||
Foam::DsmcParcel<ParcelType>::constantProperties::sigmaT() const
|
||||
{
|
||||
return constant::math::pi*d_*d_;
|
||||
return constant::mathematical::pi*d_*d_;
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -27,7 +27,7 @@ License
|
||||
#include "LarsenBorgnakkeVariableHardSphere.H"
|
||||
#include "constants.H"
|
||||
|
||||
using namespace Foam::constant;
|
||||
using namespace Foam::constant::mathematical;
|
||||
|
||||
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
|
||||
|
||||
@ -159,7 +159,7 @@ Foam::scalar Foam::LarsenBorgnakkeVariableHardSphere<CloudType>::sigmaTcR
|
||||
|
||||
// calculating cross section = pi*dPQ^2, where dPQ is from Bird, eq. 4.79
|
||||
scalar sigmaTPQ =
|
||||
math::pi*dPQ*dPQ
|
||||
pi*dPQ*dPQ
|
||||
*pow(2.0*physicoChemical::k.value()*Tref_/(mR*cR*cR), omegaPQ - 0.5)
|
||||
/exp(Foam::lgamma(2.5 - omegaPQ));
|
||||
|
||||
@ -255,7 +255,7 @@ void Foam::LarsenBorgnakkeVariableHardSphere<CloudType>::collide
|
||||
|
||||
scalar sinTheta = sqrt(1.0 - cosTheta*cosTheta);
|
||||
|
||||
scalar phi = math::twoPi*rndGen.scalar01();
|
||||
scalar phi = twoPi*rndGen.scalar01();
|
||||
|
||||
vector postCollisionRelU =
|
||||
cR
|
||||
|
||||
@ -27,7 +27,7 @@ License
|
||||
#include "VariableHardSphere.H"
|
||||
#include "constants.H"
|
||||
|
||||
using namespace Foam::constant;
|
||||
using namespace Foam::constant::mathematical;
|
||||
|
||||
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
|
||||
|
||||
@ -93,7 +93,7 @@ Foam::scalar Foam::VariableHardSphere<CloudType>::sigmaTcR
|
||||
|
||||
// calculating cross section = pi*dPQ^2, where dPQ is from Bird, eq. 4.79
|
||||
scalar sigmaTPQ =
|
||||
math::pi*dPQ*dPQ
|
||||
pi*dPQ*dPQ
|
||||
*pow(2.0*physicoChemical::k.value()*Tref_/(mR*cR*cR), omegaPQ - 0.5)
|
||||
/exp(Foam::lgamma(2.5 - omegaPQ));
|
||||
|
||||
@ -128,7 +128,7 @@ void Foam::VariableHardSphere<CloudType>::collide
|
||||
|
||||
scalar sinTheta = sqrt(1.0 - cosTheta*cosTheta);
|
||||
|
||||
scalar phi = math::twoPi*rndGen.scalar01();
|
||||
scalar phi = twoPi*rndGen.scalar01();
|
||||
|
||||
vector postCollisionRelU =
|
||||
cR
|
||||
|
||||
@ -27,7 +27,7 @@ License
|
||||
#include "FreeStream.H"
|
||||
#include "constants.H"
|
||||
|
||||
using namespace Foam::constant;
|
||||
using namespace Foam::constant::mathematical;
|
||||
|
||||
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
|
||||
|
||||
@ -133,7 +133,7 @@ void Foam::FreeStream<CloudType>::inflow()
|
||||
|
||||
Random& rndGen(cloud.rndGen());
|
||||
|
||||
scalar sqrtPi = sqrt(math::pi);
|
||||
scalar sqrtPi = sqrt(pi);
|
||||
|
||||
label particlesInserted = 0;
|
||||
|
||||
|
||||
@ -24,9 +24,9 @@ License
|
||||
|
||||
\*---------------------------------------------------------------------------*/
|
||||
|
||||
#include "mathConstants.H"
|
||||
#include "mathematicalConstants.H"
|
||||
|
||||
using namespace Foam::constant;
|
||||
using namespace Foam::constant::mathematical;
|
||||
|
||||
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
|
||||
|
||||
@ -353,7 +353,7 @@ template <class ParcelType>
|
||||
inline Foam::scalar
|
||||
Foam::KinematicParcel<ParcelType>::volume(const scalar d) const
|
||||
{
|
||||
return math::pi/6.0*pow3(d);
|
||||
return pi/6.0*pow3(d);
|
||||
}
|
||||
|
||||
|
||||
@ -383,7 +383,7 @@ template <class ParcelType>
|
||||
inline Foam::scalar
|
||||
Foam::KinematicParcel<ParcelType>::areaS(const scalar d) const
|
||||
{
|
||||
return math::pi*d*d;
|
||||
return pi*d*d;
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -25,9 +25,9 @@ License
|
||||
\*---------------------------------------------------------------------------*/
|
||||
|
||||
#include "ReactingMultiphaseParcel.H"
|
||||
#include "mathConstants.H"
|
||||
#include "mathematicalConstants.H"
|
||||
|
||||
using namespace Foam::constant;
|
||||
using namespace Foam::constant::mathematical;
|
||||
|
||||
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
|
||||
|
||||
@ -497,7 +497,7 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::calc
|
||||
}
|
||||
else
|
||||
{
|
||||
this->d_ = cbrt(mass1/this->rho_*6.0/math::pi);
|
||||
this->d_ = cbrt(mass1/this->rho_*6.0/pi);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -25,10 +25,10 @@ License
|
||||
\*---------------------------------------------------------------------------*/
|
||||
|
||||
#include "ReactingParcel.H"
|
||||
#include "mathConstants.H"
|
||||
#include "mathematicalConstants.H"
|
||||
#include "specie.H"
|
||||
|
||||
using namespace Foam::constant;
|
||||
using namespace Foam::constant::mathematical;
|
||||
|
||||
// * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * * //
|
||||
|
||||
@ -393,7 +393,7 @@ void Foam::ReactingParcel<ParcelType>::calc
|
||||
}
|
||||
else
|
||||
{
|
||||
this->d_ = cbrt(mass1/this->rho_*6.0/math::pi);
|
||||
this->d_ = cbrt(mass1/this->rho_*6.0/pi);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -26,9 +26,9 @@ License
|
||||
|
||||
#include "ConeInjection.H"
|
||||
#include "DataEntry.H"
|
||||
#include "mathConstants.H"
|
||||
#include "mathematicalConstants.H"
|
||||
|
||||
using namespace Foam::constant;
|
||||
using namespace Foam::constant::mathematical;
|
||||
|
||||
// * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * //
|
||||
|
||||
@ -203,7 +203,7 @@ void Foam::ConeInjection<CloudType>::setProperties
|
||||
)
|
||||
{
|
||||
// set particle velocity
|
||||
const scalar deg2Rad = math::pi/180.0;
|
||||
const scalar deg2Rad = pi/180.0;
|
||||
|
||||
scalar t = time - this->SOI_;
|
||||
scalar ti = thetaInner_().value(t);
|
||||
@ -213,7 +213,7 @@ void Foam::ConeInjection<CloudType>::setProperties
|
||||
coneAngle *= deg2Rad;
|
||||
scalar alpha = sin(coneAngle);
|
||||
scalar dcorr = cos(coneAngle);
|
||||
scalar beta = math::twoPi*this->owner().rndGen().scalar01();
|
||||
scalar beta = twoPi*this->owner().rndGen().scalar01();
|
||||
|
||||
vector normal = alpha*(tanVec1_*cos(beta) + tanVec2_*sin(beta));
|
||||
vector dirVec = dcorr*direction_;
|
||||
|
||||
@ -26,9 +26,9 @@ License
|
||||
|
||||
#include "ConeInjectionMP.H"
|
||||
#include "DataEntry.H"
|
||||
#include "mathConstants.H"
|
||||
#include "mathematicalConstants.H"
|
||||
|
||||
using namespace Foam::constant;
|
||||
using namespace Foam::constant::mathematical;
|
||||
|
||||
// * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * //
|
||||
|
||||
@ -249,7 +249,7 @@ void Foam::ConeInjectionMP<CloudType>::setProperties
|
||||
// set particle velocity
|
||||
const label i = parcelI%positions_.size();
|
||||
|
||||
const scalar deg2Rad = math::pi/180.0;
|
||||
const scalar deg2Rad = pi/180.0;
|
||||
|
||||
scalar t = time - this->SOI_;
|
||||
scalar ti = thetaInner_().value(t);
|
||||
@ -259,7 +259,7 @@ void Foam::ConeInjectionMP<CloudType>::setProperties
|
||||
coneAngle *= deg2Rad;
|
||||
scalar alpha = sin(coneAngle);
|
||||
scalar dcorr = cos(coneAngle);
|
||||
scalar beta = math::twoPi*this->owner().rndGen().scalar01();
|
||||
scalar beta = twoPi*this->owner().rndGen().scalar01();
|
||||
|
||||
vector normal = alpha*(tanVec1_[i]*cos(beta) + tanVec2_[i]*sin(beta));
|
||||
vector dirVec = dcorr*axes_[i];
|
||||
|
||||
@ -26,9 +26,9 @@ License
|
||||
|
||||
#include "FieldActivatedInjection.H"
|
||||
#include "volFields.H"
|
||||
#include "mathConstants.H"
|
||||
#include "mathematicalConstants.H"
|
||||
|
||||
using namespace Foam::constant;
|
||||
using namespace Foam::constant::mathematical;
|
||||
|
||||
// * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * //
|
||||
|
||||
@ -130,7 +130,7 @@ Foam::FieldActivatedInjection<CloudType>::FieldActivatedInjection
|
||||
|
||||
// Determine total volume of particles to inject
|
||||
this->volumeTotal_ =
|
||||
nParcelsPerInjector_*sum(pow3(diameters_))*math::pi/6.0;
|
||||
nParcelsPerInjector_*sum(pow3(diameters_))*pi/6.0;
|
||||
|
||||
// Set/cache the injector cells
|
||||
forAll(positions_, i)
|
||||
|
||||
@ -25,10 +25,10 @@ License
|
||||
\*---------------------------------------------------------------------------*/
|
||||
|
||||
#include "InjectionModel.H"
|
||||
#include "mathConstants.H"
|
||||
#include "mathematicalConstants.H"
|
||||
#include "meshTools.H"
|
||||
|
||||
using namespace Foam::constant;
|
||||
using namespace Foam::constant::mathematical;
|
||||
|
||||
// * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * * //
|
||||
|
||||
@ -200,7 +200,7 @@ Foam::scalar Foam::InjectionModel<CloudType>::setNumberOfParticles
|
||||
nP =
|
||||
volume/volumeTotal_
|
||||
*massTotal_/rho
|
||||
/(parcels*math::pi/6.0*pow3(diameter));
|
||||
/(parcels*pi/6.0*pow3(diameter));
|
||||
break;
|
||||
}
|
||||
case pbNumber:
|
||||
|
||||
@ -25,9 +25,9 @@ License
|
||||
\*---------------------------------------------------------------------------*/
|
||||
|
||||
#include "ManualInjection.H"
|
||||
#include "mathConstants.H"
|
||||
#include "mathematicalConstants.H"
|
||||
|
||||
using namespace Foam::constant;
|
||||
using namespace Foam::constant::mathematical;
|
||||
|
||||
// * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * //
|
||||
|
||||
@ -108,7 +108,7 @@ Foam::ManualInjection<CloudType>::ManualInjection
|
||||
}
|
||||
|
||||
// Determine volume of particles to inject
|
||||
this->volumeTotal_ = sum(pow3(diameters_))*math::pi/6.0;
|
||||
this->volumeTotal_ = sum(pow3(diameters_))*pi/6.0;
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -26,9 +26,9 @@ License
|
||||
|
||||
#include "LiquidEvaporation.H"
|
||||
#include "specie.H"
|
||||
#include "mathConstants.H"
|
||||
#include "mathematicalConstants.H"
|
||||
|
||||
using namespace Foam::constant;
|
||||
using namespace Foam::constant::mathematical;
|
||||
|
||||
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
|
||||
|
||||
@ -150,7 +150,7 @@ void Foam::LiquidEvaporation<CloudType>::calculate
|
||||
scalarField Xc = calcXc(cellI);
|
||||
|
||||
// droplet surface area
|
||||
scalar A = math::pi*sqr(d);
|
||||
scalar A = pi*sqr(d);
|
||||
|
||||
// calculate mass transfer of each specie in liquid
|
||||
forAll(activeLiquids_, i)
|
||||
|
||||
@ -26,9 +26,9 @@ License
|
||||
|
||||
#include "moleculeCloud.H"
|
||||
#include "fvMesh.H"
|
||||
#include "mathConstants.H"
|
||||
#include "mathematicalConstants.H"
|
||||
|
||||
using namespace Foam::constant;
|
||||
using namespace Foam::constant::mathematical;
|
||||
|
||||
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
|
||||
|
||||
@ -606,11 +606,11 @@ void Foam::moleculeCloud::initialiseMolecules
|
||||
zoneDict.lookup("orientationAngles")
|
||||
);
|
||||
|
||||
scalar phi(orientationAngles.x()*math::pi/180.0);
|
||||
scalar phi(orientationAngles.x()*pi/180.0);
|
||||
|
||||
scalar theta(orientationAngles.y()*math::pi/180.0);
|
||||
scalar theta(orientationAngles.y()*pi/180.0);
|
||||
|
||||
scalar psi(orientationAngles.z()*math::pi/180.0);
|
||||
scalar psi(orientationAngles.z()*pi/180.0);
|
||||
|
||||
const tensor R
|
||||
(
|
||||
@ -976,11 +976,11 @@ void Foam::moleculeCloud::createMolecule
|
||||
{
|
||||
pi = equipartitionAngularMomentum(temperature, cP);
|
||||
|
||||
scalar phi(rndGen_.scalar01()*math::twoPi);
|
||||
scalar phi(rndGen_.scalar01()*twoPi);
|
||||
|
||||
scalar theta(rndGen_.scalar01()*math::twoPi);
|
||||
scalar theta(rndGen_.scalar01()*twoPi);
|
||||
|
||||
scalar psi(rndGen_.scalar01()*math::twoPi);
|
||||
scalar psi(rndGen_.scalar01()*twoPi);
|
||||
|
||||
Q = tensor
|
||||
(
|
||||
|
||||
@ -25,13 +25,13 @@ License
|
||||
\*---------------------------------------------------------------------------*/
|
||||
|
||||
#include "electrostaticPotential.H"
|
||||
#include "mathConstants.H"
|
||||
#include "mathematicalConstants.H"
|
||||
|
||||
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
|
||||
|
||||
Foam::electrostaticPotential::electrostaticPotential()
|
||||
:
|
||||
prefactor(1.0/(4.0*constant::math::pi*8.854187817e-12))
|
||||
prefactor(1.0/(4.0*constant::mathematical::pi*8.854187817e-12))
|
||||
{}
|
||||
|
||||
// * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * * //
|
||||
|
||||
@ -25,7 +25,7 @@ License
|
||||
\*---------------------------------------------------------------------------*/
|
||||
|
||||
#include "coulomb.H"
|
||||
#include "mathConstants.H"
|
||||
#include "mathematicalConstants.H"
|
||||
#include "addToRunTimeSelectionTable.H"
|
||||
|
||||
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
||||
@ -47,7 +47,7 @@ addToRunTimeSelectionTable
|
||||
);
|
||||
|
||||
scalar coulomb::oneOverFourPiEps0 =
|
||||
1.0/(4.0*constant::math::pi*8.854187817e-12);
|
||||
1.0/(4.0*constant::mathematical::pi*8.854187817e-12);
|
||||
|
||||
|
||||
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
|
||||
|
||||
@ -25,7 +25,7 @@ License
|
||||
\*---------------------------------------------------------------------------*/
|
||||
|
||||
#include "dampedCoulomb.H"
|
||||
#include "mathConstants.H"
|
||||
#include "mathematicalConstants.H"
|
||||
#include "addToRunTimeSelectionTable.H"
|
||||
|
||||
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
||||
@ -47,7 +47,7 @@ addToRunTimeSelectionTable
|
||||
);
|
||||
|
||||
scalar dampedCoulomb::oneOverFourPiEps0 =
|
||||
1.0/(4.0*constant::math::pi*8.854187817e-12);
|
||||
1.0/(4.0*constant::mathematical::pi*8.854187817e-12);
|
||||
|
||||
|
||||
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
|
||||
|
||||
@ -26,7 +26,7 @@ License
|
||||
\*---------------------------------------------------------------------------*/
|
||||
|
||||
#include "cellQuality.H"
|
||||
#include "mathConstants.H"
|
||||
#include "mathematicalConstants.H"
|
||||
|
||||
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
|
||||
|
||||
@ -67,7 +67,7 @@ Foam::tmp<Foam::scalarField> Foam::cellQuality::nonOrthogonality() const
|
||||
|
||||
scalar cosDDotS =
|
||||
Foam::acos(min(1.0, (d & s)/(mag(d)*magS + VSMALL)))
|
||||
*180.0/constant::math::pi;
|
||||
*180.0/constant::mathematical::pi;
|
||||
|
||||
result[own[faceI]] = max(cosDDotS, result[own[faceI]]);
|
||||
|
||||
@ -93,7 +93,7 @@ Foam::tmp<Foam::scalarField> Foam::cellQuality::nonOrthogonality() const
|
||||
|
||||
scalar cosDDotS =
|
||||
Foam::acos(min(1.0, (d & s)/(mag(d)*magS + VSMALL)))
|
||||
*180.0/constant::math::pi;
|
||||
*180.0/constant::mathematical::pi;
|
||||
|
||||
result[faceCells[faceI]] = max(cosDDotS, result[faceCells[faceI]]);
|
||||
}
|
||||
@ -208,7 +208,7 @@ Foam::tmp<Foam::scalarField> Foam::cellQuality::faceNonOrthogonality() const
|
||||
|
||||
scalar cosDDotS =
|
||||
Foam::acos(min(1.0, (d & s)/(mag(d)*magS + VSMALL)))
|
||||
*180.0/constant::math::pi;
|
||||
*180.0/constant::mathematical::pi;
|
||||
|
||||
result[faceI] = cosDDotS;
|
||||
}
|
||||
@ -234,7 +234,7 @@ Foam::tmp<Foam::scalarField> Foam::cellQuality::faceNonOrthogonality() const
|
||||
|
||||
scalar cosDDotS =
|
||||
Foam::acos(min(1.0, (d & s)/(mag(d)*magS + VSMALL)))
|
||||
*180.0/constant::math::pi;
|
||||
*180.0/constant::mathematical::pi;
|
||||
|
||||
result[globalFaceI++] = cosDDotS;
|
||||
}
|
||||
|
||||
@ -27,7 +27,7 @@ License
|
||||
#include "EulerCoordinateRotation.H"
|
||||
|
||||
#include "Switch.H"
|
||||
#include "mathConstants.H"
|
||||
#include "mathematicalConstants.H"
|
||||
#include "addToRunTimeSelectionTable.H"
|
||||
|
||||
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
|
||||
@ -59,9 +59,9 @@ void Foam::EulerCoordinateRotation::calcTransform
|
||||
|
||||
if (inDegrees)
|
||||
{
|
||||
phi *= constant::math::pi/180.0;
|
||||
theta *= constant::math::pi/180.0;
|
||||
psi *= constant::math::pi/180.0;
|
||||
phi *= constant::mathematical::pi/180.0;
|
||||
theta *= constant::mathematical::pi/180.0;
|
||||
psi *= constant::mathematical::pi/180.0;
|
||||
}
|
||||
|
||||
tensor::operator=
|
||||
|
||||
@ -27,7 +27,7 @@ License
|
||||
#include "STARCDCoordinateRotation.H"
|
||||
|
||||
#include "Switch.H"
|
||||
#include "mathConstants.H"
|
||||
#include "mathematicalConstants.H"
|
||||
#include "addToRunTimeSelectionTable.H"
|
||||
|
||||
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
|
||||
@ -60,9 +60,9 @@ void Foam::STARCDCoordinateRotation::calcTransform
|
||||
|
||||
if (inDegrees)
|
||||
{
|
||||
x *= constant::math::pi/180.0;
|
||||
y *= constant::math::pi/180.0;
|
||||
z *= constant::math::pi/180.0;
|
||||
x *= constant::mathematical::pi/180.0;
|
||||
y *= constant::mathematical::pi/180.0;
|
||||
z *= constant::mathematical::pi/180.0;
|
||||
}
|
||||
|
||||
tensor::operator=
|
||||
|
||||
@ -28,7 +28,7 @@ License
|
||||
|
||||
#include "one.H"
|
||||
#include "Switch.H"
|
||||
#include "mathConstants.H"
|
||||
#include "mathematicalConstants.H"
|
||||
#include "addToRunTimeSelectionTable.H"
|
||||
|
||||
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
|
||||
@ -133,7 +133,7 @@ Foam::vector Foam::cylindricalCS::localToGlobal
|
||||
{
|
||||
scalar theta
|
||||
(
|
||||
local.y()*(inDegrees_ ? constant::math::pi/180.0 : 1.0)
|
||||
local.y()*(inDegrees_ ? constant::mathematical::pi/180.0 : 1.0)
|
||||
);
|
||||
|
||||
return coordinateSystem::localToGlobal
|
||||
@ -153,7 +153,7 @@ Foam::tmp<Foam::vectorField> Foam::cylindricalCS::localToGlobal
|
||||
scalarField theta =
|
||||
(
|
||||
local.component(vector::Y)
|
||||
*(inDegrees_ ? constant::math::pi/180.0 : 1.0)
|
||||
*(inDegrees_ ? constant::mathematical::pi/180.0 : 1.0)
|
||||
);
|
||||
|
||||
|
||||
@ -181,7 +181,7 @@ Foam::vector Foam::cylindricalCS::globalToLocal
|
||||
(
|
||||
lc.y(),
|
||||
lc.x()
|
||||
)*(inDegrees_ ? 180.0/constant::math::pi : 1.0),
|
||||
)*(inDegrees_ ? 180.0/constant::mathematical::pi : 1.0),
|
||||
lc.z()
|
||||
);
|
||||
}
|
||||
@ -212,7 +212,7 @@ Foam::tmp<Foam::vectorField> Foam::cylindricalCS::globalToLocal
|
||||
(
|
||||
lc.component(vector::Y),
|
||||
lc.component(vector::X)
|
||||
)*(inDegrees_ ? 180.0/constant::math::pi : 1.0)
|
||||
)*(inDegrees_ ? 180.0/constant::mathematical::pi : 1.0)
|
||||
);
|
||||
|
||||
result.replace(vector::Z, lc.component(vector::Z));
|
||||
|
||||
@ -28,7 +28,7 @@ License
|
||||
|
||||
#include "one.H"
|
||||
#include "Switch.H"
|
||||
#include "mathConstants.H"
|
||||
#include "mathematicalConstants.H"
|
||||
#include "addToRunTimeSelectionTable.H"
|
||||
|
||||
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
|
||||
@ -135,12 +135,12 @@ Foam::vector Foam::sphericalCS::localToGlobal
|
||||
const scalar theta
|
||||
(
|
||||
local.y()
|
||||
*(inDegrees_ ? constant::math::pi/180.0 : 1.0)
|
||||
*(inDegrees_ ? constant::mathematical::pi/180.0 : 1.0)
|
||||
);
|
||||
const scalar phi
|
||||
(
|
||||
local.z()
|
||||
*(inDegrees_ ? constant::math::pi/180.0 : 1.0)
|
||||
*(inDegrees_ ? constant::mathematical::pi/180.0 : 1.0)
|
||||
);
|
||||
|
||||
return coordinateSystem::localToGlobal
|
||||
@ -161,12 +161,12 @@ Foam::tmp<Foam::vectorField> Foam::sphericalCS::localToGlobal
|
||||
const scalarField theta
|
||||
(
|
||||
local.component(vector::Y)
|
||||
*(inDegrees_ ? constant::math::pi/180.0 : 1.0)
|
||||
*(inDegrees_ ? constant::mathematical::pi/180.0 : 1.0)
|
||||
);
|
||||
const scalarField phi
|
||||
(
|
||||
local.component(vector::Z)
|
||||
*(inDegrees_ ? constant::math::pi/180.0 : 1.0)
|
||||
*(inDegrees_ ? constant::mathematical::pi/180.0 : 1.0)
|
||||
);
|
||||
|
||||
vectorField lc(local.size());
|
||||
@ -193,11 +193,11 @@ Foam::vector Foam::sphericalCS::globalToLocal
|
||||
atan2
|
||||
(
|
||||
lc.y(), lc.x()
|
||||
)*(inDegrees_ ? 180.0/constant::math::pi : 1.0),
|
||||
)*(inDegrees_ ? 180.0/constant::mathematical::pi : 1.0),
|
||||
acos
|
||||
(
|
||||
lc.z()/(r + SMALL)
|
||||
)*(inDegrees_ ? 180.0/constant::math::pi : 1.0)
|
||||
)*(inDegrees_ ? 180.0/constant::mathematical::pi : 1.0)
|
||||
);
|
||||
}
|
||||
|
||||
@ -227,7 +227,7 @@ Foam::tmp<Foam::vectorField> Foam::sphericalCS::globalToLocal
|
||||
(
|
||||
lc.component(vector::Y),
|
||||
lc.component(vector::X)
|
||||
)*(inDegrees_ ? 180.0/constant::math::pi : 1.0)
|
||||
)*(inDegrees_ ? 180.0/constant::mathematical::pi : 1.0)
|
||||
);
|
||||
|
||||
result.replace
|
||||
@ -236,7 +236,7 @@ Foam::tmp<Foam::vectorField> Foam::sphericalCS::globalToLocal
|
||||
acos
|
||||
(
|
||||
lc.component(vector::Z)/(r + SMALL)
|
||||
)*(inDegrees_ ? 180.0/constant::math::pi : 1.0)
|
||||
)*(inDegrees_ ? 180.0/constant::mathematical::pi : 1.0)
|
||||
);
|
||||
|
||||
return tresult;
|
||||
|
||||
@ -26,7 +26,7 @@ License
|
||||
|
||||
#include "toroidalCS.H"
|
||||
#include "addToRunTimeSelectionTable.H"
|
||||
#include "mathConstants.H"
|
||||
#include "mathematicalConstants.H"
|
||||
|
||||
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
|
||||
|
||||
@ -72,8 +72,8 @@ Foam::vector Foam::toroidalCS::localToGlobal
|
||||
) const
|
||||
{
|
||||
// Notation: r = local.x()
|
||||
scalar theta = local.y()*constant::math::pi/180.0;
|
||||
scalar phi = local.z()*constant::math::pi/180.0;
|
||||
scalar theta = local.y()*constant::mathematical::pi/180.0;
|
||||
scalar phi = local.z()*constant::mathematical::pi/180.0;
|
||||
|
||||
scalar rprime = radius_ + local.x()*sin(phi);
|
||||
|
||||
@ -101,10 +101,10 @@ Foam::tmp<Foam::vectorField> Foam::toroidalCS::localToGlobal
|
||||
const scalarField r = local.component(vector::X);
|
||||
|
||||
const scalarField theta =
|
||||
local.component(vector::Y)*constant::math::pi/180.0;
|
||||
local.component(vector::Y)*constant::mathematical::pi/180.0;
|
||||
|
||||
const scalarField phi =
|
||||
local.component(vector::Z)*constant::math::pi/180.0;
|
||||
local.component(vector::Z)*constant::mathematical::pi/180.0;
|
||||
|
||||
const scalarField rprime = radius_ + r*sin(phi);
|
||||
|
||||
|
||||
@ -26,7 +26,7 @@ License
|
||||
|
||||
#include "primitiveMeshGeometry.H"
|
||||
#include "pyramidPointFaceRef.H"
|
||||
#include "mathConstants.H"
|
||||
#include "mathematicalConstants.H"
|
||||
|
||||
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
||||
|
||||
@ -272,7 +272,7 @@ bool Foam::primitiveMeshGeometry::checkFaceDotProduct
|
||||
|
||||
// Severe nonorthogonality threshold
|
||||
const scalar severeNonorthogonalityThreshold =
|
||||
::cos(orthWarn/180.0*constant::math::pi);
|
||||
::cos(orthWarn/180.0*constant::mathematical::pi);
|
||||
|
||||
scalar minDDotS = GREAT;
|
||||
|
||||
@ -304,7 +304,7 @@ bool Foam::primitiveMeshGeometry::checkFaceDotProduct
|
||||
<< " between cells " << own[faceI]
|
||||
<< " and " << nei[faceI]
|
||||
<< ": Angle = "
|
||||
<< ::acos(dDotS)/constant::math::pi*180.0
|
||||
<< ::acos(dDotS)/constant::mathematical::pi*180.0
|
||||
<< " deg." << endl;
|
||||
}
|
||||
|
||||
@ -330,7 +330,7 @@ bool Foam::primitiveMeshGeometry::checkFaceDotProduct
|
||||
<< " between cells " << own[faceI] << " and "
|
||||
<< nei[faceI]
|
||||
<< ": Angle = "
|
||||
<< ::acos(dDotS)/constant::math::pi*180.0
|
||||
<< ::acos(dDotS)/constant::mathematical::pi*180.0
|
||||
<< " deg." << endl;
|
||||
}
|
||||
|
||||
@ -376,9 +376,9 @@ bool Foam::primitiveMeshGeometry::checkFaceDotProduct
|
||||
if (neiSize > 0)
|
||||
{
|
||||
Info<< "Mesh non-orthogonality Max: "
|
||||
<< ::acos(minDDotS)/constant::math::pi*180.0
|
||||
<< ::acos(minDDotS)/constant::mathematical::pi*180.0
|
||||
<< " average: " <<
|
||||
::acos(sumDDotS/neiSize)/constant::math::pi*180.0
|
||||
::acos(sumDDotS/neiSize)/constant::mathematical::pi*180.0
|
||||
<< endl;
|
||||
}
|
||||
}
|
||||
@ -780,7 +780,7 @@ bool Foam::primitiveMeshGeometry::checkFaceAngles
|
||||
<< abort(FatalError);
|
||||
}
|
||||
|
||||
const scalar maxSin = Foam::sin(maxDeg/180.0*constant::math::pi);
|
||||
const scalar maxSin = Foam::sin(maxDeg/180.0*constant::mathematical::pi);
|
||||
|
||||
const faceList& fcs = mesh.faces();
|
||||
|
||||
@ -861,7 +861,7 @@ bool Foam::primitiveMeshGeometry::checkFaceAngles
|
||||
{
|
||||
scalar maxConcaveDegr =
|
||||
Foam::asin(Foam::min(1.0, maxEdgeSin))
|
||||
*180.0/constant::math::pi;
|
||||
*180.0/constant::mathematical::pi;
|
||||
|
||||
Info<< "There are " << nConcave
|
||||
<< " faces with concave angles between consecutive"
|
||||
|
||||
@ -26,7 +26,7 @@ License
|
||||
|
||||
#include "shapeToCell.H"
|
||||
#include "polyMesh.H"
|
||||
#include "mathConstants.H"
|
||||
#include "mathematicalConstants.H"
|
||||
#include "hexMatcher.H"
|
||||
#include "cellFeatures.H"
|
||||
|
||||
@ -57,7 +57,7 @@ Foam::topoSetSource::addToUsageTable Foam::shapeToCell::usage_
|
||||
|
||||
// Angle for polys to be considered splitHexes.
|
||||
Foam::scalar Foam::shapeToCell::featureCos =
|
||||
Foam::cos(10.0*Foam::constant::math::pi/180.0);
|
||||
Foam::cos(10.0*Foam::constant::mathematical::pi/180.0);
|
||||
|
||||
|
||||
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
|
||||
|
||||
@ -36,7 +36,7 @@ License
|
||||
#include "meshTools.H"
|
||||
#include "plane.H"
|
||||
#include "Random.H"
|
||||
#include "mathConstants.H"
|
||||
#include "mathematicalConstants.H"
|
||||
#include "treeBoundBox.H"
|
||||
|
||||
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
|
||||
@ -44,7 +44,7 @@ License
|
||||
defineTypeNameAndDebug(Foam::edgeIntersections, 0);
|
||||
|
||||
Foam::scalar Foam::edgeIntersections::alignedCos_ =
|
||||
Foam::cos(89.0*Foam::constant::math::pi/180.0);
|
||||
Foam::cos(89.0*Foam::constant::mathematical::pi/180.0);
|
||||
|
||||
|
||||
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
|
||||
|
||||
@ -33,7 +33,7 @@ License
|
||||
#include "linePointRef.H"
|
||||
#include "OFstream.H"
|
||||
#include "IFstream.H"
|
||||
#include "mathConstants.H"
|
||||
#include "mathematicalConstants.H"
|
||||
|
||||
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
|
||||
|
||||
@ -491,7 +491,7 @@ Foam::labelList Foam::surfaceFeatures::selectFeatureEdges
|
||||
void Foam::surfaceFeatures::findFeatures(const scalar includedAngle)
|
||||
{
|
||||
scalar minCos =
|
||||
Foam::cos((180.0 - includedAngle)*constant::math::pi/180.0);
|
||||
Foam::cos((180.0 - includedAngle)*constant::mathematical::pi/180.0);
|
||||
|
||||
const labelListList& edgeFaces = surf_.edgeFaces();
|
||||
const vectorField& faceNormals = surf_.faceNormals();
|
||||
|
||||
@ -27,7 +27,7 @@ License
|
||||
#include "Kmesh.H"
|
||||
#include "polyMesh.H"
|
||||
#include "volFields.H"
|
||||
#include "mathConstants.H"
|
||||
#include "mathematicalConstants.H"
|
||||
|
||||
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
||||
|
||||
@ -89,15 +89,15 @@ Foam::Kmesh::Kmesh(const fvMesh& mesh)
|
||||
|
||||
for (i=0; i<NN[0]; i++)
|
||||
{
|
||||
scalar k1 = (i - NN[0]/2)*constant::math::twoPi/L[0];
|
||||
scalar k1 = (i - NN[0]/2)*constant::mathematical::twoPi/L[0];
|
||||
|
||||
for (label j=0; j<NN[1]; j++)
|
||||
{
|
||||
scalar k2 = (j - NN[1]/2)*constant::math::twoPi/L[1];
|
||||
scalar k2 = (j - NN[1]/2)*constant::mathematical::twoPi/L[1];
|
||||
|
||||
for (label k=0; k<NN[2]; k++)
|
||||
{
|
||||
scalar k3 = (k - NN[2]/2)*constant::math::twoPi/L[2];
|
||||
scalar k3 = (k - NN[2]/2)*constant::mathematical::twoPi/L[2];
|
||||
|
||||
(*this)[rep(i, j, k, NN)] = vector(k1, k2, k3);
|
||||
}
|
||||
|
||||
@ -25,7 +25,7 @@ License
|
||||
\*---------------------------------------------------------------------------*/
|
||||
|
||||
#include "kShellIntegration.H"
|
||||
#include "mathConstants.H"
|
||||
#include "mathematicalConstants.H"
|
||||
|
||||
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
||||
|
||||
@ -51,12 +51,12 @@ graph kShellIntegration
|
||||
// spectra E(k). int E(k) dk is now the total energy in a box
|
||||
// of side 2pi
|
||||
|
||||
y *= sqr(x)*4.0*constant::math::pi;
|
||||
y *= sqr(x)*4.0*constant::mathematical::pi;
|
||||
|
||||
// now scale this to get the energy in a box of side l0
|
||||
|
||||
scalar l0(K.sizeOfBox()[0]*(scalar(K.nn()[0])/(scalar(K.nn()[0]) - 1.0)));
|
||||
scalar factor = pow3(l0/constant::math::twoPi);
|
||||
scalar factor = pow3(l0/constant::mathematical::twoPi);
|
||||
|
||||
y *= factor;
|
||||
|
||||
|
||||
@ -28,7 +28,7 @@ License
|
||||
#include "IFstream.H"
|
||||
#include "DynamicList.H"
|
||||
#include "fft.H"
|
||||
#include "mathConstants.H"
|
||||
#include "mathematicalConstants.H"
|
||||
#include "SubField.H"
|
||||
|
||||
// * * * * * * * * * * * * * * Static Member Data * * * * * * * * * * * * * //
|
||||
@ -170,7 +170,7 @@ Foam::tmp<Foam::scalarField> Foam::noiseFFT::Hanning(const label N) const
|
||||
|
||||
scalar T = N*deltat_;
|
||||
|
||||
return 2*(0.5 - 0.5*cos(constant::math::twoPi*t/T));
|
||||
return 2*(0.5 - 0.5*cos(constant::mathematical::twoPi*t/T));
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -29,7 +29,7 @@ License
|
||||
#include "Kmesh.H"
|
||||
#include "primitiveFields.H"
|
||||
#include "Ek.H"
|
||||
#include "mathConstants.H"
|
||||
#include "mathematicalConstants.H"
|
||||
|
||||
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
||||
|
||||
@ -70,8 +70,8 @@ vectorField turbGen::U()
|
||||
complexVectorField up =
|
||||
fft::reverseTransform
|
||||
(
|
||||
ComplexField(cos(constant::math::twoPi*rndPhases)*s,
|
||||
sin(constant::math::twoPi*rndPhases)*s),
|
||||
ComplexField(cos(constant::mathematical::twoPi*rndPhases)*s,
|
||||
sin(constant::mathematical::twoPi*rndPhases)*s),
|
||||
K.nn()
|
||||
);
|
||||
|
||||
|
||||
@ -33,6 +33,7 @@ License
|
||||
#include "constants.H"
|
||||
|
||||
using namespace Foam::constant;
|
||||
using namespace Foam::constant::mathematical;
|
||||
|
||||
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
|
||||
|
||||
@ -84,7 +85,7 @@ greyDiffusiveRadiationMixedFvPatchScalarField
|
||||
patch().lookupPatchField<volScalarField, scalar>(TName_);
|
||||
|
||||
refValue() =
|
||||
emissivity_*4.0*physicoChemical::sigma.value()*pow4(Tp)/math::pi;
|
||||
emissivity_*4.0*physicoChemical::sigma.value()*pow4(Tp)/pi;
|
||||
|
||||
refGrad() = 0.0;
|
||||
|
||||
@ -199,9 +200,7 @@ updateCoeffs()
|
||||
(
|
||||
Ir*(1.0 - emissivity_)
|
||||
+ emissivity_*physicoChemical::sigma.value()*pow4(Tp[faceI])
|
||||
)
|
||||
/constant::math::pi;
|
||||
|
||||
)/pi;
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
@ -34,6 +34,7 @@ License
|
||||
#include "constants.H"
|
||||
|
||||
using namespace Foam::constant;
|
||||
using namespace Foam::constant::mathematical;
|
||||
|
||||
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
|
||||
|
||||
@ -85,7 +86,7 @@ wideBandDiffusiveRadiationMixedFvPatchScalarField
|
||||
patch().lookupPatchField<volScalarField, scalar>(TName_);
|
||||
|
||||
refValue() =
|
||||
emissivity_*4.0*physicoChemical::sigma.value()*pow4(Tp)/math::pi;
|
||||
emissivity_*4.0*physicoChemical::sigma.value()*pow4(Tp)/pi;
|
||||
refGrad() = 0.0;
|
||||
|
||||
if (dict.found("value"))
|
||||
@ -197,8 +198,7 @@ updateCoeffs()
|
||||
(
|
||||
Ir*(1.0 - emissivity_)
|
||||
+ emissivity_*Eb[faceI]
|
||||
)
|
||||
/math::pi;
|
||||
)/pi;
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
@ -32,6 +32,7 @@ License
|
||||
#include "constants.H"
|
||||
|
||||
using namespace Foam::constant;
|
||||
using namespace Foam::constant::mathematical;
|
||||
|
||||
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
|
||||
|
||||
@ -135,8 +136,8 @@ Foam::radiation::fvDOM::fvDOM(const volScalarField& T)
|
||||
{
|
||||
nRay_ = 4*nPhi_*nTheta_;
|
||||
IRay_.setSize(nRay_);
|
||||
scalar deltaPhi = math::pi/(2.0*nPhi_);
|
||||
scalar deltaTheta = math::pi/nTheta_;
|
||||
scalar deltaPhi = pi/(2.0*nPhi_);
|
||||
scalar deltaTheta = pi/nTheta_;
|
||||
label i = 0;
|
||||
for (label n = 1; n <= nTheta_; n++)
|
||||
{
|
||||
@ -168,11 +169,11 @@ Foam::radiation::fvDOM::fvDOM(const volScalarField& T)
|
||||
{
|
||||
if (mesh_.nSolutionD() == 2) //2D (X & Y)
|
||||
{
|
||||
scalar thetai = math::piByTwo;
|
||||
scalar deltaTheta = math::pi;
|
||||
scalar thetai = piByTwo;
|
||||
scalar deltaTheta = pi;
|
||||
nRay_ = 4*nPhi_;
|
||||
IRay_.setSize(nRay_);
|
||||
scalar deltaPhi = math::pi/(2.0*nPhi_);
|
||||
scalar deltaPhi = pi/(2.0*nPhi_);
|
||||
label i = 0;
|
||||
for (label m = 1; m <= 4*nPhi_; m++)
|
||||
{
|
||||
@ -198,11 +199,11 @@ Foam::radiation::fvDOM::fvDOM(const volScalarField& T)
|
||||
}
|
||||
else //1D (X)
|
||||
{
|
||||
scalar thetai = math::piByTwo;
|
||||
scalar deltaTheta = math::pi;
|
||||
scalar thetai = piByTwo;
|
||||
scalar deltaTheta = pi;
|
||||
nRay_ = 2;
|
||||
IRay_.setSize(nRay_);
|
||||
scalar deltaPhi = math::pi;
|
||||
scalar deltaPhi = pi;
|
||||
label i = 0;
|
||||
for (label m = 1; m <= 2; m++)
|
||||
{
|
||||
|
||||
@ -199,7 +199,7 @@ Foam::scalar Foam::radiation::radiativeIntensityRay::correct()
|
||||
fvm::div(Ji, ILambda_[lambdaI], "div(Ji,Ii_h)")
|
||||
+ fvm::Sp(k*omega_, ILambda_[lambdaI])
|
||||
==
|
||||
1.0/constant::math::pi*omega_
|
||||
1.0/constant::mathematical::pi*omega_
|
||||
*(
|
||||
k*blackBody_.bLambda(lambdaI)
|
||||
+ absorptionEmission_.ECont(lambdaI)
|
||||
|
||||
@ -26,7 +26,7 @@ License
|
||||
|
||||
#include "interfaceProperties.H"
|
||||
#include "alphaContactAngleFvPatchScalarField.H"
|
||||
#include "mathConstants.H"
|
||||
#include "mathematicalConstants.H"
|
||||
#include "surfaceInterpolate.H"
|
||||
#include "fvcDiv.H"
|
||||
#include "fvcGrad.H"
|
||||
@ -35,7 +35,7 @@ License
|
||||
// * * * * * * * * * * * * * * * Static Member Data * * * * * * * * * * * * //
|
||||
|
||||
const Foam::scalar Foam::interfaceProperties::convertToRad =
|
||||
Foam::constant::math::pi/180.0;
|
||||
Foam::constant::mathematical::pi/180.0;
|
||||
|
||||
|
||||
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
|
||||
|
||||
Reference in New Issue
Block a user