Split data_out_dof_data instantiations.

This file currently requires 91s/3.9GB and 103s/3.3GB on debug and release,
respectively, with GCC7.2. With the split these are 53s/2.6GB - 52s/2.6GB and
60.5s/2.6GB - 59.1s/2.5GB: much better for memory usage.

diff --git a/source/numerics/CMakeLists.txt b/source/numerics/CMakeLists.txt
index fd906c011a9908116d5330eb2805b98fd9fb70e4..1bcbeea1e21cdc3eb3a02ed6eb1fd114b88efce8 100644 (file)
--- a/source/numerics/CMakeLists.txt
+++ b/source/numerics/CMakeLists.txt
@@ -36,6 +36,7 @@ SET(_unity_include_src
 
 SET(_separate_src
   data_out_dof_data.cc
+  data_out_dof_data_inst2.cc
   data_out_dof_data_codim.cc
   derivative_approximation.cc
   error_estimator_1d.cc

diff --git a/source/numerics/data_out_dof_data.cc b/source/numerics/data_out_dof_data.cc
index 1769f88ae720a52f42da2a9a75e8f0f53b76a4e4..a9db478c538108091f5ad15aa7b1d0f77e5ae35e 100644 (file)
--- a/source/numerics/data_out_dof_data.cc
+++ b/source/numerics/data_out_dof_data.cc
@@ -29,6 +29,8 @@
 
 DEAL_II_NAMESPACE_OPEN
 
+#define SPLIT_INSTANTIATIONS_COUNT 2
+#define SPLIT_INSTANTIATIONS_INDEX 0
 #include "data_out_dof_data.inst"
 
 DEAL_II_NAMESPACE_CLOSE

diff --git a/source/numerics/data_out_dof_data_inst2.cc b/source/numerics/data_out_dof_data_inst2.cc
new file mode 100644 (file)
index 0000000..b5943d5
--- /dev/null
+++ b/source/numerics/data_out_dof_data_inst2.cc
@@ -0,0 +1,36 @@
+// ---------------------------------------------------------------------
+//
+// Copyright (C) 2018 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.
+//
+// ---------------------------------------------------------------------
+
+#include <deal.II/lac/block_vector.h>
+#include <deal.II/lac/la_vector.h>
+#include <deal.II/lac/la_parallel_vector.h>
+#include <deal.II/lac/la_parallel_block_vector.h>
+#include <deal.II/lac/petsc_parallel_vector.h>
+#include <deal.II/lac/petsc_parallel_block_vector.h>
+#include <deal.II/lac/trilinos_vector.h>
+#include <deal.II/lac/trilinos_epetra_vector.h>
+#include <deal.II/lac/trilinos_parallel_block_vector.h>
+#include <deal.II/lac/vector.h>
+#include <deal.II/lac/vector_element_access.h>
+
+#include <deal.II/numerics/data_out_dof_data.templates.h>
+
+DEAL_II_NAMESPACE_OPEN
+
+#define SPLIT_INSTANTIATIONS_COUNT 2
+#define SPLIT_INSTANTIATIONS_INDEX 1
+#include "data_out_dof_data.inst"
+
+DEAL_II_NAMESPACE_CLOSE