songtianlun/openfoam
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

thermophysicalProperties: New base-class for liquidProperties and in the future gasProperties

Browse Source 
Description
    Base-class for thermophysical properties of solids, liquids and gases
    providing an interface compatible with the templated thermodynamics
    packages.

liquidProperties, solidProperties and thermophysicalFunction libraries have been
combined with the new thermophysicalProperties class into a single
thermophysicalProperties library to simplify compilation and linkage of models,
libraries and applications dependent on these classes.
This commit is contained in:
Henry Weller 2017-02-18 21:53:20 +00:00
parent de44d09ad9
commit d2be645483
171 changed files with 508 additions and 303 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
applications/solvers/combustion/fireFoam/Make/options
View File

@ -13,8 +13,7 @@ EXE_INC = \
-I$(LIB_SRC)/thermophysicalModels/chemistryModel/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/solidChemistryModel/lnInclude \
-I$(LIB_SRC)/combustionModels/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/properties/solidProperties/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/properties/liquidProperties/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/thermophysicalProperties/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/thermophysicalFunctions/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/SLGThermo/lnInclude \
@ -36,8 +35,6 @@ EXE_LIBS = \
-lspecie \
-lcompressibleTransportModels \
-lfluidThermophysicalModels \
-lsolidProperties \
-lthermophysicalFunctions \
-lreactionThermophysicalModels \
-lSLGThermo \
-lchemistryModel \

1
applications/solvers/lagrangian/DPMFoam/MPPICFoam/Make/options
View File

@ -25,7 +25,6 @@ EXE_LIBS = \
-llagrangian \
-llagrangianIntermediate \
-llagrangianTurbulence \
-lthermophysicalFunctions \
-lspecie \
-lradiationModels \
-lincompressibleTransportModels \

1
applications/solvers/lagrangian/DPMFoam/Make/options
View File

@ -21,7 +21,6 @@ EXE_LIBS = \
-llagrangian \
-llagrangianIntermediate \
-llagrangianTurbulence \
-lthermophysicalFunctions \
-lspecie \
-lradiationModels \
-lincompressibleTransportModels \

7
applications/solvers/lagrangian/coalChemistryFoam/Make/options
View File

@ -10,8 +10,7 @@ EXE_INC = \
-I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
-I$(LIB_SRC)/transportModels/compressible/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/properties/liquidProperties/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/properties/solidProperties/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/thermophysicalProperties/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/thermophysicalFunctions/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/SLGThermo/lnInclude \
@ -36,9 +35,7 @@ EXE_LIBS = \
-lspecie \
-lcompressibleTransportModels \
-lfluidThermophysicalModels \
-lliquidProperties \
-lsolidProperties \
-lthermophysicalFunctions \
-lthermophysicalProperties \
-lreactionThermophysicalModels \
-lSLGThermo \
-lchemistryModel \

1
applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/Make/options
View File

@ -19,7 +19,6 @@ EXE_LIBS = \
-llagrangian \
-llagrangianIntermediate \
-llagrangianTurbulence \
-lthermophysicalFunctions \
-lcompressibleTransportModels \
-lfluidThermophysicalModels \
-lspecie \

1
applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/icoUncoupledKinematicParcelDyMFoam/Make/options
View File

@ -23,7 +23,6 @@ EXE_LIBS = \
-llagrangian \
-llagrangianIntermediate \
-llagrangianTurbulence \
-lthermophysicalFunctions \
-lcompressibleTransportModels \
-lfluidThermophysicalModels \
-lspecie \

5
applications/solvers/lagrangian/reactingParcelFilmFoam/Make/options
View File

@ -9,8 +9,7 @@ EXE_INC = \
-I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
-I$(LIB_SRC)/transportModels/compressible/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/properties/solidProperties/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/properties/liquidProperties/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/thermophysicalProperties/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/thermophysicalFunctions/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/SLGThermo/lnInclude \
@ -34,8 +33,6 @@ EXE_LIBS = \
-lspecie \
-lcompressibleTransportModels \
-lfluidThermophysicalModels \
-lsolidProperties \
-lthermophysicalFunctions \
-lreactionThermophysicalModels \
-lSLGThermo \
-lchemistryModel \

7
applications/solvers/lagrangian/reactingParcelFoam/Make/options
View File

