From fe21442f24366dcab675d47ad21b105565ec7735 Mon Sep 17 00:00:00 2001
From: Emily Bourne <emily.bourne@epfl.ch>
Date: Mon, 20 Apr 2026 16:33:25 +0200
Subject: [PATCH 1/2] Add gmgpolar namespace

---
 include/ConfigParser/cmdline.h                |  0
 include/ConfigParser/config_parser.h          |  4 ++
 include/ConfigParser/test_selection.h         |  5 ++
 include/Definitions/equals.h                  |  7 ++-
 .../directSolverGive.h                        |  4 ++
 .../directSolverTake.h                        |  4 ++
 .../directSolverGiveCustomLU.h                |  4 ++
 .../directSolverTakeCustomLU.h                |  4 ++
 include/DirectSolver/directSolver.h           |  4 ++
 .../extrapolatedSmootherGive.h                |  4 ++
 .../extrapolatedSmootherTake.h                |  4 ++
 .../extrapolatedSmoother.h                    |  4 ++
 include/GMGPolar/gmgpolar.h                   |  4 ++
 include/GMGPolar/igmgpolar.h                  |  4 ++
 .../cartesianR2_Boundary_CircularGeometry.h   |  4 ++
 .../cartesianR2_Boundary_CzarnyGeometry.h     |  4 ++
 .../cartesianR2_Boundary_ShafranovGeometry.h  |  4 ++
 .../cartesianR6_Boundary_CircularGeometry.h   |  4 ++
 .../cartesianR6_Boundary_CzarnyGeometry.h     |  4 ++
 .../cartesianR6_Boundary_ShafranovGeometry.h  |  4 ++
 .../polarR6_Boundary_CircularGeometry.h       |  4 ++
 .../polarR6_Boundary_CulhamGeometry.h         |  4 ++
 .../polarR6_Boundary_CzarnyGeometry.h         |  4 ++
 .../polarR6_Boundary_ShafranovGeometry.h      |  4 ++
 .../refined_Boundary_CircularGeometry.h       |  4 ++
 .../refined_Boundary_CulhamGeometry.h         |  4 ++
 .../refined_Boundary_CzarnyGeometry.h         |  4 ++
 .../refined_Boundary_ShafranovGeometry.h      |  4 ++
 .../poissonCoefficients.h                     |  4 ++
 .../sonnendruckerCoefficients.h               |  4 ++
 .../sonnendruckerGyroCoefficients.h           |  4 ++
 .../zoniCoefficients.h                        |  4 ++
 .../zoniGyroCoefficients.h                    |  4 ++
 .../zoniShiftedCoefficients.h                 |  4 ++
 .../zoniShiftedGyroCoefficients.h             |  4 ++
 .../DomainGeometry/circularGeometry.h         |  6 ++-
 .../DomainGeometry/culhamGeometry.h           |  6 ++-
 .../DomainGeometry/czarnyGeometry.h           |  4 ++
 .../DomainGeometry/shafranovGeometry.h        |  6 ++-
 .../cartesianR2_CircularGeometry.h            |  4 ++
 .../cartesianR2_CzarnyGeometry.h              |  4 ++
 .../cartesianR2_ShafranovGeometry.h           |  4 ++
 .../cartesianR6_CircularGeometry.h            |  4 ++
 .../cartesianR6_CzarnyGeometry.h              |  4 ++
 .../cartesianR6_ShafranovGeometry.h           |  4 ++
 .../ExactSolution/polarR6_CircularGeometry.h  |  4 ++
 .../ExactSolution/polarR6_CulhamGeometry.h    |  4 ++
 .../ExactSolution/polarR6_CzarnyGeometry.h    |  4 ++
 .../ExactSolution/polarR6_ShafranovGeometry.h |  4 ++
 .../ExactSolution/refined_CircularGeometry.h  |  4 ++
 .../ExactSolution/refined_CulhamGeometry.h    |  4 ++
 .../ExactSolution/refined_CzarnyGeometry.h    |  4 ++
 .../ExactSolution/refined_ShafranovGeometry.h |  4 ++
 .../cartesianR2_Poisson_CircularGeometry.h    |  4 ++
 .../cartesianR2_Poisson_CzarnyGeometry.h      |  4 ++
 .../cartesianR2_Poisson_ShafranovGeometry.h   |  4 ++
 ...ianR2_SonnendruckerGyro_CircularGeometry.h |  4 ++
 ...esianR2_SonnendruckerGyro_CzarnyGeometry.h |  4 ++
 ...anR2_SonnendruckerGyro_ShafranovGeometry.h |  4 ++
 ...rtesianR2_Sonnendrucker_CircularGeometry.h |  4 ++
 ...cartesianR2_Sonnendrucker_CzarnyGeometry.h |  4 ++
 ...tesianR2_Sonnendrucker_ShafranovGeometry.h |  4 ++
 .../cartesianR2_ZoniGyro_CircularGeometry.h   |  4 ++
 .../cartesianR2_ZoniGyro_CzarnyGeometry.h     |  4 ++
 .../cartesianR2_ZoniGyro_ShafranovGeometry.h  |  4 ++
 ...esianR2_ZoniShiftedGyro_CircularGeometry.h |  4 ++
 ...rtesianR2_ZoniShiftedGyro_CzarnyGeometry.h |  4 ++
 ...sianR2_ZoniShiftedGyro_ShafranovGeometry.h |  4 ++
 ...cartesianR2_ZoniShifted_CircularGeometry.h |  4 ++
 .../cartesianR2_ZoniShifted_CzarnyGeometry.h  |  4 ++
 ...artesianR2_ZoniShifted_ShafranovGeometry.h |  4 ++
 .../cartesianR2_Zoni_CircularGeometry.h       |  4 ++
 .../cartesianR2_Zoni_CzarnyGeometry.h         |  4 ++
 .../cartesianR2_Zoni_ShafranovGeometry.h      |  4 ++
 .../cartesianR6_Poisson_CircularGeometry.h    |  4 ++
 .../cartesianR6_Poisson_CzarnyGeometry.h      |  4 ++
 .../cartesianR6_Poisson_ShafranovGeometry.h   |  4 ++
 ...ianR6_SonnendruckerGyro_CircularGeometry.h |  4 ++
 ...esianR6_SonnendruckerGyro_CzarnyGeometry.h |  4 ++
 ...anR6_SonnendruckerGyro_ShafranovGeometry.h |  4 ++
 ...rtesianR6_Sonnendrucker_CircularGeometry.h |  4 ++
 ...cartesianR6_Sonnendrucker_CzarnyGeometry.h |  4 ++
 ...tesianR6_Sonnendrucker_ShafranovGeometry.h |  4 ++
 .../cartesianR6_ZoniGyro_CircularGeometry.h   |  4 ++
 .../cartesianR6_ZoniGyro_CzarnyGeometry.h     |  4 ++
 .../cartesianR6_ZoniGyro_ShafranovGeometry.h  |  4 ++
 ...esianR6_ZoniShiftedGyro_CircularGeometry.h |  4 ++
 ...rtesianR6_ZoniShiftedGyro_CzarnyGeometry.h |  4 ++
 ...sianR6_ZoniShiftedGyro_ShafranovGeometry.h |  4 ++
 ...cartesianR6_ZoniShifted_CircularGeometry.h |  4 ++
 .../cartesianR6_ZoniShifted_CzarnyGeometry.h  |  4 ++
 ...artesianR6_ZoniShifted_ShafranovGeometry.h |  4 ++
 .../cartesianR6_Zoni_CircularGeometry.h       |  4 ++
 .../cartesianR6_Zoni_CzarnyGeometry.h         |  4 ++
 .../cartesianR6_Zoni_ShafranovGeometry.h      |  4 ++
 .../polarR6_Poisson_CircularGeometry.h        |  4 ++
 .../polarR6_Poisson_CzarnyGeometry.h          |  4 ++
 .../polarR6_Poisson_ShafranovGeometry.h       |  4 ++
 ...larR6_SonnendruckerGyro_CircularGeometry.h |  4 ++
 ...polarR6_SonnendruckerGyro_CzarnyGeometry.h |  4 ++
 ...arR6_SonnendruckerGyro_ShafranovGeometry.h |  4 ++
 .../polarR6_Sonnendrucker_CircularGeometry.h  |  4 ++
 .../polarR6_Sonnendrucker_CzarnyGeometry.h    |  4 ++
 .../polarR6_Sonnendrucker_ShafranovGeometry.h |  4 ++
 .../polarR6_ZoniGyro_CircularGeometry.h       |  4 ++
 .../polarR6_ZoniGyro_CzarnyGeometry.h         |  4 ++
 .../polarR6_ZoniGyro_ShafranovGeometry.h      |  4 ++
 ...polarR6_ZoniShiftedGyro_CircularGeometry.h |  4 ++
 .../polarR6_ZoniShiftedGyro_CulhamGeometry.h  |  4 ++
 .../polarR6_ZoniShiftedGyro_CzarnyGeometry.h  |  4 ++
 ...olarR6_ZoniShiftedGyro_ShafranovGeometry.h |  4 ++
 .../polarR6_ZoniShifted_CircularGeometry.h    |  4 ++
 .../polarR6_ZoniShifted_CzarnyGeometry.h      |  4 ++
 .../polarR6_ZoniShifted_ShafranovGeometry.h   |  4 ++
 .../polarR6_Zoni_CircularGeometry.h           |  4 ++
 .../SourceTerms/polarR6_Zoni_CzarnyGeometry.h |  4 ++
 .../polarR6_Zoni_ShafranovGeometry.h          |  4 ++
 ...refined_ZoniShiftedGyro_CircularGeometry.h |  4 ++
 .../refined_ZoniShiftedGyro_CulhamGeometry.h  |  4 ++
 .../refined_ZoniShiftedGyro_CzarnyGeometry.h  |  4 ++
 ...efined_ZoniShiftedGyro_ShafranovGeometry.h |  4 ++
 include/InputFunctions/exactSolution.h        |  4 ++
 include/Interpolation/interpolation.h         |  4 ++
 include/Level/level.h                         | 24 +++++++++
 include/Level/level.inl                       | 51 ++++++++-----------
 include/Level/levelCache.inl                  | 11 ++--
 include/LinearAlgebra/Matrix/coo_matrix.h     |  4 ++
 include/LinearAlgebra/Matrix/csr_matrix.h     |  4 ++
 .../LinearAlgebra/Solvers/coo_mumps_solver.h  |  4 ++
 include/LinearAlgebra/Solvers/csr_lu_solver.h |  4 ++
 .../Solvers/tridiagonal_solver.h              |  6 ++-
 include/LinearAlgebra/Vector/vector.h         |  5 ++
 .../LinearAlgebra/Vector/vector_operations.h  |  5 ++
 include/PolarGrid/polargrid.h                 |  4 ++
 include/Residual/ResidualGive/residualGive.h  |  4 ++
 include/Residual/ResidualTake/residualTake.h  |  4 ++
 include/Residual/residual.h                   |  4 ++
 include/Smoother/SmootherGive/smootherGive.h  |  4 ++
 include/Smoother/SmootherTake/smootherTake.h  |  4 ++
 include/Smoother/smoother.h                   |  4 ++
 include/Stencil/stencil.h                     |  4 ++
 src/ConfigParser/config_parser.cpp            |  1 +
 src/ConfigParser/select_test_case.cpp         |  1 +
 src/GMGPolar/gmgpolar.cpp                     |  1 +
 .../cartesianR2_Boundary_CircularGeometry.cpp |  1 +
 .../cartesianR2_Boundary_CzarnyGeometry.cpp   |  1 +
 ...cartesianR2_Boundary_ShafranovGeometry.cpp |  1 +
 .../cartesianR6_Boundary_CircularGeometry.cpp |  1 +
 .../cartesianR6_Boundary_CzarnyGeometry.cpp   |  1 +
 ...cartesianR6_Boundary_ShafranovGeometry.cpp |  1 +
 .../polarR6_Boundary_CircularGeometry.cpp     |  1 +
 .../polarR6_Boundary_CulhamGeometry.cpp       |  1 +
 .../polarR6_Boundary_CzarnyGeometry.cpp       |  1 +
 .../polarR6_Boundary_ShafranovGeometry.cpp    |  1 +
 .../refined_Boundary_CircularGeometry.cpp     |  1 +
 .../refined_Boundary_CulhamGeometry.cpp       |  1 +
 .../refined_Boundary_CzarnyGeometry.cpp       |  1 +
 .../refined_Boundary_ShafranovGeometry.cpp    |  1 +
 .../poissonCoefficients.cpp                   |  1 +
 .../sonnendruckerCoefficients.cpp             |  1 +
 .../sonnendruckerGyroCoefficients.cpp         |  1 +
 .../zoniCoefficients.cpp                      |  1 +
 .../zoniGyroCoefficients.cpp                  |  1 +
 .../zoniShiftedCoefficients.cpp               |  1 +
 .../zoniShiftedGyroCoefficients.cpp           |  1 +
 .../DomainGeometry/circularGeometry.cpp       |  1 +
 .../DomainGeometry/culhamGeometry.cpp         |  1 +
 .../DomainGeometry/czarnyGeometry.cpp         |  1 +
 .../DomainGeometry/shafranovGeometry.cpp      |  1 +
 .../cartesianR2_CircularGeometry.cpp          |  1 +
 .../cartesianR2_CzarnyGeometry.cpp            |  1 +
 .../cartesianR2_ShafranovGeometry.cpp         |  1 +
 .../cartesianR6_CircularGeometry.cpp          |  1 +
 .../cartesianR6_CzarnyGeometry.cpp            |  1 +
 .../cartesianR6_ShafranovGeometry.cpp         |  1 +
 .../polarR6_CircularGeometry.cpp              |  1 +
 .../ExactSolution/polarR6_CulhamGeometry.cpp  |  1 +
 .../ExactSolution/polarR6_CzarnyGeometry.cpp  |  1 +
 .../polarR6_ShafranovGeometry.cpp             |  1 +
 .../refined_CircularGeometry.cpp              |  1 +
 .../ExactSolution/refined_CulhamGeometry.cpp  |  1 +
 .../ExactSolution/refined_CzarnyGeometry.cpp  |  1 +
 .../refined_ShafranovGeometry.cpp             |  1 +
 .../cartesianR2_Poisson_CircularGeometry.cpp  |  1 +
 .../cartesianR2_Poisson_CzarnyGeometry.cpp    |  1 +
 .../cartesianR2_Poisson_ShafranovGeometry.cpp |  1 +
 ...nR2_SonnendruckerGyro_CircularGeometry.cpp |  1 +
 ...ianR2_SonnendruckerGyro_CzarnyGeometry.cpp |  1 +
 ...R2_SonnendruckerGyro_ShafranovGeometry.cpp |  1 +
 ...esianR2_Sonnendrucker_CircularGeometry.cpp |  1 +
 ...rtesianR2_Sonnendrucker_CzarnyGeometry.cpp |  1 +
 ...sianR2_Sonnendrucker_ShafranovGeometry.cpp |  1 +
 .../cartesianR2_ZoniGyro_CircularGeometry.cpp |  1 +
 .../cartesianR2_ZoniGyro_CzarnyGeometry.cpp   |  1 +
 ...cartesianR2_ZoniGyro_ShafranovGeometry.cpp |  1 +
 ...ianR2_ZoniShiftedGyro_CircularGeometry.cpp |  1 +
 ...esianR2_ZoniShiftedGyro_CzarnyGeometry.cpp |  1 +
 ...anR2_ZoniShiftedGyro_ShafranovGeometry.cpp |  1 +
 ...rtesianR2_ZoniShifted_CircularGeometry.cpp |  1 +
 ...cartesianR2_ZoniShifted_CzarnyGeometry.cpp |  1 +
 ...tesianR2_ZoniShifted_ShafranovGeometry.cpp |  1 +
 .../cartesianR2_Zoni_CircularGeometry.cpp     |  1 +
 .../cartesianR2_Zoni_CzarnyGeometry.cpp       |  1 +
 .../cartesianR2_Zoni_ShafranovGeometry.cpp    |  1 +
 .../cartesianR6_Poisson_CircularGeometry.cpp  |  1 +
 .../cartesianR6_Poisson_CzarnyGeometry.cpp    |  1 +
 .../cartesianR6_Poisson_ShafranovGeometry.cpp |  1 +
 ...nR6_SonnendruckerGyro_CircularGeometry.cpp |  1 +
 ...ianR6_SonnendruckerGyro_CzarnyGeometry.cpp |  1 +
 ...R6_SonnendruckerGyro_ShafranovGeometry.cpp |  1 +
 ...esianR6_Sonnendrucker_CircularGeometry.cpp |  1 +
 ...rtesianR6_Sonnendrucker_CzarnyGeometry.cpp |  1 +
 ...sianR6_Sonnendrucker_ShafranovGeometry.cpp |  1 +
 .../cartesianR6_ZoniGyro_CircularGeometry.cpp |  1 +
 .../cartesianR6_ZoniGyro_CzarnyGeometry.cpp   |  1 +
 ...cartesianR6_ZoniGyro_ShafranovGeometry.cpp |  1 +
 ...ianR6_ZoniShiftedGyro_CircularGeometry.cpp |  1 +
 ...esianR6_ZoniShiftedGyro_CzarnyGeometry.cpp |  1 +
 ...anR6_ZoniShiftedGyro_ShafranovGeometry.cpp |  1 +
 ...rtesianR6_ZoniShifted_CircularGeometry.cpp |  1 +
 ...cartesianR6_ZoniShifted_CzarnyGeometry.cpp |  1 +
 ...tesianR6_ZoniShifted_ShafranovGeometry.cpp |  1 +
 .../cartesianR6_Zoni_CircularGeometry.cpp     |  1 +
 .../cartesianR6_Zoni_CzarnyGeometry.cpp       |  1 +
 .../cartesianR6_Zoni_ShafranovGeometry.cpp    |  1 +
 .../polarR6_Poisson_CircularGeometry.cpp      |  1 +
 .../polarR6_Poisson_CzarnyGeometry.cpp        |  1 +
 .../polarR6_Poisson_ShafranovGeometry.cpp     |  1 +
 ...rR6_SonnendruckerGyro_CircularGeometry.cpp |  1 +
 ...larR6_SonnendruckerGyro_CzarnyGeometry.cpp |  1 +
 ...R6_SonnendruckerGyro_ShafranovGeometry.cpp |  1 +
 ...polarR6_Sonnendrucker_CircularGeometry.cpp |  1 +
 .../polarR6_Sonnendrucker_CzarnyGeometry.cpp  |  1 +
 ...olarR6_Sonnendrucker_ShafranovGeometry.cpp |  1 +
 .../polarR6_ZoniGyro_CircularGeometry.cpp     |  1 +
 .../polarR6_ZoniGyro_CzarnyGeometry.cpp       |  1 +
 .../polarR6_ZoniGyro_ShafranovGeometry.cpp    |  1 +
 ...larR6_ZoniShiftedGyro_CircularGeometry.cpp |  1 +
 ...polarR6_ZoniShiftedGyro_CulhamGeometry.cpp |  1 +
 ...polarR6_ZoniShiftedGyro_CzarnyGeometry.cpp |  1 +
 ...arR6_ZoniShiftedGyro_ShafranovGeometry.cpp |  1 +
 .../polarR6_ZoniShifted_CircularGeometry.cpp  |  1 +
 .../polarR6_ZoniShifted_CzarnyGeometry.cpp    |  1 +
 .../polarR6_ZoniShifted_ShafranovGeometry.cpp |  1 +
 .../polarR6_Zoni_CircularGeometry.cpp         |  1 +
 .../polarR6_Zoni_CzarnyGeometry.cpp           |  1 +
 .../polarR6_Zoni_ShafranovGeometry.cpp        |  1 +
 ...fined_ZoniShiftedGyro_CircularGeometry.cpp |  1 +
 ...refined_ZoniShiftedGyro_CulhamGeometry.cpp |  1 +
 ...refined_ZoniShiftedGyro_CzarnyGeometry.cpp |  1 +
 ...ined_ZoniShiftedGyro_ShafranovGeometry.cpp |  1 +
 .../extrapolated_prolongation.cpp             |  1 +
 .../extrapolated_restriction.cpp              |  1 +
 src/Interpolation/fmg_interpolation.cpp       |  1 +
 src/Interpolation/injection.cpp               |  1 +
 src/Interpolation/interpolation.cpp           |  1 +
 src/Interpolation/prolongation.cpp            |  1 +
 src/Interpolation/restriction.cpp             |  1 +
 .../Solvers/coo_mumps_solver.cpp              |  1 +
 src/PolarGrid/anisotropic_division.cpp        |  1 +
 src/PolarGrid/polargrid.cpp                   |  5 ++
 src/Stencil/stencil.cpp                       |  1 +
 src/convergence_order.cpp                     |  1 +
 src/main.cpp                                  |  1 +
 src/strong_scaling.cpp                        |  1 +
 src/weak_scaling.cpp                          |  1 +
 tests/ConfigParser/config_parser.cpp          |  1 +
 tests/DirectSolver/directSolver.cpp           |  1 +
 tests/DirectSolver/directSolverNoMumps.cpp    |  1 +
 .../extrapolated_smoother.cpp                 |  1 +
 tests/GMGPolar/convergence_order.cpp          |  1 +
 tests/GMGPolar/pcg_tests.cpp                  |  1 +
 tests/GMGPolar/solve_tests.cpp                |  1 +
 .../extrapolated_prolongation.cpp             |  1 +
 .../extrapolated_restriction.cpp              |  1 +
 tests/Interpolation/prolongation.cpp          |  1 +
 tests/Interpolation/restriction.cpp           |  1 +
 tests/LinearAlgebra/Matrix/coo_matrix.cpp     |  1 +
 tests/LinearAlgebra/Matrix/csr_matrix.cpp     |  1 +
 .../Solvers/coo_mumps_solver.cpp              |  1 +
 tests/LinearAlgebra/Solvers/csr_lu_solver.cpp |  1 +
 .../Solvers/tridiagonal_solver.cpp            |  1 +
 .../Vector/vector_operations.cpp              |  1 +
 tests/PolarGrid/polargrid.cpp                 |  1 +
 tests/Residual/residual.cpp                   |  1 +
 tests/Smoother/smoother.cpp                   |  1 +
 tests/test_tools.h                            |  2 +
 287 files changed, 760 insertions(+), 39 deletions(-)
 mode change 100755 => 100644 include/ConfigParser/cmdline.h

diff --git a/include/ConfigParser/cmdline.h b/include/ConfigParser/cmdline.h
old mode 100755
new mode 100644
diff --git a/include/ConfigParser/config_parser.h b/include/ConfigParser/config_parser.h
index ba0ab8539..e7e39ffef 100644
--- a/include/ConfigParser/config_parser.h
+++ b/include/ConfigParser/config_parser.h
@@ -13,6 +13,9 @@
 #include "../../include/GMGPolar/gmgpolar.h"
 #include "test_selection.h"
 
+namespace gmgpolar
+{
+
 class ConfigParser
 {
 public:
@@ -118,3 +121,4 @@ class ConfigParser
     void selectTestCase(GeometryType geometry_type, ProblemType problem_type, AlphaCoeff alpha_type,
                         BetaCoeff beta_type, double Rmax, double kappa_eps, double delta_e, double alpha_jump);
 };
+} // namespace gmgpolar
diff --git a/include/ConfigParser/test_selection.h b/include/ConfigParser/test_selection.h
index 30d95cf57..b2f4b55d1 100644
--- a/include/ConfigParser/test_selection.h
+++ b/include/ConfigParser/test_selection.h
@@ -4,8 +4,13 @@
 
 #include "../../include/GMGPolar/test_cases.h"
 
+namespace gmgpolar
+{
+
 using DomainGeometryVariant = std::variant<CircularGeometry, ShafranovGeometry, CzarnyGeometry, CulhamGeometry>;
 
 using DensityProfileCoefficientsVariant =
     std::variant<PoissonCoefficients, SonnendruckerCoefficients, SonnendruckerGyroCoefficients, ZoniCoefficients,
                  ZoniGyroCoefficients, ZoniShiftedCoefficients, ZoniShiftedGyroCoefficients>;
+
+} // namespace gmgpolar
diff --git a/include/Definitions/equals.h b/include/Definitions/equals.h
index 24fe37e9e..0d9650033 100644
--- a/include/Definitions/equals.h
+++ b/include/Definitions/equals.h
@@ -4,9 +4,14 @@
 #include <cmath>
 #include <algorithm>
 
+namespace gmgpolar
+{
+
 template <typename T>
 inline std::enable_if_t<std::is_floating_point_v<T>, bool> equals(T lhs, T rhs)
 {
     return std::abs(lhs - rhs) <=
            (1e3 * std::numeric_limits<T>::epsilon()) * std::max(1.0, std::max(std::abs(lhs), std::abs(rhs)));
-}
\ No newline at end of file
+}
+
+} // namespace gmgpolar
diff --git a/include/DirectSolver/DirectSolver-COO-MUMPS-Give/directSolverGive.h b/include/DirectSolver/DirectSolver-COO-MUMPS-Give/directSolverGive.h
index 81c1726e0..6492ede7d 100644
--- a/include/DirectSolver/DirectSolver-COO-MUMPS-Give/directSolverGive.h
+++ b/include/DirectSolver/DirectSolver-COO-MUMPS-Give/directSolverGive.h
@@ -4,6 +4,9 @@
 
 #ifdef GMGPOLAR_USE_MUMPS
 
+namespace gmgpolar
+{
+
 template <class LevelCacheType>
 class DirectSolver_COO_MUMPS_Give : public DirectSolver<LevelCacheType>
 {
@@ -84,4 +87,5 @@ class DirectSolver_COO_MUMPS_Give : public DirectSolver<LevelCacheType>
     #include "directSolverGive.inl"
     #include "matrixStencil.inl"
 
+} // namespace gmgpolar
 #endif
diff --git a/include/DirectSolver/DirectSolver-COO-MUMPS-Take/directSolverTake.h b/include/DirectSolver/DirectSolver-COO-MUMPS-Take/directSolverTake.h
index a79f0e313..690803632 100644
--- a/include/DirectSolver/DirectSolver-COO-MUMPS-Take/directSolverTake.h
+++ b/include/DirectSolver/DirectSolver-COO-MUMPS-Take/directSolverTake.h
@@ -4,6 +4,9 @@
 
 #ifdef GMGPOLAR_USE_MUMPS
 
+namespace gmgpolar
+{
+
 template <class LevelCacheType>
 class DirectSolver_COO_MUMPS_Take : public DirectSolver<LevelCacheType>
 {
@@ -83,4 +86,5 @@ class DirectSolver_COO_MUMPS_Take : public DirectSolver<LevelCacheType>
     #include "directSolverTake.inl"
     #include "matrixStencil.inl"
 
+} // namespace gmgpolar
 #endif
diff --git a/include/DirectSolver/DirectSolver-CSR-LU-Give/directSolverGiveCustomLU.h b/include/DirectSolver/DirectSolver-CSR-LU-Give/directSolverGiveCustomLU.h
index 2e9028087..7cbf2444b 100644
--- a/include/DirectSolver/DirectSolver-CSR-LU-Give/directSolverGiveCustomLU.h
+++ b/include/DirectSolver/DirectSolver-CSR-LU-Give/directSolverGiveCustomLU.h
@@ -2,6 +2,9 @@
 
 #include "../directSolver.h"
 
+namespace gmgpolar
+{
+
 template <class LevelCacheType>
 class DirectSolver_CSR_LU_Give : public DirectSolver<LevelCacheType>
 {
@@ -64,3 +67,4 @@ class DirectSolver_CSR_LU_Give : public DirectSolver<LevelCacheType>
 #include "buildSolverMatrix.inl"
 #include "directSolverGive.inl"
 #include "matrixStencil.inl"
+} // namespace gmgpolar
diff --git a/include/DirectSolver/DirectSolver-CSR-LU-Take/directSolverTakeCustomLU.h b/include/DirectSolver/DirectSolver-CSR-LU-Take/directSolverTakeCustomLU.h
index a387371c8..eb42b9157 100644
--- a/include/DirectSolver/DirectSolver-CSR-LU-Take/directSolverTakeCustomLU.h
+++ b/include/DirectSolver/DirectSolver-CSR-LU-Take/directSolverTakeCustomLU.h
@@ -2,6 +2,9 @@
 
 #include "../directSolver.h"
 
+namespace gmgpolar
+{
+
 template <class LevelCacheType>
 class DirectSolver_CSR_LU_Take : public DirectSolver<LevelCacheType>
 {
@@ -63,3 +66,4 @@ class DirectSolver_CSR_LU_Take : public DirectSolver<LevelCacheType>
 #include "buildSolverMatrix.inl"
 #include "directSolverTake.inl"
 #include "matrixStencil.inl"
+} // namespace gmgpolar
diff --git a/include/DirectSolver/directSolver.h b/include/DirectSolver/directSolver.h
index fbe11a3e4..5f964fdcf 100644
--- a/include/DirectSolver/directSolver.h
+++ b/include/DirectSolver/directSolver.h
@@ -19,6 +19,9 @@
     #include "mpi.h"
 #endif
 
+namespace gmgpolar
+{
+
 template <class LevelCacheType>
 class DirectSolver
 {
@@ -43,3 +46,4 @@ class DirectSolver
     const bool DirBC_Interior_;
     const int num_omp_threads_;
 };
+} // namespace gmgpolar
diff --git a/include/ExtrapolatedSmoother/ExtrapolatedSmootherGive/extrapolatedSmootherGive.h b/include/ExtrapolatedSmoother/ExtrapolatedSmootherGive/extrapolatedSmootherGive.h
index df31ca82d..94eceb432 100644
--- a/include/ExtrapolatedSmoother/ExtrapolatedSmootherGive/extrapolatedSmootherGive.h
+++ b/include/ExtrapolatedSmoother/ExtrapolatedSmootherGive/extrapolatedSmootherGive.h
@@ -2,6 +2,9 @@
 
 #include "../extrapolatedSmoother.h"
 
+namespace gmgpolar
+{
+
 // The extrapolated smoother implements the coupled circle-radial smoothing with coarse node elimination.
 // Coarse nodes are excluded from the smoothing iteration by:
 // 1. Setting their diagonal entries in A_sc to 1.0 (identity mapping)
@@ -196,3 +199,4 @@ class ExtrapolatedSmootherGive : public ExtrapolatedSmoother<LevelCacheType>
 #include "applyAscOrtho.inl"
 #include "solveAscSystem.inl"
 #include "initializeMumps.inl"
+} // namespace gmgpolar
diff --git a/include/ExtrapolatedSmoother/ExtrapolatedSmootherTake/extrapolatedSmootherTake.h b/include/ExtrapolatedSmoother/ExtrapolatedSmootherTake/extrapolatedSmootherTake.h
index 7bae6996b..b05269d44 100644
--- a/include/ExtrapolatedSmoother/ExtrapolatedSmootherTake/extrapolatedSmootherTake.h
+++ b/include/ExtrapolatedSmoother/ExtrapolatedSmootherTake/extrapolatedSmootherTake.h
@@ -2,6 +2,9 @@
 
 #include "../extrapolatedSmoother.h"
 
+namespace gmgpolar
+{
+
 // The extrapolated smoother implements the coupled circle-radial smoothing with coarse node elimination.
 // Coarse nodes are excluded from the smoothing iteration by:
 // 1. Setting their diagonal entries in A_sc to 1.0 (identity mapping)
@@ -200,3 +203,4 @@ class ExtrapolatedSmootherTake : public ExtrapolatedSmoother<LevelCacheType>
 #include "buildTridiagonalAsc.inl"
 #include "applyAscOrtho.inl"
 #include "solveAscSystem.inl"
+} // namespace gmgpolar
diff --git a/include/ExtrapolatedSmoother/extrapolatedSmoother.h b/include/ExtrapolatedSmoother/extrapolatedSmoother.h
index bb555a5e6..79b40ac62 100644
--- a/include/ExtrapolatedSmoother/extrapolatedSmoother.h
+++ b/include/ExtrapolatedSmoother/extrapolatedSmoother.h
@@ -20,6 +20,9 @@
     #include "mpi.h"
 #endif
 
+namespace gmgpolar
+{
+
 template <class LevelCacheType>
 class ExtrapolatedSmoother
 {
@@ -42,3 +45,4 @@ class ExtrapolatedSmoother
     const bool DirBC_Interior_;
     const int num_omp_threads_;
 };
+} // namespace gmgpolar
diff --git a/include/GMGPolar/gmgpolar.h b/include/GMGPolar/gmgpolar.h
index 7fa02b765..0e947555e 100644
--- a/include/GMGPolar/gmgpolar.h
+++ b/include/GMGPolar/gmgpolar.h
@@ -12,6 +12,9 @@
 
 #include "igmgpolar.h"
 
+namespace gmgpolar
+{
+
 template <concepts::DomainGeometry DomainGeometry, concepts::DensityProfileCoefficients DensityProfileCoefficients>
 class GMGPolar : public IGMGPolar
 {
@@ -210,3 +213,4 @@ class GMGPolar : public IGMGPolar
 #include "MultigridMethods/extrapolated_multigrid_V_Cycle.h"
 #include "MultigridMethods/multigrid_F_Cycle.h"
 #include "MultigridMethods/multigrid_W_Cycle.h"
+} // namespace gmgpolar
diff --git a/include/GMGPolar/igmgpolar.h b/include/GMGPolar/igmgpolar.h
index e367ac8f6..89c969fbb 100644
--- a/include/GMGPolar/igmgpolar.h
+++ b/include/GMGPolar/igmgpolar.h
@@ -18,6 +18,9 @@
 #include "../PolarGrid/polargrid.h"
 #include "../Definitions/global_definitions.h"
 
+namespace gmgpolar
+{
+
 class IGMGPolar
 {
 public:
@@ -222,3 +225,4 @@ class IGMGPolar
     double t_avg_MGC_residual_;
     double t_avg_MGC_directSolver_;
 };
+} // namespace gmgpolar
diff --git a/include/InputFunctions/BoundaryConditions/cartesianR2_Boundary_CircularGeometry.h b/include/InputFunctions/BoundaryConditions/cartesianR2_Boundary_CircularGeometry.h
index 066eb3d61..b2e816e79 100644
--- a/include/InputFunctions/BoundaryConditions/cartesianR2_Boundary_CircularGeometry.h
+++ b/include/InputFunctions/BoundaryConditions/cartesianR2_Boundary_CircularGeometry.h
@@ -4,6 +4,9 @@
 
 #include "../boundaryConditions.h"
 
+namespace gmgpolar
+{
+
 class CartesianR2_Boundary_CircularGeometry
 {
 public:
@@ -17,3 +20,4 @@ class CartesianR2_Boundary_CircularGeometry
 };
 
 static_assert(concepts::BoundaryConditions<CartesianR2_Boundary_CircularGeometry>);
+} // namespace gmgpolar
diff --git a/include/InputFunctions/BoundaryConditions/cartesianR2_Boundary_CzarnyGeometry.h b/include/InputFunctions/BoundaryConditions/cartesianR2_Boundary_CzarnyGeometry.h
index d1f8d7dd6..c74e756c4 100644
--- a/include/InputFunctions/BoundaryConditions/cartesianR2_Boundary_CzarnyGeometry.h
+++ b/include/InputFunctions/BoundaryConditions/cartesianR2_Boundary_CzarnyGeometry.h
@@ -4,6 +4,9 @@
 
 #include "../boundaryConditions.h"
 
+namespace gmgpolar
+{
+
 class CartesianR2_Boundary_CzarnyGeometry
 {
 public:
@@ -24,3 +27,4 @@ class CartesianR2_Boundary_CzarnyGeometry
 };
 
 static_assert(concepts::BoundaryConditions<CartesianR2_Boundary_CzarnyGeometry>);
+} // namespace gmgpolar
diff --git a/include/InputFunctions/BoundaryConditions/cartesianR2_Boundary_ShafranovGeometry.h b/include/InputFunctions/BoundaryConditions/cartesianR2_Boundary_ShafranovGeometry.h
index d3f2c0c98..b75bf2d22 100644
--- a/include/InputFunctions/BoundaryConditions/cartesianR2_Boundary_ShafranovGeometry.h
+++ b/include/InputFunctions/BoundaryConditions/cartesianR2_Boundary_ShafranovGeometry.h
@@ -4,6 +4,9 @@
 
 #include "../boundaryConditions.h"
 
+namespace gmgpolar
+{
+
 class CartesianR2_Boundary_ShafranovGeometry
 {
 public:
@@ -19,3 +22,4 @@ class CartesianR2_Boundary_ShafranovGeometry
 };
 
 static_assert(concepts::BoundaryConditions<CartesianR2_Boundary_ShafranovGeometry>);
+} // namespace gmgpolar
diff --git a/include/InputFunctions/BoundaryConditions/cartesianR6_Boundary_CircularGeometry.h b/include/InputFunctions/BoundaryConditions/cartesianR6_Boundary_CircularGeometry.h
index afe80cb65..ebf3c625e 100644
--- a/include/InputFunctions/BoundaryConditions/cartesianR6_Boundary_CircularGeometry.h
+++ b/include/InputFunctions/BoundaryConditions/cartesianR6_Boundary_CircularGeometry.h
@@ -4,6 +4,9 @@
 
 #include "../boundaryConditions.h"
 
+namespace gmgpolar
+{
+
 class CartesianR6_Boundary_CircularGeometry
 {
 public:
@@ -17,3 +20,4 @@ class CartesianR6_Boundary_CircularGeometry
 };
 
 static_assert(concepts::BoundaryConditions<CartesianR6_Boundary_CircularGeometry>);
+} // namespace gmgpolar
diff --git a/include/InputFunctions/BoundaryConditions/cartesianR6_Boundary_CzarnyGeometry.h b/include/InputFunctions/BoundaryConditions/cartesianR6_Boundary_CzarnyGeometry.h
index 749094d77..d0eb2573c 100644
--- a/include/InputFunctions/BoundaryConditions/cartesianR6_Boundary_CzarnyGeometry.h
+++ b/include/InputFunctions/BoundaryConditions/cartesianR6_Boundary_CzarnyGeometry.h
@@ -4,6 +4,9 @@
 
 #include "../boundaryConditions.h"
 
+namespace gmgpolar
+{
+
 class CartesianR6_Boundary_CzarnyGeometry
 {
 public:
@@ -24,3 +27,4 @@ class CartesianR6_Boundary_CzarnyGeometry
 };
 
 static_assert(concepts::BoundaryConditions<CartesianR6_Boundary_CzarnyGeometry>);
+} // namespace gmgpolar
diff --git a/include/InputFunctions/BoundaryConditions/cartesianR6_Boundary_ShafranovGeometry.h b/include/InputFunctions/BoundaryConditions/cartesianR6_Boundary_ShafranovGeometry.h
index 235ee6f65..baf4f8ac2 100644
--- a/include/InputFunctions/BoundaryConditions/cartesianR6_Boundary_ShafranovGeometry.h
+++ b/include/InputFunctions/BoundaryConditions/cartesianR6_Boundary_ShafranovGeometry.h
@@ -4,6 +4,9 @@
 
 #include "../boundaryConditions.h"
 
+namespace gmgpolar
+{
+
 class CartesianR6_Boundary_ShafranovGeometry
 {
 public:
@@ -19,3 +22,4 @@ class CartesianR6_Boundary_ShafranovGeometry
 };
 
 static_assert(concepts::BoundaryConditions<CartesianR6_Boundary_ShafranovGeometry>);
+} // namespace gmgpolar
diff --git a/include/InputFunctions/BoundaryConditions/polarR6_Boundary_CircularGeometry.h b/include/InputFunctions/BoundaryConditions/polarR6_Boundary_CircularGeometry.h
index bd9bb4786..29956e3a2 100644
--- a/include/InputFunctions/BoundaryConditions/polarR6_Boundary_CircularGeometry.h
+++ b/include/InputFunctions/BoundaryConditions/polarR6_Boundary_CircularGeometry.h
@@ -4,6 +4,9 @@
 
 #include "../boundaryConditions.h"
 
+namespace gmgpolar
+{
+
 class PolarR6_Boundary_CircularGeometry
 {
 public:
@@ -17,3 +20,4 @@ class PolarR6_Boundary_CircularGeometry
 };
 
 static_assert(concepts::BoundaryConditions<PolarR6_Boundary_CircularGeometry>);
+} // namespace gmgpolar
diff --git a/include/InputFunctions/BoundaryConditions/polarR6_Boundary_CulhamGeometry.h b/include/InputFunctions/BoundaryConditions/polarR6_Boundary_CulhamGeometry.h
index 0af9883b3..0a53b46f4 100644
--- a/include/InputFunctions/BoundaryConditions/polarR6_Boundary_CulhamGeometry.h
+++ b/include/InputFunctions/BoundaryConditions/polarR6_Boundary_CulhamGeometry.h
@@ -4,6 +4,9 @@
 
 #include "../boundaryConditions.h"
 
+namespace gmgpolar
+{
+
 class PolarR6_Boundary_CulhamGeometry
 {
 public:
@@ -17,3 +20,4 @@ class PolarR6_Boundary_CulhamGeometry
 };
 
 static_assert(concepts::BoundaryConditions<PolarR6_Boundary_CulhamGeometry>);
+} // namespace gmgpolar
diff --git a/include/InputFunctions/BoundaryConditions/polarR6_Boundary_CzarnyGeometry.h b/include/InputFunctions/BoundaryConditions/polarR6_Boundary_CzarnyGeometry.h
index 177f2eb74..ba0310b89 100644
--- a/include/InputFunctions/BoundaryConditions/polarR6_Boundary_CzarnyGeometry.h
+++ b/include/InputFunctions/BoundaryConditions/polarR6_Boundary_CzarnyGeometry.h
@@ -4,6 +4,9 @@
 
 #include "../boundaryConditions.h"
 
+namespace gmgpolar
+{
+
 class PolarR6_Boundary_CzarnyGeometry
 {
 public:
@@ -23,3 +26,4 @@ class PolarR6_Boundary_CzarnyGeometry
 };
 
 static_assert(concepts::BoundaryConditions<PolarR6_Boundary_CzarnyGeometry>);
+} // namespace gmgpolar
diff --git a/include/InputFunctions/BoundaryConditions/polarR6_Boundary_ShafranovGeometry.h b/include/InputFunctions/BoundaryConditions/polarR6_Boundary_ShafranovGeometry.h
index ff98d5366..4b745f98f 100644
--- a/include/InputFunctions/BoundaryConditions/polarR6_Boundary_ShafranovGeometry.h
+++ b/include/InputFunctions/BoundaryConditions/polarR6_Boundary_ShafranovGeometry.h
@@ -4,6 +4,9 @@
 
 #include "../boundaryConditions.h"
 
+namespace gmgpolar
+{
+
 class PolarR6_Boundary_ShafranovGeometry
 {
 public:
@@ -19,3 +22,4 @@ class PolarR6_Boundary_ShafranovGeometry
 };
 
 static_assert(concepts::BoundaryConditions<PolarR6_Boundary_ShafranovGeometry>);
+} // namespace gmgpolar
diff --git a/include/InputFunctions/BoundaryConditions/refined_Boundary_CircularGeometry.h b/include/InputFunctions/BoundaryConditions/refined_Boundary_CircularGeometry.h
index d6c8c02bc..20fba37e6 100644
--- a/include/InputFunctions/BoundaryConditions/refined_Boundary_CircularGeometry.h
+++ b/include/InputFunctions/BoundaryConditions/refined_Boundary_CircularGeometry.h
@@ -4,6 +4,9 @@
 
 #include "../boundaryConditions.h"
 
+namespace gmgpolar
+{
+
 class Refined_Boundary_CircularGeometry
 {
 public:
@@ -17,3 +20,4 @@ class Refined_Boundary_CircularGeometry
 };
 
 static_assert(concepts::BoundaryConditions<Refined_Boundary_CircularGeometry>);
+} // namespace gmgpolar
diff --git a/include/InputFunctions/BoundaryConditions/refined_Boundary_CulhamGeometry.h b/include/InputFunctions/BoundaryConditions/refined_Boundary_CulhamGeometry.h
index 39ef8999e..80ed34b50 100644
--- a/include/InputFunctions/BoundaryConditions/refined_Boundary_CulhamGeometry.h
+++ b/include/InputFunctions/BoundaryConditions/refined_Boundary_CulhamGeometry.h
@@ -4,6 +4,9 @@
 
 #include "../boundaryConditions.h"
 
+namespace gmgpolar
+{
+
 class Refined_Boundary_CulhamGeometry
 {
 public:
@@ -17,3 +20,4 @@ class Refined_Boundary_CulhamGeometry
 };
 
 static_assert(concepts::BoundaryConditions<Refined_Boundary_CulhamGeometry>);
+} // namespace gmgpolar
diff --git a/include/InputFunctions/BoundaryConditions/refined_Boundary_CzarnyGeometry.h b/include/InputFunctions/BoundaryConditions/refined_Boundary_CzarnyGeometry.h
index e857e5b0f..36fac69db 100644
--- a/include/InputFunctions/BoundaryConditions/refined_Boundary_CzarnyGeometry.h
+++ b/include/InputFunctions/BoundaryConditions/refined_Boundary_CzarnyGeometry.h
@@ -4,6 +4,9 @@
 
 #include "../boundaryConditions.h"
 
+namespace gmgpolar
+{
+
 class Refined_Boundary_CzarnyGeometry
 {
 public:
@@ -23,3 +26,4 @@ class Refined_Boundary_CzarnyGeometry
 };
 
 static_assert(concepts::BoundaryConditions<Refined_Boundary_CzarnyGeometry>);
+} // namespace gmgpolar
diff --git a/include/InputFunctions/BoundaryConditions/refined_Boundary_ShafranovGeometry.h b/include/InputFunctions/BoundaryConditions/refined_Boundary_ShafranovGeometry.h
index 5d880f47a..a6e6d55b6 100644
--- a/include/InputFunctions/BoundaryConditions/refined_Boundary_ShafranovGeometry.h
+++ b/include/InputFunctions/BoundaryConditions/refined_Boundary_ShafranovGeometry.h
@@ -4,6 +4,9 @@
 
 #include "../boundaryConditions.h"
 
+namespace gmgpolar
+{
+
 class Refined_Boundary_ShafranovGeometry
 {
 public:
@@ -19,3 +22,4 @@ class Refined_Boundary_ShafranovGeometry
 };
 
 static_assert(concepts::BoundaryConditions<Refined_Boundary_ShafranovGeometry>);
+} // namespace gmgpolar
diff --git a/include/InputFunctions/DensityProfileCoefficients/poissonCoefficients.h b/include/InputFunctions/DensityProfileCoefficients/poissonCoefficients.h
index 1f3948efe..4cbf3d60d 100644
--- a/include/InputFunctions/DensityProfileCoefficients/poissonCoefficients.h
+++ b/include/InputFunctions/DensityProfileCoefficients/poissonCoefficients.h
@@ -4,6 +4,9 @@
 
 #include "../densityProfileCoefficients.h"
 
+namespace gmgpolar
+{
+
 class PoissonCoefficients
 {
 public:
@@ -19,3 +22,4 @@ class PoissonCoefficients
     const double Rmax       = 1.3;
     const double alpha_jump = 0.5 * 1.3;
 };
+} // namespace gmgpolar
diff --git a/include/InputFunctions/DensityProfileCoefficients/sonnendruckerCoefficients.h b/include/InputFunctions/DensityProfileCoefficients/sonnendruckerCoefficients.h
index 90ded27af..62bc1a427 100644
--- a/include/InputFunctions/DensityProfileCoefficients/sonnendruckerCoefficients.h
+++ b/include/InputFunctions/DensityProfileCoefficients/sonnendruckerCoefficients.h
@@ -4,6 +4,9 @@
 
 #include "../densityProfileCoefficients.h"
 
+namespace gmgpolar
+{
+
 class SonnendruckerCoefficients
 {
 public:
@@ -19,3 +22,4 @@ class SonnendruckerCoefficients
     const double Rmax       = 1.3;
     const double alpha_jump = 0.66 * 1.3;
 };
+} // namespace gmgpolar
diff --git a/include/InputFunctions/DensityProfileCoefficients/sonnendruckerGyroCoefficients.h b/include/InputFunctions/DensityProfileCoefficients/sonnendruckerGyroCoefficients.h
index 668e9fede..083d8361e 100644
--- a/include/InputFunctions/DensityProfileCoefficients/sonnendruckerGyroCoefficients.h
+++ b/include/InputFunctions/DensityProfileCoefficients/sonnendruckerGyroCoefficients.h
@@ -4,6 +4,9 @@
 
 #include "../densityProfileCoefficients.h"
 
+namespace gmgpolar
+{
+
 class SonnendruckerGyroCoefficients
 {
 public:
@@ -19,3 +22,4 @@ class SonnendruckerGyroCoefficients
     const double Rmax       = 1.3;
     const double alpha_jump = 0.66 * 1.3;
 };
+} // namespace gmgpolar
diff --git a/include/InputFunctions/DensityProfileCoefficients/zoniCoefficients.h b/include/InputFunctions/DensityProfileCoefficients/zoniCoefficients.h
index e4db76361..db14a2552 100644
--- a/include/InputFunctions/DensityProfileCoefficients/zoniCoefficients.h
+++ b/include/InputFunctions/DensityProfileCoefficients/zoniCoefficients.h
@@ -4,6 +4,9 @@
 
 #include "../densityProfileCoefficients.h"
 
+namespace gmgpolar
+{
+
 class ZoniCoefficients
 {
 public:
@@ -19,3 +22,4 @@ class ZoniCoefficients
     const double Rmax       = 1.3;
     const double alpha_jump = 0.4837 * 1.3;
 };
+} // namespace gmgpolar
diff --git a/include/InputFunctions/DensityProfileCoefficients/zoniGyroCoefficients.h b/include/InputFunctions/DensityProfileCoefficients/zoniGyroCoefficients.h
index 6c93feb42..d06a5cd00 100644
--- a/include/InputFunctions/DensityProfileCoefficients/zoniGyroCoefficients.h
+++ b/include/InputFunctions/DensityProfileCoefficients/zoniGyroCoefficients.h
@@ -4,6 +4,9 @@
 
 #include "../densityProfileCoefficients.h"
 
+namespace gmgpolar
+{
+
 class ZoniGyroCoefficients
 {
 public:
@@ -19,3 +22,4 @@ class ZoniGyroCoefficients
     const double Rmax       = 1.3;
     const double alpha_jump = 0.4837 * 1.3;
 };
+} // namespace gmgpolar
diff --git a/include/InputFunctions/DensityProfileCoefficients/zoniShiftedCoefficients.h b/include/InputFunctions/DensityProfileCoefficients/zoniShiftedCoefficients.h
index 282320d57..802dee8f2 100644
--- a/include/InputFunctions/DensityProfileCoefficients/zoniShiftedCoefficients.h
+++ b/include/InputFunctions/DensityProfileCoefficients/zoniShiftedCoefficients.h
@@ -4,6 +4,9 @@
 
 #include "../densityProfileCoefficients.h"
 
+namespace gmgpolar
+{
+
 class ZoniShiftedCoefficients
 {
 public:
@@ -19,3 +22,4 @@ class ZoniShiftedCoefficients
     const double Rmax       = 1.3;
     const double alpha_jump = 0.678 * 1.3;
 };
+} // namespace gmgpolar
diff --git a/include/InputFunctions/DensityProfileCoefficients/zoniShiftedGyroCoefficients.h b/include/InputFunctions/DensityProfileCoefficients/zoniShiftedGyroCoefficients.h
index f7f23df4e..80c25373f 100644
--- a/include/InputFunctions/DensityProfileCoefficients/zoniShiftedGyroCoefficients.h
+++ b/include/InputFunctions/DensityProfileCoefficients/zoniShiftedGyroCoefficients.h
@@ -4,6 +4,9 @@
 
 #include "../densityProfileCoefficients.h"
 
+namespace gmgpolar
+{
+
 class ZoniShiftedGyroCoefficients
 {
 public:
@@ -19,3 +22,4 @@ class ZoniShiftedGyroCoefficients
     const double Rmax       = 1.3;
     const double alpha_jump = 0.678 * 1.3;
 };
+} // namespace gmgpolar
diff --git a/include/InputFunctions/DomainGeometry/circularGeometry.h b/include/InputFunctions/DomainGeometry/circularGeometry.h
index fd79c51f8..37815cde2 100644
--- a/include/InputFunctions/DomainGeometry/circularGeometry.h
+++ b/include/InputFunctions/DomainGeometry/circularGeometry.h
@@ -4,6 +4,9 @@
 
 #include "../domainGeometry.h"
 
+namespace gmgpolar
+{
+
 class CircularGeometry
 {
 public:
@@ -21,4 +24,5 @@ class CircularGeometry
     const double Rmax = 1.3;
 };
 
-#include "circularGeometry.inl"
\ No newline at end of file
+#include "circularGeometry.inl"
+} // namespace gmgpolar
diff --git a/include/InputFunctions/DomainGeometry/culhamGeometry.h b/include/InputFunctions/DomainGeometry/culhamGeometry.h
index a41903cc6..c4e9543e9 100644
--- a/include/InputFunctions/DomainGeometry/culhamGeometry.h
+++ b/include/InputFunctions/DomainGeometry/culhamGeometry.h
@@ -7,6 +7,9 @@
 
 #include "../domainGeometry.h"
 
+namespace gmgpolar
+{
+
 class CulhamGeometry
 {
 public:
@@ -93,4 +96,5 @@ class CulhamGeometry
     std::array<double, 1001> T_prime_array;
 };
 
-#include "culhamGeometry.inl"
\ No newline at end of file
+#include "culhamGeometry.inl"
+} // namespace gmgpolar
diff --git a/include/InputFunctions/DomainGeometry/czarnyGeometry.h b/include/InputFunctions/DomainGeometry/czarnyGeometry.h
index b6931f705..9cd3fd4f2 100644
--- a/include/InputFunctions/DomainGeometry/czarnyGeometry.h
+++ b/include/InputFunctions/DomainGeometry/czarnyGeometry.h
@@ -6,6 +6,9 @@
 
 /* Triangular Shape and Ellipticity */
 
+namespace gmgpolar
+{
+
 class CzarnyGeometry
 {
 public:
@@ -29,3 +32,4 @@ class CzarnyGeometry
 };
 
 #include "czarnyGeometry.inl"
+} // namespace gmgpolar
diff --git a/include/InputFunctions/DomainGeometry/shafranovGeometry.h b/include/InputFunctions/DomainGeometry/shafranovGeometry.h
index 11e169889..cf87a15c7 100644
--- a/include/InputFunctions/DomainGeometry/shafranovGeometry.h
+++ b/include/InputFunctions/DomainGeometry/shafranovGeometry.h
@@ -6,6 +6,9 @@
 
 /* Strechted Ellipse with a Shafranov Shift */
 
+namespace gmgpolar
+{
+
 class ShafranovGeometry
 {
 public:
@@ -25,4 +28,5 @@ class ShafranovGeometry
     const double shift_delta      = 0.2;
 };
 
-#include "shafranovGeometry.inl"
\ No newline at end of file
+#include "shafranovGeometry.inl"
+} // namespace gmgpolar
diff --git a/include/InputFunctions/ExactSolution/cartesianR2_CircularGeometry.h b/include/InputFunctions/ExactSolution/cartesianR2_CircularGeometry.h
index 608adebc2..515ef617c 100644
--- a/include/InputFunctions/ExactSolution/cartesianR2_CircularGeometry.h
+++ b/include/InputFunctions/ExactSolution/cartesianR2_CircularGeometry.h
@@ -4,6 +4,9 @@
 
 #include "../exactSolution.h"
 
+namespace gmgpolar
+{
+
 class CartesianR2_CircularGeometry : public ExactSolution
 {
 public:
@@ -16,3 +19,4 @@ class CartesianR2_CircularGeometry : public ExactSolution
 private:
     const double Rmax = 1.3;
 };
+} // namespace gmgpolar
diff --git a/include/InputFunctions/ExactSolution/cartesianR2_CzarnyGeometry.h b/include/InputFunctions/ExactSolution/cartesianR2_CzarnyGeometry.h
index 87d35ed24..2f2960eef 100644
--- a/include/InputFunctions/ExactSolution/cartesianR2_CzarnyGeometry.h
+++ b/include/InputFunctions/ExactSolution/cartesianR2_CzarnyGeometry.h
@@ -4,6 +4,9 @@
 
 #include "../exactSolution.h"
 
+namespace gmgpolar
+{
+
 class CartesianR2_CzarnyGeometry : public ExactSolution
 {
 public:
@@ -22,3 +25,4 @@ class CartesianR2_CzarnyGeometry : public ExactSolution
     void initializeGeometry();
     double factor_xi;
 };
+} // namespace gmgpolar
diff --git a/include/InputFunctions/ExactSolution/cartesianR2_ShafranovGeometry.h b/include/InputFunctions/ExactSolution/cartesianR2_ShafranovGeometry.h
index 6c0b6174d..138e1d567 100644
--- a/include/InputFunctions/ExactSolution/cartesianR2_ShafranovGeometry.h
+++ b/include/InputFunctions/ExactSolution/cartesianR2_ShafranovGeometry.h
@@ -4,6 +4,9 @@
 
 #include "../exactSolution.h"
 
+namespace gmgpolar
+{
+
 class CartesianR2_ShafranovGeometry : public ExactSolution
 {
 public:
@@ -18,3 +21,4 @@ class CartesianR2_ShafranovGeometry : public ExactSolution
     const double elongation_kappa = 0.3;
     const double shift_delta      = 0.2;
 };
+} // namespace gmgpolar
diff --git a/include/InputFunctions/ExactSolution/cartesianR6_CircularGeometry.h b/include/InputFunctions/ExactSolution/cartesianR6_CircularGeometry.h
index 1cc4d8fd0..a56bdddf8 100644
--- a/include/InputFunctions/ExactSolution/cartesianR6_CircularGeometry.h
+++ b/include/InputFunctions/ExactSolution/cartesianR6_CircularGeometry.h
@@ -4,6 +4,9 @@
 
 #include "../exactSolution.h"
 
+namespace gmgpolar
+{
+
 class CartesianR6_CircularGeometry : public ExactSolution
 {
 public:
@@ -16,3 +19,4 @@ class CartesianR6_CircularGeometry : public ExactSolution
 private:
     const double Rmax = 1.3;
 };
+} // namespace gmgpolar
diff --git a/include/InputFunctions/ExactSolution/cartesianR6_CzarnyGeometry.h b/include/InputFunctions/ExactSolution/cartesianR6_CzarnyGeometry.h
index ddf5797e5..e47a77279 100644
--- a/include/InputFunctions/ExactSolution/cartesianR6_CzarnyGeometry.h
+++ b/include/InputFunctions/ExactSolution/cartesianR6_CzarnyGeometry.h
@@ -4,6 +4,9 @@
 
 #include "../exactSolution.h"
 
+namespace gmgpolar
+{
+
 class CartesianR6_CzarnyGeometry : public ExactSolution
 {
 public:
@@ -22,3 +25,4 @@ class CartesianR6_CzarnyGeometry : public ExactSolution
     void initializeGeometry();
     double factor_xi;
 };
+} // namespace gmgpolar
diff --git a/include/InputFunctions/ExactSolution/cartesianR6_ShafranovGeometry.h b/include/InputFunctions/ExactSolution/cartesianR6_ShafranovGeometry.h
index 91f5a968c..ff7fe07d6 100644
--- a/include/InputFunctions/ExactSolution/cartesianR6_ShafranovGeometry.h
+++ b/include/InputFunctions/ExactSolution/cartesianR6_ShafranovGeometry.h
@@ -4,6 +4,9 @@
 
 #include "../exactSolution.h"
 
+namespace gmgpolar
+{
+
 class CartesianR6_ShafranovGeometry : public ExactSolution
 {
 public:
@@ -18,3 +21,4 @@ class CartesianR6_ShafranovGeometry : public ExactSolution
     const double elongation_kappa = 0.3;
     const double shift_delta      = 0.2;
 };
+} // namespace gmgpolar
diff --git a/include/InputFunctions/ExactSolution/polarR6_CircularGeometry.h b/include/InputFunctions/ExactSolution/polarR6_CircularGeometry.h
index 3d7e1347f..0a388bc8e 100644
--- a/include/InputFunctions/ExactSolution/polarR6_CircularGeometry.h
+++ b/include/InputFunctions/ExactSolution/polarR6_CircularGeometry.h
@@ -4,6 +4,9 @@
 
 #include "../exactSolution.h"
 
+namespace gmgpolar
+{
+
 class PolarR6_CircularGeometry : public ExactSolution
 {
 public:
@@ -16,3 +19,4 @@ class PolarR6_CircularGeometry : public ExactSolution
 private:
     const double Rmax = 1.3;
 };
+} // namespace gmgpolar
diff --git a/include/InputFunctions/ExactSolution/polarR6_CulhamGeometry.h b/include/InputFunctions/ExactSolution/polarR6_CulhamGeometry.h
index 91e03edff..b80b64abe 100644
--- a/include/InputFunctions/ExactSolution/polarR6_CulhamGeometry.h
+++ b/include/InputFunctions/ExactSolution/polarR6_CulhamGeometry.h
@@ -4,6 +4,9 @@
 
 #include "../exactSolution.h"
 
+namespace gmgpolar
+{
+
 class PolarR6_CulhamGeometry : public ExactSolution
 {
 public:
@@ -16,3 +19,4 @@ class PolarR6_CulhamGeometry : public ExactSolution
 private:
     const double Rmax = 1.3;
 };
+} // namespace gmgpolar
diff --git a/include/InputFunctions/ExactSolution/polarR6_CzarnyGeometry.h b/include/InputFunctions/ExactSolution/polarR6_CzarnyGeometry.h
index bb7edd5ac..cb6a53327 100644
--- a/include/InputFunctions/ExactSolution/polarR6_CzarnyGeometry.h
+++ b/include/InputFunctions/ExactSolution/polarR6_CzarnyGeometry.h
@@ -4,6 +4,9 @@
 
 #include "../exactSolution.h"
 
+namespace gmgpolar
+{
+
 class PolarR6_CzarnyGeometry : public ExactSolution
 {
 public:
@@ -22,3 +25,4 @@ class PolarR6_CzarnyGeometry : public ExactSolution
     void initializeGeometry();
     double factor_xi;
 };
+} // namespace gmgpolar
diff --git a/include/InputFunctions/ExactSolution/polarR6_ShafranovGeometry.h b/include/InputFunctions/ExactSolution/polarR6_ShafranovGeometry.h
index 585ac7fcf..ee045635a 100644
--- a/include/InputFunctions/ExactSolution/polarR6_ShafranovGeometry.h
+++ b/include/InputFunctions/ExactSolution/polarR6_ShafranovGeometry.h
@@ -4,6 +4,9 @@
 
 #include "../exactSolution.h"
 
+namespace gmgpolar
+{
+
 class PolarR6_ShafranovGeometry : public ExactSolution
 {
 public:
@@ -18,3 +21,4 @@ class PolarR6_ShafranovGeometry : public ExactSolution
     const double elongation_kappa = 0.3;
     const double shift_delta      = 0.2;
 };
+} // namespace gmgpolar
diff --git a/include/InputFunctions/ExactSolution/refined_CircularGeometry.h b/include/InputFunctions/ExactSolution/refined_CircularGeometry.h
index c90cd7cf1..28ed86ea6 100644
--- a/include/InputFunctions/ExactSolution/refined_CircularGeometry.h
+++ b/include/InputFunctions/ExactSolution/refined_CircularGeometry.h
@@ -4,6 +4,9 @@
 
 #include "../exactSolution.h"
 
+namespace gmgpolar
+{
+
 class Refined_CircularGeometry : public ExactSolution
 {
 public:
@@ -16,3 +19,4 @@ class Refined_CircularGeometry : public ExactSolution
 private:
     const double Rmax = 1.3;
 };
+} // namespace gmgpolar
diff --git a/include/InputFunctions/ExactSolution/refined_CulhamGeometry.h b/include/InputFunctions/ExactSolution/refined_CulhamGeometry.h
index 8ed80354c..012c03b8c 100644
--- a/include/InputFunctions/ExactSolution/refined_CulhamGeometry.h
+++ b/include/InputFunctions/ExactSolution/refined_CulhamGeometry.h
@@ -4,6 +4,9 @@
 
 #include "../exactSolution.h"
 
+namespace gmgpolar
+{
+
 class Refined_CulhamGeometry : public ExactSolution
 {
 public:
@@ -16,3 +19,4 @@ class Refined_CulhamGeometry : public ExactSolution
 private:
     const double Rmax = 1.3;
 };
+} // namespace gmgpolar
diff --git a/include/InputFunctions/ExactSolution/refined_CzarnyGeometry.h b/include/InputFunctions/ExactSolution/refined_CzarnyGeometry.h
index 6706b65c6..749e9d784 100644
--- a/include/InputFunctions/ExactSolution/refined_CzarnyGeometry.h
+++ b/include/InputFunctions/ExactSolution/refined_CzarnyGeometry.h
@@ -4,6 +4,9 @@
 
 #include "../exactSolution.h"
 
+namespace gmgpolar
+{
+
 class Refined_CzarnyGeometry : public ExactSolution
 {
 public:
@@ -22,3 +25,4 @@ class Refined_CzarnyGeometry : public ExactSolution
     void initializeGeometry();
     double factor_xi;
 };
+} // namespace gmgpolar
diff --git a/include/InputFunctions/ExactSolution/refined_ShafranovGeometry.h b/include/InputFunctions/ExactSolution/refined_ShafranovGeometry.h
index f649f5c08..e6b482001 100644
--- a/include/InputFunctions/ExactSolution/refined_ShafranovGeometry.h
+++ b/include/InputFunctions/ExactSolution/refined_ShafranovGeometry.h
@@ -4,6 +4,9 @@
 
 #include "../exactSolution.h"
 
+namespace gmgpolar
+{
+
 class Refined_ShafranovGeometry : public ExactSolution
 {
 public:
@@ -18,3 +21,4 @@ class Refined_ShafranovGeometry : public ExactSolution
     const double elongation_kappa = 0.3;
     const double shift_delta      = 0.2;
 };
+} // namespace gmgpolar
diff --git a/include/InputFunctions/SourceTerms/cartesianR2_Poisson_CircularGeometry.h b/include/InputFunctions/SourceTerms/cartesianR2_Poisson_CircularGeometry.h
index 0a3b49c6a..a3926a345 100644
--- a/include/InputFunctions/SourceTerms/cartesianR2_Poisson_CircularGeometry.h
+++ b/include/InputFunctions/SourceTerms/cartesianR2_Poisson_CircularGeometry.h
@@ -6,6 +6,9 @@
 
 #include "../../PolarGrid/polargrid.h"
 
+namespace gmgpolar
+{
+
 class CartesianR2_Poisson_CircularGeometry
 {
 public:
@@ -17,3 +20,4 @@ class CartesianR2_Poisson_CircularGeometry
     PolarGrid const& grid_;
     const double Rmax = 1.3;
 };
+} // namespace gmgpolar
diff --git a/include/InputFunctions/SourceTerms/cartesianR2_Poisson_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/cartesianR2_Poisson_CzarnyGeometry.h
index 05cef6f89..7014ad14c 100644
--- a/include/InputFunctions/SourceTerms/cartesianR2_Poisson_CzarnyGeometry.h
+++ b/include/InputFunctions/SourceTerms/cartesianR2_Poisson_CzarnyGeometry.h
@@ -6,6 +6,9 @@
 
 #include "../../PolarGrid/polargrid.h"
 
+namespace gmgpolar
+{
+
 class CartesianR2_Poisson_CzarnyGeometry
 {
 public:
@@ -23,3 +26,4 @@ class CartesianR2_Poisson_CzarnyGeometry
     void initializeGeometry();
     double factor_xi;
 };
+} // namespace gmgpolar
diff --git a/include/InputFunctions/SourceTerms/cartesianR2_Poisson_ShafranovGeometry.h b/include/InputFunctions/SourceTerms/cartesianR2_Poisson_ShafranovGeometry.h
index 4e004c91a..93a315a23 100644
--- a/include/InputFunctions/SourceTerms/cartesianR2_Poisson_ShafranovGeometry.h
+++ b/include/InputFunctions/SourceTerms/cartesianR2_Poisson_ShafranovGeometry.h
@@ -6,6 +6,9 @@
 
 #include "../../PolarGrid/polargrid.h"
 
+namespace gmgpolar
+{
+
 class CartesianR2_Poisson_ShafranovGeometry
 {
 public:
@@ -20,3 +23,4 @@ class CartesianR2_Poisson_ShafranovGeometry
     const double elongation_kappa = 0.3;
     const double shift_delta      = 0.2;
 };
+} // namespace gmgpolar
diff --git a/include/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_CircularGeometry.h b/include/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_CircularGeometry.h
index 284e83325..c829f1fb6 100644
--- a/include/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_CircularGeometry.h
+++ b/include/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_CircularGeometry.h
@@ -6,6 +6,9 @@
 
 #include "../../PolarGrid/polargrid.h"
 
+namespace gmgpolar
+{
+
 class CartesianR2_SonnendruckerGyro_CircularGeometry
 {
 public:
@@ -17,3 +20,4 @@ class CartesianR2_SonnendruckerGyro_CircularGeometry
     PolarGrid const& grid_;
     const double Rmax = 1.3;
 };
+} // namespace gmgpolar
diff --git a/include/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_CzarnyGeometry.h
index f2bd0cf2d..e01900d64 100644
--- a/include/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_CzarnyGeometry.h
+++ b/include/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_CzarnyGeometry.h
@@ -6,6 +6,9 @@
 
 #include "../../PolarGrid/polargrid.h"
 
+namespace gmgpolar
+{
+
 class CartesianR2_SonnendruckerGyro_CzarnyGeometry
 {
 public:
@@ -23,3 +26,4 @@ class CartesianR2_SonnendruckerGyro_CzarnyGeometry
     void initializeGeometry();
     double factor_xi;
 };
+} // namespace gmgpolar
diff --git a/include/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_ShafranovGeometry.h b/include/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_ShafranovGeometry.h
index 4c6c23be3..ba51e1c00 100644
--- a/include/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_ShafranovGeometry.h
+++ b/include/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_ShafranovGeometry.h
@@ -6,6 +6,9 @@
 
 #include "../../PolarGrid/polargrid.h"
 
+namespace gmgpolar
+{
+
 class CartesianR2_SonnendruckerGyro_ShafranovGeometry
 {
 public:
@@ -20,3 +23,4 @@ class CartesianR2_SonnendruckerGyro_ShafranovGeometry
     const double elongation_kappa = 0.3;
     const double shift_delta      = 0.2;
 };
+} // namespace gmgpolar
diff --git a/include/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_CircularGeometry.h b/include/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_CircularGeometry.h
index 358686ef1..057cffcd0 100644
--- a/include/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_CircularGeometry.h
+++ b/include/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_CircularGeometry.h
@@ -6,6 +6,9 @@
 
 #include "../../PolarGrid/polargrid.h"
 
+namespace gmgpolar
+{
+
 class CartesianR2_Sonnendrucker_CircularGeometry
 {
 public:
@@ -17,3 +20,4 @@ class CartesianR2_Sonnendrucker_CircularGeometry
     PolarGrid const& grid_;
     const double Rmax = 1.3;
 };
+} // namespace gmgpolar
diff --git a/include/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_CzarnyGeometry.h
index bf40bc454..f20a6f675 100644
--- a/include/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_CzarnyGeometry.h
+++ b/include/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_CzarnyGeometry.h
@@ -6,6 +6,9 @@
 
 #include "../../PolarGrid/polargrid.h"
 
+namespace gmgpolar
+{
+
 class CartesianR2_Sonnendrucker_CzarnyGeometry
 {
 public:
@@ -23,3 +26,4 @@ class CartesianR2_Sonnendrucker_CzarnyGeometry
     void initializeGeometry();
     double factor_xi;
 };
+} // namespace gmgpolar
diff --git a/include/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_ShafranovGeometry.h b/include/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_ShafranovGeometry.h
index 2efcb5bd3..b86ec41f3 100644
--- a/include/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_ShafranovGeometry.h
+++ b/include/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_ShafranovGeometry.h
@@ -6,6 +6,9 @@
 
 #include "../../PolarGrid/polargrid.h"
 
+namespace gmgpolar
+{
+
 class CartesianR2_Sonnendrucker_ShafranovGeometry
 {
 public:
@@ -20,3 +23,4 @@ class CartesianR2_Sonnendrucker_ShafranovGeometry
     const double elongation_kappa = 0.3;
     const double shift_delta      = 0.2;
 };
+} // namespace gmgpolar
diff --git a/include/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_CircularGeometry.h b/include/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_CircularGeometry.h
index d32fcf771..74f1e36a6 100644
--- a/include/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_CircularGeometry.h
+++ b/include/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_CircularGeometry.h
@@ -6,6 +6,9 @@
 
 #include "../../PolarGrid/polargrid.h"
 
+namespace gmgpolar
+{
+
 class CartesianR2_ZoniGyro_CircularGeometry
 {
 public:
@@ -17,3 +20,4 @@ class CartesianR2_ZoniGyro_CircularGeometry
     PolarGrid const& grid_;
     const double Rmax = 1.3;
 };
+} // namespace gmgpolar
diff --git a/include/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_CzarnyGeometry.h
index 9a32f09ec..fd2850238 100644
--- a/include/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_CzarnyGeometry.h
+++ b/include/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_CzarnyGeometry.h
@@ -6,6 +6,9 @@
 
 #include "../../PolarGrid/polargrid.h"
 
+namespace gmgpolar
+{
+
 class CartesianR2_ZoniGyro_CzarnyGeometry
 {
 public:
@@ -23,3 +26,4 @@ class CartesianR2_ZoniGyro_CzarnyGeometry
     void initializeGeometry();
     double factor_xi;
 };
+} // namespace gmgpolar
diff --git a/include/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_ShafranovGeometry.h b/include/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_ShafranovGeometry.h
index e6eb758a0..f457af617 100644
--- a/include/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_ShafranovGeometry.h
+++ b/include/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_ShafranovGeometry.h
@@ -6,6 +6,9 @@
 
 #include "../../PolarGrid/polargrid.h"
 
+namespace gmgpolar
+{
+
 class CartesianR2_ZoniGyro_ShafranovGeometry
 {
 public:
@@ -20,3 +23,4 @@ class CartesianR2_ZoniGyro_ShafranovGeometry
     const double elongation_kappa = 0.3;
     const double shift_delta      = 0.2;
 };
+} // namespace gmgpolar
diff --git a/include/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_CircularGeometry.h b/include/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_CircularGeometry.h
index b5b25467d..476af715c 100644
--- a/include/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_CircularGeometry.h
+++ b/include/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_CircularGeometry.h
@@ -6,6 +6,9 @@
 
 #include "../../PolarGrid/polargrid.h"
 
+namespace gmgpolar
+{
+
 class CartesianR2_ZoniShiftedGyro_CircularGeometry
 {
 public:
@@ -17,3 +20,4 @@ class CartesianR2_ZoniShiftedGyro_CircularGeometry
     PolarGrid const& grid_;
     const double Rmax = 1.3;
 };
+} // namespace gmgpolar
diff --git a/include/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_CzarnyGeometry.h
index 1915f784c..81fa73977 100644
--- a/include/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_CzarnyGeometry.h
+++ b/include/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_CzarnyGeometry.h
@@ -6,6 +6,9 @@
 
 #include "../../PolarGrid/polargrid.h"
 
+namespace gmgpolar
+{
+
 class CartesianR2_ZoniShiftedGyro_CzarnyGeometry
 {
 public:
@@ -23,3 +26,4 @@ class CartesianR2_ZoniShiftedGyro_CzarnyGeometry
     void initializeGeometry();
     double factor_xi;
 };
+} // namespace gmgpolar
diff --git a/include/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_ShafranovGeometry.h b/include/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_ShafranovGeometry.h
index 6be47fb87..25b730237 100644
--- a/include/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_ShafranovGeometry.h
+++ b/include/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_ShafranovGeometry.h
@@ -6,6 +6,9 @@
 
 #include "../../PolarGrid/polargrid.h"
 
+namespace gmgpolar
+{
+
 class CartesianR2_ZoniShiftedGyro_ShafranovGeometry
 {
 public:
@@ -20,3 +23,4 @@ class CartesianR2_ZoniShiftedGyro_ShafranovGeometry
     const double elongation_kappa = 0.3;
     const double shift_delta      = 0.2;
 };
+} // namespace gmgpolar
diff --git a/include/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_CircularGeometry.h b/include/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_CircularGeometry.h
index 3030625fa..32888233c 100644
--- a/include/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_CircularGeometry.h
+++ b/include/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_CircularGeometry.h
@@ -6,6 +6,9 @@
 
 #include "../../PolarGrid/polargrid.h"
 
+namespace gmgpolar
+{
+
 class CartesianR2_ZoniShifted_CircularGeometry
 {
 public:
@@ -17,3 +20,4 @@ class CartesianR2_ZoniShifted_CircularGeometry
     PolarGrid const& grid_;
     const double Rmax = 1.3;
 };
+} // namespace gmgpolar
diff --git a/include/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_CzarnyGeometry.h
index f83e03e2d..fe379d959 100644
--- a/include/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_CzarnyGeometry.h
+++ b/include/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_CzarnyGeometry.h
@@ -6,6 +6,9 @@
 
 #include "../../PolarGrid/polargrid.h"
 
+namespace gmgpolar
+{
+
 class CartesianR2_ZoniShifted_CzarnyGeometry
 {
 public:
@@ -23,3 +26,4 @@ class CartesianR2_ZoniShifted_CzarnyGeometry
     void initializeGeometry();
     double factor_xi;
 };
+} // namespace gmgpolar
diff --git a/include/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_ShafranovGeometry.h b/include/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_ShafranovGeometry.h
index 0e3668016..821a311db 100644
--- a/include/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_ShafranovGeometry.h
+++ b/include/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_ShafranovGeometry.h
@@ -6,6 +6,9 @@
 
 #include "../../PolarGrid/polargrid.h"
 
+namespace gmgpolar
+{
+
 class CartesianR2_ZoniShifted_ShafranovGeometry
 {
 public:
@@ -20,3 +23,4 @@ class CartesianR2_ZoniShifted_ShafranovGeometry
     const double elongation_kappa = 0.3;
     const double shift_delta      = 0.2;
 };
+} // namespace gmgpolar
diff --git a/include/InputFunctions/SourceTerms/cartesianR2_Zoni_CircularGeometry.h b/include/InputFunctions/SourceTerms/cartesianR2_Zoni_CircularGeometry.h
index 637c02fab..a1e2e9fee 100644
--- a/include/InputFunctions/SourceTerms/cartesianR2_Zoni_CircularGeometry.h
+++ b/include/InputFunctions/SourceTerms/cartesianR2_Zoni_CircularGeometry.h
@@ -6,6 +6,9 @@
 
 #include "../../PolarGrid/polargrid.h"
 
+namespace gmgpolar
+{
+
 class CartesianR2_Zoni_CircularGeometry
 {
 public:
@@ -17,3 +20,4 @@ class CartesianR2_Zoni_CircularGeometry
     PolarGrid const& grid_;
     const double Rmax = 1.3;
 };
+} // namespace gmgpolar
diff --git a/include/InputFunctions/SourceTerms/cartesianR2_Zoni_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/cartesianR2_Zoni_CzarnyGeometry.h
index 9d3318b91..5b23ae075 100644
--- a/include/InputFunctions/SourceTerms/cartesianR2_Zoni_CzarnyGeometry.h
+++ b/include/InputFunctions/SourceTerms/cartesianR2_Zoni_CzarnyGeometry.h
@@ -6,6 +6,9 @@
 
 #include "../../PolarGrid/polargrid.h"
 
+namespace gmgpolar
+{
+
 class CartesianR2_Zoni_CzarnyGeometry
 {
 public:
@@ -23,3 +26,4 @@ class CartesianR2_Zoni_CzarnyGeometry
     void initializeGeometry();
     double factor_xi;
 };
+} // namespace gmgpolar
diff --git a/include/InputFunctions/SourceTerms/cartesianR2_Zoni_ShafranovGeometry.h b/include/InputFunctions/SourceTerms/cartesianR2_Zoni_ShafranovGeometry.h
index df74cc85e..baf9bfd29 100644
--- a/include/InputFunctions/SourceTerms/cartesianR2_Zoni_ShafranovGeometry.h
+++ b/include/InputFunctions/SourceTerms/cartesianR2_Zoni_ShafranovGeometry.h
@@ -6,6 +6,9 @@
 
 #include "../../PolarGrid/polargrid.h"
 
+namespace gmgpolar
+{
+
 class CartesianR2_Zoni_ShafranovGeometry
 {
 public:
@@ -20,3 +23,4 @@ class CartesianR2_Zoni_ShafranovGeometry
     const double elongation_kappa = 0.3;
     const double shift_delta      = 0.2;
 };
+} // namespace gmgpolar
diff --git a/include/InputFunctions/SourceTerms/cartesianR6_Poisson_CircularGeometry.h b/include/InputFunctions/SourceTerms/cartesianR6_Poisson_CircularGeometry.h
index 18a916c1b..58991ba5b 100644
--- a/include/InputFunctions/SourceTerms/cartesianR6_Poisson_CircularGeometry.h
+++ b/include/InputFunctions/SourceTerms/cartesianR6_Poisson_CircularGeometry.h
@@ -6,6 +6,9 @@
 
 #include "../../PolarGrid/polargrid.h"
 
+namespace gmgpolar
+{
+
 class CartesianR6_Poisson_CircularGeometry
 {
 public:
@@ -17,3 +20,4 @@ class CartesianR6_Poisson_CircularGeometry
     PolarGrid const& grid_;
     const double Rmax = 1.3;
 };
+} // namespace gmgpolar
diff --git a/include/InputFunctions/SourceTerms/cartesianR6_Poisson_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/cartesianR6_Poisson_CzarnyGeometry.h
index 297778bae..41046282d 100644
--- a/include/InputFunctions/SourceTerms/cartesianR6_Poisson_CzarnyGeometry.h
+++ b/include/InputFunctions/SourceTerms/cartesianR6_Poisson_CzarnyGeometry.h
@@ -6,6 +6,9 @@
 
 #include "../../PolarGrid/polargrid.h"
 
+namespace gmgpolar
+{
+
 class CartesianR6_Poisson_CzarnyGeometry
 {
 public:
@@ -23,3 +26,4 @@ class CartesianR6_Poisson_CzarnyGeometry
     void initializeGeometry();
     double factor_xi;
 };
+} // namespace gmgpolar
diff --git a/include/InputFunctions/SourceTerms/cartesianR6_Poisson_ShafranovGeometry.h b/include/InputFunctions/SourceTerms/cartesianR6_Poisson_ShafranovGeometry.h
index 90d2b9564..ac748476b 100644
--- a/include/InputFunctions/SourceTerms/cartesianR6_Poisson_ShafranovGeometry.h
+++ b/include/InputFunctions/SourceTerms/cartesianR6_Poisson_ShafranovGeometry.h
@@ -6,6 +6,9 @@
 
 #include "../../PolarGrid/polargrid.h"
 
+namespace gmgpolar
+{
+
 class CartesianR6_Poisson_ShafranovGeometry
 {
 public:
@@ -20,3 +23,4 @@ class CartesianR6_Poisson_ShafranovGeometry
     const double elongation_kappa = 0.3;
     const double shift_delta      = 0.2;
 };
+} // namespace gmgpolar
diff --git a/include/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_CircularGeometry.h b/include/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_CircularGeometry.h
index 5f8347359..fe63b6215 100644
--- a/include/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_CircularGeometry.h
+++ b/include/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_CircularGeometry.h
@@ -6,6 +6,9 @@
 
 #include "../../PolarGrid/polargrid.h"
 
+namespace gmgpolar
+{
+
 class CartesianR6_SonnendruckerGyro_CircularGeometry
 {
 public:
@@ -17,3 +20,4 @@ class CartesianR6_SonnendruckerGyro_CircularGeometry
     PolarGrid const& grid_;
     const double Rmax = 1.3;
 };
+} // namespace gmgpolar
diff --git a/include/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_CzarnyGeometry.h
index 02723f7e1..7605a903a 100644
--- a/include/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_CzarnyGeometry.h
+++ b/include/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_CzarnyGeometry.h
@@ -6,6 +6,9 @@
 
 #include "../../PolarGrid/polargrid.h"
 
+namespace gmgpolar
+{
+
 class CartesianR6_SonnendruckerGyro_CzarnyGeometry
 {
 public:
@@ -23,3 +26,4 @@ class CartesianR6_SonnendruckerGyro_CzarnyGeometry
     void initializeGeometry();
     double factor_xi;
 };
+} // namespace gmgpolar
diff --git a/include/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_ShafranovGeometry.h b/include/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_ShafranovGeometry.h
index 027961ee6..542c3858c 100644
--- a/include/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_ShafranovGeometry.h
+++ b/include/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_ShafranovGeometry.h
@@ -6,6 +6,9 @@
 
 #include "../../PolarGrid/polargrid.h"
 
+namespace gmgpolar
+{
+
 class CartesianR6_SonnendruckerGyro_ShafranovGeometry
 {
 public:
@@ -20,3 +23,4 @@ class CartesianR6_SonnendruckerGyro_ShafranovGeometry
     const double elongation_kappa = 0.3;
     const double shift_delta      = 0.2;
 };
+} // namespace gmgpolar
diff --git a/include/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_CircularGeometry.h b/include/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_CircularGeometry.h
index c56a42741..83a655b76 100644
--- a/include/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_CircularGeometry.h
+++ b/include/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_CircularGeometry.h
@@ -6,6 +6,9 @@
 
 #include "../../PolarGrid/polargrid.h"
 
+namespace gmgpolar
+{
+
 class CartesianR6_Sonnendrucker_CircularGeometry
 {
 public:
@@ -17,3 +20,4 @@ class CartesianR6_Sonnendrucker_CircularGeometry
     PolarGrid const& grid_;
     const double Rmax = 1.3;
 };
+} // namespace gmgpolar
diff --git a/include/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_CzarnyGeometry.h
index 2faa9228b..0dfa06db8 100644
--- a/include/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_CzarnyGeometry.h
+++ b/include/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_CzarnyGeometry.h
@@ -6,6 +6,9 @@
 
 #include "../../PolarGrid/polargrid.h"
 
+namespace gmgpolar
+{
+
 class CartesianR6_Sonnendrucker_CzarnyGeometry
 {
 public:
@@ -23,3 +26,4 @@ class CartesianR6_Sonnendrucker_CzarnyGeometry
     void initializeGeometry();
     double factor_xi;
 };
+} // namespace gmgpolar
diff --git a/include/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_ShafranovGeometry.h b/include/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_ShafranovGeometry.h
index 56466c3b0..153b926da 100644
--- a/include/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_ShafranovGeometry.h
+++ b/include/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_ShafranovGeometry.h
@@ -6,6 +6,9 @@
 
 #include "../../PolarGrid/polargrid.h"
 
+namespace gmgpolar
+{
+
 class CartesianR6_Sonnendrucker_ShafranovGeometry
 {
 public:
@@ -20,3 +23,4 @@ class CartesianR6_Sonnendrucker_ShafranovGeometry
     const double elongation_kappa = 0.3;
     const double shift_delta      = 0.2;
 };
+} // namespace gmgpolar
diff --git a/include/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_CircularGeometry.h b/include/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_CircularGeometry.h
index ea59e04d9..d22863465 100644
--- a/include/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_CircularGeometry.h
+++ b/include/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_CircularGeometry.h
@@ -6,6 +6,9 @@
 
 #include "../../PolarGrid/polargrid.h"
 
+namespace gmgpolar
+{
+
 class CartesianR6_ZoniGyro_CircularGeometry
 {
 public:
@@ -17,3 +20,4 @@ class CartesianR6_ZoniGyro_CircularGeometry
     PolarGrid const& grid_;
     const double Rmax = 1.3;
 };
+} // namespace gmgpolar
diff --git a/include/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_CzarnyGeometry.h
index c5b8c497d..df8c5e7b7 100644
--- a/include/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_CzarnyGeometry.h
+++ b/include/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_CzarnyGeometry.h
@@ -6,6 +6,9 @@
 
 #include "../../PolarGrid/polargrid.h"
 
+namespace gmgpolar
+{
+
 class CartesianR6_ZoniGyro_CzarnyGeometry
 {
 public:
@@ -23,3 +26,4 @@ class CartesianR6_ZoniGyro_CzarnyGeometry
     void initializeGeometry();
     double factor_xi;
 };
+} // namespace gmgpolar
diff --git a/include/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_ShafranovGeometry.h b/include/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_ShafranovGeometry.h
index fbd070179..49533ec04 100644
--- a/include/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_ShafranovGeometry.h
+++ b/include/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_ShafranovGeometry.h
@@ -6,6 +6,9 @@
 
 #include "../../PolarGrid/polargrid.h"
 
+namespace gmgpolar
+{
+
 class CartesianR6_ZoniGyro_ShafranovGeometry
 {
 public:
@@ -20,3 +23,4 @@ class CartesianR6_ZoniGyro_ShafranovGeometry
     const double elongation_kappa = 0.3;
     const double shift_delta      = 0.2;
 };
+} // namespace gmgpolar
diff --git a/include/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_CircularGeometry.h b/include/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_CircularGeometry.h
index 669e27909..8fd12333f 100644
--- a/include/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_CircularGeometry.h
+++ b/include/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_CircularGeometry.h
@@ -6,6 +6,9 @@
 
 #include "../../PolarGrid/polargrid.h"
 
+namespace gmgpolar
+{
+
 class CartesianR6_ZoniShiftedGyro_CircularGeometry
 {
 public:
@@ -17,3 +20,4 @@ class CartesianR6_ZoniShiftedGyro_CircularGeometry
     PolarGrid const& grid_;
     const double Rmax = 1.3;
 };
+} // namespace gmgpolar
diff --git a/include/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_CzarnyGeometry.h
index 989cf6463..51483bd87 100644
--- a/include/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_CzarnyGeometry.h
+++ b/include/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_CzarnyGeometry.h
@@ -6,6 +6,9 @@
 
 #include "../../PolarGrid/polargrid.h"
 
+namespace gmgpolar
+{
+
 class CartesianR6_ZoniShiftedGyro_CzarnyGeometry
 {
 public:
@@ -23,3 +26,4 @@ class CartesianR6_ZoniShiftedGyro_CzarnyGeometry
     void initializeGeometry();
     double factor_xi;
 };
+} // namespace gmgpolar
diff --git a/include/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_ShafranovGeometry.h b/include/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_ShafranovGeometry.h
index c01bf27e9..1676d28bb 100644
--- a/include/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_ShafranovGeometry.h
+++ b/include/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_ShafranovGeometry.h
@@ -6,6 +6,9 @@
 
 #include "../../PolarGrid/polargrid.h"
 
+namespace gmgpolar
+{
+
 class CartesianR6_ZoniShiftedGyro_ShafranovGeometry
 {
 public:
@@ -20,3 +23,4 @@ class CartesianR6_ZoniShiftedGyro_ShafranovGeometry
     const double elongation_kappa = 0.3;
     const double shift_delta      = 0.2;
 };
+} // namespace gmgpolar
diff --git a/include/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_CircularGeometry.h b/include/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_CircularGeometry.h
index 5af275152..c58eeb7e9 100644
--- a/include/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_CircularGeometry.h
+++ b/include/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_CircularGeometry.h
@@ -6,6 +6,9 @@
 
 #include "../../PolarGrid/polargrid.h"
 
+namespace gmgpolar
+{
+
 class CartesianR6_ZoniShifted_CircularGeometry
 {
 public:
@@ -17,3 +20,4 @@ class CartesianR6_ZoniShifted_CircularGeometry
     PolarGrid const& grid_;
     const double Rmax = 1.3;
 };
+} // namespace gmgpolar
diff --git a/include/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_CzarnyGeometry.h
index 9cae81aad..cf0560f15 100644
--- a/include/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_CzarnyGeometry.h
+++ b/include/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_CzarnyGeometry.h
@@ -6,6 +6,9 @@
 
 #include "../../PolarGrid/polargrid.h"
 
+namespace gmgpolar
+{
+
 class CartesianR6_ZoniShifted_CzarnyGeometry
 {
 public:
@@ -23,3 +26,4 @@ class CartesianR6_ZoniShifted_CzarnyGeometry
     void initializeGeometry();
     double factor_xi;
 };
+} // namespace gmgpolar
diff --git a/include/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_ShafranovGeometry.h b/include/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_ShafranovGeometry.h
index 6af7eeb29..766ddea8b 100644
--- a/include/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_ShafranovGeometry.h
+++ b/include/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_ShafranovGeometry.h
@@ -6,6 +6,9 @@
 
 #include "../../PolarGrid/polargrid.h"
 
+namespace gmgpolar
+{
+
 class CartesianR6_ZoniShifted_ShafranovGeometry
 {
 public:
@@ -20,3 +23,4 @@ class CartesianR6_ZoniShifted_ShafranovGeometry
     const double elongation_kappa = 0.3;
     const double shift_delta      = 0.2;
 };
+} // namespace gmgpolar
diff --git a/include/InputFunctions/SourceTerms/cartesianR6_Zoni_CircularGeometry.h b/include/InputFunctions/SourceTerms/cartesianR6_Zoni_CircularGeometry.h
index 302a080d2..380e36544 100644
--- a/include/InputFunctions/SourceTerms/cartesianR6_Zoni_CircularGeometry.h
+++ b/include/InputFunctions/SourceTerms/cartesianR6_Zoni_CircularGeometry.h
@@ -6,6 +6,9 @@
 
 #include "../../PolarGrid/polargrid.h"
 
+namespace gmgpolar
+{
+
 class CartesianR6_Zoni_CircularGeometry
 {
 public:
@@ -17,3 +20,4 @@ class CartesianR6_Zoni_CircularGeometry
     PolarGrid const& grid_;
     const double Rmax = 1.3;
 };
+} // namespace gmgpolar
diff --git a/include/InputFunctions/SourceTerms/cartesianR6_Zoni_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/cartesianR6_Zoni_CzarnyGeometry.h
index a66022ca2..5d5bfc488 100644
--- a/include/InputFunctions/SourceTerms/cartesianR6_Zoni_CzarnyGeometry.h
+++ b/include/InputFunctions/SourceTerms/cartesianR6_Zoni_CzarnyGeometry.h
@@ -6,6 +6,9 @@
 
 #include "../../PolarGrid/polargrid.h"
 
+namespace gmgpolar
+{
+
 class CartesianR6_Zoni_CzarnyGeometry
 {
 public:
@@ -23,3 +26,4 @@ class CartesianR6_Zoni_CzarnyGeometry
     void initializeGeometry();
     double factor_xi;
 };
+} // namespace gmgpolar
diff --git a/include/InputFunctions/SourceTerms/cartesianR6_Zoni_ShafranovGeometry.h b/include/InputFunctions/SourceTerms/cartesianR6_Zoni_ShafranovGeometry.h
index b6a80321f..63406c85c 100644
--- a/include/InputFunctions/SourceTerms/cartesianR6_Zoni_ShafranovGeometry.h
+++ b/include/InputFunctions/SourceTerms/cartesianR6_Zoni_ShafranovGeometry.h
@@ -6,6 +6,9 @@
 
 #include "../../PolarGrid/polargrid.h"
 
+namespace gmgpolar
+{
+
 class CartesianR6_Zoni_ShafranovGeometry
 {
 public:
@@ -20,3 +23,4 @@ class CartesianR6_Zoni_ShafranovGeometry
     const double elongation_kappa = 0.3;
     const double shift_delta      = 0.2;
 };
+} // namespace gmgpolar
diff --git a/include/InputFunctions/SourceTerms/polarR6_Poisson_CircularGeometry.h b/include/InputFunctions/SourceTerms/polarR6_Poisson_CircularGeometry.h
index e8013b09a..0e4cf7c34 100644
--- a/include/InputFunctions/SourceTerms/polarR6_Poisson_CircularGeometry.h
+++ b/include/InputFunctions/SourceTerms/polarR6_Poisson_CircularGeometry.h
@@ -6,6 +6,9 @@
 
 #include "../../PolarGrid/polargrid.h"
 
+namespace gmgpolar
+{
+
 class PolarR6_Poisson_CircularGeometry
 {
 public:
@@ -17,3 +20,4 @@ class PolarR6_Poisson_CircularGeometry
     PolarGrid const& grid_;
     const double Rmax = 1.3;
 };
+} // namespace gmgpolar
diff --git a/include/InputFunctions/SourceTerms/polarR6_Poisson_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/polarR6_Poisson_CzarnyGeometry.h
index 6139369e8..bf631f388 100644
--- a/include/InputFunctions/SourceTerms/polarR6_Poisson_CzarnyGeometry.h
+++ b/include/InputFunctions/SourceTerms/polarR6_Poisson_CzarnyGeometry.h
@@ -6,6 +6,9 @@
 
 #include "../../PolarGrid/polargrid.h"
 
+namespace gmgpolar
+{
+
 class PolarR6_Poisson_CzarnyGeometry
 {
 public:
@@ -23,3 +26,4 @@ class PolarR6_Poisson_CzarnyGeometry
     void initializeGeometry();
     double factor_xi;
 };
+} // namespace gmgpolar
diff --git a/include/InputFunctions/SourceTerms/polarR6_Poisson_ShafranovGeometry.h b/include/InputFunctions/SourceTerms/polarR6_Poisson_ShafranovGeometry.h
index e223b8769..decfc28b0 100644
--- a/include/InputFunctions/SourceTerms/polarR6_Poisson_ShafranovGeometry.h
+++ b/include/InputFunctions/SourceTerms/polarR6_Poisson_ShafranovGeometry.h
@@ -6,6 +6,9 @@
 
 #include "../../PolarGrid/polargrid.h"
 
+namespace gmgpolar
+{
+
 class PolarR6_Poisson_ShafranovGeometry
 {
 public:
@@ -20,3 +23,4 @@ class PolarR6_Poisson_ShafranovGeometry
     const double elongation_kappa = 0.3;
     const double shift_delta      = 0.2;
 };
+} // namespace gmgpolar
diff --git a/include/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_CircularGeometry.h b/include/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_CircularGeometry.h
index 7de0c7785..fede8e3e7 100644
--- a/include/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_CircularGeometry.h
+++ b/include/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_CircularGeometry.h
@@ -6,6 +6,9 @@
 
 #include "../../PolarGrid/polargrid.h"
 
+namespace gmgpolar
+{
+
 class PolarR6_SonnendruckerGyro_CircularGeometry
 {
 public:
@@ -17,3 +20,4 @@ class PolarR6_SonnendruckerGyro_CircularGeometry
     PolarGrid const& grid_;
     const double Rmax = 1.3;
 };
+} // namespace gmgpolar
diff --git a/include/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_CzarnyGeometry.h
index 5d3ed4671..33a21c823 100644
--- a/include/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_CzarnyGeometry.h
+++ b/include/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_CzarnyGeometry.h
@@ -6,6 +6,9 @@
 
 #include "../../PolarGrid/polargrid.h"
 
+namespace gmgpolar
+{
+
 class PolarR6_SonnendruckerGyro_CzarnyGeometry
 {
 public:
@@ -23,3 +26,4 @@ class PolarR6_SonnendruckerGyro_CzarnyGeometry
     void initializeGeometry();
     double factor_xi;
 };
+} // namespace gmgpolar
diff --git a/include/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_ShafranovGeometry.h b/include/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_ShafranovGeometry.h
index 45ad9fc2b..734e406a3 100644
--- a/include/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_ShafranovGeometry.h
+++ b/include/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_ShafranovGeometry.h
@@ -6,6 +6,9 @@
 
 #include "../../PolarGrid/polargrid.h"
 
+namespace gmgpolar
+{
+
 class PolarR6_SonnendruckerGyro_ShafranovGeometry
 {
 public:
@@ -20,3 +23,4 @@ class PolarR6_SonnendruckerGyro_ShafranovGeometry
     const double elongation_kappa = 0.3;
     const double shift_delta      = 0.2;
 };
+} // namespace gmgpolar
diff --git a/include/InputFunctions/SourceTerms/polarR6_Sonnendrucker_CircularGeometry.h b/include/InputFunctions/SourceTerms/polarR6_Sonnendrucker_CircularGeometry.h
index 0f4092996..e509ebf43 100644
--- a/include/InputFunctions/SourceTerms/polarR6_Sonnendrucker_CircularGeometry.h
+++ b/include/InputFunctions/SourceTerms/polarR6_Sonnendrucker_CircularGeometry.h
@@ -6,6 +6,9 @@
 
 #include "../../PolarGrid/polargrid.h"
 
+namespace gmgpolar
+{
+
 class PolarR6_Sonnendrucker_CircularGeometry
 {
 public:
@@ -17,3 +20,4 @@ class PolarR6_Sonnendrucker_CircularGeometry
     PolarGrid const& grid_;
     const double Rmax = 1.3;
 };
+} // namespace gmgpolar
diff --git a/include/InputFunctions/SourceTerms/polarR6_Sonnendrucker_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/polarR6_Sonnendrucker_CzarnyGeometry.h
index 1dff82d5a..335f68115 100644
--- a/include/InputFunctions/SourceTerms/polarR6_Sonnendrucker_CzarnyGeometry.h
+++ b/include/InputFunctions/SourceTerms/polarR6_Sonnendrucker_CzarnyGeometry.h
@@ -6,6 +6,9 @@
 
 #include "../../PolarGrid/polargrid.h"
 
+namespace gmgpolar
+{
+
 class PolarR6_Sonnendrucker_CzarnyGeometry
 {
 public:
@@ -23,3 +26,4 @@ class PolarR6_Sonnendrucker_CzarnyGeometry
     void initializeGeometry();
     double factor_xi;
 };
+} // namespace gmgpolar
diff --git a/include/InputFunctions/SourceTerms/polarR6_Sonnendrucker_ShafranovGeometry.h b/include/InputFunctions/SourceTerms/polarR6_Sonnendrucker_ShafranovGeometry.h
index 00b65a5c5..1b2ce8fcf 100644
--- a/include/InputFunctions/SourceTerms/polarR6_Sonnendrucker_ShafranovGeometry.h
+++ b/include/InputFunctions/SourceTerms/polarR6_Sonnendrucker_ShafranovGeometry.h
@@ -6,6 +6,9 @@
 
 #include "../../PolarGrid/polargrid.h"
 
+namespace gmgpolar
+{
+
 class PolarR6_Sonnendrucker_ShafranovGeometry
 {
 public:
@@ -20,3 +23,4 @@ class PolarR6_Sonnendrucker_ShafranovGeometry
     const double elongation_kappa = 0.3;
     const double shift_delta      = 0.2;
 };
+} // namespace gmgpolar
diff --git a/include/InputFunctions/SourceTerms/polarR6_ZoniGyro_CircularGeometry.h b/include/InputFunctions/SourceTerms/polarR6_ZoniGyro_CircularGeometry.h
index ae56d5457..0541d8627 100644
--- a/include/InputFunctions/SourceTerms/polarR6_ZoniGyro_CircularGeometry.h
+++ b/include/InputFunctions/SourceTerms/polarR6_ZoniGyro_CircularGeometry.h
@@ -6,6 +6,9 @@
 
 #include "../../PolarGrid/polargrid.h"
 
+namespace gmgpolar
+{
+
 class PolarR6_ZoniGyro_CircularGeometry
 {
 public:
@@ -17,3 +20,4 @@ class PolarR6_ZoniGyro_CircularGeometry
     PolarGrid const& grid_;
     const double Rmax = 1.3;
 };
+} // namespace gmgpolar
diff --git a/include/InputFunctions/SourceTerms/polarR6_ZoniGyro_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/polarR6_ZoniGyro_CzarnyGeometry.h
index fcb32ecbf..88eef371e 100644
--- a/include/InputFunctions/SourceTerms/polarR6_ZoniGyro_CzarnyGeometry.h
+++ b/include/InputFunctions/SourceTerms/polarR6_ZoniGyro_CzarnyGeometry.h
@@ -6,6 +6,9 @@
 
 #include "../../PolarGrid/polargrid.h"
 
+namespace gmgpolar
+{
+
 class PolarR6_ZoniGyro_CzarnyGeometry
 {
 public:
@@ -23,3 +26,4 @@ class PolarR6_ZoniGyro_CzarnyGeometry
     void initializeGeometry();
     double factor_xi;
 };
+} // namespace gmgpolar
diff --git a/include/InputFunctions/SourceTerms/polarR6_ZoniGyro_ShafranovGeometry.h b/include/InputFunctions/SourceTerms/polarR6_ZoniGyro_ShafranovGeometry.h
index 17d9a8ad9..3caaec88c 100644
--- a/include/InputFunctions/SourceTerms/polarR6_ZoniGyro_ShafranovGeometry.h
+++ b/include/InputFunctions/SourceTerms/polarR6_ZoniGyro_ShafranovGeometry.h
@@ -6,6 +6,9 @@
 
 #include "../../PolarGrid/polargrid.h"
 
+namespace gmgpolar
+{
+
 class PolarR6_ZoniGyro_ShafranovGeometry
 {
 public:
@@ -20,3 +23,4 @@ class PolarR6_ZoniGyro_ShafranovGeometry
     const double elongation_kappa = 0.3;
     const double shift_delta      = 0.2;
 };
+} // namespace gmgpolar
diff --git a/include/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CircularGeometry.h b/include/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CircularGeometry.h
index 6bde28048..a331c34d6 100644
--- a/include/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CircularGeometry.h
+++ b/include/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CircularGeometry.h
@@ -6,6 +6,9 @@
 
 #include "../../PolarGrid/polargrid.h"
 
+namespace gmgpolar
+{
+
 class PolarR6_ZoniShiftedGyro_CircularGeometry
 {
 public:
@@ -17,3 +20,4 @@ class PolarR6_ZoniShiftedGyro_CircularGeometry
     PolarGrid const& grid_;
     const double Rmax = 1.3;
 };
+} // namespace gmgpolar
diff --git a/include/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CulhamGeometry.h b/include/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CulhamGeometry.h
index 91b87d032..956a344f9 100644
--- a/include/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CulhamGeometry.h
+++ b/include/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CulhamGeometry.h
@@ -6,6 +6,9 @@
 
 #include "../../PolarGrid/polargrid.h"
 
+namespace gmgpolar
+{
+
 class PolarR6_ZoniShiftedGyro_CulhamGeometry
 {
 public:
@@ -17,3 +20,4 @@ class PolarR6_ZoniShiftedGyro_CulhamGeometry
     PolarGrid const& grid_;
     const double Rmax = 1.3;
 };
+} // namespace gmgpolar
diff --git a/include/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CzarnyGeometry.h
index 886a3d6b7..c8d2d79da 100644
--- a/include/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CzarnyGeometry.h
+++ b/include/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CzarnyGeometry.h
@@ -6,6 +6,9 @@
 
 #include "../../PolarGrid/polargrid.h"
 
+namespace gmgpolar
+{
+
 class PolarR6_ZoniShiftedGyro_CzarnyGeometry
 {
 public:
@@ -23,3 +26,4 @@ class PolarR6_ZoniShiftedGyro_CzarnyGeometry
     void initializeGeometry();
     double factor_xi;
 };
+} // namespace gmgpolar
diff --git a/include/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_ShafranovGeometry.h b/include/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_ShafranovGeometry.h
index c872752d9..7e1deaa60 100644
--- a/include/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_ShafranovGeometry.h
+++ b/include/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_ShafranovGeometry.h
@@ -6,6 +6,9 @@
 
 #include "../../PolarGrid/polargrid.h"
 
+namespace gmgpolar
+{
+
 class PolarR6_ZoniShiftedGyro_ShafranovGeometry
 {
 public:
@@ -20,3 +23,4 @@ class PolarR6_ZoniShiftedGyro_ShafranovGeometry
     const double elongation_kappa = 0.3;
     const double shift_delta      = 0.2;
 };
+} // namespace gmgpolar
diff --git a/include/InputFunctions/SourceTerms/polarR6_ZoniShifted_CircularGeometry.h b/include/InputFunctions/SourceTerms/polarR6_ZoniShifted_CircularGeometry.h
index 7cf4f1bf8..25b6e2081 100644
--- a/include/InputFunctions/SourceTerms/polarR6_ZoniShifted_CircularGeometry.h
+++ b/include/InputFunctions/SourceTerms/polarR6_ZoniShifted_CircularGeometry.h
@@ -6,6 +6,9 @@
 
 #include "../../PolarGrid/polargrid.h"
 
+namespace gmgpolar
+{
+
 class PolarR6_ZoniShifted_CircularGeometry
 {
 public:
@@ -17,3 +20,4 @@ class PolarR6_ZoniShifted_CircularGeometry
     PolarGrid const& grid_;
     const double Rmax = 1.3;
 };
+} // namespace gmgpolar
diff --git a/include/InputFunctions/SourceTerms/polarR6_ZoniShifted_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/polarR6_ZoniShifted_CzarnyGeometry.h
index a91d02d20..71c4d6137 100644
--- a/include/InputFunctions/SourceTerms/polarR6_ZoniShifted_CzarnyGeometry.h
+++ b/include/InputFunctions/SourceTerms/polarR6_ZoniShifted_CzarnyGeometry.h
@@ -6,6 +6,9 @@
 
 #include "../../PolarGrid/polargrid.h"
 
+namespace gmgpolar
+{
+
 class PolarR6_ZoniShifted_CzarnyGeometry
 {
 public:
@@ -23,3 +26,4 @@ class PolarR6_ZoniShifted_CzarnyGeometry
     void initializeGeometry();
     double factor_xi;
 };
+} // namespace gmgpolar
diff --git a/include/InputFunctions/SourceTerms/polarR6_ZoniShifted_ShafranovGeometry.h b/include/InputFunctions/SourceTerms/polarR6_ZoniShifted_ShafranovGeometry.h
index 9be23ec04..465ee3b6b 100644
--- a/include/InputFunctions/SourceTerms/polarR6_ZoniShifted_ShafranovGeometry.h
+++ b/include/InputFunctions/SourceTerms/polarR6_ZoniShifted_ShafranovGeometry.h
@@ -6,6 +6,9 @@
 
 #include "../../PolarGrid/polargrid.h"
 
+namespace gmgpolar
+{
+
 class PolarR6_ZoniShifted_ShafranovGeometry
 {
 public:
@@ -20,3 +23,4 @@ class PolarR6_ZoniShifted_ShafranovGeometry
     const double elongation_kappa = 0.3;
     const double shift_delta      = 0.2;
 };
+} // namespace gmgpolar
diff --git a/include/InputFunctions/SourceTerms/polarR6_Zoni_CircularGeometry.h b/include/InputFunctions/SourceTerms/polarR6_Zoni_CircularGeometry.h
index 6ca53a246..5bb85bfcc 100644
--- a/include/InputFunctions/SourceTerms/polarR6_Zoni_CircularGeometry.h
+++ b/include/InputFunctions/SourceTerms/polarR6_Zoni_CircularGeometry.h
@@ -6,6 +6,9 @@
 
 #include "../../PolarGrid/polargrid.h"
 
+namespace gmgpolar
+{
+
 class PolarR6_Zoni_CircularGeometry
 {
 public:
@@ -17,3 +20,4 @@ class PolarR6_Zoni_CircularGeometry
     PolarGrid const& grid_;
     const double Rmax = 1.3;
 };
+} // namespace gmgpolar
diff --git a/include/InputFunctions/SourceTerms/polarR6_Zoni_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/polarR6_Zoni_CzarnyGeometry.h
index 29f7e2ccc..5ec32eabc 100644
--- a/include/InputFunctions/SourceTerms/polarR6_Zoni_CzarnyGeometry.h
+++ b/include/InputFunctions/SourceTerms/polarR6_Zoni_CzarnyGeometry.h
@@ -6,6 +6,9 @@
 
 #include "../../PolarGrid/polargrid.h"
 
+namespace gmgpolar
+{
+
 class PolarR6_Zoni_CzarnyGeometry
 {
 public:
@@ -23,3 +26,4 @@ class PolarR6_Zoni_CzarnyGeometry
     void initializeGeometry();
     double factor_xi;
 };
+} // namespace gmgpolar
diff --git a/include/InputFunctions/SourceTerms/polarR6_Zoni_ShafranovGeometry.h b/include/InputFunctions/SourceTerms/polarR6_Zoni_ShafranovGeometry.h
index cd0d44ea3..364356616 100644
--- a/include/InputFunctions/SourceTerms/polarR6_Zoni_ShafranovGeometry.h
+++ b/include/InputFunctions/SourceTerms/polarR6_Zoni_ShafranovGeometry.h
@@ -6,6 +6,9 @@
 
 #include "../../PolarGrid/polargrid.h"
 
+namespace gmgpolar
+{
+
 class PolarR6_Zoni_ShafranovGeometry
 {
 public:
@@ -20,3 +23,4 @@ class PolarR6_Zoni_ShafranovGeometry
     const double elongation_kappa = 0.3;
     const double shift_delta      = 0.2;
 };
+} // namespace gmgpolar
diff --git a/include/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CircularGeometry.h b/include/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CircularGeometry.h
index 05ae28592..182ebc7b7 100644
--- a/include/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CircularGeometry.h
+++ b/include/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CircularGeometry.h
@@ -6,6 +6,9 @@
 
 #include "../../PolarGrid/polargrid.h"
 
+namespace gmgpolar
+{
+
 class Refined_ZoniShiftedGyro_CircularGeometry
 {
 public:
@@ -17,3 +20,4 @@ class Refined_ZoniShiftedGyro_CircularGeometry
     PolarGrid const& grid_;
     const double Rmax = 1.3;
 };
+} // namespace gmgpolar
diff --git a/include/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CulhamGeometry.h b/include/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CulhamGeometry.h
index cddd03aa3..820dd97a2 100644
--- a/include/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CulhamGeometry.h
+++ b/include/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CulhamGeometry.h
@@ -6,6 +6,9 @@
 
 #include "../../PolarGrid/polargrid.h"
 
+namespace gmgpolar
+{
+
 class Refined_ZoniShiftedGyro_CulhamGeometry
 {
 public:
@@ -17,3 +20,4 @@ class Refined_ZoniShiftedGyro_CulhamGeometry
     PolarGrid const& grid_;
     const double Rmax = 1.3;
 };
+} // namespace gmgpolar
diff --git a/include/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CzarnyGeometry.h b/include/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CzarnyGeometry.h
index 60130b6a1..71b4b535d 100644
--- a/include/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CzarnyGeometry.h
+++ b/include/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CzarnyGeometry.h
@@ -6,6 +6,9 @@
 
 #include "../../PolarGrid/polargrid.h"
 
+namespace gmgpolar
+{
+
 class Refined_ZoniShiftedGyro_CzarnyGeometry
 {
 public:
@@ -23,3 +26,4 @@ class Refined_ZoniShiftedGyro_CzarnyGeometry
     void initializeGeometry();
     double factor_xi;
 };
+} // namespace gmgpolar
diff --git a/include/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_ShafranovGeometry.h b/include/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_ShafranovGeometry.h
index 368ff0a38..0c43500d1 100644
--- a/include/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_ShafranovGeometry.h
+++ b/include/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_ShafranovGeometry.h
@@ -6,6 +6,9 @@
 
 #include "../../PolarGrid/polargrid.h"
 
+namespace gmgpolar
+{
+
 class Refined_ZoniShiftedGyro_ShafranovGeometry
 {
 public:
@@ -20,3 +23,4 @@ class Refined_ZoniShiftedGyro_ShafranovGeometry
     const double elongation_kappa = 0.3;
     const double shift_delta      = 0.2;
 };
+} // namespace gmgpolar
diff --git a/include/InputFunctions/exactSolution.h b/include/InputFunctions/exactSolution.h
index 5aac48a46..221c4ec26 100644
--- a/include/InputFunctions/exactSolution.h
+++ b/include/InputFunctions/exactSolution.h
@@ -1,5 +1,8 @@
 #pragma once
 
+namespace gmgpolar
+{
+
 class ExactSolution
 {
 public:
@@ -8,3 +11,4 @@ class ExactSolution
 
     virtual double exact_solution(double r, double theta) const = 0;
 };
+} // namespace gmgpolar
diff --git a/include/Interpolation/interpolation.h b/include/Interpolation/interpolation.h
index 11a0ca915..111832cd6 100644
--- a/include/Interpolation/interpolation.h
+++ b/include/Interpolation/interpolation.h
@@ -10,6 +10,9 @@
 #include "../LinearAlgebra/Vector/vector_operations.h"
 #include "../Definitions/global_definitions.h"
 
+namespace gmgpolar
+{
+
 class Interpolation
 {
 public:
@@ -41,3 +44,4 @@ class Interpolation
     const int max_omp_threads_;
     const bool DirBC_Interior_;
 };
+} // namespace gmgpolar
diff --git a/include/Level/level.h b/include/Level/level.h
index 85a7595ae..058027c81 100644
--- a/include/Level/level.h
+++ b/include/Level/level.h
@@ -1,5 +1,8 @@
 #pragma once
 
+namespace gmgpolar
+{
+
 // Required to prevent circular dependencies.
 template <class LevelCacheType>
 class DirectSolver;
@@ -10,6 +13,8 @@ class Smoother;
 template <class LevelCacheType>
 class ExtrapolatedSmoother;
 
+} // namespace gmgpolar
+
 #include <memory>
 #include <omp.h>
 #include <vector>
@@ -28,6 +33,23 @@ class ExtrapolatedSmoother;
 
 #include "../Definitions/geometry_helper.h"
 
+#include "../../include/Residual/ResidualGive/residualGive.h"
+#include "../../include/Residual/ResidualTake/residualTake.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/Smoother/SmootherGive/smootherGive.h"
+#include "../../include/Smoother/SmootherTake/smootherTake.h"
+
+#include "../../include/ExtrapolatedSmoother/ExtrapolatedSmootherGive/extrapolatedSmootherGive.h"
+#include "../../include/ExtrapolatedSmoother/ExtrapolatedSmootherTake/extrapolatedSmootherTake.h"
+
+namespace gmgpolar
+{
+
 // The `Level` class represents a single level of a multigrid method.
 // In multigrid solvers, the computational domain is divided into different levels, where each level corresponds to a grid with a different resolution.
 // The `Level` class manages the specific data structures and operations needed to solve a problem at a given level, including residual computation, direct solving, and smoothing.
@@ -170,3 +192,5 @@ class LevelCache
 
 #include "levelCache.inl"
 #include "level.inl"
+
+} // namespace gmgpolar
diff --git a/include/Level/level.inl b/include/Level/level.inl
index b26a0e1f6..1dafc334e 100644
--- a/include/Level/level.inl
+++ b/include/Level/level.inl
@@ -1,24 +1,12 @@
 #pragma once
-#include "../../include/Residual/ResidualGive/residualGive.h"
-#include "../../include/Residual/ResidualTake/residualTake.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/Smoother/SmootherGive/smootherGive.h"
-#include "../../include/Smoother/SmootherTake/smootherTake.h"
-
-#include "../../include/ExtrapolatedSmoother/ExtrapolatedSmootherGive/extrapolatedSmootherGive.h"
-#include "../../include/ExtrapolatedSmoother/ExtrapolatedSmootherTake/extrapolatedSmootherTake.h"
 
 // ----------- //
 // Constructor //
 template <concepts::DomainGeometry DomainGeometry, concepts::DensityProfileCoefficients DensityProfileCoefficients>
-Level<DomainGeometry, DensityProfileCoefficients>::Level(const int level_depth, std::unique_ptr<const PolarGrid> grid,
-                             std::unique_ptr<const LevelCache<DomainGeometry, DensityProfileCoefficients>> level_cache,
-                             const ExtrapolationType extrapolation, const bool FMG, const bool PCG_FMG)
+Level<DomainGeometry, DensityProfileCoefficients>::Level(
+    const int level_depth, std::unique_ptr<const PolarGrid> grid,
+    std::unique_ptr<const LevelCache<DomainGeometry, DensityProfileCoefficients>> 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 +34,8 @@ const PolarGrid& Level<DomainGeometry, DensityProfileCoefficients>::grid() const
 }
 
 template <concepts::DomainGeometry DomainGeometry, concepts::DensityProfileCoefficients DensityProfileCoefficients>
-const LevelCache<DomainGeometry, DensityProfileCoefficients>& Level<DomainGeometry, DensityProfileCoefficients>::levelCache() const
+const LevelCache<DomainGeometry, DensityProfileCoefficients>&
+Level<DomainGeometry, DensityProfileCoefficients>::levelCache() const
 {
     return *level_cache_;
 }
@@ -102,8 +91,8 @@ ConstVector<double> Level<DomainGeometry, DensityProfileCoefficients>::error_cor
 // -------------- //
 // Apply Residual //
 template <concepts::DomainGeometry DomainGeometry, concepts::DensityProfileCoefficients DensityProfileCoefficients>
-void Level<DomainGeometry, DensityProfileCoefficients>::initializeResidual(const bool DirBC_Interior, const int num_omp_threads,
-                                               const StencilDistributionMethod stencil_distribution_method)
+void Level<DomainGeometry, DensityProfileCoefficients>::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 +107,16 @@ void Level<DomainGeometry, DensityProfileCoefficients>::initializeResidual(const
 }
 
 template <concepts::DomainGeometry DomainGeometry, concepts::DensityProfileCoefficients DensityProfileCoefficients>
-void Level<DomainGeometry, DensityProfileCoefficients>::computeResidual(Vector<double> result, ConstVector<double> rhs, ConstVector<double> x) const
+void Level<DomainGeometry, DensityProfileCoefficients>::computeResidual(Vector<double> result, ConstVector<double> rhs,
+                                                                        ConstVector<double> x) const
 {
     if (!op_residual_)
         throw std::runtime_error("Residual not initialized.");
     op_residual_->computeResidual(result, rhs, x);
 }
 template <concepts::DomainGeometry DomainGeometry, concepts::DensityProfileCoefficients DensityProfileCoefficients>
-void Level<DomainGeometry, DensityProfileCoefficients>::applySystemOperator(Vector<double> result, ConstVector<double> x) const
+void Level<DomainGeometry, DensityProfileCoefficients>::applySystemOperator(Vector<double> result,
+                                                                            ConstVector<double> x) const
 {
     if (!op_residual_)
         throw std::runtime_error("Residual not initialized.");
@@ -135,8 +126,8 @@ void Level<DomainGeometry, DensityProfileCoefficients>::applySystemOperator(Vect
 // ------------------- //
 // Solve coarse System //
 template <concepts::DomainGeometry DomainGeometry, concepts::DensityProfileCoefficients DensityProfileCoefficients>
-void Level<DomainGeometry, DensityProfileCoefficients>::initializeDirectSolver(const bool DirBC_Interior, const int num_omp_threads,
-                                                   const StencilDistributionMethod stencil_distribution_method)
+void Level<DomainGeometry, DensityProfileCoefficients>::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 +163,8 @@ void Level<DomainGeometry, DensityProfileCoefficients>::directSolveInPlace(Vecto
 // --------------- //
 // Apply Smoothing //
 template <concepts::DomainGeometry DomainGeometry, concepts::DensityProfileCoefficients DensityProfileCoefficients>
-void Level<DomainGeometry, DensityProfileCoefficients>::initializeSmoothing(const bool DirBC_Interior, const int num_omp_threads,
-                                                const StencilDistributionMethod stencil_distribution_method)
+void Level<DomainGeometry, DensityProfileCoefficients>::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 +179,8 @@ void Level<DomainGeometry, DensityProfileCoefficients>::initializeSmoothing(cons
 }
 
 template <concepts::DomainGeometry DomainGeometry, concepts::DensityProfileCoefficients DensityProfileCoefficients>
-void Level<DomainGeometry, DensityProfileCoefficients>::smoothing(Vector<double> x, ConstVector<double> rhs, Vector<double> temp) const
+void Level<DomainGeometry, DensityProfileCoefficients>::smoothing(Vector<double> x, ConstVector<double> rhs,
+                                                                  Vector<double> temp) const
 {
     if (!op_smoother_)
         throw std::runtime_error("Smoother not initialized.");
@@ -198,8 +190,8 @@ void Level<DomainGeometry, DensityProfileCoefficients>::smoothing(Vector<double>
 // ---------------------------- //
 // Apply Extrapolated Smoothing //
 template <concepts::DomainGeometry DomainGeometry, concepts::DensityProfileCoefficients DensityProfileCoefficients>
-void Level<DomainGeometry, DensityProfileCoefficients>::initializeExtrapolatedSmoothing(const bool DirBC_Interior, const int num_omp_threads,
-                                                            const StencilDistributionMethod stencil_distribution_method)
+void Level<DomainGeometry, DensityProfileCoefficients>::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<ExtrapolatedSmootherTake<LevelCacheType>>(
@@ -214,7 +206,8 @@ void Level<DomainGeometry, DensityProfileCoefficients>::initializeExtrapolatedSm
 }
 
 template <concepts::DomainGeometry DomainGeometry, concepts::DensityProfileCoefficients DensityProfileCoefficients>
-void Level<DomainGeometry, DensityProfileCoefficients>::extrapolatedSmoothing(Vector<double> x, ConstVector<double> rhs, Vector<double> temp) const
+void Level<DomainGeometry, DensityProfileCoefficients>::extrapolatedSmoothing(Vector<double> x, ConstVector<double> rhs,
+                                                                              Vector<double> 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 <concepts::DomainGeometry DomainGeometry, concepts::DensityProfileCoefficients DensityProfileCoefficients>
-LevelCache<DomainGeometry, DensityProfileCoefficients>::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<DomainGeometry, DensityProfileCoefficients>::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<DomainGeometry, DensityProfileCoefficients>::LevelCache(const PolarGr
 }
 
 template <concepts::DomainGeometry DomainGeometry, concepts::DensityProfileCoefficients DensityProfileCoefficients>
-const DensityProfileCoefficients& LevelCache<DomainGeometry, DensityProfileCoefficients>::densityProfileCoefficients() const
+const DensityProfileCoefficients&
+LevelCache<DomainGeometry, DensityProfileCoefficients>::densityProfileCoefficients() const
 {
     return density_profile_coefficients_;
 }
diff --git a/include/LinearAlgebra/Matrix/coo_matrix.h b/include/LinearAlgebra/Matrix/coo_matrix.h
index 9cfdc17ff..c3c5c5c8c 100644
--- a/include/LinearAlgebra/Matrix/coo_matrix.h
+++ b/include/LinearAlgebra/Matrix/coo_matrix.h
@@ -18,6 +18,9 @@
 #include "../../LinearAlgebra/Vector/vector.h"
 #include "../../LinearAlgebra/Vector/vector_operations.h"
 
+namespace gmgpolar
+{
+
 template <typename T>
 class SparseMatrixCOO
 {
@@ -343,3 +346,4 @@ T* SparseMatrixCOO<T>::values_data() const
 {
     return values_.data();
 }
+} // namespace gmgpolar
diff --git a/include/LinearAlgebra/Matrix/csr_matrix.h b/include/LinearAlgebra/Matrix/csr_matrix.h
index d9af82f11..911f91995 100644
--- a/include/LinearAlgebra/Matrix/csr_matrix.h
+++ b/include/LinearAlgebra/Matrix/csr_matrix.h
@@ -26,6 +26,9 @@
 // The CSR matrix format is used if a custom LU decomposition solver is choosen.
 // MUMPS relies on the COO format.
 
+namespace gmgpolar
+{
+
 template <typename T>
 class SparseMatrixCSR
 {
@@ -325,3 +328,4 @@ int* SparseMatrixCSR<T>::row_start_indices_data() const
 {
     return row_start_indices_.data();
 }
+} // namespace gmgpolar
diff --git a/include/LinearAlgebra/Solvers/coo_mumps_solver.h b/include/LinearAlgebra/Solvers/coo_mumps_solver.h
index a4eb6dab4..e2301624f 100644
--- a/include/LinearAlgebra/Solvers/coo_mumps_solver.h
+++ b/include/LinearAlgebra/Solvers/coo_mumps_solver.h
@@ -30,6 +30,9 @@
  *   Not thread-safe. Each instance manages its own MUMPS communicator and
  *   must not be shared across threads.
  */
+namespace gmgpolar
+{
+
 class CooMumpsSolver
 {
 public:
@@ -94,4 +97,5 @@ class CooMumpsSolver
     DMUMPS_STRUC_C mumps_solver_ = {};
 };
 
+} // namespace gmgpolar
 #endif // GMGPOLAR_USE_MUMPS
diff --git a/include/LinearAlgebra/Solvers/csr_lu_solver.h b/include/LinearAlgebra/Solvers/csr_lu_solver.h
index 89a1e59a5..79a567666 100644
--- a/include/LinearAlgebra/Solvers/csr_lu_solver.h
+++ b/include/LinearAlgebra/Solvers/csr_lu_solver.h
@@ -10,6 +10,9 @@
 #include "../../LinearAlgebra/Matrix/csr_matrix.h"
 #include "../../LinearAlgebra/Vector/vector.h"
 
+namespace gmgpolar
+{
+
 /**
  * @brief Sparse LU decomposition solver for symmetric positive definite matrices.
  *
@@ -551,3 +554,4 @@ void SparseLUSolver<T>::numericFactorization(const SparseMatrixCSR<T>& A,
         }
     }
 }
+} // namespace gmgpolar
diff --git a/include/LinearAlgebra/Solvers/tridiagonal_solver.h b/include/LinearAlgebra/Solvers/tridiagonal_solver.h
index e09af360a..4e83ad02d 100644
--- a/include/LinearAlgebra/Solvers/tridiagonal_solver.h
+++ b/include/LinearAlgebra/Solvers/tridiagonal_solver.h
@@ -5,6 +5,9 @@
 #include "../../LinearAlgebra/Vector/vector.h"
 #include "../../LinearAlgebra/Vector/vector_operations.h"
 
+namespace gmgpolar
+{
+
 template <typename T>
 class BatchedTridiagonalSolver
 {
@@ -302,4 +305,5 @@ class BatchedTridiagonalSolver
 
     bool is_cyclic_;
     bool is_factorized_;
-};
\ No newline at end of file
+};
+} // namespace gmgpolar
diff --git a/include/LinearAlgebra/Vector/vector.h b/include/LinearAlgebra/Vector/vector.h
index 48f5ee79b..b767be395 100644
--- a/include/LinearAlgebra/Vector/vector.h
+++ b/include/LinearAlgebra/Vector/vector.h
@@ -2,9 +2,14 @@
 
 #include <Kokkos_Core.hpp>
 
+namespace gmgpolar
+{
+
 template <typename T>
 using AllocatableVector = Kokkos::View<T*, Kokkos::LayoutRight, Kokkos::HostSpace>;
 template <typename T>
 using Vector = Kokkos::View<T*, Kokkos::LayoutRight, Kokkos::HostSpace> const;
 template <typename T>
 using ConstVector = Kokkos::View<const T*, Kokkos::LayoutRight, Kokkos::HostSpace> const;
+
+} // namespace gmgpolar
diff --git a/include/LinearAlgebra/Vector/vector_operations.h b/include/LinearAlgebra/Vector/vector_operations.h
index cd877c588..ed85c2da0 100644
--- a/include/LinearAlgebra/Vector/vector_operations.h
+++ b/include/LinearAlgebra/Vector/vector_operations.h
@@ -9,6 +9,9 @@
 #include "vector.h"
 #include "../../Definitions/equals.h"
 
+namespace gmgpolar
+{
+
 template <typename T>
 bool equals(ConstVector<T> lhs, ConstVector<T> rhs)
 {
@@ -154,3 +157,5 @@ T infinity_norm(ConstVector<T> x)
     }
     return result;
 }
+
+} // namespace gmgpolar
diff --git a/include/PolarGrid/polargrid.h b/include/PolarGrid/polargrid.h
index 9204d511a..3a82f7406 100644
--- a/include/PolarGrid/polargrid.h
+++ b/include/PolarGrid/polargrid.h
@@ -19,6 +19,9 @@
 #include "../Definitions/equals.h"
 #include "../LinearAlgebra/Vector/vector.h"
 
+namespace gmgpolar
+{
+
 class PolarGrid
 {
 public:
@@ -140,3 +143,4 @@ class PolarGrid
 PolarGrid coarseningGrid(const PolarGrid& grid);
 
 #include "polargrid.inl" // Include the inline function definitions
+} // namespace gmgpolar
diff --git a/include/Residual/ResidualGive/residualGive.h b/include/Residual/ResidualGive/residualGive.h
index dfc4fcd5d..37d1040d1 100644
--- a/include/Residual/ResidualGive/residualGive.h
+++ b/include/Residual/ResidualGive/residualGive.h
@@ -2,6 +2,9 @@
 
 #include "../residual.h"
 
+namespace gmgpolar
+{
+
 template <class LevelCacheType>
 class ResidualGive : public Residual<LevelCacheType>
 {
@@ -21,3 +24,4 @@ class ResidualGive : public Residual<LevelCacheType>
 
 #include "residualGive.inl"
 #include "applyAGive.inl"
+} // namespace gmgpolar
diff --git a/include/Residual/ResidualTake/residualTake.h b/include/Residual/ResidualTake/residualTake.h
index 231743f22..0ecaf1ff7 100644
--- a/include/Residual/ResidualTake/residualTake.h
+++ b/include/Residual/ResidualTake/residualTake.h
@@ -2,6 +2,9 @@
 
 #include "../residual.h"
 
+namespace gmgpolar
+{
+
 template <class LevelCacheType>
 class ResidualTake : public Residual<LevelCacheType>
 {
@@ -21,3 +24,4 @@ class ResidualTake : public Residual<LevelCacheType>
 
 #include "residualTake.inl"
 #include "applyATake.inl"
+} // namespace gmgpolar
diff --git a/include/Residual/residual.h b/include/Residual/residual.h
index bde5f4e34..f1525bd13 100644
--- a/include/Residual/residual.h
+++ b/include/Residual/residual.h
@@ -9,6 +9,9 @@
 #include "../LinearAlgebra/Vector/vector.h"
 #include "../LinearAlgebra/Vector/vector_operations.h"
 
+namespace gmgpolar
+{
+
 template <class LevelCacheType>
 class Residual
 {
@@ -35,3 +38,4 @@ class Residual
     const bool DirBC_Interior_;
     const int num_omp_threads_;
 };
+} // namespace gmgpolar
diff --git a/include/Smoother/SmootherGive/smootherGive.h b/include/Smoother/SmootherGive/smootherGive.h
index 8c77e65dd..c8f52b947 100644
--- a/include/Smoother/SmootherGive/smootherGive.h
+++ b/include/Smoother/SmootherGive/smootherGive.h
@@ -2,6 +2,9 @@
 
 #include "../smoother.h"
 
+namespace gmgpolar
+{
+
 // The smoother implements the coupled circle-radial smoothing procedure.
 // It performs iterative updates on different parts of the grid based
 // on the circle/radial section of the grid and black/white line coloring.
@@ -190,3 +193,4 @@ class SmootherGive : public Smoother<LevelCacheType>
 #include "solveAscSystem.inl"
 #include "matrixStencil.inl"
 #include "initializeMumps.inl"
+} // namespace gmgpolar
diff --git a/include/Smoother/SmootherTake/smootherTake.h b/include/Smoother/SmootherTake/smootherTake.h
index 16a0ea21c..e872a19bf 100644
--- a/include/Smoother/SmootherTake/smootherTake.h
+++ b/include/Smoother/SmootherTake/smootherTake.h
@@ -2,6 +2,9 @@
 
 #include "../smoother.h"
 
+namespace gmgpolar
+{
+
 // The smoother implements the coupled circle-radial smoothing procedure.
 // It performs iterative updates on different parts of the grid based
 // on the circle/radial section of the grid and black/white line coloring.
@@ -193,3 +196,4 @@ class SmootherTake : public Smoother<LevelCacheType>
 #include "applyAscOrtho.inl"
 #include "solveAscSystem.inl"
 #include "matrixStencil.inl"
+} // namespace gmgpolar
diff --git a/include/Smoother/smoother.h b/include/Smoother/smoother.h
index a1e907151..a0639c4a9 100644
--- a/include/Smoother/smoother.h
+++ b/include/Smoother/smoother.h
@@ -20,6 +20,9 @@
     #include "mpi.h"
 #endif
 
+namespace gmgpolar
+{
+
 template <class LevelCacheType>
 class Smoother
 {
@@ -42,3 +45,4 @@ class Smoother
     const bool DirBC_Interior_;
     const int num_omp_threads_;
 };
+} // namespace gmgpolar
diff --git a/include/Stencil/stencil.h b/include/Stencil/stencil.h
index d1c658175..2359049eb 100644
--- a/include/Stencil/stencil.h
+++ b/include/Stencil/stencil.h
@@ -29,6 +29,9 @@ enum class StencilPosition
  * - A value of `-1` means the position is not included in the stencil pattern.
  * - Other values (0, 1, 2, ..., stencil_size - 1) correspond to valid stencil indices.
  */
+namespace gmgpolar
+{
+
 class Stencil
 {
 public:
@@ -39,3 +42,4 @@ class Stencil
     std::array<int, 9> values_;
     int stencil_size_;
 };
+} // namespace gmgpolar
diff --git a/src/ConfigParser/config_parser.cpp b/src/ConfigParser/config_parser.cpp
index 315f26f86..d9739af09 100644
--- a/src/ConfigParser/config_parser.cpp
+++ b/src/ConfigParser/config_parser.cpp
@@ -1,4 +1,5 @@
 #include "../include/ConfigParser/config_parser.h"
+using namespace gmgpolar;
 
 ConfigParser::ConfigParser()
 {
diff --git a/src/ConfigParser/select_test_case.cpp b/src/ConfigParser/select_test_case.cpp
index 487e44dfa..e006bd856 100644
--- a/src/ConfigParser/select_test_case.cpp
+++ b/src/ConfigParser/select_test_case.cpp
@@ -1,5 +1,6 @@
 #include "../../include/ConfigParser/config_parser.h"
 #include "../../include/GMGPolar/gmgpolar.h"
+using namespace gmgpolar;
 
 std::unique_ptr<IGMGPolar> ConfigParser::solver() const
 {
diff --git a/src/GMGPolar/gmgpolar.cpp b/src/GMGPolar/gmgpolar.cpp
index 2977e0ff6..ebeaedb26 100644
--- a/src/GMGPolar/gmgpolar.cpp
+++ b/src/GMGPolar/gmgpolar.cpp
@@ -1,4 +1,5 @@
 #include "../../include/GMGPolar/gmgpolar.h"
+using namespace gmgpolar;
 
 /* ---------------------------------------------------------------------- */
 /* Constructor & Initialization                                           */
diff --git a/src/InputFunctions/BoundaryConditions/cartesianR2_Boundary_CircularGeometry.cpp b/src/InputFunctions/BoundaryConditions/cartesianR2_Boundary_CircularGeometry.cpp
index a138e9377..8b869cd2d 100644
--- a/src/InputFunctions/BoundaryConditions/cartesianR2_Boundary_CircularGeometry.cpp
+++ b/src/InputFunctions/BoundaryConditions/cartesianR2_Boundary_CircularGeometry.cpp
@@ -1,4 +1,5 @@
 #include "../include/InputFunctions/BoundaryConditions/cartesianR2_Boundary_CircularGeometry.h"
+using namespace gmgpolar;
 
 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..f9a6e2a79 100644
--- a/src/InputFunctions/BoundaryConditions/cartesianR2_Boundary_CzarnyGeometry.cpp
+++ b/src/InputFunctions/BoundaryConditions/cartesianR2_Boundary_CzarnyGeometry.cpp
@@ -1,4 +1,5 @@
 #include "../include/InputFunctions/BoundaryConditions/cartesianR2_Boundary_CzarnyGeometry.h"
+using namespace gmgpolar;
 
 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..bec5939b4 100644
--- a/src/InputFunctions/BoundaryConditions/cartesianR2_Boundary_ShafranovGeometry.cpp
+++ b/src/InputFunctions/BoundaryConditions/cartesianR2_Boundary_ShafranovGeometry.cpp
@@ -1,4 +1,5 @@
 #include "../include/InputFunctions/BoundaryConditions/cartesianR2_Boundary_ShafranovGeometry.h"
+using namespace gmgpolar;
 
 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..cb203cac3 100644
--- a/src/InputFunctions/BoundaryConditions/cartesianR6_Boundary_CircularGeometry.cpp
+++ b/src/InputFunctions/BoundaryConditions/cartesianR6_Boundary_CircularGeometry.cpp
@@ -1,4 +1,5 @@
 #include "../include/InputFunctions/BoundaryConditions/cartesianR6_Boundary_CircularGeometry.h"
+using namespace gmgpolar;
 
 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..019d9315a 100644
--- a/src/InputFunctions/BoundaryConditions/cartesianR6_Boundary_CzarnyGeometry.cpp
+++ b/src/InputFunctions/BoundaryConditions/cartesianR6_Boundary_CzarnyGeometry.cpp
@@ -1,4 +1,5 @@
 #include "../include/InputFunctions/BoundaryConditions/cartesianR6_Boundary_CzarnyGeometry.h"
+using namespace gmgpolar;
 
 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..612ca7b67 100644
--- a/src/InputFunctions/BoundaryConditions/cartesianR6_Boundary_ShafranovGeometry.cpp
+++ b/src/InputFunctions/BoundaryConditions/cartesianR6_Boundary_ShafranovGeometry.cpp
@@ -1,4 +1,5 @@
 #include "../include/InputFunctions/BoundaryConditions/cartesianR6_Boundary_ShafranovGeometry.h"
+using namespace gmgpolar;
 
 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..f60376368 100644
--- a/src/InputFunctions/BoundaryConditions/polarR6_Boundary_CircularGeometry.cpp
+++ b/src/InputFunctions/BoundaryConditions/polarR6_Boundary_CircularGeometry.cpp
@@ -1,4 +1,5 @@
 #include "../include/InputFunctions/BoundaryConditions/polarR6_Boundary_CircularGeometry.h"
+using namespace gmgpolar;
 
 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..a977a2f96 100644
--- a/src/InputFunctions/BoundaryConditions/polarR6_Boundary_CulhamGeometry.cpp
+++ b/src/InputFunctions/BoundaryConditions/polarR6_Boundary_CulhamGeometry.cpp
@@ -1,4 +1,5 @@
 #include "../include/InputFunctions/BoundaryConditions/polarR6_Boundary_CulhamGeometry.h"
+using namespace gmgpolar;
 
 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..a9f9ba16c 100644
--- a/src/InputFunctions/BoundaryConditions/polarR6_Boundary_CzarnyGeometry.cpp
+++ b/src/InputFunctions/BoundaryConditions/polarR6_Boundary_CzarnyGeometry.cpp
@@ -1,4 +1,5 @@
 #include "../include/InputFunctions/BoundaryConditions/polarR6_Boundary_CzarnyGeometry.h"
+using namespace gmgpolar;
 
 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..956c1e38b 100644
--- a/src/InputFunctions/BoundaryConditions/polarR6_Boundary_ShafranovGeometry.cpp
+++ b/src/InputFunctions/BoundaryConditions/polarR6_Boundary_ShafranovGeometry.cpp
@@ -1,4 +1,5 @@
 #include "../include/InputFunctions/BoundaryConditions/polarR6_Boundary_ShafranovGeometry.h"
+using namespace gmgpolar;
 
 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..fb620880c 100644
--- a/src/InputFunctions/BoundaryConditions/refined_Boundary_CircularGeometry.cpp
+++ b/src/InputFunctions/BoundaryConditions/refined_Boundary_CircularGeometry.cpp
@@ -1,4 +1,5 @@
 #include "../include/InputFunctions/BoundaryConditions/refined_Boundary_CircularGeometry.h"
+using namespace gmgpolar;
 
 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..57227ec1a 100644
--- a/src/InputFunctions/BoundaryConditions/refined_Boundary_CulhamGeometry.cpp
+++ b/src/InputFunctions/BoundaryConditions/refined_Boundary_CulhamGeometry.cpp
@@ -1,4 +1,5 @@
 #include "../include/InputFunctions/BoundaryConditions/refined_Boundary_CulhamGeometry.h"
+using namespace gmgpolar;
 
 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..0724731b2 100644
--- a/src/InputFunctions/BoundaryConditions/refined_Boundary_CzarnyGeometry.cpp
+++ b/src/InputFunctions/BoundaryConditions/refined_Boundary_CzarnyGeometry.cpp
@@ -1,4 +1,5 @@
 #include "../include/InputFunctions/BoundaryConditions/refined_Boundary_CzarnyGeometry.h"
+using namespace gmgpolar;
 
 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..7c34ea057 100644
--- a/src/InputFunctions/BoundaryConditions/refined_Boundary_ShafranovGeometry.cpp
+++ b/src/InputFunctions/BoundaryConditions/refined_Boundary_ShafranovGeometry.cpp
@@ -1,4 +1,5 @@
 #include "../include/InputFunctions/BoundaryConditions/refined_Boundary_ShafranovGeometry.h"
+using namespace gmgpolar;
 
 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..94affce1c 100644
--- a/src/InputFunctions/DensityProfileCoefficients/poissonCoefficients.cpp
+++ b/src/InputFunctions/DensityProfileCoefficients/poissonCoefficients.cpp
@@ -1,4 +1,5 @@
 #include "../include/InputFunctions/DensityProfileCoefficients/poissonCoefficients.h"
+using namespace gmgpolar;
 
 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..2cc66f2da 100644
--- a/src/InputFunctions/DensityProfileCoefficients/sonnendruckerCoefficients.cpp
+++ b/src/InputFunctions/DensityProfileCoefficients/sonnendruckerCoefficients.cpp
@@ -1,4 +1,5 @@
 #include "../include/InputFunctions/DensityProfileCoefficients/sonnendruckerCoefficients.h"
+using namespace gmgpolar;
 
 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..768bdac5e 100644
--- a/src/InputFunctions/DensityProfileCoefficients/sonnendruckerGyroCoefficients.cpp
+++ b/src/InputFunctions/DensityProfileCoefficients/sonnendruckerGyroCoefficients.cpp
@@ -1,4 +1,5 @@
 #include "../include/InputFunctions/DensityProfileCoefficients/sonnendruckerGyroCoefficients.h"
+using namespace gmgpolar;
 
 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..3065415f3 100644
--- a/src/InputFunctions/DensityProfileCoefficients/zoniCoefficients.cpp
+++ b/src/InputFunctions/DensityProfileCoefficients/zoniCoefficients.cpp
@@ -1,4 +1,5 @@
 #include "../include/InputFunctions/DensityProfileCoefficients/zoniCoefficients.h"
+using namespace gmgpolar;
 
 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..aba20f600 100644
--- a/src/InputFunctions/DensityProfileCoefficients/zoniGyroCoefficients.cpp
+++ b/src/InputFunctions/DensityProfileCoefficients/zoniGyroCoefficients.cpp
@@ -1,4 +1,5 @@
 #include "../include/InputFunctions/DensityProfileCoefficients/zoniGyroCoefficients.h"
+using namespace gmgpolar;
 
 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..7d7a06075 100644
--- a/src/InputFunctions/DensityProfileCoefficients/zoniShiftedCoefficients.cpp
+++ b/src/InputFunctions/DensityProfileCoefficients/zoniShiftedCoefficients.cpp
@@ -1,5 +1,6 @@
 #include "../include/InputFunctions/DensityProfileCoefficients/zoniShiftedCoefficients.h"
 #include <iostream>
+using namespace gmgpolar;
 ZoniShiftedCoefficients::ZoniShiftedCoefficients(double Rmax, double alpha_jump)
     : Rmax(Rmax)
     , alpha_jump(alpha_jump)
diff --git a/src/InputFunctions/DensityProfileCoefficients/zoniShiftedGyroCoefficients.cpp b/src/InputFunctions/DensityProfileCoefficients/zoniShiftedGyroCoefficients.cpp
index 4857f3360..1f3555a50 100644
--- a/src/InputFunctions/DensityProfileCoefficients/zoniShiftedGyroCoefficients.cpp
+++ b/src/InputFunctions/DensityProfileCoefficients/zoniShiftedGyroCoefficients.cpp
@@ -1,4 +1,5 @@
 #include "../include/InputFunctions/DensityProfileCoefficients/zoniShiftedGyroCoefficients.h"
+using namespace gmgpolar;
 
 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..794d05b14 100644
--- a/src/InputFunctions/DomainGeometry/circularGeometry.cpp
+++ b/src/InputFunctions/DomainGeometry/circularGeometry.cpp
@@ -1,4 +1,5 @@
 #include "../include/InputFunctions/DomainGeometry/circularGeometry.h"
+using namespace gmgpolar;
 
 CircularGeometry::CircularGeometry(double Rmax)
     : Rmax(Rmax)
diff --git a/src/InputFunctions/DomainGeometry/culhamGeometry.cpp b/src/InputFunctions/DomainGeometry/culhamGeometry.cpp
index b4269a11f..4b611ca9e 100644
--- a/src/InputFunctions/DomainGeometry/culhamGeometry.cpp
+++ b/src/InputFunctions/DomainGeometry/culhamGeometry.cpp
@@ -1,4 +1,5 @@
 #include "../include/InputFunctions/DomainGeometry/culhamGeometry.h"
+using namespace gmgpolar;
 
 CulhamGeometry::CulhamGeometry(double Rmax)
     : Rmax(Rmax)
diff --git a/src/InputFunctions/DomainGeometry/czarnyGeometry.cpp b/src/InputFunctions/DomainGeometry/czarnyGeometry.cpp
index 62a008ca6..cef739edf 100644
--- a/src/InputFunctions/DomainGeometry/czarnyGeometry.cpp
+++ b/src/InputFunctions/DomainGeometry/czarnyGeometry.cpp
@@ -1,4 +1,5 @@
 #include "../include/InputFunctions/DomainGeometry/czarnyGeometry.h"
+using namespace gmgpolar;
 
 CzarnyGeometry::CzarnyGeometry()
 {
diff --git a/src/InputFunctions/DomainGeometry/shafranovGeometry.cpp b/src/InputFunctions/DomainGeometry/shafranovGeometry.cpp
index c352f3fac..5c423edad 100644
--- a/src/InputFunctions/DomainGeometry/shafranovGeometry.cpp
+++ b/src/InputFunctions/DomainGeometry/shafranovGeometry.cpp
@@ -1,4 +1,5 @@
 #include "../include/InputFunctions/DomainGeometry/shafranovGeometry.h"
+using namespace gmgpolar;
 
 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..06766c132 100644
--- a/src/InputFunctions/ExactSolution/cartesianR2_CircularGeometry.cpp
+++ b/src/InputFunctions/ExactSolution/cartesianR2_CircularGeometry.cpp
@@ -1,4 +1,5 @@
 #include "../include/InputFunctions/ExactSolution/cartesianR2_CircularGeometry.h"
+using namespace gmgpolar;
 
 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..d632c48f0 100644
--- a/src/InputFunctions/ExactSolution/cartesianR2_CzarnyGeometry.cpp
+++ b/src/InputFunctions/ExactSolution/cartesianR2_CzarnyGeometry.cpp
@@ -1,4 +1,5 @@
 #include "../include/InputFunctions/ExactSolution/cartesianR2_CzarnyGeometry.h"
+using namespace gmgpolar;
 
 void CartesianR2_CzarnyGeometry::initializeGeometry()
 {
diff --git a/src/InputFunctions/ExactSolution/cartesianR2_ShafranovGeometry.cpp b/src/InputFunctions/ExactSolution/cartesianR2_ShafranovGeometry.cpp
index 96c0b61f6..f1b38995c 100644
--- a/src/InputFunctions/ExactSolution/cartesianR2_ShafranovGeometry.cpp
+++ b/src/InputFunctions/ExactSolution/cartesianR2_ShafranovGeometry.cpp
@@ -1,4 +1,5 @@
 #include "../include/InputFunctions/ExactSolution/cartesianR2_ShafranovGeometry.h"
+using namespace gmgpolar;
 
 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..d5f85e5e3 100644
--- a/src/InputFunctions/ExactSolution/cartesianR6_CircularGeometry.cpp
+++ b/src/InputFunctions/ExactSolution/cartesianR6_CircularGeometry.cpp
@@ -1,4 +1,5 @@
 #include "../include/InputFunctions/ExactSolution/cartesianR6_CircularGeometry.h"
+using namespace gmgpolar;
 
 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..bbd193e77 100644
--- a/src/InputFunctions/ExactSolution/cartesianR6_CzarnyGeometry.cpp
+++ b/src/InputFunctions/ExactSolution/cartesianR6_CzarnyGeometry.cpp
@@ -1,4 +1,5 @@
 #include "../include/InputFunctions/ExactSolution/cartesianR6_CzarnyGeometry.h"
+using namespace gmgpolar;
 
 void CartesianR6_CzarnyGeometry::initializeGeometry()
 {
diff --git a/src/InputFunctions/ExactSolution/cartesianR6_ShafranovGeometry.cpp b/src/InputFunctions/ExactSolution/cartesianR6_ShafranovGeometry.cpp
index b64aa8f36..4657dce70 100644
--- a/src/InputFunctions/ExactSolution/cartesianR6_ShafranovGeometry.cpp
+++ b/src/InputFunctions/ExactSolution/cartesianR6_ShafranovGeometry.cpp
@@ -1,4 +1,5 @@
 #include "../include/InputFunctions/ExactSolution/cartesianR6_ShafranovGeometry.h"
+using namespace gmgpolar;
 
 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..d1364c750 100644
--- a/src/InputFunctions/ExactSolution/polarR6_CircularGeometry.cpp
+++ b/src/InputFunctions/ExactSolution/polarR6_CircularGeometry.cpp
@@ -1,4 +1,5 @@
 #include "../include/InputFunctions/ExactSolution/polarR6_CircularGeometry.h"
+using namespace gmgpolar;
 
 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..cce7fba4c 100644
--- a/src/InputFunctions/ExactSolution/polarR6_CulhamGeometry.cpp
+++ b/src/InputFunctions/ExactSolution/polarR6_CulhamGeometry.cpp
@@ -1,4 +1,5 @@
 #include "../include/InputFunctions/ExactSolution/polarR6_CulhamGeometry.h"
+using namespace gmgpolar;
 
 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..28ef4bce6 100644
--- a/src/InputFunctions/ExactSolution/polarR6_CzarnyGeometry.cpp
+++ b/src/InputFunctions/ExactSolution/polarR6_CzarnyGeometry.cpp
@@ -1,4 +1,5 @@
 #include "../include/InputFunctions/ExactSolution/polarR6_CzarnyGeometry.h"
+using namespace gmgpolar;
 
 void PolarR6_CzarnyGeometry::initializeGeometry()
 {
diff --git a/src/InputFunctions/ExactSolution/polarR6_ShafranovGeometry.cpp b/src/InputFunctions/ExactSolution/polarR6_ShafranovGeometry.cpp
index c9edc9dd3..f7988806f 100644
--- a/src/InputFunctions/ExactSolution/polarR6_ShafranovGeometry.cpp
+++ b/src/InputFunctions/ExactSolution/polarR6_ShafranovGeometry.cpp
@@ -1,4 +1,5 @@
 #include "../include/InputFunctions/ExactSolution/polarR6_ShafranovGeometry.h"
+using namespace gmgpolar;
 
 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..fb49518bd 100644
--- a/src/InputFunctions/ExactSolution/refined_CircularGeometry.cpp
+++ b/src/InputFunctions/ExactSolution/refined_CircularGeometry.cpp
@@ -1,4 +1,5 @@
 #include "../include/InputFunctions/ExactSolution/refined_CircularGeometry.h"
+using namespace gmgpolar;
 
 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..4b3949134 100644
--- a/src/InputFunctions/ExactSolution/refined_CulhamGeometry.cpp
+++ b/src/InputFunctions/ExactSolution/refined_CulhamGeometry.cpp
@@ -1,4 +1,5 @@
 #include "../include/InputFunctions/ExactSolution/refined_CulhamGeometry.h"
+using namespace gmgpolar;
 
 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..433d8479d 100644
--- a/src/InputFunctions/ExactSolution/refined_CzarnyGeometry.cpp
+++ b/src/InputFunctions/ExactSolution/refined_CzarnyGeometry.cpp
@@ -1,4 +1,5 @@
 #include "../include/InputFunctions/ExactSolution/refined_CzarnyGeometry.h"
+using namespace gmgpolar;
 
 void Refined_CzarnyGeometry::initializeGeometry()
 {
diff --git a/src/InputFunctions/ExactSolution/refined_ShafranovGeometry.cpp b/src/InputFunctions/ExactSolution/refined_ShafranovGeometry.cpp
index 36a534226..7ec6e9e31 100644
--- a/src/InputFunctions/ExactSolution/refined_ShafranovGeometry.cpp
+++ b/src/InputFunctions/ExactSolution/refined_ShafranovGeometry.cpp
@@ -1,4 +1,5 @@
 #include "../include/InputFunctions/ExactSolution/refined_ShafranovGeometry.h"
+using namespace gmgpolar;
 
 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..4ddca2a08 100644
--- a/src/InputFunctions/SourceTerms/cartesianR2_Poisson_CircularGeometry.cpp
+++ b/src/InputFunctions/SourceTerms/cartesianR2_Poisson_CircularGeometry.cpp
@@ -1,4 +1,5 @@
 #include "../include/InputFunctions/SourceTerms/cartesianR2_Poisson_CircularGeometry.h"
+using namespace gmgpolar;
 
 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..af825eede 100644
--- a/src/InputFunctions/SourceTerms/cartesianR2_Poisson_CzarnyGeometry.cpp
+++ b/src/InputFunctions/SourceTerms/cartesianR2_Poisson_CzarnyGeometry.cpp
@@ -1,4 +1,5 @@
 #include "../include/InputFunctions/SourceTerms/cartesianR2_Poisson_CzarnyGeometry.h"
+using namespace gmgpolar;
 
 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..249667c91 100644
--- a/src/InputFunctions/SourceTerms/cartesianR2_Poisson_ShafranovGeometry.cpp
+++ b/src/InputFunctions/SourceTerms/cartesianR2_Poisson_ShafranovGeometry.cpp
@@ -1,4 +1,5 @@
 #include "../include/InputFunctions/SourceTerms/cartesianR2_Poisson_ShafranovGeometry.h"
+using namespace gmgpolar;
 
 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..0ea4983dc 100644
--- a/src/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_CircularGeometry.cpp
+++ b/src/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_CircularGeometry.cpp
@@ -1,4 +1,5 @@
 #include "../include/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_CircularGeometry.h"
+using namespace gmgpolar;
 
 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..c5425a50c 100644
--- a/src/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_CzarnyGeometry.cpp
+++ b/src/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_CzarnyGeometry.cpp
@@ -1,4 +1,5 @@
 #include "../include/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_CzarnyGeometry.h"
+using namespace gmgpolar;
 
 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..40657d191 100644
--- a/src/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_ShafranovGeometry.cpp
+++ b/src/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_ShafranovGeometry.cpp
@@ -1,4 +1,5 @@
 #include "../include/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_ShafranovGeometry.h"
+using namespace gmgpolar;
 
 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..40d66b845 100644
--- a/src/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_CircularGeometry.cpp
+++ b/src/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_CircularGeometry.cpp
@@ -1,4 +1,5 @@
 #include "../include/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_CircularGeometry.h"
+using namespace gmgpolar;
 
 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..952ac345a 100644
--- a/src/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_CzarnyGeometry.cpp
+++ b/src/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_CzarnyGeometry.cpp
@@ -1,4 +1,5 @@
 #include "../include/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_CzarnyGeometry.h"
+using namespace gmgpolar;
 
 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..330253cc9 100644
--- a/src/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_ShafranovGeometry.cpp
+++ b/src/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_ShafranovGeometry.cpp
@@ -1,4 +1,5 @@
 #include "../include/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_ShafranovGeometry.h"
+using namespace gmgpolar;
 
 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..a515f87da 100644
--- a/src/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_CircularGeometry.cpp
+++ b/src/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_CircularGeometry.cpp
@@ -1,4 +1,5 @@
 #include "../include/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_CircularGeometry.h"
+using namespace gmgpolar;
 
 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..5334dc5cc 100644
--- a/src/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_CzarnyGeometry.cpp
+++ b/src/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_CzarnyGeometry.cpp
@@ -1,4 +1,5 @@
 #include "../include/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_CzarnyGeometry.h"
+using namespace gmgpolar;
 
 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..a8f15b5b7 100644
--- a/src/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_ShafranovGeometry.cpp
+++ b/src/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_ShafranovGeometry.cpp
@@ -1,4 +1,5 @@
 #include "../include/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_ShafranovGeometry.h"
+using namespace gmgpolar;
 
 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..7540c1dd7 100644
--- a/src/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_CircularGeometry.cpp
+++ b/src/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_CircularGeometry.cpp
@@ -1,4 +1,5 @@
 #include "../include/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_CircularGeometry.h"
+using namespace gmgpolar;
 
 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..1086bc9ce 100644
--- a/src/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_CzarnyGeometry.cpp
+++ b/src/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_CzarnyGeometry.cpp
@@ -1,4 +1,5 @@
 #include "../include/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_CzarnyGeometry.h"
+using namespace gmgpolar;
 
 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..34c53cf47 100644
--- a/src/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_ShafranovGeometry.cpp
+++ b/src/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_ShafranovGeometry.cpp
@@ -1,4 +1,5 @@
 #include "../include/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_ShafranovGeometry.h"
+using namespace gmgpolar;
 
 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..b3f4ddd67 100644
--- a/src/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_CircularGeometry.cpp
+++ b/src/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_CircularGeometry.cpp
@@ -1,4 +1,5 @@
 #include "../include/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_CircularGeometry.h"
+using namespace gmgpolar;
 
 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..cfa5cb55a 100644
--- a/src/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_CzarnyGeometry.cpp
+++ b/src/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_CzarnyGeometry.cpp
@@ -1,4 +1,5 @@
 #include "../include/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_CzarnyGeometry.h"
+using namespace gmgpolar;
 
 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..91b2c0ae7 100644
--- a/src/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_ShafranovGeometry.cpp
+++ b/src/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_ShafranovGeometry.cpp
@@ -1,4 +1,5 @@
 #include "../include/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_ShafranovGeometry.h"
+using namespace gmgpolar;
 
 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..2650de045 100644
--- a/src/InputFunctions/SourceTerms/cartesianR2_Zoni_CircularGeometry.cpp
+++ b/src/InputFunctions/SourceTerms/cartesianR2_Zoni_CircularGeometry.cpp
@@ -1,4 +1,5 @@
 #include "../include/InputFunctions/SourceTerms/cartesianR2_Zoni_CircularGeometry.h"
+using namespace gmgpolar;
 
 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..60bd3de43 100644
--- a/src/InputFunctions/SourceTerms/cartesianR2_Zoni_CzarnyGeometry.cpp
+++ b/src/InputFunctions/SourceTerms/cartesianR2_Zoni_CzarnyGeometry.cpp
@@ -1,4 +1,5 @@
 #include "../include/InputFunctions/SourceTerms/cartesianR2_Zoni_CzarnyGeometry.h"
+using namespace gmgpolar;
 
 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..d56d46ef2 100644
--- a/src/InputFunctions/SourceTerms/cartesianR2_Zoni_ShafranovGeometry.cpp
+++ b/src/InputFunctions/SourceTerms/cartesianR2_Zoni_ShafranovGeometry.cpp
@@ -1,4 +1,5 @@
 #include "../include/InputFunctions/SourceTerms/cartesianR2_Zoni_ShafranovGeometry.h"
+using namespace gmgpolar;
 
 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..e29d9f225 100644
--- a/src/InputFunctions/SourceTerms/cartesianR6_Poisson_CircularGeometry.cpp
+++ b/src/InputFunctions/SourceTerms/cartesianR6_Poisson_CircularGeometry.cpp
@@ -1,4 +1,5 @@
 #include "../include/InputFunctions/SourceTerms/cartesianR6_Poisson_CircularGeometry.h"
+using namespace gmgpolar;
 
 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..f8c36d12c 100644
--- a/src/InputFunctions/SourceTerms/cartesianR6_Poisson_CzarnyGeometry.cpp
+++ b/src/InputFunctions/SourceTerms/cartesianR6_Poisson_CzarnyGeometry.cpp
@@ -1,4 +1,5 @@
 #include "../include/InputFunctions/SourceTerms/cartesianR6_Poisson_CzarnyGeometry.h"
+using namespace gmgpolar;
 
 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..4d32d707c 100644
--- a/src/InputFunctions/SourceTerms/cartesianR6_Poisson_ShafranovGeometry.cpp
+++ b/src/InputFunctions/SourceTerms/cartesianR6_Poisson_ShafranovGeometry.cpp
@@ -1,4 +1,5 @@
 #include "../include/InputFunctions/SourceTerms/cartesianR6_Poisson_ShafranovGeometry.h"
+using namespace gmgpolar;
 
 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..79e0a7a52 100644
--- a/src/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_CircularGeometry.cpp
+++ b/src/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_CircularGeometry.cpp
@@ -1,4 +1,5 @@
 #include "../include/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_CircularGeometry.h"
+using namespace gmgpolar;
 
 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..a89cdce33 100644
--- a/src/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_CzarnyGeometry.cpp
+++ b/src/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_CzarnyGeometry.cpp
@@ -1,4 +1,5 @@
 #include "../include/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_CzarnyGeometry.h"
+using namespace gmgpolar;
 
 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..f9d686dff 100644
--- a/src/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_ShafranovGeometry.cpp
+++ b/src/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_ShafranovGeometry.cpp
@@ -1,4 +1,5 @@
 #include "../include/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_ShafranovGeometry.h"
+using namespace gmgpolar;
 
 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..4129ec5a3 100644
--- a/src/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_CircularGeometry.cpp
+++ b/src/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_CircularGeometry.cpp
@@ -1,4 +1,5 @@
 #include "../include/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_CircularGeometry.h"
+using namespace gmgpolar;
 
 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..bd2435dee 100644
--- a/src/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_CzarnyGeometry.cpp
+++ b/src/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_CzarnyGeometry.cpp
@@ -1,4 +1,5 @@
 #include "../include/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_CzarnyGeometry.h"
+using namespace gmgpolar;
 
 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..77cb3e3ed 100644
--- a/src/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_ShafranovGeometry.cpp
+++ b/src/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_ShafranovGeometry.cpp
@@ -1,4 +1,5 @@
 #include "../include/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_ShafranovGeometry.h"
+using namespace gmgpolar;
 
 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..0bc07d63e 100644
--- a/src/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_CircularGeometry.cpp
+++ b/src/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_CircularGeometry.cpp
@@ -1,4 +1,5 @@
 #include "../include/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_CircularGeometry.h"
+using namespace gmgpolar;
 
 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..ed3f506d0 100644
--- a/src/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_CzarnyGeometry.cpp
+++ b/src/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_CzarnyGeometry.cpp
@@ -1,4 +1,5 @@
 #include "../include/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_CzarnyGeometry.h"
+using namespace gmgpolar;
 
 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..92f36d215 100644
--- a/src/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_ShafranovGeometry.cpp
+++ b/src/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_ShafranovGeometry.cpp
@@ -1,4 +1,5 @@
 #include "../include/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_ShafranovGeometry.h"
+using namespace gmgpolar;
 
 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..fc87ffe21 100644
--- a/src/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_CircularGeometry.cpp
+++ b/src/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_CircularGeometry.cpp
@@ -1,4 +1,5 @@
 #include "../include/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_CircularGeometry.h"
+using namespace gmgpolar;
 
 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..44271b61e 100644
--- a/src/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_CzarnyGeometry.cpp
+++ b/src/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_CzarnyGeometry.cpp
@@ -1,4 +1,5 @@
 #include "../include/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_CzarnyGeometry.h"
+using namespace gmgpolar;
 
 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..f21f7cd4a 100644
--- a/src/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_ShafranovGeometry.cpp
+++ b/src/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_ShafranovGeometry.cpp
@@ -1,4 +1,5 @@
 #include "../include/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_ShafranovGeometry.h"
+using namespace gmgpolar;
 
 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..03a253cde 100644
--- a/src/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_CircularGeometry.cpp
+++ b/src/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_CircularGeometry.cpp
@@ -1,4 +1,5 @@
 #include "../include/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_CircularGeometry.h"
+using namespace gmgpolar;
 
 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..f3e86507e 100644
--- a/src/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_CzarnyGeometry.cpp
+++ b/src/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_CzarnyGeometry.cpp
@@ -1,4 +1,5 @@
 #include "../include/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_CzarnyGeometry.h"
+using namespace gmgpolar;
 
 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..a56fed96f 100644
--- a/src/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_ShafranovGeometry.cpp
+++ b/src/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_ShafranovGeometry.cpp
@@ -1,4 +1,5 @@
 #include "../include/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_ShafranovGeometry.h"
+using namespace gmgpolar;
 
 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..9e36dbcf1 100644
--- a/src/InputFunctions/SourceTerms/cartesianR6_Zoni_CircularGeometry.cpp
+++ b/src/InputFunctions/SourceTerms/cartesianR6_Zoni_CircularGeometry.cpp
@@ -1,4 +1,5 @@
 #include "../include/InputFunctions/SourceTerms/cartesianR6_Zoni_CircularGeometry.h"
+using namespace gmgpolar;
 
 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..eab1cb06c 100644
--- a/src/InputFunctions/SourceTerms/cartesianR6_Zoni_CzarnyGeometry.cpp
+++ b/src/InputFunctions/SourceTerms/cartesianR6_Zoni_CzarnyGeometry.cpp
@@ -1,4 +1,5 @@
 #include "../include/InputFunctions/SourceTerms/cartesianR6_Zoni_CzarnyGeometry.h"
+using namespace gmgpolar;
 
 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..94bba0857 100644
--- a/src/InputFunctions/SourceTerms/cartesianR6_Zoni_ShafranovGeometry.cpp
+++ b/src/InputFunctions/SourceTerms/cartesianR6_Zoni_ShafranovGeometry.cpp
@@ -1,4 +1,5 @@
 #include "../include/InputFunctions/SourceTerms/cartesianR6_Zoni_ShafranovGeometry.h"
+using namespace gmgpolar;
 
 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..1ac8ad6d9 100644
--- a/src/InputFunctions/SourceTerms/polarR6_Poisson_CircularGeometry.cpp
+++ b/src/InputFunctions/SourceTerms/polarR6_Poisson_CircularGeometry.cpp
@@ -1,4 +1,5 @@
 #include "../include/InputFunctions/SourceTerms/polarR6_Poisson_CircularGeometry.h"
+using namespace gmgpolar;
 
 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..5d55eefd8 100644
--- a/src/InputFunctions/SourceTerms/polarR6_Poisson_CzarnyGeometry.cpp
+++ b/src/InputFunctions/SourceTerms/polarR6_Poisson_CzarnyGeometry.cpp
@@ -1,4 +1,5 @@
 #include "../include/InputFunctions/SourceTerms/polarR6_Poisson_CzarnyGeometry.h"
+using namespace gmgpolar;
 
 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..d56c95dac 100644
--- a/src/InputFunctions/SourceTerms/polarR6_Poisson_ShafranovGeometry.cpp
+++ b/src/InputFunctions/SourceTerms/polarR6_Poisson_ShafranovGeometry.cpp
@@ -1,4 +1,5 @@
 #include "../include/InputFunctions/SourceTerms/polarR6_Poisson_ShafranovGeometry.h"
+using namespace gmgpolar;
 
 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..b462dab5d 100644
--- a/src/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_CircularGeometry.cpp
+++ b/src/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_CircularGeometry.cpp
@@ -1,4 +1,5 @@
 #include "../include/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_CircularGeometry.h"
+using namespace gmgpolar;
 
 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..652702875 100644
--- a/src/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_CzarnyGeometry.cpp
+++ b/src/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_CzarnyGeometry.cpp
@@ -1,4 +1,5 @@
 #include "../include/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_CzarnyGeometry.h"
+using namespace gmgpolar;
 
 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..0b6ef3c5b 100644
--- a/src/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_ShafranovGeometry.cpp
+++ b/src/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_ShafranovGeometry.cpp
@@ -1,4 +1,5 @@
 #include "../include/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_ShafranovGeometry.h"
+using namespace gmgpolar;
 
 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..52cad9db4 100644
--- a/src/InputFunctions/SourceTerms/polarR6_Sonnendrucker_CircularGeometry.cpp
+++ b/src/InputFunctions/SourceTerms/polarR6_Sonnendrucker_CircularGeometry.cpp
@@ -1,4 +1,5 @@
 #include "../include/InputFunctions/SourceTerms/polarR6_Sonnendrucker_CircularGeometry.h"
+using namespace gmgpolar;
 
 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..d6efa6e0b 100644
--- a/src/InputFunctions/SourceTerms/polarR6_Sonnendrucker_CzarnyGeometry.cpp
+++ b/src/InputFunctions/SourceTerms/polarR6_Sonnendrucker_CzarnyGeometry.cpp
@@ -1,4 +1,5 @@
 #include "../include/InputFunctions/SourceTerms/polarR6_Sonnendrucker_CzarnyGeometry.h"
+using namespace gmgpolar;
 
 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..4627698ac 100644
--- a/src/InputFunctions/SourceTerms/polarR6_Sonnendrucker_ShafranovGeometry.cpp
+++ b/src/InputFunctions/SourceTerms/polarR6_Sonnendrucker_ShafranovGeometry.cpp
@@ -1,4 +1,5 @@
 #include "../include/InputFunctions/SourceTerms/polarR6_Sonnendrucker_ShafranovGeometry.h"
+using namespace gmgpolar;
 
 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..ab69dac17 100644
--- a/src/InputFunctions/SourceTerms/polarR6_ZoniGyro_CircularGeometry.cpp
+++ b/src/InputFunctions/SourceTerms/polarR6_ZoniGyro_CircularGeometry.cpp
@@ -1,4 +1,5 @@
 #include "../include/InputFunctions/SourceTerms/polarR6_ZoniGyro_CircularGeometry.h"
+using namespace gmgpolar;
 
 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..63cad5c2d 100644
--- a/src/InputFunctions/SourceTerms/polarR6_ZoniGyro_CzarnyGeometry.cpp
+++ b/src/InputFunctions/SourceTerms/polarR6_ZoniGyro_CzarnyGeometry.cpp
@@ -1,4 +1,5 @@
 #include "../include/InputFunctions/SourceTerms/polarR6_ZoniGyro_CzarnyGeometry.h"
+using namespace gmgpolar;
 
 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..564939931 100644
--- a/src/InputFunctions/SourceTerms/polarR6_ZoniGyro_ShafranovGeometry.cpp
+++ b/src/InputFunctions/SourceTerms/polarR6_ZoniGyro_ShafranovGeometry.cpp
@@ -1,4 +1,5 @@
 #include "../include/InputFunctions/SourceTerms/polarR6_ZoniGyro_ShafranovGeometry.h"
+using namespace gmgpolar;
 
 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..05fac1fdd 100644
--- a/src/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CircularGeometry.cpp
+++ b/src/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CircularGeometry.cpp
@@ -1,4 +1,5 @@
 #include "../include/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CircularGeometry.h"
+using namespace gmgpolar;
 
 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..7b8a44cba 100644
--- a/src/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CulhamGeometry.cpp
+++ b/src/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CulhamGeometry.cpp
@@ -1,4 +1,5 @@
 #include "../include/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CulhamGeometry.h"
+using namespace gmgpolar;
 
 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..844c5059d 100644
--- a/src/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CzarnyGeometry.cpp
+++ b/src/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CzarnyGeometry.cpp
@@ -1,4 +1,5 @@
 #include "../include/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CzarnyGeometry.h"
+using namespace gmgpolar;
 
 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..08397022d 100644
--- a/src/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_ShafranovGeometry.cpp
+++ b/src/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_ShafranovGeometry.cpp
@@ -1,4 +1,5 @@
 #include "../include/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_ShafranovGeometry.h"
+using namespace gmgpolar;
 
 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..ba453760c 100644
--- a/src/InputFunctions/SourceTerms/polarR6_ZoniShifted_CircularGeometry.cpp
+++ b/src/InputFunctions/SourceTerms/polarR6_ZoniShifted_CircularGeometry.cpp
@@ -1,4 +1,5 @@
 #include "../include/InputFunctions/SourceTerms/polarR6_ZoniShifted_CircularGeometry.h"
+using namespace gmgpolar;
 
 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..19dca45fd 100644
--- a/src/InputFunctions/SourceTerms/polarR6_ZoniShifted_CzarnyGeometry.cpp
+++ b/src/InputFunctions/SourceTerms/polarR6_ZoniShifted_CzarnyGeometry.cpp
@@ -1,4 +1,5 @@
 #include "../include/InputFunctions/SourceTerms/polarR6_ZoniShifted_CzarnyGeometry.h"
+using namespace gmgpolar;
 
 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..ec59b375e 100644
--- a/src/InputFunctions/SourceTerms/polarR6_ZoniShifted_ShafranovGeometry.cpp
+++ b/src/InputFunctions/SourceTerms/polarR6_ZoniShifted_ShafranovGeometry.cpp
@@ -1,4 +1,5 @@
 #include "../include/InputFunctions/SourceTerms/polarR6_ZoniShifted_ShafranovGeometry.h"
+using namespace gmgpolar;
 
 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..3068508a8 100644
--- a/src/InputFunctions/SourceTerms/polarR6_Zoni_CircularGeometry.cpp
+++ b/src/InputFunctions/SourceTerms/polarR6_Zoni_CircularGeometry.cpp
@@ -1,4 +1,5 @@
 #include "../include/InputFunctions/SourceTerms/polarR6_Zoni_CircularGeometry.h"
+using namespace gmgpolar;
 
 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..1aa771fca 100644
--- a/src/InputFunctions/SourceTerms/polarR6_Zoni_CzarnyGeometry.cpp
+++ b/src/InputFunctions/SourceTerms/polarR6_Zoni_CzarnyGeometry.cpp
@@ -1,4 +1,5 @@
 #include "../include/InputFunctions/SourceTerms/polarR6_Zoni_CzarnyGeometry.h"
+using namespace gmgpolar;
 
 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..7c8377c21 100644
--- a/src/InputFunctions/SourceTerms/polarR6_Zoni_ShafranovGeometry.cpp
+++ b/src/InputFunctions/SourceTerms/polarR6_Zoni_ShafranovGeometry.cpp
@@ -1,4 +1,5 @@
 #include "../include/InputFunctions/SourceTerms/polarR6_Zoni_ShafranovGeometry.h"
+using namespace gmgpolar;
 
 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..f29f6dbff 100644
--- a/src/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CircularGeometry.cpp
+++ b/src/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CircularGeometry.cpp
@@ -1,4 +1,5 @@
 #include "../include/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CircularGeometry.h"
+using namespace gmgpolar;
 
 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..4b1673882 100644
--- a/src/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CulhamGeometry.cpp
+++ b/src/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CulhamGeometry.cpp
@@ -1,4 +1,5 @@
 #include "../include/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CulhamGeometry.h"
+using namespace gmgpolar;
 
 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..8d8865c51 100644
--- a/src/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CzarnyGeometry.cpp
+++ b/src/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CzarnyGeometry.cpp
@@ -1,4 +1,5 @@
 #include "../include/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CzarnyGeometry.h"
+using namespace gmgpolar;
 
 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..91f5bf3c4 100644
--- a/src/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_ShafranovGeometry.cpp
+++ b/src/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_ShafranovGeometry.cpp
@@ -1,4 +1,5 @@
 #include "../include/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_ShafranovGeometry.h"
+using namespace gmgpolar;
 
 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..0e7924d11 100644
--- a/src/Interpolation/extrapolated_prolongation.cpp
+++ b/src/Interpolation/extrapolated_prolongation.cpp
@@ -1,4 +1,5 @@
 #include "../../include/Interpolation/interpolation.h"
+using namespace gmgpolar;
 
 /*
  * Extrapolated Prolongation Operator
diff --git a/src/Interpolation/extrapolated_restriction.cpp b/src/Interpolation/extrapolated_restriction.cpp
index a248f9404..3fd0fd04c 100644
--- a/src/Interpolation/extrapolated_restriction.cpp
+++ b/src/Interpolation/extrapolated_restriction.cpp
@@ -1,4 +1,5 @@
 #include "../../include/Interpolation/interpolation.h"
+using namespace gmgpolar;
 
 /*
  * Extrapolated Restriction Operator
diff --git a/src/Interpolation/fmg_interpolation.cpp b/src/Interpolation/fmg_interpolation.cpp
index 738ccb7fe..ea0a0945d 100644
--- a/src/Interpolation/fmg_interpolation.cpp
+++ b/src/Interpolation/fmg_interpolation.cpp
@@ -1,4 +1,5 @@
 #include "../../include/Interpolation/interpolation.h"
+using namespace gmgpolar;
 
 /*
  * Bicubic FMG Interpolator using the Lagrange Interpolating Polynomial
diff --git a/src/Interpolation/injection.cpp b/src/Interpolation/injection.cpp
index 05753e6c4..9920c70d9 100644
--- a/src/Interpolation/injection.cpp
+++ b/src/Interpolation/injection.cpp
@@ -1,4 +1,5 @@
 #include "../../include/Interpolation/interpolation.h"
+using namespace gmgpolar;
 
 /* Remark: This injection is not scaled. */
 
diff --git a/src/Interpolation/interpolation.cpp b/src/Interpolation/interpolation.cpp
index 33629691e..5537742c4 100644
--- a/src/Interpolation/interpolation.cpp
+++ b/src/Interpolation/interpolation.cpp
@@ -1,4 +1,5 @@
 #include "../../include/Interpolation/interpolation.h"
+using namespace gmgpolar;
 
 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..0354c74e8 100644
--- a/src/Interpolation/prolongation.cpp
+++ b/src/Interpolation/prolongation.cpp
@@ -1,4 +1,5 @@
 #include "../../include/Interpolation/interpolation.h"
+using namespace gmgpolar;
 
 /*
  * Prolongation Operator
diff --git a/src/Interpolation/restriction.cpp b/src/Interpolation/restriction.cpp
index 669e79142..b0eca728f 100644
--- a/src/Interpolation/restriction.cpp
+++ b/src/Interpolation/restriction.cpp
@@ -1,4 +1,5 @@
 #include "../../include/Interpolation/interpolation.h"
+using namespace gmgpolar;
 
 /*
  * Restriction Operator
diff --git a/src/LinearAlgebra/Solvers/coo_mumps_solver.cpp b/src/LinearAlgebra/Solvers/coo_mumps_solver.cpp
index 7080453c0..96abc80bd 100644
--- a/src/LinearAlgebra/Solvers/coo_mumps_solver.cpp
+++ b/src/LinearAlgebra/Solvers/coo_mumps_solver.cpp
@@ -5,6 +5,7 @@
     #include <iostream>
     #include <cassert>
     #include <stdexcept>
+using namespace gmgpolar;
 
 CooMumpsSolver::CooMumpsSolver(SparseMatrixCOO<double> matrix)
 {
diff --git a/src/PolarGrid/anisotropic_division.cpp b/src/PolarGrid/anisotropic_division.cpp
index c04350ab2..63ac88c3b 100644
--- a/src/PolarGrid/anisotropic_division.cpp
+++ b/src/PolarGrid/anisotropic_division.cpp
@@ -1,4 +1,5 @@
 #include "../../include/PolarGrid/polargrid.h"
+using namespace gmgpolar;
 
 Vector<double> 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..5e6eb36d4 100644
--- a/src/PolarGrid/polargrid.cpp
+++ b/src/PolarGrid/polargrid.cpp
@@ -1,5 +1,6 @@
 #include "../../include/PolarGrid/polargrid.h"
 #include <Kokkos_StdAlgorithms.hpp>
+using namespace gmgpolar;
 // ------------ //
 // Constructors //
 // ------------ //
@@ -237,6 +238,8 @@ void PolarGrid::initializeLineSplitting(std::optional<double> splitting_radius)
 // Generates a coarser PolarGrid from a finer PolarGrid //
 // ---------------------------------------------------- //
 
+namespace gmgpolar {
+
 PolarGrid coarseningGrid(const PolarGrid& fineGrid)
 {
     assert((fineGrid.nr() - 1) % 2 == 0 && (fineGrid.ntheta()) % 2 == 0);
@@ -263,6 +266,8 @@ PolarGrid coarseningGrid(const PolarGrid& fineGrid)
     }
 }
 
+}
+
 // ------------------------ //
 // Check parameter validity //
 // ------------------------ //
diff --git a/src/Stencil/stencil.cpp b/src/Stencil/stencil.cpp
index 7ca20e2bd..d178bf383 100644
--- a/src/Stencil/stencil.cpp
+++ b/src/Stencil/stencil.cpp
@@ -1,4 +1,5 @@
 #include "../../include/Stencil/stencil.h"
+using namespace gmgpolar;
 
 Stencil::Stencil(std::initializer_list<int> init)
     : values_{}
diff --git a/src/convergence_order.cpp b/src/convergence_order.cpp
index 60cf98a6f..b1d18fa9b 100644
--- a/src/convergence_order.cpp
+++ b/src/convergence_order.cpp
@@ -7,6 +7,7 @@
 
 #include "../include/GMGPolar/gmgpolar.h"
 #include "../include/GMGPolar/test_cases.h"
+using namespace gmgpolar;
 
 int main(int argc, char* argv[])
 {
diff --git a/src/main.cpp b/src/main.cpp
index f54254311..54fc7907a 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -2,6 +2,7 @@
 
 #include "../include/ConfigParser/config_parser.h"
 #include "../include/GMGPolar/gmgpolar.h"
+using namespace gmgpolar;
 
 int main(int argc, char* argv[])
 {
diff --git a/src/strong_scaling.cpp b/src/strong_scaling.cpp
index 102d6bc00..881dd5e0f 100644
--- a/src/strong_scaling.cpp
+++ b/src/strong_scaling.cpp
@@ -8,6 +8,7 @@
 
 #include "../include/GMGPolar/gmgpolar.h"
 #include "../include/GMGPolar/test_cases.h"
+using namespace gmgpolar;
 
 void runTest(int maxOpenMPThreads, int divideBy2, std::ofstream& outfile)
 {
diff --git a/src/weak_scaling.cpp b/src/weak_scaling.cpp
index a4d911ef8..3228c1a55 100644
--- a/src/weak_scaling.cpp
+++ b/src/weak_scaling.cpp
@@ -7,6 +7,7 @@
 
 #include "../include/GMGPolar/gmgpolar.h"
 #include "../include/GMGPolar/test_cases.h"
+using namespace gmgpolar;
 
 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..70cd4ed63 100644
--- a/tests/ConfigParser/config_parser.cpp
+++ b/tests/ConfigParser/config_parser.cpp
@@ -1,5 +1,6 @@
 #include <gtest/gtest.h>
 #include "../../include/ConfigParser/config_parser.h"
+using namespace gmgpolar;
 
 struct TestParams {
     int geometry;
diff --git a/tests/DirectSolver/directSolver.cpp b/tests/DirectSolver/directSolver.cpp
index c54a1dcf8..5bd525f1c 100644
--- a/tests/DirectSolver/directSolver.cpp
+++ b/tests/DirectSolver/directSolver.cpp
@@ -36,6 +36,7 @@
 /* ------ */
 #include "../include/InputFunctions/DomainGeometry/culhamGeometry.h"
 #include "../include/InputFunctions/DensityProfileCoefficients/zoniShiftedGyroCoefficients.h"
+using namespace gmgpolar;
 
 #ifdef GMGPOLAR_USE_MUMPS
 
diff --git a/tests/DirectSolver/directSolverNoMumps.cpp b/tests/DirectSolver/directSolverNoMumps.cpp
index 413d09643..622a2785c 100644
--- a/tests/DirectSolver/directSolverNoMumps.cpp
+++ b/tests/DirectSolver/directSolverNoMumps.cpp
@@ -36,6 +36,7 @@
 /* ------ */
 #include "../include/InputFunctions/DomainGeometry/culhamGeometry.h"
 #include "../include/InputFunctions/DensityProfileCoefficients/zoniShiftedGyroCoefficients.h"
+using namespace gmgpolar;
 
 /* 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..b6293230d 100644
--- a/tests/ExtrapolatedSmoother/extrapolated_smoother.cpp
+++ b/tests/ExtrapolatedSmoother/extrapolated_smoother.cpp
@@ -23,6 +23,7 @@
 #include "../include/InputFunctions/DensityProfileCoefficients/zoniShiftedCoefficients.h"
 
 #include <random>
+using namespace gmgpolar;
 
 /* Test 1/2: */
 /* Does the Take and Give Implementation match up? */
diff --git a/tests/GMGPolar/convergence_order.cpp b/tests/GMGPolar/convergence_order.cpp
index d3f5b7b18..aed50c1c8 100644
--- a/tests/GMGPolar/convergence_order.cpp
+++ b/tests/GMGPolar/convergence_order.cpp
@@ -10,6 +10,7 @@
 #include "../../include/InputFunctions/boundaryConditions.h"
 #include "../../include/InputFunctions/densityProfileCoefficients.h"
 #include "../../include/InputFunctions/sourceTerm.h"
+using namespace gmgpolar;
 
 template <class T>
 class GMGPolarPaperTestCase;
diff --git a/tests/GMGPolar/pcg_tests.cpp b/tests/GMGPolar/pcg_tests.cpp
index a68045bd9..d03cdbe4a 100644
--- a/tests/GMGPolar/pcg_tests.cpp
+++ b/tests/GMGPolar/pcg_tests.cpp
@@ -7,6 +7,7 @@
 // Including the necessary header from the project
 #include "../../include/GMGPolar/gmgpolar.h"
 #include "../../include/ConfigParser/test_selection.h"
+using namespace gmgpolar;
 
 template <class T>
 class PCGTestCase;
diff --git a/tests/GMGPolar/solve_tests.cpp b/tests/GMGPolar/solve_tests.cpp
index aa6c53e34..bc2472977 100644
--- a/tests/GMGPolar/solve_tests.cpp
+++ b/tests/GMGPolar/solve_tests.cpp
@@ -7,6 +7,7 @@
 // Including the necessary header from the project
 #include "../../include/ConfigParser/test_selection.h"
 #include "../../include/GMGPolar/gmgpolar.h"
+using namespace gmgpolar;
 
 template <class T>
 class GMGPolarTestCase;
diff --git a/tests/Interpolation/extrapolated_prolongation.cpp b/tests/Interpolation/extrapolated_prolongation.cpp
index 4650f7fb3..f2af72017 100644
--- a/tests/Interpolation/extrapolated_prolongation.cpp
+++ b/tests/Interpolation/extrapolated_prolongation.cpp
@@ -6,6 +6,7 @@
 #include "../../include/GMGPolar/gmgpolar.h"
 #include "../../include/Interpolation/interpolation.h"
 #include "../../include/InputFunctions/DensityProfileCoefficients/poissonCoefficients.h"
+using namespace gmgpolar;
 
 // 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..b3d7f06a3 100644
--- a/tests/Interpolation/extrapolated_restriction.cpp
+++ b/tests/Interpolation/extrapolated_restriction.cpp
@@ -6,6 +6,7 @@
 #include "../../include/GMGPolar/gmgpolar.h"
 #include "../../include/Interpolation/interpolation.h"
 #include "../../include/InputFunctions/DensityProfileCoefficients/poissonCoefficients.h"
+using namespace gmgpolar;
 
 // 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..ff0cd2124 100644
--- a/tests/Interpolation/prolongation.cpp
+++ b/tests/Interpolation/prolongation.cpp
@@ -5,6 +5,7 @@
 
 #include "../../include/Interpolation/interpolation.h"
 #include "../../include/InputFunctions/DensityProfileCoefficients/poissonCoefficients.h"
+using namespace gmgpolar;
 
 // Helper that computes the mathematically expected prolongation value
 static double expected_value(const PolarGrid& coarse, const PolarGrid& fine, ConstVector<double> coarse_vals, int i_r,
diff --git a/tests/Interpolation/restriction.cpp b/tests/Interpolation/restriction.cpp
index 49270f3c7..a94faa076 100644
--- a/tests/Interpolation/restriction.cpp
+++ b/tests/Interpolation/restriction.cpp
@@ -5,6 +5,7 @@
 
 #include "../../include/Interpolation/interpolation.h"
 #include "../../include/InputFunctions/DensityProfileCoefficients/poissonCoefficients.h"
+using namespace gmgpolar;
 
 // Helper that computes the mathematically expected restriction value
 static double expected_restriction_value(const PolarGrid& fine, const PolarGrid& coarse, ConstVector<double> fine_vals,
diff --git a/tests/LinearAlgebra/Matrix/coo_matrix.cpp b/tests/LinearAlgebra/Matrix/coo_matrix.cpp
index 3a2397bfc..3a7448fb3 100644
--- a/tests/LinearAlgebra/Matrix/coo_matrix.cpp
+++ b/tests/LinearAlgebra/Matrix/coo_matrix.cpp
@@ -1,6 +1,7 @@
 #include <gtest/gtest.h>
 
 #include "../../../include/LinearAlgebra/Matrix/coo_matrix.h"
+using namespace gmgpolar;
 
 // Alias for readability
 using triplet = std::tuple<int, int, double>;
diff --git a/tests/LinearAlgebra/Matrix/csr_matrix.cpp b/tests/LinearAlgebra/Matrix/csr_matrix.cpp
index c7a7694ac..ab7d89b23 100644
--- a/tests/LinearAlgebra/Matrix/csr_matrix.cpp
+++ b/tests/LinearAlgebra/Matrix/csr_matrix.cpp
@@ -3,6 +3,7 @@
 #include "../../../include/LinearAlgebra/Matrix/csr_matrix.h"
 #include "../../../include/LinearAlgebra/Solvers/csr_lu_solver.h"
 #include "../../../include/LinearAlgebra/Vector/vector.h"
+using namespace gmgpolar;
 
 TEST(SparseMatrixCSR, default_construct)
 {
diff --git a/tests/LinearAlgebra/Solvers/coo_mumps_solver.cpp b/tests/LinearAlgebra/Solvers/coo_mumps_solver.cpp
index 46724c6b8..8230fb011 100644
--- a/tests/LinearAlgebra/Solvers/coo_mumps_solver.cpp
+++ b/tests/LinearAlgebra/Solvers/coo_mumps_solver.cpp
@@ -5,6 +5,7 @@
     #include "../../../include/LinearAlgebra/Vector/vector.h"
     #include "../../../include/LinearAlgebra/Matrix/coo_matrix.h"
     #include "../../../include/LinearAlgebra/Solvers/coo_mumps_solver.h"
+using namespace gmgpolar;
 
 // -----------------------------------------------------------------------
 // Test 1: General (non-symmetric) 4x4 system
diff --git a/tests/LinearAlgebra/Solvers/csr_lu_solver.cpp b/tests/LinearAlgebra/Solvers/csr_lu_solver.cpp
index fca7ecee6..fd2751534 100644
--- a/tests/LinearAlgebra/Solvers/csr_lu_solver.cpp
+++ b/tests/LinearAlgebra/Solvers/csr_lu_solver.cpp
@@ -5,6 +5,7 @@
 #include "../../../include/LinearAlgebra/Vector/vector.h"
 #include "../../../include/LinearAlgebra/Vector/vector_operations.h"
 #include "../../../include/LinearAlgebra/Solvers/csr_lu_solver.h"
+using namespace gmgpolar;
 
 // All tests that the custom LU solver was unable to solve have been commented out.
 // This typically happens when the matrix is singular, has zero diagonal entries,
diff --git a/tests/LinearAlgebra/Solvers/tridiagonal_solver.cpp b/tests/LinearAlgebra/Solvers/tridiagonal_solver.cpp
index 8921cc14e..dc0c9d928 100644
--- a/tests/LinearAlgebra/Solvers/tridiagonal_solver.cpp
+++ b/tests/LinearAlgebra/Solvers/tridiagonal_solver.cpp
@@ -5,6 +5,7 @@
 
 #include "../../../include/LinearAlgebra/Solvers/tridiagonal_solver.h"
 #include "../../../include/LinearAlgebra/Vector/vector.h"
+using namespace gmgpolar;
 
 // clang-format off
 TEST(BatchedTridiagonalSolvers, non_cyclic_tridiagonal_n_4)
diff --git a/tests/LinearAlgebra/Vector/vector_operations.cpp b/tests/LinearAlgebra/Vector/vector_operations.cpp
index bf63ddb25..523796ea3 100644
--- a/tests/LinearAlgebra/Vector/vector_operations.cpp
+++ b/tests/LinearAlgebra/Vector/vector_operations.cpp
@@ -2,6 +2,7 @@
 
 #include "../../../include/LinearAlgebra/Vector/vector.h"
 #include "../../../include/LinearAlgebra/Vector/vector_operations.h"
+using namespace gmgpolar;
 
 /* bool equals(ConstVector<T>& lhs, ConstVector<T>& rhs); */
 
diff --git a/tests/PolarGrid/polargrid.cpp b/tests/PolarGrid/polargrid.cpp
index 31a87f2a5..37819c0f5 100644
--- a/tests/PolarGrid/polargrid.cpp
+++ b/tests/PolarGrid/polargrid.cpp
@@ -1,5 +1,6 @@
 #include <gtest/gtest.h>
 #include "../../include/PolarGrid/polargrid.h"
+using namespace gmgpolar;
 
 TEST(PolarGridTest, DefaultConstructor)
 {
diff --git a/tests/Residual/residual.cpp b/tests/Residual/residual.cpp
index b8ba5fe61..c88529fb4 100644
--- a/tests/Residual/residual.cpp
+++ b/tests/Residual/residual.cpp
@@ -18,6 +18,7 @@
 /* --------- */
 #include "../include/InputFunctions/DomainGeometry/czarnyGeometry.h"
 #include "../include/InputFunctions/DensityProfileCoefficients/zoniShiftedCoefficients.h"
+using namespace gmgpolar;
 
 /* 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..adb38f747 100644
--- a/tests/Smoother/smoother.cpp
+++ b/tests/Smoother/smoother.cpp
@@ -22,6 +22,7 @@
 #include "../include/InputFunctions/DensityProfileCoefficients/zoniShiftedCoefficients.h"
 
 #include <random>
+using namespace gmgpolar;
 
 /* Test 1/2: */
 /* Does the Take and Give Implementation match up? */
diff --git a/tests/test_tools.h b/tests/test_tools.h
index c990c8a13..5f0f87c88 100644
--- a/tests/test_tools.h
+++ b/tests/test_tools.h
@@ -4,6 +4,8 @@
 #include "../include/PolarGrid/polargrid.h"
 #include "../include/LinearAlgebra/Vector/vector.h"
 
+using namespace gmgpolar;
+
 inline Vector<double> generate_random_sample_data(const PolarGrid& grid, unsigned int seed, double min_val = -100.0,
                                                   double max_val = 100.0)
 {

From e015040639fca93db786152e3d820a4fc16c25bb Mon Sep 17 00:00:00 2001
From: Emily Bourne <emily.bourne@epfl.ch>
Date: Tue, 21 Apr 2026 09:26:00 +0200
Subject: [PATCH 2/2] Clang format

---
 src/PolarGrid/polargrid.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/PolarGrid/polargrid.cpp b/src/PolarGrid/polargrid.cpp
index 5e6eb36d4..2b68299b3 100644
--- a/src/PolarGrid/polargrid.cpp
+++ b/src/PolarGrid/polargrid.cpp
@@ -238,7 +238,8 @@ void PolarGrid::initializeLineSplitting(std::optional<double> splitting_radius)
 // Generates a coarser PolarGrid from a finer PolarGrid //
 // ---------------------------------------------------- //
 
-namespace gmgpolar {
+namespace gmgpolar
+{
 
 PolarGrid coarseningGrid(const PolarGrid& fineGrid)
 {
@@ -266,7 +267,7 @@ PolarGrid coarseningGrid(const PolarGrid& fineGrid)
     }
 }
 
-}
+} // namespace gmgpolar
 
 // ------------------------ //
 // Check parameter validity //