diff --git a/applications/solvers/combustion/chemFoam/createSingleCellMesh.H b/applications/solvers/combustion/chemFoam/createSingleCellMesh.H
index e9f0272772d0c5d2a3419ca7ef30c147f6b75d73..71ee8d60f6da68c17e17e9c7dfee69044eaf696a 100644
--- a/applications/solvers/combustion/chemFoam/createSingleCellMesh.H
+++ b/applications/solvers/combustion/chemFoam/createSingleCellMesh.H
@@ -23,7 +23,7 @@ fvMesh mesh
fvMesh::defaultRegion,
runTime.timeName(),
runTime,
- IOobject::NO_READ
+ IOobject::MUST_READ
),
xferMove<Field<vector> >(points),
faces.xfer(),
diff --git a/applications/solvers/combustion/dieselEngineFoam/Make/options b/applications/solvers/combustion/dieselEngineFoam/Make/options
index 9a4524781991ee2dda50e905632a3fc35a8be60a..9cefdaf996801894a6c62122b166353c9c5da61e 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 3b1786aa08b6821b38799bebcace1e7560c5eb31..1e6ccfa1391f5671e33e228c3f7ee45d5d3b8015 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 329dffc84d696ed65864b4bcb1290ce2f953864e..f4a9d0c52de12648e832a72ca7866e2e8fb10df5 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 7596b87bbd9a20ca831a782dd395fc3ee584f340..eede9724ce3badbfe1d94d78de1163f0279e914b 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 34867be0b413990e852ce02b38ca117e30d6973c..e9d86d977c741df2b94b404f9b322bd7de3e1475 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 2dbb2590f78aa5ebdbb10fd65f71d023520e7d75..ee3db1695ab103022ca8727bfafaad07bc2f5f04 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 7596b87bbd9a20ca831a782dd395fc3ee584f340..eede9724ce3badbfe1d94d78de1163f0279e914b 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/applications/utilities/preProcessing/foamUpgradeCyclics/foamUpgradeCyclics.C b/applications/utilities/preProcessing/foamUpgradeCyclics/foamUpgradeCyclics.C
index 89cf00cd1b10e60911298a56ab7209d7fa655990..84f3c5652be94b167ee8c1c7866ebd5257d61f61 100644
--- a/applications/utilities/preProcessing/foamUpgradeCyclics/foamUpgradeCyclics.C
+++ b/applications/utilities/preProcessing/foamUpgradeCyclics/foamUpgradeCyclics.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
@@ -311,8 +311,9 @@ void rewriteField
{
IOWarningIn("rewriteField(..)", patchDict)
<< "Cyclic patch " << patchName
- << " has value entry. Please remove this and rerun."
+ << " has value entry. This will be removed."
<< endl;
+ patchDict.remove("value");
}
diff --git a/etc/aliases.csh b/etc/aliases.csh
index 6e1deee991bf5d5c3f2b97095191065cd69329ed..9005f180ddddd440ce8a92425560450a2061522e 100644
--- a/etc/aliases.csh
+++ b/etc/aliases.csh
@@ -52,7 +52,7 @@ alias foamPV 'source `$WM_PROJECT_DIR/etc/apps/paraview3/cshrc` ParaView_VERSION
# Change directory aliases
# ~~~~~~~~~~~~~~~~~~~~~~~~
alias src 'cd $FOAM_SRC'
-alias lib 'cd $FOAM_LIB'
+alias lib 'cd $FOAM_LIBBIN'
alias run 'cd $FOAM_RUN'
alias foam 'cd $WM_PROJECT_DIR'
alias foamsrc 'cd $FOAM_SRC/$WM_PROJECT'
diff --git a/etc/aliases.sh b/etc/aliases.sh
index 2f049825ec5606a364d4b7e94a4c581e567e78c7..870b457f5fff62badcf56d5f8be4a28804762b4b 100644
--- a/etc/aliases.sh
+++ b/etc/aliases.sh
@@ -57,7 +57,7 @@ foamPV()
# Change directory aliases
# ~~~~~~~~~~~~~~~~~~~~~~~~
alias src='cd $FOAM_SRC'
-alias lib='cd $FOAM_LIB'
+alias lib='cd $FOAM_LIBBIN'
alias run='cd $FOAM_RUN'
alias foam='cd $WM_PROJECT_DIR'
alias foamsrc='cd $FOAM_SRC/$WM_PROJECT'
diff --git a/etc/settings.csh b/etc/settings.csh
index a3f9a743c0cd1c82b8a411b1908b8b2dc55d18b0..27bb9563cc4d418da288c64f4c4b84c13186db45 100644
--- a/etc/settings.csh
+++ b/etc/settings.csh
@@ -65,7 +65,7 @@ setenv FOAM_USER_LIBBIN $WM_PROJECT_USER_DIR/platforms/$WM_OPTIONS/lib
# convenience
setenv FOAM_APP $WM_PROJECT_DIR/applications
-setenv FOAM_LIB $WM_PROJECT_DIR/lib
+#setenv FOAM_LIB $WM_PROJECT_DIR/lib
setenv FOAM_SRC $WM_PROJECT_DIR/src
setenv FOAM_TUTORIALS $WM_PROJECT_DIR/tutorials
setenv FOAM_UTILITIES $FOAM_APP/utilities
diff --git a/etc/settings.sh b/etc/settings.sh
index 46c39f59decc3d649b1e14a60d31730a137592d6..728b197720f14a9f1eb5b7ac576051860c5e0c91 100644
--- a/etc/settings.sh
+++ b/etc/settings.sh
@@ -88,7 +88,7 @@ export FOAM_USER_LIBBIN=$WM_PROJECT_USER_DIR/platforms/$WM_OPTIONS/lib
# convenience
export FOAM_APP=$WM_PROJECT_DIR/applications
-export FOAM_LIB=$WM_PROJECT_DIR/lib
+#export FOAM_LIB=$WM_PROJECT_DIR/lib
export FOAM_SRC=$WM_PROJECT_DIR/src
export FOAM_TUTORIALS=$WM_PROJECT_DIR/tutorials
export FOAM_UTILITIES=$FOAM_APP/utilities
diff --git a/src/OpenFOAM/matrices/LUscalarMatrix/LUscalarMatrix.C b/src/OpenFOAM/matrices/LUscalarMatrix/LUscalarMatrix.C
index 03dc2d55366337c1e620ea70796b0e27a5d21cbb..121f016c2f3fef50d92034e3e3f310c5ac0b372e 100644
--- a/src/OpenFOAM/matrices/LUscalarMatrix/LUscalarMatrix.C
+++ b/src/OpenFOAM/matrices/LUscalarMatrix/LUscalarMatrix.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
@@ -260,6 +260,11 @@ void Foam::LUscalarMatrix::convert
}
else if (interface.myProcNo_ < interface.neighbProcNo_)
{
+ // Interface to neighbour proc. Find on neighbour proc the
+ // corresponding interface. The problem is that there can
+ // be multiple interfaces between two processors (from
+ // processorCyclics) so also compare the communication tag
+
const PtrList<procLduInterface>& neiInterfaces =
lduMatrices[interface.neighbProcNo_].interfaces_;
@@ -269,8 +274,11 @@ void Foam::LUscalarMatrix::convert
{
if
(
- neiInterfaces[ninti].neighbProcNo_
- == interface.myProcNo_
+ (
+ neiInterfaces[ninti].neighbProcNo_
+ == interface.myProcNo_
+ )
+ && (neiInterfaces[ninti].tag_ == interface.tag_)
)
{
neiInterfacei = ninti;
diff --git a/src/OpenFOAM/matrices/LUscalarMatrix/procLduInterface.C b/src/OpenFOAM/matrices/LUscalarMatrix/procLduInterface.C
index 0a4b7132027802f08b7d877413ece016239d3c83..979ef370274934aa630144e6072b227cc77bd317 100644
--- a/src/OpenFOAM/matrices/LUscalarMatrix/procLduInterface.C
+++ b/src/OpenFOAM/matrices/LUscalarMatrix/procLduInterface.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
@@ -39,7 +39,8 @@ Foam::procLduInterface::procLduInterface
faceCells_(interface.interface().faceCells()),
coeffs_(coeffs),
myProcNo_(-1),
- neighbProcNo_(-1)
+ neighbProcNo_(-1),
+ tag_(-1)
{
if (isA<processorLduInterface>(interface.interface()))
{
@@ -48,6 +49,7 @@ Foam::procLduInterface::procLduInterface
myProcNo_ = pldui.myProcNo();
neighbProcNo_ = pldui.neighbProcNo();
+ tag_ = pldui.tag();
}
else if (isA<cyclicLduInterface>(interface.interface()))
{
@@ -70,7 +72,8 @@ Foam::procLduInterface::procLduInterface(Istream& is)
faceCells_(is),
coeffs_(is),
myProcNo_(readLabel(is)),
- neighbProcNo_(readLabel(is))
+ neighbProcNo_(readLabel(is)),
+ tag_(readLabel(is))
{}
@@ -81,7 +84,8 @@ Foam::Ostream& Foam::operator<<(Ostream& os, const procLduInterface& cldui)
os << cldui.faceCells_
<< cldui.coeffs_
<< cldui.myProcNo_
- << cldui.neighbProcNo_;
+ << cldui.neighbProcNo_
+ << cldui.tag_;
return os;
}
diff --git a/src/OpenFOAM/matrices/LUscalarMatrix/procLduInterface.H b/src/OpenFOAM/matrices/LUscalarMatrix/procLduInterface.H
index 0e03bfdb375511ad7482c561cd68a10e4144dc48..defaa331ffbb78821e637add8caf8144ec204d94 100644
--- a/src/OpenFOAM/matrices/LUscalarMatrix/procLduInterface.H
+++ b/src/OpenFOAM/matrices/LUscalarMatrix/procLduInterface.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
@@ -57,6 +57,7 @@ class procLduInterface
scalarField coeffs_;
label myProcNo_;
label neighbProcNo_;
+ label tag_;
// Private Member Functions
diff --git a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistribute.C b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistribute.C
index 25e7727c8e4ddb2bc50e143c14a95612f11d7f23..95c2d1d2321fa152da5c1793b14dd94c49882ca5 100644
--- a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistribute.C
+++ b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistribute.C
@@ -29,6 +29,7 @@ License
#include "globalIndex.H"
#include "globalIndexAndTransform.H"
#include "transformField.H"
+#include "ListOps.H"
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@@ -1104,6 +1105,12 @@ Foam::mapDistribute::mapDistribute(const Xfer<mapDistribute>& map)
// * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * * //
+Foam::label Foam::mapDistribute::whichTransform(const label index) const
+{
+ return findLower(transformStart_, index+1);
+}
+
+
void Foam::mapDistribute::transfer(mapDistribute& rhs)
{
constructSize_ = rhs.constructSize_;
diff --git a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistribute.H b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistribute.H
index 6e1a26468cd4e5563e7ab4f9131fc8dad915d482..99a31d3d7d92a05d210bc9e2266693449a4b79ff 100644
--- a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistribute.H
+++ b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistribute.H
@@ -385,6 +385,9 @@ public:
return transformStart_;
}
+ //- Find transform from transformElements
+ label whichTransform(const label index) const;
+
//- Calculate a schedule. See above.
static List<labelPair> schedule
(
diff --git a/src/lagrangian/coalCombustion/Make/options b/src/lagrangian/coalCombustion/Make/options
index 763b6cc2486a3d539cbce76e43fce03fbc28a74b..93f4b9d404dd63c7bce95b3f49f91338e897eef5 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 40cb013fbb7939a2c04f5e346bd6619018400346..9891ba01973ee5d44c5443e21a7e1f020fa51fe5 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 a8c6e028626a4ce4df7b20ad779cbc815d136699..e1c722dc09f162a43ecd2671f92743568e1fa9ac 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 e29bbfcf8b05aa24a0e60e28ab9a6b2bf74f630c..876842b7cdacf0ada60efaa1d5040f3d29a52428 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 27b7e4ddd7b94969395994ee53de3e38684f1cb1..c2de30e258e8952c8bc7a5902784c5a2d23cf29c 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 529eef58f5a182fa02755035a751f22ed038224f..c436c1e4fbe3923e9ea5cd1aab9031583878c2f8 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 aa3b30611ca9c052c161dc0e23f13f32a8d17ba7..148ca0eaf1f4acfd7014ea0580c95d9c50b38830 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 fbd957ccfb0b9047ad4e547bee6e63e4fb8b180e..760c26d118c893f496e04e775e1b36048a4a14ca 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 4af479631e3bcd94f9a3aa0dff9e152f7b1957da..d0fd0a2ebba1529a6418dc40d8daa4426b5217a3 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 795f548bc393f1ce06de5664fd4327212e60a31f..1c0607dd53717f54385ea03bd219c417de5d4764 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 59acf5596e5cd169f0ef4af6d7fa329995779f56..55ad8276efa5017056a24595b0ce820377fe52ef 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 241b7cb11385961a6210e8e493ff0425d22828fb..f7c5c4214a3f1e047e5e502396b24bb71b18f357 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 2df163b402e362d5d69ca2985546f01b8baab215..54fab69d486c6d907222a68d3c581131e738eadd 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 45f24d02769d2b61def0c74d8944e80ab1141fb9..2f2516813939e6be4402fc56756765110c929385 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 6a8d8c6a6ba2e76320a78f821ccea4fe6bdf44f9..c1a289c719dc03c31ab2a6729415ed30eee02dc8 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 ef983481878e33b8f72688458e32b5d4159e3034..dbacb3bfa9910a4bf6bcebb31c3fdb08bfb4ce76 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 6eef87400fb08db6ccf00e44a0399a74cba813bc..9ba9375c80f8d2173e7e9354bcbb70421b173938 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 e11bd085327f29fe5496988c47c43d8db4c61767..740d0453c74a8efc271bdc49619cdffd749652d7 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 682b2ebfafc1fbfe2a800af2bdaf11371748b663..b0bf8b74ebf5e6f3baed575d41a500c63af92a8f 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 eade4f966c1b805d0d5217abdfb68b45c1533597..9668e86404f44de429dfd246b52f6e884b320cfd 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 59b20f929fc6a019ce493eb1a25816ab3b7f82ed..55ff9dfc909d0e1253c1bb4881ef0f728535ecb2 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 3e243038262cc7e1d244f20221946337c3bdb0ff..7824e726a29691ccd3010cb6f455eef26212e098 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 2af3301cdbb788d28ff5672eddf541f300fbc9a6..ee2dfdac2879767df03aca4027a8a3fc34856ac9 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 76fa010e5e6c3a744a3fbb58a978033d059119dd..68b29c9084b557c2cb5b0c3a45c56b7f8abc74d2 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 fbbde6326f42f63b4ab93c80fc3464b4bda611c9..835a4e767f7c6b7db231297b7d61ac00c6e9df62 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 8a16cf6cc294daed38575fa11ed27acb43cb07c4..260740dd985ac5df9966c48c065258d9ee8f64bc 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 463f47f92e58e20941051316c449e3a4e58fb3d4..d1502014ba364880a28b612d5409f344aa26c3e6 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 e8ac0b90796ab07370d54751e30a72c81aa1536a..7e4ba37eebef18453d5246d1c4ef1c6544ead253 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 af3dedaa179a2f084807b01ebfc7efbf6a8e4c0c..1f7f984a826750b5d6af0b40c0e06020253b36f7 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 8b121c622e642fdc9e5f22cbab200f4ca16957c3..2189382e34aa389312888b0c842f36240d3b3aed 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 f28eb559addb148c889f86ef7e47c92c50a57144..7b96b28d15baa72fc3afaee7502a920958d22e18 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 61636ad1769518d440c9da7a8c7b4111ed4f3919..78efbc2ccbba87ffa98580217858871e0e2774fe 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 6c410479f48597d6c85f4db4e260828c7239c5a4..01079023dc13e2acc2587256fac6bd9928b16c4f 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 5bd1443461ac178ed8f7ea039e4779fb1cc2603c..f4ef3324c7a44bb0f6e6880b3662fabeccb90261 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 216b51d6fe149cd0b98593cea36b2308cea8bd6a..5c96b6907ee7603e6f8e60fe89d19b148a8ec227 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 db2b9e627ba49d84506d394e780fabc27626c724..f474d86966356c8b42fc4b23443ac6caf7beb0df 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 aefd1679bee9585d0a104234f61fb67aafc45d84..d7798cff98d0621f8309c679c32c50a6d71a5fe3 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 c36e4e6916c58fcb3bd46bff18b59391b044d6b7..16459fa5227edf4874f4363cb263074803345e41 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 7556a97b63d83e201a98f69f14c3266788092ac4..51b714f831ae5aa35e92e151499c007cef19672d 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 7895f8573a20a8785487e6890fd9339f6ceed32c..67ebff166cfaeb94e945d78eb319d9da1ccb6388 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 590637f54f6b56884776139dc6dd6927e5f76138..84e4bec6dfeac6359f85c6262f6e67516fec34ff 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 c0e6998eccac0c2ccf587054b2108e0c16fd5785..d17cbc3e9dd84de5e8d8935fc7dd13387cce81d9 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 db20632300d9ea4ab1e315b7156adb88da249d0b..7ff9a9456a1d8a410dae812d81ca42484a6229fd 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/parcels/Templates/ReactingParcel/ReactingParcel.C b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C
index 91f07d24db3097ffe02d0b585cc57c98d6bdbdc8..968b1cedf656eb26871d3ce0adc528ca30f8ace0 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C
@@ -50,16 +50,19 @@ void Foam::ReactingParcel<ParcelType>::setCellValues
if (pc_ < td.cloud().constProps().pMin())
{
- WarningIn
- (
- "void Foam::ReactingParcel<ParcelType>::setCellValues"
- "("
- "TrackData&, "
- "const scalar, "
- "const label"
- ")"
- ) << "Limiting observed pressure in cell " << cellI << " to "
- << td.cloud().constProps().pMin() << nl << endl;
+ if (debug)
+ {
+ WarningIn
+ (
+ "void Foam::ReactingParcel<ParcelType>::setCellValues"
+ "("
+ "TrackData&, "
+ "const scalar, "
+ "const label"
+ ")"
+ ) << "Limiting observed pressure in cell " << cellI << " to "
+ << td.cloud().constProps().pMin() << nl << endl;
+ }
pc_ = td.cloud().constProps().pMin();
}
@@ -86,54 +89,50 @@ void Foam::ReactingParcel<ParcelType>::cellValueSourceCorrection
return;
}
- scalar massCell = this->massCell(cellI);
+ const scalar massCell = this->massCell(cellI);
- const scalar V = td.cloud().pMesh().cellVolumes()[cellI];
- this->rhoc_ += addedMass/V;
+ this->rhoc_ += addedMass/td.cloud().pMesh().cellVolumes()[cellI];
- scalar massCellNew = massCell + addedMass;
+ const scalar massCellNew = massCell + addedMass;
this->Uc_ += td.cloud().UTrans()[cellI]/massCellNew;
scalar CpEff = 0.0;
- scalar CsEff = 0.0;
- scalar Csc = 0.0;
if (addedMass > ROOTVSMALL)
{
forAll(td.cloud().rhoTrans(), i)
{
scalar Y = td.cloud().rhoTrans(i)[cellI]/addedMass;
CpEff += Y*td.cloud().composition().carrier().Cp(i, this->Tc_);
-
- scalar W = td.cloud().composition().carrier().W(i);
- CsEff += td.cloud().rhoTrans(i)[cellI]/V*Y/W;
- scalar Yc = td.cloud().composition().carrier().Y(i)[cellI];
- Csc += massCell/V*Yc/W;
}
}
- CsEff = (massCell*Csc + addedMass*CsEff)/massCellNew;
const scalar Cpc = td.CpInterp().psi()[cellI];
this->Cpc_ = (massCell*Cpc + addedMass*CpEff)/massCellNew;
this->Tc_ += td.cloud().hsTrans()[cellI]/(this->Cpc_*massCellNew);
- if (this->Tc_ < td.cloud().constProps().TMin())
+ if (debug && (this->Tc_ < td.cloud().constProps().TMin()))
{
- WarningIn
- (
- "void Foam::ReactingParcel<ParcelType>::cellValueSourceCorrection"
- "("
- "TrackData&, "
- "const scalar, "
- "const label"
- ")"
- ) << "Limiting observed temperature in cell " << cellI << " to "
- << td.cloud().constProps().TMin() << nl << endl;
+ if (debug)
+ {
+ WarningIn
+ (
+ "void Foam::ReactingParcel<ParcelType>::"
+ "cellValueSourceCorrection"
+ "("
+ "TrackData&, "
+ "const scalar, "
+ "const label"
+ ")"
+ ) << "Limiting observed temperature in cell " << cellI << " to "
+ << td.cloud().constProps().TMin() << nl << endl;
+ }
this->Tc_ = td.cloud().constProps().TMin();
}
- this->pc_ = CsEff*specie::RR*this->Tc_;
+// constant pressure
+// this->pc_ = this->pc_;
}
diff --git a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.C b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.C
index b95ba03f8c0042890b96cddefd5c8f69a9f0c7d7..153ac45fa62c484e888abcc010cb05db9b42e50d 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.C
+++ b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.C
@@ -49,16 +49,19 @@ void Foam::ThermoParcel<ParcelType>::setCellValues
if (Tc_ < td.cloud().constProps().TMin())
{
- WarningIn
- (
- "void Foam::ThermoParcel<ParcelType>::setCellValues"
- "("
- "TrackData&, "
- "const scalar, "
- "const label"
- ")"
- ) << "Limiting observed temperature in cell " << cellI << " to "
- << td.cloud().constProps().TMin() << nl << endl;
+ if (debug)
+ {
+ WarningIn
+ (
+ "void Foam::ThermoParcel<ParcelType>::setCellValues"
+ "("
+ "TrackData&, "
+ "const scalar, "
+ "const label"
+ ")"
+ ) << "Limiting observed temperature in cell " << cellI << " to "
+ << td.cloud().constProps().TMin() << nl << endl;
+ }
Tc_ = td.cloud().constProps().TMin();
}
@@ -81,16 +84,19 @@ void Foam::ThermoParcel<ParcelType>::cellValueSourceCorrection
if (Tc_ < td.cloud().constProps().TMin())
{
- WarningIn
- (
- "void Foam::ThermoParcel<ParcelType>::cellValueSourceCorrection"
- "("
- "TrackData&, "
- "const scalar, "
- "const label"
- ")"
- ) << "Limiting observed temperature in cell " << cellI << " to "
- << td.cloud().constProps().TMin() << nl << endl;
+ if (debug)
+ {
+ WarningIn
+ (
+ "void Foam::ThermoParcel<ParcelType>::cellValueSourceCorrection"
+ "("
+ "TrackData&, "
+ "const scalar, "
+ "const label"
+ ")"
+ ) << "Limiting observed temperature in cell " << cellI << " to "
+ << td.cloud().constProps().TMin() << nl << endl;
+ }
Tc_ = td.cloud().constProps().TMin();
}
@@ -116,21 +122,24 @@ void Foam::ThermoParcel<ParcelType>::calcSurfaceValues
if (Ts < td.cloud().constProps().TMin())
{
- WarningIn
- (
- "void Foam::ThermoParcel<ParcelType>::calcSurfaceValues"
- "("
- "TrackData&, "
- "const label, "
- "const scalar, "
- "scalar&, "
- "scalar&, "
- "scalar&, "
- "scalar&, "
- "scalar&"
- ") const"
- ) << "Limiting parcel surface temperature to "
- << td.cloud().constProps().TMin() << nl << endl;
+ if (debug)
+ {
+ WarningIn
+ (
+ "void Foam::ThermoParcel<ParcelType>::calcSurfaceValues"
+ "("
+ "TrackData&, "
+ "const label, "
+ "const scalar, "
+ "scalar&, "
+ "scalar&, "
+ "scalar&, "
+ "scalar&, "
+ "scalar&"
+ ") const"
+ ) << "Limiting parcel surface temperature to "
+ << td.cloud().constProps().TMin() << nl << endl;
+ }
Ts = td.cloud().constProps().TMin();
}
diff --git a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.C b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.C
index 219e691e3a7da2b721c33c50bba900c7911e002f..2815d5e3d1ab5624e685adc81be9fff9275e1773 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 74a4a87a2054db38164257de93a183addb6470be..04ec177d1cb5a8320d839704e6ba1965c3103f1d 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 dbae15d93d4b199afa8c007494f7294297e53bb7..8c66c4fbbd20723d111c0f0a348a9ee8ddb3414e 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 c0d9f69e7703a4c115219b37c071d21cf1c89013..84dc17c90ddcd8739cd8c099c27d8321fbc519ee 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 3b0199a09b5a9b3694ce73c9c915977c0441bb2a..dda598200c908ea48dd6a229a2a5f6d26e8c342a 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 29ae7ce8ea6a90f6496b68d3d791bf41a4efb133..375f0e22fd057c12a6cf7aee2ee464bb956d76d6 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 1723c09f711ba96227ad2697675eb9f5de3572c9..c6a7e254f8e143bae9ea7e0b956f846663e600cd 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 0695c1fba4e51b696f6cb5a0660daa334f2f38cb..0ae32ec9ac589733157634d972464b9375eed61c 100755
--- a/src/thermophysicalModels/Allwmake
+++ b/src/thermophysicalModels/Allwmake
@@ -6,10 +6,10 @@ set -x
wmake $makeOption specie
wmake $makeOption solid
wmake $makeOption thermophysicalFunctions
-wmake $makeOption liquids
-wmake $makeOption liquidMixture
-wmake $makeOption pointSolids
-wmake $makeOption pointSolidMixture
+wmake $makeOption liquidProperties
+wmake $makeOption liquidMixtureProperties
+wmake $makeOption solidProperties
+wmake $makeOption solidMixtureProperties
wmake $makeOption basic
wmake $makeOption reactionThermo
diff --git a/src/thermophysicalModels/SLGThermo/Make/options b/src/thermophysicalModels/SLGThermo/Make/options
index 6121f1c83e0c1000ca1448cc65e8f3d6974caaab..3eda6c06d5620d4dabf3c5ce999332cb08b4ac93 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 ce9048a5ac6793f24bc48a5fcd9decbcc00d6991..711dd174c76e5603d2492eb865bc6a6bf0634a08 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 f4ba8299a83f6516fcd91a45a840c18e129f6a92..751a39416448f500d95aafa4cd3f740898ec590f 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 5d205229ef99e59deda6fa1e414efd428d8dc52b..0000000000000000000000000000000000000000
--- 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 6d4c2eb7658fcd2a315953f35c3a1c5b2fc61388..0000000000000000000000000000000000000000
--- 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 0000000000000000000000000000000000000000..4f0959cfc7767d4395fd472df37af09a6c3ecdf6
--- /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 bfa6b569ba77177a6a88d674a674ce257c84e2fd..28490cc168761c9d0a5ceb2596dce002424e8f9d 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 aa573eb1ad94419244a5167214bd0d4af80cef22..a28d214d99c9c503cc95a80c7db025ef41486d00 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 186d19e64ce88b17122f076334250786523784af..d127478cacbdf23c1ef9694703193690fffa37ef 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 113c62d200767c9382ab680bfaa7191a860ae660..167b0d229ba5ec1fdeca03820a8f914833f32f03 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 b5a80e0c5f213a6acd65128e60e46f4e3f442cdc..dbcce489ceb9605d359434b419b572a6ab728ec4 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 4c0325833e59478c191e079c4a2346306e95083c..43f02099d97a5a99db4d09e5923199746253111b 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 9b0fd047c1dfb4f94fa484585dcecdd6f0947d06..c2f153d98929c8acdf30dcfdb055c9af439d41e3 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 328355329521acfcea26818668b675c18875a007..91abdc41ee0d29448b4e03d036f51c1a1c97cf0a 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 7fad8fdd259413c7e0c12d0b4f3d3eccaf2574e1..0cb8e4def56ee5e17a7fa3708d6a617b49ce3b15 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 cc4880bd7e9626f368fca7cf0b134fb61a834265..a35c62cbf000b40600bd87f0b91104ef5b1891af 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 023c8864953f761c6e67711a3611da1b7e5918a4..1651d288d4cf91ea7450b419a356cc5501db6f3e 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 24bec218b7bf0d6a73aaf8b5c3a0fcc0b2ac97c3..b53f6fe8ec8be71379eb3c173f1b820baabcfe34 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 12884c7efbca96f35286d3c3ad41c842f18bf8e8..4278f2bf330ece370696ab881649dd5f200fe73c 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 1c2e6d3fc43d11966d1dad7ad80f872656cdb889..346a9ef48085448d7a090e337c70605df83efe0d 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 cb6912e51baf644eedd7ea86db1ce88248493f93..3ce3352b161653f558aba34a4ace9561036d6518 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 a50eb7f4f53a799e2d2653a13c47a814c7e39ac4..434c5c47001a62b2584878d7922ba17543f8e36e 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 ec98406e3f1bcc5312c9257f961b95a07299e4c7..ba8033499f5c7e31842f4e4304ca194c1af2af89 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 165c345fc572ce305114d9724d0bdc4f2dd27ba3..fcce331f7cc71997e01c7f0a246a902df8c2f15f 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 be9df8a31036f594a6028b98c5a922c5b1adf14b..33c5a7dba33f088dea11ce3e5b312dcfbf4388a7 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 3d14007cf4f130a44a360b0ddfd9fe98e0f92b31..de16ec9db63d97d0cdcfea72767905145b6e9b37 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 7b0997a339906596da46b10570aa7b9dc736b956..5b95693571908de5d64aa119fed0d0f8b9379d8e 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 2b86f7363087b795568452625a2f7887957bc637..5509b6b6a637dd95caef22f80182307d1f111283 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 7eaf9679cf5e6c497fb900f3d6af0472a8c51193..4c282b4ca4b7c7cbaf6170863a3a9235386893c6 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 cd802142857fe163fe097b6cfab79c07920051a2..993251b8a21064c5bf4cf59d44e14d16dd72cfe9 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 f648ba7792e6a1c496450a7950936fbb9aa63284..ce2c710da312acd2e244366dd4b3bfff012cc9ff 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 ff4e527253f8eaff2bba889ab3a70842b3f90f75..fe5e7b9e5229d0f289dcfa808ffa9632d2d09a9a 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 75e10ddb995d80e58ff7a3fea5edad7cfe555d49..83c83845bf91e11405c510aecdb9ece3fc9b6849 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 38e3f06797271c1d2ec63026a3aa92c4006eabdd..9d978cbf97b503704e66189cb452e64ec4f4298e 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 3fea9b5061f2143dfbe871fdf20ff577966a447b..380bdd6dce4c639f73ce8a5b2c5479afcf1b59ee 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 bd085b1becf07edd91146b441b98e269c99f7cc8..b59c6ec3e3c2c65652c19ec1e679064bfe5b424c 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 307d72b704ec8a97c06beb2cf5c3a8e6a0348951..c4b8254bb5150fb76e0bd4a22a5109063d0ee043 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 1ae3a34d0e871eb57c77ce507786759f141f53db..88e6edcdac7cbaf55022cf0448c62e978aafb68d 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 40a455ecb2b10ad528eec9b78f1b3675c656657b..6a5ac9303650308c67e2e054368156aa96a5c17e 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 27bcd05e731ec5e2ae625f9acda745e6d7f71a8e..7fa59aa1baaa08fb3b860012fbce6de7ca46a45d 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 bb25111b67ceb4d87b3dcb30bf776582e9ffdfd9..b539f4b504189fb815827ab2f0d30d552e5bd1d1 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 e298bae4c98392b5a935e05c99a76679776fe95c..677d96bfa2615565f1c630be50b018db7b3179f3 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 c2ce36e90ca2e17aac517536915db6bd366352db..34237ac91b4ef1a62db9a17b2dc8671e8839562c 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 f07cdbc8d49339a194068ece6e54ab948e7efd04..9a1ab395c4d42ba43226094e7e5f1ba5d8f6ed20 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 e3737774a15e3dffeb5ac85cfcfa48f8782023d4..e594fbc55017b03e9611e655753bb5f02920762e 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 810ddfa781ae4a81957b30337d98eb56078903ea..7bb4e2cb68d3227dcaca554a63a93507cdcce032 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 339a7d5e2874362533ca06f42f5cfc36e741b790..3734d712dca669e53d4c2b4ae2e0862026f4cd62 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 66f3bfe53e7be3739218db494a983758117eada3..db5ef7878f76d45c645af189e14311d86f8f3427 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 bb340e8223d17fb18cd4ac6246888597153fa499..2285c1fa7dc9ee506144d759d74a5bfab3d77dda 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 8364eeb7726767f429b6d2aa0c0086dd8fa25696..0eb4935bf5d38c23b77c1db97afb247697da53e0 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 e304faf9c9bd6e78b577a3f094cce4a23a4f95d4..90eb54e1a1de9b0328c2f63419dc3960e86e3291 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 996a6e8bcb91832088da1b82a8ebb5ee56158efe..8a316775bc40dbedea59bf08ffe5957ec59639c5 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 bee4f0d3ca5292a72bea72844bbd2dc3266cd565..00a0b8a3a229c211dc3ffb7a790bdcadcc458ecb 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 a6fb5425058f46eb7fbf02777bb2cae059858b23..e258a4595b83e812a25abae1915247560c4c8be3 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 7bdfe8a6e614e09cd074bb9dfd9b924bc905ad78..86f38fc2ca049b3e87554e74fd7f7f37310ddec4 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 67602dc2c8983c5be250bf4b74636e900424d32b..6e8541115df37392a3d5fbb8d871c367db148c48 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 0f22c1bdbdbda2613f1dd90a3b211eb0c15f933b..0ca76b67a7a40caf78f7cafe3ef9264df7407fac 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 056d1e3b29e435314a1ebb3ca24e72db4455ca8d..409e3690a93a97c9df1563f1b024d62866a78f39 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 985171794eaa720cb980027cd85dfc59d0b9bda8..1c2b0bc5dbff1e41e96eacd741ad9fa05d28bc6e 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 7f1efbb3d285a56edf3f7350da2336d85a5996bc..46eaca6e871ff199009f7f33a97da63f8dace929 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 3a51caf792ad8ef709dc6c3df5d6eba5a4e0ba82..414bea27f6e4344143652ee94a5ec4ffb3ef44a3 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 2be91bf4d5a737a3624bae644dbf4ab36b1a9f9e..5b841caa28ba95dc67012412ea5b99c5807bdf4b 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 5be416de6840f15fd56e7a354c68f126b2ef64da..ebbb6b78bdb2c9143bc7b5c4d49f5ddffb67dd0d 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 2e321ded79abfa7883ec6b1547f63547765e5f8a..5090f573b4914290c46a88e3c0a5651224e967f2 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 5f4f17fd89aa7ce89070c6dc9b6e6a3d76d7cf62..9d03c03970c9deee089130bc59aa9ca9b76b108b 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 dce3a0f9ebd2a5d7ae270718fee3546fdb999fc0..7c7c63c864df01ac1beca1bfc693315544ee1da6 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 594a867e73c1b82fb9125e456640b6bd8fb3993b..3859bed3ec2b7e36f19f73078e96a892c0347a3e 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 3ba851ba788a677b6a6d668ef0861f698f8500da..d334e240b6622ffb8e17b66edf48168c7c8a1347 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 0a3bf14e9eb74b20e029e2fe830dbe6805e5f7cf..aece4b536b0a30d91aaf5169496aab5451a1ce14 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 b40f001006d2b102c810ce161354fd8ddd89a5c4..8d0b407cef2a8c3bddab41c61b7f290b98a7af7f 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 84bfd189547b3bfb674cddc0bd1ee7845f51fcdd..62d5c8b7eb35eab8e85cf4b753609db9c329435d 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 82b06c85865cbb33e1e0fd090d4e8bc61c195a93..439644a4ec331d815fd40582f55617871e2bae3e 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 0f1b2824bbd7d35d4853c78c9ee28b2ea3e28de3..9edb17df630e563d1ac1ed3d55f8961fd6e3dbd2 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 66ab3d33c61ab06b12b4aaeddaf01b69bc19101b..4925bdc819f009f3289a1b941a6e709776397e3f 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 dc9346da3f5e0db5565143e1f117f817ec93ae91..1b450b62892ac29c2e1ccb9b8849fdf26b337836 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 223d1e4538ca06ac5167aac43c8d403a44f246f0..137605942201d13f1aa97ffa450719ba86cf7bf5 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 33d67a06ef4e9fba9b2cb9a2599e5771abbb7046..500fd6c1172b1eadb11491c8c719c700ba6e7a3f 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 12b722922d16f68e633b71642d09809347471104..806afaf6dc557972fa972fc9e403965efdff3d69 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 49470621e8cc14361c728ccbf2df55be9aa653fd..3752a3e76f6a7d7a33cf6db5880a5c72f4b8ae2d 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 476c7b8478acfa22d9346e022b997bec499192a2..e3a0ff4c1c61b00a38e8fee603dd7ba921134da1 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 eb593b097a104405bab80a5eb178317d4364fa02..b99d39bab2066b2fa8c682a63080634d703d275d 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 e519492bda8d824a8bd6e90bbd4fb7df5df29588..d5a39b1a4c8311b5fed4377cb20f062d3159691e 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 bcea55a03b6ebe7d8efec9519c25ef5f00898a69..fa91d57f39c41e739e26c8a5932817e5d3ced4e6 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 0ad21a6942cfa94bb7eabac770236ccc2a64d643..c7333766ad95db8139c5a38700090119ff407942 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 e2f27128d520e81ed9e7d4e8b9dee691724f1483..9b6347d83efb26c91b368be21674673287ec972e 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 dd7f6648df5c975dd81a7fa3a3b575f8d8bfa120..c6d36feddf5770d7fbf188bfdb47842e206dc20b 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 f8a199661e182225abe58c21bd42c8031f61fce5..94412e3beb0fbfd2ee5fc53e6de0ce45fdc94fb5 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 5258c41bdf47b9792d3ebae26aa2568e76b37388..14b00cc77533e1bf8ff9b01424f8ac728f23791d 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 ac355d3c006e3d877c4ed562762d1cf468fde121..8297a842abc6a704eba9cb840acd024961c002c5 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 f53343aec05b7df8186cd95bec1929a5e5ec3ddf..3f93f4509b331009632a7da354feb0196a3b6e92 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 9ed32f011d57373063662dd034263612c97efa26..1c858c47c07578cbf67089d32a845ed0b471136e 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 b0b5d82cc747711340a42bb9781d5ede1507ca2c..285633e339932491166c82c66ff4dc5d859b52d3 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 6a0c08814c742dd17b948a5ae081d5b8e0eab9e3..74989233e825a6250092b951c95c9c5c5e7a76bd 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 bbe0558393b9548409f8689d4d424f0bcba9d21c..7308518f99525863b2eea094b183f64f1e66fee2 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 83572b233f71f9921aa0adeaa88e1166ce396664..cb6f946aea8a17f843c60cf6ce3f67c032f26ffe 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 0f3e1b414d496e85e9c00568b751e26f3d724792..d1dbf718ca75537a51d66e3fd9a49f21dc660368 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 256ba7db2c14a8ebf1ef1867fddcfc7ec2f721c7..81e4d1c20fcfa4796ddb2166d0dd28d66292a795 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 0000000000000000000000000000000000000000..5806013778fcfd8db302a34936ddd9a104a83e12
--- /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 aeaf885d4470a91fb90c44fabee6d184efe421da..3d8062a7e53cec66dc7674ad10d6628de1c31133 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 fa86dd41f0582a3d33c6ac31dd71b81b0a533f34..3cb5990fa48335d756cd7b0db3d554a66646ed91 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 9aa51834fb1ca45642421e4436ce7ddebd6a1d3d..a06493c13729581c054f3ca8c3459da310a27a1c 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 e4a9dee2148d1021dcbfa47d758a5987d4906866..69c0e66a6f4fa5e2d37e5f15efb35cdf15e86c46 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 f7d788e23e984fe6637d618163ed9ecc6b23e0e0..cd02f67f8c48b64d3b77eb7748ed26aa0e48368c 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 45da23e3f652cca5bd181380b7c3ded7a89100c3..0000000000000000000000000000000000000000
--- 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 17cad4937b86dc11b47f20e871508956d700061d..0000000000000000000000000000000000000000
--- 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 526d2519705c1bdccc31fd7f94dc5b26ebe71b94..0000000000000000000000000000000000000000
--- 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 0000000000000000000000000000000000000000..e31412ed1dda107e56f16c363c48a61f2db5fa3b
--- /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 db6f1fe9211e1bd64242a1995d4699c31ac3e06a..a7802dcbf8edb5490de56b2737ab9ef4e7f06c74 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 3eb1d15b2e5932635252d9023abdb2c2dfd0921e..1d4afd216237d908beedc653c270d0cdab3e281f 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 0f6b749e86f824fa7d66c30ed2f774299802e741..d84449414cfa9d39143b371301749a080dce9b35 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 1e178dfc440205b18ecff1fe58920a0684f89903..7a6b3137920dae394439033f9ff3400e32a86f7e 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 614a1532060a91a4c09e628158e73ee614872a03..bd4b4364bcc3d2cc84e18bde999873dc5da51e28 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 d15029f65a116fa958a2822ae6c8b355941835cf..f199c4e0e1314aa80f869e94fd41d82f3b1c3f7d 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 d5559500b8f09d809d7f6cd7400baa606c52e633..fc47cd1d953f60ec348d8b35eed11e3dac5c1b0b 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 0000000000000000000000000000000000000000..694c379453f81cd4a51e3cdd09c0af6b88da57b8
--- /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 b9672f5bd03e6e31e98bb099dc1f6e263017c2b2..2ab7370ff713c5b816377417c7876b6c57aa9dde 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 fcbfbdeeb94c0400c4d18dba2cfe53f60a33ec60..796cc3b3d85b47159aafa2910259ce5956c26fe7 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 6c53900fc09752032f01a0ca7cebbf7eb1c3f066..e3c0f8ed0eee10cf8452849336b0189c4d6e862d 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 2b660c95375e0e7bc06f4ff672bad86c9a694540..7ed4e03f145f05338105551dd9a7174f917dfbc1 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 6aa0aab563ad5c7726307b38d27aa763d11cd711..252977569df167f12a3175a6b4c22107daa6f0ca 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 f93ededc4597b8717fb5ae5e8d890c7b133e5c11..9e2e0d675d3f1592bdebaa601e0b3cf82ec2745f 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));
}
}
diff --git a/tutorials/combustion/chemFoam/gri/chemkin/chem.inp b/tutorials/combustion/chemFoam/gri/chemkin/chem.inp
index 6c9e031c4ccb92b333b6fe48662e17dcf7f6aaf8..eb5d63d38899bbb60f405329113e6b7414406ca6 100644
--- a/tutorials/combustion/chemFoam/gri/chemkin/chem.inp
+++ b/tutorials/combustion/chemFoam/gri/chemkin/chem.inp
@@ -7,7 +7,7 @@ ELEMENTS
O H C N AR
END
SPECIES
-CH CH2O CH3O H O2 H2 O OH H2O HO2 H2O2
+CH4 CH2O CH3O H O2 H2 O OH H2O HO2 H2O2
C CH CH2 CH2(S) CH3 CO CO2
HCO CH2OH CH3OH C2H C2H2 C2H3
C2H4 C2H5 C2H6 HCCO CH2CO HCCOH N NH
diff --git a/tutorials/combustion/chemFoam/gri/validation/createGraph b/tutorials/combustion/chemFoam/gri/validation/createGraph
index 7f16367984818649d49314e604b08f17317e34d6..3cf81886237c0cde7efe5da64c7f636efdd08572 100755
--- a/tutorials/combustion/chemFoam/gri/validation/createGraph
+++ b/tutorials/combustion/chemFoam/gri/validation/createGraph
@@ -1,16 +1,17 @@
#!/bin/sh
gnuplot<<EOF
- set terminal postscript eps color enhanced
+ set terminal postscript eps color enhanced "Helveicta,20"
set output "OF_vs_CHEMKINII.eps"
- set xlabel "Time / [s]"
- set ylabel "Temperature / [K]"
+ set xlabel "Time / [s]" font "Helveicta,24"
+ set ylabel "Temperature / [K]" font "Helveicta,24"
set grid
set key left top
set xrange [0:0.07]
- set yrange [1000:2700]
+ set yrange [750:2750]
+ set ytic 250
plot \
- "../chemFoam.out" u 1:2 t "OpenFOAM" with points lt 1 pt 6,\
+ "../chemFoam.out" u 1:2 t "OpenFOAM" with points lt 1 pt 6 ps 1.5,\
"chemkinII" with lines title "Chemkin II" lt -1
EOF
diff --git a/tutorials/combustion/chemFoam/h2/system/controlDict b/tutorials/combustion/chemFoam/h2/system/controlDict
index 6d9df8d24fcf7657b8d517bd6b5e1514999077d1..f56ce79ba6f5f6d39bf12c3b4b9885c7cbf99327 100644
--- a/tutorials/combustion/chemFoam/h2/system/controlDict
+++ b/tutorials/combustion/chemFoam/h2/system/controlDict
@@ -47,5 +47,7 @@ timePrecision 6;
runTimeModifiable yes;
+suppressSolverInfo yes;
+
// ************************************************************************* //
diff --git a/tutorials/combustion/chemFoam/h2/validation/createGraph b/tutorials/combustion/chemFoam/h2/validation/createGraph
index 129bf2167534dc78737c471fd91b1e1ffeb6e8a7..c77d3e76a813f9b4361a9ea2ef20f41eb204f008 100755
--- a/tutorials/combustion/chemFoam/h2/validation/createGraph
+++ b/tutorials/combustion/chemFoam/h2/validation/createGraph
@@ -1,16 +1,17 @@
#!/bin/sh
gnuplot<<EOF
- set terminal postscript eps color enhanced
+ set terminal postscript eps color enhanced "Helvetica,20"
set output "OF_vs_CHEMKINII.eps"
- set xlabel "Time / [s]"
- set ylabel "Temperature / [K]"
+ set xlabel "Time / [s]" font "Helvetica,24"
+ set ylabel "Temperature / [K]" font "Helvetica,24"
set grid
set key left top
set xrange [0:0.001]
- set yrange [1000:2400]
+ set yrange [750:2750]
+ set ytic 250
plot \
- "../chemFoam.out" u 1:2 t "OpenFOAM" with points lt 1 pt 6,\
+ "../chemFoam.out" u 1:2 t "OpenFOAM" with points lt 1 pt 6 ps 1.5,\
"chemkinII" with lines title "Chemkin II" lt -1
EOF
diff --git a/tutorials/combustion/chemFoam/ic8h18/validation/createGraph b/tutorials/combustion/chemFoam/ic8h18/validation/createGraph
index 1b171625f339160abb674e15884575d1cfc962f0..31313b7d105f3865372832e288f8872c66e351f4 100755
--- a/tutorials/combustion/chemFoam/ic8h18/validation/createGraph
+++ b/tutorials/combustion/chemFoam/ic8h18/validation/createGraph
@@ -1,16 +1,17 @@
#!/bin/sh
gnuplot<<EOF
- set terminal postscript eps color enhanced
+ set terminal postscript eps color enhanced "Helvetica,20"
set output "OF_vs_CHEMKINII.eps"
- set xlabel "Time / [s]"
- set ylabel "Temperature / [K]"
+ set xlabel "Time / [s]" font "Helvetica,24"
+ set ylabel "Temperature / [K]" font "Helvetica,24"
set grid
set key left top
set xrange [0:0.01]
-# set yrange [800:2800]
+ set yrange [750:2750]
+ set ytic 250
plot \
- "../chemFoam.out" u 1:2 t "OpenFOAM" with points lt 1 pt 6,\
+ "../chemFoam.out" u 1:2 t "OpenFOAM" with points lt 1 pt 6 ps 1.5,\
"chemkinII" with lines title "Chemkin II" lt -1
EOF
diff --git a/tutorials/combustion/chemFoam/nc7h16/validation/createGraph b/tutorials/combustion/chemFoam/nc7h16/validation/createGraph
index c47bd41a2d7a7ba766d284861574f4ea1eb5ea7f..33f6dcd9bb3d6762ef26d7e98050e077c27fe430 100755
--- a/tutorials/combustion/chemFoam/nc7h16/validation/createGraph
+++ b/tutorials/combustion/chemFoam/nc7h16/validation/createGraph
@@ -1,16 +1,17 @@
#!/bin/sh
gnuplot<<EOF
- set terminal postscript eps color enhanced
+ set terminal postscript eps color enhanced "Helvetica,20"
set output "OF_vs_CHEMKINII.eps"
- set xlabel "Time / [s]"
- set ylabel "Temperature / [K]"
+ set xlabel "Time / [s]" font "Helvetica,24"
+ set ylabel "Temperature / [K]" font "Helvetica,24"
set grid
- set key left top
+ set key left top
set xrange [0:0.001]
- set yrange [800:2800]
+ set yrange [750:2750]
+ set ytics 250
plot \
- "../chemFoam.out" u 1:2 t "OpenFOAM" with points lt 1 pt 6,\
+ "../chemFoam.out" u 1:2 t "OpenFOAM" with points lt 1 pt 6 ps 1.5,\
"chemkinII" with lines title "Chemkin II" lt -1
EOF