@ -11,8 +11,7 @@ EXE_INC = \
-I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
-I$(LIB_SRC)/transportModels/compressible/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/properties/liquidProperties/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/properties/solidProperties/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/thermophysicalProperties/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/thermophysicalFunctions/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/SLGThermo/lnInclude \
@ -37,9 +36,7 @@ EXE_LIBS = \
-lspecie \
-lcompressibleTransportModels \
-lfluidThermophysicalModels \
-lliquidProperties \
-lsolidProperties \
-lthermophysicalFunctions \
-lthermophysicalProperties \
-lreactionThermophysicalModels \
-lSLGThermo \
-lchemistryModel \

7
applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/Make/options
View File

@ -11,8 +11,7 @@ EXE_INC = \
-I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
-I$(LIB_SRC)/transportModels/compressible/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/properties/liquidProperties/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/properties/solidProperties/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/thermophysicalProperties/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/thermophysicalFunctions/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/SLGThermo/lnInclude \
@ -37,9 +36,7 @@ EXE_LIBS = \
-lspecie \
-lcompressibleTransportModels \
-lfluidThermophysicalModels \
-lliquidProperties \
-lsolidProperties \
-lthermophysicalFunctions \
-lthermophysicalProperties \
-lreactionThermophysicalModels \
-lSLGThermo \
-lchemistryModel \

7
applications/solvers/lagrangian/sprayFoam/Make/options
View File

@ -13,8 +13,7 @@ EXE_INC = \
-I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
-I$(LIB_SRC)/transportModels/compressible/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/properties/liquidProperties/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/properties/solidProperties/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/thermophysicalProperties/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/thermophysicalFunctions/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/SLGThermo/lnInclude \
@ -35,9 +34,7 @@ EXE_LIBS = \
-lspecie \
-lcompressibleTransportModels \
-lfluidThermophysicalModels \
-lliquidProperties \
-lsolidProperties \
-lthermophysicalFunctions \
-lthermophysicalProperties \
-lreactionThermophysicalModels \
-lSLGThermo \
-lchemistryModel \

7
applications/solvers/lagrangian/sprayFoam/sprayDyMFoam/Make/options
View File

@ -14,8 +14,7 @@ EXE_INC = \
-I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
-I$(LIB_SRC)/transportModels/compressible/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/properties/liquidProperties/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/properties/solidProperties/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/thermophysicalProperties/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/thermophysicalFunctions/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/SLGThermo/lnInclude \
@ -39,9 +38,7 @@ EXE_LIBS = \
-lspecie \
-lcompressibleTransportModels \
-lfluidThermophysicalModels \
-lliquidProperties \
-lsolidProperties \
-lthermophysicalFunctions \
-lthermophysicalProperties \
-lreactionThermophysicalModels \
-lSLGThermo \
-lchemistryModel \

7
applications/solvers/lagrangian/sprayFoam/sprayEngineFoam/Make/options
View File

@ -15,8 +15,7 @@ EXE_INC = \
-I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
-I$(LIB_SRC)/transportModels/compressible/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/properties/liquidProperties/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/properties/solidProperties/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/thermophysicalProperties/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/thermophysicalFunctions/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/SLGThermo/lnInclude \
@ -42,9 +41,7 @@ EXE_LIBS = \
-lspecie \
-lcompressibleTransportModels \
-lfluidThermophysicalModels \
-lliquidProperties \
-lsolidProperties \
-lthermophysicalFunctions \
-lthermophysicalProperties \
-lreactionThermophysicalModels \
-lSLGThermo \
-lchemistryModel \

1
applications/solvers/lagrangian/uncoupledKinematicParcelFoam/Make/options
View File

@ -17,7 +17,6 @@ EXE_LIBS = \
-llagrangian \
-llagrangianIntermediate \
-llagrangianTurbulence \
-lthermophysicalFunctions \
-lcompressibleTransportModels \
-lfluidThermophysicalModels \
-lspecie \

3
applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/Make/options
View File

@ -2,8 +2,7 @@ EXE_INC = \
-I../phaseSystems/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/properties/liquidProperties/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/properties/solidProperties/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/thermophysicalProperties/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/thermophysicalFunctions/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/SLGThermo/lnInclude \

1
applications/test/Function1/Make/options
View File

@ -9,7 +9,6 @@ EXE_INC = \
EXE_LIBS = \
-llagrangianIntermediate \
-lradiationModels \
-lthermophysicalFunctions \
-lregionModels \
-lfiniteVolume \
-lmeshTools \

4
applications/test/liquid/Make/options
View File

@ -1,5 +1,3 @@
EXE_INC = \
-I$(LIB_SRC)/thermophysicalModels/properties/liquidProperties/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/thermophysicalProperties/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/thermophysicalFunctions/lnInclude
EXE_LIBS = -lliquidProperties -lthermophysicalFunctions

4
applications/utilities/miscellaneous/foamList/Make/options
View File

