Merge pull request #3021 from boutproject/fix-recompilation-cascade

Fix recompilation cascade
boutproject · Nov 7, 2024 · bb5f194 · bb5f194
2 parents daffcf9 + 0d413f4
commit bb5f194
Show file tree

Hide file tree

Showing 121 changed files with 665 additions and 772 deletions.
diff --git a/include/bout/adios_object.hxx b/include/bout/adios_object.hxx
@@ -12,7 +12,7 @@
 #ifndef ADIOS_OBJECT_HXX
 #define ADIOS_OBJECT_HXX
 
-#include "bout/build_config.hxx"
+#include "bout/build_defines.hxx"
 
 #if BOUT_HAS_ADIOS2
 

diff --git a/include/bout/array.hxx b/include/bout/array.hxx
@@ -35,7 +35,7 @@
 #include <omp.h>
 #endif
 
-#include "bout/build_config.hxx"
+#include "bout/build_defines.hxx"
 
 #if BOUT_HAS_UMPIRE
 #include "umpire/Allocator.hpp"

diff --git a/include/bout/bout.hxx b/include/bout/bout.hxx
@@ -35,7 +35,7 @@
 #define BOUT_H
 
 // IWYU pragma: begin_keep, begin_export
-#include "bout/build_config.hxx"
+#include "bout/build_defines.hxx"
 
 #include "bout/boutcomm.hxx"
 #include "bout/difops.hxx" // Differential operators
@@ -52,7 +52,6 @@
 #include "bout/vecops.hxx" // Vector differential operations
 #include "bout/vector2d.hxx"
 #include "bout/vector3d.hxx"
-#include "bout/version.hxx"
 #include "bout/where.hxx"
 // IWYU pragma: end_keep, end_export
 

diff --git a/include/bout/caliper_wrapper.hxx b/include/bout/caliper_wrapper.hxx
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "bout/build_config.hxx"
+#include "bout/build_defines.hxx"
 
 #if BOUT_HAS_CALIPER
 #include <caliper/cali-manager.h>

diff --git a/include/bout/coordinates.hxx b/include/bout/coordinates.hxx
@@ -33,11 +33,10 @@
 #ifndef BOUT_COORDINATES_H
 #define BOUT_COORDINATES_H
 
+#include "bout/bout_types.hxx"
 #include "bout/field2d.hxx"
 #include "bout/field3d.hxx"
 #include "bout/paralleltransform.hxx"
-#include "bout/utils.hxx"
-#include <bout/bout_types.hxx>
 
 class Mesh;
 

diff --git a/include/bout/field.hxx b/include/bout/field.hxx
@@ -29,28 +29,21 @@ class Field;
 #ifndef FIELD_H
 #define FIELD_H
 
-#include "bout/build_config.hxx"
-
 #include <cmath>
 #include <cstdio>
-#include <memory>
 #include <string>
 
-#include "bout/field_data.hxx"
-
 #include "bout/bout_types.hxx"
 #include "bout/boutcomm.hxx"
 #include "bout/boutexception.hxx"
+#include "bout/field_data.hxx"
 #include "bout/msg_stack.hxx"
 #include "bout/region.hxx"
-#include "bout/stencils.hxx"
 #include "bout/traits.hxx"
 #include "bout/utils.hxx"
 #include <bout/globals.hxx>
 #include <bout/rvec.hxx>
 
-#include "bout/unused.hxx"
-
 class Mesh;
 
 /// Base class for scalar fields

diff --git a/include/bout/field2d.hxx b/include/bout/field2d.hxx
@@ -30,23 +30,21 @@ class Field2D;
 #ifndef BOUT_FIELD2D_H
 #define BOUT_FIELD2D_H
 
-class Mesh;
+#include "bout/array.hxx"
+#include "bout/build_config.hxx"
 #include "bout/field.hxx"
 #include "bout/field_data.hxx"
-class Field3D;
 #include "bout/fieldperp.hxx"
-#include "bout/stencils.hxx"
-
-#include "bout/array.hxx"
 #include "bout/region.hxx"
-#include "bout/utils.hxx"
-
 #include "bout/unused.hxx"
 
 #if BOUT_HAS_RAJA
 #include "RAJA/RAJA.hpp" // using RAJA lib
 #endif
 
+class Field3D;
+class Mesh;
+
 /*!
  * \brief 2D X-Y scalar fields
  *

diff --git a/include/bout/field3d.hxx b/include/bout/field3d.hxx
@@ -26,23 +26,19 @@ class Field3D;
 #ifndef BOUT_FIELD3D_H
 #define BOUT_FIELD3D_H
 
-class Mesh; // #include "bout/mesh.hxx"
+#include "bout/array.hxx"
+#include "bout/assert.hxx"
 #include "bout/bout_types.hxx"
 #include "bout/field.hxx"
 #include "bout/field2d.hxx"
 #include "bout/fieldperp.hxx"
-#include "bout/stencils.hxx"
-
-#include "bout/array.hxx"
 #include "bout/region.hxx"
 
-#include "bout/assert.hxx"
-
-#include "bout/utils.hxx"
-
 #include <optional>
 #include <vector>
 
+class Mesh;
+
 /// Class for 3D X-Y-Z scalar fields
 /*!
   This class represents a scalar field defined over the mesh.

diff --git a/include/bout/hypre_interface.hxx b/include/bout/hypre_interface.hxx
@@ -1,7 +1,7 @@
 #ifndef BOUT_HYPRE_INTERFACE_H
 #define BOUT_HYPRE_INTERFACE_H
 
-#include "bout/build_config.hxx"
+#include "bout/build_defines.hxx"
 
 #if BOUT_HAS_HYPRE
 

diff --git a/include/bout/hyprelib.hxx b/include/bout/hyprelib.hxx
@@ -43,7 +43,7 @@
 #ifndef BOUT_HYPRELIB_H
 #define BOUT_HYPRELIB_H
 
-#include "bout/build_config.hxx"
+#include "bout/build_defines.hxx"
 
 namespace bout {
 #if BOUT_HAS_HYPRE

diff --git a/include/bout/interpolation.hxx b/include/bout/interpolation.hxx
@@ -27,6 +27,7 @@
 #define BOUT_INTERP_H
 
 #include "bout/mesh.hxx"
+#include "bout/stencils.hxx"
 
 /// Perform interpolation between centre -> shifted or vice-versa
 /*!

diff --git a/include/bout/invert/laplacexy.hxx b/include/bout/invert/laplacexy.hxx
@@ -33,7 +33,7 @@
 #ifndef BOUT_LAPLACE_XY_H
 #define BOUT_LAPLACE_XY_H
 
-#include "bout/build_config.hxx"
+#include "bout/build_defines.hxx"
 
 #if !BOUT_HAS_PETSC
 // If no PETSc

diff --git a/include/bout/invert_laplace.hxx b/include/bout/invert_laplace.hxx
@@ -34,7 +34,7 @@ class Laplacian;
 #ifndef BOUT_LAPLACE_H
 #define BOUT_LAPLACE_H
 
-#include "bout/build_config.hxx"
+#include "bout/build_defines.hxx"
 
 #if BOUT_HAS_PETSC
 #define PVEC_REAL_MPI_TYPE MPI_DOUBLE

diff --git a/include/bout/invertable_operator.hxx b/include/bout/invertable_operator.hxx
@@ -33,7 +33,7 @@ class InvertableOperator;
 #ifndef BOUT_INVERTABLE_OPERATOR_H
 #define BOUT_INVERTABLE_OPERATOR_H
 
-#include "bout/build_config.hxx"
+#include "bout/build_defines.hxx"
 
 #if BOUT_HAS_PETSC
 

diff --git a/include/bout/lapack_routines.hxx b/include/bout/lapack_routines.hxx
@@ -23,7 +23,8 @@
 #ifndef BOUT_LAPACK_ROUTINES_H
 #define BOUT_LAPACK_ROUTINES_H
 
-#include <bout/utils.hxx>
+#include "bout/dcomplex.hxx"
+#include "bout/utils.hxx"
 
 /* Tridiagonal inversion
  *

diff --git a/include/bout/msg_stack.hxx b/include/bout/msg_stack.hxx
@@ -29,7 +29,7 @@ class MsgStack;
 #ifndef BOUT_MSG_STACK_H
 #define BOUT_MSG_STACK_H
 
-#include "bout/build_config.hxx"
+#include "bout/build_defines.hxx"
 
 #include "bout/unused.hxx"
 

diff --git a/include/bout/options_io.hxx b/include/bout/options_io.hxx
@@ -35,7 +35,7 @@
 #ifndef OPTIONS_IO_H
 #define OPTIONS_IO_H
 
-#include "bout/build_config.hxx"
+#include "bout/build_defines.hxx"
 #include "bout/generic_factory.hxx"
 #include "bout/options.hxx"
 

diff --git a/include/bout/paralleltransform.hxx b/include/bout/paralleltransform.hxx
@@ -7,6 +7,7 @@
 #define BOUT_PARALLELTRANSFORM_H
 
 #include "bout/bout_types.hxx"
+#include "bout/dcomplex.hxx"
 #include "bout/field3d.hxx"
 #include "bout/options.hxx"
 #include "bout/unused.hxx"

diff --git a/include/bout/petsc_interface.hxx b/include/bout/petsc_interface.hxx
@@ -30,7 +30,7 @@
 #ifndef BOUT_PETSC_INTERFACE_H
 #define BOUT_PETSC_INTERFACE_H
 
-#include "bout/build_config.hxx"
+#include "bout/build_defines.hxx"
 
 #if BOUT_HAS_PETSC
 

diff --git a/include/bout/scorepwrapper.hxx b/include/bout/scorepwrapper.hxx
@@ -1,7 +1,7 @@
 #ifndef BOUT_SCOREP_H
 #define BOUT_SCOREP_H
 
-#include "bout/build_config.hxx"
+#include "bout/build_defines.hxx"
 
 #include "bout/msg_stack.hxx"
 #include <bout/bout_types.hxx>

diff --git a/include/bout/slepclib.hxx b/include/bout/slepclib.hxx
@@ -45,7 +45,7 @@ class SlepcLib;
 #ifndef BOUT_SLEPCLIB_H
 #define BOUT_SLEPCLIB_H
 
-#include "bout/build_config.hxx"
+#include "bout/build_defines.hxx"
 
 #if BOUT_HAS_SLEPC
 

diff --git a/include/bout/solver.hxx b/include/bout/solver.hxx
@@ -36,7 +36,7 @@
 #ifndef SOLVER_H
 #define SOLVER_H
 
-#include "bout/build_config.hxx"
+#include "bout/build_defines.hxx"
 
 #include "bout/bout_types.hxx"
 #include "bout/boutexception.hxx"

diff --git a/include/bout/sys/gettext.hxx b/include/bout/sys/gettext.hxx
@@ -3,7 +3,7 @@
 #ifndef BOUT_GETTEXT_H
 #define BOUT_GETTEXT_H
 
-#include "bout/build_config.hxx"
+#include "bout/build_defines.hxx"
 
 #if BOUT_HAS_GETTEXT
 

diff --git a/include/bout/sys/uuid.h b/include/bout/sys/uuid.h
@@ -24,7 +24,7 @@
 #ifndef BOUT_UUID_H
 #define BOUT_UUID_H
 
-#include "bout/build_config.hxx"
+#include "bout/build_defines.hxx"
 
 #include <array>
 #include <atomic>

diff --git a/include/bout/utils.hxx b/include/bout/utils.hxx
@@ -29,13 +29,12 @@
 #ifndef BOUT_UTILS_H
 #define BOUT_UTILS_H
 
-#include "bout/bout_types.hxx"
-#include "bout/boutexception.hxx"
-#include "bout/dcomplex.hxx"
+#include "bout/build_config.hxx"
 
 #include "bout/array.hxx"
 #include "bout/assert.hxx"
-#include "bout/build_config.hxx"
+#include "bout/bout_types.hxx"
+#include "bout/boutexception.hxx"
 #include "bout/msg_stack.hxx"
 #include "bout/region.hxx"
 #include "bout/unused.hxx"
@@ -46,6 +45,7 @@
 #include <list>
 #include <memory>
 #include <set>
+#include <sstream>
 #include <string>
 
 #ifdef _MSC_VER

diff --git a/include/bout/vectormetric.hxx b/include/bout/vectormetric.hxx
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "bout/build_config.hxx"
+#include "bout/build_defines.hxx"
 
 #if BOUT_USE_METRIC_3D
 #include "bout/vector3d.hxx"

diff --git a/src/invert/fft_fftw.cxx b/src/invert/fft_fftw.cxx
@@ -25,7 +25,7 @@
  *
  **************************************************************************/
 
-#include "bout/build_config.hxx"
+#include "bout/build_defines.hxx"
 
 #include <bout/fft.hxx>
 #include <bout/globals.hxx>

diff --git a/src/invert/lapack_routines.cxx b/src/invert/lapack_routines.cxx
@@ -34,7 +34,7 @@
  *
  */
 
-#include "bout/build_config.hxx"
+#include "bout/build_defines.hxx"
 
 #include <bout/boutexception.hxx>
 #include <bout/dcomplex.hxx>

diff --git a/src/invert/laplace/impls/cyclic/cyclic_laplace.hxx b/src/invert/laplace/impls/cyclic/cyclic_laplace.hxx
@@ -31,7 +31,7 @@ class LaplaceCyclic;
 #ifndef BOUT_LAP_CYCLIC_H
 #define BOUT_LAP_CYCLIC_H
 
-#include "bout/build_config.hxx"
+#include "bout/build_defines.hxx"
 #include "bout/invert_laplace.hxx"
 
 #if BOUT_USE_METRIC_3D

diff --git a/src/invert/laplace/impls/hypre3d/hypre3d_laplace.cxx b/src/invert/laplace/impls/hypre3d/hypre3d_laplace.cxx
@@ -23,7 +23,7 @@
  * along with BOUT++.  If not, see <http://www.gnu.org/licenses/>.
  *
  **************************************************************************/
