From 7b20e888a80fee608f01e7dc13ce21eb42b4ffe7 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Tue, 27 Jun 2023 13:02:20 +0200
Subject: [PATCH] REGRESSION: inconsistent constructMap order in
meshToMesh::calcProcMap
- commit fb69a54bc309 accidentally changed the constructMap compact
order from linear ordering to local elements first order. Seems to
interact poorly with other bookkeeping so doing a partial revert,
but still replacing the old allGatherList with exchangeSizes.
Note:
the processorLOD method does actually use a constructMap with local
elements first ordering, so some inconsistency may still exist
there
---
.../meshToMesh/meshToMeshParallelOps.C | 39 ++++++++++++++-----
1 file changed, 29 insertions(+), 10 deletions(-)
diff --git a/src/sampling/meshToMesh/meshToMeshParallelOps.C b/src/sampling/meshToMesh/meshToMeshParallelOps.C
index 180290a4694..ed4c3efb38e 100644
--- a/src/sampling/meshToMesh/meshToMeshParallelOps.C
+++ b/src/sampling/meshToMesh/meshToMeshParallelOps.C
@@ -212,27 +212,46 @@ Foam::autoPtr<Foam::mapDistribute> Foam::meshToMesh::calcProcMap
}
}
- // convert dynamicList to labelList
- forAll(sendMap, proci)
- {
- sendMap[proci].transfer(dynSendMap[proci]);
- }
-
- // debug printing
if (debug)
{
Pout<< "Of my " << tgt.nCells()
<< " target cells I need to send to:" << nl
<< "\tproc\tcells" << endl;
- forAll(sendMap, proci)
+ forAll(dynSendMap, proci)
{
Pout<< '\t' << proci << '\t'
- << sendMap[proci].size() << endl;
+ << dynSendMap[proci].size() << endl;
}
}
+
+ // Convert DynamicList -> List
+ forAll(sendMap, proci)
+ {
+ sendMap[proci].transfer(dynSendMap[proci]);
+ }
}
- return autoPtr<mapDistribute>::New(std::move(sendMap));
+
+ labelList recvSizes;
+ Pstream::exchangeSizes(sendMap, recvSizes, UPstream::worldComm);
+
+ // Uses linear receive order
+ labelListList constructMap(UPstream::nProcs());
+
+ label constructSize = 0;
+ forAll(constructMap, proci)
+ {
+ const label len = recvSizes[proci];
+ constructMap[proci] = identity(len, constructSize);
+ constructSize += len;
+ }
+
+ return autoPtr<mapDistribute>::New
+ (
+ constructSize,
+ std::move(sendMap),
+ std::move(constructMap)
+ );
break;
}
}
--
GitLab