[Kinetics] Use BulkRate<> template for CustomFunc1Rate

Author: ischoegl

include/cantera/kinetics/BulkRate.h

@@ -10,6 +10,7 @@
 #define CT_BULKRATE_H
 
 #include "Arrhenius.h"
+#include "Custom.h"
 
 namespace Cantera
 {
@@ -40,6 +41,7 @@ class BulkRate : public RateType
 using ArrheniusRate = BulkRate<Arrhenius3, ReactionData>;
 using TwoTempPlasmaRate = BulkRate<TwoTempPlasma, TwoTempPlasmaData>;
 using BlowersMaselRate = BulkRate<BlowersMasel, BulkData>;
+using CustomFunc1Rate = BulkRate<CustomFunc1Base, ReactionData>;
 
 
 class ThreeBodyBase

include/cantera/kinetics/Custom.h

@@ -33,24 +33,14 @@ class Func1;
  * @warning This class is an experimental part of the %Cantera API and
  *    may be changed or removed without notice.
  */
-class CustomFunc1Rate final : public ReactionRate
+class CustomFunc1Base : public ReactionRate
 {
 public:
-    CustomFunc1Rate();
-    CustomFunc1Rate(const AnyMap& node, const UnitStack& rate_units)
-        : CustomFunc1Rate()
-    {
-        setParameters(node, rate_units);
-    }
-
-    unique_ptr<MultiRateBase> newMultiRate() const override {
-        return unique_ptr<MultiRateBase>(new MultiRate<CustomFunc1Rate, ReactionData>);
-    }
+    CustomFunc1Base() = default;
 
     const std::string type() const override { return "custom-rate-function"; }
 
     void getParameters(AnyMap& rateNode, const Units& rate_units=Units(0.)) const;
-    using ReactionRate::getParameters;
 
     //! Update information specific to reaction
     /*!
@@ -66,7 +56,7 @@ class CustomFunc1Rate final : public ReactionRate
     void setRateFunction(shared_ptr<Func1> f);
 
 protected:
-    shared_ptr<Func1> m_ratefunc;
+    shared_ptr<Func1> m_ratefunc = 0;
 };
 
 

src/kinetics/Custom.cpp

@@ -9,27 +9,22 @@
 namespace Cantera
 {
 
-CustomFunc1Rate::CustomFunc1Rate()
-    : m_ratefunc(0)
-{
-}
-
-void CustomFunc1Rate::setRateFunction(shared_ptr<Func1> f)
+void CustomFunc1Base::setRateFunction(shared_ptr<Func1> f)
 {
     m_ratefunc = f;
 }
 
-double CustomFunc1Rate::evalFromStruct(const ReactionData& shared_data) const
+double CustomFunc1Base::evalFromStruct(const ReactionData& shared_data) const
 {
     if (m_ratefunc) {
         return m_ratefunc->eval(shared_data.temperature);
     }
     return NAN;
 }
 
-void CustomFunc1Rate::getParameters(AnyMap& rateNode, const Units& rate_units) const
+void CustomFunc1Base::getParameters(AnyMap& rateNode, const Units& rate_units) const
 {
-    throw NotImplementedError("CustomFunc1Rate::getParameters",
+    throw NotImplementedError("CustomFunc1Base::getParameters",
                               "Not implemented by '{}' object.", type());
 }