diff --git a/applications/solvers/combustion/dieselEngineFoam/Make/options b/applications/solvers/combustion/dieselEngineFoam/Make/options index 9cefdaf996..5f047de258 100644 --- a/applications/solvers/combustion/dieselEngineFoam/Make/options +++ b/applications/solvers/combustion/dieselEngineFoam/Make/options @@ -4,8 +4,8 @@ EXE_INC = \ -I$(LIB_SRC)/lagrangian/basic/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/lagrangian/dieselSpray/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/liquidProperties/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/liquidMixtureProperties/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/properties/liquidProperties/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/properties/liquidMixtureProperties/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/thermophysicalFunctions/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ diff --git a/applications/solvers/combustion/dieselFoam/Make/options b/applications/solvers/combustion/dieselFoam/Make/options index 1e6ccfa139..427ccfc98b 100644 --- a/applications/solvers/combustion/dieselFoam/Make/options +++ b/applications/solvers/combustion/dieselFoam/Make/options @@ -5,8 +5,8 @@ EXE_INC = \ -I$(LIB_SRC)/lagrangian/basic/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/lagrangian/dieselSpray/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/liquidProperties/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/liquidMixtureProperties/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/properties/liquidProperties/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/properties/liquidMixtureProperties/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/thermophysicalFunctions/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ diff --git a/applications/solvers/lagrangian/coalChemistryFoam/Make/options b/applications/solvers/lagrangian/coalChemistryFoam/Make/options index ff78384881..17cd096198 100644 --- a/applications/solvers/lagrangian/coalChemistryFoam/Make/options +++ b/applications/solvers/lagrangian/coalChemistryFoam/Make/options @@ -8,10 +8,10 @@ EXE_INC = \ -I$(LIB_SRC)/thermophysicalModels/pdfs/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/liquidProperties/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/liquidMixtureProperties/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/solidProperties/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/solidMixtureProperties/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/properties/liquidProperties/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/properties/liquidMixtureProperties/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/properties/solidProperties/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/properties/solidMixtureProperties/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/thermophysicalFunctions/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/SLGThermo/lnInclude \ diff --git a/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/Make/options b/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/Make/options index 1cf2738a50..063236d23e 100644 --- a/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/Make/options +++ b/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/Make/options @@ -8,10 +8,10 @@ EXE_INC = \ -I$(LIB_SRC)/thermophysicalModels/pdfs/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/liquidProperties/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/liquidMixtureProperties/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/solidProperties/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/solidMixtureProperties/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/properties/liquidProperties/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/properties/liquidMixtureProperties/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/properties/solidProperties/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/properties/solidMixtureProperties/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/thermophysicalFunctions/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/SLGThermo/lnInclude \ diff --git a/applications/solvers/lagrangian/reactingParcelFilmFoam/Make/options b/applications/solvers/lagrangian/reactingParcelFilmFoam/Make/options index 687401ef78..9b9f551e8d 100644 --- a/applications/solvers/lagrangian/reactingParcelFilmFoam/Make/options +++ b/applications/solvers/lagrangian/reactingParcelFilmFoam/Make/options @@ -5,10 +5,10 @@ EXE_INC = \ -I$(LIB_SRC)/thermophysicalModels/pdfs/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/solidProperties/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/solidMixtureProperties/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/liquidProperties/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/liquidMixtureProperties/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/properties/solidProperties/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/properties/solidMixtureProperties/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/properties/liquidProperties/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/properties/liquidMixtureProperties/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/thermophysicalFunctions/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/SLGThermo/lnInclude \ diff --git a/applications/solvers/lagrangian/reactingParcelFoam/Make/options b/applications/solvers/lagrangian/reactingParcelFoam/Make/options index 88e49525d3..579a6e47db 100644 --- a/applications/solvers/lagrangian/reactingParcelFoam/Make/options +++ b/applications/solvers/lagrangian/reactingParcelFoam/Make/options @@ -7,10 +7,10 @@ EXE_INC = \ -I$(LIB_SRC)/thermophysicalModels/pdfs/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/liquidProperties/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/liquidMixtureProperties/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/solidProperties/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/solidMixtureProperties/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/properties/liquidProperties/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/properties/liquidMixtureProperties/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/properties/solidProperties/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/properties/solidMixtureProperties/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/thermophysicalFunctions/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/SLGThermo/lnInclude \ diff --git a/applications/solvers/lagrangian/steadyReactingParcelFoam/Make/options b/applications/solvers/lagrangian/steadyReactingParcelFoam/Make/options index 1cf2738a50..063236d23e 100644 --- a/applications/solvers/lagrangian/steadyReactingParcelFoam/Make/options +++ b/applications/solvers/lagrangian/steadyReactingParcelFoam/Make/options @@ -8,10 +8,10 @@ EXE_INC = \ -I$(LIB_SRC)/thermophysicalModels/pdfs/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/liquidProperties/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/liquidMixtureProperties/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/solidProperties/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/solidMixtureProperties/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/properties/liquidProperties/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/properties/liquidMixtureProperties/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/properties/solidProperties/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/properties/solidMixtureProperties/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/thermophysicalFunctions/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/SLGThermo/lnInclude \ diff --git a/applications/utilities/miscellaneous/foamDebugSwitches/Make/options b/applications/utilities/miscellaneous/foamDebugSwitches/Make/options index dca91f271f..9641909235 100644 --- a/applications/utilities/miscellaneous/foamDebugSwitches/Make/options +++ b/applications/utilities/miscellaneous/foamDebugSwitches/Make/options @@ -34,8 +34,8 @@ EXE_LIBS = \ -llaminarFlameSpeedModels \ -lLESdeltas \ -lLESfilters \ - -lliquidMixture \ - -lliquids \ + -lliquidMixtureProperties \ + -lliquidProperties \ -lmeshTools \ -lmolecularMeasurements \ -lmolecule \ @@ -47,9 +47,9 @@ EXE_LIBS = \ -lrandomProcesses \ -lreactionThermophysicalModels \ -lsampling \ - -lpointSolidMixture \ + -lsolidMixtureProperties \ -lsolidParticle \ - -lpointSolids \ + -lsolidProperties \ -lspecie \ -lsurfMesh \ -lsystemCall \ diff --git a/src/lagrangian/coalCombustion/Make/options b/src/lagrangian/coalCombustion/Make/options index 140890fce2..dc7db16ea7 100644 --- a/src/lagrangian/coalCombustion/Make/options +++ b/src/lagrangian/coalCombustion/Make/options @@ -6,10 +6,10 @@ EXE_INC = \ -I$(LIB_SRC)/thermophysicalModels/pdfs/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/liquidProperties/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/liquidMixtureProperties/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/solidProperties/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/solidMixtureProperties/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/properties/liquidProperties/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/properties/liquidMixtureProperties/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/properties/solidProperties/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/properties/solidMixtureProperties/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/SLGThermo/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/radiationModels/lnInclude \ diff --git a/src/lagrangian/dieselSpray/Make/options b/src/lagrangian/dieselSpray/Make/options index 9891ba0197..8465ce4ed2 100644 --- a/src/lagrangian/dieselSpray/Make/options +++ b/src/lagrangian/dieselSpray/Make/options @@ -8,8 +8,8 @@ EXE_INC = \ -I$(LIB_SRC)/turbulenceModels/LES/LESdeltas/lnInclude \ -I$(LIB_SRC)/turbulenceModels/compressible/LES/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/liquidProperties/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/liquidMixtureProperties/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/properties/liquidProperties/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/properties/liquidMixtureProperties/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/thermophysicalFunctions/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ diff --git a/src/lagrangian/intermediate/Make/options b/src/lagrangian/intermediate/Make/options index 00a2974127..e2c807106f 100644 --- a/src/lagrangian/intermediate/Make/options +++ b/src/lagrangian/intermediate/Make/options @@ -5,10 +5,10 @@ EXE_INC = \ -I$(LIB_SRC)/thermophysicalModels/pdfs/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/liquidProperties/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/liquidMixtureProperties/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/solidProperties/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/solidMixtureProperties/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/properties/liquidProperties/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/properties/liquidMixtureProperties/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/properties/solidProperties/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/properties/solidMixtureProperties/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/SLGThermo/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/radiationModels/lnInclude \ diff --git a/src/surfaceFilmModels/Make/options b/src/surfaceFilmModels/Make/options index dda598200c..d3439c4c3a 100644 --- a/src/surfaceFilmModels/Make/options +++ b/src/surfaceFilmModels/Make/options @@ -3,10 +3,10 @@ EXE_INC = \ -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/liquidProperties/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/liquidMixtureProperties/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/solidProperties/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/solidMixtureProperties/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/properties/liquidProperties/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/properties/liquidMixtureProperties/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/properties/solidProperties/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/properties/solidMixtureProperties/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/SLGThermo/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/pdfs/lnInclude \ diff --git a/src/thermophysicalModels/Allwmake b/src/thermophysicalModels/Allwmake index b62c36aa5d..9e9514e528 100755 --- a/src/thermophysicalModels/Allwmake +++ b/src/thermophysicalModels/Allwmake @@ -6,10 +6,7 @@ set -x wmake $makeOption specie wmake $makeOption solid wmake $makeOption thermophysicalFunctions -wmake $makeOption liquidProperties -wmake $makeOption liquidMixtureProperties -wmake $makeOption solidProperties -wmake $makeOption solidMixtureProperties +./properties/Allwmake $* wmake $makeOption basic wmake $makeOption reactionThermo diff --git a/src/thermophysicalModels/SLGThermo/Make/options b/src/thermophysicalModels/SLGThermo/Make/options index 3eda6c06d5..7102ea2c61 100644 --- a/src/thermophysicalModels/SLGThermo/Make/options +++ b/src/thermophysicalModels/SLGThermo/Make/options @@ -2,10 +2,10 @@ EXE_INC = \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/liquidProperties/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/liquidMixtureProperties/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/solidProperties/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/solidMixtureProperties/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/properties/liquidProperties/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/properties/liquidMixtureProperties/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/properties/solidProperties/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/properties/solidMixtureProperties/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude LIB_LIBS = \ diff --git a/src/thermophysicalModels/properties/Allwmake b/src/thermophysicalModels/properties/Allwmake new file mode 100755 index 0000000000..da66ba8d47 --- /dev/null +++ b/src/thermophysicalModels/properties/Allwmake @@ -0,0 +1,12 @@ +#!/bin/sh +cd ${0%/*} || exit 1 # run from this directory +[ $# -ge 1 ] && makeOption=$1 || makeOption=libso +set -x + +wmake $makeOption liquidProperties +wmake $makeOption liquidMixtureProperties +wmake $makeOption solidProperties +wmake $makeOption solidMixtureProperties + + +# ----------------------------------------------------------------- end-of-file diff --git a/src/thermophysicalModels/liquidMixtureProperties/Make/files b/src/thermophysicalModels/properties/liquidMixtureProperties/Make/files similarity index 100% rename from src/thermophysicalModels/liquidMixtureProperties/Make/files rename to src/thermophysicalModels/properties/liquidMixtureProperties/Make/files diff --git a/src/thermophysicalModels/liquidMixtureProperties/Make/options b/src/thermophysicalModels/properties/liquidMixtureProperties/Make/options similarity index 80% rename from src/thermophysicalModels/liquidMixtureProperties/Make/options rename to src/thermophysicalModels/properties/liquidMixtureProperties/Make/options index 28490cc168..138f439935 100644 --- a/src/thermophysicalModels/liquidMixtureProperties/Make/options +++ b/src/thermophysicalModels/properties/liquidMixtureProperties/Make/options @@ -1,7 +1,7 @@ EXE_INC = \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/liquidProperties/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/properties/liquidProperties/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/combustion/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/thermophysicalFunctions/lnInclude diff --git a/src/thermophysicalModels/liquidMixtureProperties/liquidMixtureProperties/liquidMixtureProperties.C b/src/thermophysicalModels/properties/liquidMixtureProperties/liquidMixtureProperties/liquidMixtureProperties.C similarity index 100% rename from src/thermophysicalModels/liquidMixtureProperties/liquidMixtureProperties/liquidMixtureProperties.C rename to src/thermophysicalModels/properties/liquidMixtureProperties/liquidMixtureProperties/liquidMixtureProperties.C diff --git a/src/thermophysicalModels/liquidMixtureProperties/liquidMixtureProperties/liquidMixtureProperties.H b/src/thermophysicalModels/properties/liquidMixtureProperties/liquidMixtureProperties/liquidMixtureProperties.H similarity index 100% rename from src/thermophysicalModels/liquidMixtureProperties/liquidMixtureProperties/liquidMixtureProperties.H rename to src/thermophysicalModels/properties/liquidMixtureProperties/liquidMixtureProperties/liquidMixtureProperties.H diff --git a/src/thermophysicalModels/liquidProperties/Ar/Ar.C b/src/thermophysicalModels/properties/liquidProperties/Ar/Ar.C similarity index 100% rename from src/thermophysicalModels/liquidProperties/Ar/Ar.C rename to src/thermophysicalModels/properties/liquidProperties/Ar/Ar.C diff --git a/src/thermophysicalModels/liquidProperties/Ar/Ar.H b/src/thermophysicalModels/properties/liquidProperties/Ar/Ar.H similarity index 100% rename from src/thermophysicalModels/liquidProperties/Ar/Ar.H rename to src/thermophysicalModels/properties/liquidProperties/Ar/Ar.H diff --git a/src/thermophysicalModels/liquidProperties/Ar/ArI.H b/src/thermophysicalModels/properties/liquidProperties/Ar/ArI.H similarity index 100% rename from src/thermophysicalModels/liquidProperties/Ar/ArI.H rename to src/thermophysicalModels/properties/liquidProperties/Ar/ArI.H diff --git a/src/thermophysicalModels/liquidProperties/C10H22/C10H22.C b/src/thermophysicalModels/properties/liquidProperties/C10H22/C10H22.C similarity index 100% rename from src/thermophysicalModels/liquidProperties/C10H22/C10H22.C rename to src/thermophysicalModels/properties/liquidProperties/C10H22/C10H22.C diff --git a/src/thermophysicalModels/liquidProperties/C10H22/C10H22.H b/src/thermophysicalModels/properties/liquidProperties/C10H22/C10H22.H similarity index 100% rename from src/thermophysicalModels/liquidProperties/C10H22/C10H22.H rename to src/thermophysicalModels/properties/liquidProperties/C10H22/C10H22.H diff --git a/src/thermophysicalModels/liquidProperties/C10H22/C10H22I.H b/src/thermophysicalModels/properties/liquidProperties/C10H22/C10H22I.H similarity index 100% rename from src/thermophysicalModels/liquidProperties/C10H22/C10H22I.H rename to src/thermophysicalModels/properties/liquidProperties/C10H22/C10H22I.H diff --git a/src/thermophysicalModels/liquidProperties/C12H26/C12H26.C b/src/thermophysicalModels/properties/liquidProperties/C12H26/C12H26.C similarity index 100% rename from src/thermophysicalModels/liquidProperties/C12H26/C12H26.C rename to src/thermophysicalModels/properties/liquidProperties/C12H26/C12H26.C diff --git a/src/thermophysicalModels/liquidProperties/C12H26/C12H26.H b/src/thermophysicalModels/properties/liquidProperties/C12H26/C12H26.H similarity index 100% rename from src/thermophysicalModels/liquidProperties/C12H26/C12H26.H rename to src/thermophysicalModels/properties/liquidProperties/C12H26/C12H26.H diff --git a/src/thermophysicalModels/liquidProperties/C12H26/C12H26I.H b/src/thermophysicalModels/properties/liquidProperties/C12H26/C12H26I.H similarity index 100% rename from src/thermophysicalModels/liquidProperties/C12H26/C12H26I.H rename to src/thermophysicalModels/properties/liquidProperties/C12H26/C12H26I.H diff --git a/src/thermophysicalModels/liquidProperties/C13H28/C13H28.C b/src/thermophysicalModels/properties/liquidProperties/C13H28/C13H28.C similarity index 100% rename from src/thermophysicalModels/liquidProperties/C13H28/C13H28.C rename to src/thermophysicalModels/properties/liquidProperties/C13H28/C13H28.C diff --git a/src/thermophysicalModels/liquidProperties/C13H28/C13H28.H b/src/thermophysicalModels/properties/liquidProperties/C13H28/C13H28.H similarity index 100% rename from src/thermophysicalModels/liquidProperties/C13H28/C13H28.H rename to src/thermophysicalModels/properties/liquidProperties/C13H28/C13H28.H diff --git a/src/thermophysicalModels/liquidProperties/C13H28/C13H28I.H b/src/thermophysicalModels/properties/liquidProperties/C13H28/C13H28I.H similarity index 100% rename from src/thermophysicalModels/liquidProperties/C13H28/C13H28I.H rename to src/thermophysicalModels/properties/liquidProperties/C13H28/C13H28I.H diff --git a/src/thermophysicalModels/liquidProperties/C14H30/C14H30.C b/src/thermophysicalModels/properties/liquidProperties/C14H30/C14H30.C similarity index 100% rename from src/thermophysicalModels/liquidProperties/C14H30/C14H30.C rename to src/thermophysicalModels/properties/liquidProperties/C14H30/C14H30.C diff --git a/src/thermophysicalModels/liquidProperties/C14H30/C14H30.H b/src/thermophysicalModels/properties/liquidProperties/C14H30/C14H30.H similarity index 100% rename from src/thermophysicalModels/liquidProperties/C14H30/C14H30.H rename to src/thermophysicalModels/properties/liquidProperties/C14H30/C14H30.H diff --git a/src/thermophysicalModels/liquidProperties/C14H30/C14H30I.H b/src/thermophysicalModels/properties/liquidProperties/C14H30/C14H30I.H similarity index 100% rename from src/thermophysicalModels/liquidProperties/C14H30/C14H30I.H rename to src/thermophysicalModels/properties/liquidProperties/C14H30/C14H30I.H diff --git a/src/thermophysicalModels/liquidProperties/C16H34/C16H34.C b/src/thermophysicalModels/properties/liquidProperties/C16H34/C16H34.C similarity index 100% rename from src/thermophysicalModels/liquidProperties/C16H34/C16H34.C rename to src/thermophysicalModels/properties/liquidProperties/C16H34/C16H34.C diff --git a/src/thermophysicalModels/liquidProperties/C16H34/C16H34.H b/src/thermophysicalModels/properties/liquidProperties/C16H34/C16H34.H similarity index 100% rename from src/thermophysicalModels/liquidProperties/C16H34/C16H34.H rename to src/thermophysicalModels/properties/liquidProperties/C16H34/C16H34.H diff --git a/src/thermophysicalModels/liquidProperties/C16H34/C16H34I.H b/src/thermophysicalModels/properties/liquidProperties/C16H34/C16H34I.H similarity index 100% rename from src/thermophysicalModels/liquidProperties/C16H34/C16H34I.H rename to src/thermophysicalModels/properties/liquidProperties/C16H34/C16H34I.H diff --git a/src/thermophysicalModels/liquidProperties/C2H5OH/C2H5OH.C b/src/thermophysicalModels/properties/liquidProperties/C2H5OH/C2H5OH.C similarity index 100% rename from src/thermophysicalModels/liquidProperties/C2H5OH/C2H5OH.C rename to src/thermophysicalModels/properties/liquidProperties/C2H5OH/C2H5OH.C diff --git a/src/thermophysicalModels/liquidProperties/C2H5OH/C2H5OH.H b/src/thermophysicalModels/properties/liquidProperties/C2H5OH/C2H5OH.H similarity index 100% rename from src/thermophysicalModels/liquidProperties/C2H5OH/C2H5OH.H rename to src/thermophysicalModels/properties/liquidProperties/C2H5OH/C2H5OH.H diff --git a/src/thermophysicalModels/liquidProperties/C2H5OH/C2H5OHI.H b/src/thermophysicalModels/properties/liquidProperties/C2H5OH/C2H5OHI.H similarity index 100% rename from src/thermophysicalModels/liquidProperties/C2H5OH/C2H5OHI.H rename to src/thermophysicalModels/properties/liquidProperties/C2H5OH/C2H5OHI.H diff --git a/src/thermophysicalModels/liquidProperties/C2H6/C2H6.C b/src/thermophysicalModels/properties/liquidProperties/C2H6/C2H6.C similarity index 100% rename from src/thermophysicalModels/liquidProperties/C2H6/C2H6.C rename to src/thermophysicalModels/properties/liquidProperties/C2H6/C2H6.C diff --git a/src/thermophysicalModels/liquidProperties/C2H6/C2H6.H b/src/thermophysicalModels/properties/liquidProperties/C2H6/C2H6.H similarity index 100% rename from src/thermophysicalModels/liquidProperties/C2H6/C2H6.H rename to src/thermophysicalModels/properties/liquidProperties/C2H6/C2H6.H diff --git a/src/thermophysicalModels/liquidProperties/C2H6/C2H6I.H b/src/thermophysicalModels/properties/liquidProperties/C2H6/C2H6I.H similarity index 100% rename from src/thermophysicalModels/liquidProperties/C2H6/C2H6I.H rename to src/thermophysicalModels/properties/liquidProperties/C2H6/C2H6I.H diff --git a/src/thermophysicalModels/liquidProperties/C2H6O/C2H6O.C b/src/thermophysicalModels/properties/liquidProperties/C2H6O/C2H6O.C similarity index 100% rename from src/thermophysicalModels/liquidProperties/C2H6O/C2H6O.C rename to src/thermophysicalModels/properties/liquidProperties/C2H6O/C2H6O.C diff --git a/src/thermophysicalModels/liquidProperties/C2H6O/C2H6O.H b/src/thermophysicalModels/properties/liquidProperties/C2H6O/C2H6O.H similarity index 100% rename from src/thermophysicalModels/liquidProperties/C2H6O/C2H6O.H rename to src/thermophysicalModels/properties/liquidProperties/C2H6O/C2H6O.H diff --git a/src/thermophysicalModels/liquidProperties/C2H6O/C2H6OI.H b/src/thermophysicalModels/properties/liquidProperties/C2H6O/C2H6OI.H similarity index 100% rename from src/thermophysicalModels/liquidProperties/C2H6O/C2H6OI.H rename to src/thermophysicalModels/properties/liquidProperties/C2H6O/C2H6OI.H diff --git a/src/thermophysicalModels/liquidProperties/C3H6O/C3H6O.C b/src/thermophysicalModels/properties/liquidProperties/C3H6O/C3H6O.C similarity index 100% rename from src/thermophysicalModels/liquidProperties/C3H6O/C3H6O.C rename to src/thermophysicalModels/properties/liquidProperties/C3H6O/C3H6O.C diff --git a/src/thermophysicalModels/liquidProperties/C3H6O/C3H6O.H b/src/thermophysicalModels/properties/liquidProperties/C3H6O/C3H6O.H similarity index 100% rename from src/thermophysicalModels/liquidProperties/C3H6O/C3H6O.H rename to src/thermophysicalModels/properties/liquidProperties/C3H6O/C3H6O.H diff --git a/src/thermophysicalModels/liquidProperties/C3H6O/C3H6OI.H b/src/thermophysicalModels/properties/liquidProperties/C3H6O/C3H6OI.H similarity index 100% rename from src/thermophysicalModels/liquidProperties/C3H6O/C3H6OI.H rename to src/thermophysicalModels/properties/liquidProperties/C3H6O/C3H6OI.H diff --git a/src/thermophysicalModels/liquidProperties/C3H8/C3H8.C b/src/thermophysicalModels/properties/liquidProperties/C3H8/C3H8.C similarity index 100% rename from src/thermophysicalModels/liquidProperties/C3H8/C3H8.C rename to src/thermophysicalModels/properties/liquidProperties/C3H8/C3H8.C diff --git a/src/thermophysicalModels/liquidProperties/C3H8/C3H8.H b/src/thermophysicalModels/properties/liquidProperties/C3H8/C3H8.H similarity index 100% rename from src/thermophysicalModels/liquidProperties/C3H8/C3H8.H rename to src/thermophysicalModels/properties/liquidProperties/C3H8/C3H8.H diff --git a/src/thermophysicalModels/liquidProperties/C3H8/C3H8I.H b/src/thermophysicalModels/properties/liquidProperties/C3H8/C3H8I.H similarity index 100% rename from src/thermophysicalModels/liquidProperties/C3H8/C3H8I.H rename to src/thermophysicalModels/properties/liquidProperties/C3H8/C3H8I.H diff --git a/src/thermophysicalModels/liquidProperties/C4H10O/C4H10O.C b/src/thermophysicalModels/properties/liquidProperties/C4H10O/C4H10O.C similarity index 100% rename from src/thermophysicalModels/liquidProperties/C4H10O/C4H10O.C rename to src/thermophysicalModels/properties/liquidProperties/C4H10O/C4H10O.C diff --git a/src/thermophysicalModels/liquidProperties/C4H10O/C4H10O.H b/src/thermophysicalModels/properties/liquidProperties/C4H10O/C4H10O.H similarity index 100% rename from src/thermophysicalModels/liquidProperties/C4H10O/C4H10O.H rename to src/thermophysicalModels/properties/liquidProperties/C4H10O/C4H10O.H diff --git a/src/thermophysicalModels/liquidProperties/C4H10O/C4H10OI.H b/src/thermophysicalModels/properties/liquidProperties/C4H10O/C4H10OI.H similarity index 100% rename from src/thermophysicalModels/liquidProperties/C4H10O/C4H10OI.H rename to src/thermophysicalModels/properties/liquidProperties/C4H10O/C4H10OI.H diff --git a/src/thermophysicalModels/liquidProperties/C6H14/C6H14.C b/src/thermophysicalModels/properties/liquidProperties/C6H14/C6H14.C similarity index 100% rename from src/thermophysicalModels/liquidProperties/C6H14/C6H14.C rename to src/thermophysicalModels/properties/liquidProperties/C6H14/C6H14.C diff --git a/src/thermophysicalModels/liquidProperties/C6H14/C6H14.H b/src/thermophysicalModels/properties/liquidProperties/C6H14/C6H14.H similarity index 100% rename from src/thermophysicalModels/liquidProperties/C6H14/C6H14.H rename to src/thermophysicalModels/properties/liquidProperties/C6H14/C6H14.H diff --git a/src/thermophysicalModels/liquidProperties/C6H14/C6H14I.H b/src/thermophysicalModels/properties/liquidProperties/C6H14/C6H14I.H similarity index 100% rename from src/thermophysicalModels/liquidProperties/C6H14/C6H14I.H rename to src/thermophysicalModels/properties/liquidProperties/C6H14/C6H14I.H diff --git a/src/thermophysicalModels/liquidProperties/C6H6/C6H6.C b/src/thermophysicalModels/properties/liquidProperties/C6H6/C6H6.C similarity index 100% rename from src/thermophysicalModels/liquidProperties/C6H6/C6H6.C rename to src/thermophysicalModels/properties/liquidProperties/C6H6/C6H6.C diff --git a/src/thermophysicalModels/liquidProperties/C6H6/C6H6.H b/src/thermophysicalModels/properties/liquidProperties/C6H6/C6H6.H similarity index 100% rename from src/thermophysicalModels/liquidProperties/C6H6/C6H6.H rename to src/thermophysicalModels/properties/liquidProperties/C6H6/C6H6.H diff --git a/src/thermophysicalModels/liquidProperties/C6H6/C6H6I.H b/src/thermophysicalModels/properties/liquidProperties/C6H6/C6H6I.H similarity index 100% rename from src/thermophysicalModels/liquidProperties/C6H6/C6H6I.H rename to src/thermophysicalModels/properties/liquidProperties/C6H6/C6H6I.H diff --git a/src/thermophysicalModels/liquidProperties/C7H16/C7H16.C b/src/thermophysicalModels/properties/liquidProperties/C7H16/C7H16.C similarity index 100% rename from src/thermophysicalModels/liquidProperties/C7H16/C7H16.C rename to src/thermophysicalModels/properties/liquidProperties/C7H16/C7H16.C diff --git a/src/thermophysicalModels/liquidProperties/C7H16/C7H16.H b/src/thermophysicalModels/properties/liquidProperties/C7H16/C7H16.H similarity index 100% rename from src/thermophysicalModels/liquidProperties/C7H16/C7H16.H rename to src/thermophysicalModels/properties/liquidProperties/C7H16/C7H16.H diff --git a/src/thermophysicalModels/liquidProperties/C7H16/C7H16I.H b/src/thermophysicalModels/properties/liquidProperties/C7H16/C7H16I.H similarity index 100% rename from src/thermophysicalModels/liquidProperties/C7H16/C7H16I.H rename to src/thermophysicalModels/properties/liquidProperties/C7H16/C7H16I.H diff --git a/src/thermophysicalModels/liquidProperties/C7H8/C7H8.C b/src/thermophysicalModels/properties/liquidProperties/C7H8/C7H8.C similarity index 100% rename from src/thermophysicalModels/liquidProperties/C7H8/C7H8.C rename to src/thermophysicalModels/properties/liquidProperties/C7H8/C7H8.C diff --git a/src/thermophysicalModels/liquidProperties/C7H8/C7H8.H b/src/thermophysicalModels/properties/liquidProperties/C7H8/C7H8.H similarity index 100% rename from src/thermophysicalModels/liquidProperties/C7H8/C7H8.H rename to src/thermophysicalModels/properties/liquidProperties/C7H8/C7H8.H diff --git a/src/thermophysicalModels/liquidProperties/C7H8/C7H8I.H b/src/thermophysicalModels/properties/liquidProperties/C7H8/C7H8I.H similarity index 100% rename from src/thermophysicalModels/liquidProperties/C7H8/C7H8I.H rename to src/thermophysicalModels/properties/liquidProperties/C7H8/C7H8I.H diff --git a/src/thermophysicalModels/liquidProperties/C8H10/C8H10.C b/src/thermophysicalModels/properties/liquidProperties/C8H10/C8H10.C similarity index 100% rename from src/thermophysicalModels/liquidProperties/C8H10/C8H10.C rename to src/thermophysicalModels/properties/liquidProperties/C8H10/C8H10.C diff --git a/src/thermophysicalModels/liquidProperties/C8H10/C8H10.H b/src/thermophysicalModels/properties/liquidProperties/C8H10/C8H10.H similarity index 100% rename from src/thermophysicalModels/liquidProperties/C8H10/C8H10.H rename to src/thermophysicalModels/properties/liquidProperties/C8H10/C8H10.H diff --git a/src/thermophysicalModels/liquidProperties/C8H10/C8H10I.H b/src/thermophysicalModels/properties/liquidProperties/C8H10/C8H10I.H similarity index 100% rename from src/thermophysicalModels/liquidProperties/C8H10/C8H10I.H rename to src/thermophysicalModels/properties/liquidProperties/C8H10/C8H10I.H diff --git a/src/thermophysicalModels/liquidProperties/C8H18/C8H18.C b/src/thermophysicalModels/properties/liquidProperties/C8H18/C8H18.C similarity index 100% rename from src/thermophysicalModels/liquidProperties/C8H18/C8H18.C rename to src/thermophysicalModels/properties/liquidProperties/C8H18/C8H18.C diff --git a/src/thermophysicalModels/liquidProperties/C8H18/C8H18.H b/src/thermophysicalModels/properties/liquidProperties/C8H18/C8H18.H similarity index 100% rename from src/thermophysicalModels/liquidProperties/C8H18/C8H18.H rename to src/thermophysicalModels/properties/liquidProperties/C8H18/C8H18.H diff --git a/src/thermophysicalModels/liquidProperties/C8H18/C8H18I.H b/src/thermophysicalModels/properties/liquidProperties/C8H18/C8H18I.H similarity index 100% rename from src/thermophysicalModels/liquidProperties/C8H18/C8H18I.H rename to src/thermophysicalModels/properties/liquidProperties/C8H18/C8H18I.H diff --git a/src/thermophysicalModels/liquidProperties/C9H20/C9H20.C b/src/thermophysicalModels/properties/liquidProperties/C9H20/C9H20.C similarity index 100% rename from src/thermophysicalModels/liquidProperties/C9H20/C9H20.C rename to src/thermophysicalModels/properties/liquidProperties/C9H20/C9H20.C diff --git a/src/thermophysicalModels/liquidProperties/C9H20/C9H20.H b/src/thermophysicalModels/properties/liquidProperties/C9H20/C9H20.H similarity index 100% rename from src/thermophysicalModels/liquidProperties/C9H20/C9H20.H rename to src/thermophysicalModels/properties/liquidProperties/C9H20/C9H20.H diff --git a/src/thermophysicalModels/liquidProperties/C9H20/C9H20I.H b/src/thermophysicalModels/properties/liquidProperties/C9H20/C9H20I.H similarity index 100% rename from src/thermophysicalModels/liquidProperties/C9H20/C9H20I.H rename to src/thermophysicalModels/properties/liquidProperties/C9H20/C9H20I.H diff --git a/src/thermophysicalModels/liquidProperties/CH3OH/CH3OH.C b/src/thermophysicalModels/properties/liquidProperties/CH3OH/CH3OH.C similarity index 100% rename from src/thermophysicalModels/liquidProperties/CH3OH/CH3OH.C rename to src/thermophysicalModels/properties/liquidProperties/CH3OH/CH3OH.C diff --git a/src/thermophysicalModels/liquidProperties/CH3OH/CH3OH.H b/src/thermophysicalModels/properties/liquidProperties/CH3OH/CH3OH.H similarity index 100% rename from src/thermophysicalModels/liquidProperties/CH3OH/CH3OH.H rename to src/thermophysicalModels/properties/liquidProperties/CH3OH/CH3OH.H diff --git a/src/thermophysicalModels/liquidProperties/CH3OH/CH3OHI.H b/src/thermophysicalModels/properties/liquidProperties/CH3OH/CH3OHI.H similarity index 100% rename from src/thermophysicalModels/liquidProperties/CH3OH/CH3OHI.H rename to src/thermophysicalModels/properties/liquidProperties/CH3OH/CH3OHI.H diff --git a/src/thermophysicalModels/liquidProperties/CH4N2O/CH4N2O.C b/src/thermophysicalModels/properties/liquidProperties/CH4N2O/CH4N2O.C similarity index 100% rename from src/thermophysicalModels/liquidProperties/CH4N2O/CH4N2O.C rename to src/thermophysicalModels/properties/liquidProperties/CH4N2O/CH4N2O.C diff --git a/src/thermophysicalModels/liquidProperties/CH4N2O/CH4N2O.H b/src/thermophysicalModels/properties/liquidProperties/CH4N2O/CH4N2O.H similarity index 100% rename from src/thermophysicalModels/liquidProperties/CH4N2O/CH4N2O.H rename to src/thermophysicalModels/properties/liquidProperties/CH4N2O/CH4N2O.H diff --git a/src/thermophysicalModels/liquidProperties/CH4N2O/CH4N2OI.H b/src/thermophysicalModels/properties/liquidProperties/CH4N2O/CH4N2OI.H similarity index 100% rename from src/thermophysicalModels/liquidProperties/CH4N2O/CH4N2OI.H rename to src/thermophysicalModels/properties/liquidProperties/CH4N2O/CH4N2OI.H diff --git a/src/thermophysicalModels/liquidProperties/H2O/H2O.C b/src/thermophysicalModels/properties/liquidProperties/H2O/H2O.C similarity index 100% rename from src/thermophysicalModels/liquidProperties/H2O/H2O.C rename to src/thermophysicalModels/properties/liquidProperties/H2O/H2O.C diff --git a/src/thermophysicalModels/liquidProperties/H2O/H2O.H b/src/thermophysicalModels/properties/liquidProperties/H2O/H2O.H similarity index 100% rename from src/thermophysicalModels/liquidProperties/H2O/H2O.H rename to src/thermophysicalModels/properties/liquidProperties/H2O/H2O.H diff --git a/src/thermophysicalModels/liquidProperties/H2O/H2OI.H b/src/thermophysicalModels/properties/liquidProperties/H2O/H2OI.H similarity index 100% rename from src/thermophysicalModels/liquidProperties/H2O/H2OI.H rename to src/thermophysicalModels/properties/liquidProperties/H2O/H2OI.H diff --git a/src/thermophysicalModels/liquidProperties/IC8H18/IC8H18.C b/src/thermophysicalModels/properties/liquidProperties/IC8H18/IC8H18.C similarity index 100% rename from src/thermophysicalModels/liquidProperties/IC8H18/IC8H18.C rename to src/thermophysicalModels/properties/liquidProperties/IC8H18/IC8H18.C diff --git a/src/thermophysicalModels/liquidProperties/IC8H18/IC8H18.H b/src/thermophysicalModels/properties/liquidProperties/IC8H18/IC8H18.H similarity index 100% rename from src/thermophysicalModels/liquidProperties/IC8H18/IC8H18.H rename to src/thermophysicalModels/properties/liquidProperties/IC8H18/IC8H18.H diff --git a/src/thermophysicalModels/liquidProperties/IC8H18/IC8H18I.H b/src/thermophysicalModels/properties/liquidProperties/IC8H18/IC8H18I.H similarity index 100% rename from src/thermophysicalModels/liquidProperties/IC8H18/IC8H18I.H rename to src/thermophysicalModels/properties/liquidProperties/IC8H18/IC8H18I.H diff --git a/src/thermophysicalModels/liquidProperties/IDEA/IDEA.C b/src/thermophysicalModels/properties/liquidProperties/IDEA/IDEA.C similarity index 100% rename from src/thermophysicalModels/liquidProperties/IDEA/IDEA.C rename to src/thermophysicalModels/properties/liquidProperties/IDEA/IDEA.C diff --git a/src/thermophysicalModels/liquidProperties/IDEA/IDEA.H b/src/thermophysicalModels/properties/liquidProperties/IDEA/IDEA.H similarity index 100% rename from src/thermophysicalModels/liquidProperties/IDEA/IDEA.H rename to src/thermophysicalModels/properties/liquidProperties/IDEA/IDEA.H diff --git a/src/thermophysicalModels/liquidProperties/IDEA/IDEA.thermo b/src/thermophysicalModels/properties/liquidProperties/IDEA/IDEA.thermo similarity index 100% rename from src/thermophysicalModels/liquidProperties/IDEA/IDEA.thermo rename to src/thermophysicalModels/properties/liquidProperties/IDEA/IDEA.thermo diff --git a/src/thermophysicalModels/liquidProperties/IDEA/IDEAI.H b/src/thermophysicalModels/properties/liquidProperties/IDEA/IDEAI.H similarity index 100% rename from src/thermophysicalModels/liquidProperties/IDEA/IDEAI.H rename to src/thermophysicalModels/properties/liquidProperties/IDEA/IDEAI.H diff --git a/src/thermophysicalModels/liquidProperties/MB/MB.C b/src/thermophysicalModels/properties/liquidProperties/MB/MB.C similarity index 100% rename from src/thermophysicalModels/liquidProperties/MB/MB.C rename to src/thermophysicalModels/properties/liquidProperties/MB/MB.C diff --git a/src/thermophysicalModels/liquidProperties/MB/MB.H b/src/thermophysicalModels/properties/liquidProperties/MB/MB.H similarity index 100% rename from src/thermophysicalModels/liquidProperties/MB/MB.H rename to src/thermophysicalModels/properties/liquidProperties/MB/MB.H diff --git a/src/thermophysicalModels/liquidProperties/MB/MBI.H b/src/thermophysicalModels/properties/liquidProperties/MB/MBI.H similarity index 100% rename from src/thermophysicalModels/liquidProperties/MB/MBI.H rename to src/thermophysicalModels/properties/liquidProperties/MB/MBI.H diff --git a/src/thermophysicalModels/liquidProperties/Make/files b/src/thermophysicalModels/properties/liquidProperties/Make/files similarity index 100% rename from src/thermophysicalModels/liquidProperties/Make/files rename to src/thermophysicalModels/properties/liquidProperties/Make/files diff --git a/src/thermophysicalModels/liquidProperties/Make/options b/src/thermophysicalModels/properties/liquidProperties/Make/options similarity index 100% rename from src/thermophysicalModels/liquidProperties/Make/options rename to src/thermophysicalModels/properties/liquidProperties/Make/options diff --git a/src/thermophysicalModels/liquidProperties/N2/N2.C b/src/thermophysicalModels/properties/liquidProperties/N2/N2.C similarity index 100% rename from src/thermophysicalModels/liquidProperties/N2/N2.C rename to src/thermophysicalModels/properties/liquidProperties/N2/N2.C diff --git a/src/thermophysicalModels/liquidProperties/N2/N2.H b/src/thermophysicalModels/properties/liquidProperties/N2/N2.H similarity index 100% rename from src/thermophysicalModels/liquidProperties/N2/N2.H rename to src/thermophysicalModels/properties/liquidProperties/N2/N2.H diff --git a/src/thermophysicalModels/liquidProperties/N2/N2I.H b/src/thermophysicalModels/properties/liquidProperties/N2/N2I.H similarity index 100% rename from src/thermophysicalModels/liquidProperties/N2/N2I.H rename to src/thermophysicalModels/properties/liquidProperties/N2/N2I.H diff --git a/src/thermophysicalModels/liquidProperties/aC10H7CH3/aC10H7CH3.C b/src/thermophysicalModels/properties/liquidProperties/aC10H7CH3/aC10H7CH3.C similarity index 100% rename from src/thermophysicalModels/liquidProperties/aC10H7CH3/aC10H7CH3.C rename to src/thermophysicalModels/properties/liquidProperties/aC10H7CH3/aC10H7CH3.C diff --git a/src/thermophysicalModels/liquidProperties/aC10H7CH3/aC10H7CH3.H b/src/thermophysicalModels/properties/liquidProperties/aC10H7CH3/aC10H7CH3.H similarity index 100% rename from src/thermophysicalModels/liquidProperties/aC10H7CH3/aC10H7CH3.H rename to src/thermophysicalModels/properties/liquidProperties/aC10H7CH3/aC10H7CH3.H diff --git a/src/thermophysicalModels/liquidProperties/aC10H7CH3/aC10H7CH3I.H b/src/thermophysicalModels/properties/liquidProperties/aC10H7CH3/aC10H7CH3I.H similarity index 100% rename from src/thermophysicalModels/liquidProperties/aC10H7CH3/aC10H7CH3I.H rename to src/thermophysicalModels/properties/liquidProperties/aC10H7CH3/aC10H7CH3I.H diff --git a/src/thermophysicalModels/liquidProperties/bC10H7CH3/bC10H7CH3.C b/src/thermophysicalModels/properties/liquidProperties/bC10H7CH3/bC10H7CH3.C similarity index 100% rename from src/thermophysicalModels/liquidProperties/bC10H7CH3/bC10H7CH3.C rename to src/thermophysicalModels/properties/liquidProperties/bC10H7CH3/bC10H7CH3.C diff --git a/src/thermophysicalModels/liquidProperties/bC10H7CH3/bC10H7CH3.H b/src/thermophysicalModels/properties/liquidProperties/bC10H7CH3/bC10H7CH3.H similarity index 100% rename from src/thermophysicalModels/liquidProperties/bC10H7CH3/bC10H7CH3.H rename to src/thermophysicalModels/properties/liquidProperties/bC10H7CH3/bC10H7CH3.H diff --git a/src/thermophysicalModels/liquidProperties/bC10H7CH3/bC10H7CH3I.H b/src/thermophysicalModels/properties/liquidProperties/bC10H7CH3/bC10H7CH3I.H similarity index 100% rename from src/thermophysicalModels/liquidProperties/bC10H7CH3/bC10H7CH3I.H rename to src/thermophysicalModels/properties/liquidProperties/bC10H7CH3/bC10H7CH3I.H diff --git a/src/thermophysicalModels/liquidProperties/iC3H8O/iC3H8O.C b/src/thermophysicalModels/properties/liquidProperties/iC3H8O/iC3H8O.C similarity index 100% rename from src/thermophysicalModels/liquidProperties/iC3H8O/iC3H8O.C rename to src/thermophysicalModels/properties/liquidProperties/iC3H8O/iC3H8O.C diff --git a/src/thermophysicalModels/liquidProperties/iC3H8O/iC3H8O.H b/src/thermophysicalModels/properties/liquidProperties/iC3H8O/iC3H8O.H similarity index 100% rename from src/thermophysicalModels/liquidProperties/iC3H8O/iC3H8O.H rename to src/thermophysicalModels/properties/liquidProperties/iC3H8O/iC3H8O.H diff --git a/src/thermophysicalModels/liquidProperties/iC3H8O/iC3H8OI.H b/src/thermophysicalModels/properties/liquidProperties/iC3H8O/iC3H8OI.H similarity index 100% rename from src/thermophysicalModels/liquidProperties/iC3H8O/iC3H8OI.H rename to src/thermophysicalModels/properties/liquidProperties/iC3H8O/iC3H8OI.H diff --git a/src/thermophysicalModels/liquidProperties/liquidProperties/liquidProperties.C b/src/thermophysicalModels/properties/liquidProperties/liquidProperties/liquidProperties.C similarity index 100% rename from src/thermophysicalModels/liquidProperties/liquidProperties/liquidProperties.C rename to src/thermophysicalModels/properties/liquidProperties/liquidProperties/liquidProperties.C diff --git a/src/thermophysicalModels/liquidProperties/liquidProperties/liquidProperties.H b/src/thermophysicalModels/properties/liquidProperties/liquidProperties/liquidProperties.H similarity index 100% rename from src/thermophysicalModels/liquidProperties/liquidProperties/liquidProperties.H rename to src/thermophysicalModels/properties/liquidProperties/liquidProperties/liquidProperties.H diff --git a/src/thermophysicalModels/liquidProperties/liquidProperties/liquidPropertiesI.H b/src/thermophysicalModels/properties/liquidProperties/liquidProperties/liquidPropertiesI.H similarity index 100% rename from src/thermophysicalModels/liquidProperties/liquidProperties/liquidPropertiesI.H rename to src/thermophysicalModels/properties/liquidProperties/liquidProperties/liquidPropertiesI.H diff --git a/src/thermophysicalModels/liquidProperties/nC3H8O/nC3H8O.C b/src/thermophysicalModels/properties/liquidProperties/nC3H8O/nC3H8O.C similarity index 100% rename from src/thermophysicalModels/liquidProperties/nC3H8O/nC3H8O.C rename to src/thermophysicalModels/properties/liquidProperties/nC3H8O/nC3H8O.C diff --git a/src/thermophysicalModels/liquidProperties/nC3H8O/nC3H8O.H b/src/thermophysicalModels/properties/liquidProperties/nC3H8O/nC3H8O.H similarity index 100% rename from src/thermophysicalModels/liquidProperties/nC3H8O/nC3H8O.H rename to src/thermophysicalModels/properties/liquidProperties/nC3H8O/nC3H8O.H diff --git a/src/thermophysicalModels/liquidProperties/nC3H8O/nC3H8OI.H b/src/thermophysicalModels/properties/liquidProperties/nC3H8O/nC3H8OI.H similarity index 100% rename from src/thermophysicalModels/liquidProperties/nC3H8O/nC3H8OI.H rename to src/thermophysicalModels/properties/liquidProperties/nC3H8O/nC3H8OI.H diff --git a/src/thermophysicalModels/solidMixtureProperties/Make/files b/src/thermophysicalModels/properties/solidMixtureProperties/Make/files similarity index 100% rename from src/thermophysicalModels/solidMixtureProperties/Make/files rename to src/thermophysicalModels/properties/solidMixtureProperties/Make/files diff --git a/src/thermophysicalModels/properties/solidMixtureProperties/Make/options b/src/thermophysicalModels/properties/solidMixtureProperties/Make/options new file mode 100644 index 0000000000..f2d8f809d5 --- /dev/null +++ b/src/thermophysicalModels/properties/solidMixtureProperties/Make/options @@ -0,0 +1,3 @@ +EXE_INC = \ + -I${LIB_SRC}/thermophysicalModels/properties/solidProperties/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude diff --git a/src/thermophysicalModels/solidMixtureProperties/solidMixtureProperties/solidMixtureProperties.C b/src/thermophysicalModels/properties/solidMixtureProperties/solidMixtureProperties/solidMixtureProperties.C similarity index 100% rename from src/thermophysicalModels/solidMixtureProperties/solidMixtureProperties/solidMixtureProperties.C rename to src/thermophysicalModels/properties/solidMixtureProperties/solidMixtureProperties/solidMixtureProperties.C diff --git a/src/thermophysicalModels/solidMixtureProperties/solidMixtureProperties/solidMixtureProperties.H b/src/thermophysicalModels/properties/solidMixtureProperties/solidMixtureProperties/solidMixtureProperties.H similarity index 100% rename from src/thermophysicalModels/solidMixtureProperties/solidMixtureProperties/solidMixtureProperties.H rename to src/thermophysicalModels/properties/solidMixtureProperties/solidMixtureProperties/solidMixtureProperties.H diff --git a/src/thermophysicalModels/solidProperties/C/C.C b/src/thermophysicalModels/properties/solidProperties/C/C.C similarity index 100% rename from src/thermophysicalModels/solidProperties/C/C.C rename to src/thermophysicalModels/properties/solidProperties/C/C.C diff --git a/src/thermophysicalModels/solidProperties/C/C.H b/src/thermophysicalModels/properties/solidProperties/C/C.H similarity index 100% rename from src/thermophysicalModels/solidProperties/C/C.H rename to src/thermophysicalModels/properties/solidProperties/C/C.H diff --git a/src/thermophysicalModels/solidProperties/CaCO3/CaCO3.C b/src/thermophysicalModels/properties/solidProperties/CaCO3/CaCO3.C similarity index 100% rename from src/thermophysicalModels/solidProperties/CaCO3/CaCO3.C rename to src/thermophysicalModels/properties/solidProperties/CaCO3/CaCO3.C diff --git a/src/thermophysicalModels/solidProperties/CaCO3/CaCO3.H b/src/thermophysicalModels/properties/solidProperties/CaCO3/CaCO3.H similarity index 100% rename from src/thermophysicalModels/solidProperties/CaCO3/CaCO3.H rename to src/thermophysicalModels/properties/solidProperties/CaCO3/CaCO3.H diff --git a/src/thermophysicalModels/solidProperties/Make/files b/src/thermophysicalModels/properties/solidProperties/Make/files similarity index 100% rename from src/thermophysicalModels/solidProperties/Make/files rename to src/thermophysicalModels/properties/solidProperties/Make/files diff --git a/src/thermophysicalModels/solidProperties/Make/options b/src/thermophysicalModels/properties/solidProperties/Make/options similarity index 100% rename from src/thermophysicalModels/solidProperties/Make/options rename to src/thermophysicalModels/properties/solidProperties/Make/options diff --git a/src/thermophysicalModels/solidProperties/ash/ash.C b/src/thermophysicalModels/properties/solidProperties/ash/ash.C similarity index 100% rename from src/thermophysicalModels/solidProperties/ash/ash.C rename to src/thermophysicalModels/properties/solidProperties/ash/ash.C diff --git a/src/thermophysicalModels/solidProperties/ash/ash.H b/src/thermophysicalModels/properties/solidProperties/ash/ash.H similarity index 100% rename from src/thermophysicalModels/solidProperties/ash/ash.H rename to src/thermophysicalModels/properties/solidProperties/ash/ash.H diff --git a/src/thermophysicalModels/solidProperties/solidProperties/solidProperties.C b/src/thermophysicalModels/properties/solidProperties/solidProperties/solidProperties.C similarity index 100% rename from src/thermophysicalModels/solidProperties/solidProperties/solidProperties.C rename to src/thermophysicalModels/properties/solidProperties/solidProperties/solidProperties.C diff --git a/src/thermophysicalModels/solidProperties/solidProperties/solidProperties.H b/src/thermophysicalModels/properties/solidProperties/solidProperties/solidProperties.H similarity index 100% rename from src/thermophysicalModels/solidProperties/solidProperties/solidProperties.H rename to src/thermophysicalModels/properties/solidProperties/solidProperties/solidProperties.H diff --git a/src/thermophysicalModels/solidProperties/solidProperties/solidPropertiesI.H b/src/thermophysicalModels/properties/solidProperties/solidProperties/solidPropertiesI.H similarity index 100% rename from src/thermophysicalModels/solidProperties/solidProperties/solidPropertiesI.H rename to src/thermophysicalModels/properties/solidProperties/solidProperties/solidPropertiesI.H diff --git a/src/thermophysicalModels/solidProperties/solidProperties/solidPropertiesNew.C b/src/thermophysicalModels/properties/solidProperties/solidProperties/solidPropertiesNew.C similarity index 100% rename from src/thermophysicalModels/solidProperties/solidProperties/solidPropertiesNew.C rename to src/thermophysicalModels/properties/solidProperties/solidProperties/solidPropertiesNew.C diff --git a/src/thermophysicalModels/solidMixtureProperties/Make/options b/src/thermophysicalModels/solidMixtureProperties/Make/options deleted file mode 100644 index a7802dcbf8..0000000000 --- a/src/thermophysicalModels/solidMixtureProperties/Make/options +++ /dev/null @@ -1,3 +0,0 @@ -EXE_INC = \ - -I${LIB_SRC}/thermophysicalModels/solidProperties/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude