Merge branch 'thermo-ext' into 'develop'

Thermo ext

See merge request Development/openfoam!424

applications/solvers/combustion/chemFoam/Make/options

@@ -6,11 +6,13 @@ EXE_INC = \
     -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
     -I$(LIB_SRC)/transportModels/compressible/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/chemistryModel/lnInclude
+    -I$(LIB_SRC)/thermophysicalModels/chemistryModel/lnInclude \
+    -I$(LIB_SRC)/thermophysicalModels/thermophysicalProperties/lnInclude
 
 EXE_LIBS = \
     -lfiniteVolume \
     -lmeshTools \
     -lfluidThermophysicalModels \
     -lreactionThermophysicalModels \
-    -lchemistryModel
+    -lchemistryModel \
+    -lthermophysicalProperties

applications/utilities/thermophysical/chemkinToFoam/Make/options

@@ -1,9 +1,11 @@
 EXE_INC = \
     -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude
+    -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
+    -I$(LIB_SRC)/thermophysicalModels/thermophysicalProperties/lnInclude
 
 EXE_LIBS = \
     -lreactionThermophysicalModels \
     -lcompressibleTransportModels \
     -lfluidThermophysicalModels \
-    -lspecie
+    -lspecie \
+    -lthermophysicalProperties

src/combustionModels/Make/options

@@ -8,6 +8,7 @@ EXE_INC = \
     -I$(LIB_SRC)/thermophysicalModels/chemistryModel/lnInclude \
     -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
     -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
+    -I$(LIB_SRC)/thermophysicalModels/thermophysicalProperties/lnInclude
 
 LIB_LIBS = \
     -lfiniteVolume \
@@ -18,4 +19,5 @@ LIB_LIBS = \
     -lreactionThermophysicalModels \
     -lchemistryModel \
     -lturbulenceModels \
-    -lcompressibleTurbulenceModels
+    -lcompressibleTurbulenceModels \
+    -lthermophysicalProperties

src/phaseSystemModels/multiphaseInter/phasesSystem/InterfaceCompositionModel/InterfaceCompositionModels.C

@@ -214,7 +214,7 @@ namespace Foam
         );
 
 
-        // From pure phase (solidThermo) to phase (Boussinesq)
+        // From pure solid phase (const) to phase (Boussinesq)
         makeInterfacePureType
         (
             Lee,
@@ -228,7 +228,7 @@ namespace Foam
             BoussinesqFluidEThermoPhysics
         );
 
-        // From pure phase (solidThermo) to phase (rho const)
+        // From pure solid phase (const) to phase (rho const)
         makeInterfacePureType
         (
             Lee,
@@ -242,7 +242,35 @@ namespace Foam
             constRhoHThermoPhysics
         );
 
-        // From pure phase (all-poly solidThermo) to phase (ico-rho)
+        // From pure solid phase (const) to phase (tabulated)
+        makeInterfacePureType
+        (
+            Lee,
+            heSolidThermo,
+            solidThermo,
+            pureMixture,
+            hConstSolidThermoPhysics,
+            heRhoThermo,
+            rhoThermo,
+            pureMixture,
+            tabulatedThermoPhysics
+        );
+
+        // From pure solid phase (const) to phase (poly)
+        makeInterfacePureType
+        (
+            Lee,
+            heSolidThermo,
+            solidThermo,
+            pureMixture,
+            hConstSolidThermoPhysics,
+            heRhoThermo,
+            rhoThermo,
+            pureMixture,
+            icoPoly8HThermoPhysics
+        );
+
+        // From pure solid phase (poly) to flow phase (poly)
         makeInterfacePureType
         (
             Lee,
@@ -256,6 +284,20 @@ namespace Foam
             icoPoly8HThermoPhysics
         );
 
+        // From pure solid phase (poly) to flow phase (tabulated)
+        makeInterfacePureType
+        (
+            Lee,
+            heSolidThermo,
+            solidThermo,
+            pureMixture,
+            hPolyTranspPolyIcoSolidThermoPhysics,
+            heRhoThermo,
+            rhoThermo,
+            pureMixture,
+            tabulatedThermoPhysics
+        );
+
         // From pure phase (exp-Transp, hPower solidThermo) to phase (ico-rho)
         makeInterfacePureType
         (
@@ -314,7 +356,7 @@ namespace Foam
             hConstSolidThermoPhysics
         );
 
-        //From pure liquid phase (ico-rho) to pure phase (exp-Transp, hPower solidThermo)
+        //From pure phase (poly) to solid phase (exp)
         makeInterfacePureType
         (
             Lee,
@@ -328,6 +370,62 @@ namespace Foam
             hPowerSolidThermoPhysics
         );
 
+        //From pure phase (poly) to solid phase (poly)
+        makeInterfacePureType
+        (
+            Lee,
+            heRhoThermo,
+            rhoThermo,
+            pureMixture,
+            icoPoly8HThermoPhysics,
+            heSolidThermo,
+            solidThermo,
+            pureMixture,
+            hPolyTranspPolyIcoSolidThermoPhysics
+        );
+
+        //From pure phase (poly) to solid phase (const)
+        makeInterfacePureType
+        (
+            Lee,
+            heRhoThermo,
+            rhoThermo,
+            pureMixture,
+            icoPoly8HThermoPhysics,
+            heSolidThermo,
+            solidThermo,
+            pureMixture,
+            hConstSolidThermoPhysics
+        );
+
+        //From pure phase (tabulated) to solid phase (poly)
+        makeInterfacePureType
+        (
+            Lee,
+            heRhoThermo,
+            rhoThermo,
+            pureMixture,
+            tabulatedThermoPhysics,
+            heSolidThermo,
+            solidThermo,
+            pureMixture,
+            hPolyTranspPolyIcoSolidThermoPhysics
+        );
+
+        //From pure phase (tabulated) to solid phase (const)
+        makeInterfacePureType
+        (
+            Lee,
+            heRhoThermo,
+            rhoThermo,
+            pureMixture,
+            tabulatedThermoPhysics,
+            heSolidThermo,
+            solidThermo,
+            pureMixture,
+            hConstSolidThermoPhysics
+        );
+
 
 
         // interfaceHeatResistance model definitions

