From 7eb9e544d1881be94384c065fbd429f986970031 Mon Sep 17 00:00:00 2001 From: Emily Bourne Date: Mon, 20 Apr 2026 14:09:25 +0200 Subject: [PATCH 01/26] Use directory agnostic imports --- src/ConfigParser/config_parser.cpp | 2 +- src/ConfigParser/select_test_case.cpp | 4 +-- src/GMGPolar/gmgpolar.cpp | 2 +- .../cartesianR2_Boundary_CircularGeometry.cpp | 2 +- .../cartesianR2_Boundary_CzarnyGeometry.cpp | 2 +- ...cartesianR2_Boundary_ShafranovGeometry.cpp | 2 +- .../cartesianR6_Boundary_CircularGeometry.cpp | 2 +- .../cartesianR6_Boundary_CzarnyGeometry.cpp | 2 +- ...cartesianR6_Boundary_ShafranovGeometry.cpp | 2 +- .../polarR6_Boundary_CircularGeometry.cpp | 2 +- .../polarR6_Boundary_CulhamGeometry.cpp | 2 +- .../polarR6_Boundary_CzarnyGeometry.cpp | 2 +- .../polarR6_Boundary_ShafranovGeometry.cpp | 2 +- .../refined_Boundary_CircularGeometry.cpp | 2 +- .../refined_Boundary_CulhamGeometry.cpp | 2 +- .../refined_Boundary_CzarnyGeometry.cpp | 2 +- .../refined_Boundary_ShafranovGeometry.cpp | 2 +- .../poissonCoefficients.cpp | 2 +- .../sonnendruckerCoefficients.cpp | 2 +- .../sonnendruckerGyroCoefficients.cpp | 2 +- .../zoniCoefficients.cpp | 2 +- .../zoniGyroCoefficients.cpp | 2 +- .../zoniShiftedCoefficients.cpp | 2 +- .../zoniShiftedGyroCoefficients.cpp | 2 +- .../DomainGeometry/circularGeometry.cpp | 2 +- .../DomainGeometry/culhamGeometry.cpp | 2 +- .../DomainGeometry/czarnyGeometry.cpp | 2 +- .../DomainGeometry/shafranovGeometry.cpp | 2 +- .../cartesianR2_CircularGeometry.cpp | 2 +- .../cartesianR2_CzarnyGeometry.cpp | 2 +- .../cartesianR2_ShafranovGeometry.cpp | 2 +- .../cartesianR6_CircularGeometry.cpp | 2 +- .../cartesianR6_CzarnyGeometry.cpp | 2 +- .../cartesianR6_ShafranovGeometry.cpp | 2 +- .../polarR6_CircularGeometry.cpp | 2 +- .../ExactSolution/polarR6_CulhamGeometry.cpp | 2 +- .../ExactSolution/polarR6_CzarnyGeometry.cpp | 2 +- .../polarR6_ShafranovGeometry.cpp | 2 +- .../refined_CircularGeometry.cpp | 2 +- .../ExactSolution/refined_CulhamGeometry.cpp | 2 +- .../ExactSolution/refined_CzarnyGeometry.cpp | 2 +- .../refined_ShafranovGeometry.cpp | 2 +- .../cartesianR2_Poisson_CircularGeometry.cpp | 2 +- .../cartesianR2_Poisson_CzarnyGeometry.cpp | 2 +- .../cartesianR2_Poisson_ShafranovGeometry.cpp | 2 +- ...nR2_SonnendruckerGyro_CircularGeometry.cpp | 2 +- ...ianR2_SonnendruckerGyro_CzarnyGeometry.cpp | 2 +- ...R2_SonnendruckerGyro_ShafranovGeometry.cpp | 2 +- ...esianR2_Sonnendrucker_CircularGeometry.cpp | 2 +- ...rtesianR2_Sonnendrucker_CzarnyGeometry.cpp | 2 +- ...sianR2_Sonnendrucker_ShafranovGeometry.cpp | 2 +- .../cartesianR2_ZoniGyro_CircularGeometry.cpp | 2 +- .../cartesianR2_ZoniGyro_CzarnyGeometry.cpp | 2 +- ...cartesianR2_ZoniGyro_ShafranovGeometry.cpp | 2 +- ...ianR2_ZoniShiftedGyro_CircularGeometry.cpp | 2 +- ...esianR2_ZoniShiftedGyro_CzarnyGeometry.cpp | 2 +- ...anR2_ZoniShiftedGyro_ShafranovGeometry.cpp | 2 +- ...rtesianR2_ZoniShifted_CircularGeometry.cpp | 2 +- ...cartesianR2_ZoniShifted_CzarnyGeometry.cpp | 2 +- ...tesianR2_ZoniShifted_ShafranovGeometry.cpp | 2 +- .../cartesianR2_Zoni_CircularGeometry.cpp | 2 +- .../cartesianR2_Zoni_CzarnyGeometry.cpp | 2 +- .../cartesianR2_Zoni_ShafranovGeometry.cpp | 2 +- .../cartesianR6_Poisson_CircularGeometry.cpp | 2 +- .../cartesianR6_Poisson_CzarnyGeometry.cpp | 2 +- .../cartesianR6_Poisson_ShafranovGeometry.cpp | 2 +- ...nR6_SonnendruckerGyro_CircularGeometry.cpp | 2 +- ...ianR6_SonnendruckerGyro_CzarnyGeometry.cpp | 2 +- ...R6_SonnendruckerGyro_ShafranovGeometry.cpp | 2 +- ...esianR6_Sonnendrucker_CircularGeometry.cpp | 2 +- ...rtesianR6_Sonnendrucker_CzarnyGeometry.cpp | 2 +- ...sianR6_Sonnendrucker_ShafranovGeometry.cpp | 2 +- .../cartesianR6_ZoniGyro_CircularGeometry.cpp | 2 +- .../cartesianR6_ZoniGyro_CzarnyGeometry.cpp | 2 +- ...cartesianR6_ZoniGyro_ShafranovGeometry.cpp | 2 +- ...ianR6_ZoniShiftedGyro_CircularGeometry.cpp | 2 +- ...esianR6_ZoniShiftedGyro_CzarnyGeometry.cpp | 2 +- ...anR6_ZoniShiftedGyro_ShafranovGeometry.cpp | 2 +- ...rtesianR6_ZoniShifted_CircularGeometry.cpp | 2 +- ...cartesianR6_ZoniShifted_CzarnyGeometry.cpp | 2 +- ...tesianR6_ZoniShifted_ShafranovGeometry.cpp | 2 +- .../cartesianR6_Zoni_CircularGeometry.cpp | 2 +- .../cartesianR6_Zoni_CzarnyGeometry.cpp | 2 +- .../cartesianR6_Zoni_ShafranovGeometry.cpp | 2 +- .../polarR6_Poisson_CircularGeometry.cpp | 2 +- .../polarR6_Poisson_CzarnyGeometry.cpp | 2 +- .../polarR6_Poisson_ShafranovGeometry.cpp | 2 +- ...rR6_SonnendruckerGyro_CircularGeometry.cpp | 2 +- ...larR6_SonnendruckerGyro_CzarnyGeometry.cpp | 2 +- ...R6_SonnendruckerGyro_ShafranovGeometry.cpp | 2 +- ...polarR6_Sonnendrucker_CircularGeometry.cpp | 2 +- .../polarR6_Sonnendrucker_CzarnyGeometry.cpp | 2 +- ...olarR6_Sonnendrucker_ShafranovGeometry.cpp | 2 +- .../polarR6_ZoniGyro_CircularGeometry.cpp | 2 +- .../polarR6_ZoniGyro_CzarnyGeometry.cpp | 2 +- .../polarR6_ZoniGyro_ShafranovGeometry.cpp | 2 +- ...larR6_ZoniShiftedGyro_CircularGeometry.cpp | 2 +- ...polarR6_ZoniShiftedGyro_CulhamGeometry.cpp | 2 +- ...polarR6_ZoniShiftedGyro_CzarnyGeometry.cpp | 2 +- ...arR6_ZoniShiftedGyro_ShafranovGeometry.cpp | 2 +- .../polarR6_ZoniShifted_CircularGeometry.cpp | 2 +- .../polarR6_ZoniShifted_CzarnyGeometry.cpp | 2 +- .../polarR6_ZoniShifted_ShafranovGeometry.cpp | 2 +- .../polarR6_Zoni_CircularGeometry.cpp | 2 +- .../polarR6_Zoni_CzarnyGeometry.cpp | 2 +- .../polarR6_Zoni_ShafranovGeometry.cpp | 2 +- ...fined_ZoniShiftedGyro_CircularGeometry.cpp | 2 +- ...refined_ZoniShiftedGyro_CulhamGeometry.cpp | 2 +- ...refined_ZoniShiftedGyro_CzarnyGeometry.cpp | 2 +- ...ined_ZoniShiftedGyro_ShafranovGeometry.cpp | 2 +- .../extrapolated_prolongation.cpp | 2 +- .../extrapolated_restriction.cpp | 2 +- src/Interpolation/fmg_interpolation.cpp | 2 +- src/Interpolation/injection.cpp | 2 +- src/Interpolation/interpolation.cpp | 2 +- src/Interpolation/prolongation.cpp | 2 +- src/Interpolation/restriction.cpp | 2 +- src/PolarGrid/anisotropic_division.cpp | 2 +- src/PolarGrid/polargrid.cpp | 2 +- src/Stencil/stencil.cpp | 2 +- src/convergence_order.cpp | 4 +-- src/main.cpp | 4 +-- src/strong_scaling.cpp | 4 +-- src/weak_scaling.cpp | 4 +-- tests/ConfigParser/config_parser.cpp | 2 +- tests/DirectSolver/directSolver.cpp | 34 +++++++++---------- tests/DirectSolver/directSolverNoMumps.cpp | 34 +++++++++---------- .../extrapolated_smoother.cpp | 22 ++++++------ tests/GMGPolar/convergence_order.cpp | 10 +++--- tests/GMGPolar/pcg_tests.cpp | 4 +-- tests/GMGPolar/solve_tests.cpp | 4 +-- .../extrapolated_prolongation.cpp | 6 ++-- .../extrapolated_restriction.cpp | 6 ++-- tests/Interpolation/prolongation.cpp | 4 +-- tests/Interpolation/restriction.cpp | 4 +-- tests/PolarGrid/polargrid.cpp | 2 +- tests/Residual/residual.cpp | 16 ++++----- tests/Smoother/smoother.cpp | 20 +++++------ tests/test_tools.h | 4 +-- 139 files changed, 215 insertions(+), 215 deletions(-) diff --git a/src/ConfigParser/config_parser.cpp b/src/ConfigParser/config_parser.cpp index 315f26f86..2f3b1b57a 100644 --- a/src/ConfigParser/config_parser.cpp +++ b/src/ConfigParser/config_parser.cpp @@ -1,4 +1,4 @@ -#include "../include/ConfigParser/config_parser.h" +#include ConfigParser::ConfigParser() { diff --git a/src/ConfigParser/select_test_case.cpp b/src/ConfigParser/select_test_case.cpp index 487e44dfa..34b63e1be 100644 --- a/src/ConfigParser/select_test_case.cpp +++ b/src/ConfigParser/select_test_case.cpp @@ -1,5 +1,5 @@ -#include "../../include/ConfigParser/config_parser.h" -#include "../../include/GMGPolar/gmgpolar.h" +#include +#include std::unique_ptr ConfigParser::solver() const { diff --git a/src/GMGPolar/gmgpolar.cpp b/src/GMGPolar/gmgpolar.cpp index 2977e0ff6..2128a1fa9 100644 --- a/src/GMGPolar/gmgpolar.cpp +++ b/src/GMGPolar/gmgpolar.cpp @@ -1,4 +1,4 @@ -#include "../../include/GMGPolar/gmgpolar.h" +#include /* ---------------------------------------------------------------------- */ /* Constructor & Initialization */ diff --git a/src/InputFunctions/BoundaryConditions/cartesianR2_Boundary_CircularGeometry.cpp b/src/InputFunctions/BoundaryConditions/cartesianR2_Boundary_CircularGeometry.cpp index a138e9377..f43843d9d 100644 --- a/src/InputFunctions/BoundaryConditions/cartesianR2_Boundary_CircularGeometry.cpp +++ b/src/InputFunctions/BoundaryConditions/cartesianR2_Boundary_CircularGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/BoundaryConditions/cartesianR2_Boundary_CircularGeometry.h" +#include CartesianR2_Boundary_CircularGeometry::CartesianR2_Boundary_CircularGeometry(double Rmax) : Rmax(Rmax) diff --git a/src/InputFunctions/BoundaryConditions/cartesianR2_Boundary_CzarnyGeometry.cpp b/src/InputFunctions/BoundaryConditions/cartesianR2_Boundary_CzarnyGeometry.cpp index dca71e0b3..e43abc770 100644 --- a/src/InputFunctions/BoundaryConditions/cartesianR2_Boundary_CzarnyGeometry.cpp +++ b/src/InputFunctions/BoundaryConditions/cartesianR2_Boundary_CzarnyGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/BoundaryConditions/cartesianR2_Boundary_CzarnyGeometry.h" +#include void CartesianR2_Boundary_CzarnyGeometry::initializeGeometry() { diff --git a/src/InputFunctions/BoundaryConditions/cartesianR2_Boundary_ShafranovGeometry.cpp b/src/InputFunctions/BoundaryConditions/cartesianR2_Boundary_ShafranovGeometry.cpp index 4d3653c82..796294a80 100644 --- a/src/InputFunctions/BoundaryConditions/cartesianR2_Boundary_ShafranovGeometry.cpp +++ b/src/InputFunctions/BoundaryConditions/cartesianR2_Boundary_ShafranovGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/BoundaryConditions/cartesianR2_Boundary_ShafranovGeometry.h" +#include CartesianR2_Boundary_ShafranovGeometry::CartesianR2_Boundary_ShafranovGeometry(double Rmax, double elongation_kappa, double shift_delta) diff --git a/src/InputFunctions/BoundaryConditions/cartesianR6_Boundary_CircularGeometry.cpp b/src/InputFunctions/BoundaryConditions/cartesianR6_Boundary_CircularGeometry.cpp index a0e85bf1f..384aadcd8 100644 --- a/src/InputFunctions/BoundaryConditions/cartesianR6_Boundary_CircularGeometry.cpp +++ b/src/InputFunctions/BoundaryConditions/cartesianR6_Boundary_CircularGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/BoundaryConditions/cartesianR6_Boundary_CircularGeometry.h" +#include CartesianR6_Boundary_CircularGeometry::CartesianR6_Boundary_CircularGeometry(double Rmax) : Rmax(Rmax) diff --git a/src/InputFunctions/BoundaryConditions/cartesianR6_Boundary_CzarnyGeometry.cpp b/src/InputFunctions/BoundaryConditions/cartesianR6_Boundary_CzarnyGeometry.cpp index ea60a1475..7622fa830 100644 --- a/src/InputFunctions/BoundaryConditions/cartesianR6_Boundary_CzarnyGeometry.cpp +++ b/src/InputFunctions/BoundaryConditions/cartesianR6_Boundary_CzarnyGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/BoundaryConditions/cartesianR6_Boundary_CzarnyGeometry.h" +#include void CartesianR6_Boundary_CzarnyGeometry::initializeGeometry() { diff --git a/src/InputFunctions/BoundaryConditions/cartesianR6_Boundary_ShafranovGeometry.cpp b/src/InputFunctions/BoundaryConditions/cartesianR6_Boundary_ShafranovGeometry.cpp index 58570946d..69257c68c 100644 --- a/src/InputFunctions/BoundaryConditions/cartesianR6_Boundary_ShafranovGeometry.cpp +++ b/src/InputFunctions/BoundaryConditions/cartesianR6_Boundary_ShafranovGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/BoundaryConditions/cartesianR6_Boundary_ShafranovGeometry.h" +#include CartesianR6_Boundary_ShafranovGeometry::CartesianR6_Boundary_ShafranovGeometry(double Rmax, double elongation_kappa, double shift_delta) diff --git a/src/InputFunctions/BoundaryConditions/polarR6_Boundary_CircularGeometry.cpp b/src/InputFunctions/BoundaryConditions/polarR6_Boundary_CircularGeometry.cpp index bcb31ef16..a52972130 100644 --- a/src/InputFunctions/BoundaryConditions/polarR6_Boundary_CircularGeometry.cpp +++ b/src/InputFunctions/BoundaryConditions/polarR6_Boundary_CircularGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/BoundaryConditions/polarR6_Boundary_CircularGeometry.h" +#include PolarR6_Boundary_CircularGeometry::PolarR6_Boundary_CircularGeometry(double Rmax) : Rmax(Rmax) diff --git a/src/InputFunctions/BoundaryConditions/polarR6_Boundary_CulhamGeometry.cpp b/src/InputFunctions/BoundaryConditions/polarR6_Boundary_CulhamGeometry.cpp index 1f53db847..2be16338d 100644 --- a/src/InputFunctions/BoundaryConditions/polarR6_Boundary_CulhamGeometry.cpp +++ b/src/InputFunctions/BoundaryConditions/polarR6_Boundary_CulhamGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/BoundaryConditions/polarR6_Boundary_CulhamGeometry.h" +#include PolarR6_Boundary_CulhamGeometry::PolarR6_Boundary_CulhamGeometry(double Rmax) : Rmax(Rmax) diff --git a/src/InputFunctions/BoundaryConditions/polarR6_Boundary_CzarnyGeometry.cpp b/src/InputFunctions/BoundaryConditions/polarR6_Boundary_CzarnyGeometry.cpp index 0afc6656f..69c11bd09 100644 --- a/src/InputFunctions/BoundaryConditions/polarR6_Boundary_CzarnyGeometry.cpp +++ b/src/InputFunctions/BoundaryConditions/polarR6_Boundary_CzarnyGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/BoundaryConditions/polarR6_Boundary_CzarnyGeometry.h" +#include void PolarR6_Boundary_CzarnyGeometry::initializeGeometry() { diff --git a/src/InputFunctions/BoundaryConditions/polarR6_Boundary_ShafranovGeometry.cpp b/src/InputFunctions/BoundaryConditions/polarR6_Boundary_ShafranovGeometry.cpp index 9ae7db44c..74db8f588 100644 --- a/src/InputFunctions/BoundaryConditions/polarR6_Boundary_ShafranovGeometry.cpp +++ b/src/InputFunctions/BoundaryConditions/polarR6_Boundary_ShafranovGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/BoundaryConditions/polarR6_Boundary_ShafranovGeometry.h" +#include PolarR6_Boundary_ShafranovGeometry::PolarR6_Boundary_ShafranovGeometry(double Rmax, double elongation_kappa, double shift_delta) diff --git a/src/InputFunctions/BoundaryConditions/refined_Boundary_CircularGeometry.cpp b/src/InputFunctions/BoundaryConditions/refined_Boundary_CircularGeometry.cpp index c32b5e8ab..bebd381fe 100644 --- a/src/InputFunctions/BoundaryConditions/refined_Boundary_CircularGeometry.cpp +++ b/src/InputFunctions/BoundaryConditions/refined_Boundary_CircularGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/BoundaryConditions/refined_Boundary_CircularGeometry.h" +#include Refined_Boundary_CircularGeometry::Refined_Boundary_CircularGeometry(double Rmax) : Rmax(Rmax) diff --git a/src/InputFunctions/BoundaryConditions/refined_Boundary_CulhamGeometry.cpp b/src/InputFunctions/BoundaryConditions/refined_Boundary_CulhamGeometry.cpp index 0706b3460..131845067 100644 --- a/src/InputFunctions/BoundaryConditions/refined_Boundary_CulhamGeometry.cpp +++ b/src/InputFunctions/BoundaryConditions/refined_Boundary_CulhamGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/BoundaryConditions/refined_Boundary_CulhamGeometry.h" +#include Refined_Boundary_CulhamGeometry::Refined_Boundary_CulhamGeometry(double Rmax) : Rmax(Rmax) diff --git a/src/InputFunctions/BoundaryConditions/refined_Boundary_CzarnyGeometry.cpp b/src/InputFunctions/BoundaryConditions/refined_Boundary_CzarnyGeometry.cpp index 0e65eac73..7433df716 100644 --- a/src/InputFunctions/BoundaryConditions/refined_Boundary_CzarnyGeometry.cpp +++ b/src/InputFunctions/BoundaryConditions/refined_Boundary_CzarnyGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/BoundaryConditions/refined_Boundary_CzarnyGeometry.h" +#include void Refined_Boundary_CzarnyGeometry::initializeGeometry() { diff --git a/src/InputFunctions/BoundaryConditions/refined_Boundary_ShafranovGeometry.cpp b/src/InputFunctions/BoundaryConditions/refined_Boundary_ShafranovGeometry.cpp index 40e3cc010..c465cdb88 100644 --- a/src/InputFunctions/BoundaryConditions/refined_Boundary_ShafranovGeometry.cpp +++ b/src/InputFunctions/BoundaryConditions/refined_Boundary_ShafranovGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/BoundaryConditions/refined_Boundary_ShafranovGeometry.h" +#include Refined_Boundary_ShafranovGeometry::Refined_Boundary_ShafranovGeometry(double Rmax, double elongation_kappa, double shift_delta) diff --git a/src/InputFunctions/DensityProfileCoefficients/poissonCoefficients.cpp b/src/InputFunctions/DensityProfileCoefficients/poissonCoefficients.cpp index 7b95497c5..578d4dfe5 100644 --- a/src/InputFunctions/DensityProfileCoefficients/poissonCoefficients.cpp +++ b/src/InputFunctions/DensityProfileCoefficients/poissonCoefficients.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/DensityProfileCoefficients/poissonCoefficients.h" +#include PoissonCoefficients::PoissonCoefficients(double Rmax, double alpha_jump) : Rmax(Rmax) diff --git a/src/InputFunctions/DensityProfileCoefficients/sonnendruckerCoefficients.cpp b/src/InputFunctions/DensityProfileCoefficients/sonnendruckerCoefficients.cpp index c9e58d669..d51cd7f89 100644 --- a/src/InputFunctions/DensityProfileCoefficients/sonnendruckerCoefficients.cpp +++ b/src/InputFunctions/DensityProfileCoefficients/sonnendruckerCoefficients.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/DensityProfileCoefficients/sonnendruckerCoefficients.h" +#include SonnendruckerCoefficients::SonnendruckerCoefficients(double Rmax, double alpha_jump) : Rmax(Rmax) diff --git a/src/InputFunctions/DensityProfileCoefficients/sonnendruckerGyroCoefficients.cpp b/src/InputFunctions/DensityProfileCoefficients/sonnendruckerGyroCoefficients.cpp index 5f78cad31..0edc8b991 100644 --- a/src/InputFunctions/DensityProfileCoefficients/sonnendruckerGyroCoefficients.cpp +++ b/src/InputFunctions/DensityProfileCoefficients/sonnendruckerGyroCoefficients.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/DensityProfileCoefficients/sonnendruckerGyroCoefficients.h" +#include SonnendruckerGyroCoefficients::SonnendruckerGyroCoefficients(double _Rmax, double _alpha_jump) : Rmax(_Rmax) diff --git a/src/InputFunctions/DensityProfileCoefficients/zoniCoefficients.cpp b/src/InputFunctions/DensityProfileCoefficients/zoniCoefficients.cpp index 7aa6dfc0f..775c3ba7e 100644 --- a/src/InputFunctions/DensityProfileCoefficients/zoniCoefficients.cpp +++ b/src/InputFunctions/DensityProfileCoefficients/zoniCoefficients.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/DensityProfileCoefficients/zoniCoefficients.h" +#include ZoniCoefficients::ZoniCoefficients(double Rmax, double alpha_jump) : Rmax(Rmax) diff --git a/src/InputFunctions/DensityProfileCoefficients/zoniGyroCoefficients.cpp b/src/InputFunctions/DensityProfileCoefficients/zoniGyroCoefficients.cpp index 1fb188c33..554d5e171 100644 --- a/src/InputFunctions/DensityProfileCoefficients/zoniGyroCoefficients.cpp +++ b/src/InputFunctions/DensityProfileCoefficients/zoniGyroCoefficients.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/DensityProfileCoefficients/zoniGyroCoefficients.h" +#include ZoniGyroCoefficients::ZoniGyroCoefficients(double Rmax, double alpha_jump) : Rmax(Rmax) diff --git a/src/InputFunctions/DensityProfileCoefficients/zoniShiftedCoefficients.cpp b/src/InputFunctions/DensityProfileCoefficients/zoniShiftedCoefficients.cpp index 2473be3ee..2c75bd7f3 100644 --- a/src/InputFunctions/DensityProfileCoefficients/zoniShiftedCoefficients.cpp +++ b/src/InputFunctions/DensityProfileCoefficients/zoniShiftedCoefficients.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/DensityProfileCoefficients/zoniShiftedCoefficients.h" +#include #include ZoniShiftedCoefficients::ZoniShiftedCoefficients(double Rmax, double alpha_jump) : Rmax(Rmax) diff --git a/src/InputFunctions/DensityProfileCoefficients/zoniShiftedGyroCoefficients.cpp b/src/InputFunctions/DensityProfileCoefficients/zoniShiftedGyroCoefficients.cpp index 4857f3360..c5ea1ecc9 100644 --- a/src/InputFunctions/DensityProfileCoefficients/zoniShiftedGyroCoefficients.cpp +++ b/src/InputFunctions/DensityProfileCoefficients/zoniShiftedGyroCoefficients.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/DensityProfileCoefficients/zoniShiftedGyroCoefficients.h" +#include ZoniShiftedGyroCoefficients::ZoniShiftedGyroCoefficients(double Rmax, double alpha_jump) : Rmax(Rmax) diff --git a/src/InputFunctions/DomainGeometry/circularGeometry.cpp b/src/InputFunctions/DomainGeometry/circularGeometry.cpp index 3fc6201c2..593fec2e2 100644 --- a/src/InputFunctions/DomainGeometry/circularGeometry.cpp +++ b/src/InputFunctions/DomainGeometry/circularGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/DomainGeometry/circularGeometry.h" +#include CircularGeometry::CircularGeometry(double Rmax) : Rmax(Rmax) diff --git a/src/InputFunctions/DomainGeometry/culhamGeometry.cpp b/src/InputFunctions/DomainGeometry/culhamGeometry.cpp index b4269a11f..3f786139e 100644 --- a/src/InputFunctions/DomainGeometry/culhamGeometry.cpp +++ b/src/InputFunctions/DomainGeometry/culhamGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/DomainGeometry/culhamGeometry.h" +#include CulhamGeometry::CulhamGeometry(double Rmax) : Rmax(Rmax) diff --git a/src/InputFunctions/DomainGeometry/czarnyGeometry.cpp b/src/InputFunctions/DomainGeometry/czarnyGeometry.cpp index 62a008ca6..3233a9380 100644 --- a/src/InputFunctions/DomainGeometry/czarnyGeometry.cpp +++ b/src/InputFunctions/DomainGeometry/czarnyGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/DomainGeometry/czarnyGeometry.h" +#include CzarnyGeometry::CzarnyGeometry() { diff --git a/src/InputFunctions/DomainGeometry/shafranovGeometry.cpp b/src/InputFunctions/DomainGeometry/shafranovGeometry.cpp index c352f3fac..9fc15d382 100644 --- a/src/InputFunctions/DomainGeometry/shafranovGeometry.cpp +++ b/src/InputFunctions/DomainGeometry/shafranovGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/DomainGeometry/shafranovGeometry.h" +#include ShafranovGeometry::ShafranovGeometry(double Rmax, double elongation_kappa, double shift_delta) : Rmax(Rmax) diff --git a/src/InputFunctions/ExactSolution/cartesianR2_CircularGeometry.cpp b/src/InputFunctions/ExactSolution/cartesianR2_CircularGeometry.cpp index 9c059db95..5d0bd51e2 100644 --- a/src/InputFunctions/ExactSolution/cartesianR2_CircularGeometry.cpp +++ b/src/InputFunctions/ExactSolution/cartesianR2_CircularGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/ExactSolution/cartesianR2_CircularGeometry.h" +#include CartesianR2_CircularGeometry::CartesianR2_CircularGeometry(double Rmax) : Rmax(Rmax) diff --git a/src/InputFunctions/ExactSolution/cartesianR2_CzarnyGeometry.cpp b/src/InputFunctions/ExactSolution/cartesianR2_CzarnyGeometry.cpp index 11782531d..853abc6d4 100644 --- a/src/InputFunctions/ExactSolution/cartesianR2_CzarnyGeometry.cpp +++ b/src/InputFunctions/ExactSolution/cartesianR2_CzarnyGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/ExactSolution/cartesianR2_CzarnyGeometry.h" +#include void CartesianR2_CzarnyGeometry::initializeGeometry() { diff --git a/src/InputFunctions/ExactSolution/cartesianR2_ShafranovGeometry.cpp b/src/InputFunctions/ExactSolution/cartesianR2_ShafranovGeometry.cpp index 96c0b61f6..84e7f6e63 100644 --- a/src/InputFunctions/ExactSolution/cartesianR2_ShafranovGeometry.cpp +++ b/src/InputFunctions/ExactSolution/cartesianR2_ShafranovGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/ExactSolution/cartesianR2_ShafranovGeometry.h" +#include CartesianR2_ShafranovGeometry::CartesianR2_ShafranovGeometry(double Rmax, double elongation_kappa, double shift_delta) : Rmax(Rmax) diff --git a/src/InputFunctions/ExactSolution/cartesianR6_CircularGeometry.cpp b/src/InputFunctions/ExactSolution/cartesianR6_CircularGeometry.cpp index 6c4042075..5fb7023ee 100644 --- a/src/InputFunctions/ExactSolution/cartesianR6_CircularGeometry.cpp +++ b/src/InputFunctions/ExactSolution/cartesianR6_CircularGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/ExactSolution/cartesianR6_CircularGeometry.h" +#include CartesianR6_CircularGeometry::CartesianR6_CircularGeometry(double Rmax) : Rmax(Rmax) diff --git a/src/InputFunctions/ExactSolution/cartesianR6_CzarnyGeometry.cpp b/src/InputFunctions/ExactSolution/cartesianR6_CzarnyGeometry.cpp index 1512960c7..a44e404b8 100644 --- a/src/InputFunctions/ExactSolution/cartesianR6_CzarnyGeometry.cpp +++ b/src/InputFunctions/ExactSolution/cartesianR6_CzarnyGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/ExactSolution/cartesianR6_CzarnyGeometry.h" +#include void CartesianR6_CzarnyGeometry::initializeGeometry() { diff --git a/src/InputFunctions/ExactSolution/cartesianR6_ShafranovGeometry.cpp b/src/InputFunctions/ExactSolution/cartesianR6_ShafranovGeometry.cpp index b64aa8f36..74baa4e5c 100644 --- a/src/InputFunctions/ExactSolution/cartesianR6_ShafranovGeometry.cpp +++ b/src/InputFunctions/ExactSolution/cartesianR6_ShafranovGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/ExactSolution/cartesianR6_ShafranovGeometry.h" +#include CartesianR6_ShafranovGeometry::CartesianR6_ShafranovGeometry(double Rmax, double elongation_kappa, double shift_delta) : Rmax(Rmax) diff --git a/src/InputFunctions/ExactSolution/polarR6_CircularGeometry.cpp b/src/InputFunctions/ExactSolution/polarR6_CircularGeometry.cpp index 8e67e6929..153d58476 100644 --- a/src/InputFunctions/ExactSolution/polarR6_CircularGeometry.cpp +++ b/src/InputFunctions/ExactSolution/polarR6_CircularGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/ExactSolution/polarR6_CircularGeometry.h" +#include PolarR6_CircularGeometry::PolarR6_CircularGeometry(double Rmax) : Rmax(Rmax) diff --git a/src/InputFunctions/ExactSolution/polarR6_CulhamGeometry.cpp b/src/InputFunctions/ExactSolution/polarR6_CulhamGeometry.cpp index a40979a61..d7483b88d 100644 --- a/src/InputFunctions/ExactSolution/polarR6_CulhamGeometry.cpp +++ b/src/InputFunctions/ExactSolution/polarR6_CulhamGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/ExactSolution/polarR6_CulhamGeometry.h" +#include PolarR6_CulhamGeometry::PolarR6_CulhamGeometry(double Rmax) : Rmax(Rmax) diff --git a/src/InputFunctions/ExactSolution/polarR6_CzarnyGeometry.cpp b/src/InputFunctions/ExactSolution/polarR6_CzarnyGeometry.cpp index f04903a9a..9c6da34f8 100644 --- a/src/InputFunctions/ExactSolution/polarR6_CzarnyGeometry.cpp +++ b/src/InputFunctions/ExactSolution/polarR6_CzarnyGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/ExactSolution/polarR6_CzarnyGeometry.h" +#include void PolarR6_CzarnyGeometry::initializeGeometry() { diff --git a/src/InputFunctions/ExactSolution/polarR6_ShafranovGeometry.cpp b/src/InputFunctions/ExactSolution/polarR6_ShafranovGeometry.cpp index c9edc9dd3..63f9143bf 100644 --- a/src/InputFunctions/ExactSolution/polarR6_ShafranovGeometry.cpp +++ b/src/InputFunctions/ExactSolution/polarR6_ShafranovGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/ExactSolution/polarR6_ShafranovGeometry.h" +#include PolarR6_ShafranovGeometry::PolarR6_ShafranovGeometry(double Rmax, double elongation_kappa, double shift_delta) : Rmax(Rmax) diff --git a/src/InputFunctions/ExactSolution/refined_CircularGeometry.cpp b/src/InputFunctions/ExactSolution/refined_CircularGeometry.cpp index e838f74cc..83d80312d 100644 --- a/src/InputFunctions/ExactSolution/refined_CircularGeometry.cpp +++ b/src/InputFunctions/ExactSolution/refined_CircularGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/ExactSolution/refined_CircularGeometry.h" +#include Refined_CircularGeometry::Refined_CircularGeometry(double Rmax) : Rmax(Rmax) diff --git a/src/InputFunctions/ExactSolution/refined_CulhamGeometry.cpp b/src/InputFunctions/ExactSolution/refined_CulhamGeometry.cpp index 827334bbd..a32dbbf2d 100644 --- a/src/InputFunctions/ExactSolution/refined_CulhamGeometry.cpp +++ b/src/InputFunctions/ExactSolution/refined_CulhamGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/ExactSolution/refined_CulhamGeometry.h" +#include Refined_CulhamGeometry::Refined_CulhamGeometry(double Rmax) : Rmax(Rmax) diff --git a/src/InputFunctions/ExactSolution/refined_CzarnyGeometry.cpp b/src/InputFunctions/ExactSolution/refined_CzarnyGeometry.cpp index c7432e526..64a57892d 100644 --- a/src/InputFunctions/ExactSolution/refined_CzarnyGeometry.cpp +++ b/src/InputFunctions/ExactSolution/refined_CzarnyGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/ExactSolution/refined_CzarnyGeometry.h" +#include void Refined_CzarnyGeometry::initializeGeometry() { diff --git a/src/InputFunctions/ExactSolution/refined_ShafranovGeometry.cpp b/src/InputFunctions/ExactSolution/refined_ShafranovGeometry.cpp index 36a534226..98bc7e17b 100644 --- a/src/InputFunctions/ExactSolution/refined_ShafranovGeometry.cpp +++ b/src/InputFunctions/ExactSolution/refined_ShafranovGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/ExactSolution/refined_ShafranovGeometry.h" +#include Refined_ShafranovGeometry::Refined_ShafranovGeometry(double Rmax, double elongation_kappa, double shift_delta) : Rmax(Rmax) diff --git a/src/InputFunctions/SourceTerms/cartesianR2_Poisson_CircularGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR2_Poisson_CircularGeometry.cpp index 4919d98ae..a947182b3 100644 --- a/src/InputFunctions/SourceTerms/cartesianR2_Poisson_CircularGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR2_Poisson_CircularGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/SourceTerms/cartesianR2_Poisson_CircularGeometry.h" +#include CartesianR2_Poisson_CircularGeometry::CartesianR2_Poisson_CircularGeometry(PolarGrid const& grid, double Rmax) : grid_(grid) diff --git a/src/InputFunctions/SourceTerms/cartesianR2_Poisson_CzarnyGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR2_Poisson_CzarnyGeometry.cpp index fdb129c16..f4266582e 100644 --- a/src/InputFunctions/SourceTerms/cartesianR2_Poisson_CzarnyGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR2_Poisson_CzarnyGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/SourceTerms/cartesianR2_Poisson_CzarnyGeometry.h" +#include void CartesianR2_Poisson_CzarnyGeometry::initializeGeometry() { diff --git a/src/InputFunctions/SourceTerms/cartesianR2_Poisson_ShafranovGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR2_Poisson_ShafranovGeometry.cpp index e395dd496..6a5a538df 100644 --- a/src/InputFunctions/SourceTerms/cartesianR2_Poisson_ShafranovGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR2_Poisson_ShafranovGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/SourceTerms/cartesianR2_Poisson_ShafranovGeometry.h" +#include CartesianR2_Poisson_ShafranovGeometry::CartesianR2_Poisson_ShafranovGeometry(PolarGrid const& grid, double Rmax, double elongation_kappa, diff --git a/src/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_CircularGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_CircularGeometry.cpp index 4ce2b4408..026280ed5 100644 --- a/src/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_CircularGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_CircularGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_CircularGeometry.h" +#include CartesianR2_SonnendruckerGyro_CircularGeometry::CartesianR2_SonnendruckerGyro_CircularGeometry(PolarGrid const& grid, double Rmax) diff --git a/src/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_CzarnyGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_CzarnyGeometry.cpp index a4c9e4f12..c8fd0fb4e 100644 --- a/src/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_CzarnyGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_CzarnyGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_CzarnyGeometry.h" +#include void CartesianR2_SonnendruckerGyro_CzarnyGeometry::initializeGeometry() { diff --git a/src/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_ShafranovGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_ShafranovGeometry.cpp index 9b47817ec..a9da15cb2 100644 --- a/src/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_ShafranovGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_ShafranovGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_ShafranovGeometry.h" +#include CartesianR2_SonnendruckerGyro_ShafranovGeometry::CartesianR2_SonnendruckerGyro_ShafranovGeometry( PolarGrid const& grid, double Rmax, double elongation_kappa, double shift_delta) diff --git a/src/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_CircularGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_CircularGeometry.cpp index fc82badd3..7be5a0188 100644 --- a/src/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_CircularGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_CircularGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_CircularGeometry.h" +#include CartesianR2_Sonnendrucker_CircularGeometry::CartesianR2_Sonnendrucker_CircularGeometry(PolarGrid const& grid, double Rmax) diff --git a/src/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_CzarnyGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_CzarnyGeometry.cpp index 81ffcc9bb..538472100 100644 --- a/src/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_CzarnyGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_CzarnyGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_CzarnyGeometry.h" +#include void CartesianR2_Sonnendrucker_CzarnyGeometry::initializeGeometry() { diff --git a/src/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_ShafranovGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_ShafranovGeometry.cpp index 6eeb5aeea..709ca1e24 100644 --- a/src/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_ShafranovGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_ShafranovGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_ShafranovGeometry.h" +#include CartesianR2_Sonnendrucker_ShafranovGeometry::CartesianR2_Sonnendrucker_ShafranovGeometry(PolarGrid const& grid, double Rmax, diff --git a/src/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_CircularGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_CircularGeometry.cpp index 448862d29..c8a019be6 100644 --- a/src/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_CircularGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_CircularGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_CircularGeometry.h" +#include CartesianR2_ZoniGyro_CircularGeometry::CartesianR2_ZoniGyro_CircularGeometry(PolarGrid const& grid, double Rmax) : grid_(grid) diff --git a/src/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_CzarnyGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_CzarnyGeometry.cpp index 66009f5ba..b4feb6ec0 100644 --- a/src/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_CzarnyGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_CzarnyGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_CzarnyGeometry.h" +#include void CartesianR2_ZoniGyro_CzarnyGeometry::initializeGeometry() { diff --git a/src/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_ShafranovGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_ShafranovGeometry.cpp index 7754b649a..dc1ce8718 100644 --- a/src/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_ShafranovGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_ShafranovGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_ShafranovGeometry.h" +#include CartesianR2_ZoniGyro_ShafranovGeometry::CartesianR2_ZoniGyro_ShafranovGeometry(PolarGrid const& grid, double Rmax, double elongation_kappa, diff --git a/src/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_CircularGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_CircularGeometry.cpp index f76530224..de1567586 100644 --- a/src/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_CircularGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_CircularGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_CircularGeometry.h" +#include CartesianR2_ZoniShiftedGyro_CircularGeometry::CartesianR2_ZoniShiftedGyro_CircularGeometry(PolarGrid const& grid, double Rmax) diff --git a/src/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_CzarnyGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_CzarnyGeometry.cpp index 58068ca17..00e573d8c 100644 --- a/src/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_CzarnyGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_CzarnyGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_CzarnyGeometry.h" +#include void CartesianR2_ZoniShiftedGyro_CzarnyGeometry::initializeGeometry() { diff --git a/src/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_ShafranovGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_ShafranovGeometry.cpp index e019d50f9..1ea224bf3 100644 --- a/src/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_ShafranovGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_ShafranovGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_ShafranovGeometry.h" +#include CartesianR2_ZoniShiftedGyro_ShafranovGeometry::CartesianR2_ZoniShiftedGyro_ShafranovGeometry(PolarGrid const& grid, double Rmax, diff --git a/src/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_CircularGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_CircularGeometry.cpp index 5d5abe67b..4c0d284ab 100644 --- a/src/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_CircularGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_CircularGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_CircularGeometry.h" +#include CartesianR2_ZoniShifted_CircularGeometry::CartesianR2_ZoniShifted_CircularGeometry(PolarGrid const& grid, double Rmax) : grid_(grid) diff --git a/src/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_CzarnyGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_CzarnyGeometry.cpp index 3485a87c4..fd74ce574 100644 --- a/src/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_CzarnyGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_CzarnyGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_CzarnyGeometry.h" +#include void CartesianR2_ZoniShifted_CzarnyGeometry::initializeGeometry() { diff --git a/src/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_ShafranovGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_ShafranovGeometry.cpp index e8335bc26..7ab41bf53 100644 --- a/src/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_ShafranovGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_ShafranovGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_ShafranovGeometry.h" +#include CartesianR2_ZoniShifted_ShafranovGeometry::CartesianR2_ZoniShifted_ShafranovGeometry(PolarGrid const& grid, double Rmax, double elongation_kappa, diff --git a/src/InputFunctions/SourceTerms/cartesianR2_Zoni_CircularGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR2_Zoni_CircularGeometry.cpp index ca27473b9..fa7251f59 100644 --- a/src/InputFunctions/SourceTerms/cartesianR2_Zoni_CircularGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR2_Zoni_CircularGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/SourceTerms/cartesianR2_Zoni_CircularGeometry.h" +#include CartesianR2_Zoni_CircularGeometry::CartesianR2_Zoni_CircularGeometry(PolarGrid const& grid, double Rmax) : grid_(grid) diff --git a/src/InputFunctions/SourceTerms/cartesianR2_Zoni_CzarnyGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR2_Zoni_CzarnyGeometry.cpp index 6dd6f3134..938a90417 100644 --- a/src/InputFunctions/SourceTerms/cartesianR2_Zoni_CzarnyGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR2_Zoni_CzarnyGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/SourceTerms/cartesianR2_Zoni_CzarnyGeometry.h" +#include void CartesianR2_Zoni_CzarnyGeometry::initializeGeometry() { diff --git a/src/InputFunctions/SourceTerms/cartesianR2_Zoni_ShafranovGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR2_Zoni_ShafranovGeometry.cpp index 73a4a666b..1e8de5f31 100644 --- a/src/InputFunctions/SourceTerms/cartesianR2_Zoni_ShafranovGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR2_Zoni_ShafranovGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/SourceTerms/cartesianR2_Zoni_ShafranovGeometry.h" +#include CartesianR2_Zoni_ShafranovGeometry::CartesianR2_Zoni_ShafranovGeometry(PolarGrid const& grid, double Rmax, double elongation_kappa, double shift_delta) diff --git a/src/InputFunctions/SourceTerms/cartesianR6_Poisson_CircularGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR6_Poisson_CircularGeometry.cpp index 1d6372a98..3450f0553 100644 --- a/src/InputFunctions/SourceTerms/cartesianR6_Poisson_CircularGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR6_Poisson_CircularGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/SourceTerms/cartesianR6_Poisson_CircularGeometry.h" +#include CartesianR6_Poisson_CircularGeometry::CartesianR6_Poisson_CircularGeometry(PolarGrid const& grid, double Rmax) : grid_(grid) diff --git a/src/InputFunctions/SourceTerms/cartesianR6_Poisson_CzarnyGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR6_Poisson_CzarnyGeometry.cpp index 222588355..8fe8db177 100644 --- a/src/InputFunctions/SourceTerms/cartesianR6_Poisson_CzarnyGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR6_Poisson_CzarnyGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/SourceTerms/cartesianR6_Poisson_CzarnyGeometry.h" +#include void CartesianR6_Poisson_CzarnyGeometry::initializeGeometry() { diff --git a/src/InputFunctions/SourceTerms/cartesianR6_Poisson_ShafranovGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR6_Poisson_ShafranovGeometry.cpp index 68c9b942b..e9b3b6eb4 100644 --- a/src/InputFunctions/SourceTerms/cartesianR6_Poisson_ShafranovGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR6_Poisson_ShafranovGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/SourceTerms/cartesianR6_Poisson_ShafranovGeometry.h" +#include CartesianR6_Poisson_ShafranovGeometry::CartesianR6_Poisson_ShafranovGeometry(PolarGrid const& grid, double Rmax, double elongation_kappa, diff --git a/src/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_CircularGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_CircularGeometry.cpp index 991fd1925..c7f85c156 100644 --- a/src/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_CircularGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_CircularGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_CircularGeometry.h" +#include CartesianR6_SonnendruckerGyro_CircularGeometry::CartesianR6_SonnendruckerGyro_CircularGeometry(PolarGrid const& grid, double Rmax) diff --git a/src/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_CzarnyGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_CzarnyGeometry.cpp index 709694942..129974282 100644 --- a/src/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_CzarnyGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_CzarnyGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_CzarnyGeometry.h" +#include void CartesianR6_SonnendruckerGyro_CzarnyGeometry::initializeGeometry() { diff --git a/src/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_ShafranovGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_ShafranovGeometry.cpp index 87be80e70..fb734d603 100644 --- a/src/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_ShafranovGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_ShafranovGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_ShafranovGeometry.h" +#include CartesianR6_SonnendruckerGyro_ShafranovGeometry::CartesianR6_SonnendruckerGyro_ShafranovGeometry( PolarGrid const& grid, double Rmax, double elongation_kappa, double shift_delta) diff --git a/src/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_CircularGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_CircularGeometry.cpp index d196ba095..908980ffe 100644 --- a/src/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_CircularGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_CircularGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_CircularGeometry.h" +#include CartesianR6_Sonnendrucker_CircularGeometry::CartesianR6_Sonnendrucker_CircularGeometry(PolarGrid const& grid, double Rmax) diff --git a/src/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_CzarnyGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_CzarnyGeometry.cpp index d1368b366..8b4394086 100644 --- a/src/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_CzarnyGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_CzarnyGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_CzarnyGeometry.h" +#include void CartesianR6_Sonnendrucker_CzarnyGeometry::initializeGeometry() { diff --git a/src/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_ShafranovGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_ShafranovGeometry.cpp index d2699bbd5..a02b0edfa 100644 --- a/src/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_ShafranovGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_ShafranovGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_ShafranovGeometry.h" +#include CartesianR6_Sonnendrucker_ShafranovGeometry::CartesianR6_Sonnendrucker_ShafranovGeometry(PolarGrid const& grid, double Rmax, diff --git a/src/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_CircularGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_CircularGeometry.cpp index f049e2960..1dd72f458 100644 --- a/src/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_CircularGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_CircularGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_CircularGeometry.h" +#include CartesianR6_ZoniGyro_CircularGeometry::CartesianR6_ZoniGyro_CircularGeometry(PolarGrid const& grid, double Rmax) : grid_(grid) diff --git a/src/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_CzarnyGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_CzarnyGeometry.cpp index dbd536a38..598d8c66c 100644 --- a/src/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_CzarnyGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_CzarnyGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_CzarnyGeometry.h" +#include void CartesianR6_ZoniGyro_CzarnyGeometry::initializeGeometry() { diff --git a/src/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_ShafranovGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_ShafranovGeometry.cpp index 98e378ec0..42309171e 100644 --- a/src/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_ShafranovGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_ShafranovGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_ShafranovGeometry.h" +#include CartesianR6_ZoniGyro_ShafranovGeometry::CartesianR6_ZoniGyro_ShafranovGeometry(PolarGrid const& grid, double Rmax, double elongation_kappa, diff --git a/src/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_CircularGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_CircularGeometry.cpp index 53fbcaaad..f6df0171d 100644 --- a/src/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_CircularGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_CircularGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_CircularGeometry.h" +#include CartesianR6_ZoniShiftedGyro_CircularGeometry::CartesianR6_ZoniShiftedGyro_CircularGeometry(PolarGrid const& grid, double Rmax) diff --git a/src/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_CzarnyGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_CzarnyGeometry.cpp index 8c1edfb4b..c043a6426 100644 --- a/src/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_CzarnyGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_CzarnyGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_CzarnyGeometry.h" +#include void CartesianR6_ZoniShiftedGyro_CzarnyGeometry::initializeGeometry() { diff --git a/src/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_ShafranovGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_ShafranovGeometry.cpp index 4d5dcb56c..b58ae1cac 100644 --- a/src/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_ShafranovGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_ShafranovGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_ShafranovGeometry.h" +#include CartesianR6_ZoniShiftedGyro_ShafranovGeometry::CartesianR6_ZoniShiftedGyro_ShafranovGeometry(PolarGrid const& grid, double Rmax, diff --git a/src/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_CircularGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_CircularGeometry.cpp index b1fbb43dc..f429445ad 100644 --- a/src/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_CircularGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_CircularGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_CircularGeometry.h" +#include CartesianR6_ZoniShifted_CircularGeometry::CartesianR6_ZoniShifted_CircularGeometry(PolarGrid const& grid, double Rmax) : grid_(grid) diff --git a/src/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_CzarnyGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_CzarnyGeometry.cpp index 8a14899fa..2a135ca24 100644 --- a/src/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_CzarnyGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_CzarnyGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_CzarnyGeometry.h" +#include void CartesianR6_ZoniShifted_CzarnyGeometry::initializeGeometry() { diff --git a/src/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_ShafranovGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_ShafranovGeometry.cpp index 664b72087..d18a2c2dc 100644 --- a/src/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_ShafranovGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_ShafranovGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_ShafranovGeometry.h" +#include CartesianR6_ZoniShifted_ShafranovGeometry::CartesianR6_ZoniShifted_ShafranovGeometry(PolarGrid const& grid, double Rmax, double elongation_kappa, diff --git a/src/InputFunctions/SourceTerms/cartesianR6_Zoni_CircularGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR6_Zoni_CircularGeometry.cpp index 68ecffc01..9bb6c56ef 100644 --- a/src/InputFunctions/SourceTerms/cartesianR6_Zoni_CircularGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR6_Zoni_CircularGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/SourceTerms/cartesianR6_Zoni_CircularGeometry.h" +#include CartesianR6_Zoni_CircularGeometry::CartesianR6_Zoni_CircularGeometry(PolarGrid const& grid, double Rmax) : grid_(grid) diff --git a/src/InputFunctions/SourceTerms/cartesianR6_Zoni_CzarnyGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR6_Zoni_CzarnyGeometry.cpp index 4efdd0326..8c4a32c21 100644 --- a/src/InputFunctions/SourceTerms/cartesianR6_Zoni_CzarnyGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR6_Zoni_CzarnyGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/SourceTerms/cartesianR6_Zoni_CzarnyGeometry.h" +#include void CartesianR6_Zoni_CzarnyGeometry::initializeGeometry() { diff --git a/src/InputFunctions/SourceTerms/cartesianR6_Zoni_ShafranovGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR6_Zoni_ShafranovGeometry.cpp index aeb9d4ed7..a8c551e63 100644 --- a/src/InputFunctions/SourceTerms/cartesianR6_Zoni_ShafranovGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR6_Zoni_ShafranovGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/SourceTerms/cartesianR6_Zoni_ShafranovGeometry.h" +#include CartesianR6_Zoni_ShafranovGeometry::CartesianR6_Zoni_ShafranovGeometry(PolarGrid const& grid, double Rmax, double elongation_kappa, double shift_delta) diff --git a/src/InputFunctions/SourceTerms/polarR6_Poisson_CircularGeometry.cpp b/src/InputFunctions/SourceTerms/polarR6_Poisson_CircularGeometry.cpp index 145e4bac0..a352a5bc4 100644 --- a/src/InputFunctions/SourceTerms/polarR6_Poisson_CircularGeometry.cpp +++ b/src/InputFunctions/SourceTerms/polarR6_Poisson_CircularGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/SourceTerms/polarR6_Poisson_CircularGeometry.h" +#include PolarR6_Poisson_CircularGeometry::PolarR6_Poisson_CircularGeometry(PolarGrid const& grid, double Rmax) : grid_(grid) diff --git a/src/InputFunctions/SourceTerms/polarR6_Poisson_CzarnyGeometry.cpp b/src/InputFunctions/SourceTerms/polarR6_Poisson_CzarnyGeometry.cpp index 863cdac9e..f541771e1 100644 --- a/src/InputFunctions/SourceTerms/polarR6_Poisson_CzarnyGeometry.cpp +++ b/src/InputFunctions/SourceTerms/polarR6_Poisson_CzarnyGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/SourceTerms/polarR6_Poisson_CzarnyGeometry.h" +#include void PolarR6_Poisson_CzarnyGeometry::initializeGeometry() { diff --git a/src/InputFunctions/SourceTerms/polarR6_Poisson_ShafranovGeometry.cpp b/src/InputFunctions/SourceTerms/polarR6_Poisson_ShafranovGeometry.cpp index 674964480..b8371f391 100644 --- a/src/InputFunctions/SourceTerms/polarR6_Poisson_ShafranovGeometry.cpp +++ b/src/InputFunctions/SourceTerms/polarR6_Poisson_ShafranovGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/SourceTerms/polarR6_Poisson_ShafranovGeometry.h" +#include PolarR6_Poisson_ShafranovGeometry::PolarR6_Poisson_ShafranovGeometry(PolarGrid const& grid, double Rmax, double elongation_kappa, double shift_delta) diff --git a/src/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_CircularGeometry.cpp b/src/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_CircularGeometry.cpp index 60c3cc129..608aefe71 100644 --- a/src/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_CircularGeometry.cpp +++ b/src/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_CircularGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_CircularGeometry.h" +#include PolarR6_SonnendruckerGyro_CircularGeometry::PolarR6_SonnendruckerGyro_CircularGeometry(PolarGrid const& grid, double Rmax) diff --git a/src/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_CzarnyGeometry.cpp b/src/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_CzarnyGeometry.cpp index 219d5470d..915ff0f9f 100644 --- a/src/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_CzarnyGeometry.cpp +++ b/src/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_CzarnyGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_CzarnyGeometry.h" +#include void PolarR6_SonnendruckerGyro_CzarnyGeometry::initializeGeometry() { diff --git a/src/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_ShafranovGeometry.cpp b/src/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_ShafranovGeometry.cpp index 23ac7aa74..0ff593dbb 100644 --- a/src/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_ShafranovGeometry.cpp +++ b/src/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_ShafranovGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_ShafranovGeometry.h" +#include PolarR6_SonnendruckerGyro_ShafranovGeometry::PolarR6_SonnendruckerGyro_ShafranovGeometry(PolarGrid const& grid, double Rmax, diff --git a/src/InputFunctions/SourceTerms/polarR6_Sonnendrucker_CircularGeometry.cpp b/src/InputFunctions/SourceTerms/polarR6_Sonnendrucker_CircularGeometry.cpp index 701d4b624..5792b9d2a 100644 --- a/src/InputFunctions/SourceTerms/polarR6_Sonnendrucker_CircularGeometry.cpp +++ b/src/InputFunctions/SourceTerms/polarR6_Sonnendrucker_CircularGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/SourceTerms/polarR6_Sonnendrucker_CircularGeometry.h" +#include PolarR6_Sonnendrucker_CircularGeometry::PolarR6_Sonnendrucker_CircularGeometry(PolarGrid const& grid, double Rmax) : grid_(grid) diff --git a/src/InputFunctions/SourceTerms/polarR6_Sonnendrucker_CzarnyGeometry.cpp b/src/InputFunctions/SourceTerms/polarR6_Sonnendrucker_CzarnyGeometry.cpp index e2c0cb220..f3f5337ac 100644 --- a/src/InputFunctions/SourceTerms/polarR6_Sonnendrucker_CzarnyGeometry.cpp +++ b/src/InputFunctions/SourceTerms/polarR6_Sonnendrucker_CzarnyGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/SourceTerms/polarR6_Sonnendrucker_CzarnyGeometry.h" +#include void PolarR6_Sonnendrucker_CzarnyGeometry::initializeGeometry() { diff --git a/src/InputFunctions/SourceTerms/polarR6_Sonnendrucker_ShafranovGeometry.cpp b/src/InputFunctions/SourceTerms/polarR6_Sonnendrucker_ShafranovGeometry.cpp index e912dbefb..8b23fc31d 100644 --- a/src/InputFunctions/SourceTerms/polarR6_Sonnendrucker_ShafranovGeometry.cpp +++ b/src/InputFunctions/SourceTerms/polarR6_Sonnendrucker_ShafranovGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/SourceTerms/polarR6_Sonnendrucker_ShafranovGeometry.h" +#include PolarR6_Sonnendrucker_ShafranovGeometry::PolarR6_Sonnendrucker_ShafranovGeometry(PolarGrid const& grid, double Rmax, double elongation_kappa, diff --git a/src/InputFunctions/SourceTerms/polarR6_ZoniGyro_CircularGeometry.cpp b/src/InputFunctions/SourceTerms/polarR6_ZoniGyro_CircularGeometry.cpp index ddef297cf..166772f1d 100644 --- a/src/InputFunctions/SourceTerms/polarR6_ZoniGyro_CircularGeometry.cpp +++ b/src/InputFunctions/SourceTerms/polarR6_ZoniGyro_CircularGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/SourceTerms/polarR6_ZoniGyro_CircularGeometry.h" +#include PolarR6_ZoniGyro_CircularGeometry::PolarR6_ZoniGyro_CircularGeometry(PolarGrid const& grid, double Rmax) : grid_(grid) diff --git a/src/InputFunctions/SourceTerms/polarR6_ZoniGyro_CzarnyGeometry.cpp b/src/InputFunctions/SourceTerms/polarR6_ZoniGyro_CzarnyGeometry.cpp index e19c14702..946dfafd8 100644 --- a/src/InputFunctions/SourceTerms/polarR6_ZoniGyro_CzarnyGeometry.cpp +++ b/src/InputFunctions/SourceTerms/polarR6_ZoniGyro_CzarnyGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/SourceTerms/polarR6_ZoniGyro_CzarnyGeometry.h" +#include void PolarR6_ZoniGyro_CzarnyGeometry::initializeGeometry() { diff --git a/src/InputFunctions/SourceTerms/polarR6_ZoniGyro_ShafranovGeometry.cpp b/src/InputFunctions/SourceTerms/polarR6_ZoniGyro_ShafranovGeometry.cpp index 982680571..8d15e4494 100644 --- a/src/InputFunctions/SourceTerms/polarR6_ZoniGyro_ShafranovGeometry.cpp +++ b/src/InputFunctions/SourceTerms/polarR6_ZoniGyro_ShafranovGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/SourceTerms/polarR6_ZoniGyro_ShafranovGeometry.h" +#include PolarR6_ZoniGyro_ShafranovGeometry::PolarR6_ZoniGyro_ShafranovGeometry(PolarGrid const& grid, double Rmax, double elongation_kappa, double shift_delta) diff --git a/src/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CircularGeometry.cpp b/src/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CircularGeometry.cpp index 5be3dc70f..893c4f4a2 100644 --- a/src/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CircularGeometry.cpp +++ b/src/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CircularGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CircularGeometry.h" +#include PolarR6_ZoniShiftedGyro_CircularGeometry::PolarR6_ZoniShiftedGyro_CircularGeometry(PolarGrid const& grid, double Rmax) : grid_(grid) diff --git a/src/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CulhamGeometry.cpp b/src/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CulhamGeometry.cpp index c3d0dfc79..8896cec8d 100644 --- a/src/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CulhamGeometry.cpp +++ b/src/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CulhamGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CulhamGeometry.h" +#include PolarR6_ZoniShiftedGyro_CulhamGeometry::PolarR6_ZoniShiftedGyro_CulhamGeometry(PolarGrid const& grid, double Rmax) : grid_(grid) diff --git a/src/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CzarnyGeometry.cpp b/src/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CzarnyGeometry.cpp index 5dd99e19d..95abac75c 100644 --- a/src/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CzarnyGeometry.cpp +++ b/src/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CzarnyGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CzarnyGeometry.h" +#include void PolarR6_ZoniShiftedGyro_CzarnyGeometry::initializeGeometry() { diff --git a/src/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_ShafranovGeometry.cpp b/src/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_ShafranovGeometry.cpp index af9867d57..f13f06c75 100644 --- a/src/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_ShafranovGeometry.cpp +++ b/src/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_ShafranovGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_ShafranovGeometry.h" +#include PolarR6_ZoniShiftedGyro_ShafranovGeometry::PolarR6_ZoniShiftedGyro_ShafranovGeometry(PolarGrid const& grid, double Rmax, double elongation_kappa, diff --git a/src/InputFunctions/SourceTerms/polarR6_ZoniShifted_CircularGeometry.cpp b/src/InputFunctions/SourceTerms/polarR6_ZoniShifted_CircularGeometry.cpp index d218f6f2a..90f93ac2d 100644 --- a/src/InputFunctions/SourceTerms/polarR6_ZoniShifted_CircularGeometry.cpp +++ b/src/InputFunctions/SourceTerms/polarR6_ZoniShifted_CircularGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/SourceTerms/polarR6_ZoniShifted_CircularGeometry.h" +#include PolarR6_ZoniShifted_CircularGeometry::PolarR6_ZoniShifted_CircularGeometry(PolarGrid const& grid, double Rmax) : grid_(grid) diff --git a/src/InputFunctions/SourceTerms/polarR6_ZoniShifted_CzarnyGeometry.cpp b/src/InputFunctions/SourceTerms/polarR6_ZoniShifted_CzarnyGeometry.cpp index 5db6c59c0..34ea17cc2 100644 --- a/src/InputFunctions/SourceTerms/polarR6_ZoniShifted_CzarnyGeometry.cpp +++ b/src/InputFunctions/SourceTerms/polarR6_ZoniShifted_CzarnyGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/SourceTerms/polarR6_ZoniShifted_CzarnyGeometry.h" +#include void PolarR6_ZoniShifted_CzarnyGeometry::initializeGeometry() { diff --git a/src/InputFunctions/SourceTerms/polarR6_ZoniShifted_ShafranovGeometry.cpp b/src/InputFunctions/SourceTerms/polarR6_ZoniShifted_ShafranovGeometry.cpp index a4381cd53..dbf489027 100644 --- a/src/InputFunctions/SourceTerms/polarR6_ZoniShifted_ShafranovGeometry.cpp +++ b/src/InputFunctions/SourceTerms/polarR6_ZoniShifted_ShafranovGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/SourceTerms/polarR6_ZoniShifted_ShafranovGeometry.h" +#include PolarR6_ZoniShifted_ShafranovGeometry::PolarR6_ZoniShifted_ShafranovGeometry(PolarGrid const& grid, double Rmax, double elongation_kappa, diff --git a/src/InputFunctions/SourceTerms/polarR6_Zoni_CircularGeometry.cpp b/src/InputFunctions/SourceTerms/polarR6_Zoni_CircularGeometry.cpp index 84f318e1f..d6658b65f 100644 --- a/src/InputFunctions/SourceTerms/polarR6_Zoni_CircularGeometry.cpp +++ b/src/InputFunctions/SourceTerms/polarR6_Zoni_CircularGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/SourceTerms/polarR6_Zoni_CircularGeometry.h" +#include PolarR6_Zoni_CircularGeometry::PolarR6_Zoni_CircularGeometry(PolarGrid const& grid, double Rmax) : grid_(grid) diff --git a/src/InputFunctions/SourceTerms/polarR6_Zoni_CzarnyGeometry.cpp b/src/InputFunctions/SourceTerms/polarR6_Zoni_CzarnyGeometry.cpp index 33165b7b5..30cffd442 100644 --- a/src/InputFunctions/SourceTerms/polarR6_Zoni_CzarnyGeometry.cpp +++ b/src/InputFunctions/SourceTerms/polarR6_Zoni_CzarnyGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/SourceTerms/polarR6_Zoni_CzarnyGeometry.h" +#include void PolarR6_Zoni_CzarnyGeometry::initializeGeometry() { diff --git a/src/InputFunctions/SourceTerms/polarR6_Zoni_ShafranovGeometry.cpp b/src/InputFunctions/SourceTerms/polarR6_Zoni_ShafranovGeometry.cpp index 02a4143b6..a0f7552cd 100644 --- a/src/InputFunctions/SourceTerms/polarR6_Zoni_ShafranovGeometry.cpp +++ b/src/InputFunctions/SourceTerms/polarR6_Zoni_ShafranovGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/SourceTerms/polarR6_Zoni_ShafranovGeometry.h" +#include PolarR6_Zoni_ShafranovGeometry::PolarR6_Zoni_ShafranovGeometry(PolarGrid const& grid, double Rmax, double elongation_kappa, double shift_delta) diff --git a/src/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CircularGeometry.cpp b/src/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CircularGeometry.cpp index 8703aa2c6..174274dbb 100644 --- a/src/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CircularGeometry.cpp +++ b/src/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CircularGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CircularGeometry.h" +#include Refined_ZoniShiftedGyro_CircularGeometry::Refined_ZoniShiftedGyro_CircularGeometry(PolarGrid const& grid, double Rmax) : grid_(grid) diff --git a/src/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CulhamGeometry.cpp b/src/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CulhamGeometry.cpp index b73a71845..5d6ddccb2 100644 --- a/src/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CulhamGeometry.cpp +++ b/src/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CulhamGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CulhamGeometry.h" +#include Refined_ZoniShiftedGyro_CulhamGeometry::Refined_ZoniShiftedGyro_CulhamGeometry(PolarGrid const& grid, double Rmax) : grid_(grid) diff --git a/src/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CzarnyGeometry.cpp b/src/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CzarnyGeometry.cpp index 5a1f289a9..bc73fa51a 100644 --- a/src/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CzarnyGeometry.cpp +++ b/src/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CzarnyGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CzarnyGeometry.h" +#include void Refined_ZoniShiftedGyro_CzarnyGeometry::initializeGeometry() { diff --git a/src/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_ShafranovGeometry.cpp b/src/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_ShafranovGeometry.cpp index e8d48fe72..2695b1068 100644 --- a/src/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_ShafranovGeometry.cpp +++ b/src/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_ShafranovGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_ShafranovGeometry.h" +#include Refined_ZoniShiftedGyro_ShafranovGeometry::Refined_ZoniShiftedGyro_ShafranovGeometry(PolarGrid const& grid, double Rmax, double elongation_kappa, diff --git a/src/Interpolation/extrapolated_prolongation.cpp b/src/Interpolation/extrapolated_prolongation.cpp index 9145fc9af..35e30624a 100644 --- a/src/Interpolation/extrapolated_prolongation.cpp +++ b/src/Interpolation/extrapolated_prolongation.cpp @@ -1,4 +1,4 @@ -#include "../../include/Interpolation/interpolation.h" +#include /* * Extrapolated Prolongation Operator diff --git a/src/Interpolation/extrapolated_restriction.cpp b/src/Interpolation/extrapolated_restriction.cpp index a248f9404..6b1634b36 100644 --- a/src/Interpolation/extrapolated_restriction.cpp +++ b/src/Interpolation/extrapolated_restriction.cpp @@ -1,4 +1,4 @@ -#include "../../include/Interpolation/interpolation.h" +#include /* * Extrapolated Restriction Operator diff --git a/src/Interpolation/fmg_interpolation.cpp b/src/Interpolation/fmg_interpolation.cpp index 738ccb7fe..12a549e63 100644 --- a/src/Interpolation/fmg_interpolation.cpp +++ b/src/Interpolation/fmg_interpolation.cpp @@ -1,4 +1,4 @@ -#include "../../include/Interpolation/interpolation.h" +#include /* * Bicubic FMG Interpolator using the Lagrange Interpolating Polynomial diff --git a/src/Interpolation/injection.cpp b/src/Interpolation/injection.cpp index 05753e6c4..3a38b99aa 100644 --- a/src/Interpolation/injection.cpp +++ b/src/Interpolation/injection.cpp @@ -1,4 +1,4 @@ -#include "../../include/Interpolation/interpolation.h" +#include /* Remark: This injection is not scaled. */ diff --git a/src/Interpolation/interpolation.cpp b/src/Interpolation/interpolation.cpp index 33629691e..e85f92656 100644 --- a/src/Interpolation/interpolation.cpp +++ b/src/Interpolation/interpolation.cpp @@ -1,4 +1,4 @@ -#include "../../include/Interpolation/interpolation.h" +#include Interpolation::Interpolation(int max_omp_threads, bool DirBC_Interior) : max_omp_threads_(max_omp_threads) diff --git a/src/Interpolation/prolongation.cpp b/src/Interpolation/prolongation.cpp index 9c417da70..f7cdc3d25 100644 --- a/src/Interpolation/prolongation.cpp +++ b/src/Interpolation/prolongation.cpp @@ -1,4 +1,4 @@ -#include "../../include/Interpolation/interpolation.h" +#include /* * Prolongation Operator diff --git a/src/Interpolation/restriction.cpp b/src/Interpolation/restriction.cpp index 669e79142..bcc38fec5 100644 --- a/src/Interpolation/restriction.cpp +++ b/src/Interpolation/restriction.cpp @@ -1,4 +1,4 @@ -#include "../../include/Interpolation/interpolation.h" +#include /* * Restriction Operator diff --git a/src/PolarGrid/anisotropic_division.cpp b/src/PolarGrid/anisotropic_division.cpp index c04350ab2..62103264c 100644 --- a/src/PolarGrid/anisotropic_division.cpp +++ b/src/PolarGrid/anisotropic_division.cpp @@ -1,4 +1,4 @@ -#include "../../include/PolarGrid/polargrid.h" +#include Vector PolarGrid::RadialAnisotropicDivision(double R0, double R, const int nr_exp, double refinement_radius, const int anisotropic_factor) const diff --git a/src/PolarGrid/polargrid.cpp b/src/PolarGrid/polargrid.cpp index 933c49dea..c20086b21 100644 --- a/src/PolarGrid/polargrid.cpp +++ b/src/PolarGrid/polargrid.cpp @@ -1,4 +1,4 @@ -#include "../../include/PolarGrid/polargrid.h" +#include #include // ------------ // // Constructors // diff --git a/src/Stencil/stencil.cpp b/src/Stencil/stencil.cpp index 7ca20e2bd..8189029ca 100644 --- a/src/Stencil/stencil.cpp +++ b/src/Stencil/stencil.cpp @@ -1,4 +1,4 @@ -#include "../../include/Stencil/stencil.h" +#include Stencil::Stencil(std::initializer_list init) : values_{} diff --git a/src/convergence_order.cpp b/src/convergence_order.cpp index 60cf98a6f..aa3252504 100644 --- a/src/convergence_order.cpp +++ b/src/convergence_order.cpp @@ -5,8 +5,8 @@ #include #include -#include "../include/GMGPolar/gmgpolar.h" -#include "../include/GMGPolar/test_cases.h" +#include +#include int main(int argc, char* argv[]) { diff --git a/src/main.cpp b/src/main.cpp index f54254311..8cf2ae939 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1,7 +1,7 @@ #include -#include "../include/ConfigParser/config_parser.h" -#include "../include/GMGPolar/gmgpolar.h" +#include +#include int main(int argc, char* argv[]) { diff --git a/src/strong_scaling.cpp b/src/strong_scaling.cpp index 102d6bc00..b86977af0 100644 --- a/src/strong_scaling.cpp +++ b/src/strong_scaling.cpp @@ -6,8 +6,8 @@ #include #include -#include "../include/GMGPolar/gmgpolar.h" -#include "../include/GMGPolar/test_cases.h" +#include +#include void runTest(int maxOpenMPThreads, int divideBy2, std::ofstream& outfile) { diff --git a/src/weak_scaling.cpp b/src/weak_scaling.cpp index a4d911ef8..32ada2ff2 100644 --- a/src/weak_scaling.cpp +++ b/src/weak_scaling.cpp @@ -5,8 +5,8 @@ #include #include -#include "../include/GMGPolar/gmgpolar.h" -#include "../include/GMGPolar/test_cases.h" +#include +#include void runTest(int maxOpenMPThreads, int divideBy2, std::ofstream& outfile) { diff --git a/tests/ConfigParser/config_parser.cpp b/tests/ConfigParser/config_parser.cpp index 9c26ceff4..706318f3e 100644 --- a/tests/ConfigParser/config_parser.cpp +++ b/tests/ConfigParser/config_parser.cpp @@ -1,5 +1,5 @@ #include -#include "../../include/ConfigParser/config_parser.h" +#include struct TestParams { int geometry; diff --git a/tests/DirectSolver/directSolver.cpp b/tests/DirectSolver/directSolver.cpp index c54a1dcf8..e438d06a3 100644 --- a/tests/DirectSolver/directSolver.cpp +++ b/tests/DirectSolver/directSolver.cpp @@ -5,37 +5,37 @@ #include "../test_tools.h" -#include "../../include/GMGPolar/gmgpolar.h" +#include -#include "../../include/Residual/ResidualGive/residualGive.h" -#include "../../include/DirectSolver/DirectSolver-COO-MUMPS-Give/directSolverGive.h" -#include "../../include/DirectSolver/DirectSolver-COO-MUMPS-Take/directSolverTake.h" -#include "../../include/DirectSolver/DirectSolver-CSR-LU-Give/directSolverGiveCustomLU.h" -#include "../../include/DirectSolver/DirectSolver-CSR-LU-Take/directSolverTakeCustomLU.h" +#include +#include +#include +#include +#include -#include "../../include/InputFunctions/domainGeometry.h" -#include "../../include/InputFunctions/densityProfileCoefficients.h" -#include "../../include/InputFunctions/boundaryConditions.h" +#include +#include +#include /* ------ */ /* Test 1 */ /* ------ */ -#include "../include/InputFunctions/DomainGeometry/circularGeometry.h" -#include "../include/InputFunctions/DensityProfileCoefficients/sonnendruckerGyroCoefficients.h" +#include +#include /* ------ */ /* Test 2 */ /* ------ */ -#include "../include/InputFunctions/DomainGeometry/shafranovGeometry.h" -#include "../include/InputFunctions/DensityProfileCoefficients/zoniGyroCoefficients.h" +#include +#include /* ------ */ /* Test 3 */ /* ------ */ -#include "../include/InputFunctions/DomainGeometry/czarnyGeometry.h" -#include "../include/InputFunctions/DensityProfileCoefficients/zoniShiftedCoefficients.h" +#include +#include /* ------ */ /* Test 4 */ /* ------ */ -#include "../include/InputFunctions/DomainGeometry/culhamGeometry.h" -#include "../include/InputFunctions/DensityProfileCoefficients/zoniShiftedGyroCoefficients.h" +#include +#include #ifdef GMGPOLAR_USE_MUMPS diff --git a/tests/DirectSolver/directSolverNoMumps.cpp b/tests/DirectSolver/directSolverNoMumps.cpp index 413d09643..5c01eb776 100644 --- a/tests/DirectSolver/directSolverNoMumps.cpp +++ b/tests/DirectSolver/directSolverNoMumps.cpp @@ -5,37 +5,37 @@ #include "../test_tools.h" -#include "../../include/GMGPolar/gmgpolar.h" +#include -#include "../../include/Residual/ResidualGive/residualGive.h" -#include "../../include/DirectSolver/DirectSolver-COO-MUMPS-Give/directSolverGive.h" -#include "../../include/DirectSolver/DirectSolver-COO-MUMPS-Take/directSolverTake.h" -#include "../../include/DirectSolver/DirectSolver-CSR-LU-Give/directSolverGiveCustomLU.h" -#include "../../include/DirectSolver/DirectSolver-CSR-LU-Take/directSolverTakeCustomLU.h" +#include +#include +#include +#include +#include -#include "../../include/InputFunctions/domainGeometry.h" -#include "../../include/InputFunctions/densityProfileCoefficients.h" -#include "../../include/InputFunctions/boundaryConditions.h" +#include +#include +#include /* ------ */ /* Test 1 */ /* ------ */ -#include "../include/InputFunctions/DomainGeometry/circularGeometry.h" -#include "../include/InputFunctions/DensityProfileCoefficients/sonnendruckerGyroCoefficients.h" +#include +#include /* ------ */ /* Test 2 */ /* ------ */ -#include "../include/InputFunctions/DomainGeometry/shafranovGeometry.h" -#include "../include/InputFunctions/DensityProfileCoefficients/zoniGyroCoefficients.h" +#include +#include /* ------ */ /* Test 3 */ /* ------ */ -#include "../include/InputFunctions/DomainGeometry/czarnyGeometry.h" -#include "../include/InputFunctions/DensityProfileCoefficients/zoniShiftedCoefficients.h" +#include +#include /* ------ */ /* Test 4 */ /* ------ */ -#include "../include/InputFunctions/DomainGeometry/culhamGeometry.h" -#include "../include/InputFunctions/DensityProfileCoefficients/zoniShiftedGyroCoefficients.h" +#include +#include /* Test 1/2: */ /* Does the Take and Give Implementation match up? */ diff --git a/tests/ExtrapolatedSmoother/extrapolated_smoother.cpp b/tests/ExtrapolatedSmoother/extrapolated_smoother.cpp index 4726fe041..8a268100e 100644 --- a/tests/ExtrapolatedSmoother/extrapolated_smoother.cpp +++ b/tests/ExtrapolatedSmoother/extrapolated_smoother.cpp @@ -5,22 +5,22 @@ #include "../test_tools.h" -#include "../../include/GMGPolar/gmgpolar.h" +#include -#include "../../include/Residual/ResidualGive/residualGive.h" -#include "../../include/Residual/ResidualTake/residualTake.h" -#include "../../include/DirectSolver/DirectSolver-CSR-LU-Give/directSolverGiveCustomLU.h" -#include "../../include/DirectSolver/DirectSolver-CSR-LU-Take/directSolverTakeCustomLU.h" -#include "../../include/ExtrapolatedSmoother/ExtrapolatedSmootherGive/extrapolatedSmootherGive.h" -#include "../../include/ExtrapolatedSmoother/ExtrapolatedSmootherTake/extrapolatedSmootherTake.h" +#include +#include +#include +#include +#include +#include -#include "../../include/InputFunctions/domainGeometry.h" -#include "../../include/InputFunctions/densityProfileCoefficients.h" +#include +#include /* --------- */ /* Test Case */ /* --------- */ -#include "../include/InputFunctions/DomainGeometry/czarnyGeometry.h" -#include "../include/InputFunctions/DensityProfileCoefficients/zoniShiftedCoefficients.h" +#include +#include #include diff --git a/tests/GMGPolar/convergence_order.cpp b/tests/GMGPolar/convergence_order.cpp index d3f5b7b18..2b91457b4 100644 --- a/tests/GMGPolar/convergence_order.cpp +++ b/tests/GMGPolar/convergence_order.cpp @@ -5,11 +5,11 @@ #include #include -#include "../../include/ConfigParser/test_selection.h" -#include "../../include/GMGPolar/gmgpolar.h" -#include "../../include/InputFunctions/boundaryConditions.h" -#include "../../include/InputFunctions/densityProfileCoefficients.h" -#include "../../include/InputFunctions/sourceTerm.h" +#include +#include +#include +#include +#include template class GMGPolarPaperTestCase; diff --git a/tests/GMGPolar/pcg_tests.cpp b/tests/GMGPolar/pcg_tests.cpp index a68045bd9..c915219ff 100644 --- a/tests/GMGPolar/pcg_tests.cpp +++ b/tests/GMGPolar/pcg_tests.cpp @@ -5,8 +5,8 @@ #include // Including the necessary header from the project -#include "../../include/GMGPolar/gmgpolar.h" -#include "../../include/ConfigParser/test_selection.h" +#include +#include template class PCGTestCase; diff --git a/tests/GMGPolar/solve_tests.cpp b/tests/GMGPolar/solve_tests.cpp index aa6c53e34..ca560ba24 100644 --- a/tests/GMGPolar/solve_tests.cpp +++ b/tests/GMGPolar/solve_tests.cpp @@ -5,8 +5,8 @@ #include // Including the necessary header from the project -#include "../../include/ConfigParser/test_selection.h" -#include "../../include/GMGPolar/gmgpolar.h" +#include +#include template class GMGPolarTestCase; diff --git a/tests/Interpolation/extrapolated_prolongation.cpp b/tests/Interpolation/extrapolated_prolongation.cpp index 4650f7fb3..e0a5b84b5 100644 --- a/tests/Interpolation/extrapolated_prolongation.cpp +++ b/tests/Interpolation/extrapolated_prolongation.cpp @@ -3,9 +3,9 @@ #include "../test_tools.h" -#include "../../include/GMGPolar/gmgpolar.h" -#include "../../include/Interpolation/interpolation.h" -#include "../../include/InputFunctions/DensityProfileCoefficients/poissonCoefficients.h" +#include +#include +#include // Helper that computes the mathematically expected extrapolated prolongation value static double expected_extrapolated_value(const PolarGrid& coarse, const PolarGrid& fine, diff --git a/tests/Interpolation/extrapolated_restriction.cpp b/tests/Interpolation/extrapolated_restriction.cpp index 2af24650c..70586f86a 100644 --- a/tests/Interpolation/extrapolated_restriction.cpp +++ b/tests/Interpolation/extrapolated_restriction.cpp @@ -3,9 +3,9 @@ #include "../test_tools.h" -#include "../../include/GMGPolar/gmgpolar.h" -#include "../../include/Interpolation/interpolation.h" -#include "../../include/InputFunctions/DensityProfileCoefficients/poissonCoefficients.h" +#include +#include +#include // Helper that computes the mathematically expected extrapolated restriction value static double expected_extrapolated_restriction_value(const PolarGrid& fine, const PolarGrid& coarse, diff --git a/tests/Interpolation/prolongation.cpp b/tests/Interpolation/prolongation.cpp index f1f6acc8d..600fdfb24 100644 --- a/tests/Interpolation/prolongation.cpp +++ b/tests/Interpolation/prolongation.cpp @@ -3,8 +3,8 @@ #include "../test_tools.h" -#include "../../include/Interpolation/interpolation.h" -#include "../../include/InputFunctions/DensityProfileCoefficients/poissonCoefficients.h" +#include +#include // Helper that computes the mathematically expected prolongation value static double expected_value(const PolarGrid& coarse, const PolarGrid& fine, ConstVector coarse_vals, int i_r, diff --git a/tests/Interpolation/restriction.cpp b/tests/Interpolation/restriction.cpp index 49270f3c7..fc5dcee92 100644 --- a/tests/Interpolation/restriction.cpp +++ b/tests/Interpolation/restriction.cpp @@ -3,8 +3,8 @@ #include "../test_tools.h" -#include "../../include/Interpolation/interpolation.h" -#include "../../include/InputFunctions/DensityProfileCoefficients/poissonCoefficients.h" +#include +#include // Helper that computes the mathematically expected restriction value static double expected_restriction_value(const PolarGrid& fine, const PolarGrid& coarse, ConstVector fine_vals, diff --git a/tests/PolarGrid/polargrid.cpp b/tests/PolarGrid/polargrid.cpp index 31a87f2a5..7442c58d2 100644 --- a/tests/PolarGrid/polargrid.cpp +++ b/tests/PolarGrid/polargrid.cpp @@ -1,5 +1,5 @@ #include -#include "../../include/PolarGrid/polargrid.h" +#include TEST(PolarGridTest, DefaultConstructor) { diff --git a/tests/Residual/residual.cpp b/tests/Residual/residual.cpp index b8ba5fe61..dc20b83ea 100644 --- a/tests/Residual/residual.cpp +++ b/tests/Residual/residual.cpp @@ -5,19 +5,19 @@ #include "../test_tools.h" -#include "../../include/GMGPolar/gmgpolar.h" +#include -#include "../../include/Residual/ResidualGive/residualGive.h" -#include "../../include/Residual/ResidualTake/residualTake.h" +#include +#include -#include "../../include/InputFunctions/domainGeometry.h" -#include "../../include/InputFunctions/densityProfileCoefficients.h" -#include "../../include/InputFunctions/boundaryConditions.h" +#include +#include +#include /* --------- */ /* Test Case */ /* --------- */ -#include "../include/InputFunctions/DomainGeometry/czarnyGeometry.h" -#include "../include/InputFunctions/DensityProfileCoefficients/zoniShiftedCoefficients.h" +#include +#include /* Test 1/1: */ /* Does the Take and Give Implementation match up? */ diff --git a/tests/Smoother/smoother.cpp b/tests/Smoother/smoother.cpp index cca39984b..bc0cf1e9b 100644 --- a/tests/Smoother/smoother.cpp +++ b/tests/Smoother/smoother.cpp @@ -5,21 +5,21 @@ #include "../test_tools.h" -#include "../../include/GMGPolar/gmgpolar.h" +#include -#include "../../include/Residual/ResidualGive/residualGive.h" -#include "../../include/DirectSolver/DirectSolver-CSR-LU-Give/directSolverGiveCustomLU.h" -#include "../../include/Smoother/SmootherGive/smootherGive.h" -#include "../../include/Smoother/SmootherTake/smootherTake.h" +#include +#include +#include +#include -#include "../../include/InputFunctions/domainGeometry.h" -#include "../../include/InputFunctions/densityProfileCoefficients.h" -#include "../../include/InputFunctions/boundaryConditions.h" +#include +#include +#include /* --------- */ /* Test Case */ /* --------- */ -#include "../include/InputFunctions/DomainGeometry/czarnyGeometry.h" -#include "../include/InputFunctions/DensityProfileCoefficients/zoniShiftedCoefficients.h" +#include +#include #include diff --git a/tests/test_tools.h b/tests/test_tools.h index c990c8a13..f84f2e229 100644 --- a/tests/test_tools.h +++ b/tests/test_tools.h @@ -1,8 +1,8 @@ #pragma once #include -#include "../include/PolarGrid/polargrid.h" -#include "../include/LinearAlgebra/Vector/vector.h" +#include +#include inline Vector generate_random_sample_data(const PolarGrid& grid, unsigned int seed, double min_val = -100.0, double max_val = 100.0) From ed53411132f97a5ab30f21458c2cb11d0133e61b Mon Sep 17 00:00:00 2001 From: Emily Bourne Date: Mon, 20 Apr 2026 14:24:01 +0200 Subject: [PATCH 02/26] Move package searches to root. InputFunctions only needs to be linked to gmgpolar --- CMakeLists.txt | 18 ++++++++++++++++-- src/CMakeLists.txt | 43 ++++++------------------------------------- 2 files changed, 22 insertions(+), 39 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 40f67515b..8db144f6e 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,8 @@ cmake_minimum_required(VERSION 3.12) +# Ensure custom cmake modules can be found +list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake") + # Options should be defined before they're used option(GMGPOLAR_BUILD_TESTS "Build GMGPolar unit tests." ON) option(GMGPOLAR_USE_LIKWID "Use LIKWID to measure code (regions)." OFF) @@ -27,6 +30,12 @@ endif() set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Wall -Wextra -pedantic -Wno-unused -Wno-psabi -Wfloat-conversion") set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O2 -mtune=generic -Wno-psabi") +if (CMAKE_COMPILER_IS_GNUCXX AND CMAKE_BUILD_TYPE STREQUAL "Release") + # If using GNU increase maximum number of instructions considered for inlining + # in Release mode in this folder and sub-folders + add_compile_options(--param max-inline-insns-single=1500) +endif() + # Set coverage compiler flags - must come before any targets are defined if(GMGPOLAR_ENABLE_COVERAGE) if(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang") @@ -44,8 +53,13 @@ if(GMGPOLAR_ENABLE_COVERAGE) endif() endif() +find_package(OpenMP REQUIRED) find_package(Kokkos 4.4.1...<5.1 QUIET REQUIRED) -include_directories(include) + +if (${GMGPOLAR_USE_MUMPS}) + find_package(Metis REQUIRED) +endif() + add_subdirectory(src) add_executable(gmgpolar src/main.cpp) @@ -53,7 +67,7 @@ add_executable(convergence_order src/convergence_order.cpp) add_executable(weak_scaling src/weak_scaling.cpp) add_executable(strong_scaling src/strong_scaling.cpp) -target_link_libraries(gmgpolar PRIVATE GMGPolarLib) +target_link_libraries(gmgpolar PRIVATE GMGPolarLib InputFunctions) target_link_libraries(convergence_order PRIVATE GMGPolarLib) target_link_libraries(weak_scaling PRIVATE GMGPolarLib) target_link_libraries(strong_scaling PRIVATE GMGPolarLib) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index a1b07be2f..71e0224c3 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,10 +1,3 @@ -cmake_minimum_required(VERSION 3.12) - -if (CMAKE_COMPILER_IS_GNUCXX AND CMAKE_BUILD_TYPE STREQUAL "Release") - # If using GNU increase maximum number of instructions considered for inlining - # in Release mode in this folder and sub-folders - add_compile_options(--param max-inline-insns-single=1500) -endif() # Add subdirectories for components add_subdirectory(InputFunctions) @@ -63,20 +56,15 @@ add_library(GMGPolarLib STATIC # Basic library configuration target_include_directories(GMGPolarLib PUBLIC - ${CMAKE_CURRENT_SOURCE_DIR}/.. - ${CMAKE_CURRENT_SOURCE_DIR} -) - -target_link_libraries(GMGPolarLib PUBLIC - InputFunctions + ${CMAKE_CURRENT_SOURCE_DIR}/../include ) # Handle OpenMP -find_package(OpenMP REQUIRED) -if(OpenMP_CXX_FOUND) - target_link_libraries(GMGPolarLib PUBLIC OpenMP::OpenMP_CXX) -endif() -target_link_libraries(GMGPolarLib PUBLIC Kokkos::kokkos) +target_link_libraries(GMGPolarLib + PUBLIC + OpenMP::OpenMP_CXX + Kokkos::kokkos +) # Handle MUMPS configuration @@ -115,25 +103,6 @@ if(GMGPOLAR_USE_MUMPS) message(SEND_ERROR "MUMPS not found") endif() endif() - - if(DEFINED ENV{METIS_DIR}) - set(METIS_DIR $ENV{METIS_DIR}) - - if(EXISTS "${METIS_DIR}/include" AND EXISTS "${METIS_DIR}/lib") - set(METIS_INCLUDE_DIR "${METIS_DIR}/include") - set(METIS_LIBRARY_DIR "${METIS_DIR}/lib") - - target_include_directories(GMGPolarLib PUBLIC ${METIS_INCLUDE_DIR}) - target_link_directories(GMGPolarLib PUBLIC ${METIS_LIBRARY_DIR}) - set(METIS_FOUND TRUE) - endif() - - if(METIS_FOUND) - target_link_libraries(GMGPolarLib PUBLIC metis) - else() - message(SEND_ERROR "METIS not found") - endif() - endif() endif() # Handle LIKWID configuration From ec909eb3eaf9710ec7b511dbab20021b6f95e836 Mon Sep 17 00:00:00 2001 From: Emily Bourne Date: Mon, 20 Apr 2026 14:28:34 +0200 Subject: [PATCH 03/26] Link includes cleanly --- src/InputFunctions/BoundaryConditions/CMakeLists.txt | 3 +-- src/InputFunctions/CMakeLists.txt | 4 ++-- src/InputFunctions/DensityProfileCoefficients/CMakeLists.txt | 5 ++--- src/InputFunctions/DomainGeometry/CMakeLists.txt | 5 ++--- src/InputFunctions/ExactSolution/CMakeLists.txt | 5 ++--- src/InputFunctions/SourceTerms/CMakeLists.txt | 3 +-- 6 files changed, 10 insertions(+), 15 deletions(-) diff --git a/src/InputFunctions/BoundaryConditions/CMakeLists.txt b/src/InputFunctions/BoundaryConditions/CMakeLists.txt index c183b0798..d8604ff32 100644 --- a/src/InputFunctions/BoundaryConditions/CMakeLists.txt +++ b/src/InputFunctions/BoundaryConditions/CMakeLists.txt @@ -18,6 +18,5 @@ set(BOUNDARY_CONDITIONS_SOURCES add_library(InputFunctions_BoundaryConditions STATIC ${BOUNDARY_CONDITIONS_SOURCES}) target_include_directories(InputFunctions_BoundaryConditions PUBLIC - ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_SOURCE_DIR}/include/InputFunctions/BoundaryConditions + ${PROJECT_SOURCE_DIR}/include ) diff --git a/src/InputFunctions/CMakeLists.txt b/src/InputFunctions/CMakeLists.txt index 17bf2710d..c9500aa1c 100644 --- a/src/InputFunctions/CMakeLists.txt +++ b/src/InputFunctions/CMakeLists.txt @@ -15,5 +15,5 @@ target_link_libraries(InputFunctions INTERFACE ) target_include_directories(InputFunctions INTERFACE - ${CMAKE_SOURCE_DIR}/include/InputFunctions -) \ No newline at end of file + ${PROJECT_SOURCE_DIR}/include +) diff --git a/src/InputFunctions/DensityProfileCoefficients/CMakeLists.txt b/src/InputFunctions/DensityProfileCoefficients/CMakeLists.txt index 505bb9f82..b0a236680 100644 --- a/src/InputFunctions/DensityProfileCoefficients/CMakeLists.txt +++ b/src/InputFunctions/DensityProfileCoefficients/CMakeLists.txt @@ -10,6 +10,5 @@ set(DENSITY_PROFILE_COEFFICIENTS_SOURCES add_library(InputFunctions_DensityProfileCoefficients STATIC ${DENSITY_PROFILE_COEFFICIENTS_SOURCES}) target_include_directories(InputFunctions_DensityProfileCoefficients PUBLIC - ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_SOURCE_DIR}/include/InputFunctions/DensityProfileCoefficients -) \ No newline at end of file + ${PROJECT_SOURCE_DIR}/include +) diff --git a/src/InputFunctions/DomainGeometry/CMakeLists.txt b/src/InputFunctions/DomainGeometry/CMakeLists.txt index 65b2c8b35..d9053e9c4 100644 --- a/src/InputFunctions/DomainGeometry/CMakeLists.txt +++ b/src/InputFunctions/DomainGeometry/CMakeLists.txt @@ -7,6 +7,5 @@ set(DOMAIN_GEOMETRY_SOURCES add_library(InputFunctions_DomainGeometry STATIC ${DOMAIN_GEOMETRY_SOURCES}) target_include_directories(InputFunctions_DomainGeometry PUBLIC - ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_SOURCE_DIR}/include/InputFunctions/DomainGeometry -) \ No newline at end of file + ${PROJECT_SOURCE_DIR}/include +) diff --git a/src/InputFunctions/ExactSolution/CMakeLists.txt b/src/InputFunctions/ExactSolution/CMakeLists.txt index 0cea300d3..053ee30ff 100644 --- a/src/InputFunctions/ExactSolution/CMakeLists.txt +++ b/src/InputFunctions/ExactSolution/CMakeLists.txt @@ -17,6 +17,5 @@ set(EXACT_SOLUTION_SOURCES add_library(InputFunctions_ExactSolution STATIC ${EXACT_SOLUTION_SOURCES}) target_include_directories(InputFunctions_ExactSolution PUBLIC - ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_SOURCE_DIR}/include/InputFunctions/ExactSolution -) \ No newline at end of file + ${PROJECT_SOURCE_DIR}/include +) diff --git a/src/InputFunctions/SourceTerms/CMakeLists.txt b/src/InputFunctions/SourceTerms/CMakeLists.txt index 4f22afc30..8abdd1ae1 100644 --- a/src/InputFunctions/SourceTerms/CMakeLists.txt +++ b/src/InputFunctions/SourceTerms/CMakeLists.txt @@ -71,8 +71,7 @@ set(SOURCE_TERMS_SOURCES add_library(InputFunctions_SourceTerms STATIC ${SOURCE_TERMS_SOURCES}) target_include_directories(InputFunctions_SourceTerms PUBLIC - ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_SOURCE_DIR}/include/InputFunctions/SourceTerms + ${PROJECT_SOURCE_DIR}/include ) target_link_libraries(InputFunctions_SourceTerms PUBLIC Kokkos::kokkos) From 1351a297ed2ff54f9632c16d14ca502216d5ad52 Mon Sep 17 00:00:00 2001 From: Emily Bourne Date: Mon, 20 Apr 2026 14:32:54 +0200 Subject: [PATCH 04/26] All tests use input --- CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8db144f6e..aba6a872f 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -68,9 +68,9 @@ add_executable(weak_scaling src/weak_scaling.cpp) add_executable(strong_scaling src/strong_scaling.cpp) target_link_libraries(gmgpolar PRIVATE GMGPolarLib InputFunctions) -target_link_libraries(convergence_order PRIVATE GMGPolarLib) -target_link_libraries(weak_scaling PRIVATE GMGPolarLib) -target_link_libraries(strong_scaling PRIVATE GMGPolarLib) +target_link_libraries(convergence_order PRIVATE GMGPolarLib InputFunctions) +target_link_libraries(weak_scaling PRIVATE GMGPolarLib InputFunctions) +target_link_libraries(strong_scaling PRIVATE GMGPolarLib InputFunctions) if(GMGPOLAR_BUILD_TESTS) enable_testing() From 18a3cbea6838d1c6d35f00d8fe3d3ac4d7344129 Mon Sep 17 00:00:00 2001 From: Emily Bourne Date: Mon, 20 Apr 2026 14:36:12 +0200 Subject: [PATCH 05/26] Set C++ standard globally --- CMakeLists.txt | 2 ++ tests/CMakeLists.txt | 3 +-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index aba6a872f..e5023d159 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -30,6 +30,8 @@ endif() set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Wall -Wextra -pedantic -Wno-unused -Wno-psabi -Wfloat-conversion") set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O2 -mtune=generic -Wno-psabi") +set(CMAKE_CXX_STANDARD 20 CACHE INTERNAL "The C++ standard whose features are requested to build this project.") + if (CMAKE_COMPILER_IS_GNUCXX AND CMAKE_BUILD_TYPE STREQUAL "Release") # If using GNU increase maximum number of instructions considered for inlining # in Release mode in this folder and sub-folders diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 3c64033de..b301e5b9c 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -31,8 +31,7 @@ add_executable(gmgpolar_tests ) # Set the compile features and link libraries -target_compile_features(gmgpolar_tests PRIVATE cxx_std_20) -target_link_libraries(gmgpolar_tests GMGPolarLib GTest::gtest_main) +target_link_libraries(gmgpolar_tests GMGPolarLib InputFunctions GTest::gtest_main) include(GoogleTest) gtest_discover_tests(gmgpolar_tests) From 4e46726410ca8085ba21325a8b012b4e94164fd1 Mon Sep 17 00:00:00 2001 From: Emily Bourne Date: Mon, 20 Apr 2026 14:53:16 +0200 Subject: [PATCH 06/26] Move LIKWID and MUMPS target definition to cmake/FindX.cmake files --- CMakeLists.txt | 8 +++-- cmake/FindLIKWID.cmake | 33 +++++++++++++++++++ cmake/FindMUMPS.cmake | 56 ++++++++++++++++++++++++++++++++ cmake/FindMetis.cmake | 27 ++++++++++++++++ src/CMakeLists.txt | 72 +++--------------------------------------- 5 files changed, 126 insertions(+), 70 deletions(-) create mode 100644 cmake/FindLIKWID.cmake create mode 100644 cmake/FindMUMPS.cmake create mode 100644 cmake/FindMetis.cmake diff --git a/CMakeLists.txt b/CMakeLists.txt index e5023d159..95b818074 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -58,8 +58,12 @@ endif() find_package(OpenMP REQUIRED) find_package(Kokkos 4.4.1...<5.1 QUIET REQUIRED) -if (${GMGPOLAR_USE_MUMPS}) - find_package(Metis REQUIRED) +if(GMGPOLAR_USE_MUMPS) + find_package(MUMPS REQUIRED COMPONENTS OpenMP METIS) +endif() + +if(GMGPOLAR_USE_LIKWID) + find_package(LIKWID REQUIRED) endif() add_subdirectory(src) diff --git a/cmake/FindLIKWID.cmake b/cmake/FindLIKWID.cmake new file mode 100644 index 000000000..c30739018 --- /dev/null +++ b/cmake/FindLIKWID.cmake @@ -0,0 +1,33 @@ + +if(DEFINED ENV{LIKWID_DIR} AND NOT LIKWID_DIR) + set(LIKWID_DIR "$ENV{LIKWID_DIR}" CACHE PATH "LIKWID installation directory") +endif() + +find_package(PkgConfig QUIET) +if(PKG_CONFIG_FOUND) + pkg_check_modules(LIKWID_PC QUIET likwid) +endif() + +find_path(LIKWID_INCLUDE_DIR + NAMES likwid.h + HINTS ${LIKWID_DIR}/include ${LIKWID_PC_INCLUDE_DIRS} +) + +find_library(LIKWID_LIBRARY + NAMES likwid + HINTS ${LIKWID_DIR}/lib ${LIKWID_DIR}/lib64 ${LIKWID_PC_LIBRARY_DIRS} +) + +include(FindPackageHandleStandardArgs) +find_package_handle_standard_args(LIKWID + REQUIRED_VARS LIKWID_INCLUDE_DIR LIKWID_LIBRARY +) + +if(LIKWID_FOUND AND NOT TARGET LIKWID::LIKWID) + add_library(LIKWID::LIKWID INTERFACE IMPORTED) + set_target_properties(LIKWID::LIKWID PROPERTIES + INTERFACE_INCLUDE_DIRECTORIES "${LIKWID_INCLUDE_DIR}" + INTERFACE_LINK_LIBRARIES "${LIKWID_LIBRARY}" + INTERFACE_COMPILE_DEFINITIONS "LIKWID_PERFMON" + ) +endif() diff --git a/cmake/FindMUMPS.cmake b/cmake/FindMUMPS.cmake new file mode 100644 index 000000000..4464e5c94 --- /dev/null +++ b/cmake/FindMUMPS.cmake @@ -0,0 +1,56 @@ + +# Stage 1: prefer an installed MUMPS CMake config (supports COMPONENTS properly) +find_package(MUMPS CONFIG QUIET COMPONENTS ${MUMPS_FIND_COMPONENTS}) +if(MUMPS_FOUND) + return() +endif() + +# Stage 2: manual discovery via MUMPS_DIR hint +if(DEFINED ENV{MUMPS_DIR} AND NOT MUMPS_DIR) + set(MUMPS_DIR "$ENV{MUMPS_DIR}" CACHE PATH "MUMPS installation directory") +endif() + +find_path(MUMPS_INCLUDE_DIR + NAMES dmumps_c.h + HINTS ${MUMPS_DIR}/include +) + +foreach(_lib dmumps smumps mumps_common) + find_library(MUMPS_${_lib}_LIBRARY + NAMES ${_lib} + HINTS ${MUMPS_DIR}/lib ${MUMPS_DIR}/lib64 + ) + list(APPEND _MUMPS_REQUIRED_VARS MUMPS_${_lib}_LIBRARY) +endforeach() + +# mpiseq is the sequential MPI stub — only present in sequential builds +find_library(MUMPS_mpiseq_LIBRARY + NAMES mpiseq + HINTS ${MUMPS_DIR}/lib ${MUMPS_DIR}/lib64 + ${MUMPS_DIR}/libseq ${MUMPS_DIR}/lib/SEQ +) + +include(FindPackageHandleStandardArgs) +find_package_handle_standard_args(MUMPS + REQUIRED_VARS MUMPS_INCLUDE_DIR ${_MUMPS_REQUIRED_VARS} +) + +if(MUMPS_FOUND AND NOT TARGET MUMPS::MUMPS) + find_package(Metis REQUIRED) + + set(_mumps_libs + ${MUMPS_dmumps_LIBRARY} + ${MUMPS_smumps_LIBRARY} + ${MUMPS_mumps_common_LIBRARY} + metis::metis + ) + if(MUMPS_mpiseq_LIBRARY) + list(APPEND _mumps_libs ${MUMPS_mpiseq_LIBRARY}) + endif() + + add_library(MUMPS::MUMPS INTERFACE IMPORTED) + set_target_properties(MUMPS::MUMPS PROPERTIES + INTERFACE_INCLUDE_DIRECTORIES "${MUMPS_INCLUDE_DIR}" + INTERFACE_LINK_LIBRARIES "${_mumps_libs}" + ) +endif() diff --git a/cmake/FindMetis.cmake b/cmake/FindMetis.cmake new file mode 100644 index 000000000..68821b483 --- /dev/null +++ b/cmake/FindMetis.cmake @@ -0,0 +1,27 @@ + +if(DEFINED ENV{METIS_DIR} AND NOT METIS_DIR) + set(METIS_DIR "$ENV{METIS_DIR}" CACHE PATH "METIS installation directory") +endif() + +find_path(METIS_INCLUDE_DIR + NAMES metis.h + HINTS ${METIS_DIR}/include +) + +find_library(METIS_LIBRARY + NAMES metis + HINTS ${METIS_DIR}/lib ${METIS_DIR}/lib64 +) + +include(FindPackageHandleStandardArgs) +find_package_handle_standard_args(Metis + REQUIRED_VARS METIS_INCLUDE_DIR METIS_LIBRARY +) + +if(Metis_FOUND AND NOT TARGET metis::metis) + add_library(metis::metis INTERFACE IMPORTED) + set_target_properties(metis::metis PROPERTIES + INTERFACE_INCLUDE_DIRECTORIES "${METIS_INCLUDE_DIR}" + INTERFACE_LINK_LIBRARIES "${METIS_LIBRARY}" + ) +endif() diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 71e0224c3..afcf960a5 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -69,76 +69,12 @@ target_link_libraries(GMGPolarLib # Handle MUMPS configuration if(GMGPOLAR_USE_MUMPS) - find_package(MUMPS COMPONENTS OpenMP METIS) - if (${MUMPS_FOUND}) - target_link_libraries(GMGPolarLib PUBLIC MUMPS::MUMPS) - target_compile_definitions(GMGPolarLib PUBLIC GMGPOLAR_USE_MUMPS) - elseif(DEFINED ENV{MUMPS_DIR}) - set(MUMPS_DIR $ENV{MUMPS_DIR}) - - if(EXISTS "${MUMPS_DIR}/include" AND EXISTS "${MUMPS_DIR}/lib") - set(MUMPS_INCLUDE_DIR "${MUMPS_DIR}/include") - set(MUMPS_LIBRARY_DIR "${MUMPS_DIR}/lib") - - target_include_directories(GMGPolarLib PUBLIC ${MUMPS_INCLUDE_DIR}) - target_link_directories(GMGPolarLib PUBLIC ${MUMPS_LIBRARY_DIR}) - - if (EXISTS "${MUMPS_DIR}/libseq") - target_include_directories(GMGPolarLib PUBLIC "${MUMPS_DIR}/libseq") - target_link_directories(GMGPolarLib PUBLIC "${MUMPS_DIR}/libseq") - endif() - - set(MUMPS_FOUND TRUE) - endif() - - if(MUMPS_FOUND) - target_link_libraries(GMGPolarLib PUBLIC - mumps_common - smumps - dmumps - mpiseq - ) - target_compile_definitions(GMGPolarLib PUBLIC GMGPOLAR_USE_MUMPS) - else() - message(SEND_ERROR "MUMPS not found") - endif() - endif() + target_link_libraries(GMGPolarLib PUBLIC MUMPS::MUMPS) + target_compile_definitions(GMGPolarLib PUBLIC GMGPOLAR_USE_MUMPS) endif() # Handle LIKWID configuration if(GMGPOLAR_USE_LIKWID) - if(NOT DEFINED LIKWID_DIR) - if(DEFINED ENV{LIKWID_DIR}) - set(LIKWID_DIR $ENV{LIKWID_DIR} CACHE PATH "Path to Likwid installation") - endif() - endif() - - if(LIKWID_DIR) - find_path(LIKWID_INCLUDE_DIR - NAMES likwid.h - PATHS "${LIKWID_DIR}/include" - NO_DEFAULT_PATH - REQUIRED - ) - find_library(LIKWID_LIBRARY - NAMES likwid - PATHS "${LIKWID_DIR}/lib" "${LIKWID_DIR}/lib64" - NO_DEFAULT_PATH - REQUIRED - ) - else() - find_package(PkgConfig QUIET) - if(PKG_CONFIG_FOUND) - pkg_check_modules(LIKWID QUIET likwid) - endif() - endif() - - if(LIKWID_INCLUDE_DIR AND LIKWID_LIBRARY) - target_include_directories(GMGPolarLib PUBLIC ${LIKWID_INCLUDE_DIR}) - target_link_libraries(GMGPolarLib PUBLIC ${LIKWID_LIBRARY}) - target_compile_definitions(GMGPolarLib PUBLIC - LIKWID_PERFMON - GMGPOLAR_USE_LIKWID - ) - endif() + target_link_libraries(GMGPolarLib PUBLIC LIKWID::LIKWID) + target_compile_definitions(GMGPolarLib PUBLIC GMGPOLAR_USE_LIKWID) endif() From 08d6ffb8624b333b365bfceafef7b0366b9d2539 Mon Sep 17 00:00:00 2001 From: Emily Bourne Date: Mon, 20 Apr 2026 14:59:55 +0200 Subject: [PATCH 07/26] Try for a local version of GTest --- CMakeLists.txt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 95b818074..2112d7e35 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -80,7 +80,10 @@ target_link_libraries(strong_scaling PRIVATE GMGPolarLib InputFunctions) if(GMGPOLAR_BUILD_TESTS) enable_testing() - add_subdirectory(third-party) + find_package(GTest 1.17) + if (NOT GTest_FOUND) + add_subdirectory(third-party) + endif() add_subdirectory(tests) # Add coverage target - moved after test configuration From ed804235d6542b77fba9f02c79d21759c6382467 Mon Sep 17 00:00:00 2001 From: Emily Bourne Date: Mon, 20 Apr 2026 15:05:07 +0200 Subject: [PATCH 08/26] Prefer project paths --- include/ConfigParser/config_parser.h | 12 +- include/ConfigParser/test_selection.h | 2 +- include/GMGPolar/test_cases.h | 214 +++++++++++++------------- include/Level/level.inl | 20 +-- 4 files changed, 124 insertions(+), 124 deletions(-) diff --git a/include/ConfigParser/config_parser.h b/include/ConfigParser/config_parser.h index ba0ab8539..45728f8e6 100644 --- a/include/ConfigParser/config_parser.h +++ b/include/ConfigParser/config_parser.h @@ -5,12 +5,12 @@ #include #include -#include "../../include/ConfigParser/cmdline.h" -#include "../../include/Definitions/global_definitions.h" -#include "../../include/PolarGrid/polargrid.h" -#include "../../include/GMGPolar/test_cases.h" -#include "../../include/GMGPolar/igmgpolar.h" -#include "../../include/GMGPolar/gmgpolar.h" +#include +#include +#include +#include +#include +#include #include "test_selection.h" class ConfigParser diff --git a/include/ConfigParser/test_selection.h b/include/ConfigParser/test_selection.h index 30d95cf57..4c7ff3302 100644 --- a/include/ConfigParser/test_selection.h +++ b/include/ConfigParser/test_selection.h @@ -2,7 +2,7 @@ #include -#include "../../include/GMGPolar/test_cases.h" +#include using DomainGeometryVariant = std::variant; diff --git a/include/GMGPolar/test_cases.h b/include/GMGPolar/test_cases.h index ef1000e67..7be7cd518 100644 --- a/include/GMGPolar/test_cases.h +++ b/include/GMGPolar/test_cases.h @@ -12,129 +12,129 @@ /* --------------- */ /* Domain Geometry */ -#include "../include/InputFunctions/DomainGeometry/circularGeometry.h" -#include "../include/InputFunctions/DomainGeometry/culhamGeometry.h" -#include "../include/InputFunctions/DomainGeometry/czarnyGeometry.h" -#include "../include/InputFunctions/DomainGeometry/shafranovGeometry.h" +#include +#include +#include +#include /* --------------- */ /* Exact Solutions */ -#include "../include/InputFunctions/ExactSolution/cartesianR2_CircularGeometry.h" -#include "../include/InputFunctions/ExactSolution/cartesianR2_CzarnyGeometry.h" -#include "../include/InputFunctions/ExactSolution/cartesianR2_ShafranovGeometry.h" -#include "../include/InputFunctions/ExactSolution/cartesianR6_CircularGeometry.h" -#include "../include/InputFunctions/ExactSolution/cartesianR6_CzarnyGeometry.h" -#include "../include/InputFunctions/ExactSolution/cartesianR6_ShafranovGeometry.h" -#include "../include/InputFunctions/ExactSolution/polarR6_CircularGeometry.h" -#include "../include/InputFunctions/ExactSolution/polarR6_CulhamGeometry.h" -#include "../include/InputFunctions/ExactSolution/polarR6_CzarnyGeometry.h" -#include "../include/InputFunctions/ExactSolution/polarR6_ShafranovGeometry.h" -#include "../include/InputFunctions/ExactSolution/refined_CircularGeometry.h" -#include "../include/InputFunctions/ExactSolution/refined_CulhamGeometry.h" -#include "../include/InputFunctions/ExactSolution/refined_CzarnyGeometry.h" -#include "../include/InputFunctions/ExactSolution/refined_ShafranovGeometry.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include /* ------------------- */ /* Boundary Conditions */ -#include "../include/InputFunctions/BoundaryConditions/cartesianR2_Boundary_CircularGeometry.h" -#include "../include/InputFunctions/BoundaryConditions/cartesianR2_Boundary_CzarnyGeometry.h" -#include "../include/InputFunctions/BoundaryConditions/cartesianR2_Boundary_ShafranovGeometry.h" -#include "../include/InputFunctions/BoundaryConditions/cartesianR6_Boundary_CircularGeometry.h" -#include "../include/InputFunctions/BoundaryConditions/cartesianR6_Boundary_CzarnyGeometry.h" -#include "../include/InputFunctions/BoundaryConditions/cartesianR6_Boundary_ShafranovGeometry.h" -#include "../include/InputFunctions/BoundaryConditions/polarR6_Boundary_CircularGeometry.h" -#include "../include/InputFunctions/BoundaryConditions/polarR6_Boundary_CulhamGeometry.h" -#include "../include/InputFunctions/BoundaryConditions/polarR6_Boundary_CzarnyGeometry.h" -#include "../include/InputFunctions/BoundaryConditions/polarR6_Boundary_ShafranovGeometry.h" -#include "../include/InputFunctions/BoundaryConditions/refined_Boundary_CircularGeometry.h" -#include "../include/InputFunctions/BoundaryConditions/refined_Boundary_CulhamGeometry.h" -#include "../include/InputFunctions/BoundaryConditions/refined_Boundary_CzarnyGeometry.h" -#include "../include/InputFunctions/BoundaryConditions/refined_Boundary_ShafranovGeometry.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include /* -----------------------------*/ /* Density Profile Coefficients */ -#include "../include/InputFunctions/DensityProfileCoefficients/poissonCoefficients.h" -#include "../include/InputFunctions/DensityProfileCoefficients/sonnendruckerCoefficients.h" -#include "../include/InputFunctions/DensityProfileCoefficients/sonnendruckerGyroCoefficients.h" -#include "../include/InputFunctions/DensityProfileCoefficients/zoniCoefficients.h" -#include "../include/InputFunctions/DensityProfileCoefficients/zoniGyroCoefficients.h" -#include "../include/InputFunctions/DensityProfileCoefficients/zoniShiftedCoefficients.h" -#include "../include/InputFunctions/DensityProfileCoefficients/zoniShiftedGyroCoefficients.h" +#include +#include +#include +#include +#include +#include +#include /* ------------------------- */ /* Source Terms: CartesianR2 */ -#include "../include/InputFunctions/SourceTerms/cartesianR2_Poisson_CircularGeometry.h" -#include "../include/InputFunctions/SourceTerms/cartesianR2_Poisson_CzarnyGeometry.h" -#include "../include/InputFunctions/SourceTerms/cartesianR2_Poisson_ShafranovGeometry.h" -#include "../include/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_CircularGeometry.h" -#include "../include/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_CzarnyGeometry.h" -#include "../include/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_ShafranovGeometry.h" -#include "../include/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_CircularGeometry.h" -#include "../include/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_CzarnyGeometry.h" -#include "../include/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_ShafranovGeometry.h" -#include "../include/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_CircularGeometry.h" -#include "../include/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_CzarnyGeometry.h" -#include "../include/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_ShafranovGeometry.h" -#include "../include/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_CircularGeometry.h" -#include "../include/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_CzarnyGeometry.h" -#include "../include/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_ShafranovGeometry.h" -#include "../include/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_CircularGeometry.h" -#include "../include/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_CzarnyGeometry.h" -#include "../include/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_ShafranovGeometry.h" -#include "../include/InputFunctions/SourceTerms/cartesianR2_Zoni_CircularGeometry.h" -#include "../include/InputFunctions/SourceTerms/cartesianR2_Zoni_CzarnyGeometry.h" -#include "../include/InputFunctions/SourceTerms/cartesianR2_Zoni_ShafranovGeometry.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include /* ------------------------- */ /* Source Terms: CartesianR6 */ -#include "../include/InputFunctions/SourceTerms/cartesianR6_Poisson_CircularGeometry.h" -#include "../include/InputFunctions/SourceTerms/cartesianR6_Poisson_CzarnyGeometry.h" -#include "../include/InputFunctions/SourceTerms/cartesianR6_Poisson_ShafranovGeometry.h" -#include "../include/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_CircularGeometry.h" -#include "../include/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_CzarnyGeometry.h" -#include "../include/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_ShafranovGeometry.h" -#include "../include/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_CircularGeometry.h" -#include "../include/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_CzarnyGeometry.h" -#include "../include/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_ShafranovGeometry.h" -#include "../include/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_CircularGeometry.h" -#include "../include/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_CzarnyGeometry.h" -#include "../include/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_ShafranovGeometry.h" -#include "../include/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_CircularGeometry.h" -#include "../include/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_CzarnyGeometry.h" -#include "../include/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_ShafranovGeometry.h" -#include "../include/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_CircularGeometry.h" -#include "../include/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_CzarnyGeometry.h" -#include "../include/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_ShafranovGeometry.h" -#include "../include/InputFunctions/SourceTerms/cartesianR6_Zoni_CircularGeometry.h" -#include "../include/InputFunctions/SourceTerms/cartesianR6_Zoni_CzarnyGeometry.h" -#include "../include/InputFunctions/SourceTerms/cartesianR6_Zoni_ShafranovGeometry.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include /* --------------------- */ /* Source Terms: PolarR6 */ -#include "../include/InputFunctions/SourceTerms/polarR6_Poisson_CircularGeometry.h" -#include "../include/InputFunctions/SourceTerms/polarR6_Poisson_CzarnyGeometry.h" -#include "../include/InputFunctions/SourceTerms/polarR6_Poisson_ShafranovGeometry.h" -#include "../include/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_CircularGeometry.h" -#include "../include/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_CzarnyGeometry.h" -#include "../include/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_ShafranovGeometry.h" -#include "../include/InputFunctions/SourceTerms/polarR6_Sonnendrucker_CircularGeometry.h" -#include "../include/InputFunctions/SourceTerms/polarR6_Sonnendrucker_CzarnyGeometry.h" -#include "../include/InputFunctions/SourceTerms/polarR6_Sonnendrucker_ShafranovGeometry.h" -#include "../include/InputFunctions/SourceTerms/polarR6_ZoniGyro_CircularGeometry.h" -#include "../include/InputFunctions/SourceTerms/polarR6_ZoniGyro_CzarnyGeometry.h" -#include "../include/InputFunctions/SourceTerms/polarR6_ZoniGyro_ShafranovGeometry.h" -#include "../include/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CircularGeometry.h" -#include "../include/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CulhamGeometry.h" /* Culham */ -#include "../include/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CzarnyGeometry.h" -#include "../include/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_ShafranovGeometry.h" -#include "../include/InputFunctions/SourceTerms/polarR6_ZoniShifted_CircularGeometry.h" -#include "../include/InputFunctions/SourceTerms/polarR6_ZoniShifted_CzarnyGeometry.h" -#include "../include/InputFunctions/SourceTerms/polarR6_ZoniShifted_ShafranovGeometry.h" -#include "../include/InputFunctions/SourceTerms/polarR6_Zoni_CircularGeometry.h" -#include "../include/InputFunctions/SourceTerms/polarR6_Zoni_CzarnyGeometry.h" -#include "../include/InputFunctions/SourceTerms/polarR6_Zoni_ShafranovGeometry.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include /* Culham */ +#include +#include +#include +#include +#include +#include +#include +#include /* --------------------- */ /* Source Terms: Refined */ -#include "../include/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CircularGeometry.h" -#include "../include/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CulhamGeometry.h" /* Culham */ -#include "../include/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CzarnyGeometry.h" -#include "../include/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_ShafranovGeometry.h" \ No newline at end of file +#include +#include /* Culham */ +#include +#include \ No newline at end of file diff --git a/include/Level/level.inl b/include/Level/level.inl index b26a0e1f6..a69d0a53d 100644 --- a/include/Level/level.inl +++ b/include/Level/level.inl @@ -1,17 +1,17 @@ #pragma once -#include "../../include/Residual/ResidualGive/residualGive.h" -#include "../../include/Residual/ResidualTake/residualTake.h" +#include +#include -#include "../../include/DirectSolver/DirectSolver-COO-MUMPS-Give/directSolverGive.h" -#include "../../include/DirectSolver/DirectSolver-COO-MUMPS-Take/directSolverTake.h" -#include "../../include/DirectSolver/DirectSolver-CSR-LU-Give/directSolverGiveCustomLU.h" -#include "../../include/DirectSolver/DirectSolver-CSR-LU-Take/directSolverTakeCustomLU.h" +#include +#include +#include +#include -#include "../../include/Smoother/SmootherGive/smootherGive.h" -#include "../../include/Smoother/SmootherTake/smootherTake.h" +#include +#include -#include "../../include/ExtrapolatedSmoother/ExtrapolatedSmootherGive/extrapolatedSmootherGive.h" -#include "../../include/ExtrapolatedSmoother/ExtrapolatedSmootherTake/extrapolatedSmootherTake.h" +#include +#include // ----------- // // Constructor // From bdd3cd2826863aafd84dc2fed724c16ecb6f6434 Mon Sep 17 00:00:00 2001 From: Emily Bourne Date: Mon, 20 Apr 2026 15:08:28 +0200 Subject: [PATCH 09/26] Add an install target --- CMakeLists.txt | 2 ++ src/CMakeLists.txt | 4 ++++ src/InputFunctions/CMakeLists.txt | 10 ++++++++++ 3 files changed, 16 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2112d7e35..9e43483da 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -66,6 +66,8 @@ if(GMGPOLAR_USE_LIKWID) find_package(LIKWID REQUIRED) endif() +install(DIRECTORY ${PROJECT_SOURCE_DIR}/include/ DESTINATION include) + add_subdirectory(src) add_executable(gmgpolar src/main.cpp) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index afcf960a5..b19f4878e 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -67,6 +67,10 @@ target_link_libraries(GMGPolarLib ) +install(TARGETS GMGPolarLib + ARCHIVE DESTINATION lib +) + # Handle MUMPS configuration if(GMGPOLAR_USE_MUMPS) target_link_libraries(GMGPolarLib PUBLIC MUMPS::MUMPS) diff --git a/src/InputFunctions/CMakeLists.txt b/src/InputFunctions/CMakeLists.txt index c9500aa1c..c58fab6b8 100644 --- a/src/InputFunctions/CMakeLists.txt +++ b/src/InputFunctions/CMakeLists.txt @@ -17,3 +17,13 @@ target_link_libraries(InputFunctions INTERFACE target_include_directories(InputFunctions INTERFACE ${PROJECT_SOURCE_DIR}/include ) + +install(TARGETS + InputFunctions + InputFunctions_BoundaryConditions + InputFunctions_DensityProfileCoefficients + InputFunctions_DomainGeometry + InputFunctions_ExactSolution + InputFunctions_SourceTerms + ARCHIVE DESTINATION lib +) From 7d43a70a549dd2407bbbff60d8201ccd85ab9448 Mon Sep 17 00:00:00 2001 From: Emily Bourne Date: Mon, 20 Apr 2026 15:14:30 +0200 Subject: [PATCH 10/26] Add GMGPolarTargets to ensure we can do find_package(GMGPolar) --- CMakeLists.txt | 28 ++++++++++++++++++++++++++++ cmake/GMGPolarConfig.cmake.in | 18 ++++++++++++++++++ src/CMakeLists.txt | 1 + src/InputFunctions/CMakeLists.txt | 1 + 4 files changed, 48 insertions(+) create mode 100644 cmake/GMGPolarConfig.cmake.in diff --git a/CMakeLists.txt b/CMakeLists.txt index 9e43483da..3d7588c5e 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -68,6 +68,34 @@ endif() install(DIRECTORY ${PROJECT_SOURCE_DIR}/include/ DESTINATION include) +include(CMakePackageConfigHelpers) + +configure_package_config_file( + cmake/GMGPolarConfig.cmake.in + ${CMAKE_CURRENT_BINARY_DIR}/GMGPolarConfig.cmake + INSTALL_DESTINATION lib/cmake/GMGPolar +) + +write_basic_package_version_file( + ${CMAKE_CURRENT_BINARY_DIR}/GMGPolarConfigVersion.cmake + VERSION ${PROJECT_VERSION} + COMPATIBILITY SameMajorVersion +) + +install(FILES + ${CMAKE_CURRENT_BINARY_DIR}/GMGPolarConfig.cmake + ${CMAKE_CURRENT_BINARY_DIR}/GMGPolarConfigVersion.cmake + cmake/FindMUMPS.cmake + cmake/FindLIKWID.cmake + cmake/FindMetis.cmake + DESTINATION lib/cmake/GMGPolar +) + +install(EXPORT GMGPolarTargets + NAMESPACE GMGPolar:: + DESTINATION lib/cmake/GMGPolar +) + add_subdirectory(src) add_executable(gmgpolar src/main.cpp) diff --git a/cmake/GMGPolarConfig.cmake.in b/cmake/GMGPolarConfig.cmake.in new file mode 100644 index 000000000..228a06446 --- /dev/null +++ b/cmake/GMGPolarConfig.cmake.in @@ -0,0 +1,18 @@ +@PACKAGE_INIT@ + +list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}") + +include(CMakeFindDependencyMacro) + +find_dependency(OpenMP REQUIRED) +find_dependency(Kokkos REQUIRED) + +if(@GMGPOLAR_USE_MUMPS@) + find_dependency(MUMPS REQUIRED) +endif() + +if(@GMGPOLAR_USE_LIKWID@) + find_dependency(LIKWID REQUIRED) +endif() + +include("${CMAKE_CURRENT_LIST_DIR}/GMGPolarTargets.cmake") diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index b19f4878e..03c450124 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -68,6 +68,7 @@ target_link_libraries(GMGPolarLib install(TARGETS GMGPolarLib + EXPORT GMGPolarTargets ARCHIVE DESTINATION lib ) diff --git a/src/InputFunctions/CMakeLists.txt b/src/InputFunctions/CMakeLists.txt index c58fab6b8..333426ef5 100644 --- a/src/InputFunctions/CMakeLists.txt +++ b/src/InputFunctions/CMakeLists.txt @@ -25,5 +25,6 @@ install(TARGETS InputFunctions_DomainGeometry InputFunctions_ExactSolution InputFunctions_SourceTerms + EXPORT GMGPolarTargets ARCHIVE DESTINATION lib ) From a01d03eb3b7926365b7b8eeac986d54c26797448 Mon Sep 17 00:00:00 2001 From: Emily Bourne Date: Mon, 20 Apr 2026 15:23:27 +0200 Subject: [PATCH 11/26] Use different include paths for local build vs installed library --- CMakeLists.txt | 5 +++++ src/CMakeLists.txt | 4 ++-- src/InputFunctions/BoundaryConditions/CMakeLists.txt | 2 +- src/InputFunctions/CMakeLists.txt | 2 +- src/InputFunctions/DensityProfileCoefficients/CMakeLists.txt | 2 +- src/InputFunctions/DomainGeometry/CMakeLists.txt | 2 +- src/InputFunctions/ExactSolution/CMakeLists.txt | 2 +- src/InputFunctions/SourceTerms/CMakeLists.txt | 2 +- 8 files changed, 13 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3d7588c5e..39b4e4839 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -66,6 +66,11 @@ if(GMGPOLAR_USE_LIKWID) find_package(LIKWID REQUIRED) endif() +set(GMGPOLAR_INCLUDE_DIRS + $ + $ +) + install(DIRECTORY ${PROJECT_SOURCE_DIR}/include/ DESTINATION include) include(CMakePackageConfigHelpers) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 03c450124..08d427251 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -55,8 +55,8 @@ add_library(GMGPolarLib STATIC ) # Basic library configuration -target_include_directories(GMGPolarLib PUBLIC - ${CMAKE_CURRENT_SOURCE_DIR}/../include +target_include_directories(GMGPolarLib PUBLIC + ${GMGPOLAR_INCLUDE_DIRS} ) # Handle OpenMP diff --git a/src/InputFunctions/BoundaryConditions/CMakeLists.txt b/src/InputFunctions/BoundaryConditions/CMakeLists.txt index d8604ff32..8ed212e0d 100644 --- a/src/InputFunctions/BoundaryConditions/CMakeLists.txt +++ b/src/InputFunctions/BoundaryConditions/CMakeLists.txt @@ -18,5 +18,5 @@ set(BOUNDARY_CONDITIONS_SOURCES add_library(InputFunctions_BoundaryConditions STATIC ${BOUNDARY_CONDITIONS_SOURCES}) target_include_directories(InputFunctions_BoundaryConditions PUBLIC - ${PROJECT_SOURCE_DIR}/include + ${GMGPOLAR_INCLUDE_DIRS} ) diff --git a/src/InputFunctions/CMakeLists.txt b/src/InputFunctions/CMakeLists.txt index 333426ef5..01e916b3b 100644 --- a/src/InputFunctions/CMakeLists.txt +++ b/src/InputFunctions/CMakeLists.txt @@ -15,7 +15,7 @@ target_link_libraries(InputFunctions INTERFACE ) target_include_directories(InputFunctions INTERFACE - ${PROJECT_SOURCE_DIR}/include + ${GMGPOLAR_INCLUDE_DIRS} ) install(TARGETS diff --git a/src/InputFunctions/DensityProfileCoefficients/CMakeLists.txt b/src/InputFunctions/DensityProfileCoefficients/CMakeLists.txt index b0a236680..f22a5a6d7 100644 --- a/src/InputFunctions/DensityProfileCoefficients/CMakeLists.txt +++ b/src/InputFunctions/DensityProfileCoefficients/CMakeLists.txt @@ -10,5 +10,5 @@ set(DENSITY_PROFILE_COEFFICIENTS_SOURCES add_library(InputFunctions_DensityProfileCoefficients STATIC ${DENSITY_PROFILE_COEFFICIENTS_SOURCES}) target_include_directories(InputFunctions_DensityProfileCoefficients PUBLIC - ${PROJECT_SOURCE_DIR}/include + ${GMGPOLAR_INCLUDE_DIRS} ) diff --git a/src/InputFunctions/DomainGeometry/CMakeLists.txt b/src/InputFunctions/DomainGeometry/CMakeLists.txt index d9053e9c4..4f616e4f7 100644 --- a/src/InputFunctions/DomainGeometry/CMakeLists.txt +++ b/src/InputFunctions/DomainGeometry/CMakeLists.txt @@ -7,5 +7,5 @@ set(DOMAIN_GEOMETRY_SOURCES add_library(InputFunctions_DomainGeometry STATIC ${DOMAIN_GEOMETRY_SOURCES}) target_include_directories(InputFunctions_DomainGeometry PUBLIC - ${PROJECT_SOURCE_DIR}/include + ${GMGPOLAR_INCLUDE_DIRS} ) diff --git a/src/InputFunctions/ExactSolution/CMakeLists.txt b/src/InputFunctions/ExactSolution/CMakeLists.txt index 053ee30ff..f30317593 100644 --- a/src/InputFunctions/ExactSolution/CMakeLists.txt +++ b/src/InputFunctions/ExactSolution/CMakeLists.txt @@ -17,5 +17,5 @@ set(EXACT_SOLUTION_SOURCES add_library(InputFunctions_ExactSolution STATIC ${EXACT_SOLUTION_SOURCES}) target_include_directories(InputFunctions_ExactSolution PUBLIC - ${PROJECT_SOURCE_DIR}/include + ${GMGPOLAR_INCLUDE_DIRS} ) diff --git a/src/InputFunctions/SourceTerms/CMakeLists.txt b/src/InputFunctions/SourceTerms/CMakeLists.txt index 8abdd1ae1..0c4aa2807 100644 --- a/src/InputFunctions/SourceTerms/CMakeLists.txt +++ b/src/InputFunctions/SourceTerms/CMakeLists.txt @@ -71,7 +71,7 @@ set(SOURCE_TERMS_SOURCES add_library(InputFunctions_SourceTerms STATIC ${SOURCE_TERMS_SOURCES}) target_include_directories(InputFunctions_SourceTerms PUBLIC - ${PROJECT_SOURCE_DIR}/include + ${GMGPOLAR_INCLUDE_DIRS} ) target_link_libraries(InputFunctions_SourceTerms PUBLIC Kokkos::kokkos) From 7392ea6fa6d02686de5c668513313664d77441b5 Mon Sep 17 00:00:00 2001 From: Emily Bourne Date: Tue, 21 Apr 2026 09:24:36 +0200 Subject: [PATCH 12/26] Clang format --- include/Level/level.inl | 38 +++++++++++++++++++++--------------- include/Level/levelCache.inl | 11 ++++++----- 2 files changed, 28 insertions(+), 21 deletions(-) diff --git a/include/Level/level.inl b/include/Level/level.inl index a69d0a53d..8886fcfe8 100644 --- a/include/Level/level.inl +++ b/include/Level/level.inl @@ -16,9 +16,10 @@ // ----------- // // Constructor // template -Level::Level(const int level_depth, std::unique_ptr grid, - std::unique_ptr> level_cache, - const ExtrapolationType extrapolation, const bool FMG, const bool PCG_FMG) +Level::Level( + const int level_depth, std::unique_ptr grid, + std::unique_ptr> level_cache, + const ExtrapolationType extrapolation, const bool FMG, const bool PCG_FMG) : level_depth_(level_depth) , grid_(std::move(grid)) , level_cache_(std::move(level_cache)) @@ -46,7 +47,8 @@ const PolarGrid& Level::grid() const } template -const LevelCache& Level::levelCache() const +const LevelCache& +Level::levelCache() const { return *level_cache_; } @@ -102,8 +104,8 @@ ConstVector Level::error_cor // -------------- // // Apply Residual // template -void Level::initializeResidual(const bool DirBC_Interior, const int num_omp_threads, - const StencilDistributionMethod stencil_distribution_method) +void Level::initializeResidual( + const bool DirBC_Interior, const int num_omp_threads, const StencilDistributionMethod stencil_distribution_method) { if (stencil_distribution_method == StencilDistributionMethod::CPU_TAKE) { op_residual_ = @@ -118,14 +120,16 @@ void Level::initializeResidual(const } template -void Level::computeResidual(Vector result, ConstVector rhs, ConstVector x) const +void Level::computeResidual(Vector result, ConstVector rhs, + ConstVector x) const { if (!op_residual_) throw std::runtime_error("Residual not initialized."); op_residual_->computeResidual(result, rhs, x); } template -void Level::applySystemOperator(Vector result, ConstVector x) const +void Level::applySystemOperator(Vector result, + ConstVector x) const { if (!op_residual_) throw std::runtime_error("Residual not initialized."); @@ -135,8 +139,8 @@ void Level::applySystemOperator(Vect // ------------------- // // Solve coarse System // template -void Level::initializeDirectSolver(const bool DirBC_Interior, const int num_omp_threads, - const StencilDistributionMethod stencil_distribution_method) +void Level::initializeDirectSolver( + const bool DirBC_Interior, const int num_omp_threads, const StencilDistributionMethod stencil_distribution_method) { #ifdef GMGPOLAR_USE_MUMPS if (stencil_distribution_method == StencilDistributionMethod::CPU_TAKE) { @@ -172,8 +176,8 @@ void Level::directSolveInPlace(Vecto // --------------- // // Apply Smoothing // template -void Level::initializeSmoothing(const bool DirBC_Interior, const int num_omp_threads, - const StencilDistributionMethod stencil_distribution_method) +void Level::initializeSmoothing( + const bool DirBC_Interior, const int num_omp_threads, const StencilDistributionMethod stencil_distribution_method) { if (stencil_distribution_method == StencilDistributionMethod::CPU_TAKE) { op_smoother_ = @@ -188,7 +192,8 @@ void Level::initializeSmoothing(cons } template -void Level::smoothing(Vector x, ConstVector rhs, Vector temp) const +void Level::smoothing(Vector x, ConstVector rhs, + Vector temp) const { if (!op_smoother_) throw std::runtime_error("Smoother not initialized."); @@ -198,8 +203,8 @@ void Level::smoothing(Vector // ---------------------------- // // Apply Extrapolated Smoothing // template -void Level::initializeExtrapolatedSmoothing(const bool DirBC_Interior, const int num_omp_threads, - const StencilDistributionMethod stencil_distribution_method) +void Level::initializeExtrapolatedSmoothing( + const bool DirBC_Interior, const int num_omp_threads, const StencilDistributionMethod stencil_distribution_method) { if (stencil_distribution_method == StencilDistributionMethod::CPU_TAKE) { op_extrapolated_smoother_ = std::make_unique>( @@ -214,7 +219,8 @@ void Level::initializeExtrapolatedSm } template -void Level::extrapolatedSmoothing(Vector x, ConstVector rhs, Vector temp) const +void Level::extrapolatedSmoothing(Vector x, ConstVector rhs, + Vector temp) const { if (!op_extrapolated_smoother_) throw std::runtime_error("Extrapolated Smoother not initialized."); diff --git a/include/Level/levelCache.inl b/include/Level/levelCache.inl index 0ac1de66a..20b94e7f4 100644 --- a/include/Level/levelCache.inl +++ b/include/Level/levelCache.inl @@ -1,10 +1,10 @@ #pragma once template -LevelCache::LevelCache(const PolarGrid& grid, - const DensityProfileCoefficients& density_profile_coefficients, - const DomainGeometry& domain_geometry, - const bool cache_density_profile_coefficients, const bool cache_domain_geometry) +LevelCache::LevelCache( + const PolarGrid& grid, const DensityProfileCoefficients& density_profile_coefficients, + const DomainGeometry& domain_geometry, const bool cache_density_profile_coefficients, + const bool cache_domain_geometry) : domain_geometry_(domain_geometry) , density_profile_coefficients_(density_profile_coefficients) , cache_density_profile_coefficients_(cache_density_profile_coefficients) @@ -79,7 +79,8 @@ LevelCache::LevelCache(const PolarGr } template -const DensityProfileCoefficients& LevelCache::densityProfileCoefficients() const +const DensityProfileCoefficients& +LevelCache::densityProfileCoefficients() const { return density_profile_coefficients_; } From 6e94e02f06fbeba996a6eab063512bd12c5e9cba Mon Sep 17 00:00:00 2001 From: Emily Bourne Date: Tue, 21 Apr 2026 11:28:42 +0200 Subject: [PATCH 13/26] Fix merge --- src/CMakeLists.txt | 120 +++--------------- .../BoundaryConditions/CMakeLists.txt | 3 +- src/InputFunctions/CMakeLists.txt | 13 +- .../DensityProfileCoefficients/CMakeLists.txt | 5 +- .../DomainGeometry/CMakeLists.txt | 5 +- .../ExactSolution/CMakeLists.txt | 5 +- src/InputFunctions/SourceTerms/CMakeLists.txt | 3 +- 7 files changed, 33 insertions(+), 121 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index a1b07be2f..08d427251 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,10 +1,3 @@ -cmake_minimum_required(VERSION 3.12) - -if (CMAKE_COMPILER_IS_GNUCXX AND CMAKE_BUILD_TYPE STREQUAL "Release") - # If using GNU increase maximum number of instructions considered for inlining - # in Release mode in this folder and sub-folders - add_compile_options(--param max-inline-insns-single=1500) -endif() # Add subdirectories for components add_subdirectory(InputFunctions) @@ -62,114 +55,31 @@ add_library(GMGPolarLib STATIC ) # Basic library configuration -target_include_directories(GMGPolarLib PUBLIC - ${CMAKE_CURRENT_SOURCE_DIR}/.. - ${CMAKE_CURRENT_SOURCE_DIR} +target_include_directories(GMGPolarLib PUBLIC + ${GMGPOLAR_INCLUDE_DIRS} ) -target_link_libraries(GMGPolarLib PUBLIC - InputFunctions +# Handle OpenMP +target_link_libraries(GMGPolarLib + PUBLIC + OpenMP::OpenMP_CXX + Kokkos::kokkos ) -# Handle OpenMP -find_package(OpenMP REQUIRED) -if(OpenMP_CXX_FOUND) - target_link_libraries(GMGPolarLib PUBLIC OpenMP::OpenMP_CXX) -endif() -target_link_libraries(GMGPolarLib PUBLIC Kokkos::kokkos) +install(TARGETS GMGPolarLib + EXPORT GMGPolarTargets + ARCHIVE DESTINATION lib +) # Handle MUMPS configuration if(GMGPOLAR_USE_MUMPS) - find_package(MUMPS COMPONENTS OpenMP METIS) - if (${MUMPS_FOUND}) - target_link_libraries(GMGPolarLib PUBLIC MUMPS::MUMPS) - target_compile_definitions(GMGPolarLib PUBLIC GMGPOLAR_USE_MUMPS) - elseif(DEFINED ENV{MUMPS_DIR}) - set(MUMPS_DIR $ENV{MUMPS_DIR}) - - if(EXISTS "${MUMPS_DIR}/include" AND EXISTS "${MUMPS_DIR}/lib") - set(MUMPS_INCLUDE_DIR "${MUMPS_DIR}/include") - set(MUMPS_LIBRARY_DIR "${MUMPS_DIR}/lib") - - target_include_directories(GMGPolarLib PUBLIC ${MUMPS_INCLUDE_DIR}) - target_link_directories(GMGPolarLib PUBLIC ${MUMPS_LIBRARY_DIR}) - - if (EXISTS "${MUMPS_DIR}/libseq") - target_include_directories(GMGPolarLib PUBLIC "${MUMPS_DIR}/libseq") - target_link_directories(GMGPolarLib PUBLIC "${MUMPS_DIR}/libseq") - endif() - - set(MUMPS_FOUND TRUE) - endif() - - if(MUMPS_FOUND) - target_link_libraries(GMGPolarLib PUBLIC - mumps_common - smumps - dmumps - mpiseq - ) - target_compile_definitions(GMGPolarLib PUBLIC GMGPOLAR_USE_MUMPS) - else() - message(SEND_ERROR "MUMPS not found") - endif() - endif() - - if(DEFINED ENV{METIS_DIR}) - set(METIS_DIR $ENV{METIS_DIR}) - - if(EXISTS "${METIS_DIR}/include" AND EXISTS "${METIS_DIR}/lib") - set(METIS_INCLUDE_DIR "${METIS_DIR}/include") - set(METIS_LIBRARY_DIR "${METIS_DIR}/lib") - - target_include_directories(GMGPolarLib PUBLIC ${METIS_INCLUDE_DIR}) - target_link_directories(GMGPolarLib PUBLIC ${METIS_LIBRARY_DIR}) - set(METIS_FOUND TRUE) - endif() - - if(METIS_FOUND) - target_link_libraries(GMGPolarLib PUBLIC metis) - else() - message(SEND_ERROR "METIS not found") - endif() - endif() + target_link_libraries(GMGPolarLib PUBLIC MUMPS::MUMPS) + target_compile_definitions(GMGPolarLib PUBLIC GMGPOLAR_USE_MUMPS) endif() # Handle LIKWID configuration if(GMGPOLAR_USE_LIKWID) - if(NOT DEFINED LIKWID_DIR) - if(DEFINED ENV{LIKWID_DIR}) - set(LIKWID_DIR $ENV{LIKWID_DIR} CACHE PATH "Path to Likwid installation") - endif() - endif() - - if(LIKWID_DIR) - find_path(LIKWID_INCLUDE_DIR - NAMES likwid.h - PATHS "${LIKWID_DIR}/include" - NO_DEFAULT_PATH - REQUIRED - ) - find_library(LIKWID_LIBRARY - NAMES likwid - PATHS "${LIKWID_DIR}/lib" "${LIKWID_DIR}/lib64" - NO_DEFAULT_PATH - REQUIRED - ) - else() - find_package(PkgConfig QUIET) - if(PKG_CONFIG_FOUND) - pkg_check_modules(LIKWID QUIET likwid) - endif() - endif() - - if(LIKWID_INCLUDE_DIR AND LIKWID_LIBRARY) - target_include_directories(GMGPolarLib PUBLIC ${LIKWID_INCLUDE_DIR}) - target_link_libraries(GMGPolarLib PUBLIC ${LIKWID_LIBRARY}) - target_compile_definitions(GMGPolarLib PUBLIC - LIKWID_PERFMON - GMGPOLAR_USE_LIKWID - ) - endif() + target_link_libraries(GMGPolarLib PUBLIC LIKWID::LIKWID) + target_compile_definitions(GMGPolarLib PUBLIC GMGPOLAR_USE_LIKWID) endif() diff --git a/src/InputFunctions/BoundaryConditions/CMakeLists.txt b/src/InputFunctions/BoundaryConditions/CMakeLists.txt index c183b0798..8ed212e0d 100644 --- a/src/InputFunctions/BoundaryConditions/CMakeLists.txt +++ b/src/InputFunctions/BoundaryConditions/CMakeLists.txt @@ -18,6 +18,5 @@ set(BOUNDARY_CONDITIONS_SOURCES add_library(InputFunctions_BoundaryConditions STATIC ${BOUNDARY_CONDITIONS_SOURCES}) target_include_directories(InputFunctions_BoundaryConditions PUBLIC - ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_SOURCE_DIR}/include/InputFunctions/BoundaryConditions + ${GMGPOLAR_INCLUDE_DIRS} ) diff --git a/src/InputFunctions/CMakeLists.txt b/src/InputFunctions/CMakeLists.txt index 17bf2710d..3a4131385 100644 --- a/src/InputFunctions/CMakeLists.txt +++ b/src/InputFunctions/CMakeLists.txt @@ -14,6 +14,13 @@ target_link_libraries(InputFunctions INTERFACE InputFunctions_SourceTerms ) -target_include_directories(InputFunctions INTERFACE - ${CMAKE_SOURCE_DIR}/include/InputFunctions -) \ No newline at end of file +install(TARGETS + InputFunctions + InputFunctions_BoundaryConditions + InputFunctions_DensityProfileCoefficients + InputFunctions_DomainGeometry + InputFunctions_ExactSolution + InputFunctions_SourceTerms + EXPORT GMGPolarTargets + ARCHIVE DESTINATION lib +) diff --git a/src/InputFunctions/DensityProfileCoefficients/CMakeLists.txt b/src/InputFunctions/DensityProfileCoefficients/CMakeLists.txt index 505bb9f82..f22a5a6d7 100644 --- a/src/InputFunctions/DensityProfileCoefficients/CMakeLists.txt +++ b/src/InputFunctions/DensityProfileCoefficients/CMakeLists.txt @@ -10,6 +10,5 @@ set(DENSITY_PROFILE_COEFFICIENTS_SOURCES add_library(InputFunctions_DensityProfileCoefficients STATIC ${DENSITY_PROFILE_COEFFICIENTS_SOURCES}) target_include_directories(InputFunctions_DensityProfileCoefficients PUBLIC - ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_SOURCE_DIR}/include/InputFunctions/DensityProfileCoefficients -) \ No newline at end of file + ${GMGPOLAR_INCLUDE_DIRS} +) diff --git a/src/InputFunctions/DomainGeometry/CMakeLists.txt b/src/InputFunctions/DomainGeometry/CMakeLists.txt index 65b2c8b35..4f616e4f7 100644 --- a/src/InputFunctions/DomainGeometry/CMakeLists.txt +++ b/src/InputFunctions/DomainGeometry/CMakeLists.txt @@ -7,6 +7,5 @@ set(DOMAIN_GEOMETRY_SOURCES add_library(InputFunctions_DomainGeometry STATIC ${DOMAIN_GEOMETRY_SOURCES}) target_include_directories(InputFunctions_DomainGeometry PUBLIC - ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_SOURCE_DIR}/include/InputFunctions/DomainGeometry -) \ No newline at end of file + ${GMGPOLAR_INCLUDE_DIRS} +) diff --git a/src/InputFunctions/ExactSolution/CMakeLists.txt b/src/InputFunctions/ExactSolution/CMakeLists.txt index 0cea300d3..f30317593 100644 --- a/src/InputFunctions/ExactSolution/CMakeLists.txt +++ b/src/InputFunctions/ExactSolution/CMakeLists.txt @@ -17,6 +17,5 @@ set(EXACT_SOLUTION_SOURCES add_library(InputFunctions_ExactSolution STATIC ${EXACT_SOLUTION_SOURCES}) target_include_directories(InputFunctions_ExactSolution PUBLIC - ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_SOURCE_DIR}/include/InputFunctions/ExactSolution -) \ No newline at end of file + ${GMGPOLAR_INCLUDE_DIRS} +) diff --git a/src/InputFunctions/SourceTerms/CMakeLists.txt b/src/InputFunctions/SourceTerms/CMakeLists.txt index 4f22afc30..0c4aa2807 100644 --- a/src/InputFunctions/SourceTerms/CMakeLists.txt +++ b/src/InputFunctions/SourceTerms/CMakeLists.txt @@ -71,8 +71,7 @@ set(SOURCE_TERMS_SOURCES add_library(InputFunctions_SourceTerms STATIC ${SOURCE_TERMS_SOURCES}) target_include_directories(InputFunctions_SourceTerms PUBLIC - ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_SOURCE_DIR}/include/InputFunctions/SourceTerms + ${GMGPOLAR_INCLUDE_DIRS} ) target_link_libraries(InputFunctions_SourceTerms PUBLIC Kokkos::kokkos) From edaf7d457bd3633c0fcb441a13a8c668ea9b5d7f Mon Sep 17 00:00:00 2001 From: Emily Bourne Date: Tue, 21 Apr 2026 14:20:12 +0200 Subject: [PATCH 14/26] Create GMGPolarInterface to hold all CLI/testing interface objects --- CMakeLists.txt | 8 ++++---- src/CMakeLists.txt | 24 +++++++++++++++++------- tests/CMakeLists.txt | 2 +- 3 files changed, 22 insertions(+), 12 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 39b4e4839..5fa42e20e 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -108,10 +108,10 @@ add_executable(convergence_order src/convergence_order.cpp) add_executable(weak_scaling src/weak_scaling.cpp) add_executable(strong_scaling src/strong_scaling.cpp) -target_link_libraries(gmgpolar PRIVATE GMGPolarLib InputFunctions) -target_link_libraries(convergence_order PRIVATE GMGPolarLib InputFunctions) -target_link_libraries(weak_scaling PRIVATE GMGPolarLib InputFunctions) -target_link_libraries(strong_scaling PRIVATE GMGPolarLib InputFunctions) +target_link_libraries(gmgpolar PRIVATE GMGPolarLib GMGPolarInterface) +target_link_libraries(convergence_order PRIVATE GMGPolarLib GMGPolarInterface) +target_link_libraries(weak_scaling PRIVATE GMGPolarLib GMGPolarInterface) +target_link_libraries(strong_scaling PRIVATE GMGPolarLib GMGPolarInterface) if(GMGPOLAR_BUILD_TESTS) enable_testing() diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 08d427251..014685c6e 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -51,7 +51,6 @@ add_library(GMGPolarLib STATIC ${GMG_POLAR_SOURCES} ${STENCIL_SOURCES} ${INTERPOLATION_SOURCES} - ${CONFIG_PARSER_SOURCES} ) # Basic library configuration @@ -66,12 +65,6 @@ target_link_libraries(GMGPolarLib Kokkos::kokkos ) - -install(TARGETS GMGPolarLib - EXPORT GMGPolarTargets - ARCHIVE DESTINATION lib -) - # Handle MUMPS configuration if(GMGPOLAR_USE_MUMPS) target_link_libraries(GMGPolarLib PUBLIC MUMPS::MUMPS) @@ -83,3 +76,20 @@ if(GMGPOLAR_USE_LIKWID) target_link_libraries(GMGPolarLib PUBLIC LIKWID::LIKWID) target_compile_definitions(GMGPolarLib PUBLIC GMGPOLAR_USE_LIKWID) endif() + +add_library(GMGPolarInterface STATIC + ${CONFIG_PARSER_SOURCES} +) +target_link_libraries(GMGPolarInterface + PUBLIC + GMGPolarLib + InputFunctions +) + + +install(TARGETS + GMGPolarLib + GMGPolarInterface + EXPORT GMGPolarTargets + ARCHIVE DESTINATION lib +) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 3c64033de..41d2add52 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -32,7 +32,7 @@ add_executable(gmgpolar_tests # Set the compile features and link libraries target_compile_features(gmgpolar_tests PRIVATE cxx_std_20) -target_link_libraries(gmgpolar_tests GMGPolarLib GTest::gtest_main) +target_link_libraries(gmgpolar_tests GMGPolarLib GMGPolarInterface GTest::gtest_main) include(GoogleTest) gtest_discover_tests(gmgpolar_tests) From adaca6d75541895270d46bf77e6f20176fd653b2 Mon Sep 17 00:00:00 2001 From: Emily Bourne Date: Tue, 21 Apr 2026 14:21:17 +0200 Subject: [PATCH 15/26] MUMPS dependencies --- .github/actions/test/action.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/actions/test/action.yml b/.github/actions/test/action.yml index 556b00208..30f6d694d 100644 --- a/.github/actions/test/action.yml +++ b/.github/actions/test/action.yml @@ -17,10 +17,9 @@ runs: run: | apt-get -qq update apt-get -qq -y install lcov - - name: Install MUMPS Dependencies - shell: bash - run: | - apt-get -qq -y install gfortran + - name: Install additional dependencies to use MUMPS + if: inputs.use-mumps == 'true' + uses: ./.github/actions/install-dependencies - name: Download build test directory uses: actions/download-artifact@v4 with: From 4ee7dbbd69a86abe1d708f6f4498ad3d1183d6e5 Mon Sep 17 00:00:00 2001 From: Emily Bourne Date: Wed, 22 Apr 2026 09:29:36 +0200 Subject: [PATCH 16/26] Add target aliases --- src/CMakeLists.txt | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 014685c6e..c1b7adda6 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -77,6 +77,8 @@ if(GMGPOLAR_USE_LIKWID) target_compile_definitions(GMGPolarLib PUBLIC GMGPOLAR_USE_LIKWID) endif() +add_library(GMGPolar::GMGPolarLib ALIAS GMGPolarLib) + add_library(GMGPolarInterface STATIC ${CONFIG_PARSER_SOURCES} ) @@ -86,10 +88,11 @@ target_link_libraries(GMGPolarInterface InputFunctions ) +add_library(GMGPolar::GMGPolarInterface ALIAS GMGPolarInterface) install(TARGETS - GMGPolarLib - GMGPolarInterface + GMGPolar::GMGPolarLib + GMGPolar::GMGPolarInterface EXPORT GMGPolarTargets ARCHIVE DESTINATION lib ) From c2da216eedebdb011ab74acfe4ab2a0039117e0d Mon Sep 17 00:00:00 2001 From: Emily Bourne Date: Wed, 22 Apr 2026 11:01:50 +0200 Subject: [PATCH 17/26] Can't export aliases --- src/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index c1b7adda6..8537bb999 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -91,8 +91,8 @@ target_link_libraries(GMGPolarInterface add_library(GMGPolar::GMGPolarInterface ALIAS GMGPolarInterface) install(TARGETS - GMGPolar::GMGPolarLib - GMGPolar::GMGPolarInterface + GMGPolarLib + GMGPolarInterface EXPORT GMGPolarTargets ARCHIVE DESTINATION lib ) From 3678f5cda0f1c2e0c752fa59cbfcdebd39017f08 Mon Sep 17 00:00:00 2001 From: Emily Bourne Date: Thu, 23 Apr 2026 17:12:26 +0200 Subject: [PATCH 18/26] Only C++ component required Co-authored-by: Thomas Padioleau --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5fa42e20e..718d0a13f 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -55,7 +55,7 @@ if(GMGPOLAR_ENABLE_COVERAGE) endif() endif() -find_package(OpenMP REQUIRED) +find_package(OpenMP REQUIRED COMPONENTS CXX) find_package(Kokkos 4.4.1...<5.1 QUIET REQUIRED) if(GMGPOLAR_USE_MUMPS) From 0bacedcb6bf689ee00f9839739e89c52b9b38dd9 Mon Sep 17 00:00:00 2001 From: Emily Bourne Date: Fri, 24 Apr 2026 13:11:15 +0200 Subject: [PATCH 19/26] Tests should not be its own project --- tests/CMakeLists.txt | 6 ------ 1 file changed, 6 deletions(-) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 41d2add52..22e4dc711 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -1,9 +1,3 @@ -cmake_minimum_required(VERSION 3.12) - -project(GMGPolarTests LANGUAGES CXX) - -set(CMAKE_CXX_STANDARD 20) -set(CMAKE_CXX_STANDARD_REQUIRED True) # Create a single test executable that includes all test sources add_executable(gmgpolar_tests From 063b52c868c2e870bee2a6b6954db83015ffa16f Mon Sep 17 00:00:00 2001 From: Emily Bourne Date: Fri, 24 Apr 2026 13:11:27 +0200 Subject: [PATCH 20/26] Add QUIET to find_package(GTest) --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 718d0a13f..afc2661d6 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -115,7 +115,7 @@ target_link_libraries(strong_scaling PRIVATE GMGPolarLib GMGPolarInterface) if(GMGPOLAR_BUILD_TESTS) enable_testing() - find_package(GTest 1.17) + find_package(GTest 1.17 QUIET) if (NOT GTest_FOUND) add_subdirectory(third-party) endif() From f33f81db633533443f6e2168e5e1eac809b700c0 Mon Sep 17 00:00:00 2001 From: Emily Bourne Date: Fri, 24 Apr 2026 13:11:43 +0200 Subject: [PATCH 21/26] Version already set --- CMakeLists.txt | 2 -- 1 file changed, 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index afc2661d6..e709c82d4 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -30,8 +30,6 @@ endif() set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Wall -Wextra -pedantic -Wno-unused -Wno-psabi -Wfloat-conversion") set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O2 -mtune=generic -Wno-psabi") -set(CMAKE_CXX_STANDARD 20 CACHE INTERNAL "The C++ standard whose features are requested to build this project.") - if (CMAKE_COMPILER_IS_GNUCXX AND CMAKE_BUILD_TYPE STREQUAL "Release") # If using GNU increase maximum number of instructions considered for inlining # in Release mode in this folder and sub-folders From b101c711dbf116f0d1b6ee6e5e57e0507efe3ad5 Mon Sep 17 00:00:00 2001 From: Emily Bourne Date: Fri, 24 Apr 2026 13:12:32 +0200 Subject: [PATCH 22/26] Duplicate C++ version specification --- tests/CMakeLists.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 22e4dc711..3f698ae46 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -24,8 +24,7 @@ add_executable(gmgpolar_tests GMGPolar/convergence_order.cpp ) -# Set the compile features and link libraries -target_compile_features(gmgpolar_tests PRIVATE cxx_std_20) +# Set the link libraries target_link_libraries(gmgpolar_tests GMGPolarLib GMGPolarInterface GTest::gtest_main) include(GoogleTest) From e1ca3ba72564c23363c783e6a34421b5755fbcb7 Mon Sep 17 00:00:00 2001 From: Emily Bourne Date: Mon, 27 Apr 2026 10:12:08 +0200 Subject: [PATCH 23/26] Enable Fortran instead of choosing project languages based on USE_MUMPS Co-authored-by: Thomas Padioleau --- CMakeLists.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index e709c82d4..a5e5a6937 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -14,6 +14,10 @@ if (${GMGPOLAR_USE_MUMPS}) project(GMGPolar VERSION 2.0.0 LANGUAGES CXX Fortran) else() project(GMGPolar VERSION 2.0.0 LANGUAGES CXX) +project(GMGPolar VERSION 2.1.0 LANGUAGES CXX) +# MUMPS does not automatically provide Fortran libraries +if (${GMGPOLAR_USE_MUMPS}) + enable_language(Fortran) endif() set(CMAKE_CXX_STANDARD 20) From 0ba4a9ee320fc0a28bc6f3946048e5e6efa8c766 Mon Sep 17 00:00:00 2001 From: Emily Bourne Date: Mon, 27 Apr 2026 11:19:47 +0200 Subject: [PATCH 24/26] Clear duplicate project declaration --- CMakeLists.txt | 5 ----- 1 file changed, 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a5e5a6937..8114f3329 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,11 +9,6 @@ option(GMGPOLAR_USE_LIKWID "Use LIKWID to measure code (regions)." OFF) option(GMGPOLAR_USE_MUMPS "Use MUMPS to solve linear systems." OFF) option(GMGPOLAR_ENABLE_COVERAGE "Enable code coverage reporting (requires GCC/Clang)" OFF) -if (${GMGPOLAR_USE_MUMPS}) - # MUMPS does not automatically provide Fortran libraries - project(GMGPolar VERSION 2.0.0 LANGUAGES CXX Fortran) -else() - project(GMGPolar VERSION 2.0.0 LANGUAGES CXX) project(GMGPolar VERSION 2.1.0 LANGUAGES CXX) # MUMPS does not automatically provide Fortran libraries if (${GMGPOLAR_USE_MUMPS}) From 6971888c0b7f0652c70d2bc4dd31b105e8e14c2d Mon Sep 17 00:00:00 2001 From: Thomas Padioleau Date: Thu, 30 Apr 2026 14:00:53 +0200 Subject: [PATCH 25/26] Review ebourne cleanup cmake (#234) --- CMakeLists.txt | 2 +- cmake/GMGPolarConfig.cmake.in | 8 ++++---- src/CMakeLists.txt | 5 +++++ 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8114f3329..de29b9c71 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -53,7 +53,7 @@ if(GMGPOLAR_ENABLE_COVERAGE) endif() find_package(OpenMP REQUIRED COMPONENTS CXX) -find_package(Kokkos 4.4.1...<5.1 QUIET REQUIRED) +find_package(Kokkos 4.4.1...<6 QUIET REQUIRED) if(GMGPOLAR_USE_MUMPS) find_package(MUMPS REQUIRED COMPONENTS OpenMP METIS) diff --git a/cmake/GMGPolarConfig.cmake.in b/cmake/GMGPolarConfig.cmake.in index 228a06446..390a06a66 100644 --- a/cmake/GMGPolarConfig.cmake.in +++ b/cmake/GMGPolarConfig.cmake.in @@ -4,15 +4,15 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}") include(CMakeFindDependencyMacro) -find_dependency(OpenMP REQUIRED) -find_dependency(Kokkos REQUIRED) +find_dependency(OpenMP COMPONENTS CXX) +find_dependency(Kokkos) if(@GMGPOLAR_USE_MUMPS@) - find_dependency(MUMPS REQUIRED) + find_dependency(MUMPS COMPONENTS OpenMP METIS) endif() if(@GMGPOLAR_USE_LIKWID@) - find_dependency(LIKWID REQUIRED) + find_dependency(LIKWID) endif() include("${CMAKE_CURRENT_LIST_DIR}/GMGPolarTargets.cmake") diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 8537bb999..fa6675aa7 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -53,6 +53,9 @@ add_library(GMGPolarLib STATIC ${INTERPOLATION_SOURCES} ) +# Declare C++20 is a minimum required to use GMGPolarLib headers +target_compile_features(GMGPolarLib INTERFACE cxx_std_20) + # Basic library configuration target_include_directories(GMGPolarLib PUBLIC ${GMGPOLAR_INCLUDE_DIRS} @@ -82,6 +85,8 @@ add_library(GMGPolar::GMGPolarLib ALIAS GMGPolarLib) add_library(GMGPolarInterface STATIC ${CONFIG_PARSER_SOURCES} ) +# Declare C++20 is a minimum required to use GMGPolarInterface headers +target_compile_features(GMGPolarInterface INTERFACE cxx_std_20) target_link_libraries(GMGPolarInterface PUBLIC GMGPolarLib From 6a9c5dad36fd97df65718c921e976dc1f89c9af9 Mon Sep 17 00:00:00 2001 From: Emily Bourne Date: Fri, 1 May 2026 13:28:43 +0200 Subject: [PATCH 26/26] Fix merge --- src/Interpolation/injection.cpp | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/Interpolation/injection.cpp b/src/Interpolation/injection.cpp index 42d1ab3e0..9283e4e74 100644 --- a/src/Interpolation/injection.cpp +++ b/src/Interpolation/injection.cpp @@ -1,9 +1,4 @@ -<<<<<<< ebourne_cleanup_cmake #include -======= -#include "../../include/Interpolation/interpolation.h" - ->>>>>>> main using namespace gmgpolar; /* Remark: This injection is not scaled. */