From daeb592de61fd2bd6a47937df4a20a8369a72dbb Mon Sep 17 00:00:00 2001
From: Rafael Ravedutti <rafaelravedutti@gmail.com>
Date: Tue, 20 Feb 2024 13:41:37 +0100
Subject: [PATCH] Fix C++ standards and waLBerla data types
Signed-off-by: Rafael Ravedutti <rafaelravedutti@gmail.com>
---
CMakeLists.txt | 4 ++--
runtime/domain/block_forest.hpp | 8 ++++----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a53979a..67d7074 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -120,11 +120,11 @@ endif()
target_link_libraries(${CPU_BIN} ${CMAKE_EXE_LINKER_FLAGS})
set_target_properties(${CPU_BIN} PROPERTIES CXX_STANDARD_REQUIRED ON)
-set_target_properties(${CPU_BIN} PROPERTIES CXX_STANDARD 14)
+set_target_properties(${CPU_BIN} PROPERTIES CXX_STANDARD 17)
target_link_libraries(${GPU_BIN} ${CMAKE_EXE_LINKER_FLAGS})
set_target_properties(${GPU_BIN} PROPERTIES CXX_STANDARD_REQUIRED ON)
-set_target_properties(${GPU_BIN} PROPERTIES CXX_STANDARD 14)
+set_target_properties(${GPU_BIN} PROPERTIES CXX_STANDARD 17)
if(USE_MPI)
find_package(MPI REQUIRED)
diff --git a/runtime/domain/block_forest.hpp b/runtime/domain/block_forest.hpp
index fd49eb1..7a11aa4 100644
--- a/runtime/domain/block_forest.hpp
+++ b/runtime/domain/block_forest.hpp
@@ -23,9 +23,9 @@ namespace pairs {
class BlockForest : public DomainPartitioner {
private:
std::shared_ptr<BlockForest> forest;
- blockforest::InfoCollection info;
- std::map<int, std::vector<math::AABB>> neighborhood;
- std::map<int, std::vector<BlockID>> blocks_pushed;
+ walberla::blockforest::InfoCollection info;
+ std::map<int, std::vector<walberla::math::AABB>> neighborhood;
+ std::map<int, std::vector<walberla::BlockID>> blocks_pushed;
std::vector<int> ranks;
std::vector<int> naabbs;
std::vector<int> aabb_offsetss;
@@ -56,7 +56,7 @@ public:
void initializeWorkloadBalancer();
void updateNeighborhood();
void updateWeights(real_t *position, int nparticles);
- Vector3<int> getBlockConfig(int num_processes, int nx, int ny, int nz);
+ walberla::Vector3<int> getBlockConfig(int num_processes, int nx, int ny, int nz);
int getInitialRefinementLevel(int num_processes);
void setBoundingBox();
void rebalance();
--
GitLab