diff --git a/applications/solvers/multiphase/compressibleInterFoam/twoPhaseMixtureThermo/twoPhaseMixtureThermo.H b/applications/solvers/multiphase/compressibleInterFoam/twoPhaseMixtureThermo/twoPhaseMixtureThermo.H
index 5c45642814ebd75c36c7f375face1a4ffa671a1f..c712e5a47febe326713874865c56655b857d4a1f 100644
--- a/applications/solvers/multiphase/compressibleInterFoam/twoPhaseMixtureThermo/twoPhaseMixtureThermo.H
+++ b/applications/solvers/multiphase/compressibleInterFoam/twoPhaseMixtureThermo/twoPhaseMixtureThermo.H
@@ -205,10 +205,10 @@ public:
) const;
//- Heat capacity using pressure and temperature
- virtual tmp<scalarField> CpThermo
+ virtual tmp<scalarField> Cp
(
- const scalarField& T,
const scalarField& p,
+ const scalarField& T,
const labelList& cells
) const
{
@@ -230,8 +230,8 @@ public:
//- Density from pressure and temperature
virtual tmp<scalarField> rhoEoS
(
- const scalarField& T,
const scalarField& p,
+ const scalarField& T,
const labelList& cells
) const
{
diff --git a/applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/multiphaseMixtureThermo.H b/applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/multiphaseMixtureThermo.H
index 2882b64c3d941112899ce503f064a51adf462d65..472bd285aaa78c22aaeda7aff011493db9f42808 100644
--- a/applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/multiphaseMixtureThermo.H
+++ b/applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/multiphaseMixtureThermo.H
@@ -319,10 +319,10 @@ public:
) const;
//- Heat capacity using pressure and temperature
- virtual tmp<scalarField> CpThermo
+ virtual tmp<scalarField> Cp
(
- const scalarField& T,
const scalarField& p,
+ const scalarField& T,
const labelList& cells
) const
{
@@ -344,8 +344,8 @@ public:
//- Density from pressure and temperature
virtual tmp<scalarField> rhoEoS
(
- const scalarField& T,
const scalarField& p,
+ const scalarField& T,
const labelList& cells
) const
{
diff --git a/applications/solvers/multiphase/interCondensatingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/twoPhaseMixtureEThermo/twoPhaseMixtureEThermo.H b/applications/solvers/multiphase/interCondensatingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/twoPhaseMixtureEThermo/twoPhaseMixtureEThermo.H
index b962e19e646973bffae86594495713d7671c91ce..cedad45329be80f73b2c026f8ed9d2cc91153751 100644
--- a/applications/solvers/multiphase/interCondensatingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/twoPhaseMixtureEThermo/twoPhaseMixtureEThermo.H
+++ b/applications/solvers/multiphase/interCondensatingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/twoPhaseMixtureEThermo/twoPhaseMixtureEThermo.H
@@ -174,10 +174,10 @@ public:
) const;
//- Heat capacity using pressure and temperature
- virtual tmp<scalarField> CpThermo
+ virtual tmp<scalarField> Cp
(
- const scalarField& T,
const scalarField& p,
+ const scalarField& T,
const labelList& cells
) const
{
@@ -199,8 +199,8 @@ public:
//- Density from pressure and temperature
virtual tmp<scalarField> rhoEoS
(
- const scalarField& T,
const scalarField& p,
+ const scalarField& T,
const labelList& cells
) const
{
diff --git a/src/phaseSystemModels/multiphaseInter/phasesSystem/phaseSystem/phaseSystem.C b/src/phaseSystemModels/multiphaseInter/phasesSystem/phaseSystem/phaseSystem.C
index 830ae513812b15810cc934819de1785ff74368ad..a4d0230bdc118c442a15bcb2bb4ea65affa4f9a7 100644
--- a/src/phaseSystemModels/multiphaseInter/phasesSystem/phaseSystem/phaseSystem.C
+++ b/src/phaseSystemModels/multiphaseInter/phasesSystem/phaseSystem/phaseSystem.C
@@ -455,18 +455,6 @@ Foam::tmp<Foam::scalarField> Foam::phaseSystem::Cp
}
-Foam::tmp<Foam::scalarField> Foam::phaseSystem::CpThermo
-(
- const scalarField& T,
- const scalarField& p,
- const labelList& cells
-) const
-{
- NotImplemented;
- return nullptr;
-}
-
-
Foam::tmp<Foam::volScalarField> Foam::phaseSystem::Cv() const
{
auto iter = phaseModels_.cbegin();
@@ -510,8 +498,8 @@ Foam::tmp<Foam::scalarField> Foam::phaseSystem::Cv
Foam::tmp<Foam::scalarField> Foam::phaseSystem::rhoEoS
(
- const scalarField& T,
const scalarField& p,
+ const scalarField& T,
const labelList& cells
) const
{
diff --git a/src/phaseSystemModels/multiphaseInter/phasesSystem/phaseSystem/phaseSystem.H b/src/phaseSystemModels/multiphaseInter/phasesSystem/phaseSystem/phaseSystem.H
index 45af20a88d6b145756ce674b38868189b06b5f65..c6a30787cb8f053628fc591ac1a4591c889c2568 100644
--- a/src/phaseSystemModels/multiphaseInter/phasesSystem/phaseSystem/phaseSystem.H
+++ b/src/phaseSystemModels/multiphaseInter/phasesSystem/phaseSystem/phaseSystem.H
@@ -352,12 +352,16 @@ public:
) const;
//- Heat capacity using pressure and temperature
- virtual tmp<scalarField> CpThermo
+ virtual tmp<scalarField> Cp
(
- const scalarField& T,
const scalarField& p,
+ const scalarField& T,
const labelList& cells
- ) const;
+ ) const
+ {
+ NotImplemented;
+ return tmp<scalarField>::New(p);
+ }
//- Return Cv of the mixture
virtual tmp<volScalarField> Cv() const;
@@ -373,8 +377,8 @@ public:
//- Density from pressure and temperature
virtual tmp<scalarField> rhoEoS
(
- const scalarField& T,
const scalarField& p,
+ const scalarField& T,
const labelList& cells
) const;
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/CHFModels/Zuber/Zuber.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/CHFModels/Zuber/Zuber.C
index 26d2dacb3a05363d77745cafb16d4a534bb8adff..78740a8ec5c6a75cd83fbae02d83e7bb14304040 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/CHFModels/Zuber/Zuber.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/CHFModels/Zuber/Zuber.C
@@ -83,10 +83,10 @@ Foam::wallBoilingModels::CHFModels::Zuber::CHF
const scalarField& pw = liquid.thermo().p().boundaryField()[patchi];
- tmp<scalarField> trhoVapor = vapor.thermo().rhoEoS(Tsatw, pw, cells);
+ tmp<scalarField> trhoVapor = vapor.thermo().rhoEoS(pw ,Tsatw, cells);
const scalarField& rhoVapor = trhoVapor.ref();
- tmp<scalarField> trhoLiq = liquid.thermo().rhoEoS(Tsatw, pw, cells);
+ tmp<scalarField> trhoLiq = liquid.thermo().rhoEoS(pw, Tsatw, cells);
const scalarField& rhoLiq = trhoLiq.ref();
const phasePairKey pair(liquid.name(), vapor.name());
const scalarField sigma
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/CHFSubCoolModels/HuaXu/HuaXu.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/CHFSubCoolModels/HuaXu/HuaXu.C
index 3284a5d4a9614063c600ff82bf13573cdc56e375..2e6448ccdad0140d82b2f0bd839012f2786cdc65 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/CHFSubCoolModels/HuaXu/HuaXu.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/CHFSubCoolModels/HuaXu/HuaXu.C
@@ -85,10 +85,10 @@ Foam::wallBoilingModels::CHFModels::HuaXu::CHFSubCool
const scalarField& pw = liquid.thermo().p().boundaryField()[patchi];
- tmp<scalarField> trhoVapor = vapor.thermo().rhoEoS(Tsatw, pw, cells);
+ tmp<scalarField> trhoVapor = vapor.thermo().rhoEoS(pw, Tsatw, cells);
const scalarField& rhoVapor = trhoVapor.ref();
- tmp<scalarField> trhoLiq = liquid.thermo().rhoEoS(Tsatw, pw, cells);
+ tmp<scalarField> trhoLiq = liquid.thermo().rhoEoS(pw, Tsatw, cells);
const scalarField& rhoLiq = trhoLiq.ref();
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/CHFSubCoolModels/Tatsumoto/Tatsumoto.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/CHFSubCoolModels/Tatsumoto/Tatsumoto.C
index f1d6565f6aa2515ca27525be3e06fddf8eac3e69..d516e27152afe56b361e0595573cbc79267eb5dd 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/CHFSubCoolModels/Tatsumoto/Tatsumoto.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/CHFSubCoolModels/Tatsumoto/Tatsumoto.C
@@ -78,13 +78,13 @@ Foam::wallBoilingModels::CHFModels::Tatsumoto::CHFSubCool
const labelUList& cells = liquid.mesh().boundary()[patchi].faceCells();
const scalarField& pw = liquid.thermo().p().boundaryField()[patchi];
- tmp<scalarField> trhoVapor = vapor.thermo().rhoEoS(Tsatw, pw, cells);
+ tmp<scalarField> trhoVapor = vapor.thermo().rhoEoS(pw, Tsatw, cells);
const scalarField& rhoVapor = trhoVapor.ref();
- tmp<scalarField> trhoLiq = liquid.thermo().rhoEoS(Tsatw, pw, cells);
+ tmp<scalarField> trhoLiq = liquid.thermo().rhoEoS(pw, Tsatw, cells);
const scalarField& rhoLiq = trhoLiq.ref();
- tmp<scalarField> tCp = liquid.thermo().CpThermo(Tsatw, pw, cells);
+ tmp<scalarField> tCp = liquid.thermo().Cp(pw, Tsatw, cells);
const scalarField& Cp = tCp();
return
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/MHFModels/Jeschar/Jeschar.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/MHFModels/Jeschar/Jeschar.C
index 61419a6ef99864d3720c35c32079e17167b6028a..e0c929f6dd97e5912937cc33b45b0ec2955cc311 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/MHFModels/Jeschar/Jeschar.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/MHFModels/Jeschar/Jeschar.C
@@ -83,10 +83,10 @@ Foam::wallBoilingModels::CHFModels::Jeschar::MHF
const scalarField& pw = liquid.thermo().p().boundaryField()[patchi];
- tmp<scalarField> trhoVapor = vapor.thermo().rhoEoS(Tsatw, pw, cells);
+ tmp<scalarField> trhoVapor = vapor.thermo().rhoEoS(pw, Tsatw, cells);
const scalarField& rhoVapor = trhoVapor.ref();
- tmp<scalarField> trhoLiq = liquid.thermo().rhoEoS(Tsatw, pw, cells);
+ tmp<scalarField> trhoLiq = liquid.thermo().rhoEoS(pw, Tsatw, cells);
const scalarField& rhoLiq = trhoLiq.ref();
const phasePairKey pair(liquid.name(), vapor.name());
@@ -99,7 +99,10 @@ Foam::wallBoilingModels::CHFModels::Jeschar::MHF
Kmhf_*rhoVapor*L
*(
pow(sigma/(mag(g.value())*(rhoLiq - rhoVapor)), 0.25)
- * sqrt(mag(g.value())*(rhoLiq - rhoVapor)/(rhoLiq + rhoVapor + VSMALL))
+ * sqrt
+ (
+ mag(g.value())*(rhoLiq - rhoVapor)/(rhoLiq + rhoVapor + VSMALL)
+ )
);
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/filmBoilingModels/BreenWestwater/BreenWestwater.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/filmBoilingModels/BreenWestwater/BreenWestwater.C
index 3f44030d601f0a557a979ea40596cc0fdbf9761f..c916bdc05ccb2d38fd8c93d751021bcde82774ce 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/filmBoilingModels/BreenWestwater/BreenWestwater.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/filmBoilingModels/BreenWestwater/BreenWestwater.C
@@ -84,16 +84,16 @@ Foam::wallBoilingModels::filmBoilingModels::BreenWestwater::htcFilmBoil
const labelUList& cells = liquid.mesh().boundary()[patchi].faceCells();
const scalarField& pw = liquid.thermo().p().boundaryField()[patchi];
- tmp<scalarField> trhoVapor = vapor.thermo().rhoEoS(Tsatw, pw, cells);
+ tmp<scalarField> trhoVapor = vapor.thermo().rhoEoS(pw, Tsatw, cells);
const scalarField& rhoVapor = trhoVapor.ref();
- tmp<scalarField> trhoLiq = liquid.thermo().rhoEoS(Tsatw, pw, cells);
+ tmp<scalarField> trhoLiq = liquid.thermo().rhoEoS(pw, Tsatw, cells);
const scalarField& rhoLiq = trhoLiq.ref();
const scalarField kappaLiquid(liquid.kappa(patchi));
- tmp<scalarField> tCp = vapor.thermo().CpThermo(Tsatw, pw, cells);
+ tmp<scalarField> tCp = vapor.thermo().Cp(pw, Tsatw, cells);
const scalarField& CpVapor = tCp();
const scalarField nuLiquid(liquid.nu(patchi));
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/filmBoilingModels/Bromley/Bromley.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/filmBoilingModels/Bromley/Bromley.C
index 5a929a980b4fc19854157355f35c6fb6fff00a4d..ca421a779e4a0a52366ab3a5ef120680b04f183e 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/filmBoilingModels/Bromley/Bromley.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/filmBoilingModels/Bromley/Bromley.C
@@ -88,18 +88,17 @@ Foam::wallBoilingModels::filmBoilingModels::Bromley::htcFilmBoil
const scalarField& pw = liquid.thermo().p().boundaryField()[patchi];
- tmp<scalarField> trhoVapor = vapor.thermo().rhoEoS(Tsatw, pw, cells);
+ tmp<scalarField> trhoVapor = vapor.thermo().rhoEoS(pw, Tsatw, cells);
const scalarField& rhoVapor = trhoVapor.ref();
- tmp<scalarField> trhoLiq = liquid.thermo().rhoEoS(Tsatw, pw, cells);
+ tmp<scalarField> trhoLiq = liquid.thermo().rhoEoS(pw, Tsatw, cells);
const scalarField& rhoLiq = trhoLiq.ref();
const scalarField kappaVapor(vapor.kappa(patchi));
- tmp<volScalarField> tCp = vapor.thermo().Cp();
- const volScalarField& Cp = tCp();
- const scalarField& CpVapor = Cp.boundaryField()[patchi];
+ tmp<scalarField> tCp = vapor.thermo().Cp(pw, Tsatw, cells);
+ const scalarField& CpVapor = tCp();
const scalarField muVapor(vapor.mu(patchi));
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/nucleateFluxModels/Kutadeladze/Kutadeladze.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/nucleateFluxModels/Kutadeladze/Kutadeladze.C
index 2b0f4edfa7e5062d41448db44dbce804939ef922..f30f59a0e784da593996ddff0cf2d6eef1af9147 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/nucleateFluxModels/Kutadeladze/Kutadeladze.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/nucleateFluxModels/Kutadeladze/Kutadeladze.C
@@ -83,10 +83,10 @@ Foam::wallBoilingModels::nucleateFluxModels::Kutadeladze::qNucleate
const labelUList& cells = liquid.mesh().boundary()[patchi].faceCells();
- tmp<scalarField> trhoVapor = vapor.thermo().rhoEoS(Tsatw, pb, cells);
+ tmp<scalarField> trhoVapor = vapor.thermo().rhoEoS(pb, Tsatw, cells);
const scalarField& rhoVapor = trhoVapor.ref();
- tmp<scalarField> trhoLiq = liquid.thermo().rhoEoS(Tsatw, pb, cells);
+ tmp<scalarField> trhoLiq = liquid.thermo().rhoEoS(pb, Tsatw, cells);
const scalarField& rhoLiq = trhoLiq.ref();
const phasePairKey pair(liquid.name(), vapor.name());
@@ -100,9 +100,8 @@ Foam::wallBoilingModels::nucleateFluxModels::Kutadeladze::qNucleate
const scalarField kappaLiquid(liquid.kappa(patchi));
- tmp<volScalarField> tCpliq = liquid.thermo().Cp();
- const volScalarField& Cpliq = tCpliq();
- const scalarField& Cpliquid = Cpliq.boundaryField()[patchi];
+ tmp<scalarField> tCpliq = liquid.thermo().Cp(pb, Tsatw, cells);
+ const scalarField& Cpliquid = tCpliq();
const scalarField muLiquid(liquid.mu(patchi));
diff --git a/src/thermophysicalModels/basic/basicThermo/basicThermo.H b/src/thermophysicalModels/basic/basicThermo/basicThermo.H
index 1776cb901c9d0412e13b499380bd5fadc4aea1dc..54dc0061d0f2b509bd7d36a786422b5d330ae02f 100644
--- a/src/thermophysicalModels/basic/basicThermo/basicThermo.H
+++ b/src/thermophysicalModels/basic/basicThermo/basicThermo.H
@@ -443,11 +443,11 @@ public:
const label patchi
) const = 0;
- //- Heat capacity using pressure and temperature
- virtual tmp<scalarField> CpThermo
+ //- Heat capacity using pressure and temperature [J/kg/K]
+ virtual tmp<scalarField> Cp
(
- const scalarField& T,
const scalarField& p,
+ const scalarField& T,
const labelList& cells
) const = 0;
@@ -462,11 +462,11 @@ public:
const label patchi
) const = 0;
- //- Density from pressure and temperature
+ //- Density from pressure and temperature from EoS
virtual tmp<scalarField> rhoEoS
(
- const scalarField& T,
const scalarField& p,
+ const scalarField& T,
const labelList& cells
) const = 0;
diff --git a/src/thermophysicalModels/basic/heThermo/heThermo.C b/src/thermophysicalModels/basic/heThermo/heThermo.C
index c4287668d625cdd33b59b4e15855a6ad023f6f31..b880caa00cc0d66e1aeaae418a52714dbbcd54c5 100644
--- a/src/thermophysicalModels/basic/heThermo/heThermo.C
+++ b/src/thermophysicalModels/basic/heThermo/heThermo.C
@@ -378,10 +378,10 @@ Foam::tmp<Foam::scalarField> Foam::heThermo<BasicThermo, MixtureType>::Cp
template<class BasicThermo, class MixtureType>
Foam::tmp<Foam::scalarField>
-Foam::heThermo<BasicThermo, MixtureType>::CpThermo
+Foam::heThermo<BasicThermo, MixtureType>::Cp
(
- const scalarField& T,
const scalarField& p,
+ const scalarField& T,
const labelList& cells
) const
{
@@ -475,8 +475,8 @@ template<class BasicThermo, class MixtureType>
Foam::tmp<Foam::scalarField>
Foam::heThermo<BasicThermo, MixtureType>::rhoEoS
(
- const scalarField& T,
const scalarField& p,
+ const scalarField& T,
const labelList& cells
) const
{
diff --git a/src/thermophysicalModels/basic/heThermo/heThermo.H b/src/thermophysicalModels/basic/heThermo/heThermo.H
index 54cfc36b11135512b6abd756d3ca3f56cbb56d8e..a52b17fd92ccd8c45b3bb37b92791aef4cb83b25 100644
--- a/src/thermophysicalModels/basic/heThermo/heThermo.H
+++ b/src/thermophysicalModels/basic/heThermo/heThermo.H
@@ -229,10 +229,10 @@ public:
) const;
//- Heat capacity using pressure and temperature
- virtual tmp<scalarField> CpThermo
+ virtual tmp<scalarField> Cp
(
- const scalarField& T,
const scalarField& p,
+ const scalarField& T,
const labelList& cells
) const;
@@ -250,8 +250,8 @@ public:
//- Density from pressure and temperature
virtual tmp<scalarField> rhoEoS
(
- const scalarField& T,
const scalarField& p,
+ const scalarField& T,
const labelList& cells
) const;