Merge pull request #3896 from lindsayad/subvector-api-changes

lindsayad · web-flow · commit 10d830f69d4c · 2024-07-11T23:08:17.000-07:00
A couple small changes for subvectors
diff --git a/include/numerics/numeric_vector.h b/include/numerics/numeric_vector.h
@@ -749,7 +749,8 @@ class NumericVector : public ReferenceCountedObject<NumericVector<T>>,
    * rows.  This  is currently only implemented for
    * PetscVectors.
    */
-  virtual void restore_subvector(NumericVector<T> &&, const std::vector<numeric_index_type> &)
+  virtual void restore_subvector(std::unique_ptr<NumericVector<T>>,
+                                 const std::vector<numeric_index_type> &)
   {
     libmesh_not_implemented();
   }
diff --git a/include/numerics/petsc_vector.h b/include/numerics/petsc_vector.h
@@ -349,7 +349,7 @@ class PetscVector final : public NumericVector<T>
   virtual std::unique_ptr<NumericVector<T>>
   get_subvector(const std::vector<numeric_index_type> & rows) override;
 
-  virtual void restore_subvector(NumericVector<T> && subvector,
+  virtual void restore_subvector(std::unique_ptr<NumericVector<T>> subvector,
                                  const std::vector<numeric_index_type> & rows) override;
 
 private:
diff --git a/src/numerics/petsc_vector.C b/src/numerics/petsc_vector.C
@@ -1426,15 +1426,17 @@ PetscVector<T>::get_subvector(const std::vector<numeric_index_type> & rows)
   ierr = VecGetSubVector(_vec, parent_is, &subvec);
   LIBMESH_CHKERR(ierr);
 
+  this->_is_closed = false;
+
   return std::make_unique<PetscVector<T>>(subvec, this->comm());
 }
 
 template <typename T>
 void
-PetscVector<T>::restore_subvector(NumericVector<T> && subvector,
+PetscVector<T>::restore_subvector(std::unique_ptr<NumericVector<T>> subvector,
                                   const std::vector<numeric_index_type> & rows)
 {
-  auto * const petsc_subvector = cast_ptr<PetscVector<T> *>(&subvector);
+  auto * const petsc_subvector = cast_ptr<PetscVector<T> *>(subvector.get());
 
   // Construct index set
   WrappedPetsc<IS> parent_is;
@@ -1448,6 +1450,11 @@ PetscVector<T>::restore_subvector(NumericVector<T> && subvector,
   Vec subvec = petsc_subvector->vec();
   ierr = VecRestoreSubVector(_vec, parent_is, &subvec);
   LIBMESH_CHKERR(ierr);
+
+  if (this->type() == GHOSTED)
+    VecGhostUpdateBeginEnd(this->comm(), _vec, INSERT_VALUES, SCATTER_FORWARD);
+
+  this->_is_closed = true;
 }
 
 //------------------------------------------------------------------
diff --git a/src/systems/condensed_eigen_system.C b/src/systems/condensed_eigen_system.C
@@ -267,7 +267,7 @@ CondensedEigenSystem::copy_sub_to_super(const NumericVector<Number> & sub,
                           super.local_size());
   auto super_sub_view = super.get_subvector(local_non_condensed_dofs_vector);
   *super_sub_view = sub;
-  super.restore_subvector(std::move(*super_sub_view), local_non_condensed_dofs_vector);
+  super.restore_subvector(std::move(super_sub_view), local_non_condensed_dofs_vector);
 }
 
 void
@@ -279,7 +279,7 @@ CondensedEigenSystem::copy_super_to_sub(NumericVector<Number> & super,
                           super.local_size());
   auto super_sub_view = super.get_subvector(local_non_condensed_dofs_vector);
   sub = *super_sub_view;
-  super.restore_subvector(std::move(*super_sub_view), local_non_condensed_dofs_vector);
+  super.restore_subvector(std::move(super_sub_view), local_non_condensed_dofs_vector);
 }
 
 void

Original file line number	Diff line number	Diff line change
`@@ -749,7 +749,8 @@ class NumericVector : public ReferenceCountedObject<NumericVector<T>>,`
`749`	`749`	`* rows. This is currently only implemented for`
`750`	`750`	`* PetscVectors.`
`751`	`751`	`*/`
`752`		`- virtual void restore_subvector(NumericVector<T> &&, const std::vector<numeric_index_type> &)`
	`752`	`+ virtual void restore_subvector(std::unique_ptr<NumericVector<T>>,`
	`753`	`+ const std::vector<numeric_index_type> &)`
`753`	`754`	`{`
`754`	`755`	`libmesh_not_implemented();`
`755`	`756`	`}`