From 4413f10e9796011a674d5bfafd47f3b6b872f06c Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Wed, 26 Sep 2012 23:49:29 +0100
Subject: [PATCH] Thermodynamics: rationalised the "make" macros for
 chemistrySolvers

---
 .../chemistrySolver/chemistrySolver.H         | 21 -------------------
 .../makeSolidChemistrySolverType.H            |  5 +++++
 .../makeSolidChemistrySolvers.C               | 14 -------------
 3 files changed, 5 insertions(+), 35 deletions(-)

diff --git a/src/thermophysicalModels/chemistryModel/chemistrySolver/chemistrySolver/chemistrySolver.H b/src/thermophysicalModels/chemistryModel/chemistrySolver/chemistrySolver/chemistrySolver.H
index 5e8dcff289..f8348150b0 100644
--- a/src/thermophysicalModels/chemistryModel/chemistrySolver/chemistrySolver/chemistrySolver.H
+++ b/src/thermophysicalModels/chemistryModel/chemistrySolver/chemistrySolver/chemistrySolver.H
@@ -112,7 +112,6 @@ public:
     );
 
 
-
 #define makeChemistrySolverType(SS, ODEChem, Comp, Thermo)                    \
                                                                               \
     typedef SS<ODEChem<Comp, Thermo> > SS##ODEChem##Comp##Thermo;             \
@@ -132,26 +131,6 @@ public:
     );
 
 
-#define makeSolidChemistrySolverType(SS, ODEChem, Comp, SThermo, GThermo)     \
-                                                                              \
-    typedef SS<ODEChem<Comp, SThermo, GThermo> >                              \
-        SS##ODEChem##Comp##SThermo##GThermo;                                  \
-                                                                              \
-    defineTemplateTypeNameAndDebugWithName                                    \
-    (                                                                         \
-        SS##ODEChem##Comp##SThermo##GThermo,                                  \
-        #SS"<"#ODEChem"<"#Comp","#SThermo","#GThermo">>",                     \
-        0                                                                     \
-    );                                                                        \
-                                                                              \
-    addToRunTimeSelectionTable                                                \
-    (                                                                         \
-        Comp,                                                                 \
-        SS##ODEChem##Comp##SThermo##GThermo,                                  \
-        fvMesh                                                                \
-    );
-
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
diff --git a/src/thermophysicalModels/solidChemistryModel/solidChemistrySolver/makeSolidChemistrySolverType.H b/src/thermophysicalModels/solidChemistryModel/solidChemistrySolver/makeSolidChemistrySolverType.H
index f528bc50a5..39e49524e4 100644
--- a/src/thermophysicalModels/solidChemistryModel/solidChemistrySolver/makeSolidChemistrySolverType.H
+++ b/src/thermophysicalModels/solidChemistryModel/solidChemistrySolver/makeSolidChemistrySolverType.H
@@ -41,6 +41,11 @@ namespace Foam
 
 #define makeSolidChemistrySolverType(SS, ODEChem, Comp, SThermo, GThermo)     \
                                                                               \
+    typedef ODESolidChemistryModel<Comp, SThermo, GThermo>                    \
+        ODESolidChemistryModel##Comp##SThermo##GThermo;                       \
+                                                                              \
+    makeChemistrySolver(ODESolidChemistryModel##Comp##SThermo##GThermo)       \
+                                                                              \
     typedef SS<ODEChem<Comp, SThermo, GThermo> >                              \
         SS##ODEChem##Comp##SThermo##GThermo;                                  \
                                                                               \
diff --git a/src/thermophysicalModels/solidChemistryModel/solidChemistrySolver/makeSolidChemistrySolvers.C b/src/thermophysicalModels/solidChemistryModel/solidChemistrySolver/makeSolidChemistrySolvers.C
index cfdb9c2d53..64cc731266 100644
--- a/src/thermophysicalModels/solidChemistryModel/solidChemistrySolver/makeSolidChemistrySolvers.C
+++ b/src/thermophysicalModels/solidChemistryModel/solidChemistrySolver/makeSolidChemistrySolvers.C
@@ -27,8 +27,6 @@ License
 #include "solidThermoPhysicsTypes.H"
 #include "thermoPhysicsTypes.H"
 
-#include "chemistrySolver.H"
-
 #include "ODESolidChemistryModel.H"
 #include "solidChemistryModel.H"
 
@@ -38,12 +36,6 @@ License
 
 namespace Foam
 {
-    typedef ODESolidChemistryModel
-        <solidChemistryModel, hConstSolidThermoPhysics, gasThermoPhysics>
-            solidODEChemistryConstThermo;
-
-    makeChemistrySolver(solidODEChemistryConstThermo)
-
     makeSolidChemistrySolverType
     (
         ode,
@@ -53,12 +45,6 @@ namespace Foam
         gasThermoPhysics
     )
 
-    typedef ODESolidChemistryModel
-        <solidChemistryModel, hExponentialSolidThermoPhysics, gasThermoPhysics>
-            solidODEChemistryExpThermo;
-
-    makeChemistrySolver(solidODEChemistryExpThermo)
-
     makeSolidChemistrySolverType
     (
         ode,