From 30c73bd24aa9e1febf45814b6bc63a3bd8ae573c Mon Sep 17 00:00:00 2001
From: Wenqing Wang <wenqing.wang@ufz.de>
Date: Fri, 1 Oct 2021 16:21:01 +0200
Subject: [PATCH] [NodePartitionedMeshReader] gathered active node numbers.
---
.../IO/MPI_IO/NodePartitionedMeshReader.cpp | 45 ++++++++++++++++---
1 file changed, 39 insertions(+), 6 deletions(-)
diff --git a/MeshLib/IO/MPI_IO/NodePartitionedMeshReader.cpp b/MeshLib/IO/MPI_IO/NodePartitionedMeshReader.cpp
index 7f40beda4ec..e3d6f7b2d33 100644
--- a/MeshLib/IO/MPI_IO/NodePartitionedMeshReader.cpp
+++ b/MeshLib/IO/MPI_IO/NodePartitionedMeshReader.cpp
@@ -15,13 +15,12 @@
#include "NodePartitionedMeshReader.h"
-#include "BaseLib/Logging.h"
-
-#ifdef USE_PETSC
#include <mpi.h>
-#endif
+
+#include <numeric>
#include "BaseLib/FileTools.h"
+#include "BaseLib/Logging.h"
#include "BaseLib/RunTime.h"
#include "MeshLib/Elements/Elements.h"
#include "MeshLib/MeshEnums.h"
@@ -381,10 +380,44 @@ MeshLib::NodePartitionedMesh* NodePartitionedMeshReader::newMesh(
std::vector<MeshLib::Element*> const& mesh_elems,
MeshLib::Properties const& properties) const
{
+ std::vector<std::size_t> gathered_n_active_base_nodes(_mpi_comm_size);
+
+ MPI_Allgather(&_mesh_info.active_base_nodes,
+ 1,
+ MPI_UNSIGNED_LONG,
+ gathered_n_active_base_nodes.data(),
+ 1,
+ MPI_UNSIGNED_LONG,
+ _mpi_comm);
+
+ std::vector<std::size_t> n_active_base_nodes_at_rank;
+ n_active_base_nodes_at_rank.push_back(0);
+ std::partial_sum(begin(gathered_n_active_base_nodes),
+ end(gathered_n_active_base_nodes),
+ back_inserter(n_active_base_nodes_at_rank));
+
+ std::vector<std::size_t> gathered_n_active_high_order_nodes(_mpi_comm_size);
+ std::size_t const n_active_high_order_nodes =
+ _mesh_info.active_nodes - _mesh_info.active_base_nodes;
+ MPI_Allgather(&n_active_high_order_nodes,
+ 1,
+ MPI_UNSIGNED_LONG,
+ gathered_n_active_high_order_nodes.data(),
+ 1,
+ MPI_UNSIGNED_LONG,
+ _mpi_comm);
+
+ std::vector<std::size_t> n_active_high_order_nodes_at_rank;
+ n_active_high_order_nodes_at_rank.push_back(0);
+ std::partial_sum(begin(gathered_n_active_high_order_nodes),
+ end(gathered_n_active_high_order_nodes),
+ back_inserter(n_active_high_order_nodes_at_rank));
+
return new MeshLib::NodePartitionedMesh(
mesh_name, mesh_nodes, glb_node_ids, mesh_elems, properties,
- _mesh_info.global_nodes, _mesh_info.active_base_nodes,
- _mesh_info.active_nodes);
+ _mesh_info.global_base_nodes, _mesh_info.global_nodes,
+ _mesh_info.active_nodes, std::move(n_active_base_nodes_at_rank),
+ std::move(n_active_high_order_nodes_at_rank));
}
void NodePartitionedMeshReader::setNodes(
--
GitLab