From 40cf72f0c5cec34b2cc5399097490af21ba32616 Mon Sep 17 00:00:00 2001 From: Ray Speth Date: Tue, 24 Jan 2023 14:49:21 -0500 Subject: [PATCH] more CT_API --- include/cantera/kinetics/Falloff.h | 16 +++------------- include/cantera/kinetics/PlogRate.h | 6 ++---- include/cantera/kinetics/TwoTempPlasmaRate.h | 4 +--- src/kinetics/Falloff.cpp | 15 +++++++++++++++ src/kinetics/PlogRate.cpp | 6 ++++++ src/kinetics/TwoTempPlasmaRate.cpp | 6 ++++++ 6 files changed, 33 insertions(+), 20 deletions(-) diff --git a/include/cantera/kinetics/Falloff.h b/include/cantera/kinetics/Falloff.h index 5d8395a8c35..f5d8916ab2c 100644 --- a/include/cantera/kinetics/Falloff.h +++ b/include/cantera/kinetics/Falloff.h @@ -286,20 +286,10 @@ class LindemannRate final : public FalloffRate public: LindemannRate() = default; - LindemannRate(const AnyMap& node, const UnitStack& rate_units={}) - : LindemannRate() - { - setParameters(node, rate_units); - } + LindemannRate(const AnyMap& node, const UnitStack& rate_units={}); - LindemannRate( - const ArrheniusRate& low, const ArrheniusRate& high, const vector_fp& c) - : LindemannRate() - { - m_lowRate = low; - m_highRate = high; - setFalloffCoeffs(c); - } + LindemannRate(const ArrheniusRate& low, const ArrheniusRate& high, + const vector_fp& c); unique_ptr newMultiRate() const override{ return unique_ptr( diff --git a/include/cantera/kinetics/PlogRate.h b/include/cantera/kinetics/PlogRate.h index 287d1ab2d3e..81be503e0e5 100644 --- a/include/cantera/kinetics/PlogRate.h +++ b/include/cantera/kinetics/PlogRate.h @@ -76,14 +76,12 @@ class PlogRate final : public ReactionRate { public: //! Default constructor. - PlogRate(); + CT_API PlogRate(); //! Constructor from Arrhenius rate expressions at a set of pressures explicit PlogRate(const std::multimap& rates); - PlogRate(const AnyMap& node, const UnitStack& rate_units={}) : PlogRate() { - setParameters(node, rate_units); - } + PlogRate(const AnyMap& node, const UnitStack& rate_units={}); unique_ptr newMultiRate() const { return unique_ptr(new MultiRate); diff --git a/include/cantera/kinetics/TwoTempPlasmaRate.h b/include/cantera/kinetics/TwoTempPlasmaRate.h index 00ac5623465..4b865472429 100644 --- a/include/cantera/kinetics/TwoTempPlasmaRate.h +++ b/include/cantera/kinetics/TwoTempPlasmaRate.h @@ -75,9 +75,7 @@ class TwoTempPlasmaRate : public ArrheniusBase */ TwoTempPlasmaRate(double A, double b, double Ea=0.0, double EE=0.0); - TwoTempPlasmaRate(const AnyMap& node, const UnitStack& rate_units={}) : TwoTempPlasmaRate() { - setParameters(node, rate_units); - } + TwoTempPlasmaRate(const AnyMap& node, const UnitStack& rate_units={}); unique_ptr newMultiRate() const override { return unique_ptr( diff --git a/src/kinetics/Falloff.cpp b/src/kinetics/Falloff.cpp index a48588bf864..a965d4d81b5 100644 --- a/src/kinetics/Falloff.cpp +++ b/src/kinetics/Falloff.cpp @@ -211,6 +211,21 @@ void FalloffRate::validate(const std::string& equation, const Kinetics& kin) } } +LindemannRate::LindemannRate(const AnyMap& node, const UnitStack& rate_units) + : LindemannRate() +{ + setParameters(node, rate_units); +} + +LindemannRate::LindemannRate(const ArrheniusRate& low, const ArrheniusRate& high, + const vector_fp& c) + : LindemannRate() +{ + m_lowRate = low; + m_highRate = high; + setFalloffCoeffs(c); +} + void TroeRate::setFalloffCoeffs(const vector_fp& c) { if (c.size() != 3 && c.size() != 4) { diff --git a/src/kinetics/PlogRate.cpp b/src/kinetics/PlogRate.cpp index 629c96d8d89..c4082bae659 100644 --- a/src/kinetics/PlogRate.cpp +++ b/src/kinetics/PlogRate.cpp @@ -64,6 +64,12 @@ PlogRate::PlogRate(const std::multimap& rates) setRates(rates); } +PlogRate::PlogRate(const AnyMap& node, const UnitStack& rate_units) + : PlogRate() +{ + setParameters(node, rate_units); +} + void PlogRate::setParameters(const AnyMap& node, const UnitStack& rate_units) { ReactionRate::setParameters(node, rate_units); diff --git a/src/kinetics/TwoTempPlasmaRate.cpp b/src/kinetics/TwoTempPlasmaRate.cpp index 62890d4a436..ce3f4694969 100644 --- a/src/kinetics/TwoTempPlasmaRate.cpp +++ b/src/kinetics/TwoTempPlasmaRate.cpp @@ -59,6 +59,12 @@ TwoTempPlasmaRate::TwoTempPlasmaRate(double A, double b, double Ea, double EE) m_E4_R = EE / GasConstant; } +TwoTempPlasmaRate::TwoTempPlasmaRate(const AnyMap& node, const UnitStack& rate_units) + : TwoTempPlasmaRate() +{ + setParameters(node, rate_units); +} + double TwoTempPlasmaRate::ddTScaledFromStruct(const TwoTempPlasmaData& shared_data) const { warn_user("TwoTempPlasmaRate::ddTScaledFromStruct",