max/poet
1
0
Fork 0
mirror of https://git.gfz-potsdam.de/naaice/poet.git synced 2025-12-16 04:48:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add OpenMP support and fix include paths

Browse Source
This commit is contained in:
Max Lübke 2024-03-06 13:06:53 +00:00
parent 106f9c519e
commit be7a861c78
6 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -19,7 +19,7 @@ get_poet_version()
# set(GCC_CXX_FLAGS "-D STRICT_R_HEADERS") add_definitions(${GCC_CXX_FLAGS}) # set(GCC_CXX_FLAGS "-D STRICT_R_HEADERS") add_definitions(${GCC_CXX_FLAGS})
find_package(MPI REQUIRED) find_package(MPI REQUIRED)
find_package(OpenMP)
find_package(RRuntime REQUIRED) find_package(RRuntime REQUIRED)
add_subdirectory(src) add_subdirectory(src)

4
src/CMakeLists.txt
View File

@ -39,6 +39,10 @@ if (POET_PHT_ADDITIONAL_INFO)
target_compile_definitions(poetlib PRIVATE POET_PHT_ADD) target_compile_definitions(poetlib PRIVATE POET_PHT_ADD)
endif() endif()
if (OpenMP_FOUND)
target_link_libraries(poetlib PUBLIC OpenMP::OpenMP_CXX)
endif()
file(READ "${PROJECT_SOURCE_DIR}/R_lib/kin_r_library.R" R_KIN_LIB ) file(READ "${PROJECT_SOURCE_DIR}/R_lib/kin_r_library.R" R_KIN_LIB )
configure_file(poet.hpp.in poet.hpp @ONLY) configure_file(poet.hpp.in poet.hpp @ONLY)

2
src/Transport/AdvectionModule.cpp
View File

@ -1,5 +1,7 @@
#include "AdvectionModule.hpp" #include "AdvectionModule.hpp"
#include "../Base/Macros.hpp"
#include <cstddef> #include <cstddef>
#include <cstdint> #include <cstdint>
#include <cstdlib> #include <cstdlib>

1
src/poet.cpp
View File

@ -23,6 +23,7 @@
#include "Base/RInsidePOET.hpp" #include "Base/RInsidePOET.hpp"
#include "Base/SimParams.hpp" #include "Base/SimParams.hpp"
#include "Chemistry/ChemistryModule.hpp" #include "Chemistry/ChemistryModule.hpp"
#include "Transport/AdvectionModule.hpp"
#include "Transport/DiffusionModule.hpp" #include "Transport/DiffusionModule.hpp"
#include <poet.hpp> #include <poet.hpp>

4
test/CMakeLists.txt
View File

@ -17,5 +17,5 @@ add_custom_target(check
) )
add_executable(advection advection/testAdvection.cpp) add_executable(advection advection/testAdvection.cpp)
target_include_directories(advection PRIVATE "${CMAKE_CURRENT_BINARY_DIR}") target_include_directories(advection PRIVATE "${CMAKE_CURRENT_BINARY_DIR}" "${PROJECT_SOURCE_DIR}/src")
target_link_libraries(advection poet_lib) target_link_libraries(advection poetlib)

3
test/advection/testAdvection.cpp
View File

@ -1,5 +1,6 @@
#include <Transport/AdvectionModule.hpp>
#include <cstddef> #include <cstddef>
#include <poet/AdvectionModule.hpp>
#include <string> #include <string>
#include "InputFiles.hpp" #include "InputFiles.hpp"