From 06d573d69a7d6f05590845d51b778a6925961e24 Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Mon, 8 Oct 2012 16:13:50 +0100
Subject: [PATCH] solidChemistryModel: Reorganised input of thermo-physical
 data for the gases

---
 .../ODESolidChemistryModel.C                  |  6 +--
 .../solidChemistryModelNew.C                  |  2 +-
 .../reactingSolidMixture.C                    |  2 +-
 .../constant/panelRegion/chemistryProperties  | 37 -------------------
 .../panelRegion/thermophysicalProperties      | 36 ++++++++++++++++++
 5 files changed, 41 insertions(+), 42 deletions(-)

diff --git a/src/thermophysicalModels/solidChemistryModel/ODESolidChemistryModel/ODESolidChemistryModel.C b/src/thermophysicalModels/solidChemistryModel/ODESolidChemistryModel/ODESolidChemistryModel.C
index 63b3fd0dd3..6823a603bd 100644
--- a/src/thermophysicalModels/solidChemistryModel/ODESolidChemistryModel/ODESolidChemistryModel.C
+++ b/src/thermophysicalModels/solidChemistryModel/ODESolidChemistryModel/ODESolidChemistryModel.C
@@ -41,7 +41,7 @@ ODESolidChemistryModel
     pyrolisisGases_
     (
         mesh.lookupObject<dictionary>
-            ("chemistryProperties").lookup("species")
+            ("thermophysicalProperties").lookup("gaseousSpecies")
     ),
     reactions_
     (
@@ -183,8 +183,8 @@ ODESolidChemistryModel
         dictionary thermoDict =
             mesh.lookupObject<dictionary>
             (
-                "chemistryProperties"
-            ).subDict(pyrolisisGases_[gasI]);
+                "thermophysicalProperties"
+            ).subDict(pyrolisisGases_[gasI] + "Coeffs");
 
         gasThermo_.set
         (
diff --git a/src/thermophysicalModels/solidChemistryModel/solidChemistryModel/solidChemistryModelNew.C b/src/thermophysicalModels/solidChemistryModel/solidChemistryModel/solidChemistryModelNew.C
index f023a6ae19..ca97c91ace 100644
--- a/src/thermophysicalModels/solidChemistryModel/solidChemistryModel/solidChemistryModelNew.C
+++ b/src/thermophysicalModels/solidChemistryModel/solidChemistryModel/solidChemistryModelNew.C
@@ -92,7 +92,7 @@ Foam::autoPtr<Foam::solidChemistryModel> Foam::solidChemistryModel::New
       + word(solidThermoTypeDict.lookup("energy")) + ">"
     );
 
-    const dictionary& gasThermoTypeDict(chemistryDict.subDict("gasThermoType"));
+    const dictionary& gasThermoTypeDict(thermoDict.subDict("gasThermoType"));
     word gasThermoTypeName
     (
         word(gasThermoTypeDict.lookup("transport")) + '<'
diff --git a/src/thermophysicalModels/solidThermo/mixtures/reactingSolidMixture/reactingSolidMixture.C b/src/thermophysicalModels/solidThermo/mixtures/reactingSolidMixture/reactingSolidMixture.C
index bc498e21da..eb5d1f3c2b 100644
--- a/src/thermophysicalModels/solidThermo/mixtures/reactingSolidMixture/reactingSolidMixture.C
+++ b/src/thermophysicalModels/solidThermo/mixtures/reactingSolidMixture/reactingSolidMixture.C
@@ -48,7 +48,7 @@ Foam::reactingSolidMixture<ThermoSolidType>::reactingSolidMixture
         (
             this->components_,
             mesh.lookupObject<dictionary>
-                ("chemistryProperties").lookup("species")
+                ("thermophysicalProperties").lookup("gaseousSpecies")
         )
     )
 {}
diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/panelRegion/chemistryProperties b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/panelRegion/chemistryProperties
index cd6a5ded0f..5051adef2c 100644
--- a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/panelRegion/chemistryProperties
+++ b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/panelRegion/chemistryProperties
@@ -23,15 +23,6 @@ chemistryType
 
 chemistry           on;
 
-gasThermoType
-{
-    transport       sutherland;
-    thermo          janaf;
-    equationOfState perfectGas;
-    specie          specie;
-    energy          sensibleEnthalpy;
-}
-
 initialChemicalTimeStep 1e-07;
 
 odeCoeffs
@@ -40,34 +31,6 @@ odeCoeffs
     eps             0.05;
 }
 
-species
-(
-    gas
-);
-
-gas
-{
-    specie
-    {
-        nMoles          1;
-        molWeight       18.0153;
-    }
-    thermodynamics
-    {
-        Tlow            200;
-        Thigh           5000;
-        Tcommon         1000;
-        highCpCoeffs    ( 2.67215 0.00305629 -8.73026e-07 1.20100e-10 -6.39162e-15 -29899.2 6.86282 );
-        lowCpCoeffs     ( 3.38684 0.00347498 -6.35470e-06 6.96858e-09 -2.50659e-12 -30208.1 2.59023 );
-    }
-    transport
-    {
-        As              1.67212e-06;
-        Ts              170.672;
-    }
-}
-
-
 reactions
 (
     irreversibleSolidArrheniusReaction
diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/panelRegion/thermophysicalProperties b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/panelRegion/thermophysicalProperties
index 31d5e07f8b..6f70cdd8c8 100644
--- a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/panelRegion/thermophysicalProperties
+++ b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/panelRegion/thermophysicalProperties
@@ -25,11 +25,25 @@ thermoType
     energy          sensibleEnthalpy;
 }
 
+gasThermoType
+{
+    transport       sutherland;
+    thermo          janaf;
+    equationOfState perfectGas;
+    specie          specie;
+    energy          sensibleEnthalpy;
+}
+
 solidComponents
 (
     v char
 );
 
+gaseousSpecies
+(
+    gas
+);
+
 vCoeffs
 {
     specie
@@ -74,5 +88,27 @@ charCoeffs
     }
 };
 
+gasCoeffs
+{
+    specie
+    {
+        nMoles          1;
+        molWeight       18.0153;
+    }
+    thermodynamics
+    {
+        Tlow            200;
+        Thigh           5000;
+        Tcommon         1000;
+        highCpCoeffs    ( 2.67215 0.00305629 -8.73026e-07 1.20100e-10 -6.39162e-15 -29899.2 6.86282 );
+        lowCpCoeffs     ( 3.38684 0.00347498 -6.35470e-06 6.96858e-09 -2.50659e-12 -30208.1 2.59023 );
+    }
+    transport
+    {
+        As              1.67212e-06;
+        Ts              170.672;
+    }
+}
+
 
 // ************************************************************************* //