From ab40ddaaf3cbffa6c0e081f59bd0edd8a49e3ad2 Mon Sep 17 00:00:00 2001
From: sergio <sergio>
Date: Mon, 21 Nov 2016 07:36:05 -0800
Subject: [PATCH] Adding fireCompartment tutorial for new pyrolysis thermo,
 thermocouple FO and EDC combustion model

---
 .../thermoCoupleProbes/thermoCoupleProbes.C   |  6 ++---
 .../fireFoam/LES/compartmentFire/Allclean     |  1 +
 .../constant/boundaryRadiationProperties      |  2 +-
 .../constant/combustionProperties             |  2 +-
 .../constant/panelRegion/radiationProperties  |  8 +------
 .../constant/radiationProperties              | 24 +++++++++----------
 .../constant/turbulenceProperties             |  3 +--
 .../LES/compartmentFire/system/controlDict    | 20 ++++++++--------
 .../LES/compartmentFire/system/fvSchemes      |  4 ++--
 .../LES/compartmentFire/system/fvSolution     |  2 +-
 .../compartmentFire/validation/createGraphs   |  4 +++-
 11 files changed, 36 insertions(+), 40 deletions(-)

diff --git a/src/functionObjects/utilities/thermoCoupleProbes/thermoCoupleProbes.C b/src/functionObjects/utilities/thermoCoupleProbes/thermoCoupleProbes.C
index f247a9528ee..740856a5a8d 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 c983aa5c4cf..405ac295a36 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 f30f0b96b7a..525a4eb95df 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 e4bfa70b9f8..d9ca794ff1b 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 c3723b4087c..68ea708f1fc 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 262ba8e50e4..4ca47a820be 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 b32e0fc2fa6..b457a63123a 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 bc6ad0d11e1..5fef5019a69 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 c3589f3c8b8..06045750356 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 790df096e95..4700d62060d 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 4284cbd12a8..3f025efa1b3 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
-- 
GitLab