COMP: macros for non-templated chemistry readers

src/thermophysicalModels/reactionThermo/chemistryReaders/chemistryReader/chemistryReader.H

@@ -122,28 +122,24 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #define makeChemistryReader(Thermo)                                           \
-                                                                              \
-defineTemplateTypeNameAndDebug                                                \
-(                                                                             \
-    chemistryReader<Thermo>,                                                  \
-    0                                                                         \
-);                                                                            \
-                                                                              \
-defineTemplateRunTimeSelectionTable(chemistryReader<Thermo>, dictionary);
+    defineTemplateTypeNameAndDebug(chemistryReader<Thermo>, 0);               \
+    defineTemplateRunTimeSelectionTable(chemistryReader<Thermo>, dictionary);
 
 
 #define makeChemistryReaderType(SS, Thermo)                                   \
-                                                                              \
     defineNamedTemplateTypeNameAndDebug(SS<Thermo>, 0);                       \
-                                                                              \
     chemistryReader<Thermo>::adddictionaryConstructorToTable<SS<Thermo> >     \
         add##SS##Thermo##ConstructorToTable_;
 
 
 #define addChemistryReaderType(SS, Thermo)                                    \
-                                                                              \
     defineNamedTemplateTypeNameAndDebug(SS, 0);                               \
-                                                                              \
+    chemistryReader<Thermo>::adddictionaryConstructorToTable<SS>              \
+        add##SS##Thermo##ConstructorToTable_;
+
+
+#define addNonTemplatedChemistryReaderType(SS, Thermo)                        \
+    defineTypeNameAndDebug(SS, 0);                                            \
     chemistryReader<Thermo>::adddictionaryConstructorToTable<SS>              \
         add##SS##Thermo##ConstructorToTable_;
 

src/thermophysicalModels/reactionThermo/chemistryReaders/chemkinReader/chemkinReader.C

@@ -45,8 +45,9 @@ License
 
 namespace Foam
 {
-    addChemistryReaderType(chemkinReader, gasThermoPhysics);
-};
+    addNonTemplatedChemistryReaderType(chemkinReader, gasThermoPhysics);
+}
+
 
 /* * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * */