diff --git a/src/functionObjects/utilities/thermoCoupleProbes/thermoCoupleProbes.C b/src/functionObjects/utilities/thermoCoupleProbes/thermoCoupleProbes.C
index f247a9528ee93864ab42ef7fb293c417e1b2873b..740856a5a8d15cb177c417cfcfa2180df5dc8317 100644
--- a/src/functionObjects/utilities/thermoCoupleProbes/thermoCoupleProbes.C
+++ b/src/functionObjects/utilities/thermoCoupleProbes/thermoCoupleProbes.C
@@ -67,9 +67,9 @@ Foam::functionObjects::thermoCoupleProbes::thermoCoupleProbes
}
// Check if the property exist (resume old calculation)
- // or of it is new
+ // or of it is new.
dictionary probeDict;
- if (getDict(name, probeDict))
+ if (getDict(typeName, probeDict))
{
probeDict.lookup("Tc") >> Ttc_;
}
@@ -172,7 +172,7 @@ bool Foam::functionObjects::thermoCoupleProbes::write()
dictionary probeDict;
probeDict.add("Tc", Ttc_);
- setProperty(name(), probeDict);
+ setProperty(typeName, probeDict);
return true;
}
diff --git a/tutorials/combustion/fireFoam/LES/compartmentFire/Allclean b/tutorials/combustion/fireFoam/LES/compartmentFire/Allclean
index c983aa5c4cf1ecf902607d503651beb7888839e9..405ac295a36bc8091ba0e8de64407326d7f1fa58 100755
--- a/tutorials/combustion/fireFoam/LES/compartmentFire/Allclean
+++ b/tutorials/combustion/fireFoam/LES/compartmentFire/Allclean
@@ -6,5 +6,6 @@
cleanCase
rm -rf constant/panelRegion/polyMesh
rm -f constant/polyMesh/boundary
+rm -f validation/*.eps
# -----------------------------------------------------------------------------
diff --git a/tutorials/combustion/fireFoam/LES/compartmentFire/constant/boundaryRadiationProperties b/tutorials/combustion/fireFoam/LES/compartmentFire/constant/boundaryRadiationProperties
index f30f0b96b7af9832f6dd9756c6facabde4cc03c4..525a4eb95df5e75f86cddecda9f4919122585867 100644
--- a/tutorials/combustion/fireFoam/LES/compartmentFire/constant/boundaryRadiationProperties
+++ b/tutorials/combustion/fireFoam/LES/compartmentFire/constant/boundaryRadiationProperties
@@ -18,7 +18,7 @@ FoamFile
".*"
{
mode lookup;
- emissivity 1.0;
+ emissivity 0.8;
absorptivity 0.0;
}
diff --git a/tutorials/combustion/fireFoam/LES/compartmentFire/constant/combustionProperties b/tutorials/combustion/fireFoam/LES/compartmentFire/constant/combustionProperties
index e4bfa70b9f8326f78c09dc4b7253a154e90c5fea..d9ca794ff1b3d3bb51f5062b5df1bba759a19380 100644
--- a/tutorials/combustion/fireFoam/LES/compartmentFire/constant/combustionProperties
+++ b/tutorials/combustion/fireFoam/LES/compartmentFire/constant/combustionProperties
@@ -23,7 +23,7 @@ eddyDissipationDiffusionModelCoeffs
{
semiImplicit false;
CEDC 4;
- Cd 6;
+ Cd 4;
}
infinitelyFastChemistryCoeffs
diff --git a/tutorials/combustion/fireFoam/LES/compartmentFire/constant/panelRegion/radiationProperties b/tutorials/combustion/fireFoam/LES/compartmentFire/constant/panelRegion/radiationProperties
index c3723b4087c0c7e4eb76998c68da38af126e9368..68ea708f1fc07d23b81db2bb88705e2597219e55 100755
--- a/tutorials/combustion/fireFoam/LES/compartmentFire/constant/panelRegion/radiationProperties
+++ b/tutorials/combustion/fireFoam/LES/compartmentFire/constant/panelRegion/radiationProperties
@@ -20,13 +20,7 @@ radiation on;
radiationModel opaqueSolid;
-absorptionEmissionModel multiBandSolidAbsorptionEmission;
-
-multiBandSolidAbsorptionEmissionCoeffs
-{
- absorptivity (0 0);
- emissivity (1 1);
-}
+absorptionEmissionModel none;
transmissivityModel none;
diff --git a/tutorials/combustion/fireFoam/LES/compartmentFire/constant/radiationProperties b/tutorials/combustion/fireFoam/LES/compartmentFire/constant/radiationProperties
index 262ba8e50e49f00922ddb1a469a7e76fb8a5fd21..4ca47a820be16e2c29d44c05c6a6a6173122cd6e 100644
--- a/tutorials/combustion/fireFoam/LES/compartmentFire/constant/radiationProperties
+++ b/tutorials/combustion/fireFoam/LES/compartmentFire/constant/radiationProperties
@@ -23,14 +23,14 @@ radiationModel fvDOM;
fvDOMCoeffs
{
- nPhi 4;
+ nPhi 2;
nTheta 4;
- convergence 1e-3;
- maxIter 3;
+ convergence 1e-5;
+ maxIter 5;
}
// Number of flow iterations per radiation iteration
-solverFreq 20;
+solverFreq 15;
absorptionEmissionModel greyMeanAbsorptionEmission;
@@ -44,7 +44,7 @@ constantAbsorptionEmissionCoeffs
greyMeanAbsorptionEmissionCoeffs
{
//lookUpTableFileName "SpeciesTable";
- EhrrCoeff 0.2;
+ EhrrCoeff 0.15;
CO2
{
Tcommon 200; //Common Temp
@@ -64,11 +64,11 @@ greyMeanAbsorptionEmissionCoeffs
hiTcoeffs //coefss for T > Tcommon
(
18.741
- -121.31e3
+ -121.31e3
273.5e6
- -194.05e9
+ -194.05e9
56.31e12
- -5.8169e15
+ -5.8169e15
);
}
@@ -119,10 +119,10 @@ greyMeanAbsorptionEmissionCoeffs
hiTcoeffs
(
6.6334
- -0.0035686
+ -0.0035686
1.6682e-8
2.5611e-10
- -2.6558e-14
+ -2.6558e-14
0
);
}
@@ -145,7 +145,7 @@ greyMeanAbsorptionEmissionCoeffs
);
hiTcoeffs
(
- 0.1
+ 0.01
0
0
0
@@ -173,7 +173,7 @@ greyMeanAbsorptionEmissionCoeffs
);
hiTcoeffs
(
- 0.1
+ 0.01
0
0
0
diff --git a/tutorials/combustion/fireFoam/LES/compartmentFire/constant/turbulenceProperties b/tutorials/combustion/fireFoam/LES/compartmentFire/constant/turbulenceProperties
index b32e0fc2fa6a8cfc5094f591a0208fa4bc77aef1..b457a63123a2aa13f77f47a0fb62f15f7cbc0f33 100644
--- a/tutorials/combustion/fireFoam/LES/compartmentFire/constant/turbulenceProperties
+++ b/tutorials/combustion/fireFoam/LES/compartmentFire/constant/turbulenceProperties
@@ -32,8 +32,7 @@ LES
kEqnCoeffs
{
- Ck 0.074;
- Ce 1.048;
+ Ck 0.06;
}
cubeRootVolCoeffs
diff --git a/tutorials/combustion/fireFoam/LES/compartmentFire/system/controlDict b/tutorials/combustion/fireFoam/LES/compartmentFire/system/controlDict
index bc6ad0d11e1cb9ef8845f98fb89805c1d2b36a0e..5fef5019a69588fb342b3e47d2e47145b40193aa 100644
--- a/tutorials/combustion/fireFoam/LES/compartmentFire/system/controlDict
+++ b/tutorials/combustion/fireFoam/LES/compartmentFire/system/controlDict
@@ -28,7 +28,7 @@ deltaT 0.001;
writeControl adjustableRunTime;
-writeInterval 10;
+writeInterval 20;
purgeWrite 0;
@@ -44,11 +44,11 @@ timePrecision 6;
graphFormat raw;
-runTimeModifiable yes;
+runTimeModifiable no;
adjustTimeStep yes;
-maxCo 1.2;
+maxCo 2;
maxDi 0.25;
@@ -61,7 +61,7 @@ functions
type surfaceFieldValue;
libs ("libfieldFunctionObjects.so");
writeControl timeStep;
- writeInterval 20;
+ writeInterval 200;
log true;
writeFields no;
regionType patch;
@@ -74,8 +74,8 @@ functions
{
type patchProbes;
libs ("libsampling.so");
- writeControl writeTime;
- writeInterval 20;
+ writeControl timeStep;
+ writeInterval 200;
log true;
patchName region0_to_panelRegion_wallPanel;
probeLocations
@@ -91,8 +91,8 @@ functions
{
type patchProbes;
libs ("libsampling.so");
- writeControl writeTime;
- writeInterval 20;
+ writeControl timeStep;
+ writeInterval 200;
log true;
patchName inlet;
probeLocations
@@ -154,8 +154,8 @@ functions
{
type probes;
libs ("libsampling.so");
- writeControl writeTime;
- writeInterval 30;
+ writeControl timeStep;
+ writeInterval 200;
probeLocations
(
(-0.1 0.02 0.0) // Lower Gas
diff --git a/tutorials/combustion/fireFoam/LES/compartmentFire/system/fvSchemes b/tutorials/combustion/fireFoam/LES/compartmentFire/system/fvSchemes
index c3589f3c8b8caeb36f7893ecccc0953d5bf9c8dc..06045750356a2e2caf8347a3b70adb69bc180d54 100644
--- a/tutorials/combustion/fireFoam/LES/compartmentFire/system/fvSchemes
+++ b/tutorials/combustion/fireFoam/LES/compartmentFire/system/fvSchemes
@@ -48,7 +48,7 @@ divSchemes
laplacianSchemes
{
- default Gauss linear uncorrected;
+ default Gauss linear orthogonal;
}
interpolationSchemes
@@ -58,7 +58,7 @@ interpolationSchemes
snGradSchemes
{
- default uncorrected;
+ default orthogonal;
}
fluxRequired
diff --git a/tutorials/combustion/fireFoam/LES/compartmentFire/system/fvSolution b/tutorials/combustion/fireFoam/LES/compartmentFire/system/fvSolution
index 790df096e9589750e7257b1a8275527431472e7c..4700d62060d70688c9b6f67d10740f75fe413cb0 100644
--- a/tutorials/combustion/fireFoam/LES/compartmentFire/system/fvSolution
+++ b/tutorials/combustion/fireFoam/LES/compartmentFire/system/fvSolution
@@ -77,7 +77,7 @@ solvers
PIMPLE
{
momentumPredictor yes;
- nOuterCorrectors 3;
+ nOuterCorrectors 2;
nCorrectors 2;
nNonOrthogonalCorrectors 0;
}
diff --git a/tutorials/combustion/fireFoam/LES/compartmentFire/validation/createGraphs b/tutorials/combustion/fireFoam/LES/compartmentFire/validation/createGraphs
index 4284cbd12a88a2dd38e4befa3793267c77d531b4..3f025efa1b3e3b80fa56b4744977c6d8f71b8606 100755
--- a/tutorials/combustion/fireFoam/LES/compartmentFire/validation/createGraphs
+++ b/tutorials/combustion/fireFoam/LES/compartmentFire/validation/createGraphs
@@ -3,7 +3,7 @@
# ========= |
# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
# \\ / O peration |
-# \\ / A nd | Copyright (C) 2015 OpenFOAM Foundation
+# \\ / A nd | Copyright (C) 2016 OpenCFD Ltd.
# \\/ M anipulation |
#-------------------------------------------------------------------------------
# License
@@ -77,6 +77,8 @@ EXPT="$DATAFILET"
echo $OF
echo $EXPT
+#
+
#createEpsT $OF 2 $EXPT 12 Temperature
#createEpsT $OF 3 $EXPT 10 Temperature
#createEpsT $OF 5 $EXPT 3 Temperature