From 9ea79303b720a6314e8e68d0fd95d4ce6ee81bd1 Mon Sep 17 00:00:00 2001
From: Sergio Ferraris <sergio@alex.opencfd.co.uk>
Date: Thu, 11 Apr 2013 11:12:00 +0100
Subject: [PATCH] ENH: Changing typeName for solidChemistryModel in dictionary

---
 .../solidChemistryModel/makeSolidChemistryModel.H             | 3 ++-
 .../solidChemistrySolver/makeSolidChemistrySolverType.H       | 4 ++--
 .../constant/panelRegion/chemistryProperties                  | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/thermophysicalModels/solidChemistryModel/makeSolidChemistryModel.H b/src/thermophysicalModels/solidChemistryModel/makeSolidChemistryModel.H
index 510897f541..febcc0ac69 100644
--- a/src/thermophysicalModels/solidChemistryModel/makeSolidChemistryModel.H
+++ b/src/thermophysicalModels/solidChemistryModel/makeSolidChemistryModel.H
@@ -48,7 +48,8 @@ namespace Foam
     defineTemplateTypeNameAndDebugWithName                                    \
     (                                                                         \
         sChemistryl##Comp##SThermo,                                           \
-        (#sChemistry"<"#Comp"," + SThermo::typeName() + ">").c_str(),         \
+        (word(sChemistry::typeName_()) + "<"#Comp"," + SThermo::typeName() +  \
+        + ">").c_str(),                                                       \
         0                                                                     \
     );                                                                        \
                                                                               \
diff --git a/src/thermophysicalModels/solidChemistryModel/solidChemistrySolver/makeSolidChemistrySolverType.H b/src/thermophysicalModels/solidChemistryModel/solidChemistrySolver/makeSolidChemistrySolverType.H
index 3f24e11e4a..734d510831 100644
--- a/src/thermophysicalModels/solidChemistryModel/solidChemistrySolver/makeSolidChemistrySolverType.H
+++ b/src/thermophysicalModels/solidChemistryModel/solidChemistrySolver/makeSolidChemistrySolverType.H
@@ -47,8 +47,8 @@ namespace Foam
     defineTemplateTypeNameAndDebugWithName                                    \
     (                                                                         \
         SS##Schem##Comp##SThermo##GThermo,                                    \
-        (#SS"<"#Schem"<"#Comp"," + SThermo::typeName() + ","                  \
-      + GThermo::typeName() + ">>").c_str(),                                  \
+        (#SS"<" + word(Schem::typeName_()) +"<"#Comp"," + SThermo::typeName() \
+        + ","  + GThermo::typeName() + ">>").c_str(),                         \
         0                                                                     \
     );                                                                        \
                                                                               \
diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/panelRegion/chemistryProperties b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/panelRegion/chemistryProperties
index dd30353e69..9f8ecdd196 100644
--- a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/panelRegion/chemistryProperties
+++ b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/panelRegion/chemistryProperties
@@ -18,7 +18,7 @@ FoamFile
 chemistryType
 {
     chemistrySolver   ode;
-    chemistryThermo   pyrolysisChemistryModel;
+    chemistryThermo   pyrolysis;
 }
 
 chemistry           on;