From: Author: Daniel Arndt <daniel.arndt@iwr.uni-heidelberg.de>
Date: Mon, 26 Nov 2018 14:09:20 +0000 (+0000)
Subject: Fix tests
X-Git-Tag: v9.1.0-rc1~535^2
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F7463%2Fhead;p=dealii.git

Fix tests
---

diff --git a/include/deal.II/matrix_free/cuda_matrix_free.h b/include/deal.II/matrix_free/cuda_matrix_free.h
index 75af6c004e..a8932d9b32 100644
--- a/include/deal.II/matrix_free/cuda_matrix_free.h
+++ b/include/deal.II/matrix_free/cuda_matrix_free.h
@@ -252,12 +252,12 @@ namespace CUDAWrappers
      * Initializes the data structures.
      */
     void
-    reinit(const Mapping<dim> &             mapping,
-           const DoFHandler<dim> &          dof_handler,
-           const AffineConstraints<Number> &constraints,
-           const Quadrature<1> &            quad,
-           std::shared_ptr<const MPI_Comm>  comm,
-           const AdditionalData             additional_data);
+    internal_reinit(const Mapping<dim> &             mapping,
+                    const DoFHandler<dim> &          dof_handler,
+                    const AffineConstraints<Number> &constraints,
+                    const Quadrature<1> &            quad,
+                    std::shared_ptr<const MPI_Comm>  comm,
+                    const AdditionalData             additional_data);
 
     /**
      * Helper function. Loop over all the cells and apply the functor on each
diff --git a/include/deal.II/matrix_free/cuda_matrix_free.templates.h b/include/deal.II/matrix_free/cuda_matrix_free.templates.h
index 89625a885c..9e8c5e35f5 100644
--- a/include/deal.II/matrix_free/cuda_matrix_free.templates.h
+++ b/include/deal.II/matrix_free/cuda_matrix_free.templates.h
@@ -520,12 +520,12 @@ namespace CUDAWrappers
                                   const MPI_Comm &                 comm,
                                   const AdditionalData additional_data)
   {
-    reinit(mapping,
-           dof_handler,
-           constraints,
-           quad,
-           std::make_shared<const MPI_Comm>(comm),
-           additional_data);
+    internal_reinit(mapping,
+                    dof_handler,
+                    constraints,
+                    quad,
+                    std::make_shared<const MPI_Comm>(comm),
+                    additional_data);
   }
 
 
@@ -538,12 +538,12 @@ namespace CUDAWrappers
                                   const MPI_Comm &                 comm,
                                   const AdditionalData additional_data)
   {
-    reinit(StaticMappingQ1<dim>::mapping,
-           dof_handler,
-           constraints,
-           quad,
-           std::make_shared<const MPI_Comm>(comm),
-           additional_data);
+    internal_reinit(StaticMappingQ1<dim>::mapping,
+                    dof_handler,
+                    constraints,
+                    quad,
+                    std::make_shared<const MPI_Comm>(comm),
+                    additional_data);
   }
 
 
@@ -556,7 +556,8 @@ namespace CUDAWrappers
                                   const Quadrature<1> &            quad,
                                   const AdditionalData additional_data)
   {
-    reinit(mapping, dof_handler, constraints, quad, nullptr, additional_data);
+    internal_reinit(
+      mapping, dof_handler, constraints, quad, nullptr, additional_data);
   }
 
 
@@ -568,12 +569,12 @@ namespace CUDAWrappers
                                   const Quadrature<1> &            quad,
                                   const AdditionalData additional_data)
   {
-    reinit(StaticMappingQ1<dim>::mapping,
-           dof_handler,
-           constraints,
-           quad,
-           nullptr,
-           additional_data);
+    internal_reinit(StaticMappingQ1<dim>::mapping,
+                    dof_handler,
+                    constraints,
+                    quad,
+                    nullptr,
+                    additional_data);
   }
 
 
@@ -753,12 +754,13 @@ namespace CUDAWrappers
 
   template <int dim, typename Number>
   void
-  MatrixFree<dim, Number>::reinit(const Mapping<dim> &             mapping,
-                                  const DoFHandler<dim> &          dof_handler,
-                                  const AffineConstraints<Number> &constraints,
-                                  const Quadrature<1> &            quad,
-                                  std::shared_ptr<const MPI_Comm>  comm,
-                                  const AdditionalData additional_data)
+  MatrixFree<dim, Number>::internal_reinit(
+    const Mapping<dim> &             mapping,
+    const DoFHandler<dim> &          dof_handler,
+    const AffineConstraints<Number> &constraints,
+    const Quadrature<1> &            quad,
+    std::shared_ptr<const MPI_Comm>  comm,
+    const AdditionalData             additional_data)
   {
     if (typeid(Number) == typeid(double))
       cudaDeviceSetSharedMemConfig(cudaSharedMemBankSizeEightByte);