@ -49,7 +49,7 @@ EXE_LIBS = \
-llagrangianSpray \
-llagrangianTurbulence \
-llaminarFlameSpeedModels \
-lliquidProperties \
-lthermophysicalProperties \
-lmeshTools \
-lmolecularMeasurements \
-lmolecule \
@ -81,7 +81,6 @@ EXE_LIBS = \
-lsnappyHexMesh \
-lsolidChemistryModel \
-lsolidParticle \
-lsolidProperties \
-lsolidSpecie \
-lsolidThermo \
-lsolverFunctionObjects \
@ -90,7 +89,6 @@ EXE_LIBS = \
-lsurfaceFilmModels \
-lsurfMesh \
-lthermalBaffleModels \
-lthermophysicalFunctions \
-ltopoChangerFvMesh \
-ltriSurface \
-lturbulenceModels \

6
src/lagrangian/coalCombustion/Make/options
View File

@ -5,8 +5,7 @@ EXE_INC = \
-I$(LIB_SRC)/transportModels/compressible/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/properties/liquidProperties/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/properties/solidProperties/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/thermophysicalProperties/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/SLGThermo/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/radiation/lnInclude \
@ -28,8 +27,7 @@ LIB_LIBS = \
-lspecie \
-lcompressibleTransportModels \
-lfluidThermophysicalModels \
-lliquidProperties \
-lsolidProperties \
-lthermophysicalProperties \
-lreactionThermophysicalModels \
-lSLGThermo \
-lradiationModels \

6
src/lagrangian/intermediate/Make/options
View File

@ -4,8 +4,7 @@ EXE_INC = \
-I$(LIB_SRC)/transportModels/compressible/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/properties/liquidProperties/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/properties/solidProperties/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/thermophysicalProperties/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/SLGThermo/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/radiation/lnInclude \
@ -23,8 +22,7 @@ LIB_LIBS = \
-lspecie \
-lcompressibleTransportModels \
-lfluidThermophysicalModels \
-lliquidProperties \
-lsolidProperties \
-lthermophysicalProperties \
-lreactionThermophysicalModels \
-lSLGThermo \
-lradiationModels \

6
src/lagrangian/spray/Make/options
View File

@ -6,8 +6,7 @@ EXE_INC = \
-I$(LIB_SRC)/transportModels/compressible/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/properties/liquidProperties/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/properties/solidProperties/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/thermophysicalProperties/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/SLGThermo/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/radiation/lnInclude \
@ -30,8 +29,7 @@ LIB_LIBS = \
-lspecie \
-lcompressibleTransportModels \
-lfluidThermophysicalModels \
-lliquidProperties \
-lsolidProperties \
-lthermophysicalProperties \
-lreactionThermophysicalModels \
-lSLGThermo \
-lradiationModels \

6
src/lagrangian/turbulence/Make/options
View File

@ -5,8 +5,7 @@ EXE_INC = \
-I$(LIB_SRC)/transportModels/compressible/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/properties/liquidProperties/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/properties/solidProperties/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/thermophysicalProperties/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/SLGThermo/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/radiationModels/lnInclude \
@ -28,8 +27,7 @@ LIB_LIBS = \
-lspecie \
-lcompressibleTransportModels \
-lfluidThermophysicalModels \
-lliquidProperties \
-lsolidProperties \
-lthermophysicalProperties \
-lreactionThermophysicalModels \
-lSLGThermo \
-lradiationModels \

3
src/regionModels/regionCoupling/Make/options
View File

@ -7,9 +7,8 @@ EXE_INC = \
-I$(LIB_SRC)/thermophysicalModels/SLGThermo/lnInclude\
-I$(LIB_SRC)/thermophysicalModels/solidThermo/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/solidChemistryModel/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/properties/liquidProperties/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/thermophysicalProperties/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/solidSpecie/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/properties/solidProperties/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/radiation/lnInclude \
-I$(LIB_SRC)/turbulenceModels/lnInclude \

6
src/regionModels/surfaceFilmModels/Make/options
View File

@ -2,8 +2,7 @@ EXE_INC = \
-I$(LIB_SRC)/transportModels/compressible/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/properties/liquidProperties/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/properties/solidProperties/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/thermophysicalProperties/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/SLGThermo/lnInclude \
-I$(LIB_SRC)/lagrangian/distributionModels/lnInclude \
@ -15,8 +14,7 @@ LIB_LIBS = \
-lcompressibleTransportModels \
-lfluidThermophysicalModels \
-lspecie \
-lliquidProperties \
-lsolidProperties \
-lthermophysicalProperties \
-lreactionThermophysicalModels \
-lSLGThermo \
-ldistributionModels \

