adding option to specify name of compressibility field - defaults to psi

src/thermophysicalModels/barotropicCompressibilityModel/Chung/Chung.C

@@ -31,13 +31,16 @@ License
 
 namespace Foam
 {
-namespace compressibilityModels
+    namespace compressibilityModels
-{
+    {
-
+        defineTypeNameAndDebug(Chung, 0);
-defineTypeNameAndDebug(Chung, 0);
+        addToRunTimeSelectionTable
-addToRunTimeSelectionTable(barotropicCompressibilityModel, Chung, dictionary);
+        (
-
+            barotropicCompressibilityModel,
-}
+            Chung,
+            dictionary
+        );
+    }
 }
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
@@ -45,10 +48,11 @@ addToRunTimeSelectionTable(barotropicCompressibilityModel, Chung, dictionary);
 Foam::compressibilityModels::Chung::Chung
 (
     const dictionary& compressibilityProperties,
-    const volScalarField& gamma
+    const volScalarField& gamma,
+    const word& psiName
 )
 :
-    barotropicCompressibilityModel(compressibilityProperties, gamma),
+    barotropicCompressibilityModel(compressibilityProperties, gamma, psiName),
     psiv_(compressibilityProperties_.lookup("psiv")),
     psil_(compressibilityProperties_.lookup("psil")),
     rhovSat_(compressibilityProperties_.lookup("rhovSat")),

src/thermophysicalModels/barotropicCompressibilityModel/Chung/Chung.H

@@ -75,7 +75,8 @@ public:
         Chung
         (
             const dictionary& compressibilityProperties,
-            const volScalarField& gamma
+            const volScalarField& gamma,
+            const word& psiName = "psi"
         );
 
 

src/thermophysicalModels/barotropicCompressibilityModel/Wallis/Wallis.C

@@ -31,13 +31,16 @@ License
 
 namespace Foam
 {
-namespace compressibilityModels
+    namespace compressibilityModels
-{
+    {
-
+        defineTypeNameAndDebug(Wallis, 0);
-defineTypeNameAndDebug(Wallis, 0);
+        addToRunTimeSelectionTable
-addToRunTimeSelectionTable(barotropicCompressibilityModel, Wallis, dictionary);
+        (
-
+            barotropicCompressibilityModel,
-}
+            Wallis,
+            dictionary
+        );
+    }
 }
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
@@ -45,10 +48,11 @@ addToRunTimeSelectionTable(barotropicCompressibilityModel, Wallis, dictionary);
 Foam::compressibilityModels::Wallis::Wallis
 (
     const dictionary& compressibilityProperties,
-    const volScalarField& gamma
+    const volScalarField& gamma,
+    const word& psiName
 )
 :
-    barotropicCompressibilityModel(compressibilityProperties, gamma),
+    barotropicCompressibilityModel(compressibilityProperties, gamma, psiName),
     psiv_(compressibilityProperties_.lookup("psiv")),
     psil_(compressibilityProperties_.lookup("psil")),
     rhovSat_(compressibilityProperties_.lookup("rhovSat")),
@@ -62,7 +66,8 @@ Foam::compressibilityModels::Wallis::Wallis
 
 void Foam::compressibilityModels::Wallis::correct()
 {
-    psi_ = (gamma_*rhovSat_ + (scalar(1) - gamma_)*rholSat_)
+    psi_ =
+        (gamma_*rhovSat_ + (scalar(1) - gamma_)*rholSat_)
        *(gamma_*psiv_/rhovSat_ + (scalar(1) - gamma_)*psil_/rholSat_);
 }
 

src/thermophysicalModels/barotropicCompressibilityModel/Wallis/Wallis.H

@@ -75,7 +75,8 @@ public:
         Wallis
         (
             const dictionary& compressibilityProperties,
-            const volScalarField& gamma
+            const volScalarField& gamma,
+            const word& psiName = "psi"
         );
 
 

src/thermophysicalModels/barotropicCompressibilityModel/barotropicCompressibilityModel/barotropicCompressibilityModel.C

