Skip to content

Commit

Permalink
more CT_API
Browse files Browse the repository at this point in the history
  • Loading branch information
speth committed Jan 24, 2023
1 parent 535dd6a commit 40cf72f
Show file tree
Hide file tree
Showing 6 changed files with 33 additions and 20 deletions.
16 changes: 3 additions & 13 deletions include/cantera/kinetics/Falloff.h
Original file line number Diff line number Diff line change
Expand Up @@ -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<MultiRateBase> newMultiRate() const override{
return unique_ptr<MultiRateBase>(
Expand Down
6 changes: 2 additions & 4 deletions include/cantera/kinetics/PlogRate.h
Original file line number Diff line number Diff line change
Expand Up @@ -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<double, ArrheniusRate>& rates);

PlogRate(const AnyMap& node, const UnitStack& rate_units={}) : PlogRate() {
setParameters(node, rate_units);
}
PlogRate(const AnyMap& node, const UnitStack& rate_units={});

unique_ptr<MultiRateBase> newMultiRate() const {
return unique_ptr<MultiRateBase>(new MultiRate<PlogRate, PlogData>);
Expand Down
4 changes: 1 addition & 3 deletions include/cantera/kinetics/TwoTempPlasmaRate.h
Original file line number Diff line number Diff line change
Expand Up @@ -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<MultiRateBase> newMultiRate() const override {
return unique_ptr<MultiRateBase>(
Expand Down
15 changes: 15 additions & 0 deletions src/kinetics/Falloff.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
6 changes: 6 additions & 0 deletions src/kinetics/PlogRate.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,12 @@ PlogRate::PlogRate(const std::multimap<double, ArrheniusRate>& 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);
Expand Down
6 changes: 6 additions & 0 deletions src/kinetics/TwoTempPlasmaRate.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down

0 comments on commit 40cf72f

Please sign in to comment.