reset -> reset_memory

libMesh · Nov 5, 2024 · 17dc9e1 · 17dc9e1
1 parent 8c19cbe
commit 17dc9e1
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 22 deletions.
diff --git a/include/numerics/petsc_matrix.h b/include/numerics/petsc_matrix.h
@@ -291,6 +291,8 @@ class PetscMatrix final : public PetscMatrixBase<T>
 
   virtual bool supports_hash_table() const override { return true; }
 
+  virtual void reset_memory() override;
+
 protected:
   /**
    * Perform matrix initialization steps sans preallocation

diff --git a/include/numerics/petsc_matrix_base.h b/include/numerics/petsc_matrix_base.h
@@ -171,10 +171,6 @@ class PetscMatrixBase : public SparseMatrix<T>
 
   virtual bool closed() const override;
 
-#if PETSC_RELEASE_GREATER_EQUALS(3,23,0)
-  virtual void reset () override;
-#endif
-
 protected:
 
   /**

diff --git a/include/numerics/sparse_matrix.h b/include/numerics/sparse_matrix.h
@@ -605,12 +605,9 @@ class SparseMatrix : public ReferenceCountedObject<SparseMatrix<T>>,
   bool use_hash_table() const { return _use_hash_table; }
 
   /**
-   * Reset the state of the matrix. The default implementation calls \p clear() but this is meant to
-   * be more nuanced in that it can reset the state of the matrix without deallocating core data
-   * structures. As an example, this would not destroy the \p Mat data member for PETSc matrix
-   * derived classes
+   * Reset the memory storage of the matrix
    */
-  virtual void reset() { this->clear(); }
+  virtual void reset_memory() { libmesh_not_implemented(); }
 
 protected:
   /**

diff --git a/src/numerics/petsc_matrix.C b/src/numerics/petsc_matrix.C
@@ -1284,6 +1284,21 @@ PetscMatrix<T>::copy_from_hash ()
 }
 #endif
 
+template <typename T>
+void
+PetscMatrix<T>::reset_memory()
+{
+  if (this->_use_hash_table)
+#if PETSC_RELEASE_GREATER_EQUALS(3, 23, 0)
+    // This performs MatReset plus re-establishes the hash table
+    LibmeshPetscCall(MatResetHash(this->_mat));
+#else
+    libmesh_error_msg("Hash tables not fully supported until PETSc version 3.23");
+#endif
+  else
+    this->reset_preallocation();
+}
+
 //------------------------------------------------------------------
 // Explicit instantiations
 template class LIBMESH_EXPORT PetscMatrix<Number>;

diff --git a/src/numerics/petsc_matrix_base.C b/src/numerics/petsc_matrix_base.C
@@ -249,19 +249,6 @@ bool PetscMatrixBase<T>::closed() const
   return (assembled == PETSC_TRUE);
 }
 
-#if PETSC_RELEASE_GREATER_EQUALS(3,23,0)
-template <typename T>
-void
-PetscMatrixBase<T>::reset()
-{
-  if (this->_use_hash_table)
-    // This performs MatReset plus re-establishes the hash table
-    LibmeshPetscCall(MatResetHash(this->_mat));
-  else
-    LibmeshPetscCall(MatReset(this->_mat));
-}
-#endif
-
 //------------------------------------------------------------------
 // Explicit instantiations
 template class LIBMESH_EXPORT PetscMatrixBase<Number>;