Merge pull request #5414 from totto82/fix_mpi_edit_trans

Fix modifications of TRANX/Y/Z in parallel (e.g. MULTIPLY of TRANX in EDIT)
This commit is contained in:
Markus Blatt 2024-06-07 06:28:35 +02:00 committed by GitHub
commit 302503e172
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -856,8 +856,7 @@ createTransmissibilityArrays_(const std::array<bool,3>& is_tran)
unsigned c2 = elemMapper.index(intersection.outside());
int gc1 = cartMapper_.cartesianIndex(c1);
int gc2 = cartMapper_.cartesianIndex(c2);
if (c1 > c2)
if (std::tie(gc1, c1) > std::tie(gc2, c2))
continue; // we only need to handle each connection once, thank you.
auto isID = details::isId(c1, c2);
@ -920,7 +919,7 @@ resetTransmissibilityFromArrays_(const std::array<bool,3>& is_tran,
unsigned c2 = elemMapper.index(intersection.outside());
int gc1 = cartMapper_.cartesianIndex(c1);
int gc2 = cartMapper_.cartesianIndex(c2);
if (c1 > c2)
if (std::tie(gc1, c1) > std::tie(gc2, c2))
continue; // we only need to handle each connection once, thank you.
auto isID = details::isId(c1, c2);