mirror of
https://develop.openfoam.com/Development/openfoam.git
synced 2025-12-28 03:37:59 +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:
@ -25,7 +25,7 @@ License
|
||||
\*---------------------------------------------------------------------------*/
|
||||
|
||||
#include "SchnerrSauer.H"
|
||||
#include "mathConstants.H"
|
||||
#include "mathematicalConstants.H"
|
||||
#include "addToRunTimeSelectionTable.H"
|
||||
|
||||
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
|
||||
@ -77,7 +77,7 @@ Foam::phaseChangeTwoPhaseMixtures::SchnerrSauer::rRb
|
||||
{
|
||||
return pow
|
||||
(
|
||||
((4*constant::math::pi*n_)/3)
|
||||
((4*constant::mathematical::pi*n_)/3)
|
||||
*limitedAlpha1/(1.0 + alphaNuc() - limitedAlpha1),
|
||||
1.0/3.0
|
||||
);
|
||||
@ -87,7 +87,7 @@ Foam::phaseChangeTwoPhaseMixtures::SchnerrSauer::rRb
|
||||
Foam::dimensionedScalar
|
||||
Foam::phaseChangeTwoPhaseMixtures::SchnerrSauer::alphaNuc() const
|
||||
{
|
||||
dimensionedScalar Vnuc = n_*constant::math::pi*pow3(dNuc_)/6;
|
||||
dimensionedScalar Vnuc = n_*constant::mathematical::pi*pow3(dNuc_)/6;
|
||||
return Vnuc/(1 + Vnuc);
|
||||
}
|
||||
|
||||
|
||||
@ -29,12 +29,12 @@ License
|
||||
#include "Time.H"
|
||||
#include "subCycle.H"
|
||||
#include "fvCFD.H"
|
||||
#include "mathConstants.H"
|
||||
#include "mathematicalConstants.H"
|
||||
|
||||
// * * * * * * * * * * * * * * * Static Member Data * * * * * * * * * * * * //
|
||||
|
||||
const scalar Foam::multiphaseMixture::convertToRad =
|
||||
Foam::constant::math::pi/180.0;
|
||||
Foam::constant::mathematical::pi/180.0;
|
||||
|
||||
|
||||
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
|
||||
|
||||
@ -25,7 +25,7 @@ License
|
||||
\*---------------------------------------------------------------------------*/
|
||||
|
||||
#include "GidaspowConductivity.H"
|
||||
#include "mathConstants.H"
|
||||
#include "mathematicalConstants.H"
|
||||
#include "addToRunTimeSelectionTable.H"
|
||||
|
||||
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
|
||||
@ -69,7 +69,7 @@ Foam::tmp<Foam::volScalarField> Foam::GidaspowConductivity::kappa
|
||||
const dimensionedScalar& e
|
||||
) const
|
||||
{
|
||||
const scalar sqrtPi = sqrt(constant::math::pi);
|
||||
const scalar sqrtPi = sqrt(constant::mathematical::pi);
|
||||
|
||||
return rhoa*da*sqrt(Theta)*
|
||||
(
|
||||
|
||||
@ -25,7 +25,7 @@ License
|
||||
\*---------------------------------------------------------------------------*/
|
||||
|
||||
#include "HrenyaSinclairConductivity.H"
|
||||
#include "mathConstants.H"
|
||||
#include "mathematicalConstants.H"
|
||||
#include "addToRunTimeSelectionTable.H"
|
||||
|
||||
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
|
||||
@ -74,7 +74,7 @@ Foam::tmp<Foam::volScalarField> Foam::HrenyaSinclairConductivity::kappa
|
||||
const dimensionedScalar& e
|
||||
) const
|
||||
{
|
||||
const scalar sqrtPi = sqrt(constant::math::pi);
|
||||
const scalar sqrtPi = sqrt(constant::mathematical::pi);
|
||||
|
||||
volScalarField lamda =
|
||||
scalar(1) + da/(6.0*sqrt(2.0)*(alpha + scalar(1.0e-5)))/L_;
|
||||
|
||||
@ -25,7 +25,7 @@ License
|
||||
\*---------------------------------------------------------------------------*/
|
||||
|
||||
#include "SyamlalConductivity.H"
|
||||
#include "mathConstants.H"
|
||||
#include "mathematicalConstants.H"
|
||||
#include "addToRunTimeSelectionTable.H"
|
||||
|
||||
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
|
||||
@ -69,7 +69,7 @@ Foam::tmp<Foam::volScalarField> Foam::SyamlalConductivity::kappa
|
||||
const dimensionedScalar& e
|
||||
) const
|
||||
{
|
||||
const scalar sqrtPi = sqrt(constant::math::pi);
|
||||
const scalar sqrtPi = sqrt(constant::mathematical::pi);
|
||||
|
||||
return rhoa*da*sqrt(Theta)*
|
||||
(
|
||||
|
||||
@ -26,7 +26,7 @@ License
|
||||
|
||||
#include "kineticTheoryModel.H"
|
||||
#include "surfaceInterpolate.H"
|
||||
#include "mathConstants.H"
|
||||
#include "mathematicalConstants.H"
|
||||
#include "fvCFD.H"
|
||||
|
||||
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
|
||||
@ -204,7 +204,7 @@ void Foam::kineticTheoryModel::solve()
|
||||
|
||||
volScalarField alpha = alpha_;
|
||||
alpha.max(1.0e-6);
|
||||
const scalar sqrtPi = sqrt(constant::math::pi);
|
||||
const scalar sqrtPi = sqrt(constant::mathematical::pi);
|
||||
|
||||
surfaceScalarField phi = 1.5*rhoa_*phia_*fvc::interpolate(alpha_);
|
||||
|
||||
|
||||
@ -25,7 +25,7 @@ License
|
||||
\*---------------------------------------------------------------------------*/
|
||||
|
||||
#include "GidaspowViscosity.H"
|
||||
#include "mathConstants.H"
|
||||
#include "mathematicalConstants.H"
|
||||
#include "addToRunTimeSelectionTable.H"
|
||||
|
||||
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
|
||||
@ -70,7 +70,7 @@ Foam::kineticTheoryModels::GidaspowViscosity::mua
|
||||
const dimensionedScalar& e
|
||||
) const
|
||||
{
|
||||
const scalar sqrtPi = sqrt(constant::math::pi);
|
||||
const scalar sqrtPi = sqrt(constant::mathematical::pi);
|
||||
|
||||
return rhoa*da*sqrt(Theta)*
|
||||
(
|
||||
|
||||
@ -25,7 +25,7 @@ License
|
||||
\*---------------------------------------------------------------------------*/
|
||||
|
||||
#include "HrenyaSinclairViscosity.H"
|
||||
#include "mathConstants.H"
|
||||
#include "mathematicalConstants.H"
|
||||
#include "addToRunTimeSelectionTable.H"
|
||||
|
||||
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
|
||||
@ -77,7 +77,7 @@ Foam::kineticTheoryModels::HrenyaSinclairViscosity::mua
|
||||
const dimensionedScalar& e
|
||||
) const
|
||||
{
|
||||
const scalar sqrtPi = sqrt(constant::math::pi);
|
||||
const scalar sqrtPi = sqrt(constant::mathematical::pi);
|
||||
|
||||
volScalarField lamda =
|
||||
scalar(1) + da/(6.0*sqrt(2.0)*(alpha + scalar(1.0e-5)))/L_;
|
||||
|
||||
@ -25,7 +25,7 @@ License
|
||||
\*---------------------------------------------------------------------------*/
|
||||
|
||||
#include "SyamlalViscosity.H"
|
||||
#include "mathConstants.H"
|
||||
#include "mathematicalConstants.H"
|
||||
#include "addToRunTimeSelectionTable.H"
|
||||
|
||||
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
|
||||
@ -69,7 +69,7 @@ Foam::tmp<Foam::volScalarField> Foam::kineticTheoryModels::SyamlalViscosity::mua
|
||||
const dimensionedScalar& e
|
||||
) const
|
||||
{
|
||||
const scalar sqrtPi = sqrt(constant::math::pi);
|
||||
const scalar sqrtPi = sqrt(constant::mathematical::pi);
|
||||
|
||||
return rhoa*da*sqrt(Theta)*
|
||||
(
|
||||
|
||||
Reference in New Issue
Block a user