From 9ca4cb8b992033ad2bcaa2831056b95dcbcfb150 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://openfoam.org>
Date: Wed, 24 Jul 2019 14:12:26 +0100
Subject: [PATCH] barotropicCompressibilityModel: Obtain rhovSat from pSat

Resolves feature request https://bugs.openfoam.org/view.php?id=3314
---
 .../Chung/Chung.C                             | 20 +++++++++----------
 .../Chung/Chung.H                             |  3 +--
 .../Wallis/Wallis.C                           | 20 ++++++++++---------
 .../Wallis/Wallis.H                           |  1 +
 4 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/src/thermophysicalModels/barotropicCompressibilityModel/Chung/Chung.C b/src/thermophysicalModels/barotropicCompressibilityModel/Chung/Chung.C
index 702c9980ca..8119037348 100644
--- a/src/thermophysicalModels/barotropicCompressibilityModel/Chung/Chung.C
+++ b/src/thermophysicalModels/barotropicCompressibilityModel/Chung/Chung.C
@@ -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;
diff --git a/src/thermophysicalModels/barotropicCompressibilityModel/Chung/Chung.H b/src/thermophysicalModels/barotropicCompressibilityModel/Chung/Chung.H
index 36b5fb586e..a5ac8df4fc 100644
--- a/src/thermophysicalModels/barotropicCompressibilityModel/Chung/Chung.H
+++ b/src/thermophysicalModels/barotropicCompressibilityModel/Chung/Chung.H
@@ -55,10 +55,9 @@ class Chung
 {
     // Private Data
 
+        dimensionedScalar pSat_;
         dimensionedScalar psiv_;
         dimensionedScalar psil_;
-
-        dimensionedScalar rhovSat_;
         dimensionedScalar rholSat_;
 
 
diff --git a/src/thermophysicalModels/barotropicCompressibilityModel/Wallis/Wallis.C b/src/thermophysicalModels/barotropicCompressibilityModel/Wallis/Wallis.C
index c990127b4f..f143467e6f 100644
--- a/src/thermophysicalModels/barotropicCompressibilityModel/Wallis/Wallis.C
+++ b/src/thermophysicalModels/barotropicCompressibilityModel/Wallis/Wallis.C
@@ -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;
diff --git a/src/thermophysicalModels/barotropicCompressibilityModel/Wallis/Wallis.H b/src/thermophysicalModels/barotropicCompressibilityModel/Wallis/Wallis.H
index aa2164887e..972974129e 100644
--- a/src/thermophysicalModels/barotropicCompressibilityModel/Wallis/Wallis.H
+++ b/src/thermophysicalModels/barotropicCompressibilityModel/Wallis/Wallis.H
@@ -55,6 +55,7 @@ class Wallis
 {
     // Private Data
 
+        dimensionedScalar pSat_;
         dimensionedScalar psiv_;
         dimensionedScalar psil_;