src/phaseSystemModels/multiphaseInter/phasesSystem/Make/options

@@ -6,6 +6,7 @@ EXE_INC = \
     -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/solidThermo/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/solidSpecie/lnInclude \
+    -I$(LIB_SRC)/thermophysicalModels/thermophysicalProperties/lnInclude \
     -I$(LIB_SRC)/transportModels \
     -I$(LIB_SRC)/transportModels/compressible/lnInclude \
     -I$(LIB_SRC)/transportModels/incompressible/lnInclude \
@@ -28,4 +29,5 @@ LIB_LIBS = \
     -lgeometricVoF \
     -lturbulenceModels \
     -lcompressibleTurbulenceModels \
+    -lthermophysicalProperties \
     -lcombustionModels

src/phaseSystemModels/reactingEuler/multiphaseSystem/Make/options

@@ -23,4 +23,5 @@ LIB_LIBS = \
     -lcompressibleTransportModels \
     -lspecie \
     -lturbulenceModels \
-    -lcompressibleTurbulenceModels
+    -lcompressibleTurbulenceModels \
+    -lthermophysicalProperties

src/thermophysicalModels/Allwmake

@@ -4,6 +4,7 @@ cd "${0%/*}" || exit                                # Run from this directory
 
 #------------------------------------------------------------------------------
 
+wmakeLnInclude -u thermophysicalProperties
 wmake $targetType specie
 wmake $targetType solidSpecie
 wmake $targetType thermophysicalProperties

src/thermophysicalModels/chemistryModel/Make/options

@@ -7,7 +7,8 @@ EXE_INC = \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/functions/Polynomial \
-    -I$(LIB_SRC)/thermophysicalModels/thermophysicalFunctions/lnInclude
+    -I$(LIB_SRC)/thermophysicalModels/thermophysicalFunctions/lnInclude \
+    -I$(LIB_SRC)/thermophysicalModels/thermophysicalProperties/lnInclude
 
 LIB_LIBS = \
     -lfiniteVolume \
@@ -16,4 +17,5 @@ LIB_LIBS = \
     -lcompressibleTransportModels \
     -lfluidThermophysicalModels \
     -lreactionThermophysicalModels \
-    -lspecie
+    -lspecie \
+    -lthermophysicalProperties

src/thermophysicalModels/reactionThermo/Make/options

@@ -4,6 +4,7 @@ EXE_INC = \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/solidSpecie/lnInclude \
+    -I$(LIB_SRC)/thermophysicalModels/thermophysicalProperties/lnInclude \
     -I$(LIB_SRC)/functionObjects/field/lnInclude
 
 LIB_LIBS = \
@@ -11,4 +12,5 @@ LIB_LIBS = \
     -lcompressibleTransportModels \
     -lfluidThermophysicalModels \
     -lspecie \
-    -lsolidSpecie
+    -lsolidSpecie \
+    -lthermophysicalProperties

src/thermophysicalModels/solidChemistryModel/Make/options

@@ -7,6 +7,7 @@ EXE_INC = \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/solidThermo/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
+    -I$(LIB_SRC)/thermophysicalModels/thermophysicalProperties/lnInclude \
     -I$(LIB_SRC)/transportModels/compressible/lnInclude
 
 LIB_LIBS = \
@@ -17,4 +18,5 @@ LIB_LIBS = \
     -lfluidThermophysicalModels \
     -lsolidThermo \
     -lreactionThermophysicalModels \
-    -lcompressibleTransportModels
+    -lcompressibleTransportModels \
+    -lthermophysicalProperties

src/thermophysicalModels/specie/Make/options

@@ -1,2 +1,4 @@
-/* EXE_INC = */
+EXE_INC = \
+    -I$(LIB_SRC)/thermophysicalModels/thermophysicalProperties/lnInclude
+
 /* LIB_LIBS = */

src/thermophysicalModels/specie/include/thermoPhysicsTypes.H

@@ -56,6 +56,10 @@ Description
 #include "hPolynomialThermo.H"
 #include "polynomialTransport.H"
 
+#include "tabulatedTransport.H"
+#include "hTabulatedThermo.H"
+#include "icoTabulated.H"
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
@@ -198,6 +202,20 @@ namespace Foam
     >
     constHThermoPhysics;
 
+    typedef
+    tabulatedTransport
+    <
+        species::thermo
+        <
+            hTabulatedThermo
+            <
+                icoTabulated<specie>
+            >,
+            sensibleEnthalpy
+        >
+    >
+    tabulatedThermoPhysics;
+
 
     // thermo physics types based on sensibleInternalEnergy
     typedef
@@ -336,6 +354,20 @@ namespace Foam
         >
     >
     constEThermoPhysics;
+
+    typedef
+    tabulatedTransport
+    <
+        species::thermo
+        <
+            hTabulatedThermo
+            <
+                icoTabulated<specie>
+            >,
+            sensibleInternalEnergy
+        >
+    >
+    tabulatedEThermoPhysics;
 }
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //