diff --git a/.github/actions/test/action.yml b/.github/actions/test/action.yml index 556b0020..30f6d694 100644 --- a/.github/actions/test/action.yml +++ b/.github/actions/test/action.yml @@ -17,10 +17,9 @@ runs: run: | apt-get -qq update apt-get -qq -y install lcov - - name: Install MUMPS Dependencies - shell: bash - run: | - apt-get -qq -y install gfortran + - name: Install additional dependencies to use MUMPS + if: inputs.use-mumps == 'true' + uses: ./.github/actions/install-dependencies - name: Download build test directory uses: actions/download-artifact@v4 with: diff --git a/CMakeLists.txt b/CMakeLists.txt index 84296ddc..470162af 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,16 +1,18 @@ cmake_minimum_required(VERSION 3.12) +# Ensure custom cmake modules can be found +list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake") + # Options should be defined before they're used option(GMGPOLAR_BUILD_TESTS "Build GMGPolar unit tests." ON) option(GMGPOLAR_USE_LIKWID "Use LIKWID to measure code (regions)." OFF) option(GMGPOLAR_USE_MUMPS "Use MUMPS to solve linear systems." OFF) option(GMGPOLAR_ENABLE_COVERAGE "Enable code coverage reporting (requires GCC/Clang)" OFF) +project(GMGPolar VERSION 2.1.0 LANGUAGES CXX) +# MUMPS does not automatically provide Fortran libraries if (${GMGPOLAR_USE_MUMPS}) - # MUMPS does not automatically provide Fortran libraries - project(GMGPolar VERSION 2.0.0 LANGUAGES CXX Fortran) -else() - project(GMGPolar VERSION 2.0.0 LANGUAGES CXX) + enable_language(Fortran) endif() set(CMAKE_CXX_STANDARD 20) @@ -23,6 +25,12 @@ if(NOT CMAKE_BUILD_TYPE) set(CMAKE_BUILD_TYPE Release) endif() +if (CMAKE_COMPILER_IS_GNUCXX AND CMAKE_BUILD_TYPE STREQUAL "Release") + # If using GNU increase maximum number of instructions considered for inlining + # in Release mode in this folder and sub-folders + add_compile_options(--param max-inline-insns-single=1500) +endif() + # Set coverage compiler flags - must come before any targets are defined if(GMGPOLAR_ENABLE_COVERAGE) if(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang") @@ -40,8 +48,52 @@ if(GMGPOLAR_ENABLE_COVERAGE) endif() endif() -find_package(Kokkos 4.4.1...<5.1 QUIET REQUIRED) -include_directories(include) +find_package(OpenMP REQUIRED COMPONENTS CXX) +find_package(Kokkos 4.4.1...<6 QUIET REQUIRED) + +if(GMGPOLAR_USE_MUMPS) + find_package(MUMPS REQUIRED COMPONENTS OpenMP METIS) +endif() + +if(GMGPOLAR_USE_LIKWID) + find_package(LIKWID REQUIRED) +endif() + +set(GMGPOLAR_INCLUDE_DIRS + $ + $ +) + +install(DIRECTORY ${PROJECT_SOURCE_DIR}/include/ DESTINATION include) + +include(CMakePackageConfigHelpers) + +configure_package_config_file( + cmake/GMGPolarConfig.cmake.in + ${CMAKE_CURRENT_BINARY_DIR}/GMGPolarConfig.cmake + INSTALL_DESTINATION lib/cmake/GMGPolar +) + +write_basic_package_version_file( + ${CMAKE_CURRENT_BINARY_DIR}/GMGPolarConfigVersion.cmake + VERSION ${PROJECT_VERSION} + COMPATIBILITY SameMajorVersion +) + +install(FILES + ${CMAKE_CURRENT_BINARY_DIR}/GMGPolarConfig.cmake + ${CMAKE_CURRENT_BINARY_DIR}/GMGPolarConfigVersion.cmake + cmake/FindMUMPS.cmake + cmake/FindLIKWID.cmake + cmake/FindMetis.cmake + DESTINATION lib/cmake/GMGPolar +) + +install(EXPORT GMGPolarTargets + NAMESPACE GMGPolar:: + DESTINATION lib/cmake/GMGPolar +) + add_subdirectory(src) add_executable(gmgpolar src/main.cpp) @@ -49,14 +101,17 @@ add_executable(convergence_order src/convergence_order.cpp) add_executable(weak_scaling src/weak_scaling.cpp) add_executable(strong_scaling src/strong_scaling.cpp) -target_link_libraries(gmgpolar PRIVATE GMGPolarLib) -target_link_libraries(convergence_order PRIVATE GMGPolarLib) -target_link_libraries(weak_scaling PRIVATE GMGPolarLib) -target_link_libraries(strong_scaling PRIVATE GMGPolarLib) +target_link_libraries(gmgpolar PRIVATE GMGPolarLib GMGPolarInterface) +target_link_libraries(convergence_order PRIVATE GMGPolarLib GMGPolarInterface) +target_link_libraries(weak_scaling PRIVATE GMGPolarLib GMGPolarInterface) +target_link_libraries(strong_scaling PRIVATE GMGPolarLib GMGPolarInterface) if(GMGPOLAR_BUILD_TESTS) enable_testing() - add_subdirectory(third-party) + find_package(GTest 1.17 QUIET) + if (NOT GTest_FOUND) + add_subdirectory(third-party) + endif() add_subdirectory(tests) # Add coverage target - moved after test configuration diff --git a/cmake/FindLIKWID.cmake b/cmake/FindLIKWID.cmake new file mode 100644 index 00000000..c3073901 --- /dev/null +++ b/cmake/FindLIKWID.cmake @@ -0,0 +1,33 @@ + +if(DEFINED ENV{LIKWID_DIR} AND NOT LIKWID_DIR) + set(LIKWID_DIR "$ENV{LIKWID_DIR}" CACHE PATH "LIKWID installation directory") +endif() + +find_package(PkgConfig QUIET) +if(PKG_CONFIG_FOUND) + pkg_check_modules(LIKWID_PC QUIET likwid) +endif() + +find_path(LIKWID_INCLUDE_DIR + NAMES likwid.h + HINTS ${LIKWID_DIR}/include ${LIKWID_PC_INCLUDE_DIRS} +) + +find_library(LIKWID_LIBRARY + NAMES likwid + HINTS ${LIKWID_DIR}/lib ${LIKWID_DIR}/lib64 ${LIKWID_PC_LIBRARY_DIRS} +) + +include(FindPackageHandleStandardArgs) +find_package_handle_standard_args(LIKWID + REQUIRED_VARS LIKWID_INCLUDE_DIR LIKWID_LIBRARY +) + +if(LIKWID_FOUND AND NOT TARGET LIKWID::LIKWID) + add_library(LIKWID::LIKWID INTERFACE IMPORTED) + set_target_properties(LIKWID::LIKWID PROPERTIES + INTERFACE_INCLUDE_DIRECTORIES "${LIKWID_INCLUDE_DIR}" + INTERFACE_LINK_LIBRARIES "${LIKWID_LIBRARY}" + INTERFACE_COMPILE_DEFINITIONS "LIKWID_PERFMON" + ) +endif() diff --git a/cmake/FindMUMPS.cmake b/cmake/FindMUMPS.cmake new file mode 100644 index 00000000..4464e5c9 --- /dev/null +++ b/cmake/FindMUMPS.cmake @@ -0,0 +1,56 @@ + +# Stage 1: prefer an installed MUMPS CMake config (supports COMPONENTS properly) +find_package(MUMPS CONFIG QUIET COMPONENTS ${MUMPS_FIND_COMPONENTS}) +if(MUMPS_FOUND) + return() +endif() + +# Stage 2: manual discovery via MUMPS_DIR hint +if(DEFINED ENV{MUMPS_DIR} AND NOT MUMPS_DIR) + set(MUMPS_DIR "$ENV{MUMPS_DIR}" CACHE PATH "MUMPS installation directory") +endif() + +find_path(MUMPS_INCLUDE_DIR + NAMES dmumps_c.h + HINTS ${MUMPS_DIR}/include +) + +foreach(_lib dmumps smumps mumps_common) + find_library(MUMPS_${_lib}_LIBRARY + NAMES ${_lib} + HINTS ${MUMPS_DIR}/lib ${MUMPS_DIR}/lib64 + ) + list(APPEND _MUMPS_REQUIRED_VARS MUMPS_${_lib}_LIBRARY) +endforeach() + +# mpiseq is the sequential MPI stub — only present in sequential builds +find_library(MUMPS_mpiseq_LIBRARY + NAMES mpiseq + HINTS ${MUMPS_DIR}/lib ${MUMPS_DIR}/lib64 + ${MUMPS_DIR}/libseq ${MUMPS_DIR}/lib/SEQ +) + +include(FindPackageHandleStandardArgs) +find_package_handle_standard_args(MUMPS + REQUIRED_VARS MUMPS_INCLUDE_DIR ${_MUMPS_REQUIRED_VARS} +) + +if(MUMPS_FOUND AND NOT TARGET MUMPS::MUMPS) + find_package(Metis REQUIRED) + + set(_mumps_libs + ${MUMPS_dmumps_LIBRARY} + ${MUMPS_smumps_LIBRARY} + ${MUMPS_mumps_common_LIBRARY} + metis::metis + ) + if(MUMPS_mpiseq_LIBRARY) + list(APPEND _mumps_libs ${MUMPS_mpiseq_LIBRARY}) + endif() + + add_library(MUMPS::MUMPS INTERFACE IMPORTED) + set_target_properties(MUMPS::MUMPS PROPERTIES + INTERFACE_INCLUDE_DIRECTORIES "${MUMPS_INCLUDE_DIR}" + INTERFACE_LINK_LIBRARIES "${_mumps_libs}" + ) +endif() diff --git a/cmake/FindMetis.cmake b/cmake/FindMetis.cmake new file mode 100644 index 00000000..68821b48 --- /dev/null +++ b/cmake/FindMetis.cmake @@ -0,0 +1,27 @@ + +if(DEFINED ENV{METIS_DIR} AND NOT METIS_DIR) + set(METIS_DIR "$ENV{METIS_DIR}" CACHE PATH "METIS installation directory") +endif() + +find_path(METIS_INCLUDE_DIR + NAMES metis.h + HINTS ${METIS_DIR}/include +) + +find_library(METIS_LIBRARY + NAMES metis + HINTS ${METIS_DIR}/lib ${METIS_DIR}/lib64 +) + +include(FindPackageHandleStandardArgs) +find_package_handle_standard_args(Metis + REQUIRED_VARS METIS_INCLUDE_DIR METIS_LIBRARY +) + +if(Metis_FOUND AND NOT TARGET metis::metis) + add_library(metis::metis INTERFACE IMPORTED) + set_target_properties(metis::metis PROPERTIES + INTERFACE_INCLUDE_DIRECTORIES "${METIS_INCLUDE_DIR}" + INTERFACE_LINK_LIBRARIES "${METIS_LIBRARY}" + ) +endif() diff --git a/cmake/GMGPolarConfig.cmake.in b/cmake/GMGPolarConfig.cmake.in new file mode 100644 index 00000000..390a06a6 --- /dev/null +++ b/cmake/GMGPolarConfig.cmake.in @@ -0,0 +1,18 @@ +@PACKAGE_INIT@ + +list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}") + +include(CMakeFindDependencyMacro) + +find_dependency(OpenMP COMPONENTS CXX) +find_dependency(Kokkos) + +if(@GMGPOLAR_USE_MUMPS@) + find_dependency(MUMPS COMPONENTS OpenMP METIS) +endif() + +if(@GMGPOLAR_USE_LIKWID@) + find_dependency(LIKWID) +endif() + +include("${CMAKE_CURRENT_LIST_DIR}/GMGPolarTargets.cmake") diff --git a/include/ConfigParser/config_parser.h b/include/ConfigParser/config_parser.h index 6bb96166..872e1250 100644 --- a/include/ConfigParser/config_parser.h +++ b/include/ConfigParser/config_parser.h @@ -5,12 +5,12 @@ #include #include -#include "../../include/ConfigParser/cmdline.h" -#include "../../include/Definitions/global_definitions.h" -#include "../../include/PolarGrid/polargrid.h" -#include "../../include/GMGPolar/test_cases.h" -#include "../../include/GMGPolar/igmgpolar.h" -#include "../../include/GMGPolar/gmgpolar.h" +#include +#include +#include +#include +#include +#include #include "test_selection.h" namespace gmgpolar diff --git a/include/ConfigParser/test_selection.h b/include/ConfigParser/test_selection.h index b2f4b55d..9bc079f0 100644 --- a/include/ConfigParser/test_selection.h +++ b/include/ConfigParser/test_selection.h @@ -2,7 +2,7 @@ #include -#include "../../include/GMGPolar/test_cases.h" +#include namespace gmgpolar { diff --git a/include/GMGPolar/test_cases.h b/include/GMGPolar/test_cases.h index ef1000e6..7be7cd51 100644 --- a/include/GMGPolar/test_cases.h +++ b/include/GMGPolar/test_cases.h @@ -12,129 +12,129 @@ /* --------------- */ /* Domain Geometry */ -#include "../include/InputFunctions/DomainGeometry/circularGeometry.h" -#include "../include/InputFunctions/DomainGeometry/culhamGeometry.h" -#include "../include/InputFunctions/DomainGeometry/czarnyGeometry.h" -#include "../include/InputFunctions/DomainGeometry/shafranovGeometry.h" +#include +#include +#include +#include /* --------------- */ /* Exact Solutions */ -#include "../include/InputFunctions/ExactSolution/cartesianR2_CircularGeometry.h" -#include "../include/InputFunctions/ExactSolution/cartesianR2_CzarnyGeometry.h" -#include "../include/InputFunctions/ExactSolution/cartesianR2_ShafranovGeometry.h" -#include "../include/InputFunctions/ExactSolution/cartesianR6_CircularGeometry.h" -#include "../include/InputFunctions/ExactSolution/cartesianR6_CzarnyGeometry.h" -#include "../include/InputFunctions/ExactSolution/cartesianR6_ShafranovGeometry.h" -#include "../include/InputFunctions/ExactSolution/polarR6_CircularGeometry.h" -#include "../include/InputFunctions/ExactSolution/polarR6_CulhamGeometry.h" -#include "../include/InputFunctions/ExactSolution/polarR6_CzarnyGeometry.h" -#include "../include/InputFunctions/ExactSolution/polarR6_ShafranovGeometry.h" -#include "../include/InputFunctions/ExactSolution/refined_CircularGeometry.h" -#include "../include/InputFunctions/ExactSolution/refined_CulhamGeometry.h" -#include "../include/InputFunctions/ExactSolution/refined_CzarnyGeometry.h" -#include "../include/InputFunctions/ExactSolution/refined_ShafranovGeometry.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include /* ------------------- */ /* Boundary Conditions */ -#include "../include/InputFunctions/BoundaryConditions/cartesianR2_Boundary_CircularGeometry.h" -#include "../include/InputFunctions/BoundaryConditions/cartesianR2_Boundary_CzarnyGeometry.h" -#include "../include/InputFunctions/BoundaryConditions/cartesianR2_Boundary_ShafranovGeometry.h" -#include "../include/InputFunctions/BoundaryConditions/cartesianR6_Boundary_CircularGeometry.h" -#include "../include/InputFunctions/BoundaryConditions/cartesianR6_Boundary_CzarnyGeometry.h" -#include "../include/InputFunctions/BoundaryConditions/cartesianR6_Boundary_ShafranovGeometry.h" -#include "../include/InputFunctions/BoundaryConditions/polarR6_Boundary_CircularGeometry.h" -#include "../include/InputFunctions/BoundaryConditions/polarR6_Boundary_CulhamGeometry.h" -#include "../include/InputFunctions/BoundaryConditions/polarR6_Boundary_CzarnyGeometry.h" -#include "../include/InputFunctions/BoundaryConditions/polarR6_Boundary_ShafranovGeometry.h" -#include "../include/InputFunctions/BoundaryConditions/refined_Boundary_CircularGeometry.h" -#include "../include/InputFunctions/BoundaryConditions/refined_Boundary_CulhamGeometry.h" -#include "../include/InputFunctions/BoundaryConditions/refined_Boundary_CzarnyGeometry.h" -#include "../include/InputFunctions/BoundaryConditions/refined_Boundary_ShafranovGeometry.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include /* -----------------------------*/ /* Density Profile Coefficients */ -#include "../include/InputFunctions/DensityProfileCoefficients/poissonCoefficients.h" -#include "../include/InputFunctions/DensityProfileCoefficients/sonnendruckerCoefficients.h" -#include "../include/InputFunctions/DensityProfileCoefficients/sonnendruckerGyroCoefficients.h" -#include "../include/InputFunctions/DensityProfileCoefficients/zoniCoefficients.h" -#include "../include/InputFunctions/DensityProfileCoefficients/zoniGyroCoefficients.h" -#include "../include/InputFunctions/DensityProfileCoefficients/zoniShiftedCoefficients.h" -#include "../include/InputFunctions/DensityProfileCoefficients/zoniShiftedGyroCoefficients.h" +#include +#include +#include +#include +#include +#include +#include /* ------------------------- */ /* Source Terms: CartesianR2 */ -#include "../include/InputFunctions/SourceTerms/cartesianR2_Poisson_CircularGeometry.h" -#include "../include/InputFunctions/SourceTerms/cartesianR2_Poisson_CzarnyGeometry.h" -#include "../include/InputFunctions/SourceTerms/cartesianR2_Poisson_ShafranovGeometry.h" -#include "../include/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_CircularGeometry.h" -#include "../include/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_CzarnyGeometry.h" -#include "../include/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_ShafranovGeometry.h" -#include "../include/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_CircularGeometry.h" -#include "../include/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_CzarnyGeometry.h" -#include "../include/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_ShafranovGeometry.h" -#include "../include/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_CircularGeometry.h" -#include "../include/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_CzarnyGeometry.h" -#include "../include/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_ShafranovGeometry.h" -#include "../include/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_CircularGeometry.h" -#include "../include/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_CzarnyGeometry.h" -#include "../include/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_ShafranovGeometry.h" -#include "../include/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_CircularGeometry.h" -#include "../include/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_CzarnyGeometry.h" -#include "../include/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_ShafranovGeometry.h" -#include "../include/InputFunctions/SourceTerms/cartesianR2_Zoni_CircularGeometry.h" -#include "../include/InputFunctions/SourceTerms/cartesianR2_Zoni_CzarnyGeometry.h" -#include "../include/InputFunctions/SourceTerms/cartesianR2_Zoni_ShafranovGeometry.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include /* ------------------------- */ /* Source Terms: CartesianR6 */ -#include "../include/InputFunctions/SourceTerms/cartesianR6_Poisson_CircularGeometry.h" -#include "../include/InputFunctions/SourceTerms/cartesianR6_Poisson_CzarnyGeometry.h" -#include "../include/InputFunctions/SourceTerms/cartesianR6_Poisson_ShafranovGeometry.h" -#include "../include/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_CircularGeometry.h" -#include "../include/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_CzarnyGeometry.h" -#include "../include/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_ShafranovGeometry.h" -#include "../include/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_CircularGeometry.h" -#include "../include/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_CzarnyGeometry.h" -#include "../include/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_ShafranovGeometry.h" -#include "../include/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_CircularGeometry.h" -#include "../include/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_CzarnyGeometry.h" -#include "../include/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_ShafranovGeometry.h" -#include "../include/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_CircularGeometry.h" -#include "../include/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_CzarnyGeometry.h" -#include "../include/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_ShafranovGeometry.h" -#include "../include/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_CircularGeometry.h" -#include "../include/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_CzarnyGeometry.h" -#include "../include/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_ShafranovGeometry.h" -#include "../include/InputFunctions/SourceTerms/cartesianR6_Zoni_CircularGeometry.h" -#include "../include/InputFunctions/SourceTerms/cartesianR6_Zoni_CzarnyGeometry.h" -#include "../include/InputFunctions/SourceTerms/cartesianR6_Zoni_ShafranovGeometry.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include /* --------------------- */ /* Source Terms: PolarR6 */ -#include "../include/InputFunctions/SourceTerms/polarR6_Poisson_CircularGeometry.h" -#include "../include/InputFunctions/SourceTerms/polarR6_Poisson_CzarnyGeometry.h" -#include "../include/InputFunctions/SourceTerms/polarR6_Poisson_ShafranovGeometry.h" -#include "../include/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_CircularGeometry.h" -#include "../include/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_CzarnyGeometry.h" -#include "../include/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_ShafranovGeometry.h" -#include "../include/InputFunctions/SourceTerms/polarR6_Sonnendrucker_CircularGeometry.h" -#include "../include/InputFunctions/SourceTerms/polarR6_Sonnendrucker_CzarnyGeometry.h" -#include "../include/InputFunctions/SourceTerms/polarR6_Sonnendrucker_ShafranovGeometry.h" -#include "../include/InputFunctions/SourceTerms/polarR6_ZoniGyro_CircularGeometry.h" -#include "../include/InputFunctions/SourceTerms/polarR6_ZoniGyro_CzarnyGeometry.h" -#include "../include/InputFunctions/SourceTerms/polarR6_ZoniGyro_ShafranovGeometry.h" -#include "../include/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CircularGeometry.h" -#include "../include/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CulhamGeometry.h" /* Culham */ -#include "../include/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CzarnyGeometry.h" -#include "../include/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_ShafranovGeometry.h" -#include "../include/InputFunctions/SourceTerms/polarR6_ZoniShifted_CircularGeometry.h" -#include "../include/InputFunctions/SourceTerms/polarR6_ZoniShifted_CzarnyGeometry.h" -#include "../include/InputFunctions/SourceTerms/polarR6_ZoniShifted_ShafranovGeometry.h" -#include "../include/InputFunctions/SourceTerms/polarR6_Zoni_CircularGeometry.h" -#include "../include/InputFunctions/SourceTerms/polarR6_Zoni_CzarnyGeometry.h" -#include "../include/InputFunctions/SourceTerms/polarR6_Zoni_ShafranovGeometry.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include /* Culham */ +#include +#include +#include +#include +#include +#include +#include +#include /* --------------------- */ /* Source Terms: Refined */ -#include "../include/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CircularGeometry.h" -#include "../include/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CulhamGeometry.h" /* Culham */ -#include "../include/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CzarnyGeometry.h" -#include "../include/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_ShafranovGeometry.h" \ No newline at end of file +#include +#include /* Culham */ +#include +#include \ No newline at end of file diff --git a/include/Level/level.h b/include/Level/level.h index 058027c8..548c74b6 100644 --- a/include/Level/level.h +++ b/include/Level/level.h @@ -33,19 +33,19 @@ class ExtrapolatedSmoother; #include "../Definitions/geometry_helper.h" -#include "../../include/Residual/ResidualGive/residualGive.h" -#include "../../include/Residual/ResidualTake/residualTake.h" +#include "../Residual/ResidualGive/residualGive.h" +#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 "../DirectSolver/DirectSolver-COO-MUMPS-Give/directSolverGive.h" +#include "../DirectSolver/DirectSolver-COO-MUMPS-Take/directSolverTake.h" +#include "../DirectSolver/DirectSolver-CSR-LU-Give/directSolverGiveCustomLU.h" +#include "../DirectSolver/DirectSolver-CSR-LU-Take/directSolverTakeCustomLU.h" -#include "../../include/Smoother/SmootherGive/smootherGive.h" -#include "../../include/Smoother/SmootherTake/smootherTake.h" +#include "../Smoother/SmootherGive/smootherGive.h" +#include "../Smoother/SmootherTake/smootherTake.h" -#include "../../include/ExtrapolatedSmoother/ExtrapolatedSmootherGive/extrapolatedSmootherGive.h" -#include "../../include/ExtrapolatedSmoother/ExtrapolatedSmootherTake/extrapolatedSmootherTake.h" +#include "../ExtrapolatedSmoother/ExtrapolatedSmootherGive/extrapolatedSmootherGive.h" +#include "../ExtrapolatedSmoother/ExtrapolatedSmootherTake/extrapolatedSmootherTake.h" namespace gmgpolar { diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index a1b07be2..fa6675aa 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,10 +1,3 @@ -cmake_minimum_required(VERSION 3.12) - -if (CMAKE_COMPILER_IS_GNUCXX AND CMAKE_BUILD_TYPE STREQUAL "Release") - # If using GNU increase maximum number of instructions considered for inlining - # in Release mode in this folder and sub-folders - add_compile_options(--param max-inline-insns-single=1500) -endif() # Add subdirectories for components add_subdirectory(InputFunctions) @@ -58,118 +51,53 @@ add_library(GMGPolarLib STATIC ${GMG_POLAR_SOURCES} ${STENCIL_SOURCES} ${INTERPOLATION_SOURCES} - ${CONFIG_PARSER_SOURCES} ) -# Basic library configuration -target_include_directories(GMGPolarLib PUBLIC - ${CMAKE_CURRENT_SOURCE_DIR}/.. - ${CMAKE_CURRENT_SOURCE_DIR} -) +# Declare C++20 is a minimum required to use GMGPolarLib headers +target_compile_features(GMGPolarLib INTERFACE cxx_std_20) -target_link_libraries(GMGPolarLib PUBLIC - InputFunctions +# Basic library configuration +target_include_directories(GMGPolarLib PUBLIC + ${GMGPOLAR_INCLUDE_DIRS} ) # Handle OpenMP -find_package(OpenMP REQUIRED) -if(OpenMP_CXX_FOUND) - target_link_libraries(GMGPolarLib PUBLIC OpenMP::OpenMP_CXX) -endif() -target_link_libraries(GMGPolarLib PUBLIC Kokkos::kokkos) - +target_link_libraries(GMGPolarLib + PUBLIC + OpenMP::OpenMP_CXX + Kokkos::kokkos +) # Handle MUMPS configuration if(GMGPOLAR_USE_MUMPS) - find_package(MUMPS COMPONENTS OpenMP METIS) - if (${MUMPS_FOUND}) - target_link_libraries(GMGPolarLib PUBLIC MUMPS::MUMPS) - target_compile_definitions(GMGPolarLib PUBLIC GMGPOLAR_USE_MUMPS) - elseif(DEFINED ENV{MUMPS_DIR}) - set(MUMPS_DIR $ENV{MUMPS_DIR}) - - if(EXISTS "${MUMPS_DIR}/include" AND EXISTS "${MUMPS_DIR}/lib") - set(MUMPS_INCLUDE_DIR "${MUMPS_DIR}/include") - set(MUMPS_LIBRARY_DIR "${MUMPS_DIR}/lib") - - target_include_directories(GMGPolarLib PUBLIC ${MUMPS_INCLUDE_DIR}) - target_link_directories(GMGPolarLib PUBLIC ${MUMPS_LIBRARY_DIR}) - - if (EXISTS "${MUMPS_DIR}/libseq") - target_include_directories(GMGPolarLib PUBLIC "${MUMPS_DIR}/libseq") - target_link_directories(GMGPolarLib PUBLIC "${MUMPS_DIR}/libseq") - endif() - - set(MUMPS_FOUND TRUE) - endif() - - if(MUMPS_FOUND) - target_link_libraries(GMGPolarLib PUBLIC - mumps_common - smumps - dmumps - mpiseq - ) - target_compile_definitions(GMGPolarLib PUBLIC GMGPOLAR_USE_MUMPS) - else() - message(SEND_ERROR "MUMPS not found") - endif() - endif() - - if(DEFINED ENV{METIS_DIR}) - set(METIS_DIR $ENV{METIS_DIR}) - - if(EXISTS "${METIS_DIR}/include" AND EXISTS "${METIS_DIR}/lib") - set(METIS_INCLUDE_DIR "${METIS_DIR}/include") - set(METIS_LIBRARY_DIR "${METIS_DIR}/lib") - - target_include_directories(GMGPolarLib PUBLIC ${METIS_INCLUDE_DIR}) - target_link_directories(GMGPolarLib PUBLIC ${METIS_LIBRARY_DIR}) - set(METIS_FOUND TRUE) - endif() - - if(METIS_FOUND) - target_link_libraries(GMGPolarLib PUBLIC metis) - else() - message(SEND_ERROR "METIS not found") - endif() - endif() + target_link_libraries(GMGPolarLib PUBLIC MUMPS::MUMPS) + target_compile_definitions(GMGPolarLib PUBLIC GMGPOLAR_USE_MUMPS) endif() # Handle LIKWID configuration if(GMGPOLAR_USE_LIKWID) - if(NOT DEFINED LIKWID_DIR) - if(DEFINED ENV{LIKWID_DIR}) - set(LIKWID_DIR $ENV{LIKWID_DIR} CACHE PATH "Path to Likwid installation") - endif() - endif() - - if(LIKWID_DIR) - find_path(LIKWID_INCLUDE_DIR - NAMES likwid.h - PATHS "${LIKWID_DIR}/include" - NO_DEFAULT_PATH - REQUIRED - ) - find_library(LIKWID_LIBRARY - NAMES likwid - PATHS "${LIKWID_DIR}/lib" "${LIKWID_DIR}/lib64" - NO_DEFAULT_PATH - REQUIRED - ) - else() - find_package(PkgConfig QUIET) - if(PKG_CONFIG_FOUND) - pkg_check_modules(LIKWID QUIET likwid) - endif() - endif() - - if(LIKWID_INCLUDE_DIR AND LIKWID_LIBRARY) - target_include_directories(GMGPolarLib PUBLIC ${LIKWID_INCLUDE_DIR}) - target_link_libraries(GMGPolarLib PUBLIC ${LIKWID_LIBRARY}) - target_compile_definitions(GMGPolarLib PUBLIC - LIKWID_PERFMON - GMGPOLAR_USE_LIKWID - ) - endif() + target_link_libraries(GMGPolarLib PUBLIC LIKWID::LIKWID) + target_compile_definitions(GMGPolarLib PUBLIC GMGPOLAR_USE_LIKWID) endif() + +add_library(GMGPolar::GMGPolarLib ALIAS GMGPolarLib) + +add_library(GMGPolarInterface STATIC + ${CONFIG_PARSER_SOURCES} +) +# Declare C++20 is a minimum required to use GMGPolarInterface headers +target_compile_features(GMGPolarInterface INTERFACE cxx_std_20) +target_link_libraries(GMGPolarInterface + PUBLIC + GMGPolarLib + InputFunctions +) + +add_library(GMGPolar::GMGPolarInterface ALIAS GMGPolarInterface) + +install(TARGETS + GMGPolarLib + GMGPolarInterface + EXPORT GMGPolarTargets + ARCHIVE DESTINATION lib +) diff --git a/src/ConfigParser/config_parser.cpp b/src/ConfigParser/config_parser.cpp index d9739af0..7620323c 100644 --- a/src/ConfigParser/config_parser.cpp +++ b/src/ConfigParser/config_parser.cpp @@ -1,4 +1,4 @@ -#include "../include/ConfigParser/config_parser.h" +#include using namespace gmgpolar; ConfigParser::ConfigParser() diff --git a/src/ConfigParser/select_test_case.cpp b/src/ConfigParser/select_test_case.cpp index cf12c897..ac230969 100644 --- a/src/ConfigParser/select_test_case.cpp +++ b/src/ConfigParser/select_test_case.cpp @@ -1,5 +1,5 @@ -#include "../../include/ConfigParser/config_parser.h" -#include "../../include/GMGPolar/gmgpolar.h" +#include +#include using namespace gmgpolar; std::unique_ptr ConfigParser::solver() const diff --git a/src/GMGPolar/gmgpolar.cpp b/src/GMGPolar/gmgpolar.cpp index ebeaedb2..4f7955f0 100644 --- a/src/GMGPolar/gmgpolar.cpp +++ b/src/GMGPolar/gmgpolar.cpp @@ -1,4 +1,4 @@ -#include "../../include/GMGPolar/gmgpolar.h" +#include using namespace gmgpolar; /* ---------------------------------------------------------------------- */ diff --git a/src/InputFunctions/BoundaryConditions/CMakeLists.txt b/src/InputFunctions/BoundaryConditions/CMakeLists.txt index c183b079..8ed212e0 100644 --- a/src/InputFunctions/BoundaryConditions/CMakeLists.txt +++ b/src/InputFunctions/BoundaryConditions/CMakeLists.txt @@ -18,6 +18,5 @@ set(BOUNDARY_CONDITIONS_SOURCES add_library(InputFunctions_BoundaryConditions STATIC ${BOUNDARY_CONDITIONS_SOURCES}) target_include_directories(InputFunctions_BoundaryConditions PUBLIC - ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_SOURCE_DIR}/include/InputFunctions/BoundaryConditions + ${GMGPOLAR_INCLUDE_DIRS} ) diff --git a/src/InputFunctions/BoundaryConditions/cartesianR2_Boundary_CircularGeometry.cpp b/src/InputFunctions/BoundaryConditions/cartesianR2_Boundary_CircularGeometry.cpp index 8b869cd2..06e1135b 100644 --- a/src/InputFunctions/BoundaryConditions/cartesianR2_Boundary_CircularGeometry.cpp +++ b/src/InputFunctions/BoundaryConditions/cartesianR2_Boundary_CircularGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/BoundaryConditions/cartesianR2_Boundary_CircularGeometry.h" +#include using namespace gmgpolar; CartesianR2_Boundary_CircularGeometry::CartesianR2_Boundary_CircularGeometry(double Rmax) diff --git a/src/InputFunctions/BoundaryConditions/cartesianR2_Boundary_CzarnyGeometry.cpp b/src/InputFunctions/BoundaryConditions/cartesianR2_Boundary_CzarnyGeometry.cpp index f9a6e2a7..fd9eef20 100644 --- a/src/InputFunctions/BoundaryConditions/cartesianR2_Boundary_CzarnyGeometry.cpp +++ b/src/InputFunctions/BoundaryConditions/cartesianR2_Boundary_CzarnyGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/BoundaryConditions/cartesianR2_Boundary_CzarnyGeometry.h" +#include 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 bec5939b..323ff2af 100644 --- a/src/InputFunctions/BoundaryConditions/cartesianR2_Boundary_ShafranovGeometry.cpp +++ b/src/InputFunctions/BoundaryConditions/cartesianR2_Boundary_ShafranovGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/BoundaryConditions/cartesianR2_Boundary_ShafranovGeometry.h" +#include using namespace gmgpolar; CartesianR2_Boundary_ShafranovGeometry::CartesianR2_Boundary_ShafranovGeometry(double Rmax, double elongation_kappa, diff --git a/src/InputFunctions/BoundaryConditions/cartesianR6_Boundary_CircularGeometry.cpp b/src/InputFunctions/BoundaryConditions/cartesianR6_Boundary_CircularGeometry.cpp index cb203cac..998345c4 100644 --- a/src/InputFunctions/BoundaryConditions/cartesianR6_Boundary_CircularGeometry.cpp +++ b/src/InputFunctions/BoundaryConditions/cartesianR6_Boundary_CircularGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/BoundaryConditions/cartesianR6_Boundary_CircularGeometry.h" +#include using namespace gmgpolar; CartesianR6_Boundary_CircularGeometry::CartesianR6_Boundary_CircularGeometry(double Rmax) diff --git a/src/InputFunctions/BoundaryConditions/cartesianR6_Boundary_CzarnyGeometry.cpp b/src/InputFunctions/BoundaryConditions/cartesianR6_Boundary_CzarnyGeometry.cpp index 019d9315..9a6f68ea 100644 --- a/src/InputFunctions/BoundaryConditions/cartesianR6_Boundary_CzarnyGeometry.cpp +++ b/src/InputFunctions/BoundaryConditions/cartesianR6_Boundary_CzarnyGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/BoundaryConditions/cartesianR6_Boundary_CzarnyGeometry.h" +#include 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 612ca7b6..f899b00b 100644 --- a/src/InputFunctions/BoundaryConditions/cartesianR6_Boundary_ShafranovGeometry.cpp +++ b/src/InputFunctions/BoundaryConditions/cartesianR6_Boundary_ShafranovGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/BoundaryConditions/cartesianR6_Boundary_ShafranovGeometry.h" +#include using namespace gmgpolar; CartesianR6_Boundary_ShafranovGeometry::CartesianR6_Boundary_ShafranovGeometry(double Rmax, double elongation_kappa, diff --git a/src/InputFunctions/BoundaryConditions/polarR6_Boundary_CircularGeometry.cpp b/src/InputFunctions/BoundaryConditions/polarR6_Boundary_CircularGeometry.cpp index f6037636..1c005b2b 100644 --- a/src/InputFunctions/BoundaryConditions/polarR6_Boundary_CircularGeometry.cpp +++ b/src/InputFunctions/BoundaryConditions/polarR6_Boundary_CircularGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/BoundaryConditions/polarR6_Boundary_CircularGeometry.h" +#include using namespace gmgpolar; PolarR6_Boundary_CircularGeometry::PolarR6_Boundary_CircularGeometry(double Rmax) diff --git a/src/InputFunctions/BoundaryConditions/polarR6_Boundary_CulhamGeometry.cpp b/src/InputFunctions/BoundaryConditions/polarR6_Boundary_CulhamGeometry.cpp index a977a2f9..1d51c4bb 100644 --- a/src/InputFunctions/BoundaryConditions/polarR6_Boundary_CulhamGeometry.cpp +++ b/src/InputFunctions/BoundaryConditions/polarR6_Boundary_CulhamGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/BoundaryConditions/polarR6_Boundary_CulhamGeometry.h" +#include using namespace gmgpolar; PolarR6_Boundary_CulhamGeometry::PolarR6_Boundary_CulhamGeometry(double Rmax) diff --git a/src/InputFunctions/BoundaryConditions/polarR6_Boundary_CzarnyGeometry.cpp b/src/InputFunctions/BoundaryConditions/polarR6_Boundary_CzarnyGeometry.cpp index a9f9ba16..47439dbe 100644 --- a/src/InputFunctions/BoundaryConditions/polarR6_Boundary_CzarnyGeometry.cpp +++ b/src/InputFunctions/BoundaryConditions/polarR6_Boundary_CzarnyGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/BoundaryConditions/polarR6_Boundary_CzarnyGeometry.h" +#include 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 956c1e38..71939049 100644 --- a/src/InputFunctions/BoundaryConditions/polarR6_Boundary_ShafranovGeometry.cpp +++ b/src/InputFunctions/BoundaryConditions/polarR6_Boundary_ShafranovGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/BoundaryConditions/polarR6_Boundary_ShafranovGeometry.h" +#include using namespace gmgpolar; PolarR6_Boundary_ShafranovGeometry::PolarR6_Boundary_ShafranovGeometry(double Rmax, double elongation_kappa, diff --git a/src/InputFunctions/BoundaryConditions/refined_Boundary_CircularGeometry.cpp b/src/InputFunctions/BoundaryConditions/refined_Boundary_CircularGeometry.cpp index fb620880..ece8dc34 100644 --- a/src/InputFunctions/BoundaryConditions/refined_Boundary_CircularGeometry.cpp +++ b/src/InputFunctions/BoundaryConditions/refined_Boundary_CircularGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/BoundaryConditions/refined_Boundary_CircularGeometry.h" +#include using namespace gmgpolar; Refined_Boundary_CircularGeometry::Refined_Boundary_CircularGeometry(double Rmax) diff --git a/src/InputFunctions/BoundaryConditions/refined_Boundary_CulhamGeometry.cpp b/src/InputFunctions/BoundaryConditions/refined_Boundary_CulhamGeometry.cpp index 57227ec1..de181d85 100644 --- a/src/InputFunctions/BoundaryConditions/refined_Boundary_CulhamGeometry.cpp +++ b/src/InputFunctions/BoundaryConditions/refined_Boundary_CulhamGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/BoundaryConditions/refined_Boundary_CulhamGeometry.h" +#include using namespace gmgpolar; Refined_Boundary_CulhamGeometry::Refined_Boundary_CulhamGeometry(double Rmax) diff --git a/src/InputFunctions/BoundaryConditions/refined_Boundary_CzarnyGeometry.cpp b/src/InputFunctions/BoundaryConditions/refined_Boundary_CzarnyGeometry.cpp index 0724731b..8cb842fa 100644 --- a/src/InputFunctions/BoundaryConditions/refined_Boundary_CzarnyGeometry.cpp +++ b/src/InputFunctions/BoundaryConditions/refined_Boundary_CzarnyGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/BoundaryConditions/refined_Boundary_CzarnyGeometry.h" +#include 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 7c34ea05..5c3d7421 100644 --- a/src/InputFunctions/BoundaryConditions/refined_Boundary_ShafranovGeometry.cpp +++ b/src/InputFunctions/BoundaryConditions/refined_Boundary_ShafranovGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/BoundaryConditions/refined_Boundary_ShafranovGeometry.h" +#include using namespace gmgpolar; Refined_Boundary_ShafranovGeometry::Refined_Boundary_ShafranovGeometry(double Rmax, double elongation_kappa, diff --git a/src/InputFunctions/CMakeLists.txt b/src/InputFunctions/CMakeLists.txt index 17bf2710..3a413138 100644 --- a/src/InputFunctions/CMakeLists.txt +++ b/src/InputFunctions/CMakeLists.txt @@ -14,6 +14,13 @@ target_link_libraries(InputFunctions INTERFACE InputFunctions_SourceTerms ) -target_include_directories(InputFunctions INTERFACE - ${CMAKE_SOURCE_DIR}/include/InputFunctions -) \ No newline at end of file +install(TARGETS + InputFunctions + InputFunctions_BoundaryConditions + InputFunctions_DensityProfileCoefficients + InputFunctions_DomainGeometry + InputFunctions_ExactSolution + InputFunctions_SourceTerms + EXPORT GMGPolarTargets + ARCHIVE DESTINATION lib +) diff --git a/src/InputFunctions/DensityProfileCoefficients/CMakeLists.txt b/src/InputFunctions/DensityProfileCoefficients/CMakeLists.txt index 505bb9f8..f22a5a6d 100644 --- a/src/InputFunctions/DensityProfileCoefficients/CMakeLists.txt +++ b/src/InputFunctions/DensityProfileCoefficients/CMakeLists.txt @@ -10,6 +10,5 @@ set(DENSITY_PROFILE_COEFFICIENTS_SOURCES add_library(InputFunctions_DensityProfileCoefficients STATIC ${DENSITY_PROFILE_COEFFICIENTS_SOURCES}) target_include_directories(InputFunctions_DensityProfileCoefficients PUBLIC - ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_SOURCE_DIR}/include/InputFunctions/DensityProfileCoefficients -) \ No newline at end of file + ${GMGPOLAR_INCLUDE_DIRS} +) diff --git a/src/InputFunctions/DensityProfileCoefficients/poissonCoefficients.cpp b/src/InputFunctions/DensityProfileCoefficients/poissonCoefficients.cpp index 94affce1..7b6db2d1 100644 --- a/src/InputFunctions/DensityProfileCoefficients/poissonCoefficients.cpp +++ b/src/InputFunctions/DensityProfileCoefficients/poissonCoefficients.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/DensityProfileCoefficients/poissonCoefficients.h" +#include using namespace gmgpolar; PoissonCoefficients::PoissonCoefficients(double Rmax, double alpha_jump) diff --git a/src/InputFunctions/DensityProfileCoefficients/sonnendruckerCoefficients.cpp b/src/InputFunctions/DensityProfileCoefficients/sonnendruckerCoefficients.cpp index 2cc66f2d..e1add2de 100644 --- a/src/InputFunctions/DensityProfileCoefficients/sonnendruckerCoefficients.cpp +++ b/src/InputFunctions/DensityProfileCoefficients/sonnendruckerCoefficients.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/DensityProfileCoefficients/sonnendruckerCoefficients.h" +#include using namespace gmgpolar; SonnendruckerCoefficients::SonnendruckerCoefficients(double Rmax, double alpha_jump) diff --git a/src/InputFunctions/DensityProfileCoefficients/sonnendruckerGyroCoefficients.cpp b/src/InputFunctions/DensityProfileCoefficients/sonnendruckerGyroCoefficients.cpp index 768bdac5..aeadfb65 100644 --- a/src/InputFunctions/DensityProfileCoefficients/sonnendruckerGyroCoefficients.cpp +++ b/src/InputFunctions/DensityProfileCoefficients/sonnendruckerGyroCoefficients.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/DensityProfileCoefficients/sonnendruckerGyroCoefficients.h" +#include using namespace gmgpolar; SonnendruckerGyroCoefficients::SonnendruckerGyroCoefficients(double _Rmax, double _alpha_jump) diff --git a/src/InputFunctions/DensityProfileCoefficients/zoniCoefficients.cpp b/src/InputFunctions/DensityProfileCoefficients/zoniCoefficients.cpp index 3065415f..322eb60a 100644 --- a/src/InputFunctions/DensityProfileCoefficients/zoniCoefficients.cpp +++ b/src/InputFunctions/DensityProfileCoefficients/zoniCoefficients.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/DensityProfileCoefficients/zoniCoefficients.h" +#include using namespace gmgpolar; ZoniCoefficients::ZoniCoefficients(double Rmax, double alpha_jump) diff --git a/src/InputFunctions/DensityProfileCoefficients/zoniGyroCoefficients.cpp b/src/InputFunctions/DensityProfileCoefficients/zoniGyroCoefficients.cpp index aba20f60..922929d3 100644 --- a/src/InputFunctions/DensityProfileCoefficients/zoniGyroCoefficients.cpp +++ b/src/InputFunctions/DensityProfileCoefficients/zoniGyroCoefficients.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/DensityProfileCoefficients/zoniGyroCoefficients.h" +#include using namespace gmgpolar; ZoniGyroCoefficients::ZoniGyroCoefficients(double Rmax, double alpha_jump) diff --git a/src/InputFunctions/DensityProfileCoefficients/zoniShiftedCoefficients.cpp b/src/InputFunctions/DensityProfileCoefficients/zoniShiftedCoefficients.cpp index 7d7a0607..16590922 100644 --- a/src/InputFunctions/DensityProfileCoefficients/zoniShiftedCoefficients.cpp +++ b/src/InputFunctions/DensityProfileCoefficients/zoniShiftedCoefficients.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/DensityProfileCoefficients/zoniShiftedCoefficients.h" +#include #include using namespace gmgpolar; ZoniShiftedCoefficients::ZoniShiftedCoefficients(double Rmax, double alpha_jump) diff --git a/src/InputFunctions/DensityProfileCoefficients/zoniShiftedGyroCoefficients.cpp b/src/InputFunctions/DensityProfileCoefficients/zoniShiftedGyroCoefficients.cpp index 1f3555a5..3dbd10b9 100644 --- a/src/InputFunctions/DensityProfileCoefficients/zoniShiftedGyroCoefficients.cpp +++ b/src/InputFunctions/DensityProfileCoefficients/zoniShiftedGyroCoefficients.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/DensityProfileCoefficients/zoniShiftedGyroCoefficients.h" +#include using namespace gmgpolar; ZoniShiftedGyroCoefficients::ZoniShiftedGyroCoefficients(double Rmax, double alpha_jump) diff --git a/src/InputFunctions/DomainGeometry/CMakeLists.txt b/src/InputFunctions/DomainGeometry/CMakeLists.txt index 65b2c8b3..4f616e4f 100644 --- a/src/InputFunctions/DomainGeometry/CMakeLists.txt +++ b/src/InputFunctions/DomainGeometry/CMakeLists.txt @@ -7,6 +7,5 @@ set(DOMAIN_GEOMETRY_SOURCES add_library(InputFunctions_DomainGeometry STATIC ${DOMAIN_GEOMETRY_SOURCES}) target_include_directories(InputFunctions_DomainGeometry PUBLIC - ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_SOURCE_DIR}/include/InputFunctions/DomainGeometry -) \ No newline at end of file + ${GMGPOLAR_INCLUDE_DIRS} +) diff --git a/src/InputFunctions/DomainGeometry/circularGeometry.cpp b/src/InputFunctions/DomainGeometry/circularGeometry.cpp index 794d05b1..4394b7a9 100644 --- a/src/InputFunctions/DomainGeometry/circularGeometry.cpp +++ b/src/InputFunctions/DomainGeometry/circularGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/DomainGeometry/circularGeometry.h" +#include using namespace gmgpolar; CircularGeometry::CircularGeometry(double Rmax) diff --git a/src/InputFunctions/DomainGeometry/culhamGeometry.cpp b/src/InputFunctions/DomainGeometry/culhamGeometry.cpp index 4b611ca9..29abeac0 100644 --- a/src/InputFunctions/DomainGeometry/culhamGeometry.cpp +++ b/src/InputFunctions/DomainGeometry/culhamGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/DomainGeometry/culhamGeometry.h" +#include using namespace gmgpolar; CulhamGeometry::CulhamGeometry(double Rmax) diff --git a/src/InputFunctions/DomainGeometry/czarnyGeometry.cpp b/src/InputFunctions/DomainGeometry/czarnyGeometry.cpp index cef739ed..732c603a 100644 --- a/src/InputFunctions/DomainGeometry/czarnyGeometry.cpp +++ b/src/InputFunctions/DomainGeometry/czarnyGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/DomainGeometry/czarnyGeometry.h" +#include using namespace gmgpolar; CzarnyGeometry::CzarnyGeometry() diff --git a/src/InputFunctions/DomainGeometry/shafranovGeometry.cpp b/src/InputFunctions/DomainGeometry/shafranovGeometry.cpp index 5c423eda..093f7dfd 100644 --- a/src/InputFunctions/DomainGeometry/shafranovGeometry.cpp +++ b/src/InputFunctions/DomainGeometry/shafranovGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/DomainGeometry/shafranovGeometry.h" +#include using namespace gmgpolar; ShafranovGeometry::ShafranovGeometry(double Rmax, double elongation_kappa, double shift_delta) diff --git a/src/InputFunctions/ExactSolution/CMakeLists.txt b/src/InputFunctions/ExactSolution/CMakeLists.txt index 0cea300d..f3031759 100644 --- a/src/InputFunctions/ExactSolution/CMakeLists.txt +++ b/src/InputFunctions/ExactSolution/CMakeLists.txt @@ -17,6 +17,5 @@ set(EXACT_SOLUTION_SOURCES add_library(InputFunctions_ExactSolution STATIC ${EXACT_SOLUTION_SOURCES}) target_include_directories(InputFunctions_ExactSolution PUBLIC - ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_SOURCE_DIR}/include/InputFunctions/ExactSolution -) \ No newline at end of file + ${GMGPOLAR_INCLUDE_DIRS} +) diff --git a/src/InputFunctions/ExactSolution/cartesianR2_CircularGeometry.cpp b/src/InputFunctions/ExactSolution/cartesianR2_CircularGeometry.cpp index 06766c13..07f4f23a 100644 --- a/src/InputFunctions/ExactSolution/cartesianR2_CircularGeometry.cpp +++ b/src/InputFunctions/ExactSolution/cartesianR2_CircularGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/ExactSolution/cartesianR2_CircularGeometry.h" +#include using namespace gmgpolar; CartesianR2_CircularGeometry::CartesianR2_CircularGeometry(double Rmax) diff --git a/src/InputFunctions/ExactSolution/cartesianR2_CzarnyGeometry.cpp b/src/InputFunctions/ExactSolution/cartesianR2_CzarnyGeometry.cpp index d632c48f..cb56ca9f 100644 --- a/src/InputFunctions/ExactSolution/cartesianR2_CzarnyGeometry.cpp +++ b/src/InputFunctions/ExactSolution/cartesianR2_CzarnyGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/ExactSolution/cartesianR2_CzarnyGeometry.h" +#include using namespace gmgpolar; void CartesianR2_CzarnyGeometry::initializeGeometry() diff --git a/src/InputFunctions/ExactSolution/cartesianR2_ShafranovGeometry.cpp b/src/InputFunctions/ExactSolution/cartesianR2_ShafranovGeometry.cpp index f1b38995..5328a82f 100644 --- a/src/InputFunctions/ExactSolution/cartesianR2_ShafranovGeometry.cpp +++ b/src/InputFunctions/ExactSolution/cartesianR2_ShafranovGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/ExactSolution/cartesianR2_ShafranovGeometry.h" +#include using namespace gmgpolar; CartesianR2_ShafranovGeometry::CartesianR2_ShafranovGeometry(double Rmax, double elongation_kappa, double shift_delta) diff --git a/src/InputFunctions/ExactSolution/cartesianR6_CircularGeometry.cpp b/src/InputFunctions/ExactSolution/cartesianR6_CircularGeometry.cpp index d5f85e5e..ff56aa93 100644 --- a/src/InputFunctions/ExactSolution/cartesianR6_CircularGeometry.cpp +++ b/src/InputFunctions/ExactSolution/cartesianR6_CircularGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/ExactSolution/cartesianR6_CircularGeometry.h" +#include using namespace gmgpolar; CartesianR6_CircularGeometry::CartesianR6_CircularGeometry(double Rmax) diff --git a/src/InputFunctions/ExactSolution/cartesianR6_CzarnyGeometry.cpp b/src/InputFunctions/ExactSolution/cartesianR6_CzarnyGeometry.cpp index bbd193e7..b74c85a1 100644 --- a/src/InputFunctions/ExactSolution/cartesianR6_CzarnyGeometry.cpp +++ b/src/InputFunctions/ExactSolution/cartesianR6_CzarnyGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/ExactSolution/cartesianR6_CzarnyGeometry.h" +#include using namespace gmgpolar; void CartesianR6_CzarnyGeometry::initializeGeometry() diff --git a/src/InputFunctions/ExactSolution/cartesianR6_ShafranovGeometry.cpp b/src/InputFunctions/ExactSolution/cartesianR6_ShafranovGeometry.cpp index 4657dce7..0dd0b871 100644 --- a/src/InputFunctions/ExactSolution/cartesianR6_ShafranovGeometry.cpp +++ b/src/InputFunctions/ExactSolution/cartesianR6_ShafranovGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/ExactSolution/cartesianR6_ShafranovGeometry.h" +#include using namespace gmgpolar; CartesianR6_ShafranovGeometry::CartesianR6_ShafranovGeometry(double Rmax, double elongation_kappa, double shift_delta) diff --git a/src/InputFunctions/ExactSolution/polarR6_CircularGeometry.cpp b/src/InputFunctions/ExactSolution/polarR6_CircularGeometry.cpp index d1364c75..cbd015df 100644 --- a/src/InputFunctions/ExactSolution/polarR6_CircularGeometry.cpp +++ b/src/InputFunctions/ExactSolution/polarR6_CircularGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/ExactSolution/polarR6_CircularGeometry.h" +#include using namespace gmgpolar; PolarR6_CircularGeometry::PolarR6_CircularGeometry(double Rmax) diff --git a/src/InputFunctions/ExactSolution/polarR6_CulhamGeometry.cpp b/src/InputFunctions/ExactSolution/polarR6_CulhamGeometry.cpp index cce7fba4..cee9f6d1 100644 --- a/src/InputFunctions/ExactSolution/polarR6_CulhamGeometry.cpp +++ b/src/InputFunctions/ExactSolution/polarR6_CulhamGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/ExactSolution/polarR6_CulhamGeometry.h" +#include using namespace gmgpolar; PolarR6_CulhamGeometry::PolarR6_CulhamGeometry(double Rmax) diff --git a/src/InputFunctions/ExactSolution/polarR6_CzarnyGeometry.cpp b/src/InputFunctions/ExactSolution/polarR6_CzarnyGeometry.cpp index 28ef4bce..abf891a5 100644 --- a/src/InputFunctions/ExactSolution/polarR6_CzarnyGeometry.cpp +++ b/src/InputFunctions/ExactSolution/polarR6_CzarnyGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/ExactSolution/polarR6_CzarnyGeometry.h" +#include using namespace gmgpolar; void PolarR6_CzarnyGeometry::initializeGeometry() diff --git a/src/InputFunctions/ExactSolution/polarR6_ShafranovGeometry.cpp b/src/InputFunctions/ExactSolution/polarR6_ShafranovGeometry.cpp index f7988806..2140cbc1 100644 --- a/src/InputFunctions/ExactSolution/polarR6_ShafranovGeometry.cpp +++ b/src/InputFunctions/ExactSolution/polarR6_ShafranovGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/ExactSolution/polarR6_ShafranovGeometry.h" +#include using namespace gmgpolar; PolarR6_ShafranovGeometry::PolarR6_ShafranovGeometry(double Rmax, double elongation_kappa, double shift_delta) diff --git a/src/InputFunctions/ExactSolution/refined_CircularGeometry.cpp b/src/InputFunctions/ExactSolution/refined_CircularGeometry.cpp index fb49518b..22b92f03 100644 --- a/src/InputFunctions/ExactSolution/refined_CircularGeometry.cpp +++ b/src/InputFunctions/ExactSolution/refined_CircularGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/ExactSolution/refined_CircularGeometry.h" +#include using namespace gmgpolar; Refined_CircularGeometry::Refined_CircularGeometry(double Rmax) diff --git a/src/InputFunctions/ExactSolution/refined_CulhamGeometry.cpp b/src/InputFunctions/ExactSolution/refined_CulhamGeometry.cpp index 4b394913..f9b48b10 100644 --- a/src/InputFunctions/ExactSolution/refined_CulhamGeometry.cpp +++ b/src/InputFunctions/ExactSolution/refined_CulhamGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/ExactSolution/refined_CulhamGeometry.h" +#include using namespace gmgpolar; Refined_CulhamGeometry::Refined_CulhamGeometry(double Rmax) diff --git a/src/InputFunctions/ExactSolution/refined_CzarnyGeometry.cpp b/src/InputFunctions/ExactSolution/refined_CzarnyGeometry.cpp index 433d8479..97aaecc7 100644 --- a/src/InputFunctions/ExactSolution/refined_CzarnyGeometry.cpp +++ b/src/InputFunctions/ExactSolution/refined_CzarnyGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/ExactSolution/refined_CzarnyGeometry.h" +#include using namespace gmgpolar; void Refined_CzarnyGeometry::initializeGeometry() diff --git a/src/InputFunctions/ExactSolution/refined_ShafranovGeometry.cpp b/src/InputFunctions/ExactSolution/refined_ShafranovGeometry.cpp index 7ec6e9e3..7fd9350b 100644 --- a/src/InputFunctions/ExactSolution/refined_ShafranovGeometry.cpp +++ b/src/InputFunctions/ExactSolution/refined_ShafranovGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/ExactSolution/refined_ShafranovGeometry.h" +#include using namespace gmgpolar; Refined_ShafranovGeometry::Refined_ShafranovGeometry(double Rmax, double elongation_kappa, double shift_delta) diff --git a/src/InputFunctions/SourceTerms/CMakeLists.txt b/src/InputFunctions/SourceTerms/CMakeLists.txt index 4f22afc3..0c4aa280 100644 --- a/src/InputFunctions/SourceTerms/CMakeLists.txt +++ b/src/InputFunctions/SourceTerms/CMakeLists.txt @@ -71,8 +71,7 @@ set(SOURCE_TERMS_SOURCES add_library(InputFunctions_SourceTerms STATIC ${SOURCE_TERMS_SOURCES}) target_include_directories(InputFunctions_SourceTerms PUBLIC - ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_SOURCE_DIR}/include/InputFunctions/SourceTerms + ${GMGPOLAR_INCLUDE_DIRS} ) target_link_libraries(InputFunctions_SourceTerms PUBLIC Kokkos::kokkos) diff --git a/src/InputFunctions/SourceTerms/cartesianR2_Poisson_CircularGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR2_Poisson_CircularGeometry.cpp index 4ddca2a0..b095e6a6 100644 --- a/src/InputFunctions/SourceTerms/cartesianR2_Poisson_CircularGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR2_Poisson_CircularGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/SourceTerms/cartesianR2_Poisson_CircularGeometry.h" +#include using namespace gmgpolar; CartesianR2_Poisson_CircularGeometry::CartesianR2_Poisson_CircularGeometry(PolarGrid const& grid, double Rmax) diff --git a/src/InputFunctions/SourceTerms/cartesianR2_Poisson_CzarnyGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR2_Poisson_CzarnyGeometry.cpp index af825eed..59fdfecb 100644 --- a/src/InputFunctions/SourceTerms/cartesianR2_Poisson_CzarnyGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR2_Poisson_CzarnyGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/SourceTerms/cartesianR2_Poisson_CzarnyGeometry.h" +#include 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 249667c9..d11a285b 100644 --- a/src/InputFunctions/SourceTerms/cartesianR2_Poisson_ShafranovGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR2_Poisson_ShafranovGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/SourceTerms/cartesianR2_Poisson_ShafranovGeometry.h" +#include using namespace gmgpolar; CartesianR2_Poisson_ShafranovGeometry::CartesianR2_Poisson_ShafranovGeometry(PolarGrid const& grid, double Rmax, diff --git a/src/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_CircularGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_CircularGeometry.cpp index 0ea4983d..fa20efb8 100644 --- a/src/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_CircularGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_CircularGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_CircularGeometry.h" +#include using namespace gmgpolar; CartesianR2_SonnendruckerGyro_CircularGeometry::CartesianR2_SonnendruckerGyro_CircularGeometry(PolarGrid const& grid, diff --git a/src/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_CzarnyGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_CzarnyGeometry.cpp index c5425a50..8859b687 100644 --- a/src/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_CzarnyGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_CzarnyGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_CzarnyGeometry.h" +#include 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 40657d19..a4f699bb 100644 --- a/src/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_ShafranovGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_ShafranovGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/SourceTerms/cartesianR2_SonnendruckerGyro_ShafranovGeometry.h" +#include using namespace gmgpolar; CartesianR2_SonnendruckerGyro_ShafranovGeometry::CartesianR2_SonnendruckerGyro_ShafranovGeometry( diff --git a/src/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_CircularGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_CircularGeometry.cpp index 40d66b84..e4d348cb 100644 --- a/src/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_CircularGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_CircularGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_CircularGeometry.h" +#include using namespace gmgpolar; CartesianR2_Sonnendrucker_CircularGeometry::CartesianR2_Sonnendrucker_CircularGeometry(PolarGrid const& grid, diff --git a/src/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_CzarnyGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_CzarnyGeometry.cpp index 952ac345..178925c3 100644 --- a/src/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_CzarnyGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_CzarnyGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_CzarnyGeometry.h" +#include 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 330253cc..f14db652 100644 --- a/src/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_ShafranovGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_ShafranovGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/SourceTerms/cartesianR2_Sonnendrucker_ShafranovGeometry.h" +#include using namespace gmgpolar; CartesianR2_Sonnendrucker_ShafranovGeometry::CartesianR2_Sonnendrucker_ShafranovGeometry(PolarGrid const& grid, diff --git a/src/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_CircularGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_CircularGeometry.cpp index a515f87d..989cb4dd 100644 --- a/src/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_CircularGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_CircularGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_CircularGeometry.h" +#include using namespace gmgpolar; CartesianR2_ZoniGyro_CircularGeometry::CartesianR2_ZoniGyro_CircularGeometry(PolarGrid const& grid, double Rmax) diff --git a/src/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_CzarnyGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_CzarnyGeometry.cpp index 5334dc5c..3bba5f8e 100644 --- a/src/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_CzarnyGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_CzarnyGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_CzarnyGeometry.h" +#include 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 a8f15b5b..598b7f10 100644 --- a/src/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_ShafranovGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_ShafranovGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/SourceTerms/cartesianR2_ZoniGyro_ShafranovGeometry.h" +#include using namespace gmgpolar; CartesianR2_ZoniGyro_ShafranovGeometry::CartesianR2_ZoniGyro_ShafranovGeometry(PolarGrid const& grid, double Rmax, diff --git a/src/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_CircularGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_CircularGeometry.cpp index 7540c1dd..5ecf51ce 100644 --- a/src/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_CircularGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_CircularGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_CircularGeometry.h" +#include using namespace gmgpolar; CartesianR2_ZoniShiftedGyro_CircularGeometry::CartesianR2_ZoniShiftedGyro_CircularGeometry(PolarGrid const& grid, diff --git a/src/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_CzarnyGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_CzarnyGeometry.cpp index 1086bc9c..6018e37f 100644 --- a/src/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_CzarnyGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_CzarnyGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_CzarnyGeometry.h" +#include 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 34c53cf4..88d88b4a 100644 --- a/src/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_ShafranovGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_ShafranovGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/SourceTerms/cartesianR2_ZoniShiftedGyro_ShafranovGeometry.h" +#include using namespace gmgpolar; CartesianR2_ZoniShiftedGyro_ShafranovGeometry::CartesianR2_ZoniShiftedGyro_ShafranovGeometry(PolarGrid const& grid, diff --git a/src/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_CircularGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_CircularGeometry.cpp index b3f4ddd6..c7e644ac 100644 --- a/src/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_CircularGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_CircularGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_CircularGeometry.h" +#include using namespace gmgpolar; CartesianR2_ZoniShifted_CircularGeometry::CartesianR2_ZoniShifted_CircularGeometry(PolarGrid const& grid, double Rmax) diff --git a/src/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_CzarnyGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_CzarnyGeometry.cpp index cfa5cb55..78fecfa6 100644 --- a/src/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_CzarnyGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_CzarnyGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_CzarnyGeometry.h" +#include 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 91b2c0ae..591d8af0 100644 --- a/src/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_ShafranovGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_ShafranovGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/SourceTerms/cartesianR2_ZoniShifted_ShafranovGeometry.h" +#include using namespace gmgpolar; CartesianR2_ZoniShifted_ShafranovGeometry::CartesianR2_ZoniShifted_ShafranovGeometry(PolarGrid const& grid, double Rmax, diff --git a/src/InputFunctions/SourceTerms/cartesianR2_Zoni_CircularGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR2_Zoni_CircularGeometry.cpp index 2650de04..804fee14 100644 --- a/src/InputFunctions/SourceTerms/cartesianR2_Zoni_CircularGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR2_Zoni_CircularGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/SourceTerms/cartesianR2_Zoni_CircularGeometry.h" +#include using namespace gmgpolar; CartesianR2_Zoni_CircularGeometry::CartesianR2_Zoni_CircularGeometry(PolarGrid const& grid, double Rmax) diff --git a/src/InputFunctions/SourceTerms/cartesianR2_Zoni_CzarnyGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR2_Zoni_CzarnyGeometry.cpp index 60bd3de4..2e0da742 100644 --- a/src/InputFunctions/SourceTerms/cartesianR2_Zoni_CzarnyGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR2_Zoni_CzarnyGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/SourceTerms/cartesianR2_Zoni_CzarnyGeometry.h" +#include 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 d56d46ef..7eaeaedd 100644 --- a/src/InputFunctions/SourceTerms/cartesianR2_Zoni_ShafranovGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR2_Zoni_ShafranovGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/SourceTerms/cartesianR2_Zoni_ShafranovGeometry.h" +#include using namespace gmgpolar; CartesianR2_Zoni_ShafranovGeometry::CartesianR2_Zoni_ShafranovGeometry(PolarGrid const& grid, double Rmax, diff --git a/src/InputFunctions/SourceTerms/cartesianR6_Poisson_CircularGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR6_Poisson_CircularGeometry.cpp index e29d9f22..65ea124e 100644 --- a/src/InputFunctions/SourceTerms/cartesianR6_Poisson_CircularGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR6_Poisson_CircularGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/SourceTerms/cartesianR6_Poisson_CircularGeometry.h" +#include using namespace gmgpolar; CartesianR6_Poisson_CircularGeometry::CartesianR6_Poisson_CircularGeometry(PolarGrid const& grid, double Rmax) diff --git a/src/InputFunctions/SourceTerms/cartesianR6_Poisson_CzarnyGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR6_Poisson_CzarnyGeometry.cpp index f8c36d12..f75ecdca 100644 --- a/src/InputFunctions/SourceTerms/cartesianR6_Poisson_CzarnyGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR6_Poisson_CzarnyGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/SourceTerms/cartesianR6_Poisson_CzarnyGeometry.h" +#include 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 4d32d707..3e3d6358 100644 --- a/src/InputFunctions/SourceTerms/cartesianR6_Poisson_ShafranovGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR6_Poisson_ShafranovGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/SourceTerms/cartesianR6_Poisson_ShafranovGeometry.h" +#include using namespace gmgpolar; CartesianR6_Poisson_ShafranovGeometry::CartesianR6_Poisson_ShafranovGeometry(PolarGrid const& grid, double Rmax, diff --git a/src/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_CircularGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_CircularGeometry.cpp index 79e0a7a5..0c6e4a5b 100644 --- a/src/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_CircularGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_CircularGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_CircularGeometry.h" +#include using namespace gmgpolar; CartesianR6_SonnendruckerGyro_CircularGeometry::CartesianR6_SonnendruckerGyro_CircularGeometry(PolarGrid const& grid, diff --git a/src/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_CzarnyGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_CzarnyGeometry.cpp index a89cdce3..cc113544 100644 --- a/src/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_CzarnyGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_CzarnyGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_CzarnyGeometry.h" +#include 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 f9d686df..a45644dc 100644 --- a/src/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_ShafranovGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_ShafranovGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/SourceTerms/cartesianR6_SonnendruckerGyro_ShafranovGeometry.h" +#include using namespace gmgpolar; CartesianR6_SonnendruckerGyro_ShafranovGeometry::CartesianR6_SonnendruckerGyro_ShafranovGeometry( diff --git a/src/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_CircularGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_CircularGeometry.cpp index 4129ec5a..9243b514 100644 --- a/src/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_CircularGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_CircularGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_CircularGeometry.h" +#include using namespace gmgpolar; CartesianR6_Sonnendrucker_CircularGeometry::CartesianR6_Sonnendrucker_CircularGeometry(PolarGrid const& grid, diff --git a/src/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_CzarnyGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_CzarnyGeometry.cpp index bd2435de..360cad66 100644 --- a/src/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_CzarnyGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_CzarnyGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_CzarnyGeometry.h" +#include 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 77cb3e3e..c4051bcb 100644 --- a/src/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_ShafranovGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_ShafranovGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/SourceTerms/cartesianR6_Sonnendrucker_ShafranovGeometry.h" +#include using namespace gmgpolar; CartesianR6_Sonnendrucker_ShafranovGeometry::CartesianR6_Sonnendrucker_ShafranovGeometry(PolarGrid const& grid, diff --git a/src/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_CircularGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_CircularGeometry.cpp index 0bc07d63..b6113aa7 100644 --- a/src/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_CircularGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_CircularGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_CircularGeometry.h" +#include using namespace gmgpolar; CartesianR6_ZoniGyro_CircularGeometry::CartesianR6_ZoniGyro_CircularGeometry(PolarGrid const& grid, double Rmax) diff --git a/src/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_CzarnyGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_CzarnyGeometry.cpp index ed3f506d..b83aca7b 100644 --- a/src/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_CzarnyGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_CzarnyGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_CzarnyGeometry.h" +#include 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 92f36d21..f5238591 100644 --- a/src/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_ShafranovGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_ShafranovGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/SourceTerms/cartesianR6_ZoniGyro_ShafranovGeometry.h" +#include using namespace gmgpolar; CartesianR6_ZoniGyro_ShafranovGeometry::CartesianR6_ZoniGyro_ShafranovGeometry(PolarGrid const& grid, double Rmax, diff --git a/src/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_CircularGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_CircularGeometry.cpp index fc87ffe2..3792313a 100644 --- a/src/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_CircularGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_CircularGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_CircularGeometry.h" +#include using namespace gmgpolar; CartesianR6_ZoniShiftedGyro_CircularGeometry::CartesianR6_ZoniShiftedGyro_CircularGeometry(PolarGrid const& grid, diff --git a/src/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_CzarnyGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_CzarnyGeometry.cpp index 44271b61..ae11ec70 100644 --- a/src/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_CzarnyGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_CzarnyGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_CzarnyGeometry.h" +#include 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 f21f7cd4..dad9e90b 100644 --- a/src/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_ShafranovGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_ShafranovGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/SourceTerms/cartesianR6_ZoniShiftedGyro_ShafranovGeometry.h" +#include using namespace gmgpolar; CartesianR6_ZoniShiftedGyro_ShafranovGeometry::CartesianR6_ZoniShiftedGyro_ShafranovGeometry(PolarGrid const& grid, diff --git a/src/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_CircularGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_CircularGeometry.cpp index 03a253cd..debc6ecb 100644 --- a/src/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_CircularGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_CircularGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_CircularGeometry.h" +#include using namespace gmgpolar; CartesianR6_ZoniShifted_CircularGeometry::CartesianR6_ZoniShifted_CircularGeometry(PolarGrid const& grid, double Rmax) diff --git a/src/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_CzarnyGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_CzarnyGeometry.cpp index f3e86507..672d2224 100644 --- a/src/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_CzarnyGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_CzarnyGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_CzarnyGeometry.h" +#include 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 a56fed96..9516f7ff 100644 --- a/src/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_ShafranovGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_ShafranovGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/SourceTerms/cartesianR6_ZoniShifted_ShafranovGeometry.h" +#include using namespace gmgpolar; CartesianR6_ZoniShifted_ShafranovGeometry::CartesianR6_ZoniShifted_ShafranovGeometry(PolarGrid const& grid, double Rmax, diff --git a/src/InputFunctions/SourceTerms/cartesianR6_Zoni_CircularGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR6_Zoni_CircularGeometry.cpp index 9e36dbcf..2c43f57a 100644 --- a/src/InputFunctions/SourceTerms/cartesianR6_Zoni_CircularGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR6_Zoni_CircularGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/SourceTerms/cartesianR6_Zoni_CircularGeometry.h" +#include using namespace gmgpolar; CartesianR6_Zoni_CircularGeometry::CartesianR6_Zoni_CircularGeometry(PolarGrid const& grid, double Rmax) diff --git a/src/InputFunctions/SourceTerms/cartesianR6_Zoni_CzarnyGeometry.cpp b/src/InputFunctions/SourceTerms/cartesianR6_Zoni_CzarnyGeometry.cpp index eab1cb06..2ffe9184 100644 --- a/src/InputFunctions/SourceTerms/cartesianR6_Zoni_CzarnyGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR6_Zoni_CzarnyGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/SourceTerms/cartesianR6_Zoni_CzarnyGeometry.h" +#include 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 94bba085..b621e6e1 100644 --- a/src/InputFunctions/SourceTerms/cartesianR6_Zoni_ShafranovGeometry.cpp +++ b/src/InputFunctions/SourceTerms/cartesianR6_Zoni_ShafranovGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/SourceTerms/cartesianR6_Zoni_ShafranovGeometry.h" +#include using namespace gmgpolar; CartesianR6_Zoni_ShafranovGeometry::CartesianR6_Zoni_ShafranovGeometry(PolarGrid const& grid, double Rmax, diff --git a/src/InputFunctions/SourceTerms/polarR6_Poisson_CircularGeometry.cpp b/src/InputFunctions/SourceTerms/polarR6_Poisson_CircularGeometry.cpp index 1ac8ad6d..0b948641 100644 --- a/src/InputFunctions/SourceTerms/polarR6_Poisson_CircularGeometry.cpp +++ b/src/InputFunctions/SourceTerms/polarR6_Poisson_CircularGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/SourceTerms/polarR6_Poisson_CircularGeometry.h" +#include using namespace gmgpolar; PolarR6_Poisson_CircularGeometry::PolarR6_Poisson_CircularGeometry(PolarGrid const& grid, double Rmax) diff --git a/src/InputFunctions/SourceTerms/polarR6_Poisson_CzarnyGeometry.cpp b/src/InputFunctions/SourceTerms/polarR6_Poisson_CzarnyGeometry.cpp index 5d55eefd..85403319 100644 --- a/src/InputFunctions/SourceTerms/polarR6_Poisson_CzarnyGeometry.cpp +++ b/src/InputFunctions/SourceTerms/polarR6_Poisson_CzarnyGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/SourceTerms/polarR6_Poisson_CzarnyGeometry.h" +#include 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 d56c95da..0505fcfb 100644 --- a/src/InputFunctions/SourceTerms/polarR6_Poisson_ShafranovGeometry.cpp +++ b/src/InputFunctions/SourceTerms/polarR6_Poisson_ShafranovGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/SourceTerms/polarR6_Poisson_ShafranovGeometry.h" +#include using namespace gmgpolar; PolarR6_Poisson_ShafranovGeometry::PolarR6_Poisson_ShafranovGeometry(PolarGrid const& grid, double Rmax, diff --git a/src/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_CircularGeometry.cpp b/src/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_CircularGeometry.cpp index b462dab5..ccbbb8d5 100644 --- a/src/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_CircularGeometry.cpp +++ b/src/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_CircularGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_CircularGeometry.h" +#include using namespace gmgpolar; PolarR6_SonnendruckerGyro_CircularGeometry::PolarR6_SonnendruckerGyro_CircularGeometry(PolarGrid const& grid, diff --git a/src/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_CzarnyGeometry.cpp b/src/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_CzarnyGeometry.cpp index 65270287..0fddf109 100644 --- a/src/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_CzarnyGeometry.cpp +++ b/src/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_CzarnyGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_CzarnyGeometry.h" +#include 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 0b6ef3c5..485bd2ef 100644 --- a/src/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_ShafranovGeometry.cpp +++ b/src/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_ShafranovGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/SourceTerms/polarR6_SonnendruckerGyro_ShafranovGeometry.h" +#include using namespace gmgpolar; PolarR6_SonnendruckerGyro_ShafranovGeometry::PolarR6_SonnendruckerGyro_ShafranovGeometry(PolarGrid const& grid, diff --git a/src/InputFunctions/SourceTerms/polarR6_Sonnendrucker_CircularGeometry.cpp b/src/InputFunctions/SourceTerms/polarR6_Sonnendrucker_CircularGeometry.cpp index 52cad9db..50eb9915 100644 --- a/src/InputFunctions/SourceTerms/polarR6_Sonnendrucker_CircularGeometry.cpp +++ b/src/InputFunctions/SourceTerms/polarR6_Sonnendrucker_CircularGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/SourceTerms/polarR6_Sonnendrucker_CircularGeometry.h" +#include using namespace gmgpolar; PolarR6_Sonnendrucker_CircularGeometry::PolarR6_Sonnendrucker_CircularGeometry(PolarGrid const& grid, double Rmax) diff --git a/src/InputFunctions/SourceTerms/polarR6_Sonnendrucker_CzarnyGeometry.cpp b/src/InputFunctions/SourceTerms/polarR6_Sonnendrucker_CzarnyGeometry.cpp index d6efa6e0..2dbb388d 100644 --- a/src/InputFunctions/SourceTerms/polarR6_Sonnendrucker_CzarnyGeometry.cpp +++ b/src/InputFunctions/SourceTerms/polarR6_Sonnendrucker_CzarnyGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/SourceTerms/polarR6_Sonnendrucker_CzarnyGeometry.h" +#include 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 4627698a..96ba68e8 100644 --- a/src/InputFunctions/SourceTerms/polarR6_Sonnendrucker_ShafranovGeometry.cpp +++ b/src/InputFunctions/SourceTerms/polarR6_Sonnendrucker_ShafranovGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/SourceTerms/polarR6_Sonnendrucker_ShafranovGeometry.h" +#include using namespace gmgpolar; PolarR6_Sonnendrucker_ShafranovGeometry::PolarR6_Sonnendrucker_ShafranovGeometry(PolarGrid const& grid, double Rmax, diff --git a/src/InputFunctions/SourceTerms/polarR6_ZoniGyro_CircularGeometry.cpp b/src/InputFunctions/SourceTerms/polarR6_ZoniGyro_CircularGeometry.cpp index ab69dac1..11ba82c4 100644 --- a/src/InputFunctions/SourceTerms/polarR6_ZoniGyro_CircularGeometry.cpp +++ b/src/InputFunctions/SourceTerms/polarR6_ZoniGyro_CircularGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/SourceTerms/polarR6_ZoniGyro_CircularGeometry.h" +#include using namespace gmgpolar; PolarR6_ZoniGyro_CircularGeometry::PolarR6_ZoniGyro_CircularGeometry(PolarGrid const& grid, double Rmax) diff --git a/src/InputFunctions/SourceTerms/polarR6_ZoniGyro_CzarnyGeometry.cpp b/src/InputFunctions/SourceTerms/polarR6_ZoniGyro_CzarnyGeometry.cpp index 63cad5c2..f070fa8d 100644 --- a/src/InputFunctions/SourceTerms/polarR6_ZoniGyro_CzarnyGeometry.cpp +++ b/src/InputFunctions/SourceTerms/polarR6_ZoniGyro_CzarnyGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/SourceTerms/polarR6_ZoniGyro_CzarnyGeometry.h" +#include 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 56493993..e5c358ee 100644 --- a/src/InputFunctions/SourceTerms/polarR6_ZoniGyro_ShafranovGeometry.cpp +++ b/src/InputFunctions/SourceTerms/polarR6_ZoniGyro_ShafranovGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/SourceTerms/polarR6_ZoniGyro_ShafranovGeometry.h" +#include using namespace gmgpolar; PolarR6_ZoniGyro_ShafranovGeometry::PolarR6_ZoniGyro_ShafranovGeometry(PolarGrid const& grid, double Rmax, diff --git a/src/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CircularGeometry.cpp b/src/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CircularGeometry.cpp index 05fac1fd..ceada235 100644 --- a/src/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CircularGeometry.cpp +++ b/src/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CircularGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CircularGeometry.h" +#include using namespace gmgpolar; PolarR6_ZoniShiftedGyro_CircularGeometry::PolarR6_ZoniShiftedGyro_CircularGeometry(PolarGrid const& grid, double Rmax) diff --git a/src/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CulhamGeometry.cpp b/src/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CulhamGeometry.cpp index 7b8a44cb..a1537cc0 100644 --- a/src/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CulhamGeometry.cpp +++ b/src/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CulhamGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CulhamGeometry.h" +#include using namespace gmgpolar; PolarR6_ZoniShiftedGyro_CulhamGeometry::PolarR6_ZoniShiftedGyro_CulhamGeometry(PolarGrid const& grid, double Rmax) diff --git a/src/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CzarnyGeometry.cpp b/src/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CzarnyGeometry.cpp index 844c5059..d7123eb1 100644 --- a/src/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CzarnyGeometry.cpp +++ b/src/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CzarnyGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_CzarnyGeometry.h" +#include 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 08397022..dc0a9adb 100644 --- a/src/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_ShafranovGeometry.cpp +++ b/src/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_ShafranovGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/SourceTerms/polarR6_ZoniShiftedGyro_ShafranovGeometry.h" +#include using namespace gmgpolar; PolarR6_ZoniShiftedGyro_ShafranovGeometry::PolarR6_ZoniShiftedGyro_ShafranovGeometry(PolarGrid const& grid, double Rmax, diff --git a/src/InputFunctions/SourceTerms/polarR6_ZoniShifted_CircularGeometry.cpp b/src/InputFunctions/SourceTerms/polarR6_ZoniShifted_CircularGeometry.cpp index ba453760..8e7dfcdc 100644 --- a/src/InputFunctions/SourceTerms/polarR6_ZoniShifted_CircularGeometry.cpp +++ b/src/InputFunctions/SourceTerms/polarR6_ZoniShifted_CircularGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/SourceTerms/polarR6_ZoniShifted_CircularGeometry.h" +#include using namespace gmgpolar; PolarR6_ZoniShifted_CircularGeometry::PolarR6_ZoniShifted_CircularGeometry(PolarGrid const& grid, double Rmax) diff --git a/src/InputFunctions/SourceTerms/polarR6_ZoniShifted_CzarnyGeometry.cpp b/src/InputFunctions/SourceTerms/polarR6_ZoniShifted_CzarnyGeometry.cpp index 19dca45f..25fe3087 100644 --- a/src/InputFunctions/SourceTerms/polarR6_ZoniShifted_CzarnyGeometry.cpp +++ b/src/InputFunctions/SourceTerms/polarR6_ZoniShifted_CzarnyGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/SourceTerms/polarR6_ZoniShifted_CzarnyGeometry.h" +#include 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 ec59b375..174f37f5 100644 --- a/src/InputFunctions/SourceTerms/polarR6_ZoniShifted_ShafranovGeometry.cpp +++ b/src/InputFunctions/SourceTerms/polarR6_ZoniShifted_ShafranovGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/SourceTerms/polarR6_ZoniShifted_ShafranovGeometry.h" +#include using namespace gmgpolar; PolarR6_ZoniShifted_ShafranovGeometry::PolarR6_ZoniShifted_ShafranovGeometry(PolarGrid const& grid, double Rmax, diff --git a/src/InputFunctions/SourceTerms/polarR6_Zoni_CircularGeometry.cpp b/src/InputFunctions/SourceTerms/polarR6_Zoni_CircularGeometry.cpp index 3068508a..b6319441 100644 --- a/src/InputFunctions/SourceTerms/polarR6_Zoni_CircularGeometry.cpp +++ b/src/InputFunctions/SourceTerms/polarR6_Zoni_CircularGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/SourceTerms/polarR6_Zoni_CircularGeometry.h" +#include using namespace gmgpolar; PolarR6_Zoni_CircularGeometry::PolarR6_Zoni_CircularGeometry(PolarGrid const& grid, double Rmax) diff --git a/src/InputFunctions/SourceTerms/polarR6_Zoni_CzarnyGeometry.cpp b/src/InputFunctions/SourceTerms/polarR6_Zoni_CzarnyGeometry.cpp index 1aa771fc..e86a59fb 100644 --- a/src/InputFunctions/SourceTerms/polarR6_Zoni_CzarnyGeometry.cpp +++ b/src/InputFunctions/SourceTerms/polarR6_Zoni_CzarnyGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/SourceTerms/polarR6_Zoni_CzarnyGeometry.h" +#include 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 7c8377c2..77651b27 100644 --- a/src/InputFunctions/SourceTerms/polarR6_Zoni_ShafranovGeometry.cpp +++ b/src/InputFunctions/SourceTerms/polarR6_Zoni_ShafranovGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/SourceTerms/polarR6_Zoni_ShafranovGeometry.h" +#include using namespace gmgpolar; PolarR6_Zoni_ShafranovGeometry::PolarR6_Zoni_ShafranovGeometry(PolarGrid const& grid, double Rmax, diff --git a/src/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CircularGeometry.cpp b/src/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CircularGeometry.cpp index f29f6dbf..daad426e 100644 --- a/src/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CircularGeometry.cpp +++ b/src/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CircularGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CircularGeometry.h" +#include using namespace gmgpolar; Refined_ZoniShiftedGyro_CircularGeometry::Refined_ZoniShiftedGyro_CircularGeometry(PolarGrid const& grid, double Rmax) diff --git a/src/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CulhamGeometry.cpp b/src/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CulhamGeometry.cpp index 4b167388..386ebb4c 100644 --- a/src/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CulhamGeometry.cpp +++ b/src/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CulhamGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CulhamGeometry.h" +#include using namespace gmgpolar; Refined_ZoniShiftedGyro_CulhamGeometry::Refined_ZoniShiftedGyro_CulhamGeometry(PolarGrid const& grid, double Rmax) diff --git a/src/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CzarnyGeometry.cpp b/src/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CzarnyGeometry.cpp index 8d8865c5..63707681 100644 --- a/src/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CzarnyGeometry.cpp +++ b/src/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CzarnyGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_CzarnyGeometry.h" +#include 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 91f5bf3c..23da77ad 100644 --- a/src/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_ShafranovGeometry.cpp +++ b/src/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_ShafranovGeometry.cpp @@ -1,4 +1,4 @@ -#include "../include/InputFunctions/SourceTerms/refined_ZoniShiftedGyro_ShafranovGeometry.h" +#include using namespace gmgpolar; Refined_ZoniShiftedGyro_ShafranovGeometry::Refined_ZoniShiftedGyro_ShafranovGeometry(PolarGrid const& grid, double Rmax, diff --git a/src/Interpolation/extrapolated_prolongation.cpp b/src/Interpolation/extrapolated_prolongation.cpp index 0e7924d1..6a8a91e5 100644 --- a/src/Interpolation/extrapolated_prolongation.cpp +++ b/src/Interpolation/extrapolated_prolongation.cpp @@ -1,4 +1,4 @@ -#include "../../include/Interpolation/interpolation.h" +#include using namespace gmgpolar; /* diff --git a/src/Interpolation/extrapolated_restriction.cpp b/src/Interpolation/extrapolated_restriction.cpp index 3fd0fd04..c2522284 100644 --- a/src/Interpolation/extrapolated_restriction.cpp +++ b/src/Interpolation/extrapolated_restriction.cpp @@ -1,4 +1,4 @@ -#include "../../include/Interpolation/interpolation.h" +#include using namespace gmgpolar; /* diff --git a/src/Interpolation/fmg_interpolation.cpp b/src/Interpolation/fmg_interpolation.cpp index ea0a0945..fa1c7206 100644 --- a/src/Interpolation/fmg_interpolation.cpp +++ b/src/Interpolation/fmg_interpolation.cpp @@ -1,4 +1,4 @@ -#include "../../include/Interpolation/interpolation.h" +#include using namespace gmgpolar; /* diff --git a/src/Interpolation/injection.cpp b/src/Interpolation/injection.cpp index 48dbae4e..9283e4e7 100644 --- a/src/Interpolation/injection.cpp +++ b/src/Interpolation/injection.cpp @@ -1,5 +1,4 @@ -#include "../../include/Interpolation/interpolation.h" - +#include using namespace gmgpolar; /* Remark: This injection is not scaled. */ diff --git a/src/Interpolation/interpolation.cpp b/src/Interpolation/interpolation.cpp index 5537742c..85eea5b1 100644 --- a/src/Interpolation/interpolation.cpp +++ b/src/Interpolation/interpolation.cpp @@ -1,4 +1,4 @@ -#include "../../include/Interpolation/interpolation.h" +#include using namespace gmgpolar; Interpolation::Interpolation(int max_omp_threads, bool DirBC_Interior) diff --git a/src/Interpolation/prolongation.cpp b/src/Interpolation/prolongation.cpp index 0354c74e..2674d446 100644 --- a/src/Interpolation/prolongation.cpp +++ b/src/Interpolation/prolongation.cpp @@ -1,4 +1,4 @@ -#include "../../include/Interpolation/interpolation.h" +#include using namespace gmgpolar; /* diff --git a/src/Interpolation/restriction.cpp b/src/Interpolation/restriction.cpp index b0eca728..fce92b4c 100644 --- a/src/Interpolation/restriction.cpp +++ b/src/Interpolation/restriction.cpp @@ -1,4 +1,4 @@ -#include "../../include/Interpolation/interpolation.h" +#include using namespace gmgpolar; /* diff --git a/src/PolarGrid/anisotropic_division.cpp b/src/PolarGrid/anisotropic_division.cpp index 63ac88c3..8dfdce27 100644 --- a/src/PolarGrid/anisotropic_division.cpp +++ b/src/PolarGrid/anisotropic_division.cpp @@ -1,4 +1,4 @@ -#include "../../include/PolarGrid/polargrid.h" +#include using namespace gmgpolar; Vector PolarGrid::RadialAnisotropicDivision(double R0, double R, const int nr_exp, double refinement_radius, diff --git a/src/PolarGrid/polargrid.cpp b/src/PolarGrid/polargrid.cpp index a54aa364..79b91a76 100644 --- a/src/PolarGrid/polargrid.cpp +++ b/src/PolarGrid/polargrid.cpp @@ -1,4 +1,4 @@ -#include "../../include/PolarGrid/polargrid.h" +#include #include using namespace gmgpolar; // ------------ // diff --git a/src/Stencil/stencil.cpp b/src/Stencil/stencil.cpp index d178bf38..2a6d6421 100644 --- a/src/Stencil/stencil.cpp +++ b/src/Stencil/stencil.cpp @@ -1,4 +1,4 @@ -#include "../../include/Stencil/stencil.h" +#include using namespace gmgpolar; Stencil::Stencil(std::initializer_list init) diff --git a/src/convergence_order.cpp b/src/convergence_order.cpp index b1d18fa9..64b7cf52 100644 --- a/src/convergence_order.cpp +++ b/src/convergence_order.cpp @@ -5,8 +5,8 @@ #include #include -#include "../include/GMGPolar/gmgpolar.h" -#include "../include/GMGPolar/test_cases.h" +#include +#include using namespace gmgpolar; int main(int argc, char* argv[]) diff --git a/src/main.cpp b/src/main.cpp index 54fc7907..a7d2305c 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1,7 +1,7 @@ #include -#include "../include/ConfigParser/config_parser.h" -#include "../include/GMGPolar/gmgpolar.h" +#include +#include using namespace gmgpolar; int main(int argc, char* argv[]) diff --git a/src/strong_scaling.cpp b/src/strong_scaling.cpp index 881dd5e0..2d17d8d9 100644 --- a/src/strong_scaling.cpp +++ b/src/strong_scaling.cpp @@ -6,8 +6,8 @@ #include #include -#include "../include/GMGPolar/gmgpolar.h" -#include "../include/GMGPolar/test_cases.h" +#include +#include 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 3228c1a5..b4772a3f 100644 --- a/src/weak_scaling.cpp +++ b/src/weak_scaling.cpp @@ -5,8 +5,8 @@ #include #include -#include "../include/GMGPolar/gmgpolar.h" -#include "../include/GMGPolar/test_cases.h" +#include +#include using namespace gmgpolar; void runTest(int maxOpenMPThreads, int divideBy2, std::ofstream& outfile) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 3c64033d..3f698ae4 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -1,9 +1,3 @@ -cmake_minimum_required(VERSION 3.12) - -project(GMGPolarTests LANGUAGES CXX) - -set(CMAKE_CXX_STANDARD 20) -set(CMAKE_CXX_STANDARD_REQUIRED True) # Create a single test executable that includes all test sources add_executable(gmgpolar_tests @@ -30,9 +24,8 @@ add_executable(gmgpolar_tests GMGPolar/convergence_order.cpp ) -# Set the compile features and link libraries -target_compile_features(gmgpolar_tests PRIVATE cxx_std_20) -target_link_libraries(gmgpolar_tests GMGPolarLib GTest::gtest_main) +# Set the link libraries +target_link_libraries(gmgpolar_tests GMGPolarLib GMGPolarInterface GTest::gtest_main) include(GoogleTest) gtest_discover_tests(gmgpolar_tests) diff --git a/tests/ConfigParser/config_parser.cpp b/tests/ConfigParser/config_parser.cpp index 70cd4ed6..7c7c7132 100644 --- a/tests/ConfigParser/config_parser.cpp +++ b/tests/ConfigParser/config_parser.cpp @@ -1,5 +1,5 @@ #include -#include "../../include/ConfigParser/config_parser.h" +#include using namespace gmgpolar; struct TestParams { diff --git a/tests/DirectSolver/directSolver.cpp b/tests/DirectSolver/directSolver.cpp index 5bd525f1..dc848655 100644 --- a/tests/DirectSolver/directSolver.cpp +++ b/tests/DirectSolver/directSolver.cpp @@ -5,37 +5,37 @@ #include "../test_tools.h" -#include "../../include/GMGPolar/gmgpolar.h" +#include -#include "../../include/Residual/ResidualGive/residualGive.h" -#include "../../include/DirectSolver/DirectSolver-COO-MUMPS-Give/directSolverGive.h" -#include "../../include/DirectSolver/DirectSolver-COO-MUMPS-Take/directSolverTake.h" -#include "../../include/DirectSolver/DirectSolver-CSR-LU-Give/directSolverGiveCustomLU.h" -#include "../../include/DirectSolver/DirectSolver-CSR-LU-Take/directSolverTakeCustomLU.h" +#include +#include +#include +#include +#include -#include "../../include/InputFunctions/domainGeometry.h" -#include "../../include/InputFunctions/densityProfileCoefficients.h" -#include "../../include/InputFunctions/boundaryConditions.h" +#include +#include +#include /* ------ */ /* Test 1 */ /* ------ */ -#include "../include/InputFunctions/DomainGeometry/circularGeometry.h" -#include "../include/InputFunctions/DensityProfileCoefficients/sonnendruckerGyroCoefficients.h" +#include +#include /* ------ */ /* Test 2 */ /* ------ */ -#include "../include/InputFunctions/DomainGeometry/shafranovGeometry.h" -#include "../include/InputFunctions/DensityProfileCoefficients/zoniGyroCoefficients.h" +#include +#include /* ------ */ /* Test 3 */ /* ------ */ -#include "../include/InputFunctions/DomainGeometry/czarnyGeometry.h" -#include "../include/InputFunctions/DensityProfileCoefficients/zoniShiftedCoefficients.h" +#include +#include /* ------ */ /* Test 4 */ /* ------ */ -#include "../include/InputFunctions/DomainGeometry/culhamGeometry.h" -#include "../include/InputFunctions/DensityProfileCoefficients/zoniShiftedGyroCoefficients.h" +#include +#include using namespace gmgpolar; #ifdef GMGPOLAR_USE_MUMPS diff --git a/tests/DirectSolver/directSolverNoMumps.cpp b/tests/DirectSolver/directSolverNoMumps.cpp index 622a2785..f863c670 100644 --- a/tests/DirectSolver/directSolverNoMumps.cpp +++ b/tests/DirectSolver/directSolverNoMumps.cpp @@ -5,37 +5,37 @@ #include "../test_tools.h" -#include "../../include/GMGPolar/gmgpolar.h" +#include -#include "../../include/Residual/ResidualGive/residualGive.h" -#include "../../include/DirectSolver/DirectSolver-COO-MUMPS-Give/directSolverGive.h" -#include "../../include/DirectSolver/DirectSolver-COO-MUMPS-Take/directSolverTake.h" -#include "../../include/DirectSolver/DirectSolver-CSR-LU-Give/directSolverGiveCustomLU.h" -#include "../../include/DirectSolver/DirectSolver-CSR-LU-Take/directSolverTakeCustomLU.h" +#include +#include +#include +#include +#include -#include "../../include/InputFunctions/domainGeometry.h" -#include "../../include/InputFunctions/densityProfileCoefficients.h" -#include "../../include/InputFunctions/boundaryConditions.h" +#include +#include +#include /* ------ */ /* Test 1 */ /* ------ */ -#include "../include/InputFunctions/DomainGeometry/circularGeometry.h" -#include "../include/InputFunctions/DensityProfileCoefficients/sonnendruckerGyroCoefficients.h" +#include +#include /* ------ */ /* Test 2 */ /* ------ */ -#include "../include/InputFunctions/DomainGeometry/shafranovGeometry.h" -#include "../include/InputFunctions/DensityProfileCoefficients/zoniGyroCoefficients.h" +#include +#include /* ------ */ /* Test 3 */ /* ------ */ -#include "../include/InputFunctions/DomainGeometry/czarnyGeometry.h" -#include "../include/InputFunctions/DensityProfileCoefficients/zoniShiftedCoefficients.h" +#include +#include /* ------ */ /* Test 4 */ /* ------ */ -#include "../include/InputFunctions/DomainGeometry/culhamGeometry.h" -#include "../include/InputFunctions/DensityProfileCoefficients/zoniShiftedGyroCoefficients.h" +#include +#include using namespace gmgpolar; /* Test 1/2: */ diff --git a/tests/ExtrapolatedSmoother/extrapolated_smoother.cpp b/tests/ExtrapolatedSmoother/extrapolated_smoother.cpp index b6293230..a667bea1 100644 --- a/tests/ExtrapolatedSmoother/extrapolated_smoother.cpp +++ b/tests/ExtrapolatedSmoother/extrapolated_smoother.cpp @@ -5,22 +5,22 @@ #include "../test_tools.h" -#include "../../include/GMGPolar/gmgpolar.h" +#include -#include "../../include/Residual/ResidualGive/residualGive.h" -#include "../../include/Residual/ResidualTake/residualTake.h" -#include "../../include/DirectSolver/DirectSolver-CSR-LU-Give/directSolverGiveCustomLU.h" -#include "../../include/DirectSolver/DirectSolver-CSR-LU-Take/directSolverTakeCustomLU.h" -#include "../../include/ExtrapolatedSmoother/ExtrapolatedSmootherGive/extrapolatedSmootherGive.h" -#include "../../include/ExtrapolatedSmoother/ExtrapolatedSmootherTake/extrapolatedSmootherTake.h" +#include +#include +#include +#include +#include +#include -#include "../../include/InputFunctions/domainGeometry.h" -#include "../../include/InputFunctions/densityProfileCoefficients.h" +#include +#include /* --------- */ /* Test Case */ /* --------- */ -#include "../include/InputFunctions/DomainGeometry/czarnyGeometry.h" -#include "../include/InputFunctions/DensityProfileCoefficients/zoniShiftedCoefficients.h" +#include +#include #include using namespace gmgpolar; diff --git a/tests/GMGPolar/convergence_order.cpp b/tests/GMGPolar/convergence_order.cpp index aed50c1c..a78bbdf2 100644 --- a/tests/GMGPolar/convergence_order.cpp +++ b/tests/GMGPolar/convergence_order.cpp @@ -5,11 +5,11 @@ #include #include -#include "../../include/ConfigParser/test_selection.h" -#include "../../include/GMGPolar/gmgpolar.h" -#include "../../include/InputFunctions/boundaryConditions.h" -#include "../../include/InputFunctions/densityProfileCoefficients.h" -#include "../../include/InputFunctions/sourceTerm.h" +#include +#include +#include +#include +#include using namespace gmgpolar; template diff --git a/tests/GMGPolar/pcg_tests.cpp b/tests/GMGPolar/pcg_tests.cpp index d03cdbe4..71b8aec7 100644 --- a/tests/GMGPolar/pcg_tests.cpp +++ b/tests/GMGPolar/pcg_tests.cpp @@ -5,8 +5,8 @@ #include // Including the necessary header from the project -#include "../../include/GMGPolar/gmgpolar.h" -#include "../../include/ConfigParser/test_selection.h" +#include +#include using namespace gmgpolar; template diff --git a/tests/GMGPolar/solve_tests.cpp b/tests/GMGPolar/solve_tests.cpp index bc247297..4e6ecb00 100644 --- a/tests/GMGPolar/solve_tests.cpp +++ b/tests/GMGPolar/solve_tests.cpp @@ -5,8 +5,8 @@ #include // Including the necessary header from the project -#include "../../include/ConfigParser/test_selection.h" -#include "../../include/GMGPolar/gmgpolar.h" +#include +#include using namespace gmgpolar; template diff --git a/tests/Interpolation/extrapolated_prolongation.cpp b/tests/Interpolation/extrapolated_prolongation.cpp index f2af7201..462367d6 100644 --- a/tests/Interpolation/extrapolated_prolongation.cpp +++ b/tests/Interpolation/extrapolated_prolongation.cpp @@ -3,9 +3,9 @@ #include "../test_tools.h" -#include "../../include/GMGPolar/gmgpolar.h" -#include "../../include/Interpolation/interpolation.h" -#include "../../include/InputFunctions/DensityProfileCoefficients/poissonCoefficients.h" +#include +#include +#include using namespace gmgpolar; // Helper that computes the mathematically expected extrapolated prolongation value diff --git a/tests/Interpolation/extrapolated_restriction.cpp b/tests/Interpolation/extrapolated_restriction.cpp index b3d7f06a..73600c1b 100644 --- a/tests/Interpolation/extrapolated_restriction.cpp +++ b/tests/Interpolation/extrapolated_restriction.cpp @@ -3,9 +3,9 @@ #include "../test_tools.h" -#include "../../include/GMGPolar/gmgpolar.h" -#include "../../include/Interpolation/interpolation.h" -#include "../../include/InputFunctions/DensityProfileCoefficients/poissonCoefficients.h" +#include +#include +#include using namespace gmgpolar; // Helper that computes the mathematically expected extrapolated restriction value diff --git a/tests/Interpolation/prolongation.cpp b/tests/Interpolation/prolongation.cpp index ff0cd212..fdfa9ae1 100644 --- a/tests/Interpolation/prolongation.cpp +++ b/tests/Interpolation/prolongation.cpp @@ -3,8 +3,8 @@ #include "../test_tools.h" -#include "../../include/Interpolation/interpolation.h" -#include "../../include/InputFunctions/DensityProfileCoefficients/poissonCoefficients.h" +#include +#include using namespace gmgpolar; // Helper that computes the mathematically expected prolongation value diff --git a/tests/Interpolation/restriction.cpp b/tests/Interpolation/restriction.cpp index a94faa07..cd2ac6e9 100644 --- a/tests/Interpolation/restriction.cpp +++ b/tests/Interpolation/restriction.cpp @@ -3,8 +3,8 @@ #include "../test_tools.h" -#include "../../include/Interpolation/interpolation.h" -#include "../../include/InputFunctions/DensityProfileCoefficients/poissonCoefficients.h" +#include +#include using namespace gmgpolar; // Helper that computes the mathematically expected restriction value diff --git a/tests/PolarGrid/polargrid.cpp b/tests/PolarGrid/polargrid.cpp index 37819c0f..3def5090 100644 --- a/tests/PolarGrid/polargrid.cpp +++ b/tests/PolarGrid/polargrid.cpp @@ -1,5 +1,5 @@ #include -#include "../../include/PolarGrid/polargrid.h" +#include using namespace gmgpolar; TEST(PolarGridTest, DefaultConstructor) diff --git a/tests/Residual/residual.cpp b/tests/Residual/residual.cpp index c88529fb..50c57ec8 100644 --- a/tests/Residual/residual.cpp +++ b/tests/Residual/residual.cpp @@ -5,19 +5,19 @@ #include "../test_tools.h" -#include "../../include/GMGPolar/gmgpolar.h" +#include -#include "../../include/Residual/ResidualGive/residualGive.h" -#include "../../include/Residual/ResidualTake/residualTake.h" +#include +#include -#include "../../include/InputFunctions/domainGeometry.h" -#include "../../include/InputFunctions/densityProfileCoefficients.h" -#include "../../include/InputFunctions/boundaryConditions.h" +#include +#include +#include /* --------- */ /* Test Case */ /* --------- */ -#include "../include/InputFunctions/DomainGeometry/czarnyGeometry.h" -#include "../include/InputFunctions/DensityProfileCoefficients/zoniShiftedCoefficients.h" +#include +#include using namespace gmgpolar; /* Test 1/1: */ diff --git a/tests/Smoother/smoother.cpp b/tests/Smoother/smoother.cpp index adb38f74..4e3c62e4 100644 --- a/tests/Smoother/smoother.cpp +++ b/tests/Smoother/smoother.cpp @@ -5,21 +5,21 @@ #include "../test_tools.h" -#include "../../include/GMGPolar/gmgpolar.h" +#include -#include "../../include/Residual/ResidualGive/residualGive.h" -#include "../../include/DirectSolver/DirectSolver-CSR-LU-Give/directSolverGiveCustomLU.h" -#include "../../include/Smoother/SmootherGive/smootherGive.h" -#include "../../include/Smoother/SmootherTake/smootherTake.h" +#include +#include +#include +#include -#include "../../include/InputFunctions/domainGeometry.h" -#include "../../include/InputFunctions/densityProfileCoefficients.h" -#include "../../include/InputFunctions/boundaryConditions.h" +#include +#include +#include /* --------- */ /* Test Case */ /* --------- */ -#include "../include/InputFunctions/DomainGeometry/czarnyGeometry.h" -#include "../include/InputFunctions/DensityProfileCoefficients/zoniShiftedCoefficients.h" +#include +#include #include using namespace gmgpolar; diff --git a/tests/test_tools.h b/tests/test_tools.h index 5f0f87c8..32c10f9c 100644 --- a/tests/test_tools.h +++ b/tests/test_tools.h @@ -1,8 +1,8 @@ #pragma once #include -#include "../include/PolarGrid/polargrid.h" -#include "../include/LinearAlgebra/Vector/vector.h" +#include +#include using namespace gmgpolar;