From 21b3d19575ca622bb8a68df7424815d69bb2e47b Mon Sep 17 00:00:00 2001
From: Henry Weller <http://openfoam.org>
Date: Fri, 15 Jun 2018 16:15:42 +0100
Subject: [PATCH] thermophysicalModels::Reaction: Refactored to remove
 unnecessary solid reaction specific functions

---
 .../solvers/combustion/fireFoam/Make/options  |  1 +
 .../pyrolysisChemistryModel.C                 | 16 +++++++++---
 .../reaction/Reactions/Reaction/Reaction.C    | 26 -------------------
 .../reaction/Reactions/Reaction/Reaction.H    |  9 -------
 4 files changed, 14 insertions(+), 38 deletions(-)

diff --git a/applications/solvers/combustion/fireFoam/Make/options b/applications/solvers/combustion/fireFoam/Make/options
index 2c5162642..b50245d7e 100644
--- a/applications/solvers/combustion/fireFoam/Make/options
+++ b/applications/solvers/combustion/fireFoam/Make/options
@@ -6,6 +6,7 @@ EXE_INC = \
     -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
     -I$(LIB_SRC)/lagrangian/distributionModels/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
+    -I$(LIB_SRC)/thermophysicalModels/solidSpecie/lnInclude \
     -I$(LIB_SRC)/transportModels/compressible/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/solidThermo/lnInclude \
diff --git a/src/thermophysicalModels/solidChemistryModel/pyrolysisChemistryModel/pyrolysisChemistryModel.C b/src/thermophysicalModels/solidChemistryModel/pyrolysisChemistryModel/pyrolysisChemistryModel.C
index 6fea87184..bfba92e00 100644
--- a/src/thermophysicalModels/solidChemistryModel/pyrolysisChemistryModel/pyrolysisChemistryModel.C
+++ b/src/thermophysicalModels/solidChemistryModel/pyrolysisChemistryModel/pyrolysisChemistryModel.C
@@ -37,7 +37,13 @@ pyrolysisChemistryModel
 )
 :
     solidChemistryModel<CompType, SolidThermo>(thermo),
-    pyrolisisGases_(this->reactions_[0].gasSpecies()),
+    pyrolisisGases_
+    (
+        dynamic_cast<const SolidReaction<SolidThermo>&>
+        (
+            this->reactions_[0]
+        ).gasSpecies()
+    ),
     gasThermo_(pyrolisisGases_.size()),
     nGases_(pyrolisisGases_.size()),
     nSpecie_(this->Ys_.size() + nGases_),
@@ -156,7 +162,7 @@ pyrolysisChemistryModel
     Info<< indent << "Number of gases = " << nGases_ << nl;
     forAll(this->reactions_, i)
     {
-        Info<< dynamic_cast<const SolidReaction<SolidThermo>& >
+        Info<< dynamic_cast<const SolidReaction<SolidThermo>&>
         (
             this->reactions_[i]
         ) << nl;
@@ -193,7 +199,11 @@ pyrolysisChemistryModel<CompType, SolidThermo, GasThermo>::omega
 
     forAll(this->reactions_, i)
     {
-        const Reaction<SolidThermo>& R = this->reactions_[i];
+        const SolidReaction<SolidThermo>& R =
+            dynamic_cast<const SolidReaction<SolidThermo>&>
+            (
+                this->reactions_[i]
+            );
 
         scalar omegai = omega
         (
diff --git a/src/thermophysicalModels/specie/reaction/Reactions/Reaction/Reaction.C b/src/thermophysicalModels/specie/reaction/Reactions/Reaction/Reaction.C
index f17036f37..c33789ec9 100644
--- a/src/thermophysicalModels/specie/reaction/Reactions/Reaction/Reaction.C
+++ b/src/thermophysicalModels/specie/reaction/Reactions/Reaction/Reaction.C
@@ -806,30 +806,4 @@ const Foam::speciesTable& Foam::Reaction<ReactionThermo>::species() const
 }
 
 
-template<class ReactionThermo>
-const Foam::speciesTable& Foam::Reaction<ReactionThermo>::gasSpecies() const
-{
-    NotImplemented;
-    return NullObjectRef<speciesTable>();
-}
-
-
-template<class ReactionThermo>
-const Foam::List<typename Foam::Reaction<ReactionThermo>::specieCoeffs>&
-Foam::Reaction<ReactionThermo>::glhs() const
-{
-    NotImplemented;
-    return NullObjectRef<List<specieCoeffs>>();
-}
-
-
-template<class ReactionThermo>
-const Foam::List<typename Foam::Reaction<ReactionThermo>::specieCoeffs>&
-Foam::Reaction<ReactionThermo>::grhs() const
-{
-    NotImplemented;
-    return NullObjectRef<List<specieCoeffs>>();
-}
-
-
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/specie/reaction/Reactions/Reaction/Reaction.H b/src/thermophysicalModels/specie/reaction/Reactions/Reaction/Reaction.H
index dce5e7688..8a3fa54c5 100644
--- a/src/thermophysicalModels/specie/reaction/Reactions/Reaction/Reaction.H
+++ b/src/thermophysicalModels/specie/reaction/Reactions/Reaction/Reaction.H
@@ -249,18 +249,9 @@ public:
             //- Access to the components of the right hand side
             inline const List<specieCoeffs>& rhs() const;
 
-            //- Access to the gas components of the left hand side
-            virtual const List<specieCoeffs>& grhs() const;
-
-            //- Access to the gas components of the right hand side
-            virtual const List<specieCoeffs>& glhs() const;
-
             //- Access to specie list
             const speciesTable& species() const;
 
-            //- Access to gas specie list
-            virtual const speciesTable& gasSpecies() const;
-
             //- Construct the left- and right-hand-side reaction coefficients
             void setLRhs
             (