6
src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/Make/options
View File

@ -2,8 +2,7 @@ EXE_INC = \
-I$(LIB_SRC)/transportModels/compressible/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/properties/liquidProperties/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/properties/solidProperties/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/thermophysicalProperties/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/SLGThermo/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
@ -17,8 +16,7 @@ LIB_LIBS = \
-lcompressibleTransportModels \
-lfluidThermophysicalModels \
-lspecie \
-lliquidProperties \
-lsolidProperties \
-lthermophysicalProperties \
-lreactionThermophysicalModels \
-lSLGThermo \
-lturbulenceModels \

3
src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/liquidFilmThermo/liquidFilmThermo.C
View File

@ -93,7 +93,8 @@ void liquidFilmThermo::initLiquid(const dictionary& dict)
// new liquid create
ownLiquid_ = true;
liquidPtr_ = new liquidProperties(dict.subDict(name_ + "Coeffs"));
liquidPtr_ =
liquidProperties::New(dict.subDict(name_ + "Coeffs")).ptr();
}
}

3
src/thermophysicalModels/Allwmake
View File

@ -6,8 +6,7 @@ cd ${0%/*} || exit 1 # Run from this directory
wmake $targetType specie
wmake $targetType solidSpecie
wmake $targetType thermophysicalFunctions
./properties/Allwmake $targetType $*
wmake $targetType thermophysicalProperties
wmake $targetType basic
wmake $targetType reactionThermo

3
src/thermophysicalModels/SLGThermo/Make/options
View File

@ -2,8 +2,7 @@ EXE_INC = \
-I$(LIB_SRC)/transportModels/compressible/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/properties/liquidProperties/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/properties/solidProperties/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/thermophysicalProperties/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
-I$(LIB_SRC)/finiteVolume/lnInclude

3
src/thermophysicalModels/basic/Make/options
View File

@ -1,10 +1,13 @@
EXE_INC = \
-I$(LIB_SRC)/transportModels/compressible/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/thermophysicalProperties/lnInclude \
-I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude
LIB_LIBS = \
-lcompressibleTransportModels \
-lspecie \
-lthermophysicalProperties \
-lfiniteVolume \
-lmeshTools

1
src/thermophysicalModels/chemistryModel/Make/options
View File

@ -15,7 +15,6 @@ LIB_LIBS = \
-lfluidThermophysicalModels \
-lreactionThermophysicalModels \
-lspecie \
-lthermophysicalFunctions \
-lODE \
-lfiniteVolume \
-lmeshTools

10
src/thermophysicalModels/properties/Allwmake
View File

@ -1,10 +0,0 @@
#!/bin/sh
cd ${0%/*} || exit 1 # Run from this directory
# Parse arguments for library compilation
. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
wmake $targetType liquidProperties
wmake $targetType solidProperties
#------------------------------------------------------------------------------

35
src/thermophysicalModels/properties/liquidProperties/Make/files
View File

@ -1,35 +0,0 @@
liquidProperties/liquidProperties.C
liquidMixtureProperties/liquidMixtureProperties.C
H2O/H2O.C
C7H16/C7H16.C
C12H26/C12H26.C
C10H22/C10H22.C
C8H18/C8H18.C
IC8H18/IC8H18.C
C4H10O/C4H10O.C
C2H6O/C2H6O.C
IDEA/IDEA.C
aC10H7CH3/aC10H7CH3.C
bC10H7CH3/bC10H7CH3.C
C8H10/C8H10.C
C16H34/C16H34.C
C9H20/C9H20.C
C6H6/C6H6.C
C7H8/C7H8.C
C6H14/C6H14.C
C13H28/C13H28.C
C14H30/C14H30.C
C3H8/C3H8.C
C3H6O/C3H6O.C
C2H6/C2H6.C
CH3OH/CH3OH.C
C2H5OH/C2H5OH.C
Ar/Ar.C
N2/N2.C
MB/MB.C
CH4N2O/CH4N2O.C
nC3H8O/nC3H8O.C
iC3H8O/iC3H8O.C
LIB = $(FOAM_LIBBIN)/libliquidProperties

7
src/thermophysicalModels/properties/liquidProperties/Make/options
View File

@ -1,7 +0,0 @@
EXE_INC = \
-I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/thermophysicalFunctions/lnInclude
LIB_LIBS = \
-lspecie \
-lthermophysicalFunctions

9
src/thermophysicalModels/properties/solidProperties/Make/files
View File

@ -1,9 +0,0 @@
solidProperties/solidProperties.C
solidProperties/solidPropertiesNew.C
solidMixtureProperties/solidMixtureProperties.C
ash/ash.C
C/C.C
CaCO3/CaCO3.C
LIB = $(FOAM_LIBBIN)/libsolidProperties

6
src/thermophysicalModels/radiation/Make/options
View File

@ -4,8 +4,7 @@ EXE_INC = \
-I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/solidThermo/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/SLGThermo/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/properties/liquidProperties/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/properties/solidProperties/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/thermophysicalProperties/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
-I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude
@ -16,7 +15,6 @@ LIB_LIBS = \
-lspecie \
-lsolidThermo \
-lSLGThermo \
-lsolidProperties \
-lliquidProperties \
-lthermophysicalProperties \
-lfiniteVolume \
-lmeshTools

17
src/thermophysicalModels/thermophysicalFunctions/Make/files
View File

@ -1,17 +0,0 @@
thermophysicalFunction = thermophysicalFunction
NSRDSfunctions = NSRDSfunctions
APIfunctions = APIfunctions
$(thermophysicalFunction)/thermophysicalFunction.C
$(NSRDSfunctions)/NSRDSfunc0/NSRDSfunc0.C
$(NSRDSfunctions)/NSRDSfunc1/NSRDSfunc1.C
$(NSRDSfunctions)/NSRDSfunc2/NSRDSfunc2.C
$(NSRDSfunctions)/NSRDSfunc3/NSRDSfunc3.C
$(NSRDSfunctions)/NSRDSfunc4/NSRDSfunc4.C
$(NSRDSfunctions)/NSRDSfunc5/NSRDSfunc5.C
$(NSRDSfunctions)/NSRDSfunc6/NSRDSfunc6.C
$(NSRDSfunctions)/NSRDSfunc7/NSRDSfunc7.C
$(NSRDSfunctions)/NSRDSfunc14/NSRDSfunc14.C
$(APIfunctions)/APIdiffCoefFunc/APIdiffCoefFunc.C
LIB = $(FOAM_LIBBIN)/libthermophysicalFunctions

0
src/thermophysicalModels/thermophysicalFunctions/Make/options
View File

64
src/thermophysicalModels/thermophysicalProperties/Make/files Normal file
View File

@ -0,0 +1,64 @@
thermophysicalFunctions/thermophysicalFunction/thermophysicalFunction.C
NSRDSfunctions = thermophysicalFunctions/NSRDSfunctions
$(NSRDSfunctions)/NSRDSfunc0/NSRDSfunc0.C
$(NSRDSfunctions)/NSRDSfunc1/NSRDSfunc1.C
$(NSRDSfunctions)/NSRDSfunc2/NSRDSfunc2.C
$(NSRDSfunctions)/NSRDSfunc3/NSRDSfunc3.C
$(NSRDSfunctions)/NSRDSfunc4/NSRDSfunc4.C
$(NSRDSfunctions)/NSRDSfunc5/NSRDSfunc5.C
$(NSRDSfunctions)/NSRDSfunc6/NSRDSfunc6.C
$(NSRDSfunctions)/NSRDSfunc7/NSRDSfunc7.C
$(NSRDSfunctions)/NSRDSfunc14/NSRDSfunc14.C
APIfunctions = thermophysicalFunctions/APIfunctions
$(APIfunctions)/APIdiffCoefFunc/APIdiffCoefFunc.C
thermophysicalProperties/thermophysicalProperties.C
liquidProperties/liquidProperties/liquidProperties.C
liquidProperties/liquidMixtureProperties/liquidMixtureProperties.C
liquidProperties/H2O/H2O.C
liquidProperties/C7H16/C7H16.C
liquidProperties/C12H26/C12H26.C
liquidProperties/C10H22/C10H22.C
liquidProperties/C8H18/C8H18.C
liquidProperties/IC8H18/IC8H18.C
liquidProperties/C4H10O/C4H10O.C
liquidProperties/C2H6O/C2H6O.C
liquidProperties/IDEA/IDEA.C
liquidProperties/aC10H7CH3/aC10H7CH3.C
liquidProperties/bC10H7CH3/bC10H7CH3.C
liquidProperties/C8H10/C8H10.C
liquidProperties/C16H34/C16H34.C
liquidProperties/C9H20/C9H20.C
liquidProperties/C6H6/C6H6.C
liquidProperties/C7H8/C7H8.C
liquidProperties/C6H14/C6H14.C
liquidProperties/C13H28/C13H28.C
liquidProperties/C14H30/C14H30.C
liquidProperties/C3H8/C3H8.C
liquidProperties/C3H6O/C3H6O.C
liquidProperties/C2H6/C2H6.C
liquidProperties/CH3OH/CH3OH.C
liquidProperties/C2H5OH/C2H5OH.C
liquidProperties/Ar/Ar.C
liquidProperties/N2/N2.C
liquidProperties/MB/MB.C
liquidProperties/CH4N2O/CH4N2O.C
liquidProperties/nC3H8O/nC3H8O.C
liquidProperties/iC3H8O/iC3H8O.C
solidProperties/solidProperties/solidProperties.C
solidProperties/solidProperties/solidPropertiesNew.C
solidProperties/solidMixtureProperties/solidMixtureProperties.C
solidProperties/ash/ash.C
solidProperties/C/C.C
solidProperties/CaCO3/CaCO3.C
LIB = $(FOAM_LIBBIN)/libthermophysicalProperties

3
src/thermophysicalModels/properties/solidProperties/Make/options → src/thermophysicalModels/thermophysicalProperties/Make/options
View File

@ -1,2 +1,5 @@
EXE_INC = \
-I$(LIB_SRC)/thermophysicalModels/specie/lnInclude
LIB_LIBS = \
-lspecie

0
src/thermophysicalModels/properties/liquidProperties/Ar/Ar.C → src/thermophysicalModels/thermophysicalProperties/liquidProperties/Ar/Ar.C
View File

0
src/thermophysicalModels/properties/liquidProperties/Ar/Ar.H → src/thermophysicalModels/thermophysicalProperties/liquidProperties/Ar/Ar.H
View File

0
src/thermophysicalModels/properties/liquidProperties/Ar/ArI.H → src/thermophysicalModels/thermophysicalProperties/liquidProperties/Ar/ArI.H
View File

0
src/thermophysicalModels/properties/liquidProperties/C10H22/C10H22.C → src/thermophysicalModels/thermophysicalProperties/liquidProperties/C10H22/C10H22.C
View File

0
src/thermophysicalModels/properties/liquidProperties/C10H22/C10H22.H → src/thermophysicalModels/thermophysicalProperties/liquidProperties/C10H22/C10H22.H
View File

0
src/thermophysicalModels/properties/liquidProperties/C10H22/C10H22I.H → src/thermophysicalModels/thermophysicalProperties/liquidProperties/C10H22/C10H22I.H
View File

0
src/thermophysicalModels/properties/liquidProperties/C12H26/C12H26.C → src/thermophysicalModels/thermophysicalProperties/liquidProperties/C12H26/C12H26.C
View File

0
src/thermophysicalModels/properties/liquidProperties/C12H26/C12H26.H → src/thermophysicalModels/thermophysicalProperties/liquidProperties/C12H26/C12H26.H
View File

0
src/thermophysicalModels/properties/liquidProperties/C12H26/C12H26I.H → src/thermophysicalModels/thermophysicalProperties/liquidProperties/C12H26/C12H26I.H
View File

0
src/thermophysicalModels/properties/liquidProperties/C13H28/C13H28.C → src/thermophysicalModels/thermophysicalProperties/liquidProperties/C13H28/C13H28.C
View File

0
src/thermophysicalModels/properties/liquidProperties/C13H28/C13H28.H → src/thermophysicalModels/thermophysicalProperties/liquidProperties/C13H28/C13H28.H
View File

0
src/thermophysicalModels/properties/liquidProperties/C13H28/C13H28I.H → src/thermophysicalModels/thermophysicalProperties/liquidProperties/C13H28/C13H28I.H
View File

0
src/thermophysicalModels/properties/liquidProperties/C14H30/C14H30.C → src/thermophysicalModels/thermophysicalProperties/liquidProperties/C14H30/C14H30.C
View File

0
src/thermophysicalModels/properties/liquidProperties/C14H30/C14H30.H → src/thermophysicalModels/thermophysicalProperties/liquidProperties/C14H30/C14H30.H
View File

0
src/thermophysicalModels/properties/liquidProperties/C14H30/C14H30I.H → src/thermophysicalModels/thermophysicalProperties/liquidProperties/C14H30/C14H30I.H
View File

0
src/thermophysicalModels/properties/liquidProperties/C16H34/C16H34.C → src/thermophysicalModels/thermophysicalProperties/liquidProperties/C16H34/C16H34.C
View File

0
src/thermophysicalModels/properties/liquidProperties/C16H34/C16H34.H → src/thermophysicalModels/thermophysicalProperties/liquidProperties/C16H34/C16H34.H
View File

0
src/thermophysicalModels/properties/liquidProperties/C16H34/C16H34I.H → src/thermophysicalModels/thermophysicalProperties/liquidProperties/C16H34/C16H34I.H
View File

0
src/thermophysicalModels/properties/liquidProperties/C2H5OH/C2H5OH.C → src/thermophysicalModels/thermophysicalProperties/liquidProperties/C2H5OH/C2H5OH.C
View File

0
src/thermophysicalModels/properties/liquidProperties/C2H5OH/C2H5OH.H → src/thermophysicalModels/thermophysicalProperties/liquidProperties/C2H5OH/C2H5OH.H
View File

0
src/thermophysicalModels/properties/liquidProperties/C2H5OH/C2H5OHI.H → src/thermophysicalModels/thermophysicalProperties/liquidProperties/C2H5OH/C2H5OHI.H
View File

0
src/thermophysicalModels/properties/liquidProperties/C2H6/C2H6.C → src/thermophysicalModels/thermophysicalProperties/liquidProperties/C2H6/C2H6.C
View File

0
src/thermophysicalModels/properties/liquidProperties/C2H6/C2H6.H → src/thermophysicalModels/thermophysicalProperties/liquidProperties/C2H6/C2H6.H
View File

0
src/thermophysicalModels/properties/liquidProperties/C2H6/C2H6I.H → src/thermophysicalModels/thermophysicalProperties/liquidProperties/C2H6/C2H6I.H
View File

0
src/thermophysicalModels/properties/liquidProperties/C2H6O/C2H6O.C → src/thermophysicalModels/thermophysicalProperties/liquidProperties/C2H6O/C2H6O.C
View File

0
src/thermophysicalModels/properties/liquidProperties/C2H6O/C2H6O.H → src/thermophysicalModels/thermophysicalProperties/liquidProperties/C2H6O/C2H6O.H
View File

0
src/thermophysicalModels/properties/liquidProperties/C2H6O/C2H6OI.H → src/thermophysicalModels/thermophysicalProperties/liquidProperties/C2H6O/C2H6OI.H
View File

0
src/thermophysicalModels/properties/liquidProperties/C3H6O/C3H6O.C → src/thermophysicalModels/thermophysicalProperties/liquidProperties/C3H6O/C3H6O.C
View File

0
src/thermophysicalModels/properties/liquidProperties/C3H6O/C3H6O.H → src/thermophysicalModels/thermophysicalProperties/liquidProperties/C3H6O/C3H6O.H
View File

0
src/thermophysicalModels/properties/liquidProperties/C3H6O/C3H6OI.H → src/thermophysicalModels/thermophysicalProperties/liquidProperties/C3H6O/C3H6OI.H
View File

0
src/thermophysicalModels/properties/liquidProperties/C3H8/C3H8.C → src/thermophysicalModels/thermophysicalProperties/liquidProperties/C3H8/C3H8.C
View File

0
src/thermophysicalModels/properties/liquidProperties/C3H8/C3H8.H → src/thermophysicalModels/thermophysicalProperties/liquidProperties/C3H8/C3H8.H
View File

0
src/thermophysicalModels/properties/liquidProperties/C3H8/C3H8I.H → src/thermophysicalModels/thermophysicalProperties/liquidProperties/C3H8/C3H8I.H
View File

0
src/thermophysicalModels/properties/liquidProperties/C4H10O/C4H10O.C → src/thermophysicalModels/thermophysicalProperties/liquidProperties/C4H10O/C4H10O.C
View File

0
src/thermophysicalModels/properties/liquidProperties/C4H10O/C4H10O.H → src/thermophysicalModels/thermophysicalProperties/liquidProperties/C4H10O/C4H10O.H
View File

0
src/thermophysicalModels/properties/liquidProperties/C4H10O/C4H10OI.H → src/thermophysicalModels/thermophysicalProperties/liquidProperties/C4H10O/C4H10OI.H
View File

0
src/thermophysicalModels/properties/liquidProperties/C6H14/C6H14.C → src/thermophysicalModels/thermophysicalProperties/liquidProperties/C6H14/C6H14.C
View File

0
src/thermophysicalModels/properties/liquidProperties/C6H14/C6H14.H → src/thermophysicalModels/thermophysicalProperties/liquidProperties/C6H14/C6H14.H
View File

0
src/thermophysicalModels/properties/liquidProperties/C6H14/C6H14I.H → src/thermophysicalModels/thermophysicalProperties/liquidProperties/C6H14/C6H14I.H
View File

0
src/thermophysicalModels/properties/liquidProperties/C6H6/C6H6.C → src/thermophysicalModels/thermophysicalProperties/liquidProperties/C6H6/C6H6.C
View File

0
src/thermophysicalModels/properties/liquidProperties/C6H6/C6H6.H → src/thermophysicalModels/thermophysicalProperties/liquidProperties/C6H6/C6H6.H
View File

0
src/thermophysicalModels/properties/liquidProperties/C6H6/C6H6I.H → src/thermophysicalModels/thermophysicalProperties/liquidProperties/C6H6/C6H6I.H
View File

0
src/thermophysicalModels/properties/liquidProperties/C7H16/C7H16.C → src/thermophysicalModels/thermophysicalProperties/liquidProperties/C7H16/C7H16.C
View File

0
src/thermophysicalModels/properties/liquidProperties/C7H16/C7H16.H → src/thermophysicalModels/thermophysicalProperties/liquidProperties/C7H16/C7H16.H
View File

0
src/thermophysicalModels/properties/liquidProperties/C7H16/C7H16I.H → src/thermophysicalModels/thermophysicalProperties/liquidProperties/C7H16/C7H16I.H
View File

0
src/thermophysicalModels/properties/liquidProperties/C7H8/C7H8.C → src/thermophysicalModels/thermophysicalProperties/liquidProperties/C7H8/C7H8.C
View File

0
src/thermophysicalModels/properties/liquidProperties/C7H8/C7H8.H → src/thermophysicalModels/thermophysicalProperties/liquidProperties/C7H8/C7H8.H
View File

0
src/thermophysicalModels/properties/liquidProperties/C7H8/C7H8I.H → src/thermophysicalModels/thermophysicalProperties/liquidProperties/C7H8/C7H8I.H
View File

0
src/thermophysicalModels/properties/liquidProperties/C8H10/C8H10.C → src/thermophysicalModels/thermophysicalProperties/liquidProperties/C8H10/C8H10.C
View File

0
src/thermophysicalModels/properties/liquidProperties/C8H10/C8H10.H → src/thermophysicalModels/thermophysicalProperties/liquidProperties/C8H10/C8H10.H
View File

0
src/thermophysicalModels/properties/liquidProperties/C8H10/C8H10I.H → src/thermophysicalModels/thermophysicalProperties/liquidProperties/C8H10/C8H10I.H
View File

0
src/thermophysicalModels/properties/liquidProperties/C8H18/C8H18.C → src/thermophysicalModels/thermophysicalProperties/liquidProperties/C8H18/C8H18.C
View File

0
src/thermophysicalModels/properties/liquidProperties/C8H18/C8H18.H → src/thermophysicalModels/thermophysicalProperties/liquidProperties/C8H18/C8H18.H
View File

0
src/thermophysicalModels/properties/liquidProperties/C8H18/C8H18I.H → src/thermophysicalModels/thermophysicalProperties/liquidProperties/C8H18/C8H18I.H
View File

0
src/thermophysicalModels/properties/liquidProperties/C9H20/C9H20.C → src/thermophysicalModels/thermophysicalProperties/liquidProperties/C9H20/C9H20.C
View File

0
src/thermophysicalModels/properties/liquidProperties/C9H20/C9H20.H → src/thermophysicalModels/thermophysicalProperties/liquidProperties/C9H20/C9H20.H
View File

0
src/thermophysicalModels/properties/liquidProperties/C9H20/C9H20I.H → src/thermophysicalModels/thermophysicalProperties/liquidProperties/C9H20/C9H20I.H
View File

0
src/thermophysicalModels/properties/liquidProperties/CH3OH/CH3OH.C → src/thermophysicalModels/thermophysicalProperties/liquidProperties/CH3OH/CH3OH.C
View File

0
src/thermophysicalModels/properties/liquidProperties/CH3OH/CH3OH.H → src/thermophysicalModels/thermophysicalProperties/liquidProperties/CH3OH/CH3OH.H
View File

0
src/thermophysicalModels/properties/liquidProperties/CH3OH/CH3OHI.H → src/thermophysicalModels/thermophysicalProperties/liquidProperties/CH3OH/CH3OHI.H
View File

0
src/thermophysicalModels/properties/liquidProperties/CH4N2O/CH4N2O.C → src/thermophysicalModels/thermophysicalProperties/liquidProperties/CH4N2O/CH4N2O.C
View File

0
src/thermophysicalModels/properties/liquidProperties/CH4N2O/CH4N2O.H → src/thermophysicalModels/thermophysicalProperties/liquidProperties/CH4N2O/CH4N2O.H
View File

Some files were not shown because too many files have changed in this diff Show More