Merge branch 'master' of github.com-OpenFOAM:OpenFOAM/OpenFOAM-dev

tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/fvOptions

@@ -66,6 +66,26 @@ options
             h.steam      (3700 0); // kg*m^2/s^3
         }
     }
+
+    limitTsteam
+    {
+        type            limitTemperature;
+        active          yes;
+        selectionMode   all;
+        min             270;
+        max             2000;
+        phase           steam;
+    }
+
+    limitTwater
+    {
+        type            limitTemperature;
+        active          yes;
+        selectionMode   all;
+        min             270;
+        max             2000;
+        phase           water;
+    }
 }
 
 

tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/system/controlDict

@@ -47,28 +47,21 @@ runTimeModifiable yes;
 
 adjustTimeStep  yes;
 
-maxCo           0.1;
+maxCo           0.25;
 
 maxDeltaT       1e-2;
 
 functions
 {
-    timeStepping
-    {
-        type            setTimeStep;
-        functionObjectLibs ("libutilityFunctionObjects.so");
-        enabled         yes;
-        deltaT          tableFile;
-        file            "system/deltaTvalues";
-    }
-
-    minMaxp
+    minMax
     {
         type        fieldMinMax;
         functionObjectLibs ("libfieldFunctionObjects.so");
         fields
         (
-             p
+            T.steam
+            T.water
+            p
         );
         location        no;
         writeControl    timeStep;

tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/system/deltaTvalues

@@ -1,9 +0,0 @@
-(
-    (0 1e-3)
-    (0.99 1e-3)
-    (0.999 1e-4)
-    (0.9999 1e-5)
-    (1.001 1e-5)
-    (1.01 1e-4)
-    (1.1 1e-3)
-);

tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/system/fvSolution

@@ -81,7 +81,7 @@ PIMPLE
     nOuterCorrectors 3;
     nCorrectors      1;
     nNonOrthogonalCorrectors 0;
-    nEnergyCorrectors 2;
+    nEnergyCorrectors 1;
     faceMomentum    yes;
 }