zhyang-dev/OpenFOAM-5.x
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

thermophysicalModels: Changed specie thermodynamics from mole to mass basis

Browse Source 
The fundamental properties provided by the specie class hierarchy were
mole-based, i.e. provide the properties per mole whereas the fundamental
properties provided by the liquidProperties and solidProperties classes are
mass-based, i.e. per unit mass.  This inconsistency made it impossible to
instantiate the thermodynamics packages (rhoThermo, psiThermo) used by the FV
transport solvers on liquidProperties.  In order to combine VoF with film and/or
Lagrangian models it is essential that the physical propertied of the three
representations of the liquid are consistent which means that it is necessary to
instantiate the thermodynamics packages on liquidProperties.  This requires
either liquidProperties to be rewritten mole-based or the specie classes to be
rewritten mass-based.  Given that most of OpenFOAM solvers operate
mass-based (solve for mass-fractions and provide mass-fractions to sub-models it
is more consistent and efficient if the low-level thermodynamics is also
mass-based.

This commit includes all of the changes necessary for all of the thermodynamics
in OpenFOAM to operate mass-based and supports the instantiation of
thermodynamics packages on liquidProperties.

Note that most users, developers and contributors to OpenFOAM will not notice
any difference in the operation of the code except that the confusing

    nMoles     1;

entries in the thermophysicalProperties files are no longer needed or used and
have been removed in this commet.  The only substantial change to the internals
is that species thermodynamics are now "mixed" with mass rather than mole
fractions.  This is more convenient except for defining reaction equilibrium
thermodynamics for which the molar rather than mass composition is usually know.
The consequence of this can be seen in the adiabaticFlameT, equilibriumCO and
equilibriumFlameT utilities in which the species thermodynamics are
pre-multiplied by their molecular mass to effectively convert them to mole-basis
to simplify the definition of the reaction equilibrium thermodynamics, e.g. in
equilibriumCO

    // Reactants (mole-based)
    thermo FUEL(thermoData.subDict(fuelName)); FUEL *= FUEL.W();

    // Oxidant (mole-based)
    thermo O2(thermoData.subDict("O2")); O2 *= O2.W();
    thermo N2(thermoData.subDict("N2")); N2 *= N2.W();

    // Intermediates (mole-based)
    thermo H2(thermoData.subDict("H2")); H2 *= H2.W();

    // Products (mole-based)
    thermo CO2(thermoData.subDict("CO2")); CO2 *= CO2.W();
    thermo H2O(thermoData.subDict("H2O")); H2O *= H2O.W();
    thermo CO(thermoData.subDict("CO")); CO *= CO.W();

    // Product dissociation reactions

    thermo CO2BreakUp
    (
        CO2 == CO + 0.5*O2
    );

    thermo H2OBreakUp
    (
        H2O == H2 + 0.5*O2
    );

Please report any problems with this substantial but necessary rewrite of the
thermodynamic at https://bugs.openfoam.org

Henry G. Weller
CFD Direct Ltd.
This commit is contained in:
Henry Weller
2017-02-17 11:22:14 +00:00
parent 2d4bec327c
commit abc50e214c
356 changed files with 2654 additions and 6318 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
applications/solvers/combustion/fireFoam/Make/options
View File

@ -14,9 +14,7 @@ EXE_INC = \
-I$(LIB_SRC)/thermophysicalModels/solidChemistryModel/lnInclude \
-I$(LIB_SRC)/combustionModels/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/properties/solidProperties/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/properties/solidMixtureProperties/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/properties/liquidProperties/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/properties/liquidMixtureProperties/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/thermophysicalFunctions/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/SLGThermo/lnInclude \
@ -39,7 +37,6 @@ EXE_LIBS = \
-lcompressibleTransportModels \
-lfluidThermophysicalModels \
-lsolidProperties \
-lsolidMixtureProperties \
-lthermophysicalFunctions \
-lreactionThermophysicalModels \
-lSLGThermo \

26
applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/EEqn.H
View File

@ -1,26 +0,0 @@
{
volScalarField& he = thermo.he();
fvScalarMatrix EEqn
(
fvm::div(phi, he)
+ (
he.name() == "e"
? fvc::div(phi, volScalarField("Ekp", 0.5*magSqr(U) + p/rho))
: fvc::div(phi, volScalarField("K", 0.5*magSqr(U)))
)
- fvm::laplacian(turbulence->alphaEff(), he)
==
fvOptions(rho, he)
);
EEqn.relax();
fvOptions.constrain(EEqn);
EEqn.solve();
fvOptions.correct(he);
thermo.correct();
}

11
applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/createFields.H
View File

@ -67,6 +67,17 @@ dimensionedScalar rhoMin
)
);
dimensionedScalar pMin
(
dimensionedScalar::lookupOrDefault
(
"pMin",
simple.dict(),
dimPressure,
10
)
);
Info<< "Creating turbulence model\n" << endl;
autoPtr<compressible::turbulenceModel> turbulence
(

2
applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/pEqn.H
View File

@ -83,6 +83,8 @@
/fvc::domainIntegrate(psi);
}
p = max(p, pMin);
rho = thermo.rho();
rho = max(rho, rhoMin);
rho = min(rho, rhoMax);

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

@ -11,9 +11,7 @@ EXE_INC = \
-I$(LIB_SRC)/transportModels/compressible/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/properties/liquidProperties/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/properties/liquidMixtureProperties/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/properties/solidProperties/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/properties/solidMixtureProperties/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/thermophysicalFunctions/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/SLGThermo/lnInclude \
@ -39,9 +37,7 @@ EXE_LIBS = \
-lcompressibleTransportModels \
-lfluidThermophysicalModels \
-lliquidProperties \
-lliquidMixtureProperties \
-lsolidProperties \
-lsolidMixtureProperties \
-lthermophysicalFunctions \
-lreactionThermophysicalModels \
-lSLGThermo \

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

@ -10,9 +10,7 @@ EXE_INC = \
-I$(LIB_SRC)/transportModels/compressible/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/properties/solidProperties/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/properties/solidMixtureProperties/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/properties/liquidProperties/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/properties/liquidMixtureProperties/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/thermophysicalFunctions/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/SLGThermo/lnInclude \
@ -37,7 +35,6 @@ EXE_LIBS = \
-lcompressibleTransportModels \
-lfluidThermophysicalModels \
-lsolidProperties \
-lsolidMixtureProperties \
-lthermophysicalFunctions \
-lreactionThermophysicalModels \
-lSLGThermo \

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

@ -12,9 +12,7 @@ EXE_INC = \
-I$(LIB_SRC)/transportModels/compressible/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/properties/liquidProperties/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/properties/liquidMixtureProperties/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/properties/solidProperties/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/properties/solidMixtureProperties/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/thermophysicalFunctions/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/SLGThermo/lnInclude \
@ -40,9 +38,7 @@ EXE_LIBS = \
-lcompressibleTransportModels \
-lfluidThermophysicalModels \
-lliquidProperties \
-lliquidMixtureProperties \
-lsolidProperties \
-lsolidMixtureProperties \
-lthermophysicalFunctions \
-lreactionThermophysicalModels \
-lSLGThermo \

4
applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/Make/options
View File

@ -12,9 +12,7 @@ EXE_INC = \
-I$(LIB_SRC)/transportModels/compressible/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/properties/liquidProperties/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/properties/liquidMixtureProperties/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/properties/solidProperties/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/properties/solidMixtureProperties/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/thermophysicalFunctions/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/SLGThermo/lnInclude \
@ -40,9 +38,7 @@ EXE_LIBS = \
-lcompressibleTransportModels \
-lfluidThermophysicalModels \
-lliquidProperties \
-lliquidMixtureProperties \
-lsolidProperties \
-lsolidMixtureProperties \
-lthermophysicalFunctions \
-lreactionThermophysicalModels \
-lSLGThermo \

4
applications/solvers/lagrangian/sprayFoam/Make/options
View File

@ -14,9 +14,7 @@ EXE_INC = \
-I$(LIB_SRC)/transportModels/compressible/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/properties/liquidProperties/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/properties/liquidMixtureProperties/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/properties/solidProperties/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/properties/solidMixtureProperties/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/thermophysicalFunctions/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/SLGThermo/lnInclude \
@ -38,9 +36,7 @@ EXE_LIBS = \
-lcompressibleTransportModels \
-lfluidThermophysicalModels \
-lliquidProperties \
-lliquidMixtureProperties \
-lsolidProperties \
-lsolidMixtureProperties \
-lthermophysicalFunctions \
-lreactionThermophysicalModels \
-lSLGThermo \

4
applications/solvers/lagrangian/sprayFoam/sprayDyMFoam/Make/options
View File

@ -15,9 +15,7 @@ EXE_INC = \
-I$(LIB_SRC)/transportModels/compressible/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/properties/liquidProperties/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/properties/liquidMixtureProperties/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/properties/solidProperties/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/properties/solidMixtureProperties/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/thermophysicalFunctions/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/SLGThermo/lnInclude \
@ -42,9 +40,7 @@ EXE_LIBS = \
-lcompressibleTransportModels \
-lfluidThermophysicalModels \
-lliquidProperties \
-lliquidMixtureProperties \
-lsolidProperties \
-lsolidMixtureProperties \
-lthermophysicalFunctions \
-lreactionThermophysicalModels \
-lSLGThermo \

4
applications/solvers/lagrangian/sprayFoam/sprayEngineFoam/Make/options
View File

@ -16,9 +16,7 @@ EXE_INC = \
-I$(LIB_SRC)/transportModels/compressible/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/properties/liquidProperties/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/properties/liquidMixtureProperties/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/properties/solidProperties/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/properties/solidMixtureProperties/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/thermophysicalFunctions/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/SLGThermo/lnInclude \
@ -45,9 +43,7 @@ EXE_LIBS = \
-lcompressibleTransportModels \
-lfluidThermophysicalModels \
-lliquidProperties \
-lliquidMixtureProperties \
-lsolidProperties \
-lsolidMixtureProperties \
-lthermophysicalFunctions \
-lreactionThermophysicalModels \
-lSLGThermo \

2
applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/Make/options
View File

@ -3,9 +3,7 @@ EXE_INC = \
-I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/properties/liquidProperties/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/properties/liquidMixtureProperties/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/properties/solidProperties/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/properties/solidMixtureProperties/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/thermophysicalFunctions/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/SLGThermo/lnInclude \

2
applications/test/thermoMixture/thermoDict
View File

