From 62708ab3add4e1caa907ef76b8db4fbaa98eb839 Mon Sep 17 00:00:00 2001 From: Gavin Ridley Date: Sat, 15 Apr 2023 13:01:01 -0400 Subject: [PATCH] PR comments addressed --- src/message_passing.cpp | 8 ++++---- src/output.cpp | 6 ------ tests/cpp_unit_tests/test_file_utils.cpp | 1 + 3 files changed, 5 insertions(+), 10 deletions(-) diff --git a/src/message_passing.cpp b/src/message_passing.cpp index fa9036c71..7a43f78f4 100644 --- a/src/message_passing.cpp +++ b/src/message_passing.cpp @@ -24,14 +24,14 @@ vector calculate_parallel_index_vector(const int64_t size) #ifdef OPENMC_MPI result.resize(n_procs); - vector bank_size(n_procs); + result[0] = 0; + vector bank_size(n_procs + 1); // Populate the result with cumulative sum of the number of // surface source banks per process MPI_Scan(&size, bank_size.data(), 1, MPI_INT64_T, MPI_SUM, intracomm); - MPI_Allgather( - bank_size.data(), 1, MPI_INT64_T, result.data(), 1, MPI_INT64_T, intracomm); - result.insert(result.begin(), 0); + MPI_Allgather(bank_size.data() + 1, 1, MPI_INT64_T, result.data(), 1, + MPI_INT64_T, intracomm); #else result.push_back(0); result.push_back(size); diff --git a/src/output.cpp b/src/output.cpp index c280677a2..04e15b82d 100644 --- a/src/output.cpp +++ b/src/output.cpp @@ -390,12 +390,6 @@ void print_build_info() #ifdef COVERAGEBUILD coverage = y; #endif -#ifdef NCRYSTAL - ncrystal = y; -#endif -#ifdef OPENMC_MCPL - mcpl = y; -#endif // Wraps macro variables in quotes #define STRINGIFY(x) STRINGIFY2(x) diff --git a/tests/cpp_unit_tests/test_file_utils.cpp b/tests/cpp_unit_tests/test_file_utils.cpp index 23222f639..69d9b5a59 100644 --- a/tests/cpp_unit_tests/test_file_utils.cpp +++ b/tests/cpp_unit_tests/test_file_utils.cpp @@ -11,6 +11,7 @@ TEST_CASE("Test get_file_extension") REQUIRE(get_file_extension("has_directory/asdf.20.h5") == "h5"); REQUIRE(get_file_extension("wasssssup_lol") == ""); REQUIRE(get_file_extension("has_directory/secret_file") == ""); + REQUIRE(get_file_extension("lovely.dir/extensionless_file") == ""); } TEST_CASE("Test dir_exists")