From e58be3fedfdd1508fced336a0e4154f5b3478b26 Mon Sep 17 00:00:00 2001 From: StaticObserver Date: Fri, 21 Jun 2024 11:32:43 +0800 Subject: [PATCH 1/5] fix bug in metadomain.cpp; link library stdc++fs --- src/CMakeLists.txt | 3 ++- src/framework/domain/metadomain.cpp | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 162d48df9..c15a90795 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -37,4 +37,5 @@ add_subdirectory(${SRC_DIR}/../setups ${CMAKE_CURRENT_BINARY_DIR}/setups) set(libs ntt_global ntt_framework ntt_metrics ntt_engines ntt_pgen) add_dependencies(${ENTITY} ${libs}) -target_link_libraries(${ENTITY} PUBLIC ${libs}) \ No newline at end of file +target_link_libraries(${ENTITY} PUBLIC ${libs}) +target_link_libraries(${ENTITY} PUBLIC stdc++fs) \ No newline at end of file diff --git a/src/framework/domain/metadomain.cpp b/src/framework/domain/metadomain.cpp index 86a9420fd..584bfa551 100644 --- a/src/framework/domain/metadomain.cpp +++ b/src/framework/domain/metadomain.cpp @@ -375,7 +375,7 @@ namespace ntt { template void Metadomain::metricCompatibilityCheck() const { const auto dx_min = g_mesh.metric.dxMin(); - auto dx_min_from_domains = INFINITY; + auto dx_min_from_domains = std::numeric_limits::infinity(); for (unsigned int idx { 0 }; idx < g_ndomains; ++idx) { const auto& current_domain = g_subdomains[idx]; const auto current_dx_min = current_domain.mesh.metric.dxMin(); From a98f023247bda5a90b24213b3ac791a07e9fb921 Mon Sep 17 00:00:00 2001 From: hayk Date: Thu, 27 Jun 2024 15:42:06 -0400 Subject: [PATCH 2/5] Update CMakeLists.txt putting stdc++fs only where necessary --- src/CMakeLists.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index c15a90795..38478ad11 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -37,5 +37,4 @@ add_subdirectory(${SRC_DIR}/../setups ${CMAKE_CURRENT_BINARY_DIR}/setups) set(libs ntt_global ntt_framework ntt_metrics ntt_engines ntt_pgen) add_dependencies(${ENTITY} ${libs}) -target_link_libraries(${ENTITY} PUBLIC ${libs}) -target_link_libraries(${ENTITY} PUBLIC stdc++fs) \ No newline at end of file +target_link_libraries(${ENTITY} ${libs}) From 1aa8c8c5394a5de86c6662c4a6d905ff7a7b9f6d Mon Sep 17 00:00:00 2001 From: hayk Date: Thu, 27 Jun 2024 15:43:39 -0400 Subject: [PATCH 3/5] Update CMakeLists.txt needs to be PUBLIC (fixing my own bug) --- src/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 38478ad11..5d7f0abb4 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -37,4 +37,4 @@ add_subdirectory(${SRC_DIR}/../setups ${CMAKE_CURRENT_BINARY_DIR}/setups) set(libs ntt_global ntt_framework ntt_metrics ntt_engines ntt_pgen) add_dependencies(${ENTITY} ${libs}) -target_link_libraries(${ENTITY} ${libs}) +target_link_libraries(${ENTITY} PUBLIC ${libs}) From 4bd5728dd32ae452a70e6186040963fa8e95966c Mon Sep 17 00:00:00 2001 From: hayk Date: Thu, 27 Jun 2024 15:59:39 -0400 Subject: [PATCH 4/5] added lib --- src/framework/domain/metadomain.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/framework/domain/metadomain.cpp b/src/framework/domain/metadomain.cpp index 584bfa551..b13475fd6 100644 --- a/src/framework/domain/metadomain.cpp +++ b/src/framework/domain/metadomain.cpp @@ -21,6 +21,7 @@ #include #endif +#include #include #include #include From 0d4db39c1d8eca744931d69de9d721fb6dc5121a Mon Sep 17 00:00:00 2001 From: hayk Date: Mon, 1 Jul 2024 05:27:48 +0000 Subject: [PATCH 5/5] linked stdc++fs --- src/global/CMakeLists.txt | 3 ++- src/output/tests/CMakeLists.txt | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/global/CMakeLists.txt b/src/global/CMakeLists.txt index 1038bc4b7..d00689283 100644 --- a/src/global/CMakeLists.txt +++ b/src/global/CMakeLists.txt @@ -22,4 +22,5 @@ add_library(ntt_global ${SOURCES}) target_include_directories(ntt_global PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} INTERFACE ${CMAKE_CURRENT_SOURCE_DIR} -) \ No newline at end of file +) +target_link_libraries(ntt_global PRIVATE stdc++fs) \ No newline at end of file diff --git a/src/output/tests/CMakeLists.txt b/src/output/tests/CMakeLists.txt index 926a3a89e..d33cc6c54 100644 --- a/src/output/tests/CMakeLists.txt +++ b/src/output/tests/CMakeLists.txt @@ -17,7 +17,7 @@ function(gen_test title) set (libs ntt_output ntt_global ntt_metrics ntt_framework) add_dependencies(${exec} ${libs}) - target_link_libraries(${exec} PRIVATE ${libs}) + target_link_libraries(${exec} PRIVATE ${libs} stdc++fs) add_test(NAME "OUTPUT::${title}" COMMAND "${exec}") endfunction()