diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/reactionThermo/hRefConstThermos.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/reactionThermo/hRefConstThermos.C
index f43303a2b7ecb5671e0fc962bc25e8d80a58e60b..712a96e1dedd3fdbbaf4f502b04611ffb83acbf9 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/reactionThermo/hRefConstThermos.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/reactionThermo/hRefConstThermos.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2015 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2015-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -253,6 +253,14 @@ makeReactionMixtureThermo
constRefRhoConstHThermoPhysics
);
+makeReactionMixtureThermo
+(
+ rhoThermo,
+ rhoReactionThermo,
+ heRhoThermo,
+ multiComponentMixture,
+ constRefFluidHThermoPhysics
+);
makeReactionMixtureThermo
(
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/fvOptions b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/fvOptions
index 6a3a4da0be7b8d35339eba09a8bb81779e06b1ef..c59177ebfce02a73119d1006a75ba8ccd1573308 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/fvOptions
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/fvOptions
@@ -71,7 +71,7 @@ options
volumeMode absolute;
injectionRateSuSp
{
- e.steam (3700 0); // kg*m^2/s^3
+ h.steam (3700 0); // kg*m^2/s^3
}
}
}
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/phaseProperties b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/phaseProperties
index fc976bc67cbfb62885309d8fe16983df67e56061..919159c256b159116fdbdadb8d5cb63e0f3d4625 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/phaseProperties
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/phaseProperties
@@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-type thermalPhaseChangeTwoPhaseSystem;
+type thermalPhaseChangeTwoPhaseSystem;
phases (steam water);
@@ -34,7 +34,7 @@ steam
}
Sc 0.7;
- residualAlpha 1e-6;
+ residualAlpha 1e-3;
}
water
@@ -47,7 +47,7 @@ water
}
Sc 0.7;
- residualAlpha 1e-6;
+ residualAlpha 1e-3;
}
blending
@@ -56,30 +56,6 @@ blending
{
type none;
continuousPhase water;
- minFullyContinuousAlpha.steam 0.7;
- minPartlyContinuousAlpha.steam 0.5;
- minFullyContinuousAlpha.water 0.7;
- minPartlyContinuousAlpha.water 0.5;
- }
-
- heatTransfer
- {
- type none;
- continuousPhase water;
- minFullyContinuousAlpha.steam 1;
- minPartlyContinuousAlpha.steam 0;
- minFullyContinuousAlpha.water 1;
- minPartlyContinuousAlpha.water 0;
- }
-
- massTransfer
- {
- type none;
- continuousPhase water;
- minFullyContinuousAlpha.steam 1;
- minPartlyContinuousAlpha.steam 0;
- minFullyContinuousAlpha.water 1;
- minPartlyContinuousAlpha.water 0;
}
}
@@ -107,12 +83,6 @@ aspectRatio
type constant;
E0 1.0;
}
-
- (water in steam)
- {
- type constant;
- E0 1.0;
- }
);
drag
@@ -126,16 +96,6 @@ drag
type none;
}
}
-
- (water in steam)
- {
- type SchillerNaumann;
- residualRe 1e-3;
- swarmCorrection
- {
- type none;
- }
- }
);
virtualMass
@@ -145,27 +105,18 @@ virtualMass
type constantCoefficient;
Cvm 0.5;
}
-
- (water in steam)
- {
- type constantCoefficient;
- Cvm 0.5;
- }
);
interfaceComposition
+();
+
+heatTransfer
(
(steam in water)
{
- type Saturated;
- species ( H2O );
- Le 1.0;
- saturationPressure
- {
- type ArdenBuck;
- }
+ type spherical;
+ residualAlpha 1e-4;
}
-
);
heatTransfer.steam
@@ -187,33 +138,19 @@ heatTransfer.water
);
massTransfer.steam
-(
-
-);
+();
massTransfer.water
-(
-
-);
+();
lift
-(
-);
+();
wallLubrication
-(
-);
+();
turbulentDispersion
-(
- (steam in water)
- {
- type Burns;//
- sigma 0.7;
- Ctd 1.0;
- residualAlpha 1e-3;
- }
-);
+();
// Minimum allowable pressure
pMin 10000;
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/thermophysicalProperties.steam b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/thermophysicalProperties.steam
index 73efe39b1144ed2e61f3f023fc232baab952403e..1afc14ece841a819f675d0ba5d447790365e2e26 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/thermophysicalProperties.steam
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/thermophysicalProperties.steam
@@ -23,9 +23,13 @@ thermoType
thermo hRefConst;
equationOfState perfectGas;
specie specie;
- energy sensibleInternalEnergy;
+ energy sensibleEnthalpy;
}
+dpdt yes;
+
+pressureWorkAlphaLimit 0;
+
species
(
water
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/thermophysicalProperties.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/thermophysicalProperties.water
index 84cdbf196544b1495364888f4d2e8cb3c68b0d18..2691e905b952204ee3f1f5229801cedcacf2207b 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/thermophysicalProperties.water
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/thermophysicalProperties.water
@@ -23,9 +23,13 @@ thermoType
thermo hRefConst;
equationOfState perfectFluid;
specie specie;
- energy sensibleInternalEnergy;
+ energy sensibleEnthalpy;
}
+dpdt yes;
+
+pressureWorkAlphaLimit 0;
+
species
(
water
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/system/controlDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/system/controlDict
index c39421ffae2b7f1020da69844f3ab62337d14fa7..ad3f9a9e919aa7d408e566f72775d87ee1b86284 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/system/controlDict
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/system/controlDict
@@ -25,11 +25,11 @@ stopAt endTime;
endTime 10;
-deltaT 1e-6;
+deltaT 1e-3;
writeControl adjustableRunTime;
-writeInterval 0.5;
+writeInterval 0.1;
purgeWrite 0;
@@ -41,7 +41,7 @@ writeCompression compressed;
timeFormat general;
-timePrecision 6;
+timePrecision 9;
runTimeModifiable yes;
@@ -51,5 +51,30 @@ maxCo 0.1;
maxDeltaT 1e-2;
+functions
+{
+ timeStepping
+ {
+ type setTimeStep;
+ functionObjectLibs ("libutilityFunctionObjects.so");
+ enabled yes;
+ deltaT tableFile;
+ file "system/deltaTvalues";
+ }
+
+ minMaxp
+ {
+ type fieldMinMax;
+ functionObjectLibs ("libfieldFunctionObjects.so");
+ fields
+ (
+ p
+ );
+ location no;
+ writeControl timeStep;
+ writeInterval 1;
+ }
+}
+
// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/system/deltaTvalues b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/system/deltaTvalues
new file mode 100644
index 0000000000000000000000000000000000000000..03c2defea091efeffb8d2149840db6a26b835b2b
--- /dev/null
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/system/deltaTvalues
@@ -0,0 +1,9 @@
+(
+ (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)
+);
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/system/fvSolution b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/system/fvSolution
old mode 100644
new mode 100755
index f1af1c490040026756b9019b84dd76d709861310..8cce0f90ce6526c6e0f7cb2eaf457b9f0d08589b
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/system/fvSolution
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/system/fvSolution
@@ -27,8 +27,8 @@ solvers
{
solver PCG;
preconditioner DIC;
- tolerance 1e-8;
- relTol 0;
+ tolerance 1e-10;
+ relTol 0.001;
}
p_rghFinal
@@ -78,10 +78,10 @@ solvers
PIMPLE
{
- nOuterCorrectors 4;
+ nOuterCorrectors 3;
nCorrectors 1;
nNonOrthogonalCorrectors 0;
- nEnergyCorrectors 1;
+ nEnergyCorrectors 2;
faceMomentum yes;
}
@@ -89,7 +89,7 @@ relaxationFactors
{
fields
{
- iDmdt 1;
+ iDmdt 1;
}
equations