songtianlun/openfoam
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

STY: Function names and arguments order

Browse Source
This commit is contained in:
sergio 2021-12-13 14:59:47 -08:00 committed by Andrew Heather
parent e5b64f7740
commit cd2e69923e
15 changed files with 53 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
applications/solvers/multiphase/compressibleInterFoam/twoPhaseMixtureThermo/twoPhaseMixtureThermo.H
View File

@ -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
{

6
applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/multiphaseMixtureThermo.H
View File

@ -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
{

6
applications/solvers/multiphase/interCondensatingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/twoPhaseMixtureEThermo/twoPhaseMixtureEThermo.H
View File

@ -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
{

14
src/phaseSystemModels/multiphaseInter/phasesSystem/phaseSystem/phaseSystem.C
View File

@ -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
{

12
src/phaseSystemModels/multiphaseInter/phasesSystem/phaseSystem/phaseSystem.H
View File

@ -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;

4
src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/CHFModels/Zuber/Zuber.C
View File

@ -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

4
src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/CHFSubCoolModels/HuaXu/HuaXu.C
View File

@ -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();

6
src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/CHFSubCoolModels/Tatsumoto/Tatsumoto.C
View File

@ -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

9
src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/MHFModels/Jeschar/Jeschar.C
View File

@ -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)
)
);
}

6
src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/filmBoilingModels/BreenWestwater/BreenWestwater.C
View File

@ -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));

9
src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/filmBoilingModels/Bromley/Bromley.C
View File

@ -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));

9
src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/nucleateFluxModels/Kutadeladze/Kutadeladze.C
View File

@ -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));

10
src/thermophysicalModels/basic/basicThermo/basicThermo.H
View File

@ -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;

6
src/thermophysicalModels/basic/heThermo/heThermo.C
View File

@ -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
{

6
src/thermophysicalModels/basic/heThermo/heThermo.H
View File

@ -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;