Prevent infinite recursion in Solution callbacks

Cantera · Mar 7, 2023 · 399e1cb · 399e1cb
1 parent cc6489d
commit 399e1cb
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 10 deletions.
diff --git a/src/base/Solution.cpp b/src/base/Solution.cpp
@@ -48,6 +48,9 @@ void Solution::setThermo(shared_ptr<ThermoPhase> thermo) {
 }
 
 void Solution::setKinetics(shared_ptr<Kinetics> kinetics) {
+    if (kinetics == m_kinetics) {
+        return;
+    }
     m_kinetics = kinetics;
     if (m_kinetics) {
         m_kinetics->setRoot(shared_from_this());
@@ -58,6 +61,9 @@ void Solution::setKinetics(shared_ptr<Kinetics> kinetics) {
 }
 
 void Solution::setTransport(shared_ptr<Transport> transport) {
+    if (transport == m_transport) {
+        return;
+    }
     m_transport = transport;
     for (const auto& [id, callback] : m_changeCallbacks) {
         callback();

diff --git a/src/oneD/IonFlow.cpp b/src/oneD/IonFlow.cpp
@@ -74,8 +74,8 @@ IonFlow::IonFlow(shared_ptr<Solution> sol, const std::string& id, size_t points)
         setTransportModel("Ion");
     }
     m_solution->registerChangedCallback(this, [this]() {
-        setKinetics(*m_solution->kinetics());
-        setTransport(*m_solution->transport());
+        setKinetics(m_solution->kinetics());
+        setTransport(m_solution->transport());
     });
 }
 

diff --git a/src/oneD/StFlow.cpp b/src/oneD/StFlow.cpp
@@ -131,8 +131,8 @@ StFlow::StFlow(shared_ptr<Solution> sol, const std::string& id, size_t points)
         setTransportModel("Mix");
     }
     m_solution->registerChangedCallback(this, [this]() {
-        setKinetics(*m_solution->kinetics());
-        setTransport(*m_solution->transport());
+        setKinetics(m_solution->kinetics());
+        setTransport(m_solution->transport());
     });
 }
 
@@ -161,9 +161,8 @@ void StFlow::setKinetics(shared_ptr<Kinetics> kin)
 
 void StFlow::setKinetics(Kinetics& kin)
 {
-    // @todo: resolve crash for updated m_solution->registerChangedCallback
-    // warn_deprecated("StFlow::setKinetics",
-    //     "To be removed after Cantera 3.0. Replaced by Domain1D::setKinetics.");
+    warn_deprecated("StFlow::setKinetics(Kinetics&)", "To be removed after Cantera 3.0."
+        " Replaced by setKinetics(shared_ptr<Kinetics>).");
     m_kin = &kin;
 }
 
@@ -258,9 +257,8 @@ std::string StFlow::transportModel() const {
 
 void StFlow::setTransport(Transport& trans)
 {
-    // @todo: resolve crash for updated m_solution->registerChangedCallback
-    // warn_deprecated("StFlow::setTransport",
-    //     "To be removed after Cantera 3.0. Replaced by Domain1D::setTransport.");
+    warn_deprecated("StFlow::setTransport(Transport&)", "To be removed after"
+        " Cantera 3.0. Replaced by setTransport(shared_ptr<Transport>).");
     m_trans = &trans;
     if (m_trans->transportModel() == "None") {
         throw CanteraError("StFlow::setTransport",