diff --git a/src/surfaceFilmModels/submodels/thermo/phaseChangeModel/standardPhaseChange/standardPhaseChange.C b/src/surfaceFilmModels/submodels/thermo/phaseChangeModel/standardPhaseChange/standardPhaseChange.C
index df0eb7712ee16d53bb54aedece9674d5bab26416..8380d06ef7be8edd73c661d1c850ecf426c0fab1 100644
--- a/src/surfaceFilmModels/submodels/thermo/phaseChangeModel/standardPhaseChange/standardPhaseChange.C
+++ b/src/surfaceFilmModels/submodels/thermo/phaseChangeModel/standardPhaseChange/standardPhaseChange.C
@@ -148,8 +148,8 @@ void Foam::surfaceFilmModels::standardPhaseChange::correct
const scalar qDotInf = hInf[cellI]*(TInf[cellI] - T[cellI]);
const scalar qDotFilm = hFilm[cellI]*(T[cellI] - Tw[cellI]);
- const scalar cp = liq.cp(pc, Tloc);
- const scalar qCorr = availableMass[cellI]*cp*(T[cellI] - Tb_);
+ const scalar Cp = liq.Cp(pc, Tloc);
+ const scalar qCorr = availableMass[cellI]*Cp*(T[cellI] - Tb_);
dMass[cellI] =
dt*magSf[cellI]/hVap*(qDotInf + qDotFilm)
+ qCorr/hVap;
diff --git a/src/surfaceFilmModels/surfaceFilmModel/kinematicSingleLayer/kinematicSingleLayer.C b/src/surfaceFilmModels/surfaceFilmModel/kinematicSingleLayer/kinematicSingleLayer.C
index 5c81e24cc3475889c08666770be38238bf17df20..c645552e67aa510940d25b230b78d0cc855c2e5a 100644
--- a/src/surfaceFilmModels/surfaceFilmModel/kinematicSingleLayer/kinematicSingleLayer.C
+++ b/src/surfaceFilmModels/surfaceFilmModel/kinematicSingleLayer/kinematicSingleLayer.C
@@ -1116,12 +1116,12 @@ Foam::surfaceFilmModels::kinematicSingleLayer::Tw() const
const Foam::volScalarField&
-Foam::surfaceFilmModels::kinematicSingleLayer::cp() const
+Foam::surfaceFilmModels::kinematicSingleLayer::Cp() const
{
FatalErrorIn
(
- "const volScalarField& kinematicSingleLayer::cp() const"
- ) << "cp field not available for " << type() << abort(FatalError);
+ "const volScalarField& kinematicSingleLayer::Cp() const"
+ ) << "Cp field not available for " << type() << abort(FatalError);
return volScalarField::null();
}
diff --git a/src/surfaceFilmModels/surfaceFilmModel/kinematicSingleLayer/kinematicSingleLayer.H b/src/surfaceFilmModels/surfaceFilmModel/kinematicSingleLayer/kinematicSingleLayer.H
index c6b1ed1b4e3a73b2ec89daa38b0f5c6771267859..4e33708c2581c26bdd23f276cd182c7f9a1caea4 100644
--- a/src/surfaceFilmModels/surfaceFilmModel/kinematicSingleLayer/kinematicSingleLayer.H
+++ b/src/surfaceFilmModels/surfaceFilmModel/kinematicSingleLayer/kinematicSingleLayer.H
@@ -401,7 +401,7 @@ public:
virtual const volScalarField& Tw() const;
//- Return the film specific heat capacity [J/kg/K]
- virtual const volScalarField& cp() const;
+ virtual const volScalarField& Cp() const;
//- Return the film thermal conductivity [W/m/K]
virtual const volScalarField& kappa() const;
diff --git a/src/surfaceFilmModels/surfaceFilmModel/noFilm/noFilm.C b/src/surfaceFilmModels/surfaceFilmModel/noFilm/noFilm.C
index b277192e25870d2228f6f3c26cae68835c13f2a6..619226bb8ff1f9f09e66c10debddeed8a0ffa1bc 100644
--- a/src/surfaceFilmModels/surfaceFilmModel/noFilm/noFilm.C
+++ b/src/surfaceFilmModels/surfaceFilmModel/noFilm/noFilm.C
@@ -199,10 +199,10 @@ const Foam::volScalarField& Foam::surfaceFilmModels::noFilm::Tw() const
}
-const Foam::volScalarField& Foam::surfaceFilmModels::noFilm::cp() const
+const Foam::volScalarField& Foam::surfaceFilmModels::noFilm::Cp() const
{
- FatalErrorIn("const volScalarField& noFilm::cp() const")
- << "cp field not available for " << type() << abort(FatalError);
+ FatalErrorIn("const volScalarField& noFilm::Cp() const")
+ << "Cp field not available for " << type() << abort(FatalError);
return volScalarField::null();
}
diff --git a/src/surfaceFilmModels/surfaceFilmModel/noFilm/noFilm.H b/src/surfaceFilmModels/surfaceFilmModel/noFilm/noFilm.H
index e4616151fdc3b39bfc6f5feabe1876ff90b7d541..7c3d7f89d91d61986d178e0a598c4c07489fe7ac 100644
--- a/src/surfaceFilmModels/surfaceFilmModel/noFilm/noFilm.H
+++ b/src/surfaceFilmModels/surfaceFilmModel/noFilm/noFilm.H
@@ -148,7 +148,7 @@ public:
virtual const volScalarField& Tw() const;
//- Return the film specific heat capacity [J/kg/K]
- virtual const volScalarField& cp() const;
+ virtual const volScalarField& Cp() const;
//- Return the film thermal conductivity [W/m/K]
virtual const volScalarField& kappa() const;
diff --git a/src/surfaceFilmModels/surfaceFilmModel/surfaceFilmModel/surfaceFilmModel.H b/src/surfaceFilmModels/surfaceFilmModel/surfaceFilmModel/surfaceFilmModel.H
index c8c01ed6a7274a3d0e0552c56188f7a046ec0a07..511a6204e4a9b65bc6ac3b95151522c9dfa2ea13 100644
--- a/src/surfaceFilmModels/surfaceFilmModel/surfaceFilmModel/surfaceFilmModel.H
+++ b/src/surfaceFilmModels/surfaceFilmModel/surfaceFilmModel/surfaceFilmModel.H
@@ -242,7 +242,7 @@ public:
virtual const volScalarField& Tw() const = 0;
//- Return the film specific heat capacity [J/kg/K]
- virtual const volScalarField& cp() const = 0;
+ virtual const volScalarField& Cp() const = 0;
//- Return the film thermal conductivity [W/m/K]
virtual const volScalarField& kappa() const = 0;
diff --git a/src/surfaceFilmModels/surfaceFilmModel/thermoSingleLayer/thermoSingleLayer.C b/src/surfaceFilmModels/surfaceFilmModel/thermoSingleLayer/thermoSingleLayer.C
index aa9194942e1368eae04f16b0cf97036c0f5a16d7..ec1391ec1841cae2abe2a5c2f32c08cfca60b5f1 100644
--- a/src/surfaceFilmModels/surfaceFilmModel/thermoSingleLayer/thermoSingleLayer.C
+++ b/src/surfaceFilmModels/surfaceFilmModel/thermoSingleLayer/thermoSingleLayer.C
@@ -74,7 +74,7 @@ void Foam::surfaceFilmModels::thermoSingleLayer::correctThermoFields()
rho_ == dimensionedScalar(coeffs_.lookup("rho0"));
mu_ == dimensionedScalar(coeffs_.lookup("mu0"));
sigma_ == dimensionedScalar(coeffs_.lookup("sigma0"));
- cp_ == dimensionedScalar(coeffs_.lookup("cp0"));
+ Cp_ == dimensionedScalar(coeffs_.lookup("Cp0"));
kappa_ == dimensionedScalar(coeffs_.lookup("kappa0"));
break;
@@ -89,14 +89,14 @@ void Foam::surfaceFilmModels::thermoSingleLayer::correctThermoFields()
rho_[cellI] = liq.rho(p, T);
mu_[cellI] = liq.mu(p, T);
sigma_[cellI] = liq.sigma(p, T);
- cp_[cellI] = liq.cp(p, T);
+ Cp_[cellI] = liq.Cp(p, T);
kappa_[cellI] = liq.K(p, T);
}
rho_.correctBoundaryConditions();
mu_.correctBoundaryConditions();
sigma_.correctBoundaryConditions();
- cp_.correctBoundaryConditions();
+ Cp_.correctBoundaryConditions();
kappa_.correctBoundaryConditions();
break;
@@ -188,8 +188,8 @@ Foam::tmp<Foam::fvScalarMatrix> Foam::surfaceFilmModels::thermoSingleLayer::q
return
(
- - fvm::Sp(htcs_->h()/cp_, hs) - htcs_->h()*(Tstd - TPrimary_)
- - fvm::Sp(htcw_->h()/cp_, hs) - htcw_->h()*(Tstd - Tw_)
+ - fvm::Sp(htcs_->h()/Cp_, hs) - htcs_->h()*(Tstd - TPrimary_)
+ - fvm::Sp(htcw_->h()/Cp_, hs) - htcw_->h()*(Tstd - Tw_)
);
}
@@ -236,18 +236,18 @@ Foam::surfaceFilmModels::thermoSingleLayer::thermoSingleLayer
kinematicSingleLayer(modelType, mesh, g),
thermo_(mesh.lookupObject<SLGThermo>("SLGThermo")),
liquidId_(thermo_.liquidId(coeffs_.lookup("liquid"))),
- cp_
+ Cp_
(
IOobject
(
- "cp",
+ "Cp",
time_.timeName(),
filmRegion_,
IOobject::NO_READ,
IOobject::AUTO_WRITE
),
filmRegion_,
- dimensionedScalar("cp", dimEnergy/dimMass/dimTemperature, 0.0),
+ dimensionedScalar("Cp", dimEnergy/dimMass/dimTemperature, 0.0),
zeroGradientFvPatchScalarField::typeName
),
kappa_
@@ -526,9 +526,9 @@ void Foam::surfaceFilmModels::thermoSingleLayer::evolveFilm()
const Foam::volScalarField&
-Foam::surfaceFilmModels::thermoSingleLayer::cp() const
+Foam::surfaceFilmModels::thermoSingleLayer::Cp() const
{
- return cp_;
+ return Cp_;
}
diff --git a/src/surfaceFilmModels/surfaceFilmModel/thermoSingleLayer/thermoSingleLayer.H b/src/surfaceFilmModels/surfaceFilmModel/thermoSingleLayer/thermoSingleLayer.H
index 2cdf71f2e47772b7a0a33402e106ec28ffbfcfce..5ee8d0de521c8e528e578f77449d64c0c7c79d5d 100644
--- a/src/surfaceFilmModels/surfaceFilmModel/thermoSingleLayer/thermoSingleLayer.H
+++ b/src/surfaceFilmModels/surfaceFilmModel/thermoSingleLayer/thermoSingleLayer.H
@@ -27,7 +27,7 @@ Class
Description
Thermodynamic form of single-cell layer surface film model
- Note: defining enthalpy as cp(T - Tstd) - when using liquids from the
+ Note: defining enthalpy as Cp(T - Tstd) - when using liquids from the
thermophysical library, their enthalpies are calculated similarly, where
Tstd = 298.15 K
@@ -90,7 +90,7 @@ protected:
// Fields
//- Specific heat capacity / [J/kg/K]
- volScalarField cp_;
+ volScalarField Cp_;
//- Thermal conductivity / [W/m/K]
volScalarField kappa_;
@@ -218,7 +218,7 @@ public:
// Fields
//- Return the film specific heat capacity [J/kg/K]
- virtual const volScalarField& cp() const;
+ virtual const volScalarField& Cp() const;
//- Return the film thermal conductivity [W/m/K]
virtual const volScalarField& kappa() const;
diff --git a/src/surfaceFilmModels/surfaceFilmModel/thermoSingleLayer/thermoSingleLayerI.H b/src/surfaceFilmModels/surfaceFilmModel/thermoSingleLayer/thermoSingleLayerI.H
index f98802a51ac2988000964c9944b5e3686a983bb7..3d0138ad622f7d027f9ff1cfcd263ca4ea10e66b 100644
--- a/src/surfaceFilmModels/surfaceFilmModel/thermoSingleLayer/thermoSingleLayerI.H
+++ b/src/surfaceFilmModels/surfaceFilmModel/thermoSingleLayer/thermoSingleLayerI.H
@@ -61,7 +61,7 @@ Foam::surfaceFilmModels::thermoSingleLayer::hs
IOobject::NO_READ,
IOobject::NO_WRITE
),
- cp_*(T - Tstd),
+ Cp_*(T - Tstd),
zeroGradientFvPatchScalarField::typeName
)
);
@@ -88,7 +88,7 @@ Foam::surfaceFilmModels::thermoSingleLayer::T
IOobject::NO_READ,
IOobject::NO_WRITE
),
- hs/cp_ + Tstd,
+ hs/Cp_ + Tstd,
zeroGradientFvPatchScalarField::typeName
)
);
diff --git a/src/thermophysicalModels/liquidMixture/liquidMixture/liquidMixture.C b/src/thermophysicalModels/liquidMixture/liquidMixture/liquidMixture.C
index 8c958caa4f82cc0b6fbb82d077a2cee34b38ae29..6db944c0287714d5993bdfb4ff5f88a21a83bdc3 100644
--- a/src/thermophysicalModels/liquidMixture/liquidMixture/liquidMixture.C
+++ b/src/thermophysicalModels/liquidMixture/liquidMixture/liquidMixture.C
@@ -256,25 +256,25 @@ Foam::scalar Foam::liquidMixture::hl
}
-Foam::scalar Foam::liquidMixture::cp
+Foam::scalar Foam::liquidMixture::Cp
(
const scalar p,
const scalar T,
const scalarField& x
) const
{
- scalar cp = 0.0;
+ scalar Cp = 0.0;
forAll(properties_, i)
{
if (x[i] > SMALL)
{
scalar Ti = min(TrMax*properties_[i].Tc(), T);
- cp += x[i]*properties_[i].cp(p, Ti)*properties_[i].W();
+ Cp += x[i]*properties_[i].Cp(p, Ti)*properties_[i].W();
}
}
- return cp/W(x);
+ return Cp/W(x);
}
diff --git a/src/thermophysicalModels/liquidMixture/liquidMixture/liquidMixture.H b/src/thermophysicalModels/liquidMixture/liquidMixture/liquidMixture.H
index 88102564759a053bf1c4421141dc93631ab64397..2ecde01b7b884f0144b1abc14dfe215eb60b901c 100644
--- a/src/thermophysicalModels/liquidMixture/liquidMixture/liquidMixture.H
+++ b/src/thermophysicalModels/liquidMixture/liquidMixture/liquidMixture.H
@@ -207,7 +207,7 @@ public:
) const;
//- Calculate the mixture heat capacity [J/(kg K)]
- scalar cp
+ scalar Cp
(
const scalar p,
const scalar T,
diff --git a/src/thermophysicalModels/liquids/Ar/Ar.C b/src/thermophysicalModels/liquids/Ar/Ar.C
index 456872eeaa98cdd4131bc41a0fe4628dbf3c27da..cb7835691049b206117b3c5f564ecf79751403e3 100644
--- a/src/thermophysicalModels/liquids/Ar/Ar.C
+++ b/src/thermophysicalModels/liquids/Ar/Ar.C
@@ -57,7 +57,7 @@ Foam::Ar::Ar()
rho_(151.922244, 0.286, 150.86, 0.2984),
pv_(39.233, -1051.7, -3.5895, 5.0444e-05, 2),
hl_(150.86, 218509.061780314, 0.352, 0.0, 0.0, 0.0),
- cp_(4562.43116050866, -70.7770101131471, 0.367477721037349, 0.0, 0.0, 0.0),
+ Cp_(4562.43116050866, -70.7770101131471, 0.367477721037349, 0.0, 0.0, 0.0),
h_
(
-1460974.49982473,
@@ -67,7 +67,7 @@ Foam::Ar::Ar()
0.0,
0.0
),
- cpg_(520.326424351657, 0.0, 0.0, 0.0, 0.0, 0.0),
+ Cpg_(520.326424351657, 0.0, 0.0, 0.0, 0.0, 0.0),
B_
(
0.000952488234705117,
@@ -107,9 +107,9 @@ Foam::Ar::Ar
rho_(density),
pv_(vapourPressure),
hl_(heatOfVapourisation),
- cp_(heatCapacity),
+ Cp_(heatCapacity),
h_(enthalpy),
- cpg_(idealGasHeatCapacity),
+ Cpg_(idealGasHeatCapacity),
B_(secondVirialCoeff),
mu_(dynamicViscosity),
mug_(vapourDynamicViscosity),
@@ -126,9 +126,9 @@ Foam::Ar::Ar(Istream& is)
rho_(is),
pv_(is),
hl_(is),
- cp_(is),
+ Cp_(is),
h_(is),
- cpg_(is),
+ Cpg_(is),
B_(is),
mu_(is),
mug_(is),
@@ -145,9 +145,9 @@ Foam::Ar::Ar(const dictionary& dict)
rho_(dict.subDict("rho")),
pv_(dict.subDict("pv")),
hl_(dict.subDict("hl")),
- cp_(dict.subDict("cp")),
+ Cp_(dict.subDict("Cp")),
h_(dict.subDict("h")),
- cpg_(dict.subDict("cpg")),
+ Cpg_(dict.subDict("Cpg")),
B_(dict.subDict("B")),
mu_(dict.subDict("mu")),
mug_(dict.subDict("mug")),
diff --git a/src/thermophysicalModels/liquids/Ar/Ar.H b/src/thermophysicalModels/liquids/Ar/Ar.H
index 7c090098412303aab7435eceb3e528c6d00ddf2c..560b99a583e9a5b4c74161a9e7ca1496bdf4332e 100644
--- a/src/thermophysicalModels/liquids/Ar/Ar.H
+++ b/src/thermophysicalModels/liquids/Ar/Ar.H
@@ -65,9 +65,9 @@ class Ar
NSRDSfunc5 rho_;
NSRDSfunc1 pv_;
NSRDSfunc6 hl_;
- NSRDSfunc0 cp_;
+ NSRDSfunc0 Cp_;
NSRDSfunc0 h_;
- NSRDSfunc0 cpg_;
+ NSRDSfunc0 Cpg_;
NSRDSfunc4 B_;
NSRDSfunc1 mu_;
NSRDSfunc2 mug_;
@@ -126,13 +126,13 @@ public:
inline scalar hl(scalar p, scalar T) const;
//- Liquid heat capacity [J/(kg K)]
- inline scalar cp(scalar p, scalar T) const;
+ inline scalar Cp(scalar p, scalar T) const;
//- Liquid Enthalpy [J/(kg)]
inline scalar h(scalar p, scalar T) const;
//- Ideal gas heat capacity [J/(kg K)]
- inline scalar cpg(scalar p, scalar T) const;
+ inline scalar Cpg(scalar p, scalar T) const;
//- Second Virial Coefficient [m^3/kg]
inline scalar B(scalar p, scalar T) const;
@@ -168,8 +168,8 @@ public:
rho_.writeData(os); os << nl;
pv_.writeData(os); os << nl;
hl_.writeData(os); os << nl;
- cp_.writeData(os); os << nl;
- cpg_.writeData(os); os << nl;
+ Cp_.writeData(os); os << nl;
+ Cpg_.writeData(os); os << nl;
B_.writeData(os); os << nl;
mu_.writeData(os); os << nl;
mug_.writeData(os); os << nl;
diff --git a/src/thermophysicalModels/liquids/Ar/ArI.H b/src/thermophysicalModels/liquids/Ar/ArI.H
index 358c1195ffdc784e3e5d4d7bfeaa4b03d5eb2d45..734d9c5c888134857c106d3a69ad7990d677a345 100644
--- a/src/thermophysicalModels/liquids/Ar/ArI.H
+++ b/src/thermophysicalModels/liquids/Ar/ArI.H
@@ -41,9 +41,9 @@ inline Foam::scalar Foam::Ar::hl(scalar p, scalar T) const
}
-inline Foam::scalar Foam::Ar::cp(scalar p, scalar T) const
+inline Foam::scalar Foam::Ar::Cp(scalar p, scalar T) const
{
- return cp_.f(p, T);
+ return Cp_.f(p, T);
}
@@ -53,9 +53,9 @@ inline Foam::scalar Foam::Ar::h(scalar p, scalar T) const
}
-inline Foam::scalar Foam::Ar::cpg(scalar p, scalar T) const
+inline Foam::scalar Foam::Ar::Cpg(scalar p, scalar T) const
{
- return cpg_.f(p, T);
+ return Cpg_.f(p, T);
}
diff --git a/src/thermophysicalModels/liquids/C10H22/C10H22.C b/src/thermophysicalModels/liquids/C10H22/C10H22.C
index 8c1e70e38853e85445c7b0bdac60623f56746c71..c27466912659ccf960b40ec9c84ca789b456dfd2 100644
--- a/src/thermophysicalModels/liquids/C10H22/C10H22.C
+++ b/src/thermophysicalModels/liquids/C10H22/C10H22.C
@@ -57,7 +57,7 @@ Foam::C10H22::C10H22()
rho_(60.94208835, 0.25745, 617.7, 0.28912),
pv_(112.73, -9749.6, -13.245, 7.1266e-06, 2.0),
hl_(617.70, 464743.296904101, 0.39797, 0.0, 0.0, 0.0),
- cp_
+ Cp_
(
1958.18252099659,
-1.39094071757388,
@@ -75,7 +75,7 @@ Foam::C10H22::C10H22()
0.0,
0.0
),
- cpg_(1175.10630073444, 3762.16748076045, 1614.1, 2658.04547211582, 742),
+ Cpg_(1175.10630073444, 3762.16748076045, 1614.1, 2658.04547211582, 742),
B_
(
0.00337351091119935,
@@ -115,9 +115,9 @@ Foam::C10H22::C10H22
rho_(density),
pv_(vapourPressure),
hl_(heatOfVapourisation),
- cp_(heatCapacity),
+ Cp_(heatCapacity),
h_(enthalpy),
- cpg_(idealGasHeatCapacity),
+ Cpg_(idealGasHeatCapacity),
B_(secondVirialCoeff),
mu_(dynamicViscosity),
mug_(vapourDynamicViscosity),
@@ -134,9 +134,9 @@ Foam::C10H22::C10H22(Istream& is)
rho_(is),
pv_(is),
hl_(is),
- cp_(is),
+ Cp_(is),
h_(is),
- cpg_(is),
+ Cpg_(is),
B_(is),
mu_(is),
mug_(is),
@@ -153,9 +153,9 @@ Foam::C10H22::C10H22(const dictionary& dict)
rho_(dict.subDict("rho")),
pv_(dict.subDict("pv")),
hl_(dict.subDict("hl")),
- cp_(dict.subDict("cp")),
+ Cp_(dict.subDict("Cp")),
h_(dict.subDict("h")),
- cpg_(dict.subDict("cpg")),
+ Cpg_(dict.subDict("Cpg")),
B_(dict.subDict("B")),
mu_(dict.subDict("mu")),
mug_(dict.subDict("mug")),
diff --git a/src/thermophysicalModels/liquids/C10H22/C10H22.H b/src/thermophysicalModels/liquids/C10H22/C10H22.H
index 0e6881d58c6eda9e1383619ea916cbf02449eff1..9fc03f06407d423bd50be4b469608b24e6f860f0 100644
--- a/src/thermophysicalModels/liquids/C10H22/C10H22.H
+++ b/src/thermophysicalModels/liquids/C10H22/C10H22.H
@@ -65,9 +65,9 @@ class C10H22
NSRDSfunc5 rho_;
NSRDSfunc1 pv_;
NSRDSfunc6 hl_;
- NSRDSfunc0 cp_;
+ NSRDSfunc0 Cp_;
NSRDSfunc0 h_;
- NSRDSfunc7 cpg_;
+ NSRDSfunc7 Cpg_;
NSRDSfunc4 B_;
NSRDSfunc1 mu_;
NSRDSfunc2 mug_;
@@ -126,13 +126,13 @@ public:
inline scalar hl(scalar p, scalar T) const;
//- Liquid heat capacity [J/(kg K)]
- inline scalar cp(scalar p, scalar T) const;
+ inline scalar Cp(scalar p, scalar T) const;
//- Liquid Enthalpy [J/(kg)]
inline scalar h(scalar p, scalar T) const;
//- Ideal gas heat capacity [J/(kg K)]
- inline scalar cpg(scalar p, scalar T) const;
+ inline scalar Cpg(scalar p, scalar T) const;
//- Second Virial Coefficient [m^3/kg]
inline scalar B(scalar p, scalar T) const;
@@ -168,8 +168,8 @@ public:
rho_.writeData(os); os << nl;
pv_.writeData(os); os << nl;
hl_.writeData(os); os << nl;
- cp_.writeData(os); os << nl;
- cpg_.writeData(os); os << nl;
+ Cp_.writeData(os); os << nl;
+ Cpg_.writeData(os); os << nl;
B_.writeData(os); os << nl;
mu_.writeData(os); os << nl;
mug_.writeData(os); os << nl;
diff --git a/src/thermophysicalModels/liquids/C10H22/C10H22I.H b/src/thermophysicalModels/liquids/C10H22/C10H22I.H
index 8a22471a7fc2f070993206fbaea4a5c134c1e770..47706cc0c8f0ebf6afdc612bfe8f0ab638b4f12f 100644
--- a/src/thermophysicalModels/liquids/C10H22/C10H22I.H
+++ b/src/thermophysicalModels/liquids/C10H22/C10H22I.H
@@ -41,9 +41,9 @@ inline Foam::scalar Foam::C10H22::hl(scalar p, scalar T) const
}
-inline Foam::scalar Foam::C10H22::cp(scalar p, scalar T) const
+inline Foam::scalar Foam::C10H22::Cp(scalar p, scalar T) const
{
- return cp_.f(p, T);
+ return Cp_.f(p, T);
}
@@ -53,9 +53,9 @@ inline Foam::scalar Foam::C10H22::h(scalar p, scalar T) const
}
-inline Foam::scalar Foam::C10H22::cpg(scalar p, scalar T) const
+inline Foam::scalar Foam::C10H22::Cpg(scalar p, scalar T) const
{
- return cpg_.f(p, T);
+ return Cpg_.f(p, T);
}
diff --git a/src/thermophysicalModels/liquids/C12H26/C12H26.C b/src/thermophysicalModels/liquids/C12H26/C12H26.C
index 52efdd1ed263cf44098bef3fdcf10c910e2b377e..f384008d6915939936c50af22252be2401fbf251 100644
--- a/src/thermophysicalModels/liquids/C12H26/C12H26.C
+++ b/src/thermophysicalModels/liquids/C12H26/C12H26.C
@@ -57,7 +57,7 @@ Foam::C12H26::C12H26()
rho_(60.53982858, 0.25511, 658.0, 0.29368),
pv_(137.47, -11976.0, -16.698, 8.0906e-06, 2.0),
hl_(658.0, 454020.829174935, 0.40681, 0.0, 0.0, 0.0),
- cp_(2983.53861146661, -8.0352006011577, 0.018207916025784, 0.0, 0.0, 0.0),
+ Cp_(2983.53861146661, -8.0352006011577, 0.018207916025784, 0.0, 0.0, 0.0),
h_
(
-2755166.83820769,
@@ -67,7 +67,7 @@ Foam::C12H26::C12H26()
0.0,
0.0
),
- cpg_(1250.16144371778, 3894.02247296552, 1715.5, 2650.67101879792, 777.5),
+ Cpg_(1250.16144371778, 3894.02247296552, 1715.5, 2650.67101879792, 777.5),
B_
(
0.00516619896910848,
@@ -107,9 +107,9 @@ Foam::C12H26::C12H26
rho_(density),
pv_(vapourPressure),
hl_(heatOfVapourisation),
- cp_(heatCapacity),
+ Cp_(heatCapacity),
h_(enthalpy),
- cpg_(idealGasHeatCapacity),
+ Cpg_(idealGasHeatCapacity),
B_(secondVirialCoeff),
mu_(dynamicViscosity),
mug_(vapourDynamicViscosity),
@@ -126,9 +126,9 @@ Foam::C12H26::C12H26(Istream& is)
rho_(is),
pv_(is),
hl_(is),
- cp_(is),
+ Cp_(is),
h_(is),
- cpg_(is),
+ Cpg_(is),
B_(is),
mu_(is),
mug_(is),
@@ -145,9 +145,9 @@ Foam::C12H26::C12H26(const dictionary& dict)
rho_(dict.subDict("rho")),
pv_(dict.subDict("pv")),
hl_(dict.subDict("hl")),
- cp_(dict.subDict("cp")),
+ Cp_(dict.subDict("Cp")),
h_(dict.subDict("h")),
- cpg_(dict.subDict("cpg")),
+ Cpg_(dict.subDict("Cpg")),
B_(dict.subDict("B")),
mu_(dict.subDict("mu")),
mug_(dict.subDict("mug")),
diff --git a/src/thermophysicalModels/liquids/C12H26/C12H26.H b/src/thermophysicalModels/liquids/C12H26/C12H26.H
index cd0070c79f099acaff41de15a1c3fdd00fe44209..bbdba13e792b29d1f95fa7f17b7a67bae66dbb25 100644
--- a/src/thermophysicalModels/liquids/C12H26/C12H26.H
+++ b/src/thermophysicalModels/liquids/C12H26/C12H26.H
@@ -65,9 +65,9 @@ class C12H26
NSRDSfunc5 rho_;
NSRDSfunc1 pv_;
NSRDSfunc6 hl_;
- NSRDSfunc0 cp_;
+ NSRDSfunc0 Cp_;
NSRDSfunc0 h_;
- NSRDSfunc7 cpg_;
+ NSRDSfunc7 Cpg_;
NSRDSfunc4 B_;
NSRDSfunc1 mu_;
NSRDSfunc2 mug_;
@@ -126,13 +126,13 @@ public:
inline scalar hl(scalar p, scalar T) const;
//- Liquid heat capacity [J/(kg K)]
- inline scalar cp(scalar p, scalar T) const;
+ inline scalar Cp(scalar p, scalar T) const;
//- Liquid Enthalpy [J/(kg)]
inline scalar h(scalar p, scalar T) const;
//- Ideal gas heat capacity [J/(kg K)]
- inline scalar cpg(scalar p, scalar T) const;
+ inline scalar Cpg(scalar p, scalar T) const;
//- Second Virial Coefficient [m^3/kg]
inline scalar B(scalar p, scalar T) const;
@@ -168,8 +168,8 @@ public:
rho_.writeData(os); os << nl;
pv_.writeData(os); os << nl;
hl_.writeData(os); os << nl;
- cp_.writeData(os); os << nl;
- cpg_.writeData(os); os << nl;
+ Cp_.writeData(os); os << nl;
+ Cpg_.writeData(os); os << nl;
B_.writeData(os); os << nl;
mu_.writeData(os); os << nl;
mug_.writeData(os); os << nl;
diff --git a/src/thermophysicalModels/liquids/C12H26/C12H26I.H b/src/thermophysicalModels/liquids/C12H26/C12H26I.H
index adf5fc6801f7abb86bef555060e7dd7ef4b35641..2d5b06218ef681552b18b0423f4971b6bcb9edf3 100644
--- a/src/thermophysicalModels/liquids/C12H26/C12H26I.H
+++ b/src/thermophysicalModels/liquids/C12H26/C12H26I.H
@@ -41,9 +41,9 @@ inline Foam::scalar Foam::C12H26::hl(scalar p, scalar T) const
}
-inline Foam::scalar Foam::C12H26::cp(scalar p, scalar T) const
+inline Foam::scalar Foam::C12H26::Cp(scalar p, scalar T) const
{
- return cp_.f(p, T);
+ return Cp_.f(p, T);
}
@@ -53,9 +53,9 @@ inline Foam::scalar Foam::C12H26::h(scalar p, scalar T) const
}
-inline Foam::scalar Foam::C12H26::cpg(scalar p, scalar T) const
+inline Foam::scalar Foam::C12H26::Cpg(scalar p, scalar T) const
{
- return cpg_.f(p, T);
+ return Cpg_.f(p, T);
}
diff --git a/src/thermophysicalModels/liquids/C13H28/C13H28.C b/src/thermophysicalModels/liquids/C13H28/C13H28.C
index f47acd37f373b67bda6bc42c15b56cdfd234124f..adb9e44911584721a996766f9610c27d68e7f13e 100644
--- a/src/thermophysicalModels/liquids/C13H28/C13H28.C
+++ b/src/thermophysicalModels/liquids/C13H28/C13H28.C
@@ -57,7 +57,7 @@ Foam::C13H28::C13H28()
rho_(59.513022, 0.2504, 675.8, 0.312),
pv_(118.27, -11432, -13.769, 5.9641e-06, 2.0),
hl_(675.80, 444227.48352453, 0.4162, 0.0, 0.0, 0.0),
- cp_
+ Cp_
(
4275.05220622135,
-16.6539202126217,
@@ -75,7 +75,7 @@ Foam::C13H28::C13H28()
0.0,
0.0
),
- cpg_(1136.87522035093, 3641.14663846175, -1443, 2277.00485450058, -683.0),
+ Cpg_(1136.87522035093, 3641.14663846175, -1443, 2277.00485450058, -683.0),
B_
(
0.00246321156401703,
@@ -115,9 +115,9 @@ Foam::C13H28::C13H28
rho_(density),
pv_(vapourPressure),
hl_(heatOfVapourisation),
- cp_(heatCapacity),
+ Cp_(heatCapacity),
h_(enthalpy),
- cpg_(idealGasHeatCapacity),
+ Cpg_(idealGasHeatCapacity),
B_(secondVirialCoeff),
mu_(dynamicViscosity),
mug_(vapourDynamicViscosity),
@@ -134,9 +134,9 @@ Foam::C13H28::C13H28(Istream& is)
rho_(is),
pv_(is),
hl_(is),
- cp_(is),
+ Cp_(is),
h_(is),
- cpg_(is),
+ Cpg_(is),
B_(is),
mu_(is),
mug_(is),
@@ -153,9 +153,9 @@ Foam::C13H28::C13H28(const dictionary& dict)
rho_(dict.subDict("rho")),
pv_(dict.subDict("pv")),
hl_(dict.subDict("hl")),
- cp_(dict.subDict("cp")),
+ Cp_(dict.subDict("Cp")),
h_(dict.subDict("h")),
- cpg_(dict.subDict("cpg")),
+ Cpg_(dict.subDict("Cpg")),
B_(dict.subDict("B")),
mu_(dict.subDict("mu")),
mug_(dict.subDict("mug")),
diff --git a/src/thermophysicalModels/liquids/C13H28/C13H28.H b/src/thermophysicalModels/liquids/C13H28/C13H28.H
index 7e481470a5ebc55168bb7aea98f54ae251ce4f54..3cd8dfcb798a89a2a8b3943e2a2587329b508d6e 100644
--- a/src/thermophysicalModels/liquids/C13H28/C13H28.H
+++ b/src/thermophysicalModels/liquids/C13H28/C13H28.H
@@ -65,9 +65,9 @@ class C13H28
NSRDSfunc5 rho_;
NSRDSfunc1 pv_;
NSRDSfunc6 hl_;
- NSRDSfunc0 cp_;
+ NSRDSfunc0 Cp_;
NSRDSfunc0 h_;
- NSRDSfunc7 cpg_;
+ NSRDSfunc7 Cpg_;
NSRDSfunc4 B_;
NSRDSfunc1 mu_;
NSRDSfunc2 mug_;
@@ -126,13 +126,13 @@ public:
inline scalar hl(scalar p, scalar T) const;
//- Liquid heat capacity [J/(kg K)]
- inline scalar cp(scalar p, scalar T) const;
+ inline scalar Cp(scalar p, scalar T) const;
//- Liquid Enthalpy [J/(kg)]
inline scalar h(scalar p, scalar T) const;
//- Ideal gas heat capacity [J/(kg K)]
- inline scalar cpg(scalar p, scalar T) const;
+ inline scalar Cpg(scalar p, scalar T) const;
//- Second Virial Coefficient [m^3/kg]
inline scalar B(scalar p, scalar T) const;
@@ -168,8 +168,8 @@ public:
rho_.writeData(os); os << nl;
pv_.writeData(os); os << nl;
hl_.writeData(os); os << nl;
- cp_.writeData(os); os << nl;
- cpg_.writeData(os); os << nl;
+ Cp_.writeData(os); os << nl;
+ Cpg_.writeData(os); os << nl;
B_.writeData(os); os << nl;
mu_.writeData(os); os << nl;
mug_.writeData(os); os << nl;
diff --git a/src/thermophysicalModels/liquids/C13H28/C13H28I.H b/src/thermophysicalModels/liquids/C13H28/C13H28I.H
index 243bf0d3a1036c844a4d81b683447816d570e543..e8e63ce77a1754daaed3df0336ffebf85f7739c7 100644
--- a/src/thermophysicalModels/liquids/C13H28/C13H28I.H
+++ b/src/thermophysicalModels/liquids/C13H28/C13H28I.H
@@ -41,9 +41,9 @@ inline Foam::scalar Foam::C13H28::hl(scalar p, scalar T) const
}
-inline Foam::scalar Foam::C13H28::cp(scalar p, scalar T) const
+inline Foam::scalar Foam::C13H28::Cp(scalar p, scalar T) const
{
- return cp_.f(p, T);
+ return Cp_.f(p, T);
}
@@ -53,9 +53,9 @@ inline Foam::scalar Foam::C13H28::h(scalar p, scalar T) const
}
-inline Foam::scalar Foam::C13H28::cpg(scalar p, scalar T) const
+inline Foam::scalar Foam::C13H28::Cpg(scalar p, scalar T) const
{
- return cpg_.f(p, T);
+ return Cpg_.f(p, T);
}
diff --git a/src/thermophysicalModels/liquids/C14H30/C14H30.C b/src/thermophysicalModels/liquids/C14H30/C14H30.C
index 9c7dfc16bf9477828f4487ad2cff28c281175cf2..0b2d2515c42843a8aecdc765419447a9af8e8341 100644
--- a/src/thermophysicalModels/liquids/C14H30/C14H30.C
+++ b/src/thermophysicalModels/liquids/C14H30/C14H30.C
@@ -57,7 +57,7 @@ Foam::C14H30::C14H30()
rho_(60.92023144, 0.2582, 692.4, 0.26628),
pv_(249.21, -16915, -35.195, 0.028451, 1.0),
hl_(692.40, 455764.345336506, 0.428, 0.0, 0.0, 0.0),
- cp_
+ Cp_
(
2565.72845679261,
-4.78114036856325,
@@ -75,7 +75,7 @@ Foam::C14H30::C14H30()
0.0,
0.0
),
- cpg_(1134.11831122223, 3629.17859591113, -1440.3, 2275.29335860317, -682),
+ Cpg_(1134.11831122223, 3629.17859591113, -1440.3, 2275.29335860317, -682),
B_
(
0.00247837614419936,
@@ -115,9 +115,9 @@ Foam::C14H30::C14H30
rho_(density),
pv_(vapourPressure),
hl_(heatOfVapourisation),
- cp_(heatCapacity),
+ Cp_(heatCapacity),
h_(enthalpy),
- cpg_(idealGasHeatCapacity),
+ Cpg_(idealGasHeatCapacity),
B_(secondVirialCoeff),
mu_(dynamicViscosity),
mug_(vapourDynamicViscosity),
@@ -134,9 +134,9 @@ Foam::C14H30::C14H30(Istream& is)
rho_(is),
pv_(is),
hl_(is),
- cp_(is),
+ Cp_(is),
h_(is),
- cpg_(is),
+ Cpg_(is),
B_(is),
mu_(is),
mug_(is),
@@ -153,9 +153,9 @@ Foam::C14H30::C14H30(const dictionary& dict)
rho_(dict.subDict("rho")),
pv_(dict.subDict("pv")),
hl_(dict.subDict("hl")),
- cp_(dict.subDict("cp")),
+ Cp_(dict.subDict("Cp")),
h_(dict.subDict("h")),
- cpg_(dict.subDict("cpg")),
+ Cpg_(dict.subDict("Cpg")),
B_(dict.subDict("B")),
mu_(dict.subDict("mu")),
mug_(dict.subDict("mug")),
diff --git a/src/thermophysicalModels/liquids/C14H30/C14H30.H b/src/thermophysicalModels/liquids/C14H30/C14H30.H
index c7095f77e666eebadb9d39d20603978b53418626..b96d4daf7df7776666089b2553d81169343b1471 100644
--- a/src/thermophysicalModels/liquids/C14H30/C14H30.H
+++ b/src/thermophysicalModels/liquids/C14H30/C14H30.H
@@ -65,9 +65,9 @@ class C14H30
NSRDSfunc5 rho_;
NSRDSfunc1 pv_;
NSRDSfunc6 hl_;
- NSRDSfunc0 cp_;
+ NSRDSfunc0 Cp_;
NSRDSfunc0 h_;
- NSRDSfunc7 cpg_;
+ NSRDSfunc7 Cpg_;
NSRDSfunc4 B_;
NSRDSfunc1 mu_;
NSRDSfunc2 mug_;
@@ -126,13 +126,13 @@ public:
inline scalar hl(scalar p, scalar T) const;
//- Liquid heat capacity [J/(kg K)]
- inline scalar cp(scalar p, scalar T) const;
+ inline scalar Cp(scalar p, scalar T) const;
//- Liquid Enthalpy [J/(kg)]
inline scalar h(scalar p, scalar T) const;
//- Ideal gas heat capacity [J/(kg K)]
- inline scalar cpg(scalar p, scalar T) const;
+ inline scalar Cpg(scalar p, scalar T) const;
//- Second Virial Coefficient [m^3/kg]
inline scalar B(scalar p, scalar T) const;
@@ -168,8 +168,8 @@ public:
rho_.writeData(os); os << nl;
pv_.writeData(os); os << nl;
hl_.writeData(os); os << nl;
- cp_.writeData(os); os << nl;
- cpg_.writeData(os); os << nl;
+ Cp_.writeData(os); os << nl;
+ Cpg_.writeData(os); os << nl;
B_.writeData(os); os << nl;
mu_.writeData(os); os << nl;
mug_.writeData(os); os << nl;
diff --git a/src/thermophysicalModels/liquids/C14H30/C14H30I.H b/src/thermophysicalModels/liquids/C14H30/C14H30I.H
index 3677e3c41d25735fbdb28d6d87528aac38046879..a390ce4a0016ccb7d5ae1300855050bcfe3b3cae 100644
--- a/src/thermophysicalModels/liquids/C14H30/C14H30I.H
+++ b/src/thermophysicalModels/liquids/C14H30/C14H30I.H
@@ -41,9 +41,9 @@ inline Foam::scalar Foam::C14H30::hl(scalar p, scalar T) const
}
-inline Foam::scalar Foam::C14H30::cp(scalar p, scalar T) const
+inline Foam::scalar Foam::C14H30::Cp(scalar p, scalar T) const
{
- return cp_.f(p, T);
+ return Cp_.f(p, T);
}
@@ -53,9 +53,9 @@ inline Foam::scalar Foam::C14H30::h(scalar p, scalar T) const
}
-inline Foam::scalar Foam::C14H30::cpg(scalar p, scalar T) const
+inline Foam::scalar Foam::C14H30::Cpg(scalar p, scalar T) const
{
- return cpg_.f(p, T);
+ return Cpg_.f(p, T);
}
diff --git a/src/thermophysicalModels/liquids/C16H34/C16H34.C b/src/thermophysicalModels/liquids/C16H34/C16H34.C
index 98f18bff4d27b058e9bf615c46509a1d8acd0a55..3f7089378e0cea82520ed43255d313ddb64e2e03 100644
--- a/src/thermophysicalModels/liquids/C16H34/C16H34.C
+++ b/src/thermophysicalModels/liquids/C16H34/C16H34.C
@@ -57,7 +57,7 @@ Foam::C16H34::C16H34()
rho_(61.94656776, 0.25442, 720.6, 0.3238),
pv_(233.1, -17346, -32.251, 0.02407, 1.0),
hl_(720.60, 430654.548987397, 0.4122, 0.0, 0.0, 0.0),
- cp_
+ Cp_
(
3769.90540791182,
-12.5871068599136,
@@ -75,7 +75,7 @@ Foam::C16H34::C16H34()
0.0,
0.0
),
- cpg_(1128.74592618108, 3600.8584828171, -1429.7, 2259.69988429913, 679.0),
+ Cpg_(1128.74592618108, 3600.8584828171, -1429.7, 2259.69988429913, 679.0),
B_
(
0.0025091191718997,
@@ -115,9 +115,9 @@ Foam::C16H34::C16H34
rho_(density),
pv_(vapourPressure),
hl_(heatOfVapourisation),
- cp_(heatCapacity),
+ Cp_(heatCapacity),
h_(enthalpy),
- cpg_(idealGasHeatCapacity),
+ Cpg_(idealGasHeatCapacity),
B_(secondVirialCoeff),
mu_(dynamicViscosity),
mug_(vapourDynamicViscosity),
@@ -134,9 +134,9 @@ Foam::C16H34::C16H34(Istream& is)
rho_(is),
pv_(is),
hl_(is),
- cp_(is),
+ Cp_(is),
h_(is),
- cpg_(is),
+ Cpg_(is),
B_(is),
mu_(is),
mug_(is),
@@ -153,9 +153,9 @@ Foam::C16H34::C16H34(const dictionary& dict)
rho_(dict.subDict("rho")),
pv_(dict.subDict("pv")),
hl_(dict.subDict("hl")),
- cp_(dict.subDict("cp")),
+ Cp_(dict.subDict("Cp")),
h_(dict.subDict("h")),
- cpg_(dict.subDict("cpg")),
+ Cpg_(dict.subDict("Cpg")),
B_(dict.subDict("B")),
mu_(dict.subDict("mu")),
mug_(dict.subDict("mug")),
diff --git a/src/thermophysicalModels/liquids/C16H34/C16H34.H b/src/thermophysicalModels/liquids/C16H34/C16H34.H
index 1b70c2e7a9d2fd3f7103383553dbc519d27b7a97..4654a0eef3e329a39102a417798467da64dd956b 100644
--- a/src/thermophysicalModels/liquids/C16H34/C16H34.H
+++ b/src/thermophysicalModels/liquids/C16H34/C16H34.H
@@ -65,9 +65,9 @@ class C16H34
NSRDSfunc5 rho_;
NSRDSfunc1 pv_;
NSRDSfunc6 hl_;
- NSRDSfunc0 cp_;
+ NSRDSfunc0 Cp_;
NSRDSfunc0 h_;
- NSRDSfunc7 cpg_;
+ NSRDSfunc7 Cpg_;
NSRDSfunc4 B_;
NSRDSfunc1 mu_;
NSRDSfunc2 mug_;
@@ -126,13 +126,13 @@ public:
inline scalar hl(scalar p, scalar T) const;
//- Liquid heat capacity [J/(kg K)]
- inline scalar cp(scalar p, scalar T) const;
+ inline scalar Cp(scalar p, scalar T) const;
//- Liquid Enthalpy [J/(kg)]
inline scalar h(scalar p, scalar T) const;
//- Ideal gas heat capacity [J/(kg K)]
- inline scalar cpg(scalar p, scalar T) const;
+ inline scalar Cpg(scalar p, scalar T) const;
//- Second Virial Coefficient [m^3/kg]
inline scalar B(scalar p, scalar T) const;
@@ -168,8 +168,8 @@ public:
rho_.writeData(os); os << nl;
pv_.writeData(os); os << nl;
hl_.writeData(os); os << nl;
- cp_.writeData(os); os << nl;
- cpg_.writeData(os); os << nl;
+ Cp_.writeData(os); os << nl;
+ Cpg_.writeData(os); os << nl;
B_.writeData(os); os << nl;
mu_.writeData(os); os << nl;
mug_.writeData(os); os << nl;
diff --git a/src/thermophysicalModels/liquids/C16H34/C16H34I.H b/src/thermophysicalModels/liquids/C16H34/C16H34I.H
index 48f9df84216e848a8d22ec0cb6eb9b2a88ede9e6..5f23d611deee2672b4533bd453338c6f2551f649 100644
--- a/src/thermophysicalModels/liquids/C16H34/C16H34I.H
+++ b/src/thermophysicalModels/liquids/C16H34/C16H34I.H
@@ -41,9 +41,9 @@ inline Foam::scalar Foam::C16H34::hl(scalar p, scalar T) const
}
-inline Foam::scalar Foam::C16H34::cp(scalar p, scalar T) const
+inline Foam::scalar Foam::C16H34::Cp(scalar p, scalar T) const
{
- return cp_.f(p, T);
+ return Cp_.f(p, T);
}
@@ -53,9 +53,9 @@ inline Foam::scalar Foam::C16H34::h(scalar p, scalar T) const
}
-inline Foam::scalar Foam::C16H34::cpg(scalar p, scalar T) const
+inline Foam::scalar Foam::C16H34::Cpg(scalar p, scalar T) const
{
- return cpg_.f(p, T);
+ return Cpg_.f(p, T);
}
diff --git a/src/thermophysicalModels/liquids/C2H5OH/C2H5OH.C b/src/thermophysicalModels/liquids/C2H5OH/C2H5OH.C
index afe17a2c76391ed6cb7d1b880601f1cd8e9fc191..1f7c2beab626beeda3727cb210b9d248a9b17932 100644
--- a/src/thermophysicalModels/liquids/C2H5OH/C2H5OH.C
+++ b/src/thermophysicalModels/liquids/C2H5OH/C2H5OH.C
@@ -57,7 +57,7 @@ Foam::C2H5OH::C2H5OH()
rho_(70.1308387, 0.26395, 516.25, 0.2367),
pv_(59.796, -6595, -5.0474, 6.3e-07, 2),
hl_(516.25, 958345.091059064, -0.4134, 0.75362, 0.0, 0.0),
- cp_
+ Cp_
(
2052.57331394213,
-1.21990926653498,
@@ -75,7 +75,7 @@ Foam::C2H5OH::C2H5OH()
1.30130890620591e-05,
0.0
),
- cpg_(909.505307256507, 3358.00646855803, 1530, 2029.56434912848, 640),
+ Cpg_(909.505307256507, 3358.00646855803, 1530, 2029.56434912848, 640),
B_
(
-0.00358158414552085,
@@ -115,9 +115,9 @@ Foam::C2H5OH::C2H5OH
rho_(density),
pv_(vapourPressure),
hl_(heatOfVapourisation),
- cp_(heatCapacity),
+ Cp_(heatCapacity),
h_(enthalpy),
- cpg_(idealGasHeatCapacity),
+ Cpg_(idealGasHeatCapacity),
B_(secondVirialCoeff),
mu_(dynamicViscosity),
mug_(vapourDynamicViscosity),
@@ -134,9 +134,9 @@ Foam::C2H5OH::C2H5OH(Istream& is)
rho_(is),
pv_(is),
hl_(is),
- cp_(is),
+ Cp_(is),
h_(is),
- cpg_(is),
+ Cpg_(is),
B_(is),
mu_(is),
mug_(is),
@@ -153,9 +153,9 @@ Foam::C2H5OH::C2H5OH(const dictionary& dict)
rho_(dict.subDict("rho")),
pv_(dict.subDict("pv")),
hl_(dict.subDict("hl")),
- cp_(dict.subDict("cp")),
+ Cp_(dict.subDict("Cp")),
h_(dict.subDict("h")),
- cpg_(dict.subDict("cpg")),
+ Cpg_(dict.subDict("Cpg")),
B_(dict.subDict("B")),
mu_(dict.subDict("mu")),
mug_(dict.subDict("mug")),
diff --git a/src/thermophysicalModels/liquids/C2H5OH/C2H5OH.H b/src/thermophysicalModels/liquids/C2H5OH/C2H5OH.H
index 5027e925ef10af93906f6b81576ab70464b330a4..57a692608d55ec1e5295674901a2489453db189c 100644
--- a/src/thermophysicalModels/liquids/C2H5OH/C2H5OH.H
+++ b/src/thermophysicalModels/liquids/C2H5OH/C2H5OH.H
@@ -65,9 +65,9 @@ class C2H5OH
NSRDSfunc5 rho_;
NSRDSfunc1 pv_;
NSRDSfunc6 hl_;
- NSRDSfunc0 cp_;
+ NSRDSfunc0 Cp_;
NSRDSfunc0 h_;
- NSRDSfunc7 cpg_;
+ NSRDSfunc7 Cpg_;
NSRDSfunc4 B_;
NSRDSfunc1 mu_;
NSRDSfunc2 mug_;
@@ -126,13 +126,13 @@ public:
inline scalar hl(scalar p, scalar T) const;
//- Liquid heat capacity [J/(kg K)]
- inline scalar cp(scalar p, scalar T) const;
+ inline scalar Cp(scalar p, scalar T) const;
//- Liquid Enthalpy [J/(kg)]
inline scalar h(scalar p, scalar T) const;
//- Ideal gas heat capacity [J/(kg K)]
- inline scalar cpg(scalar p, scalar T) const;
+ inline scalar Cpg(scalar p, scalar T) const;
//- Second Virial Coefficient [m^3/kg]
inline scalar B(scalar p, scalar T) const;
@@ -168,8 +168,8 @@ public:
rho_.writeData(os); os << nl;
pv_.writeData(os); os << nl;
hl_.writeData(os); os << nl;
- cp_.writeData(os); os << nl;
- cpg_.writeData(os); os << nl;
+ Cp_.writeData(os); os << nl;
+ Cpg_.writeData(os); os << nl;
B_.writeData(os); os << nl;
mu_.writeData(os); os << nl;
mug_.writeData(os); os << nl;
diff --git a/src/thermophysicalModels/liquids/C2H5OH/C2H5OHI.H b/src/thermophysicalModels/liquids/C2H5OH/C2H5OHI.H
index d578dbf6deb4a24d779cc81d65545912412e479e..880c05fb23328b00f130b04b4ce914fc941b49aa 100644
--- a/src/thermophysicalModels/liquids/C2H5OH/C2H5OHI.H
+++ b/src/thermophysicalModels/liquids/C2H5OH/C2H5OHI.H
@@ -41,9 +41,9 @@ inline Foam::scalar Foam::C2H5OH::hl(scalar p, scalar T) const
}
-inline Foam::scalar Foam::C2H5OH::cp(scalar p, scalar T) const
+inline Foam::scalar Foam::C2H5OH::Cp(scalar p, scalar T) const
{
- return cp_.f(p, T);
+ return Cp_.f(p, T);
}
@@ -53,9 +53,9 @@ inline Foam::scalar Foam::C2H5OH::h(scalar p, scalar T) const
}
-inline Foam::scalar Foam::C2H5OH::cpg(scalar p, scalar T) const
+inline Foam::scalar Foam::C2H5OH::Cpg(scalar p, scalar T) const
{
- return cpg_.f(p, T);
+ return Cpg_.f(p, T);
}
diff --git a/src/thermophysicalModels/liquids/C2H6/C2H6.C b/src/thermophysicalModels/liquids/C2H6/C2H6.C
index 871c75881e2cf518c8cd5fb85abda486e73ecdc9..57b63c89a8665c3626285f39c396c8654188b2d6 100644
--- a/src/thermophysicalModels/liquids/C2H6/C2H6.C
+++ b/src/thermophysicalModels/liquids/C2H6/C2H6.C
@@ -57,7 +57,7 @@ Foam::C2H6::C2H6()
rho_(57.499854, 0.27937, 305.32, 0.29187),
pv_(51.857, -2598.7, -5.1283, 1.4913e-05, 2.0),
hl_(305.32, 701396.740937812, 0.60646, -0.55492, 0.32799, 0.0),
- cp_
+ Cp_
(
305.32,
8.02554965861611,
@@ -66,7 +66,7 @@ Foam::C2H6::C2H6()
-343.93389207094
),
h_(0.0, 0.0, 0.0, 0.0, 0.0, 0.0),
- cpg_(1341.07083471899, 4463.58496840705, 1655.5, 2435.08480212837, 752.87),
+ Cpg_(1341.07083471899, 4463.58496840705, 1655.5, 2435.08480212837, 752.87),
B_
(
0.00269205187894912,
@@ -106,9 +106,9 @@ Foam::C2H6::C2H6
rho_(density),
pv_(vapourPressure),
hl_(heatOfVapourisation),
- cp_(heatCapacity),
+ Cp_(heatCapacity),
h_(enthalpy),
- cpg_(idealGasHeatCapacity),
+ Cpg_(idealGasHeatCapacity),
B_(secondVirialCoeff),
mu_(dynamicViscosity),
mug_(vapourDynamicViscosity),
@@ -125,9 +125,9 @@ Foam::C2H6::C2H6(Istream& is)
rho_(is),
pv_(is),
hl_(is),
- cp_(is),
+ Cp_(is),
h_(is),
- cpg_(is),
+ Cpg_(is),
B_(is),
mu_(is),
mug_(is),
@@ -144,9 +144,9 @@ Foam::C2H6::C2H6(const dictionary& dict)
rho_(dict.subDict("rho")),
pv_(dict.subDict("pv")),
hl_(dict.subDict("hl")),
- cp_(dict.subDict("cp")),
+ Cp_(dict.subDict("Cp")),
h_(dict.subDict("h")),
- cpg_(dict.subDict("cpg")),
+ Cpg_(dict.subDict("Cpg")),
B_(dict.subDict("B")),
mu_(dict.subDict("mu")),
mug_(dict.subDict("mug")),
diff --git a/src/thermophysicalModels/liquids/C2H6/C2H6.H b/src/thermophysicalModels/liquids/C2H6/C2H6.H
index 6be77e42c233bc163fc5bf04ca0e9c6dc075f19b..f3647fae40e5cdcf7d90977c46a65e6ecf3e1504 100644
--- a/src/thermophysicalModels/liquids/C2H6/C2H6.H
+++ b/src/thermophysicalModels/liquids/C2H6/C2H6.H
@@ -65,9 +65,9 @@ class C2H6
NSRDSfunc5 rho_;
NSRDSfunc1 pv_;
NSRDSfunc6 hl_;
- NSRDSfunc14 cp_;
+ NSRDSfunc14 Cp_;
NSRDSfunc0 h_;
- NSRDSfunc7 cpg_;
+ NSRDSfunc7 Cpg_;
NSRDSfunc4 B_;
NSRDSfunc1 mu_;
NSRDSfunc2 mug_;
@@ -126,13 +126,13 @@ public:
inline scalar hl(scalar p, scalar T) const;
//- Liquid heat capacity [J/(kg K)]
- inline scalar cp(scalar p, scalar T) const;
+ inline scalar Cp(scalar p, scalar T) const;
//- Liquid Enthalpy [J/(kg)]
inline scalar h(scalar p, scalar T) const;
//- Ideal gas heat capacity [J/(kg K)]
- inline scalar cpg(scalar p, scalar T) const;
+ inline scalar Cpg(scalar p, scalar T) const;
//- Second Virial Coefficient [m^3/kg]
inline scalar B(scalar p, scalar T) const;
@@ -168,8 +168,8 @@ public:
rho_.writeData(os); os << nl;
pv_.writeData(os); os << nl;
hl_.writeData(os); os << nl;
- cp_.writeData(os); os << nl;
- cpg_.writeData(os); os << nl;
+ Cp_.writeData(os); os << nl;
+ Cpg_.writeData(os); os << nl;
B_.writeData(os); os << nl;
mu_.writeData(os); os << nl;
mug_.writeData(os); os << nl;
diff --git a/src/thermophysicalModels/liquids/C2H6/C2H6I.H b/src/thermophysicalModels/liquids/C2H6/C2H6I.H
index b1f0cbe75f39acfda671ce80b821237d96373d67..23da581d0242eecfad776f2ffb6635877b6f745f 100644
--- a/src/thermophysicalModels/liquids/C2H6/C2H6I.H
+++ b/src/thermophysicalModels/liquids/C2H6/C2H6I.H
@@ -41,9 +41,9 @@ inline Foam::scalar Foam::C2H6::hl(scalar p, scalar T) const
}
-inline Foam::scalar Foam::C2H6::cp(scalar p, scalar T) const
+inline Foam::scalar Foam::C2H6::Cp(scalar p, scalar T) const
{
- return cp_.f(p, T);
+ return Cp_.f(p, T);
}
@@ -53,9 +53,9 @@ inline Foam::scalar Foam::C2H6::h(scalar p, scalar T) const
}
-inline Foam::scalar Foam::C2H6::cpg(scalar p, scalar T) const
+inline Foam::scalar Foam::C2H6::Cpg(scalar p, scalar T) const
{
- return cpg_.f(p, T);
+ return Cpg_.f(p, T);
}
diff --git a/src/thermophysicalModels/liquids/C2H6O/C2H6O.C b/src/thermophysicalModels/liquids/C2H6O/C2H6O.C
index 89fc93f75a2a3140b73c655eeb53c09b605fa34f..d3ea71a5281eb83c49bbb365d9bbe9a25ac9d461 100644
--- a/src/thermophysicalModels/liquids/C2H6O/C2H6O.C
+++ b/src/thermophysicalModels/liquids/C2H6O/C2H6O.C
@@ -57,7 +57,7 @@ Foam::C2H6O::C2H6O()
rho_(69.472052, 0.26325, 400.1, 0.2806),
pv_(51.566, -3664.4, -4.653, 5.9e-06, 2),
hl_(400.10, 608435.173326966, 0.2477, -0.089, 0.203, 0),
- cp_
+ Cp_
(
1491.24139877141,
11.3099915344375,
@@ -75,7 +75,7 @@ Foam::C2H6O::C2H6O()
3.41390088779874e-05,
0.0
),
- cpg_(950.747791356443, 3160.47667628991, 1284, 1291.5409494454, 520),
+ Cpg_(950.747791356443, 3160.47667628991, 1284, 1291.5409494454, 520),
B_
(
0.00235082159369641,
@@ -115,9 +115,9 @@ Foam::C2H6O::C2H6O
rho_(density),
pv_(vapourPressure),
hl_(heatOfVapourisation),
- cp_(heatCapacity),
+ Cp_(heatCapacity),
h_(enthalpy),
- cpg_(idealGasHeatCapacity),
+ Cpg_(idealGasHeatCapacity),
B_(secondVirialCoeff),
mu_(dynamicViscosity),
mug_(vapourDynamicViscosity),
@@ -134,9 +134,9 @@ Foam::C2H6O::C2H6O(Istream& is)
rho_(is),
pv_(is),
hl_(is),
- cp_(is),
+ Cp_(is),
h_(is),
- cpg_(is),
+ Cpg_(is),
B_(is),
mu_(is),
mug_(is),
@@ -153,9 +153,9 @@ Foam::C2H6O::C2H6O(const dictionary& dict)
rho_(dict.subDict("rho")),
pv_(dict.subDict("pv")),
hl_(dict.subDict("hl")),
- cp_(dict.subDict("cp")),
+ Cp_(dict.subDict("Cp")),
h_(dict.subDict("h")),
- cpg_(dict.subDict("cpg")),
+ Cpg_(dict.subDict("Cpg")),
B_(dict.subDict("B")),
mu_(dict.subDict("mu")),
mug_(dict.subDict("mug")),
diff --git a/src/thermophysicalModels/liquids/C2H6O/C2H6O.H b/src/thermophysicalModels/liquids/C2H6O/C2H6O.H
index a9a053b371428e167000ec362fbf4541e16677f1..d4faffa564a2f563def6a5825566911a6c0edda2 100644
--- a/src/thermophysicalModels/liquids/C2H6O/C2H6O.H
+++ b/src/thermophysicalModels/liquids/C2H6O/C2H6O.H
@@ -65,9 +65,9 @@ class C2H6O
NSRDSfunc5 rho_;
NSRDSfunc1 pv_;
NSRDSfunc6 hl_;
- NSRDSfunc0 cp_;
+ NSRDSfunc0 Cp_;
NSRDSfunc0 h_;
- NSRDSfunc7 cpg_;
+ NSRDSfunc7 Cpg_;
NSRDSfunc4 B_;
NSRDSfunc1 mu_;
NSRDSfunc2 mug_;
@@ -126,13 +126,13 @@ public:
inline scalar hl(scalar p, scalar T) const;
//- Liquid heat capacity [J/(kg K)]
- inline scalar cp(scalar p, scalar T) const;
+ inline scalar Cp(scalar p, scalar T) const;
//- Liquid Enthalpy [J/(kg)]
inline scalar h(scalar p, scalar T) const;
//- Ideal gas heat capacity [J/(kg K)]
- inline scalar cpg(scalar p, scalar T) const;
+ inline scalar Cpg(scalar p, scalar T) const;
//- Second Virial Coefficient [m^3/kg]
inline scalar B(scalar p, scalar T) const;
@@ -168,8 +168,8 @@ public:
rho_.writeData(os); os << nl;
pv_.writeData(os); os << nl;
hl_.writeData(os); os << nl;
- cp_.writeData(os); os << nl;
- cpg_.writeData(os); os << nl;
+ Cp_.writeData(os); os << nl;
+ Cpg_.writeData(os); os << nl;
B_.writeData(os); os << nl;
mu_.writeData(os); os << nl;
mug_.writeData(os); os << nl;
diff --git a/src/thermophysicalModels/liquids/C2H6O/C2H6OI.H b/src/thermophysicalModels/liquids/C2H6O/C2H6OI.H
index 6a73d4c5e25a87faaa94ac8b3786d695682cbe9f..4ffa57920dfbdb5b75f1a6bb0841beda7144c7f2 100644
--- a/src/thermophysicalModels/liquids/C2H6O/C2H6OI.H
+++ b/src/thermophysicalModels/liquids/C2H6O/C2H6OI.H
@@ -41,9 +41,9 @@ inline Foam::scalar Foam::C2H6O::hl(scalar p, scalar T) const
}
-inline Foam::scalar Foam::C2H6O::cp(scalar p, scalar T) const
+inline Foam::scalar Foam::C2H6O::Cp(scalar p, scalar T) const
{
- return cp_.f(p, T);
+ return Cp_.f(p, T);
}
@@ -53,9 +53,9 @@ inline Foam::scalar Foam::C2H6O::h(scalar p, scalar T) const
}
-inline Foam::scalar Foam::C2H6O::cpg(scalar p, scalar T) const
+inline Foam::scalar Foam::C2H6O::Cpg(scalar p, scalar T) const
{
- return cpg_.f(p, T);
+ return Cpg_.f(p, T);
}
diff --git a/src/thermophysicalModels/liquids/C3H6O/C3H6O.C b/src/thermophysicalModels/liquids/C3H6O/C3H6O.C
index fa20f6d0787deaba15c999cf248b02274fc57dc5..b72d1f43d8a741f3ac7d0940f7b1cf2922002773 100644
--- a/src/thermophysicalModels/liquids/C3H6O/C3H6O.C
+++ b/src/thermophysicalModels/liquids/C3H6O/C3H6O.C
@@ -57,7 +57,7 @@ Foam::C3H6O::C3H6O()
rho_(71.426784, 0.2576, 508.2, 0.29903),
pv_(70.72, -5.685, -7.351, 6.3e-06, 2.0),
hl_(508.20, 846590.909090909, 1.036, -1.294, 0.672, 0.0),
- cp_
+ Cp_
(
2334.71074380165,
-3.04752066115702,
@@ -75,7 +75,7 @@ Foam::C3H6O::C3H6O()
2.96573691460055e-06,
0.0
),
- cpg_(828.512396694215, 2830.57851239669, 1250.0, 1234.50413223141, -524.4),
+ Cpg_(828.512396694215, 2830.57851239669, 1250.0, 1234.50413223141, -524.4),
B_
(
0.00190599173553719,
@@ -115,9 +115,9 @@ Foam::C3H6O::C3H6O
rho_(density),
pv_(vapourPressure),
hl_(heatOfVapourisation),
- cp_(heatCapacity),
+ Cp_(heatCapacity),
h_(enthalpy),
- cpg_(idealGasHeatCapacity),
+ Cpg_(idealGasHeatCapacity),
B_(secondVirialCoeff),
mu_(dynamicViscosity),
mug_(vapourDynamicViscosity),
@@ -134,9 +134,9 @@ Foam::C3H6O::C3H6O(Istream& is)
rho_(is),
pv_(is),
hl_(is),
- cp_(is),
+ Cp_(is),
h_(is),
- cpg_(is),
+ Cpg_(is),
B_(is),
mu_(is),
mug_(is),
@@ -153,9 +153,9 @@ Foam::C3H6O::C3H6O(const dictionary& dict)
rho_(dict.subDict("rho")),
pv_(dict.subDict("pv")),
hl_(dict.subDict("hl")),
- cp_(dict.subDict("cp")),
+ Cp_(dict.subDict("Cp")),
h_(dict.subDict("h")),
- cpg_(dict.subDict("cpg")),
+ Cpg_(dict.subDict("Cpg")),
B_(dict.subDict("B")),
mu_(dict.subDict("mu")),
mug_(dict.subDict("mug")),
diff --git a/src/thermophysicalModels/liquids/C3H6O/C3H6O.H b/src/thermophysicalModels/liquids/C3H6O/C3H6O.H
index b383111750cf006edacf0832bc4d10dda7cbf7c9..664693ac74b4b2b335124a388e870e936a842569 100644
--- a/src/thermophysicalModels/liquids/C3H6O/C3H6O.H
+++ b/src/thermophysicalModels/liquids/C3H6O/C3H6O.H
@@ -65,9 +65,9 @@ class C3H6O
NSRDSfunc5 rho_;
NSRDSfunc1 pv_;
NSRDSfunc6 hl_;
- NSRDSfunc0 cp_;
+ NSRDSfunc0 Cp_;
NSRDSfunc0 h_;
- NSRDSfunc7 cpg_;
+ NSRDSfunc7 Cpg_;
NSRDSfunc4 B_;
NSRDSfunc1 mu_;
NSRDSfunc2 mug_;
@@ -126,13 +126,13 @@ public:
inline scalar hl(scalar p, scalar T) const;
//- Liquid heat capacity [J/(kg K)]
- inline scalar cp(scalar p, scalar T) const;
+ inline scalar Cp(scalar p, scalar T) const;
//- Liquid Enthalpy [J/(kg)]
inline scalar h(scalar p, scalar T) const;
//- Ideal gas heat capacity [J/(kg K)]
- inline scalar cpg(scalar p, scalar T) const;
+ inline scalar Cpg(scalar p, scalar T) const;
//- Second Virial Coefficient [m^3/kg]
inline scalar B(scalar p, scalar T) const;
@@ -168,8 +168,8 @@ public:
rho_.writeData(os); os << nl;
pv_.writeData(os); os << nl;
hl_.writeData(os); os << nl;
- cp_.writeData(os); os << nl;
- cpg_.writeData(os); os << nl;
+ Cp_.writeData(os); os << nl;
+ Cpg_.writeData(os); os << nl;
B_.writeData(os); os << nl;
mu_.writeData(os); os << nl;
mug_.writeData(os); os << nl;
diff --git a/src/thermophysicalModels/liquids/C3H6O/C3H6OI.H b/src/thermophysicalModels/liquids/C3H6O/C3H6OI.H
index 93d5b88664bd179a7c8dc4e8f3b10570642f47c4..4e7052b2b2940ad31a5347b74b870b1b3bf91604 100644
--- a/src/thermophysicalModels/liquids/C3H6O/C3H6OI.H
+++ b/src/thermophysicalModels/liquids/C3H6O/C3H6OI.H
@@ -40,9 +40,9 @@ inline Foam::scalar Foam::C3H6O::hl(scalar p, scalar T) const
}
-inline Foam::scalar Foam::C3H6O::cp(scalar p, scalar T) const
+inline Foam::scalar Foam::C3H6O::Cp(scalar p, scalar T) const
{
- return cp_.f(p, T);
+ return Cp_.f(p, T);
}
@@ -52,9 +52,9 @@ inline Foam::scalar Foam::C3H6O::h(scalar p, scalar T) const
}
-inline Foam::scalar Foam::C3H6O::cpg(scalar p, scalar T) const
+inline Foam::scalar Foam::C3H6O::Cpg(scalar p, scalar T) const
{
- return cpg_.f(p, T);
+ return Cpg_.f(p, T);
}
diff --git a/src/thermophysicalModels/liquids/C3H8/C3H8.C b/src/thermophysicalModels/liquids/C3H8/C3H8.C
index 767e83c834f2e66328c3dbcbaa77c832899fa5f6..79069ed5b6048ac04251846dc21ac90599e9772b 100644
--- a/src/thermophysicalModels/liquids/C3H8/C3H8.C
+++ b/src/thermophysicalModels/liquids/C3H8/C3H8.C
@@ -56,7 +56,7 @@ Foam::C3H8::C3H8()
rho_(60.6628672, 0.27453, 369.83, 0.29359),
pv_(59.078, -3492.6, -6.0669, 1.0919e-05, 2.0),
hl_(369.83, 662395.682148041, 0.78237, -0.77319, 0.39246, 0.0),
- cp_
+ Cp_
(
369.83,
9.48470319647089,
@@ -65,7 +65,7 @@ Foam::C3H8::C3H8()
-131.535634282099
),
h_(0.0, 0.0, 0.0, 0.0, 0.0, 0.0),
- cpg_(1177.43105950653, 4364.34143686502, 1626.5, 2648.76632801161, 723.6),
+ Cpg_(1177.43105950653, 4364.34143686502, 1626.5, 2648.76632801161, 723.6),
B_
(
0.00255578737300435,
@@ -105,9 +105,9 @@ Foam::C3H8::C3H8
rho_(density),
pv_(vapourPressure),
hl_(heatOfVapourisation),
- cp_(heatCapacity),
+ Cp_(heatCapacity),
h_(enthalpy),
- cpg_(idealGasHeatCapacity),
+ Cpg_(idealGasHeatCapacity),
B_(secondVirialCoeff),
mu_(dynamicViscosity),
mug_(vapourDynamicViscosity),
@@ -124,9 +124,9 @@ Foam::C3H8::C3H8(Istream& is)
rho_(is),
pv_(is),
hl_(is),
- cp_(is),
+ Cp_(is),
h_(is),
- cpg_(is),
+ Cpg_(is),
B_(is),
mu_(is),
mug_(is),
@@ -143,9 +143,9 @@ Foam::C3H8::C3H8(const dictionary& dict)
rho_(dict.subDict("rho")),
pv_(dict.subDict("pv")),
hl_(dict.subDict("hl")),
- cp_(dict.subDict("cp")),
+ Cp_(dict.subDict("Cp")),
h_(dict.subDict("h")),
- cpg_(dict.subDict("cpg")),
+ Cpg_(dict.subDict("Cpg")),
B_(dict.subDict("B")),
mu_(dict.subDict("mu")),
mug_(dict.subDict("mug")),
diff --git a/src/thermophysicalModels/liquids/C3H8/C3H8.H b/src/thermophysicalModels/liquids/C3H8/C3H8.H
index c9cea6693465715ee5e0d4b728ee3f620ff82f63..88de0f86d3f42492972930cc02511459248c6894 100644
--- a/src/thermophysicalModels/liquids/C3H8/C3H8.H
+++ b/src/thermophysicalModels/liquids/C3H8/C3H8.H
@@ -65,9 +65,9 @@ class C3H8
NSRDSfunc5 rho_;
NSRDSfunc1 pv_;
NSRDSfunc6 hl_;
- NSRDSfunc14 cp_;
+ NSRDSfunc14 Cp_;
NSRDSfunc0 h_;
- NSRDSfunc7 cpg_;
+ NSRDSfunc7 Cpg_;
NSRDSfunc4 B_;
NSRDSfunc1 mu_;
NSRDSfunc2 mug_;
@@ -126,13 +126,13 @@ public:
inline scalar hl(scalar p, scalar T) const;
//- Liquid heat capacity [J/(kg K)]
- inline scalar cp(scalar p, scalar T) const;
+ inline scalar Cp(scalar p, scalar T) const;
//- Liquid Enthalpy [J/(kg)]
inline scalar h(scalar p, scalar T) const;
//- Ideal gas heat capacity [J/(kg K)]
- inline scalar cpg(scalar p, scalar T) const;
+ inline scalar Cpg(scalar p, scalar T) const;
//- Second Virial Coefficient [m^3/kg]
inline scalar B(scalar p, scalar T) const;
@@ -168,8 +168,8 @@ public:
rho_.writeData(os); os << nl;
pv_.writeData(os); os << nl;
hl_.writeData(os); os << nl;
- cp_.writeData(os); os << nl;
- cpg_.writeData(os); os << nl;
+ Cp_.writeData(os); os << nl;
+ Cpg_.writeData(os); os << nl;
B_.writeData(os); os << nl;
mu_.writeData(os); os << nl;
mug_.writeData(os); os << nl;
diff --git a/src/thermophysicalModels/liquids/C3H8/C3H8I.H b/src/thermophysicalModels/liquids/C3H8/C3H8I.H
index b75b4c9e74bb4f123823ca56b1a25df9cbea20dd..90328adbb8691dd37942f0615e22f87dabcb1670 100644
--- a/src/thermophysicalModels/liquids/C3H8/C3H8I.H
+++ b/src/thermophysicalModels/liquids/C3H8/C3H8I.H
@@ -41,9 +41,9 @@ inline Foam::scalar Foam::C3H8::hl(scalar p, scalar T) const
}
-inline Foam::scalar Foam::C3H8::cp(scalar p, scalar T) const
+inline Foam::scalar Foam::C3H8::Cp(scalar p, scalar T) const
{
- return cp_.f(p, T);
+ return Cp_.f(p, T);
}
@@ -53,9 +53,9 @@ inline Foam::scalar Foam::C3H8::h(scalar p, scalar T) const
}
-inline Foam::scalar Foam::C3H8::cpg(scalar p, scalar T) const
+inline Foam::scalar Foam::C3H8::Cpg(scalar p, scalar T) const
{
- return cpg_.f(p, T);
+ return Cpg_.f(p, T);
}
diff --git a/src/thermophysicalModels/liquids/C4H10O/C4H10O.C b/src/thermophysicalModels/liquids/C4H10O/C4H10O.C
index 1dd51ea3f6b7117cf1b3e62590e4edb15a5c7d31..10483d5decb27c87a046ae32175cfa3f24b9ee1f 100644
--- a/src/thermophysicalModels/liquids/C4H10O/C4H10O.C
+++ b/src/thermophysicalModels/liquids/C4H10O/C4H10O.C
@@ -57,7 +57,7 @@ Foam::C4H10O::C4H10O()
rho_(75.2793188, 0.27608, 466.7, 0.29358),
pv_(101.03, -6311.5, -12.27, 1.377e-05, 2),
hl_(466.70, 566355.921913576, 0.40717, 0, 0, 0),
- cp_
+ Cp_
(
599.004357621791,
17.5519069654493,
@@ -75,7 +75,7 @@ Foam::C4H10O::C4H10O()
2.95556035238725e-05,
0.0
),
- cpg_(1163.06679438231, 3441.57683849817, 1541.3, 1938.66950878944, -688.9),
+ Cpg_(1163.06679438231, 3441.57683849817, 1541.3, 1938.66950878944, -688.9),
B_
(
0.00215992337061371,
@@ -115,9 +115,9 @@ Foam::C4H10O::C4H10O
rho_(density),
pv_(vapourPressure),
hl_(heatOfVapourisation),
- cp_(heatCapacity),
+ Cp_(heatCapacity),
h_(enthalpy),
- cpg_(idealGasHeatCapacity),
+ Cpg_(idealGasHeatCapacity),
B_(secondVirialCoeff),
mu_(dynamicViscosity),
mug_(vapourDynamicViscosity),
@@ -134,9 +134,9 @@ Foam::C4H10O::C4H10O(Istream& is)
rho_(is),
pv_(is),
hl_(is),
- cp_(is),
+ Cp_(is),
h_(is),
- cpg_(is),
+ Cpg_(is),
B_(is),
mu_(is),
mug_(is),
@@ -153,9 +153,9 @@ Foam::C4H10O::C4H10O(const dictionary& dict)
rho_(dict.subDict("rho")),
pv_(dict.subDict("pv")),
hl_(dict.subDict("hl")),
- cp_(dict.subDict("cp")),
+ Cp_(dict.subDict("Cp")),
h_(dict.subDict("h")),
- cpg_(dict.subDict("cpg")),
+ Cpg_(dict.subDict("Cpg")),
B_(dict.subDict("B")),
mu_(dict.subDict("mu")),
mug_(dict.subDict("mug")),
diff --git a/src/thermophysicalModels/liquids/C4H10O/C4H10O.H b/src/thermophysicalModels/liquids/C4H10O/C4H10O.H
index a2d07a66a10790dfd6dc067cf0621463f255fd2e..2099cffa8b7bf1cbf0ad45d9bd655f3d64741d2b 100644
--- a/src/thermophysicalModels/liquids/C4H10O/C4H10O.H
+++ b/src/thermophysicalModels/liquids/C4H10O/C4H10O.H
@@ -65,9 +65,9 @@ class C4H10O
NSRDSfunc5 rho_;
NSRDSfunc1 pv_;
NSRDSfunc6 hl_;
- NSRDSfunc0 cp_;
+ NSRDSfunc0 Cp_;
NSRDSfunc0 h_;
- NSRDSfunc7 cpg_;
+ NSRDSfunc7 Cpg_;
NSRDSfunc4 B_;
NSRDSfunc1 mu_;
NSRDSfunc2 mug_;
@@ -126,13 +126,13 @@ public:
inline scalar hl(scalar p, scalar T) const;
//- Liquid heat capacity [J/(kg K)]
- inline scalar cp(scalar p, scalar T) const;
+ inline scalar Cp(scalar p, scalar T) const;
//- Liquid Enthalpy [J/(kg)]
inline scalar h(scalar p, scalar T) const;
//- Ideal gas heat capacity [J/(kg K)]
- inline scalar cpg(scalar p, scalar T) const;
+ inline scalar Cpg(scalar p, scalar T) const;
//- Second Virial Coefficient [m^3/kg]
inline scalar B(scalar p, scalar T) const;
@@ -168,8 +168,8 @@ public:
rho_.writeData(os); os << nl;
pv_.writeData(os); os << nl;
hl_.writeData(os); os << nl;
- cp_.writeData(os); os << nl;
- cpg_.writeData(os); os << nl;
+ Cp_.writeData(os); os << nl;
+ Cpg_.writeData(os); os << nl;
B_.writeData(os); os << nl;
mu_.writeData(os); os << nl;
mug_.writeData(os); os << nl;
diff --git a/src/thermophysicalModels/liquids/C4H10O/C4H10OI.H b/src/thermophysicalModels/liquids/C4H10O/C4H10OI.H
index 263cac42541fdb22afb63c0769084de50fb0475a..34a392871f99751780f70816f2b8738fac416d8a 100644
--- a/src/thermophysicalModels/liquids/C4H10O/C4H10OI.H
+++ b/src/thermophysicalModels/liquids/C4H10O/C4H10OI.H
@@ -41,9 +41,9 @@ inline Foam::scalar Foam::C4H10O::hl(scalar p, scalar T) const
}
-inline Foam::scalar Foam::C4H10O::cp(scalar p, scalar T) const
+inline Foam::scalar Foam::C4H10O::Cp(scalar p, scalar T) const
{
- return cp_.f(p, T);
+ return Cp_.f(p, T);
}
@@ -53,9 +53,9 @@ inline Foam::scalar Foam::C4H10O::h(scalar p, scalar T) const
}
-inline Foam::scalar Foam::C4H10O::cpg(scalar p, scalar T) const
+inline Foam::scalar Foam::C4H10O::Cpg(scalar p, scalar T) const
{
- return cpg_.f(p, T);
+ return Cpg_.f(p, T);
}
diff --git a/src/thermophysicalModels/liquids/C6H14/C6H14.C b/src/thermophysicalModels/liquids/C6H14/C6H14.C
index 0a3a75349acecb2df97a10d7e50cf402fa02de18..607e94217f7f8042427d27bc8855bd36d5d3905f 100644
--- a/src/thermophysicalModels/liquids/C6H14/C6H14.C
+++ b/src/thermophysicalModels/liquids/C6H14/C6H14.C
@@ -57,7 +57,7 @@ Foam::C6H14::C6H14()
rho_(61.03399848, 0.26411, 507.6, 0.27537),
pv_(104.65, -6995.5, -12.702, 1.2381e-05, 2.0),
hl_(507.60, 527286.863084118, 0.39002, 0.0, 0.0, 0.0),
- cp_
+ Cp_
(
1997.28465831951,
-2.13258758137322,
@@ -75,7 +75,7 @@ Foam::C6H14::C6H14()
0.0,
0.0
),
- cpg_(1211.4601343746, 4088.0977523005, 1694.6, 2748.99335089409, 761.6),
+ Cpg_(1211.4601343746, 4088.0977523005, 1694.6, 2748.99335089409, 761.6),
B_
(
0.0022859927822969,
@@ -115,9 +115,9 @@ Foam::C6H14::C6H14
rho_(density),
pv_(vapourPressure),
hl_(heatOfVapourisation),
- cp_(heatCapacity),
+ Cp_(heatCapacity),
h_(enthalpy),
- cpg_(idealGasHeatCapacity),
+ Cpg_(idealGasHeatCapacity),
B_(secondVirialCoeff),
mu_(dynamicViscosity),
mug_(vapourDynamicViscosity),
@@ -134,9 +134,9 @@ Foam::C6H14::C6H14(Istream& is)
rho_(is),
pv_(is),
hl_(is),
- cp_(is),
+ Cp_(is),
h_(is),
- cpg_(is),
+ Cpg_(is),
B_(is),
mu_(is),
mug_(is),
@@ -153,9 +153,9 @@ Foam::C6H14::C6H14(const dictionary& dict)
rho_(dict.subDict("rho")),
pv_(dict.subDict("pv")),
hl_(dict.subDict("hl")),
- cp_(dict.subDict("cp")),
+ Cp_(dict.subDict("Cp")),
h_(dict.subDict("h")),
- cpg_(dict.subDict("cpg")),
+ Cpg_(dict.subDict("Cpg")),
B_(dict.subDict("B")),
mu_(dict.subDict("mu")),
mug_(dict.subDict("mug")),
diff --git a/src/thermophysicalModels/liquids/C6H14/C6H14.H b/src/thermophysicalModels/liquids/C6H14/C6H14.H
index 9a29cb9590d9e7949c80061d3cd97fb28001cf96..fe97e35f9b65e16c51516b1b09d8c49874e96147 100644
--- a/src/thermophysicalModels/liquids/C6H14/C6H14.H
+++ b/src/thermophysicalModels/liquids/C6H14/C6H14.H
@@ -65,9 +65,9 @@ class C6H14
NSRDSfunc5 rho_;
NSRDSfunc1 pv_;
NSRDSfunc6 hl_;
- NSRDSfunc0 cp_;
+ NSRDSfunc0 Cp_;
NSRDSfunc0 h_;
- NSRDSfunc7 cpg_;
+ NSRDSfunc7 Cpg_;
NSRDSfunc4 B_;
NSRDSfunc1 mu_;
NSRDSfunc2 mug_;
@@ -126,13 +126,13 @@ public:
inline scalar hl(scalar p, scalar T) const;
//- Liquid heat capacity [J/(kg K)]
- inline scalar cp(scalar p, scalar T) const;
+ inline scalar Cp(scalar p, scalar T) const;
//- Liquid Enthalpy [J/(kg)]
inline scalar h(scalar p, scalar T) const;
//- Ideal gas heat capacity [J/(kg K)]
- inline scalar cpg(scalar p, scalar T) const;
+ inline scalar Cpg(scalar p, scalar T) const;
//- Second Virial Coefficient [m^3/kg]
inline scalar B(scalar p, scalar T) const;
@@ -168,8 +168,8 @@ public:
rho_.writeData(os); os << nl;
pv_.writeData(os); os << nl;
hl_.writeData(os); os << nl;
- cp_.writeData(os); os << nl;
- cpg_.writeData(os); os << nl;
+ Cp_.writeData(os); os << nl;
+ Cpg_.writeData(os); os << nl;
B_.writeData(os); os << nl;
mu_.writeData(os); os << nl;
mug_.writeData(os); os << nl;
diff --git a/src/thermophysicalModels/liquids/C6H14/C6H14I.H b/src/thermophysicalModels/liquids/C6H14/C6H14I.H
index 7f560fd9846324439d5173a0e7ed61b688bda78b..6f3335d9908c813e930840ce61d0cbec28c6f9ae 100644
--- a/src/thermophysicalModels/liquids/C6H14/C6H14I.H
+++ b/src/thermophysicalModels/liquids/C6H14/C6H14I.H
@@ -41,9 +41,9 @@ inline Foam::scalar Foam::C6H14::hl(scalar p, scalar T) const
}
-inline Foam::scalar Foam::C6H14::cp(scalar p, scalar T) const
+inline Foam::scalar Foam::C6H14::Cp(scalar p, scalar T) const
{
- return cp_.f(p, T);
+ return Cp_.f(p, T);
}
@@ -53,9 +53,9 @@ inline Foam::scalar Foam::C6H14::h(scalar p, scalar T) const
}
-inline Foam::scalar Foam::C6H14::cpg(scalar p, scalar T) const
+inline Foam::scalar Foam::C6H14::Cpg(scalar p, scalar T) const
{
- return cpg_.f(p, T);
+ return Cpg_.f(p, T);
}
diff --git a/src/thermophysicalModels/liquids/C6H6/C6H6.C b/src/thermophysicalModels/liquids/C6H6/C6H6.C
index f3d2beb4001aa3d03626d7b4e5d850a7e58c9448..5dd2ee1398c523829bab31985b95a9ea83ef78a9 100644
--- a/src/thermophysicalModels/liquids/C6H6/C6H6.C
+++ b/src/thermophysicalModels/liquids/C6H6/C6H6.C
@@ -57,7 +57,7 @@ Foam::C6H6::C6H6()
rho_(80.5511568, 0.2667, 562.16, 0.2818),
pv_(78.05, -6275.5, -8.4443, 6.26e-06, 2),
hl_(562.16, 649435.440510024, 0.7616, -0.5052, 0.1564, 0),
- cp_
+ Cp_
(
1386.69124612745,
-0.416058581048212,
@@ -75,7 +75,7 @@ Foam::C6H6::C6H6()
0.0,
0.0
),
- cpg_(568.656066774202, 2970.65826868423, 1494.6, 2203.57426325627, -678.15),
+ Cpg_(568.656066774202, 2970.65826868423, 1494.6, 2203.57426325627, -678.15),
B_
(
0.00184089919860716,
@@ -115,9 +115,9 @@ Foam::C6H6::C6H6
rho_(density),
pv_(vapourPressure),
hl_(heatOfVapourisation),
- cp_(heatCapacity),
+ Cp_(heatCapacity),
h_(enthalpy),
- cpg_(idealGasHeatCapacity),
+ Cpg_(idealGasHeatCapacity),
B_(secondVirialCoeff),
mu_(dynamicViscosity),
mug_(vapourDynamicViscosity),
@@ -134,9 +134,9 @@ Foam::C6H6::C6H6(Istream& is)
rho_(is),
pv_(is),
hl_(is),
- cp_(is),
+ Cp_(is),
h_(is),
- cpg_(is),
+ Cpg_(is),
B_(is),
mu_(is),
mug_(is),
@@ -153,9 +153,9 @@ Foam::C6H6::C6H6(const dictionary& dict)
rho_(dict.subDict("rho")),
pv_(dict.subDict("pv")),
hl_(dict.subDict("hl")),
- cp_(dict.subDict("cp")),
+ Cp_(dict.subDict("Cp")),
h_(dict.subDict("h")),
- cpg_(dict.subDict("cpg")),
+ Cpg_(dict.subDict("Cpg")),
B_(dict.subDict("B")),
mu_(dict.subDict("mu")),
mug_(dict.subDict("mug")),
diff --git a/src/thermophysicalModels/liquids/C6H6/C6H6.H b/src/thermophysicalModels/liquids/C6H6/C6H6.H
index 0ac66107583d4e57279377c0513bdba57e58815d..3484656d0091dd0a3f6d5a3e10012f0ce9f52e78 100644
--- a/src/thermophysicalModels/liquids/C6H6/C6H6.H
+++ b/src/thermophysicalModels/liquids/C6H6/C6H6.H
@@ -65,9 +65,9 @@ class C6H6
NSRDSfunc5 rho_;
NSRDSfunc1 pv_;
NSRDSfunc6 hl_;
- NSRDSfunc0 cp_;
+ NSRDSfunc0 Cp_;
NSRDSfunc0 h_;
- NSRDSfunc7 cpg_;
+ NSRDSfunc7 Cpg_;
NSRDSfunc4 B_;
NSRDSfunc1 mu_;
NSRDSfunc2 mug_;
@@ -126,13 +126,13 @@ public:
inline scalar hl(scalar p, scalar T) const;
//- Liquid heat capacity [J/(kg K)]
- inline scalar cp(scalar p, scalar T) const;
+ inline scalar Cp(scalar p, scalar T) const;
//- Liquid Enthalpy [J/(kg)]
inline scalar h(scalar p, scalar T) const;
//- Ideal gas heat capacity [J/(kg K)]
- inline scalar cpg(scalar p, scalar T) const;
+ inline scalar Cpg(scalar p, scalar T) const;
//- Second Virial Coefficient [m^3/kg]
inline scalar B(scalar p, scalar T) const;
@@ -168,8 +168,8 @@ public:
rho_.writeData(os); os << nl;
pv_.writeData(os); os << nl;
hl_.writeData(os); os << nl;
- cp_.writeData(os); os << nl;
- cpg_.writeData(os); os << nl;
+ Cp_.writeData(os); os << nl;
+ Cpg_.writeData(os); os << nl;
B_.writeData(os); os << nl;
mu_.writeData(os); os << nl;
mug_.writeData(os); os << nl;
diff --git a/src/thermophysicalModels/liquids/C6H6/C6H6I.H b/src/thermophysicalModels/liquids/C6H6/C6H6I.H
index 40453d887bf904f672bcd11a28a5aa4d7493fe2f..8dc5a871cd34cfaf8c8506ce23f8353c230a5ac4 100644
--- a/src/thermophysicalModels/liquids/C6H6/C6H6I.H
+++ b/src/thermophysicalModels/liquids/C6H6/C6H6I.H
@@ -41,9 +41,9 @@ inline Foam::scalar Foam::C6H6::hl(scalar p, scalar T) const
}
-inline Foam::scalar Foam::C6H6::cp(scalar p, scalar T) const
+inline Foam::scalar Foam::C6H6::Cp(scalar p, scalar T) const
{
- return cp_.f(p, T);
+ return Cp_.f(p, T);
}
@@ -53,9 +53,9 @@ inline Foam::scalar Foam::C6H6::h(scalar p, scalar T) const
}
-inline Foam::scalar Foam::C6H6::cpg(scalar p, scalar T) const
+inline Foam::scalar Foam::C6H6::Cpg(scalar p, scalar T) const
{
- return cpg_.f(p, T);
+ return Cpg_.f(p, T);
}
diff --git a/src/thermophysicalModels/liquids/C7H16/C7H16.C b/src/thermophysicalModels/liquids/C7H16/C7H16.C
index df1d14bbe64cf3a8d20d66b5cbb5072553864b3a..15d2b2678bfa1915c813d6fe9eb7725de7f514ca 100644
--- a/src/thermophysicalModels/liquids/C7H16/C7H16.C
+++ b/src/thermophysicalModels/liquids/C7H16/C7H16.C
@@ -57,7 +57,7 @@ Foam::C7H16::C7H16()
rho_(61.38396836, 0.26211, 540.2, 0.28141),
pv_(87.829, -6996.4, -9.8802, 7.2099e-06, 2.0),
hl_(540.20, 499121.791545248, 0.38795, 0.0, 0.0, 0.0),
- cp_
+ Cp_
(
540.20,
6.11976102401216,
@@ -74,7 +74,7 @@ Foam::C7H16::C7H16()
-1.634831e-4,
9.64941e-8
),
- cpg_(1199.05392998284, 3992.85457666361, 1676.6, 2734.42177956968, 756.4),
+ Cpg_(1199.05392998284, 3992.85457666361, 1676.6, 2734.42177956968, 756.4),
B_
(
0.00274040956448844,
@@ -114,9 +114,9 @@ Foam::C7H16::C7H16
rho_(density),
pv_(vapourPressure),
hl_(heatOfVapourisation),
- cp_(heatCapacity),
+ Cp_(heatCapacity),
h_(enthalpy),
- cpg_(idealGasHeatCapacity),
+ Cpg_(idealGasHeatCapacity),
B_(secondVirialCoeff),
mu_(dynamicViscosity),
mug_(vapourDynamicViscosity),
@@ -133,9 +133,9 @@ Foam::C7H16::C7H16(Istream& is)
rho_(is),
pv_(is),
hl_(is),
- cp_(is),
+ Cp_(is),
h_(is),
- cpg_(is),
+ Cpg_(is),
B_(is),
mu_(is),
mug_(is),
@@ -152,9 +152,9 @@ Foam::C7H16::C7H16(const dictionary& dict)
rho_(dict.subDict("rho")),
pv_(dict.subDict("pv")),
hl_(dict.subDict("hl")),
- cp_(dict.subDict("cp")),
+ Cp_(dict.subDict("Cp")),
h_(dict.subDict("h")),
- cpg_(dict.subDict("cpg")),
+ Cpg_(dict.subDict("Cpg")),
B_(dict.subDict("B")),
mu_(dict.subDict("mu")),
mug_(dict.subDict("mug")),
diff --git a/src/thermophysicalModels/liquids/C7H16/C7H16.H b/src/thermophysicalModels/liquids/C7H16/C7H16.H
index 75f816ff44ecdc6cfd61e59b449b647844926381..ce8b9dfb37e82252fb3e51d8323c4f89e9d92d5d 100644
--- a/src/thermophysicalModels/liquids/C7H16/C7H16.H
+++ b/src/thermophysicalModels/liquids/C7H16/C7H16.H
@@ -65,9 +65,9 @@ class C7H16
NSRDSfunc5 rho_;
NSRDSfunc1 pv_;
NSRDSfunc6 hl_;
- NSRDSfunc14 cp_;
+ NSRDSfunc14 Cp_;
NSRDSfunc0 h_;
- NSRDSfunc7 cpg_;
+ NSRDSfunc7 Cpg_;
NSRDSfunc4 B_;
NSRDSfunc1 mu_;
NSRDSfunc2 mug_;
@@ -126,13 +126,13 @@ public:
inline scalar hl(scalar p, scalar T) const;
//- Liquid heat capacity [J/(kg K)]
- inline scalar cp(scalar p, scalar T) const;
+ inline scalar Cp(scalar p, scalar T) const;
//- Liquid Enthalpy [J/kg]
inline scalar h(scalar p, scalar T) const;
//- Ideal gas heat capacity [J/(kg K)]
- inline scalar cpg(scalar p, scalar T) const;
+ inline scalar Cpg(scalar p, scalar T) const;
//- Second Virial Coefficient [m^3/kg]
inline scalar B(scalar p, scalar T) const;
@@ -168,8 +168,8 @@ public:
rho_.writeData(os); os << nl;
pv_.writeData(os); os << nl;
hl_.writeData(os); os << nl;
- cp_.writeData(os); os << nl;
- cpg_.writeData(os); os << nl;
+ Cp_.writeData(os); os << nl;
+ Cpg_.writeData(os); os << nl;
B_.writeData(os); os << nl;
mu_.writeData(os); os << nl;
mug_.writeData(os); os << nl;
diff --git a/src/thermophysicalModels/liquids/C7H16/C7H16I.H b/src/thermophysicalModels/liquids/C7H16/C7H16I.H
index e71b5c57cd3d6bdb475760cf627fcb50c52284ad..299f8b6d7e8d6eb1d708eb652de46c8b0c1d4659 100644
--- a/src/thermophysicalModels/liquids/C7H16/C7H16I.H
+++ b/src/thermophysicalModels/liquids/C7H16/C7H16I.H
@@ -41,9 +41,9 @@ inline Foam::scalar Foam::C7H16::hl(scalar p, scalar T) const
}
-inline Foam::scalar Foam::C7H16::cp(scalar p, scalar T) const
+inline Foam::scalar Foam::C7H16::Cp(scalar p, scalar T) const
{
- return cp_.f(p, T);
+ return Cp_.f(p, T);
}
@@ -53,9 +53,9 @@ inline Foam::scalar Foam::C7H16::h(scalar p, scalar T) const
}
-inline Foam::scalar Foam::C7H16::cpg(scalar p, scalar T) const
+inline Foam::scalar Foam::C7H16::Cpg(scalar p, scalar T) const
{
- return cpg_.f(p, T);
+ return Cpg_.f(p, T);
}
diff --git a/src/thermophysicalModels/liquids/C7H8/C7H8.C b/src/thermophysicalModels/liquids/C7H8/C7H8.C
index e38dede79dca6a98d9ef0d422428a0a9f1e825c4..311eabbe1242c0a8d5e53e055d2fe263cc0765f3 100644
--- a/src/thermophysicalModels/liquids/C7H8/C7H8.C
+++ b/src/thermophysicalModels/liquids/C7H8/C7H8.C
@@ -57,7 +57,7 @@ Foam::C7H8::C7H8()
rho_(81.32088237, 0.27108, 591.79, 0.29889),
pv_(83.359, -6995, -9.1635, 6.225e-06, 2.0),
hl_(591.79, 544383.065085033, 0.3834, 0.0, 0.0, 0.0),
- cp_
+ Cp_
(
2066.83235476064,
-8.14664481609707,
@@ -75,7 +75,7 @@ Foam::C7H8::C7H8()
-7.53057813568336e-06,
0.0
),
- cpg_(630.989461803106, 3107.19440856947, 1440.6, 2059.88647833212, -650.43),
+ Cpg_(630.989461803106, 3107.19440856947, 1440.6, 2059.88647833212, -650.43),
B_
(
0.00191120131103418,
@@ -115,9 +115,9 @@ Foam::C7H8::C7H8
rho_(density),
pv_(vapourPressure),
hl_(heatOfVapourisation),
- cp_(heatCapacity),
+ Cp_(heatCapacity),
h_(enthalpy),
- cpg_(idealGasHeatCapacity),
+ Cpg_(idealGasHeatCapacity),
B_(secondVirialCoeff),
mu_(dynamicViscosity),
mug_(vapourDynamicViscosity),
@@ -134,9 +134,9 @@ Foam::C7H8::C7H8(Istream& is)
rho_(is),
pv_(is),
hl_(is),
- cp_(is),
+ Cp_(is),
h_(is),
- cpg_(is),
+ Cpg_(is),
B_(is),
mu_(is),
mug_(is),
@@ -153,9 +153,9 @@ Foam::C7H8::C7H8(const dictionary& dict)
rho_(dict.subDict("rho")),
pv_(dict.subDict("pv")),
hl_(dict.subDict("hl")),
- cp_(dict.subDict("cp")),
+ Cp_(dict.subDict("Cp")),
h_(dict.subDict("h")),
- cpg_(dict.subDict("cpg")),
+ Cpg_(dict.subDict("Cpg")),
B_(dict.subDict("B")),
mu_(dict.subDict("mu")),
mug_(dict.subDict("mug")),
diff --git a/src/thermophysicalModels/liquids/C7H8/C7H8.H b/src/thermophysicalModels/liquids/C7H8/C7H8.H
index 2091f852c95d6d5cc8d84bcfea91ed7f3fd88441..31130737cb5f9897c7ddd9978315f4dde2dc9937 100644
--- a/src/thermophysicalModels/liquids/C7H8/C7H8.H
+++ b/src/thermophysicalModels/liquids/C7H8/C7H8.H
@@ -65,9 +65,9 @@ class C7H8
NSRDSfunc5 rho_;
NSRDSfunc1 pv_;
NSRDSfunc6 hl_;
- NSRDSfunc0 cp_;
+ NSRDSfunc0 Cp_;
NSRDSfunc0 h_;
- NSRDSfunc7 cpg_;
+ NSRDSfunc7 Cpg_;
NSRDSfunc4 B_;
NSRDSfunc1 mu_;
NSRDSfunc2 mug_;
@@ -126,13 +126,13 @@ public:
inline scalar hl(scalar p, scalar T) const;
//- Liquid heat capacity [J/(kg K)]
- inline scalar cp(scalar p, scalar T) const;
+ inline scalar Cp(scalar p, scalar T) const;
//- Liquid Enthalpy [J/(kg)]
inline scalar h(scalar p, scalar T) const;
//- Ideal gas heat capacity [J/(kg K)]
- inline scalar cpg(scalar p, scalar T) const;
+ inline scalar Cpg(scalar p, scalar T) const;
//- Second Virial Coefficient [m^3/kg]
inline scalar B(scalar p, scalar T) const;
@@ -168,8 +168,8 @@ public:
rho_.writeData(os); os << nl;
pv_.writeData(os); os << nl;
hl_.writeData(os); os << nl;
- cp_.writeData(os); os << nl;
- cpg_.writeData(os); os << nl;
+ Cp_.writeData(os); os << nl;
+ Cpg_.writeData(os); os << nl;
B_.writeData(os); os << nl;
mu_.writeData(os); os << nl;
mug_.writeData(os); os << nl;
diff --git a/src/thermophysicalModels/liquids/C7H8/C7H8I.H b/src/thermophysicalModels/liquids/C7H8/C7H8I.H
index 217aeb33e996d58cb460f1312f145529df258f23..622ea133ea0d1c5c81e683afe4c75a9567d3f72d 100644
--- a/src/thermophysicalModels/liquids/C7H8/C7H8I.H
+++ b/src/thermophysicalModels/liquids/C7H8/C7H8I.H
@@ -41,9 +41,9 @@ inline Foam::scalar Foam::C7H8::hl(scalar p, scalar T) const
}
-inline Foam::scalar Foam::C7H8::cp(scalar p, scalar T) const
+inline Foam::scalar Foam::C7H8::Cp(scalar p, scalar T) const
{
- return cp_.f(p, T);
+ return Cp_.f(p, T);
}
@@ -53,9 +53,9 @@ inline Foam::scalar Foam::C7H8::h(scalar p, scalar T) const
}
-inline Foam::scalar Foam::C7H8::cpg(scalar p, scalar T) const
+inline Foam::scalar Foam::C7H8::Cpg(scalar p, scalar T) const
{
- return cpg_.f(p, T);
+ return Cpg_.f(p, T);
}
diff --git a/src/thermophysicalModels/liquids/C8H10/C8H10.C b/src/thermophysicalModels/liquids/C8H10/C8H10.C
index 5c6e34c12c666636f7929d83cd9d3fb1fafb3092..a7d001394c87d18fdddfac60dfce149a9d9cc9fe 100644
--- a/src/thermophysicalModels/liquids/C8H10/C8H10.C
+++ b/src/thermophysicalModels/liquids/C8H10/C8H10.C
@@ -57,7 +57,7 @@ Foam::C8H10::C8H10()
rho_(76.3765398, 0.26438, 617.17, 0.2921),
pv_(88.246, -7691.1, -9.797, 5.931e-06, 2.0),
hl_(617.17, 516167.924119547, 0.3882, 0.0, 0.0, 0.0),
- cp_
+ Cp_
(
818.521762883005,
6.66873887366131,
@@ -75,7 +75,7 @@ Foam::C8H10::C8H10()
1.05965130407754e-05,
0.0
),
- cpg_(738.835984816374, 3201.5598067196, 1559, 2285.07916772632, -702.0),
+ Cpg_(738.835984816374, 3201.5598067196, 1559, 2285.07916772632, -702.0),
B_
(
0.00165776559571242,
@@ -115,9 +115,9 @@ Foam::C8H10::C8H10
rho_(density),
pv_(vapourPressure),
hl_(heatOfVapourisation),
- cp_(heatCapacity),
+ Cp_(heatCapacity),
h_(enthalpy),
- cpg_(idealGasHeatCapacity),
+ Cpg_(idealGasHeatCapacity),
B_(secondVirialCoeff),
mu_(dynamicViscosity),
mug_(vapourDynamicViscosity),
@@ -134,9 +134,9 @@ Foam::C8H10::C8H10(Istream& is)
rho_(is),
pv_(is),
hl_(is),
- cp_(is),
+ Cp_(is),
h_(is),
- cpg_(is),
+ Cpg_(is),
B_(is),
mu_(is),
mug_(is),
@@ -153,9 +153,9 @@ Foam::C8H10::C8H10(const dictionary& dict)
rho_(dict.subDict("rho")),
pv_(dict.subDict("pv")),
hl_(dict.subDict("hl")),
- cp_(dict.subDict("cp")),
+ Cp_(dict.subDict("Cp")),
h_(dict.subDict("h")),
- cpg_(dict.subDict("cpg")),
+ Cpg_(dict.subDict("Cpg")),
B_(dict.subDict("B")),
mu_(dict.subDict("mu")),
mug_(dict.subDict("mug")),
diff --git a/src/thermophysicalModels/liquids/C8H10/C8H10.H b/src/thermophysicalModels/liquids/C8H10/C8H10.H
index a524ad0138fed02a273713ddc0e71c67d7837531..3757aabee51d99f62d93e86f7cbad15f7c0a98f5 100644
--- a/src/thermophysicalModels/liquids/C8H10/C8H10.H
+++ b/src/thermophysicalModels/liquids/C8H10/C8H10.H
@@ -64,9 +64,9 @@ class C8H10
NSRDSfunc5 rho_;
NSRDSfunc1 pv_;
NSRDSfunc6 hl_;
- NSRDSfunc0 cp_;
+ NSRDSfunc0 Cp_;
NSRDSfunc0 h_;
- NSRDSfunc7 cpg_;
+ NSRDSfunc7 Cpg_;
NSRDSfunc4 B_;
NSRDSfunc1 mu_;
NSRDSfunc2 mug_;
@@ -125,13 +125,13 @@ public:
inline scalar hl(scalar p, scalar T) const;
//- Liquid heat capacity [J/(kg K)]
- inline scalar cp(scalar p, scalar T) const;
+ inline scalar Cp(scalar p, scalar T) const;
//- Liquid Enthalpy [J/(kg)]
inline scalar h(scalar p, scalar T) const;
//- Ideal gas heat capacity [J/(kg K)]
- inline scalar cpg(scalar p, scalar T) const;
+ inline scalar Cpg(scalar p, scalar T) const;
//- Second Virial Coefficient [m^3/kg]
inline scalar B(scalar p, scalar T) const;
@@ -167,8 +167,8 @@ public:
rho_.writeData(os); os << nl;
pv_.writeData(os); os << nl;
hl_.writeData(os); os << nl;
- cp_.writeData(os); os << nl;
- cpg_.writeData(os); os << nl;
+ Cp_.writeData(os); os << nl;
+ Cpg_.writeData(os); os << nl;
B_.writeData(os); os << nl;
mu_.writeData(os); os << nl;
mug_.writeData(os); os << nl;
diff --git a/src/thermophysicalModels/liquids/C8H10/C8H10I.H b/src/thermophysicalModels/liquids/C8H10/C8H10I.H
index 11f6933183f315cf41f66b15f59c0c91ec4cf817..cf961922fcfb19e8317d39e8e037e1666cb7b4bf 100644
--- a/src/thermophysicalModels/liquids/C8H10/C8H10I.H
+++ b/src/thermophysicalModels/liquids/C8H10/C8H10I.H
@@ -41,9 +41,9 @@ inline Foam::scalar Foam::C8H10::hl(scalar p, scalar T) const
}
-inline Foam::scalar Foam::C8H10::cp(scalar p, scalar T) const
+inline Foam::scalar Foam::C8H10::Cp(scalar p, scalar T) const
{
- return cp_.f(p, T);
+ return Cp_.f(p, T);
}
@@ -53,9 +53,9 @@ inline Foam::scalar Foam::C8H10::h(scalar p, scalar T) const
}
-inline Foam::scalar Foam::C8H10::cpg(scalar p, scalar T) const
+inline Foam::scalar Foam::C8H10::Cpg(scalar p, scalar T) const
{
- return cpg_.f(p, T);
+ return Cpg_.f(p, T);
}
diff --git a/src/thermophysicalModels/liquids/C8H18/C8H18.C b/src/thermophysicalModels/liquids/C8H18/C8H18.C
index ce8d75361e07f06e584b1632028a429b0d698dd0..a5f3529d1a6ade09ccbc4a14acb1b05dc90063e7 100644
--- a/src/thermophysicalModels/liquids/C8H18/C8H18.C
+++ b/src/thermophysicalModels/liquids/C8H18/C8H18.C
@@ -57,7 +57,7 @@ Foam::C8H18::C8H18()
rho_(61.37745861, 0.26115, 568.7, 0.28034),
pv_(96.084, -7900.2, -11.003, 7.1802e-06, 2.0),
hl_(568.70, 483056.263186, 0.38467, 0.0, 0.0, 0.0),
- cp_
+ Cp_
(
1968.20477803749,
-1.63379467920267,
@@ -75,7 +75,7 @@ Foam::C8H18::C8H18()
0.0,
0.0
),
- cpg_(1186.54305748877, 3878.9820626625, 1635.6, 2673.52995246474, 746.4),
+ Cpg_(1186.54305748877, 3878.9820626625, 1635.6, 2673.52995246474, 746.4),
B_
(
0.00239777293379205,
@@ -115,9 +115,9 @@ Foam::C8H18::C8H18
rho_(density),
pv_(vapourPressure),
hl_(heatOfVapourisation),
- cp_(heatCapacity),
+ Cp_(heatCapacity),
h_(enthalpy),
- cpg_(idealGasHeatCapacity),
+ Cpg_(idealGasHeatCapacity),
B_(secondVirialCoeff),
mu_(dynamicViscosity),
mug_(vapourDynamicViscosity),
@@ -134,9 +134,9 @@ Foam::C8H18::C8H18(Istream& is)
rho_(is),
pv_(is),
hl_(is),
- cp_(is),
+ Cp_(is),
h_(is),
- cpg_(is),
+ Cpg_(is),
B_(is),
mu_(is),
mug_(is),
@@ -153,9 +153,9 @@ Foam::C8H18::C8H18(const dictionary& dict)
rho_(dict.subDict("rho")),
pv_(dict.subDict("pv")),
hl_(dict.subDict("hl")),
- cp_(dict.subDict("cp")),
+ Cp_(dict.subDict("Cp")),
h_(dict.subDict("h")),
- cpg_(dict.subDict("cpg")),
+ Cpg_(dict.subDict("Cpg")),
B_(dict.subDict("B")),
mu_(dict.subDict("mu")),
mug_(dict.subDict("mug")),
diff --git a/src/thermophysicalModels/liquids/C8H18/C8H18.H b/src/thermophysicalModels/liquids/C8H18/C8H18.H
index 7ccc52768047958fcb10a7d928210e4d7df56bc7..57223738b056630622aae39fe796a388f13c2433 100644
--- a/src/thermophysicalModels/liquids/C8H18/C8H18.H
+++ b/src/thermophysicalModels/liquids/C8H18/C8H18.H
@@ -65,9 +65,9 @@ class C8H18
NSRDSfunc5 rho_;
NSRDSfunc1 pv_;
NSRDSfunc6 hl_;
- NSRDSfunc0 cp_;
+ NSRDSfunc0 Cp_;
NSRDSfunc0 h_;
- NSRDSfunc7 cpg_;
+ NSRDSfunc7 Cpg_;
NSRDSfunc4 B_;
NSRDSfunc1 mu_;
NSRDSfunc2 mug_;
@@ -126,13 +126,13 @@ public:
inline scalar hl(scalar p, scalar T) const;
//- Liquid heat capacity [J/(kg K)]
- inline scalar cp(scalar p, scalar T) const;
+ inline scalar Cp(scalar p, scalar T) const;
//- Liquid Enthalpy [J/(kg)]
inline scalar h(scalar p, scalar T) const;
//- Ideal gas heat capacity [J/(kg K)]
- inline scalar cpg(scalar p, scalar T) const;
+ inline scalar Cpg(scalar p, scalar T) const;
//- Second Virial Coefficient [m^3/kg]
inline scalar B(scalar p, scalar T) const;
@@ -168,8 +168,8 @@ public:
rho_.writeData(os); os << nl;
pv_.writeData(os); os << nl;
hl_.writeData(os); os << nl;
- cp_.writeData(os); os << nl;
- cpg_.writeData(os); os << nl;
+ Cp_.writeData(os); os << nl;
+ Cpg_.writeData(os); os << nl;
B_.writeData(os); os << nl;
mu_.writeData(os); os << nl;
mug_.writeData(os); os << nl;
diff --git a/src/thermophysicalModels/liquids/C8H18/C8H18I.H b/src/thermophysicalModels/liquids/C8H18/C8H18I.H
index a1a00bee10bff9adbddfb32a425c7f1ff3230135..205f9bfea5e4000c00f6958f041fe864754f3e7b 100644
--- a/src/thermophysicalModels/liquids/C8H18/C8H18I.H
+++ b/src/thermophysicalModels/liquids/C8H18/C8H18I.H
@@ -41,9 +41,9 @@ inline Foam::scalar Foam::C8H18::hl(scalar p, scalar T) const
}
-inline Foam::scalar Foam::C8H18::cp(scalar p, scalar T) const
+inline Foam::scalar Foam::C8H18::Cp(scalar p, scalar T) const
{
- return cp_.f(p, T);
+ return Cp_.f(p, T);
}
@@ -53,9 +53,9 @@ inline Foam::scalar Foam::C8H18::h(scalar p, scalar T) const
}
-inline Foam::scalar Foam::C8H18::cpg(scalar p, scalar T) const
+inline Foam::scalar Foam::C8H18::Cpg(scalar p, scalar T) const
{
- return cpg_.f(p, T);
+ return Cpg_.f(p, T);
}
diff --git a/src/thermophysicalModels/liquids/C9H20/C9H20.C b/src/thermophysicalModels/liquids/C9H20/C9H20.C
index 674dc80ed3d188a9b04a27605783824b0c05b89b..966965dbd27ff26125672bb84f11f0d1d835185c 100644
--- a/src/thermophysicalModels/liquids/C9H20/C9H20.C
+++ b/src/thermophysicalModels/liquids/C9H20/C9H20.C
@@ -57,7 +57,7 @@ Foam::C9H20::C9H20()
rho_(62.06019846, 0.26147, 594.6, 0.28281),
pv_(109.35, -90304.0, -12.882, 7.8544e-06, 2.0),
hl_(594.60, 470691.886665939, 0.38522, 0.0, 0.0, 0.0),
- cp_
+ Cp_
(
2986.79224687739,
-8.88677509395125,
@@ -75,7 +75,7 @@ Foam::C9H20::C9H20()
0.0,
0.0
),
- cpg_(1183.16206396482, 3832.11963386299, 1644.8, 2705.48425829188, 749.6),
+ Cpg_(1183.16206396482, 3832.11963386299, 1644.8, 2705.48425829188, 749.6),
B_
(
0.00304542406711472,
@@ -115,9 +115,9 @@ Foam::C9H20::C9H20
rho_(density),
pv_(vapourPressure),
hl_(heatOfVapourisation),
- cp_(heatCapacity),
+ Cp_(heatCapacity),
h_(enthalpy),
- cpg_(idealGasHeatCapacity),
+ Cpg_(idealGasHeatCapacity),
B_(secondVirialCoeff),
mu_(dynamicViscosity),
mug_(vapourDynamicViscosity),
@@ -134,9 +134,9 @@ Foam::C9H20::C9H20(Istream& is)
rho_(is),
pv_(is),
hl_(is),
- cp_(is),
+ Cp_(is),
h_(is),
- cpg_(is),
+ Cpg_(is),
B_(is),
mu_(is),
mug_(is),
@@ -153,9 +153,9 @@ Foam::C9H20::C9H20(const dictionary& dict)
rho_(dict.subDict("rho")),
pv_(dict.subDict("pv")),
hl_(dict.subDict("hl")),
- cp_(dict.subDict("cp")),
+ Cp_(dict.subDict("Cp")),
h_(dict.subDict("h")),
- cpg_(dict.subDict("cpg")),
+ Cpg_(dict.subDict("Cpg")),
B_(dict.subDict("B")),
mu_(dict.subDict("mu")),
mug_(dict.subDict("mug")),
diff --git a/src/thermophysicalModels/liquids/C9H20/C9H20.H b/src/thermophysicalModels/liquids/C9H20/C9H20.H
index f930dcf21c4d17db0b0763f808e50be051f22549..375219da826f5a88148deddf740ec7b5868e0018 100644
--- a/src/thermophysicalModels/liquids/C9H20/C9H20.H
+++ b/src/thermophysicalModels/liquids/C9H20/C9H20.H
@@ -65,9 +65,9 @@ class C9H20
NSRDSfunc5 rho_;
NSRDSfunc1 pv_;
NSRDSfunc6 hl_;
- NSRDSfunc0 cp_;
+ NSRDSfunc0 Cp_;
NSRDSfunc0 h_;
- NSRDSfunc7 cpg_;
+ NSRDSfunc7 Cpg_;
NSRDSfunc4 B_;
NSRDSfunc1 mu_;
NSRDSfunc2 mug_;
@@ -126,13 +126,13 @@ public:
inline scalar hl(scalar p, scalar T) const;
//- Liquid heat capacity [J/(kg K)]
- inline scalar cp(scalar p, scalar T) const;
+ inline scalar Cp(scalar p, scalar T) const;
//- Liquid Enthalpy [J/(kg)]
inline scalar h(scalar p, scalar T) const;
//- Ideal gas heat capacity [J/(kg K)]
- inline scalar cpg(scalar p, scalar T) const;
+ inline scalar Cpg(scalar p, scalar T) const;
//- Second Virial Coefficient [m^3/kg]
inline scalar B(scalar p, scalar T) const;
@@ -168,8 +168,8 @@ public:
rho_.writeData(os); os << nl;
pv_.writeData(os); os << nl;
hl_.writeData(os); os << nl;
- cp_.writeData(os); os << nl;
- cpg_.writeData(os); os << nl;
+ Cp_.writeData(os); os << nl;
+ Cpg_.writeData(os); os << nl;
B_.writeData(os); os << nl;
mu_.writeData(os); os << nl;
mug_.writeData(os); os << nl;
diff --git a/src/thermophysicalModels/liquids/C9H20/C9H20I.H b/src/thermophysicalModels/liquids/C9H20/C9H20I.H
index 9860a1a564f1603c7b4014289f441595b1ba353e..d4d0661951f0eab5f544b5946eefb33717f8955c 100644
--- a/src/thermophysicalModels/liquids/C9H20/C9H20I.H
+++ b/src/thermophysicalModels/liquids/C9H20/C9H20I.H
@@ -41,9 +41,9 @@ inline Foam::scalar Foam::C9H20::hl(scalar p, scalar T) const
}
-inline Foam::scalar Foam::C9H20::cp(scalar p, scalar T) const
+inline Foam::scalar Foam::C9H20::Cp(scalar p, scalar T) const
{
- return cp_.f(p, T);
+ return Cp_.f(p, T);
}
@@ -53,9 +53,9 @@ inline Foam::scalar Foam::C9H20::h(scalar p, scalar T) const
}
-inline Foam::scalar Foam::C9H20::cpg(scalar p, scalar T) const
+inline Foam::scalar Foam::C9H20::Cpg(scalar p, scalar T) const
{
- return cpg_.f(p, T);
+ return Cpg_.f(p, T);
}
diff --git a/src/thermophysicalModels/liquids/CH3OH/CH3OH.C b/src/thermophysicalModels/liquids/CH3OH/CH3OH.C
index ef18d40a20896a0a9a7f4ab5a5ad123f15ee84bb..e93e52aa951a96cbf34f9ed8837eba9288c63dfe 100644
--- a/src/thermophysicalModels/liquids/CH3OH/CH3OH.C
+++ b/src/thermophysicalModels/liquids/CH3OH/CH3OH.C
@@ -57,7 +57,7 @@ Foam::CH3OH::CH3OH()
rho_(73.952936, 0.27192, 512.58, 0.2331),
pv_(109.93, -7471.3, -13.988, 0.015281, 1.0),
hl_(512.58, 1644716.30984333, 0.3766, 0.0, 0.0, 0.0),
- cp_
+ Cp_
(
3358.09250358904,
-11.8781599151114,
@@ -75,7 +75,7 @@ Foam::CH3OH::CH3OH()
0.0,
0.0
),
- cpg_(1226.9521253355, 2772.92303851195, 1963, 1733.66206853505, 909.6),
+ Cpg_(1226.9521253355, 2772.92303851195, 1963, 1733.66206853505, 909.6),
B_
(
-0.0199737844079645,
@@ -115,9 +115,9 @@ Foam::CH3OH::CH3OH
rho_(density),
pv_(vapourPressure),
hl_(heatOfVapourisation),
- cp_(heatCapacity),
+ Cp_(heatCapacity),
h_(enthalpy),
- cpg_(idealGasHeatCapacity),
+ Cpg_(idealGasHeatCapacity),
B_(secondVirialCoeff),
mu_(dynamicViscosity),
mug_(vapourDynamicViscosity),
@@ -134,9 +134,9 @@ Foam::CH3OH::CH3OH(Istream& is)
rho_(is),
pv_(is),
hl_(is),
- cp_(is),
+ Cp_(is),
h_(is),
- cpg_(is),
+ Cpg_(is),
B_(is),
mu_(is),
mug_(is),
@@ -153,9 +153,9 @@ Foam::CH3OH::CH3OH(const dictionary& dict)
rho_(dict.subDict("rho")),
pv_(dict.subDict("pv")),
hl_(dict.subDict("hl")),
- cp_(dict.subDict("cp")),
+ Cp_(dict.subDict("Cp")),
h_(dict.subDict("h")),
- cpg_(dict.subDict("cpg")),
+ Cpg_(dict.subDict("Cpg")),
B_(dict.subDict("B")),
mu_(dict.subDict("mu")),
mug_(dict.subDict("mug")),
diff --git a/src/thermophysicalModels/liquids/CH3OH/CH3OH.H b/src/thermophysicalModels/liquids/CH3OH/CH3OH.H
index c754565d9c5e9fbed1feb3c35359a255de46d380..5f90bafe9213cf71f25ec6768d9c1e4973090665 100644
--- a/src/thermophysicalModels/liquids/CH3OH/CH3OH.H
+++ b/src/thermophysicalModels/liquids/CH3OH/CH3OH.H
@@ -65,9 +65,9 @@ class CH3OH
NSRDSfunc5 rho_;
NSRDSfunc1 pv_;
NSRDSfunc6 hl_;
- NSRDSfunc0 cp_;
+ NSRDSfunc0 Cp_;
NSRDSfunc0 h_;
- NSRDSfunc7 cpg_;
+ NSRDSfunc7 Cpg_;
NSRDSfunc4 B_;
NSRDSfunc1 mu_;
NSRDSfunc2 mug_;
@@ -126,13 +126,13 @@ public:
inline scalar hl(scalar p, scalar T) const;
//- Liquid heat capacity [J/(kg K)]
- inline scalar cp(scalar p, scalar T) const;
+ inline scalar Cp(scalar p, scalar T) const;
//- Liquid Enthalpy [J/(kg)]
inline scalar h(scalar p, scalar T) const;
//- Ideal gas heat capacity [J/(kg K)]
- inline scalar cpg(scalar p, scalar T) const;
+ inline scalar Cpg(scalar p, scalar T) const;
//- Second Virial Coefficient [m^3/kg]
inline scalar B(scalar p, scalar T) const;
@@ -168,8 +168,8 @@ public:
rho_.writeData(os); os << nl;
pv_.writeData(os); os << nl;
hl_.writeData(os); os << nl;
- cp_.writeData(os); os << nl;
- cpg_.writeData(os); os << nl;
+ Cp_.writeData(os); os << nl;
+ Cpg_.writeData(os); os << nl;
B_.writeData(os); os << nl;
mu_.writeData(os); os << nl;
mug_.writeData(os); os << nl;
diff --git a/src/thermophysicalModels/liquids/CH3OH/CH3OHI.H b/src/thermophysicalModels/liquids/CH3OH/CH3OHI.H
index 260d97b3de228b360824d0e74d907ef29bd84448..1d4c767af7e3e2f40a30f9d2a1febc0af6e2cfa1 100644
--- a/src/thermophysicalModels/liquids/CH3OH/CH3OHI.H
+++ b/src/thermophysicalModels/liquids/CH3OH/CH3OHI.H
@@ -41,9 +41,9 @@ inline Foam::scalar Foam::CH3OH::hl(scalar p, scalar T) const
}
-inline Foam::scalar Foam::CH3OH::cp(scalar p, scalar T) const
+inline Foam::scalar Foam::CH3OH::Cp(scalar p, scalar T) const
{
- return cp_.f(p, T);
+ return Cp_.f(p, T);
}
@@ -53,9 +53,9 @@ inline Foam::scalar Foam::CH3OH::h(scalar p, scalar T) const
}
-inline Foam::scalar Foam::CH3OH::cpg(scalar p, scalar T) const
+inline Foam::scalar Foam::CH3OH::Cpg(scalar p, scalar T) const
{
- return cpg_.f(p, T);
+ return Cpg_.f(p, T);
}
diff --git a/src/thermophysicalModels/liquids/CH4N2O/CH4N2O.C b/src/thermophysicalModels/liquids/CH4N2O/CH4N2O.C
index 7b36eb583b0e7e9ba1e5a9e883f6cc3f98d574b9..b32f82f269c4f6b38ca5d2d4086a627c98bdd4c9 100644
--- a/src/thermophysicalModels/liquids/CH4N2O/CH4N2O.C
+++ b/src/thermophysicalModels/liquids/CH4N2O/CH4N2O.C
@@ -58,9 +58,9 @@ Foam::CH4N2O::CH4N2O()
rho_(1230.006936, 0.0, 0.0, 0.0, 0.0, 0.0),
pv_(3015.15611544, -185497.059684, -430.223621983, 0.00017405122622, 2.0),
hl_(705.0, 2534249.0, 0.5, 0.0, 0.0, 0.0),
- cp_(2006.46063673904, 0.0, 0.0, 0.0, 0.0, 0.0),
+ Cp_(2006.46063673904, 0.0, 0.0, 0.0, 0.0, 0.0),
h_(-6154107.41641135, 2006.46063673904, 0.0, 0.0, 0.0, 0.0),
- cpg_(811.875582789397, 2099.04089516451, 1627.3, 1603.63660583455, 724.41),
+ Cpg_(811.875582789397, 2099.04089516451, 1627.3, 1603.63660583455, 724.41),
B_
(
-0.000383641934194752,
@@ -100,9 +100,9 @@ Foam::CH4N2O::CH4N2O
rho_(density),
pv_(vapourPressure),
hl_(heatOfVapourisation),
- cp_(heatCapacity),
+ Cp_(heatCapacity),
h_(enthalpy),
- cpg_(idealGasHeatCapacity),
+ Cpg_(idealGasHeatCapacity),
B_(secondVirialCoeff),
mu_(dynamicViscosity),
mug_(vapourDynamicViscosity),
@@ -119,9 +119,9 @@ Foam::CH4N2O::CH4N2O(Istream& is)
rho_(is),
pv_(is),
hl_(is),
- cp_(is),
+ Cp_(is),
h_(is),
- cpg_(is),
+ Cpg_(is),
B_(is),
mu_(is),
mug_(is),
@@ -138,9 +138,9 @@ Foam::CH4N2O::CH4N2O(const dictionary& dict)
rho_(dict.subDict("rho")),
pv_(dict.subDict("pv")),
hl_(dict.subDict("hl")),
- cp_(dict.subDict("cp")),
+ Cp_(dict.subDict("Cp")),
h_(dict.subDict("h")),
- cpg_(dict.subDict("cpg")),
+ Cpg_(dict.subDict("Cpg")),
B_(dict.subDict("B")),
mu_(dict.subDict("mu")),
mug_(dict.subDict("mug")),
diff --git a/src/thermophysicalModels/liquids/CH4N2O/CH4N2O.H b/src/thermophysicalModels/liquids/CH4N2O/CH4N2O.H
index a45bc0cd5b467054fa8676fae0fef4fae61a86d3..b4d221b42df54bca91d4b81e59199aac376356da 100644
--- a/src/thermophysicalModels/liquids/CH4N2O/CH4N2O.H
+++ b/src/thermophysicalModels/liquids/CH4N2O/CH4N2O.H
@@ -66,9 +66,9 @@ class CH4N2O
NSRDSfunc0 rho_;
NSRDSfunc1 pv_;
NSRDSfunc6 hl_;
- NSRDSfunc0 cp_;
+ NSRDSfunc0 Cp_;
NSRDSfunc0 h_;
- NSRDSfunc7 cpg_;
+ NSRDSfunc7 Cpg_;
NSRDSfunc4 B_;
NSRDSfunc1 mu_;
NSRDSfunc2 mug_;
@@ -126,13 +126,13 @@ public:
inline scalar hl(scalar p, scalar T) const;
//- Liquid heat capacity [J/(kg K)]
- inline scalar cp(scalar p, scalar T) const;
+ inline scalar Cp(scalar p, scalar T) const;
//- Liquid Enthalpy [J/(kg)]
inline scalar h(scalar p, scalar T) const;
//- Ideal gas heat capacity [J/(kg K)]
- inline scalar cpg(scalar p, scalar T) const;
+ inline scalar Cpg(scalar p, scalar T) const;
//- Second Virial Coefficient [m^3/kg]
inline scalar B(scalar p, scalar T) const;
@@ -168,8 +168,8 @@ public:
rho_.writeData(os); os << nl;
pv_.writeData(os); os << nl;
hl_.writeData(os); os << nl;
- cp_.writeData(os); os << nl;
- cpg_.writeData(os); os << nl;
+ Cp_.writeData(os); os << nl;
+ Cpg_.writeData(os); os << nl;
B_.writeData(os); os << nl;
mu_.writeData(os); os << nl;
mug_.writeData(os); os << nl;
diff --git a/src/thermophysicalModels/liquids/CH4N2O/CH4N2OI.H b/src/thermophysicalModels/liquids/CH4N2O/CH4N2OI.H
index 23b40c1a0bb2dcadfd2e0e5ef4cdf6c6e9c5df5b..a9496589c3c2b22205fb18c2983440e6659a2975 100644
--- a/src/thermophysicalModels/liquids/CH4N2O/CH4N2OI.H
+++ b/src/thermophysicalModels/liquids/CH4N2O/CH4N2OI.H
@@ -41,9 +41,9 @@ inline Foam::scalar Foam::CH4N2O::hl(scalar p, scalar T) const
}
-inline Foam::scalar Foam::CH4N2O::cp(scalar p, scalar T) const
+inline Foam::scalar Foam::CH4N2O::Cp(scalar p, scalar T) const
{
- return cp_.f(p, T);
+ return Cp_.f(p, T);
}
@@ -53,9 +53,9 @@ inline Foam::scalar Foam::CH4N2O::h(scalar p, scalar T) const
}
-inline Foam::scalar Foam::CH4N2O::cpg(scalar p, scalar T) const
+inline Foam::scalar Foam::CH4N2O::Cpg(scalar p, scalar T) const
{
- return cpg_.f(p, T);
+ return Cpg_.f(p, T);
}
diff --git a/src/thermophysicalModels/liquids/H2O/H2O.C b/src/thermophysicalModels/liquids/H2O/H2O.C
index ff68fa73243aed89c13295d1956704435698ba03..6820731f8bc916ef3adb0fc4d525c8b6c27287e9 100644
--- a/src/thermophysicalModels/liquids/H2O/H2O.C
+++ b/src/thermophysicalModels/liquids/H2O/H2O.C
@@ -57,7 +57,7 @@ Foam::H2O::H2O()
rho_(98.343885, 0.30542, 647.13, 0.081),
pv_(73.649, -7258.2, -7.3037, 4.1653e-06, 2),
hl_(647.13, 2889425.47876769, 0.3199, -0.212, 0.25795, 0),
- cp_
+ Cp_
(
15341.1046350264,
-116.019983347211,
@@ -75,7 +75,7 @@ Foam::H2O::H2O()
-0.000195892311962254,
1.04025534276991e-07
),
- cpg_
+ Cpg_
(
1851.73466555648,
1487.53816264224,
@@ -122,9 +122,9 @@ Foam::H2O::H2O
rho_(density),
pv_(vapourPressure),
hl_(heatOfVapourisation),
- cp_(heatCapacity),
+ Cp_(heatCapacity),
h_(enthalpy),
- cpg_(idealGasHeatCapacity),
+ Cpg_(idealGasHeatCapacity),
B_(secondVirialCoeff),
mu_(dynamicViscosity),
mug_(vapourDynamicViscosity),
@@ -141,9 +141,9 @@ Foam::H2O::H2O(Istream& is)
rho_(is),
pv_(is),
hl_(is),
- cp_(is),
+ Cp_(is),
h_(is),
- cpg_(is),
+ Cpg_(is),
B_(is),
mu_(is),
mug_(is),
@@ -160,9 +160,9 @@ Foam::H2O::H2O(const dictionary& dict)
rho_(dict.subDict("rho")),
pv_(dict.subDict("pv")),
hl_(dict.subDict("hl")),
- cp_(dict.subDict("cp")),
+ Cp_(dict.subDict("Cp")),
h_(dict.subDict("h")),
- cpg_(dict.subDict("cpg")),
+ Cpg_(dict.subDict("Cpg")),
B_(dict.subDict("B")),
mu_(dict.subDict("mu")),
mug_(dict.subDict("mug")),
diff --git a/src/thermophysicalModels/liquids/H2O/H2O.H b/src/thermophysicalModels/liquids/H2O/H2O.H
index 08e4145a9bb5fc508b8b5ee7293780e174452069..a25c9f48db6f1adc52eafb4a88753c9f99ece93a 100644
--- a/src/thermophysicalModels/liquids/H2O/H2O.H
+++ b/src/thermophysicalModels/liquids/H2O/H2O.H
@@ -64,9 +64,9 @@ class H2O
NSRDSfunc5 rho_;
NSRDSfunc1 pv_;
NSRDSfunc6 hl_;
- NSRDSfunc0 cp_;
+ NSRDSfunc0 Cp_;
NSRDSfunc0 h_;
- NSRDSfunc7 cpg_;
+ NSRDSfunc7 Cpg_;
NSRDSfunc4 B_;
NSRDSfunc1 mu_;
NSRDSfunc2 mug_;
@@ -125,13 +125,13 @@ public:
inline scalar hl(scalar p, scalar T) const;
//- Liquid heat capacity [J/(kg K)]
- inline scalar cp(scalar p, scalar T) const;
+ inline scalar Cp(scalar p, scalar T) const;
//- Liquid Enthalpy [J/(kg)]
inline scalar h(scalar p, scalar T) const;
//- Ideal gas heat capacity [J/(kg K)]
- inline scalar cpg(scalar p, scalar T) const;
+ inline scalar Cpg(scalar p, scalar T) const;
//- Second Virial Coefficient [m^3/kg]
inline scalar B(scalar p, scalar T) const;
@@ -167,8 +167,8 @@ public:
rho_.writeData(os); os << nl;
pv_.writeData(os); os << nl;
hl_.writeData(os); os << nl;
- cp_.writeData(os); os << nl;
- cpg_.writeData(os); os << nl;
+ Cp_.writeData(os); os << nl;
+ Cpg_.writeData(os); os << nl;
B_.writeData(os); os << nl;
mu_.writeData(os); os << nl;
mug_.writeData(os); os << nl;
diff --git a/src/thermophysicalModels/liquids/H2O/H2OI.H b/src/thermophysicalModels/liquids/H2O/H2OI.H
index d3e4683b68391f91f5b19ee2d132b03cf955dd3d..ce9dd1125cd34d3a1518d8192d36459c7c097ebe 100644
--- a/src/thermophysicalModels/liquids/H2O/H2OI.H
+++ b/src/thermophysicalModels/liquids/H2O/H2OI.H
@@ -41,9 +41,9 @@ inline Foam::scalar Foam::H2O::hl(scalar p, scalar T) const
}
-inline Foam::scalar Foam::H2O::cp(scalar p, scalar T) const
+inline Foam::scalar Foam::H2O::Cp(scalar p, scalar T) const
{
- return cp_.f(p, T);
+ return Cp_.f(p, T);
}
@@ -53,9 +53,9 @@ inline Foam::scalar Foam::H2O::h(scalar p, scalar T) const
}
-inline Foam::scalar Foam::H2O::cpg(scalar p, scalar T) const
+inline Foam::scalar Foam::H2O::Cpg(scalar p, scalar T) const
{
- return cpg_.f(p, T);
+ return Cpg_.f(p, T);
}
diff --git a/src/thermophysicalModels/liquids/IC8H18/IC8H18.C b/src/thermophysicalModels/liquids/IC8H18/IC8H18.C
index dd03caf74e249b9f6d8e62115a4be234bdab6f20..cfc4736d60549ff9a03910fa668a622b2ee7ce24 100644
--- a/src/thermophysicalModels/liquids/IC8H18/IC8H18.C
+++ b/src/thermophysicalModels/liquids/IC8H18/IC8H18.C
@@ -57,7 +57,7 @@ Foam::IC8H18::IC8H18()
rho_(67.2363666, 0.27373, 543.96, 0.2846),
pv_(120.81, -7550, -16.111, 0.017099, 1.0),
hl_(543.96, 375379.713037617, 0.1549, 0.138, 0.0666, 0.0),
- cp_
+ Cp_
(
1219.89652546156,
1.67205049417409,
@@ -75,7 +75,7 @@ Foam::IC8H18::IC8H18()
0.0,
0.0
),
- cpg_(997.10236275617, 4627.4653990598, 1594, 2933.52942721328, 677.94),
+ Cpg_(997.10236275617, 4627.4653990598, 1594, 2933.52942721328, 677.94),
B_
(
0.00234936225718063,
@@ -115,9 +115,9 @@ Foam::IC8H18::IC8H18
rho_(density),
pv_(vapourPressure),
hl_(heatOfVapourisation),
- cp_(heatCapacity),
+ Cp_(heatCapacity),
h_(enthalpy),
- cpg_(idealGasHeatCapacity),
+ Cpg_(idealGasHeatCapacity),
B_(secondVirialCoeff),
mu_(dynamicViscosity),
mug_(vapourDynamicViscosity),
@@ -134,9 +134,9 @@ Foam::IC8H18::IC8H18(Istream& is)
rho_(is),
pv_(is),
hl_(is),
- cp_(is),
+ Cp_(is),
h_(is),
- cpg_(is),
+ Cpg_(is),
B_(is),
mu_(is),
mug_(is),
@@ -153,9 +153,9 @@ Foam::IC8H18::IC8H18(const dictionary& dict)
rho_(dict.subDict("rho")),
pv_(dict.subDict("pv")),
hl_(dict.subDict("hl")),
- cp_(dict.subDict("cp")),
+ Cp_(dict.subDict("Cp")),
h_(dict.subDict("h")),
- cpg_(dict.subDict("cpg")),
+ Cpg_(dict.subDict("Cpg")),
B_(dict.subDict("B")),
mu_(dict.subDict("mu")),
mug_(dict.subDict("mug")),
diff --git a/src/thermophysicalModels/liquids/IC8H18/IC8H18.H b/src/thermophysicalModels/liquids/IC8H18/IC8H18.H
index 6a90aa0dae6e9f763d220bc849549d61c7c81be0..967a458b47c359b6c909da275fa7277a64891555 100644
--- a/src/thermophysicalModels/liquids/IC8H18/IC8H18.H
+++ b/src/thermophysicalModels/liquids/IC8H18/IC8H18.H
@@ -65,9 +65,9 @@ class IC8H18
NSRDSfunc5 rho_;
NSRDSfunc1 pv_;
NSRDSfunc6 hl_;
- NSRDSfunc0 cp_;
+ NSRDSfunc0 Cp_;
NSRDSfunc0 h_;
- NSRDSfunc7 cpg_;
+ NSRDSfunc7 Cpg_;
NSRDSfunc4 B_;
NSRDSfunc1 mu_;
NSRDSfunc2 mug_;
@@ -126,13 +126,13 @@ public:
inline scalar hl(scalar p, scalar T) const;
//- Liquid heat capacity [J/(kg K)]
- inline scalar cp(scalar p, scalar T) const;
+ inline scalar Cp(scalar p, scalar T) const;
//- Liquid Enthalpy [J/(kg)]
inline scalar h(scalar p, scalar T) const;
//- Ideal gas heat capacity [J/(kg K)]
- inline scalar cpg(scalar p, scalar T) const;
+ inline scalar Cpg(scalar p, scalar T) const;
//- Second Virial Coefficient [m^3/kg]
inline scalar B(scalar p, scalar T) const;
@@ -168,8 +168,8 @@ public:
rho_.writeData(os); os << nl;
pv_.writeData(os); os << nl;
hl_.writeData(os); os << nl;
- cp_.writeData(os); os << nl;
- cpg_.writeData(os); os << nl;
+ Cp_.writeData(os); os << nl;
+ Cpg_.writeData(os); os << nl;
B_.writeData(os); os << nl;
mu_.writeData(os); os << nl;
mug_.writeData(os); os << nl;
diff --git a/src/thermophysicalModels/liquids/IC8H18/IC8H18I.H b/src/thermophysicalModels/liquids/IC8H18/IC8H18I.H
index 2ff7b50602bfe7ae1753a94b760abc881da172c1..72e0999e4a7550ed0cbcf2b85ee5b5dace2764ed 100644
--- a/src/thermophysicalModels/liquids/IC8H18/IC8H18I.H
+++ b/src/thermophysicalModels/liquids/IC8H18/IC8H18I.H
@@ -41,9 +41,9 @@ inline Foam::scalar Foam::IC8H18::hl(scalar p, scalar T) const
}
-inline Foam::scalar Foam::IC8H18::cp(scalar p, scalar T) const
+inline Foam::scalar Foam::IC8H18::Cp(scalar p, scalar T) const
{
- return cp_.f(p, T);
+ return Cp_.f(p, T);
}
@@ -53,9 +53,9 @@ inline Foam::scalar Foam::IC8H18::h(scalar p, scalar T) const
}
-inline Foam::scalar Foam::IC8H18::cpg(scalar p, scalar T) const
+inline Foam::scalar Foam::IC8H18::Cpg(scalar p, scalar T) const
{
- return cpg_.f(p, T);
+ return Cpg_.f(p, T);
}
diff --git a/src/thermophysicalModels/liquids/IDEA/IDEA.C b/src/thermophysicalModels/liquids/IDEA/IDEA.C
index 959f8f3aea2445dc7669ab3547503b8e72bd1138..8e113b90c880c3f1403fd913e48424ba385abe95 100644
--- a/src/thermophysicalModels/liquids/IDEA/IDEA.C
+++ b/src/thermophysicalModels/liquids/IDEA/IDEA.C
@@ -72,9 +72,9 @@ Foam::IDEA::IDEA()
-1.1656446689e+01,
4.3667661492
),
- cp_(1.6604957e+3, -6.250871e-1, 6.1778552e-3, 0.0, 0.0, 0.0),
+ Cp_(1.6604957e+3, -6.250871e-1, 6.1778552e-3, 0.0, 0.0, 0.0),
h_(0.0, 0.0, 0.0, 0.0, 0.0, 0.0),
- cpg_
+ Cpg_
(
1.0457515243e+03,
3.4410492875e+03,
@@ -135,9 +135,9 @@ Foam::IDEA::IDEA
rho_(density),
pv_(vapourPressure),
hl_(heatOfVapourisation),
- cp_(heatCapacity),
+ Cp_(heatCapacity),
h_(enthalpy),
- cpg_(idealGasHeatCapacity),
+ Cpg_(idealGasHeatCapacity),
B_(secondVirialCoeff),
mu_(dynamicViscosity),
mug_(vapourDynamicViscosity),
@@ -154,9 +154,9 @@ Foam::IDEA::IDEA(Istream& is)
rho_(is),
pv_(is),
hl_(is),
- cp_(is),
+ Cp_(is),
h_(is),
- cpg_(is),
+ Cpg_(is),
B_(is),
mu_(is),
mug_(is),
@@ -173,9 +173,9 @@ Foam::IDEA::IDEA(const dictionary& dict)
rho_(dict.subDict("rho")),
pv_(dict.subDict("pv")),
hl_(dict.subDict("hl")),
- cp_(dict.subDict("cp")),
+ Cp_(dict.subDict("Cp")),
h_(dict.subDict("h")),
- cpg_(dict.subDict("cpg")),
+ Cpg_(dict.subDict("Cpg")),
B_(dict.subDict("B")),
mu_(dict.subDict("mu")),
mug_(dict.subDict("mug")),
diff --git a/src/thermophysicalModels/liquids/IDEA/IDEA.H b/src/thermophysicalModels/liquids/IDEA/IDEA.H
index 41bfb4b326e29d1981f8c143855cf2d3f5b6b65e..f5e6d9152ea725d89f97389dff5922ab0e1b09f4 100644
--- a/src/thermophysicalModels/liquids/IDEA/IDEA.H
+++ b/src/thermophysicalModels/liquids/IDEA/IDEA.H
@@ -87,9 +87,9 @@ class IDEA
NSRDSfunc5 rho_;
NSRDSfunc1 pv_;
NSRDSfunc6 hl_;
- NSRDSfunc0 cp_;
+ NSRDSfunc0 Cp_;
NSRDSfunc0 h_;
- NSRDSfunc7 cpg_;
+ NSRDSfunc7 Cpg_;
NSRDSfunc4 B_;
NSRDSfunc1 mu_;
NSRDSfunc2 mug_;
@@ -148,13 +148,13 @@ public:
inline scalar hl(scalar p, scalar T) const;
//- Liquid heat capacity [J/(kg K)]
- inline scalar cp(scalar p, scalar T) const;
+ inline scalar Cp(scalar p, scalar T) const;
//- Liquid Enthalpy [J/(kg)]
inline scalar h(scalar p, scalar T) const;
//- Ideal gas heat capacity [J/(kg K)]
- inline scalar cpg(scalar p, scalar T) const;
+ inline scalar Cpg(scalar p, scalar T) const;
//- Second Virial Coefficient [m^3/kg]
inline scalar B(scalar p, scalar T) const;
@@ -190,8 +190,8 @@ public:
rho_.writeData(os); os << nl;
pv_.writeData(os); os << nl;
hl_.writeData(os); os << nl;
- cp_.writeData(os); os << nl;
- cpg_.writeData(os); os << nl;
+ Cp_.writeData(os); os << nl;
+ Cpg_.writeData(os); os << nl;
mu_.writeData(os); os << nl;
mug_.writeData(os); os << nl;
K_.writeData(os); os << nl;
diff --git a/src/thermophysicalModels/liquids/IDEA/IDEAI.H b/src/thermophysicalModels/liquids/IDEA/IDEAI.H
index 9861b03c8eb34443d34c43c30aa62eae851b3c33..5f8b8bfb9d3995687b755c99bc5105d4f040c83c 100644
--- a/src/thermophysicalModels/liquids/IDEA/IDEAI.H
+++ b/src/thermophysicalModels/liquids/IDEA/IDEAI.H
@@ -41,9 +41,9 @@ inline Foam::scalar Foam::IDEA::hl(scalar p, scalar T) const
}
-inline Foam::scalar Foam::IDEA::cp(scalar p, scalar T) const
+inline Foam::scalar Foam::IDEA::Cp(scalar p, scalar T) const
{
- return cp_.f(p, T);
+ return Cp_.f(p, T);
}
@@ -53,9 +53,9 @@ inline Foam::scalar Foam::IDEA::h(scalar p, scalar T) const
}
-inline Foam::scalar Foam::IDEA::cpg(scalar p, scalar T) const
+inline Foam::scalar Foam::IDEA::Cpg(scalar p, scalar T) const
{
- return cpg_.f(p, T);
+ return Cpg_.f(p, T);
}
diff --git a/src/thermophysicalModels/liquids/MB/MB.C b/src/thermophysicalModels/liquids/MB/MB.C
index fe9c3fb574bf255ad10c345f1d05ac222ee8fb15..c4d6fe38f4b093b68a2e5a57c66fabaea77d24f1 100644
--- a/src/thermophysicalModels/liquids/MB/MB.C
+++ b/src/thermophysicalModels/liquids/MB/MB.C
@@ -57,9 +57,9 @@ Foam::MB::MB()
rho_(76.6099633, 0.257, 554.5, 0.2772),
pv_(107.51, -8112.9, -12.77, 9.2919e-06, 2.0),
hl_(554.5, 508307.794738233, 0.392, 0.0, 0.0, 0.0),
- cp_(1135.77394182096, 2.89818178257762, 0.0, 0.0, 0.0, 0.0),
+ Cp_(1135.77394182096, 2.89818178257762, 0.0, 0.0, 0.0, 0.0),
h_(-5255966.14542938, 1135.77394182096, 1.44909089128881, 0.0, 0.0, 0.0),
- cpg_(875.329227575808, 2849.22600922327, 1570.0, 2029.70636327142, 678.3),
+ Cpg_(875.329227575808, 2849.22600922327, 1570.0, 2029.70636327142, 678.3),
B_
(
0.00220496803188,
@@ -99,9 +99,9 @@ Foam::MB::MB
rho_(density),
pv_(vapourPressure),
hl_(heatOfVapourisation),
- cp_(heatCapacity),
+ Cp_(heatCapacity),
h_(enthalpy),
- cpg_(idealGasHeatCapacity),
+ Cpg_(idealGasHeatCapacity),
B_(secondVirialCoeff),
mu_(dynamicViscosity),
mug_(vapourDynamicViscosity),
@@ -118,9 +118,9 @@ Foam::MB::MB(Istream& is)
rho_(is),
pv_(is),
hl_(is),
- cp_(is),
+ Cp_(is),
h_(is),
- cpg_(is),
+ Cpg_(is),
B_(is),
mu_(is),
mug_(is),
@@ -137,9 +137,9 @@ Foam::MB::MB(const dictionary& dict)
rho_(dict.subDict("rho")),
pv_(dict.subDict("pv")),
hl_(dict.subDict("hl")),
- cp_(dict.subDict("cp")),
+ Cp_(dict.subDict("Cp")),
h_(dict.subDict("h")),
- cpg_(dict.subDict("cpg")),
+ Cpg_(dict.subDict("Cpg")),
B_(dict.subDict("B")),
mu_(dict.subDict("mu")),
mug_(dict.subDict("mug")),
diff --git a/src/thermophysicalModels/liquids/MB/MB.H b/src/thermophysicalModels/liquids/MB/MB.H
index 121a914154207d666d9306d86b79a7c0e8833977..15245c6e47b16eb1fcb35acc39fe07974daa2ecd 100644
--- a/src/thermophysicalModels/liquids/MB/MB.H
+++ b/src/thermophysicalModels/liquids/MB/MB.H
@@ -65,9 +65,9 @@ class MB
NSRDSfunc5 rho_;
NSRDSfunc1 pv_;
NSRDSfunc6 hl_;
- NSRDSfunc0 cp_;
+ NSRDSfunc0 Cp_;
NSRDSfunc0 h_;
- NSRDSfunc7 cpg_;
+ NSRDSfunc7 Cpg_;
NSRDSfunc4 B_;
NSRDSfunc1 mu_;
NSRDSfunc2 mug_;
@@ -126,13 +126,13 @@ public:
inline scalar hl(scalar p, scalar T) const;
//- Liquid heat capacity [J/(kg K)]
- inline scalar cp(scalar p, scalar T) const;
+ inline scalar Cp(scalar p, scalar T) const;
//- Liquid Enthalpy [J/(kg)]
inline scalar h(scalar p, scalar T) const;
//- Ideal gas heat capacity [J/(kg K)]
- inline scalar cpg(scalar p, scalar T) const;
+ inline scalar Cpg(scalar p, scalar T) const;
//- Second Virial Coefficient [m^3/kg]
inline scalar B(scalar p, scalar T) const;
@@ -168,8 +168,8 @@ public:
rho_.writeData(os); os << nl;
pv_.writeData(os); os << nl;
hl_.writeData(os); os << nl;
- cp_.writeData(os); os << nl;
- cpg_.writeData(os); os << nl;
+ Cp_.writeData(os); os << nl;
+ Cpg_.writeData(os); os << nl;
B_.writeData(os); os << nl;
mu_.writeData(os); os << nl;
mug_.writeData(os); os << nl;
diff --git a/src/thermophysicalModels/liquids/MB/MBI.H b/src/thermophysicalModels/liquids/MB/MBI.H
index f08998b1c20fe1824e5d84f76b803b054b7c8944..89ea496c75aaf6a09b4ebcd21105a5cc731e83d9 100644
--- a/src/thermophysicalModels/liquids/MB/MBI.H
+++ b/src/thermophysicalModels/liquids/MB/MBI.H
@@ -41,9 +41,9 @@ inline Foam::scalar Foam::MB::hl(scalar p, scalar T) const
}
-inline Foam::scalar Foam::MB::cp(scalar p, scalar T) const
+inline Foam::scalar Foam::MB::Cp(scalar p, scalar T) const
{
- return cp_.f(p, T);
+ return Cp_.f(p, T);
}
@@ -53,9 +53,9 @@ inline Foam::scalar Foam::MB::h(scalar p, scalar T) const
}
-inline Foam::scalar Foam::MB::cpg(scalar p, scalar T) const
+inline Foam::scalar Foam::MB::Cpg(scalar p, scalar T) const
{
- return cpg_.f(p, T);
+ return Cpg_.f(p, T);
}
diff --git a/src/thermophysicalModels/liquids/N2/N2.C b/src/thermophysicalModels/liquids/N2/N2.C
index 918ff702a6c1c2a2cc5d072d3b8f7d87adbc440d..5e414122434535544e6c3d76951d0c17ee987e4d 100644
--- a/src/thermophysicalModels/liquids/N2/N2.C
+++ b/src/thermophysicalModels/liquids/N2/N2.C
@@ -57,7 +57,7 @@ Foam::N2::N2()
rho_(88.8716136, 0.28479, 126.1, 0.2925),
pv_(59.826, -1097.6, -8.6689, 0.046346, 1.0),
hl_(126.10, 336617.405582923, 1.201, -1.4811, 0.7085, 0.0),
- cp_
+ Cp_
(
-1192.26101235097,
125.187406296852,
@@ -75,7 +75,7 @@ Foam::N2::N2()
0.00189815806382523,
0.0
),
- cpg_(1038.94481330763, 307.52123938031, 1701.6, 3.69351038766331, 909.79),
+ Cpg_(1038.94481330763, 307.52123938031, 1701.6, 3.69351038766331, 909.79),
B_
(
0.00166702363104162,
@@ -115,9 +115,9 @@ Foam::N2::N2
rho_(density),
pv_(vapourPressure),
hl_(heatOfVapourisation),
- cp_(heatCapacity),
+ Cp_(heatCapacity),
h_(enthalpy),
- cpg_(idealGasHeatCapacity),
+ Cpg_(idealGasHeatCapacity),
B_(secondVirialCoeff),
mu_(dynamicViscosity),
mug_(vapourDynamicViscosity),
@@ -134,9 +134,9 @@ Foam::N2::N2(Istream& is)
rho_(is),
pv_(is),
hl_(is),
- cp_(is),
+ Cp_(is),
h_(is),
- cpg_(is),
+ Cpg_(is),
B_(is),
mu_(is),
mug_(is),
@@ -153,9 +153,9 @@ Foam::N2::N2(const dictionary& dict)
rho_(dict.subDict("rho")),
pv_(dict.subDict("pv")),
hl_(dict.subDict("hl")),
- cp_(dict.subDict("cp")),
+ Cp_(dict.subDict("Cp")),
h_(dict.subDict("h")),
- cpg_(dict.subDict("cpg")),
+ Cpg_(dict.subDict("Cpg")),
B_(dict.subDict("B")),
mu_(dict.subDict("mu")),
mug_(dict.subDict("mug")),
diff --git a/src/thermophysicalModels/liquids/N2/N2.H b/src/thermophysicalModels/liquids/N2/N2.H
index 66a4d84434af4080b9a725c6ddfbb5cd2e89fe8f..6f318f1a452cd563618de04699e5b8b45e571a26 100644
--- a/src/thermophysicalModels/liquids/N2/N2.H
+++ b/src/thermophysicalModels/liquids/N2/N2.H
@@ -65,9 +65,9 @@ class N2
NSRDSfunc5 rho_;
NSRDSfunc1 pv_;
NSRDSfunc6 hl_;
- NSRDSfunc0 cp_;
+ NSRDSfunc0 Cp_;
NSRDSfunc0 h_;
- NSRDSfunc7 cpg_;
+ NSRDSfunc7 Cpg_;
NSRDSfunc4 B_;
NSRDSfunc1 mu_;
NSRDSfunc2 mug_;
@@ -126,13 +126,13 @@ public:
inline scalar hl(scalar p, scalar T) const;
//- Liquid heat capacity [J/(kg K)]
- inline scalar cp(scalar p, scalar T) const;
+ inline scalar Cp(scalar p, scalar T) const;
//- Liquid Enthalpy [J/(kg)]
inline scalar h(scalar p, scalar T) const;
//- Ideal gas heat capacity [J/(kg K)]
- inline scalar cpg(scalar p, scalar T) const;
+ inline scalar Cpg(scalar p, scalar T) const;
//- Second Virial Coefficient [m^3/kg]
inline scalar B(scalar p, scalar T) const;
@@ -168,8 +168,8 @@ public:
rho_.writeData(os); os << nl;
pv_.writeData(os); os << nl;
hl_.writeData(os); os << nl;
- cp_.writeData(os); os << nl;
- cpg_.writeData(os); os << nl;
+ Cp_.writeData(os); os << nl;
+ Cpg_.writeData(os); os << nl;
B_.writeData(os); os << nl;
mu_.writeData(os); os << nl;
mug_.writeData(os); os << nl;
diff --git a/src/thermophysicalModels/liquids/N2/N2I.H b/src/thermophysicalModels/liquids/N2/N2I.H
index d02df907a42bc70a14b7eea699899c0f24e60db4..264de66aca176d18eb510d14ade0d837e4ab93d4 100644
--- a/src/thermophysicalModels/liquids/N2/N2I.H
+++ b/src/thermophysicalModels/liquids/N2/N2I.H
@@ -41,9 +41,9 @@ inline Foam::scalar Foam::N2::hl(scalar p, scalar T) const
}
-inline Foam::scalar Foam::N2::cp(scalar p, scalar T) const
+inline Foam::scalar Foam::N2::Cp(scalar p, scalar T) const
{
- return cp_.f(p, T);
+ return Cp_.f(p, T);
}
@@ -53,9 +53,9 @@ inline Foam::scalar Foam::N2::h(scalar p, scalar T) const
}
-inline Foam::scalar Foam::N2::cpg(scalar p, scalar T) const
+inline Foam::scalar Foam::N2::Cpg(scalar p, scalar T) const
{
- return cpg_.f(p, T);
+ return Cpg_.f(p, T);
}
diff --git a/src/thermophysicalModels/liquids/aC10H7CH3/aC10H7CH3.C b/src/thermophysicalModels/liquids/aC10H7CH3/aC10H7CH3.C
index 5d04492def8b167e8e9913c5a703b911003aaf7c..9532106b78c5f19c05b25602303cecc21f510395 100644
--- a/src/thermophysicalModels/liquids/aC10H7CH3/aC10H7CH3.C
+++ b/src/thermophysicalModels/liquids/aC10H7CH3/aC10H7CH3.C
@@ -57,7 +57,7 @@ Foam::aC10H7CH3::aC10H7CH3()
rho_(60.92559, 0.22408, 772.04, 0.25709),
pv_(73.716, -9103.2, -7.2253, 2.062e-06, 2),
hl_(772.04, 511744.022503516, 0.4164, 0, 0, 0),
- cp_(965.893108298172, 1.16216596343179, 0.00298523206751055, 0, 0, 0),
+ Cp_(965.893108298172, 1.16216596343179, 0.00298523206751055, 0, 0, 0),
h_
(
38161.6838138517,
@@ -67,7 +67,7 @@ Foam::aC10H7CH3::aC10H7CH3()
0,
0
),
- cpg_(743.389592123769, 2703.5864978903, 1548.5, 2031.64556962025, 722.06),
+ Cpg_(743.389592123769, 2703.5864978903, 1548.5, 2031.64556962025, 722.06),
B_
(
0.00205555555555556,
@@ -107,9 +107,9 @@ Foam::aC10H7CH3::aC10H7CH3
rho_(density),
pv_(vapourPressure),
hl_(heatOfVapourisation),
- cp_(heatCapacity),
+ Cp_(heatCapacity),
h_(enthalpy),
- cpg_(idealGasHeatCapacity),
+ Cpg_(idealGasHeatCapacity),
B_(secondVirialCoeff),
mu_(dynamicViscosity),
mug_(vapourDynamicViscosity),
@@ -126,9 +126,9 @@ Foam::aC10H7CH3::aC10H7CH3(Istream& is)
rho_(is),
pv_(is),
hl_(is),
- cp_(is),
+ Cp_(is),
h_(is),
- cpg_(is),
+ Cpg_(is),
B_(is),
mu_(is),
mug_(is),
@@ -145,9 +145,9 @@ Foam::aC10H7CH3::aC10H7CH3(const dictionary& dict)
rho_(dict.subDict("rho")),
pv_(dict.subDict("pv")),
hl_(dict.subDict("hl")),
- cp_(dict.subDict("cp")),
+ Cp_(dict.subDict("Cp")),
h_(dict.subDict("h")),
- cpg_(dict.subDict("cpg")),
+ Cpg_(dict.subDict("Cpg")),
B_(dict.subDict("B")),
mu_(dict.subDict("mu")),
mug_(dict.subDict("mug")),
diff --git a/src/thermophysicalModels/liquids/aC10H7CH3/aC10H7CH3.H b/src/thermophysicalModels/liquids/aC10H7CH3/aC10H7CH3.H
index 702f07faec189274583174e77bf6f2948e2df342..05ec2c90a07b307c1cad792b127bb7a43d752173 100644
--- a/src/thermophysicalModels/liquids/aC10H7CH3/aC10H7CH3.H
+++ b/src/thermophysicalModels/liquids/aC10H7CH3/aC10H7CH3.H
@@ -65,9 +65,9 @@ class aC10H7CH3
NSRDSfunc5 rho_;
NSRDSfunc1 pv_;
NSRDSfunc6 hl_;
- NSRDSfunc0 cp_;
+ NSRDSfunc0 Cp_;
NSRDSfunc0 h_;
- NSRDSfunc7 cpg_;
+ NSRDSfunc7 Cpg_;
NSRDSfunc4 B_;
NSRDSfunc1 mu_;
NSRDSfunc2 mug_;
@@ -126,13 +126,13 @@ public:
inline scalar hl(scalar p, scalar T) const;
//- Liquid heat capacity [J/(kg K)]
- inline scalar cp(scalar p, scalar T) const;
+ inline scalar Cp(scalar p, scalar T) const;
//- Liquid Enthalpy [J/(kg)]
inline scalar h(scalar p, scalar T) const;
//- Ideal gas heat capacity [J/(kg K)]
- inline scalar cpg(scalar p, scalar T) const;
+ inline scalar Cpg(scalar p, scalar T) const;
//- Second Virial Coefficient [m^3/kg]
inline scalar B(scalar p, scalar T) const;
@@ -168,8 +168,8 @@ public:
rho_.writeData(os); os << nl;
pv_.writeData(os); os << nl;
hl_.writeData(os); os << nl;
- cp_.writeData(os); os << nl;
- cpg_.writeData(os); os << nl;
+ Cp_.writeData(os); os << nl;
+ Cpg_.writeData(os); os << nl;
B_.writeData(os); os << nl;
mu_.writeData(os); os << nl;
mug_.writeData(os); os << nl;
diff --git a/src/thermophysicalModels/liquids/aC10H7CH3/aC10H7CH3I.H b/src/thermophysicalModels/liquids/aC10H7CH3/aC10H7CH3I.H
index 138bede0915cff4345b4557f6e8fd53285a60eb5..5d837d8af376032efe0ab433e356268597eda7d4 100644
--- a/src/thermophysicalModels/liquids/aC10H7CH3/aC10H7CH3I.H
+++ b/src/thermophysicalModels/liquids/aC10H7CH3/aC10H7CH3I.H
@@ -41,9 +41,9 @@ inline Foam::scalar Foam::aC10H7CH3::hl(scalar p, scalar T) const
}
-inline Foam::scalar Foam::aC10H7CH3::cp(scalar p, scalar T) const
+inline Foam::scalar Foam::aC10H7CH3::Cp(scalar p, scalar T) const
{
- return cp_.f(p, T);
+ return Cp_.f(p, T);
}
@@ -53,9 +53,9 @@ inline Foam::scalar Foam::aC10H7CH3::h(scalar p, scalar T) const
}
-inline Foam::scalar Foam::aC10H7CH3::cpg(scalar p, scalar T) const
+inline Foam::scalar Foam::aC10H7CH3::Cpg(scalar p, scalar T) const
{
- return cpg_.f(p, T);
+ return Cpg_.f(p, T);
}
diff --git a/src/thermophysicalModels/liquids/bC10H7CH3/bC10H7CH3.C b/src/thermophysicalModels/liquids/bC10H7CH3/bC10H7CH3.C
index 540f3d249e2a0647b935480afb8dea7bf2630f9c..656a57d23bbe4f4a13e227d6264c73284fe51377 100644
--- a/src/thermophysicalModels/liquids/bC10H7CH3/bC10H7CH3.C
+++ b/src/thermophysicalModels/liquids/bC10H7CH3/bC10H7CH3.C
@@ -57,7 +57,7 @@ Foam::bC10H7CH3::bC10H7CH3()
rho_(67.36014, 0.23843, 761, 0.2559),
pv_(134.31, -12103, -16.195, 6.9659e-06, 2),
hl_(761.0, 513150.492264416, 0.4044, 0.0, 0.0, 0.0),
- cp_(811.322081575246, 2.30225035161744, 0.0008628691983122, 0.0, 0.0, 0.0),
+ Cp_(811.322081575246, 2.30225035161744, 0.0008628691983122, 0.0, 0.0, 0.0),
h_
(
45001.2311880177,
@@ -67,7 +67,7 @@ Foam::bC10H7CH3::bC10H7CH3()
0.0,
0.0
),
- cpg_(760.126582278481, 2699.08579465542, 1564.1, 1994.51476793249, 727.49),
+ Cpg_(760.126582278481, 2699.08579465542, 1564.1, 1994.51476793249, 727.49),
B_
(
0.00229430379746835,
@@ -107,9 +107,9 @@ Foam::bC10H7CH3::bC10H7CH3
rho_(density),
pv_(vapourPressure),
hl_(heatOfVapourisation),
- cp_(heatCapacity),
+ Cp_(heatCapacity),
h_(enthalpy),
- cpg_(idealGasHeatCapacity),
+ Cpg_(idealGasHeatCapacity),
B_(secondVirialCoeff),
mu_(dynamicViscosity),
mug_(vapourDynamicViscosity),
@@ -126,9 +126,9 @@ Foam::bC10H7CH3::bC10H7CH3(Istream& is)
rho_(is),
pv_(is),
hl_(is),
- cp_(is),
+ Cp_(is),
h_(is),
- cpg_(is),
+ Cpg_(is),
B_(is),
mu_(is),
mug_(is),
@@ -145,9 +145,9 @@ Foam::bC10H7CH3::bC10H7CH3(const dictionary& dict)
rho_(dict.subDict("rho")),
pv_(dict.subDict("pv")),
hl_(dict.subDict("hl")),
- cp_(dict.subDict("cp")),
+ Cp_(dict.subDict("Cp")),
h_(dict.subDict("h")),
- cpg_(dict.subDict("cpg")),
+ Cpg_(dict.subDict("Cpg")),
B_(dict.subDict("B")),
mu_(dict.subDict("mu")),
mug_(dict.subDict("mug")),
diff --git a/src/thermophysicalModels/liquids/bC10H7CH3/bC10H7CH3.H b/src/thermophysicalModels/liquids/bC10H7CH3/bC10H7CH3.H
index a986564046061af5a7d79a90c2adccf6ab6b3982..d3ff3512913a0f195865e0c8b73e4e60bae9cbbf 100644
--- a/src/thermophysicalModels/liquids/bC10H7CH3/bC10H7CH3.H
+++ b/src/thermophysicalModels/liquids/bC10H7CH3/bC10H7CH3.H
@@ -65,9 +65,9 @@ class bC10H7CH3
NSRDSfunc5 rho_;
NSRDSfunc1 pv_;
NSRDSfunc6 hl_;
- NSRDSfunc0 cp_;
+ NSRDSfunc0 Cp_;
NSRDSfunc0 h_;
- NSRDSfunc7 cpg_;
+ NSRDSfunc7 Cpg_;
NSRDSfunc4 B_;
NSRDSfunc1 mu_;
NSRDSfunc2 mug_;
@@ -126,13 +126,13 @@ public:
inline scalar hl(scalar p, scalar T) const;
//- Liquid heat capacity [J/(kg K)]
- inline scalar cp(scalar p, scalar T) const;
+ inline scalar Cp(scalar p, scalar T) const;
//- Liquid Enthalpy [J/(kg)]
inline scalar h(scalar p, scalar T) const;
//- Ideal gas heat capacity [J/(kg K)]
- inline scalar cpg(scalar p, scalar T) const;
+ inline scalar Cpg(scalar p, scalar T) const;
//- Second Virial Coefficient [m^3/kg]
inline scalar B(scalar p, scalar T) const;
@@ -168,8 +168,8 @@ public:
rho_.writeData(os); os << nl;
pv_.writeData(os); os << nl;
hl_.writeData(os); os << nl;
- cp_.writeData(os); os << nl;
- cpg_.writeData(os); os << nl;
+ Cp_.writeData(os); os << nl;
+ Cpg_.writeData(os); os << nl;
B_.writeData(os); os << nl;
mu_.writeData(os); os << nl;
mug_.writeData(os); os << nl;
diff --git a/src/thermophysicalModels/liquids/bC10H7CH3/bC10H7CH3I.H b/src/thermophysicalModels/liquids/bC10H7CH3/bC10H7CH3I.H
index fd01df9d5185200833e08fa7f92fa729b942f5e9..0ae9b284a782d5b99dfb7ba3c4d0ac23df95d0fd 100644
--- a/src/thermophysicalModels/liquids/bC10H7CH3/bC10H7CH3I.H
+++ b/src/thermophysicalModels/liquids/bC10H7CH3/bC10H7CH3I.H
@@ -41,9 +41,9 @@ inline Foam::scalar Foam::bC10H7CH3::hl(scalar p, scalar T) const
}
-inline Foam::scalar Foam::bC10H7CH3::cp(scalar p, scalar T) const
+inline Foam::scalar Foam::bC10H7CH3::Cp(scalar p, scalar T) const
{
- return cp_.f(p, T);
+ return Cp_.f(p, T);
}
@@ -53,9 +53,9 @@ inline Foam::scalar Foam::bC10H7CH3::h(scalar p, scalar T) const
}
-inline Foam::scalar Foam::bC10H7CH3::cpg(scalar p, scalar T) const
+inline Foam::scalar Foam::bC10H7CH3::Cpg(scalar p, scalar T) const
{
- return cpg_.f(p, T);
+ return Cpg_.f(p, T);
}
diff --git a/src/thermophysicalModels/liquids/iC3H8O/iC3H8O.C b/src/thermophysicalModels/liquids/iC3H8O/iC3H8O.C
index fc89e36a5ef4cacc236720c524d5c2ff59b687b2..1faec0b0c293615265f51cf6c55ebb89a34f67be 100644
--- a/src/thermophysicalModels/liquids/iC3H8O/iC3H8O.C
+++ b/src/thermophysicalModels/liquids/iC3H8O/iC3H8O.C
@@ -57,7 +57,7 @@ Foam::iC3H8O::iC3H8O()
rho_(70.91328, 0.26475, 508.31, 0.243),
pv_(92.935, -8177.1, -10.031, 3.9988e-06, 2.0),
hl_(508.31, 948149.627263046, 0.087, 0.3007, 0.0, 0.0),
- cp_
+ Cp_
(
7760.91586794462,
-68.3672790202343,
@@ -75,7 +75,7 @@ Foam::iC3H8O::iC3H8O()
-5.87643104366347e-05,
0.0
),
- cpg_(789.73642172524, 3219.8482428115, 1124, 1560.83599574015, 460.0),
+ Cpg_(789.73642172524, 3219.8482428115, 1124, 1560.83599574015, 460.0),
B_
(
0.000502529286474973,
@@ -115,9 +115,9 @@ Foam::iC3H8O::iC3H8O
rho_(density),
pv_(vapourPressure),
hl_(heatOfVapourisation),
- cp_(heatCapacity),
+ Cp_(heatCapacity),
h_(enthalpy),
- cpg_(idealGasHeatCapacity),
+ Cpg_(idealGasHeatCapacity),
B_(secondVirialCoeff),
mu_(dynamicViscosity),
mug_(vapourDynamicViscosity),
@@ -134,9 +134,9 @@ Foam::iC3H8O::iC3H8O(Istream& is)
rho_(is),
pv_(is),
hl_(is),
- cp_(is),
+ Cp_(is),
h_(is),
- cpg_(is),
+ Cpg_(is),
B_(is),
mu_(is),
mug_(is),
@@ -153,9 +153,9 @@ Foam::iC3H8O::iC3H8O(const dictionary& dict)
rho_(dict.subDict("rho")),
pv_(dict.subDict("pv")),
hl_(dict.subDict("hl")),
- cp_(dict.subDict("cp")),
+ Cp_(dict.subDict("Cp")),
h_(dict.subDict("h")),
- cpg_(dict.subDict("cpg")),
+ Cpg_(dict.subDict("Cpg")),
B_(dict.subDict("B")),
mu_(dict.subDict("mu")),
mug_(dict.subDict("mug")),
diff --git a/src/thermophysicalModels/liquids/iC3H8O/iC3H8O.H b/src/thermophysicalModels/liquids/iC3H8O/iC3H8O.H
index 4b2e45cd74c4b4d8f8c5ca0c5f2576562d73a6c9..6caa05922244d0961069aa193a8ce18b38eb8015 100644
--- a/src/thermophysicalModels/liquids/iC3H8O/iC3H8O.H
+++ b/src/thermophysicalModels/liquids/iC3H8O/iC3H8O.H
@@ -64,9 +64,9 @@ class iC3H8O
NSRDSfunc5 rho_;
NSRDSfunc1 pv_;
NSRDSfunc6 hl_;
- NSRDSfunc0 cp_;
+ NSRDSfunc0 Cp_;
NSRDSfunc0 h_;
- NSRDSfunc7 cpg_;
+ NSRDSfunc7 Cpg_;
NSRDSfunc4 B_;
NSRDSfunc1 mu_;
NSRDSfunc2 mug_;
@@ -124,13 +124,13 @@ public:
inline scalar hl(scalar p, scalar T) const;
//- Liquid heat capacity [J/(kg K)]
- inline scalar cp(scalar p, scalar T) const;
+ inline scalar Cp(scalar p, scalar T) const;
//- Liquid Enthalpy [J/(kg)]
inline scalar h(scalar p, scalar T) const;
//- Ideal gas heat capacity [J/(kg K)]
- inline scalar cpg(scalar p, scalar T) const;
+ inline scalar Cpg(scalar p, scalar T) const;
//- Second Virial Coefficient [m^3/kg]
inline scalar B(scalar p, scalar T) const;
@@ -167,8 +167,8 @@ public:
rho_.writeData(os); os << nl;
pv_.writeData(os); os << nl;
hl_.writeData(os); os << nl;
- cp_.writeData(os); os << nl;
- cpg_.writeData(os); os << nl;
+ Cp_.writeData(os); os << nl;
+ Cpg_.writeData(os); os << nl;
B_.writeData(os); os << nl;
mu_.writeData(os); os << nl;
mug_.writeData(os); os << nl;
diff --git a/src/thermophysicalModels/liquids/iC3H8O/iC3H8OI.H b/src/thermophysicalModels/liquids/iC3H8O/iC3H8OI.H
index 13b8bd2c9d81775dee67cbf30587d40f65fa146d..a25862a37c853aed2d3f083662bf2f8cd91cead5 100644
--- a/src/thermophysicalModels/liquids/iC3H8O/iC3H8OI.H
+++ b/src/thermophysicalModels/liquids/iC3H8O/iC3H8OI.H
@@ -41,9 +41,9 @@ inline Foam::scalar Foam::iC3H8O::hl(scalar p, scalar T) const
}
-inline Foam::scalar Foam::iC3H8O::cp(scalar p, scalar T) const
+inline Foam::scalar Foam::iC3H8O::Cp(scalar p, scalar T) const
{
- return cp_.f(p, T);
+ return Cp_.f(p, T);
}
@@ -53,9 +53,9 @@ inline Foam::scalar Foam::iC3H8O::h(scalar p, scalar T) const
}
-inline Foam::scalar Foam::iC3H8O::cpg(scalar p, scalar T) const
+inline Foam::scalar Foam::iC3H8O::Cpg(scalar p, scalar T) const
{
- return cpg_.f(p, T);
+ return Cpg_.f(p, T);
}
diff --git a/src/thermophysicalModels/liquids/liquid/liquid.H b/src/thermophysicalModels/liquids/liquid/liquid.H
index 7db4131b995eb4e71a60c4d232229ddf6c61dc58..005058857e568ca745f35501bcf890f87f2cd8e1 100644
--- a/src/thermophysicalModels/liquids/liquid/liquid.H
+++ b/src/thermophysicalModels/liquids/liquid/liquid.H
@@ -213,13 +213,13 @@ public:
virtual scalar hl(scalar p, scalar T) const = 0;
//- Liquid heat capacity [J/(kg K)]
- virtual scalar cp(scalar p, scalar T) const = 0;
+ virtual scalar Cp(scalar p, scalar T) const = 0;
//- Liquid enthalpy [J/kg] - reference to 298.15 K
virtual scalar h(scalar p, scalar T) const = 0;
//- Ideal gas heat capacity [J/(kg K)]
- virtual scalar cpg(scalar p, scalar T) const = 0;
+ virtual scalar Cpg(scalar p, scalar T) const = 0;
//- Liquid viscosity [Pa s]
virtual scalar mu(scalar p, scalar T) const = 0;
diff --git a/src/thermophysicalModels/liquids/nC3H8O/nC3H8O.C b/src/thermophysicalModels/liquids/nC3H8O/nC3H8O.C
index ff696d10026f3e3579704cdeecc84cf082fa5f12..6d816baa76e4a3110b32f60fd1a96b6fc4af0f19 100644
--- a/src/thermophysicalModels/liquids/nC3H8O/nC3H8O.C
+++ b/src/thermophysicalModels/liquids/nC3H8O/nC3H8O.C
@@ -57,7 +57,7 @@ Foam::nC3H8O::nC3H8O()
rho_(75.300288, 0.272, 536.71, 0.2494),
pv_(77.46, -7960, -7.5235, 3e-07, 2.0),
hl_(536.71, 1098242.8115016, 0.647, -0.783, 0.613, 0.0),
- cp_
+ Cp_
(
216.320553780618,
18.5203674121406,
@@ -75,7 +75,7 @@ Foam::nC3H8O::nC3H8O()
3.16160809371672e-05,
0.0
),
- cpg_(961.794462193823, 3467.78487752929, 1542, 2046.72523961661, 649),
+ Cpg_(961.794462193823, 3467.78487752929, 1542, 2046.72523961661, 649),
B_
(
0.000933506389776358,
@@ -115,9 +115,9 @@ Foam::nC3H8O::nC3H8O
rho_(density),
pv_(vapourPressure),
hl_(heatOfVapourisation),
- cp_(heatCapacity),
+ Cp_(heatCapacity),
h_(enthalpy),
- cpg_(idealGasHeatCapacity),
+ Cpg_(idealGasHeatCapacity),
B_(secondVirialCoeff),
mu_(dynamicViscosity),
mug_(vapourDynamicViscosity),
@@ -134,9 +134,9 @@ Foam::nC3H8O::nC3H8O(Istream& is)
rho_(is),
pv_(is),
hl_(is),
- cp_(is),
+ Cp_(is),
h_(is),
- cpg_(is),
+ Cpg_(is),
B_(is),
mu_(is),
mug_(is),
@@ -153,9 +153,9 @@ Foam::nC3H8O::nC3H8O(const dictionary& dict)
rho_(dict.subDict("rho")),
pv_(dict.subDict("pv")),
hl_(dict.subDict("hl")),
- cp_(dict.subDict("cp")),
+ Cp_(dict.subDict("Cp")),
h_(dict.subDict("h")),
- cpg_(dict.subDict("cpg")),
+ Cpg_(dict.subDict("Cpg")),
B_(dict.subDict("B")),
mu_(dict.subDict("mu")),
mug_(dict.subDict("mug")),
diff --git a/src/thermophysicalModels/liquids/nC3H8O/nC3H8O.H b/src/thermophysicalModels/liquids/nC3H8O/nC3H8O.H
index c63f109fcfd29304456dd5d5c7c145002d72fdcf..f4751b0fcf093c9e2c13a36b051bface618b6647 100644
--- a/src/thermophysicalModels/liquids/nC3H8O/nC3H8O.H
+++ b/src/thermophysicalModels/liquids/nC3H8O/nC3H8O.H
@@ -64,9 +64,9 @@ class nC3H8O
NSRDSfunc5 rho_;
NSRDSfunc1 pv_;
NSRDSfunc6 hl_;
- NSRDSfunc0 cp_;
+ NSRDSfunc0 Cp_;
NSRDSfunc0 h_;
- NSRDSfunc7 cpg_;
+ NSRDSfunc7 Cpg_;
NSRDSfunc4 B_;
NSRDSfunc1 mu_;
NSRDSfunc2 mug_;
@@ -124,13 +124,13 @@ public:
inline scalar hl(scalar p, scalar T) const;
//- Liquid heat capacity [J/(kg K)]
- inline scalar cp(scalar p, scalar T) const;
+ inline scalar Cp(scalar p, scalar T) const;
//- Liquid Enthalpy [J/(kg)]
inline scalar h(scalar p, scalar T) const;
//- Ideal gas heat capacity [J/(kg K)]
- inline scalar cpg(scalar p, scalar T) const;
+ inline scalar Cpg(scalar p, scalar T) const;
//- Second Virial Coefficient [m^3/kg]
inline scalar B(scalar p, scalar T) const;
@@ -167,8 +167,8 @@ public:
rho_.writeData(os); os << nl;
pv_.writeData(os); os << nl;
hl_.writeData(os); os << nl;
- cp_.writeData(os); os << nl;
- cpg_.writeData(os); os << nl;
+ Cp_.writeData(os); os << nl;
+ Cpg_.writeData(os); os << nl;
B_.writeData(os); os << nl;
mu_.writeData(os); os << nl;
mug_.writeData(os); os << nl;
diff --git a/src/thermophysicalModels/liquids/nC3H8O/nC3H8OI.H b/src/thermophysicalModels/liquids/nC3H8O/nC3H8OI.H
index 23738672b4832d87367933f1daf4f80fd3263a34..c3379993103216f813912b0828439841ef173b06 100644
--- a/src/thermophysicalModels/liquids/nC3H8O/nC3H8OI.H
+++ b/src/thermophysicalModels/liquids/nC3H8O/nC3H8OI.H
@@ -41,9 +41,9 @@ inline Foam::scalar Foam::nC3H8O::hl(scalar p, scalar T) const
}
-inline Foam::scalar Foam::nC3H8O::cp(scalar p, scalar T) const
+inline Foam::scalar Foam::nC3H8O::Cp(scalar p, scalar T) const
{
- return cp_.f(p, T);
+ return Cp_.f(p, T);
}
@@ -53,9 +53,9 @@ inline Foam::scalar Foam::nC3H8O::h(scalar p, scalar T) const
}
-inline Foam::scalar Foam::nC3H8O::cpg(scalar p, scalar T) const
+inline Foam::scalar Foam::nC3H8O::Cpg(scalar p, scalar T) const
{
- return cpg_.f(p, T);
+ return Cpg_.f(p, T);
}
diff --git a/src/thermophysicalModels/solidMixture/solidMixture/solidMixture.C b/src/thermophysicalModels/solidMixture/solidMixture/solidMixture.C
index a0a60c15348159328a3c94ce0b6b7a7260217081..1132a9e870a466dbb8b07a9aa93b8e2900867431 100644
--- a/src/thermophysicalModels/solidMixture/solidMixture/solidMixture.C
+++ b/src/thermophysicalModels/solidMixture/solidMixture/solidMixture.C
@@ -98,7 +98,7 @@ Foam::scalar Foam::solidMixture::rho
}
-Foam::scalar Foam::solidMixture::cp
+Foam::scalar Foam::solidMixture::Cp
(
const scalarField& Y
) const
@@ -106,7 +106,7 @@ Foam::scalar Foam::solidMixture::cp
scalar val = 0.0;
forAll(properties_, i)
{
- val += properties_[i].cp()*Y[i];
+ val += properties_[i].Cp()*Y[i];
}
return val;
}
diff --git a/src/thermophysicalModels/solidMixture/solidMixture/solidMixture.H b/src/thermophysicalModels/solidMixture/solidMixture/solidMixture.H
index ba1d582ee58735f5c8b446cd9b64e181fb1b9bac..f7dc730920fab8350db8e10ef3f9b046106a0fee 100644
--- a/src/thermophysicalModels/solidMixture/solidMixture/solidMixture.H
+++ b/src/thermophysicalModels/solidMixture/solidMixture/solidMixture.H
@@ -116,7 +116,7 @@ public:
//- Calculate the mixture heat capacity [J/(kg K)] as a function
// of mass fractions
- scalar cp(const scalarField& Y) const;
+ scalar Cp(const scalarField& Y) const;
};
diff --git a/src/thermophysicalModels/solids/solid/solid.C b/src/thermophysicalModels/solids/solid/solid.C
index 0a3c4eaa463fb09b6c9bdc48e8065315009cc87e..cda244496221fbda8a1bdc298f81e14e204ebf6d 100644
--- a/src/thermophysicalModels/solids/solid/solid.C
+++ b/src/thermophysicalModels/solids/solid/solid.C
@@ -40,14 +40,14 @@ namespace Foam
Foam::solid::solid
(
scalar rho,
- scalar cp,
+ scalar Cp,
scalar K,
scalar Hf,
scalar emissivity
)
:
rho_(rho),
- cp_(cp),
+ Cp_(Cp),
K_(K),
Hf_(Hf),
emissivity_(emissivity)
@@ -57,7 +57,7 @@ Foam::solid::solid
Foam::solid::solid(Istream& is)
:
rho_(readScalar(is)),
- cp_(readScalar(is)),
+ Cp_(readScalar(is)),
K_(readScalar(is)),
Hf_(readScalar(is)),
emissivity_(readScalar(is))
@@ -67,7 +67,7 @@ Foam::solid::solid(Istream& is)
Foam::solid::solid(const dictionary& dict)
:
rho_(readScalar(dict.lookup("rho"))),
- cp_(readScalar(dict.lookup("cp"))),
+ Cp_(readScalar(dict.lookup("Cp"))),
K_(readScalar(dict.lookup("K"))),
Hf_(readScalar(dict.lookup("Hf"))),
emissivity_(readScalar(dict.lookup("emissivity")))
@@ -79,7 +79,7 @@ Foam::solid::solid(const dictionary& dict)
void Foam::solid::writeData(Ostream& os) const
{
os << rho_ << token::SPACE
- << cp_ << token::SPACE
+ << Cp_ << token::SPACE
<< K_ << token::SPACE
<< Hf_ << token::SPACE
<< emissivity_;
diff --git a/src/thermophysicalModels/solids/solid/solid.H b/src/thermophysicalModels/solids/solid/solid.H
index e66ece6ca892ea09858cbfd6fe9c33261db3197b..1adb26e4d9005448f7895b7d708b25c5a94624fe 100644
--- a/src/thermophysicalModels/solids/solid/solid.H
+++ b/src/thermophysicalModels/solids/solid/solid.H
@@ -67,7 +67,7 @@ class solid
scalar rho_;
//- Specific heat capacity [J/(kg.K)]
- scalar cp_;
+ scalar Cp_;
//- Thermal conductivity [W/(m.K)]
scalar K_;
@@ -121,7 +121,7 @@ public:
solid
(
scalar rho,
- scalar cp,
+ scalar Cp,
scalar K,
scalar Hf,
scalar emissivity
@@ -153,7 +153,7 @@ public:
inline scalar rho() const;
//- Specific heat capacity [J/(kg.K)]
- inline scalar cp() const;
+ inline scalar Cp() const;
//- Thermal conductivity [W/(m.K)]
inline scalar K() const;
diff --git a/src/thermophysicalModels/solids/solid/solidI.H b/src/thermophysicalModels/solids/solid/solidI.H
index d18d48087e5ea7aa09c7ac70dc4944830b99b327..79d1ec58378ac88a5ddb4c572d1a8c1a96b666d9 100644
--- a/src/thermophysicalModels/solids/solid/solidI.H
+++ b/src/thermophysicalModels/solids/solid/solidI.H
@@ -31,9 +31,9 @@ inline Foam::scalar Foam::solid::rho() const
}
-inline Foam::scalar Foam::solid::cp() const
+inline Foam::scalar Foam::solid::Cp() const
{
- return cp_;
+ return Cp_;
}