From 497b4f0bedce21887435ea10cde10f85eb84e018 Mon Sep 17 00:00:00 2001
From: andy <andy>
Date: Fri, 28 Jan 2011 13:09:10 +0000
Subject: [PATCH] ENH: Code refactoring to avoing ambiguities + clean-up
- pointSolid->solidProperties
- pointSolidMixure->solidMixtureProperties
- liquids->liquidProperties
- liquidMixture->liquidMoxtureProperties
---
.../combustion/dieselEngineFoam/Make/options | 8 +-
.../combustion/dieselFoam/Make/options | 8 +-
.../lagrangian/coalChemistryFoam/Make/options | 16 +-
.../Make/options | 16 +-
.../reactingParcelFilmFoam/Make/options | 12 +-
.../reactingParcelFoam/Make/options | 16 +-
.../steadyReactingParcelFoam/Make/options | 16 +-
src/lagrangian/coalCombustion/Make/options | 16 +-
src/lagrangian/dieselSpray/Make/options | 8 +-
.../commonRailInjector/commonRailInjector.C | 4 +-
.../commonRailInjector/commonRailInjector.H | 4 +-
.../definedInjector/definedInjector.C | 4 +-
.../definedInjector/definedInjector.H | 4 +-
.../injector/injectorType/injectorType.H | 6 +-
.../multiHoleInjector/multiHoleInjector.C | 4 +-
.../multiHoleInjector/multiHoleInjector.H | 4 +-
.../injector/swirlInjector/swirlInjector.C | 4 +-
.../injector/swirlInjector/swirlInjector.H | 4 +-
.../injector/unitInjector/unitInjector.C | 4 +-
.../injector/unitInjector/unitInjector.H | 4 +-
src/lagrangian/dieselSpray/parcel/parcel.C | 6 +-
.../dieselSpray/parcel/setRelaxationTimes.C | 4 +-
src/lagrangian/dieselSpray/spray/spray.C | 4 +-
src/lagrangian/dieselSpray/spray/spray.H | 12 +-
src/lagrangian/dieselSpray/spray/sprayI.H | 4 +-
.../atomizationModel/LISA/LISA.C | 4 +-
.../atomizationModel/LISA/LISA.H | 4 +-
.../atomizationModel/atomizationModel.H | 4 +-
.../blobsSheetAtomization.C | 4 +-
.../blobsSheetAtomization.H | 4 +-
.../noAtomization/noAtomization.C | 4 +-
.../noAtomization/noAtomization.H | 4 +-
.../spraySubModels/breakupModel/ETAB/ETAB.C | 4 +-
.../spraySubModels/breakupModel/ETAB/ETAB.H | 4 +-
.../spraySubModels/breakupModel/SHF/SHF.C | 4 +-
.../spraySubModels/breakupModel/SHF/SHF.H | 4 +-
.../spraySubModels/breakupModel/TAB/TAB.C | 4 +-
.../spraySubModels/breakupModel/TAB/TAB.H | 4 +-
.../breakupModel/breakupModel/breakupModel.C | 4 +-
.../breakupModel/breakupModel/breakupModel.H | 6 +-
.../breakupModel/breakupModelNew.C | 2 +-
.../breakupModel/noBreakup/noBreakup.C | 4 +-
.../breakupModel/noBreakup/noBreakup.H | 4 +-
.../breakupModel/reitzDiwakar/reitzDiwakar.C | 4 +-
.../breakupModel/reitzDiwakar/reitzDiwakar.H | 4 +-
.../breakupModel/reitzKHRT/reitzKHRT.C | 4 +-
.../breakupModel/reitzKHRT/reitzKHRT.H | 4 +-
.../definedPressureSwirl.C | 4 +-
.../injectorModel/injectorModel.H | 4 +-
src/lagrangian/intermediate/Make/options | 16 +-
.../CompositionModel/CompositionModel.C | 8 +-
.../CompositionModel/CompositionModel.H | 6 +-
.../LiquidEvaporation/LiquidEvaporation.H | 6 +-
.../ThermoSurfaceFilm/ThermoSurfaceFilm.C | 6 +-
src/surfaceFilmModels/Make/options | 8 +-
.../standardPhaseChange/standardPhaseChange.C | 4 +-
.../thermoSingleLayer/thermoSingleLayer.C | 5 +-
src/thermophysicalModels/Allwmake | 8 +-
.../SLGThermo/Make/options | 8 +-
.../SLGThermo/SLGThermo/SLGThermo.C | 16 +-
.../SLGThermo/SLGThermo/SLGThermo.H | 14 +-
.../liquidMixture/Make/files | 6 -
.../liquidMixture/liquidMixtureIO.C | 60 ---
.../liquidMixtureProperties/Make/files | 3 +
.../Make/options | 4 +-
.../liquidMixtureProperties.C} | 58 +--
.../liquidMixtureProperties.H} | 35 +-
.../{liquids => liquidProperties}/Ar/Ar.C | 20 +-
.../{liquids => liquidProperties}/Ar/Ar.H | 14 +-
.../{liquids => liquidProperties}/Ar/ArI.H | 2 +-
.../C10H22/C10H22.C | 20 +-
.../C10H22/C10H22.H | 14 +-
.../C10H22/C10H22I.H | 2 +-
.../C12H26/C12H26.C | 20 +-
.../C12H26/C12H26.H | 14 +-
.../C12H26/C12H26I.H | 2 +-
.../C13H28/C13H28.C | 20 +-
.../C13H28/C13H28.H | 14 +-
.../C13H28/C13H28I.H | 2 +-
.../C14H30/C14H30.C | 20 +-
.../C14H30/C14H30.H | 14 +-
.../C14H30/C14H30I.H | 2 +-
.../C16H34/C16H34.C | 20 +-
.../C16H34/C16H34.H | 14 +-
.../C16H34/C16H34I.H | 2 +-
.../C2H5OH/C2H5OH.C | 20 +-
.../C2H5OH/C2H5OH.H | 14 +-
.../C2H5OH/C2H5OHI.H | 2 +-
.../{liquids => liquidProperties}/C2H6/C2H6.C | 20 +-
.../{liquids => liquidProperties}/C2H6/C2H6.H | 14 +-
.../C2H6/C2H6I.H | 2 +-
.../C2H6O/C2H6O.C | 20 +-
.../C2H6O/C2H6O.H | 14 +-
.../C2H6O/C2H6OI.H | 2 +-
.../C3H6O/C3H6O.C | 20 +-
.../C3H6O/C3H6O.H | 14 +-
.../C3H6O/C3H6OI.H | 2 +-
.../{liquids => liquidProperties}/C3H8/C3H8.C | 20 +-
.../{liquids => liquidProperties}/C3H8/C3H8.H | 14 +-
.../C3H8/C3H8I.H | 2 +-
.../C4H10O/C4H10O.C | 20 +-
.../C4H10O/C4H10O.H | 14 +-
.../C4H10O/C4H10OI.H | 2 +-
.../C6H14/C6H14.C | 20 +-
.../C6H14/C6H14.H | 14 +-
.../C6H14/C6H14I.H | 2 +-
.../{liquids => liquidProperties}/C6H6/C6H6.C | 20 +-
.../{liquids => liquidProperties}/C6H6/C6H6.H | 14 +-
.../C6H6/C6H6I.H | 2 +-
.../C7H16/C7H16.C | 20 +-
.../C7H16/C7H16.H | 14 +-
.../C7H16/C7H16I.H | 2 +-
.../{liquids => liquidProperties}/C7H8/C7H8.C | 20 +-
.../{liquids => liquidProperties}/C7H8/C7H8.H | 14 +-
.../C7H8/C7H8I.H | 2 +-
.../C8H10/C8H10.C | 20 +-
.../C8H10/C8H10.H | 14 +-
.../C8H10/C8H10I.H | 2 +-
.../C8H18/C8H18.C | 20 +-
.../C8H18/C8H18.H | 14 +-
.../C8H18/C8H18I.H | 2 +-
.../C9H20/C9H20.C | 20 +-
.../C9H20/C9H20.H | 14 +-
.../C9H20/C9H20I.H | 2 +-
.../CH3OH/CH3OH.C | 20 +-
.../CH3OH/CH3OH.H | 14 +-
.../CH3OH/CH3OHI.H | 2 +-
.../CH4N2O/CH4N2O.C | 20 +-
.../CH4N2O/CH4N2O.H | 15 +-
.../CH4N2O/CH4N2OI.H | 2 +-
.../{liquids => liquidProperties}/H2O/H2O.C | 20 +-
.../{liquids => liquidProperties}/H2O/H2O.H | 14 +-
.../{liquids => liquidProperties}/H2O/H2OI.H | 2 +-
.../IC8H18/IC8H18.C | 20 +-
.../IC8H18/IC8H18.H | 14 +-
.../IC8H18/IC8H18I.H | 2 +-
.../{liquids => liquidProperties}/IDEA/IDEA.C | 20 +-
.../{liquids => liquidProperties}/IDEA/IDEA.H | 14 +-
.../IDEA/IDEA.thermo | 0
.../IDEA/IDEAI.H | 2 +-
.../{liquids => liquidProperties}/MB/MB.C | 20 +-
.../{liquids => liquidProperties}/MB/MB.H | 14 +-
.../{liquids => liquidProperties}/MB/MBI.H | 2 +-
.../{liquids => liquidProperties}/Make/files | 4 +-
.../Make/options | 0
.../{liquids => liquidProperties}/N2/N2.C | 20 +-
.../{liquids => liquidProperties}/N2/N2.H | 14 +-
.../{liquids => liquidProperties}/N2/N2I.H | 2 +-
.../aC10H7CH3/aC10H7CH3.C | 20 +-
.../aC10H7CH3/aC10H7CH3.H | 14 +-
.../aC10H7CH3/aC10H7CH3I.H | 2 +-
.../bC10H7CH3/bC10H7CH3.C | 20 +-
.../bC10H7CH3/bC10H7CH3.H | 14 +-
.../bC10H7CH3/bC10H7CH3I.H | 2 +-
.../iC3H8O/iC3H8O.C | 20 +-
.../iC3H8O/iC3H8O.H | 14 +-
.../iC3H8O/iC3H8OI.H | 2 +-
.../liquidProperties/liquidProperties.C | 387 ++++++++++++++++++
.../liquidProperties/liquidProperties.H} | 50 +--
.../liquidProperties/liquidPropertiesI.H} | 24 +-
.../nC3H8O/nC3H8O.C | 20 +-
.../nC3H8O/nC3H8O.H | 14 +-
.../nC3H8O/nC3H8OI.H | 2 +-
.../liquids/liquid/liquid.C | 340 ---------------
.../pointSolidMixture/Make/files | 3 -
.../pointSolids/Make/files | 8 -
.../solidMixtureProperties/Make/files | 3 +
.../Make/options | 2 +-
.../solidMixtureProperties.C} | 27 +-
.../solidMixtureProperties.H} | 43 +-
.../{pointSolids => solidProperties}/C/C.C | 22 +-
.../{pointSolids => solidProperties}/C/C.H | 16 +-
.../CaCO3/CaCO3.C | 22 +-
.../CaCO3/CaCO3.H | 16 +-
.../solidProperties/Make/files | 8 +
.../Make/options | 0
.../ash/ash.C | 22 +-
.../ash/ash.H | 16 +-
.../solidProperties/solidProperties.C} | 24 +-
.../solidProperties/solidProperties.H} | 58 +--
.../solidProperties/solidPropertiesI.H} | 16 +-
.../solidProperties/solidPropertiesNew.C} | 54 +--
182 files changed, 1408 insertions(+), 1397 deletions(-)
delete mode 100644 src/thermophysicalModels/liquidMixture/Make/files
delete mode 100644 src/thermophysicalModels/liquidMixture/liquidMixture/liquidMixtureIO.C
create mode 100644 src/thermophysicalModels/liquidMixtureProperties/Make/files
rename src/thermophysicalModels/{liquidMixture => liquidMixtureProperties}/Make/options (76%)
rename src/thermophysicalModels/{liquidMixture/liquidMixture/liquidMixture.C => liquidMixtureProperties/liquidMixtureProperties/liquidMixtureProperties.C} (82%)
rename src/thermophysicalModels/{liquidMixture/liquidMixture/liquidMixture.H => liquidMixtureProperties/liquidMixtureProperties/liquidMixtureProperties.H} (88%)
rename src/thermophysicalModels/{liquids => liquidProperties}/Ar/Ar.C (91%)
rename src/thermophysicalModels/{liquids => liquidProperties}/Ar/Ar.H (94%)
rename src/thermophysicalModels/{liquids => liquidProperties}/Ar/ArI.H (97%)
rename src/thermophysicalModels/{liquids => liquidProperties}/C10H22/C10H22.C (91%)
rename src/thermophysicalModels/{liquids => liquidProperties}/C10H22/C10H22.H (94%)
rename src/thermophysicalModels/{liquids => liquidProperties}/C10H22/C10H22I.H (97%)
rename src/thermophysicalModels/{liquids => liquidProperties}/C12H26/C12H26.C (91%)
rename src/thermophysicalModels/{liquids => liquidProperties}/C12H26/C12H26.H (94%)
rename src/thermophysicalModels/{liquids => liquidProperties}/C12H26/C12H26I.H (97%)
rename src/thermophysicalModels/{liquids => liquidProperties}/C13H28/C13H28.C (91%)
rename src/thermophysicalModels/{liquids => liquidProperties}/C13H28/C13H28.H (94%)
rename src/thermophysicalModels/{liquids => liquidProperties}/C13H28/C13H28I.H (97%)
rename src/thermophysicalModels/{liquids => liquidProperties}/C14H30/C14H30.C (91%)
rename src/thermophysicalModels/{liquids => liquidProperties}/C14H30/C14H30.H (94%)
rename src/thermophysicalModels/{liquids => liquidProperties}/C14H30/C14H30I.H (97%)
rename src/thermophysicalModels/{liquids => liquidProperties}/C16H34/C16H34.C (91%)
rename src/thermophysicalModels/{liquids => liquidProperties}/C16H34/C16H34.H (94%)
rename src/thermophysicalModels/{liquids => liquidProperties}/C16H34/C16H34I.H (97%)
rename src/thermophysicalModels/{liquids => liquidProperties}/C2H5OH/C2H5OH.C (91%)
rename src/thermophysicalModels/{liquids => liquidProperties}/C2H5OH/C2H5OH.H (94%)
rename src/thermophysicalModels/{liquids => liquidProperties}/C2H5OH/C2H5OHI.H (97%)
rename src/thermophysicalModels/{liquids => liquidProperties}/C2H6/C2H6.C (91%)
rename src/thermophysicalModels/{liquids => liquidProperties}/C2H6/C2H6.H (94%)
rename src/thermophysicalModels/{liquids => liquidProperties}/C2H6/C2H6I.H (97%)
rename src/thermophysicalModels/{liquids => liquidProperties}/C2H6O/C2H6O.C (91%)
rename src/thermophysicalModels/{liquids => liquidProperties}/C2H6O/C2H6O.H (94%)
rename src/thermophysicalModels/{liquids => liquidProperties}/C2H6O/C2H6OI.H (97%)
rename src/thermophysicalModels/{liquids => liquidProperties}/C3H6O/C3H6O.C (91%)
rename src/thermophysicalModels/{liquids => liquidProperties}/C3H6O/C3H6O.H (94%)
rename src/thermophysicalModels/{liquids => liquidProperties}/C3H6O/C3H6OI.H (97%)
rename src/thermophysicalModels/{liquids => liquidProperties}/C3H8/C3H8.C (91%)
rename src/thermophysicalModels/{liquids => liquidProperties}/C3H8/C3H8.H (94%)
rename src/thermophysicalModels/{liquids => liquidProperties}/C3H8/C3H8I.H (97%)
rename src/thermophysicalModels/{liquids => liquidProperties}/C4H10O/C4H10O.C (91%)
rename src/thermophysicalModels/{liquids => liquidProperties}/C4H10O/C4H10O.H (94%)
rename src/thermophysicalModels/{liquids => liquidProperties}/C4H10O/C4H10OI.H (97%)
rename src/thermophysicalModels/{liquids => liquidProperties}/C6H14/C6H14.C (91%)
rename src/thermophysicalModels/{liquids => liquidProperties}/C6H14/C6H14.H (94%)
rename src/thermophysicalModels/{liquids => liquidProperties}/C6H14/C6H14I.H (97%)
rename src/thermophysicalModels/{liquids => liquidProperties}/C6H6/C6H6.C (91%)
rename src/thermophysicalModels/{liquids => liquidProperties}/C6H6/C6H6.H (94%)
rename src/thermophysicalModels/{liquids => liquidProperties}/C6H6/C6H6I.H (97%)
rename src/thermophysicalModels/{liquids => liquidProperties}/C7H16/C7H16.C (91%)
rename src/thermophysicalModels/{liquids => liquidProperties}/C7H16/C7H16.H (94%)
rename src/thermophysicalModels/{liquids => liquidProperties}/C7H16/C7H16I.H (97%)
rename src/thermophysicalModels/{liquids => liquidProperties}/C7H8/C7H8.C (91%)
rename src/thermophysicalModels/{liquids => liquidProperties}/C7H8/C7H8.H (94%)
rename src/thermophysicalModels/{liquids => liquidProperties}/C7H8/C7H8I.H (97%)
rename src/thermophysicalModels/{liquids => liquidProperties}/C8H10/C8H10.C (91%)
rename src/thermophysicalModels/{liquids => liquidProperties}/C8H10/C8H10.H (94%)
rename src/thermophysicalModels/{liquids => liquidProperties}/C8H10/C8H10I.H (97%)
rename src/thermophysicalModels/{liquids => liquidProperties}/C8H18/C8H18.C (91%)
rename src/thermophysicalModels/{liquids => liquidProperties}/C8H18/C8H18.H (94%)
rename src/thermophysicalModels/{liquids => liquidProperties}/C8H18/C8H18I.H (97%)
rename src/thermophysicalModels/{liquids => liquidProperties}/C9H20/C9H20.C (91%)
rename src/thermophysicalModels/{liquids => liquidProperties}/C9H20/C9H20.H (94%)
rename src/thermophysicalModels/{liquids => liquidProperties}/C9H20/C9H20I.H (97%)
rename src/thermophysicalModels/{liquids => liquidProperties}/CH3OH/CH3OH.C (91%)
rename src/thermophysicalModels/{liquids => liquidProperties}/CH3OH/CH3OH.H (94%)
rename src/thermophysicalModels/{liquids => liquidProperties}/CH3OH/CH3OHI.H (97%)
rename src/thermophysicalModels/{liquids => liquidProperties}/CH4N2O/CH4N2O.C (91%)
rename src/thermophysicalModels/{liquids => liquidProperties}/CH4N2O/CH4N2O.H (94%)
rename src/thermophysicalModels/{liquids => liquidProperties}/CH4N2O/CH4N2OI.H (97%)
rename src/thermophysicalModels/{liquids => liquidProperties}/H2O/H2O.C (91%)
rename src/thermophysicalModels/{liquids => liquidProperties}/H2O/H2O.H (94%)
rename src/thermophysicalModels/{liquids => liquidProperties}/H2O/H2OI.H (97%)
rename src/thermophysicalModels/{liquids => liquidProperties}/IC8H18/IC8H18.C (91%)
rename src/thermophysicalModels/{liquids => liquidProperties}/IC8H18/IC8H18.H (94%)
rename src/thermophysicalModels/{liquids => liquidProperties}/IC8H18/IC8H18I.H (97%)
rename src/thermophysicalModels/{liquids => liquidProperties}/IDEA/IDEA.C (92%)
rename src/thermophysicalModels/{liquids => liquidProperties}/IDEA/IDEA.H (95%)
rename src/thermophysicalModels/{liquids => liquidProperties}/IDEA/IDEA.thermo (100%)
rename src/thermophysicalModels/{liquids => liquidProperties}/IDEA/IDEAI.H (97%)
rename src/thermophysicalModels/{liquids => liquidProperties}/MB/MB.C (91%)
rename src/thermophysicalModels/{liquids => liquidProperties}/MB/MB.H (94%)
rename src/thermophysicalModels/{liquids => liquidProperties}/MB/MBI.H (97%)
rename src/thermophysicalModels/{liquids => liquidProperties}/Make/files (84%)
rename src/thermophysicalModels/{liquids => liquidProperties}/Make/options (100%)
rename src/thermophysicalModels/{liquids => liquidProperties}/N2/N2.C (91%)
rename src/thermophysicalModels/{liquids => liquidProperties}/N2/N2.H (94%)
rename src/thermophysicalModels/{liquids => liquidProperties}/N2/N2I.H (97%)
rename src/thermophysicalModels/{liquids => liquidProperties}/aC10H7CH3/aC10H7CH3.C (91%)
rename src/thermophysicalModels/{liquids => liquidProperties}/aC10H7CH3/aC10H7CH3.H (94%)
rename src/thermophysicalModels/{liquids => liquidProperties}/aC10H7CH3/aC10H7CH3I.H (97%)
rename src/thermophysicalModels/{liquids => liquidProperties}/bC10H7CH3/bC10H7CH3.C (91%)
rename src/thermophysicalModels/{liquids => liquidProperties}/bC10H7CH3/bC10H7CH3.H (94%)
rename src/thermophysicalModels/{liquids => liquidProperties}/bC10H7CH3/bC10H7CH3I.H (97%)
rename src/thermophysicalModels/{liquids => liquidProperties}/iC3H8O/iC3H8O.C (91%)
rename src/thermophysicalModels/{liquids => liquidProperties}/iC3H8O/iC3H8O.H (94%)
rename src/thermophysicalModels/{liquids => liquidProperties}/iC3H8O/iC3H8OI.H (97%)
create mode 100644 src/thermophysicalModels/liquidProperties/liquidProperties/liquidProperties.C
rename src/thermophysicalModels/{liquids/liquid/liquid.H => liquidProperties/liquidProperties/liquidProperties.H} (84%)
rename src/thermophysicalModels/{liquids/liquid/liquidI.H => liquidProperties/liquidProperties/liquidPropertiesI.H} (67%)
rename src/thermophysicalModels/{liquids => liquidProperties}/nC3H8O/nC3H8O.C (91%)
rename src/thermophysicalModels/{liquids => liquidProperties}/nC3H8O/nC3H8O.H (94%)
rename src/thermophysicalModels/{liquids => liquidProperties}/nC3H8O/nC3H8OI.H (97%)
delete mode 100644 src/thermophysicalModels/liquids/liquid/liquid.C
delete mode 100644 src/thermophysicalModels/pointSolidMixture/Make/files
delete mode 100644 src/thermophysicalModels/pointSolids/Make/files
create mode 100644 src/thermophysicalModels/solidMixtureProperties/Make/files
rename src/thermophysicalModels/{pointSolidMixture => solidMixtureProperties}/Make/options (50%)
rename src/thermophysicalModels/{pointSolidMixture/pointSolidMixture/pointSolidMixture.C => solidMixtureProperties/solidMixtureProperties/solidMixtureProperties.C} (77%)
rename src/thermophysicalModels/{pointSolidMixture/pointSolidMixture/pointSolidMixture.H => solidMixtureProperties/solidMixtureProperties/solidMixtureProperties.H} (75%)
rename src/thermophysicalModels/{pointSolids => solidProperties}/C/C.C (81%)
rename src/thermophysicalModels/{pointSolids => solidProperties}/C/C.H (87%)
rename src/thermophysicalModels/{pointSolids => solidProperties}/CaCO3/CaCO3.C (81%)
rename src/thermophysicalModels/{pointSolids => solidProperties}/CaCO3/CaCO3.H (86%)
create mode 100644 src/thermophysicalModels/solidProperties/Make/files
rename src/thermophysicalModels/{pointSolids => solidProperties}/Make/options (100%)
rename src/thermophysicalModels/{pointSolids => solidProperties}/ash/ash.C (81%)
rename src/thermophysicalModels/{pointSolids => solidProperties}/ash/ash.H (87%)
rename src/thermophysicalModels/{pointSolids/pointSolid/pointSolid.C => solidProperties/solidProperties/solidProperties.C} (78%)
rename src/thermophysicalModels/{pointSolids/pointSolid/pointSolid.H => solidProperties/solidProperties/solidProperties.H} (75%)
rename src/thermophysicalModels/{pointSolids/pointSolid/pointSolidI.H => solidProperties/solidProperties/solidPropertiesI.H} (75%)
rename src/thermophysicalModels/{pointSolids/pointSolid/pointSolidNew.C => solidProperties/solidProperties/solidPropertiesNew.C} (64%)
diff --git a/applications/solvers/combustion/dieselEngineFoam/Make/options b/applications/solvers/combustion/dieselEngineFoam/Make/options
index 9a452478199..9cefdaf9968 100644
--- a/applications/solvers/combustion/dieselEngineFoam/Make/options
+++ b/applications/solvers/combustion/dieselEngineFoam/Make/options
@@ -4,8 +4,8 @@ EXE_INC = \
-I$(LIB_SRC)/lagrangian/basic/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/lagrangian/dieselSpray/lnInclude \
- -I$(LIB_SRC)/thermophysicalModels/liquids/lnInclude \
- -I$(LIB_SRC)/thermophysicalModels/liquidMixture/lnInclude \
+ -I$(LIB_SRC)/thermophysicalModels/liquidProperties/lnInclude \
+ -I$(LIB_SRC)/thermophysicalModels/liquidMixtureProperties/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/thermophysicalFunctions/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
@@ -27,8 +27,8 @@ EXE_LIBS = \
-llagrangian \
-lmeshTools \
-ldieselSpray \
- -lliquids \
- -lliquidMixture \
+ -lliquidProperties \
+ -lliquidMixtureProperties \
-lthermophysicalFunctions \
-lspecie \
-lbasicThermophysicalModels \
diff --git a/applications/solvers/combustion/dieselFoam/Make/options b/applications/solvers/combustion/dieselFoam/Make/options
index 3b1786aa08b..1e6ccfa1391 100644
--- a/applications/solvers/combustion/dieselFoam/Make/options
+++ b/applications/solvers/combustion/dieselFoam/Make/options
@@ -5,8 +5,8 @@ EXE_INC = \
-I$(LIB_SRC)/lagrangian/basic/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/lagrangian/dieselSpray/lnInclude \
- -I$(LIB_SRC)/thermophysicalModels/liquids/lnInclude \
- -I$(LIB_SRC)/thermophysicalModels/liquidMixture/lnInclude \
+ -I$(LIB_SRC)/thermophysicalModels/liquidProperties/lnInclude \
+ -I$(LIB_SRC)/thermophysicalModels/liquidMixtureProperties/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/thermophysicalFunctions/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
@@ -24,8 +24,8 @@ EXE_LIBS = \
-llagrangian \
-lmeshTools \
-ldieselSpray \
- -lliquids \
- -lliquidMixture \
+ -lliquidProperties \
+ -lliquidMixtureProperties \
-lthermophysicalFunctions \
-lspecie \
-lbasicThermophysicalModels \
diff --git a/applications/solvers/lagrangian/coalChemistryFoam/Make/options b/applications/solvers/lagrangian/coalChemistryFoam/Make/options
index 329dffc84d6..f4a9d0c52de 100644
--- a/applications/solvers/lagrangian/coalChemistryFoam/Make/options
+++ b/applications/solvers/lagrangian/coalChemistryFoam/Make/options
@@ -8,10 +8,10 @@ EXE_INC = \
-I$(LIB_SRC)/thermophysicalModels/pdfs/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
- -I$(LIB_SRC)/thermophysicalModels/liquids/lnInclude \
- -I$(LIB_SRC)/thermophysicalModels/liquidMixture/lnInclude \
- -I$(LIB_SRC)/thermophysicalModels/pointSolids/lnInclude \
- -I$(LIB_SRC)/thermophysicalModels/pointSolidMixture/lnInclude \
+ -I$(LIB_SRC)/thermophysicalModels/liquidProperties/lnInclude \
+ -I$(LIB_SRC)/thermophysicalModels/liquidMixtureProperties/lnInclude \
+ -I$(LIB_SRC)/thermophysicalModels/solidProperties/lnInclude \
+ -I$(LIB_SRC)/thermophysicalModels/solidMixtureProperties/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/thermophysicalFunctions/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/SLGThermo/lnInclude \
@@ -31,10 +31,10 @@ EXE_LIBS = \
-lcoalCombustion\
-lspecie \
-lbasicThermophysicalModels \
- -lliquids \
- -lliquidMixture \
- -lpointSolids \
- -lpointSolidMixture \
+ -lliquidProperties \
+ -lliquidMixtureProperties \
+ -lsolidProperties \
+ -lsolidMixtureProperties \
-lthermophysicalFunctions \
-lreactionThermophysicalModels \
-lSLGThermo \
diff --git a/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/Make/options b/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/Make/options
index 7596b87bbd9..eede9724ce3 100644
--- a/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/Make/options
+++ b/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/Make/options
@@ -8,10 +8,10 @@ EXE_INC = \
-I$(LIB_SRC)/thermophysicalModels/pdfs/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
- -I$(LIB_SRC)/thermophysicalModels/liquids/lnInclude \
- -I$(LIB_SRC)/thermophysicalModels/liquidMixture/lnInclude \
- -I$(LIB_SRC)/thermophysicalModels/pointSolids/lnInclude \
- -I$(LIB_SRC)/thermophysicalModels/pointSolidMixture/lnInclude \
+ -I$(LIB_SRC)/thermophysicalModels/liquidProperties/lnInclude \
+ -I$(LIB_SRC)/thermophysicalModels/liquidMixtureProperties/lnInclude \
+ -I$(LIB_SRC)/thermophysicalModels/solidProperties/lnInclude \
+ -I$(LIB_SRC)/thermophysicalModels/solidMixtureProperties/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/thermophysicalFunctions/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/SLGThermo/lnInclude \
@@ -30,10 +30,10 @@ EXE_LIBS = \
-llagrangianIntermediate \
-lspecie \
-lbasicThermophysicalModels \
- -lliquids \
- -lliquidMixture \
- -lpointSolids \
- -lpointSolidMixture \
+ -lliquidProperties \
+ -lliquidMixtureProperties \
+ -lsolidProperties \
+ -lsolidMixtureProperties \
-lthermophysicalFunctions \
-lreactionThermophysicalModels \
-lSLGThermo \
diff --git a/applications/solvers/lagrangian/reactingParcelFilmFoam/Make/options b/applications/solvers/lagrangian/reactingParcelFilmFoam/Make/options
index 34867be0b41..e9d86d977c7 100644
--- a/applications/solvers/lagrangian/reactingParcelFilmFoam/Make/options
+++ b/applications/solvers/lagrangian/reactingParcelFilmFoam/Make/options
@@ -5,10 +5,10 @@ EXE_INC = \
-I$(LIB_SRC)/thermophysicalModels/pdfs/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
- -I$(LIB_SRC)/thermophysicalModels/pointSolids/lnInclude \
- -I$(LIB_SRC)/thermophysicalModels/pointSolidMixture/lnInclude \
- -I$(LIB_SRC)/thermophysicalModels/liquids/lnInclude \
- -I$(LIB_SRC)/thermophysicalModels/liquidMixture/lnInclude \
+ -I$(LIB_SRC)/thermophysicalModels/solidProperties/lnInclude \
+ -I$(LIB_SRC)/thermophysicalModels/solidMixtureProperties/lnInclude \
+ -I$(LIB_SRC)/thermophysicalModels/liquidProperties/lnInclude \
+ -I$(LIB_SRC)/thermophysicalModels/liquidMixtureProperties/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/thermophysicalFunctions/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/SLGThermo/lnInclude \
@@ -26,8 +26,8 @@ EXE_LIBS = \
-lcompressibleLESModels \
-lspecie \
-lbasicThermophysicalModels \
- -lpointSolids \
- -lpointSolidMixture \
+ -lsolidProperties \
+ -lsolidMixtureProperties \
-lthermophysicalFunctions \
-lreactionThermophysicalModels \
-lSLGThermo \
diff --git a/applications/solvers/lagrangian/reactingParcelFoam/Make/options b/applications/solvers/lagrangian/reactingParcelFoam/Make/options
index 2dbb2590f78..ee3db1695ab 100644
--- a/applications/solvers/lagrangian/reactingParcelFoam/Make/options
+++ b/applications/solvers/lagrangian/reactingParcelFoam/Make/options
@@ -7,10 +7,10 @@ EXE_INC = \
-I$(LIB_SRC)/thermophysicalModels/pdfs/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
- -I$(LIB_SRC)/thermophysicalModels/liquids/lnInclude \
- -I$(LIB_SRC)/thermophysicalModels/liquidMixture/lnInclude \
- -I$(LIB_SRC)/thermophysicalModels/pointSolids/lnInclude \
- -I$(LIB_SRC)/thermophysicalModels/pointSolidMixture/lnInclude \
+ -I$(LIB_SRC)/thermophysicalModels/liquidProperties/lnInclude \
+ -I$(LIB_SRC)/thermophysicalModels/liquidMixtureProperties/lnInclude \
+ -I$(LIB_SRC)/thermophysicalModels/solidProperties/lnInclude \
+ -I$(LIB_SRC)/thermophysicalModels/solidMixtureProperties/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/thermophysicalFunctions/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/SLGThermo/lnInclude \
@@ -29,10 +29,10 @@ EXE_LIBS = \
-llagrangianIntermediate \
-lspecie \
-lbasicThermophysicalModels \
- -lliquids \
- -lliquidMixture \
- -lpointSolids \
- -lpointSolidMixture \
+ -lliquidProperties \
+ -lliquidMixtureProperties \
+ -lsolidProperties \
+ -lsolidMixtureProperties \
-lthermophysicalFunctions \
-lreactionThermophysicalModels \
-lSLGThermo \
diff --git a/applications/solvers/lagrangian/steadyReactingParcelFoam/Make/options b/applications/solvers/lagrangian/steadyReactingParcelFoam/Make/options
index 7596b87bbd9..eede9724ce3 100644
--- a/applications/solvers/lagrangian/steadyReactingParcelFoam/Make/options
+++ b/applications/solvers/lagrangian/steadyReactingParcelFoam/Make/options
@@ -8,10 +8,10 @@ EXE_INC = \
-I$(LIB_SRC)/thermophysicalModels/pdfs/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
- -I$(LIB_SRC)/thermophysicalModels/liquids/lnInclude \
- -I$(LIB_SRC)/thermophysicalModels/liquidMixture/lnInclude \
- -I$(LIB_SRC)/thermophysicalModels/pointSolids/lnInclude \
- -I$(LIB_SRC)/thermophysicalModels/pointSolidMixture/lnInclude \
+ -I$(LIB_SRC)/thermophysicalModels/liquidProperties/lnInclude \
+ -I$(LIB_SRC)/thermophysicalModels/liquidMixtureProperties/lnInclude \
+ -I$(LIB_SRC)/thermophysicalModels/solidProperties/lnInclude \
+ -I$(LIB_SRC)/thermophysicalModels/solidMixtureProperties/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/thermophysicalFunctions/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/SLGThermo/lnInclude \
@@ -30,10 +30,10 @@ EXE_LIBS = \
-llagrangianIntermediate \
-lspecie \
-lbasicThermophysicalModels \
- -lliquids \
- -lliquidMixture \
- -lpointSolids \
- -lpointSolidMixture \
+ -lliquidProperties \
+ -lliquidMixtureProperties \
+ -lsolidProperties \
+ -lsolidMixtureProperties \
-lthermophysicalFunctions \
-lreactionThermophysicalModels \
-lSLGThermo \
diff --git a/src/lagrangian/coalCombustion/Make/options b/src/lagrangian/coalCombustion/Make/options
index 763b6cc2486..93f4b9d404d 100644
--- a/src/lagrangian/coalCombustion/Make/options
+++ b/src/lagrangian/coalCombustion/Make/options
@@ -6,10 +6,10 @@ EXE_INC = \
-I$(LIB_SRC)/thermophysicalModels/pdfs/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
- -I$(LIB_SRC)/thermophysicalModels/liquids/lnInclude \
- -I$(LIB_SRC)/thermophysicalModels/liquidMixture/lnInclude \
- -I$(LIB_SRC)/thermophysicalModels/pointSolids/lnInclude \
- -I$(LIB_SRC)/thermophysicalModels/pointSolidMixture/lnInclude \
+ -I$(LIB_SRC)/thermophysicalModels/liquidProperties/lnInclude \
+ -I$(LIB_SRC)/thermophysicalModels/liquidMixtureProperties/lnInclude \
+ -I$(LIB_SRC)/thermophysicalModels/solidProperties/lnInclude \
+ -I$(LIB_SRC)/thermophysicalModels/solidMixtureProperties/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/SLGThermo/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/radiation/lnInclude \
@@ -28,10 +28,10 @@ LIB_LIBS = \
-lpdf \
-lspecie \
-lbasicThermophysicalModels \
- -lliquids \
- -lliquidMixture \
- -lpointSolids \
- -lpointSolidMixture \
+ -lliquidProperties \
+ -lliquidMixtureProperties \
+ -lsolidProperties \
+ -lsolidMixtureProperties \
-lreactionThermophysicalModels \
-lSLGThermo \
-lcompressibleRASModels \
diff --git a/src/lagrangian/dieselSpray/Make/options b/src/lagrangian/dieselSpray/Make/options
index 40cb013fbb7..9891ba01973 100644
--- a/src/lagrangian/dieselSpray/Make/options
+++ b/src/lagrangian/dieselSpray/Make/options
@@ -8,8 +8,8 @@ EXE_INC = \
-I$(LIB_SRC)/turbulenceModels/LES/LESdeltas/lnInclude \
-I$(LIB_SRC)/turbulenceModels/compressible/LES/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
- -I$(LIB_SRC)/thermophysicalModels/liquids/lnInclude \
- -I$(LIB_SRC)/thermophysicalModels/liquidMixture/lnInclude \
+ -I$(LIB_SRC)/thermophysicalModels/liquidProperties/lnInclude \
+ -I$(LIB_SRC)/thermophysicalModels/liquidMixtureProperties/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/thermophysicalFunctions/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
@@ -22,8 +22,8 @@ LIB_LIBS = \
-lcompressibleRASModels \
-lcompressibleLESModels \
-lLESdeltas \
- -lliquids \
- -lliquidMixture \
+ -lliquidProperties \
+ -lliquidMixtureProperties \
-lthermophysicalFunctions \
-lspecie \
-lpdf
diff --git a/src/lagrangian/dieselSpray/injector/commonRailInjector/commonRailInjector.C b/src/lagrangian/dieselSpray/injector/commonRailInjector/commonRailInjector.C
index a8c6e028626..e1c722dc09f 100644
--- a/src/lagrangian/dieselSpray/injector/commonRailInjector/commonRailInjector.C
+++ b/src/lagrangian/dieselSpray/injector/commonRailInjector/commonRailInjector.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -400,7 +400,7 @@ Foam::scalar Foam::commonRailInjector::injectedMass
void Foam::commonRailInjector::correctProfiles
(
- const liquidMixture& fuel,
+ const liquidMixtureProperties& fuel,
const scalar referencePressure
)
{
diff --git a/src/lagrangian/dieselSpray/injector/commonRailInjector/commonRailInjector.H b/src/lagrangian/dieselSpray/injector/commonRailInjector/commonRailInjector.H
index e29bbfcf8b0..876842b7cda 100644
--- a/src/lagrangian/dieselSpray/injector/commonRailInjector/commonRailInjector.H
+++ b/src/lagrangian/dieselSpray/injector/commonRailInjector/commonRailInjector.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -213,7 +213,7 @@ public:
void correctProfiles
(
- const liquidMixture& fuel,
+ const liquidMixtureProperties& fuel,
const scalar referencePressure
);
diff --git a/src/lagrangian/dieselSpray/injector/definedInjector/definedInjector.C b/src/lagrangian/dieselSpray/injector/definedInjector/definedInjector.C
index 27b7e4ddd7b..c2de30e258e 100644
--- a/src/lagrangian/dieselSpray/injector/definedInjector/definedInjector.C
+++ b/src/lagrangian/dieselSpray/injector/definedInjector/definedInjector.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -366,7 +366,7 @@ Foam::scalar Foam::definedInjector::injectedMass
void Foam::definedInjector::correctProfiles
(
- const liquidMixture& fuel,
+ const liquidMixtureProperties& fuel,
const scalar referencePressure
)
{
diff --git a/src/lagrangian/dieselSpray/injector/definedInjector/definedInjector.H b/src/lagrangian/dieselSpray/injector/definedInjector/definedInjector.H
index 529eef58f5a..c436c1e4fbe 100644
--- a/src/lagrangian/dieselSpray/injector/definedInjector/definedInjector.H
+++ b/src/lagrangian/dieselSpray/injector/definedInjector/definedInjector.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -218,7 +218,7 @@ public:
void correctProfiles
(
- const liquidMixture& fuel,
+ const liquidMixtureProperties& fuel,
const scalar referencePressure
);
diff --git a/src/lagrangian/dieselSpray/injector/injectorType/injectorType.H b/src/lagrangian/dieselSpray/injector/injectorType/injectorType.H
index aa3b30611ca..148ca0eaf1f 100644
--- a/src/lagrangian/dieselSpray/injector/injectorType/injectorType.H
+++ b/src/lagrangian/dieselSpray/injector/injectorType/injectorType.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -44,7 +44,7 @@ SourceFiles
#include "vector.H"
#include "scalarField.H"
#include "cachedRandom.H"
-#include "liquidMixture.H"
+#include "liquidMixtureProperties.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -218,7 +218,7 @@ public:
virtual void correctProfiles
(
- const liquidMixture& fuel,
+ const liquidMixtureProperties& fuel,
const scalar referencePressure
) = 0;
};
diff --git a/src/lagrangian/dieselSpray/injector/multiHoleInjector/multiHoleInjector.C b/src/lagrangian/dieselSpray/injector/multiHoleInjector/multiHoleInjector.C
index fbd957ccfb0..760c26d118c 100644
--- a/src/lagrangian/dieselSpray/injector/multiHoleInjector/multiHoleInjector.C
+++ b/src/lagrangian/dieselSpray/injector/multiHoleInjector/multiHoleInjector.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -420,7 +420,7 @@ Foam::scalar Foam::multiHoleInjector::injectedMass
void Foam::multiHoleInjector::correctProfiles
(
- const liquidMixture& fuel,
+ const liquidMixtureProperties& fuel,
const scalar referencePressure
)
{
diff --git a/src/lagrangian/dieselSpray/injector/multiHoleInjector/multiHoleInjector.H b/src/lagrangian/dieselSpray/injector/multiHoleInjector/multiHoleInjector.H
index 4af479631e3..d0fd0a2ebba 100644
--- a/src/lagrangian/dieselSpray/injector/multiHoleInjector/multiHoleInjector.H
+++ b/src/lagrangian/dieselSpray/injector/multiHoleInjector/multiHoleInjector.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -223,7 +223,7 @@ public:
void correctProfiles
(
- const liquidMixture& fuel,
+ const liquidMixtureProperties& fuel,
const scalar referencePressure
);
diff --git a/src/lagrangian/dieselSpray/injector/swirlInjector/swirlInjector.C b/src/lagrangian/dieselSpray/injector/swirlInjector/swirlInjector.C
index 795f548bc39..1c0607dd537 100644
--- a/src/lagrangian/dieselSpray/injector/swirlInjector/swirlInjector.C
+++ b/src/lagrangian/dieselSpray/injector/swirlInjector/swirlInjector.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -409,7 +409,7 @@ Foam::scalar Foam::swirlInjector::injectedMass
void Foam::swirlInjector::correctProfiles
(
- const liquidMixture& fuel,
+ const liquidMixtureProperties& fuel,
const scalar referencePressure
)
{
diff --git a/src/lagrangian/dieselSpray/injector/swirlInjector/swirlInjector.H b/src/lagrangian/dieselSpray/injector/swirlInjector/swirlInjector.H
index 59acf5596e5..55ad8276efa 100644
--- a/src/lagrangian/dieselSpray/injector/swirlInjector/swirlInjector.H
+++ b/src/lagrangian/dieselSpray/injector/swirlInjector/swirlInjector.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -232,7 +232,7 @@ public:
void correctProfiles
(
- const liquidMixture& fuel,
+ const liquidMixtureProperties& fuel,
const scalar referencePressure
);
diff --git a/src/lagrangian/dieselSpray/injector/unitInjector/unitInjector.C b/src/lagrangian/dieselSpray/injector/unitInjector/unitInjector.C
index 241b7cb1138..f7c5c4214a3 100644
--- a/src/lagrangian/dieselSpray/injector/unitInjector/unitInjector.C
+++ b/src/lagrangian/dieselSpray/injector/unitInjector/unitInjector.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -357,7 +357,7 @@ Foam::scalar Foam::unitInjector::injectedMass(const scalar t) const
void Foam::unitInjector::correctProfiles
(
- const liquidMixture& fuel,
+ const liquidMixtureProperties& fuel,
const scalar referencePressure
)
{
diff --git a/src/lagrangian/dieselSpray/injector/unitInjector/unitInjector.H b/src/lagrangian/dieselSpray/injector/unitInjector/unitInjector.H
index 2df163b402e..54fab69d486 100644
--- a/src/lagrangian/dieselSpray/injector/unitInjector/unitInjector.H
+++ b/src/lagrangian/dieselSpray/injector/unitInjector/unitInjector.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -212,7 +212,7 @@ public:
void correctProfiles
(
- const liquidMixture& fuel,
+ const liquidMixtureProperties& fuel,
const scalar referencePressure
);
diff --git a/src/lagrangian/dieselSpray/parcel/parcel.C b/src/lagrangian/dieselSpray/parcel/parcel.C
index 45f24d02769..2f251681393 100644
--- a/src/lagrangian/dieselSpray/parcel/parcel.C
+++ b/src/lagrangian/dieselSpray/parcel/parcel.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -99,7 +99,7 @@ bool Foam::parcel::move(spray& sDB, const scalar trackTime)
const polyMesh& mesh = cloud().pMesh();
const polyBoundaryMesh& pbMesh = mesh.boundaryMesh();
- const liquidMixture& fuels = sDB.fuels();
+ const liquidMixtureProperties& fuels = sDB.fuels();
label Nf = fuels.components().size();
label Ns = sDB.composition().Y().size();
@@ -333,7 +333,7 @@ void Foam::parcel::updateParcelProperties
const label faceI
)
{
- const liquidMixture& fuels = sDB.fuels();
+ const liquidMixtureProperties& fuels = sDB.fuels();
label Nf = sDB.fuels().components().size();
label Ns = sDB.composition().Y().size();
diff --git a/src/lagrangian/dieselSpray/parcel/setRelaxationTimes.C b/src/lagrangian/dieselSpray/parcel/setRelaxationTimes.C
index 6a8d8c6a6ba..c1a289c719d 100644
--- a/src/lagrangian/dieselSpray/parcel/setRelaxationTimes.C
+++ b/src/lagrangian/dieselSpray/parcel/setRelaxationTimes.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -51,7 +51,7 @@ void Foam::parcel::setRelaxationTimes
const scalar dt
)
{
- const liquidMixture& fuels = sDB.fuels();
+ const liquidMixtureProperties& fuels = sDB.fuels();
scalar mCell = rho*sDB.mesh().V()[cell()];
scalarField mfg(Yfg*mCell);
diff --git a/src/lagrangian/dieselSpray/spray/spray.C b/src/lagrangian/dieselSpray/spray/spray.C
index ef983481878..dbacb3bfa99 100644
--- a/src/lagrangian/dieselSpray/spray/spray.C
+++ b/src/lagrangian/dieselSpray/spray/spray.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -169,7 +169,7 @@ Foam::spray::spray
fuels_
(
- liquidMixture::New
+ liquidMixtureProperties::New
(
mesh_.lookupObject<dictionary>("thermophysicalProperties")
)
diff --git a/src/lagrangian/dieselSpray/spray/spray.H b/src/lagrangian/dieselSpray/spray/spray.H
index 6eef87400fb..9ba9375c80f 100644
--- a/src/lagrangian/dieselSpray/spray/spray.H
+++ b/src/lagrangian/dieselSpray/spray/spray.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -32,13 +32,13 @@ Description
#ifndef spray_H
#define spray_H
+#include "autoPtr.H"
#include "parcel.H"
#include "injector.H"
#include "IOPtrList.H"
#include "interpolation.H"
-#include "liquid.H"
-#include "autoPtr.H"
-#include "liquidMixture.H"
+#include "liquidProperties.H"
+#include "liquidMixtureProperties.H"
#include "cachedRandom.H"
#include "thermoPhysicsTypes.H"
@@ -115,7 +115,7 @@ class spray
autoPtr<breakupModel> breakupModel_;
autoPtr<collisionModel> collisionModel_;
autoPtr<dispersionModel> dispersionModel_;
- autoPtr<liquidMixture> fuels_;
+ autoPtr<liquidMixtureProperties> fuels_;
autoPtr<injectorModel> injectorModel_;
@@ -254,7 +254,7 @@ public:
inline label subCycles() const;
inline const vector& g() const;
- inline const liquidMixture& fuels() const;
+ inline const liquidMixtureProperties& fuels() const;
inline const PtrList<gasThermoPhysics>& gasProperties() const;
inline const basicMultiComponentMixture& composition() const;
diff --git a/src/lagrangian/dieselSpray/spray/sprayI.H b/src/lagrangian/dieselSpray/spray/sprayI.H
index e11bd085327..740d0453c74 100644
--- a/src/lagrangian/dieselSpray/spray/sprayI.H
+++ b/src/lagrangian/dieselSpray/spray/sprayI.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -236,7 +236,7 @@ inline const Foam::vector& Foam::spray::g() const
}
-inline const Foam::liquidMixture& Foam::spray::fuels() const
+inline const Foam::liquidMixtureProperties& Foam::spray::fuels() const
{
return fuels_();
}
diff --git a/src/lagrangian/dieselSpray/spraySubModels/atomizationModel/LISA/LISA.C b/src/lagrangian/dieselSpray/spraySubModels/atomizationModel/LISA/LISA.C
index 682b2ebfafc..b0bf8b74ebf 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/atomizationModel/LISA/LISA.C
+++ b/src/lagrangian/dieselSpray/spraySubModels/atomizationModel/LISA/LISA.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -74,7 +74,7 @@ void Foam::LISA::atomizeParcel
parcel& p,
const scalar deltaT,
const vector& vel,
- const liquidMixture& fuels
+ const liquidMixtureProperties& fuels
) const
{
const PtrList<volScalarField>& Y = spray_.composition().Y();
diff --git a/src/lagrangian/dieselSpray/spraySubModels/atomizationModel/LISA/LISA.H b/src/lagrangian/dieselSpray/spraySubModels/atomizationModel/LISA/LISA.H
index eade4f966c1..9668e86404f 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/atomizationModel/LISA/LISA.H
+++ b/src/lagrangian/dieselSpray/spraySubModels/atomizationModel/LISA/LISA.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -97,7 +97,7 @@ public:
parcel& parcel,
const scalar deltaT,
const vector& vel,
- const liquidMixture& fuels
+ const liquidMixtureProperties& fuels
) const;
};
diff --git a/src/lagrangian/dieselSpray/spraySubModels/atomizationModel/atomizationModel/atomizationModel.H b/src/lagrangian/dieselSpray/spraySubModels/atomizationModel/atomizationModel/atomizationModel.H
index 59b20f929fc..55ff9dfc909 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/atomizationModel/atomizationModel/atomizationModel.H
+++ b/src/lagrangian/dieselSpray/spraySubModels/atomizationModel/atomizationModel/atomizationModel.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -104,7 +104,7 @@ public:
parcel& parcel,
const scalar deltaT,
const vector& vel,
- const liquidMixture& fuels
+ const liquidMixtureProperties& fuels
) const = 0;
};
diff --git a/src/lagrangian/dieselSpray/spraySubModels/atomizationModel/blobsSheetAtomization/blobsSheetAtomization.C b/src/lagrangian/dieselSpray/spraySubModels/atomizationModel/blobsSheetAtomization/blobsSheetAtomization.C
index 3e243038262..7824e726a29 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/atomizationModel/blobsSheetAtomization/blobsSheetAtomization.C
+++ b/src/lagrangian/dieselSpray/spraySubModels/atomizationModel/blobsSheetAtomization/blobsSheetAtomization.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -73,7 +73,7 @@ void Foam::blobsSheetAtomization::atomizeParcel
parcel& p,
const scalar deltaT,
const vector& vel,
- const liquidMixture& fuels
+ const liquidMixtureProperties& fuels
) const
{
const PtrList<volScalarField>& Y = spray_.composition().Y();
diff --git a/src/lagrangian/dieselSpray/spraySubModels/atomizationModel/blobsSheetAtomization/blobsSheetAtomization.H b/src/lagrangian/dieselSpray/spraySubModels/atomizationModel/blobsSheetAtomization/blobsSheetAtomization.H
index 2af3301cdbb..ee2dfdac287 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/atomizationModel/blobsSheetAtomization/blobsSheetAtomization.H
+++ b/src/lagrangian/dieselSpray/spraySubModels/atomizationModel/blobsSheetAtomization/blobsSheetAtomization.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -92,7 +92,7 @@ public:
parcel& parcel,
const scalar deltaT,
const vector& vel,
- const liquidMixture& fuels
+ const liquidMixtureProperties& fuels
) const;
};
diff --git a/src/lagrangian/dieselSpray/spraySubModels/atomizationModel/noAtomization/noAtomization.C b/src/lagrangian/dieselSpray/spraySubModels/atomizationModel/noAtomization/noAtomization.C
index 76fa010e5e6..68b29c9084b 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/atomizationModel/noAtomization/noAtomization.C
+++ b/src/lagrangian/dieselSpray/spraySubModels/atomizationModel/noAtomization/noAtomization.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -69,7 +69,7 @@ void Foam::noAtomization::atomizeParcel
parcel& p,
const scalar deltaT,
const vector& vel,
- const liquidMixture& fuels
+ const liquidMixtureProperties& fuels
) const
{
p.liquidCore() = 0.0;
diff --git a/src/lagrangian/dieselSpray/spraySubModels/atomizationModel/noAtomization/noAtomization.H b/src/lagrangian/dieselSpray/spraySubModels/atomizationModel/noAtomization/noAtomization.H
index fbbde6326f4..835a4e767f7 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/atomizationModel/noAtomization/noAtomization.H
+++ b/src/lagrangian/dieselSpray/spraySubModels/atomizationModel/noAtomization/noAtomization.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -71,7 +71,7 @@ public:
parcel& parcel,
const scalar deltaT,
const vector& vel,
- const liquidMixture& fuels
+ const liquidMixtureProperties& fuels
) const;
};
diff --git a/src/lagrangian/dieselSpray/spraySubModels/breakupModel/ETAB/ETAB.C b/src/lagrangian/dieselSpray/spraySubModels/breakupModel/ETAB/ETAB.C
index 8a16cf6cc29..260740dd985 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/breakupModel/ETAB/ETAB.C
+++ b/src/lagrangian/dieselSpray/spraySubModels/breakupModel/ETAB/ETAB.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -79,7 +79,7 @@ void Foam::ETAB::breakupParcel
parcel& p,
const scalar deltaT,
const vector& Ug,
- const liquidMixture& fuels
+ const liquidMixtureProperties& fuels
) const
{
scalar T = p.T();
diff --git a/src/lagrangian/dieselSpray/spraySubModels/breakupModel/ETAB/ETAB.H b/src/lagrangian/dieselSpray/spraySubModels/breakupModel/ETAB/ETAB.H
index 463f47f92e5..d1502014ba3 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/breakupModel/ETAB/ETAB.H
+++ b/src/lagrangian/dieselSpray/spraySubModels/breakupModel/ETAB/ETAB.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -111,7 +111,7 @@ public:
parcel& parcel,
const scalar deltaT,
const vector& Ug,
- const liquidMixture& fuels
+ const liquidMixtureProperties& fuels
) const;
};
diff --git a/src/lagrangian/dieselSpray/spraySubModels/breakupModel/SHF/SHF.C b/src/lagrangian/dieselSpray/spraySubModels/breakupModel/SHF/SHF.C
index e8ac0b90796..7e4ba37eebe 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/breakupModel/SHF/SHF.C
+++ b/src/lagrangian/dieselSpray/spraySubModels/breakupModel/SHF/SHF.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -98,7 +98,7 @@ void Foam::SHF::breakupParcel
parcel& p,
const scalar deltaT,
const vector& vel,
- const liquidMixture& fuels
+ const liquidMixtureProperties& fuels
) const
{
label cellI = p.cell();
diff --git a/src/lagrangian/dieselSpray/spraySubModels/breakupModel/SHF/SHF.H b/src/lagrangian/dieselSpray/spraySubModels/breakupModel/SHF/SHF.H
index af3dedaa179..1f7f984a826 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/breakupModel/SHF/SHF.H
+++ b/src/lagrangian/dieselSpray/spraySubModels/breakupModel/SHF/SHF.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -133,7 +133,7 @@ public:
parcel& parcel,
const scalar deltaT,
const vector& vel,
- const liquidMixture& fuels
+ const liquidMixtureProperties& fuels
) const;
};
diff --git a/src/lagrangian/dieselSpray/spraySubModels/breakupModel/TAB/TAB.C b/src/lagrangian/dieselSpray/spraySubModels/breakupModel/TAB/TAB.C
index 8b121c622e6..2189382e34a 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/breakupModel/TAB/TAB.C
+++ b/src/lagrangian/dieselSpray/spraySubModels/breakupModel/TAB/TAB.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -84,7 +84,7 @@ void Foam::TAB::breakupParcel
parcel& p,
const scalar deltaT,
const vector& Ug,
- const liquidMixture& fuels
+ const liquidMixtureProperties& fuels
) const
{
scalar T = p.T();
diff --git a/src/lagrangian/dieselSpray/spraySubModels/breakupModel/TAB/TAB.H b/src/lagrangian/dieselSpray/spraySubModels/breakupModel/TAB/TAB.H
index f28eb559add..7b96b28d15b 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/breakupModel/TAB/TAB.H
+++ b/src/lagrangian/dieselSpray/spraySubModels/breakupModel/TAB/TAB.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -108,7 +108,7 @@ public:
parcel& parcel,
const scalar deltaT,
const vector& Ug,
- const liquidMixture& fuels
+ const liquidMixtureProperties& fuels
) const;
};
diff --git a/src/lagrangian/dieselSpray/spraySubModels/breakupModel/breakupModel/breakupModel.C b/src/lagrangian/dieselSpray/spraySubModels/breakupModel/breakupModel/breakupModel.C
index 61636ad1769..78efbc2ccbb 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/breakupModel/breakupModel/breakupModel.C
+++ b/src/lagrangian/dieselSpray/spraySubModels/breakupModel/breakupModel/breakupModel.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -78,7 +78,7 @@ void Foam::breakupModel::updateParcelProperties
parcel& p,
const scalar deltaT,
const vector& Ug,
- const liquidMixture& fuels
+ const liquidMixtureProperties& fuels
) const
{
if (includeOscillation_)
diff --git a/src/lagrangian/dieselSpray/spraySubModels/breakupModel/breakupModel/breakupModel.H b/src/lagrangian/dieselSpray/spraySubModels/breakupModel/breakupModel/breakupModel.H
index 6c410479f48..01079023dc1 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/breakupModel/breakupModel/breakupModel.H
+++ b/src/lagrangian/dieselSpray/spraySubModels/breakupModel/breakupModel/breakupModel.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -126,7 +126,7 @@ public:
parcel& p,
const scalar deltaT,
const vector& Ug,
- const liquidMixture& fuels
+ const liquidMixtureProperties& fuels
) const;
virtual void breakupParcel
@@ -134,7 +134,7 @@ public:
parcel& parcel,
const scalar deltaT,
const vector& vel,
- const liquidMixture& fuels
+ const liquidMixtureProperties& fuels
) const = 0;
};
diff --git a/src/lagrangian/dieselSpray/spraySubModels/breakupModel/breakupModel/breakupModelNew.C b/src/lagrangian/dieselSpray/spraySubModels/breakupModel/breakupModel/breakupModelNew.C
index 5bd1443461a..f4ef3324c7a 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/breakupModel/breakupModel/breakupModelNew.C
+++ b/src/lagrangian/dieselSpray/spraySubModels/breakupModel/breakupModel/breakupModelNew.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/src/lagrangian/dieselSpray/spraySubModels/breakupModel/noBreakup/noBreakup.C b/src/lagrangian/dieselSpray/spraySubModels/breakupModel/noBreakup/noBreakup.C
index 216b51d6fe1..5c96b6907ee 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/breakupModel/noBreakup/noBreakup.C
+++ b/src/lagrangian/dieselSpray/spraySubModels/breakupModel/noBreakup/noBreakup.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -69,7 +69,7 @@ void Foam::noBreakup::breakupParcel
parcel&,
const scalar,
const vector&,
- const liquidMixture&
+ const liquidMixtureProperties&
) const
{
// Do nothing
diff --git a/src/lagrangian/dieselSpray/spraySubModels/breakupModel/noBreakup/noBreakup.H b/src/lagrangian/dieselSpray/spraySubModels/breakupModel/noBreakup/noBreakup.H
index db2b9e627ba..f474d869663 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/breakupModel/noBreakup/noBreakup.H
+++ b/src/lagrangian/dieselSpray/spraySubModels/breakupModel/noBreakup/noBreakup.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -75,7 +75,7 @@ public:
parcel& parcel,
const scalar deltaT,
const vector& vel,
- const liquidMixture& fuels
+ const liquidMixtureProperties& fuels
) const;
};
diff --git a/src/lagrangian/dieselSpray/spraySubModels/breakupModel/reitzDiwakar/reitzDiwakar.C b/src/lagrangian/dieselSpray/spraySubModels/breakupModel/reitzDiwakar/reitzDiwakar.C
index aefd1679bee..d7798cff98d 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/breakupModel/reitzDiwakar/reitzDiwakar.C
+++ b/src/lagrangian/dieselSpray/spraySubModels/breakupModel/reitzDiwakar/reitzDiwakar.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -73,7 +73,7 @@ void Foam::reitzDiwakar::breakupParcel
parcel& p,
const scalar deltaT,
const vector& vel,
- const liquidMixture& fuels
+ const liquidMixtureProperties& fuels
) const
{
const PtrList<volScalarField>& Y = spray_.composition().Y();
diff --git a/src/lagrangian/dieselSpray/spraySubModels/breakupModel/reitzDiwakar/reitzDiwakar.H b/src/lagrangian/dieselSpray/spraySubModels/breakupModel/reitzDiwakar/reitzDiwakar.H
index c36e4e6916c..16459fa5227 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/breakupModel/reitzDiwakar/reitzDiwakar.H
+++ b/src/lagrangian/dieselSpray/spraySubModels/breakupModel/reitzDiwakar/reitzDiwakar.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -87,7 +87,7 @@ public:
parcel& parcel,
const scalar deltaT,
const vector& vel,
- const liquidMixture& fuels
+ const liquidMixtureProperties& fuels
) const;
};
diff --git a/src/lagrangian/dieselSpray/spraySubModels/breakupModel/reitzKHRT/reitzKHRT.C b/src/lagrangian/dieselSpray/spraySubModels/breakupModel/reitzKHRT/reitzKHRT.C
index 7556a97b63d..51b714f831a 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/breakupModel/reitzKHRT/reitzKHRT.C
+++ b/src/lagrangian/dieselSpray/spraySubModels/breakupModel/reitzKHRT/reitzKHRT.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -75,7 +75,7 @@ void Foam::reitzKHRT::breakupParcel
parcel& p,
const scalar deltaT,
const vector& vel,
- const liquidMixture& fuels
+ const liquidMixtureProperties& fuels
) const
{
label cellI = p.cell();
diff --git a/src/lagrangian/dieselSpray/spraySubModels/breakupModel/reitzKHRT/reitzKHRT.H b/src/lagrangian/dieselSpray/spraySubModels/breakupModel/reitzKHRT/reitzKHRT.H
index 7895f8573a2..67ebff166cf 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/breakupModel/reitzKHRT/reitzKHRT.H
+++ b/src/lagrangian/dieselSpray/spraySubModels/breakupModel/reitzKHRT/reitzKHRT.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -91,7 +91,7 @@ public:
parcel& parcel,
const scalar deltaT,
const vector& vel,
- const liquidMixture& fuels
+ const liquidMixtureProperties& fuels
) const;
};
diff --git a/src/lagrangian/dieselSpray/spraySubModels/injectorModel/definedPressureSwirl/definedPressureSwirl.C b/src/lagrangian/dieselSpray/spraySubModels/injectorModel/definedPressureSwirl/definedPressureSwirl.C
index 590637f54f6..84e4bec6dfe 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/injectorModel/definedPressureSwirl/definedPressureSwirl.C
+++ b/src/lagrangian/dieselSpray/spraySubModels/injectorModel/definedPressureSwirl/definedPressureSwirl.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -97,7 +97,7 @@ Foam::scalar Foam::definedPressureSwirlInjector::d0
// modifications to take account of flash boiling....
- const liquidMixture& fuels = sm_.fuels();
+ const liquidMixtureProperties& fuels = sm_.fuels();
scalar chi = 0.0;
scalar Tinj = it.T(t);
label Nf = fuels.components().size();
diff --git a/src/lagrangian/dieselSpray/spraySubModels/injectorModel/injectorModel/injectorModel.H b/src/lagrangian/dieselSpray/spraySubModels/injectorModel/injectorModel/injectorModel.H
index c0e6998ecca..d17cbc3e9dd 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/injectorModel/injectorModel/injectorModel.H
+++ b/src/lagrangian/dieselSpray/spraySubModels/injectorModel/injectorModel/injectorModel.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -34,7 +34,7 @@ Description
#ifndef injectorModel_H
#define injectorModel_H
-#include "liquid.H"
+#include "liquidProperties.H"
#include "injector.H"
#include "PtrList.H"
#include "IOdictionary.H"
diff --git a/src/lagrangian/intermediate/Make/options b/src/lagrangian/intermediate/Make/options
index db20632300d..7ff9a9456a1 100644
--- a/src/lagrangian/intermediate/Make/options
+++ b/src/lagrangian/intermediate/Make/options
@@ -5,10 +5,10 @@ EXE_INC = \
-I$(LIB_SRC)/thermophysicalModels/pdfs/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
- -I$(LIB_SRC)/thermophysicalModels/liquids/lnInclude \
- -I$(LIB_SRC)/thermophysicalModels/liquidMixture/lnInclude \
- -I$(LIB_SRC)/thermophysicalModels/pointSolids/lnInclude \
- -I$(LIB_SRC)/thermophysicalModels/pointSolidMixture/lnInclude \
+ -I$(LIB_SRC)/thermophysicalModels/liquidProperties/lnInclude \
+ -I$(LIB_SRC)/thermophysicalModels/liquidMixtureProperties/lnInclude \
+ -I$(LIB_SRC)/thermophysicalModels/solidProperties/lnInclude \
+ -I$(LIB_SRC)/thermophysicalModels/solidMixtureProperties/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/SLGThermo/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/radiation/lnInclude \
@@ -25,10 +25,10 @@ LIB_LIBS = \
-lmeshTools \
-llagrangian \
-lpdf \
- -lliquids \
- -lliquidMixture \
- -lpointSolids \
- -lpointSolidMixture \
+ -lliquidProperties \
+ -lliquidMixtureProperties \
+ -lsolidProperties \
+ -lsolidMixtureProperties \
-lspecie \
-lbasicThermophysicalModels \
-lreactionThermophysicalModels \
diff --git a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.C b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.C
index 219e691e3a7..2815d5e3d1a 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.C
+++ b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2008-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -93,14 +93,16 @@ Foam::CompositionModel<CloudType>::carrier() const
template<class CloudType>
-const Foam::liquidMixture& Foam::CompositionModel<CloudType>::liquids() const
+const Foam::liquidMixtureProperties&
+Foam::CompositionModel<CloudType>::liquids() const
{
return thermo_.liquids();
}
template<class CloudType>
-const Foam::pointSolidMixture& Foam::CompositionModel<CloudType>::solids() const
+const Foam::solidMixtureProperties&
+Foam::CompositionModel<CloudType>::solids() const
{
return thermo_.solids();
}
diff --git a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.H b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.H
index 74a4a87a205..04ec177d1cb 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.H
+++ b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2008-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -140,10 +140,10 @@ public:
const basicMultiComponentMixture& carrier() const;
//- Return the global (additional) liquids
- const liquidMixture& liquids() const;
+ const liquidMixtureProperties& liquids() const;
//- Return the global (additional) solids
- const pointSolidMixture& solids() const;
+ const solidMixtureProperties& solids() const;
//- Return the list of phase properties
const phasePropertiesList& phaseProps() const;
diff --git a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.H b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.H
index dbae15d93d4..8c66c4fbbd2 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.H
+++ b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2009-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2009-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -34,7 +34,7 @@ Description
#define LiquidEvaporation_H
#include "PhaseChangeModel.H"
-#include "liquidMixture.H"
+#include "liquidMixtureProperties.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -54,7 +54,7 @@ protected:
// Protected data
//- Global liquid properties data
- const liquidMixture& liquids_;
+ const liquidMixtureProperties& liquids_;
//- List of active liquid names
List<word> activeLiquids_;
diff --git a/src/lagrangian/intermediate/submodels/Thermodynamic/SurfaceFilmModel/ThermoSurfaceFilm/ThermoSurfaceFilm.C b/src/lagrangian/intermediate/submodels/Thermodynamic/SurfaceFilmModel/ThermoSurfaceFilm/ThermoSurfaceFilm.C
index c0d9f69e770..84dc17c90dd 100644
--- a/src/lagrangian/intermediate/submodels/Thermodynamic/SurfaceFilmModel/ThermoSurfaceFilm/ThermoSurfaceFilm.C
+++ b/src/lagrangian/intermediate/submodels/Thermodynamic/SurfaceFilmModel/ThermoSurfaceFilm/ThermoSurfaceFilm.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2009-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2009-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -230,7 +230,7 @@ void Foam::ThermoSurfaceFilm<CloudType>::drySplashInteraction
Info<< "Parcel " << p.origId() << " drySplashInteraction" << endl;
}
- const liquid& liq = thermo_.liquids().properties()[0];
+ const liquidProperties& liq = thermo_.liquids().properties()[0];
// Patch face velocity and normal
const vector& Up = this->owner().U().boundaryField()[pp.index()][faceI];
@@ -286,7 +286,7 @@ void Foam::ThermoSurfaceFilm<CloudType>::wetSplashInteraction
Info<< "Parcel " << p.origId() << " wetSplashInteraction" << endl;
}
- const liquid& liq = thermo_.liquids().properties()[0];
+ const liquidProperties& liq = thermo_.liquids().properties()[0];
// Patch face velocity and normal
const vector& Up = this->owner().U().boundaryField()[pp.index()][faceI];
diff --git a/src/surfaceFilmModels/Make/options b/src/surfaceFilmModels/Make/options
index 3b0199a09b5..dda598200c9 100644
--- a/src/surfaceFilmModels/Make/options
+++ b/src/surfaceFilmModels/Make/options
@@ -3,10 +3,10 @@ EXE_INC = \
-I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
- -I$(LIB_SRC)/thermophysicalModels/liquids/lnInclude \
- -I$(LIB_SRC)/thermophysicalModels/liquidMixture/lnInclude \
- -I$(LIB_SRC)/thermophysicalModels/pointSolids/lnInclude \
- -I$(LIB_SRC)/thermophysicalModels/pointSolidMixture/lnInclude \
+ -I$(LIB_SRC)/thermophysicalModels/liquidProperties/lnInclude \
+ -I$(LIB_SRC)/thermophysicalModels/liquidMixtureProperties/lnInclude \
+ -I$(LIB_SRC)/thermophysicalModels/solidProperties/lnInclude \
+ -I$(LIB_SRC)/thermophysicalModels/solidMixtureProperties/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/SLGThermo/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/pdfs/lnInclude \
diff --git a/src/surfaceFilmModels/submodels/thermo/phaseChangeModel/standardPhaseChange/standardPhaseChange.C b/src/surfaceFilmModels/submodels/thermo/phaseChangeModel/standardPhaseChange/standardPhaseChange.C
index 29ae7ce8ea6..375f0e22fd0 100644
--- a/src/surfaceFilmModels/submodels/thermo/phaseChangeModel/standardPhaseChange/standardPhaseChange.C
+++ b/src/surfaceFilmModels/submodels/thermo/phaseChangeModel/standardPhaseChange/standardPhaseChange.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2010-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2010-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -106,7 +106,7 @@ void Foam::surfaceFilmModels::standardPhaseChange::correct
// set local thermo properties
const SLGThermo& thermo = film.thermo();
const label liqId = film.liquidId();
- const liquid& liq = thermo.liquids().properties()[liqId];
+ const liquidProperties& liq = thermo.liquids().properties()[liqId];
const label vapId = thermo.carrierId(thermo.liquids().components()[liqId]);
// retrieve fields from film model
diff --git a/src/surfaceFilmModels/surfaceFilmModel/thermoSingleLayer/thermoSingleLayer.C b/src/surfaceFilmModels/surfaceFilmModel/thermoSingleLayer/thermoSingleLayer.C
index 1723c09f711..c6a7e254f8e 100644
--- a/src/surfaceFilmModels/surfaceFilmModel/thermoSingleLayer/thermoSingleLayer.C
+++ b/src/surfaceFilmModels/surfaceFilmModel/thermoSingleLayer/thermoSingleLayer.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2009-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2009-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -81,7 +81,8 @@ void Foam::surfaceFilmModels::thermoSingleLayer::correctThermoFields()
}
case tmSingleComponent:
{
- const liquid& liq = thermo_.liquids().properties()[liquidId_];
+ const liquidProperties& liq =
+ thermo_.liquids().properties()[liquidId_];
forAll(rho_, cellI)
{
const scalar T = T_[cellI];
diff --git a/src/thermophysicalModels/Allwmake b/src/thermophysicalModels/Allwmake
index 7b1b586b563..306211ac6a7 100755
--- a/src/thermophysicalModels/Allwmake
+++ b/src/thermophysicalModels/Allwmake
@@ -5,10 +5,10 @@ set -x
wmake libso specie
wmake libso solid
wmake libso thermophysicalFunctions
-wmake libso liquids
-wmake libso liquidMixture
-wmake libso pointSolids
-wmake libso pointSolidMixture
+wmake libso liquidProperties
+wmake libso liquidMixtureProperties
+wmake libso solidProperties
+wmake libso solidMixtureProperties
wmake libso basic
wmake libso reactionThermo
diff --git a/src/thermophysicalModels/SLGThermo/Make/options b/src/thermophysicalModels/SLGThermo/Make/options
index 6121f1c83e0..3eda6c06d56 100644
--- a/src/thermophysicalModels/SLGThermo/Make/options
+++ b/src/thermophysicalModels/SLGThermo/Make/options
@@ -2,10 +2,10 @@ EXE_INC = \
-I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
- -I$(LIB_SRC)/thermophysicalModels/liquids/lnInclude \
- -I$(LIB_SRC)/thermophysicalModels/liquidMixture/lnInclude \
- -I$(LIB_SRC)/thermophysicalModels/pointSolids/lnInclude \
- -I$(LIB_SRC)/thermophysicalModels/pointSolidMixture/lnInclude \
+ -I$(LIB_SRC)/thermophysicalModels/liquidProperties/lnInclude \
+ -I$(LIB_SRC)/thermophysicalModels/liquidMixtureProperties/lnInclude \
+ -I$(LIB_SRC)/thermophysicalModels/solidProperties/lnInclude \
+ -I$(LIB_SRC)/thermophysicalModels/solidMixtureProperties/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude
LIB_LIBS = \
diff --git a/src/thermophysicalModels/SLGThermo/SLGThermo/SLGThermo.C b/src/thermophysicalModels/SLGThermo/SLGThermo/SLGThermo.C
index ce9048a5ac6..711dd174c76 100644
--- a/src/thermophysicalModels/SLGThermo/SLGThermo/SLGThermo.C
+++ b/src/thermophysicalModels/SLGThermo/SLGThermo/SLGThermo.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2010-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2010-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -61,7 +61,7 @@ Foam::SLGThermo::SLGThermo(const fvMesh& mesh, basicThermo& thermo)
if (thermo.found("liquids"))
{
- liquids_ = liquidMixture::New(thermo.subDict("liquids"));
+ liquids_ = liquidMixtureProperties::New(thermo.subDict("liquids"));
Info<< " liquids - " << liquids_->components().size()
<< " components" << endl;
}
@@ -72,7 +72,7 @@ Foam::SLGThermo::SLGThermo(const fvMesh& mesh, basicThermo& thermo)
if (thermo.found("solids"))
{
- solids_ = pointSolidMixture::New(thermo.subDict("solids"));
+ solids_ = solidMixtureProperties::New(thermo.subDict("solids"));
Info<< " solids - " << solids_->components().size()
<< " components" << endl;
}
@@ -113,13 +113,14 @@ const Foam::basicMultiComponentMixture& Foam::SLGThermo::carrier() const
}
-const Foam::liquidMixture& Foam::SLGThermo::liquids() const
+const Foam::liquidMixtureProperties& Foam::SLGThermo::liquids() const
{
if (!liquids_.valid())
{
FatalErrorIn
(
- "const Foam::liquidMixture& Foam::SLGThermo::liquids() const"
+ "const Foam::liquidMixtureProperties& "
+ "Foam::SLGThermo::liquids() const"
) << "liquids requested, but object is not allocated"
<< abort(FatalError);
}
@@ -128,13 +129,14 @@ const Foam::liquidMixture& Foam::SLGThermo::liquids() const
}
-const Foam::pointSolidMixture& Foam::SLGThermo::solids() const
+const Foam::solidMixtureProperties& Foam::SLGThermo::solids() const
{
if (!solids_.valid())
{
FatalErrorIn
(
- "const Foam::pointSolidtMixture& Foam::SLGThermo::solids() const"
+ "const Foam::solidMixtureProperties& "
+ "Foam::SLGThermo::solids() const"
) << "solids requested, but object is not allocated"
<< abort(FatalError);
}
diff --git a/src/thermophysicalModels/SLGThermo/SLGThermo/SLGThermo.H b/src/thermophysicalModels/SLGThermo/SLGThermo/SLGThermo.H
index f4ba8299a83..751a3941644 100644
--- a/src/thermophysicalModels/SLGThermo/SLGThermo/SLGThermo.H
+++ b/src/thermophysicalModels/SLGThermo/SLGThermo/SLGThermo.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2010-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2010-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -48,8 +48,8 @@ SourceFiles
#include "MeshObject.H"
#include "basicThermo.H"
#include "basicMultiComponentMixture.H"
-#include "liquidMixture.H"
-#include "pointSolidMixture.H"
+#include "liquidMixtureProperties.H"
+#include "solidMixtureProperties.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -73,10 +73,10 @@ class SLGThermo
basicMultiComponentMixture* carrier_;
//- Additional liquid properties data
- autoPtr<liquidMixture> liquids_;
+ autoPtr<liquidMixtureProperties> liquids_;
//- Additional solid properties data
- autoPtr<pointSolidMixture> solids_;
+ autoPtr<solidMixtureProperties> solids_;
public:
@@ -105,10 +105,10 @@ public:
const basicMultiComponentMixture& carrier() const;
//- Return reference to the global (additional) liquids
- const liquidMixture& liquids() const;
+ const liquidMixtureProperties& liquids() const;
//- Return reference to the global (additional) solids
- const pointSolidMixture& solids() const;
+ const solidMixtureProperties& solids() const;
// Index retrieval
diff --git a/src/thermophysicalModels/liquidMixture/Make/files b/src/thermophysicalModels/liquidMixture/Make/files
deleted file mode 100644
index 5d205229ef9..00000000000
--- a/src/thermophysicalModels/liquidMixture/Make/files
+++ /dev/null
@@ -1,6 +0,0 @@
-liquidMixture = liquidMixture
-
-$(liquidMixture)/liquidMixture.C
-$(liquidMixture)/liquidMixtureIO.C
-
-LIB = $(FOAM_LIBBIN)/libliquidMixture
diff --git a/src/thermophysicalModels/liquidMixture/liquidMixture/liquidMixtureIO.C b/src/thermophysicalModels/liquidMixture/liquidMixture/liquidMixtureIO.C
deleted file mode 100644
index 6d4c2eb7658..00000000000
--- a/src/thermophysicalModels/liquidMixture/liquidMixture/liquidMixtureIO.C
+++ /dev/null
@@ -1,60 +0,0 @@
-/*---------------------------------------------------------------------------*\
- ========= |
- \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
- \\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
- \\/ 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 <http://www.gnu.org/licenses/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "liquidMixture.H"
-//#include "IOstreams.H"
-
-// * * * * * * * * * * * * * * * IOstream Operators * * * * * * * * * * * * //
-/*
-Foam::Istream& Foam::operator>>(Foam::Istream& is, Foam::liquidMixture& l)
-{
- is >> l.x_;
-
- // Check state of Istream
- is.check
- (
- "Foam::Istream& Foam::operator>>(Foam::Istream&, Foam::liquidMixture&)"
- );
-
- return is;
-}
-
-Foam::Ostream& Foam::operator<<(Foam::Ostream& os, const Foam::liquidMixture& l)
-{
-
- os << l.x_;
-
- // Check state of Ostream
- os.check
- (
- "Foam::Ostream& Foam::operator<<(Foam::Ostream&, "
- "const Foam::liquidMixture&)"
- );
-
- return os;
-}
- */
-
-// ************************************************************************* //
diff --git a/src/thermophysicalModels/liquidMixtureProperties/Make/files b/src/thermophysicalModels/liquidMixtureProperties/Make/files
new file mode 100644
index 00000000000..4f0959cfc77
--- /dev/null
+++ b/src/thermophysicalModels/liquidMixtureProperties/Make/files
@@ -0,0 +1,3 @@
+liquidMixtureProperties/liquidMixtureProperties.C
+
+LIB = $(FOAM_LIBBIN)/libliquidMixtureProperties
diff --git a/src/thermophysicalModels/liquidMixture/Make/options b/src/thermophysicalModels/liquidMixtureProperties/Make/options
similarity index 76%
rename from src/thermophysicalModels/liquidMixture/Make/options
rename to src/thermophysicalModels/liquidMixtureProperties/Make/options
index bfa6b569ba7..28490cc1687 100644
--- a/src/thermophysicalModels/liquidMixture/Make/options
+++ b/src/thermophysicalModels/liquidMixtureProperties/Make/options
@@ -1,11 +1,11 @@
EXE_INC = \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
- -I$(LIB_SRC)/thermophysicalModels/liquids/lnInclude \
+ -I$(LIB_SRC)/thermophysicalModels/liquidProperties/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/combustion/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/thermophysicalFunctions/lnInclude
LIB_LIBS = \
- -lliquids \
+ -lliquidProperties \
-lthermophysicalFunctions
diff --git a/src/thermophysicalModels/liquidMixture/liquidMixture/liquidMixture.C b/src/thermophysicalModels/liquidMixtureProperties/liquidMixtureProperties/liquidMixtureProperties.C
similarity index 82%
rename from src/thermophysicalModels/liquidMixture/liquidMixture/liquidMixture.C
rename to src/thermophysicalModels/liquidMixtureProperties/liquidMixtureProperties/liquidMixtureProperties.C
index aa573eb1ad9..a28d214d99c 100644
--- a/src/thermophysicalModels/liquidMixture/liquidMixture/liquidMixture.C
+++ b/src/thermophysicalModels/liquidMixtureProperties/liquidMixtureProperties/liquidMixtureProperties.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -23,18 +23,18 @@ License
\*---------------------------------------------------------------------------*/
-#include "liquidMixture.H"
+#include "liquidMixtureProperties.H"
#include "dictionary.H"
#include "specie.H"
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-const Foam::scalar Foam::liquidMixture::TrMax = 0.999;
+const Foam::scalar Foam::liquidMixtureProperties::TrMax = 0.999;
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-Foam::liquidMixture::liquidMixture
+Foam::liquidMixtureProperties::liquidMixtureProperties
(
const dictionary& thermophysicalProperties
)
@@ -57,12 +57,19 @@ Foam::liquidMixture::liquidMixture
forAll(components_, i)
{
- properties_.set(i, liquid::New(props.subDict(components_[i])));
+ properties_.set
+ (
+ i,
+ liquidProperties::New(props.subDict(components_[i]))
+ );
}
}
-Foam::liquidMixture::liquidMixture(const liquidMixture& lm)
+Foam::liquidMixtureProperties::liquidMixtureProperties
+(
+ const liquidMixtureProperties& lm
+)
:
components_(lm.components_),
properties_(lm.properties_.size())
@@ -76,18 +83,21 @@ Foam::liquidMixture::liquidMixture(const liquidMixture& lm)
// * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * //
-Foam::autoPtr<Foam::liquidMixture> Foam::liquidMixture::New
+Foam::autoPtr<Foam::liquidMixtureProperties> Foam::liquidMixtureProperties::New
(
const dictionary& thermophysicalProperties
)
{
- return autoPtr<liquidMixture>(new liquidMixture(thermophysicalProperties));
+ return autoPtr<liquidMixtureProperties>
+ (
+ new liquidMixtureProperties(thermophysicalProperties)
+ );
}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-Foam::scalar Foam::liquidMixture::Tc(const scalarField& x) const
+Foam::scalar Foam::liquidMixtureProperties::Tc(const scalarField& x) const
{
scalar vTc = 0.0;
scalar vc = 0.0;
@@ -103,7 +113,7 @@ Foam::scalar Foam::liquidMixture::Tc(const scalarField& x) const
}
-Foam::scalar Foam::liquidMixture::Tpc(const scalarField& x) const
+Foam::scalar Foam::liquidMixtureProperties::Tpc(const scalarField& x) const
{
scalar Tpc = 0.0;
forAll(properties_, i)
@@ -115,7 +125,7 @@ Foam::scalar Foam::liquidMixture::Tpc(const scalarField& x) const
}
-Foam::scalar Foam::liquidMixture::Ppc(const scalarField& x) const
+Foam::scalar Foam::liquidMixtureProperties::Ppc(const scalarField& x) const
{
scalar Vc = 0.0;
scalar Zc = 0.0;
@@ -129,7 +139,7 @@ Foam::scalar Foam::liquidMixture::Ppc(const scalarField& x) const
}
-Foam::scalar Foam::liquidMixture::omega(const scalarField& x) const
+Foam::scalar Foam::liquidMixtureProperties::omega(const scalarField& x) const
{
scalar omega = 0.0;
forAll(properties_, i)
@@ -141,7 +151,7 @@ Foam::scalar Foam::liquidMixture::omega(const scalarField& x) const
}
-Foam::scalarField Foam::liquidMixture::Xs
+Foam::scalarField Foam::liquidMixtureProperties::Xs
(
const scalar p,
const scalar Tg,
@@ -162,7 +172,7 @@ Foam::scalarField Foam::liquidMixture::Xs
}
-Foam::scalar Foam::liquidMixture::W(const scalarField& x) const
+Foam::scalar Foam::liquidMixtureProperties::W(const scalarField& x) const
{
scalar W = 0.0;
forAll(properties_, i)
@@ -174,7 +184,7 @@ Foam::scalar Foam::liquidMixture::W(const scalarField& x) const
}
-Foam::scalarField Foam::liquidMixture::Y(const scalarField& X) const
+Foam::scalarField Foam::liquidMixtureProperties::Y(const scalarField& X) const
{
scalarField Y(X/W(X));
@@ -187,7 +197,7 @@ Foam::scalarField Foam::liquidMixture::Y(const scalarField& X) const
}
-Foam::scalarField Foam::liquidMixture::X(const scalarField& Y) const
+Foam::scalarField Foam::liquidMixtureProperties::X(const scalarField& Y) const
{
scalarField X(Y.size());
scalar Winv = 0.0;
@@ -202,7 +212,7 @@ Foam::scalarField Foam::liquidMixture::X(const scalarField& Y) const
}
-Foam::scalar Foam::liquidMixture::rho
+Foam::scalar Foam::liquidMixtureProperties::rho
(
const scalar p,
const scalar T,
@@ -225,7 +235,7 @@ Foam::scalar Foam::liquidMixture::rho
}
-Foam::scalar Foam::liquidMixture::pv
+Foam::scalar Foam::liquidMixtureProperties::pv
(
const scalar p,
const scalar T,
@@ -247,7 +257,7 @@ Foam::scalar Foam::liquidMixture::pv
}
-Foam::scalar Foam::liquidMixture::hl
+Foam::scalar Foam::liquidMixtureProperties::hl
(
const scalar p,
const scalar T,
@@ -269,7 +279,7 @@ Foam::scalar Foam::liquidMixture::hl
}
-Foam::scalar Foam::liquidMixture::Cp
+Foam::scalar Foam::liquidMixtureProperties::Cp
(
const scalar p,
const scalar T,
@@ -291,7 +301,7 @@ Foam::scalar Foam::liquidMixture::Cp
}
-Foam::scalar Foam::liquidMixture::sigma
+Foam::scalar Foam::liquidMixtureProperties::sigma
(
const scalar p,
const scalar T,
@@ -325,7 +335,7 @@ Foam::scalar Foam::liquidMixture::sigma
}
-Foam::scalar Foam::liquidMixture::mu
+Foam::scalar Foam::liquidMixtureProperties::mu
(
const scalar p,
const scalar T,
@@ -347,7 +357,7 @@ Foam::scalar Foam::liquidMixture::mu
}
-Foam::scalar Foam::liquidMixture::K
+Foam::scalar Foam::liquidMixtureProperties::K
(
const scalar p,
const scalar T,
@@ -396,7 +406,7 @@ Foam::scalar Foam::liquidMixture::K
}
-Foam::scalar Foam::liquidMixture::D
+Foam::scalar Foam::liquidMixtureProperties::D
(
const scalar p,
const scalar T,
diff --git a/src/thermophysicalModels/liquidMixture/liquidMixture/liquidMixture.H b/src/thermophysicalModels/liquidMixtureProperties/liquidMixtureProperties/liquidMixtureProperties.H
similarity index 88%
rename from src/thermophysicalModels/liquidMixture/liquidMixture/liquidMixture.H
rename to src/thermophysicalModels/liquidMixtureProperties/liquidMixtureProperties/liquidMixtureProperties.H
index 186d19e64ce..d127478cacb 100644
--- a/src/thermophysicalModels/liquidMixture/liquidMixture/liquidMixture.H
+++ b/src/thermophysicalModels/liquidMixtureProperties/liquidMixtureProperties/liquidMixtureProperties.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -22,7 +22,7 @@ License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Class
- Foam::liquidMixture
+ Foam::liquidMixtureProperties
Description
A mixture of liquids.
@@ -40,7 +40,7 @@ Description
The @c liquidProperties sub-dictionary entry should be used when possible
to avoid conflicts with identically named gas-phase entries.
- A simple example of a single-component liquidMixture:
+ A simple example of a single-component liquidMixtureProperties:
@verbatim
liquidComponents
(
@@ -81,13 +81,13 @@ Description
\*---------------------------------------------------------------------------*/
-#ifndef liquidMixture_H
-#define liquidMixture_H
+#ifndef liquidMixtureProperties_H
+#define liquidMixtureProperties_H
#include "word.H"
#include "scalarField.H"
#include "PtrList.H"
-#include "liquid.H"
+#include "liquidProperties.H"
#include "autoPtr.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -96,10 +96,10 @@ namespace Foam
{
/*---------------------------------------------------------------------------*\
- Class liquidMixture Declaration
+ Class liquidMixtureProperties Declaration
\*---------------------------------------------------------------------------*/
-class liquidMixture
+class liquidMixtureProperties
{
// Private data
@@ -110,7 +110,7 @@ class liquidMixture
List<word> components_;
//- The liquid properties
- PtrList<liquid> properties_;
+ PtrList<liquidProperties> properties_;
public:
@@ -119,27 +119,30 @@ public:
// Constructors
//- Construct from dictionary
- liquidMixture(const dictionary& dict);
+ liquidMixtureProperties(const dictionary& dict);
//- Construct copy
- liquidMixture(const liquidMixture& lm);
+ liquidMixtureProperties(const liquidMixtureProperties& lm);
//- Construct and return a clone
- virtual autoPtr<liquidMixture> clone() const
+ virtual autoPtr<liquidMixtureProperties> clone() const
{
- return autoPtr<liquidMixture>(new liquidMixture(*this));
+ return autoPtr<liquidMixtureProperties>
+ (
+ new liquidMixtureProperties(*this)
+ );
}
//- Destructor
- virtual ~liquidMixture()
+ virtual ~liquidMixtureProperties()
{}
// Selectors
//- Select construct from dictionary
- static autoPtr<liquidMixture> New(const dictionary&);
+ static autoPtr<liquidMixtureProperties> New(const dictionary&);
// Member Functions
@@ -151,7 +154,7 @@ public:
}
//- Return the liquid properties
- inline const PtrList<liquid>& properties() const
+ inline const PtrList<liquidProperties>& properties() const
{
return properties_;
}
diff --git a/src/thermophysicalModels/liquids/Ar/Ar.C b/src/thermophysicalModels/liquidProperties/Ar/Ar.C
similarity index 91%
rename from src/thermophysicalModels/liquids/Ar/Ar.C
rename to src/thermophysicalModels/liquidProperties/Ar/Ar.C
index 113c62d2007..167b0d229ba 100644
--- a/src/thermophysicalModels/liquids/Ar/Ar.C
+++ b/src/thermophysicalModels/liquidProperties/Ar/Ar.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -31,16 +31,16 @@ License
namespace Foam
{
defineTypeNameAndDebug(Ar, 0);
- addToRunTimeSelectionTable(liquid, Ar,);
- addToRunTimeSelectionTable(liquid, Ar, Istream);
- addToRunTimeSelectionTable(liquid, Ar, dictionary);
+ addToRunTimeSelectionTable(liquidProperties, Ar,);
+ addToRunTimeSelectionTable(liquidProperties, Ar, Istream);
+ addToRunTimeSelectionTable(liquidProperties, Ar, dictionary);
}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
Foam::Ar::Ar()
:
- liquid
+ liquidProperties
(
39.948,
150.86,
@@ -87,7 +87,7 @@ Foam::Ar::Ar()
Foam::Ar::Ar
(
- const liquid& l,
+ const liquidProperties& l,
const NSRDSfunc5& density,
const NSRDSfunc1& vapourPressure,
const NSRDSfunc6& heatOfVapourisation,
@@ -103,7 +103,7 @@ Foam::Ar::Ar
const APIdiffCoefFunc& vapourDiffussivity
)
:
- liquid(l),
+ liquidProperties(l),
rho_(density),
pv_(vapourPressure),
hl_(heatOfVapourisation),
@@ -122,7 +122,7 @@ Foam::Ar::Ar
Foam::Ar::Ar(Istream& is)
:
- liquid(is),
+ liquidProperties(is),
rho_(is),
pv_(is),
hl_(is),
@@ -141,7 +141,7 @@ Foam::Ar::Ar(Istream& is)
Foam::Ar::Ar(const dictionary& dict)
:
- liquid(dict),
+ liquidProperties(dict),
rho_(dict.subDict("rho")),
pv_(dict.subDict("pv")),
hl_(dict.subDict("hl")),
@@ -160,7 +160,7 @@ Foam::Ar::Ar(const dictionary& dict)
Foam::Ar::Ar(const Ar& liq)
:
- liquid(liq),
+ liquidProperties(liq),
rho_(liq.rho_),
pv_(liq.pv_),
hl_(liq.hl_),
diff --git a/src/thermophysicalModels/liquids/Ar/Ar.H b/src/thermophysicalModels/liquidProperties/Ar/Ar.H
similarity index 94%
rename from src/thermophysicalModels/liquids/Ar/Ar.H
rename to src/thermophysicalModels/liquidProperties/Ar/Ar.H
index b5a80e0c5f2..dbcce489ceb 100644
--- a/src/thermophysicalModels/liquids/Ar/Ar.H
+++ b/src/thermophysicalModels/liquidProperties/Ar/Ar.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -35,7 +35,7 @@ SourceFiles
#ifndef Ar_H
#define Ar_H
-#include "liquid.H"
+#include "liquidProperties.H"
#include "NSRDSfunc0.H"
#include "NSRDSfunc1.H"
#include "NSRDSfunc2.H"
@@ -58,7 +58,7 @@ namespace Foam
class Ar
:
- public liquid
+ public liquidProperties
{
// Private data
@@ -91,7 +91,7 @@ public:
//- Construct from components
Ar
(
- const liquid& l,
+ const liquidProperties& l,
const NSRDSfunc5& density,
const NSRDSfunc1& vapourPressure,
const NSRDSfunc6& heatOfVapourisation,
@@ -117,9 +117,9 @@ public:
Ar(const Ar& liq);
//- Construct and return clone
- virtual autoPtr<liquid> clone() const
+ virtual autoPtr<liquidProperties> clone() const
{
- return autoPtr<liquid>(new Ar(*this));
+ return autoPtr<liquidProperties>(new Ar(*this));
}
@@ -173,7 +173,7 @@ public:
//- Write the function coefficients
void writeData(Ostream& os) const
{
- liquid::writeData(os); os << nl;
+ liquidProperties::writeData(os); os << nl;
rho_.writeData(os); os << nl;
pv_.writeData(os); os << nl;
hl_.writeData(os); os << nl;
diff --git a/src/thermophysicalModels/liquids/Ar/ArI.H b/src/thermophysicalModels/liquidProperties/Ar/ArI.H
similarity index 97%
rename from src/thermophysicalModels/liquids/Ar/ArI.H
rename to src/thermophysicalModels/liquidProperties/Ar/ArI.H
index 4c0325833e5..43f02099d97 100644
--- a/src/thermophysicalModels/liquids/Ar/ArI.H
+++ b/src/thermophysicalModels/liquidProperties/Ar/ArI.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/src/thermophysicalModels/liquids/C10H22/C10H22.C b/src/thermophysicalModels/liquidProperties/C10H22/C10H22.C
similarity index 91%
rename from src/thermophysicalModels/liquids/C10H22/C10H22.C
rename to src/thermophysicalModels/liquidProperties/C10H22/C10H22.C
index 9b0fd047c1d..c2f153d9892 100644
--- a/src/thermophysicalModels/liquids/C10H22/C10H22.C
+++ b/src/thermophysicalModels/liquidProperties/C10H22/C10H22.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -31,16 +31,16 @@ License
namespace Foam
{
defineTypeNameAndDebug(C10H22, 0);
- addToRunTimeSelectionTable(liquid, C10H22,);
- addToRunTimeSelectionTable(liquid, C10H22, Istream);
- addToRunTimeSelectionTable(liquid, C10H22, dictionary);
+ addToRunTimeSelectionTable(liquidProperties, C10H22,);
+ addToRunTimeSelectionTable(liquidProperties, C10H22, Istream);
+ addToRunTimeSelectionTable(liquidProperties, C10H22, dictionary);
}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
Foam::C10H22::C10H22()
:
- liquid
+ liquidProperties
(
142.285,
617.70,
@@ -95,7 +95,7 @@ Foam::C10H22::C10H22()
Foam::C10H22::C10H22
(
- const liquid& l,
+ const liquidProperties& l,
const NSRDSfunc5& density,
const NSRDSfunc1& vapourPressure,
const NSRDSfunc6& heatOfVapourisation,
@@ -111,7 +111,7 @@ Foam::C10H22::C10H22
const APIdiffCoefFunc& vapourDiffussivity
)
:
- liquid(l),
+ liquidProperties(l),
rho_(density),
pv_(vapourPressure),
hl_(heatOfVapourisation),
@@ -130,7 +130,7 @@ Foam::C10H22::C10H22
Foam::C10H22::C10H22(Istream& is)
:
- liquid(is),
+ liquidProperties(is),
rho_(is),
pv_(is),
hl_(is),
@@ -149,7 +149,7 @@ Foam::C10H22::C10H22(Istream& is)
Foam::C10H22::C10H22(const dictionary& dict)
:
- liquid(dict),
+ liquidProperties(dict),
rho_(dict.subDict("rho")),
pv_(dict.subDict("pv")),
hl_(dict.subDict("hl")),
@@ -168,7 +168,7 @@ Foam::C10H22::C10H22(const dictionary& dict)
Foam::C10H22::C10H22(const C10H22& liq)
:
- liquid(liq),
+ liquidProperties(liq),
rho_(liq.rho_),
pv_(liq.pv_),
hl_(liq.hl_),
diff --git a/src/thermophysicalModels/liquids/C10H22/C10H22.H b/src/thermophysicalModels/liquidProperties/C10H22/C10H22.H
similarity index 94%
rename from src/thermophysicalModels/liquids/C10H22/C10H22.H
rename to src/thermophysicalModels/liquidProperties/C10H22/C10H22.H
index 32835532952..91abdc41ee0 100644
--- a/src/thermophysicalModels/liquids/C10H22/C10H22.H
+++ b/src/thermophysicalModels/liquidProperties/C10H22/C10H22.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -35,7 +35,7 @@ SourceFiles
#ifndef C10H22_H
#define C10H22_H
-#include "liquid.H"
+#include "liquidProperties.H"
#include "NSRDSfunc0.H"
#include "NSRDSfunc1.H"
#include "NSRDSfunc2.H"
@@ -58,7 +58,7 @@ namespace Foam
class C10H22
:
- public liquid
+ public liquidProperties
{
// Private data
@@ -91,7 +91,7 @@ public:
//- Construct from components
C10H22
(
- const liquid& l,
+ const liquidProperties& l,
const NSRDSfunc5& density,
const NSRDSfunc1& vapourPressure,
const NSRDSfunc6& heatOfVapourisation,
@@ -117,9 +117,9 @@ public:
C10H22(const C10H22& liq);
//- Construct and return clone
- virtual autoPtr<liquid> clone() const
+ virtual autoPtr<liquidProperties> clone() const
{
- return autoPtr<liquid>(new C10H22(*this));
+ return autoPtr<liquidProperties>(new C10H22(*this));
}
@@ -173,7 +173,7 @@ public:
//- Write the function coefficients
void writeData(Ostream& os) const
{
- liquid::writeData(os); os << nl;
+ liquidProperties::writeData(os); os << nl;
rho_.writeData(os); os << nl;
pv_.writeData(os); os << nl;
hl_.writeData(os); os << nl;
diff --git a/src/thermophysicalModels/liquids/C10H22/C10H22I.H b/src/thermophysicalModels/liquidProperties/C10H22/C10H22I.H
similarity index 97%
rename from src/thermophysicalModels/liquids/C10H22/C10H22I.H
rename to src/thermophysicalModels/liquidProperties/C10H22/C10H22I.H
index 7fad8fdd259..0cb8e4def56 100644
--- a/src/thermophysicalModels/liquids/C10H22/C10H22I.H
+++ b/src/thermophysicalModels/liquidProperties/C10H22/C10H22I.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/src/thermophysicalModels/liquids/C12H26/C12H26.C b/src/thermophysicalModels/liquidProperties/C12H26/C12H26.C
similarity index 91%
rename from src/thermophysicalModels/liquids/C12H26/C12H26.C
rename to src/thermophysicalModels/liquidProperties/C12H26/C12H26.C
index cc4880bd7e9..a35c62cbf00 100644
--- a/src/thermophysicalModels/liquids/C12H26/C12H26.C
+++ b/src/thermophysicalModels/liquidProperties/C12H26/C12H26.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -31,16 +31,16 @@ License
namespace Foam
{
defineTypeNameAndDebug(C12H26, 0);
- addToRunTimeSelectionTable(liquid, C12H26,);
- addToRunTimeSelectionTable(liquid, C12H26, Istream);
- addToRunTimeSelectionTable(liquid, C12H26, dictionary);
+ addToRunTimeSelectionTable(liquidProperties, C12H26,);
+ addToRunTimeSelectionTable(liquidProperties, C12H26, Istream);
+ addToRunTimeSelectionTable(liquidProperties, C12H26, dictionary);
}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
Foam::C12H26::C12H26()
:
- liquid
+ liquidProperties
(
170.338,
658.0,
@@ -87,7 +87,7 @@ Foam::C12H26::C12H26()
Foam::C12H26::C12H26
(
- const liquid& l,
+ const liquidProperties& l,
const NSRDSfunc5& density,
const NSRDSfunc1& vapourPressure,
const NSRDSfunc6& heatOfVapourisation,
@@ -103,7 +103,7 @@ Foam::C12H26::C12H26
const APIdiffCoefFunc& vapourDiffussivity
)
:
- liquid(l),
+ liquidProperties(l),
rho_(density),
pv_(vapourPressure),
hl_(heatOfVapourisation),
@@ -122,7 +122,7 @@ Foam::C12H26::C12H26
Foam::C12H26::C12H26(Istream& is)
:
- liquid(is),
+ liquidProperties(is),
rho_(is),
pv_(is),
hl_(is),
@@ -141,7 +141,7 @@ Foam::C12H26::C12H26(Istream& is)
Foam::C12H26::C12H26(const dictionary& dict)
:
- liquid(dict),
+ liquidProperties(dict),
rho_(dict.subDict("rho")),
pv_(dict.subDict("pv")),
hl_(dict.subDict("hl")),
@@ -160,7 +160,7 @@ Foam::C12H26::C12H26(const dictionary& dict)
Foam::C12H26::C12H26(const C12H26& liq)
:
- liquid(liq),
+ liquidProperties(liq),
rho_(liq.rho_),
pv_(liq.pv_),
hl_(liq.hl_),
diff --git a/src/thermophysicalModels/liquids/C12H26/C12H26.H b/src/thermophysicalModels/liquidProperties/C12H26/C12H26.H
similarity index 94%
rename from src/thermophysicalModels/liquids/C12H26/C12H26.H
rename to src/thermophysicalModels/liquidProperties/C12H26/C12H26.H
index 023c8864953..1651d288d4c 100644
--- a/src/thermophysicalModels/liquids/C12H26/C12H26.H
+++ b/src/thermophysicalModels/liquidProperties/C12H26/C12H26.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -35,7 +35,7 @@ SourceFiles
#ifndef C12H26_H
#define C12H26_H
-#include "liquid.H"
+#include "liquidProperties.H"
#include "NSRDSfunc0.H"
#include "NSRDSfunc1.H"
#include "NSRDSfunc2.H"
@@ -58,7 +58,7 @@ namespace Foam
class C12H26
:
- public liquid
+ public liquidProperties
{
// Private data
@@ -91,7 +91,7 @@ public:
//- Construct from conponents
C12H26
(
- const liquid& l,
+ const liquidProperties& l,
const NSRDSfunc5& density,
const NSRDSfunc1& vapourPressure,
const NSRDSfunc6& heatOfVapourisation,
@@ -117,9 +117,9 @@ public:
C12H26(const C12H26& liq);
//- Construct and return clone
- virtual autoPtr<liquid> clone() const
+ virtual autoPtr<liquidProperties> clone() const
{
- return autoPtr<liquid>(new C12H26(*this));
+ return autoPtr<liquidProperties>(new C12H26(*this));
}
@@ -173,7 +173,7 @@ public:
//- Write the function coefficients
void writeData(Ostream& os) const
{
- liquid::writeData(os); os << nl;
+ liquidProperties::writeData(os); os << nl;
rho_.writeData(os); os << nl;
pv_.writeData(os); os << nl;
hl_.writeData(os); os << nl;
diff --git a/src/thermophysicalModels/liquids/C12H26/C12H26I.H b/src/thermophysicalModels/liquidProperties/C12H26/C12H26I.H
similarity index 97%
rename from src/thermophysicalModels/liquids/C12H26/C12H26I.H
rename to src/thermophysicalModels/liquidProperties/C12H26/C12H26I.H
index 24bec218b7b..b53f6fe8ec8 100644
--- a/src/thermophysicalModels/liquids/C12H26/C12H26I.H
+++ b/src/thermophysicalModels/liquidProperties/C12H26/C12H26I.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/src/thermophysicalModels/liquids/C13H28/C13H28.C b/src/thermophysicalModels/liquidProperties/C13H28/C13H28.C
similarity index 91%
rename from src/thermophysicalModels/liquids/C13H28/C13H28.C
rename to src/thermophysicalModels/liquidProperties/C13H28/C13H28.C
index 12884c7efbc..4278f2bf330 100644
--- a/src/thermophysicalModels/liquids/C13H28/C13H28.C
+++ b/src/thermophysicalModels/liquidProperties/C13H28/C13H28.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -31,16 +31,16 @@ License
namespace Foam
{
defineTypeNameAndDebug(C13H28, 0);
- addToRunTimeSelectionTable(liquid, C13H28,);
- addToRunTimeSelectionTable(liquid, C13H28, Istream);
- addToRunTimeSelectionTable(liquid, C13H28, dictionary);
+ addToRunTimeSelectionTable(liquidProperties, C13H28,);
+ addToRunTimeSelectionTable(liquidProperties, C13H28, Istream);
+ addToRunTimeSelectionTable(liquidProperties, C13H28, dictionary);
}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
Foam::C13H28::C13H28()
:
- liquid
+ liquidProperties
(
184.365,
675.80,
@@ -95,7 +95,7 @@ Foam::C13H28::C13H28()
Foam::C13H28::C13H28
(
- const liquid& l,
+ const liquidProperties& l,
const NSRDSfunc5& density,
const NSRDSfunc1& vapourPressure,
const NSRDSfunc6& heatOfVapourisation,
@@ -111,7 +111,7 @@ Foam::C13H28::C13H28
const APIdiffCoefFunc& vapourDiffussivity
)
:
- liquid(l),
+ liquidProperties(l),
rho_(density),
pv_(vapourPressure),
hl_(heatOfVapourisation),
@@ -130,7 +130,7 @@ Foam::C13H28::C13H28
Foam::C13H28::C13H28(Istream& is)
:
- liquid(is),
+ liquidProperties(is),
rho_(is),
pv_(is),
hl_(is),
@@ -149,7 +149,7 @@ Foam::C13H28::C13H28(Istream& is)
Foam::C13H28::C13H28(const dictionary& dict)
:
- liquid(dict),
+ liquidProperties(dict),
rho_(dict.subDict("rho")),
pv_(dict.subDict("pv")),
hl_(dict.subDict("hl")),
@@ -168,7 +168,7 @@ Foam::C13H28::C13H28(const dictionary& dict)
Foam::C13H28::C13H28(const C13H28& liq)
:
- liquid(liq),
+ liquidProperties(liq),
rho_(liq.rho_),
pv_(liq.pv_),
hl_(liq.hl_),
diff --git a/src/thermophysicalModels/liquids/C13H28/C13H28.H b/src/thermophysicalModels/liquidProperties/C13H28/C13H28.H
similarity index 94%
rename from src/thermophysicalModels/liquids/C13H28/C13H28.H
rename to src/thermophysicalModels/liquidProperties/C13H28/C13H28.H
index 1c2e6d3fc43..346a9ef4808 100644
--- a/src/thermophysicalModels/liquids/C13H28/C13H28.H
+++ b/src/thermophysicalModels/liquidProperties/C13H28/C13H28.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -35,7 +35,7 @@ SourceFiles
#ifndef C13H28_H
#define C13H28_H
-#include "liquid.H"
+#include "liquidProperties.H"
#include "NSRDSfunc0.H"
#include "NSRDSfunc1.H"
#include "NSRDSfunc2.H"
@@ -58,7 +58,7 @@ namespace Foam
class C13H28
:
- public liquid
+ public liquidProperties
{
// Private data
@@ -91,7 +91,7 @@ public:
//- Construct from components
C13H28
(
- const liquid& l,
+ const liquidProperties& l,
const NSRDSfunc5& density,
const NSRDSfunc1& vapourPressure,
const NSRDSfunc6& heatOfVapourisation,
@@ -117,9 +117,9 @@ public:
C13H28(const C13H28& liq);
//- Construct and return clone
- virtual autoPtr<liquid> clone() const
+ virtual autoPtr<liquidProperties> clone() const
{
- return autoPtr<liquid>(new C13H28(*this));
+ return autoPtr<liquidProperties>(new C13H28(*this));
}
@@ -173,7 +173,7 @@ public:
//- Write the function coefficients
void writeData(Ostream& os) const
{
- liquid::writeData(os); os << nl;
+ liquidProperties::writeData(os); os << nl;
rho_.writeData(os); os << nl;
pv_.writeData(os); os << nl;
hl_.writeData(os); os << nl;
diff --git a/src/thermophysicalModels/liquids/C13H28/C13H28I.H b/src/thermophysicalModels/liquidProperties/C13H28/C13H28I.H
similarity index 97%
rename from src/thermophysicalModels/liquids/C13H28/C13H28I.H
rename to src/thermophysicalModels/liquidProperties/C13H28/C13H28I.H
index cb6912e51ba..3ce3352b161 100644
--- a/src/thermophysicalModels/liquids/C13H28/C13H28I.H
+++ b/src/thermophysicalModels/liquidProperties/C13H28/C13H28I.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/src/thermophysicalModels/liquids/C14H30/C14H30.C b/src/thermophysicalModels/liquidProperties/C14H30/C14H30.C
similarity index 91%
rename from src/thermophysicalModels/liquids/C14H30/C14H30.C
rename to src/thermophysicalModels/liquidProperties/C14H30/C14H30.C
index a50eb7f4f53..434c5c47001 100644
--- a/src/thermophysicalModels/liquids/C14H30/C14H30.C
+++ b/src/thermophysicalModels/liquidProperties/C14H30/C14H30.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -31,16 +31,16 @@ License
namespace Foam
{
defineTypeNameAndDebug(C14H30, 0);
- addToRunTimeSelectionTable(liquid, C14H30,);
- addToRunTimeSelectionTable(liquid, C14H30, Istream);
- addToRunTimeSelectionTable(liquid, C14H30, dictionary);
+ addToRunTimeSelectionTable(liquidProperties, C14H30,);
+ addToRunTimeSelectionTable(liquidProperties, C14H30, Istream);
+ addToRunTimeSelectionTable(liquidProperties, C14H30, dictionary);
}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
Foam::C14H30::C14H30()
:
- liquid
+ liquidProperties
(
198.392,
692.40,
@@ -95,7 +95,7 @@ Foam::C14H30::C14H30()
Foam::C14H30::C14H30
(
- const liquid& l,
+ const liquidProperties& l,
const NSRDSfunc5& density,
const NSRDSfunc1& vapourPressure,
const NSRDSfunc6& heatOfVapourisation,
@@ -111,7 +111,7 @@ Foam::C14H30::C14H30
const APIdiffCoefFunc& vapourDiffussivity
)
:
- liquid(l),
+ liquidProperties(l),
rho_(density),
pv_(vapourPressure),
hl_(heatOfVapourisation),
@@ -130,7 +130,7 @@ Foam::C14H30::C14H30
Foam::C14H30::C14H30(Istream& is)
:
- liquid(is),
+ liquidProperties(is),
rho_(is),
pv_(is),
hl_(is),
@@ -149,7 +149,7 @@ Foam::C14H30::C14H30(Istream& is)
Foam::C14H30::C14H30(const dictionary& dict)
:
- liquid(dict),
+ liquidProperties(dict),
rho_(dict.subDict("rho")),
pv_(dict.subDict("pv")),
hl_(dict.subDict("hl")),
@@ -168,7 +168,7 @@ Foam::C14H30::C14H30(const dictionary& dict)
Foam::C14H30::C14H30(const C14H30& liq)
:
- liquid(liq),
+ liquidProperties(liq),
rho_(liq.rho_),
pv_(liq.pv_),
hl_(liq.hl_),
diff --git a/src/thermophysicalModels/liquids/C14H30/C14H30.H b/src/thermophysicalModels/liquidProperties/C14H30/C14H30.H
similarity index 94%
rename from src/thermophysicalModels/liquids/C14H30/C14H30.H
rename to src/thermophysicalModels/liquidProperties/C14H30/C14H30.H
index ec98406e3f1..ba8033499f5 100644
--- a/src/thermophysicalModels/liquids/C14H30/C14H30.H
+++ b/src/thermophysicalModels/liquidProperties/C14H30/C14H30.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -35,7 +35,7 @@ SourceFiles
#ifndef C14H30_H
#define C14H30_H
-#include "liquid.H"
+#include "liquidProperties.H"
#include "NSRDSfunc0.H"
#include "NSRDSfunc1.H"
#include "NSRDSfunc2.H"
@@ -58,7 +58,7 @@ namespace Foam
class C14H30
:
- public liquid
+ public liquidProperties
{
// Private data
@@ -91,7 +91,7 @@ public:
//- Construct from components
C14H30
(
- const liquid& l,
+ const liquidProperties& l,
const NSRDSfunc5& density,
const NSRDSfunc1& vapourPressure,
const NSRDSfunc6& heatOfVapourisation,
@@ -117,9 +117,9 @@ public:
C14H30(const C14H30& liq);
//- Construct and return clone
- virtual autoPtr<liquid> clone() const
+ virtual autoPtr<liquidProperties> clone() const
{
- return autoPtr<liquid>(new C14H30(*this));
+ return autoPtr<liquidProperties>(new C14H30(*this));
}
@@ -173,7 +173,7 @@ public:
//- Write the function coefficients
void writeData(Ostream& os) const
{
- liquid::writeData(os); os << nl;
+ liquidProperties::writeData(os); os << nl;
rho_.writeData(os); os << nl;
pv_.writeData(os); os << nl;
hl_.writeData(os); os << nl;
diff --git a/src/thermophysicalModels/liquids/C14H30/C14H30I.H b/src/thermophysicalModels/liquidProperties/C14H30/C14H30I.H
similarity index 97%
rename from src/thermophysicalModels/liquids/C14H30/C14H30I.H
rename to src/thermophysicalModels/liquidProperties/C14H30/C14H30I.H
index 165c345fc57..fcce331f7cc 100644
--- a/src/thermophysicalModels/liquids/C14H30/C14H30I.H
+++ b/src/thermophysicalModels/liquidProperties/C14H30/C14H30I.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/src/thermophysicalModels/liquids/C16H34/C16H34.C b/src/thermophysicalModels/liquidProperties/C16H34/C16H34.C
similarity index 91%
rename from src/thermophysicalModels/liquids/C16H34/C16H34.C
rename to src/thermophysicalModels/liquidProperties/C16H34/C16H34.C
index be9df8a3103..33c5a7dba33 100644
--- a/src/thermophysicalModels/liquids/C16H34/C16H34.C
+++ b/src/thermophysicalModels/liquidProperties/C16H34/C16H34.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -31,16 +31,16 @@ License
namespace Foam
{
defineTypeNameAndDebug(C16H34, 0);
- addToRunTimeSelectionTable(liquid, C16H34,);
- addToRunTimeSelectionTable(liquid, C16H34, Istream);
- addToRunTimeSelectionTable(liquid, C16H34, dictionary);
+ addToRunTimeSelectionTable(liquidProperties, C16H34,);
+ addToRunTimeSelectionTable(liquidProperties, C16H34, Istream);
+ addToRunTimeSelectionTable(liquidProperties, C16H34, dictionary);
}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
Foam::C16H34::C16H34()
:
- liquid
+ liquidProperties
(
226.446,
720.60,
@@ -95,7 +95,7 @@ Foam::C16H34::C16H34()
Foam::C16H34::C16H34
(
- const liquid& l,
+ const liquidProperties& l,
const NSRDSfunc5& density,
const NSRDSfunc1& vapourPressure,
const NSRDSfunc6& heatOfVapourisation,
@@ -111,7 +111,7 @@ Foam::C16H34::C16H34
const APIdiffCoefFunc& vapourDiffussivity
)
:
- liquid(l),
+ liquidProperties(l),
rho_(density),
pv_(vapourPressure),
hl_(heatOfVapourisation),
@@ -130,7 +130,7 @@ Foam::C16H34::C16H34
Foam::C16H34::C16H34(Istream& is)
:
- liquid(is),
+ liquidProperties(is),
rho_(is),
pv_(is),
hl_(is),
@@ -149,7 +149,7 @@ Foam::C16H34::C16H34(Istream& is)
Foam::C16H34::C16H34(const dictionary& dict)
:
- liquid(dict),
+ liquidProperties(dict),
rho_(dict.subDict("rho")),
pv_(dict.subDict("pv")),
hl_(dict.subDict("hl")),
@@ -168,7 +168,7 @@ Foam::C16H34::C16H34(const dictionary& dict)
Foam::C16H34::C16H34(const C16H34& liq)
:
- liquid(liq),
+ liquidProperties(liq),
rho_(liq.rho_),
pv_(liq.pv_),
hl_(liq.hl_),
diff --git a/src/thermophysicalModels/liquids/C16H34/C16H34.H b/src/thermophysicalModels/liquidProperties/C16H34/C16H34.H
similarity index 94%
rename from src/thermophysicalModels/liquids/C16H34/C16H34.H
rename to src/thermophysicalModels/liquidProperties/C16H34/C16H34.H
index 3d14007cf4f..de16ec9db63 100644
--- a/src/thermophysicalModels/liquids/C16H34/C16H34.H
+++ b/src/thermophysicalModels/liquidProperties/C16H34/C16H34.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -35,7 +35,7 @@ SourceFiles
#ifndef C16H34_H
#define C16H34_H
-#include "liquid.H"
+#include "liquidProperties.H"
#include "NSRDSfunc0.H"
#include "NSRDSfunc1.H"
#include "NSRDSfunc2.H"
@@ -58,7 +58,7 @@ namespace Foam
class C16H34
:
- public liquid
+ public liquidProperties
{
// Private data
@@ -91,7 +91,7 @@ public:
//- Construct from components
C16H34
(
- const liquid& l,
+ const liquidProperties& l,
const NSRDSfunc5& density,
const NSRDSfunc1& vapourPressure,
const NSRDSfunc6& heatOfVapourisation,
@@ -117,9 +117,9 @@ public:
C16H34(const C16H34& liq);
//- Construct and return clone
- virtual autoPtr<liquid> clone() const
+ virtual autoPtr<liquidProperties> clone() const
{
- return autoPtr<liquid>(new C16H34(*this));
+ return autoPtr<liquidProperties>(new C16H34(*this));
}
@@ -173,7 +173,7 @@ public:
//- Write the function coefficients
void writeData(Ostream& os) const
{
- liquid::writeData(os); os << nl;
+ liquidProperties::writeData(os); os << nl;
rho_.writeData(os); os << nl;
pv_.writeData(os); os << nl;
hl_.writeData(os); os << nl;
diff --git a/src/thermophysicalModels/liquids/C16H34/C16H34I.H b/src/thermophysicalModels/liquidProperties/C16H34/C16H34I.H
similarity index 97%
rename from src/thermophysicalModels/liquids/C16H34/C16H34I.H
rename to src/thermophysicalModels/liquidProperties/C16H34/C16H34I.H
index 7b0997a3399..5b956935719 100644
--- a/src/thermophysicalModels/liquids/C16H34/C16H34I.H
+++ b/src/thermophysicalModels/liquidProperties/C16H34/C16H34I.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/src/thermophysicalModels/liquids/C2H5OH/C2H5OH.C b/src/thermophysicalModels/liquidProperties/C2H5OH/C2H5OH.C
similarity index 91%
rename from src/thermophysicalModels/liquids/C2H5OH/C2H5OH.C
rename to src/thermophysicalModels/liquidProperties/C2H5OH/C2H5OH.C
index 2b86f736308..5509b6b6a63 100644
--- a/src/thermophysicalModels/liquids/C2H5OH/C2H5OH.C
+++ b/src/thermophysicalModels/liquidProperties/C2H5OH/C2H5OH.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -31,16 +31,16 @@ License
namespace Foam
{
defineTypeNameAndDebug(C2H5OH, 0);
- addToRunTimeSelectionTable(liquid, C2H5OH,);
- addToRunTimeSelectionTable(liquid, C2H5OH, Istream);
- addToRunTimeSelectionTable(liquid, C2H5OH, dictionary);
+ addToRunTimeSelectionTable(liquidProperties, C2H5OH,);
+ addToRunTimeSelectionTable(liquidProperties, C2H5OH, Istream);
+ addToRunTimeSelectionTable(liquidProperties, C2H5OH, dictionary);
}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
Foam::C2H5OH::C2H5OH()
:
- liquid
+ liquidProperties
(
46.069,
516.25,
@@ -95,7 +95,7 @@ Foam::C2H5OH::C2H5OH()
Foam::C2H5OH::C2H5OH
(
- const liquid& l,
+ const liquidProperties& l,
const NSRDSfunc5& density,
const NSRDSfunc1& vapourPressure,
const NSRDSfunc6& heatOfVapourisation,
@@ -111,7 +111,7 @@ Foam::C2H5OH::C2H5OH
const APIdiffCoefFunc& vapourDiffussivity
)
:
- liquid(l),
+ liquidProperties(l),
rho_(density),
pv_(vapourPressure),
hl_(heatOfVapourisation),
@@ -130,7 +130,7 @@ Foam::C2H5OH::C2H5OH
Foam::C2H5OH::C2H5OH(Istream& is)
:
- liquid(is),
+ liquidProperties(is),
rho_(is),
pv_(is),
hl_(is),
@@ -149,7 +149,7 @@ Foam::C2H5OH::C2H5OH(Istream& is)
Foam::C2H5OH::C2H5OH(const dictionary& dict)
:
- liquid(dict),
+ liquidProperties(dict),
rho_(dict.subDict("rho")),
pv_(dict.subDict("pv")),
hl_(dict.subDict("hl")),
@@ -168,7 +168,7 @@ Foam::C2H5OH::C2H5OH(const dictionary& dict)
Foam::C2H5OH::C2H5OH(const C2H5OH& liq)
:
- liquid(liq),
+ liquidProperties(liq),
rho_(liq.rho_),
pv_(liq.pv_),
hl_(liq.hl_),
diff --git a/src/thermophysicalModels/liquids/C2H5OH/C2H5OH.H b/src/thermophysicalModels/liquidProperties/C2H5OH/C2H5OH.H
similarity index 94%
rename from src/thermophysicalModels/liquids/C2H5OH/C2H5OH.H
rename to src/thermophysicalModels/liquidProperties/C2H5OH/C2H5OH.H
index 7eaf9679cf5..4c282b4ca4b 100644
--- a/src/thermophysicalModels/liquids/C2H5OH/C2H5OH.H
+++ b/src/thermophysicalModels/liquidProperties/C2H5OH/C2H5OH.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -35,7 +35,7 @@ SourceFiles
#ifndef C2H5OH_H
#define C2H5OH_H
-#include "liquid.H"
+#include "liquidProperties.H"
#include "NSRDSfunc0.H"
#include "NSRDSfunc1.H"
#include "NSRDSfunc2.H"
@@ -58,7 +58,7 @@ namespace Foam
class C2H5OH
:
- public liquid
+ public liquidProperties
{
// Private data
@@ -91,7 +91,7 @@ public:
//- Construct from components
C2H5OH
(
- const liquid& l,
+ const liquidProperties& l,
const NSRDSfunc5& density,
const NSRDSfunc1& vapourPressure,
const NSRDSfunc6& heatOfVapourisation,
@@ -117,9 +117,9 @@ public:
C2H5OH(const C2H5OH& liq);
//- Construct and return clone
- virtual autoPtr<liquid> clone() const
+ virtual autoPtr<liquidProperties> clone() const
{
- return autoPtr<liquid>(new C2H5OH(*this));
+ return autoPtr<liquidProperties>(new C2H5OH(*this));
}
@@ -173,7 +173,7 @@ public:
//- Write the function coefficients
void writeData(Ostream& os) const
{
- liquid::writeData(os); os << nl;
+ liquidProperties::writeData(os); os << nl;
rho_.writeData(os); os << nl;
pv_.writeData(os); os << nl;
hl_.writeData(os); os << nl;
diff --git a/src/thermophysicalModels/liquids/C2H5OH/C2H5OHI.H b/src/thermophysicalModels/liquidProperties/C2H5OH/C2H5OHI.H
similarity index 97%
rename from src/thermophysicalModels/liquids/C2H5OH/C2H5OHI.H
rename to src/thermophysicalModels/liquidProperties/C2H5OH/C2H5OHI.H
index cd802142857..993251b8a21 100644
--- a/src/thermophysicalModels/liquids/C2H5OH/C2H5OHI.H
+++ b/src/thermophysicalModels/liquidProperties/C2H5OH/C2H5OHI.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/src/thermophysicalModels/liquids/C2H6/C2H6.C b/src/thermophysicalModels/liquidProperties/C2H6/C2H6.C
similarity index 91%
rename from src/thermophysicalModels/liquids/C2H6/C2H6.C
rename to src/thermophysicalModels/liquidProperties/C2H6/C2H6.C
index f648ba7792e..ce2c710da31 100644
--- a/src/thermophysicalModels/liquids/C2H6/C2H6.C
+++ b/src/thermophysicalModels/liquidProperties/C2H6/C2H6.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -31,16 +31,16 @@ License
namespace Foam
{
defineTypeNameAndDebug(C2H6, 0);
- addToRunTimeSelectionTable(liquid, C2H6,);
- addToRunTimeSelectionTable(liquid, C2H6, Istream);
- addToRunTimeSelectionTable(liquid, C2H6, dictionary);
+ addToRunTimeSelectionTable(liquidProperties, C2H6,);
+ addToRunTimeSelectionTable(liquidProperties, C2H6, Istream);
+ addToRunTimeSelectionTable(liquidProperties, C2H6, dictionary);
}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
Foam::C2H6::C2H6()
:
- liquid
+ liquidProperties
(
30.070,
305.32,
@@ -86,7 +86,7 @@ Foam::C2H6::C2H6()
Foam::C2H6::C2H6
(
- const liquid& l,
+ const liquidProperties& l,
const NSRDSfunc5& density,
const NSRDSfunc1& vapourPressure,
const NSRDSfunc6& heatOfVapourisation,
@@ -102,7 +102,7 @@ Foam::C2H6::C2H6
const APIdiffCoefFunc& vapourDiffussivity
)
:
- liquid(l),
+ liquidProperties(l),
rho_(density),
pv_(vapourPressure),
hl_(heatOfVapourisation),
@@ -121,7 +121,7 @@ Foam::C2H6::C2H6
Foam::C2H6::C2H6(Istream& is)
:
- liquid(is),
+ liquidProperties(is),
rho_(is),
pv_(is),
hl_(is),
@@ -140,7 +140,7 @@ Foam::C2H6::C2H6(Istream& is)
Foam::C2H6::C2H6(const dictionary& dict)
:
- liquid(dict),
+ liquidProperties(dict),
rho_(dict.subDict("rho")),
pv_(dict.subDict("pv")),
hl_(dict.subDict("hl")),
@@ -159,7 +159,7 @@ Foam::C2H6::C2H6(const dictionary& dict)
Foam::C2H6::C2H6(const C2H6& liq)
:
- liquid(liq),
+ liquidProperties(liq),
rho_(liq.rho_),
pv_(liq.pv_),
hl_(liq.hl_),
diff --git a/src/thermophysicalModels/liquids/C2H6/C2H6.H b/src/thermophysicalModels/liquidProperties/C2H6/C2H6.H
similarity index 94%
rename from src/thermophysicalModels/liquids/C2H6/C2H6.H
rename to src/thermophysicalModels/liquidProperties/C2H6/C2H6.H
index ff4e527253f..fe5e7b9e522 100644
--- a/src/thermophysicalModels/liquids/C2H6/C2H6.H
+++ b/src/thermophysicalModels/liquidProperties/C2H6/C2H6.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -35,7 +35,7 @@ SourceFiles
#ifndef C2H6_H
#define C2H6_H
-#include "liquid.H"
+#include "liquidProperties.H"
#include "NSRDSfunc0.H"
#include "NSRDSfunc1.H"
#include "NSRDSfunc2.H"
@@ -58,7 +58,7 @@ namespace Foam
class C2H6
:
- public liquid
+ public liquidProperties
{
// Private data
@@ -91,7 +91,7 @@ public:
//- Construct from components
C2H6
(
- const liquid& l,
+ const liquidProperties& l,
const NSRDSfunc5& density,
const NSRDSfunc1& vapourPressure,
const NSRDSfunc6& heatOfVapourisation,
@@ -117,9 +117,9 @@ public:
C2H6(const C2H6& liq);
//- Construct and return clone
- virtual autoPtr<liquid> clone() const
+ virtual autoPtr<liquidProperties> clone() const
{
- return autoPtr<liquid>(new C2H6(*this));
+ return autoPtr<liquidProperties>(new C2H6(*this));
}
@@ -173,7 +173,7 @@ public:
//- Write the function coefficients
void writeData(Ostream& os) const
{
- liquid::writeData(os); os << nl;
+ liquidProperties::writeData(os); os << nl;
rho_.writeData(os); os << nl;
pv_.writeData(os); os << nl;
hl_.writeData(os); os << nl;
diff --git a/src/thermophysicalModels/liquids/C2H6/C2H6I.H b/src/thermophysicalModels/liquidProperties/C2H6/C2H6I.H
similarity index 97%
rename from src/thermophysicalModels/liquids/C2H6/C2H6I.H
rename to src/thermophysicalModels/liquidProperties/C2H6/C2H6I.H
index 75e10ddb995..83c83845bf9 100644
--- a/src/thermophysicalModels/liquids/C2H6/C2H6I.H
+++ b/src/thermophysicalModels/liquidProperties/C2H6/C2H6I.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/src/thermophysicalModels/liquids/C2H6O/C2H6O.C b/src/thermophysicalModels/liquidProperties/C2H6O/C2H6O.C
similarity index 91%
rename from src/thermophysicalModels/liquids/C2H6O/C2H6O.C
rename to src/thermophysicalModels/liquidProperties/C2H6O/C2H6O.C
index 38e3f067972..9d978cbf97b 100644
--- a/src/thermophysicalModels/liquids/C2H6O/C2H6O.C
+++ b/src/thermophysicalModels/liquidProperties/C2H6O/C2H6O.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -31,16 +31,16 @@ License
namespace Foam
{
defineTypeNameAndDebug(C2H6O, 0);
- addToRunTimeSelectionTable(liquid, C2H6O,);
- addToRunTimeSelectionTable(liquid, C2H6O, Istream);
- addToRunTimeSelectionTable(liquid, C2H6O, dictionary);
+ addToRunTimeSelectionTable(liquidProperties, C2H6O,);
+ addToRunTimeSelectionTable(liquidProperties, C2H6O, Istream);
+ addToRunTimeSelectionTable(liquidProperties, C2H6O, dictionary);
}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
Foam::C2H6O::C2H6O()
:
- liquid
+ liquidProperties
(
46.069,
400.10,
@@ -95,7 +95,7 @@ Foam::C2H6O::C2H6O()
Foam::C2H6O::C2H6O
(
- const liquid& l,
+ const liquidProperties& l,
const NSRDSfunc5& density,
const NSRDSfunc1& vapourPressure,
const NSRDSfunc6& heatOfVapourisation,
@@ -111,7 +111,7 @@ Foam::C2H6O::C2H6O
const APIdiffCoefFunc& vapourDiffussivity
)
:
- liquid(l),
+ liquidProperties(l),
rho_(density),
pv_(vapourPressure),
hl_(heatOfVapourisation),
@@ -130,7 +130,7 @@ Foam::C2H6O::C2H6O
Foam::C2H6O::C2H6O(Istream& is)
:
- liquid(is),
+ liquidProperties(is),
rho_(is),
pv_(is),
hl_(is),
@@ -149,7 +149,7 @@ Foam::C2H6O::C2H6O(Istream& is)
Foam::C2H6O::C2H6O(const dictionary& dict)
:
- liquid(dict),
+ liquidProperties(dict),
rho_(dict.subDict("rho")),
pv_(dict.subDict("pv")),
hl_(dict.subDict("hl")),
@@ -168,7 +168,7 @@ Foam::C2H6O::C2H6O(const dictionary& dict)
Foam::C2H6O::C2H6O(const C2H6O& liq)
:
- liquid(liq),
+ liquidProperties(liq),
rho_(liq.rho_),
pv_(liq.pv_),
hl_(liq.hl_),
diff --git a/src/thermophysicalModels/liquids/C2H6O/C2H6O.H b/src/thermophysicalModels/liquidProperties/C2H6O/C2H6O.H
similarity index 94%
rename from src/thermophysicalModels/liquids/C2H6O/C2H6O.H
rename to src/thermophysicalModels/liquidProperties/C2H6O/C2H6O.H
index 3fea9b5061f..380bdd6dce4 100644
--- a/src/thermophysicalModels/liquids/C2H6O/C2H6O.H
+++ b/src/thermophysicalModels/liquidProperties/C2H6O/C2H6O.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -35,7 +35,7 @@ SourceFiles
#ifndef C2H6O_H
#define C2H6O_H
-#include "liquid.H"
+#include "liquidProperties.H"
#include "NSRDSfunc0.H"
#include "NSRDSfunc1.H"
#include "NSRDSfunc2.H"
@@ -58,7 +58,7 @@ namespace Foam
class C2H6O
:
- public liquid
+ public liquidProperties
{
// Private data
@@ -91,7 +91,7 @@ public:
//- Construct from components
C2H6O
(
- const liquid& l,
+ const liquidProperties& l,
const NSRDSfunc5& density,
const NSRDSfunc1& vapourPressure,
const NSRDSfunc6& heatOfVapourisation,
@@ -117,9 +117,9 @@ public:
C2H6O(const C2H6O& liq);
//- Construct and return clone
- virtual autoPtr<liquid> clone() const
+ virtual autoPtr<liquidProperties> clone() const
{
- return autoPtr<liquid>(new C2H6O(*this));
+ return autoPtr<liquidProperties>(new C2H6O(*this));
}
@@ -173,7 +173,7 @@ public:
//- Write the function coefficients
void writeData(Ostream& os) const
{
- liquid::writeData(os); os << nl;
+ liquidProperties::writeData(os); os << nl;
rho_.writeData(os); os << nl;
pv_.writeData(os); os << nl;
hl_.writeData(os); os << nl;
diff --git a/src/thermophysicalModels/liquids/C2H6O/C2H6OI.H b/src/thermophysicalModels/liquidProperties/C2H6O/C2H6OI.H
similarity index 97%
rename from src/thermophysicalModels/liquids/C2H6O/C2H6OI.H
rename to src/thermophysicalModels/liquidProperties/C2H6O/C2H6OI.H
index bd085b1becf..b59c6ec3e3c 100644
--- a/src/thermophysicalModels/liquids/C2H6O/C2H6OI.H
+++ b/src/thermophysicalModels/liquidProperties/C2H6O/C2H6OI.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/src/thermophysicalModels/liquids/C3H6O/C3H6O.C b/src/thermophysicalModels/liquidProperties/C3H6O/C3H6O.C
similarity index 91%
rename from src/thermophysicalModels/liquids/C3H6O/C3H6O.C
rename to src/thermophysicalModels/liquidProperties/C3H6O/C3H6O.C
index 307d72b704e..c4b8254bb51 100644
--- a/src/thermophysicalModels/liquids/C3H6O/C3H6O.C
+++ b/src/thermophysicalModels/liquidProperties/C3H6O/C3H6O.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -31,16 +31,16 @@ License
namespace Foam
{
defineTypeNameAndDebug(C3H6O, 0);
- addToRunTimeSelectionTable(liquid, C3H6O,);
- addToRunTimeSelectionTable(liquid, C3H6O, Istream);
- addToRunTimeSelectionTable(liquid, C3H6O, dictionary);
+ addToRunTimeSelectionTable(liquidProperties, C3H6O,);
+ addToRunTimeSelectionTable(liquidProperties, C3H6O, Istream);
+ addToRunTimeSelectionTable(liquidProperties, C3H6O, dictionary);
}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
Foam::C3H6O::C3H6O()
:
- liquid
+ liquidProperties
(
58.08,
508.20,
@@ -95,7 +95,7 @@ Foam::C3H6O::C3H6O()
Foam::C3H6O::C3H6O
(
- const liquid& l,
+ const liquidProperties& l,
const NSRDSfunc5& density,
const NSRDSfunc1& vapourPressure,
const NSRDSfunc6& heatOfVapourisation,
@@ -111,7 +111,7 @@ Foam::C3H6O::C3H6O
const APIdiffCoefFunc& vapourDiffussivity
)
:
- liquid(l),
+ liquidProperties(l),
rho_(density),
pv_(vapourPressure),
hl_(heatOfVapourisation),
@@ -130,7 +130,7 @@ Foam::C3H6O::C3H6O
Foam::C3H6O::C3H6O(Istream& is)
:
- liquid(is),
+ liquidProperties(is),
rho_(is),
pv_(is),
hl_(is),
@@ -149,7 +149,7 @@ Foam::C3H6O::C3H6O(Istream& is)
Foam::C3H6O::C3H6O(const dictionary& dict)
:
- liquid(dict),
+ liquidProperties(dict),
rho_(dict.subDict("rho")),
pv_(dict.subDict("pv")),
hl_(dict.subDict("hl")),
@@ -168,7 +168,7 @@ Foam::C3H6O::C3H6O(const dictionary& dict)
Foam::C3H6O::C3H6O(const C3H6O& liq)
:
- liquid(liq),
+ liquidProperties(liq),
rho_(liq.rho_),
pv_(liq.pv_),
hl_(liq.hl_),
diff --git a/src/thermophysicalModels/liquids/C3H6O/C3H6O.H b/src/thermophysicalModels/liquidProperties/C3H6O/C3H6O.H
similarity index 94%
rename from src/thermophysicalModels/liquids/C3H6O/C3H6O.H
rename to src/thermophysicalModels/liquidProperties/C3H6O/C3H6O.H
index 1ae3a34d0e8..88e6edcdac7 100644
--- a/src/thermophysicalModels/liquids/C3H6O/C3H6O.H
+++ b/src/thermophysicalModels/liquidProperties/C3H6O/C3H6O.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -35,7 +35,7 @@ SourceFiles
#ifndef C3H6O_H
#define C3H6O_H
-#include "liquid.H"
+#include "liquidProperties.H"
#include "NSRDSfunc0.H"
#include "NSRDSfunc1.H"
#include "NSRDSfunc2.H"
@@ -58,7 +58,7 @@ namespace Foam
class C3H6O
:
- public liquid
+ public liquidProperties
{
// Private data
@@ -91,7 +91,7 @@ public:
//- Construct from compoents
C3H6O
(
- const liquid& l,
+ const liquidProperties& l,
const NSRDSfunc5& density,
const NSRDSfunc1& vapourPressure,
const NSRDSfunc6& heatOfVapourisation,
@@ -117,9 +117,9 @@ public:
C3H6O(const C3H6O& liq);
//- Construct and return clone
- virtual autoPtr<liquid> clone() const
+ virtual autoPtr<liquidProperties> clone() const
{
- return autoPtr<liquid>(new C3H6O(*this));
+ return autoPtr<liquidProperties>(new C3H6O(*this));
}
@@ -173,7 +173,7 @@ public:
//- Write the function coefficients
void writeData(Ostream& os) const
{
- liquid::writeData(os); os << nl;
+ liquidProperties::writeData(os); os << nl;
rho_.writeData(os); os << nl;
pv_.writeData(os); os << nl;
hl_.writeData(os); os << nl;
diff --git a/src/thermophysicalModels/liquids/C3H6O/C3H6OI.H b/src/thermophysicalModels/liquidProperties/C3H6O/C3H6OI.H
similarity index 97%
rename from src/thermophysicalModels/liquids/C3H6O/C3H6OI.H
rename to src/thermophysicalModels/liquidProperties/C3H6O/C3H6OI.H
index 40a455ecb2b..6a5ac930365 100644
--- a/src/thermophysicalModels/liquids/C3H6O/C3H6OI.H
+++ b/src/thermophysicalModels/liquidProperties/C3H6O/C3H6OI.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/src/thermophysicalModels/liquids/C3H8/C3H8.C b/src/thermophysicalModels/liquidProperties/C3H8/C3H8.C
similarity index 91%
rename from src/thermophysicalModels/liquids/C3H8/C3H8.C
rename to src/thermophysicalModels/liquidProperties/C3H8/C3H8.C
index 27bcd05e731..7fa59aa1baa 100644
--- a/src/thermophysicalModels/liquids/C3H8/C3H8.C
+++ b/src/thermophysicalModels/liquidProperties/C3H8/C3H8.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -31,16 +31,16 @@ License
namespace Foam
{
defineTypeNameAndDebug(C3H8, 0);
- addToRunTimeSelectionTable(liquid, C3H8,);
- addToRunTimeSelectionTable(liquid, C3H8, Istream);
- addToRunTimeSelectionTable(liquid, C3H8, dictionary);
+ addToRunTimeSelectionTable(liquidProperties, C3H8,);
+ addToRunTimeSelectionTable(liquidProperties, C3H8, Istream);
+ addToRunTimeSelectionTable(liquidProperties, C3H8, dictionary);
}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
Foam::C3H8::C3H8()
:
- liquid
+ liquidProperties
(
44.096,
369.83,
@@ -85,7 +85,7 @@ Foam::C3H8::C3H8()
Foam::C3H8::C3H8
(
- const liquid& l,
+ const liquidProperties& l,
const NSRDSfunc5& density,
const NSRDSfunc1& vapourPressure,
const NSRDSfunc6& heatOfVapourisation,
@@ -101,7 +101,7 @@ Foam::C3H8::C3H8
const APIdiffCoefFunc& vapourDiffussivity
)
:
- liquid(l),
+ liquidProperties(l),
rho_(density),
pv_(vapourPressure),
hl_(heatOfVapourisation),
@@ -120,7 +120,7 @@ Foam::C3H8::C3H8
Foam::C3H8::C3H8(Istream& is)
:
- liquid(is),
+ liquidProperties(is),
rho_(is),
pv_(is),
hl_(is),
@@ -139,7 +139,7 @@ Foam::C3H8::C3H8(Istream& is)
Foam::C3H8::C3H8(const dictionary& dict)
:
- liquid(dict),
+ liquidProperties(dict),
rho_(dict.subDict("rho")),
pv_(dict.subDict("pv")),
hl_(dict.subDict("hl")),
@@ -158,7 +158,7 @@ Foam::C3H8::C3H8(const dictionary& dict)
Foam::C3H8::C3H8(const C3H8& liq)
:
- liquid(liq),
+ liquidProperties(liq),
rho_(liq.rho_),
pv_(liq.pv_),
hl_(liq.hl_),
diff --git a/src/thermophysicalModels/liquids/C3H8/C3H8.H b/src/thermophysicalModels/liquidProperties/C3H8/C3H8.H
similarity index 94%
rename from src/thermophysicalModels/liquids/C3H8/C3H8.H
rename to src/thermophysicalModels/liquidProperties/C3H8/C3H8.H
index bb25111b67c..b539f4b5041 100644
--- a/src/thermophysicalModels/liquids/C3H8/C3H8.H
+++ b/src/thermophysicalModels/liquidProperties/C3H8/C3H8.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -35,7 +35,7 @@ SourceFiles
#ifndef C3H8_H
#define C3H8_H
-#include "liquid.H"
+#include "liquidProperties.H"
#include "NSRDSfunc0.H"
#include "NSRDSfunc1.H"
#include "NSRDSfunc2.H"
@@ -58,7 +58,7 @@ namespace Foam
class C3H8
:
- public liquid
+ public liquidProperties
{
// Private data
@@ -91,7 +91,7 @@ public:
//- Construct from components
C3H8
(
- const liquid& l,
+ const liquidProperties& l,
const NSRDSfunc5& density,
const NSRDSfunc1& vapourPressure,
const NSRDSfunc6& heatOfVapourisation,
@@ -117,9 +117,9 @@ public:
C3H8(const C3H8& liq);
//- Construct and return clone
- virtual autoPtr<liquid> clone() const
+ virtual autoPtr<liquidProperties> clone() const
{
- return autoPtr<liquid>(new C3H8(*this));
+ return autoPtr<liquidProperties>(new C3H8(*this));
}
@@ -173,7 +173,7 @@ public:
//- Write the function coefficients
void writeData(Ostream& os) const
{
- liquid::writeData(os); os << nl;
+ liquidProperties::writeData(os); os << nl;
rho_.writeData(os); os << nl;
pv_.writeData(os); os << nl;
hl_.writeData(os); os << nl;
diff --git a/src/thermophysicalModels/liquids/C3H8/C3H8I.H b/src/thermophysicalModels/liquidProperties/C3H8/C3H8I.H
similarity index 97%
rename from src/thermophysicalModels/liquids/C3H8/C3H8I.H
rename to src/thermophysicalModels/liquidProperties/C3H8/C3H8I.H
index e298bae4c98..677d96bfa26 100644
--- a/src/thermophysicalModels/liquids/C3H8/C3H8I.H
+++ b/src/thermophysicalModels/liquidProperties/C3H8/C3H8I.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/src/thermophysicalModels/liquids/C4H10O/C4H10O.C b/src/thermophysicalModels/liquidProperties/C4H10O/C4H10O.C
similarity index 91%
rename from src/thermophysicalModels/liquids/C4H10O/C4H10O.C
rename to src/thermophysicalModels/liquidProperties/C4H10O/C4H10O.C
index c2ce36e90ca..34237ac91b4 100644
--- a/src/thermophysicalModels/liquids/C4H10O/C4H10O.C
+++ b/src/thermophysicalModels/liquidProperties/C4H10O/C4H10O.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -31,16 +31,16 @@ License
namespace Foam
{
defineTypeNameAndDebug(C4H10O, 0);
- addToRunTimeSelectionTable(liquid, C4H10O,);
- addToRunTimeSelectionTable(liquid, C4H10O, Istream);
- addToRunTimeSelectionTable(liquid, C4H10O, dictionary);
+ addToRunTimeSelectionTable(liquidProperties, C4H10O,);
+ addToRunTimeSelectionTable(liquidProperties, C4H10O, Istream);
+ addToRunTimeSelectionTable(liquidProperties, C4H10O, dictionary);
}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
Foam::C4H10O::C4H10O()
:
- liquid
+ liquidProperties
(
74.123,
466.70,
@@ -95,7 +95,7 @@ Foam::C4H10O::C4H10O()
Foam::C4H10O::C4H10O
(
- const liquid& l,
+ const liquidProperties& l,
const NSRDSfunc5& density,
const NSRDSfunc1& vapourPressure,
const NSRDSfunc6& heatOfVapourisation,
@@ -111,7 +111,7 @@ Foam::C4H10O::C4H10O
const APIdiffCoefFunc& vapourDiffussivity
)
:
- liquid(l),
+ liquidProperties(l),
rho_(density),
pv_(vapourPressure),
hl_(heatOfVapourisation),
@@ -130,7 +130,7 @@ Foam::C4H10O::C4H10O
Foam::C4H10O::C4H10O(Istream& is)
:
- liquid(is),
+ liquidProperties(is),
rho_(is),
pv_(is),
hl_(is),
@@ -149,7 +149,7 @@ Foam::C4H10O::C4H10O(Istream& is)
Foam::C4H10O::C4H10O(const dictionary& dict)
:
- liquid(dict),
+ liquidProperties(dict),
rho_(dict.subDict("rho")),
pv_(dict.subDict("pv")),
hl_(dict.subDict("hl")),
@@ -168,7 +168,7 @@ Foam::C4H10O::C4H10O(const dictionary& dict)
Foam::C4H10O::C4H10O(const C4H10O& liq)
:
- liquid(liq),
+ liquidProperties(liq),
rho_(liq.rho_),
pv_(liq.pv_),
hl_(liq.hl_),
diff --git a/src/thermophysicalModels/liquids/C4H10O/C4H10O.H b/src/thermophysicalModels/liquidProperties/C4H10O/C4H10O.H
similarity index 94%
rename from src/thermophysicalModels/liquids/C4H10O/C4H10O.H
rename to src/thermophysicalModels/liquidProperties/C4H10O/C4H10O.H
index f07cdbc8d49..9a1ab395c4d 100644
--- a/src/thermophysicalModels/liquids/C4H10O/C4H10O.H
+++ b/src/thermophysicalModels/liquidProperties/C4H10O/C4H10O.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -35,7 +35,7 @@ SourceFiles
#ifndef C4H10O_H
#define C4H10O_H
-#include "liquid.H"
+#include "liquidProperties.H"
#include "NSRDSfunc0.H"
#include "NSRDSfunc1.H"
#include "NSRDSfunc2.H"
@@ -58,7 +58,7 @@ namespace Foam
class C4H10O
:
- public liquid
+ public liquidProperties
{
// Private data
@@ -91,7 +91,7 @@ public:
//- Construct from components
C4H10O
(
- const liquid& l,
+ const liquidProperties& l,
const NSRDSfunc5& density,
const NSRDSfunc1& vapourPressure,
const NSRDSfunc6& heatOfVapourisation,
@@ -117,9 +117,9 @@ public:
C4H10O(const C4H10O& liq);
//- Construct and return clone
- virtual autoPtr<liquid> clone() const
+ virtual autoPtr<liquidProperties> clone() const
{
- return autoPtr<liquid>(new C4H10O(*this));
+ return autoPtr<liquidProperties>(new C4H10O(*this));
}
@@ -173,7 +173,7 @@ public:
//- Write the function coefficients
void writeData(Ostream& os) const
{
- liquid::writeData(os); os << nl;
+ liquidProperties::writeData(os); os << nl;
rho_.writeData(os); os << nl;
pv_.writeData(os); os << nl;
hl_.writeData(os); os << nl;
diff --git a/src/thermophysicalModels/liquids/C4H10O/C4H10OI.H b/src/thermophysicalModels/liquidProperties/C4H10O/C4H10OI.H
similarity index 97%
rename from src/thermophysicalModels/liquids/C4H10O/C4H10OI.H
rename to src/thermophysicalModels/liquidProperties/C4H10O/C4H10OI.H
index e3737774a15..e594fbc5501 100644
--- a/src/thermophysicalModels/liquids/C4H10O/C4H10OI.H
+++ b/src/thermophysicalModels/liquidProperties/C4H10O/C4H10OI.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/src/thermophysicalModels/liquids/C6H14/C6H14.C b/src/thermophysicalModels/liquidProperties/C6H14/C6H14.C
similarity index 91%
rename from src/thermophysicalModels/liquids/C6H14/C6H14.C
rename to src/thermophysicalModels/liquidProperties/C6H14/C6H14.C
index 810ddfa781a..7bb4e2cb68d 100644
--- a/src/thermophysicalModels/liquids/C6H14/C6H14.C
+++ b/src/thermophysicalModels/liquidProperties/C6H14/C6H14.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -31,16 +31,16 @@ License
namespace Foam
{
defineTypeNameAndDebug(C6H14, 0);
- addToRunTimeSelectionTable(liquid, C6H14,);
- addToRunTimeSelectionTable(liquid, C6H14, Istream);
- addToRunTimeSelectionTable(liquid, C6H14, dictionary);
+ addToRunTimeSelectionTable(liquidProperties, C6H14,);
+ addToRunTimeSelectionTable(liquidProperties, C6H14, Istream);
+ addToRunTimeSelectionTable(liquidProperties, C6H14, dictionary);
}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
Foam::C6H14::C6H14()
:
- liquid
+ liquidProperties
(
86.177,
507.60,
@@ -95,7 +95,7 @@ Foam::C6H14::C6H14()
Foam::C6H14::C6H14
(
- const liquid& l,
+ const liquidProperties& l,
const NSRDSfunc5& density,
const NSRDSfunc1& vapourPressure,
const NSRDSfunc6& heatOfVapourisation,
@@ -111,7 +111,7 @@ Foam::C6H14::C6H14
const APIdiffCoefFunc& vapourDiffussivity
)
:
- liquid(l),
+ liquidProperties(l),
rho_(density),
pv_(vapourPressure),
hl_(heatOfVapourisation),
@@ -130,7 +130,7 @@ Foam::C6H14::C6H14
Foam::C6H14::C6H14(Istream& is)
:
- liquid(is),
+ liquidProperties(is),
rho_(is),
pv_(is),
hl_(is),
@@ -149,7 +149,7 @@ Foam::C6H14::C6H14(Istream& is)
Foam::C6H14::C6H14(const dictionary& dict)
:
- liquid(dict),
+ liquidProperties(dict),
rho_(dict.subDict("rho")),
pv_(dict.subDict("pv")),
hl_(dict.subDict("hl")),
@@ -168,7 +168,7 @@ Foam::C6H14::C6H14(const dictionary& dict)
Foam::C6H14::C6H14(const C6H14& liq)
:
- liquid(liq),
+ liquidProperties(liq),
rho_(liq.rho_),
pv_(liq.pv_),
hl_(liq.hl_),
diff --git a/src/thermophysicalModels/liquids/C6H14/C6H14.H b/src/thermophysicalModels/liquidProperties/C6H14/C6H14.H
similarity index 94%
rename from src/thermophysicalModels/liquids/C6H14/C6H14.H
rename to src/thermophysicalModels/liquidProperties/C6H14/C6H14.H
index 339a7d5e287..3734d712dca 100644
--- a/src/thermophysicalModels/liquids/C6H14/C6H14.H
+++ b/src/thermophysicalModels/liquidProperties/C6H14/C6H14.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -35,7 +35,7 @@ SourceFiles
#ifndef C6H14_H
#define C6H14_H
-#include "liquid.H"
+#include "liquidProperties.H"
#include "NSRDSfunc0.H"
#include "NSRDSfunc1.H"
#include "NSRDSfunc2.H"
@@ -58,7 +58,7 @@ namespace Foam
class C6H14
:
- public liquid
+ public liquidProperties
{
// Private data
@@ -91,7 +91,7 @@ public:
//- Construct from components
C6H14
(
- const liquid& l,
+ const liquidProperties& l,
const NSRDSfunc5& density,
const NSRDSfunc1& vapourPressure,
const NSRDSfunc6& heatOfVapourisation,
@@ -117,9 +117,9 @@ public:
C6H14(const C6H14& liq);
//- Construct and return clone
- virtual autoPtr<liquid> clone() const
+ virtual autoPtr<liquidProperties> clone() const
{
- return autoPtr<liquid>(new C6H14(*this));
+ return autoPtr<liquidProperties>(new C6H14(*this));
}
@@ -173,7 +173,7 @@ public:
//- Write the function coefficients
void writeData(Ostream& os) const
{
- liquid::writeData(os); os << nl;
+ liquidProperties::writeData(os); os << nl;
rho_.writeData(os); os << nl;
pv_.writeData(os); os << nl;
hl_.writeData(os); os << nl;
diff --git a/src/thermophysicalModels/liquids/C6H14/C6H14I.H b/src/thermophysicalModels/liquidProperties/C6H14/C6H14I.H
similarity index 97%
rename from src/thermophysicalModels/liquids/C6H14/C6H14I.H
rename to src/thermophysicalModels/liquidProperties/C6H14/C6H14I.H
index 66f3bfe53e7..db5ef7878f7 100644
--- a/src/thermophysicalModels/liquids/C6H14/C6H14I.H
+++ b/src/thermophysicalModels/liquidProperties/C6H14/C6H14I.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/src/thermophysicalModels/liquids/C6H6/C6H6.C b/src/thermophysicalModels/liquidProperties/C6H6/C6H6.C
similarity index 91%
rename from src/thermophysicalModels/liquids/C6H6/C6H6.C
rename to src/thermophysicalModels/liquidProperties/C6H6/C6H6.C
index bb340e8223d..2285c1fa7dc 100644
--- a/src/thermophysicalModels/liquids/C6H6/C6H6.C
+++ b/src/thermophysicalModels/liquidProperties/C6H6/C6H6.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -31,16 +31,16 @@ License
namespace Foam
{
defineTypeNameAndDebug(C6H6, 0);
- addToRunTimeSelectionTable(liquid, C6H6,);
- addToRunTimeSelectionTable(liquid, C6H6, Istream);
- addToRunTimeSelectionTable(liquid, C6H6, dictionary);
+ addToRunTimeSelectionTable(liquidProperties, C6H6,);
+ addToRunTimeSelectionTable(liquidProperties, C6H6, Istream);
+ addToRunTimeSelectionTable(liquidProperties, C6H6, dictionary);
}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
Foam::C6H6::C6H6()
:
- liquid
+ liquidProperties
(
78.114,
562.16,
@@ -95,7 +95,7 @@ Foam::C6H6::C6H6()
Foam::C6H6::C6H6
(
- const liquid& l,
+ const liquidProperties& l,
const NSRDSfunc5& density,
const NSRDSfunc1& vapourPressure,
const NSRDSfunc6& heatOfVapourisation,
@@ -111,7 +111,7 @@ Foam::C6H6::C6H6
const APIdiffCoefFunc& vapourDiffussivity
)
:
- liquid(l),
+ liquidProperties(l),
rho_(density),
pv_(vapourPressure),
hl_(heatOfVapourisation),
@@ -130,7 +130,7 @@ Foam::C6H6::C6H6
Foam::C6H6::C6H6(Istream& is)
:
- liquid(is),
+ liquidProperties(is),
rho_(is),
pv_(is),
hl_(is),
@@ -149,7 +149,7 @@ Foam::C6H6::C6H6(Istream& is)
Foam::C6H6::C6H6(const dictionary& dict)
:
- liquid(dict),
+ liquidProperties(dict),
rho_(dict.subDict("rho")),
pv_(dict.subDict("pv")),
hl_(dict.subDict("hl")),
@@ -168,7 +168,7 @@ Foam::C6H6::C6H6(const dictionary& dict)
Foam::C6H6::C6H6(const C6H6& liq)
:
- liquid(liq),
+ liquidProperties(liq),
rho_(liq.rho_),
pv_(liq.pv_),
hl_(liq.hl_),
diff --git a/src/thermophysicalModels/liquids/C6H6/C6H6.H b/src/thermophysicalModels/liquidProperties/C6H6/C6H6.H
similarity index 94%
rename from src/thermophysicalModels/liquids/C6H6/C6H6.H
rename to src/thermophysicalModels/liquidProperties/C6H6/C6H6.H
index 8364eeb7726..0eb4935bf5d 100644
--- a/src/thermophysicalModels/liquids/C6H6/C6H6.H
+++ b/src/thermophysicalModels/liquidProperties/C6H6/C6H6.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -35,7 +35,7 @@ SourceFiles
#ifndef C6H6_H
#define C6H6_H
-#include "liquid.H"
+#include "liquidProperties.H"
#include "NSRDSfunc0.H"
#include "NSRDSfunc1.H"
#include "NSRDSfunc2.H"
@@ -58,7 +58,7 @@ namespace Foam
class C6H6
:
- public liquid
+ public liquidProperties
{
// Private data
@@ -91,7 +91,7 @@ public:
//- Comstruct from components
C6H6
(
- const liquid& l,
+ const liquidProperties& l,
const NSRDSfunc5& density,
const NSRDSfunc1& vapourPressure,
const NSRDSfunc6& heatOfVapourisation,
@@ -117,9 +117,9 @@ public:
C6H6(const C6H6& liq);
//- Construct and return clone
- virtual autoPtr<liquid> clone() const
+ virtual autoPtr<liquidProperties> clone() const
{
- return autoPtr<liquid>(new C6H6(*this));
+ return autoPtr<liquidProperties>(new C6H6(*this));
}
@@ -173,7 +173,7 @@ public:
//- Write the function coefficients
void writeData(Ostream& os) const
{
- liquid::writeData(os); os << nl;
+ liquidProperties::writeData(os); os << nl;
rho_.writeData(os); os << nl;
pv_.writeData(os); os << nl;
hl_.writeData(os); os << nl;
diff --git a/src/thermophysicalModels/liquids/C6H6/C6H6I.H b/src/thermophysicalModels/liquidProperties/C6H6/C6H6I.H
similarity index 97%
rename from src/thermophysicalModels/liquids/C6H6/C6H6I.H
rename to src/thermophysicalModels/liquidProperties/C6H6/C6H6I.H
index e304faf9c9b..90eb54e1a1d 100644
--- a/src/thermophysicalModels/liquids/C6H6/C6H6I.H
+++ b/src/thermophysicalModels/liquidProperties/C6H6/C6H6I.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/src/thermophysicalModels/liquids/C7H16/C7H16.C b/src/thermophysicalModels/liquidProperties/C7H16/C7H16.C
similarity index 91%
rename from src/thermophysicalModels/liquids/C7H16/C7H16.C
rename to src/thermophysicalModels/liquidProperties/C7H16/C7H16.C
index 996a6e8bcb9..8a316775bc4 100644
--- a/src/thermophysicalModels/liquids/C7H16/C7H16.C
+++ b/src/thermophysicalModels/liquidProperties/C7H16/C7H16.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -31,16 +31,16 @@ License
namespace Foam
{
defineTypeNameAndDebug(C7H16, 0);
- addToRunTimeSelectionTable(liquid, C7H16,);
- addToRunTimeSelectionTable(liquid, C7H16, Istream);
- addToRunTimeSelectionTable(liquid, C7H16, dictionary);
+ addToRunTimeSelectionTable(liquidProperties, C7H16,);
+ addToRunTimeSelectionTable(liquidProperties, C7H16, Istream);
+ addToRunTimeSelectionTable(liquidProperties, C7H16, dictionary);
}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
Foam::C7H16::C7H16()
:
- liquid
+ liquidProperties
(
100.204,
540.20,
@@ -94,7 +94,7 @@ Foam::C7H16::C7H16()
Foam::C7H16::C7H16
(
- const liquid& l,
+ const liquidProperties& l,
const NSRDSfunc5& density,
const NSRDSfunc1& vapourPressure,
const NSRDSfunc6& heatOfVapourisation,
@@ -110,7 +110,7 @@ Foam::C7H16::C7H16
const APIdiffCoefFunc& vapourDiffussivity
)
:
- liquid(l),
+ liquidProperties(l),
rho_(density),
pv_(vapourPressure),
hl_(heatOfVapourisation),
@@ -129,7 +129,7 @@ Foam::C7H16::C7H16
Foam::C7H16::C7H16(Istream& is)
:
- liquid(is),
+ liquidProperties(is),
rho_(is),
pv_(is),
hl_(is),
@@ -148,7 +148,7 @@ Foam::C7H16::C7H16(Istream& is)
Foam::C7H16::C7H16(const dictionary& dict)
:
- liquid(dict),
+ liquidProperties(dict),
rho_(dict.subDict("rho")),
pv_(dict.subDict("pv")),
hl_(dict.subDict("hl")),
@@ -167,7 +167,7 @@ Foam::C7H16::C7H16(const dictionary& dict)
Foam::C7H16::C7H16(const C7H16& liq)
:
- liquid(liq),
+ liquidProperties(liq),
rho_(liq.rho_),
pv_(liq.pv_),
hl_(liq.hl_),
diff --git a/src/thermophysicalModels/liquids/C7H16/C7H16.H b/src/thermophysicalModels/liquidProperties/C7H16/C7H16.H
similarity index 94%
rename from src/thermophysicalModels/liquids/C7H16/C7H16.H
rename to src/thermophysicalModels/liquidProperties/C7H16/C7H16.H
index bee4f0d3ca5..00a0b8a3a22 100644
--- a/src/thermophysicalModels/liquids/C7H16/C7H16.H
+++ b/src/thermophysicalModels/liquidProperties/C7H16/C7H16.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -35,7 +35,7 @@ SourceFiles
#ifndef C7H16_H
#define C7H16_H
-#include "liquid.H"
+#include "liquidProperties.H"
#include "NSRDSfunc0.H"
#include "NSRDSfunc1.H"
#include "NSRDSfunc2.H"
@@ -58,7 +58,7 @@ namespace Foam
class C7H16
:
- public liquid
+ public liquidProperties
{
// Private data
@@ -91,7 +91,7 @@ public:
//- Construct from components
C7H16
(
- const liquid& l,
+ const liquidProperties& l,
const NSRDSfunc5& density,
const NSRDSfunc1& vapourPressure,
const NSRDSfunc6& heatOfVapourisation,
@@ -117,9 +117,9 @@ public:
C7H16(const C7H16& liq);
//- Construct and return clone
- virtual autoPtr<liquid> clone() const
+ virtual autoPtr<liquidProperties> clone() const
{
- return autoPtr<liquid>(new C7H16(*this));
+ return autoPtr<liquidProperties>(new C7H16(*this));
}
@@ -173,7 +173,7 @@ public:
//- Write the function coefficients
void writeData(Ostream& os) const
{
- liquid::writeData(os); os << nl;
+ liquidProperties::writeData(os); os << nl;
rho_.writeData(os); os << nl;
pv_.writeData(os); os << nl;
hl_.writeData(os); os << nl;
diff --git a/src/thermophysicalModels/liquids/C7H16/C7H16I.H b/src/thermophysicalModels/liquidProperties/C7H16/C7H16I.H
similarity index 97%
rename from src/thermophysicalModels/liquids/C7H16/C7H16I.H
rename to src/thermophysicalModels/liquidProperties/C7H16/C7H16I.H
index a6fb5425058..e258a4595b8 100644
--- a/src/thermophysicalModels/liquids/C7H16/C7H16I.H
+++ b/src/thermophysicalModels/liquidProperties/C7H16/C7H16I.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/src/thermophysicalModels/liquids/C7H8/C7H8.C b/src/thermophysicalModels/liquidProperties/C7H8/C7H8.C
similarity index 91%
rename from src/thermophysicalModels/liquids/C7H8/C7H8.C
rename to src/thermophysicalModels/liquidProperties/C7H8/C7H8.C
index 7bdfe8a6e61..86f38fc2ca0 100644
--- a/src/thermophysicalModels/liquids/C7H8/C7H8.C
+++ b/src/thermophysicalModels/liquidProperties/C7H8/C7H8.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -31,16 +31,16 @@ License
namespace Foam
{
defineTypeNameAndDebug(C7H8, 0);
- addToRunTimeSelectionTable(liquid, C7H8,);
- addToRunTimeSelectionTable(liquid, C7H8, Istream);
- addToRunTimeSelectionTable(liquid, C7H8, dictionary);
+ addToRunTimeSelectionTable(liquidProperties, C7H8,);
+ addToRunTimeSelectionTable(liquidProperties, C7H8, Istream);
+ addToRunTimeSelectionTable(liquidProperties, C7H8, dictionary);
}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
Foam::C7H8::C7H8()
:
- liquid
+ liquidProperties
(
92.141,
591.79,
@@ -95,7 +95,7 @@ Foam::C7H8::C7H8()
Foam::C7H8::C7H8
(
- const liquid& l,
+ const liquidProperties& l,
const NSRDSfunc5& density,
const NSRDSfunc1& vapourPressure,
const NSRDSfunc6& heatOfVapourisation,
@@ -111,7 +111,7 @@ Foam::C7H8::C7H8
const APIdiffCoefFunc& vapourDiffussivity
)
:
- liquid(l),
+ liquidProperties(l),
rho_(density),
pv_(vapourPressure),
hl_(heatOfVapourisation),
@@ -130,7 +130,7 @@ Foam::C7H8::C7H8
Foam::C7H8::C7H8(Istream& is)
:
- liquid(is),
+ liquidProperties(is),
rho_(is),
pv_(is),
hl_(is),
@@ -149,7 +149,7 @@ Foam::C7H8::C7H8(Istream& is)
Foam::C7H8::C7H8(const dictionary& dict)
:
- liquid(dict),
+ liquidProperties(dict),
rho_(dict.subDict("rho")),
pv_(dict.subDict("pv")),
hl_(dict.subDict("hl")),
@@ -168,7 +168,7 @@ Foam::C7H8::C7H8(const dictionary& dict)
Foam::C7H8::C7H8(const C7H8& liq)
:
- liquid(liq),
+ liquidProperties(liq),
rho_(liq.rho_),
pv_(liq.pv_),
hl_(liq.hl_),
diff --git a/src/thermophysicalModels/liquids/C7H8/C7H8.H b/src/thermophysicalModels/liquidProperties/C7H8/C7H8.H
similarity index 94%
rename from src/thermophysicalModels/liquids/C7H8/C7H8.H
rename to src/thermophysicalModels/liquidProperties/C7H8/C7H8.H
index 67602dc2c89..6e8541115df 100644
--- a/src/thermophysicalModels/liquids/C7H8/C7H8.H
+++ b/src/thermophysicalModels/liquidProperties/C7H8/C7H8.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -35,7 +35,7 @@ SourceFiles
#ifndef C7H8_H
#define C7H8_H
-#include "liquid.H"
+#include "liquidProperties.H"
#include "NSRDSfunc0.H"
#include "NSRDSfunc1.H"
#include "NSRDSfunc2.H"
@@ -58,7 +58,7 @@ namespace Foam
class C7H8
:
- public liquid
+ public liquidProperties
{
// Private data
@@ -91,7 +91,7 @@ public:
//- Construct from components
C7H8
(
- const liquid& l,
+ const liquidProperties& l,
const NSRDSfunc5& density,
const NSRDSfunc1& vapourPressure,
const NSRDSfunc6& heatOfVapourisation,
@@ -117,9 +117,9 @@ public:
C7H8(const C7H8& liq);
//- Construct and return clone
- virtual autoPtr<liquid> clone() const
+ virtual autoPtr<liquidProperties> clone() const
{
- return autoPtr<liquid>(new C7H8(*this));
+ return autoPtr<liquidProperties>(new C7H8(*this));
}
@@ -173,7 +173,7 @@ public:
//- Write the function coefficients
void writeData(Ostream& os) const
{
- liquid::writeData(os); os << nl;
+ liquidProperties::writeData(os); os << nl;
rho_.writeData(os); os << nl;
pv_.writeData(os); os << nl;
hl_.writeData(os); os << nl;
diff --git a/src/thermophysicalModels/liquids/C7H8/C7H8I.H b/src/thermophysicalModels/liquidProperties/C7H8/C7H8I.H
similarity index 97%
rename from src/thermophysicalModels/liquids/C7H8/C7H8I.H
rename to src/thermophysicalModels/liquidProperties/C7H8/C7H8I.H
index 0f22c1bdbdb..0ca76b67a7a 100644
--- a/src/thermophysicalModels/liquids/C7H8/C7H8I.H
+++ b/src/thermophysicalModels/liquidProperties/C7H8/C7H8I.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/src/thermophysicalModels/liquids/C8H10/C8H10.C b/src/thermophysicalModels/liquidProperties/C8H10/C8H10.C
similarity index 91%
rename from src/thermophysicalModels/liquids/C8H10/C8H10.C
rename to src/thermophysicalModels/liquidProperties/C8H10/C8H10.C
index 056d1e3b29e..409e3690a93 100644
--- a/src/thermophysicalModels/liquids/C8H10/C8H10.C
+++ b/src/thermophysicalModels/liquidProperties/C8H10/C8H10.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -31,16 +31,16 @@ License
namespace Foam
{
defineTypeNameAndDebug(C8H10, 0);
- addToRunTimeSelectionTable(liquid, C8H10,);
- addToRunTimeSelectionTable(liquid, C8H10, Istream);
- addToRunTimeSelectionTable(liquid, C8H10, dictionary);
+ addToRunTimeSelectionTable(liquidProperties, C8H10,);
+ addToRunTimeSelectionTable(liquidProperties, C8H10, Istream);
+ addToRunTimeSelectionTable(liquidProperties, C8H10, dictionary);
}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
Foam::C8H10::C8H10()
:
- liquid
+ liquidProperties
(
106.167,
617.17,
@@ -95,7 +95,7 @@ Foam::C8H10::C8H10()
Foam::C8H10::C8H10
(
- const liquid& l,
+ const liquidProperties& l,
const NSRDSfunc5& density,
const NSRDSfunc1& vapourPressure,
const NSRDSfunc6& heatOfVapourisation,
@@ -111,7 +111,7 @@ Foam::C8H10::C8H10
const APIdiffCoefFunc& vapourDiffussivity
)
:
- liquid(l),
+ liquidProperties(l),
rho_(density),
pv_(vapourPressure),
hl_(heatOfVapourisation),
@@ -130,7 +130,7 @@ Foam::C8H10::C8H10
Foam::C8H10::C8H10(Istream& is)
:
- liquid(is),
+ liquidProperties(is),
rho_(is),
pv_(is),
hl_(is),
@@ -149,7 +149,7 @@ Foam::C8H10::C8H10(Istream& is)
Foam::C8H10::C8H10(const dictionary& dict)
:
- liquid(dict),
+ liquidProperties(dict),
rho_(dict.subDict("rho")),
pv_(dict.subDict("pv")),
hl_(dict.subDict("hl")),
@@ -168,7 +168,7 @@ Foam::C8H10::C8H10(const dictionary& dict)
Foam::C8H10::C8H10(const C8H10& liq)
:
- liquid(liq),
+ liquidProperties(liq),
rho_(liq.rho_),
pv_(liq.pv_),
hl_(liq.hl_),
diff --git a/src/thermophysicalModels/liquids/C8H10/C8H10.H b/src/thermophysicalModels/liquidProperties/C8H10/C8H10.H
similarity index 94%
rename from src/thermophysicalModels/liquids/C8H10/C8H10.H
rename to src/thermophysicalModels/liquidProperties/C8H10/C8H10.H
index 985171794ea..1c2b0bc5dbf 100644
--- a/src/thermophysicalModels/liquids/C8H10/C8H10.H
+++ b/src/thermophysicalModels/liquidProperties/C8H10/C8H10.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -35,7 +35,7 @@ SourceFiles
#ifndef C8H10_H
#define C8H10_H
-#include "liquid.H"
+#include "liquidProperties.H"
#include "NSRDSfunc0.H"
#include "NSRDSfunc1.H"
#include "NSRDSfunc2.H"
@@ -57,7 +57,7 @@ namespace Foam
class C8H10
:
- public liquid
+ public liquidProperties
{
// Private data
@@ -90,7 +90,7 @@ public:
// Construct from components
C8H10
(
- const liquid& l,
+ const liquidProperties& l,
const NSRDSfunc5& density,
const NSRDSfunc1& vapourPressure,
const NSRDSfunc6& heatOfVapourisation,
@@ -116,9 +116,9 @@ public:
C8H10(const C8H10& liq);
//- Construct and return clone
- virtual autoPtr<liquid> clone() const
+ virtual autoPtr<liquidProperties> clone() const
{
- return autoPtr<liquid>(new C8H10(*this));
+ return autoPtr<liquidProperties>(new C8H10(*this));
}
@@ -172,7 +172,7 @@ public:
//- Write the function coefficients
void writeData(Ostream& os) const
{
- liquid::writeData(os); os << nl;
+ liquidProperties::writeData(os); os << nl;
rho_.writeData(os); os << nl;
pv_.writeData(os); os << nl;
hl_.writeData(os); os << nl;
diff --git a/src/thermophysicalModels/liquids/C8H10/C8H10I.H b/src/thermophysicalModels/liquidProperties/C8H10/C8H10I.H
similarity index 97%
rename from src/thermophysicalModels/liquids/C8H10/C8H10I.H
rename to src/thermophysicalModels/liquidProperties/C8H10/C8H10I.H
index 7f1efbb3d28..46eaca6e871 100644
--- a/src/thermophysicalModels/liquids/C8H10/C8H10I.H
+++ b/src/thermophysicalModels/liquidProperties/C8H10/C8H10I.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/src/thermophysicalModels/liquids/C8H18/C8H18.C b/src/thermophysicalModels/liquidProperties/C8H18/C8H18.C
similarity index 91%
rename from src/thermophysicalModels/liquids/C8H18/C8H18.C
rename to src/thermophysicalModels/liquidProperties/C8H18/C8H18.C
index 3a51caf792a..414bea27f6e 100644
--- a/src/thermophysicalModels/liquids/C8H18/C8H18.C
+++ b/src/thermophysicalModels/liquidProperties/C8H18/C8H18.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -31,16 +31,16 @@ License
namespace Foam
{
defineTypeNameAndDebug(C8H18, 0);
- addToRunTimeSelectionTable(liquid, C8H18,);
- addToRunTimeSelectionTable(liquid, C8H18, Istream);
- addToRunTimeSelectionTable(liquid, C8H18, dictionary);
+ addToRunTimeSelectionTable(liquidProperties, C8H18,);
+ addToRunTimeSelectionTable(liquidProperties, C8H18, Istream);
+ addToRunTimeSelectionTable(liquidProperties, C8H18, dictionary);
}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
Foam::C8H18::C8H18()
:
- liquid
+ liquidProperties
(
114.231,
568.70,
@@ -95,7 +95,7 @@ Foam::C8H18::C8H18()
Foam::C8H18::C8H18
(
- const liquid& l,
+ const liquidProperties& l,
const NSRDSfunc5& density,
const NSRDSfunc1& vapourPressure,
const NSRDSfunc6& heatOfVapourisation,
@@ -111,7 +111,7 @@ Foam::C8H18::C8H18
const APIdiffCoefFunc& vapourDiffussivity
)
:
- liquid(l),
+ liquidProperties(l),
rho_(density),
pv_(vapourPressure),
hl_(heatOfVapourisation),
@@ -130,7 +130,7 @@ Foam::C8H18::C8H18
Foam::C8H18::C8H18(Istream& is)
:
- liquid(is),
+ liquidProperties(is),
rho_(is),
pv_(is),
hl_(is),
@@ -149,7 +149,7 @@ Foam::C8H18::C8H18(Istream& is)
Foam::C8H18::C8H18(const dictionary& dict)
:
- liquid(dict),
+ liquidProperties(dict),
rho_(dict.subDict("rho")),
pv_(dict.subDict("pv")),
hl_(dict.subDict("hl")),
@@ -168,7 +168,7 @@ Foam::C8H18::C8H18(const dictionary& dict)
Foam::C8H18::C8H18(const C8H18& liq)
:
- liquid(liq),
+ liquidProperties(liq),
rho_(liq.rho_),
pv_(liq.pv_),
hl_(liq.hl_),
diff --git a/src/thermophysicalModels/liquids/C8H18/C8H18.H b/src/thermophysicalModels/liquidProperties/C8H18/C8H18.H
similarity index 94%
rename from src/thermophysicalModels/liquids/C8H18/C8H18.H
rename to src/thermophysicalModels/liquidProperties/C8H18/C8H18.H
index 2be91bf4d5a..5b841caa28b 100644
--- a/src/thermophysicalModels/liquids/C8H18/C8H18.H
+++ b/src/thermophysicalModels/liquidProperties/C8H18/C8H18.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -35,7 +35,7 @@ SourceFiles
#ifndef C8H18_H
#define C8H18_H
-#include "liquid.H"
+#include "liquidProperties.H"
#include "NSRDSfunc0.H"
#include "NSRDSfunc1.H"
#include "NSRDSfunc2.H"
@@ -58,7 +58,7 @@ namespace Foam
class C8H18
:
- public liquid
+ public liquidProperties
{
// Private data
@@ -91,7 +91,7 @@ public:
//- Construct from components
C8H18
(
- const liquid& l,
+ const liquidProperties& l,
const NSRDSfunc5& density,
const NSRDSfunc1& vapourPressure,
const NSRDSfunc6& heatOfVapourisation,
@@ -117,9 +117,9 @@ public:
C8H18(const C8H18& liq);
//- Construct and return clone
- virtual autoPtr<liquid> clone() const
+ virtual autoPtr<liquidProperties> clone() const
{
- return autoPtr<liquid>(new C8H18(*this));
+ return autoPtr<liquidProperties>(new C8H18(*this));
}
@@ -173,7 +173,7 @@ public:
//- Write the function coefficients
void writeData(Ostream& os) const
{
- liquid::writeData(os); os << nl;
+ liquidProperties::writeData(os); os << nl;
rho_.writeData(os); os << nl;
pv_.writeData(os); os << nl;
hl_.writeData(os); os << nl;
diff --git a/src/thermophysicalModels/liquids/C8H18/C8H18I.H b/src/thermophysicalModels/liquidProperties/C8H18/C8H18I.H
similarity index 97%
rename from src/thermophysicalModels/liquids/C8H18/C8H18I.H
rename to src/thermophysicalModels/liquidProperties/C8H18/C8H18I.H
index 5be416de684..ebbb6b78bdb 100644
--- a/src/thermophysicalModels/liquids/C8H18/C8H18I.H
+++ b/src/thermophysicalModels/liquidProperties/C8H18/C8H18I.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/src/thermophysicalModels/liquids/C9H20/C9H20.C b/src/thermophysicalModels/liquidProperties/C9H20/C9H20.C
similarity index 91%
rename from src/thermophysicalModels/liquids/C9H20/C9H20.C
rename to src/thermophysicalModels/liquidProperties/C9H20/C9H20.C
index 2e321ded79a..5090f573b49 100644
--- a/src/thermophysicalModels/liquids/C9H20/C9H20.C
+++ b/src/thermophysicalModels/liquidProperties/C9H20/C9H20.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -31,16 +31,16 @@ License
namespace Foam
{
defineTypeNameAndDebug(C9H20, 0);
- addToRunTimeSelectionTable(liquid, C9H20,);
- addToRunTimeSelectionTable(liquid, C9H20, Istream);
- addToRunTimeSelectionTable(liquid, C9H20, dictionary);
+ addToRunTimeSelectionTable(liquidProperties, C9H20,);
+ addToRunTimeSelectionTable(liquidProperties, C9H20, Istream);
+ addToRunTimeSelectionTable(liquidProperties, C9H20, dictionary);
}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
Foam::C9H20::C9H20()
:
- liquid
+ liquidProperties
(
128.258,
594.60,
@@ -95,7 +95,7 @@ Foam::C9H20::C9H20()
Foam::C9H20::C9H20
(
- const liquid& l,
+ const liquidProperties& l,
const NSRDSfunc5& density,
const NSRDSfunc1& vapourPressure,
const NSRDSfunc6& heatOfVapourisation,
@@ -111,7 +111,7 @@ Foam::C9H20::C9H20
const APIdiffCoefFunc& vapourDiffussivity
)
:
- liquid(l),
+ liquidProperties(l),
rho_(density),
pv_(vapourPressure),
hl_(heatOfVapourisation),
@@ -130,7 +130,7 @@ Foam::C9H20::C9H20
Foam::C9H20::C9H20(Istream& is)
:
- liquid(is),
+ liquidProperties(is),
rho_(is),
pv_(is),
hl_(is),
@@ -149,7 +149,7 @@ Foam::C9H20::C9H20(Istream& is)
Foam::C9H20::C9H20(const dictionary& dict)
:
- liquid(dict),
+ liquidProperties(dict),
rho_(dict.subDict("rho")),
pv_(dict.subDict("pv")),
hl_(dict.subDict("hl")),
@@ -168,7 +168,7 @@ Foam::C9H20::C9H20(const dictionary& dict)
Foam::C9H20::C9H20(const C9H20& liq)
:
- liquid(liq),
+ liquidProperties(liq),
rho_(liq.rho_),
pv_(liq.pv_),
hl_(liq.hl_),
diff --git a/src/thermophysicalModels/liquids/C9H20/C9H20.H b/src/thermophysicalModels/liquidProperties/C9H20/C9H20.H
similarity index 94%
rename from src/thermophysicalModels/liquids/C9H20/C9H20.H
rename to src/thermophysicalModels/liquidProperties/C9H20/C9H20.H
index 5f4f17fd89a..9d03c03970c 100644
--- a/src/thermophysicalModels/liquids/C9H20/C9H20.H
+++ b/src/thermophysicalModels/liquidProperties/C9H20/C9H20.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -35,7 +35,7 @@ SourceFiles
#ifndef C9H20_H
#define C9H20_H
-#include "liquid.H"
+#include "liquidProperties.H"
#include "NSRDSfunc0.H"
#include "NSRDSfunc1.H"
#include "NSRDSfunc2.H"
@@ -58,7 +58,7 @@ namespace Foam
class C9H20
:
- public liquid
+ public liquidProperties
{
// Private data
@@ -91,7 +91,7 @@ public:
//- Construct from components
C9H20
(
- const liquid& l,
+ const liquidProperties& l,
const NSRDSfunc5& density,
const NSRDSfunc1& vapourPressure,
const NSRDSfunc6& heatOfVapourisation,
@@ -117,9 +117,9 @@ public:
C9H20(const C9H20& liq);
//- Construct and return clone
- virtual autoPtr<liquid> clone() const
+ virtual autoPtr<liquidProperties> clone() const
{
- return autoPtr<liquid>(new C9H20(*this));
+ return autoPtr<liquidProperties>(new C9H20(*this));
}
@@ -173,7 +173,7 @@ public:
//- Write the function coefficients
void writeData(Ostream& os) const
{
- liquid::writeData(os); os << nl;
+ liquidProperties::writeData(os); os << nl;
rho_.writeData(os); os << nl;
pv_.writeData(os); os << nl;
hl_.writeData(os); os << nl;
diff --git a/src/thermophysicalModels/liquids/C9H20/C9H20I.H b/src/thermophysicalModels/liquidProperties/C9H20/C9H20I.H
similarity index 97%
rename from src/thermophysicalModels/liquids/C9H20/C9H20I.H
rename to src/thermophysicalModels/liquidProperties/C9H20/C9H20I.H
index dce3a0f9ebd..7c7c63c864d 100644
--- a/src/thermophysicalModels/liquids/C9H20/C9H20I.H
+++ b/src/thermophysicalModels/liquidProperties/C9H20/C9H20I.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/src/thermophysicalModels/liquids/CH3OH/CH3OH.C b/src/thermophysicalModels/liquidProperties/CH3OH/CH3OH.C
similarity index 91%
rename from src/thermophysicalModels/liquids/CH3OH/CH3OH.C
rename to src/thermophysicalModels/liquidProperties/CH3OH/CH3OH.C
index 594a867e73c..3859bed3ec2 100644
--- a/src/thermophysicalModels/liquids/CH3OH/CH3OH.C
+++ b/src/thermophysicalModels/liquidProperties/CH3OH/CH3OH.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -31,16 +31,16 @@ License
namespace Foam
{
defineTypeNameAndDebug(CH3OH, 0);
- addToRunTimeSelectionTable(liquid, CH3OH,);
- addToRunTimeSelectionTable(liquid, CH3OH, Istream);
- addToRunTimeSelectionTable(liquid, CH3OH, dictionary);
+ addToRunTimeSelectionTable(liquidProperties, CH3OH,);
+ addToRunTimeSelectionTable(liquidProperties, CH3OH, Istream);
+ addToRunTimeSelectionTable(liquidProperties, CH3OH, dictionary);
}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
Foam::CH3OH::CH3OH()
:
- liquid
+ liquidProperties
(
32.042,
512.58,
@@ -95,7 +95,7 @@ Foam::CH3OH::CH3OH()
Foam::CH3OH::CH3OH
(
- const liquid& l,
+ const liquidProperties& l,
const NSRDSfunc5& density,
const NSRDSfunc1& vapourPressure,
const NSRDSfunc6& heatOfVapourisation,
@@ -111,7 +111,7 @@ Foam::CH3OH::CH3OH
const APIdiffCoefFunc& vapourDiffussivity
)
:
- liquid(l),
+ liquidProperties(l),
rho_(density),
pv_(vapourPressure),
hl_(heatOfVapourisation),
@@ -130,7 +130,7 @@ Foam::CH3OH::CH3OH
Foam::CH3OH::CH3OH(Istream& is)
:
- liquid(is),
+ liquidProperties(is),
rho_(is),
pv_(is),
hl_(is),
@@ -149,7 +149,7 @@ Foam::CH3OH::CH3OH(Istream& is)
Foam::CH3OH::CH3OH(const dictionary& dict)
:
- liquid(dict),
+ liquidProperties(dict),
rho_(dict.subDict("rho")),
pv_(dict.subDict("pv")),
hl_(dict.subDict("hl")),
@@ -168,7 +168,7 @@ Foam::CH3OH::CH3OH(const dictionary& dict)
Foam::CH3OH::CH3OH(const CH3OH& liq)
:
- liquid(liq),
+ liquidProperties(liq),
rho_(liq.rho_),
pv_(liq.pv_),
hl_(liq.hl_),
diff --git a/src/thermophysicalModels/liquids/CH3OH/CH3OH.H b/src/thermophysicalModels/liquidProperties/CH3OH/CH3OH.H
similarity index 94%
rename from src/thermophysicalModels/liquids/CH3OH/CH3OH.H
rename to src/thermophysicalModels/liquidProperties/CH3OH/CH3OH.H
index 3ba851ba788..d334e240b66 100644
--- a/src/thermophysicalModels/liquids/CH3OH/CH3OH.H
+++ b/src/thermophysicalModels/liquidProperties/CH3OH/CH3OH.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -35,7 +35,7 @@ SourceFiles
#ifndef CH3OH_H
#define CH3OH_H
-#include "liquid.H"
+#include "liquidProperties.H"
#include "NSRDSfunc0.H"
#include "NSRDSfunc1.H"
#include "NSRDSfunc2.H"
@@ -58,7 +58,7 @@ namespace Foam
class CH3OH
:
- public liquid
+ public liquidProperties
{
// Private data
@@ -91,7 +91,7 @@ public:
//- Construct from components
CH3OH
(
- const liquid& l,
+ const liquidProperties& l,
const NSRDSfunc5& density,
const NSRDSfunc1& vapourPressure,
const NSRDSfunc6& heatOfVapourisation,
@@ -117,9 +117,9 @@ public:
CH3OH(const CH3OH& liq);
//- Construct and return clone
- virtual autoPtr<liquid> clone() const
+ virtual autoPtr<liquidProperties> clone() const
{
- return autoPtr<liquid>(new CH3OH(*this));
+ return autoPtr<liquidProperties>(new CH3OH(*this));
}
@@ -173,7 +173,7 @@ public:
//- Write the function coefficients
void writeData(Ostream& os) const
{
- liquid::writeData(os); os << nl;
+ liquidProperties::writeData(os); os << nl;
rho_.writeData(os); os << nl;
pv_.writeData(os); os << nl;
hl_.writeData(os); os << nl;
diff --git a/src/thermophysicalModels/liquids/CH3OH/CH3OHI.H b/src/thermophysicalModels/liquidProperties/CH3OH/CH3OHI.H
similarity index 97%
rename from src/thermophysicalModels/liquids/CH3OH/CH3OHI.H
rename to src/thermophysicalModels/liquidProperties/CH3OH/CH3OHI.H
index 0a3bf14e9eb..aece4b536b0 100644
--- a/src/thermophysicalModels/liquids/CH3OH/CH3OHI.H
+++ b/src/thermophysicalModels/liquidProperties/CH3OH/CH3OHI.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/src/thermophysicalModels/liquids/CH4N2O/CH4N2O.C b/src/thermophysicalModels/liquidProperties/CH4N2O/CH4N2O.C
similarity index 91%
rename from src/thermophysicalModels/liquids/CH4N2O/CH4N2O.C
rename to src/thermophysicalModels/liquidProperties/CH4N2O/CH4N2O.C
index b40f001006d..8d0b407cef2 100644
--- a/src/thermophysicalModels/liquids/CH4N2O/CH4N2O.C
+++ b/src/thermophysicalModels/liquidProperties/CH4N2O/CH4N2O.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -32,16 +32,16 @@ License
namespace Foam
{
defineTypeNameAndDebug(CH4N2O, 0);
- addToRunTimeSelectionTable(liquid, CH4N2O,);
- addToRunTimeSelectionTable(liquid, CH4N2O, Istream);
- addToRunTimeSelectionTable(liquid, CH4N2O, dictionary);
+ addToRunTimeSelectionTable(liquidProperties, CH4N2O,);
+ addToRunTimeSelectionTable(liquidProperties, CH4N2O, Istream);
+ addToRunTimeSelectionTable(liquidProperties, CH4N2O, dictionary);
}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
Foam::CH4N2O::CH4N2O()
:
- liquid
+ liquidProperties
(
60.056,
705.0,
@@ -80,7 +80,7 @@ Foam::CH4N2O::CH4N2O()
Foam::CH4N2O::CH4N2O
(
- const liquid& l,
+ const liquidProperties& l,
const NSRDSfunc0& density,
const NSRDSfunc1& vapourPressure,
const NSRDSfunc6& heatOfVapourisation,
@@ -96,7 +96,7 @@ Foam::CH4N2O::CH4N2O
const APIdiffCoefFunc& vapourDiffussivity
)
:
- liquid(l),
+ liquidProperties(l),
rho_(density),
pv_(vapourPressure),
hl_(heatOfVapourisation),
@@ -115,7 +115,7 @@ Foam::CH4N2O::CH4N2O
Foam::CH4N2O::CH4N2O(Istream& is)
:
- liquid(is),
+ liquidProperties(is),
rho_(is),
pv_(is),
hl_(is),
@@ -134,7 +134,7 @@ Foam::CH4N2O::CH4N2O(Istream& is)
Foam::CH4N2O::CH4N2O(const dictionary& dict)
:
- liquid(dict),
+ liquidProperties(dict),
rho_(dict.subDict("rho")),
pv_(dict.subDict("pv")),
hl_(dict.subDict("hl")),
@@ -153,7 +153,7 @@ Foam::CH4N2O::CH4N2O(const dictionary& dict)
Foam::CH4N2O::CH4N2O(const CH4N2O& liq)
:
- liquid(liq),
+ liquidProperties(liq),
rho_(liq.rho_),
pv_(liq.pv_),
hl_(liq.hl_),
diff --git a/src/thermophysicalModels/liquids/CH4N2O/CH4N2O.H b/src/thermophysicalModels/liquidProperties/CH4N2O/CH4N2O.H
similarity index 94%
rename from src/thermophysicalModels/liquids/CH4N2O/CH4N2O.H
rename to src/thermophysicalModels/liquidProperties/CH4N2O/CH4N2O.H
index 84bfd189547..62d5c8b7eb3 100644
--- a/src/thermophysicalModels/liquids/CH4N2O/CH4N2O.H
+++ b/src/thermophysicalModels/liquidProperties/CH4N2O/CH4N2O.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -36,7 +36,7 @@ SourceFiles
#ifndef CH4N2O_H
#define CH4N2O_H
-#include "liquid.H"
+#include "liquidProperties.H"
#include "NSRDSfunc0.H"
#include "NSRDSfunc1.H"
#include "NSRDSfunc2.H"
@@ -59,7 +59,7 @@ namespace Foam
class CH4N2O
:
- public liquid
+ public liquidProperties
{
// Private data
@@ -91,7 +91,7 @@ public:
//- Construct from components
CH4N2O
(
- const liquid& l,
+ const liquidProperties& l,
const NSRDSfunc0& density,
const NSRDSfunc1& vapourPressure,
const NSRDSfunc6& heatOfVapourisation,
@@ -117,9 +117,9 @@ public:
CH4N2O(const CH4N2O& liq);
//- Construct and return clone
- virtual autoPtr<liquid> clone() const
+ virtual autoPtr<liquidProperties> clone() const
{
- return autoPtr<liquid>(new CH4N2O(*this));
+ return autoPtr<liquidProperties>(new CH4N2O(*this));
}
@@ -173,7 +173,7 @@ public:
//- Write the function coefficients
void writeData(Ostream& os) const
{
- liquid::writeData(os); os << nl;
+ liquidProperties::writeData(os); os << nl;
rho_.writeData(os); os << nl;
pv_.writeData(os); os << nl;
hl_.writeData(os); os << nl;
@@ -210,4 +210,3 @@ public:
#endif
// ************************************************************************* //
-
diff --git a/src/thermophysicalModels/liquids/CH4N2O/CH4N2OI.H b/src/thermophysicalModels/liquidProperties/CH4N2O/CH4N2OI.H
similarity index 97%
rename from src/thermophysicalModels/liquids/CH4N2O/CH4N2OI.H
rename to src/thermophysicalModels/liquidProperties/CH4N2O/CH4N2OI.H
index 82b06c85865..439644a4ec3 100644
--- a/src/thermophysicalModels/liquids/CH4N2O/CH4N2OI.H
+++ b/src/thermophysicalModels/liquidProperties/CH4N2O/CH4N2OI.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/src/thermophysicalModels/liquids/H2O/H2O.C b/src/thermophysicalModels/liquidProperties/H2O/H2O.C
similarity index 91%
rename from src/thermophysicalModels/liquids/H2O/H2O.C
rename to src/thermophysicalModels/liquidProperties/H2O/H2O.C
index 0f1b2824bbd..9edb17df630 100644
--- a/src/thermophysicalModels/liquids/H2O/H2O.C
+++ b/src/thermophysicalModels/liquidProperties/H2O/H2O.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -31,16 +31,16 @@ License
namespace Foam
{
defineTypeNameAndDebug(H2O, 0);
- addToRunTimeSelectionTable(liquid, H2O,);
- addToRunTimeSelectionTable(liquid, H2O, Istream);
- addToRunTimeSelectionTable(liquid, H2O, dictionary);
+ addToRunTimeSelectionTable(liquidProperties, H2O,);
+ addToRunTimeSelectionTable(liquidProperties, H2O, Istream);
+ addToRunTimeSelectionTable(liquidProperties, H2O, dictionary);
}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
Foam::H2O::H2O()
:
- liquid
+ liquidProperties
(
18.015,
647.13,
@@ -102,7 +102,7 @@ Foam::H2O::H2O()
Foam::H2O::H2O
(
- const liquid& l,
+ const liquidProperties& l,
const NSRDSfunc5& density,
const NSRDSfunc1& vapourPressure,
const NSRDSfunc6& heatOfVapourisation,
@@ -118,7 +118,7 @@ Foam::H2O::H2O
const APIdiffCoefFunc& vapourDiffussivity
)
:
- liquid(l),
+ liquidProperties(l),
rho_(density),
pv_(vapourPressure),
hl_(heatOfVapourisation),
@@ -137,7 +137,7 @@ Foam::H2O::H2O
Foam::H2O::H2O(Istream& is)
:
- liquid(is),
+ liquidProperties(is),
rho_(is),
pv_(is),
hl_(is),
@@ -156,7 +156,7 @@ Foam::H2O::H2O(Istream& is)
Foam::H2O::H2O(const dictionary& dict)
:
- liquid(dict),
+ liquidProperties(dict),
rho_(dict.subDict("rho")),
pv_(dict.subDict("pv")),
hl_(dict.subDict("hl")),
@@ -175,7 +175,7 @@ Foam::H2O::H2O(const dictionary& dict)
Foam::H2O::H2O(const H2O& liq)
:
- liquid(liq),
+ liquidProperties(liq),
rho_(liq.rho_),
pv_(liq.pv_),
hl_(liq.hl_),
diff --git a/src/thermophysicalModels/liquids/H2O/H2O.H b/src/thermophysicalModels/liquidProperties/H2O/H2O.H
similarity index 94%
rename from src/thermophysicalModels/liquids/H2O/H2O.H
rename to src/thermophysicalModels/liquidProperties/H2O/H2O.H
index 66ab3d33c61..4925bdc819f 100644
--- a/src/thermophysicalModels/liquids/H2O/H2O.H
+++ b/src/thermophysicalModels/liquidProperties/H2O/H2O.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -35,7 +35,7 @@ SourceFiles
#ifndef H2O_H
#define H2O_H
-#include "liquid.H"
+#include "liquidProperties.H"
#include "NSRDSfunc0.H"
#include "NSRDSfunc1.H"
#include "NSRDSfunc2.H"
@@ -57,7 +57,7 @@ namespace Foam
class H2O
:
- public liquid
+ public liquidProperties
{
// Private data
@@ -90,7 +90,7 @@ public:
//- Construct from components
H2O
(
- const liquid& l,
+ const liquidProperties& l,
const NSRDSfunc5& density,
const NSRDSfunc1& vapourPressure,
const NSRDSfunc6& heatOfVapourisation,
@@ -116,9 +116,9 @@ public:
H2O(const H2O& liq);
//- Construct and return clone
- virtual autoPtr<liquid> clone() const
+ virtual autoPtr<liquidProperties> clone() const
{
- return autoPtr<liquid>(new H2O(*this));
+ return autoPtr<liquidProperties>(new H2O(*this));
}
@@ -172,7 +172,7 @@ public:
//- Write the function coefficients
void writeData(Ostream& os) const
{
- liquid::writeData(os); os << nl;
+ liquidProperties::writeData(os); os << nl;
rho_.writeData(os); os << nl;
pv_.writeData(os); os << nl;
hl_.writeData(os); os << nl;
diff --git a/src/thermophysicalModels/liquids/H2O/H2OI.H b/src/thermophysicalModels/liquidProperties/H2O/H2OI.H
similarity index 97%
rename from src/thermophysicalModels/liquids/H2O/H2OI.H
rename to src/thermophysicalModels/liquidProperties/H2O/H2OI.H
index dc9346da3f5..1b450b62892 100644
--- a/src/thermophysicalModels/liquids/H2O/H2OI.H
+++ b/src/thermophysicalModels/liquidProperties/H2O/H2OI.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/src/thermophysicalModels/liquids/IC8H18/IC8H18.C b/src/thermophysicalModels/liquidProperties/IC8H18/IC8H18.C
similarity index 91%
rename from src/thermophysicalModels/liquids/IC8H18/IC8H18.C
rename to src/thermophysicalModels/liquidProperties/IC8H18/IC8H18.C
index 223d1e4538c..13760594220 100644
--- a/src/thermophysicalModels/liquids/IC8H18/IC8H18.C
+++ b/src/thermophysicalModels/liquidProperties/IC8H18/IC8H18.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -31,16 +31,16 @@ License
namespace Foam
{
defineTypeNameAndDebug(IC8H18, 0);
- addToRunTimeSelectionTable(liquid, IC8H18,);
- addToRunTimeSelectionTable(liquid, IC8H18, Istream);
- addToRunTimeSelectionTable(liquid, IC8H18, dictionary);
+ addToRunTimeSelectionTable(liquidProperties, IC8H18,);
+ addToRunTimeSelectionTable(liquidProperties, IC8H18, Istream);
+ addToRunTimeSelectionTable(liquidProperties, IC8H18, dictionary);
}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
Foam::IC8H18::IC8H18()
:
- liquid
+ liquidProperties
(
114.231,
543.96,
@@ -95,7 +95,7 @@ Foam::IC8H18::IC8H18()
Foam::IC8H18::IC8H18
(
- const liquid& l,
+ const liquidProperties& l,
const NSRDSfunc5& density,
const NSRDSfunc1& vapourPressure,
const NSRDSfunc6& heatOfVapourisation,
@@ -111,7 +111,7 @@ Foam::IC8H18::IC8H18
const APIdiffCoefFunc& vapourDiffussivity
)
:
- liquid(l),
+ liquidProperties(l),
rho_(density),
pv_(vapourPressure),
hl_(heatOfVapourisation),
@@ -130,7 +130,7 @@ Foam::IC8H18::IC8H18
Foam::IC8H18::IC8H18(Istream& is)
:
- liquid(is),
+ liquidProperties(is),
rho_(is),
pv_(is),
hl_(is),
@@ -149,7 +149,7 @@ Foam::IC8H18::IC8H18(Istream& is)
Foam::IC8H18::IC8H18(const dictionary& dict)
:
- liquid(dict),
+ liquidProperties(dict),
rho_(dict.subDict("rho")),
pv_(dict.subDict("pv")),
hl_(dict.subDict("hl")),
@@ -168,7 +168,7 @@ Foam::IC8H18::IC8H18(const dictionary& dict)
Foam::IC8H18::IC8H18(const IC8H18& liq)
:
- liquid(liq),
+ liquidProperties(liq),
rho_(liq.rho_),
pv_(liq.pv_),
hl_(liq.hl_),
diff --git a/src/thermophysicalModels/liquids/IC8H18/IC8H18.H b/src/thermophysicalModels/liquidProperties/IC8H18/IC8H18.H
similarity index 94%
rename from src/thermophysicalModels/liquids/IC8H18/IC8H18.H
rename to src/thermophysicalModels/liquidProperties/IC8H18/IC8H18.H
index 33d67a06ef4..500fd6c1172 100644
--- a/src/thermophysicalModels/liquids/IC8H18/IC8H18.H
+++ b/src/thermophysicalModels/liquidProperties/IC8H18/IC8H18.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -35,7 +35,7 @@ SourceFiles
#ifndef IC8H18_H
#define IC8H18_H
-#include "liquid.H"
+#include "liquidProperties.H"
#include "NSRDSfunc0.H"
#include "NSRDSfunc1.H"
#include "NSRDSfunc2.H"
@@ -58,7 +58,7 @@ namespace Foam
class IC8H18
:
- public liquid
+ public liquidProperties
{
// Private data
@@ -91,7 +91,7 @@ public:
//- Construct from components
IC8H18
(
- const liquid& l,
+ const liquidProperties& l,
const NSRDSfunc5& density,
const NSRDSfunc1& vapourPressure,
const NSRDSfunc6& heatOfVapourisation,
@@ -117,9 +117,9 @@ public:
IC8H18(const IC8H18& liq);
//- Construct and return clone
- virtual autoPtr<liquid> clone() const
+ virtual autoPtr<liquidProperties> clone() const
{
- return autoPtr<liquid>(new IC8H18(*this));
+ return autoPtr<liquidProperties>(new IC8H18(*this));
}
@@ -173,7 +173,7 @@ public:
//- Write the function coefficients
void writeData(Ostream& os) const
{
- liquid::writeData(os); os << nl;
+ liquidProperties::writeData(os); os << nl;
rho_.writeData(os); os << nl;
pv_.writeData(os); os << nl;
hl_.writeData(os); os << nl;
diff --git a/src/thermophysicalModels/liquids/IC8H18/IC8H18I.H b/src/thermophysicalModels/liquidProperties/IC8H18/IC8H18I.H
similarity index 97%
rename from src/thermophysicalModels/liquids/IC8H18/IC8H18I.H
rename to src/thermophysicalModels/liquidProperties/IC8H18/IC8H18I.H
index 12b722922d1..806afaf6dc5 100644
--- a/src/thermophysicalModels/liquids/IC8H18/IC8H18I.H
+++ b/src/thermophysicalModels/liquidProperties/IC8H18/IC8H18I.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/src/thermophysicalModels/liquids/IDEA/IDEA.C b/src/thermophysicalModels/liquidProperties/IDEA/IDEA.C
similarity index 92%
rename from src/thermophysicalModels/liquids/IDEA/IDEA.C
rename to src/thermophysicalModels/liquidProperties/IDEA/IDEA.C
index 49470621e8c..3752a3e76f6 100644
--- a/src/thermophysicalModels/liquids/IDEA/IDEA.C
+++ b/src/thermophysicalModels/liquidProperties/IDEA/IDEA.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -31,16 +31,16 @@ License
namespace Foam
{
defineTypeNameAndDebug(IDEA, 0);
- addToRunTimeSelectionTable(liquid, IDEA,);
- addToRunTimeSelectionTable(liquid, IDEA, Istream);
- addToRunTimeSelectionTable(liquid, IDEA, dictionary);
+ addToRunTimeSelectionTable(liquidProperties, IDEA,);
+ addToRunTimeSelectionTable(liquidProperties, IDEA, Istream);
+ addToRunTimeSelectionTable(liquidProperties, IDEA, dictionary);
}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
Foam::IDEA::IDEA()
:
- liquid
+ liquidProperties
(
142.26,
618.074,
@@ -115,7 +115,7 @@ Foam::IDEA::IDEA()
Foam::IDEA::IDEA
(
- const liquid& l,
+ const liquidProperties& l,
const NSRDSfunc5& density,
const NSRDSfunc1& vapourPressure,
const NSRDSfunc6& heatOfVapourisation,
@@ -131,7 +131,7 @@ Foam::IDEA::IDEA
const APIdiffCoefFunc& vapourDiffussivity
)
:
- liquid(l),
+ liquidProperties(l),
rho_(density),
pv_(vapourPressure),
hl_(heatOfVapourisation),
@@ -150,7 +150,7 @@ Foam::IDEA::IDEA
Foam::IDEA::IDEA(Istream& is)
:
- liquid(is),
+ liquidProperties(is),
rho_(is),
pv_(is),
hl_(is),
@@ -169,7 +169,7 @@ Foam::IDEA::IDEA(Istream& is)
Foam::IDEA::IDEA(const dictionary& dict)
:
- liquid(dict),
+ liquidProperties(dict),
rho_(dict.subDict("rho")),
pv_(dict.subDict("pv")),
hl_(dict.subDict("hl")),
@@ -188,7 +188,7 @@ Foam::IDEA::IDEA(const dictionary& dict)
Foam::IDEA::IDEA(const IDEA& liq)
:
- liquid(liq),
+ liquidProperties(liq),
rho_(liq.rho_),
pv_(liq.pv_),
hl_(liq.hl_),
diff --git a/src/thermophysicalModels/liquids/IDEA/IDEA.H b/src/thermophysicalModels/liquidProperties/IDEA/IDEA.H
similarity index 95%
rename from src/thermophysicalModels/liquids/IDEA/IDEA.H
rename to src/thermophysicalModels/liquidProperties/IDEA/IDEA.H
index 476c7b8478a..e3a0ff4c1c6 100644
--- a/src/thermophysicalModels/liquids/IDEA/IDEA.H
+++ b/src/thermophysicalModels/liquidProperties/IDEA/IDEA.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -58,7 +58,7 @@ SourceFiles
#ifndef IDEA_H
#define IDEA_H
-#include "liquid.H"
+#include "liquidProperties.H"
#include "NSRDSfunc0.H"
#include "NSRDSfunc1.H"
#include "NSRDSfunc2.H"
@@ -80,7 +80,7 @@ namespace Foam
class IDEA
:
- public liquid
+ public liquidProperties
{
// Private data
@@ -113,7 +113,7 @@ public:
// Construct from components
IDEA
(
- const liquid& l,
+ const liquidProperties& l,
const NSRDSfunc5& density,
const NSRDSfunc1& vapourPressure,
const NSRDSfunc6& heatOfVapourisation,
@@ -139,9 +139,9 @@ public:
IDEA(const IDEA& liq);
//- Construct and return clone
- virtual autoPtr<liquid> clone() const
+ virtual autoPtr<liquidProperties> clone() const
{
- return autoPtr<liquid>(new IDEA(*this));
+ return autoPtr<liquidProperties>(new IDEA(*this));
}
@@ -195,7 +195,7 @@ public:
//- Write the function coefficients
void writeData(Ostream& os) const
{
- liquid::writeData(os); os << nl;
+ liquidProperties::writeData(os); os << nl;
rho_.writeData(os); os << nl;
pv_.writeData(os); os << nl;
hl_.writeData(os); os << nl;
diff --git a/src/thermophysicalModels/liquids/IDEA/IDEA.thermo b/src/thermophysicalModels/liquidProperties/IDEA/IDEA.thermo
similarity index 100%
rename from src/thermophysicalModels/liquids/IDEA/IDEA.thermo
rename to src/thermophysicalModels/liquidProperties/IDEA/IDEA.thermo
diff --git a/src/thermophysicalModels/liquids/IDEA/IDEAI.H b/src/thermophysicalModels/liquidProperties/IDEA/IDEAI.H
similarity index 97%
rename from src/thermophysicalModels/liquids/IDEA/IDEAI.H
rename to src/thermophysicalModels/liquidProperties/IDEA/IDEAI.H
index eb593b097a1..b99d39bab20 100644
--- a/src/thermophysicalModels/liquids/IDEA/IDEAI.H
+++ b/src/thermophysicalModels/liquidProperties/IDEA/IDEAI.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/src/thermophysicalModels/liquids/MB/MB.C b/src/thermophysicalModels/liquidProperties/MB/MB.C
similarity index 91%
rename from src/thermophysicalModels/liquids/MB/MB.C
rename to src/thermophysicalModels/liquidProperties/MB/MB.C
index e519492bda8..d5a39b1a4c8 100644
--- a/src/thermophysicalModels/liquids/MB/MB.C
+++ b/src/thermophysicalModels/liquidProperties/MB/MB.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -31,16 +31,16 @@ License
namespace Foam
{
defineTypeNameAndDebug(MB, 0);
- addToRunTimeSelectionTable(liquid, MB,);
- addToRunTimeSelectionTable(liquid, MB, Istream);
- addToRunTimeSelectionTable(liquid, MB, dictionary);
+ addToRunTimeSelectionTable(liquidProperties, MB,);
+ addToRunTimeSelectionTable(liquidProperties, MB, Istream);
+ addToRunTimeSelectionTable(liquidProperties, MB, dictionary);
}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
Foam::MB::MB()
:
- liquid
+ liquidProperties
(
102.133,
554.5,
@@ -79,7 +79,7 @@ Foam::MB::MB()
Foam::MB::MB
(
- const liquid& l,
+ const liquidProperties& l,
const NSRDSfunc5& density,
const NSRDSfunc1& vapourPressure,
const NSRDSfunc6& heatOfVapourisation,
@@ -95,7 +95,7 @@ Foam::MB::MB
const APIdiffCoefFunc& vapourDiffussivity
)
:
- liquid(l),
+ liquidProperties(l),
rho_(density),
pv_(vapourPressure),
hl_(heatOfVapourisation),
@@ -114,7 +114,7 @@ Foam::MB::MB
Foam::MB::MB(Istream& is)
:
- liquid(is),
+ liquidProperties(is),
rho_(is),
pv_(is),
hl_(is),
@@ -133,7 +133,7 @@ Foam::MB::MB(Istream& is)
Foam::MB::MB(const dictionary& dict)
:
- liquid(dict),
+ liquidProperties(dict),
rho_(dict.subDict("rho")),
pv_(dict.subDict("pv")),
hl_(dict.subDict("hl")),
@@ -152,7 +152,7 @@ Foam::MB::MB(const dictionary& dict)
Foam::MB::MB(const MB& liq)
:
- liquid(liq),
+ liquidProperties(liq),
rho_(liq.rho_),
pv_(liq.pv_),
hl_(liq.hl_),
diff --git a/src/thermophysicalModels/liquids/MB/MB.H b/src/thermophysicalModels/liquidProperties/MB/MB.H
similarity index 94%
rename from src/thermophysicalModels/liquids/MB/MB.H
rename to src/thermophysicalModels/liquidProperties/MB/MB.H
index bcea55a03b6..fa91d57f39c 100644
--- a/src/thermophysicalModels/liquids/MB/MB.H
+++ b/src/thermophysicalModels/liquidProperties/MB/MB.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -35,7 +35,7 @@ SourceFiles
#ifndef MB_H
#define MB_H
-#include "liquid.H"
+#include "liquidProperties.H"
#include "NSRDSfunc0.H"
#include "NSRDSfunc1.H"
#include "NSRDSfunc2.H"
@@ -58,7 +58,7 @@ namespace Foam
class MB
:
- public liquid
+ public liquidProperties
{
// Private data
@@ -91,7 +91,7 @@ public:
//- Construct from components
MB
(
- const liquid& l,
+ const liquidProperties& l,
const NSRDSfunc5& density,
const NSRDSfunc1& vapourPressure,
const NSRDSfunc6& heatOfVapourisation,
@@ -117,9 +117,9 @@ public:
MB(const MB& liq);
//- Construct and return clone
- virtual autoPtr<liquid> clone() const
+ virtual autoPtr<liquidProperties> clone() const
{
- return autoPtr<liquid>(new MB(*this));
+ return autoPtr<liquidProperties>(new MB(*this));
}
@@ -173,7 +173,7 @@ public:
//- Write the function coefficients
void writeData(Ostream& os) const
{
- liquid::writeData(os); os << nl;
+ liquidProperties::writeData(os); os << nl;
rho_.writeData(os); os << nl;
pv_.writeData(os); os << nl;
hl_.writeData(os); os << nl;
diff --git a/src/thermophysicalModels/liquids/MB/MBI.H b/src/thermophysicalModels/liquidProperties/MB/MBI.H
similarity index 97%
rename from src/thermophysicalModels/liquids/MB/MBI.H
rename to src/thermophysicalModels/liquidProperties/MB/MBI.H
index 0ad21a6942c..c7333766ad9 100644
--- a/src/thermophysicalModels/liquids/MB/MBI.H
+++ b/src/thermophysicalModels/liquidProperties/MB/MBI.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/src/thermophysicalModels/liquids/Make/files b/src/thermophysicalModels/liquidProperties/Make/files
similarity index 84%
rename from src/thermophysicalModels/liquids/Make/files
rename to src/thermophysicalModels/liquidProperties/Make/files
index e2f27128d52..9b6347d83ef 100644
--- a/src/thermophysicalModels/liquids/Make/files
+++ b/src/thermophysicalModels/liquidProperties/Make/files
@@ -1,4 +1,4 @@
-liquid/liquid.C
+liquidProperties/liquidProperties.C
H2O/H2O.C
C7H16/C7H16.C
C12H26/C12H26.C
@@ -30,4 +30,4 @@ CH4N2O/CH4N2O.C
nC3H8O/nC3H8O.C
iC3H8O/iC3H8O.C
-LIB = $(FOAM_LIBBIN)/libliquids
+LIB = $(FOAM_LIBBIN)/libliquidProperties
diff --git a/src/thermophysicalModels/liquids/Make/options b/src/thermophysicalModels/liquidProperties/Make/options
similarity index 100%
rename from src/thermophysicalModels/liquids/Make/options
rename to src/thermophysicalModels/liquidProperties/Make/options
diff --git a/src/thermophysicalModels/liquids/N2/N2.C b/src/thermophysicalModels/liquidProperties/N2/N2.C
similarity index 91%
rename from src/thermophysicalModels/liquids/N2/N2.C
rename to src/thermophysicalModels/liquidProperties/N2/N2.C
index dd7f6648df5..c6d36feddf5 100644
--- a/src/thermophysicalModels/liquids/N2/N2.C
+++ b/src/thermophysicalModels/liquidProperties/N2/N2.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -31,16 +31,16 @@ License
namespace Foam
{
defineTypeNameAndDebug(N2, 0);
- addToRunTimeSelectionTable(liquid, N2,);
- addToRunTimeSelectionTable(liquid, N2, Istream);
- addToRunTimeSelectionTable(liquid, N2, dictionary);
+ addToRunTimeSelectionTable(liquidProperties, N2,);
+ addToRunTimeSelectionTable(liquidProperties, N2, Istream);
+ addToRunTimeSelectionTable(liquidProperties, N2, dictionary);
}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
Foam::N2::N2()
:
- liquid
+ liquidProperties
(
28.014,
126.10,
@@ -95,7 +95,7 @@ Foam::N2::N2()
Foam::N2::N2
(
- const liquid& l,
+ const liquidProperties& l,
const NSRDSfunc5& density,
const NSRDSfunc1& vapourPressure,
const NSRDSfunc6& heatOfVapourisation,
@@ -111,7 +111,7 @@ Foam::N2::N2
const APIdiffCoefFunc& vapourDiffussivity
)
:
- liquid(l),
+ liquidProperties(l),
rho_(density),
pv_(vapourPressure),
hl_(heatOfVapourisation),
@@ -130,7 +130,7 @@ Foam::N2::N2
Foam::N2::N2(Istream& is)
:
- liquid(is),
+ liquidProperties(is),
rho_(is),
pv_(is),
hl_(is),
@@ -149,7 +149,7 @@ Foam::N2::N2(Istream& is)
Foam::N2::N2(const dictionary& dict)
:
- liquid(dict),
+ liquidProperties(dict),
rho_(dict.subDict("rho")),
pv_(dict.subDict("pv")),
hl_(dict.subDict("hl")),
@@ -168,7 +168,7 @@ Foam::N2::N2(const dictionary& dict)
Foam::N2::N2(const N2& liq)
:
- liquid(liq),
+ liquidProperties(liq),
rho_(liq.rho_),
pv_(liq.pv_),
hl_(liq.hl_),
diff --git a/src/thermophysicalModels/liquids/N2/N2.H b/src/thermophysicalModels/liquidProperties/N2/N2.H
similarity index 94%
rename from src/thermophysicalModels/liquids/N2/N2.H
rename to src/thermophysicalModels/liquidProperties/N2/N2.H
index f8a199661e1..94412e3beb0 100644
--- a/src/thermophysicalModels/liquids/N2/N2.H
+++ b/src/thermophysicalModels/liquidProperties/N2/N2.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -35,7 +35,7 @@ SourceFiles
#ifndef N2_H
#define N2_H
-#include "liquid.H"
+#include "liquidProperties.H"
#include "NSRDSfunc0.H"
#include "NSRDSfunc1.H"
#include "NSRDSfunc2.H"
@@ -58,7 +58,7 @@ namespace Foam
class N2
:
- public liquid
+ public liquidProperties
{
// Private data
@@ -91,7 +91,7 @@ public:
//- Construct from components
N2
(
- const liquid& l,
+ const liquidProperties& l,
const NSRDSfunc5& density,
const NSRDSfunc1& vapourPressure,
const NSRDSfunc6& heatOfVapourisation,
@@ -117,9 +117,9 @@ public:
N2(const N2& liq);
//- Construct and return clone
- virtual autoPtr<liquid> clone() const
+ virtual autoPtr<liquidProperties> clone() const
{
- return autoPtr<liquid>(new N2(*this));
+ return autoPtr<liquidProperties>(new N2(*this));
}
@@ -173,7 +173,7 @@ public:
//- Write the function coefficients
void writeData(Ostream& os) const
{
- liquid::writeData(os); os << nl;
+ liquidProperties::writeData(os); os << nl;
rho_.writeData(os); os << nl;
pv_.writeData(os); os << nl;
hl_.writeData(os); os << nl;
diff --git a/src/thermophysicalModels/liquids/N2/N2I.H b/src/thermophysicalModels/liquidProperties/N2/N2I.H
similarity index 97%
rename from src/thermophysicalModels/liquids/N2/N2I.H
rename to src/thermophysicalModels/liquidProperties/N2/N2I.H
index 5258c41bdf4..14b00cc7753 100644
--- a/src/thermophysicalModels/liquids/N2/N2I.H
+++ b/src/thermophysicalModels/liquidProperties/N2/N2I.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/src/thermophysicalModels/liquids/aC10H7CH3/aC10H7CH3.C b/src/thermophysicalModels/liquidProperties/aC10H7CH3/aC10H7CH3.C
similarity index 91%
rename from src/thermophysicalModels/liquids/aC10H7CH3/aC10H7CH3.C
rename to src/thermophysicalModels/liquidProperties/aC10H7CH3/aC10H7CH3.C
index ac355d3c006..8297a842abc 100644
--- a/src/thermophysicalModels/liquids/aC10H7CH3/aC10H7CH3.C
+++ b/src/thermophysicalModels/liquidProperties/aC10H7CH3/aC10H7CH3.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -31,16 +31,16 @@ License
namespace Foam
{
defineTypeNameAndDebug(aC10H7CH3, 0);
- addToRunTimeSelectionTable(liquid, aC10H7CH3,);
- addToRunTimeSelectionTable(liquid, aC10H7CH3, Istream);
- addToRunTimeSelectionTable(liquid, aC10H7CH3, dictionary);
+ addToRunTimeSelectionTable(liquidProperties, aC10H7CH3,);
+ addToRunTimeSelectionTable(liquidProperties, aC10H7CH3, Istream);
+ addToRunTimeSelectionTable(liquidProperties, aC10H7CH3, dictionary);
}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
Foam::aC10H7CH3::aC10H7CH3()
:
- liquid
+ liquidProperties
(
142.2,
772.04,
@@ -87,7 +87,7 @@ Foam::aC10H7CH3::aC10H7CH3()
Foam::aC10H7CH3::aC10H7CH3
(
- const liquid& l,
+ const liquidProperties& l,
const NSRDSfunc5& density,
const NSRDSfunc1& vapourPressure,
const NSRDSfunc6& heatOfVapourisation,
@@ -103,7 +103,7 @@ Foam::aC10H7CH3::aC10H7CH3
const APIdiffCoefFunc& vapourDiffussivity
)
:
- liquid(l),
+ liquidProperties(l),
rho_(density),
pv_(vapourPressure),
hl_(heatOfVapourisation),
@@ -122,7 +122,7 @@ Foam::aC10H7CH3::aC10H7CH3
Foam::aC10H7CH3::aC10H7CH3(Istream& is)
:
- liquid(is),
+ liquidProperties(is),
rho_(is),
pv_(is),
hl_(is),
@@ -141,7 +141,7 @@ Foam::aC10H7CH3::aC10H7CH3(Istream& is)
Foam::aC10H7CH3::aC10H7CH3(const dictionary& dict)
:
- liquid(dict),
+ liquidProperties(dict),
rho_(dict.subDict("rho")),
pv_(dict.subDict("pv")),
hl_(dict.subDict("hl")),
@@ -160,7 +160,7 @@ Foam::aC10H7CH3::aC10H7CH3(const dictionary& dict)
Foam::aC10H7CH3::aC10H7CH3(const aC10H7CH3& liq)
:
- liquid(liq),
+ liquidProperties(liq),
rho_(liq.rho_),
pv_(liq.pv_),
hl_(liq.hl_),
diff --git a/src/thermophysicalModels/liquids/aC10H7CH3/aC10H7CH3.H b/src/thermophysicalModels/liquidProperties/aC10H7CH3/aC10H7CH3.H
similarity index 94%
rename from src/thermophysicalModels/liquids/aC10H7CH3/aC10H7CH3.H
rename to src/thermophysicalModels/liquidProperties/aC10H7CH3/aC10H7CH3.H
index f53343aec05..3f93f4509b3 100644
--- a/src/thermophysicalModels/liquids/aC10H7CH3/aC10H7CH3.H
+++ b/src/thermophysicalModels/liquidProperties/aC10H7CH3/aC10H7CH3.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -35,7 +35,7 @@ SourceFiles
#ifndef aC10H7CH3_H
#define aC10H7CH3_H
-#include "liquid.H"
+#include "liquidProperties.H"
#include "NSRDSfunc0.H"
#include "NSRDSfunc1.H"
#include "NSRDSfunc2.H"
@@ -58,7 +58,7 @@ namespace Foam
class aC10H7CH3
:
- public liquid
+ public liquidProperties
{
// Private data
@@ -91,7 +91,7 @@ public:
//- Constrcut from components
aC10H7CH3
(
- const liquid& l,
+ const liquidProperties& l,
const NSRDSfunc5& density,
const NSRDSfunc1& vapourPressure,
const NSRDSfunc6& heatOfVapourisation,
@@ -117,9 +117,9 @@ public:
aC10H7CH3(const aC10H7CH3& liq);
//- Construct and return clone
- virtual autoPtr<liquid> clone() const
+ virtual autoPtr<liquidProperties> clone() const
{
- return autoPtr<liquid>(new aC10H7CH3(*this));
+ return autoPtr<liquidProperties>(new aC10H7CH3(*this));
}
@@ -173,7 +173,7 @@ public:
//- Write the function coefficients
void writeData(Ostream& os) const
{
- liquid::writeData(os); os << nl;
+ liquidProperties::writeData(os); os << nl;
rho_.writeData(os); os << nl;
pv_.writeData(os); os << nl;
hl_.writeData(os); os << nl;
diff --git a/src/thermophysicalModels/liquids/aC10H7CH3/aC10H7CH3I.H b/src/thermophysicalModels/liquidProperties/aC10H7CH3/aC10H7CH3I.H
similarity index 97%
rename from src/thermophysicalModels/liquids/aC10H7CH3/aC10H7CH3I.H
rename to src/thermophysicalModels/liquidProperties/aC10H7CH3/aC10H7CH3I.H
index 9ed32f011d5..1c858c47c07 100644
--- a/src/thermophysicalModels/liquids/aC10H7CH3/aC10H7CH3I.H
+++ b/src/thermophysicalModels/liquidProperties/aC10H7CH3/aC10H7CH3I.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/src/thermophysicalModels/liquids/bC10H7CH3/bC10H7CH3.C b/src/thermophysicalModels/liquidProperties/bC10H7CH3/bC10H7CH3.C
similarity index 91%
rename from src/thermophysicalModels/liquids/bC10H7CH3/bC10H7CH3.C
rename to src/thermophysicalModels/liquidProperties/bC10H7CH3/bC10H7CH3.C
index b0b5d82cc74..285633e3399 100644
--- a/src/thermophysicalModels/liquids/bC10H7CH3/bC10H7CH3.C
+++ b/src/thermophysicalModels/liquidProperties/bC10H7CH3/bC10H7CH3.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -31,16 +31,16 @@ License
namespace Foam
{
defineTypeNameAndDebug(bC10H7CH3, 0);
- addToRunTimeSelectionTable(liquid, bC10H7CH3,);
- addToRunTimeSelectionTable(liquid, bC10H7CH3, Istream);
- addToRunTimeSelectionTable(liquid, bC10H7CH3, dictionary);
+ addToRunTimeSelectionTable(liquidProperties, bC10H7CH3,);
+ addToRunTimeSelectionTable(liquidProperties, bC10H7CH3, Istream);
+ addToRunTimeSelectionTable(liquidProperties, bC10H7CH3, dictionary);
}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
Foam::bC10H7CH3::bC10H7CH3()
:
- liquid
+ liquidProperties
(
142.2,
761.0,
@@ -87,7 +87,7 @@ Foam::bC10H7CH3::bC10H7CH3()
Foam::bC10H7CH3::bC10H7CH3
(
- const liquid& l,
+ const liquidProperties& l,
const NSRDSfunc5& density,
const NSRDSfunc1& vapourPressure,
const NSRDSfunc6& heatOfVapourisation,
@@ -103,7 +103,7 @@ Foam::bC10H7CH3::bC10H7CH3
const APIdiffCoefFunc& vapourDiffussivity
)
:
- liquid(l),
+ liquidProperties(l),
rho_(density),
pv_(vapourPressure),
hl_(heatOfVapourisation),
@@ -122,7 +122,7 @@ Foam::bC10H7CH3::bC10H7CH3
Foam::bC10H7CH3::bC10H7CH3(Istream& is)
:
- liquid(is),
+ liquidProperties(is),
rho_(is),
pv_(is),
hl_(is),
@@ -141,7 +141,7 @@ Foam::bC10H7CH3::bC10H7CH3(Istream& is)
Foam::bC10H7CH3::bC10H7CH3(const dictionary& dict)
:
- liquid(dict),
+ liquidProperties(dict),
rho_(dict.subDict("rho")),
pv_(dict.subDict("pv")),
hl_(dict.subDict("hl")),
@@ -160,7 +160,7 @@ Foam::bC10H7CH3::bC10H7CH3(const dictionary& dict)
Foam::bC10H7CH3::bC10H7CH3(const bC10H7CH3& liq)
:
- liquid(liq),
+ liquidProperties(liq),
rho_(liq.rho_),
pv_(liq.pv_),
hl_(liq.hl_),
diff --git a/src/thermophysicalModels/liquids/bC10H7CH3/bC10H7CH3.H b/src/thermophysicalModels/liquidProperties/bC10H7CH3/bC10H7CH3.H
similarity index 94%
rename from src/thermophysicalModels/liquids/bC10H7CH3/bC10H7CH3.H
rename to src/thermophysicalModels/liquidProperties/bC10H7CH3/bC10H7CH3.H
index 6a0c08814c7..74989233e82 100644
--- a/src/thermophysicalModels/liquids/bC10H7CH3/bC10H7CH3.H
+++ b/src/thermophysicalModels/liquidProperties/bC10H7CH3/bC10H7CH3.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -35,7 +35,7 @@ SourceFiles
#ifndef bC10H7CH3_H
#define bC10H7CH3_H
-#include "liquid.H"
+#include "liquidProperties.H"
#include "NSRDSfunc0.H"
#include "NSRDSfunc1.H"
#include "NSRDSfunc2.H"
@@ -58,7 +58,7 @@ namespace Foam
class bC10H7CH3
:
- public liquid
+ public liquidProperties
{
// Private data
@@ -91,7 +91,7 @@ public:
//- Construct from components
bC10H7CH3
(
- const liquid& l,
+ const liquidProperties& l,
const NSRDSfunc5& density,
const NSRDSfunc1& vapourPressure,
const NSRDSfunc6& heatOfVapourisation,
@@ -117,9 +117,9 @@ public:
bC10H7CH3(const bC10H7CH3& liq);
//- Construct and return clone
- virtual autoPtr<liquid> clone() const
+ virtual autoPtr<liquidProperties> clone() const
{
- return autoPtr<liquid>(new bC10H7CH3(*this));
+ return autoPtr<liquidProperties>(new bC10H7CH3(*this));
}
@@ -173,7 +173,7 @@ public:
//- Write the function coefficients
void writeData(Ostream& os) const
{
- liquid::writeData(os); os << nl;
+ liquidProperties::writeData(os); os << nl;
rho_.writeData(os); os << nl;
pv_.writeData(os); os << nl;
hl_.writeData(os); os << nl;
diff --git a/src/thermophysicalModels/liquids/bC10H7CH3/bC10H7CH3I.H b/src/thermophysicalModels/liquidProperties/bC10H7CH3/bC10H7CH3I.H
similarity index 97%
rename from src/thermophysicalModels/liquids/bC10H7CH3/bC10H7CH3I.H
rename to src/thermophysicalModels/liquidProperties/bC10H7CH3/bC10H7CH3I.H
index bbe0558393b..7308518f995 100644
--- a/src/thermophysicalModels/liquids/bC10H7CH3/bC10H7CH3I.H
+++ b/src/thermophysicalModels/liquidProperties/bC10H7CH3/bC10H7CH3I.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/src/thermophysicalModels/liquids/iC3H8O/iC3H8O.C b/src/thermophysicalModels/liquidProperties/iC3H8O/iC3H8O.C
similarity index 91%
rename from src/thermophysicalModels/liquids/iC3H8O/iC3H8O.C
rename to src/thermophysicalModels/liquidProperties/iC3H8O/iC3H8O.C
index 83572b233f7..cb6f946aea8 100644
--- a/src/thermophysicalModels/liquids/iC3H8O/iC3H8O.C
+++ b/src/thermophysicalModels/liquidProperties/iC3H8O/iC3H8O.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -31,16 +31,16 @@ License
namespace Foam
{
defineTypeNameAndDebug(iC3H8O, 0);
- addToRunTimeSelectionTable(liquid, iC3H8O,);
- addToRunTimeSelectionTable(liquid, iC3H8O, Istream);
- addToRunTimeSelectionTable(liquid, iC3H8O, dictionary);
+ addToRunTimeSelectionTable(liquidProperties, iC3H8O,);
+ addToRunTimeSelectionTable(liquidProperties, iC3H8O, Istream);
+ addToRunTimeSelectionTable(liquidProperties, iC3H8O, dictionary);
}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
Foam::iC3H8O::iC3H8O()
:
- liquid
+ liquidProperties
(
60.096,
508.31,
@@ -95,7 +95,7 @@ Foam::iC3H8O::iC3H8O()
Foam::iC3H8O::iC3H8O
(
- const liquid& l,
+ const liquidProperties& l,
const NSRDSfunc5& density,
const NSRDSfunc1& vapourPressure,
const NSRDSfunc6& heatOfVapourisation,
@@ -111,7 +111,7 @@ Foam::iC3H8O::iC3H8O
const NSRDSfunc1& vapourDiffussivity
)
:
- liquid(l),
+ liquidProperties(l),
rho_(density),
pv_(vapourPressure),
hl_(heatOfVapourisation),
@@ -130,7 +130,7 @@ Foam::iC3H8O::iC3H8O
Foam::iC3H8O::iC3H8O(Istream& is)
:
- liquid(is),
+ liquidProperties(is),
rho_(is),
pv_(is),
hl_(is),
@@ -149,7 +149,7 @@ Foam::iC3H8O::iC3H8O(Istream& is)
Foam::iC3H8O::iC3H8O(const dictionary& dict)
:
- liquid(dict),
+ liquidProperties(dict),
rho_(dict.subDict("rho")),
pv_(dict.subDict("pv")),
hl_(dict.subDict("hl")),
@@ -168,7 +168,7 @@ Foam::iC3H8O::iC3H8O(const dictionary& dict)
Foam::iC3H8O::iC3H8O(const iC3H8O& liq)
:
- liquid(liq),
+ liquidProperties(liq),
rho_(liq.rho_),
pv_(liq.pv_),
hl_(liq.hl_),
diff --git a/src/thermophysicalModels/liquids/iC3H8O/iC3H8O.H b/src/thermophysicalModels/liquidProperties/iC3H8O/iC3H8O.H
similarity index 94%
rename from src/thermophysicalModels/liquids/iC3H8O/iC3H8O.H
rename to src/thermophysicalModels/liquidProperties/iC3H8O/iC3H8O.H
index 0f3e1b414d4..d1dbf718ca7 100644
--- a/src/thermophysicalModels/liquids/iC3H8O/iC3H8O.H
+++ b/src/thermophysicalModels/liquidProperties/iC3H8O/iC3H8O.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -35,7 +35,7 @@ SourceFiles
#ifndef iC3H8O_H
#define iC3H8O_H
-#include "liquid.H"
+#include "liquidProperties.H"
#include "NSRDSfunc0.H"
#include "NSRDSfunc1.H"
#include "NSRDSfunc2.H"
@@ -57,7 +57,7 @@ namespace Foam
class iC3H8O
:
- public liquid
+ public liquidProperties
{
// Private data
@@ -89,7 +89,7 @@ public:
//- Constrcut from components
iC3H8O
(
- const liquid& l,
+ const liquidProperties& l,
const NSRDSfunc5& density,
const NSRDSfunc1& vapourPressure,
const NSRDSfunc6& heatOfVapourisation,
@@ -115,9 +115,9 @@ public:
iC3H8O(const iC3H8O& liq);
//- Construct and return clone
- virtual autoPtr<liquid> clone() const
+ virtual autoPtr<liquidProperties> clone() const
{
- return autoPtr<liquid>(new iC3H8O(*this));
+ return autoPtr<liquidProperties>(new iC3H8O(*this));
}
@@ -172,7 +172,7 @@ public:
//- Write the function coefficients
void writeData(Ostream& os) const
{
- liquid::writeData(os); os << nl;
+ liquidProperties::writeData(os); os << nl;
rho_.writeData(os); os << nl;
pv_.writeData(os); os << nl;
hl_.writeData(os); os << nl;
diff --git a/src/thermophysicalModels/liquids/iC3H8O/iC3H8OI.H b/src/thermophysicalModels/liquidProperties/iC3H8O/iC3H8OI.H
similarity index 97%
rename from src/thermophysicalModels/liquids/iC3H8O/iC3H8OI.H
rename to src/thermophysicalModels/liquidProperties/iC3H8O/iC3H8OI.H
index 256ba7db2c1..81e4d1c20fc 100644
--- a/src/thermophysicalModels/liquids/iC3H8O/iC3H8OI.H
+++ b/src/thermophysicalModels/liquidProperties/iC3H8O/iC3H8OI.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/src/thermophysicalModels/liquidProperties/liquidProperties/liquidProperties.C b/src/thermophysicalModels/liquidProperties/liquidProperties/liquidProperties.C
new file mode 100644
index 00000000000..5806013778f
--- /dev/null
+++ b/src/thermophysicalModels/liquidProperties/liquidProperties/liquidProperties.C
@@ -0,0 +1,387 @@
+/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
+ \\ / O peration |
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
+ \\/ 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 <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "liquidProperties.H"
+#include "HashTable.H"
+#include "Switch.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+ defineTypeNameAndDebug(liquidProperties, 0);
+ defineRunTimeSelectionTable(liquidProperties,);
+ defineRunTimeSelectionTable(liquidProperties, Istream);
+ defineRunTimeSelectionTable(liquidProperties, dictionary);
+}
+
+// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
+
+Foam::liquidProperties::liquidProperties
+(
+ scalar W,
+ scalar Tc,
+ scalar Pc,
+ scalar Vc,
+ scalar Zc,
+ scalar Tt,
+ scalar Pt,
+ scalar Tb,
+ scalar dipm,
+ scalar omega,
+ scalar delta
+)
+:
+ W_(W),
+ Tc_(Tc),
+ Pc_(Pc),
+ Vc_(Vc),
+ Zc_(Zc),
+ Tt_(Tt),
+ Pt_(Pt),
+ Tb_(Tb),
+ dipm_(dipm),
+ omega_(omega),
+ delta_(delta)
+{}
+
+
+Foam::liquidProperties::liquidProperties(Istream& is)
+:
+ W_(readScalar(is)),
+ Tc_(readScalar(is)),
+ Pc_(readScalar(is)),
+ Vc_(readScalar(is)),
+ Zc_(readScalar(is)),
+ Tt_(readScalar(is)),
+ Pt_(readScalar(is)),
+ Tb_(readScalar(is)),
+ dipm_(readScalar(is)),
+ omega_(readScalar(is)),
+ delta_(readScalar(is))
+{}
+
+
+Foam::liquidProperties::liquidProperties(const dictionary& dict)
+:
+ W_(readScalar(dict.lookup("W"))),
+ Tc_(readScalar(dict.lookup("Tc"))),
+ Pc_(readScalar(dict.lookup("Pc"))),
+ Vc_(readScalar(dict.lookup("Vc"))),
+ Zc_(readScalar(dict.lookup("Zc"))),
+ Tt_(readScalar(dict.lookup("Tt"))),
+ Pt_(readScalar(dict.lookup("Pt"))),
+ Tb_(readScalar(dict.lookup("Tb"))),
+ dipm_(readScalar(dict.lookup("dipm"))),
+ omega_(readScalar(dict.lookup("omega"))),
+ delta_(readScalar(dict.lookup("delta")))
+{}
+
+
+Foam::liquidProperties::liquidProperties(const liquidProperties& liq)
+:
+ W_(liq.W_),
+ Tc_(liq.Tc_),
+ Pc_(liq.Pc_),
+ Vc_(liq.Vc_),
+ Zc_(liq.Zc_),
+ Tt_(liq.Tt_),
+ Pt_(liq.Pt_),
+ Tb_(liq.Tb_),
+ dipm_(liq.dipm_),
+ omega_(liq.omega_),
+ delta_(liq.delta_)
+{}
+
+
+// * * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * //
+
+Foam::autoPtr<Foam::liquidProperties> Foam::liquidProperties::New(Istream& is)
+{
+ if (debug)
+ {
+ Info<< "liquidProperties::New(Istream&): "
+ << "constructing liquidProperties" << endl;
+ }
+
+ const word liquidPropertiesType(is);
+ const word coeffs(is);
+
+ if (coeffs == "defaultCoeffs")
+ {
+ ConstructorTable::iterator cstrIter =
+ ConstructorTablePtr_->find(liquidPropertiesType);
+
+ if (cstrIter == ConstructorTablePtr_->end())
+ {
+ FatalErrorIn("liquidProperties::New(Istream&)")
+ << "Unknown liquidProperties type "
+ << liquidPropertiesType << nl << nl
+ << "Valid liquidProperties types are:" << nl
+ << ConstructorTablePtr_->sortedToc()
+ << abort(FatalError);
+ }
+
+ return autoPtr<liquidProperties>(cstrIter()());
+ }
+ else if (coeffs == "coeffs")
+ {
+ IstreamConstructorTable::iterator cstrIter =
+ IstreamConstructorTablePtr_->find(liquidPropertiesType);
+
+ if (cstrIter == IstreamConstructorTablePtr_->end())
+ {
+ FatalErrorIn("liquidProperties::New(Istream&)")
+ << "Unknown liquidProperties type "
+ << liquidPropertiesType << nl << nl
+ << "Valid liquidProperties types are:" << nl
+ << IstreamConstructorTablePtr_->sortedToc()
+ << abort(FatalError);
+ }
+
+ return autoPtr<liquidProperties>(cstrIter()(is));
+ }
+ else
+ {
+ FatalErrorIn("liquidProperties::New(Istream&)")
+ << "liquidProperties type " << liquidPropertiesType
+ << ", option " << coeffs << " given"
+ << ", should be coeffs or defaultCoeffs"
+ << abort(FatalError);
+
+ return autoPtr<liquidProperties>(NULL);
+ }
+}
+
+
+Foam::autoPtr<Foam::liquidProperties> Foam::liquidProperties::New
+(
+ const dictionary& dict
+)
+{
+ if (debug)
+ {
+ Info<< "liquidProperties::New(const dictionary&):"
+ << "constructing liquidProperties" << endl;
+ }
+
+ const word& liquidPropertiesTypeName = dict.dictName();
+
+ const Switch defaultCoeffs(dict.lookup("defaultCoeffs"));
+
+ if (defaultCoeffs)
+ {
+ ConstructorTable::iterator cstrIter =
+ ConstructorTablePtr_->find(liquidPropertiesTypeName);
+
+ if (cstrIter == ConstructorTablePtr_->end())
+ {
+ FatalErrorIn
+ (
+ "liquidProperties::New(const dictionary&, const word&)"
+ ) << "Unknown liquidProperties type "
+ << liquidPropertiesTypeName << nl << nl
+ << "Valid liquidProperties types are:" << nl
+ << ConstructorTablePtr_->sortedToc()
+ << abort(FatalError);
+ }
+
+ return autoPtr<liquidProperties>(cstrIter()());
+ }
+ else
+ {
+ dictionaryConstructorTable::iterator cstrIter =
+ dictionaryConstructorTablePtr_->find(liquidPropertiesTypeName);
+
+ if (cstrIter == dictionaryConstructorTablePtr_->end())
+ {
+ FatalErrorIn
+ (
+ "liquidProperties::New(const dictionary&, const word&)"
+ ) << "Unknown liquidProperties type "
+ << liquidPropertiesTypeName << nl << nl
+ << "Valid liquidProperties types are:" << nl
+ << dictionaryConstructorTablePtr_->sortedToc()
+ << abort(FatalError);
+ }
+
+ return autoPtr<liquidProperties>
+ (
+ cstrIter()(dict.subDict(liquidPropertiesTypeName + "Coeffs"))
+ );
+ }
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
+
+Foam::scalar Foam::liquidProperties::rho(scalar p, scalar T) const
+{
+ notImplemented
+ (
+ "Foam::scalar Foam::liquidProperties::rho(scalar, scalar) const"
+ );
+ return 0.0;
+}
+
+
+Foam::scalar Foam::liquidProperties::pv(scalar p, scalar T) const
+{
+ notImplemented
+ (
+ "Foam::scalar Foam::liquidProperties::pv(scalar, scalar) const"
+ );
+ return 0.0;
+}
+
+
+Foam::scalar Foam::liquidProperties::hl(scalar p, scalar T) const
+{
+ notImplemented
+ (
+ "Foam::scalar Foam::liquidProperties::hl(scalar, scalar) const"
+ );
+ return 0.0;
+}
+
+
+Foam::scalar Foam::liquidProperties::Cp(scalar p, scalar T) const
+{
+ notImplemented
+ (
+ "Foam::scalar Foam::liquidProperties::Cp(scalar, scalar) const"
+ );
+ return 0.0;
+}
+
+
+Foam::scalar Foam::liquidProperties::h(scalar p, scalar T) const
+{
+ notImplemented
+ (
+ "Foam::scalar Foam::liquidProperties::h(scalar, scalar) const"
+ );
+ return 0.0;
+}
+
+
+Foam::scalar Foam::liquidProperties::Cpg(scalar p, scalar T) const
+{
+ notImplemented
+ (
+ "Foam::scalar Foam::liquidProperties::Cpg(scalar, scalar) const"
+ );
+ return 0.0;
+}
+
+
+Foam::scalar Foam::liquidProperties::mu(scalar p, scalar T) const
+{
+ notImplemented
+ (
+ "Foam::scalar Foam::liquidProperties::mu(scalar, scalar) const"
+ );
+ return 0.0;
+}
+
+
+Foam::scalar Foam::liquidProperties::mug(scalar p, scalar T) const
+{
+ notImplemented
+ (
+ "Foam::scalar Foam::liquidProperties::mug(scalar, scalar) const"
+ );
+ return 0.0;
+}
+
+
+Foam::scalar Foam::liquidProperties::K(scalar p, scalar T) const
+{
+ notImplemented
+ (
+ "Foam::scalar Foam::liquidProperties::K(scalar, scalar) const"
+ );
+ return 0.0;
+}
+
+
+Foam::scalar Foam::liquidProperties::Kg(scalar p, scalar T) const
+{
+ notImplemented
+ (
+ "Foam::scalar Foam::liquidProperties::Kg(scalar, scalar) const"
+ );
+ return 0.0;
+}
+
+
+Foam::scalar Foam::liquidProperties::sigma(scalar p, scalar T) const
+{
+ notImplemented
+ (
+ "Foam::scalar Foam::liquidProperties::sigms(scalar, scalar) const"
+ );
+ return 0.0;
+}
+
+
+Foam::scalar Foam::liquidProperties::D(scalar p, scalar T) const
+{
+ notImplemented
+ (
+ "Foam::scalar Foam::liquidProperties::D(scalar, scalar) const"
+ );
+ return 0.0;
+}
+
+
+Foam::scalar Foam::liquidProperties::D(scalar p, scalar T, scalar Wb) const
+{
+ notImplemented
+ (
+ "Foam::scalar Foam::liquidProperties::D(scalar, scalar) const"
+ );
+ return 0.0;
+}
+
+
+void Foam::liquidProperties::writeData(Ostream& os) const
+{
+
+ os << W_ << token::SPACE
+ << Tc_ << token::SPACE
+ << Pc_ << token::SPACE
+ << Vc_ << token::SPACE
+ << Zc_ << token::SPACE
+ << Tt_ << token::SPACE
+ << Pt_ << token::SPACE
+ << Tb_ << token::SPACE
+ << dipm_ << token::SPACE
+ << omega_<< token::SPACE
+ << delta_;
+}
+
+
+// ************************************************************************* //
diff --git a/src/thermophysicalModels/liquids/liquid/liquid.H b/src/thermophysicalModels/liquidProperties/liquidProperties/liquidProperties.H
similarity index 84%
rename from src/thermophysicalModels/liquids/liquid/liquid.H
rename to src/thermophysicalModels/liquidProperties/liquidProperties/liquidProperties.H
index aeaf885d447..3d8062a7e53 100644
--- a/src/thermophysicalModels/liquids/liquid/liquid.H
+++ b/src/thermophysicalModels/liquidProperties/liquidProperties/liquidProperties.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -22,18 +22,18 @@ License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Class
- Foam::liquid
+ Foam::liquidProperties
Description
- The thermophysical properties of a liquid
+ The thermophysical properties of a liquidProperties
SourceFiles
- liquid.C
+ liquidProperties.C
\*---------------------------------------------------------------------------*/
-#ifndef liquid_H
-#define liquid_H
+#ifndef liquidProperties_H
+#define liquidProperties_H
#include "scalar.H"
#include "IOstreams.H"
@@ -48,10 +48,10 @@ namespace Foam
{
/*---------------------------------------------------------------------------*\
- Class liquid Declaration
+ Class liquidProperties Declaration
\*---------------------------------------------------------------------------*/
-class liquid
+class liquidProperties
{
// Private data
@@ -91,7 +91,7 @@ class liquid
public:
- TypeName("liquid");
+ TypeName("liquidProperties");
// Declare run-time constructor selection tables
@@ -99,7 +99,7 @@ public:
declareRunTimeSelectionTable
(
autoPtr,
- liquid,
+ liquidProperties,
,
(),
()
@@ -108,7 +108,7 @@ public:
declareRunTimeSelectionTable
(
autoPtr,
- liquid,
+ liquidProperties,
Istream,
(Istream& is),
(is)
@@ -117,7 +117,7 @@ public:
declareRunTimeSelectionTable
(
autoPtr,
- liquid,
+ liquidProperties,
dictionary,
(const dictionary& dict),
(dict)
@@ -127,7 +127,7 @@ public:
// Constructors
//- Construct from components
- liquid
+ liquidProperties
(
scalar W,
scalar Tc,
@@ -143,32 +143,32 @@ public:
);
//- Construct from Istream
- liquid(Istream& is);
+ liquidProperties(Istream& is);
//- Construct from dictionary
- liquid(const dictionary& dict);
+ liquidProperties(const dictionary& dict);
//- Construct copy
- liquid(const liquid& liq);
+ liquidProperties(const liquidProperties& liq);
//- Construct and return clone
- virtual autoPtr<liquid> clone() const
+ virtual autoPtr<liquidProperties> clone() const
{
- return autoPtr<liquid>(new liquid(*this));
+ return autoPtr<liquidProperties>(new liquidProperties(*this));
}
// Selectors
- //- Return a pointer to a new liquid created from input
- static autoPtr<liquid> New(Istream& is);
+ //- Return a pointer to a new liquidProperties created from input
+ static autoPtr<liquidProperties> New(Istream& is);
- //- Return a pointer to a new liquid created from dictionary
- static autoPtr<liquid> New(const dictionary& dict);
+ //- Return a pointer to a new liquidProperties created from dictionary
+ static autoPtr<liquidProperties> New(const dictionary& dict);
//- Destructor
- virtual ~liquid()
+ virtual ~liquidProperties()
{}
@@ -258,7 +258,7 @@ public:
virtual void writeData(Ostream& os) const;
//- Ostream Operator
- friend Ostream& operator<<(Ostream& os, const liquid& l)
+ friend Ostream& operator<<(Ostream& os, const liquidProperties& l)
{
l.writeData(os);
return os;
@@ -272,7 +272,7 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-#include "liquidI.H"
+#include "liquidPropertiesI.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/thermophysicalModels/liquids/liquid/liquidI.H b/src/thermophysicalModels/liquidProperties/liquidProperties/liquidPropertiesI.H
similarity index 67%
rename from src/thermophysicalModels/liquids/liquid/liquidI.H
rename to src/thermophysicalModels/liquidProperties/liquidProperties/liquidPropertiesI.H
index fa86dd41f05..3cb5990fa48 100644
--- a/src/thermophysicalModels/liquids/liquid/liquidI.H
+++ b/src/thermophysicalModels/liquidProperties/liquidProperties/liquidPropertiesI.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -23,67 +23,67 @@ License
\*---------------------------------------------------------------------------*/
-inline Foam::scalar Foam::liquid::W() const
+inline Foam::scalar Foam::liquidProperties::W() const
{
return W_;
}
-inline Foam::scalar Foam::liquid::Tc() const
+inline Foam::scalar Foam::liquidProperties::Tc() const
{
return Tc_;
}
-inline Foam::scalar Foam::liquid::Pc() const
+inline Foam::scalar Foam::liquidProperties::Pc() const
{
return Pc_;
}
-inline Foam::scalar Foam::liquid::Vc() const
+inline Foam::scalar Foam::liquidProperties::Vc() const
{
return Vc_;
}
-inline Foam::scalar Foam::liquid::Zc() const
+inline Foam::scalar Foam::liquidProperties::Zc() const
{
return Zc_;
}
-inline Foam::scalar Foam::liquid::Tt() const
+inline Foam::scalar Foam::liquidProperties::Tt() const
{
return Tt_;
}
-inline Foam::scalar Foam::liquid::Pt() const
+inline Foam::scalar Foam::liquidProperties::Pt() const
{
return Pt_;
}
-inline Foam::scalar Foam::liquid::Tb() const
+inline Foam::scalar Foam::liquidProperties::Tb() const
{
return Tb_;
}
-inline Foam::scalar Foam::liquid::dipm() const
+inline Foam::scalar Foam::liquidProperties::dipm() const
{
return dipm_;
}
-inline Foam::scalar Foam::liquid::omega() const
+inline Foam::scalar Foam::liquidProperties::omega() const
{
return omega_;
}
-inline Foam::scalar Foam::liquid::delta() const
+inline Foam::scalar Foam::liquidProperties::delta() const
{
return delta_;
}
diff --git a/src/thermophysicalModels/liquids/nC3H8O/nC3H8O.C b/src/thermophysicalModels/liquidProperties/nC3H8O/nC3H8O.C
similarity index 91%
rename from src/thermophysicalModels/liquids/nC3H8O/nC3H8O.C
rename to src/thermophysicalModels/liquidProperties/nC3H8O/nC3H8O.C
index 9aa51834fb1..a06493c1372 100644
--- a/src/thermophysicalModels/liquids/nC3H8O/nC3H8O.C
+++ b/src/thermophysicalModels/liquidProperties/nC3H8O/nC3H8O.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -31,16 +31,16 @@ License
namespace Foam
{
defineTypeNameAndDebug(nC3H8O, 0);
- addToRunTimeSelectionTable(liquid, nC3H8O,);
- addToRunTimeSelectionTable(liquid, nC3H8O, Istream);
- addToRunTimeSelectionTable(liquid, nC3H8O, dictionary);
+ addToRunTimeSelectionTable(liquidProperties, nC3H8O,);
+ addToRunTimeSelectionTable(liquidProperties, nC3H8O, Istream);
+ addToRunTimeSelectionTable(liquidProperties, nC3H8O, dictionary);
}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
Foam::nC3H8O::nC3H8O()
:
- liquid
+ liquidProperties
(
60.096,
536.71,
@@ -95,7 +95,7 @@ Foam::nC3H8O::nC3H8O()
Foam::nC3H8O::nC3H8O
(
- const liquid& l,
+ const liquidProperties& l,
const NSRDSfunc5& density,
const NSRDSfunc1& vapourPressure,
const NSRDSfunc6& heatOfVapourisation,
@@ -111,7 +111,7 @@ Foam::nC3H8O::nC3H8O
const NSRDSfunc1& vapourDiffussivity
)
:
- liquid(l),
+ liquidProperties(l),
rho_(density),
pv_(vapourPressure),
hl_(heatOfVapourisation),
@@ -130,7 +130,7 @@ Foam::nC3H8O::nC3H8O
Foam::nC3H8O::nC3H8O(Istream& is)
:
- liquid(is),
+ liquidProperties(is),
rho_(is),
pv_(is),
hl_(is),
@@ -149,7 +149,7 @@ Foam::nC3H8O::nC3H8O(Istream& is)
Foam::nC3H8O::nC3H8O(const dictionary& dict)
:
- liquid(dict),
+ liquidProperties(dict),
rho_(dict.subDict("rho")),
pv_(dict.subDict("pv")),
hl_(dict.subDict("hl")),
@@ -168,7 +168,7 @@ Foam::nC3H8O::nC3H8O(const dictionary& dict)
Foam::nC3H8O::nC3H8O(const nC3H8O& liq)
:
- liquid(liq),
+ liquidProperties(liq),
rho_(liq.rho_),
pv_(liq.pv_),
hl_(liq.hl_),
diff --git a/src/thermophysicalModels/liquids/nC3H8O/nC3H8O.H b/src/thermophysicalModels/liquidProperties/nC3H8O/nC3H8O.H
similarity index 94%
rename from src/thermophysicalModels/liquids/nC3H8O/nC3H8O.H
rename to src/thermophysicalModels/liquidProperties/nC3H8O/nC3H8O.H
index e4a9dee2148..69c0e66a6f4 100644
--- a/src/thermophysicalModels/liquids/nC3H8O/nC3H8O.H
+++ b/src/thermophysicalModels/liquidProperties/nC3H8O/nC3H8O.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -35,7 +35,7 @@ SourceFiles
#ifndef nC3H8O_H
#define nC3H8O_H
-#include "liquid.H"
+#include "liquidProperties.H"
#include "NSRDSfunc0.H"
#include "NSRDSfunc1.H"
#include "NSRDSfunc2.H"
@@ -57,7 +57,7 @@ namespace Foam
class nC3H8O
:
- public liquid
+ public liquidProperties
{
// Private data
@@ -89,7 +89,7 @@ public:
//- Construct from components
nC3H8O
(
- const liquid& l,
+ const liquidProperties& l,
const NSRDSfunc5& density,
const NSRDSfunc1& vapourPressure,
const NSRDSfunc6& heatOfVapourisation,
@@ -115,9 +115,9 @@ public:
nC3H8O(const nC3H8O& liq);
//- Construct and return clone
- virtual autoPtr<liquid> clone() const
+ virtual autoPtr<liquidProperties> clone() const
{
- return autoPtr<liquid>(new nC3H8O(*this));
+ return autoPtr<liquidProperties>(new nC3H8O(*this));
}
@@ -172,7 +172,7 @@ public:
//- Write the function coefficients
void writeData(Ostream& os) const
{
- liquid::writeData(os); os << nl;
+ liquidProperties::writeData(os); os << nl;
rho_.writeData(os); os << nl;
pv_.writeData(os); os << nl;
hl_.writeData(os); os << nl;
diff --git a/src/thermophysicalModels/liquids/nC3H8O/nC3H8OI.H b/src/thermophysicalModels/liquidProperties/nC3H8O/nC3H8OI.H
similarity index 97%
rename from src/thermophysicalModels/liquids/nC3H8O/nC3H8OI.H
rename to src/thermophysicalModels/liquidProperties/nC3H8O/nC3H8OI.H
index f7d788e23e9..cd02f67f8c4 100644
--- a/src/thermophysicalModels/liquids/nC3H8O/nC3H8OI.H
+++ b/src/thermophysicalModels/liquidProperties/nC3H8O/nC3H8OI.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/src/thermophysicalModels/liquids/liquid/liquid.C b/src/thermophysicalModels/liquids/liquid/liquid.C
deleted file mode 100644
index 45da23e3f65..00000000000
--- a/src/thermophysicalModels/liquids/liquid/liquid.C
+++ /dev/null
@@ -1,340 +0,0 @@
-/*---------------------------------------------------------------------------*\
- ========= |
- \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
- \\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
- \\/ 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 <http://www.gnu.org/licenses/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "liquid.H"
-#include "HashTable.H"
-#include "Switch.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
- defineTypeNameAndDebug(liquid, 0);
- defineRunTimeSelectionTable(liquid,);
- defineRunTimeSelectionTable(liquid, Istream);
- defineRunTimeSelectionTable(liquid, dictionary);
-}
-
-// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-
-Foam::liquid::liquid
-(
- scalar W,
- scalar Tc,
- scalar Pc,
- scalar Vc,
- scalar Zc,
- scalar Tt,
- scalar Pt,
- scalar Tb,
- scalar dipm,
- scalar omega,
- scalar delta
-)
-:
- W_(W),
- Tc_(Tc),
- Pc_(Pc),
- Vc_(Vc),
- Zc_(Zc),
- Tt_(Tt),
- Pt_(Pt),
- Tb_(Tb),
- dipm_(dipm),
- omega_(omega),
- delta_(delta)
-{}
-
-
-Foam::liquid::liquid(Istream& is)
-:
- W_(readScalar(is)),
- Tc_(readScalar(is)),
- Pc_(readScalar(is)),
- Vc_(readScalar(is)),
- Zc_(readScalar(is)),
- Tt_(readScalar(is)),
- Pt_(readScalar(is)),
- Tb_(readScalar(is)),
- dipm_(readScalar(is)),
- omega_(readScalar(is)),
- delta_(readScalar(is))
-{}
-
-
-Foam::liquid::liquid(const dictionary& dict)
-:
- W_(readScalar(dict.lookup("W"))),
- Tc_(readScalar(dict.lookup("Tc"))),
- Pc_(readScalar(dict.lookup("Pc"))),
- Vc_(readScalar(dict.lookup("Vc"))),
- Zc_(readScalar(dict.lookup("Zc"))),
- Tt_(readScalar(dict.lookup("Tt"))),
- Pt_(readScalar(dict.lookup("Pt"))),
- Tb_(readScalar(dict.lookup("Tb"))),
- dipm_(readScalar(dict.lookup("dipm"))),
- omega_(readScalar(dict.lookup("omega"))),
- delta_(readScalar(dict.lookup("delta")))
-{}
-
-
-Foam::liquid::liquid(const liquid& liq)
-:
- W_(liq.W_),
- Tc_(liq.Tc_),
- Pc_(liq.Pc_),
- Vc_(liq.Vc_),
- Zc_(liq.Zc_),
- Tt_(liq.Tt_),
- Pt_(liq.Pt_),
- Tb_(liq.Tb_),
- dipm_(liq.dipm_),
- omega_(liq.omega_),
- delta_(liq.delta_)
-{}
-
-
-// * * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * //
-
-Foam::autoPtr<Foam::liquid> Foam::liquid::New(Istream& is)
-{
- if (debug)
- {
- Info<< "liquid::New(Istream&) : " << "constructing liquid" << endl;
- }
-
- const word liquidType(is);
- const word coeffs(is);
-
- if (coeffs == "defaultCoeffs")
- {
- ConstructorTable::iterator cstrIter =
- ConstructorTablePtr_->find(liquidType);
-
- if (cstrIter == ConstructorTablePtr_->end())
- {
- FatalErrorIn("liquid::New(Istream&)")
- << "Unknown liquid type "
- << liquidType << nl << nl
- << "Valid liquid types are:" << nl
- << ConstructorTablePtr_->sortedToc()
- << abort(FatalError);
- }
-
- return autoPtr<liquid>(cstrIter()());
- }
- else if (coeffs == "coeffs")
- {
- IstreamConstructorTable::iterator cstrIter =
- IstreamConstructorTablePtr_->find(liquidType);
-
- if (cstrIter == IstreamConstructorTablePtr_->end())
- {
- FatalErrorIn("liquid::New(Istream&)")
- << "Unknown liquid type "
- << liquidType << nl << nl
- << "Valid liquid types are:" << nl
- << IstreamConstructorTablePtr_->sortedToc()
- << abort(FatalError);
- }
-
- return autoPtr<liquid>(cstrIter()(is));
- }
- else
- {
- FatalErrorIn("liquid::New(Istream&)")
- << "liquid type " << liquidType
- << ", option " << coeffs << " given"
- << ", should be coeffs or defaultCoeffs"
- << abort(FatalError);
-
- return autoPtr<liquid>(NULL);
- }
-}
-
-
-Foam::autoPtr<Foam::liquid> Foam::liquid::New(const dictionary& dict)
-{
- if (debug)
- {
- Info<< "liquid::New(const dictionary&) : " << "constructing liquid"
- << endl;
- }
-
- const word& liquidTypeName = dict.dictName();
-
- const Switch defaultCoeffs(dict.lookup("defaultCoeffs"));
-
- if (defaultCoeffs)
- {
- ConstructorTable::iterator cstrIter =
- ConstructorTablePtr_->find(liquidTypeName);
-
- if (cstrIter == ConstructorTablePtr_->end())
- {
- FatalErrorIn("liquid::New(const dictionary&, const word&)")
- << "Unknown liquid type "
- << liquidTypeName << nl << nl
- << "Valid liquid types are:" << nl
- << ConstructorTablePtr_->sortedToc()
- << abort(FatalError);
- }
-
- return autoPtr<liquid>(cstrIter()());
- }
- else
- {
- dictionaryConstructorTable::iterator cstrIter =
- dictionaryConstructorTablePtr_->find(liquidTypeName);
-
- if (cstrIter == dictionaryConstructorTablePtr_->end())
- {
- FatalErrorIn("liquid::New(const dictionary&, const word&)")
- << "Unknown liquid type "
- << liquidTypeName << nl << nl
- << "Valid liquid types are:" << nl
- << dictionaryConstructorTablePtr_->sortedToc()
- << abort(FatalError);
- }
-
- return autoPtr<liquid>
- (
- cstrIter()(dict.subDict(liquidTypeName + "Coeffs"))
- );
- }
-}
-
-
-// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-
-Foam::scalar Foam::liquid::rho(scalar p, scalar T) const
-{
- notImplemented("Foam::scalar Foam::liquid::rho(scalar, scalar) const");
- return 0.0;
-}
-
-
-Foam::scalar Foam::liquid::pv(scalar p, scalar T) const
-{
- notImplemented("Foam::scalar Foam::liquid::pv(scalar, scalar) const");
- return 0.0;
-}
-
-
-Foam::scalar Foam::liquid::hl(scalar p, scalar T) const
-{
- notImplemented("Foam::scalar Foam::liquid::hl(scalar, scalar) const");
- return 0.0;
-}
-
-
-Foam::scalar Foam::liquid::Cp(scalar p, scalar T) const
-{
- notImplemented("Foam::scalar Foam::liquid::Cp(scalar, scalar) const");
- return 0.0;
-}
-
-
-Foam::scalar Foam::liquid::h(scalar p, scalar T) const
-{
- notImplemented("Foam::scalar Foam::liquid::h(scalar, scalar) const");
- return 0.0;
-}
-
-
-Foam::scalar Foam::liquid::Cpg(scalar p, scalar T) const
-{
- notImplemented("Foam::scalar Foam::liquid::Cpg(scalar, scalar) const");
- return 0.0;
-}
-
-
-Foam::scalar Foam::liquid::mu(scalar p, scalar T) const
-{
- notImplemented("Foam::scalar Foam::liquid::mu(scalar, scalar) const");
- return 0.0;
-}
-
-
-Foam::scalar Foam::liquid::mug(scalar p, scalar T) const
-{
- notImplemented("Foam::scalar Foam::liquid::mug(scalar, scalar) const");
- return 0.0;
-}
-
-
-Foam::scalar Foam::liquid::K(scalar p, scalar T) const
-{
- notImplemented("Foam::scalar Foam::liquid::K(scalar, scalar) const");
- return 0.0;
-}
-
-
-Foam::scalar Foam::liquid::Kg(scalar p, scalar T) const
-{
- notImplemented("Foam::scalar Foam::liquid::Kg(scalar, scalar) const");
- return 0.0;
-}
-
-
-Foam::scalar Foam::liquid::sigma(scalar p, scalar T) const
-{
- notImplemented("Foam::scalar Foam::liquid::sigms(scalar, scalar) const");
- return 0.0;
-}
-
-
-Foam::scalar Foam::liquid::D(scalar p, scalar T) const
-{
- notImplemented("Foam::scalar Foam::liquid::D(scalar, scalar) const");
- return 0.0;
-}
-
-
-Foam::scalar Foam::liquid::D(scalar p, scalar T, scalar Wb) const
-{
- notImplemented("Foam::scalar Foam::liquid::D(scalar, scalar) const");
- return 0.0;
-}
-
-
-void Foam::liquid::writeData(Ostream& os) const
-{
-
- os << W_ << token::SPACE
- << Tc_ << token::SPACE
- << Pc_ << token::SPACE
- << Vc_ << token::SPACE
- << Zc_ << token::SPACE
- << Tt_ << token::SPACE
- << Pt_ << token::SPACE
- << Tb_ << token::SPACE
- << dipm_ << token::SPACE
- << omega_<< token::SPACE
- << delta_;
-}
-
-
-// ************************************************************************* //
diff --git a/src/thermophysicalModels/pointSolidMixture/Make/files b/src/thermophysicalModels/pointSolidMixture/Make/files
deleted file mode 100644
index 17cad4937b8..00000000000
--- a/src/thermophysicalModels/pointSolidMixture/Make/files
+++ /dev/null
@@ -1,3 +0,0 @@
-pointSolidMixture/pointSolidMixture.C
-
-LIB = $(FOAM_LIBBIN)/libpointSolidMixture
diff --git a/src/thermophysicalModels/pointSolids/Make/files b/src/thermophysicalModels/pointSolids/Make/files
deleted file mode 100644
index 526d2519705..00000000000
--- a/src/thermophysicalModels/pointSolids/Make/files
+++ /dev/null
@@ -1,8 +0,0 @@
-pointSolid/pointSolid.C
-pointSolid/pointSolidNew.C
-
-ash/ash.C
-C/C.C
-CaCO3/CaCO3.C
-
-LIB = $(FOAM_LIBBIN)/libpointSolids
diff --git a/src/thermophysicalModels/solidMixtureProperties/Make/files b/src/thermophysicalModels/solidMixtureProperties/Make/files
new file mode 100644
index 00000000000..e31412ed1dd
--- /dev/null
+++ b/src/thermophysicalModels/solidMixtureProperties/Make/files
@@ -0,0 +1,3 @@
+solidMixtureProperties/solidMixtureProperties.C
+
+LIB = $(FOAM_LIBBIN)/libsolidMixtureProperties
diff --git a/src/thermophysicalModels/pointSolidMixture/Make/options b/src/thermophysicalModels/solidMixtureProperties/Make/options
similarity index 50%
rename from src/thermophysicalModels/pointSolidMixture/Make/options
rename to src/thermophysicalModels/solidMixtureProperties/Make/options
index db6f1fe9211..a7802dcbf8e 100644
--- a/src/thermophysicalModels/pointSolidMixture/Make/options
+++ b/src/thermophysicalModels/solidMixtureProperties/Make/options
@@ -1,3 +1,3 @@
EXE_INC = \
- -I${LIB_SRC}/thermophysicalModels/pointSolids/lnInclude \
+ -I${LIB_SRC}/thermophysicalModels/solidProperties/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/specie/lnInclude
diff --git a/src/thermophysicalModels/pointSolidMixture/pointSolidMixture/pointSolidMixture.C b/src/thermophysicalModels/solidMixtureProperties/solidMixtureProperties/solidMixtureProperties.C
similarity index 77%
rename from src/thermophysicalModels/pointSolidMixture/pointSolidMixture/pointSolidMixture.C
rename to src/thermophysicalModels/solidMixtureProperties/solidMixtureProperties/solidMixtureProperties.C
index 3eb1d15b2e5..1d4afd21623 100644
--- a/src/thermophysicalModels/pointSolidMixture/pointSolidMixture/pointSolidMixture.C
+++ b/src/thermophysicalModels/solidMixtureProperties/solidMixtureProperties/solidMixtureProperties.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -23,11 +23,11 @@ License
\*---------------------------------------------------------------------------*/
-#include "pointSolidMixture.H"
+#include "solidMixtureProperties.H"
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-Foam::pointSolidMixture::pointSolidMixture
+Foam::solidMixtureProperties::solidMixtureProperties
(
const dictionary& thermophysicalProperties
)
@@ -49,12 +49,15 @@ Foam::pointSolidMixture::pointSolidMixture
forAll(components_, i)
{
- properties_.set(i, pointSolid::New(props.subDict(components_[i])));
+ properties_.set(i, solidProperties::New(props.subDict(components_[i])));
}
}
-Foam::pointSolidMixture::pointSolidMixture(const pointSolidMixture& s)
+Foam::solidMixtureProperties::solidMixtureProperties
+(
+ const solidMixtureProperties& s
+)
:
components_(s.components_),
properties_(s.properties_.size())
@@ -68,21 +71,21 @@ Foam::pointSolidMixture::pointSolidMixture(const pointSolidMixture& s)
// * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * //
-Foam::autoPtr<Foam::pointSolidMixture> Foam::pointSolidMixture::New
+Foam::autoPtr<Foam::solidMixtureProperties> Foam::solidMixtureProperties::New
(
const dictionary& thermophysicalProperties
)
{
- return autoPtr<pointSolidMixture>
+ return autoPtr<solidMixtureProperties>
(
- new pointSolidMixture(thermophysicalProperties)
+ new solidMixtureProperties(thermophysicalProperties)
);
}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-Foam::scalarField Foam::pointSolidMixture::X(const scalarField& Y) const
+Foam::scalarField Foam::solidMixtureProperties::X(const scalarField& Y) const
{
scalarField X(Y.size());
scalar rhoInv = 0.0;
@@ -92,12 +95,12 @@ Foam::scalarField Foam::pointSolidMixture::X(const scalarField& Y) const
X[i] = Y[i]/properties_[i].rho();
}
- tmp<scalarField> tfld = X/rhoInv;
+ tmp<scalarField> tfld(X/rhoInv);
return tfld();
}
-Foam::scalar Foam::pointSolidMixture::rho(const scalarField& X) const
+Foam::scalar Foam::solidMixtureProperties::rho(const scalarField& X) const
{
scalar val = 0.0;
forAll(properties_, i)
@@ -108,7 +111,7 @@ Foam::scalar Foam::pointSolidMixture::rho(const scalarField& X) const
}
-Foam::scalar Foam::pointSolidMixture::Cp(const scalarField& Y) const
+Foam::scalar Foam::solidMixtureProperties::Cp(const scalarField& Y) const
{
scalar val = 0.0;
forAll(properties_, i)
diff --git a/src/thermophysicalModels/pointSolidMixture/pointSolidMixture/pointSolidMixture.H b/src/thermophysicalModels/solidMixtureProperties/solidMixtureProperties/solidMixtureProperties.H
similarity index 75%
rename from src/thermophysicalModels/pointSolidMixture/pointSolidMixture/pointSolidMixture.H
rename to src/thermophysicalModels/solidMixtureProperties/solidMixtureProperties/solidMixtureProperties.H
index 0f6b749e86f..d84449414cf 100644
--- a/src/thermophysicalModels/pointSolidMixture/pointSolidMixture/pointSolidMixture.H
+++ b/src/thermophysicalModels/solidMixtureProperties/solidMixtureProperties/solidMixtureProperties.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -22,30 +22,30 @@ License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Class
- Foam::pointSolidMixture
+ Foam::solidMixtureProperties
Description
A mixture of solids.
Note
The dictionary constructor searches for the entry @c solidComponents,
- which is a wordList. The pointSolid properties of each component can either
+ which is a wordList. The solid properties of each component can either
be contained within a @c solidProperties sub-dictionary or (for legacy
purposes) can be found directly in the dictionary.
The @c solidProperties sub-dictionary entry should be used when possible
to avoid conflicts with identically named gas-phase entries.
SeeAlso
- Foam::pointSolidMixture
+ Foam::solidMixtureProperties
\*---------------------------------------------------------------------------*/
-#ifndef pointSolidMixture_H
-#define pointSolidMixture_H
+#ifndef solidMixtureProperties_H
+#define solidMixtureProperties_H
#include "scalarField.H"
#include "PtrList.H"
-#include "pointSolid.H"
+#include "solidProperties.H"
#include "autoPtr.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -54,18 +54,18 @@ namespace Foam
{
/*---------------------------------------------------------------------------*\
- Class pointSolidMixture Declaration
+ Class solidMixtureProperties Declaration
\*---------------------------------------------------------------------------*/
-class pointSolidMixture
+class solidMixtureProperties
{
// Private data
//- The names of the solids
List<word> components_;
- //- The pointSolid properties
- PtrList<pointSolid> properties_;
+ //- The solidProperties properties
+ PtrList<solidProperties> properties_;
public:
@@ -73,39 +73,42 @@ public:
// Constructors
//- Construct from dictionary
- pointSolidMixture(const dictionary&);
+ solidMixtureProperties(const dictionary&);
//- Construct copy
- pointSolidMixture(const pointSolidMixture& lm);
+ solidMixtureProperties(const solidMixtureProperties& lm);
//- Construct and return a clone
- virtual autoPtr<pointSolidMixture> clone() const
+ virtual autoPtr<solidMixtureProperties> clone() const
{
- return autoPtr<pointSolidMixture>(new pointSolidMixture(*this));
+ return autoPtr<solidMixtureProperties>
+ (
+ new solidMixtureProperties(*this)
+ );
}
//- Destructor
- virtual ~pointSolidMixture()
+ virtual ~solidMixtureProperties()
{}
// Selectors
//- Select construct from dictionary
- static autoPtr<pointSolidMixture> New(const dictionary&);
+ static autoPtr<solidMixtureProperties> New(const dictionary&);
// Member Functions
- //- Return the pointSolid names
+ //- Return the solidProperties names
inline const List<word>& components() const
{
return components_;
}
- //- Return the pointSolid properties
- inline const PtrList<pointSolid>& properties() const
+ //- Return the solidProperties properties
+ inline const PtrList<solidProperties>& properties() const
{
return properties_;
}
diff --git a/src/thermophysicalModels/pointSolids/C/C.C b/src/thermophysicalModels/solidProperties/C/C.C
similarity index 81%
rename from src/thermophysicalModels/pointSolids/C/C.C
rename to src/thermophysicalModels/solidProperties/C/C.C
index 1e178dfc440..7a6b3137920 100644
--- a/src/thermophysicalModels/pointSolids/C/C.C
+++ b/src/thermophysicalModels/solidProperties/C/C.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -31,16 +31,16 @@ License
namespace Foam
{
defineTypeNameAndDebug(C, 0);
- addToRunTimeSelectionTable(pointSolid, C,);
- addToRunTimeSelectionTable(pointSolid, C, Istream);
- addToRunTimeSelectionTable(pointSolid, C, dictionary);
+ addToRunTimeSelectionTable(solidProperties, C,);
+ addToRunTimeSelectionTable(solidProperties, C, Istream);
+ addToRunTimeSelectionTable(solidProperties, C, dictionary);
}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
Foam::C::C()
:
- pointSolid(2010, 710, 0.04, 0.0, 1.0)
+ solidProperties(2010, 710, 0.04, 0.0, 1.0)
{
if (debug)
{
@@ -51,27 +51,27 @@ Foam::C::C()
}
-Foam::C::C(const pointSolid& s)
+Foam::C::C(const solidProperties& s)
:
- pointSolid(s)
+ solidProperties(s)
{}
Foam::C::C(Istream& is)
:
- pointSolid(is)
+ solidProperties(is)
{}
Foam::C::C(const dictionary& dict)
:
- pointSolid(dict)
+ solidProperties(dict)
{}
Foam::C::C(const C& s)
:
- pointSolid(s)
+ solidProperties(s)
{}
@@ -79,7 +79,7 @@ Foam::C::C(const C& s)
void Foam::C::writeData(Ostream& os) const
{
- pointSolid::writeData(os);
+ solidProperties::writeData(os);
}
diff --git a/src/thermophysicalModels/pointSolids/C/C.H b/src/thermophysicalModels/solidProperties/C/C.H
similarity index 87%
rename from src/thermophysicalModels/pointSolids/C/C.H
rename to src/thermophysicalModels/solidProperties/C/C.H
index 614a1532060..bd4b4364bcc 100644
--- a/src/thermophysicalModels/pointSolids/C/C.H
+++ b/src/thermophysicalModels/solidProperties/C/C.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -25,7 +25,7 @@ Class
Foam::C
Description
- Graphite
+ Graphite solid properties
SourceFiles
C.C
@@ -35,7 +35,7 @@ SourceFiles
#ifndef solid_C_H
#define solid_C_H
-#include "pointSolid.H"
+#include "solidProperties.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -57,7 +57,7 @@ Ostream& operator<<
class C
:
- public pointSolid
+ public solidProperties
{
public:
@@ -70,8 +70,8 @@ public:
//- Construct null
C();
- //- Construct from pointSolid
- C(const pointSolid& s);
+ //- Construct from solidProperties
+ C(const solidProperties& s);
//- Construct from Istream
C(Istream& is);
@@ -83,9 +83,9 @@ public:
C(const C& s);
//- Construct and return clone
- virtual autoPtr<pointSolid> clone() const
+ virtual autoPtr<solidProperties> clone() const
{
- return autoPtr<pointSolid>(new C(*this));
+ return autoPtr<solidProperties>(new C(*this));
}
diff --git a/src/thermophysicalModels/pointSolids/CaCO3/CaCO3.C b/src/thermophysicalModels/solidProperties/CaCO3/CaCO3.C
similarity index 81%
rename from src/thermophysicalModels/pointSolids/CaCO3/CaCO3.C
rename to src/thermophysicalModels/solidProperties/CaCO3/CaCO3.C
index d15029f65a1..f199c4e0e13 100644
--- a/src/thermophysicalModels/pointSolids/CaCO3/CaCO3.C
+++ b/src/thermophysicalModels/solidProperties/CaCO3/CaCO3.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -31,16 +31,16 @@ License
namespace Foam
{
defineTypeNameAndDebug(CaCO3, 0);
- addToRunTimeSelectionTable(pointSolid, CaCO3,);
- addToRunTimeSelectionTable(pointSolid, CaCO3, Istream);
- addToRunTimeSelectionTable(pointSolid, CaCO3, dictionary);
+ addToRunTimeSelectionTable(solidProperties, CaCO3,);
+ addToRunTimeSelectionTable(solidProperties, CaCO3, Istream);
+ addToRunTimeSelectionTable(solidProperties, CaCO3, dictionary);
}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
Foam::CaCO3::CaCO3()
:
- pointSolid(2710, 850, 1.3, 0.0, 1.0)
+ solidProperties(2710, 850, 1.3, 0.0, 1.0)
{
if (debug)
{
@@ -51,27 +51,27 @@ Foam::CaCO3::CaCO3()
}
-Foam::CaCO3::CaCO3(const pointSolid& s)
+Foam::CaCO3::CaCO3(const solidProperties& s)
:
- pointSolid(s)
+ solidProperties(s)
{}
Foam::CaCO3::CaCO3(Istream& is)
:
- pointSolid(is)
+ solidProperties(is)
{}
Foam::CaCO3::CaCO3(const dictionary& dict)
:
- pointSolid(dict)
+ solidProperties(dict)
{}
Foam::CaCO3::CaCO3(const CaCO3& s)
:
- pointSolid(s)
+ solidProperties(s)
{}
@@ -79,7 +79,7 @@ Foam::CaCO3::CaCO3(const CaCO3& s)
void Foam::CaCO3::writeData(Ostream& os) const
{
- pointSolid::writeData(os);
+ solidProperties::writeData(os);
}
diff --git a/src/thermophysicalModels/pointSolids/CaCO3/CaCO3.H b/src/thermophysicalModels/solidProperties/CaCO3/CaCO3.H
similarity index 86%
rename from src/thermophysicalModels/pointSolids/CaCO3/CaCO3.H
rename to src/thermophysicalModels/solidProperties/CaCO3/CaCO3.H
index d5559500b8f..fc47cd1d953 100644
--- a/src/thermophysicalModels/pointSolids/CaCO3/CaCO3.H
+++ b/src/thermophysicalModels/solidProperties/CaCO3/CaCO3.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -35,7 +35,7 @@ SourceFiles
#ifndef solid_CaCO3_H
#define solid_CaCO3_H
-#include "pointSolid.H"
+#include "solidProperties.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -52,12 +52,12 @@ Ostream& operator<<
/*---------------------------------------------------------------------------*\
- Class CaCO3 Declaration
+ Class CaCO3 Declaration
\*---------------------------------------------------------------------------*/
class CaCO3
:
- public pointSolid
+ public solidProperties
{
public:
@@ -71,8 +71,8 @@ public:
//- Construct null
CaCO3();
- //- Construct from pointSolid
- CaCO3(const pointSolid& s);
+ //- Construct from solidProperties
+ CaCO3(const solidProperties& s);
//- Construct from Istream
CaCO3(Istream& is);
@@ -84,9 +84,9 @@ public:
CaCO3(const CaCO3& s);
//- Construct and return clone
- virtual autoPtr<pointSolid> clone() const
+ virtual autoPtr<solidProperties> clone() const
{
- return autoPtr<pointSolid>(new CaCO3(*this));
+ return autoPtr<solidProperties>(new CaCO3(*this));
}
diff --git a/src/thermophysicalModels/solidProperties/Make/files b/src/thermophysicalModels/solidProperties/Make/files
new file mode 100644
index 00000000000..694c379453f
--- /dev/null
+++ b/src/thermophysicalModels/solidProperties/Make/files
@@ -0,0 +1,8 @@
+solidProperties/solidProperties.C
+solidProperties/solidPropertiesNew.C
+
+ash/ash.C
+C/C.C
+CaCO3/CaCO3.C
+
+LIB = $(FOAM_LIBBIN)/libsolidProperties
diff --git a/src/thermophysicalModels/pointSolids/Make/options b/src/thermophysicalModels/solidProperties/Make/options
similarity index 100%
rename from src/thermophysicalModels/pointSolids/Make/options
rename to src/thermophysicalModels/solidProperties/Make/options
diff --git a/src/thermophysicalModels/pointSolids/ash/ash.C b/src/thermophysicalModels/solidProperties/ash/ash.C
similarity index 81%
rename from src/thermophysicalModels/pointSolids/ash/ash.C
rename to src/thermophysicalModels/solidProperties/ash/ash.C
index b9672f5bd03..2ab7370ff71 100644
--- a/src/thermophysicalModels/pointSolids/ash/ash.C
+++ b/src/thermophysicalModels/solidProperties/ash/ash.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -31,16 +31,16 @@ License
namespace Foam
{
defineTypeNameAndDebug(ash, 0);
- addToRunTimeSelectionTable(pointSolid, ash,);
- addToRunTimeSelectionTable(pointSolid, ash, Istream);
- addToRunTimeSelectionTable(pointSolid, ash, dictionary);
+ addToRunTimeSelectionTable(solidProperties, ash,);
+ addToRunTimeSelectionTable(solidProperties, ash, Istream);
+ addToRunTimeSelectionTable(solidProperties, ash, dictionary);
}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
Foam::ash::ash()
:
- pointSolid(2010, 710, 0.04, 0.0, 1.0)
+ solidProperties(2010, 710, 0.04, 0.0, 1.0)
{
if (debug)
{
@@ -51,27 +51,27 @@ Foam::ash::ash()
}
-Foam::ash::ash(const pointSolid& s)
+Foam::ash::ash(const solidProperties& s)
:
- pointSolid(s)
+ solidProperties(s)
{}
Foam::ash::ash(Istream& is)
:
- pointSolid(is)
+ solidProperties(is)
{}
Foam::ash::ash(const dictionary& dict)
:
- pointSolid(dict)
+ solidProperties(dict)
{}
Foam::ash::ash(const ash& s)
:
- pointSolid(s)
+ solidProperties(s)
{}
@@ -79,7 +79,7 @@ Foam::ash::ash(const ash& s)
void Foam::ash::writeData(Ostream& os) const
{
- pointSolid::writeData(os);
+ solidProperties::writeData(os);
}
diff --git a/src/thermophysicalModels/pointSolids/ash/ash.H b/src/thermophysicalModels/solidProperties/ash/ash.H
similarity index 87%
rename from src/thermophysicalModels/pointSolids/ash/ash.H
rename to src/thermophysicalModels/solidProperties/ash/ash.H
index fcbfbdeeb94..796cc3b3d85 100644
--- a/src/thermophysicalModels/pointSolids/ash/ash.H
+++ b/src/thermophysicalModels/solidProperties/ash/ash.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -25,7 +25,7 @@ Class
Foam::ash
Description
- Coal ash
+ Coal ash solid properties
SourceFiles
ash.C
@@ -35,7 +35,7 @@ SourceFiles
#ifndef solid_ash_H
#define solid_ash_H
-#include "pointSolid.H"
+#include "solidProperties.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -57,7 +57,7 @@ Ostream& operator<<
class ash
:
- public pointSolid
+ public solidProperties
{
public:
@@ -71,8 +71,8 @@ public:
//- Construct null
ash();
- //- Construct from pointSolid
- ash(const pointSolid& s);
+ //- Construct from solidProperties
+ ash(const solidProperties& s);
//- Construct from Istream
ash(Istream& is);
@@ -84,9 +84,9 @@ public:
ash(const ash& s);
//- Construct and return clone
- virtual autoPtr<pointSolid> clone() const
+ virtual autoPtr<solidProperties> clone() const
{
- return autoPtr<pointSolid>(new ash(*this));
+ return autoPtr<solidProperties>(new ash(*this));
}
diff --git a/src/thermophysicalModels/pointSolids/pointSolid/pointSolid.C b/src/thermophysicalModels/solidProperties/solidProperties/solidProperties.C
similarity index 78%
rename from src/thermophysicalModels/pointSolids/pointSolid/pointSolid.C
rename to src/thermophysicalModels/solidProperties/solidProperties/solidProperties.C
index 6c53900fc09..e3c0f8ed0ee 100644
--- a/src/thermophysicalModels/pointSolids/pointSolid/pointSolid.C
+++ b/src/thermophysicalModels/solidProperties/solidProperties/solidProperties.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -23,21 +23,21 @@ License
\*---------------------------------------------------------------------------*/
-#include "pointSolid.H"
+#include "solidProperties.H"
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
namespace Foam
{
- defineTypeNameAndDebug(pointSolid, 0);
- defineRunTimeSelectionTable(pointSolid,);
- defineRunTimeSelectionTable(pointSolid, Istream);
- defineRunTimeSelectionTable(pointSolid, dictionary);
+ defineTypeNameAndDebug(solidProperties, 0);
+ defineRunTimeSelectionTable(solidProperties,);
+ defineRunTimeSelectionTable(solidProperties, Istream);
+ defineRunTimeSelectionTable(solidProperties, dictionary);
}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-Foam::pointSolid::pointSolid
+Foam::solidProperties::solidProperties
(
scalar rho,
scalar Cp,
@@ -54,7 +54,7 @@ Foam::pointSolid::pointSolid
{}
-Foam::pointSolid::pointSolid(Istream& is)
+Foam::solidProperties::solidProperties(Istream& is)
:
rho_(readScalar(is)),
Cp_(readScalar(is)),
@@ -64,7 +64,7 @@ Foam::pointSolid::pointSolid(Istream& is)
{}
-Foam::pointSolid::pointSolid(const dictionary& dict)
+Foam::solidProperties::solidProperties(const dictionary& dict)
:
rho_(readScalar(dict.lookup("rho"))),
Cp_(readScalar(dict.lookup("Cp"))),
@@ -74,7 +74,7 @@ Foam::pointSolid::pointSolid(const dictionary& dict)
{}
-Foam::pointSolid::pointSolid(const pointSolid& s)
+Foam::solidProperties::solidProperties(const solidProperties& s)
:
rho_(s.rho_),
Cp_(s.Cp_),
@@ -86,7 +86,7 @@ Foam::pointSolid::pointSolid(const pointSolid& s)
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-void Foam::pointSolid::writeData(Ostream& os) const
+void Foam::solidProperties::writeData(Ostream& os) const
{
os << rho_ << token::SPACE
<< Cp_ << token::SPACE
@@ -98,7 +98,7 @@ void Foam::pointSolid::writeData(Ostream& os) const
// * * * * * * * * * * * * * * IOStream operators * * * * * * * * * * * * * //
-Foam::Ostream& Foam::operator<<(Ostream& os, const pointSolid& s)
+Foam::Ostream& Foam::operator<<(Ostream& os, const solidProperties& s)
{
s.writeData(os);
return os;
diff --git a/src/thermophysicalModels/pointSolids/pointSolid/pointSolid.H b/src/thermophysicalModels/solidProperties/solidProperties/solidProperties.H
similarity index 75%
rename from src/thermophysicalModels/pointSolids/pointSolid/pointSolid.H
rename to src/thermophysicalModels/solidProperties/solidProperties/solidProperties.H
index 2b660c95375..7ed4e03f145 100644
--- a/src/thermophysicalModels/pointSolids/pointSolid/pointSolid.H
+++ b/src/thermophysicalModels/solidProperties/solidProperties/solidProperties.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -22,18 +22,18 @@ License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Class
- Foam::pointSolid
+ Foam::solidProperties
Description
- The thermophysical properties of a pointSolid
+ The thermophysical properties of a solid
SourceFiles
- pointSolid.C
+ solidProperties.C
\*---------------------------------------------------------------------------*/
-#ifndef pointSolid_H
-#define pointSolid_H
+#ifndef solidProperties_H
+#define solidProperties_H
#include "typeInfo.H"
#include "autoPtr.H"
@@ -45,20 +45,20 @@ SourceFiles
namespace Foam
{
-class pointSolid;
+class solidProperties;
Ostream& operator<<
(
Ostream&,
- const pointSolid&
+ const solidProperties&
);
/*---------------------------------------------------------------------------*\
- Class pointSolid Declaration
+ Class solidProperties Declaration
\*---------------------------------------------------------------------------*/
-class pointSolid
+class solidProperties
{
// Private data
@@ -82,7 +82,7 @@ class pointSolid
public:
//- Runtime type information
- TypeName("pointSolid");
+ TypeName("solidProperties");
// Declare run-time constructor selection tables
@@ -90,7 +90,7 @@ public:
declareRunTimeSelectionTable
(
autoPtr,
- pointSolid,
+ solidProperties,
,
(),
()
@@ -99,7 +99,7 @@ public:
declareRunTimeSelectionTable
(
autoPtr,
- pointSolid,
+ solidProperties,
Istream,
(Istream& is),
(is)
@@ -108,7 +108,7 @@ public:
declareRunTimeSelectionTable
(
autoPtr,
- pointSolid,
+ solidProperties,
dictionary,
(const dictionary& dict),
(dict)
@@ -118,7 +118,7 @@ public:
// Constructors
//- Construct from components
- pointSolid
+ solidProperties
(
scalar rho,
scalar Cp,
@@ -128,38 +128,38 @@ public:
);
//- Construct from Istream
- pointSolid(Istream& is);
+ solidProperties(Istream& is);
//- Construct from dictionary
- pointSolid(const dictionary& dict);
+ solidProperties(const dictionary& dict);
//- Construct copy
- pointSolid(const pointSolid& s);
+ solidProperties(const solidProperties& s);
//- Construct and return clone
- virtual autoPtr<pointSolid> clone() const
+ virtual autoPtr<solidProperties> clone() const
{
- return autoPtr<pointSolid>(new pointSolid(*this));
+ return autoPtr<solidProperties>(new solidProperties(*this));
}
// Selectors
- //- Return a pointer to a new pointSolid created from input
- static autoPtr<pointSolid> New(Istream& is);
+ //- Return a pointer to a new solidProperties created from input
+ static autoPtr<solidProperties> New(Istream& is);
- //- Return a pointer to a new pointSolid created from dictionary
- static autoPtr<pointSolid> New(const dictionary& dict);
+ //- Return a pointer to a new solidProperties created from dictionary
+ static autoPtr<solidProperties> New(const dictionary& dict);
//- Destructor
- virtual ~pointSolid()
+ virtual ~solidProperties()
{}
// Member Functions
- // Physical constants which define the pointSolid
+ // Physical constants which define the solidProperties
//- Density [kg/m3]
inline scalar rho() const;
@@ -185,13 +185,13 @@ public:
// I-O
- //- Write the pointSolid properties
+ //- Write the solidProperties properties
virtual void writeData(Ostream& os) const;
// Ostream Operator
- friend Ostream& operator<<(Ostream& os, const pointSolid& s);
+ friend Ostream& operator<<(Ostream& os, const solidProperties& s);
};
@@ -201,7 +201,7 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-#include "pointSolidI.H"
+#include "solidPropertiesI.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/thermophysicalModels/pointSolids/pointSolid/pointSolidI.H b/src/thermophysicalModels/solidProperties/solidProperties/solidPropertiesI.H
similarity index 75%
rename from src/thermophysicalModels/pointSolids/pointSolid/pointSolidI.H
rename to src/thermophysicalModels/solidProperties/solidProperties/solidPropertiesI.H
index 6aa0aab563a..252977569df 100644
--- a/src/thermophysicalModels/pointSolids/pointSolid/pointSolidI.H
+++ b/src/thermophysicalModels/solidProperties/solidProperties/solidPropertiesI.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -27,43 +27,43 @@ License
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-inline Foam::scalar Foam::pointSolid::rho() const
+inline Foam::scalar Foam::solidProperties::rho() const
{
return rho_;
}
-inline Foam::scalar Foam::pointSolid::Cp() const
+inline Foam::scalar Foam::solidProperties::Cp() const
{
return Cp_;
}
-inline Foam::scalar Foam::pointSolid::K() const
+inline Foam::scalar Foam::solidProperties::K() const
{
return K_;
}
-inline Foam::scalar Foam::pointSolid::Hf() const
+inline Foam::scalar Foam::solidProperties::Hf() const
{
return Hf_;
}
-inline Foam::scalar Foam::pointSolid::H(const scalar T) const
+inline Foam::scalar Foam::solidProperties::H(const scalar T) const
{
return Hs(T) + Hf_;
}
-inline Foam::scalar Foam::pointSolid::Hs(const scalar T) const
+inline Foam::scalar Foam::solidProperties::Hs(const scalar T) const
{
return Cp_*(T - specie::Tstd);
}
-inline Foam::scalar Foam::pointSolid::emissivity() const
+inline Foam::scalar Foam::solidProperties::emissivity() const
{
return emissivity_;
}
diff --git a/src/thermophysicalModels/pointSolids/pointSolid/pointSolidNew.C b/src/thermophysicalModels/solidProperties/solidProperties/solidPropertiesNew.C
similarity index 64%
rename from src/thermophysicalModels/pointSolids/pointSolid/pointSolidNew.C
rename to src/thermophysicalModels/solidProperties/solidProperties/solidPropertiesNew.C
index f93ededc459..9e2e0d675d3 100644
--- a/src/thermophysicalModels/pointSolids/pointSolid/pointSolidNew.C
+++ b/src/thermophysicalModels/solidProperties/solidProperties/solidPropertiesNew.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -23,16 +23,17 @@ License
\*---------------------------------------------------------------------------*/
-#include "pointSolid.H"
+#include "solidProperties.H"
#include "Switch.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-Foam::autoPtr<Foam::pointSolid> Foam::pointSolid::New(Istream& is)
+Foam::autoPtr<Foam::solidProperties> Foam::solidProperties::New(Istream& is)
{
if (debug)
{
- Info<< "pointSolid::New(Istream&): constructing pointSolid" << endl;
+ Info<< "solidProperties::New(Istream&): constructing solid"
+ << endl;
}
const word solidType(is);
@@ -45,14 +46,14 @@ Foam::autoPtr<Foam::pointSolid> Foam::pointSolid::New(Istream& is)
if (cstrIter == ConstructorTablePtr_->end())
{
- FatalErrorIn("pointSolid::New(Istream&)")
- << "Unknown pointSolid type " << solidType << nl << nl
- << "Valid pointSolid types are :" << endl
+ FatalErrorIn("solidProperties::New(Istream&)")
+ << "Unknown solidProperties type " << solidType << nl << nl
+ << "Valid solidProperties types are :" << endl
<< ConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
- return autoPtr<pointSolid>(cstrIter()());
+ return autoPtr<solidProperties>(cstrIter()());
}
else if (coeffs == "coeffs")
{
@@ -61,33 +62,36 @@ Foam::autoPtr<Foam::pointSolid> Foam::pointSolid::New(Istream& is)
if (cstrIter == IstreamConstructorTablePtr_->end())
{
- FatalErrorIn("pointSolid::New(Istream&)")
- << "Unknown pointSolid type " << solidType << nl << nl
- << "Valid pointSolid types are :" << endl
+ FatalErrorIn("solidProperties::New(Istream&)")
+ << "Unknown solidProperties type " << solidType << nl << nl
+ << "Valid solidProperties types are :" << endl
<< IstreamConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
- return autoPtr<pointSolid>(cstrIter()(is));
+ return autoPtr<solidProperties>(cstrIter()(is));
}
else
{
- FatalErrorIn("pointSolid::New(Istream&)")
- << "pointSolid type " << solidType
+ FatalErrorIn("solidProperties::New(Istream&)")
+ << "solidProperties type " << solidType
<< ", option " << coeffs << " given"
<< ", should be coeffs or defaultCoeffs"
<< exit(FatalError);
- return autoPtr<pointSolid>(NULL);
+ return autoPtr<solidProperties>(NULL);
}
}
-Foam::autoPtr<Foam::pointSolid> Foam::pointSolid::New(const dictionary& dict)
+Foam::autoPtr<Foam::solidProperties> Foam::solidProperties::New
+(
+ const dictionary& dict
+)
{
if (debug)
{
- Info<< "pointSolid::New(const dictionary&): constructing pointSolid"
+ Info<< "solidProperties::New(const dictionary&): constructing solid"
<< endl;
}
@@ -101,14 +105,14 @@ Foam::autoPtr<Foam::pointSolid> Foam::pointSolid::New(const dictionary& dict)
if (cstrIter == ConstructorTablePtr_->end())
{
- FatalErrorIn("pointSolid::New(const dictionary&)")
- << "Unknown pointSolid type " << solidType << nl << nl
- << "Valid pointSolid types are :" << endl
+ FatalErrorIn("solidProperties::New(const dictionary&)")
+ << "Unknown solidProperties type " << solidType << nl << nl
+ << "Valid solidProperties types are :" << endl
<< ConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
- return autoPtr<pointSolid>(cstrIter()());
+ return autoPtr<solidProperties>(cstrIter()());
}
else
{
@@ -117,14 +121,14 @@ Foam::autoPtr<Foam::pointSolid> Foam::pointSolid::New(const dictionary& dict)
if (cstrIter == dictionaryConstructorTablePtr_->end())
{
- FatalErrorIn("pointSolid::New(const dictionary&)")
- << "Unknown pointSolid type " << solidType << nl << nl
- << "Valid pointSolid types are :" << endl
+ FatalErrorIn("solidProperties::New(const dictionary&)")
+ << "Unknown solidProperties type " << solidType << nl << nl
+ << "Valid solidProperties types are :" << endl
<< dictionaryConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
- return autoPtr<pointSolid>(cstrIter()(dict));
+ return autoPtr<solidProperties>(cstrIter()(dict));
}
}
--
GitLab