Also allow vector types that are can just wrap Vec objects.

dealii · Apr 23, 2023 · 2a53b2f · 2a53b2f
1 parent 81c5479
commit 2a53b2f
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/include/deal.II/lac/petsc_snes.h b/include/deal.II/lac/petsc_snes.h
@@ -29,6 +29,11 @@
 
 #  include <petscsnes.h>
 
+#  if defined(DEAL_II_HAVE_CXX20)
+#    include <concepts>
+#  endif
+
+
 DEAL_II_NAMESPACE_OPEN
 
 namespace PETScWrappers
@@ -224,7 +229,8 @@ namespace PETScWrappers
   template <typename VectorType  = PETScWrappers::VectorBase,
             typename PMatrixType = PETScWrappers::MatrixBase,
             typename AMatrixType = PMatrixType>
-  DEAL_II_CXX20_REQUIRES(concepts::is_dealii_petsc_vector_type<VectorType>)
+  DEAL_II_CXX20_REQUIRES(concepts::is_dealii_petsc_vector_type<VectorType> ||
+                         std::constructible_from<VectorType, Vec>)
   class NonlinearSolver
   {
   public:

diff --git a/include/deal.II/lac/petsc_ts.h b/include/deal.II/lac/petsc_ts.h
@@ -29,6 +29,10 @@
 
 #  include <petscts.h>
 
+#  if defined(DEAL_II_HAVE_CXX20)
+#    include <concepts>
+#  endif
+
 DEAL_II_NAMESPACE_OPEN
 
 namespace PETScWrappers
@@ -289,7 +293,8 @@ namespace PETScWrappers
   template <typename VectorType  = PETScWrappers::VectorBase,
             typename PMatrixType = PETScWrappers::MatrixBase,
             typename AMatrixType = PMatrixType>
-  DEAL_II_CXX20_REQUIRES(concepts::is_dealii_petsc_vector_type<VectorType>)
+  DEAL_II_CXX20_REQUIRES(concepts::is_dealii_petsc_vector_type<VectorType> ||
+                         std::constructible_from<VectorType, Vec>)
   class TimeStepper
   {
   public: