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

src/thermophysicalModels/specie/equationOfState/icoPolynomial/icoPolynomial.H

@@ -48,9 +48,6 @@ Usage
             \rho = 1000 - 0.05 T + 0.003 T^2
         \f]
 
-Note
-    Input in [kg/m^3], but internally uses [kg/m3/kmol].
-
 SourceFiles
     icoPolynomialI.H
     icoPolynomial.C
@@ -116,7 +113,7 @@ class icoPolynomial
 {
     // Private Data
 
-        //- Density polynomial coefficients
+        //- Density polynomial coefficients [kg/m^3/K^i]
         Polynomial<PolySize> rhoCoeffs_;
 
 

src/thermophysicalModels/specie/thermo/eConst/eConstThermo.H

@@ -88,12 +88,10 @@ class eConstThermo
 {
     // Private Data
 
-        //- Heat capacity at constant volume
+        //- Heat capacity at constant volume [J/kg/K]
-        //  Note: input in [J/kg/K], but internally uses [J/kmol/K]
         scalar Cv_;
 
-        //- Heat of formation
+        //- Heat of formation [J/kg]
-        //  Note: input in [J/kg], but internally uses [J/kmol]
         scalar Hf_;
 
 

src/thermophysicalModels/specie/thermo/hConst/hConstThermo.H

@@ -86,7 +86,10 @@ class hConstThermo
 {
     // Private Data
 
+        //- Heat capacity at constant pressure [J/kmol/K]
         scalar Cp_;
+
+        //- Heat of formation [J/kg]
         scalar Hf_;
 
 

src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermo.H

@@ -56,8 +56,6 @@ Usage
         \f]
 
 Note
-    - Heat of formation is inputted in [J/kg], but internally uses [J/kmol]
-    - Standard entropy is inputted in [J/kg/K], but internally uses [J/kmol/K]
     - Specific heat at constant pressure polynomial coefficients evaluate to an
       expression in [J/kg/K].
 
@@ -132,14 +130,15 @@ class hPolynomialThermo
         //- Standard entropy
         scalar Sf_;
 
-        //- Specific heat at constant pressure polynomial coeffs
+        //- Specific heat at constant pressure polynomial coeffs [J/kg/K/K^i]
         Polynomial<PolySize> CpCoeffs_;
 
-        //- Enthalpy polynomial coeffs - derived from cp [J/kg]
+        //- Enthalpy polynomial coeffs [J/kg/K^i]
-        //  NOTE: relative to Tstd
+        //  Derived from Cp coeffs. Relative to Tstd.
         typename Polynomial<PolySize>::intPolyType hCoeffs_;
 
-        //- Entropy - derived from Cp [J/kg/K] - relative to Tstd
+        //- Entropy polynomial coeffs [J/kg/K/K^i]
+        //  Derived from Cp coeffs. Relative to Tstd.
         Polynomial<PolySize> sCoeffs_;
 
 

src/thermophysicalModels/specie/transport/logPolynomial/logPolynomialTransport.H

@@ -63,12 +63,6 @@ Usage
             \kappa = 2000 - 0.15 ln(T) + 0.023 ln(T)^2
         \f]
 
-Note
-    - Dynamic viscosity polynomial coefficients evaluate to an expression in
-      [Pa.s], but internally uses [Pa.s/kmol].
-    - Thermal conductivity polynomial coefficients evaluate to an expression in
-      [W/m/K], but internally uses [W/m/K/kmol].
-
 SourceFiles
     logPolynomialTransportI.H
     logPolynomialTransport.C
@@ -125,12 +119,10 @@ class logPolynomialTransport
 {
     // Private Data
 
-        //- Dynamic viscosity polynomial coefficients
+        //- Dynamic viscosity polynomial coefficients [Pa.s/K^i]
-        //  Note: input in [Pa.s], but internally uses [Pa.s/kmol]
         Polynomial<PolySize> muCoeffs_;
 
-        //- Thermal conductivity polynomial coefficients
+        //- Thermal conductivity polynomial coefficients [W/m/K/K^i]
-        //  Note: input in [W/m/K], but internally uses [W/m/K/kmol]
         Polynomial<PolySize> kappaCoeffs_;
 
 

src/thermophysicalModels/specie/transport/polynomial/polynomialTransport.H

@@ -54,12 +54,6 @@ Usage
             \kappa = 2000 - 0.15 T + 0.023 T^2
         \f]
 
-Note
-    - Dynamic viscosity polynomial coefficients evaluate to an expression in
-      [Pa.s], but internally uses [Pa.s/kmol].
-    - Thermal conductivity polynomial coefficients evaluate to an expression in
-      [W/m/K], but internally uses [W/m/K/kmol].
-
 SourceFiles
     polynomialTransportI.H
     polynomialTransport.C
@@ -116,10 +110,10 @@ class polynomialTransport
 {
     // Private Data
 
-        //- Dynamic viscosity polynomial coefficients
+        //- Dynamic viscosity polynomial coefficients [Pa.s/K^i]
         Polynomial<PolySize> muCoeffs_;
 
-        //- Thermal conductivity polynomial coefficients
+        //- Thermal conductivity polynomial coefficients [W/m/K/K^i]
         Polynomial<PolySize> kappaCoeffs_;
 
 

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
+    minMax
-    {
-        type            setTimeStep;
-        functionObjectLibs ("libutilityFunctionObjects.so");
-        enabled         yes;
-        deltaT          tableFile;
-        file            "system/deltaTvalues";
-    }
-
-    minMaxp
     {
         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;
 }