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

ENH: Code refactoring to avoing ambiguities + clean-up

Browse Source 
- pointSolid->solidProperties
- pointSolidMixure->solidMixtureProperties
- liquids->liquidProperties
- liquidMixture->liquidMoxtureProperties
This commit is contained in:
andy 2011-01-28 13:09:10 +00:00
parent eb013de3f2
commit 497b4f0bed
182 changed files with 1408 additions and 1397 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
applications/solvers/combustion/dieselEngineFoam/Make/options
View File

@ -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 \

8
applications/solvers/combustion/dieselFoam/Make/options
View File

@ -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 \

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

@ -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 \

16
applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/Make/options
View File

@ -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 \

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

@ -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 \

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

@ -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 \

16
applications/solvers/lagrangian/steadyReactingParcelFoam/Make/options
View File

@ -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 \

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

@ -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 \

8
src/lagrangian/dieselSpray/Make/options
View File

@ -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

4
src/lagrangian/dieselSpray/injector/commonRailInjector/commonRailInjector.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open 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
)
{

4
src/lagrangian/dieselSpray/injector/commonRailInjector/commonRailInjector.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open 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
);

4
src/lagrangian/dieselSpray/injector/definedInjector/definedInjector.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open 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
)
{

4
src/lagrangian/dieselSpray/injector/definedInjector/definedInjector.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open 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
);

6
src/lagrangian/dieselSpray/injector/injectorType/injectorType.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open 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;
};

4
src/lagrangian/dieselSpray/injector/multiHoleInjector/multiHoleInjector.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open 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
)
{

4
src/lagrangian/dieselSpray/injector/multiHoleInjector/multiHoleInjector.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open 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
);

4
src/lagrangian/dieselSpray/injector/swirlInjector/swirlInjector.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open 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
)
{

4
src/lagrangian/dieselSpray/injector/swirlInjector/swirlInjector.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open 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
);

4
src/lagrangian/dieselSpray/injector/unitInjector/unitInjector.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open 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
)
{

4
src/lagrangian/dieselSpray/injector/unitInjector/unitInjector.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open 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
);

6
src/lagrangian/dieselSpray/parcel/parcel.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open 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();

4
src/lagrangian/dieselSpray/parcel/setRelaxationTimes.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open 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);

4
src/lagrangian/dieselSpray/spray/spray.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open 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")
)

12
src/lagrangian/dieselSpray/spray/spray.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open 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;

4
src/lagrangian/dieselSpray/spray/sprayI.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open 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_();
}

4
src/lagrangian/dieselSpray/spraySubModels/atomizationModel/LISA/LISA.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open 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();

4
src/lagrangian/dieselSpray/spraySubModels/atomizationModel/LISA/LISA.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open 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;
};

4
src/lagrangian/dieselSpray/spraySubModels/atomizationModel/atomizationModel/atomizationModel.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open 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;
};

4
src/lagrangian/dieselSpray/spraySubModels/atomizationModel/blobsSheetAtomization/blobsSheetAtomization.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open 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();

4
src/lagrangian/dieselSpray/spraySubModels/atomizationModel/blobsSheetAtomization/blobsSheetAtomization.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open 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;
};

4
src/lagrangian/dieselSpray/spraySubModels/atomizationModel/noAtomization/noAtomization.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open 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;

4
src/lagrangian/dieselSpray/spraySubModels/atomizationModel/noAtomization/noAtomization.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open 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;
};

4
src/lagrangian/dieselSpray/spraySubModels/breakupModel/ETAB/ETAB.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open 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();

4
src/lagrangian/dieselSpray/spraySubModels/breakupModel/ETAB/ETAB.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open 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;
};

4
src/lagrangian/dieselSpray/spraySubModels/breakupModel/SHF/SHF.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open 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();

4
src/lagrangian/dieselSpray/spraySubModels/breakupModel/SHF/SHF.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open 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;
};

4
src/lagrangian/dieselSpray/spraySubModels/breakupModel/TAB/TAB.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open 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();

4
src/lagrangian/dieselSpray/spraySubModels/breakupModel/TAB/TAB.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open 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;
};

4
src/lagrangian/dieselSpray/spraySubModels/breakupModel/breakupModel/breakupModel.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open 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_)

6
src/lagrangian/dieselSpray/spraySubModels/breakupModel/breakupModel/breakupModel.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open 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;
};

2
src/lagrangian/dieselSpray/spraySubModels/breakupModel/breakupModel/breakupModelNew.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
\\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License

4
src/lagrangian/dieselSpray/spraySubModels/breakupModel/noBreakup/noBreakup.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open 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

4
src/lagrangian/dieselSpray/spraySubModels/breakupModel/noBreakup/noBreakup.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open 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;
};

4
src/lagrangian/dieselSpray/spraySubModels/breakupModel/reitzDiwakar/reitzDiwakar.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open 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();

4
src/lagrangian/dieselSpray/spraySubModels/breakupModel/reitzDiwakar/reitzDiwakar.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open 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;
};

4
src/lagrangian/dieselSpray/spraySubModels/breakupModel/reitzKHRT/reitzKHRT.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open 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();

4
src/lagrangian/dieselSpray/spraySubModels/breakupModel/reitzKHRT/reitzKHRT.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open 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;
};

4
src/lagrangian/dieselSpray/spraySubModels/injectorModel/definedPressureSwirl/definedPressureSwirl.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open 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();

4
src/lagrangian/dieselSpray/spraySubModels/injectorModel/injectorModel/injectorModel.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open 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"

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

@ -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 \

8
src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.C
View File

@ -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();
}

6
src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.H
View File

@ -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;

6
src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.H
View File

@ -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_;

6
src/lagrangian/intermediate/submodels/Thermodynamic/SurfaceFilmModel/ThermoSurfaceFilm/ThermoSurfaceFilm.C
View File

@ -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];

8
src/surfaceFilmModels/Make/options
View File

@ -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 \

4
src/surfaceFilmModels/submodels/thermo/phaseChangeModel/standardPhaseChange/standardPhaseChange.C
View File

@ -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

5
src/surfaceFilmModels/surfaceFilmModel/thermoSingleLayer/thermoSingleLayer.C
View File

@ -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];

8
src/thermophysicalModels/Allwmake
View File

@ -5,10 +5,10 @@ set -x
wmake libso specie
wmake libso solid
wmake libso thermophysicalFunctions
wmake libso liquids
wmake libso liquidMixture
wmake libso pointSolids
wmake libso pointSolidMixture
wmake libso liquidProperties
wmake libso liquidMixtureProperties
wmake libso solidProperties
wmake libso solidMixtureProperties
wmake libso basic
wmake libso reactionThermo

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

@ -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 = \

16
src/thermophysicalModels/SLGThermo/SLGThermo/SLGThermo.C
View File

@ -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);
}

14
src/thermophysicalModels/SLGThermo/SLGThermo/SLGThermo.H
View File

@ -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

6
src/thermophysicalModels/liquidMixture/Make/files
View File

@ -1,6 +0,0 @@
liquidMixture = liquidMixture
$(liquidMixture)/liquidMixture.C
$(liquidMixture)/liquidMixtureIO.C
LIB = $(FOAM_LIBBIN)/libliquidMixture

60
src/thermophysicalModels/liquidMixture/liquidMixture/liquidMixtureIO.C
View File

@ -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;
}
*/
// ************************************************************************* //

3
src/thermophysicalModels/liquidMixtureProperties/Make/files Normal file
View File

@ -0,0 +1,3 @@
liquidMixtureProperties/liquidMixtureProperties.C
LIB = $(FOAM_LIBBIN)/libliquidMixtureProperties

4
src/thermophysicalModels/liquidMixture/Make/options → src/thermophysicalModels/liquidMixtureProperties/Make/options
View File

@ -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

58
src/thermophysicalModels/liquidMixture/liquidMixture/liquidMixture.C → src/thermophysicalModels/liquidMixtureProperties/liquidMixtureProperties/liquidMixtureProperties.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open 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,

35
src/thermophysicalModels/liquidMixture/liquidMixture/liquidMixture.H → src/thermophysicalModels/liquidMixtureProperties/liquidMixtureProperties/liquidMixtureProperties.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open 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_;
}

20
src/thermophysicalModels/liquids/Ar/Ar.C → src/thermophysicalModels/liquidProperties/Ar/Ar.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open 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_),

14
src/thermophysicalModels/liquids/Ar/Ar.H → src/thermophysicalModels/liquidProperties/Ar/Ar.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open 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;

2
src/thermophysicalModels/liquids/Ar/ArI.H → src/thermophysicalModels/liquidProperties/Ar/ArI.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
\\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License

20
src/thermophysicalModels/liquids/C10H22/C10H22.C → src/thermophysicalModels/liquidProperties/C10H22/C10H22.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open 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_),

14
src/thermophysicalModels/liquids/C10H22/C10H22.H → src/thermophysicalModels/liquidProperties/C10H22/C10H22.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open 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;

