PETSc: Convert PetscScalar* iterators when calling IndexSet::add_indices

diff --git a/source/lac/petsc_vector_base.cc b/source/lac/petsc_vector_base.cc
index 5bf541cda30a987ffe448c720291abae491a952e..a3280a8b247402b1b32d407e08861fd944641ca9 100644 (file)
--- a/source/lac/petsc_vector_base.cc
+++ b/source/lac/petsc_vector_base.cc
@@ -183,6 +183,55 @@ namespace PETScWrappers
 
 
 
+  namespace
+  {
+    template <typename Iterator, typename OutType>
+    class ConvertingIterator
+    {
+      Iterator m_iterator;
+
+    public:
+      ConvertingIterator(const Iterator &iterator)
+        : m_iterator(iterator)
+      {}
+
+      OutType
+      operator*() const
+      {
+        return static_cast<OutType>(*m_iterator);
+      }
+
+      ConvertingIterator &
+      operator++()
+      {
+        ++m_iterator;
+        return *this;
+      }
+
+      ConvertingIterator
+      operator++(int)
+      {
+        ConvertingIterator old = *this;
+        ++m_iterator;
+        return old;
+      }
+
+      bool
+      operator==(const ConvertingIterator &other) const
+      {
+        return this->m_iterator == other.m_iterator;
+      }
+
+      bool
+      operator!=(const ConvertingIterator &other) const
+      {
+        return this->m_iterator != other.m_iterator;
+      }
+    };
+  } // namespace
+
+
+
   void
   VectorBase::determine_ghost_indices()
   {
@@ -236,8 +285,13 @@ namespace PETScWrappers
 
         if (std::is_sorted(&array[end_index - ghost_start_index],
                            &array[n_elements_stored_locally]))
-          ghost_indices.add_indices(&array[end_index - ghost_start_index],
-                                    &array[n_elements_stored_locally]);
+          {
+            ConvertingIterator<PetscScalar *, types::global_dof_index> start(
+              &array[end_index - ghost_start_index]);
+            ConvertingIterator<PetscScalar *, types::global_dof_index> end(
+              &array[n_elements_stored_locally]);
+            ghost_indices.add_indices(start, end);
+          }
         else
           {
             std::vector<PetscInt> sorted_indices(