[oneD] Share data vectors as Domain1D::m_data

Cantera · Apr 9, 2023 · 5541f60 · 5541f60
1 parent b735e75
commit 5541f60
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 5 deletions.
diff --git a/include/cantera/oneD/Domain1D.h b/include/cantera/oneD/Domain1D.h
@@ -540,13 +540,20 @@ class Domain1D
         m_force_full_update = update;
     }
 
+    //! Set shared data pointer
+    void setData(shared_ptr<vector<double>>& data) {
+        m_data = data;
+    }
+
 protected:
     //! Retrieve meta data
     virtual AnyMap getMeta() const;
 
     //! Retrieve meta data
     virtual void setMeta(const AnyMap& meta);
 
+    shared_ptr<vector<double>> m_data; //!< data pointer shared from OneDim
+
     double m_rdt = 0.0;
     size_t m_nv = 0;
     size_t m_points;

diff --git a/include/cantera/oneD/OneDim.h b/include/cantera/oneD/OneDim.h
@@ -233,6 +233,7 @@ class OneDim
      */
     void writeStats(int printTime = 1);
 
+    //! @deprecated  To be removed after Cantera 3.0; unused.
     AnyMap serialize(const double* soln) const;
 
     // options

diff --git a/include/cantera/oneD/Sim1D.h b/include/cantera/oneD/Sim1D.h
@@ -120,11 +120,13 @@ class Sim1D : public OneDim
     /**
      * Output information on current solution for all domains to stream.
      * @param s  Output stream
+     * @since  New in Cantera 3.0.
      */
     void show(std::ostream& s);
 
     /**
      * Show logging information on current solution for all domains.
+     * @since  New in Cantera 3.0.
      */
     void show();
 

diff --git a/src/oneD/OneDim.cpp b/src/oneD/OneDim.cpp
@@ -25,6 +25,7 @@ OneDim::OneDim(vector<shared_ptr<Domain1D>>& domains)
 {
     // create a Newton iterator, and add each domain.
     m_newt = make_unique<MultiNewton>(1);
+    m_data = make_shared<vector<double>>();
     for (auto& dom : domains) {
         addDomain(dom);
     }
@@ -40,6 +41,7 @@ OneDim::OneDim(vector<Domain1D*> domains)
 
     // create a Newton iterator, and add each domain.
     m_newt = make_unique<MultiNewton>(1);
+    m_data = make_shared<vector<double>>();
     for (size_t i = 0; i < domains.size(); i++) {
         addDomain(domains[i]);
     }
@@ -96,6 +98,7 @@ void OneDim::addDomain(shared_ptr<Domain1D> d)
     // add it also to the global domain list, and set its container and position
     m_sharedDom.push_back(d);
     m_dom.push_back(d.get());
+    d->setData(m_data);
     d->setContainer(this, m_dom.size()-1);
     resize();
 }
@@ -122,6 +125,7 @@ void OneDim::addDomain(Domain1D* d)
 
     // add it also to the global domain list, and set its container and position
     m_dom.push_back(d);
+    d->setData(m_data);
     d->setContainer(this, m_dom.size()-1);
     resize();
 }
@@ -237,11 +241,7 @@ void OneDim::resize()
         m_size = d->loc() + d->size();
     }
 
-    if (m_data) {
-        m_data->resize(size());
-    } else {
-        m_data = make_shared<vector<double>>(size());
-    }
+    m_data->resize(size());
 
     m_newt->resize(size());
     m_mask.resize(size());
@@ -456,6 +456,8 @@ void OneDim::resetBadValues(double* x)
 
 AnyMap OneDim::serialize(const double* soln) const
 {
+    warn_deprecated("OneDim::serialize",
+        "To be removed after Cantera 3.0; unused.");
     AnyMap state;
     for (size_t i = 0; i < m_dom.size(); i++) {
         state[m_dom[i]->id()] = m_dom[i]->serialize(soln + start(i));