From c853e63082d81027470d5ede08c57521af2e5b64 Mon Sep 17 00:00:00 2001 From: Patrick Kreissl Date: Fri, 4 Feb 2022 10:52:11 +0100 Subject: [PATCH] master -> main. --- src/core/HybridDecomposition.cpp | 2 +- src/core/cells.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/core/HybridDecomposition.cpp b/src/core/HybridDecomposition.cpp index cf6376402a6..a697dffed15 100644 --- a/src/core/HybridDecomposition.cpp +++ b/src/core/HybridDecomposition.cpp @@ -143,7 +143,7 @@ void HybridDecomposition::resort(bool global, m_n_square.resort(global, diff); /* basically do CellStructure::ghost_count() */ - ghost_communicator(exchange_ghosts_comm(),GHOSTTRANS_PARTNUM); + ghost_communicator(exchange_ghosts_comm(), GHOSTTRANS_PARTNUM); /* basically do CellStructure::ghost_update(unsigned data_parts) */ ghost_communicator(exchange_ghosts_comm(), diff --git a/src/core/cells.cpp b/src/core/cells.cpp index c192f22a8c0..fe79b50c044 100644 --- a/src/core/cells.cpp +++ b/src/core/cells.cpp @@ -240,11 +240,11 @@ static Utils::Vector hybrid_parts_per_decomposition_local() { return parts_per_decomposition; } -REGISTER_CALLBACK_MASTER_RANK(hybrid_parts_per_decomposition_local) +REGISTER_CALLBACK_MAIN_RANK(hybrid_parts_per_decomposition_local) std::pair hybrid_parts_per_decomposition() { auto const parts_per_decomposition = mpi_call( - Communication::Result::master_rank, hybrid_parts_per_decomposition_local); + Communication::Result::main_rank, hybrid_parts_per_decomposition_local); return std::make_pair(parts_per_decomposition[0], parts_per_decomposition[1]); }