From d2be645483f61e8cf5e31cce51d1ff1e8f23001c Mon Sep 17 00:00:00 2001 From: Henry Weller Date: Sat, 18 Feb 2017 21:53:20 +0000 Subject: [PATCH] thermophysicalProperties: New base-class for liquidProperties and in the future gasProperties 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. --- .../solvers/combustion/fireFoam/Make/options | 5 +- .../lagrangian/DPMFoam/MPPICFoam/Make/options | 1 - .../solvers/lagrangian/DPMFoam/Make/options | 1 - .../lagrangian/coalChemistryFoam/Make/options | 7 +- .../Make/options | 1 - .../Make/options | 1 - .../reactingParcelFilmFoam/Make/options | 5 +- .../reactingParcelFoam/Make/options | 7 +- .../simpleReactingParcelFoam/Make/options | 7 +- .../solvers/lagrangian/sprayFoam/Make/options | 7 +- .../sprayFoam/sprayDyMFoam/Make/options | 7 +- .../sprayFoam/sprayEngineFoam/Make/options | 7 +- .../uncoupledKinematicParcelFoam/Make/options | 1 - .../interfacialCompositionModels/Make/options | 3 +- applications/test/Function1/Make/options | 1 - applications/test/liquid/Make/options | 4 +- .../miscellaneous/foamList/Make/options | 4 +- src/lagrangian/coalCombustion/Make/options | 6 +- src/lagrangian/intermediate/Make/options | 6 +- src/lagrangian/spray/Make/options | 6 +- src/lagrangian/turbulence/Make/options | 6 +- src/regionModels/regionCoupling/Make/options | 3 +- .../surfaceFilmModels/Make/options | 6 +- .../wallFunctions/Make/options | 6 +- .../liquidFilmThermo/liquidFilmThermo.C | 3 +- src/thermophysicalModels/Allwmake | 3 +- .../SLGThermo/Make/options | 3 +- src/thermophysicalModels/basic/Make/options | 3 + .../chemistryModel/Make/options | 1 - src/thermophysicalModels/properties/Allwmake | 10 - .../properties/liquidProperties/Make/files | 35 --- .../properties/liquidProperties/Make/options | 7 - .../properties/solidProperties/Make/files | 9 - .../radiation/Make/options | 6 +- .../thermophysicalFunctions/Make/files | 17 -- .../thermophysicalFunctions/Make/options | 0 .../thermophysicalProperties/Make/files | 64 ++++++ .../Make/options | 3 + .../liquidProperties/Ar/Ar.C | 0 .../liquidProperties/Ar/Ar.H | 0 .../liquidProperties/Ar/ArI.H | 0 .../liquidProperties/C10H22/C10H22.C | 0 .../liquidProperties/C10H22/C10H22.H | 0 .../liquidProperties/C10H22/C10H22I.H | 0 .../liquidProperties/C12H26/C12H26.C | 0 .../liquidProperties/C12H26/C12H26.H | 0 .../liquidProperties/C12H26/C12H26I.H | 0 .../liquidProperties/C13H28/C13H28.C | 0 .../liquidProperties/C13H28/C13H28.H | 0 .../liquidProperties/C13H28/C13H28I.H | 0 .../liquidProperties/C14H30/C14H30.C | 0 .../liquidProperties/C14H30/C14H30.H | 0 .../liquidProperties/C14H30/C14H30I.H | 0 .../liquidProperties/C16H34/C16H34.C | 0 .../liquidProperties/C16H34/C16H34.H | 0 .../liquidProperties/C16H34/C16H34I.H | 0 .../liquidProperties/C2H5OH/C2H5OH.C | 0 .../liquidProperties/C2H5OH/C2H5OH.H | 0 .../liquidProperties/C2H5OH/C2H5OHI.H | 0 .../liquidProperties/C2H6/C2H6.C | 0 .../liquidProperties/C2H6/C2H6.H | 0 .../liquidProperties/C2H6/C2H6I.H | 0 .../liquidProperties/C2H6O/C2H6O.C | 0 .../liquidProperties/C2H6O/C2H6O.H | 0 .../liquidProperties/C2H6O/C2H6OI.H | 0 .../liquidProperties/C3H6O/C3H6O.C | 0 .../liquidProperties/C3H6O/C3H6O.H | 0 .../liquidProperties/C3H6O/C3H6OI.H | 0 .../liquidProperties/C3H8/C3H8.C | 0 .../liquidProperties/C3H8/C3H8.H | 0 .../liquidProperties/C3H8/C3H8I.H | 0 .../liquidProperties/C4H10O/C4H10O.C | 0 .../liquidProperties/C4H10O/C4H10O.H | 0 .../liquidProperties/C4H10O/C4H10OI.H | 0 .../liquidProperties/C6H14/C6H14.C | 0 .../liquidProperties/C6H14/C6H14.H | 0 .../liquidProperties/C6H14/C6H14I.H | 0 .../liquidProperties/C6H6/C6H6.C | 0 .../liquidProperties/C6H6/C6H6.H | 0 .../liquidProperties/C6H6/C6H6I.H | 0 .../liquidProperties/C7H16/C7H16.C | 0 .../liquidProperties/C7H16/C7H16.H | 0 .../liquidProperties/C7H16/C7H16I.H | 0 .../liquidProperties/C7H8/C7H8.C | 0 .../liquidProperties/C7H8/C7H8.H | 0 .../liquidProperties/C7H8/C7H8I.H | 0 .../liquidProperties/C8H10/C8H10.C | 0 .../liquidProperties/C8H10/C8H10.H | 0 .../liquidProperties/C8H10/C8H10I.H | 0 .../liquidProperties/C8H18/C8H18.C | 0 .../liquidProperties/C8H18/C8H18.H | 0 .../liquidProperties/C8H18/C8H18I.H | 0 .../liquidProperties/C9H20/C9H20.C | 0 .../liquidProperties/C9H20/C9H20.H | 0 .../liquidProperties/C9H20/C9H20I.H | 0 .../liquidProperties/CH3OH/CH3OH.C | 0 .../liquidProperties/CH3OH/CH3OH.H | 0 .../liquidProperties/CH3OH/CH3OHI.H | 0 .../liquidProperties/CH4N2O/CH4N2O.C | 0 .../liquidProperties/CH4N2O/CH4N2O.H | 0 .../liquidProperties/CH4N2O/CH4N2OI.H | 0 .../liquidProperties/H2O/H2O.C | 2 + .../liquidProperties/H2O/H2O.H | 0 .../liquidProperties/H2O/H2OI.H | 0 .../liquidProperties/IC8H18/IC8H18.C | 0 .../liquidProperties/IC8H18/IC8H18.H | 0 .../liquidProperties/IC8H18/IC8H18I.H | 0 .../liquidProperties/IDEA/IDEA.C | 0 .../liquidProperties/IDEA/IDEA.H | 0 .../liquidProperties/IDEA/IDEA.thermo | 0 .../liquidProperties/IDEA/IDEAI.H | 0 .../liquidProperties/MB/MB.C | 0 .../liquidProperties/MB/MB.H | 0 .../liquidProperties/MB/MBI.H | 0 .../liquidProperties/N2/N2.C | 0 .../liquidProperties/N2/N2.H | 0 .../liquidProperties/N2/N2I.H | 0 .../liquidProperties/aC10H7CH3/aC10H7CH3.C | 0 .../liquidProperties/aC10H7CH3/aC10H7CH3.H | 0 .../liquidProperties/aC10H7CH3/aC10H7CH3I.H | 0 .../liquidProperties/bC10H7CH3/bC10H7CH3.C | 0 .../liquidProperties/bC10H7CH3/bC10H7CH3.H | 0 .../liquidProperties/bC10H7CH3/bC10H7CH3I.H | 0 .../liquidProperties/iC3H8O/iC3H8O.C | 0 .../liquidProperties/iC3H8O/iC3H8O.H | 0 .../liquidProperties/iC3H8O/iC3H8OI.H | 0 .../liquidMixtureProperties.C | 0 .../liquidMixtureProperties.H | 0 .../liquidProperties/liquidProperties.C | 95 +------- .../liquidProperties/liquidProperties.H | 60 ++--- .../liquidProperties/liquidPropertiesI.H | 6 - .../liquidProperties/nC3H8O/nC3H8O.C | 0 .../liquidProperties/nC3H8O/nC3H8O.H | 0 .../liquidProperties/nC3H8O/nC3H8OI.H | 0 .../solidProperties/C/C.C | 0 .../solidProperties/C/C.H | 0 .../solidProperties/CaCO3/CaCO3.C | 0 .../solidProperties/CaCO3/CaCO3.H | 0 .../solidProperties/ash/ash.C | 0 .../solidProperties/ash/ash.H | 0 .../solidMixtureProperties.C | 0 .../solidMixtureProperties.H | 0 .../solidProperties/solidProperties.C | 0 .../solidProperties/solidProperties.H | 0 .../solidProperties/solidPropertiesI.H | 0 .../solidProperties/solidPropertiesNew.C | 0 .../APIdiffCoefFunc/APIdiffCoefFunc.C | 0 .../APIdiffCoefFunc/APIdiffCoefFunc.H | 0 .../NSRDSfunctions/NSRDSfunc0/NSRDSfunc0.C | 0 .../NSRDSfunctions/NSRDSfunc0/NSRDSfunc0.H | 0 .../NSRDSfunctions/NSRDSfunc1/NSRDSfunc1.C | 0 .../NSRDSfunctions/NSRDSfunc1/NSRDSfunc1.H | 0 .../NSRDSfunctions/NSRDSfunc14/NSRDSfunc14.C | 0 .../NSRDSfunctions/NSRDSfunc14/NSRDSfunc14.H | 0 .../NSRDSfunctions/NSRDSfunc2/NSRDSfunc2.C | 0 .../NSRDSfunctions/NSRDSfunc2/NSRDSfunc2.H | 0 .../NSRDSfunctions/NSRDSfunc3/NSRDSfunc3.C | 0 .../NSRDSfunctions/NSRDSfunc3/NSRDSfunc3.H | 0 .../NSRDSfunctions/NSRDSfunc4/NSRDSfunc4.C | 0 .../NSRDSfunctions/NSRDSfunc4/NSRDSfunc4.H | 0 .../NSRDSfunctions/NSRDSfunc5/NSRDSfunc5.C | 0 .../NSRDSfunctions/NSRDSfunc5/NSRDSfunc5.H | 0 .../NSRDSfunctions/NSRDSfunc6/NSRDSfunc6.C | 0 .../NSRDSfunctions/NSRDSfunc6/NSRDSfunc6.H | 0 .../NSRDSfunctions/NSRDSfunc7/NSRDSfunc7.C | 0 .../NSRDSfunctions/NSRDSfunc7/NSRDSfunc7.H | 0 .../thermophysicalFunction.C | 0 .../thermophysicalFunction.H | 0 .../thermophysicalProperties.C | 133 ++++++++++++ .../thermophysicalProperties.H | 205 ++++++++++++++++++ .../thermophysicalPropertiesI.H | 38 ++++ 171 files changed, 508 insertions(+), 303 deletions(-) delete mode 100755 src/thermophysicalModels/properties/Allwmake delete mode 100644 src/thermophysicalModels/properties/liquidProperties/Make/files delete mode 100644 src/thermophysicalModels/properties/liquidProperties/Make/options delete mode 100644 src/thermophysicalModels/properties/solidProperties/Make/files delete mode 100644 src/thermophysicalModels/thermophysicalFunctions/Make/files delete mode 100644 src/thermophysicalModels/thermophysicalFunctions/Make/options create mode 100644 src/thermophysicalModels/thermophysicalProperties/Make/files rename src/thermophysicalModels/{properties/solidProperties => thermophysicalProperties}/Make/options (71%) rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/Ar/Ar.C (100%) rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/Ar/Ar.H (100%) rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/Ar/ArI.H (100%) rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/C10H22/C10H22.C (100%) rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/C10H22/C10H22.H (100%) rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/C10H22/C10H22I.H (100%) rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/C12H26/C12H26.C (100%) rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/C12H26/C12H26.H (100%) rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/C12H26/C12H26I.H (100%) rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/C13H28/C13H28.C (100%) rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/C13H28/C13H28.H (100%) rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/C13H28/C13H28I.H (100%) rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/C14H30/C14H30.C (100%) rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/C14H30/C14H30.H (100%) rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/C14H30/C14H30I.H (100%) rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/C16H34/C16H34.C (100%) rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/C16H34/C16H34.H (100%) rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/C16H34/C16H34I.H (100%) rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/C2H5OH/C2H5OH.C (100%) rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/C2H5OH/C2H5OH.H (100%) rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/C2H5OH/C2H5OHI.H (100%) rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/C2H6/C2H6.C (100%) rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/C2H6/C2H6.H (100%) rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/C2H6/C2H6I.H (100%) rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/C2H6O/C2H6O.C (100%) rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/C2H6O/C2H6O.H (100%) rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/C2H6O/C2H6OI.H (100%) rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/C3H6O/C3H6O.C (100%) rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/C3H6O/C3H6O.H (100%) rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/C3H6O/C3H6OI.H (100%) rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/C3H8/C3H8.C (100%) rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/C3H8/C3H8.H (100%) rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/C3H8/C3H8I.H (100%) rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/C4H10O/C4H10O.C (100%) rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/C4H10O/C4H10O.H (100%) rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/C4H10O/C4H10OI.H (100%) rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/C6H14/C6H14.C (100%) rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/C6H14/C6H14.H (100%) rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/C6H14/C6H14I.H (100%) rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/C6H6/C6H6.C (100%) rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/C6H6/C6H6.H (100%) rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/C6H6/C6H6I.H (100%) rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/C7H16/C7H16.C (100%) rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/C7H16/C7H16.H (100%) rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/C7H16/C7H16I.H (100%) rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/C7H8/C7H8.C (100%) rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/C7H8/C7H8.H (100%) rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/C7H8/C7H8I.H (100%) rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/C8H10/C8H10.C (100%) rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/C8H10/C8H10.H (100%) rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/C8H10/C8H10I.H (100%) rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/C8H18/C8H18.C (100%) rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/C8H18/C8H18.H (100%) rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/C8H18/C8H18I.H (100%) rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/C9H20/C9H20.C (100%) rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/C9H20/C9H20.H (100%) rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/C9H20/C9H20I.H (100%) rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/CH3OH/CH3OH.C (100%) rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/CH3OH/CH3OH.H (100%) rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/CH3OH/CH3OHI.H (100%) rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/CH4N2O/CH4N2O.C (100%) rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/CH4N2O/CH4N2O.H (100%) rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/CH4N2O/CH4N2OI.H (100%) rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/H2O/H2O.C (96%) rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/H2O/H2O.H (100%) rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/H2O/H2OI.H (100%) rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/IC8H18/IC8H18.C (100%) rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/IC8H18/IC8H18.H (100%) rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/IC8H18/IC8H18I.H (100%) rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/IDEA/IDEA.C (100%) rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/IDEA/IDEA.H (100%) rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/IDEA/IDEA.thermo (100%) rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/IDEA/IDEAI.H (100%) rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/MB/MB.C (100%) rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/MB/MB.H (100%) rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/MB/MBI.H (100%) rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/N2/N2.C (100%) rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/N2/N2.H (100%) rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/N2/N2I.H (100%) rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/aC10H7CH3/aC10H7CH3.C (100%) rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/aC10H7CH3/aC10H7CH3.H (100%) rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/aC10H7CH3/aC10H7CH3I.H (100%) rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/bC10H7CH3/bC10H7CH3.C (100%) rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/bC10H7CH3/bC10H7CH3.H (100%) rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/bC10H7CH3/bC10H7CH3I.H (100%) rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/iC3H8O/iC3H8O.C (100%) rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/iC3H8O/iC3H8O.H (100%) rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/iC3H8O/iC3H8OI.H (100%) rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/liquidMixtureProperties/liquidMixtureProperties.C (100%) rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/liquidMixtureProperties/liquidMixtureProperties.H (100%) rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/liquidProperties/liquidProperties.C (82%) rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/liquidProperties/liquidProperties.H (82%) rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/liquidProperties/liquidPropertiesI.H (98%) rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/nC3H8O/nC3H8O.C (100%) rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/nC3H8O/nC3H8O.H (100%) rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/nC3H8O/nC3H8OI.H (100%) rename src/thermophysicalModels/{properties => thermophysicalProperties}/solidProperties/C/C.C (100%) rename src/thermophysicalModels/{properties => thermophysicalProperties}/solidProperties/C/C.H (100%) rename src/thermophysicalModels/{properties => thermophysicalProperties}/solidProperties/CaCO3/CaCO3.C (100%) rename src/thermophysicalModels/{properties => thermophysicalProperties}/solidProperties/CaCO3/CaCO3.H (100%) rename src/thermophysicalModels/{properties => thermophysicalProperties}/solidProperties/ash/ash.C (100%) rename src/thermophysicalModels/{properties => thermophysicalProperties}/solidProperties/ash/ash.H (100%) rename src/thermophysicalModels/{properties => thermophysicalProperties}/solidProperties/solidMixtureProperties/solidMixtureProperties.C (100%) rename src/thermophysicalModels/{properties => thermophysicalProperties}/solidProperties/solidMixtureProperties/solidMixtureProperties.H (100%) rename src/thermophysicalModels/{properties => thermophysicalProperties}/solidProperties/solidProperties/solidProperties.C (100%) rename src/thermophysicalModels/{properties => thermophysicalProperties}/solidProperties/solidProperties/solidProperties.H (100%) rename src/thermophysicalModels/{properties => thermophysicalProperties}/solidProperties/solidProperties/solidPropertiesI.H (100%) rename src/thermophysicalModels/{properties => thermophysicalProperties}/solidProperties/solidProperties/solidPropertiesNew.C (100%) rename src/thermophysicalModels/{ => thermophysicalProperties}/thermophysicalFunctions/APIfunctions/APIdiffCoefFunc/APIdiffCoefFunc.C (100%) rename src/thermophysicalModels/{ => thermophysicalProperties}/thermophysicalFunctions/APIfunctions/APIdiffCoefFunc/APIdiffCoefFunc.H (100%) rename src/thermophysicalModels/{ => thermophysicalProperties}/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc0/NSRDSfunc0.C (100%) rename src/thermophysicalModels/{ => thermophysicalProperties}/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc0/NSRDSfunc0.H (100%) rename src/thermophysicalModels/{ => thermophysicalProperties}/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc1/NSRDSfunc1.C (100%) rename src/thermophysicalModels/{ => thermophysicalProperties}/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc1/NSRDSfunc1.H (100%) rename src/thermophysicalModels/{ => thermophysicalProperties}/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc14/NSRDSfunc14.C (100%) rename src/thermophysicalModels/{ => thermophysicalProperties}/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc14/NSRDSfunc14.H (100%) rename src/thermophysicalModels/{ => thermophysicalProperties}/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc2/NSRDSfunc2.C (100%) rename src/thermophysicalModels/{ => thermophysicalProperties}/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc2/NSRDSfunc2.H (100%) rename src/thermophysicalModels/{ => thermophysicalProperties}/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc3/NSRDSfunc3.C (100%) rename src/thermophysicalModels/{ => thermophysicalProperties}/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc3/NSRDSfunc3.H (100%) rename src/thermophysicalModels/{ => thermophysicalProperties}/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc4/NSRDSfunc4.C (100%) rename src/thermophysicalModels/{ => thermophysicalProperties}/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc4/NSRDSfunc4.H (100%) rename src/thermophysicalModels/{ => thermophysicalProperties}/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc5/NSRDSfunc5.C (100%) rename src/thermophysicalModels/{ => thermophysicalProperties}/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc5/NSRDSfunc5.H (100%) rename src/thermophysicalModels/{ => thermophysicalProperties}/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc6/NSRDSfunc6.C (100%) rename src/thermophysicalModels/{ => thermophysicalProperties}/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc6/NSRDSfunc6.H (100%) rename src/thermophysicalModels/{ => thermophysicalProperties}/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc7/NSRDSfunc7.C (100%) rename src/thermophysicalModels/{ => thermophysicalProperties}/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc7/NSRDSfunc7.H (100%) rename src/thermophysicalModels/{ => thermophysicalProperties}/thermophysicalFunctions/thermophysicalFunction/thermophysicalFunction.C (100%) rename src/thermophysicalModels/{ => thermophysicalProperties}/thermophysicalFunctions/thermophysicalFunction/thermophysicalFunction.H (100%) create mode 100644 src/thermophysicalModels/thermophysicalProperties/thermophysicalProperties/thermophysicalProperties.C create mode 100644 src/thermophysicalModels/thermophysicalProperties/thermophysicalProperties/thermophysicalProperties.H create mode 100644 src/thermophysicalModels/thermophysicalProperties/thermophysicalProperties/thermophysicalPropertiesI.H diff --git a/applications/solvers/combustion/fireFoam/Make/options b/applications/solvers/combustion/fireFoam/Make/options index 4b25d248ea..869c315f4c 100644 --- a/applications/solvers/combustion/fireFoam/Make/options +++ b/applications/solvers/combustion/fireFoam/Make/options @@ -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 \ diff --git a/applications/solvers/lagrangian/DPMFoam/MPPICFoam/Make/options b/applications/solvers/lagrangian/DPMFoam/MPPICFoam/Make/options index aed6969724..b0eaf6453e 100644 --- a/applications/solvers/lagrangian/DPMFoam/MPPICFoam/Make/options +++ b/applications/solvers/lagrangian/DPMFoam/MPPICFoam/Make/options @@ -25,7 +25,6 @@ EXE_LIBS = \ -llagrangian \ -llagrangianIntermediate \ -llagrangianTurbulence \ - -lthermophysicalFunctions \ -lspecie \ -lradiationModels \ -lincompressibleTransportModels \ diff --git a/applications/solvers/lagrangian/DPMFoam/Make/options b/applications/solvers/lagrangian/DPMFoam/Make/options index 8ab44318e6..b1f295e294 100644 --- a/applications/solvers/lagrangian/DPMFoam/Make/options +++ b/applications/solvers/lagrangian/DPMFoam/Make/options @@ -21,7 +21,6 @@ EXE_LIBS = \ -llagrangian \ -llagrangianIntermediate \ -llagrangianTurbulence \ - -lthermophysicalFunctions \ -lspecie \ -lradiationModels \ -lincompressibleTransportModels \ diff --git a/applications/solvers/lagrangian/coalChemistryFoam/Make/options b/applications/solvers/lagrangian/coalChemistryFoam/Make/options index 978ea9d9b2..7e4d2dccfc 100644 --- a/applications/solvers/lagrangian/coalChemistryFoam/Make/options +++ b/applications/solvers/lagrangian/coalChemistryFoam/Make/options @@ -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 \ diff --git a/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/Make/options b/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/Make/options index 0004a128e4..aebc4519bb 100644 --- a/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/Make/options +++ b/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/Make/options @@ -19,7 +19,6 @@ EXE_LIBS = \ -llagrangian \ -llagrangianIntermediate \ -llagrangianTurbulence \ - -lthermophysicalFunctions \ -lcompressibleTransportModels \ -lfluidThermophysicalModels \ -lspecie \ diff --git a/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/icoUncoupledKinematicParcelDyMFoam/Make/options b/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/icoUncoupledKinematicParcelDyMFoam/Make/options index 4f94e7f64f..76fa725a3a 100644 --- a/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/icoUncoupledKinematicParcelDyMFoam/Make/options +++ b/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/icoUncoupledKinematicParcelDyMFoam/Make/options @@ -23,7 +23,6 @@ EXE_LIBS = \ -llagrangian \ -llagrangianIntermediate \ -llagrangianTurbulence \ - -lthermophysicalFunctions \ -lcompressibleTransportModels \ -lfluidThermophysicalModels \ -lspecie \ diff --git a/applications/solvers/lagrangian/reactingParcelFilmFoam/Make/options b/applications/solvers/lagrangian/reactingParcelFilmFoam/Make/options index 4e218c6dbc..eab72a2389 100644 --- a/applications/solvers/lagrangian/reactingParcelFilmFoam/Make/options +++ b/applications/solvers/lagrangian/reactingParcelFilmFoam/Make/options @@ -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 \ diff --git a/applications/solvers/lagrangian/reactingParcelFoam/Make/options b/applications/solvers/lagrangian/reactingParcelFoam/Make/options index f66d16750b..8038347006 100644 --- a/applications/solvers/lagrangian/reactingParcelFoam/Make/options +++ b/applications/solvers/lagrangian/reactingParcelFoam/Make/options @@ -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 \ diff --git a/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/Make/options b/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/Make/options index f66d16750b..8038347006 100644 --- a/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/Make/options +++ b/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/Make/options @@ -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 \ diff --git a/applications/solvers/lagrangian/sprayFoam/Make/options b/applications/solvers/lagrangian/sprayFoam/Make/options index 28b5e6ac7a..75f471f270 100644 --- a/applications/solvers/lagrangian/sprayFoam/Make/options +++ b/applications/solvers/lagrangian/sprayFoam/Make/options @@ -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 \ diff --git a/applications/solvers/lagrangian/sprayFoam/sprayDyMFoam/Make/options b/applications/solvers/lagrangian/sprayFoam/sprayDyMFoam/Make/options index ebb0621e93..f6f65d7c6c 100644 --- a/applications/solvers/lagrangian/sprayFoam/sprayDyMFoam/Make/options +++ b/applications/solvers/lagrangian/sprayFoam/sprayDyMFoam/Make/options @@ -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 \ diff --git a/applications/solvers/lagrangian/sprayFoam/sprayEngineFoam/Make/options b/applications/solvers/lagrangian/sprayFoam/sprayEngineFoam/Make/options index 3cda53424f..fe32be8cfe 100644 --- a/applications/solvers/lagrangian/sprayFoam/sprayEngineFoam/Make/options +++ b/applications/solvers/lagrangian/sprayFoam/sprayEngineFoam/Make/options @@ -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 \ diff --git a/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/Make/options b/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/Make/options index f9056dd790..639909b38e 100644 --- a/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/Make/options +++ b/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/Make/options @@ -17,7 +17,6 @@ EXE_LIBS = \ -llagrangian \ -llagrangianIntermediate \ -llagrangianTurbulence \ - -lthermophysicalFunctions \ -lcompressibleTransportModels \ -lfluidThermophysicalModels \ -lspecie \ diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/Make/options b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/Make/options index 5f109df522..65db644ba7 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/Make/options +++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/Make/options @@ -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 \ diff --git a/applications/test/Function1/Make/options b/applications/test/Function1/Make/options index af5541db76..b8e72a86c6 100644 --- a/applications/test/Function1/Make/options +++ b/applications/test/Function1/Make/options @@ -9,7 +9,6 @@ EXE_INC = \ EXE_LIBS = \ -llagrangianIntermediate \ -lradiationModels \ - -lthermophysicalFunctions \ -lregionModels \ -lfiniteVolume \ -lmeshTools \ diff --git a/applications/test/liquid/Make/options b/applications/test/liquid/Make/options index 94e250c052..a1664efd97 100644 --- a/applications/test/liquid/Make/options +++ b/applications/test/liquid/Make/options @@ -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 diff --git a/applications/utilities/miscellaneous/foamList/Make/options b/applications/utilities/miscellaneous/foamList/Make/options index 5ce9e05d42..1835b22397 100644 --- a/applications/utilities/miscellaneous/foamList/Make/options +++ b/applications/utilities/miscellaneous/foamList/Make/options @@ -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 \ diff --git a/src/lagrangian/coalCombustion/Make/options b/src/lagrangian/coalCombustion/Make/options index 10c855cf41..6687004631 100644 --- a/src/lagrangian/coalCombustion/Make/options +++ b/src/lagrangian/coalCombustion/Make/options @@ -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 \ diff --git a/src/lagrangian/intermediate/Make/options b/src/lagrangian/intermediate/Make/options index e1ec44b4b6..6b1b5c901c 100644 --- a/src/lagrangian/intermediate/Make/options +++ b/src/lagrangian/intermediate/Make/options @@ -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 \ diff --git a/src/lagrangian/spray/Make/options b/src/lagrangian/spray/Make/options index 51974e3c99..2f941fe323 100644 --- a/src/lagrangian/spray/Make/options +++ b/src/lagrangian/spray/Make/options @@ -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 \ diff --git a/src/lagrangian/turbulence/Make/options b/src/lagrangian/turbulence/Make/options index 825da6fbb8..4a7f193503 100644 --- a/src/lagrangian/turbulence/Make/options +++ b/src/lagrangian/turbulence/Make/options @@ -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 \ diff --git a/src/regionModels/regionCoupling/Make/options b/src/regionModels/regionCoupling/Make/options index 90d6d183b0..a5cab5feb1 100644 --- a/src/regionModels/regionCoupling/Make/options +++ b/src/regionModels/regionCoupling/Make/options @@ -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 \ diff --git a/src/regionModels/surfaceFilmModels/Make/options b/src/regionModels/surfaceFilmModels/Make/options index a5311a2cc8..566ec315e5 100644 --- a/src/regionModels/surfaceFilmModels/Make/options +++ b/src/regionModels/surfaceFilmModels/Make/options @@ -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 \ diff --git a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/Make/options b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/Make/options index 8ea8ffa2e9..9f799143bc 100644 --- a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/Make/options +++ b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/Make/options @@ -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 \ diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/liquidFilmThermo/liquidFilmThermo.C b/src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/liquidFilmThermo/liquidFilmThermo.C index 6c511cc549..d70b14bbf5 100644 --- a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/liquidFilmThermo/liquidFilmThermo.C +++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/liquidFilmThermo/liquidFilmThermo.C @@ -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(); } } diff --git a/src/thermophysicalModels/Allwmake b/src/thermophysicalModels/Allwmake index 2c90db55a8..2d59e0aae5 100755 --- a/src/thermophysicalModels/Allwmake +++ b/src/thermophysicalModels/Allwmake @@ -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 diff --git a/src/thermophysicalModels/SLGThermo/Make/options b/src/thermophysicalModels/SLGThermo/Make/options index 37e3533de0..6ac037828e 100644 --- a/src/thermophysicalModels/SLGThermo/Make/options +++ b/src/thermophysicalModels/SLGThermo/Make/options @@ -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 diff --git a/src/thermophysicalModels/basic/Make/options b/src/thermophysicalModels/basic/Make/options index b5c859baf1..cb12503892 100644 --- a/src/thermophysicalModels/basic/Make/options +++ b/src/thermophysicalModels/basic/Make/options @@ -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 diff --git a/src/thermophysicalModels/chemistryModel/Make/options b/src/thermophysicalModels/chemistryModel/Make/options index 5997147f12..9da89fb7b4 100644 --- a/src/thermophysicalModels/chemistryModel/Make/options +++ b/src/thermophysicalModels/chemistryModel/Make/options @@ -15,7 +15,6 @@ LIB_LIBS = \ -lfluidThermophysicalModels \ -lreactionThermophysicalModels \ -lspecie \ - -lthermophysicalFunctions \ -lODE \ -lfiniteVolume \ -lmeshTools diff --git a/src/thermophysicalModels/properties/Allwmake b/src/thermophysicalModels/properties/Allwmake deleted file mode 100755 index 0837290b62..0000000000 --- a/src/thermophysicalModels/properties/Allwmake +++ /dev/null @@ -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 - -#------------------------------------------------------------------------------ diff --git a/src/thermophysicalModels/properties/liquidProperties/Make/files b/src/thermophysicalModels/properties/liquidProperties/Make/files deleted file mode 100644 index 47f70772e8..0000000000 --- a/src/thermophysicalModels/properties/liquidProperties/Make/files +++ /dev/null @@ -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 diff --git a/src/thermophysicalModels/properties/liquidProperties/Make/options b/src/thermophysicalModels/properties/liquidProperties/Make/options deleted file mode 100644 index 383322f7d4..0000000000 --- a/src/thermophysicalModels/properties/liquidProperties/Make/options +++ /dev/null @@ -1,7 +0,0 @@ -EXE_INC = \ - -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/thermophysicalFunctions/lnInclude - -LIB_LIBS = \ - -lspecie \ - -lthermophysicalFunctions diff --git a/src/thermophysicalModels/properties/solidProperties/Make/files b/src/thermophysicalModels/properties/solidProperties/Make/files deleted file mode 100644 index fdd25a7a6b..0000000000 --- a/src/thermophysicalModels/properties/solidProperties/Make/files +++ /dev/null @@ -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 diff --git a/src/thermophysicalModels/radiation/Make/options b/src/thermophysicalModels/radiation/Make/options index 3cc7218bdd..5a768463e8 100644 --- a/src/thermophysicalModels/radiation/Make/options +++ b/src/thermophysicalModels/radiation/Make/options @@ -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 diff --git a/src/thermophysicalModels/thermophysicalFunctions/Make/files b/src/thermophysicalModels/thermophysicalFunctions/Make/files deleted file mode 100644 index 4fbfc660d5..0000000000 --- a/src/thermophysicalModels/thermophysicalFunctions/Make/files +++ /dev/null @@ -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 diff --git a/src/thermophysicalModels/thermophysicalFunctions/Make/options b/src/thermophysicalModels/thermophysicalFunctions/Make/options deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/src/thermophysicalModels/thermophysicalProperties/Make/files b/src/thermophysicalModels/thermophysicalProperties/Make/files new file mode 100644 index 0000000000..0ca2221441 --- /dev/null +++ b/src/thermophysicalModels/thermophysicalProperties/Make/files @@ -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 diff --git a/src/thermophysicalModels/properties/solidProperties/Make/options b/src/thermophysicalModels/thermophysicalProperties/Make/options similarity index 71% rename from src/thermophysicalModels/properties/solidProperties/Make/options rename to src/thermophysicalModels/thermophysicalProperties/Make/options index 848cce789f..bdc8b074c0 100644 --- a/src/thermophysicalModels/properties/solidProperties/Make/options +++ b/src/thermophysicalModels/thermophysicalProperties/Make/options @@ -1,2 +1,5 @@ EXE_INC = \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude + +LIB_LIBS = \ + -lspecie diff --git a/src/thermophysicalModels/properties/liquidProperties/Ar/Ar.C b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/Ar/Ar.C similarity index 100% rename from src/thermophysicalModels/properties/liquidProperties/Ar/Ar.C rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/Ar/Ar.C diff --git a/src/thermophysicalModels/properties/liquidProperties/Ar/Ar.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/Ar/Ar.H similarity index 100% rename from src/thermophysicalModels/properties/liquidProperties/Ar/Ar.H rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/Ar/Ar.H diff --git a/src/thermophysicalModels/properties/liquidProperties/Ar/ArI.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/Ar/ArI.H similarity index 100% rename from src/thermophysicalModels/properties/liquidProperties/Ar/ArI.H rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/Ar/ArI.H diff --git a/src/thermophysicalModels/properties/liquidProperties/C10H22/C10H22.C b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C10H22/C10H22.C similarity index 100% rename from src/thermophysicalModels/properties/liquidProperties/C10H22/C10H22.C rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/C10H22/C10H22.C diff --git a/src/thermophysicalModels/properties/liquidProperties/C10H22/C10H22.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C10H22/C10H22.H similarity index 100% rename from src/thermophysicalModels/properties/liquidProperties/C10H22/C10H22.H rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/C10H22/C10H22.H diff --git a/src/thermophysicalModels/properties/liquidProperties/C10H22/C10H22I.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C10H22/C10H22I.H similarity index 100% rename from src/thermophysicalModels/properties/liquidProperties/C10H22/C10H22I.H rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/C10H22/C10H22I.H diff --git a/src/thermophysicalModels/properties/liquidProperties/C12H26/C12H26.C b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C12H26/C12H26.C similarity index 100% rename from src/thermophysicalModels/properties/liquidProperties/C12H26/C12H26.C rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/C12H26/C12H26.C diff --git a/src/thermophysicalModels/properties/liquidProperties/C12H26/C12H26.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C12H26/C12H26.H similarity index 100% rename from src/thermophysicalModels/properties/liquidProperties/C12H26/C12H26.H rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/C12H26/C12H26.H diff --git a/src/thermophysicalModels/properties/liquidProperties/C12H26/C12H26I.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C12H26/C12H26I.H similarity index 100% rename from src/thermophysicalModels/properties/liquidProperties/C12H26/C12H26I.H rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/C12H26/C12H26I.H diff --git a/src/thermophysicalModels/properties/liquidProperties/C13H28/C13H28.C b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C13H28/C13H28.C similarity index 100% rename from src/thermophysicalModels/properties/liquidProperties/C13H28/C13H28.C rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/C13H28/C13H28.C diff --git a/src/thermophysicalModels/properties/liquidProperties/C13H28/C13H28.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C13H28/C13H28.H similarity index 100% rename from src/thermophysicalModels/properties/liquidProperties/C13H28/C13H28.H rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/C13H28/C13H28.H diff --git a/src/thermophysicalModels/properties/liquidProperties/C13H28/C13H28I.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C13H28/C13H28I.H similarity index 100% rename from src/thermophysicalModels/properties/liquidProperties/C13H28/C13H28I.H rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/C13H28/C13H28I.H diff --git a/src/thermophysicalModels/properties/liquidProperties/C14H30/C14H30.C b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C14H30/C14H30.C similarity index 100% rename from src/thermophysicalModels/properties/liquidProperties/C14H30/C14H30.C rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/C14H30/C14H30.C diff --git a/src/thermophysicalModels/properties/liquidProperties/C14H30/C14H30.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C14H30/C14H30.H similarity index 100% rename from src/thermophysicalModels/properties/liquidProperties/C14H30/C14H30.H rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/C14H30/C14H30.H diff --git a/src/thermophysicalModels/properties/liquidProperties/C14H30/C14H30I.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C14H30/C14H30I.H similarity index 100% rename from src/thermophysicalModels/properties/liquidProperties/C14H30/C14H30I.H rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/C14H30/C14H30I.H diff --git a/src/thermophysicalModels/properties/liquidProperties/C16H34/C16H34.C b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C16H34/C16H34.C similarity index 100% rename from src/thermophysicalModels/properties/liquidProperties/C16H34/C16H34.C rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/C16H34/C16H34.C diff --git a/src/thermophysicalModels/properties/liquidProperties/C16H34/C16H34.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C16H34/C16H34.H similarity index 100% rename from src/thermophysicalModels/properties/liquidProperties/C16H34/C16H34.H rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/C16H34/C16H34.H diff --git a/src/thermophysicalModels/properties/liquidProperties/C16H34/C16H34I.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C16H34/C16H34I.H similarity index 100% rename from src/thermophysicalModels/properties/liquidProperties/C16H34/C16H34I.H rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/C16H34/C16H34I.H diff --git a/src/thermophysicalModels/properties/liquidProperties/C2H5OH/C2H5OH.C b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C2H5OH/C2H5OH.C similarity index 100% rename from src/thermophysicalModels/properties/liquidProperties/C2H5OH/C2H5OH.C rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/C2H5OH/C2H5OH.C diff --git a/src/thermophysicalModels/properties/liquidProperties/C2H5OH/C2H5OH.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C2H5OH/C2H5OH.H similarity index 100% rename from src/thermophysicalModels/properties/liquidProperties/C2H5OH/C2H5OH.H rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/C2H5OH/C2H5OH.H diff --git a/src/thermophysicalModels/properties/liquidProperties/C2H5OH/C2H5OHI.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C2H5OH/C2H5OHI.H similarity index 100% rename from src/thermophysicalModels/properties/liquidProperties/C2H5OH/C2H5OHI.H rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/C2H5OH/C2H5OHI.H diff --git a/src/thermophysicalModels/properties/liquidProperties/C2H6/C2H6.C b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C2H6/C2H6.C similarity index 100% rename from src/thermophysicalModels/properties/liquidProperties/C2H6/C2H6.C rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/C2H6/C2H6.C diff --git a/src/thermophysicalModels/properties/liquidProperties/C2H6/C2H6.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C2H6/C2H6.H similarity index 100% rename from src/thermophysicalModels/properties/liquidProperties/C2H6/C2H6.H rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/C2H6/C2H6.H diff --git a/src/thermophysicalModels/properties/liquidProperties/C2H6/C2H6I.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C2H6/C2H6I.H similarity index 100% rename from src/thermophysicalModels/properties/liquidProperties/C2H6/C2H6I.H rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/C2H6/C2H6I.H diff --git a/src/thermophysicalModels/properties/liquidProperties/C2H6O/C2H6O.C b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C2H6O/C2H6O.C similarity index 100% rename from src/thermophysicalModels/properties/liquidProperties/C2H6O/C2H6O.C rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/C2H6O/C2H6O.C diff --git a/src/thermophysicalModels/properties/liquidProperties/C2H6O/C2H6O.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C2H6O/C2H6O.H similarity index 100% rename from src/thermophysicalModels/properties/liquidProperties/C2H6O/C2H6O.H rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/C2H6O/C2H6O.H diff --git a/src/thermophysicalModels/properties/liquidProperties/C2H6O/C2H6OI.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C2H6O/C2H6OI.H similarity index 100% rename from src/thermophysicalModels/properties/liquidProperties/C2H6O/C2H6OI.H rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/C2H6O/C2H6OI.H diff --git a/src/thermophysicalModels/properties/liquidProperties/C3H6O/C3H6O.C b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C3H6O/C3H6O.C similarity index 100% rename from src/thermophysicalModels/properties/liquidProperties/C3H6O/C3H6O.C rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/C3H6O/C3H6O.C diff --git a/src/thermophysicalModels/properties/liquidProperties/C3H6O/C3H6O.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C3H6O/C3H6O.H similarity index 100% rename from src/thermophysicalModels/properties/liquidProperties/C3H6O/C3H6O.H rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/C3H6O/C3H6O.H diff --git a/src/thermophysicalModels/properties/liquidProperties/C3H6O/C3H6OI.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C3H6O/C3H6OI.H similarity index 100% rename from src/thermophysicalModels/properties/liquidProperties/C3H6O/C3H6OI.H rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/C3H6O/C3H6OI.H diff --git a/src/thermophysicalModels/properties/liquidProperties/C3H8/C3H8.C b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C3H8/C3H8.C similarity index 100% rename from src/thermophysicalModels/properties/liquidProperties/C3H8/C3H8.C rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/C3H8/C3H8.C diff --git a/src/thermophysicalModels/properties/liquidProperties/C3H8/C3H8.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C3H8/C3H8.H similarity index 100% rename from src/thermophysicalModels/properties/liquidProperties/C3H8/C3H8.H rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/C3H8/C3H8.H diff --git a/src/thermophysicalModels/properties/liquidProperties/C3H8/C3H8I.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C3H8/C3H8I.H similarity index 100% rename from src/thermophysicalModels/properties/liquidProperties/C3H8/C3H8I.H rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/C3H8/C3H8I.H diff --git a/src/thermophysicalModels/properties/liquidProperties/C4H10O/C4H10O.C b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C4H10O/C4H10O.C similarity index 100% rename from src/thermophysicalModels/properties/liquidProperties/C4H10O/C4H10O.C rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/C4H10O/C4H10O.C diff --git a/src/thermophysicalModels/properties/liquidProperties/C4H10O/C4H10O.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C4H10O/C4H10O.H similarity index 100% rename from src/thermophysicalModels/properties/liquidProperties/C4H10O/C4H10O.H rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/C4H10O/C4H10O.H diff --git a/src/thermophysicalModels/properties/liquidProperties/C4H10O/C4H10OI.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C4H10O/C4H10OI.H similarity index 100% rename from src/thermophysicalModels/properties/liquidProperties/C4H10O/C4H10OI.H rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/C4H10O/C4H10OI.H diff --git a/src/thermophysicalModels/properties/liquidProperties/C6H14/C6H14.C b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C6H14/C6H14.C similarity index 100% rename from src/thermophysicalModels/properties/liquidProperties/C6H14/C6H14.C rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/C6H14/C6H14.C diff --git a/src/thermophysicalModels/properties/liquidProperties/C6H14/C6H14.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C6H14/C6H14.H similarity index 100% rename from src/thermophysicalModels/properties/liquidProperties/C6H14/C6H14.H rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/C6H14/C6H14.H diff --git a/src/thermophysicalModels/properties/liquidProperties/C6H14/C6H14I.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C6H14/C6H14I.H similarity index 100% rename from src/thermophysicalModels/properties/liquidProperties/C6H14/C6H14I.H rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/C6H14/C6H14I.H diff --git a/src/thermophysicalModels/properties/liquidProperties/C6H6/C6H6.C b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C6H6/C6H6.C similarity index 100% rename from src/thermophysicalModels/properties/liquidProperties/C6H6/C6H6.C rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/C6H6/C6H6.C diff --git a/src/thermophysicalModels/properties/liquidProperties/C6H6/C6H6.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C6H6/C6H6.H similarity index 100% rename from src/thermophysicalModels/properties/liquidProperties/C6H6/C6H6.H rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/C6H6/C6H6.H diff --git a/src/thermophysicalModels/properties/liquidProperties/C6H6/C6H6I.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C6H6/C6H6I.H similarity index 100% rename from src/thermophysicalModels/properties/liquidProperties/C6H6/C6H6I.H rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/C6H6/C6H6I.H diff --git a/src/thermophysicalModels/properties/liquidProperties/C7H16/C7H16.C b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C7H16/C7H16.C similarity index 100% rename from src/thermophysicalModels/properties/liquidProperties/C7H16/C7H16.C rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/C7H16/C7H16.C diff --git a/src/thermophysicalModels/properties/liquidProperties/C7H16/C7H16.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C7H16/C7H16.H similarity index 100% rename from src/thermophysicalModels/properties/liquidProperties/C7H16/C7H16.H rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/C7H16/C7H16.H diff --git a/src/thermophysicalModels/properties/liquidProperties/C7H16/C7H16I.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C7H16/C7H16I.H similarity index 100% rename from src/thermophysicalModels/properties/liquidProperties/C7H16/C7H16I.H rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/C7H16/C7H16I.H diff --git a/src/thermophysicalModels/properties/liquidProperties/C7H8/C7H8.C b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C7H8/C7H8.C similarity index 100% rename from src/thermophysicalModels/properties/liquidProperties/C7H8/C7H8.C rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/C7H8/C7H8.C diff --git a/src/thermophysicalModels/properties/liquidProperties/C7H8/C7H8.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C7H8/C7H8.H similarity index 100% rename from src/thermophysicalModels/properties/liquidProperties/C7H8/C7H8.H rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/C7H8/C7H8.H diff --git a/src/thermophysicalModels/properties/liquidProperties/C7H8/C7H8I.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C7H8/C7H8I.H similarity index 100% rename from src/thermophysicalModels/properties/liquidProperties/C7H8/C7H8I.H rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/C7H8/C7H8I.H diff --git a/src/thermophysicalModels/properties/liquidProperties/C8H10/C8H10.C b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C8H10/C8H10.C similarity index 100% rename from src/thermophysicalModels/properties/liquidProperties/C8H10/C8H10.C rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/C8H10/C8H10.C diff --git a/src/thermophysicalModels/properties/liquidProperties/C8H10/C8H10.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C8H10/C8H10.H similarity index 100% rename from src/thermophysicalModels/properties/liquidProperties/C8H10/C8H10.H rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/C8H10/C8H10.H diff --git a/src/thermophysicalModels/properties/liquidProperties/C8H10/C8H10I.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C8H10/C8H10I.H similarity index 100% rename from src/thermophysicalModels/properties/liquidProperties/C8H10/C8H10I.H rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/C8H10/C8H10I.H diff --git a/src/thermophysicalModels/properties/liquidProperties/C8H18/C8H18.C b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C8H18/C8H18.C similarity index 100% rename from src/thermophysicalModels/properties/liquidProperties/C8H18/C8H18.C rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/C8H18/C8H18.C diff --git a/src/thermophysicalModels/properties/liquidProperties/C8H18/C8H18.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C8H18/C8H18.H similarity index 100% rename from src/thermophysicalModels/properties/liquidProperties/C8H18/C8H18.H rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/C8H18/C8H18.H diff --git a/src/thermophysicalModels/properties/liquidProperties/C8H18/C8H18I.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C8H18/C8H18I.H similarity index 100% rename from src/thermophysicalModels/properties/liquidProperties/C8H18/C8H18I.H rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/C8H18/C8H18I.H diff --git a/src/thermophysicalModels/properties/liquidProperties/C9H20/C9H20.C b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C9H20/C9H20.C similarity index 100% rename from src/thermophysicalModels/properties/liquidProperties/C9H20/C9H20.C rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/C9H20/C9H20.C diff --git a/src/thermophysicalModels/properties/liquidProperties/C9H20/C9H20.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C9H20/C9H20.H similarity index 100% rename from src/thermophysicalModels/properties/liquidProperties/C9H20/C9H20.H rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/C9H20/C9H20.H diff --git a/src/thermophysicalModels/properties/liquidProperties/C9H20/C9H20I.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C9H20/C9H20I.H similarity index 100% rename from src/thermophysicalModels/properties/liquidProperties/C9H20/C9H20I.H rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/C9H20/C9H20I.H diff --git a/src/thermophysicalModels/properties/liquidProperties/CH3OH/CH3OH.C b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/CH3OH/CH3OH.C similarity index 100% rename from src/thermophysicalModels/properties/liquidProperties/CH3OH/CH3OH.C rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/CH3OH/CH3OH.C diff --git a/src/thermophysicalModels/properties/liquidProperties/CH3OH/CH3OH.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/CH3OH/CH3OH.H similarity index 100% rename from src/thermophysicalModels/properties/liquidProperties/CH3OH/CH3OH.H rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/CH3OH/CH3OH.H diff --git a/src/thermophysicalModels/properties/liquidProperties/CH3OH/CH3OHI.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/CH3OH/CH3OHI.H similarity index 100% rename from src/thermophysicalModels/properties/liquidProperties/CH3OH/CH3OHI.H rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/CH3OH/CH3OHI.H diff --git a/src/thermophysicalModels/properties/liquidProperties/CH4N2O/CH4N2O.C b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/CH4N2O/CH4N2O.C similarity index 100% rename from src/thermophysicalModels/properties/liquidProperties/CH4N2O/CH4N2O.C rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/CH4N2O/CH4N2O.C diff --git a/src/thermophysicalModels/properties/liquidProperties/CH4N2O/CH4N2O.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/CH4N2O/CH4N2O.H similarity index 100% rename from src/thermophysicalModels/properties/liquidProperties/CH4N2O/CH4N2O.H rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/CH4N2O/CH4N2O.H diff --git a/src/thermophysicalModels/properties/liquidProperties/CH4N2O/CH4N2OI.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/CH4N2O/CH4N2OI.H similarity index 100% rename from src/thermophysicalModels/properties/liquidProperties/CH4N2O/CH4N2OI.H rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/CH4N2O/CH4N2OI.H diff --git a/src/thermophysicalModels/properties/liquidProperties/H2O/H2O.C b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/H2O/H2O.C similarity index 96% rename from src/thermophysicalModels/properties/liquidProperties/H2O/H2O.C rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/H2O/H2O.C index eb211a946f..634007fc1d 100644 --- a/src/thermophysicalModels/properties/liquidProperties/H2O/H2O.C +++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/H2O/H2O.C @@ -31,6 +31,8 @@ License namespace Foam { defineTypeNameAndDebug(H2O, 0); + addToRunTimeSelectionTable(thermophysicalProperties, H2O,); + addToRunTimeSelectionTable(thermophysicalProperties, H2O, dictionary); addToRunTimeSelectionTable(liquidProperties, H2O,); addToRunTimeSelectionTable(liquidProperties, H2O, dictionary); } diff --git a/src/thermophysicalModels/properties/liquidProperties/H2O/H2O.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/H2O/H2O.H similarity index 100% rename from src/thermophysicalModels/properties/liquidProperties/H2O/H2O.H rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/H2O/H2O.H diff --git a/src/thermophysicalModels/properties/liquidProperties/H2O/H2OI.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/H2O/H2OI.H similarity index 100% rename from src/thermophysicalModels/properties/liquidProperties/H2O/H2OI.H rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/H2O/H2OI.H diff --git a/src/thermophysicalModels/properties/liquidProperties/IC8H18/IC8H18.C b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/IC8H18/IC8H18.C similarity index 100% rename from src/thermophysicalModels/properties/liquidProperties/IC8H18/IC8H18.C rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/IC8H18/IC8H18.C diff --git a/src/thermophysicalModels/properties/liquidProperties/IC8H18/IC8H18.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/IC8H18/IC8H18.H similarity index 100% rename from src/thermophysicalModels/properties/liquidProperties/IC8H18/IC8H18.H rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/IC8H18/IC8H18.H diff --git a/src/thermophysicalModels/properties/liquidProperties/IC8H18/IC8H18I.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/IC8H18/IC8H18I.H similarity index 100% rename from src/thermophysicalModels/properties/liquidProperties/IC8H18/IC8H18I.H rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/IC8H18/IC8H18I.H diff --git a/src/thermophysicalModels/properties/liquidProperties/IDEA/IDEA.C b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/IDEA/IDEA.C similarity index 100% rename from src/thermophysicalModels/properties/liquidProperties/IDEA/IDEA.C rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/IDEA/IDEA.C diff --git a/src/thermophysicalModels/properties/liquidProperties/IDEA/IDEA.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/IDEA/IDEA.H similarity index 100% rename from src/thermophysicalModels/properties/liquidProperties/IDEA/IDEA.H rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/IDEA/IDEA.H diff --git a/src/thermophysicalModels/properties/liquidProperties/IDEA/IDEA.thermo b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/IDEA/IDEA.thermo similarity index 100% rename from src/thermophysicalModels/properties/liquidProperties/IDEA/IDEA.thermo rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/IDEA/IDEA.thermo diff --git a/src/thermophysicalModels/properties/liquidProperties/IDEA/IDEAI.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/IDEA/IDEAI.H similarity index 100% rename from src/thermophysicalModels/properties/liquidProperties/IDEA/IDEAI.H rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/IDEA/IDEAI.H diff --git a/src/thermophysicalModels/properties/liquidProperties/MB/MB.C b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/MB/MB.C similarity index 100% rename from src/thermophysicalModels/properties/liquidProperties/MB/MB.C rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/MB/MB.C diff --git a/src/thermophysicalModels/properties/liquidProperties/MB/MB.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/MB/MB.H similarity index 100% rename from src/thermophysicalModels/properties/liquidProperties/MB/MB.H rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/MB/MB.H diff --git a/src/thermophysicalModels/properties/liquidProperties/MB/MBI.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/MB/MBI.H similarity index 100% rename from src/thermophysicalModels/properties/liquidProperties/MB/MBI.H rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/MB/MBI.H diff --git a/src/thermophysicalModels/properties/liquidProperties/N2/N2.C b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/N2/N2.C similarity index 100% rename from src/thermophysicalModels/properties/liquidProperties/N2/N2.C rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/N2/N2.C diff --git a/src/thermophysicalModels/properties/liquidProperties/N2/N2.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/N2/N2.H similarity index 100% rename from src/thermophysicalModels/properties/liquidProperties/N2/N2.H rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/N2/N2.H diff --git a/src/thermophysicalModels/properties/liquidProperties/N2/N2I.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/N2/N2I.H similarity index 100% rename from src/thermophysicalModels/properties/liquidProperties/N2/N2I.H rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/N2/N2I.H diff --git a/src/thermophysicalModels/properties/liquidProperties/aC10H7CH3/aC10H7CH3.C b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/aC10H7CH3/aC10H7CH3.C similarity index 100% rename from src/thermophysicalModels/properties/liquidProperties/aC10H7CH3/aC10H7CH3.C rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/aC10H7CH3/aC10H7CH3.C diff --git a/src/thermophysicalModels/properties/liquidProperties/aC10H7CH3/aC10H7CH3.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/aC10H7CH3/aC10H7CH3.H similarity index 100% rename from src/thermophysicalModels/properties/liquidProperties/aC10H7CH3/aC10H7CH3.H rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/aC10H7CH3/aC10H7CH3.H diff --git a/src/thermophysicalModels/properties/liquidProperties/aC10H7CH3/aC10H7CH3I.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/aC10H7CH3/aC10H7CH3I.H similarity index 100% rename from src/thermophysicalModels/properties/liquidProperties/aC10H7CH3/aC10H7CH3I.H rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/aC10H7CH3/aC10H7CH3I.H diff --git a/src/thermophysicalModels/properties/liquidProperties/bC10H7CH3/bC10H7CH3.C b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/bC10H7CH3/bC10H7CH3.C similarity index 100% rename from src/thermophysicalModels/properties/liquidProperties/bC10H7CH3/bC10H7CH3.C rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/bC10H7CH3/bC10H7CH3.C diff --git a/src/thermophysicalModels/properties/liquidProperties/bC10H7CH3/bC10H7CH3.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/bC10H7CH3/bC10H7CH3.H similarity index 100% rename from src/thermophysicalModels/properties/liquidProperties/bC10H7CH3/bC10H7CH3.H rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/bC10H7CH3/bC10H7CH3.H diff --git a/src/thermophysicalModels/properties/liquidProperties/bC10H7CH3/bC10H7CH3I.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/bC10H7CH3/bC10H7CH3I.H similarity index 100% rename from src/thermophysicalModels/properties/liquidProperties/bC10H7CH3/bC10H7CH3I.H rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/bC10H7CH3/bC10H7CH3I.H diff --git a/src/thermophysicalModels/properties/liquidProperties/iC3H8O/iC3H8O.C b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/iC3H8O/iC3H8O.C similarity index 100% rename from src/thermophysicalModels/properties/liquidProperties/iC3H8O/iC3H8O.C rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/iC3H8O/iC3H8O.C diff --git a/src/thermophysicalModels/properties/liquidProperties/iC3H8O/iC3H8O.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/iC3H8O/iC3H8O.H similarity index 100% rename from src/thermophysicalModels/properties/liquidProperties/iC3H8O/iC3H8O.H rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/iC3H8O/iC3H8O.H diff --git a/src/thermophysicalModels/properties/liquidProperties/iC3H8O/iC3H8OI.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/iC3H8O/iC3H8OI.H similarity index 100% rename from src/thermophysicalModels/properties/liquidProperties/iC3H8O/iC3H8OI.H rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/iC3H8O/iC3H8OI.H diff --git a/src/thermophysicalModels/properties/liquidProperties/liquidMixtureProperties/liquidMixtureProperties.C b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/liquidMixtureProperties/liquidMixtureProperties.C similarity index 100% rename from src/thermophysicalModels/properties/liquidProperties/liquidMixtureProperties/liquidMixtureProperties.C rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/liquidMixtureProperties/liquidMixtureProperties.C diff --git a/src/thermophysicalModels/properties/liquidProperties/liquidMixtureProperties/liquidMixtureProperties.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/liquidMixtureProperties/liquidMixtureProperties.H similarity index 100% rename from src/thermophysicalModels/properties/liquidProperties/liquidMixtureProperties/liquidMixtureProperties.H rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/liquidMixtureProperties/liquidMixtureProperties.H diff --git a/src/thermophysicalModels/properties/liquidProperties/liquidProperties/liquidProperties.C b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/liquidProperties/liquidProperties.C similarity index 82% rename from src/thermophysicalModels/properties/liquidProperties/liquidProperties/liquidProperties.C rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/liquidProperties/liquidProperties.C index 49c88103b5..2fc7a6f97b 100644 --- a/src/thermophysicalModels/properties/liquidProperties/liquidProperties/liquidProperties.C +++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/liquidProperties/liquidProperties.C @@ -53,7 +53,7 @@ Foam::liquidProperties::liquidProperties scalar delta ) : - W_(W), + thermophysicalProperties(W), Tc_(Tc), Pc_(Pc), Vc_(Vc), @@ -69,7 +69,7 @@ Foam::liquidProperties::liquidProperties Foam::liquidProperties::liquidProperties(const dictionary& dict) : - W_(readScalar(dict.lookup("W"))), + thermophysicalProperties(dict), Tc_(readScalar(dict.lookup("Tc"))), Pc_(readScalar(dict.lookup("Pc"))), Vc_(readScalar(dict.lookup("Vc"))), @@ -174,91 +174,7 @@ Foam::autoPtr Foam::liquidProperties::New // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -Foam::scalar Foam::liquidProperties::rho(scalar p, scalar T) const -{ - NotImplemented; - return 0; -} - - -Foam::scalar Foam::liquidProperties::pv(scalar p, scalar T) const -{ - NotImplemented; - return 0; -} - - -Foam::scalar Foam::liquidProperties::hl(scalar p, scalar T) const -{ - NotImplemented; - return 0; -} - - -Foam::scalar Foam::liquidProperties::Cp(scalar p, scalar T) const -{ - NotImplemented; - return 0; -} - - -Foam::scalar Foam::liquidProperties::h(scalar p, scalar T) const -{ - NotImplemented; - return 0; -} - - -Foam::scalar Foam::liquidProperties::Cpg(scalar p, scalar T) const -{ - NotImplemented; - return 0; -} - - -Foam::scalar Foam::liquidProperties::mu(scalar p, scalar T) const -{ - NotImplemented; - return 0; -} - - -Foam::scalar Foam::liquidProperties::mug(scalar p, scalar T) const -{ - NotImplemented; - return 0; -} - - -Foam::scalar Foam::liquidProperties::kappa(scalar p, scalar T) const -{ - NotImplemented; - return 0; -} - - -Foam::scalar Foam::liquidProperties::kappag(scalar p, scalar T) const -{ - NotImplemented; - return 0; -} - - -Foam::scalar Foam::liquidProperties::sigma(scalar p, scalar T) const -{ - NotImplemented; - return 0; -} - - -Foam::scalar Foam::liquidProperties::D(scalar p, scalar T) const -{ - NotImplemented; - return 0; -} - - -Foam::scalar Foam::liquidProperties::D(scalar p, scalar T, scalar Wb) const +Foam::scalar Foam::liquidProperties::S(scalar p, scalar T) const { NotImplemented; return 0; @@ -310,7 +226,7 @@ Foam::scalar Foam::liquidProperties::pvInvert(scalar p) const void Foam::liquidProperties::readIfPresent(const dictionary &dict) { - dict.readIfPresent("W", W_); + thermophysicalProperties::readIfPresent(dict); dict.readIfPresent("Tc", Tc_); dict.readIfPresent("Pc", Pc_); dict.readIfPresent("Vc", Vc_); @@ -326,7 +242,8 @@ void Foam::liquidProperties::readIfPresent(const dictionary &dict) void Foam::liquidProperties::writeData(Ostream& os) const { - os << W_ << token::SPACE + thermophysicalProperties::writeData(os); + os << token::SPACE << Tc_ << token::SPACE << Pc_ << token::SPACE << Vc_ << token::SPACE diff --git a/src/thermophysicalModels/properties/liquidProperties/liquidProperties/liquidProperties.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/liquidProperties/liquidProperties.H similarity index 82% rename from src/thermophysicalModels/properties/liquidProperties/liquidProperties/liquidProperties.H rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/liquidProperties/liquidProperties.H index 2f035a1f87..939a80770a 100644 --- a/src/thermophysicalModels/properties/liquidProperties/liquidProperties/liquidProperties.H +++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/liquidProperties/liquidProperties.H @@ -25,7 +25,7 @@ Class Foam::liquidProperties Description - The thermophysical properties of a liquidProperties + The thermophysical properties of a liquid SourceFiles liquidProperties.C @@ -35,12 +35,7 @@ SourceFiles #ifndef liquidProperties_H #define liquidProperties_H -#include "scalar.H" -#include "IOstreams.H" -#include "typeInfo.H" -#include "autoPtr.H" -#include "runTimeSelectionTables.H" -#include "dictionary.H" +#include "thermophysicalProperties.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -52,12 +47,11 @@ namespace Foam \*---------------------------------------------------------------------------*/ class liquidProperties +: + public thermophysicalProperties { // Private data - //- Molecular weight [kg/kmol] - scalar W_; - //- Critical temperature [K] scalar Tc_; @@ -137,10 +131,7 @@ public: liquidProperties(const dictionary& dict); //- Construct and return clone - virtual autoPtr clone() const - { - return autoPtr(new liquidProperties(*this)); - } + virtual autoPtr clone() const = 0; // Selectors @@ -161,20 +152,11 @@ public: // Physical constants which define the specie - //- Molecular weight [kg/kmol] - inline scalar W() const; - //- No of moles of this species in mixture // Note Mixing of liquidProperties is not currently supported // so Y = 1 inline scalar Y() const; - //- Is the equation of state is incompressible i.e. rho != f(p) - static const bool incompressible = true; - - //- Is the equation of state is isochoric i.e. rho = const - static const bool isochoric = false; - //- Critical temperature [K] inline scalar Tc() const; @@ -211,9 +193,6 @@ public: // Fundamental equation of state properties - //- Liquid density [kg/m^3] - virtual scalar rho(scalar p, scalar T) const; - //- Liquid compressibility rho/p [s^2/m^2] // Note: currently it is assumed the liquid is incompressible inline scalar psi(scalar p, scalar T) const; @@ -226,9 +205,6 @@ public: // Fundamental thermodynamic properties - //- Heat capacity at constant pressure [J/(kg K)] - virtual scalar Cp(const scalar p, const scalar T) const; - //- Absolute Enthalpy [J/kg] inline scalar Ha(const scalar p, const scalar T) const; @@ -239,46 +215,46 @@ public: inline scalar Hc() const; // Entropy [J/(kg K)] - // inline scalar S(const scalar p, const scalar T) const; + scalar S(const scalar p, const scalar T) const; // Physical properties //- Vapour pressure [Pa] - virtual scalar pv(scalar p, scalar T) const; + virtual scalar pv(scalar p, scalar T) const = 0; //- Heat of vapourisation [J/kg] - virtual scalar hl(scalar p, scalar T) const; + virtual scalar hl(scalar p, scalar T) const = 0; //- Liquid enthalpy [J/kg] - reference to 298.15 K - virtual scalar h(scalar p, scalar T) const; + virtual scalar h(scalar p, scalar T) const = 0; //- Vapour heat capacity [J/(kg K)] - virtual scalar Cpg(scalar p, scalar T) const; + virtual scalar Cpg(scalar p, scalar T) const = 0; //- Liquid viscosity [Pa s] - virtual scalar mu(scalar p, scalar T) const; + virtual scalar mu(scalar p, scalar T) const = 0; //- Vapour viscosity [Pa s] - virtual scalar mug(scalar p, scalar T) const; + virtual scalar mug(scalar p, scalar T) const = 0; //- Liquid thermal conductivity [W/(m K)] - virtual scalar kappa(scalar p, scalar T) const; + virtual scalar kappa(scalar p, scalar T) const = 0; //- Liquid thermal diffusivity of enthalpy [kg/ms] inline scalar alphah(const scalar p, const scalar T) const; //- Vapour thermal conductivity [W/(m K)] - virtual scalar kappag(scalar p, scalar T) const; + virtual scalar kappag(scalar p, scalar T) const = 0; //- Surface tension [N/m] - virtual scalar sigma(scalar p, scalar T) const; + virtual scalar sigma(scalar p, scalar T) const = 0; //- Vapour diffussivity [m2/s] - virtual scalar D(scalar p, scalar T) const; + virtual scalar D(scalar p, scalar T) const = 0; //- Vapour diffussivity [m2/s] with specified binary pair - virtual scalar D(scalar p, scalar T, scalar Wb) const; + virtual scalar D(scalar p, scalar T, scalar Wb) const = 0; //- Invert the vapour pressure relationship to retrieve the // boiling temperuture as a function of pressure @@ -306,7 +282,7 @@ public: inline void readIfPresent(Liquid& l, const dictionary& dict); //- Write the function coefficients - virtual void writeData(Ostream& os) const; + virtual void writeData(Ostream& os) const = 0;; //- Write the data for each of the property functions template diff --git a/src/thermophysicalModels/properties/liquidProperties/liquidProperties/liquidPropertiesI.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/liquidProperties/liquidPropertiesI.H similarity index 98% rename from src/thermophysicalModels/properties/liquidProperties/liquidProperties/liquidPropertiesI.H rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/liquidProperties/liquidPropertiesI.H index fb53db8c44..454116fb11 100644 --- a/src/thermophysicalModels/properties/liquidProperties/liquidProperties/liquidPropertiesI.H +++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/liquidProperties/liquidPropertiesI.H @@ -29,12 +29,6 @@ inline Foam::scalar Foam::liquidProperties::limit(const scalar T) const } -inline Foam::scalar Foam::liquidProperties::W() const -{ - return W_; -} - - inline Foam::scalar Foam::liquidProperties::Y() const { return 1; diff --git a/src/thermophysicalModels/properties/liquidProperties/nC3H8O/nC3H8O.C b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/nC3H8O/nC3H8O.C similarity index 100% rename from src/thermophysicalModels/properties/liquidProperties/nC3H8O/nC3H8O.C rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/nC3H8O/nC3H8O.C diff --git a/src/thermophysicalModels/properties/liquidProperties/nC3H8O/nC3H8O.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/nC3H8O/nC3H8O.H similarity index 100% rename from src/thermophysicalModels/properties/liquidProperties/nC3H8O/nC3H8O.H rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/nC3H8O/nC3H8O.H diff --git a/src/thermophysicalModels/properties/liquidProperties/nC3H8O/nC3H8OI.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/nC3H8O/nC3H8OI.H similarity index 100% rename from src/thermophysicalModels/properties/liquidProperties/nC3H8O/nC3H8OI.H rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/nC3H8O/nC3H8OI.H diff --git a/src/thermophysicalModels/properties/solidProperties/C/C.C b/src/thermophysicalModels/thermophysicalProperties/solidProperties/C/C.C similarity index 100% rename from src/thermophysicalModels/properties/solidProperties/C/C.C rename to src/thermophysicalModels/thermophysicalProperties/solidProperties/C/C.C diff --git a/src/thermophysicalModels/properties/solidProperties/C/C.H b/src/thermophysicalModels/thermophysicalProperties/solidProperties/C/C.H similarity index 100% rename from src/thermophysicalModels/properties/solidProperties/C/C.H rename to src/thermophysicalModels/thermophysicalProperties/solidProperties/C/C.H diff --git a/src/thermophysicalModels/properties/solidProperties/CaCO3/CaCO3.C b/src/thermophysicalModels/thermophysicalProperties/solidProperties/CaCO3/CaCO3.C similarity index 100% rename from src/thermophysicalModels/properties/solidProperties/CaCO3/CaCO3.C rename to src/thermophysicalModels/thermophysicalProperties/solidProperties/CaCO3/CaCO3.C diff --git a/src/thermophysicalModels/properties/solidProperties/CaCO3/CaCO3.H b/src/thermophysicalModels/thermophysicalProperties/solidProperties/CaCO3/CaCO3.H similarity index 100% rename from src/thermophysicalModels/properties/solidProperties/CaCO3/CaCO3.H rename to src/thermophysicalModels/thermophysicalProperties/solidProperties/CaCO3/CaCO3.H diff --git a/src/thermophysicalModels/properties/solidProperties/ash/ash.C b/src/thermophysicalModels/thermophysicalProperties/solidProperties/ash/ash.C similarity index 100% rename from src/thermophysicalModels/properties/solidProperties/ash/ash.C rename to src/thermophysicalModels/thermophysicalProperties/solidProperties/ash/ash.C diff --git a/src/thermophysicalModels/properties/solidProperties/ash/ash.H b/src/thermophysicalModels/thermophysicalProperties/solidProperties/ash/ash.H similarity index 100% rename from src/thermophysicalModels/properties/solidProperties/ash/ash.H rename to src/thermophysicalModels/thermophysicalProperties/solidProperties/ash/ash.H diff --git a/src/thermophysicalModels/properties/solidProperties/solidMixtureProperties/solidMixtureProperties.C b/src/thermophysicalModels/thermophysicalProperties/solidProperties/solidMixtureProperties/solidMixtureProperties.C similarity index 100% rename from src/thermophysicalModels/properties/solidProperties/solidMixtureProperties/solidMixtureProperties.C rename to src/thermophysicalModels/thermophysicalProperties/solidProperties/solidMixtureProperties/solidMixtureProperties.C diff --git a/src/thermophysicalModels/properties/solidProperties/solidMixtureProperties/solidMixtureProperties.H b/src/thermophysicalModels/thermophysicalProperties/solidProperties/solidMixtureProperties/solidMixtureProperties.H similarity index 100% rename from src/thermophysicalModels/properties/solidProperties/solidMixtureProperties/solidMixtureProperties.H rename to src/thermophysicalModels/thermophysicalProperties/solidProperties/solidMixtureProperties/solidMixtureProperties.H diff --git a/src/thermophysicalModels/properties/solidProperties/solidProperties/solidProperties.C b/src/thermophysicalModels/thermophysicalProperties/solidProperties/solidProperties/solidProperties.C similarity index 100% rename from src/thermophysicalModels/properties/solidProperties/solidProperties/solidProperties.C rename to src/thermophysicalModels/thermophysicalProperties/solidProperties/solidProperties/solidProperties.C diff --git a/src/thermophysicalModels/properties/solidProperties/solidProperties/solidProperties.H b/src/thermophysicalModels/thermophysicalProperties/solidProperties/solidProperties/solidProperties.H similarity index 100% rename from src/thermophysicalModels/properties/solidProperties/solidProperties/solidProperties.H rename to src/thermophysicalModels/thermophysicalProperties/solidProperties/solidProperties/solidProperties.H diff --git a/src/thermophysicalModels/properties/solidProperties/solidProperties/solidPropertiesI.H b/src/thermophysicalModels/thermophysicalProperties/solidProperties/solidProperties/solidPropertiesI.H similarity index 100% rename from src/thermophysicalModels/properties/solidProperties/solidProperties/solidPropertiesI.H rename to src/thermophysicalModels/thermophysicalProperties/solidProperties/solidProperties/solidPropertiesI.H diff --git a/src/thermophysicalModels/properties/solidProperties/solidProperties/solidPropertiesNew.C b/src/thermophysicalModels/thermophysicalProperties/solidProperties/solidProperties/solidPropertiesNew.C similarity index 100% rename from src/thermophysicalModels/properties/solidProperties/solidProperties/solidPropertiesNew.C rename to src/thermophysicalModels/thermophysicalProperties/solidProperties/solidProperties/solidPropertiesNew.C diff --git a/src/thermophysicalModels/thermophysicalFunctions/APIfunctions/APIdiffCoefFunc/APIdiffCoefFunc.C b/src/thermophysicalModels/thermophysicalProperties/thermophysicalFunctions/APIfunctions/APIdiffCoefFunc/APIdiffCoefFunc.C similarity index 100% rename from src/thermophysicalModels/thermophysicalFunctions/APIfunctions/APIdiffCoefFunc/APIdiffCoefFunc.C rename to src/thermophysicalModels/thermophysicalProperties/thermophysicalFunctions/APIfunctions/APIdiffCoefFunc/APIdiffCoefFunc.C diff --git a/src/thermophysicalModels/thermophysicalFunctions/APIfunctions/APIdiffCoefFunc/APIdiffCoefFunc.H b/src/thermophysicalModels/thermophysicalProperties/thermophysicalFunctions/APIfunctions/APIdiffCoefFunc/APIdiffCoefFunc.H similarity index 100% rename from src/thermophysicalModels/thermophysicalFunctions/APIfunctions/APIdiffCoefFunc/APIdiffCoefFunc.H rename to src/thermophysicalModels/thermophysicalProperties/thermophysicalFunctions/APIfunctions/APIdiffCoefFunc/APIdiffCoefFunc.H diff --git a/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc0/NSRDSfunc0.C b/src/thermophysicalModels/thermophysicalProperties/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc0/NSRDSfunc0.C similarity index 100% rename from src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc0/NSRDSfunc0.C rename to src/thermophysicalModels/thermophysicalProperties/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc0/NSRDSfunc0.C diff --git a/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc0/NSRDSfunc0.H b/src/thermophysicalModels/thermophysicalProperties/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc0/NSRDSfunc0.H similarity index 100% rename from src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc0/NSRDSfunc0.H rename to src/thermophysicalModels/thermophysicalProperties/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc0/NSRDSfunc0.H diff --git a/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc1/NSRDSfunc1.C b/src/thermophysicalModels/thermophysicalProperties/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc1/NSRDSfunc1.C similarity index 100% rename from src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc1/NSRDSfunc1.C rename to src/thermophysicalModels/thermophysicalProperties/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc1/NSRDSfunc1.C diff --git a/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc1/NSRDSfunc1.H b/src/thermophysicalModels/thermophysicalProperties/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc1/NSRDSfunc1.H similarity index 100% rename from src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc1/NSRDSfunc1.H rename to src/thermophysicalModels/thermophysicalProperties/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc1/NSRDSfunc1.H diff --git a/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc14/NSRDSfunc14.C b/src/thermophysicalModels/thermophysicalProperties/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc14/NSRDSfunc14.C similarity index 100% rename from src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc14/NSRDSfunc14.C rename to src/thermophysicalModels/thermophysicalProperties/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc14/NSRDSfunc14.C diff --git a/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc14/NSRDSfunc14.H b/src/thermophysicalModels/thermophysicalProperties/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc14/NSRDSfunc14.H similarity index 100% rename from src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc14/NSRDSfunc14.H rename to src/thermophysicalModels/thermophysicalProperties/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc14/NSRDSfunc14.H diff --git a/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc2/NSRDSfunc2.C b/src/thermophysicalModels/thermophysicalProperties/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc2/NSRDSfunc2.C similarity index 100% rename from src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc2/NSRDSfunc2.C rename to src/thermophysicalModels/thermophysicalProperties/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc2/NSRDSfunc2.C diff --git a/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc2/NSRDSfunc2.H b/src/thermophysicalModels/thermophysicalProperties/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc2/NSRDSfunc2.H similarity index 100% rename from src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc2/NSRDSfunc2.H rename to src/thermophysicalModels/thermophysicalProperties/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc2/NSRDSfunc2.H diff --git a/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc3/NSRDSfunc3.C b/src/thermophysicalModels/thermophysicalProperties/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc3/NSRDSfunc3.C similarity index 100% rename from src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc3/NSRDSfunc3.C rename to src/thermophysicalModels/thermophysicalProperties/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc3/NSRDSfunc3.C diff --git a/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc3/NSRDSfunc3.H b/src/thermophysicalModels/thermophysicalProperties/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc3/NSRDSfunc3.H similarity index 100% rename from src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc3/NSRDSfunc3.H rename to src/thermophysicalModels/thermophysicalProperties/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc3/NSRDSfunc3.H diff --git a/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc4/NSRDSfunc4.C b/src/thermophysicalModels/thermophysicalProperties/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc4/NSRDSfunc4.C similarity index 100% rename from src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc4/NSRDSfunc4.C rename to src/thermophysicalModels/thermophysicalProperties/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc4/NSRDSfunc4.C diff --git a/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc4/NSRDSfunc4.H b/src/thermophysicalModels/thermophysicalProperties/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc4/NSRDSfunc4.H similarity index 100% rename from src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc4/NSRDSfunc4.H rename to src/thermophysicalModels/thermophysicalProperties/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc4/NSRDSfunc4.H diff --git a/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc5/NSRDSfunc5.C b/src/thermophysicalModels/thermophysicalProperties/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc5/NSRDSfunc5.C similarity index 100% rename from src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc5/NSRDSfunc5.C rename to src/thermophysicalModels/thermophysicalProperties/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc5/NSRDSfunc5.C diff --git a/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc5/NSRDSfunc5.H b/src/thermophysicalModels/thermophysicalProperties/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc5/NSRDSfunc5.H similarity index 100% rename from src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc5/NSRDSfunc5.H rename to src/thermophysicalModels/thermophysicalProperties/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc5/NSRDSfunc5.H diff --git a/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc6/NSRDSfunc6.C b/src/thermophysicalModels/thermophysicalProperties/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc6/NSRDSfunc6.C similarity index 100% rename from src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc6/NSRDSfunc6.C rename to src/thermophysicalModels/thermophysicalProperties/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc6/NSRDSfunc6.C diff --git a/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc6/NSRDSfunc6.H b/src/thermophysicalModels/thermophysicalProperties/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc6/NSRDSfunc6.H similarity index 100% rename from src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc6/NSRDSfunc6.H rename to src/thermophysicalModels/thermophysicalProperties/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc6/NSRDSfunc6.H diff --git a/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc7/NSRDSfunc7.C b/src/thermophysicalModels/thermophysicalProperties/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc7/NSRDSfunc7.C similarity index 100% rename from src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc7/NSRDSfunc7.C rename to src/thermophysicalModels/thermophysicalProperties/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc7/NSRDSfunc7.C diff --git a/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc7/NSRDSfunc7.H b/src/thermophysicalModels/thermophysicalProperties/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc7/NSRDSfunc7.H similarity index 100% rename from src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc7/NSRDSfunc7.H rename to src/thermophysicalModels/thermophysicalProperties/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc7/NSRDSfunc7.H diff --git a/src/thermophysicalModels/thermophysicalFunctions/thermophysicalFunction/thermophysicalFunction.C b/src/thermophysicalModels/thermophysicalProperties/thermophysicalFunctions/thermophysicalFunction/thermophysicalFunction.C similarity index 100% rename from src/thermophysicalModels/thermophysicalFunctions/thermophysicalFunction/thermophysicalFunction.C rename to src/thermophysicalModels/thermophysicalProperties/thermophysicalFunctions/thermophysicalFunction/thermophysicalFunction.C diff --git a/src/thermophysicalModels/thermophysicalFunctions/thermophysicalFunction/thermophysicalFunction.H b/src/thermophysicalModels/thermophysicalProperties/thermophysicalFunctions/thermophysicalFunction/thermophysicalFunction.H similarity index 100% rename from src/thermophysicalModels/thermophysicalFunctions/thermophysicalFunction/thermophysicalFunction.H rename to src/thermophysicalModels/thermophysicalProperties/thermophysicalFunctions/thermophysicalFunction/thermophysicalFunction.H diff --git a/src/thermophysicalModels/thermophysicalProperties/thermophysicalProperties/thermophysicalProperties.C b/src/thermophysicalModels/thermophysicalProperties/thermophysicalProperties/thermophysicalProperties.C new file mode 100644 index 0000000000..e5613a98bc --- /dev/null +++ b/src/thermophysicalModels/thermophysicalProperties/thermophysicalProperties/thermophysicalProperties.C @@ -0,0 +1,133 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | + \\ / A nd | Copyright (C) 2017 OpenFOAM Foundation + \\/ M anipulation | +------------------------------------------------------------------------------- +License + This file is part of OpenFOAM. + + OpenFOAM is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + OpenFOAM is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + for more details. + + You should have received a copy of the GNU General Public License + along with OpenFOAM. If not, see . + +\*---------------------------------------------------------------------------*/ + +#include "thermophysicalProperties.H" + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +namespace Foam +{ + defineTypeNameAndDebug(thermophysicalProperties, 0); + defineRunTimeSelectionTable(thermophysicalProperties,); + defineRunTimeSelectionTable(thermophysicalProperties, dictionary); +} + +// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // + +Foam::thermophysicalProperties::thermophysicalProperties(scalar W) +: + W_(W) +{} + + +Foam::thermophysicalProperties::thermophysicalProperties(const dictionary& dict) +: + W_(readScalar(dict.lookup("W"))) +{} + + +// * * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * // + +Foam::autoPtr +Foam::thermophysicalProperties::New +( + const word& name +) +{ + if (debug) + { + InfoInFunction << "Constructing thermophysicalProperties" << endl; + } + + ConstructorTable::iterator cstrIter = ConstructorTablePtr_->find(name); + + if (cstrIter == ConstructorTablePtr_->end()) + { + FatalErrorInFunction + << "Unknown thermophysicalProperties type " + << name << nl << nl + << "Valid thermophysicalProperties types are:" << nl + << ConstructorTablePtr_->sortedToc() + << exit(FatalError); + } + + return autoPtr(cstrIter()()); +} + + +Foam::autoPtr +Foam::thermophysicalProperties::New +( + const dictionary& dict +) +{ + if (debug) + { + InfoInFunction << "Constructing thermophysicalProperties" << endl; + } + + const word& thermophysicalPropertiesTypeName = dict.dictName(); + + dictionaryConstructorTable::iterator cstrIter = + dictionaryConstructorTablePtr_->find(thermophysicalPropertiesTypeName); + + if (cstrIter == dictionaryConstructorTablePtr_->end()) + { + FatalErrorInFunction + << "Unknown thermophysicalProperties type " + << thermophysicalPropertiesTypeName << nl << nl + << "Valid thermophysicalProperties types are:" << nl + << dictionaryConstructorTablePtr_->sortedToc() + << exit(FatalError); + } + + return autoPtr(cstrIter()(dict)); +} + + +// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // + +void Foam::thermophysicalProperties::readIfPresent(const dictionary &dict) +{ + dict.readIfPresent("W", W_); +} + + +void Foam::thermophysicalProperties::writeData(Ostream& os) const +{ + os << W_; +} + + +// * * * * * * * * * * * * * * * Ostream Operator * * * * * * * * * * * * * // + +Foam::Ostream& Foam::operator<<(Ostream& os, const thermophysicalProperties& l) +{ + l.writeData(os); + return os; +} + + +// ************************************************************************* // diff --git a/src/thermophysicalModels/thermophysicalProperties/thermophysicalProperties/thermophysicalProperties.H b/src/thermophysicalModels/thermophysicalProperties/thermophysicalProperties/thermophysicalProperties.H new file mode 100644 index 0000000000..98ec171a54 --- /dev/null +++ b/src/thermophysicalModels/thermophysicalProperties/thermophysicalProperties/thermophysicalProperties.H @@ -0,0 +1,205 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | + \\ / A nd | Copyright (C) 2017 OpenFOAM Foundation + \\/ M anipulation | +------------------------------------------------------------------------------- +License + This file is part of OpenFOAM. + + OpenFOAM is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + OpenFOAM is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + for more details. + + You should have received a copy of the GNU General Public License + along with OpenFOAM. If not, see . + +Class + Foam::thermophysicalProperties + +Description + Base-class for thermophysical properties of solids, liquids and gases + providing an interface compatible with the templated thermodynamics + packages. + +SourceFiles + thermophysicalPropertiesI.H + thermophysicalProperties.C + +\*---------------------------------------------------------------------------*/ + +#ifndef thermophysicalProperties_H +#define thermophysicalProperties_H + +#include "dictionary.H" +#include "runTimeSelectionTables.H" + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +namespace Foam +{ + +/*---------------------------------------------------------------------------*\ + Class thermophysicalProperties Declaration +\*---------------------------------------------------------------------------*/ + +class thermophysicalProperties +{ + // Private data + + //- Molecular weight [kg/kmol] + scalar W_; + + +public: + + TypeName("thermophysicalProperties"); + + + // Declare run-time constructor selection tables + + declareRunTimeSelectionTable + ( + autoPtr, + thermophysicalProperties, + , + (), + () + ); + + declareRunTimeSelectionTable + ( + autoPtr, + thermophysicalProperties, + dictionary, + (const dictionary& dict), + (dict) + ); + + + // Constructors + + //- Construct from molecular weight + thermophysicalProperties(scalar W); + + //- Construct from dictionary + thermophysicalProperties(const dictionary& dict); + + + // Selectors + + //- Return a pointer to a new thermophysicalProperties created from name + static autoPtr New(const word& name); + + //- Return a pointer to a new thermophysicalProperties + // created from dictionary + static autoPtr New(const dictionary& dict); + + + //- Destructor + virtual ~thermophysicalProperties() + {} + + + // Member Functions + + // Physical constants which define the specie + + //- Molecular weight [kg/kmol] + inline scalar W() const; + + //- Is the equation of state is incompressible i.e. rho != f(p) + static const bool incompressible = true; + + //- Is the equation of state is isochoric i.e. rho = const + static const bool isochoric = false; + + //- Limit the temperature to be in the range Tlow_ to Thigh_ + inline scalar limit(const scalar T) const; + + + // Fundamental equation of state properties + + //- Liquid density [kg/m^3] + virtual scalar rho(scalar p, scalar T) const = 0; + + //- Liquid compressibility rho/p [s^2/m^2] + // Note: currently it is assumed the liquid is incompressible + virtual scalar psi(scalar p, scalar T) const = 0; + + //- Return (Cp - Cv) [J/(kg K] + // Note: currently it is assumed the liquid is incompressible + // so CpMCv 0 + virtual scalar CpMCv(scalar p, scalar T) const = 0; + + + // Fundamental thermodynamic properties + + //- Heat capacity at constant pressure [J/(kg K)] + virtual scalar Cp(const scalar p, const scalar T) const = 0; + + //- Absolute Enthalpy [J/kg] + virtual scalar Ha(const scalar p, const scalar T) const = 0; + + //- Sensible enthalpy [J/kg] + virtual scalar Hs(const scalar p, const scalar T) const = 0; + + //- Chemical enthalpy [J/kg] + virtual scalar Hc() const = 0; + + // Entropy [J/(kg K)] + virtual scalar S(const scalar p, const scalar T) const = 0; + + + // Physical properties + + //- Liquid viscosity [Pa s] + virtual scalar mu(scalar p, scalar T) const = 0; + + //- Liquid thermal conductivity [W/(m K)] + virtual scalar kappa(scalar p, scalar T) const = 0; + + //- Liquid thermal diffusivity of enthalpy [kg/ms] + virtual scalar alphah(const scalar p, const scalar T) const = 0; + + + // I-O + + //- Read and set the properties present it the given dictionary + void readIfPresent(const dictionary& dict); + + //- Write the function coefficients + virtual void writeData(Ostream& os) const = 0; + + //- Ostream Operator + friend Ostream& operator<< + ( + Ostream& os, + const thermophysicalProperties& l + ); +}; + + +Ostream& operator<<(Ostream& os, const thermophysicalProperties& l); + + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +} // End namespace Foam + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +#include "thermophysicalPropertiesI.H" + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +#endif + +// ************************************************************************* // diff --git a/src/thermophysicalModels/thermophysicalProperties/thermophysicalProperties/thermophysicalPropertiesI.H b/src/thermophysicalModels/thermophysicalProperties/thermophysicalProperties/thermophysicalPropertiesI.H new file mode 100644 index 0000000000..b6c04e0062 --- /dev/null +++ b/src/thermophysicalModels/thermophysicalProperties/thermophysicalProperties/thermophysicalPropertiesI.H @@ -0,0 +1,38 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | + \\ / A nd | Copyright (C) 2017 OpenFOAM Foundation + \\/ M anipulation | +------------------------------------------------------------------------------- +License + This file is part of OpenFOAM. + + OpenFOAM is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + OpenFOAM is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + for more details. + + You should have received a copy of the GNU General Public License + along with OpenFOAM. If not, see . + +\*---------------------------------------------------------------------------*/ + +inline Foam::scalar Foam::thermophysicalProperties::limit(const scalar T) const +{ + return T; +} + + +inline Foam::scalar Foam::thermophysicalProperties::W() const +{ + return W_; +} + + +// ************************************************************************* //