2
src/thermophysicalModels/liquids/C10H22/C10H22I.H → src/thermophysicalModels/liquidProperties/C10H22/C10H22I.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
\\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License

20
src/thermophysicalModels/liquids/C12H26/C12H26.C → src/thermophysicalModels/liquidProperties/C12H26/C12H26.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open 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_),

14
src/thermophysicalModels/liquids/C12H26/C12H26.H → src/thermophysicalModels/liquidProperties/C12H26/C12H26.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open 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;

2
src/thermophysicalModels/liquids/C12H26/C12H26I.H → src/thermophysicalModels/liquidProperties/C12H26/C12H26I.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
\\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License

20
src/thermophysicalModels/liquids/C13H28/C13H28.C → src/thermophysicalModels/liquidProperties/C13H28/C13H28.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open 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_),

14
src/thermophysicalModels/liquids/C13H28/C13H28.H → src/thermophysicalModels/liquidProperties/C13H28/C13H28.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open 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;

2
src/thermophysicalModels/liquids/C13H28/C13H28I.H → src/thermophysicalModels/liquidProperties/C13H28/C13H28I.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
\\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License

20
src/thermophysicalModels/liquids/C14H30/C14H30.C → src/thermophysicalModels/liquidProperties/C14H30/C14H30.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open 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_),

14
src/thermophysicalModels/liquids/C14H30/C14H30.H → src/thermophysicalModels/liquidProperties/C14H30/C14H30.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open 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;

2
src/thermophysicalModels/liquids/C14H30/C14H30I.H → src/thermophysicalModels/liquidProperties/C14H30/C14H30I.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
\\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License

20
src/thermophysicalModels/liquids/C16H34/C16H34.C → src/thermophysicalModels/liquidProperties/C16H34/C16H34.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open 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_),

14
src/thermophysicalModels/liquids/C16H34/C16H34.H → src/thermophysicalModels/liquidProperties/C16H34/C16H34.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open 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;

2
src/thermophysicalModels/liquids/C16H34/C16H34I.H → src/thermophysicalModels/liquidProperties/C16H34/C16H34I.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
\\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License

20
src/thermophysicalModels/liquids/C2H5OH/C2H5OH.C → src/thermophysicalModels/liquidProperties/C2H5OH/C2H5OH.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open 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_),

14
src/thermophysicalModels/liquids/C2H5OH/C2H5OH.H → src/thermophysicalModels/liquidProperties/C2H5OH/C2H5OH.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open 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;

2
src/thermophysicalModels/liquids/C2H5OH/C2H5OHI.H → src/thermophysicalModels/liquidProperties/C2H5OH/C2H5OHI.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
\\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License

20
src/thermophysicalModels/liquids/C2H6/C2H6.C → src/thermophysicalModels/liquidProperties/C2H6/C2H6.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open 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_),

14
src/thermophysicalModels/liquids/C2H6/C2H6.H → src/thermophysicalModels/liquidProperties/C2H6/C2H6.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open 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;

2
src/thermophysicalModels/liquids/C2H6/C2H6I.H → src/thermophysicalModels/liquidProperties/C2H6/C2H6I.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
\\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License

20
src/thermophysicalModels/liquids/C2H6O/C2H6O.C → src/thermophysicalModels/liquidProperties/C2H6O/C2H6O.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open 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_),

14
src/thermophysicalModels/liquids/C2H6O/C2H6O.H → src/thermophysicalModels/liquidProperties/C2H6O/C2H6O.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open 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;

2
src/thermophysicalModels/liquids/C2H6O/C2H6OI.H → src/thermophysicalModels/liquidProperties/C2H6O/C2H6OI.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
\\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License

20
src/thermophysicalModels/liquids/C3H6O/C3H6O.C → src/thermophysicalModels/liquidProperties/C3H6O/C3H6O.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open 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_),

14
src/thermophysicalModels/liquids/C3H6O/C3H6O.H → src/thermophysicalModels/liquidProperties/C3H6O/C3H6O.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open 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;

2
src/thermophysicalModels/liquids/C3H6O/C3H6OI.H → src/thermophysicalModels/liquidProperties/C3H6O/C3H6OI.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
\\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License

20
src/thermophysicalModels/liquids/C3H8/C3H8.C → src/thermophysicalModels/liquidProperties/C3H8/C3H8.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open 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_),

14
src/thermophysicalModels/liquids/C3H8/C3H8.H → src/thermophysicalModels/liquidProperties/C3H8/C3H8.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open 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;

2
src/thermophysicalModels/liquids/C3H8/C3H8I.H → src/thermophysicalModels/liquidProperties/C3H8/C3H8I.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
\\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License

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