@ -2,7 +2,6 @@ specie1
{
specie
{
nMoles 1;
molWeight 1;
}
@ -24,7 +23,6 @@ specie2
{
specie
{
nMoles 1;
molWeight 0.5;
}

2
applications/utilities/miscellaneous/foamList/Make/options
View File

@ -49,7 +49,6 @@ EXE_LIBS = \
-llagrangianSpray \
-llagrangianTurbulence \
-llaminarFlameSpeedModels \
-lliquidMixtureProperties \
-lliquidProperties \
-lmeshTools \
-lmolecularMeasurements \
@ -81,7 +80,6 @@ EXE_LIBS = \
-lSLGThermo \
-lsnappyHexMesh \
-lsolidChemistryModel \
-lsolidMixtureProperties \
-lsolidParticle \
-lsolidProperties \
-lsolidSpecie \

82
applications/utilities/thermophysical/adiabaticFlameT/adiabaticFlameT.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -97,28 +97,59 @@ int main(int argc, char *argv[])
scalar stoicO2 = n + m/4.0;
scalar stoicN2 = (0.79/0.21)*(n + m/4.0);
scalar stoicN2 = (0.79/0.21)*stoicO2;
scalar stoicCO2 = n;
scalar stoicH2O = m/2.0;
thermo fuel
thermo FUEL
(
"fuel",
thermo(thermoData.subDict(fuelName))
);
Info<< "fuel " << FUEL << ';' << endl;
FUEL *= FUEL.W();
thermo O2
(
"O2",
thermo(thermoData.subDict("O2"))
);
O2 *= O2.W();
thermo N2
(
"N2",
thermo(thermoData.subDict("N2"))
);
N2 *= N2.W();
thermo CO2
(
"CO2",
thermo(thermoData.subDict("CO2"))
);
CO2 *= CO2.W();
thermo H2O
(
"H2O",
thermo(thermoData.subDict("H2O"))
);
H2O *= H2O.W();
thermo oxidant
(
"oxidant",
stoicO2*thermo(thermoData.subDict("O2"))
+ stoicN2*thermo(thermoData.subDict("N2"))
stoicO2*O2
+ stoicN2*N2
);
Info<< "oxidant " << (1/oxidant.Y())*oxidant << ';' << endl;
dimensionedScalar stoichiometricAirFuelMassRatio
(
"stoichiometricAirFuelMassRatio",
dimless,
(oxidant.W()*oxidant.nMoles())/fuel.W()
oxidant.Y()/FUEL.W()
);
Info<< "stoichiometricAirFuelMassRatio "
@ -138,49 +169,34 @@ int main(int argc, char *argv[])
scalar ores = max(1.0/equiv - 1.0, 0.0);
scalar fburnt = 1.0 - fres;
thermo fuel
(
"fuel",
thermo(thermoData.subDict(fuelName))
);
Info<< "fuel " << fuel << ';' << endl;
thermo oxidant
(
"oxidant",
o2*thermo(thermoData.subDict("O2"))
+ n2*thermo(thermoData.subDict("N2"))
);
Info<< "oxidant " << (1/oxidant.nMoles())*oxidant << ';' << endl;
thermo reactants
(
"reactants",
fuel + oxidant
FUEL + (1.0/equiv)*oxidant
);
Info<< "reactants " << (1/reactants.nMoles())*reactants << ';' << endl;
Info<< "reactants " << (1/reactants.Y())*reactants << ';' << endl;
thermo burntProducts
(
"burntProducts",
+ (n2 - (0.79/0.21)*ores*stoicO2)*thermo(thermoData.subDict("N2"))
+ fburnt*stoicCO2*thermo(thermoData.subDict("CO2"))
+ fburnt*stoicH2O*thermo(thermoData.subDict("H2O"))
+ (n2 - (0.79/0.21)*ores*stoicO2)*N2
+ fburnt*stoicCO2*CO2
+ fburnt*stoicH2O*H2O
);
Info<< "burntProducts "
<< (1/burntProducts.nMoles())*burntProducts << ';' << endl;
<< (1/burntProducts.Y())*burntProducts << ';' << endl;
thermo products
(
"products",
fres*fuel
+ n2*thermo(thermoData.subDict("N2"))
+ fburnt*stoicCO2*thermo(thermoData.subDict("CO2"))
+ fburnt*stoicH2O*thermo(thermoData.subDict("H2O"))
+ ores*stoicO2*thermo(thermoData.subDict("O2"))
fres*FUEL
+ n2*N2
+ fburnt*stoicCO2*CO2
+ fburnt*stoicH2O*H2O
+ ores*stoicO2*O2
);
Info<< "products " << (1/products.nMoles())*products << ';' << endl;
Info<< "products " << (1/products.Y())*products << ';' << endl;
scalar Tad = products.THa(reactants.Ha(P, T0), P, 1000.0);
Info<< "Tad = " << Tad << nl << endl;

52
applications/utilities/thermophysical/equilibriumCO/equilibriumCO.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -73,52 +73,44 @@ int main(int argc, char *argv[])
scalar P = 1e5;
scalar T = 3000.0;
const scalar P = 1e5;
const scalar T = 3000.0;
// Oxidant (mole-based)
thermo O2(thermoData.subDict("O2")); O2 *= O2.W();
thermo N2(thermoData.subDict("N2")); N2 *= N2.W();
// Intermediates (mole-based)
thermo H2(thermoData.subDict("H2")); H2 *= H2.W();
thermo OH(thermoData.subDict("OH")); OH *= OH.W();
thermo H(thermoData.subDict("H")); H *= H.W();
thermo O(thermoData.subDict("O")); O *= O.W();
// Products (mole-based)
thermo CO2(thermoData.subDict("CO2")); CO2 *= CO2.W();
thermo H2O(thermoData.subDict("H2O")); H2O *= H2O.W();
thermo CO(thermoData.subDict("CO")); CO *= CO.W();
SLPtrList<thermo> EQreactions;
EQreactions.append
(
new thermo
(
thermo(thermoData.subDict("CO2"))
==
thermo(thermoData.subDict("CO"))
+ 0.5*thermo(thermoData.subDict("O2"))
)
new thermo(CO2 == CO + 0.5*O2)
);
EQreactions.append
(
new thermo
(
thermo(thermoData.subDict("O2"))
==
2.0*thermo(thermoData.subDict("O"))
)
new thermo(O2 == 2*O)
);
EQreactions.append
(
new thermo
(
thermo(thermoData.subDict("H2O"))
==
thermo(thermoData.subDict("H2"))
+ 0.5*thermo(thermoData.subDict("O2"))
)
new thermo(H2O == H2 + 0.5*O2)
);
EQreactions.append
(
new thermo
(
thermo(thermoData.subDict("H2O"))
==
thermo(thermoData.subDict("H"))
+ thermo(thermoData.subDict("OH"))
)
new thermo(H2O == H + OH)
);

29
applications/utilities/thermophysical/equilibriumFlameT/equilibriumFlameT.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -100,25 +100,27 @@ int main(int argc, char *argv[])
Info<< nl << "Reading thermodynamic data for relevant species"
<< nl << endl;
// Reactants
thermo FUEL(thermoData.subDict(fuelName));
thermo O2(thermoData.subDict("O2"));
thermo N2(thermoData.subDict("N2"));
// Reactants (mole-based)
thermo FUEL(thermoData.subDict(fuelName)); FUEL *= FUEL.W();
// Products
thermo CO2(thermoData.subDict("CO2"));
thermo H2O(thermoData.subDict("H2O"));
// Oxidant (mole-based)
thermo O2(thermoData.subDict("O2")); O2 *= O2.W();
thermo N2(thermoData.subDict("N2")); N2 *= N2.W();
// Product fragments
thermo CO(thermoData.subDict("CO"));
thermo H2(thermoData.subDict("H2"));
// Intermediates (mole-based)
thermo H2(thermoData.subDict("H2")); H2 *= H2.W();
// Products (mole-based)
thermo CO2(thermoData.subDict("CO2")); CO2 *= CO2.W();
thermo H2O(thermoData.subDict("H2O")); H2O *= H2O.W();
thermo CO(thermoData.subDict("CO")); CO *= CO.W();
// Product dissociation reactions
thermo CO2BreakUp
(
CO2 == CO + 0.5* O2
CO2 == CO + 0.5*O2
);
thermo H2OBreakUp
@ -145,7 +147,7 @@ int main(int argc, char *argv[])
(
"stoichiometricAirFuelMassRatio",
dimless,
(oxidant.W()*oxidant.nMoles())/FUEL.W()
oxidant.Y()/FUEL.W()
);
Info<< "stoichiometricAirFuelMassRatio "
@ -209,7 +211,6 @@ int main(int argc, char *argv[])
// Iteration loop for adiabatic flame temperature
for (int j=0; j<20; j++)
{
if (j > 0)
{
co = co2*

1
etc/templates/compressibleInflowOutflow/constant/thermophysicalProperties
View File

@ -30,7 +30,6 @@ mixture // air at room temperature (293 K)
{
specie
{
nMoles 1;
molWeight 28.9;
}
thermodynamics

2332
etc/thermoData/thermoData
View File

File diff suppressed because it is too large Load Diff

3
src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarField.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -54,7 +54,6 @@ Usage
// Solid thermo
specie
{
nMoles 1;
molWeight 20;
}
transport

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

@ -6,9 +6,7 @@ EXE_INC = \
-I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/properties/liquidProperties/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/properties/liquidMixtureProperties/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/properties/solidProperties/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/properties/solidMixtureProperties/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/SLGThermo/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/radiation/lnInclude \
@ -31,9 +29,7 @@ LIB_LIBS = \
-lcompressibleTransportModels \
-lfluidThermophysicalModels \
-lliquidProperties \
-lliquidMixtureProperties \
-lsolidProperties \
-lsolidMixtureProperties \
-lreactionThermophysicalModels \
-lSLGThermo \
-lradiationModels \

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

@ -5,9 +5,7 @@ EXE_INC = \
-I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/properties/liquidProperties/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/properties/liquidMixtureProperties/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/properties/solidProperties/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/properties/solidMixtureProperties/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/SLGThermo/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/radiation/lnInclude \
@ -26,9 +24,7 @@ LIB_LIBS = \
-lcompressibleTransportModels \
-lfluidThermophysicalModels \
-lliquidProperties \
-lliquidMixtureProperties \
-lsolidProperties \
-lsolidMixtureProperties \
-lreactionThermophysicalModels \
-lSLGThermo \
-lradiationModels \

4
src/lagrangian/spray/Make/options
View File

@ -7,9 +7,7 @@ EXE_INC = \
-I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/properties/liquidProperties/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/properties/liquidMixtureProperties/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/properties/solidProperties/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/properties/solidMixtureProperties/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/SLGThermo/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/radiation/lnInclude \
@ -33,9 +31,7 @@ LIB_LIBS = \
-lcompressibleTransportModels \
-lfluidThermophysicalModels \
-lliquidProperties \
-lliquidMixtureProperties \
-lsolidProperties \
-lsolidMixtureProperties \
-lreactionThermophysicalModels \
-lSLGThermo \
-lradiationModels \

4
src/lagrangian/turbulence/Make/options
View File

@ -6,9 +6,7 @@ EXE_INC = \
-I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/properties/liquidProperties/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/properties/liquidMixtureProperties/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/properties/solidProperties/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/properties/solidMixtureProperties/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/SLGThermo/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/radiationModels/lnInclude \
@ -31,9 +29,7 @@ LIB_LIBS = \
-lcompressibleTransportModels \
-lfluidThermophysicalModels \
-lliquidProperties \
-lliquidMixtureProperties \
-lsolidProperties \
-lsolidMixtureProperties \
-lreactionThermophysicalModels \
-lSLGThermo \
-lradiationModels \

2
src/regionModels/regionCoupling/Make/options
View File

@ -7,9 +7,7 @@ EXE_INC = \
-I$(LIB_SRC)/thermophysicalModels/SLGThermo/lnInclude\
-I$(LIB_SRC)/thermophysicalModels/solidThermo/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/solidChemistryModel/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/properties/liquidMixtureProperties/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/properties/liquidProperties/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/properties/solidMixtureProperties/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/solidSpecie/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/properties/solidProperties/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \

4
src/regionModels/surfaceFilmModels/Make/options
View File

@ -3,9 +3,7 @@ EXE_INC = \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/properties/liquidProperties/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/properties/liquidMixtureProperties/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/properties/solidProperties/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/properties/solidMixtureProperties/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/SLGThermo/lnInclude \
-I$(LIB_SRC)/lagrangian/distributionModels/lnInclude \
@ -18,9 +16,7 @@ LIB_LIBS = \
-lfluidThermophysicalModels \
-lspecie \
-lliquidProperties \
-lliquidMixtureProperties \
-lsolidProperties \
-lsolidMixtureProperties \
-lreactionThermophysicalModels \
-lSLGThermo \
-ldistributionModels \

4
src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/Make/options
View File

@ -3,9 +3,7 @@ EXE_INC = \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/properties/liquidProperties/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/properties/liquidMixtureProperties/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/properties/solidProperties/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/properties/solidMixtureProperties/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/SLGThermo/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
@ -20,9 +18,7 @@ LIB_LIBS = \
-lfluidThermophysicalModels \
-lspecie \
-lliquidProperties \
-lliquidMixtureProperties \
-lsolidProperties \
-lsolidMixtureProperties \
-lreactionThermophysicalModels \
-lSLGThermo \
-lturbulenceModels \

4
src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/liquidFilmThermo/liquidFilmThermo.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2013-2016 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2013-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -189,7 +189,7 @@ scalar liquidFilmThermo::kappa
const scalar T
) const
{
return liquidPtr_->K(p, T);
return liquidPtr_->kappa(p, T);
}

3
src/regionModels/thermalBaffleModels/derivedFvPatchFields/thermalBaffle/thermalBaffleFvPatchScalarField.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -78,7 +78,6 @@ Usage
{
specie
{
nMoles 1;
molWeight 20;
}
transport

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

@ -3,9 +3,7 @@ EXE_INC = \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/properties/liquidProperties/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/properties/liquidMixtureProperties/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/properties/solidProperties/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/properties/solidMixtureProperties/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
-I$(LIB_SRC)/finiteVolume/lnInclude

40
src/thermophysicalModels/basic/heThermo/heThermo.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -456,11 +456,11 @@ Foam::tmp<Foam::scalarField> Foam::heThermo<BasicThermo, MixtureType>::gamma
) const
{
tmp<scalarField> tgamma(new scalarField(T.size()));
scalarField& cpv = tgamma.ref();
scalarField& gamma = tgamma.ref();
forAll(T, facei)
{
cpv[facei] =
gamma[facei] =
this->patchFaceMixture(patchi, facei).gamma(p[facei], T[facei]);
}
@ -531,11 +531,11 @@ Foam::tmp<Foam::scalarField> Foam::heThermo<BasicThermo, MixtureType>::Cpv
) const
{
tmp<scalarField> tCpv(new scalarField(T.size()));
scalarField& cpv = tCpv.ref();
scalarField& Cpv = tCpv.ref();
forAll(T, facei)
{
cpv[facei] =
Cpv[facei] =
this->patchFaceMixture(patchi, facei).Cpv(p[facei], T[facei]);
}
@ -567,21 +567,21 @@ Foam::heThermo<BasicThermo, MixtureType>::Cpv() const
)
);
volScalarField& cpv = tCpv.ref();
volScalarField& Cpv = tCpv.ref();
forAll(this->T_, celli)
{
cpv[celli] =
Cpv[celli] =
this->cellMixture(celli).Cpv(this->p_[celli], this->T_[celli]);
}
volScalarField::Boundary& cpvBf = cpv.boundaryFieldRef();
volScalarField::Boundary& CpvBf = Cpv.boundaryFieldRef();
forAll(cpvBf, patchi)
forAll(CpvBf, patchi)
{
const fvPatchScalarField& pp = this->p_.boundaryField()[patchi];
const fvPatchScalarField& pT = this->T_.boundaryField()[patchi];
fvPatchScalarField& pCpv = cpvBf[patchi];
fvPatchScalarField& pCpv = CpvBf[patchi];
forAll(pT, facei)
{
@ -603,12 +603,12 @@ Foam::tmp<Foam::scalarField> Foam::heThermo<BasicThermo, MixtureType>::CpByCpv
) const
{
tmp<scalarField> tCpByCpv(new scalarField(T.size()));
scalarField& cpByCpv = tCpByCpv.ref();
scalarField& CpByCpv = tCpByCpv.ref();
forAll(T, facei)
{
cpByCpv[facei] =
this->patchFaceMixture(patchi, facei).cpBycpv(p[facei], T[facei]);
CpByCpv[facei] =
this->patchFaceMixture(patchi, facei).CpByCpv(p[facei], T[facei]);
}
return tCpByCpv;
@ -639,29 +639,29 @@ Foam::heThermo<BasicThermo, MixtureType>::CpByCpv() const
)
);
volScalarField& cpByCpv = tCpByCpv.ref();
volScalarField& CpByCpv = tCpByCpv.ref();
forAll(this->T_, celli)
{
cpByCpv[celli] = this->cellMixture(celli).cpBycpv
CpByCpv[celli] = this->cellMixture(celli).CpByCpv
(
this->p_[celli],
this->T_[celli]
);
}
volScalarField::Boundary& cpByCpvBf =
cpByCpv.boundaryFieldRef();
volScalarField::Boundary& CpByCpvBf =
CpByCpv.boundaryFieldRef();
forAll(cpByCpvBf, patchi)
forAll(CpByCpvBf, patchi)
{
const fvPatchScalarField& pp = this->p_.boundaryField()[patchi];
const fvPatchScalarField& pT = this->T_.boundaryField()[patchi];
fvPatchScalarField& pCpByCpv = cpByCpvBf[patchi];
fvPatchScalarField& pCpByCpv = CpByCpvBf[patchi];
forAll(pT, facei)
{
pCpByCpv[facei] = this->patchFaceMixture(patchi, facei).cpBycpv
pCpByCpv[facei] = this->patchFaceMixture(patchi, facei).CpByCpv
(
pp[facei],
pT[facei]

2
src/thermophysicalModels/properties/Allwmake
View File

@ -5,8 +5,6 @@ cd ${0%/*} || exit 1 # Run from this directory
. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
wmake $targetType liquidProperties
wmake $targetType liquidMixtureProperties
wmake $targetType solidProperties
wmake $targetType solidMixtureProperties
#------------------------------------------------------------------------------

3
src/thermophysicalModels/properties/liquidMixtureProperties/Make/files
View File

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

10
src/thermophysicalModels/properties/liquidMixtureProperties/Make/options
View File

@ -1,10 +0,0 @@
EXE_INC = \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/properties/liquidProperties/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/combustion/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/thermophysicalFunctions/lnInclude
LIB_LIBS = \
-lliquidProperties \
-lthermophysicalFunctions

22
src/thermophysicalModels/properties/liquidProperties/Ar/Ar.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -78,8 +78,8 @@ Foam::Ar::Ar()
),
mu_(-8.868, 204.3, -0.3831, -1.3e-22, 10.0),
mug_(8.386e-07, 0.6175, 75.377, -432.5),
K_(0.1819, -0.0003176, -4.11e-06, 0.0, 0.0, 0.0),
Kg_(0.0001236, 0.8262, -132.8, 16000),
kappa_(0.1819, -0.0003176, -4.11e-06, 0.0, 0.0, 0.0),
kappag_(0.0001236, 0.8262, -132.8, 16000),
sigma_(150.86, 0.03823, 1.2927, 0.0, 0.0, 0.0),
D_(147.18, 20.1, 39.948, 28) // note: Same as nHeptane
{}
@ -113,8 +113,8 @@ Foam::Ar::Ar
B_(secondVirialCoeff),
mu_(dynamicViscosity),
mug_(vapourDynamicViscosity),
K_(thermalConductivity),
Kg_(vapourThermalConductivity),
kappa_(thermalConductivity),
kappag_(vapourThermalConductivity),
sigma_(surfaceTension),
D_(vapourDiffussivity)
{}
@ -132,8 +132,8 @@ Foam::Ar::Ar(Istream& is)
B_(is),
mu_(is),
mug_(is),
K_(is),
Kg_(is),
kappa_(is),
kappag_(is),
sigma_(is),
D_(is)
{}
@ -151,8 +151,8 @@ Foam::Ar::Ar(const dictionary& dict)
B_(dict.subDict("B")),
mu_(dict.subDict("mu")),
mug_(dict.subDict("mug")),
K_(dict.subDict("K")),
Kg_(dict.subDict("Kg")),
kappa_(dict.subDict("K")),
kappag_(dict.subDict("kappag")),
sigma_(dict.subDict("sigma")),
D_(dict.subDict("D"))
{}
@ -170,8 +170,8 @@ Foam::Ar::Ar(const Ar& liq)
B_(liq.B_),
mu_(liq.mu_),
mug_(liq.mug_),
K_(liq.K_),
Kg_(liq.Kg_),
kappa_(liq.kappa_),
kappag_(liq.kappag_),
sigma_(liq.sigma_),
D_(liq.D_)
{}

14
src/thermophysicalModels/properties/liquidProperties/Ar/Ar.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -71,8 +71,8 @@ class Ar
NSRDSfunc4 B_;
NSRDSfunc1 mu_;
NSRDSfunc2 mug_;
NSRDSfunc0 K_;
NSRDSfunc2 Kg_;
NSRDSfunc0 kappa_;
NSRDSfunc2 kappag_;
NSRDSfunc6 sigma_;
APIdiffCoefFunc D_;
@ -153,10 +153,10 @@ public:
inline scalar mug(scalar p, scalar T) const;
//- Liquid thermal conductivity [W/(m K)]
inline scalar K(scalar p, scalar T) const;
inline scalar kappa(scalar p, scalar T) const;
//- Vapour thermal conductivity [W/(m K)]
inline scalar Kg(scalar p, scalar T) const;
inline scalar kappag(scalar p, scalar T) const;
//- Surface tension [N/m]
inline scalar sigma(scalar p, scalar T) const;
@ -183,8 +183,8 @@ public:
B_.writeData(os); os << nl;
mu_.writeData(os); os << nl;
mug_.writeData(os); os << nl;
K_.writeData(os); os << nl;
Kg_.writeData(os); os << nl;
kappa_.writeData(os); os << nl;
kappag_.writeData(os); os << nl;
sigma_.writeData(os); os << nl;
D_.writeData(os); os << endl;
}

10
src/thermophysicalModels/properties/liquidProperties/Ar/ArI.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -77,15 +77,15 @@ inline Foam::scalar Foam::Ar::mug(scalar p, scalar T) const
}
inline Foam::scalar Foam::Ar::K(scalar p, scalar T) const
inline Foam::scalar Foam::Ar::kappa(scalar p, scalar T) const
{
return K_.f(p, T);
return kappa_.f(p, T);
}
inline Foam::scalar Foam::Ar::Kg(scalar p, scalar T) const
inline Foam::scalar Foam::Ar::kappag(scalar p, scalar T) const
{
return Kg_.f(p, T);
return kappag_.f(p, T);
}

22
src/thermophysicalModels/properties/liquidProperties/C10H22/C10H22.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -86,8 +86,8 @@ Foam::C10H22::C10H22()
),
mu_(-16.468, 1533.5, 0.7511, 0.0, 0.0),
mug_(2.64e-08, 0.9487, 71.0, 0.0),
K_(0.2063, -0.000254, 0.0, 0.0, 0.0, 0.0),
Kg_(-668.4, 0.9323, -4071000000.0, 0.0),
kappa_(0.2063, -0.000254, 0.0, 0.0, 0.0, 0.0),
kappag_(-668.4, 0.9323, -4071000000.0, 0.0),
sigma_(617.70, 0.055435, 1.3095, 0.0, 0.0, 0.0),
D_(147.18, 20.1, 142.285, 28.0) // note: Same as nHeptane
{}
@ -121,8 +121,8 @@ Foam::C10H22::C10H22
B_(secondVirialCoeff),
mu_(dynamicViscosity),
mug_(vapourDynamicViscosity),
K_(thermalConductivity),
Kg_(vapourThermalConductivity),
kappa_(thermalConductivity),
kappag_(vapourThermalConductivity),
sigma_(surfaceTension),
D_(vapourDiffussivity)
{}
@ -140,8 +140,8 @@ Foam::C10H22::C10H22(Istream& is)
B_(is),
mu_(is),
mug_(is),
K_(is),
Kg_(is),
kappa_(is),
kappag_(is),
sigma_(is),
D_(is)
{}
@ -159,8 +159,8 @@ Foam::C10H22::C10H22(const dictionary& dict)
B_(dict.subDict("B")),
mu_(dict.subDict("mu")),
mug_(dict.subDict("mug")),
K_(dict.subDict("K")),
Kg_(dict.subDict("Kg")),
kappa_(dict.subDict("K")),
kappag_(dict.subDict("kappag")),
sigma_(dict.subDict("sigma")),
D_(dict.subDict("D"))
{}
@ -178,8 +178,8 @@ Foam::C10H22::C10H22(const C10H22& liq)
B_(liq.B_),
mu_(liq.mu_),
mug_(liq.mug_),
K_(liq.K_),
Kg_(liq.Kg_),
kappa_(liq.kappa_),
kappag_(liq.kappag_),
sigma_(liq.sigma_),
D_(liq.D_)
{}

14
src/thermophysicalModels/properties/liquidProperties/C10H22/C10H22.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -71,8 +71,8 @@ class C10H22
NSRDSfunc4 B_;
NSRDSfunc1 mu_;
NSRDSfunc2 mug_;
NSRDSfunc0 K_;
NSRDSfunc2 Kg_;
NSRDSfunc0 kappa_;
NSRDSfunc2 kappag_;
NSRDSfunc6 sigma_;
APIdiffCoefFunc D_;
@ -153,10 +153,10 @@ public:
inline scalar mug(scalar p, scalar T) const;
//- Liquid thermal conductivity [W/(m K)]
inline scalar K(scalar p, scalar T) const;
inline scalar kappa(scalar p, scalar T) const;
//- Vapour thermal conductivity [W/(m K)]
inline scalar Kg(scalar p, scalar T) const;
inline scalar kappag(scalar p, scalar T) const;
//- Surface tension [N/m]
inline scalar sigma(scalar p, scalar T) const;
@ -183,8 +183,8 @@ public:
B_.writeData(os); os << nl;
mu_.writeData(os); os << nl;
mug_.writeData(os); os << nl;
K_.writeData(os); os << nl;
Kg_.writeData(os); os << nl;
kappa_.writeData(os); os << nl;
kappag_.writeData(os); os << nl;
sigma_.writeData(os); os << nl;
D_.writeData(os); os << endl;
}

10
src/thermophysicalModels/properties/liquidProperties/C10H22/C10H22I.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -77,15 +77,15 @@ inline Foam::scalar Foam::C10H22::mug(scalar p, scalar T) const
}
inline Foam::scalar Foam::C10H22::K(scalar p, scalar T) const
inline Foam::scalar Foam::C10H22::kappa(scalar p, scalar T) const
{
return K_.f(p, T);
return kappa_.f(p, T);
}
inline Foam::scalar Foam::C10H22::Kg(scalar p, scalar T) const
inline Foam::scalar Foam::C10H22::kappag(scalar p, scalar T) const
{
return Kg_.f(p, T);
return kappag_.f(p, T);
}

22
src/thermophysicalModels/properties/liquidProperties/C12H26/C12H26.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -78,8 +78,8 @@ Foam::C12H26::C12H26()
),
mu_(-20.607, 1943, 1.3205, 0.0, 0.0),
mug_(6.344e-08, 0.8287, 219.5, 0.0),
K_(0.2047, -0.0002326, 0.0, 0.0, 0.0, 0.0),
Kg_(5.719e-06, 1.4699, 579.4, 0.0),
kappa_(0.2047, -0.0002326, 0.0, 0.0, 0.0, 0.0),
kappag_(5.719e-06, 1.4699, 579.4, 0.0),
sigma_(658.0, 0.055493, 1.3262, 0.0, 0.0, 0.0),
D_(147.18, 20.1, 170.338, 28.0) // note: Same as nHeptane
{}
@ -113,8 +113,8 @@ Foam::C12H26::C12H26
B_(secondVirialCoeff),
mu_(dynamicViscosity),
mug_(vapourDynamicViscosity),
K_(thermalConductivity),
Kg_(vapourThermalConductivity),
kappa_(thermalConductivity),
kappag_(vapourThermalConductivity),
sigma_(surfaceTension),
D_(vapourDiffussivity)
{}
@ -132,8 +132,8 @@ Foam::C12H26::C12H26(Istream& is)
B_(is),
mu_(is),
mug_(is),
K_(is),
Kg_(is),
kappa_(is),
kappag_(is),
sigma_(is),
D_(is)
{}
@ -151,8 +151,8 @@ Foam::C12H26::C12H26(const dictionary& dict)
B_(dict.subDict("B")),
mu_(dict.subDict("mu")),
mug_(dict.subDict("mug")),
K_(dict.subDict("K")),
Kg_(dict.subDict("Kg")),
kappa_(dict.subDict("K")),
kappag_(dict.subDict("kappag")),
sigma_(dict.subDict("sigma")),
D_(dict.subDict("D"))
{}
@ -170,8 +170,8 @@ Foam::C12H26::C12H26(const C12H26& liq)
B_(liq.B_),
mu_(liq.mu_),
mug_(liq.mug_),
K_(liq.K_),
Kg_(liq.Kg_),
kappa_(liq.kappa_),
kappag_(liq.kappag_),
sigma_(liq.sigma_),
D_(liq.D_)
{}

14
src/thermophysicalModels/properties/liquidProperties/C12H26/C12H26.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -71,8 +71,8 @@ class C12H26
NSRDSfunc4 B_;
NSRDSfunc1 mu_;
NSRDSfunc2 mug_;
NSRDSfunc0 K_;
NSRDSfunc2 Kg_;
NSRDSfunc0 kappa_;
NSRDSfunc2 kappag_;
NSRDSfunc6 sigma_;
APIdiffCoefFunc D_;
@ -153,10 +153,10 @@ public:
inline scalar mug(scalar p, scalar T) const;
//- Liquid thermal conductivity [W/(m K)]
inline scalar K(scalar p, scalar T) const;
inline scalar kappa(scalar p, scalar T) const;
//- Vapour thermal conductivity [W/(m K)]
inline scalar Kg(scalar p, scalar T) const;
inline scalar kappag(scalar p, scalar T) const;
//- Surface tension [N/m]
inline scalar sigma(scalar p, scalar T) const;
@ -183,8 +183,8 @@ public:
B_.writeData(os); os << nl;
mu_.writeData(os); os << nl;
mug_.writeData(os); os << nl;
K_.writeData(os); os << nl;
Kg_.writeData(os); os << nl;
kappa_.writeData(os); os << nl;
kappag_.writeData(os); os << nl;
sigma_.writeData(os); os << nl;
D_.writeData(os); os << endl;
}

10
src/thermophysicalModels/properties/liquidProperties/C12H26/C12H26I.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -77,15 +77,15 @@ inline Foam::scalar Foam::C12H26::mug(scalar p, scalar T) const
}
inline Foam::scalar Foam::C12H26::K(scalar p, scalar T) const
inline Foam::scalar Foam::C12H26::kappa(scalar p, scalar T) const
{
return K_.f(p, T);
return kappa_.f(p, T);
}
inline Foam::scalar Foam::C12H26::Kg(scalar p, scalar T) const
inline Foam::scalar Foam::C12H26::kappag(scalar p, scalar T) const
{
return Kg_.f(p, T);
return kappag_.f(p, T);
}

22
src/thermophysicalModels/properties/liquidProperties/C13H28/C13H28.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -86,8 +86,8 @@ Foam::C13H28::C13H28()
),
mu_(-23.341, 2121.9, 1.7208, 0.0, 0.0),
mug_(3.5585e-08, 0.8987, 165.3, 0.0),
K_(0.1981, -0.0002046, 0.0, 0.0, 0.0, 0.0),
Kg_(5.3701e-06, 1.4751, 599.09, 0.0),
kappa_(0.1981, -0.0002046, 0.0, 0.0, 0.0, 0.0),
kappag_(5.3701e-06, 1.4751, 599.09, 0.0),
sigma_(675.80, 0.05561, 1.3361, 0.0, 0.0, 0.0),
D_(147.18, 20.1, 184.365, 28.0) // note: Same as nHeptane
{}
@ -121,8 +121,8 @@ Foam::C13H28::C13H28
B_(secondVirialCoeff),
mu_(dynamicViscosity),
mug_(vapourDynamicViscosity),
K_(thermalConductivity),
Kg_(vapourThermalConductivity),
kappa_(thermalConductivity),
kappag_(vapourThermalConductivity),
sigma_(surfaceTension),
D_(vapourDiffussivity)
{}
@ -140,8 +140,8 @@ Foam::C13H28::C13H28(Istream& is)
B_(is),
mu_(is),
mug_(is),
K_(is),
Kg_(is),
kappa_(is),
kappag_(is),
sigma_(is),
D_(is)
{}
@ -159,8 +159,8 @@ Foam::C13H28::C13H28(const dictionary& dict)
B_(dict.subDict("B")),
mu_(dict.subDict("mu")),
mug_(dict.subDict("mug")),
K_(dict.subDict("K")),
Kg_(dict.subDict("Kg")),
kappa_(dict.subDict("K")),
kappag_(dict.subDict("kappag")),
sigma_(dict.subDict("sigma")),
D_(dict.subDict("D"))
{}
@ -178,8 +178,8 @@ Foam::C13H28::C13H28(const C13H28& liq)
B_(liq.B_),
mu_(liq.mu_),
mug_(liq.mug_),
K_(liq.K_),
Kg_(liq.Kg_),
kappa_(liq.kappa_),
kappag_(liq.kappag_),
sigma_(liq.sigma_),
D_(liq.D_)
{}

14
src/thermophysicalModels/properties/liquidProperties/C13H28/C13H28.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -71,8 +71,8 @@ class C13H28
NSRDSfunc4 B_;
NSRDSfunc1 mu_;
NSRDSfunc2 mug_;
NSRDSfunc0 K_;
NSRDSfunc2 Kg_;
NSRDSfunc0 kappa_;
NSRDSfunc2 kappag_;
NSRDSfunc6 sigma_;
APIdiffCoefFunc D_;
@ -153,10 +153,10 @@ public:
inline scalar mug(scalar p, scalar T) const;
//- Liquid thermal conductivity [W/(m K)]
inline scalar K(scalar p, scalar T) const;
inline scalar kappa(scalar p, scalar T) const;
//- Vapour thermal conductivity [W/(m K)]
inline scalar Kg(scalar p, scalar T) const;
inline scalar kappag(scalar p, scalar T) const;
//- Surface tension [N/m]
inline scalar sigma(scalar p, scalar T) const;
@ -183,8 +183,8 @@ public:
B_.writeData(os); os << nl;
mu_.writeData(os); os << nl;
mug_.writeData(os); os << nl;
K_.writeData(os); os << nl;
Kg_.writeData(os); os << nl;
kappa_.writeData(os); os << nl;
kappag_.writeData(os); os << nl;
sigma_.writeData(os); os << nl;
D_.writeData(os); os << endl;
}

10
src/thermophysicalModels/properties/liquidProperties/C13H28/C13H28I.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -77,15 +77,15 @@ inline Foam::scalar Foam::C13H28::mug(scalar p, scalar T) const
}
inline Foam::scalar Foam::C13H28::K(scalar p, scalar T) const
inline Foam::scalar Foam::C13H28::kappa(scalar p, scalar T) const
{
return K_.f(p, T);
return kappa_.f(p, T);
}
inline Foam::scalar Foam::C13H28::Kg(scalar p, scalar T) const
inline Foam::scalar Foam::C13H28::kappag(scalar p, scalar T) const
{
return Kg_.f(p, T);
return kappag_.f(p, T);
}

22
src/thermophysicalModels/properties/liquidProperties/C14H30/C14H30.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -86,8 +86,8 @@ Foam::C14H30::C14H30()
),
mu_(-18.964, 2010.9, 1.0648, 0.0, 0.0),
mug_(4.4565e-08, 0.8684, 228.16, -4347.2),
K_(0.1957, -0.0001993, 0.0, 0.0, 0.0, 0.0),
Kg_(-0.000628, 0.944, -5490, 0.0),
kappa_(0.1957, -0.0001993, 0.0, 0.0, 0.0, 0.0),
kappag_(-0.000628, 0.944, -5490, 0.0),
sigma_(692.40, 0.056436, 1.3658, 0.0, 0.0, 0.0),
D_(147.18, 20.1, 198.392, 28.0) // note: Same as nHeptane
{}
@ -121,8 +121,8 @@ Foam::C14H30::C14H30
B_(secondVirialCoeff),
mu_(dynamicViscosity),
mug_(vapourDynamicViscosity),
K_(thermalConductivity),
Kg_(vapourThermalConductivity),
kappa_(thermalConductivity),
kappag_(vapourThermalConductivity),
sigma_(surfaceTension),
D_(vapourDiffussivity)
{}
@ -140,8 +140,8 @@ Foam::C14H30::C14H30(Istream& is)
B_(is),
mu_(is),
mug_(is),
K_(is),
Kg_(is),
kappa_(is),
kappag_(is),
sigma_(is),
D_(is)
{}
@ -159,8 +159,8 @@ Foam::C14H30::C14H30(const dictionary& dict)
B_(dict.subDict("B")),
mu_(dict.subDict("mu")),
mug_(dict.subDict("mug")),
K_(dict.subDict("K")),
Kg_(dict.subDict("Kg")),
kappa_(dict.subDict("K")),
kappag_(dict.subDict("kappag")),
sigma_(dict.subDict("sigma")),
D_(dict.subDict("D"))
{}
@ -178,8 +178,8 @@ Foam::C14H30::C14H30(const C14H30& liq)
B_(liq.B_),
mu_(liq.mu_),
mug_(liq.mug_),
K_(liq.K_),
Kg_(liq.Kg_),
kappa_(liq.kappa_),
kappag_(liq.kappag_),
sigma_(liq.sigma_),
D_(liq.D_)
{}

14
src/thermophysicalModels/properties/liquidProperties/C14H30/C14H30.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -71,8 +71,8 @@ class C14H30
NSRDSfunc4 B_;
NSRDSfunc1 mu_;
NSRDSfunc2 mug_;
NSRDSfunc0 K_;
NSRDSfunc2 Kg_;
NSRDSfunc0 kappa_;
NSRDSfunc2 kappag_;
NSRDSfunc6 sigma_;
APIdiffCoefFunc D_;
@ -153,10 +153,10 @@ public:
inline scalar mug(scalar p, scalar T) const;
//- Liquid thermal conductivity [W/(m K)]
inline scalar K(scalar p, scalar T) const;
inline scalar kappa(scalar p, scalar T) const;
//- Vapour thermal conductivity [W/(m K)]
inline scalar Kg(scalar p, scalar T) const;
inline scalar kappag(scalar p, scalar T) const;
//- Surface tension [N/m]
inline scalar sigma(scalar p, scalar T) const;
@ -183,8 +183,8 @@ public:
B_.writeData(os); os << nl;
mu_.writeData(os); os << nl;
mug_.writeData(os); os << nl;
K_.writeData(os); os << nl;
Kg_.writeData(os); os << nl;
kappa_.writeData(os); os << nl;
kappag_.writeData(os); os << nl;
sigma_.writeData(os); os << nl;
D_.writeData(os); os << endl;
}

10
src/thermophysicalModels/properties/liquidProperties/C14H30/C14H30I.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -77,15 +77,15 @@ inline Foam::scalar Foam::C14H30::mug(scalar p, scalar T) const
}
inline Foam::scalar Foam::C14H30::K(scalar p, scalar T) const
inline Foam::scalar Foam::C14H30::kappa(scalar p, scalar T) const
{
return K_.f(p, T);
return kappa_.f(p, T);
}
inline Foam::scalar Foam::C14H30::Kg(scalar p, scalar T) const
inline Foam::scalar Foam::C14H30::kappag(scalar p, scalar T) const
{
return Kg_.f(p, T);
return kappag_.f(p, T);
}

22
src/thermophysicalModels/properties/liquidProperties/C16H34/C16H34.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -86,8 +86,8 @@ Foam::C16H34::C16H34()
),
mu_(-18.388, 2056.8, 0.98681, 0.0, 0.0),
mug_(1.2463e-07, 0.7322, 395.0, 6000.0),
K_(0.1963, -0.00019, 0.0, 0.0, 0.0, 0.0),
Kg_(3.075e-06, 1.552, 678.0, 0.0),
kappa_(0.1963, -0.00019, 0.0, 0.0, 0.0, 0.0),
kappag_(3.075e-06, 1.552, 678.0, 0.0),
sigma_(720.60, 0.05699, 1.3929, 0.0, 0.0, 0.0),
D_(147.18, 20.1, 226.446, 28.0) // note: Same as nHeptane
{}
@ -121,8 +121,8 @@ Foam::C16H34::C16H34
B_(secondVirialCoeff),
mu_(dynamicViscosity),
mug_(vapourDynamicViscosity),
K_(thermalConductivity),
Kg_(vapourThermalConductivity),
kappa_(thermalConductivity),
kappag_(vapourThermalConductivity),
sigma_(surfaceTension),
D_(vapourDiffussivity)
{}
@ -140,8 +140,8 @@ Foam::C16H34::C16H34(Istream& is)
B_(is),
mu_(is),
mug_(is),
K_(is),
Kg_(is),
kappa_(is),
kappag_(is),
sigma_(is),
D_(is)
{}
@ -159,8 +159,8 @@ Foam::C16H34::C16H34(const dictionary& dict)
B_(dict.subDict("B")),
mu_(dict.subDict("mu")),
mug_(dict.subDict("mug")),
K_(dict.subDict("K")),
Kg_(dict.subDict("Kg")),
kappa_(dict.subDict("K")),
kappag_(dict.subDict("kappag")),
sigma_(dict.subDict("sigma")),
D_(dict.subDict("D"))
{}
@ -178,8 +178,8 @@ Foam::C16H34::C16H34(const C16H34& liq)
B_(liq.B_),
mu_(liq.mu_),
mug_(liq.mug_),
K_(liq.K_),
Kg_(liq.Kg_),
kappa_(liq.kappa_),
kappag_(liq.kappag_),
sigma_(liq.sigma_),
D_(liq.D_)
{}

14
src/thermophysicalModels/properties/liquidProperties/C16H34/C16H34.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -71,8 +71,8 @@ class C16H34
NSRDSfunc4 B_;
NSRDSfunc1 mu_;
NSRDSfunc2 mug_;
NSRDSfunc0 K_;
NSRDSfunc2 Kg_;
NSRDSfunc0 kappa_;
NSRDSfunc2 kappag_;
NSRDSfunc6 sigma_;
APIdiffCoefFunc D_;
@ -153,10 +153,10 @@ public:
inline scalar mug(scalar p, scalar T) const;
//- Liquid thermal conductivity [W/(m K)]
inline scalar K(scalar p, scalar T) const;
inline scalar kappa(scalar p, scalar T) const;
//- Vapour thermal conductivity [W/(m K)]
inline scalar Kg(scalar p, scalar T) const;
inline scalar kappag(scalar p, scalar T) const;
//- Surface tension [N/m]
inline scalar sigma(scalar p, scalar T) const;
@ -183,8 +183,8 @@ public:
B_.writeData(os); os << nl;
mu_.writeData(os); os << nl;
mug_.writeData(os); os << nl;
K_.writeData(os); os << nl;
Kg_.writeData(os); os << nl;
kappa_.writeData(os); os << nl;
kappag_.writeData(os); os << nl;
sigma_.writeData(os); os << nl;
D_.writeData(os); os << endl;
}

10
src/thermophysicalModels/properties/liquidProperties/C16H34/C16H34I.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -77,15 +77,15 @@ inline Foam::scalar Foam::C16H34::mug(scalar p, scalar T) const
}
inline Foam::scalar Foam::C16H34::K(scalar p, scalar T) const
inline Foam::scalar Foam::C16H34::kappa(scalar p, scalar T) const
{
return K_.f(p, T);
return kappa_.f(p, T);
}
inline Foam::scalar Foam::C16H34::Kg(scalar p, scalar T) const
inline Foam::scalar Foam::C16H34::kappag(scalar p, scalar T) const
{
return Kg_.f(p, T);
return kappag_.f(p, T);
}

22
src/thermophysicalModels/properties/liquidProperties/C2H5OH/C2H5OH.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -86,8 +86,8 @@ Foam::C2H5OH::C2H5OH()
),
mu_(8.049, 776, -3.068, 0.0, 0.0),
mug_(1.0613e-07, 0.8066, 52.7, 0.0),
K_(0.253, -0.000281, 0.0, 0.0, 0.0, 0.0),
Kg_(-3.12, 0.7152, -3550000.0, 0.0),
kappa_(0.253, -0.000281, 0.0, 0.0, 0.0, 0.0),
kappag_(-3.12, 0.7152, -3550000.0, 0.0),
sigma_(3.7640e-02, -2.1570e-05, -1.025e-07, 0.0, 0.0, 0.0),
D_(147.18, 20.1, 46.069, 28) // note: Same as nHeptane
{}
@ -121,8 +121,8 @@ Foam::C2H5OH::C2H5OH
B_(secondVirialCoeff),
mu_(dynamicViscosity),
mug_(vapourDynamicViscosity),
K_(thermalConductivity),
Kg_(vapourThermalConductivity),
kappa_(thermalConductivity),
kappag_(vapourThermalConductivity),
sigma_(surfaceTension),
D_(vapourDiffussivity)
{}
@ -140,8 +140,8 @@ Foam::C2H5OH::C2H5OH(Istream& is)
B_(is),
mu_(is),
mug_(is),
K_(is),
Kg_(is),
kappa_(is),
kappag_(is),
sigma_(is),
D_(is)
{}
@ -159,8 +159,8 @@ Foam::C2H5OH::C2H5OH(const dictionary& dict)
B_(dict.subDict("B")),
mu_(dict.subDict("mu")),
mug_(dict.subDict("mug")),
K_(dict.subDict("K")),
Kg_(dict.subDict("Kg")),
kappa_(dict.subDict("K")),
kappag_(dict.subDict("kappag")),
sigma_(dict.subDict("sigma")),
D_(dict.subDict("D"))
{}
@ -178,8 +178,8 @@ Foam::C2H5OH::C2H5OH(const C2H5OH& liq)
B_(liq.B_),
mu_(liq.mu_),
mug_(liq.mug_),
K_(liq.K_),
Kg_(liq.Kg_),
kappa_(liq.kappa_),
kappag_(liq.kappag_),
sigma_(liq.sigma_),
D_(liq.D_)
{}

14
src/thermophysicalModels/properties/liquidProperties/C2H5OH/C2H5OH.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -71,8 +71,8 @@ class C2H5OH
NSRDSfunc4 B_;
NSRDSfunc1 mu_;
NSRDSfunc2 mug_;
NSRDSfunc0 K_;
NSRDSfunc2 Kg_;
NSRDSfunc0 kappa_;
NSRDSfunc2 kappag_;
NSRDSfunc0 sigma_;
APIdiffCoefFunc D_;
@ -153,10 +153,10 @@ public:
inline scalar mug(scalar p, scalar T) const;
//- Liquid thermal conductivity [W/(m K)]
inline scalar K(scalar p, scalar T) const;
inline scalar kappa(scalar p, scalar T) const;
//- Vapour thermal conductivity [W/(m K)]
inline scalar Kg(scalar p, scalar T) const;
inline scalar kappag(scalar p, scalar T) const;
//- Surface tension [N/m]
inline scalar sigma(scalar p, scalar T) const;
@ -183,8 +183,8 @@ public:
B_.writeData(os); os << nl;
mu_.writeData(os); os << nl;
mug_.writeData(os); os << nl;
K_.writeData(os); os << nl;
Kg_.writeData(os); os << nl;
kappa_.writeData(os); os << nl;
kappag_.writeData(os); os << nl;
sigma_.writeData(os); os << nl;
D_.writeData(os); os << endl;
}

10
src/thermophysicalModels/properties/liquidProperties/C2H5OH/C2H5OHI.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -77,15 +77,15 @@ inline Foam::scalar Foam::C2H5OH::mug(scalar p, scalar T) const
}
inline Foam::scalar Foam::C2H5OH::K(scalar p, scalar T) const
inline Foam::scalar Foam::C2H5OH::kappa(scalar p, scalar T) const
{
return K_.f(p, T);
return kappa_.f(p, T);
}
inline Foam::scalar Foam::C2H5OH::Kg(scalar p, scalar T) const
inline Foam::scalar Foam::C2H5OH::kappag(scalar p, scalar T) const
{
return Kg_.f(p, T);
return kappag_.f(p, T);
}

22
src/thermophysicalModels/properties/liquidProperties/C2H6/C2H6.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -77,8 +77,8 @@ Foam::C2H6::C2H6()
),
mu_(-3.4134, 197.05, -1.2193, -9.2023e-26, 10.0),
mug_(2.5906e-07, 0.67988, 98.902, 0.0),
K_(0.35758, -0.0011458, 6.1866e-07, 0.0, 0.0, 0.0),
Kg_(7.3869e-05, 1.1689, 500.73, 0.0),
kappa_(0.35758, -0.0011458, 6.1866e-07, 0.0, 0.0, 0.0),
kappag_(7.3869e-05, 1.1689, 500.73, 0.0),
sigma_(305.32, 0.048643, 1.1981, 0.0, 0.0, 0.0),
D_(147.18, 20.1, 30.070, 28) // note: Same as nHeptane
{}
@ -112,8 +112,8 @@ Foam::C2H6::C2H6
B_(secondVirialCoeff),
mu_(dynamicViscosity),
mug_(vapourDynamicViscosity),
K_(thermalConductivity),
Kg_(vapourThermalConductivity),
kappa_(thermalConductivity),
kappag_(vapourThermalConductivity),
sigma_(surfaceTension),
D_(vapourDiffussivity)
{}
@ -131,8 +131,8 @@ Foam::C2H6::C2H6(Istream& is)
B_(is),
mu_(is),
mug_(is),
K_(is),
Kg_(is),
kappa_(is),
kappag_(is),
sigma_(is),
D_(is)
{}
@ -150,8 +150,8 @@ Foam::C2H6::C2H6(const dictionary& dict)
B_(dict.subDict("B")),
mu_(dict.subDict("mu")),
mug_(dict.subDict("mug")),
K_(dict.subDict("K")),
Kg_(dict.subDict("Kg")),
kappa_(dict.subDict("K")),
kappag_(dict.subDict("kappag")),
sigma_(dict.subDict("sigma")),
D_(dict.subDict("D"))
{}
@ -169,8 +169,8 @@ Foam::C2H6::C2H6(const C2H6& liq)
B_(liq.B_),
mu_(liq.mu_),
mug_(liq.mug_),
K_(liq.K_),
Kg_(liq.Kg_),
kappa_(liq.kappa_),
kappag_(liq.kappag_),
sigma_(liq.sigma_),
D_(liq.D_)
{}

14
src/thermophysicalModels/properties/liquidProperties/C2H6/C2H6.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -71,8 +71,8 @@ class C2H6
NSRDSfunc4 B_;
NSRDSfunc1 mu_;
NSRDSfunc2 mug_;
NSRDSfunc0 K_;
NSRDSfunc2 Kg_;
NSRDSfunc0 kappa_;
NSRDSfunc2 kappag_;
NSRDSfunc6 sigma_;
APIdiffCoefFunc D_;
@ -153,10 +153,10 @@ public:
inline scalar mug(scalar p, scalar T) const;
//- Liquid thermal conductivity [W/(m K)]
inline scalar K(scalar p, scalar T) const;
inline scalar kappa(scalar p, scalar T) const;
//- Vapour thermal conductivity [W/(m K)]
inline scalar Kg(scalar p, scalar T) const;
inline scalar kappag(scalar p, scalar T) const;
//- Surface tension [N/m]
inline scalar sigma(scalar p, scalar T) const;
@ -183,8 +183,8 @@ public:
B_.writeData(os); os << nl;
mu_.writeData(os); os << nl;
mug_.writeData(os); os << nl;
K_.writeData(os); os << nl;
Kg_.writeData(os); os << nl;
kappa_.writeData(os); os << nl;
kappag_.writeData(os); os << nl;
sigma_.writeData(os); os << nl;
D_.writeData(os); os << endl;
}

10
src/thermophysicalModels/properties/liquidProperties/C2H6/C2H6I.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -77,15 +77,15 @@ inline Foam::scalar Foam::C2H6::mug(scalar p, scalar T) const
}
inline Foam::scalar Foam::C2H6::K(scalar p, scalar T) const
inline Foam::scalar Foam::C2H6::kappa(scalar p, scalar T) const
{
return K_.f(p, T);
return kappa_.f(p, T);
}
inline Foam::scalar Foam::C2H6::Kg(scalar p, scalar T) const
inline Foam::scalar Foam::C2H6::kappag(scalar p, scalar T) const
{
return Kg_.f(p, T);
return kappag_.f(p, T);
}

22
src/thermophysicalModels/properties/liquidProperties/C2H6O/C2H6O.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -86,8 +86,8 @@ Foam::C2H6O::C2H6O()
),
mu_(-10.62, 448.99, 8.3967e-05, 0.0, 0.0),
mug_(7.27, 0.1091, 440600000, 0.0),
K_(0.31276, -0.0005677, 0.0, 0.0, 0.0, 0.0),
Kg_(0.2247, 0.1026, 997.06, 1762900),
kappa_(0.31276, -0.0005677, 0.0, 0.0, 0.0, 0.0),
kappag_(0.2247, 0.1026, 997.06, 1762900),
sigma_(400.10, 0.06096, 1.2286, 0, 0, 0),
D_(147.18, 20.1, 46.069, 28) // note: Same as nHeptane
{}
@ -121,8 +121,8 @@ Foam::C2H6O::C2H6O
B_(secondVirialCoeff),
mu_(dynamicViscosity),
mug_(vapourDynamicViscosity),
K_(thermalConductivity),
Kg_(vapourThermalConductivity),
kappa_(thermalConductivity),
kappag_(vapourThermalConductivity),
sigma_(surfaceTension),
D_(vapourDiffussivity)
{}
@ -140,8 +140,8 @@ Foam::C2H6O::C2H6O(Istream& is)
B_(is),
mu_(is),
mug_(is),
K_(is),
Kg_(is),
kappa_(is),
kappag_(is),
sigma_(is),
D_(is)
{}
@ -159,8 +159,8 @@ Foam::C2H6O::C2H6O(const dictionary& dict)
B_(dict.subDict("B")),
mu_(dict.subDict("mu")),
mug_(dict.subDict("mug")),
K_(dict.subDict("K")),
Kg_(dict.subDict("Kg")),
kappa_(dict.subDict("K")),
kappag_(dict.subDict("kappag")),
sigma_(dict.subDict("sigma")),
D_(dict.subDict("D"))
{}
@ -178,8 +178,8 @@ Foam::C2H6O::C2H6O(const C2H6O& liq)
B_(liq.B_),
mu_(liq.mu_),
mug_(liq.mug_),
K_(liq.K_),
Kg_(liq.Kg_),
kappa_(liq.kappa_),
kappag_(liq.kappag_),
sigma_(liq.sigma_),
D_(liq.D_)
{}

14
src/thermophysicalModels/properties/liquidProperties/C2H6O/C2H6O.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -71,8 +71,8 @@ class C2H6O
NSRDSfunc4 B_;
NSRDSfunc1 mu_;
NSRDSfunc2 mug_;
NSRDSfunc0 K_;
NSRDSfunc2 Kg_;
NSRDSfunc0 kappa_;
NSRDSfunc2 kappag_;
NSRDSfunc6 sigma_;
APIdiffCoefFunc D_;
@ -153,10 +153,10 @@ public:
inline scalar mug(scalar p, scalar T) const;
//- Liquid thermal conductivity [W/(m K)]
inline scalar K(scalar p, scalar T) const;
inline scalar kappa(scalar p, scalar T) const;
//- Vapour thermal conductivity [W/(m K)]
inline scalar Kg(scalar p, scalar T) const;
inline scalar kappag(scalar p, scalar T) const;
//- Surface tension [N/m]
inline scalar sigma(scalar p, scalar T) const;
@ -183,8 +183,8 @@ public:
B_.writeData(os); os << nl;
mu_.writeData(os); os << nl;
mug_.writeData(os); os << nl;
K_.writeData(os); os << nl;
Kg_.writeData(os); os << nl;
kappa_.writeData(os); os << nl;
kappag_.writeData(os); os << nl;
sigma_.writeData(os); os << nl;
D_.writeData(os); os << endl;
}

10
src/thermophysicalModels/properties/liquidProperties/C2H6O/C2H6OI.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -77,15 +77,15 @@ inline Foam::scalar Foam::C2H6O::mug(scalar p, scalar T) const
}
inline Foam::scalar Foam::C2H6O::K(scalar p, scalar T) const
inline Foam::scalar Foam::C2H6O::kappa(scalar p, scalar T) const
{
return K_.f(p, T);
return kappa_.f(p, T);
}
inline Foam::scalar Foam::C2H6O::Kg(scalar p, scalar T) const
inline Foam::scalar Foam::C2H6O::kappag(scalar p, scalar T) const
{
return Kg_.f(p, T);
return kappag_.f(p, T);
}

22
src/thermophysicalModels/properties/liquidProperties/C3H6O/C3H6O.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -86,8 +86,8 @@ Foam::C3H6O::C3H6O()
),
mu_(-14.918, 1023.4, 0.5961, 0.0, 0.0),
mug_(3.1005e-08, 0.9762, 23.139, 0.0),
K_(0.2502, -0.000298, 0.0, 0.0, 0.0, 0.0),
Kg_(-26.8, 0.9098, -126500000, 0.0),
kappa_(0.2502, -0.000298, 0.0, 0.0, 0.0, 0.0),
kappag_(-26.8, 0.9098, -126500000, 0.0),
sigma_(508.20, 0.0622, 1.124, 0.0, 0.0, 0.0),
D_(147.18, 20.1, 58.08, 28) // note: Same as nHeptane
{}
@ -121,8 +121,8 @@ Foam::C3H6O::C3H6O
B_(secondVirialCoeff),
mu_(dynamicViscosity),
mug_(vapourDynamicViscosity),
K_(thermalConductivity),
Kg_(vapourThermalConductivity),
kappa_(thermalConductivity),
kappag_(vapourThermalConductivity),
sigma_(surfaceTension),
D_(vapourDiffussivity)
{}
@ -140,8 +140,8 @@ Foam::C3H6O::C3H6O(Istream& is)
B_(is),
mu_(is),
mug_(is),
K_(is),
Kg_(is),
kappa_(is),
kappag_(is),
sigma_(is),
D_(is)
{}
@ -159,8 +159,8 @@ Foam::C3H6O::C3H6O(const dictionary& dict)
B_(dict.subDict("B")),
mu_(dict.subDict("mu")),
mug_(dict.subDict("mug")),
K_(dict.subDict("K")),
Kg_(dict.subDict("Kg")),
kappa_(dict.subDict("K")),
kappag_(dict.subDict("kappag")),
sigma_(dict.subDict("sigma")),
D_(dict.subDict("D"))
{}
@ -178,8 +178,8 @@ Foam::C3H6O::C3H6O(const C3H6O& liq)
B_(liq.B_),
mu_(liq.mu_),
mug_(liq.mug_),
K_(liq.K_),
Kg_(liq.Kg_),
kappa_(liq.kappa_),
kappag_(liq.kappag_),
sigma_(liq.sigma_),
D_(liq.D_)
{}

14
src/thermophysicalModels/properties/liquidProperties/C3H6O/C3H6O.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -71,8 +71,8 @@ class C3H6O
NSRDSfunc4 B_;
NSRDSfunc1 mu_;
NSRDSfunc2 mug_;
NSRDSfunc0 K_;
NSRDSfunc2 Kg_;
NSRDSfunc0 kappa_;
NSRDSfunc2 kappag_;
NSRDSfunc6 sigma_;
APIdiffCoefFunc D_;
@ -153,10 +153,10 @@ public:
inline scalar mug(scalar p, scalar T) const;
//- Liquid thermal conductivity [W/(m K)]
inline scalar K(scalar p, scalar T) const;
inline scalar kappa(scalar p, scalar T) const;
//- Vapour thermal conductivity [W/(m K)]
inline scalar Kg(scalar p, scalar T) const;
inline scalar kappag(scalar p, scalar T) const;
//- Surface tension [N/m]
inline scalar sigma(scalar p, scalar T) const;
@ -183,8 +183,8 @@ public:
B_.writeData(os); os << nl;
mu_.writeData(os); os << nl;
mug_.writeData(os); os << nl;
K_.writeData(os); os << nl;
Kg_.writeData(os); os << nl;
kappa_.writeData(os); os << nl;
kappag_.writeData(os); os << nl;
sigma_.writeData(os); os << nl;
D_.writeData(os); os << endl;
}

10
src/thermophysicalModels/properties/liquidProperties/C3H6O/C3H6OI.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -76,15 +76,15 @@ inline Foam::scalar Foam::C3H6O::mug(scalar p, scalar T) const
}
inline Foam::scalar Foam::C3H6O::K(scalar p, scalar T) const
inline Foam::scalar Foam::C3H6O::kappa(scalar p, scalar T) const
{
return K_.f(p, T);
return kappa_.f(p, T);
}
inline Foam::scalar Foam::C3H6O::Kg(scalar p, scalar T) const
inline Foam::scalar Foam::C3H6O::kappag(scalar p, scalar T) const
{
return Kg_.f(p, T);
return kappag_.f(p, T);
}

22
src/thermophysicalModels/properties/liquidProperties/C3H8/C3H8.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -76,8 +76,8 @@ Foam::C3H8::C3H8()
),
mu_(-6.9281, 420.76, -0.63276, -1.713e-26, 10.0),
mug_(2.4993e-07, 0.68612, 179.34, -8254.6),
K_(0.26755, -0.00066457, 2.774e-07, 0.0, 0.0, 0.0),
Kg_(-1.12, 0.10972, -9834.6, -7535800),
kappa_(0.26755, -0.00066457, 2.774e-07, 0.0, 0.0, 0.0),
kappag_(-1.12, 0.10972, -9834.6, -7535800),
sigma_(369.83, 0.05092, 1.2197, 0.0, 0.0, 0.0),
D_(147.18, 20.1, 44.096, 28) // note: Same as nHeptane
{}
@ -111,8 +111,8 @@ Foam::C3H8::C3H8
B_(secondVirialCoeff),
mu_(dynamicViscosity),
mug_(vapourDynamicViscosity),
K_(thermalConductivity),
Kg_(vapourThermalConductivity),
kappa_(thermalConductivity),
kappag_(vapourThermalConductivity),
sigma_(surfaceTension),
D_(vapourDiffussivity)
{}
@ -130,8 +130,8 @@ Foam::C3H8::C3H8(Istream& is)
B_(is),
mu_(is),
mug_(is),
K_(is),
Kg_(is),
kappa_(is),
kappag_(is),
sigma_(is),
D_(is)
{}
@ -149,8 +149,8 @@ Foam::C3H8::C3H8(const dictionary& dict)
B_(dict.subDict("B")),
mu_(dict.subDict("mu")),
mug_(dict.subDict("mug")),
K_(dict.subDict("K")),
Kg_(dict.subDict("Kg")),
kappa_(dict.subDict("K")),
kappag_(dict.subDict("kappag")),
sigma_(dict.subDict("sigma")),
D_(dict.subDict("D"))
{}
@ -168,8 +168,8 @@ Foam::C3H8::C3H8(const C3H8& liq)
B_(liq.B_),
mu_(liq.mu_),
mug_(liq.mug_),
K_(liq.K_),
Kg_(liq.Kg_),
kappa_(liq.kappa_),
kappag_(liq.kappag_),
sigma_(liq.sigma_),
D_(liq.D_)
{}

14
src/thermophysicalModels/properties/liquidProperties/C3H8/C3H8.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -71,8 +71,8 @@ class C3H8
NSRDSfunc4 B_;
NSRDSfunc1 mu_;
NSRDSfunc2 mug_;
NSRDSfunc0 K_;
NSRDSfunc2 Kg_;
NSRDSfunc0 kappa_;
NSRDSfunc2 kappag_;
NSRDSfunc6 sigma_;
APIdiffCoefFunc D_;
@ -153,10 +153,10 @@ public:
inline scalar mug(scalar p, scalar T) const;
//- Liquid thermal conductivity [W/(m K)]
inline scalar K(scalar p, scalar T) const;
inline scalar kappa(scalar p, scalar T) const;
//- Vapour thermal conductivity [W/(m K)]
inline scalar Kg(scalar p, scalar T) const;
inline scalar kappag(scalar p, scalar T) const;
//- Surface tension [N/m]
inline scalar sigma(scalar p, scalar T) const;
@ -183,8 +183,8 @@ public:
B_.writeData(os); os << nl;
mu_.writeData(os); os << nl;
mug_.writeData(os); os << nl;
K_.writeData(os); os << nl;
Kg_.writeData(os); os << nl;
kappa_.writeData(os); os << nl;
kappag_.writeData(os); os << nl;
sigma_.writeData(os); os << nl;
D_.writeData(os); os << endl;
}

10
src/thermophysicalModels/properties/liquidProperties/C3H8/C3H8I.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -77,15 +77,15 @@ inline Foam::scalar Foam::C3H8::mug(scalar p, scalar T) const
}
inline Foam::scalar Foam::C3H8::K(scalar p, scalar T) const
inline Foam::scalar Foam::C3H8::kappa(scalar p, scalar T) const
{
return K_.f(p, T);
return kappa_.f(p, T);
}
inline Foam::scalar Foam::C3H8::Kg(scalar p, scalar T) const
inline Foam::scalar Foam::C3H8::kappag(scalar p, scalar T) const
{
return Kg_.f(p, T);
return kappag_.f(p, T);
}

22
src/thermophysicalModels/properties/liquidProperties/C4H10O/C4H10O.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -86,8 +86,8 @@ Foam::C4H10O::C4H10O()
),
mu_(10.197, -63.8, -3.226, 0.0, 0.0),
mug_(1.948e-06, 0.41, 495.8, 0.0),
K_(0.249, -0.0004005, 0.0, 0.0, 0.0, 0.0),
Kg_(-0.0044894, 0.6155, -3266.3, 0.0),
kappa_(0.249, -0.0004005, 0.0, 0.0, 0.0, 0.0),
kappag_(-0.0044894, 0.6155, -3266.3, 0.0),
sigma_(466.70, 0.057356, 1.288, 0.0, 0.0, 0.0),
D_(147.18, 20.1, 74.123, 28) // note: Same as nHeptane
{}
@ -121,8 +121,8 @@ Foam::C4H10O::C4H10O
B_(secondVirialCoeff),
mu_(dynamicViscosity),
mug_(vapourDynamicViscosity),
K_(thermalConductivity),
Kg_(vapourThermalConductivity),
kappa_(thermalConductivity),
kappag_(vapourThermalConductivity),
sigma_(surfaceTension),
D_(vapourDiffussivity)
{}
@ -140,8 +140,8 @@ Foam::C4H10O::C4H10O(Istream& is)
B_(is),
mu_(is),
mug_(is),
K_(is),
Kg_(is),
kappa_(is),
kappag_(is),
sigma_(is),
D_(is)
{}
@ -159,8 +159,8 @@ Foam::C4H10O::C4H10O(const dictionary& dict)
B_(dict.subDict("B")),
mu_(dict.subDict("mu")),
mug_(dict.subDict("mug")),
K_(dict.subDict("K")),
Kg_(dict.subDict("Kg")),
kappa_(dict.subDict("K")),
kappag_(dict.subDict("kappag")),
sigma_(dict.subDict("sigma")),
D_(dict.subDict("D"))
{}
@ -178,8 +178,8 @@ Foam::C4H10O::C4H10O(const C4H10O& liq)
B_(liq.B_),
mu_(liq.mu_),
mug_(liq.mug_),
K_(liq.K_),
Kg_(liq.Kg_),
kappa_(liq.kappa_),
kappag_(liq.kappag_),
sigma_(liq.sigma_),
D_(liq.D_)
{}

14
src/thermophysicalModels/properties/liquidProperties/C4H10O/C4H10O.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -71,8 +71,8 @@ class C4H10O
NSRDSfunc4 B_;
NSRDSfunc1 mu_;
NSRDSfunc2 mug_;
NSRDSfunc0 K_;
NSRDSfunc2 Kg_;
NSRDSfunc0 kappa_;
NSRDSfunc2 kappag_;
NSRDSfunc6 sigma_;
APIdiffCoefFunc D_;
@ -153,10 +153,10 @@ public:
inline scalar mug(scalar p, scalar T) const;
//- Liquid thermal conductivity [W/(m K)]
inline scalar K(scalar p, scalar T) const;
inline scalar kappa(scalar p, scalar T) const;
//- Vapour thermal conductivity [W/(m K)]
inline scalar Kg(scalar p, scalar T) const;
inline scalar kappag(scalar p, scalar T) const;
//- Surface tension [N/m]
inline scalar sigma(scalar p, scalar T) const;
@ -183,8 +183,8 @@ public:
B_.writeData(os); os << nl;
mu_.writeData(os); os << nl;
mug_.writeData(os); os << nl;
K_.writeData(os); os << nl;
Kg_.writeData(os); os << nl;
kappa_.writeData(os); os << nl;
kappag_.writeData(os); os << nl;
sigma_.writeData(os); os << nl;
D_.writeData(os); os << endl;
}

10
src/thermophysicalModels/properties/liquidProperties/C4H10O/C4H10OI.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -77,15 +77,15 @@ inline Foam::scalar Foam::C4H10O::mug(scalar p, scalar T) const
}
inline Foam::scalar Foam::C4H10O::K(scalar p, scalar T) const
inline Foam::scalar Foam::C4H10O::kappa(scalar p, scalar T) const
{
return K_.f(p, T);
return kappa_.f(p, T);
}
inline Foam::scalar Foam::C4H10O::Kg(scalar p, scalar T) const
inline Foam::scalar Foam::C4H10O::kappag(scalar p, scalar T) const
{
return Kg_.f(p, T);
return kappag_.f(p, T);
}

22
src/thermophysicalModels/properties/liquidProperties/C6H14/C6H14.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -86,8 +86,8 @@ Foam::C6H14::C6H14()
),
mu_(-20.715, 1207.5, 1.4993, 0.0, 0.0),
mug_(1.7514e-07, 0.70737, 157.14, 0.0),
K_(0.22492, -0.0003533, 0.0, 0.0, 0.0, 0.0),
Kg_(-650.5, 0.8053, -1412100000, 0.0),
kappa_(0.22492, -0.0003533, 0.0, 0.0, 0.0, 0.0),
kappag_(-650.5, 0.8053, -1412100000, 0.0),
sigma_(507.60, 0.055003, 1.2674, 0.0, 0.0, 0.0),
D_(147.18, 20.1, 86.177, 28) // note: Same as nHeptane
{}
@ -121,8 +121,8 @@ Foam::C6H14::C6H14
B_(secondVirialCoeff),
mu_(dynamicViscosity),
mug_(vapourDynamicViscosity),
K_(thermalConductivity),
Kg_(vapourThermalConductivity),
kappa_(thermalConductivity),
kappag_(vapourThermalConductivity),
sigma_(surfaceTension),
D_(vapourDiffussivity)
{}
@ -140,8 +140,8 @@ Foam::C6H14::C6H14(Istream& is)
B_(is),
mu_(is),
mug_(is),
K_(is),
Kg_(is),
kappa_(is),
kappag_(is),
sigma_(is),
D_(is)
{}
@ -159,8 +159,8 @@ Foam::C6H14::C6H14(const dictionary& dict)
B_(dict.subDict("B")),
mu_(dict.subDict("mu")),
mug_(dict.subDict("mug")),
K_(dict.subDict("K")),
Kg_(dict.subDict("Kg")),
kappa_(dict.subDict("K")),
kappag_(dict.subDict("kappag")),
sigma_(dict.subDict("sigma")),
D_(dict.subDict("D"))
{}
@ -178,8 +178,8 @@ Foam::C6H14::C6H14(const C6H14& liq)
B_(liq.B_),
mu_(liq.mu_),
mug_(liq.mug_),
K_(liq.K_),
Kg_(liq.Kg_),
kappa_(liq.kappa_),
kappag_(liq.kappag_),
sigma_(liq.sigma_),
D_(liq.D_)
{}

14
src/thermophysicalModels/properties/liquidProperties/C6H14/C6H14.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -71,8 +71,8 @@ class C6H14
NSRDSfunc4 B_;
NSRDSfunc1 mu_;
NSRDSfunc2 mug_;
NSRDSfunc0 K_;
NSRDSfunc2 Kg_;
NSRDSfunc0 kappa_;
NSRDSfunc2 kappag_;
NSRDSfunc6 sigma_;
APIdiffCoefFunc D_;
@ -153,10 +153,10 @@ public:
inline scalar mug(scalar p, scalar T) const;
//- Liquid thermal conductivity [W/(m K)]
inline scalar K(scalar p, scalar T) const;
inline scalar kappa(scalar p, scalar T) const;
//- Vapour thermal conductivity [W/(m K)]
inline scalar Kg(scalar p, scalar T) const;
inline scalar kappag(scalar p, scalar T) const;
//- Surface tension [N/m]
inline scalar sigma(scalar p, scalar T) const;
@ -183,8 +183,8 @@ public:
B_.writeData(os); os << nl;
mu_.writeData(os); os << nl;
mug_.writeData(os); os << nl;
K_.writeData(os); os << nl;
Kg_.writeData(os); os << nl;
kappa_.writeData(os); os << nl;
kappag_.writeData(os); os << nl;
sigma_.writeData(os); os << nl;
D_.writeData(os); os << endl;
}

10
src/thermophysicalModels/properties/liquidProperties/C6H14/C6H14I.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -77,15 +77,15 @@ inline Foam::scalar Foam::C6H14::mug(scalar p, scalar T) const
}
inline Foam::scalar Foam::C6H14::K(scalar p, scalar T) const
inline Foam::scalar Foam::C6H14::kappa(scalar p, scalar T) const
{
return K_.f(p, T);
return kappa_.f(p, T);
}
inline Foam::scalar Foam::C6H14::Kg(scalar p, scalar T) const
inline Foam::scalar Foam::C6H14::kappag(scalar p, scalar T) const
{
return Kg_.f(p, T);
return kappag_.f(p, T);
}

22
src/thermophysicalModels/properties/liquidProperties/C6H6/C6H6.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -86,8 +86,8 @@ Foam::C6H6::C6H6()
),
mu_(6.764, 336.4, -2.687, 0.0, 0.0),
mug_(3.134e-08, 0.9676, 7.9, 0.0),
K_(0.2407, -0.0003202, 0.0, 0.0, 0.0, 0.0),
Kg_(1.652e-05, 1.3117, 491, 0.0),
kappa_(0.2407, -0.0003202, 0.0, 0.0, 0.0, 0.0),
kappag_(1.652e-05, 1.3117, 491, 0.0),
sigma_(562.16, 0.07195, 1.2389, 0.0, 0.0, 0.0),
D_(147.18, 20.1, 78.114, 28) // note: Same as nHeptane
{}
@ -121,8 +121,8 @@ Foam::C6H6::C6H6
B_(secondVirialCoeff),
mu_(dynamicViscosity),
mug_(vapourDynamicViscosity),
K_(thermalConductivity),
Kg_(vapourThermalConductivity),
kappa_(thermalConductivity),
kappag_(vapourThermalConductivity),
sigma_(surfaceTension),
D_(vapourDiffussivity)
{}
@ -140,8 +140,8 @@ Foam::C6H6::C6H6(Istream& is)
B_(is),
mu_(is),
mug_(is),
K_(is),
Kg_(is),
kappa_(is),
kappag_(is),
sigma_(is),
D_(is)
{}
@ -159,8 +159,8 @@ Foam::C6H6::C6H6(const dictionary& dict)
B_(dict.subDict("B")),
mu_(dict.subDict("mu")),
mug_(dict.subDict("mug")),
K_(dict.subDict("K")),
Kg_(dict.subDict("Kg")),
kappa_(dict.subDict("K")),
kappag_(dict.subDict("kappag")),
sigma_(dict.subDict("sigma")),
D_(dict.subDict("D"))
{}
@ -178,8 +178,8 @@ Foam::C6H6::C6H6(const C6H6& liq)
B_(liq.B_),
mu_(liq.mu_),
mug_(liq.mug_),
K_(liq.K_),
Kg_(liq.Kg_),
kappa_(liq.kappa_),
kappag_(liq.kappag_),
sigma_(liq.sigma_),
D_(liq.D_)
{}

14
src/thermophysicalModels/properties/liquidProperties/C6H6/C6H6.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -71,8 +71,8 @@ class C6H6
NSRDSfunc4 B_;
NSRDSfunc1 mu_;
NSRDSfunc2 mug_;
NSRDSfunc0 K_;
NSRDSfunc2 Kg_;
NSRDSfunc0 kappa_;
NSRDSfunc2 kappag_;
NSRDSfunc6 sigma_;
APIdiffCoefFunc D_;
@ -153,10 +153,10 @@ public:
inline scalar mug(scalar p, scalar T) const;
//- Liquid thermal conductivity [W/(m K)]
inline scalar K(scalar p, scalar T) const;
inline scalar kappa(scalar p, scalar T) const;
//- Vapour thermal conductivity [W/(m K)]
inline scalar Kg(scalar p, scalar T) const;
inline scalar kappag(scalar p, scalar T) const;
//- Surface tension [N/m]
inline scalar sigma(scalar p, scalar T) const;
@ -183,8 +183,8 @@ public:
B_.writeData(os); os << nl;
mu_.writeData(os); os << nl;
mug_.writeData(os); os << nl;
K_.writeData(os); os << nl;
Kg_.writeData(os); os << nl;
kappa_.writeData(os); os << nl;
kappag_.writeData(os); os << nl;
sigma_.writeData(os); os << nl;
D_.writeData(os); os << endl;
}

10
src/thermophysicalModels/properties/liquidProperties/C6H6/C6H6I.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -77,15 +77,15 @@ inline Foam::scalar Foam::C6H6::mug(scalar p, scalar T) const
}
inline Foam::scalar Foam::C6H6::K(scalar p, scalar T) const
inline Foam::scalar Foam::C6H6::kappa(scalar p, scalar T) const
{
return K_.f(p, T);
return kappa_.f(p, T);
}
inline Foam::scalar Foam::C6H6::Kg(scalar p, scalar T) const
inline Foam::scalar Foam::C6H6::kappag(scalar p, scalar T) const
{
return Kg_.f(p, T);
return kappag_.f(p, T);
}

22
src/thermophysicalModels/properties/liquidProperties/C7H16/C7H16.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -85,8 +85,8 @@ Foam::C7H16::C7H16()
),
mu_(-24.451, 1533.1, 2.0087, 0.0, 0.0),
mug_(6.672e-08, 0.82837, 85.752, 0.0),
K_(0.215, -0.000303, 0.0, 0.0, 0.0, 0.0),
Kg_(-0.070028, 0.38068, -7049.9, -2400500.0),
kappa_(0.215, -0.000303, 0.0, 0.0, 0.0, 0.0),
kappag_(-0.070028, 0.38068, -7049.9, -2400500.0),
sigma_(540.20, 0.054143, 1.2512, 0.0, 0.0, 0.0),
D_(147.18, 20.1, 100.204, 28.0)
{}
@ -120,8 +120,8 @@ Foam::C7H16::C7H16
B_(secondVirialCoeff),
mu_(dynamicViscosity),
mug_(vapourDynamicViscosity),
K_(thermalConductivity),
Kg_(vapourThermalConductivity),
kappa_(thermalConductivity),
kappag_(vapourThermalConductivity),
sigma_(surfaceTension),
D_(vapourDiffussivity)
{}
@ -139,8 +139,8 @@ Foam::C7H16::C7H16(Istream& is)
B_(is),
mu_(is),
mug_(is),
K_(is),
Kg_(is),
kappa_(is),
kappag_(is),
sigma_(is),
D_(is)
{}
@ -158,8 +158,8 @@ Foam::C7H16::C7H16(const dictionary& dict)
B_(dict.subDict("B")),
mu_(dict.subDict("mu")),
mug_(dict.subDict("mug")),
K_(dict.subDict("K")),
Kg_(dict.subDict("Kg")),
kappa_(dict.subDict("K")),
kappag_(dict.subDict("kappag")),
sigma_(dict.subDict("sigma")),
D_(dict.subDict("D"))
{}
@ -177,8 +177,8 @@ Foam::C7H16::C7H16(const C7H16& liq)
B_(liq.B_),
mu_(liq.mu_),
mug_(liq.mug_),
K_(liq.K_),
Kg_(liq.Kg_),
kappa_(liq.kappa_),
kappag_(liq.kappag_),
sigma_(liq.sigma_),
D_(liq.D_)
{}

14
src/thermophysicalModels/properties/liquidProperties/C7H16/C7H16.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -71,8 +71,8 @@ class C7H16
NSRDSfunc4 B_;
NSRDSfunc1 mu_;
NSRDSfunc2 mug_;
NSRDSfunc0 K_;
NSRDSfunc2 Kg_;
NSRDSfunc0 kappa_;
NSRDSfunc2 kappag_;
NSRDSfunc6 sigma_;
APIdiffCoefFunc D_;
@ -153,10 +153,10 @@ public:
inline scalar mug(scalar p, scalar T) const;
//- Liquid thermal conductivity [W/(m K)]
inline scalar K(scalar p, scalar T) const;
inline scalar kappa(scalar p, scalar T) const;
//- Vapour thermal conductivity [W/(m K)]
inline scalar Kg(scalar p, scalar T) const;
inline scalar kappag(scalar p, scalar T) const;
//- Surface tension [N/m]
inline scalar sigma(scalar p, scalar T) const;
@ -183,8 +183,8 @@ public:
B_.writeData(os); os << nl;
mu_.writeData(os); os << nl;
mug_.writeData(os); os << nl;
K_.writeData(os); os << nl;
Kg_.writeData(os); os << nl;
kappa_.writeData(os); os << nl;
kappag_.writeData(os); os << nl;
sigma_.writeData(os); os << nl;
D_.writeData(os); os << endl;
}

10
src/thermophysicalModels/properties/liquidProperties/C7H16/C7H16I.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -77,15 +77,15 @@ inline Foam::scalar Foam::C7H16::mug(scalar p, scalar T) const
}
inline Foam::scalar Foam::C7H16::K(scalar p, scalar T) const
inline Foam::scalar Foam::C7H16::kappa(scalar p, scalar T) const
{
return K_.f(p, T);
return kappa_.f(p, T);
}
inline Foam::scalar Foam::C7H16::Kg(scalar p, scalar T) const
inline Foam::scalar Foam::C7H16::kappag(scalar p, scalar T) const
{
return Kg_.f(p, T);
return kappag_.f(p, T);
}

22
src/thermophysicalModels/properties/liquidProperties/C7H8/C7H8.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -86,8 +86,8 @@ Foam::C7H8::C7H8()
),
mu_(-13.362, 1183, 0.333, 0.0, 0.0),
mug_(2.919e-08, 0.9648, 0.0, 0.0),
K_(0.2043, -0.000239, 0.0, 0.0, 0.0, 0.0),
Kg_(2.392e-05, 1.2694, 537, 0.0),
kappa_(0.2043, -0.000239, 0.0, 0.0, 0.0, 0.0),
kappag_(2.392e-05, 1.2694, 537, 0.0),
sigma_(591.79, 0.06685, 1.2456, 0.0, 0.0, 0.0),
D_(147.18, 20.1, 92.141, 28) // note: Same as nHeptane
{}
@ -121,8 +121,8 @@ Foam::C7H8::C7H8
B_(secondVirialCoeff),
mu_(dynamicViscosity),
mug_(vapourDynamicViscosity),
K_(thermalConductivity),
Kg_(vapourThermalConductivity),
kappa_(thermalConductivity),
kappag_(vapourThermalConductivity),
sigma_(surfaceTension),
D_(vapourDiffussivity)
{}
@ -140,8 +140,8 @@ Foam::C7H8::C7H8(Istream& is)
B_(is),
mu_(is),
mug_(is),
K_(is),
Kg_(is),
kappa_(is),
kappag_(is),
sigma_(is),
D_(is)
{}
@ -159,8 +159,8 @@ Foam::C7H8::C7H8(const dictionary& dict)
B_(dict.subDict("B")),
mu_(dict.subDict("mu")),
mug_(dict.subDict("mug")),
K_(dict.subDict("K")),
Kg_(dict.subDict("Kg")),
kappa_(dict.subDict("K")),
kappag_(dict.subDict("kappag")),
sigma_(dict.subDict("sigma")),
D_(dict.subDict("D"))
{}
@ -178,8 +178,8 @@ Foam::C7H8::C7H8(const C7H8& liq)
B_(liq.B_),
mu_(liq.mu_),
mug_(liq.mug_),
K_(liq.K_),
Kg_(liq.Kg_),
kappa_(liq.kappa_),
kappag_(liq.kappag_),
sigma_(liq.sigma_),
D_(liq.D_)
{}

14
src/thermophysicalModels/properties/liquidProperties/C7H8/C7H8.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -71,8 +71,8 @@ class C7H8
NSRDSfunc4 B_;
NSRDSfunc1 mu_;
NSRDSfunc2 mug_;
NSRDSfunc0 K_;
NSRDSfunc2 Kg_;
NSRDSfunc0 kappa_;
NSRDSfunc2 kappag_;
NSRDSfunc6 sigma_;
APIdiffCoefFunc D_;
@ -153,10 +153,10 @@ public:
inline scalar mug(scalar p, scalar T) const;
//- Liquid thermal conductivity [W/(m K)]
inline scalar K(scalar p, scalar T) const;
inline scalar kappa(scalar p, scalar T) const;
//- Vapour thermal conductivity [W/(m K)]
inline scalar Kg(scalar p, scalar T) const;
inline scalar kappag(scalar p, scalar T) const;
//- Surface tension [N/m]
inline scalar sigma(scalar p, scalar T) const;
@ -183,8 +183,8 @@ public:
B_.writeData(os); os << nl;
mu_.writeData(os); os << nl;
mug_.writeData(os); os << nl;
K_.writeData(os); os << nl;
Kg_.writeData(os); os << nl;
kappa_.writeData(os); os << nl;
kappag_.writeData(os); os << nl;
sigma_.writeData(os); os << nl;
D_.writeData(os); os << endl;
}

10
src/thermophysicalModels/properties/liquidProperties/C7H8/C7H8I.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -77,15 +77,15 @@ inline Foam::scalar Foam::C7H8::mug(scalar p, scalar T) const
}
inline Foam::scalar Foam::C7H8::K(scalar p, scalar T) const
inline Foam::scalar Foam::C7H8::kappa(scalar p, scalar T) const
{
return K_.f(p, T);
return kappa_.f(p, T);
}
inline Foam::scalar Foam::C7H8::Kg(scalar p, scalar T) const
inline Foam::scalar Foam::C7H8::kappag(scalar p, scalar T) const
{
return Kg_.f(p, T);
return kappag_.f(p, T);
}

22
src/thermophysicalModels/properties/liquidProperties/C8H10/C8H10.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -86,8 +86,8 @@ Foam::C8H10::C8H10()
),
mu_(-10.452, 1048.4, -0.0715, 0.0, 0.0),
mug_(1.2e-06, 0.4518, 439.0, 0.0),
K_(0.20149, -0.00023988, 0.0, 0.0, 0.0, 0.0),
Kg_(1.708e-05, 1.319, 565.6, 0.0),
kappa_(0.20149, -0.00023988, 0.0, 0.0, 0.0, 0.0),
kappag_(1.708e-05, 1.319, 565.6, 0.0),
sigma_(617.17, 0.066, 1.268, 0.0, 0.0, 0.0),
D_(147.18, 20.1, 106.167, 28.0) // note: Same as nHeptane
{}
@ -121,8 +121,8 @@ Foam::C8H10::C8H10
B_(secondVirialCoeff),
mu_(dynamicViscosity),
mug_(vapourDynamicViscosity),
K_(thermalConductivity),
Kg_(vapourThermalConductivity),
kappa_(thermalConductivity),
kappag_(vapourThermalConductivity),
sigma_(surfaceTension),
D_(vapourDiffussivity)
{}
@ -140,8 +140,8 @@ Foam::C8H10::C8H10(Istream& is)
B_(is),
mu_(is),
mug_(is),
K_(is),
Kg_(is),
kappa_(is),
kappag_(is),
sigma_(is),
D_(is)
{}
@ -159,8 +159,8 @@ Foam::C8H10::C8H10(const dictionary& dict)
B_(dict.subDict("B")),
mu_(dict.subDict("mu")),
mug_(dict.subDict("mug")),
K_(dict.subDict("K")),
Kg_(dict.subDict("Kg")),
kappa_(dict.subDict("K")),
kappag_(dict.subDict("kappag")),
sigma_(dict.subDict("sigma")),
D_(dict.subDict("D"))
{}
@ -178,8 +178,8 @@ Foam::C8H10::C8H10(const C8H10& liq)
B_(liq.B_),
mu_(liq.mu_),
mug_(liq.mug_),
K_(liq.K_),
Kg_(liq.Kg_),
kappa_(liq.kappa_),
kappag_(liq.kappag_),
sigma_(liq.sigma_),
D_(liq.D_)
{}

14
src/thermophysicalModels/properties/liquidProperties/C8H10/C8H10.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -70,8 +70,8 @@ class C8H10
NSRDSfunc4 B_;
NSRDSfunc1 mu_;
NSRDSfunc2 mug_;
NSRDSfunc0 K_;
NSRDSfunc2 Kg_;
NSRDSfunc0 kappa_;
NSRDSfunc2 kappag_;
NSRDSfunc6 sigma_;
APIdiffCoefFunc D_;
@ -152,10 +152,10 @@ public:
inline scalar mug(scalar p, scalar T) const;
//- Liquid thermal conductivity [W/(m K)]
inline scalar K(scalar p, scalar T) const;
inline scalar kappa(scalar p, scalar T) const;
//- Vapour thermal conductivity [W/(m K)]
inline scalar Kg(scalar p, scalar T) const;
inline scalar kappag(scalar p, scalar T) const;
//- Surface tension [N/m]
inline scalar sigma(scalar p, scalar T) const;
@ -182,8 +182,8 @@ public:
B_.writeData(os); os << nl;
mu_.writeData(os); os << nl;
mug_.writeData(os); os << nl;
K_.writeData(os); os << nl;
Kg_.writeData(os); os << nl;
kappa_.writeData(os); os << nl;
kappag_.writeData(os); os << nl;
sigma_.writeData(os); os << nl;
D_.writeData(os); os << endl;
}

10
src/thermophysicalModels/properties/liquidProperties/C8H10/C8H10I.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -77,15 +77,15 @@ inline Foam::scalar Foam::C8H10::mug(scalar p, scalar T) const
}
inline Foam::scalar Foam::C8H10::K(scalar p, scalar T) const
inline Foam::scalar Foam::C8H10::kappa(scalar p, scalar T) const
{
return K_.f(p, T);
return kappa_.f(p, T);
}
inline Foam::scalar Foam::C8H10::Kg(scalar p, scalar T) const
inline Foam::scalar Foam::C8H10::kappag(scalar p, scalar T) const
{
return Kg_.f(p, T);
return kappag_.f(p, T);
}

22
src/thermophysicalModels/properties/liquidProperties/C8H18/C8H18.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -86,8 +86,8 @@ Foam::C8H18::C8H18()
),
mu_(-20.463, 1497.4, 1.379, 0.0, 0.0),
mug_(3.1191e-08, 0.92925, 55.092, 0.0),
K_(0.2156, -0.00029483, 0.0, 0.0, 0.0, 0.0),
Kg_(-8758, 0.8448, -27121000000.0, 0.0),
kappa_(0.2156, -0.00029483, 0.0, 0.0, 0.0, 0.0),
kappag_(-8758, 0.8448, -27121000000.0, 0.0),
sigma_(568.70, 0.052789, 1.2323, 0.0, 0.0, 0.0),
D_(147.18, 20.1, 114.231, 28.0) // note: Same as nHeptane
{}
@ -121,8 +121,8 @@ Foam::C8H18::C8H18
B_(secondVirialCoeff),
mu_(dynamicViscosity),
mug_(vapourDynamicViscosity),
K_(thermalConductivity),
Kg_(vapourThermalConductivity),
kappa_(thermalConductivity),
kappag_(vapourThermalConductivity),
sigma_(surfaceTension),
D_(vapourDiffussivity)
{}
@ -140,8 +140,8 @@ Foam::C8H18::C8H18(Istream& is)
B_(is),
mu_(is),
mug_(is),
K_(is),
Kg_(is),
kappa_(is),
kappag_(is),
sigma_(is),
D_(is)
{}
@ -159,8 +159,8 @@ Foam::C8H18::C8H18(const dictionary& dict)
B_(dict.subDict("B")),
mu_(dict.subDict("mu")),
mug_(dict.subDict("mug")),
K_(dict.subDict("K")),
Kg_(dict.subDict("Kg")),
kappa_(dict.subDict("K")),
kappag_(dict.subDict("kappag")),
sigma_(dict.subDict("sigma")),
D_(dict.subDict("D"))
{}
@ -178,8 +178,8 @@ Foam::C8H18::C8H18(const C8H18& liq)
B_(liq.B_),
mu_(liq.mu_),
mug_(liq.mug_),
K_(liq.K_),
Kg_(liq.Kg_),
kappa_(liq.kappa_),
kappag_(liq.kappag_),
sigma_(liq.sigma_),
D_(liq.D_)
{}

14
src/thermophysicalModels/properties/liquidProperties/C8H18/C8H18.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -71,8 +71,8 @@ class C8H18
NSRDSfunc4 B_;
NSRDSfunc1 mu_;
NSRDSfunc2 mug_;
NSRDSfunc0 K_;
NSRDSfunc2 Kg_;
NSRDSfunc0 kappa_;
NSRDSfunc2 kappag_;
NSRDSfunc6 sigma_;
APIdiffCoefFunc D_;
@ -153,10 +153,10 @@ public:
inline scalar mug(scalar p, scalar T) const;
//- Liquid thermal conductivity [W/(m K)]
inline scalar K(scalar p, scalar T) const;
inline scalar kappa(scalar p, scalar T) const;
//- Vapour thermal conductivity [W/(m K)]
inline scalar Kg(scalar p, scalar T) const;
inline scalar kappag(scalar p, scalar T) const;
//- Surface tension [N/m]
inline scalar sigma(scalar p, scalar T) const;
@ -183,8 +183,8 @@ public:
B_.writeData(os); os << nl;
mu_.writeData(os); os << nl;
mug_.writeData(os); os << nl;
K_.writeData(os); os << nl;
Kg_.writeData(os); os << nl;
kappa_.writeData(os); os << nl;
kappag_.writeData(os); os << nl;
sigma_.writeData(os); os << nl;
D_.writeData(os); os << endl;
}

10
src/thermophysicalModels/properties/liquidProperties/C8H18/C8H18I.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -77,15 +77,15 @@ inline Foam::scalar Foam::C8H18::mug(scalar p, scalar T) const
}
inline Foam::scalar Foam::C8H18::K(scalar p, scalar T) const
inline Foam::scalar Foam::C8H18::kappa(scalar p, scalar T) const
{
return K_.f(p, T);
return kappa_.f(p, T);
}
inline Foam::scalar Foam::C8H18::Kg(scalar p, scalar T) const
inline Foam::scalar Foam::C8H18::kappag(scalar p, scalar T) const
{
return Kg_.f(p, T);
return kappag_.f(p, T);
}

22
src/thermophysicalModels/properties/liquidProperties/C9H20/C9H20.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -86,8 +86,8 @@ Foam::C9H20::C9H20()
),
mu_(-21.149, 1658, 1.454, 0.0, 0.0),
mug_(1.0344e-07, 0.77301, 220.47, 0.0),
K_(0.209, -0.000264, 0.0, 0.0, 0.0, 0.0),
Kg_(-0.065771, 0.27198, -3482.3, -1580300.0),
kappa_(0.209, -0.000264, 0.0, 0.0, 0.0, 0.0),
kappag_(-0.065771, 0.27198, -3482.3, -1580300.0),
sigma_(594.60, 0.054975, 1.2897, 0.0, 0.0, 0.0),
D_(147.18, 20.1, 128.258, 28.0) // note: Same as nHeptane
{}
@ -121,8 +121,8 @@ Foam::C9H20::C9H20
B_(secondVirialCoeff),
mu_(dynamicViscosity),
mug_(vapourDynamicViscosity),
K_(thermalConductivity),
Kg_(vapourThermalConductivity),
kappa_(thermalConductivity),
kappag_(vapourThermalConductivity),
sigma_(surfaceTension),
D_(vapourDiffussivity)
{}
@ -140,8 +140,8 @@ Foam::C9H20::C9H20(Istream& is)
B_(is),
mu_(is),
mug_(is),
K_(is),
Kg_(is),
kappa_(is),
kappag_(is),
sigma_(is),
D_(is)
{}
@ -159,8 +159,8 @@ Foam::C9H20::C9H20(const dictionary& dict)
B_(dict.subDict("B")),
mu_(dict.subDict("mu")),
mug_(dict.subDict("mug")),
K_(dict.subDict("K")),
Kg_(dict.subDict("Kg")),
kappa_(dict.subDict("K")),
kappag_(dict.subDict("kappag")),
sigma_(dict.subDict("sigma")),
D_(dict.subDict("D"))
{}
@ -178,8 +178,8 @@ Foam::C9H20::C9H20(const C9H20& liq)
B_(liq.B_),
mu_(liq.mu_),
mug_(liq.mug_),
K_(liq.K_),
Kg_(liq.Kg_),
kappa_(liq.kappa_),
kappag_(liq.kappag_),
sigma_(liq.sigma_),
D_(liq.D_)
{}

14
src/thermophysicalModels/properties/liquidProperties/C9H20/C9H20.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -71,8 +71,8 @@ class C9H20
NSRDSfunc4 B_;
NSRDSfunc1 mu_;
NSRDSfunc2 mug_;
NSRDSfunc0 K_;
NSRDSfunc2 Kg_;
NSRDSfunc0 kappa_;
NSRDSfunc2 kappag_;
NSRDSfunc6 sigma_;
APIdiffCoefFunc D_;
@ -153,10 +153,10 @@ public:
inline scalar mug(scalar p, scalar T) const;
//- Liquid thermal conductivity [W/(m K)]
inline scalar K(scalar p, scalar T) const;
inline scalar kappa(scalar p, scalar T) const;
//- Vapour thermal conductivity [W/(m K)]
inline scalar Kg(scalar p, scalar T) const;
inline scalar kappag(scalar p, scalar T) const;
//- Surface tension [N/m]
inline scalar sigma(scalar p, scalar T) const;
@ -183,8 +183,8 @@ public:
B_.writeData(os); os << nl;
mu_.writeData(os); os << nl;
mug_.writeData(os); os << nl;
K_.writeData(os); os << nl;
Kg_.writeData(os); os << nl;
kappa_.writeData(os); os << nl;
kappag_.writeData(os); os << nl;
sigma_.writeData(os); os << nl;
D_.writeData(os); os << endl;
}

10
src/thermophysicalModels/properties/liquidProperties/C9H20/C9H20I.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -77,15 +77,15 @@ inline Foam::scalar Foam::C9H20::mug(scalar p, scalar T) const
}
inline Foam::scalar Foam::C9H20::K(scalar p, scalar T) const
inline Foam::scalar Foam::C9H20::kappa(scalar p, scalar T) const
{
return K_.f(p, T);
return kappa_.f(p, T);
}
inline Foam::scalar Foam::C9H20::Kg(scalar p, scalar T) const
inline Foam::scalar Foam::C9H20::kappag(scalar p, scalar T) const
{
return Kg_.f(p, T);
return kappag_.f(p, T);
}

22
src/thermophysicalModels/properties/liquidProperties/CH3OH/CH3OH.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -86,8 +86,8 @@ Foam::CH3OH::CH3OH()
),
mu_(-7.288, 1065.3, -0.6657, 0.0, 0.0),
mug_(3.0663e-07, 0.69655, 205.0, 0.0),
K_(0.2837, -0.000281, 0.0, 0.0, 0.0, 0.0),
Kg_(-7.763, 1.0279, -74360000.0, 6770000000.0),
kappa_(0.2837, -0.000281, 0.0, 0.0, 0.0, 0.0),
kappag_(-7.763, 1.0279, -74360000.0, 6770000000.0),
sigma_(512.58, 0.056, -0.00014583, 1.08e-07, 0.0, 0.0),
D_(147.18, 20.1, 32.042, 28.0) // note: Same as nHeptane
{}
@ -121,8 +121,8 @@ Foam::CH3OH::CH3OH
B_(secondVirialCoeff),
mu_(dynamicViscosity),
mug_(vapourDynamicViscosity),
K_(thermalConductivity),
Kg_(vapourThermalConductivity),
kappa_(thermalConductivity),
kappag_(vapourThermalConductivity),
sigma_(surfaceTension),
D_(vapourDiffussivity)
{}
@ -140,8 +140,8 @@ Foam::CH3OH::CH3OH(Istream& is)
B_(is),
mu_(is),
mug_(is),
K_(is),
Kg_(is),
kappa_(is),
kappag_(is),
sigma_(is),
D_(is)
{}
@ -159,8 +159,8 @@ Foam::CH3OH::CH3OH(const dictionary& dict)
B_(dict.subDict("B")),
mu_(dict.subDict("mu")),
mug_(dict.subDict("mug")),
K_(dict.subDict("K")),
Kg_(dict.subDict("Kg")),
kappa_(dict.subDict("K")),
kappag_(dict.subDict("kappag")),
sigma_(dict.subDict("sigma")),
D_(dict.subDict("D"))
{}
@ -178,8 +178,8 @@ Foam::CH3OH::CH3OH(const CH3OH& liq)
B_(liq.B_),
mu_(liq.mu_),
mug_(liq.mug_),
K_(liq.K_),
Kg_(liq.Kg_),
kappa_(liq.kappa_),
kappag_(liq.kappag_),
sigma_(liq.sigma_),
D_(liq.D_)
{}

14
src/thermophysicalModels/properties/liquidProperties/CH3OH/CH3OH.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -71,8 +71,8 @@ class CH3OH
NSRDSfunc4 B_;
NSRDSfunc1 mu_;
NSRDSfunc2 mug_;
NSRDSfunc0 K_;
NSRDSfunc2 Kg_;
NSRDSfunc0 kappa_;
NSRDSfunc2 kappag_;
NSRDSfunc6 sigma_;
APIdiffCoefFunc D_;
@ -153,10 +153,10 @@ public:
inline scalar mug(scalar p, scalar T) const;
//- Liquid thermal conductivity [W/(m K)]
inline scalar K(scalar p, scalar T) const;
inline scalar kappa(scalar p, scalar T) const;
//- Vapour thermal conductivity [W/(m K)]
inline scalar Kg(scalar p, scalar T) const;
inline scalar kappag(scalar p, scalar T) const;
//- Surface tension [N/m]
inline scalar sigma(scalar p, scalar T) const;
@ -183,8 +183,8 @@ public:
B_.writeData(os); os << nl;
mu_.writeData(os); os << nl;
mug_.writeData(os); os << nl;
K_.writeData(os); os << nl;
Kg_.writeData(os); os << nl;
kappa_.writeData(os); os << nl;
kappag_.writeData(os); os << nl;
sigma_.writeData(os); os << nl;
D_.writeData(os); os << endl;
}

10
src/thermophysicalModels/properties/liquidProperties/CH3OH/CH3OHI.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -77,15 +77,15 @@ inline Foam::scalar Foam::CH3OH::mug(scalar p, scalar T) const
}
inline Foam::scalar Foam::CH3OH::K(scalar p, scalar T) const
inline Foam::scalar Foam::CH3OH::kappa(scalar p, scalar T) const
{
return K_.f(p, T);
return kappa_.f(p, T);
}
inline Foam::scalar Foam::CH3OH::Kg(scalar p, scalar T) const
inline Foam::scalar Foam::CH3OH::kappag(scalar p, scalar T) const
{
return Kg_.f(p, T);
return kappag_.f(p, T);
}

22
src/thermophysicalModels/properties/liquidProperties/CH4N2O/CH4N2O.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -70,8 +70,8 @@ Foam::CH4N2O::CH4N2O()
),
mu_(-51.964, 3670.6, 5.7331, -5.3495e-29, 10.0),
mug_(2.6986e-06, 0.498, 1257.7, -19570.0),
K_(-0.4267, 0.0056903, -8.0065e-06, 1.815e-09, 0.0, 0.0),
Kg_(6.977e-05, 1.1243, 844.9, -148850.0),
kappa_(-0.4267, 0.0056903, -8.0065e-06, 1.815e-09, 0.0, 0.0),
kappag_(6.977e-05, 1.1243, 844.9, -148850.0),
sigma_(705.0, 1.0, 0.0, 0.0, 0.0, 0.0), // note: set to constant
D_(147.18, 20.1, 60.056, 28.0) // note: Same as nHeptane
{}
@ -105,8 +105,8 @@ Foam::CH4N2O::CH4N2O
B_(secondVirialCoeff),
mu_(dynamicViscosity),
mug_(vapourDynamicViscosity),
K_(thermalConductivity),
Kg_(vapourThermalConductivity),
kappa_(thermalConductivity),
kappag_(vapourThermalConductivity),
sigma_(surfaceTension),
D_(vapourDiffussivity)
{}
@ -124,8 +124,8 @@ Foam::CH4N2O::CH4N2O(Istream& is)
B_(is),
mu_(is),
mug_(is),
K_(is),
Kg_(is),
kappa_(is),
kappag_(is),
sigma_(is),
D_(is)
{}
@ -143,8 +143,8 @@ Foam::CH4N2O::CH4N2O(const dictionary& dict)
B_(dict.subDict("B")),
mu_(dict.subDict("mu")),
mug_(dict.subDict("mug")),
K_(dict.subDict("K")),
Kg_(dict.subDict("Kg")),
kappa_(dict.subDict("K")),
kappag_(dict.subDict("kappag")),
sigma_(dict.subDict("sigma")),
D_(dict.subDict("D"))
{}
@ -162,8 +162,8 @@ Foam::CH4N2O::CH4N2O(const CH4N2O& liq)
B_(liq.B_),
mu_(liq.mu_),
mug_(liq.mug_),
K_(liq.K_),
Kg_(liq.Kg_),
kappa_(liq.kappa_),
kappag_(liq.kappag_),
sigma_(liq.sigma_),
D_(liq.D_)
{}

14
src/thermophysicalModels/properties/liquidProperties/CH4N2O/CH4N2O.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -72,8 +72,8 @@ class CH4N2O
NSRDSfunc4 B_;
NSRDSfunc1 mu_;
NSRDSfunc2 mug_;
NSRDSfunc0 K_;
NSRDSfunc2 Kg_;
NSRDSfunc0 kappa_;
NSRDSfunc2 kappag_;
NSRDSfunc6 sigma_;
APIdiffCoefFunc D_;
@ -153,10 +153,10 @@ public:
inline scalar mug(scalar p, scalar T) const;
//- Liquid thermal conductivity [W/(m K)]
inline scalar K(scalar p, scalar T) const;
inline scalar kappa(scalar p, scalar T) const;
//- Vapour thermal conductivity [W/(m K)]
inline scalar Kg(scalar p, scalar T) const;
inline scalar kappag(scalar p, scalar T) const;
//- Surface tension [N/m]
inline scalar sigma(scalar p, scalar T) const;
@ -183,8 +183,8 @@ public:
B_.writeData(os); os << nl;
mu_.writeData(os); os << nl;
mug_.writeData(os); os << nl;
K_.writeData(os); os << nl;
Kg_.writeData(os); os << nl;
kappa_.writeData(os); os << nl;
kappag_.writeData(os); os << nl;
sigma_.writeData(os); os << nl;
D_.writeData(os); os << endl;
}

8
src/thermophysicalModels/properties/liquidProperties/CH4N2O/CH4N2OI.H
View File

@ -77,15 +77,15 @@ inline Foam::scalar Foam::CH4N2O::mug(scalar p, scalar T) const
}
inline Foam::scalar Foam::CH4N2O::K(scalar p, scalar T) const
inline Foam::scalar Foam::CH4N2O::kappa(scalar p, scalar T) const
{
return K_.f(p, T);
return kappa_.f(p, T);
}
inline Foam::scalar Foam::CH4N2O::Kg(scalar p, scalar T) const
inline Foam::scalar Foam::CH4N2O::kappag(scalar p, scalar T) const
{
return Kg_.f(p, T);
return kappag_.f(p, T);
}

50
src/thermophysicalModels/properties/liquidProperties/H2O/H2O.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -93,8 +93,8 @@ Foam::H2O::H2O()
),
mu_(-51.964, 3670.6, 5.7331, -5.3495e-29, 10),
mug_(2.6986e-06, 0.498, 1257.7, -19570),
K_(-0.4267, 0.0056903, -8.0065e-06, 1.815e-09, 0, 0),
Kg_(6.977e-05, 1.1243, 844.9, -148850),
kappa_(-0.4267, 0.0056903, -8.0065e-06, 1.815e-09, 0, 0),
kappag_(6.977e-05, 1.1243, 844.9, -148850),
sigma_(647.13, 0.18548, 2.717, -3.554, 2.047, 0),
D_(15.0, 15.0, 18.015, 28)
{}
@ -128,8 +128,8 @@ Foam::H2O::H2O
B_(secondVirialCoeff),
mu_(dynamicViscosity),
mug_(vapourDynamicViscosity),
K_(thermalConductivity),
Kg_(vapourThermalConductivity),
kappa_(thermalConductivity),
kappag_(vapourThermalConductivity),
sigma_(surfaceTension),
D_(vapourDiffussivity)
{}
@ -147,29 +147,31 @@ Foam::H2O::H2O(Istream& is)
B_(is),
mu_(is),
mug_(is),
K_(is),
Kg_(is),
kappa_(is),
kappag_(is),
sigma_(is),
D_(is)
{}
Foam::H2O::H2O(const dictionary& dict)
:
liquidProperties(dict),
rho_(dict.subDict("rho")),
pv_(dict.subDict("pv")),
hl_(dict.subDict("hl")),
Cp_(dict.subDict("Cp")),
h_(dict.subDict("h")),
Cpg_(dict.subDict("Cpg")),
B_(dict.subDict("B")),
mu_(dict.subDict("mu")),
mug_(dict.subDict("mug")),
K_(dict.subDict("K")),
Kg_(dict.subDict("Kg")),
sigma_(dict.subDict("sigma")),
D_(dict.subDict("D"))
:
H2O()
// :
// liquidProperties(dict),
// rho_(dict.subDict("rho")),
// pv_(dict.subDict("pv")),
// hl_(dict.subDict("hl")),
// Cp_(dict.subDict("Cp")),
// h_(dict.subDict("h")),
// Cpg_(dict.subDict("Cpg")),
// B_(dict.subDict("B")),
// mu_(dict.subDict("mu")),
// mug_(dict.subDict("mug")),
// kappa_(dict.subDict("K")),
// kappag_(dict.subDict("kappag")),
// sigma_(dict.subDict("sigma")),
// D_(dict.subDict("D"))
{}
@ -185,8 +187,8 @@ Foam::H2O::H2O(const H2O& liq)
B_(liq.B_),
mu_(liq.mu_),
mug_(liq.mug_),
K_(liq.K_),
Kg_(liq.Kg_),
kappa_(liq.kappa_),
kappag_(liq.kappag_),
sigma_(liq.sigma_),
D_(liq.D_)
{}

14
src/thermophysicalModels/properties/liquidProperties/H2O/H2O.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -70,8 +70,8 @@ class H2O
NSRDSfunc4 B_;
NSRDSfunc1 mu_;
NSRDSfunc2 mug_;
NSRDSfunc0 K_;
NSRDSfunc2 Kg_;
NSRDSfunc0 kappa_;
NSRDSfunc2 kappag_;
NSRDSfunc6 sigma_;
APIdiffCoefFunc D_;
@ -152,10 +152,10 @@ public:
inline scalar mug(scalar p, scalar T) const;
//- Liquid thermal conductivity [W/(m K)]
inline scalar K(scalar p, scalar T) const;
inline scalar kappa(scalar p, scalar T) const;
//- Vapour thermal conductivity [W/(m K)]
inline scalar Kg(scalar p, scalar T) const;
inline scalar kappag(scalar p, scalar T) const;
//- Surface tension [N/m]
inline scalar sigma(scalar p, scalar T) const;
@ -182,8 +182,8 @@ public:
B_.writeData(os); os << nl;
mu_.writeData(os); os << nl;
mug_.writeData(os); os << nl;
K_.writeData(os); os << nl;
Kg_.writeData(os); os << nl;
kappa_.writeData(os); os << nl;
kappag_.writeData(os); os << nl;
sigma_.writeData(os); os << nl;
D_.writeData(os); os << endl;
}

10
src/thermophysicalModels/properties/liquidProperties/H2O/H2OI.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -77,15 +77,15 @@ inline Foam::scalar Foam::H2O::mug(scalar p, scalar T) const
}
inline Foam::scalar Foam::H2O::K(scalar p, scalar T) const
inline Foam::scalar Foam::H2O::kappa(scalar p, scalar T) const
{
return K_.f(p, T);
return kappa_.f(p, T);
}
inline Foam::scalar Foam::H2O::Kg(scalar p, scalar T) const
inline Foam::scalar Foam::H2O::kappag(scalar p, scalar T) const
{
return Kg_.f(p, T);
return kappag_.f(p, T);
}

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