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

Merge branch 'master' of github.com-OpenFOAM:OpenFOAM/OpenFOAM-dev

Browse Source
This commit is contained in:
Henry Weller
2019-08-01 14:27:11 +01:00
parent b8fcd10cf7 006c3a5099
commit 89b4ad6ba7
10 changed files with 41 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/thermophysicalModels/specie/equationOfState/icoPolynomial/icoPolynomial.H
View File

@ -48,9 +48,6 @@ Usage
\rho = 1000 - 0.05 T + 0.003 T^2
\f]
Note
Input in [kg/m^3], but internally uses [kg/m3/kmol].
SourceFiles
icoPolynomialI.H
icoPolynomial.C
@ -116,7 +113,7 @@ class icoPolynomial
{
// Private Data
//- Density polynomial coefficients
//- Density polynomial coefficients [kg/m^3/K^i]
Polynomial<PolySize> rhoCoeffs_;

6
src/thermophysicalModels/specie/thermo/eConst/eConstThermo.H
View File

@ -88,12 +88,10 @@ class eConstThermo
{
// Private Data
//- Heat capacity at constant volume
// Note: input in [J/kg/K], but internally uses [J/kmol/K]
//- Heat capacity at constant volume [J/kg/K]
scalar Cv_;
//- Heat of formation
// Note: input in [J/kg], but internally uses [J/kmol]
//- Heat of formation [J/kg]
scalar Hf_;

3
src/thermophysicalModels/specie/thermo/hConst/hConstThermo.H
View File

@ -86,7 +86,10 @@ class hConstThermo
{
// Private Data
//- Heat capacity at constant pressure [J/kmol/K]
scalar Cp_;
//- Heat of formation [J/kg]
scalar Hf_;

11
src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermo.H
View File

@ -56,8 +56,6 @@ Usage
\f]
Note
- Heat of formation is inputted in [J/kg], but internally uses [J/kmol]
- Standard entropy is inputted in [J/kg/K], but internally uses [J/kmol/K]
- Specific heat at constant pressure polynomial coefficients evaluate to an
expression in [J/kg/K].
@ -132,14 +130,15 @@ class hPolynomialThermo
//- Standard entropy
scalar Sf_;
//- Specific heat at constant pressure polynomial coeffs
//- Specific heat at constant pressure polynomial coeffs [J/kg/K/K^i]
Polynomial<PolySize> CpCoeffs_;
//- Enthalpy polynomial coeffs - derived from cp [J/kg]
// NOTE: relative to Tstd
//- Enthalpy polynomial coeffs [J/kg/K^i]
// Derived from Cp coeffs. Relative to Tstd.
typename Polynomial<PolySize>::intPolyType hCoeffs_;
//- Entropy - derived from Cp [J/kg/K] - relative to Tstd
//- Entropy polynomial coeffs [J/kg/K/K^i]
// Derived from Cp coeffs. Relative to Tstd.
Polynomial<PolySize> sCoeffs_;

12
src/thermophysicalModels/specie/transport/logPolynomial/logPolynomialTransport.H
View File

@ -63,12 +63,6 @@ Usage
\kappa = 2000 - 0.15 ln(T) + 0.023 ln(T)^2
\f]
Note
- Dynamic viscosity polynomial coefficients evaluate to an expression in
[Pa.s], but internally uses [Pa.s/kmol].
- Thermal conductivity polynomial coefficients evaluate to an expression in
[W/m/K], but internally uses [W/m/K/kmol].
SourceFiles
logPolynomialTransportI.H
logPolynomialTransport.C
@ -125,12 +119,10 @@ class logPolynomialTransport
{
// Private Data
//- Dynamic viscosity polynomial coefficients
// Note: input in [Pa.s], but internally uses [Pa.s/kmol]
//- Dynamic viscosity polynomial coefficients [Pa.s/K^i]
Polynomial<PolySize> muCoeffs_;
//- Thermal conductivity polynomial coefficients
// Note: input in [W/m/K], but internally uses [W/m/K/kmol]
//- Thermal conductivity polynomial coefficients [W/m/K/K^i]
Polynomial<PolySize> kappaCoeffs_;

10
src/thermophysicalModels/specie/transport/polynomial/polynomialTransport.H
View File

@ -54,12 +54,6 @@ Usage
\kappa = 2000 - 0.15 T + 0.023 T^2
\f]
Note
- Dynamic viscosity polynomial coefficients evaluate to an expression in
[Pa.s], but internally uses [Pa.s/kmol].
- Thermal conductivity polynomial coefficients evaluate to an expression in
[W/m/K], but internally uses [W/m/K/kmol].
SourceFiles
polynomialTransportI.H
polynomialTransport.C
@ -116,10 +110,10 @@ class polynomialTransport
{
// Private Data
//- Dynamic viscosity polynomial coefficients
//- Dynamic viscosity polynomial coefficients [Pa.s/K^i]
Polynomial<PolySize> muCoeffs_;
//- Thermal conductivity polynomial coefficients
//- Thermal conductivity polynomial coefficients [W/m/K/K^i]
Polynomial<PolySize> kappaCoeffs_;

20
tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/fvOptions
View File

@ -66,6 +66,26 @@ options
h.steam (3700 0); // kg*m^2/s^3
}
}
limitTsteam
{
type limitTemperature;
active yes;
selectionMode all;
min 270;
max 2000;
phase steam;
}
limitTwater
{
type limitTemperature;
active yes;
selectionMode all;
min 270;
max 2000;
phase water;
}
}

15
tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/system/controlDict
View File

@ -47,27 +47,20 @@ runTimeModifiable yes;
adjustTimeStep yes;
maxCo 0.1;
maxCo 0.25;
maxDeltaT 1e-2;
functions
{
timeStepping
{
type setTimeStep;
functionObjectLibs ("libutilityFunctionObjects.so");
enabled yes;
deltaT tableFile;
file "system/deltaTvalues";
}
minMaxp
minMax
{
type fieldMinMax;
functionObjectLibs ("libfieldFunctionObjects.so");
fields
(
T.steam
T.water
p
);
location no;

9
tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/system/deltaTvalues
View File

@ -1,9 +0,0 @@
(
(0 1e-3)
(0.99 1e-3)
(0.999 1e-4)
(0.9999 1e-5)
(1.001 1e-5)
(1.01 1e-4)
(1.1 1e-3)
);

2
tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/system/fvSolution
View File

@ -81,7 +81,7 @@ PIMPLE
nOuterCorrectors 3;
nCorrectors 1;
nNonOrthogonalCorrectors 0;
nEnergyCorrectors 2;
nEnergyCorrectors 1;
faceMomentum yes;
}