new .inst splitting insolution_transfer.cc

diff --git a/source/numerics/CMakeLists.txt b/source/numerics/CMakeLists.txt
index 086368040c8ab7cb027056b467d8ba6c73a5d3f1..351c6c7c274481cd0a45594d40c375ca63986600 100644 (file)
--- a/source/numerics/CMakeLists.txt
+++ b/source/numerics/CMakeLists.txt
@@ -34,7 +34,6 @@ SET(_src
   solution_transfer.cc
   solution_transfer_inst2.cc
   solution_transfer_inst3.cc
-  solution_transfer_inst4.cc
   time_dependent.cc
   vector_tools_boundary.cc
   vector_tools_constraints.cc

diff --git a/source/numerics/solution_transfer.cc b/source/numerics/solution_transfer.cc
index 883ac6f43c1bbe52df9c29a9dfd50d52ec46b7d6..4bdc71814ee310e6fa0d2c80cb03f6cbdfbd262a 100644 (file)
--- a/source/numerics/solution_transfer.cc
+++ b/source/numerics/solution_transfer.cc
@@ -563,18 +563,11 @@ SolutionTransfer<dim, VECTOR, DH>::Pointerstruct::memory_consumption () const
 }
 
 
-
 /*-------------- Explicit Instantiations -------------------------------*/
-#ifdef SOLUTION_TRANSFER_INSTANTIATE_PART_TWO
-#define DIM_A 3
-#define DIM_B 3
-#else
-#define DIM_A 1
-#define DIM_B 2
+#define SPLIT_INSTANTIATIONS_COUNT 4
+#ifndef SPLIT_INSTANTIATIONS_INDEX
+#define SPLIT_INSTANTIATIONS_INDEX 0
 #endif
-
-// This file compiles the first quarter of the instantiations from solution_transfer.cc
-// to reduce the compilation unit (and memory consumption)
 #include "solution_transfer.inst"
 
 DEAL_II_NAMESPACE_CLOSE

diff --git a/source/numerics/solution_transfer.inst.in b/source/numerics/solution_transfer.inst.in
index b451fcdec99b68c058fd68fb522cc780df9fc726..9004235b7a2c750aef4863d00b5c99f08e483fb5 100644 (file)
--- a/source/numerics/solution_transfer.inst.in
+++ b/source/numerics/solution_transfer.inst.in
@@ -15,17 +15,11 @@
 
 
 for (VEC : SERIAL_VECTORS; deal_II_dimension : DIMENSIONS; deal_II_space_dimension :  SPACE_DIMENSIONS)
-  {
+{
 #if deal_II_dimension <= deal_II_space_dimension
-#if (deal_II_space_dimension == DIM_A) || (deal_II_space_dimension == DIM_B)
-
-#ifndef INSTANTIATE_HP_DH
     template class SolutionTransfer<deal_II_dimension, VEC, DoFHandler<deal_II_dimension, deal_II_space_dimension> >;
-#else
     template class SolutionTransfer<deal_II_dimension, VEC, hp::DoFHandler<deal_II_dimension, deal_II_space_dimension> >;
 #endif
-#endif
-#endif
 }
 
 

diff --git a/source/numerics/solution_transfer_inst2.cc b/source/numerics/solution_transfer_inst2.cc
index 42d15e4ae9ee0eef0ceb55f6ca2d0abb017ad992..de2971ea4e29a5d46223e60f1d2f9c828e9bb27e 100644 (file)
--- a/source/numerics/solution_transfer_inst2.cc
+++ b/source/numerics/solution_transfer_inst2.cc
@@ -16,7 +16,5 @@
 // This file compiles the second quarter of the instantiations from solution_transfer.cc
 // to reduce the compilation unit (and memory consumption)
 
-//#define INSTANTIATE_HP_DH
-#define SOLUTION_TRANSFER_INSTANTIATE_PART_TWO
-
+#define SPLIT_INSTANTIATIONS_INDEX 1
 #include "solution_transfer.cc"

diff --git a/source/numerics/solution_transfer_inst3.cc b/source/numerics/solution_transfer_inst3.cc
index 1561709c1426699c9d6b9203f383c8e919e7de9b..45745e43656f939b75452e9b9aab5418a07ecd4c 100644 (file)
--- a/source/numerics/solution_transfer_inst3.cc
+++ b/source/numerics/solution_transfer_inst3.cc
@@ -16,7 +16,5 @@
 // This file compiles the third quarter of the instantiations from solution_transfer.cc
 // to reduce the compilation unit (and memory consumption)
 
-#define INSTANTIATE_HP_DH
-//#define SOLUTION_TRANSFER_INSTANTIATE_PART_TWO
-
+#define SPLIT_INSTANTIATIONS_INDEX 2
 #include "solution_transfer.cc"

diff --git a/source/numerics/solution_transfer_inst4.cc b/source/numerics/solution_transfer_inst4.cc
deleted file mode 100644 (file)
index ee267e7..0000000
--- a/source/numerics/solution_transfer_inst4.cc
+++ /dev/null
@@ -1,22 +0,0 @@
-// ---------------------------------------------------------------------
-//
-// Copyright (C) 2013 - 2014 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 at
-// the top level of the deal.II distribution.
-//
-// ---------------------------------------------------------------------
-
-// This file compiles the fourth quarter of the instantiations from solution_transfer.cc
-// to reduce the compilation unit (and memory consumption)
-
-#define INSTANTIATE_HP_DH
-#define SOLUTION_TRANSFER_INSTANTIATE_PART_TWO
-
-#include "solution_transfer.cc"