[0D] Consolidate zeroD insert methods

include/cantera/zeroD/Reactor.h

@@ -68,14 +68,16 @@ public:
     /**
      * Insert something into the reactor. The 'something' must belong to a class
      * that is a subclass of both ThermoPhase and Kinetics.
+     * @deprecated Unused; to be removed after %Cantera 3.1.
      */
     template<class G>
     void insert(G& contents) {
+        warn_deprecated("Reactor::insert", "Unused; to be removed after Cantera 3.1.");
         setThermoMgr(contents);
         setKineticsMgr(contents);
     }
 
-    void insert(shared_ptr<Solution> sol);
+    using ReactorBase::insert;
 
     void setKineticsMgr(Kinetics& kin) override;
 

include/cantera/zeroD/ReactorBase.h

@@ -89,6 +89,9 @@ public:
         m_vol = vol;
     }
 
+    //! @deprecated To be removed after %Cantera 3.1. Superseded by setSolution.
+    void insert(shared_ptr<Solution> sol);
+
     //! Specify the mixture contained in the reactor. Note that a pointer to
     //! this substance is stored, and as the integration proceeds, the state of
     //! the substance is modified.

include/cantera/zeroD/Reservoir.h

@@ -26,13 +26,14 @@ public:
 
     void initialize(double t0=0.0) override {}
 
+    //! @deprecated Unused; to be removed after %Cantera 3.1.
     void insert(ThermoPhase& contents) {
+        warn_deprecated("Reservoir::insert",
+            "Unused; to be removed after Cantera 3.1.");
         setThermoMgr(contents);
     }
 
-    void insert(shared_ptr<Solution> sol) {
+    using ReactorBase::insert;
-        setThermoMgr(*sol->thermo());
-    }
 };
 
 }

src/zeroD/Reactor.cpp

@@ -22,11 +22,6 @@ namespace bmt = boost::math::tools;
 namespace Cantera
 {
 
-void Reactor::insert(shared_ptr<Solution> sol) {
-    setThermoMgr(*sol->thermo());
-    setKineticsMgr(*sol->kinetics());
-}
-
 void Reactor::setDerivativeSettings(AnyMap& settings)
 {
     m_kin->setDerivativeSettings(settings);

src/zeroD/ReactorBase.cpp

@@ -34,6 +34,13 @@ void ReactorBase::setSolution(shared_ptr<Solution> sol) {
     }
 }
 
+void ReactorBase::insert(shared_ptr<Solution> sol)
+{
+    // warn_deprecated("ReactorBase::insert",
+    //     "To be removed after Cantera 3.1. Superseded by 'setSolution'.");
+    setSolution(sol);
+}
+
 void ReactorBase::setThermoMgr(ThermoPhase& thermo)
 {
     m_thermo = &thermo;