Make SolutionArray::share a member function

include/cantera/base/SolutionArray.h

@@ -32,8 +32,7 @@ class SolutionArray
                   size_t size,
                   const AnyMap& meta);
 
-    SolutionArray(const shared_ptr<SolutionArray>& arr,
-                  const vector<int>& indices);
+    SolutionArray(const SolutionArray& arr, const vector<int>& indices);
 
 public:
     virtual ~SolutionArray() {}
@@ -57,13 +56,11 @@ class SolutionArray
      *
      *  Both SolutionArray object share common data. The method is used for slicing
      *  of SolutionArrays from high-level API's. Note that meta data are not inherited.
-     *  @param other  SolutionArray object containing shared data
      *  @param selected  List of locations for shared entries
      */
-    static shared_ptr<SolutionArray> share(const shared_ptr<SolutionArray>& other,
-                                           const vector<int>& selected)
+    shared_ptr<SolutionArray> share(const vector<int>& selected)
     {
-        return shared_ptr<SolutionArray>(new SolutionArray(other, selected));
+        return shared_ptr<SolutionArray>(new SolutionArray(*this, selected));
     }
 
     //! Reset all entries of the SolutionArray to the current Solution state

interfaces/cython/cantera/solutionbase.pxd

@@ -71,6 +71,7 @@ cdef extern from "cantera/base/Solution.h" namespace "Cantera":
 
 cdef extern from "cantera/base/SolutionArray.h" namespace "Cantera":
     cdef cppclass CxxSolutionArray "Cantera::SolutionArray":
+        shared_ptr[CxxSolutionArray] share(vector[int]&) except +translate_exception
         void reset() except +translate_exception
         size_t size()
         void resize(size_t) except +translate_exception
@@ -99,9 +100,6 @@ cdef extern from "cantera/base/SolutionArray.h" namespace "Cantera":
     cdef shared_ptr[CxxSolutionArray] CxxNewSolutionArray "Cantera::SolutionArray::create" (
         shared_ptr[CxxSolution], size_t, CxxAnyMap&) except +translate_exception
 
-    cdef shared_ptr[CxxSolutionArray] CxxShareSolutionArray "Cantera::SolutionArray::share" (
-        shared_ptr[CxxSolutionArray], vector[int]&) except +translate_exception
-
 
 ctypedef void (*transportMethod1d)(CxxTransport*, double*) except +translate_exception
 ctypedef void (*transportMethod2d)(CxxTransport*, size_t, double*) except +translate_exception

interfaces/cython/cantera/solutionbase.pyx

@@ -482,7 +482,6 @@ cdef object _wrap_Solution(shared_ptr[CxxSolution] cxx_soln):
     if isinstance(soln, Interface):
         iface = soln
         iface.surf = <CxxSurfPhase*>(soln.thermo)
-#        <InterfaceKinetics>(iface)._setup_phase_indices()
         iface._setup_phase_indices()
     return soln
 
@@ -515,7 +514,7 @@ cdef class SolutionArrayBase:
         cdef vector[int] cxx_selected
         for loc in selected:
             cxx_selected.push_back(loc)
-        dest._base = CxxShareSolutionArray(self._base, cxx_selected)
+        dest._base = self.base.share(cxx_selected)
         dest.base = dest._base.get()
         return dest
 

src/base/SolutionArray.cpp

@@ -58,15 +58,15 @@ SolutionArray::SolutionArray(const shared_ptr<Solution>& sol,
     m_apiShape[0] = m_dataSize;
 }
 
-SolutionArray::SolutionArray(const shared_ptr<SolutionArray>& other,
+SolutionArray::SolutionArray(const SolutionArray& other,
                              const vector<int>& selected)
-    : m_sol(other->solution())
+    : m_sol(other.m_sol)
     , m_size(selected.size())
-    , m_dataSize(other->m_data->size())
-    , m_stride(other->m_stride)
-    , m_data(other->m_data)
-    , m_extra(other->m_extra)
-    , m_order(other->m_order)
+    , m_dataSize(other.m_data->size())
+    , m_stride(other.m_stride)
+    , m_data(other.m_data)
+    , m_extra(other.m_extra)
+    , m_order(other.m_order)
     , m_shared(true)
     , m_active(selected)
 {

test/general/test_composite.cpp

@@ -271,7 +271,7 @@ TEST(SolutionArray, extraSlicedDoubles) {
     arr->setComponent("spam", any);
 
     auto indices = vector<int>({1, 2, 3});
-    auto sliced = SolutionArray::share(arr, indices);
+    auto sliced = arr->share(indices);
     testSingleCol<double>(*sliced, 2.71828, true);
 }
 
@@ -290,7 +290,7 @@ TEST(SolutionArray, extraSlicedIntegers) {
     ASSERT_EQ(arr->getAuxiliary(1)["spam"].asInt(), 3);
 
     auto indices = vector<int>({1, 2, 3});
-    auto sliced = SolutionArray::share(arr, indices);
+    auto sliced = arr->share(indices);
     ASSERT_EQ(sliced->getAuxiliary(0)["spam"].asInt(), 3);
     ASSERT_EQ(sliced->getAuxiliary(1)["spam"].asInt(), 42);
     testSingleCol<long int>(*sliced, 101, true);
@@ -307,7 +307,7 @@ TEST(SolutionArray, extraSlicedStrings) {
     arr->setComponent("spam", any);
 
     auto indices = vector<int>({1, 2, 3});
-    auto sliced = SolutionArray::share(arr, indices);
+    auto sliced = arr->share(indices);
     testSingleCol<string>(*sliced, "bar", true);
 }
 
@@ -418,7 +418,7 @@ TEST(SolutionArray, extraSlicedDoubleArrays) {
     arr->setComponent("spam", any);
 
     auto indices = vector<int>({1, 2, 3});
-    auto sliced = SolutionArray::share(arr, indices);
+    auto sliced = arr->share(indices);
 
     testMultiCol<double>(*sliced, vector<double>({1.1, 2.2}), true);
 }
@@ -432,7 +432,7 @@ TEST(SolutionArray, extraSlicedIntegerArrays) {
     arr->setComponent("spam", any);
 
     auto indices = vector<int>({1, 2, 3});
-    auto sliced = SolutionArray::share(arr, indices);
+    auto sliced = arr->share(indices);
 
     testMultiCol<long int>(*sliced, vector<long int>({3, 4, 5}), true);
 }
@@ -454,7 +454,7 @@ TEST(SolutionArray, extraSlicedStringArrays) {
     ASSERT_EQ(arr->getAuxiliary(1)["spam"].asVector<string>()[0], "abc");
 
     auto indices = vector<int>({1, 2, 3});
-    auto sliced = SolutionArray::share(arr, indices);
+    auto sliced = arr->share(indices);
     ASSERT_EQ(sliced->getAuxiliary(0)["spam"].asVector<string>()[0], "abc");
     ASSERT_EQ(sliced->getAuxiliary(1)["spam"].asVector<string>()[0], "a");
     testMultiCol<string>(*sliced, vector<string>({"foo", "bar", "baz"}), true);