From d29cd1b5bcbac6997ff4583967aeb928b6e36cea Mon Sep 17 00:00:00 2001 From: Ray Speth Date: Wed, 12 Apr 2023 00:09:28 -0400 Subject: [PATCH] [Kinetics] Simplify falloff serialization --- src/kinetics/Falloff.cpp | 23 ++--------------------- 1 file changed, 2 insertions(+), 21 deletions(-) diff --git a/src/kinetics/Falloff.cpp b/src/kinetics/Falloff.cpp index a8a354902a..82a6d9a779 100644 --- a/src/kinetics/Falloff.cpp +++ b/src/kinetics/Falloff.cpp @@ -342,22 +342,13 @@ void TroeRate::getParameters(AnyMap& node) const FalloffRate::getParameters(node); AnyMap params; - if (!valid()) { - // pass - } else if (m_lowRate.conversionUnits().factor() != 0.0) { + if (valid()) { params["A"] = m_a; params["T3"].setQuantity(1.0 / m_rt3, "K"); params["T1"].setQuantity(1.0 / m_rt1, "K"); if (std::abs(m_t2) > SmallNumber) { params["T2"].setQuantity(m_t2, "K"); } - } else { - params["A"] = m_a; - params["T3"] = 1.0 / m_rt3; - params["T1"] = 1.0 / m_rt1; - if (std::abs(m_t2) > SmallNumber) { - params["T2"] = m_t2; - } } params.setFlowStyle(); node["Troe"] = std::move(params); @@ -470,9 +461,7 @@ void SriRate::getParameters(AnyMap& node) const FalloffRate::getParameters(node); AnyMap params; - if (!valid()) { - // pass - } else if (m_lowRate.conversionUnits().factor() != 0.0) { + if (valid()) { params["A"] = m_a; params["B"].setQuantity(m_b, "K"); params["C"].setQuantity(m_c, "K"); @@ -480,14 +469,6 @@ void SriRate::getParameters(AnyMap& node) const params["D"] = m_d; params["E"] = m_e; } - } else { - params["A"] = m_a; - params["B"] = m_b; - params["C"] = m_c; - if (m_d != 1.0 || m_e != 0.0) { - params["D"] = m_d; - params["E"] = m_e; - } } params.setFlowStyle(); node["SRI"] = std::move(params);