zhyang-dev/OpenFOAM-12
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

barotropicCompressibilityModel: Obtain rhovSat from pSat

Browse Source 
Resolves feature request https://bugs.openfoam.org/view.php?id=3314
This commit is contained in:
Henry Weller
2019-07-24 14:12:26 +01:00
parent eecd590eb6
commit 9ca4cb8b99
4 changed files with 23 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/thermophysicalModels/barotropicCompressibilityModel/Chung/Chung.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -52,6 +52,12 @@ Foam::compressibilityModels::Chung::Chung
)
:
barotropicCompressibilityModel(compressibilityProperties, gamma, psiName),
pSat_
(
"pSat",
dimPressure,
compressibilityProperties_.lookup("pSat")
),
psiv_
(
"psiv",
@ -64,12 +70,6 @@ Foam::compressibilityModels::Chung::Chung
dimCompressibility,
compressibilityProperties_.lookup("psil")
),
rhovSat_
(
"rhovSat",
dimDensity,
compressibilityProperties_.lookup("rhovSat")
),
rholSat_
(
"rholSat",
@ -89,8 +89,8 @@ void Foam::compressibilityModels::Chung::correct()
(
sqrt
(
(rhovSat_/psiv_)
/((scalar(1) - gamma_)*rhovSat_/psiv_ + gamma_*rholSat_/psil_)
pSat_
/((scalar(1) - gamma_)*pSat_ + gamma_*rholSat_/psil_)
)
);
@ -109,9 +109,9 @@ bool Foam::compressibilityModels::Chung::read
{
barotropicCompressibilityModel::read(compressibilityProperties);
compressibilityProperties_.lookup("pSat") >> pSat_;
compressibilityProperties_.lookup("psiv") >> psiv_;
compressibilityProperties_.lookup("psil") >> psil_;
compressibilityProperties_.lookup("rhovSat") >> rhovSat_;
compressibilityProperties_.lookup("rholSat") >> rholSat_;
return true;

3
src/thermophysicalModels/barotropicCompressibilityModel/Chung/Chung.H
View File

@ -55,10 +55,9 @@ class Chung
{
// Private Data
dimensionedScalar pSat_;
dimensionedScalar psiv_;
dimensionedScalar psil_;
dimensionedScalar rhovSat_;
dimensionedScalar rholSat_;

20
src/thermophysicalModels/barotropicCompressibilityModel/Wallis/Wallis.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -52,6 +52,12 @@ Foam::compressibilityModels::Wallis::Wallis
)
:
barotropicCompressibilityModel(compressibilityProperties, gamma, psiName),
pSat_
(
"pSat",
dimPressure,
compressibilityProperties_.lookup("pSat")
),
psiv_
(
"psiv",
@ -64,12 +70,7 @@ Foam::compressibilityModels::Wallis::Wallis
dimCompressibility,
compressibilityProperties_.lookup("psil")
),
rhovSat_
(
"rhovSat",
dimDensity,
compressibilityProperties_.lookup("rhovSat")
),
rhovSat_(psiv_*pSat_),
rholSat_
(
"rholSat",
@ -87,7 +88,7 @@ void Foam::compressibilityModels::Wallis::correct()
{
psi_ =
(gamma_*rhovSat_ + (scalar(1) - gamma_)*rholSat_)
*(gamma_*psiv_/rhovSat_ + (scalar(1) - gamma_)*psil_/rholSat_);
*(gamma_/pSat_ + (scalar(1) - gamma_)*psil_/rholSat_);
}
@ -98,9 +99,10 @@ bool Foam::compressibilityModels::Wallis::read
{
barotropicCompressibilityModel::read(compressibilityProperties);
compressibilityProperties_.lookup("pSat") >> pSat_;
compressibilityProperties_.lookup("psiv") >> psiv_;
compressibilityProperties_.lookup("psil") >> psil_;
compressibilityProperties_.lookup("rhovSat") >> rhovSat_;
rhovSat_ = psiv_*pSat_;
compressibilityProperties_.lookup("rholSat") >> rholSat_;
return true;

1
src/thermophysicalModels/barotropicCompressibilityModel/Wallis/Wallis.H
View File

@ -55,6 +55,7 @@ class Wallis
{
// Private Data
dimensionedScalar pSat_;
dimensionedScalar psiv_;
dimensionedScalar psil_;