diff --git a/applications/solvers/combustion/chemFoam/Make/options b/applications/solvers/combustion/chemFoam/Make/options index ac20d1f9ff..0b582379d4 100644 --- a/applications/solvers/combustion/chemFoam/Make/options +++ b/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 diff --git a/applications/utilities/thermophysical/chemkinToFoam/Make/options b/applications/utilities/thermophysical/chemkinToFoam/Make/options index f274487229..a4a45b8c0c 100644 --- a/applications/utilities/thermophysical/chemkinToFoam/Make/options +++ b/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 diff --git a/src/combustionModels/Make/options b/src/combustionModels/Make/options index 584c634dcb..bd39e44b1d 100644 --- a/src/combustionModels/Make/options +++ b/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 diff --git a/src/phaseSystemModels/multiphaseInter/phasesSystem/InterfaceCompositionModel/InterfaceCompositionModels.C b/src/phaseSystemModels/multiphaseInter/phasesSystem/InterfaceCompositionModel/InterfaceCompositionModels.C index ff9bcb7d2d..fdc88ca85e 100644 --- a/src/phaseSystemModels/multiphaseInter/phasesSystem/InterfaceCompositionModel/InterfaceCompositionModels.C +++ b/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 diff --git a/src/phaseSystemModels/multiphaseInter/phasesSystem/Make/options b/src/phaseSystemModels/multiphaseInter/phasesSystem/Make/options index ad28edd86f..de7203d66c 100644 --- a/src/phaseSystemModels/multiphaseInter/phasesSystem/Make/options +++ b/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 diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/Make/options b/src/phaseSystemModels/reactingEuler/multiphaseSystem/Make/options index ae88c6b128..ae3cbab1b2 100644 --- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/Make/options +++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/Make/options @@ -23,4 +23,5 @@ LIB_LIBS = \ -lcompressibleTransportModels \ -lspecie \ -lturbulenceModels \ - -lcompressibleTurbulenceModels + -lcompressibleTurbulenceModels \ + -lthermophysicalProperties diff --git a/src/thermophysicalModels/Allwmake b/src/thermophysicalModels/Allwmake index a54beacdba..b379da6592 100755 --- a/src/thermophysicalModels/Allwmake +++ b/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 diff --git a/src/thermophysicalModels/chemistryModel/Make/options b/src/thermophysicalModels/chemistryModel/Make/options index 88acec651f..603c2da2e0 100644 --- a/src/thermophysicalModels/chemistryModel/Make/options +++ b/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 diff --git a/src/thermophysicalModels/reactionThermo/Make/options b/src/thermophysicalModels/reactionThermo/Make/options index 20754771fa..9b2471488b 100644 --- a/src/thermophysicalModels/reactionThermo/Make/options +++ b/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 diff --git a/src/thermophysicalModels/solidChemistryModel/Make/options b/src/thermophysicalModels/solidChemistryModel/Make/options index 37b7a6dd78..73add5e0b0 100644 --- a/src/thermophysicalModels/solidChemistryModel/Make/options +++ b/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 diff --git a/src/thermophysicalModels/specie/Make/options b/src/thermophysicalModels/specie/Make/options index 6b8588463d..7b1ea2409f 100644 --- a/src/thermophysicalModels/specie/Make/options +++ b/src/thermophysicalModels/specie/Make/options @@ -1,2 +1,4 @@ -/* EXE_INC = */ +EXE_INC = \ + -I$(LIB_SRC)/thermophysicalModels/thermophysicalProperties/lnInclude + /* LIB_LIBS = */ diff --git a/src/thermophysicalModels/specie/include/thermoPhysicsTypes.H b/src/thermophysicalModels/specie/include/thermoPhysicsTypes.H index de1b4e419c..7177d2f8d8 100644 --- a/src/thermophysicalModels/specie/include/thermoPhysicsTypes.H +++ b/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 + >, + sensibleEnthalpy + > + > + tabulatedThermoPhysics; + // thermo physics types based on sensibleInternalEnergy typedef @@ -336,6 +354,20 @@ namespace Foam > > constEThermoPhysics; + + typedef + tabulatedTransport + < + species::thermo + < + hTabulatedThermo + < + icoTabulated + >, + sensibleInternalEnergy + > + > + tabulatedEThermoPhysics; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //