GIT: Initial state after latest Foundation merge

applications/solvers/multiphase/interPhaseChangeFoam/Allwmake

@@ -2,12 +2,11 @@
 cd ${0%/*} || exit 1    # Run from this directory
 
 # Parse arguments for library compilation
-targetType=libso
 . $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
 set -x
 
 wmake $targetType phaseChangeTwoPhaseMixtures
-wmake
-wmake interPhaseChangeDyMFoam
+wmake $targetType
+wmake $targetType interPhaseChangeDyMFoam
 
 #------------------------------------------------------------------------------

applications/solvers/multiphase/interPhaseChangeFoam/createFields.H

@@ -38,7 +38,6 @@ volScalarField& alpha2(mixture->alpha2());
 
 const dimensionedScalar& rho1 = mixture->rho1();
 const dimensionedScalar& rho2 = mixture->rho2();
-const dimensionedScalar& pSat = mixture->pSat();
 
 
 // Need to store rho for ddt(rho, U)

applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeDyMFoam/interPhaseChangeDyMFoam.C

@@ -59,13 +59,14 @@ Description
 
 int main(int argc, char *argv[])
 {
+    #include "postProcess.H"
+
     #include "setRootCase.H"
     #include "createTime.H"
     #include "createDynamicFvMesh.H"
-
-    pimpleControl pimple(mesh);
-
-    #include "../interFoam/interDyMFoam/createControls.H"
+    #include "createControl.H"
+    #include "createTimeControls.H"
+    #include "../interFoam/interDyMFoam/createDyMControls.H"
     #include "initContinuityErrs.H"
     #include "createFields.H"
     #include "createFvOptions.H"

applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeDyMFoam/pEqn.H

@@ -38,7 +38,8 @@
         fvScalarMatrix p_rghEqn
         (
             fvc::div(phiHbyA) - fvm::laplacian(rAUf, p_rgh)
-          - (vDotvP - vDotcP)*(pSat - rho*gh) + fvm::Sp(vDotvP - vDotcP, p_rgh)
+          - (vDotvP - vDotcP)*(mixture->pSat() - rho*gh)
+          + fvm::Sp(vDotvP - vDotcP, p_rgh)
         );
 
         p_rghEqn.setReference(pRefCell, pRefValue);

applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeFoam.C

@@ -56,12 +56,12 @@ Description
 
 int main(int argc, char *argv[])
 {
+    #include "postProcess.H"
+
     #include "setRootCase.H"
     #include "createTime.H"
     #include "createMesh.H"
-
-    pimpleControl pimple(mesh);
-
+    #include "createControl.H"
     #include "createFields.H"
     #include "createFvOptions.H"
     #include "createTimeControls.H"
@@ -76,7 +76,7 @@ int main(int argc, char *argv[])
 
     while (runTime.run())
     {
-        #include "createTimeControls.H"
+        #include "readTimeControls.H"
         #include "CourantNo.H"
         #include "setDeltaT.H"
 

applications/solvers/multiphase/interPhaseChangeFoam/pEqn.H

@@ -32,7 +32,8 @@
         fvScalarMatrix p_rghEqn
         (
             fvc::div(phiHbyA) - fvm::laplacian(rAUf, p_rgh)
-          - (vDotvP - vDotcP)*(pSat - rho*gh) + fvm::Sp(vDotvP - vDotcP, p_rgh)
+          - (vDotvP - vDotcP)*(mixture->pSat() - rho*gh)
+          + fvm::Sp(vDotvP - vDotcP, p_rgh)
         );
 
         p_rghEqn.setReference(pRefCell, pRefValue);