Fix MemorySpace check for zero sized ArrayViews

diff --git a/include/deal.II/base/array_view.h b/include/deal.II/base/array_view.h
index ff410441b2d215521ccc582d41fac6c6b430a8e4..7cd0749284cd283d54ad54f1afb8f863bba7d92f 100644 (file)
--- a/include/deal.II/base/array_view.h
+++ b/include/deal.II/base/array_view.h
@@ -312,11 +312,12 @@ inline ArrayView<ElementType, MemorySpaceType>::ArrayView(
   : starting_element(starting_element)
   , n_elements(n_elements)
 {
-  Assert(internal::ArrayViewHelper::is_in_correct_memory_space<MemorySpaceType>(
-           starting_element),
-         ExcMessage(
-           "The memory space indicated by the template parameter "
-           "and the one derived from the pointer value do not match!"));
+  Assert(
+    n_elements == 0 ||
+      internal::ArrayViewHelper::is_in_correct_memory_space<MemorySpaceType>(
+        starting_element),
+    ExcMessage("The memory space indicated by the template parameter "
+               "and the one derived from the pointer value do not match!"));
 }
 
 
@@ -351,11 +352,6 @@ inline ArrayView<ElementType, MemorySpaceType>::ArrayView(
                 "object has a const value_type. In other words, you can "
                 "only create an ArrayView to const values from a const "
                 "std::vector.");
-  Assert(internal::ArrayViewHelper::is_in_correct_memory_space<MemorySpaceType>(
-           vector.data()),
-         ExcMessage(
-           "The memory space indicated by the template parameter "
-           "and the one derived from the pointer value do not match!"));
 }
 
 
@@ -474,11 +470,11 @@ template <typename ElementType, typename MemorySpaceType>
 inline typename ArrayView<ElementType, MemorySpaceType>::value_type &
   ArrayView<ElementType, MemorySpaceType>::operator[](const std::size_t i) const
 {
+  Assert(i < n_elements, ExcIndexRange(i, 0, n_elements));
   Assert(
     (std::is_same<MemorySpaceType, MemorySpace::Host>::value),
     ExcMessage(
       "Accessing elements is only allowed if the data is stored in CPU memory!"));
-  Assert(i < n_elements, ExcIndexRange(i, 0, n_elements));
 
   return *(starting_element + i);
 }

diff --git a/tests/cuda/array_view_wrong_memory.cu b/tests/cuda/array_view_wrong_memory.cu
index 81bad10ed991c71746a3a97c617d91b7dfe8655e..5516431222687220dc29b07a9100bd8c919f6bbb 100644 (file)
--- a/tests/cuda/array_view_wrong_memory.cu
+++ b/tests/cuda/array_view_wrong_memory.cu
@@ -60,5 +60,11 @@ main(int argc, char **argv)
   deallog << "Testing device ArrayView with device memory" << std::endl;
   ArrayView<unsigned int, MemorySpace::CUDA> view_4(dummy_cuda.get(), 2);
 
+  deallog << "Testing host ArrayView to a nullptr with length 0" << std::endl;
+  ArrayView<unsigned int, MemorySpace::Host> view_5(nullptr, 0);
+
+  deallog << "Testing device ArrayView to a nullptr with length 0" << std::endl;
+  ArrayView<unsigned int, MemorySpace::CUDA> view_6(nullptr, 0);
+
   return 0;
 }

diff --git a/tests/cuda/array_view_wrong_memory.debug.output b/tests/cuda/array_view_wrong_memory.debug.output
index a714815cf8259f24cac050ef62ac5f97cb1cd9d1..bc64f38489e4972a1423399a2dd9f3170fec7ffd 100644 (file)
--- a/tests/cuda/array_view_wrong_memory.debug.output
+++ b/tests/cuda/array_view_wrong_memory.debug.output
@@ -6,7 +6,7 @@ DEAL::
 An error occurred in file <array_view.h> in function
     dealii::ArrayView<ElementType, MemorySpaceType>::ArrayView(dealii::ArrayView<ElementType, MemorySpaceType>::value_type*, std::size_t) [with ElementType = unsigned int; MemorySpaceType = dealii::MemorySpace::CUDA; dealii::ArrayView<ElementType, MemorySpaceType>::value_type = unsigned int; std::size_t = long unsigned int]
 The violated condition was: 
-    internal::ArrayViewHelper::is_in_correct_memory_space<MemorySpaceType>( starting_element)
+    n_elements == 0 || internal::ArrayViewHelper::is_in_correct_memory_space<MemorySpaceType>( starting_element)
 Additional information: 
     The memory space indicated by the template parameter and the one derived from the pointer value do not match!
 --------------------------------------------------------
@@ -17,9 +17,11 @@ DEAL::
 An error occurred in file <array_view.h> in function
     dealii::ArrayView<ElementType, MemorySpaceType>::ArrayView(dealii::ArrayView<ElementType, MemorySpaceType>::value_type*, std::size_t) [with ElementType = unsigned int; MemorySpaceType = dealii::MemorySpace::Host; dealii::ArrayView<ElementType, MemorySpaceType>::value_type = unsigned int; std::size_t = long unsigned int]
 The violated condition was: 
-    internal::ArrayViewHelper::is_in_correct_memory_space<MemorySpaceType>( starting_element)
+    n_elements == 0 || internal::ArrayViewHelper::is_in_correct_memory_space<MemorySpaceType>( starting_element)
 Additional information: 
     The memory space indicated by the template parameter and the one derived from the pointer value do not match!
 --------------------------------------------------------
 
 DEAL::Testing device ArrayView with device memory
+DEAL::Testing host ArrayView to a nullptr with length 0
+DEAL::Testing device ArrayView to a nullptr with length 0