-#include "bout/build_config.hxx"
+#include "bout/build_defines.hxx"
 
 #if BOUT_HAS_HYPRE
 

diff --git a/src/invert/laplace/impls/hypre3d/hypre3d_laplace.hxx b/src/invert/laplace/impls/hypre3d/hypre3d_laplace.hxx
@@ -28,7 +28,7 @@
  **************************************************************************/
 class LaplaceHypre3d;
 
-#include "bout/build_config.hxx"
+#include "bout/build_defines.hxx"
 
 #ifndef BOUT_LAPLACE_HYPRE3D_H
 #define BOUT_LAPLACE_HYPRE3D_H

diff --git a/src/invert/laplace/impls/iterative_parallel_tri/iterative_parallel_tri.cxx b/src/invert/laplace/impls/iterative_parallel_tri/iterative_parallel_tri.cxx
@@ -25,7 +25,7 @@
  **************************************************************************/
 
 #include "iterative_parallel_tri.hxx"
-#include "bout/build_config.hxx"
+#include "bout/build_defines.hxx"
 
 #if not BOUT_USE_METRIC_3D
 

diff --git a/src/invert/laplace/impls/iterative_parallel_tri/iterative_parallel_tri.hxx b/src/invert/laplace/impls/iterative_parallel_tri/iterative_parallel_tri.hxx
@@ -29,7 +29,7 @@ class LaplaceIPT;
 #ifndef BOUT_IPT_H
 #define BOUT_IPT_H
 
-#include "bout/build_config.hxx"
+#include "bout/build_defines.hxx"
 #include "bout/invert_laplace.hxx"
 
 #if BOUT_USE_METRIC_3D

diff --git a/src/invert/laplace/impls/multigrid/multigrid_alg.cxx b/src/invert/laplace/impls/multigrid/multigrid_alg.cxx
@@ -27,7 +27,7 @@
  *
  **************************************************************************/
 
-#include "bout/build_config.hxx"
+#include "bout/build_defines.hxx"
 
 #if not BOUT_USE_METRIC_3D
 

diff --git a/src/invert/laplace/impls/multigrid/multigrid_laplace.cxx b/src/invert/laplace/impls/multigrid/multigrid_laplace.cxx
@@ -28,7 +28,7 @@
  **************************************************************************/
 
 #include "multigrid_laplace.hxx"
-#include "bout/build_config.hxx"
+#include "bout/build_defines.hxx"
 
 #if not BOUT_USE_METRIC_3D