ADC-393 Re-nest core, physics, amr into sub-families

CHANGELOG.md

@@ -239,6 +239,17 @@ Format: [Keep a Changelog](https://keepachangelog.com/en/1.1.0/); versioning
 
 ### Changed
 
+- **`include/adc` deep re-nest, phase 2: core / physics / amr split into sub-families** (ADC-393,
+  follow-up of ADC-392): `core/` now groups `foundation/` (types, cold, allocator, kokkos_env),
+  `state/` (state, variables, aux_names) and `model/` (physical_model, equation_block,
+  coupled_system); `physics/` groups `bricks/` (bricks, hyperbolic, elliptic, source),
+  `composition/` (composite) and `fluids/` (euler); `amr/` groups `hierarchy/`, `tagging/` and
+  `regridding/`. Every internal `#include <adc/...>` and the DSL emit (`physics/bricks.hpp`,
+  `core/variables.hpp`) are repointed. Public include-path break (pre-1.0). Also retires the
+  deprecated physics compat forwarders
+  `physics/{advection_diffusion,langmuir,two_fluid_isothermal}.hpp` (the bricks live at
+  `validation/physics/` under `adc::validation` since ADC-329; only the dedicated
+  `test_physics_validation_compat` used the old `adc::` aliases, removed with them).
 - **`quality.yml` pins clang-format to 19.1.7** (ADC-381): the now-blocking `format` job installed
   whatever clang-format the `ubuntu-latest` runner shipped (~v14-18) via `apt-get`, so Google-style
   output drift between major versions could fail the gate on an otherwise-clean tree. It now installs

bench/common.hpp

@@ -26,7 +26,7 @@
 ///   dette CONNUE, a resorber aux prochaines passes en pointant vers les briques d'ici. Aucun
 ///   changement de comportement attendu a chaque migration (meme sortie chronometree, meme JSON).
 
-#include <adc/core/kokkos_env.hpp>  // device_fence (seam backend : no-op serie/OpenMP, fence sous Cuda)
+#include <adc/core/foundation/kokkos_env.hpp>  // device_fence (seam backend : no-op serie/OpenMP, fence sous Cuda)
 
 #include <algorithm>
 #include <chrono>

bench/frontend_cpp.cpp

@@ -28,8 +28,8 @@
 #include <adc/numerics/elliptic/mg/geometric_mg.hpp>
 #include <adc/numerics/spatial_operator.hpp>
 #include <adc/parallel/comm.hpp>
-#include <adc/physics/bricks.hpp>  // CompositeModel, NoSource, ChargeDensity, kAuxBaseComps
-#include <adc/physics/euler.hpp>   // Euler (brique hyperbolique compressible 4 var)
+#include <adc/physics/bricks/bricks.hpp>  // CompositeModel, NoSource, ChargeDensity, kAuxBaseComps
+#include <adc/physics/fluids/euler.hpp>   // Euler (brique hyperbolique compressible 4 var)
 
 #include "common.hpp"  // adc::bench::{timed, PhaseTimers, percentile, eat} (briques de mesure partagees)
 

bench/profile_step.cpp

@@ -36,7 +36,7 @@
 #include <adc/numerics/elliptic/poisson/poisson_fft_solver.hpp>
 #include <adc/numerics/spatial_operator.hpp>
 #include <adc/parallel/comm.hpp>
-#include <adc/physics/bricks.hpp>  // CompositeModel, ExBVelocity, NoSource, ChargeDensity
+#include <adc/physics/bricks/bricks.hpp>  // CompositeModel, ExBVelocity, NoSource, ChargeDensity
 
 #include "common.hpp"  // adc::bench::{timed, PhaseTimers, eat} (briques de mesure partagees)
 

bench/profile_transport_mbox.cpp

@@ -22,8 +22,8 @@
 #include <adc/numerics/spatial_operator.hpp>
 #include <adc/parallel/comm.hpp>
 #include <adc/parallel/load_balance.hpp>
-#include <adc/physics/bricks.hpp>
-#include <adc/physics/euler.hpp>
+#include <adc/physics/bricks/bricks.hpp>
+#include <adc/physics/fluids/euler.hpp>
 
 #include <algorithm>
 #include <chrono>

bench/scaling_amr.cpp

@@ -13,8 +13,8 @@
 // Lance via bench/run_scaling.sh (kokkos-omp / kokkos-cuda / mpi-cuda) en srun -n 1/2/4.
 
 #include <adc/parallel/comm.hpp>
-#include <adc/physics/bricks.hpp>
-#include <adc/physics/euler.hpp>
+#include <adc/physics/bricks/bricks.hpp>
+#include <adc/physics/fluids/euler.hpp>
 #include <adc/runtime/builders/amr_dsl_block.hpp>
 #include <adc/runtime/amr_system.hpp>
 

bench/scaling_step.cpp

@@ -25,8 +25,8 @@
 #include <adc/numerics/elliptic/mg/geometric_mg.hpp>
 #include <adc/numerics/spatial_operator.hpp>
 #include <adc/parallel/comm.hpp>
-#include <adc/physics/bricks.hpp>
-#include <adc/physics/euler.hpp>
+#include <adc/physics/bricks/bricks.hpp>
+#include <adc/physics/fluids/euler.hpp>
 
 #include <algorithm>
 #include <chrono>

docs/validation/diocotron_amr_gpu.cpp

@@ -44,7 +44,7 @@
 // global reconstruit), donc aucun deadlock.
 
 #include <adc/parallel/comm.hpp>
-#include <adc/physics/composite.hpp>
+#include <adc/physics/composition/composite.hpp>
 #include <adc/runtime/builders/amr_dsl_block.hpp>  // add_compiled_model(AmrSystem&, ...)
 #include <adc/runtime/amr_system.hpp>
 

docs/validation/diocotron_gpu.cpp

@@ -23,7 +23,7 @@
 // local_size()==0 -> contribuent 0 a l'all-reduce), identique a la topologie CPU de run_mpi.py.
 
 #include <adc/parallel/comm.hpp>
-#include <adc/physics/composite.hpp>
+#include <adc/physics/composition/composite.hpp>
 #include <adc/runtime/builders/dsl_block.hpp>
 #include <adc/runtime/system.hpp>
 

fuzz/fuzz_cluster.cpp

@@ -8,8 +8,8 @@
 /// chop final) est exactement la classe de code geometrique ou les bords degeneres mordent
 /// (boites 1x1, lignes vides, domaines plats 1xN).
 
-#include <adc/amr/cluster.hpp>
-#include <adc/amr/tag_box.hpp>
+#include <adc/amr/tagging/cluster.hpp>
+#include <adc/amr/tagging/tag_box.hpp>
 #include <adc/mesh/box2d.hpp>
 
 #include <cstdint>

include/adc/amr/amr_hierarchy.hpp → include/adc/amr/hierarchy/amr_hierarchy.hpp

@@ -15,7 +15,7 @@
 
 #pragma once
 
-#include <adc/amr/refinement_ratio.hpp>
+#include <adc/amr/hierarchy/refinement_ratio.hpp>
 #include <adc/mesh/box2d.hpp>
 #include <adc/mesh/box_array.hpp>
 #include <adc/mesh/distribution_mapping.hpp>

include/adc/amr/regrid.hpp → include/adc/amr/regridding/regrid.hpp

@@ -15,9 +15,9 @@
 
 #pragma once
 
-#include <adc/amr/amr_hierarchy.hpp>
-#include <adc/amr/cluster.hpp>
-#include <adc/amr/tag_box.hpp>
+#include <adc/amr/hierarchy/amr_hierarchy.hpp>
+#include <adc/amr/tagging/cluster.hpp>
+#include <adc/amr/tagging/tag_box.hpp>
 #include <adc/mesh/box2d.hpp>
 #include <adc/mesh/box_array.hpp>
 #include <adc/mesh/distribution_mapping.hpp>

include/adc/amr/cluster.hpp → include/adc/amr/tagging/cluster.hpp

@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include <adc/amr/tag_box.hpp>
+#include <adc/amr/tagging/tag_box.hpp>
 #include <adc/mesh/box2d.hpp>
 #include <adc/mesh/box_array.hpp>
 

include/adc/core/allocator.hpp → include/adc/core/foundation/allocator.hpp

@@ -32,7 +32,7 @@ struct ArenaStats {
 }  // namespace adc
 
 #if defined(ADC_HAS_KOKKOS)
-#include <adc/core/kokkos_env.hpp>  // detail::ensure_kokkos_initialized: Kokkos init BEFORE kokkos_malloc
+#include <adc/core/foundation/kokkos_env.hpp>  // detail::ensure_kokkos_initialized: Kokkos init BEFORE kokkos_malloc
 #include <Kokkos_Core.hpp>
 
 #include <mutex>

include/adc/core/coupled_system.hpp → include/adc/core/model/coupled_system.hpp

@@ -15,7 +15,7 @@
 
 #pragma once
 
-#include <adc/core/equation_block.hpp>
+#include <adc/core/model/equation_block.hpp>
 
 #include <cstddef>
 #include <tuple>

include/adc/core/equation_block.hpp → include/adc/core/model/equation_block.hpp

@@ -15,7 +15,7 @@
 
 #pragma once
 
-#include <adc/core/physical_model.hpp>
+#include <adc/core/model/physical_model.hpp>
 #include <adc/numerics/time/time_integrator.hpp>
 #include <adc/mesh/multifab.hpp>
 #include <adc/mesh/physical_bc.hpp>

include/adc/core/physical_model.hpp → include/adc/core/model/physical_model.hpp

@@ -17,9 +17,9 @@
 
 #pragma once
 
-#include <adc/core/state.hpp>  // Aux: the contract fixes the auxiliary to adc::Aux
-#include <adc/core/types.hpp>
-#include <adc/core/variables.hpp>  // Variables: mandatory contract of the hyperbolic model
+#include <adc/core/state/state.hpp>  // Aux: the contract fixes the auxiliary to adc::Aux
+#include <adc/core/foundation/types.hpp>
+#include <adc/core/state/variables.hpp>  // Variables: mandatory contract of the hyperbolic model
 
 #include <concepts>
 

include/adc/core/aux_names.hpp → include/adc/core/state/aux_names.hpp

@@ -14,7 +14,7 @@
 #include <string_view>
 #include <utility>
 
-#include <adc/core/state.hpp>
+#include <adc/core/state/state.hpp>
 
 namespace adc {
 

include/adc/core/state.hpp → include/adc/core/state/state.hpp

@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include <adc/core/types.hpp>
+#include <adc/core/foundation/types.hpp>
 
 // State and Aux: the two pointwise types handled by the physics layer.
 //

include/adc/coupling/amr/amr_coupler_mp.hpp

@@ -1,7 +1,7 @@
 #pragma once
 
-#include <adc/core/types.hpp>
-#include <adc/amr/refinement_ratio.hpp>
+#include <adc/core/foundation/types.hpp>
+#include <adc/amr/hierarchy/refinement_ratio.hpp>
 #include <adc/coupling/amr/amr_diagnostics.hpp>     // amr_mass, amr_max_drift_speed
 #include <adc/coupling/amr/amr_level_storage.hpp>   // AmrLevelStack
 #include <adc/coupling/amr/amr_regrid_coupler.hpp>  // amr_regrid_finest (Berger-Rigoutsos)

include/adc/coupling/amr/amr_diagnostics.hpp

@@ -11,7 +11,7 @@
 
 #pragma once
 
-#include <adc/core/types.hpp>
+#include <adc/core/foundation/types.hpp>
 #include <adc/mesh/box2d.hpp>
 #include <adc/mesh/for_each.hpp>  // device_fence
 #include <adc/mesh/multifab.hpp>

include/adc/coupling/amr/amr_level_storage.hpp

@@ -11,8 +11,8 @@
 
 #pragma once
 
-#include <adc/core/state.hpp>  // kAuxBaseComps: default aux width (base phi/grad channel)
-#include <adc/core/types.hpp>
+#include <adc/core/state/state.hpp>  // kAuxBaseComps: default aux width (base phi/grad channel)
+#include <adc/core/foundation/types.hpp>
 #include <adc/mesh/box2d.hpp>
 #include <adc/mesh/multifab.hpp>
 

include/adc/coupling/amr/amr_regrid_coupler.hpp

@@ -1,10 +1,10 @@
 #pragma once
 
-#include <adc/amr/cluster.hpp>  // berger_rigoutsos, ClusterParams
-#include <adc/amr/refinement_ratio.hpp>
-#include <adc/amr/regrid.hpp>   // tag_cells, grow_tags
-#include <adc/amr/tag_box.hpp>  // TagBox
-#include <adc/core/types.hpp>
+#include <adc/amr/tagging/cluster.hpp>  // berger_rigoutsos, ClusterParams
+#include <adc/amr/hierarchy/refinement_ratio.hpp>
+#include <adc/amr/regridding/regrid.hpp>   // tag_cells, grow_tags
+#include <adc/amr/tagging/tag_box.hpp>  // TagBox
+#include <adc/core/foundation/types.hpp>
 #include <adc/numerics/time/amr_reflux_mf.hpp>  // AmrLevelMP, mf_find_box
 #include <adc/mesh/box2d.hpp>
 #include <adc/mesh/box_array.hpp>

include/adc/coupling/base/aux_fill.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <adc/core/state.hpp>        // kAuxBaseComps
+#include <adc/core/state/state.hpp>        // kAuxBaseComps
 #include <adc/mesh/box2d.hpp>        // Box2D
 #include <adc/mesh/fab2d.hpp>        // Fab2D
 #include <adc/mesh/geometry.hpp>     // Geometry (x_cell / y_cell)

include/adc/coupling/base/elliptic_rhs.hpp

@@ -1,7 +1,7 @@
 #pragma once
 
-#include <adc/core/coupled_system.hpp>
-#include <adc/core/types.hpp>
+#include <adc/core/model/coupled_system.hpp>
+#include <adc/core/foundation/types.hpp>
 #include <adc/mesh/for_each.hpp>
 #include <adc/mesh/multifab.hpp>
 #include <adc/numerics/spatial_operator.hpp>  // load_state

include/adc/coupling/schur/amr_condensed_schur_source_stepper.hpp

@@ -1,7 +1,7 @@
 #pragma once
 
 #include <adc/coupling/schur/condensed_schur_source_stepper.hpp>  // CondensedSchurSourceStepper (#126) + detail kernels
-#include <adc/amr/refinement_ratio.hpp>
+#include <adc/amr/hierarchy/refinement_ratio.hpp>
 #include <adc/coupling/schur/schur_condensation.hpp>  // ElectrostaticLorentzCondensation (assemble per level)
 #include <adc/numerics/elliptic/mg/composite_fac_poisson.hpp>  // CompositeFacPoisson (composite FAC elliptic solve)
 #include <adc/numerics/time/amr_reflux_mf.hpp>   // mf_average_down_mb (fine -> coarse cascade)

include/adc/coupling/schur/condensed_schur_source_stepper.hpp

@@ -1,7 +1,7 @@
 #pragma once
 
-#include <adc/core/types.hpp>
-#include <adc/core/variables.hpp>
+#include <adc/core/foundation/types.hpp>
+#include <adc/core/state/variables.hpp>
 #include <adc/coupling/schur/schur_condensation.hpp>  // ElectrostaticLorentzCondensation (builder #124)
 #include <adc/coupling/schur/schur_source_kernels.hpp>  // shared geometry-free kernels + validate_krylov_params (#263)
 #include <adc/mesh/for_each.hpp>

include/adc/coupling/schur/polar_condensed_schur_source_stepper.hpp

@@ -1,7 +1,7 @@
 #pragma once
 
-#include <adc/core/types.hpp>
-#include <adc/core/variables.hpp>
+#include <adc/core/foundation/types.hpp>
+#include <adc/core/state/variables.hpp>
 #include <adc/coupling/schur/schur_source_kernels.hpp>  // shared geometry-free kernels + validate_krylov_params (#263)
 #include <adc/mesh/for_each.hpp>
 #include <adc/mesh/geometry.hpp>  // PolarGeometry

include/adc/coupling/schur/schur_condensation.hpp

@@ -1,7 +1,7 @@
 #pragma once
 
-#include <adc/core/types.hpp>
-#include <adc/core/variables.hpp>
+#include <adc/core/foundation/types.hpp>
+#include <adc/core/state/variables.hpp>
 #include <adc/mesh/for_each.hpp>
 #include <adc/mesh/geometry.hpp>
 #include <adc/mesh/multifab.hpp>

include/adc/coupling/schur/schur_source_kernels.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <adc/core/types.hpp>  // Real, ADC_HD
+#include <adc/core/foundation/types.hpp>  // Real, ADC_HD
 #include <adc/mesh/fab2d.hpp>  // Array4, ConstArray4
 
 #include <stdexcept>

include/adc/coupling/single/coupler.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <adc/core/types.hpp>
+#include <adc/core/foundation/types.hpp>
 #include <adc/coupling/base/aux_fill.hpp>  // detail::derive_aux_bc + detail::fill_bz_box (shared)
 #include <adc/coupling/base/coupling_policy.hpp>
 #include <adc/coupling/base/elliptic_rhs.hpp>

include/adc/coupling/source/coupled_source.hpp

@@ -11,8 +11,8 @@
 
 #pragma once
 
-#include <adc/core/coupled_system.hpp>
-#include <adc/core/types.hpp>
+#include <adc/core/model/coupled_system.hpp>
+#include <adc/core/foundation/types.hpp>
 #include <adc/mesh/multifab.hpp>
 
 namespace adc {

include/adc/coupling/source/coupled_source_program.hpp

@@ -13,7 +13,7 @@
 
 #pragma once
 
-#include <adc/core/types.hpp>
+#include <adc/core/foundation/types.hpp>
 #include <adc/mesh/fab2d.hpp>  // Array4 (POD device-copyable)
 
 #include <cassert>

include/adc/coupling/static_system/amr_system_coupler.hpp

@@ -1,8 +1,8 @@
 #pragma once
 
-#include <adc/core/coupled_system.hpp>
-#include <adc/amr/refinement_ratio.hpp>
-#include <adc/core/types.hpp>
+#include <adc/core/model/coupled_system.hpp>
+#include <adc/amr/hierarchy/refinement_ratio.hpp>
+#include <adc/core/foundation/types.hpp>
 #include <adc/coupling/amr/amr_coupler_mp.hpp>  // detail::coupler_inject_aux_mb
 #include <adc/coupling/base/aux_fill.hpp>  // detail::derive_aux_bc + detail::fill_bz_box (shared)
 #include <adc/coupling/source/coupled_source.hpp>  // CoupledSourceFor

include/adc/coupling/static_system/system_coupler.hpp

@@ -1,7 +1,7 @@
 #pragma once
 
-#include <adc/core/coupled_system.hpp>
-#include <adc/core/types.hpp>
+#include <adc/core/model/coupled_system.hpp>
+#include <adc/core/foundation/types.hpp>
 #include <adc/coupling/base/aux_fill.hpp>  // detail::derive_aux_bc + detail::fill_bz_box (shared)
 #include <adc/coupling/source/coupled_source.hpp>
 #include <adc/coupling/base/elliptic_rhs.hpp>

include/adc/mesh/box2d.hpp

@@ -12,7 +12,7 @@
 
 #pragma once
 
-#include <adc/core/types.hpp>  // ADC_HD: nx/ny/length called from Geometry::dx() inside a device kernel
+#include <adc/core/foundation/types.hpp>  // ADC_HD: nx/ny/length called from Geometry::dx() inside a device kernel
 
 #include <algorithm>
 #include <cstdint>

include/adc/mesh/fab2d.hpp

@@ -13,8 +13,8 @@
 
 #pragma once
 
-#include <adc/core/allocator.hpp>
-#include <adc/core/types.hpp>
+#include <adc/core/foundation/allocator.hpp>
+#include <adc/core/foundation/types.hpp>
 #include <adc/mesh/box2d.hpp>
 
 #include <cassert>

include/adc/mesh/for_each.hpp

@@ -18,8 +18,8 @@
 
 #pragma once
 
-#include <adc/core/kokkos_env.hpp>  // detail::ensure_kokkos_initialized + device_fence (life cycle)
-#include <adc/core/types.hpp>
+#include <adc/core/foundation/kokkos_env.hpp>  // detail::ensure_kokkos_initialized + device_fence (life cycle)
+#include <adc/core/foundation/types.hpp>
 #include <adc/mesh/box2d.hpp>
 
 #include <cstdint>      // std::int64_t: cell counts (LLP64 portability, no-op on LP64)

include/adc/mesh/geometry.hpp

@@ -10,7 +10,7 @@
 
 #pragma once
 
-#include <adc/core/types.hpp>
+#include <adc/core/foundation/types.hpp>
 #include <adc/mesh/box2d.hpp>
 
 namespace adc {