makeSolidChemistryModel: Separate solid-only and solid-gas instantiation macros

Avoids duplicate typedefs.
Thanks to Bruno Santo for patch
Resolves bug-report http://www.openfoam.org/mantisbt/view.php?id=1694

src/thermophysicalModels/solidChemistryModel/basicSolidChemistryModel/basicSolidChemistryModels.C

@@ -39,8 +39,17 @@ Description
 #include "thermoPhysicsTypes.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// hConstSolidThermoPhysics
 
 makeSolidChemistryModel
+(
+    solidChemistryModel,
+    pyrolysisChemistryModel,
+    basicSolidChemistryModel,
+    hConstSolidThermoPhysics
+);
+
+makeSolidGasChemistryModel
 (
     solidChemistryModel,
     pyrolysisChemistryModel,
@@ -49,7 +58,19 @@ makeSolidChemistryModel
     gasHThermoPhysics
 );
 
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// hPowerSolidThermoPhysics
+
 makeSolidChemistryModel
+(
+    solidChemistryModel,
+    pyrolysisChemistryModel,
+    basicSolidChemistryModel,
+    hPowerSolidThermoPhysics
+);
+
+makeSolidGasChemistryModel
 (
     solidChemistryModel,
     pyrolysisChemistryModel,
@@ -58,7 +79,19 @@ makeSolidChemistryModel
     gasHThermoPhysics
 );
 
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// hExpKappaConstSolidThermoPhysics
+
 makeSolidChemistryModel
+(
+    solidChemistryModel,
+    pyrolysisChemistryModel,
+    basicSolidChemistryModel,
+    hExpKappaConstSolidThermoPhysics
+);
+
+makeSolidGasChemistryModel
 (
     solidChemistryModel,
     pyrolysisChemistryModel,

src/thermophysicalModels/solidChemistryModel/makeSolidChemistryModel.H

@@ -34,21 +34,24 @@ Description
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#define makeSolidChemistryModel(sChemistry, SS, Comp, SThermo, GThermo)       \
+#define makeSolidChemistryModel(sChemistry, SS, Comp, SThermo)                \
-                                                                              \
-    typedef Foam::SS<Foam::Comp, Foam::SThermo, Foam::GThermo>                \
-        SS##Comp##SThermo##GThermo;                                           \
                                                                               \
     typedef Foam::sChemistry<Foam::Comp, Foam::SThermo>                       \
-        sChemistryl##Comp##SThermo;                                           \
+        sChemistry##Comp##SThermo;                                            \
                                                                               \
     defineTemplateTypeNameAndDebugWithName                                    \
     (                                                                         \
-        sChemistryl##Comp##SThermo,                                           \
+        sChemistry##Comp##SThermo,                                            \
-        (Foam::word(sChemistryl##Comp##SThermo::typeName_()) + "<"#Comp","    \
+        (Foam::word(sChemistry##Comp##SThermo::typeName_()) + "<"#Comp","     \
         + SThermo::typeName() + ">").c_str(),                                 \
         0                                                                     \
-    );                                                                        \
+    );
+
+
+#define makeSolidGasChemistryModel(sChemistry, SS, Comp, SThermo, GThermo)    \
+                                                                              \
+    typedef Foam::SS<Foam::Comp, Foam::SThermo, Foam::GThermo>                \
+        SS##Comp##SThermo##GThermo;                                           \
                                                                               \
     defineTemplateTypeNameAndDebugWithName                                    \
     (                                                                         \