From 91c0e3407fd636151bfe04d47c47a12144803abe Mon Sep 17 00:00:00 2001 From: Ingmar Schoegl Date: Mon, 4 Jul 2022 06:50:00 -0500 Subject: [PATCH] [Kinetics] Remove NAN sentinel from PlogRate --- include/cantera/kinetics/PlogRate.h | 4 ++++ src/kinetics/PlogRate.cpp | 4 +--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/include/cantera/kinetics/PlogRate.h b/include/cantera/kinetics/PlogRate.h index 9671738e05..840ef52268 100644 --- a/include/cantera/kinetics/PlogRate.h +++ b/include/cantera/kinetics/PlogRate.h @@ -181,6 +181,10 @@ class PlogRate final : public ReactionRate //! reaction. std::multimap getRates() const; + virtual bool ready() const override { + return rates_.size() && !(rates_.size() > 1 && !rates_[1].ready()); + } + protected: //! log(p) to (index range) in the rates_ vector std::map> pressures_; diff --git a/src/kinetics/PlogRate.cpp b/src/kinetics/PlogRate.cpp index b83a272053..b941dd8d4e 100644 --- a/src/kinetics/PlogRate.cpp +++ b/src/kinetics/PlogRate.cpp @@ -86,9 +86,7 @@ void PlogRate::getParameters(AnyMap& rateNode, const Units& rate_units) const { std::vector rateList; rateNode["type"] = type(); - if (!rates_.size() - || (rates_.size() > 1 && std::isnan(rates_[1].preExponentialFactor()))) - { + if (!ready()) { // object not fully set up return; }