Tweak the settings for unity builds slightly.

These two unity files had large (3.4 GB for fe/unity_3.cc, 5.4 GB for
grid/unity_0.cc) maximum resident set sizes.

diff --git a/source/fe/CMakeLists.txt b/source/fe/CMakeLists.txt
index 2beb0674210fe915b824e70495cb22236930107c..c9dd9761a95ad29212321dba227be5333be7bbd7 100644 (file)
--- a/source/fe/CMakeLists.txt
+++ b/source/fe/CMakeLists.txt
@@ -51,7 +51,6 @@ SET(_unity_include_src
   fe_series_legendre.cc
   fe_system.cc
   fe_enriched.cc
-  fe_tools.cc
   fe_trace.cc
   mapping_c1.cc
   mapping_cartesian.cc
@@ -72,6 +71,7 @@ SET(_separate_src
   fe_values_inst6.cc
   mapping_fe_field.cc
   mapping_fe_field_inst2.cc
+  fe_tools.cc
   fe_tools_interpolate.cc
   fe_tools_extrapolate.cc
   mapping_q_generic.cc

diff --git a/source/grid/CMakeLists.txt b/source/grid/CMakeLists.txt
index 5fe419f85633ff5a5bfec7e57c368215d6fc6423..f33e978527f38c3477edbeec3bca0fa9261dcb3a 100644 (file)
--- a/source/grid/CMakeLists.txt
+++ b/source/grid/CMakeLists.txt
@@ -17,12 +17,8 @@ INCLUDE_DIRECTORIES(BEFORE ${CMAKE_CURRENT_BINARY_DIR})
 
 SET(_unity_include_src
   cell_id.cc
-  grid_generator.cc
-  grid_generator_from_name.cc
-  grid_in.cc
-  grid_out.cc
   grid_refinement.cc
-  grid_tools_cache.cc
+  grid_reordering.cc
   intergrid_map.cc
   manifold.cc
   manifold_lib.cc
@@ -35,8 +31,12 @@ SET(_unity_include_src
   )
 
 SET(_separate_src
-  grid_reordering.cc
+  grid_generator_from_name.cc
+  grid_in.cc
+  grid_out.cc
+  grid_generator.cc
   grid_tools.cc
+  grid_tools_cache.cc
   grid_tools_dof_handlers.cc
   tria.cc
   )