From: Wolfgang Bangerth <bangerth@colostate.edu>
Date: Sun, 23 Apr 2023 21:59:26 +0000 (-0600)
Subject: Also allow vector types that are can just wrap Vec objects.
X-Git-Tag: v9.5.0-rc1~251^2~1
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9927c907ea08545401989d50ae203b170e68f05a;p=dealii.git

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

diff --git a/include/deal.II/lac/petsc_snes.h b/include/deal.II/lac/petsc_snes.h
index 11c6db51e5..f69e2a2f36 100644
--- 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
index 64e9cb235f..af2019058d 100644
--- 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: