Mark remaining legacy objects with '2' suffix

Cantera · Jan 30, 2022 · a1c4b5c · a1c4b5c
1 parent c60e4a8
commit a1c4b5c
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/include/cantera/kinetics/GasKinetics.h b/include/cantera/kinetics/GasKinetics.h
@@ -203,7 +203,7 @@ class GasKinetics : public BulkKinetics
     //! @deprecated To be removed after Cantera 2.6 (replaced by MultiRate approach)
     void addThreeBodyReaction(ThreeBodyReaction2& r);
     //! @deprecated To be removed after Cantera 2.6 (replaced by MultiRate approach)
-    void addFalloffReaction(FalloffReaction& r);
+    void addFalloffReaction(FalloffReaction2& r);
     //! @deprecated To be removed after Cantera 2.6 (replaced by MultiRate approach)
     void addPlogReaction(PlogReaction2& r);
     //! @deprecated To be removed after Cantera 2.6 (replaced by MultiRate approach)
@@ -212,7 +212,7 @@ class GasKinetics : public BulkKinetics
     //! @deprecated To be removed after Cantera 2.6 (replaced by MultiRate approach)
     void modifyThreeBodyReaction(size_t i, ThreeBodyReaction2& r);
     //! @deprecated To be removed after Cantera 2.6 (replaced by MultiRate approach)
-    void modifyFalloffReaction(size_t i, FalloffReaction& r);
+    void modifyFalloffReaction(size_t i, FalloffReaction2& r);
     //! @deprecated To be removed after Cantera 2.6 (replaced by MultiRate approach)
     void modifyPlogReaction(size_t i, PlogReaction2& r);
     //! @deprecated To be removed after Cantera 2.6 (replaced by MultiRate approach)

diff --git a/src/kinetics/GasKinetics.cpp b/src/kinetics/GasKinetics.cpp
@@ -602,7 +602,7 @@ bool GasKinetics::addReaction(shared_ptr<Reaction> r, bool resize)
     return true;
 }
 
-void GasKinetics::addFalloffReaction(FalloffReaction& r)
+void GasKinetics::addFalloffReaction(FalloffReaction2& r)
 {
     // install high and low rate coeff calculators and extend the high and low
     // rate coeff value vectors
@@ -695,7 +695,7 @@ void GasKinetics::modifyThreeBodyReaction(size_t i, ThreeBodyReaction2& r)
     m_rates.replace(i, r.rate);
 }
 
-void GasKinetics::modifyFalloffReaction(size_t i, FalloffReaction& r)
+void GasKinetics::modifyFalloffReaction(size_t i, FalloffReaction2& r)
 {
     size_t iFall = m_rfallindx[i];
     m_falloff_high_rates.replace(iFall, r.high_rate);

diff --git a/src/kinetics/ReactionFactory.cpp b/src/kinetics/ReactionFactory.cpp
@@ -30,7 +30,7 @@ ReactionFactory::ReactionFactory()
 
     // register elementary reactions (old framework)
     reg("elementary-legacy", [](const AnyMap& node, const Kinetics& kin) {
-        ElementaryReaction* R = new ElementaryReaction2();
+        ElementaryReaction2* R = new ElementaryReaction2();
         if (!node.empty()) {
             setupElementaryReaction(*R, node, kin);
         }
@@ -46,7 +46,7 @@ ReactionFactory::ReactionFactory()
 
     // register three-body reactions (old framework)
     reg("three-body-legacy", [](const AnyMap& node, const Kinetics& kin) {
-        ThreeBodyReaction* R = new ThreeBodyReaction2();
+        ThreeBodyReaction2* R = new ThreeBodyReaction2();
         if (!node.empty()) {
             setupThreeBodyReaction(*R, node, kin);
         }
@@ -70,7 +70,7 @@ ReactionFactory::ReactionFactory()
 
     // register falloff reactions
     reg("chemically-activated-legacy", [](const AnyMap& node, const Kinetics& kin) {
-        FalloffReaction2* R = new ChemicallyActivatedReaction();
+        FalloffReaction2* R = new ChemicallyActivatedReaction2();
         if (!node.empty()) {
             setupFalloffReaction(*R, node, kin);
         }
@@ -88,7 +88,7 @@ ReactionFactory::ReactionFactory()
 
     // register pressure-dependent-Arrhenius reactions (old framework)
     reg("pressure-dependent-Arrhenius-legacy", [](const AnyMap& node, const Kinetics& kin) {
-        PlogReaction* R = new PlogReaction2();
+        PlogReaction2* R = new PlogReaction2();
         if (!node.empty()) {
             setupPlogReaction(*R, node, kin);
         }
@@ -101,7 +101,7 @@ ReactionFactory::ReactionFactory()
     });
     addAlias("Chebyshev", "chebyshev");
     reg("Chebyshev-legacy", [](const AnyMap& node, const Kinetics& kin) {
-        ChebyshevReaction* R = new ChebyshevReaction2();
+        ChebyshevReaction2* R = new ChebyshevReaction2();
         if (!node.empty()) {
             setupChebyshevReaction(*R, node, kin);
         }
@@ -188,8 +188,8 @@ ReactionFactoryXML::ReactionFactoryXML()
 
     // register falloff reactions
     reg("chemically-activated-legacy", [](const XML_Node& node) {
-        Reaction* R = new ChemicallyActivatedReaction();
-        setupChemicallyActivatedReaction(*(ChemicallyActivatedReaction*)R, node);
+        Reaction* R = new ChemicallyActivatedReaction2();
+        setupChemicallyActivatedReaction(*(ChemicallyActivatedReaction2*)R, node);
         return R;
     });
     addAlias("chemically-activated-legacy", "chemically-activated");