From aa70c20f4829ff3d252f38f9e4b219e83cc0c8d0 Mon Sep 17 00:00:00 2001
From: "Dmitry Yu. Naumov" <github@naumov.de>
Date: Tue, 17 Jul 2018 17:59:13 +0200
Subject: [PATCH] NWMP; Renames and shortcuts in processPartition.
---
.../PartitionMesh/NodeWiseMeshPartitioner.cpp | 22 +++++++++----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/Applications/Utils/ModelPreparation/PartitionMesh/NodeWiseMeshPartitioner.cpp b/Applications/Utils/ModelPreparation/PartitionMesh/NodeWiseMeshPartitioner.cpp
index 655aea47637..e4974b8a2b2 100644
--- a/Applications/Utils/ModelPreparation/PartitionMesh/NodeWiseMeshPartitioner.cpp
+++ b/Applications/Utils/ModelPreparation/PartitionMesh/NodeWiseMeshPartitioner.cpp
@@ -291,20 +291,19 @@ findGhostNodesInPartition(
void NodeWiseMeshPartitioner::processPartition(
std::size_t const part_id, const bool is_mixed_high_order_linear_elems)
{
- std::vector<MeshLib::Node*> extra_nodes;
- std::tie(_partitions[part_id].nodes, extra_nodes) =
+ auto& partition = _partitions[part_id];
+ std::vector<MeshLib::Node*> higher_order_regular_nodes;
+ std::tie(partition.nodes, higher_order_regular_nodes) =
findNonGhostNodesInPartition(part_id, is_mixed_high_order_linear_elems,
_mesh->getNumberOfBaseNodes(),
_mesh->getNodes(), _nodes_partition_ids);
- _partitions[part_id].number_of_non_ghost_base_nodes =
- _partitions[part_id].nodes.size();
- _partitions[part_id].number_of_non_ghost_nodes =
- _partitions[part_id].number_of_non_ghost_base_nodes +
- extra_nodes.size();
+ partition.number_of_non_ghost_base_nodes = partition.nodes.size();
+ partition.number_of_non_ghost_nodes =
+ partition.number_of_non_ghost_base_nodes +
+ higher_order_regular_nodes.size();
- std::tie(_partitions[part_id].regular_elements,
- _partitions[part_id].ghost_elements) =
+ std::tie(partition.regular_elements, partition.ghost_elements) =
findElementsInPartition(part_id, _mesh->getElements(),
_nodes_partition_ids);
std::vector<MeshLib::Node*> base_ghost_nodes;
@@ -322,8 +321,9 @@ void NodeWiseMeshPartitioner::processPartition(
if (is_mixed_high_order_linear_elems)
{
- partition.nodes.insert(partition.nodes.end(), extra_nodes.begin(),
- extra_nodes.end());
+ std::copy(begin(higher_order_regular_nodes),
+ end(higher_order_regular_nodes),
+ std::back_inserter(partition.nodes));
std::copy(begin(higher_order_ghost_nodes),
end(higher_order_ghost_nodes),
std::back_inserter(partition.nodes));
--
GitLab