@@ -42,7 +42,8 @@ namespace Foam
 Foam::barotropicCompressibilityModel::barotropicCompressibilityModel
 (
     const dictionary& compressibilityProperties,
-    const volScalarField& gamma
+    const volScalarField& gamma,
+    const word& psiName
 )
 :
     compressibilityProperties_(compressibilityProperties),
@@ -50,12 +51,12 @@ Foam::barotropicCompressibilityModel::barotropicCompressibilityModel
     (
         IOobject
         (
-            "psi",
+            psiName,
             gamma.mesh().time().timeName(),
             gamma.mesh()
         ),
         gamma.mesh(),
-        dimensionedScalar("psi", dimensionSet(0, -2, 2, 0, 0), 0)
+        dimensionedScalar(psiName, dimensionSet(0, -2, 2, 0, 0), 0)
     ),
     gamma_(gamma)
 {}

src/thermophysicalModels/barotropicCompressibilityModel/barotropicCompressibilityModel/barotropicCompressibilityModel.H

@@ -97,9 +97,10 @@ public:
             dictionary,
             (
                 const dictionary& compressibilityProperties,
-                const volScalarField& gamma
+                const volScalarField& gamma,
+                const word& psiName
             ),
-            (compressibilityProperties, gamma)
+            (compressibilityProperties, gamma, psiName)
         );
 
 
@@ -109,7 +110,8 @@ public:
         static autoPtr<barotropicCompressibilityModel> New
         (
             const dictionary& compressibilityProperties,
-            const volScalarField& gamma
+            const volScalarField& gamma,
+            const word& psiName = "psi"
         );
 
 
@@ -119,7 +121,8 @@ public:
         barotropicCompressibilityModel
         (
             const dictionary& compressibilityProperties,
-            const volScalarField& gamma
+            const volScalarField& gamma,
+            const word& psiName = "psi"
         );
 
 

src/thermophysicalModels/barotropicCompressibilityModel/barotropicCompressibilityModel/newBarotropicCompressibilityModel.C

@@ -32,7 +32,8 @@ Foam::autoPtr<Foam::barotropicCompressibilityModel>
 Foam::barotropicCompressibilityModel::New
 (
     const dictionary& compressibilityProperties,
-    const volScalarField& gamma
+    const volScalarField& gamma,
+    const word& psiName
 )
 {
     word bcModelTypeName
@@ -60,7 +61,7 @@ Foam::barotropicCompressibilityModel::New
 
     return autoPtr<barotropicCompressibilityModel>
     (
-        cstrIter()(compressibilityProperties, gamma)
+        cstrIter()(compressibilityProperties, gamma, psiName)
     );
 }
 

src/thermophysicalModels/barotropicCompressibilityModel/linear/linear.C

@@ -31,13 +31,16 @@ License
 
 namespace Foam
 {
-namespace compressibilityModels
+    namespace compressibilityModels
-{
+    {
-
+        defineTypeNameAndDebug(linear, 0);
-defineTypeNameAndDebug(linear, 0);
+        addToRunTimeSelectionTable
-addToRunTimeSelectionTable(barotropicCompressibilityModel, linear, dictionary);
+        (
-
+            barotropicCompressibilityModel,
-}
+            linear,
+            dictionary
+        );
+    }
 }
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
@@ -45,10 +48,11 @@ addToRunTimeSelectionTable(barotropicCompressibilityModel, linear, dictionary);
 Foam::compressibilityModels::linear::linear
 (
     const dictionary& compressibilityProperties,
-    const volScalarField& gamma
+    const volScalarField& gamma,
+    const word& psiName
 )
 :
-    barotropicCompressibilityModel(compressibilityProperties, gamma),
+    barotropicCompressibilityModel(compressibilityProperties, gamma, psiName),
     psiv_(compressibilityProperties_.lookup("psiv")),
     psil_(compressibilityProperties_.lookup("psil"))
 {

src/thermophysicalModels/barotropicCompressibilityModel/linear/linear.H

@@ -72,7 +72,8 @@ public:
         linear
         (
             const dictionary& compressibilityProperties,
-            const volScalarField& gamma
+            const volScalarField& gamma,
+            const word& psiName = "psi"
         );