..

dweindl · Sep 30, 2024 · 8eb0a9c · 8eb0a9c
1 parent 0870ba3
commit 8eb0a9c
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/include/amici/sundials_linsol_wrapper.h b/include/amici/sundials_linsol_wrapper.h
@@ -121,7 +121,7 @@ class SUNLinSolWrapper {
      * @brief Get the matrix A (matrix solvers only).
      * @return A
      */
-    virtual SUNMatrix getMatrix() const;
+    virtual SUNMatrixWrapper& getMatrix();
 
   protected:
     /**
@@ -195,7 +195,7 @@ class SUNLinSolKLU : public SUNLinSolWrapper {
      * @param ordering
      */
     SUNLinSolKLU(
-        AmiVector const& x, int nnz, int sparsetype, StateOrdering ordering
+        AmiVector const& x, int nnz, int sparsetype, StateOrdering ordering = StateOrdering::COLAMD
     );
 
     /**

diff --git a/src/sundials_linsol_wrapper.cpp b/src/sundials_linsol_wrapper.cpp
@@ -22,6 +22,13 @@ SUNLinSolWrapper::~SUNLinSolWrapper() {
 
 SUNLinSolWrapper::SUNLinSolWrapper(SUNLinSolWrapper&& other) noexcept {
     std::swap(solver_, other.solver_);
+    std::swap(A_, other.A_);
+}
+
+SUNLinSolWrapper& SUNLinSolWrapper::operator=(SUNLinSolWrapper&& other) noexcept {
+    std::swap(solver_, other.solver_);
+    std::swap(A_, other.A_);
+    return *this;
 }
 
 SUNLinearSolver SUNLinSolWrapper::get() const { return solver_; }
@@ -55,7 +62,7 @@ int SUNLinSolWrapper::space(long* lenrwLS, long* leniwLS) const {
     return SUNLinSolSpace(solver_, lenrwLS, leniwLS);
 }
 
-SUNMatrix SUNLinSolWrapper::getMatrix() const { return A_.get(); }
+SUNMatrixWrapper& SUNLinSolWrapper::getMatrix() { return A_; }
 
 SUNNonLinSolWrapper::SUNNonLinSolWrapper(SUNNonlinearSolver sol)
     : solver(sol) {}