Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Development
openfoam
Commits
cd2e6992
Commit
cd2e6992
authored
Dec 13, 2021
by
sergio
Committed by
Andrew Heather
Dec 15, 2021
Browse files
STY: Function names and arguments order
parent
e5b64f77
Changes
15
Hide whitespace changes
Inline
Side-by-side
applications/solvers/multiphase/compressibleInterFoam/twoPhaseMixtureThermo/twoPhaseMixtureThermo.H
View file @
cd2e6992
...
...
@@ -205,10 +205,10 @@ public:
)
const
;
//- Heat capacity using pressure and temperature
virtual
tmp
<
scalarField
>
Cp
Thermo
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
{
...
...
applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/multiphaseMixtureThermo.H
View file @
cd2e6992
...
...
@@ -319,10 +319,10 @@ public:
)
const
;
//- Heat capacity using pressure and temperature
virtual
tmp
<
scalarField
>
Cp
Thermo
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
{
...
...
applications/solvers/multiphase/interCondensatingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/twoPhaseMixtureEThermo/twoPhaseMixtureEThermo.H
View file @
cd2e6992
...
...
@@ -174,10 +174,10 @@ public:
)
const
;
//- Heat capacity using pressure and temperature
virtual
tmp
<
scalarField
>
Cp
Thermo
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
{
...
...
src/phaseSystemModels/multiphaseInter/phasesSystem/phaseSystem/phaseSystem.C
View file @
cd2e6992
...
...
@@ -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
{
...
...
src/phaseSystemModels/multiphaseInter/phasesSystem/phaseSystem/phaseSystem.H
View file @
cd2e6992
...
...
@@ -352,12 +352,16 @@ public:
)
const
;
//- Heat capacity using pressure and temperature
virtual
tmp
<
scalarField
>
Cp
Thermo
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
;
...
...
src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/CHFModels/Zuber/Zuber.C
View file @
cd2e6992
...
...
@@ -83,10 +83,10 @@ Foam::wallBoilingModels::CHFModels::Zuber::CHF
const
scalarField
&
pw
=
liquid
.
thermo
().
p
().
boundaryField
()[
patchi
];
tmp
<
scalarField
>
trhoVapor
=
vapor
.
thermo
().
rhoEoS
(
Tsat
w
,
p
w
,
cells
);
tmp
<
scalarField
>
trhoVapor
=
vapor
.
thermo
().
rhoEoS
(
pw
,
Tsatw
,
cells
);
const
scalarField
&
rhoVapor
=
trhoVapor
.
ref
();
tmp
<
scalarField
>
trhoLiq
=
liquid
.
thermo
().
rhoEoS
(
Tsat
w
,
p
w
,
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
...
...
src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/CHFSubCoolModels/HuaXu/HuaXu.C
View file @
cd2e6992
...
...
@@ -85,10 +85,10 @@ Foam::wallBoilingModels::CHFModels::HuaXu::CHFSubCool
const
scalarField
&
pw
=
liquid
.
thermo
().
p
().
boundaryField
()[
patchi
];
tmp
<
scalarField
>
trhoVapor
=
vapor
.
thermo
().
rhoEoS
(
Tsat
w
,
p
w
,
cells
);
tmp
<
scalarField
>
trhoVapor
=
vapor
.
thermo
().
rhoEoS
(
pw
,
Tsatw
,
cells
);
const
scalarField
&
rhoVapor
=
trhoVapor
.
ref
();
tmp
<
scalarField
>
trhoLiq
=
liquid
.
thermo
().
rhoEoS
(
Tsat
w
,
p
w
,
cells
);
tmp
<
scalarField
>
trhoLiq
=
liquid
.
thermo
().
rhoEoS
(
pw
,
Tsatw
,
cells
);
const
scalarField
&
rhoLiq
=
trhoLiq
.
ref
();
...
...
src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/CHFSubCoolModels/Tatsumoto/Tatsumoto.C
View file @
cd2e6992
...
...
@@ -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
(
Tsat
w
,
p
w
,
cells
);
tmp
<
scalarField
>
trhoVapor
=
vapor
.
thermo
().
rhoEoS
(
pw
,
Tsatw
,
cells
);
const
scalarField
&
rhoVapor
=
trhoVapor
.
ref
();
tmp
<
scalarField
>
trhoLiq
=
liquid
.
thermo
().
rhoEoS
(
Tsat
w
,
p
w
,
cells
);
tmp
<
scalarField
>
trhoLiq
=
liquid
.
thermo
().
rhoEoS
(
pw
,
Tsatw
,
cells
);
const
scalarField
&
rhoLiq
=
trhoLiq
.
ref
();
tmp
<
scalarField
>
tCp
=
liquid
.
thermo
().
Cp
Thermo
(
Tsatw
,
p
w
,
cells
);
tmp
<
scalarField
>
tCp
=
liquid
.
thermo
().
Cp
(
pw
,
Tsat
w
,
cells
);
const
scalarField
&
Cp
=
tCp
();
return
...
...
src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/MHFModels/Jeschar/Jeschar.C
View file @
cd2e6992
...
...
@@ -83,10 +83,10 @@ Foam::wallBoilingModels::CHFModels::Jeschar::MHF
const
scalarField
&
pw
=
liquid
.
thermo
().
p
().
boundaryField
()[
patchi
];
tmp
<
scalarField
>
trhoVapor
=
vapor
.
thermo
().
rhoEoS
(
Tsat
w
,
p
w
,
cells
);
tmp
<
scalarField
>
trhoVapor
=
vapor
.
thermo
().
rhoEoS
(
pw
,
Tsatw
,
cells
);
const
scalarField
&
rhoVapor
=
trhoVapor
.
ref
();
tmp
<
scalarField
>
trhoLiq
=
liquid
.
thermo
().
rhoEoS
(
Tsat
w
,
p
w
,
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
)
)
);
}
...
...
src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/filmBoilingModels/BreenWestwater/BreenWestwater.C
View file @
cd2e6992
...
...
@@ -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
(
Tsat
w
,
p
w
,
cells
);
tmp
<
scalarField
>
trhoVapor
=
vapor
.
thermo
().
rhoEoS
(
pw
,
Tsatw
,
cells
);
const
scalarField
&
rhoVapor
=
trhoVapor
.
ref
();
tmp
<
scalarField
>
trhoLiq
=
liquid
.
thermo
().
rhoEoS
(
Tsat
w
,
p
w
,
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
().
Cp
Thermo
(
Tsatw
,
p
w
,
cells
);
tmp
<
scalarField
>
tCp
=
vapor
.
thermo
().
Cp
(
pw
,
Tsat
w
,
cells
);
const
scalarField
&
CpVapor
=
tCp
();
const
scalarField
nuLiquid
(
liquid
.
nu
(
patchi
));
...
...
src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/filmBoilingModels/Bromley/Bromley.C
View file @
cd2e6992
...
...
@@ -88,18 +88,17 @@ Foam::wallBoilingModels::filmBoilingModels::Bromley::htcFilmBoil
const
scalarField
&
pw
=
liquid
.
thermo
().
p
().
boundaryField
()[
patchi
];
tmp
<
scalarField
>
trhoVapor
=
vapor
.
thermo
().
rhoEoS
(
Tsat
w
,
p
w
,
cells
);
tmp
<
scalarField
>
trhoVapor
=
vapor
.
thermo
().
rhoEoS
(
pw
,
Tsatw
,
cells
);
const
scalarField
&
rhoVapor
=
trhoVapor
.
ref
();
tmp
<
scalarField
>
trhoLiq
=
liquid
.
thermo
().
rhoEoS
(
Tsat
w
,
p
w
,
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
));
...
...
src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/nucleateFluxModels/Kutadeladze/Kutadeladze.C
View file @
cd2e6992
...
...
@@ -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
));
...
...
src/thermophysicalModels/basic/basicThermo/basicThermo.H
View file @
cd2e6992
...
...
@@ -443,11 +443,11 @@ public:
const
label
patchi
)
const
=
0
;
//- Heat capacity using pressure and temperature
virtual
tmp
<
scalarField
>
Cp
Thermo
//- 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
;
...
...
src/thermophysicalModels/basic/heThermo/heThermo.C
View file @
cd2e6992
...
...
@@ -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
>::
Cp
Thermo
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
{
...
...
src/thermophysicalModels/basic/heThermo/heThermo.H
View file @
cd2e6992
...
...
@@ -229,10 +229,10 @@ public:
)
const
;
//- Heat capacity using pressure and temperature
virtual
tmp
<
scalarField
>
Cp
Thermo
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
;
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment