Also added a separate specification of the static pressure level but the

location for the specification is the same as that for the pd level.

applications/solvers/multiphase/interDyMFoam/Make/options

@@ -7,8 +7,7 @@ EXE_INC = \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/dynamicMesh/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
-    -I$(LIB_SRC)/dynamicFvMesh/lnInclude \
+    -I$(LIB_SRC)/dynamicFvMesh/lnInclude
-    -I$(LIB_SRC)/sampling/lnInclude
 
 EXE_LIBS = \
     -linterfaceProperties \
@@ -18,5 +17,4 @@ EXE_LIBS = \
     -lfiniteVolume \
     -ldynamicMesh \
     -lmeshTools \
-    -ldynamicFvMesh \
+    -ldynamicFvMesh
-    -lsampling

applications/solvers/multiphase/interDyMFoam/createFields.H

@@ -116,34 +116,23 @@
         pd + rho*(g & mesh.C())
     );
 
-    autoPtr<probes> pRefProbe;
     label pdRefCell = 0;
     scalar pdRefValue = 0.0;
+    setRefCell(pd, mesh.solutionDict().subDict("PISO"), pdRefCell, pdRefValue);
+
     scalar pRefValue = 0.0;
 
     if (pd.needReference())
     {
-        pRefProbe.set
-        (
-            new probes
-            (
-                "pRefProbe",
-                mesh,
-                mesh.solutionDict().subDict("PISO").subDict("pRefProbe")
-            )
-        );
-
         pRefValue = readScalar
         (
             mesh.solutionDict().subDict("PISO").lookup("pRefValue")
         );
 
-        pdRefCell = pRefProbe->cells()[0];
-
         p += dimensionedScalar
         (
             "p",
             p.dimensions(),
-            pRefValue - pRefProbe->sample<scalar>("p")()[0]
+            pRefValue - getRefCellValue(p, pdRefCell)
         );
     }

applications/solvers/multiphase/interDyMFoam/interDyMFoam.C

@@ -40,7 +40,6 @@ Description
 #include "interfaceProperties.H"
 #include "twoPhaseMixture.H"
 #include "turbulenceModel.H"
-#include "probes.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -123,7 +122,7 @@ int main(int argc, char *argv[])
             (
                 "p",
                 p.dimensions(),
-                pRefValue - pRefProbe->sample<scalar>("p")()[0]
+                pRefValue - getRefCellValue(p, pdRefCell)
             );
         }
 

applications/solvers/multiphase/interFoam/createFields.H

@@ -106,6 +106,23 @@
     scalar pdRefValue = 0.0;
     setRefCell(pd, mesh.solutionDict().subDict("PISO"), pdRefCell, pdRefValue);
 
+    scalar pRefValue = 0.0;
+
+    if (pd.needReference())
+    {
+        pRefValue = readScalar
+        (
+            mesh.solutionDict().subDict("PISO").lookup("pRefValue")
+        );
+
+        p += dimensionedScalar
+        (
+            "p",
+            p.dimensions(),
+            pRefValue - getRefCellValue(p, pdRefCell)
+        );
+    }
+
 
     // Construct interface from alpha1 distribution
     interfaceProperties interface(alpha1, U, twoPhaseProperties);

applications/solvers/multiphase/interFoam/interFoam.C

@@ -91,6 +91,16 @@ int main(int argc, char *argv[])
 
         p = pd + rho*gh;
 
+        if (pd.needReference())
+        {
+            p += dimensionedScalar
+            (
+                "p",
+                p.dimensions(),
+                pRefValue - getRefCellValue(p, pdRefCell)
+            );
+        }
+
         turbulence->correct();
 
         runTime.write();

applications/solvers/multiphase/multiphaseInterFoam/createFields.H

@@ -68,6 +68,23 @@
     scalar pdRefValue = 0.0;
     setRefCell(pd, mesh.solutionDict().subDict("PISO"), pdRefCell, pdRefValue);
 
+    scalar pRefValue = 0.0;
+
+    if (pd.needReference())
+    {
+        pRefValue = readScalar
+        (
+            mesh.solutionDict().subDict("PISO").lookup("pRefValue")
+        );
+
+        p += dimensionedScalar
+        (
+            "p",
+            p.dimensions(),
+            pRefValue - getRefCellValue(p, pdRefCell)
+        );
+    }
+
 
     // Construct incompressible turbulence model
     autoPtr<incompressible::turbulenceModel> turbulence

applications/solvers/multiphase/multiphaseInterFoam/multiphaseInterFoam.C

@@ -83,6 +83,16 @@ int main(int argc, char *argv[])
 
         p = pd + rho*gh;
 
+        if (pd.needReference())
+        {
+            p += dimensionedScalar
+            (
+                "p",
+                p.dimensions(),
+                pRefValue - getRefCellValue(p, pdRefCell)
+            );
+        }
+
         turbulence->correct();
 
         runTime.write();

applications/solvers/multiphase/twoLiquidMixingFoam/createFields.H

@@ -95,6 +95,23 @@
     scalar pdRefValue = 0.0;
     setRefCell(pd, mesh.solutionDict().subDict("PISO"), pdRefCell, pdRefValue);
 
+    scalar pRefValue = 0.0;
+
+    if (pd.needReference())
+    {
+        pRefValue = readScalar
+        (
+            mesh.solutionDict().subDict("PISO").lookup("pRefValue")
+        );
+
+        p += dimensionedScalar
+        (
+            "p",
+            p.dimensions(),
+            pRefValue - getRefCellValue(p, pdRefCell)
+        );
+    }
+
 
     // Construct incompressible turbulence model
     autoPtr<incompressible::turbulenceModel> turbulence

applications/solvers/multiphase/twoLiquidMixingFoam/twoLiquidMixingFoam.C

@@ -75,6 +75,16 @@ int main(int argc, char *argv[])
 
         p = pd + rho*gh;
 
+        if (pd.needReference())
+        {
+            p += dimensionedScalar
+            (
+                "p",
+                p.dimensions(),
+                pRefValue - getRefCellValue(p, pdRefCell)
+            );
+        }
+
         turbulence->correct();
 
         runTime.write();

tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/system/fvSolution

@@ -121,13 +121,10 @@ PISO
     nAlphaCorr      1;
     nAlphaSubCycles 3;
     cAlpha          1;
-    pdRefCell       0;
+
+    pdRefPoint      (0.51 0.51 0.51);
     pdRefValue      0;
-    pRefProbe
+    pRefValue       0;
-    {
-        fields          ( pd );
-        probeLocations  ( ( 0.51 0.51 0.51 ) );
-    }
 }
 
 

tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/system/fvSolution

@@ -98,19 +98,10 @@ PISO
     nAlphaSubCycles 3;
     cAlpha          1.5;
     correctPhi      no;
-    pRefProbe
-    {
-        fields          
-        (
-            p
-        );
-        probeLocations
-        (
-            ( 0 0 0.15 )
-        );
-    }
 
-    pRefValue       100000;
+    pdRefPoint      (0 0 0.15);
+    pdRefValue      0;
+    pRefValue       1e5;
 }
 
 relaxationFactors

tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/system/fvSolution

@@ -98,19 +98,10 @@ PISO
     nAlphaSubCycles 3;
     cAlpha          1.5;
     correctPhi      no;
-    pRefProbe
-    {
-        fields
-        (
-            p
-        );
-        probeLocations
-        (
-            ( 0 0 0.15 )
-        );
-    }
 
-    pRefValue       100000;
+    pdRefPoint      (0 0 0.15);
+    pdRefValue      0;
+    pRefValue       1e5;
 }
 
 relaxationFactors

tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/system/fvSolution

@@ -98,19 +98,10 @@ PISO
     nAlphaSubCycles 3;
     cAlpha          1.5;
     correctPhi      no;
-    pRefProbe
-    {
-        fields
-        (
-            p
-        );
-        probeLocations
-        (
-            ( 0 0 0.15 )
-        );
-    }
 
-    pRefValue       100000;
+    pdRefPoint      (0 0 0.15);
+    pdRefValue      0;
+    pRefValue       1e5;
 }
 
 relaxationFactors

tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/system/fvSolution

@@ -98,19 +98,10 @@ PISO
     nAlphaSubCycles 3;
     cAlpha          1.5;
     correctPhi      no;
-    pRefProbe
-    {
-        fields
-        (
-            p
-        );
-        probeLocations
-        (
-            ( 0 0 0.15 )
-        );
-    }
 
-    pRefValue       100000;
+    pdRefPoint      (0 0 0.15);
+    pdRefValue      0;
+    pRefValue       1e5;
 }
 
 relaxationFactors

tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/system/fvSolution

@@ -98,19 +98,10 @@ PISO
     nAlphaSubCycles 3;
     cAlpha          1.5;
     correctPhi      no;
-    pRefProbe
-    {
-        fields
-        (
-            p
-        );
-        probeLocations
-        (
-            ( 0 0 0.15 )
-        );
-    }
 
-    pRefValue       100000;
+    pdRefPoint      (0 0 0.15);
+    pdRefValue      0;
+    pRefValue       1e5;
 }
 
 relaxationFactors