Do not instantiate matrix-free if dim=1

diff --git a/source/matrix_free/CMakeLists.txt b/source/matrix_free/CMakeLists.txt
index a1d7d1ed97940401862b775176c9de349c4c0879..6f09ed5790a0152ba7c21615afcac266eea988da 100644 (file)
--- a/source/matrix_free/CMakeLists.txt
+++ b/source/matrix_free/CMakeLists.txt
@@ -38,7 +38,6 @@ IF(DEAL_II_WITH_CUDA)
     ${_src}
     )
   SET(_inst
-    cuda_matrix_free.inst.in
     ${_inst}
     )
   FILE(GLOB _header

diff --git a/source/matrix_free/cuda_matrix_free.cu b/source/matrix_free/cuda_matrix_free.cu
index 7a9328b76be5ce09395e1493a8563cbc3deb55c5..f122554f98e50bdb1ada710480212a2de658975d 100644 (file)
--- a/source/matrix_free/cuda_matrix_free.cu
+++ b/source/matrix_free/cuda_matrix_free.cu
@@ -21,8 +21,12 @@ DEAL_II_NAMESPACE_OPEN
 
 namespace CUDAWrappers
 {
-#  include "cuda_matrix_free.inst"
-}
+  // Do not instantiate for dim = 1
+  template class MatrixFree<2, float>;
+  template class MatrixFree<2, double>;
+  template class MatrixFree<3, float>;
+  template class MatrixFree<3, double>;
+} // namespace CUDAWrappers
 
 DEAL_II_NAMESPACE_CLOSE
 

diff --git a/source/matrix_free/cuda_matrix_free.inst.in b/source/matrix_free/cuda_matrix_free.inst.in
deleted file mode 100644 (file)
index 2e2d861..0000000
--- a/source/matrix_free/cuda_matrix_free.inst.in
+++ /dev/null
@@ -1,21 +0,0 @@
-// ---------------------------------------------------------------------
-//
-// Copyright (C) 2016 - 2017 by the deal.II authors
-//
-// This file is part of the deal.II library.
-//
-// The deal.II library is free software; you can use it, redistribute
-// it, and/or modify it under the terms of the GNU Lesser General
-// Public License as published by the Free Software Foundation; either
-// version 2.1 of the License, or (at your option) any later version.
-// The full text of the license can be found in the file LICENSE.md at
-// the top level directory of deal.II.
-//
-// ---------------------------------------------------------------------
-
-
-for (deal_II_dimension : DIMENSIONS)
-  {
-    template class MatrixFree<deal_II_dimension, double>;
-    template class MatrixFree<deal_II_dimension, float>;
-  }