[Kinetics] Remove return argument from ReactionData::restore

Cantera · Jan 14, 2022 · ec85c24 · ec85c24
1 parent b20a25b
commit ec85c24
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 25 deletions.
diff --git a/include/cantera/kinetics/ReactionData.h b/include/cantera/kinetics/ReactionData.h
@@ -61,10 +61,7 @@ struct ReactionData
     void perturbTemperature(double deltaT);
 
     //! Restore data container after a perturbation
-    /*
-     * @returns  A boolean indicating whether value was restored after a perturbation.
-     */
-    virtual bool restore();
+    virtual void restore();
 
     //! Update number of species and reactions
     virtual void resize(size_t n_species, size_t n_reactions) {}
@@ -179,8 +176,7 @@ struct FalloffData : public ReactionData
      */
     void perturbThirdBodies(double deltaM);
 
-    //! Restore data container after a perturbation
-    virtual bool restore() override;
+    virtual void restore() override;
 
     virtual void resize(size_t n_species, size_t n_reactions) override {
         conc_3b.resize(n_reactions, NAN);
@@ -230,8 +226,7 @@ struct PlogData : public ReactionData
      */
     void perturbPressure(double deltaP);
 
-    //! Restore data container after a perturbation
-    virtual bool restore() override;
+    virtual void restore() override;
 
     virtual void invalidateCache() override {
         ReactionData::invalidateCache();
@@ -272,8 +267,7 @@ struct ChebyshevData : public ReactionData
      */
     void perturbPressure(double deltaP);
 
-    //! Restore data container after a perturbation
-    virtual bool restore() override;
+    virtual void restore() override;
 
     virtual void invalidateCache() override {
         ReactionData::invalidateCache();

diff --git a/src/kinetics/ReactionData.cpp b/src/kinetics/ReactionData.cpp
@@ -27,15 +27,14 @@ void ReactionData::perturbTemperature(double deltaT)
     ReactionData::update(temperature * (1. + deltaT));
 }
 
-bool ReactionData::restore()
+void ReactionData::restore()
 {
     // only restore if there is a valid buffered value
     if (m_temperature_buf < 0.) {
-        return false;
+        return;
     }
     ReactionData::update(m_temperature_buf);
     m_temperature_buf = -1.;
-    return true;
 }
 
 bool ArrheniusData::update(const ThermoPhase& bulk, const Kinetics& kin)
@@ -177,16 +176,15 @@ void FalloffData::perturbThirdBodies(double deltaM)
     m_perturbed = true;
 }
 
-bool FalloffData::restore()
+void FalloffData::restore()
 {
-    bool ret = ReactionData::restore();
+    ReactionData::restore();
     // only restore if there is a valid buffered value
     if (!m_perturbed) {
-        return ret;
+        return;
     }
     conc_3b = m_conc_3b_buf;
     m_perturbed = false;
-    return true;
 }
 
 void PlogData::update(double T)
@@ -216,16 +214,15 @@ void PlogData::perturbPressure(double deltaP)
     update(temperature, pressure * (1. + deltaP));
 }
 
-bool PlogData::restore()
+void PlogData::restore()
 {
-    bool ret = ReactionData::restore();
+    ReactionData::restore();
     // only restore if there is a valid buffered value
     if (m_pressure_buf < 0.) {
-        return ret;
+        return;
     }
     update(temperature, m_pressure_buf);
     m_pressure_buf = -1.;
-    return true;
 }
 
 void ChebyshevData::update(double T)
@@ -255,16 +252,15 @@ void ChebyshevData::perturbPressure(double deltaP)
     update(temperature, pressure * (1. + deltaP));
 }
 
-bool ChebyshevData::restore()
+void ChebyshevData::restore()
 {
-    bool ret = ReactionData::restore();
+    ReactionData::restore();
     // only restore if there is a valid buffered value
     if (m_pressure_buf < 0.) {
-        return ret;
+        return;
     }
     update(temperature, m_pressure_buf);
     m_pressure_buf = -1.;
-    return true;
 }
 
 }