From 42c6fa1396071b0ebbd744a6b1b45e25d55580a3 Mon Sep 17 00:00:00 2001 From: Wolfgang Bangerth Date: Mon, 26 May 2025 17:24:51 -0600 Subject: [PATCH] Avoid including .cc files for split instantiations. --- source/numerics/solution_transfer.cc | 5 ++--- source/numerics/solution_transfer_inst2.cc | 12 +++++++++--- source/numerics/solution_transfer_inst3.cc | 12 +++++++++--- source/numerics/solution_transfer_inst4.cc | 12 +++++++++--- 4 files changed, 29 insertions(+), 12 deletions(-) diff --git a/source/numerics/solution_transfer.cc b/source/numerics/solution_transfer.cc index 7bb3620d1e..60b8cdeb63 100644 --- a/source/numerics/solution_transfer.cc +++ b/source/numerics/solution_transfer.cc @@ -19,9 +19,8 @@ DEAL_II_NAMESPACE_OPEN #define SPLIT_INSTANTIATIONS_COUNT 4 -#ifndef SPLIT_INSTANTIATIONS_INDEX -# define SPLIT_INSTANTIATIONS_INDEX 0 -#endif +#define SPLIT_INSTANTIATIONS_INDEX 0 + #include "numerics/solution_transfer.inst" DEAL_II_NAMESPACE_CLOSE diff --git a/source/numerics/solution_transfer_inst2.cc b/source/numerics/solution_transfer_inst2.cc index e54840b246..60a0ca8974 100644 --- a/source/numerics/solution_transfer_inst2.cc +++ b/source/numerics/solution_transfer_inst2.cc @@ -12,8 +12,14 @@ // // ------------------------------------------------------------------------ -// This file compiles the second quarter of the instantiations from -// solution_transfer.cc to reduce the compilation unit (and memory consumption) +#include + +DEAL_II_NAMESPACE_OPEN + +#define SPLIT_INSTANTIATIONS_COUNT 4 #define SPLIT_INSTANTIATIONS_INDEX 1 -#include "solution_transfer.cc" + +#include "numerics/solution_transfer.inst" + +DEAL_II_NAMESPACE_CLOSE diff --git a/source/numerics/solution_transfer_inst3.cc b/source/numerics/solution_transfer_inst3.cc index 608ea0d8bb..8b54853ca0 100644 --- a/source/numerics/solution_transfer_inst3.cc +++ b/source/numerics/solution_transfer_inst3.cc @@ -12,8 +12,14 @@ // // ------------------------------------------------------------------------ -// This file compiles the third quarter of the instantiations from -// solution_transfer.cc to reduce the compilation unit (and memory consumption) +#include + +DEAL_II_NAMESPACE_OPEN + +#define SPLIT_INSTANTIATIONS_COUNT 4 #define SPLIT_INSTANTIATIONS_INDEX 2 -#include "solution_transfer.cc" + +#include "numerics/solution_transfer.inst" + +DEAL_II_NAMESPACE_CLOSE diff --git a/source/numerics/solution_transfer_inst4.cc b/source/numerics/solution_transfer_inst4.cc index de988d46f4..7f096f83bc 100644 --- a/source/numerics/solution_transfer_inst4.cc +++ b/source/numerics/solution_transfer_inst4.cc @@ -12,8 +12,14 @@ // // ------------------------------------------------------------------------ -// This file compiles the last quarter of the instantiations from -// solution_transfer.cc to reduce the compilation unit (and memory consumption) +#include + +DEAL_II_NAMESPACE_OPEN + +#define SPLIT_INSTANTIATIONS_COUNT 4 #define SPLIT_INSTANTIATIONS_INDEX 3 -#include "solution_transfer.cc" + +#include "numerics/solution_transfer.inst" + +DEAL_II_NAMESPACE_CLOSE -- 2.39.5