Skip to content

Commit 224c501

Browse files
committed
Avoid recomputation of final coloring.
1 parent 09efb1a commit 224c501

1 file changed

Lines changed: 5 additions & 5 deletions

File tree

Common/src/geometry/CGeometry.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3645,17 +3645,17 @@ const CCompressedSparsePatternUL& CGeometry::GetEdgeColoring(su2double* efficien
36453645
auto lowerEdgeColorGroupSize = 1ul; /* lower bound that is known to work */
36463646

36473647
while (true) {
3648-
const auto currentEdgeColoring = colorSparsePattern(pattern, edgeColorGroupSize, balanceColors);
3648+
const auto edgeColoring = colorSparsePattern(pattern, edgeColorGroupSize, balanceColors);
36493649

36503650
/*--- if the coloring fails, reduce the color group size ---*/
3651-
if (currentEdgeColoring.empty()) {
3651+
if (edgeColoring.empty()) {
36523652
upperEdgeColorGroupSize = nextEdgeColorGroupSize;
36533653
nextEdgeColorGroupSize = lowerEdgeColorGroupSize + (upperEdgeColorGroupSize - lowerEdgeColorGroupSize) / 2;
36543654
continue;
36553655
}
36563656

36573657
const su2double currentEfficiency =
3658-
coloringEfficiency(currentEdgeColoring, omp_get_max_threads(), nextEdgeColorGroupSize);
3658+
coloringEfficiency(edgeColoring, omp_get_max_threads(), nextEdgeColorGroupSize);
36593659

36603660
/*--- if the coloring is not efficient, reduce the color group size ---*/
36613661
if (currentEfficiency < COLORING_EFF_THRESH) {
@@ -3675,10 +3675,10 @@ const CCompressedSparsePatternUL& CGeometry::GetEdgeColoring(su2double* efficien
36753675
}
36763676

36773677
edgeColorGroupSize = nextEdgeColorGroupSize;
3678+
} else {
3679+
edgeColoring = colorSparsePattern(pattern, edgeColorGroupSize, balanceColors);
36783680
}
36793681

3680-
edgeColoring = colorSparsePattern(pattern, edgeColorGroupSize, balanceColors);
3681-
36823682
/*--- If the coloring fails use the natural coloring. This is a
36833683
* "soft" failure as this "bad" coloring should be detected
36843684
* downstream and a fallback strategy put in place. ---*/

0 commit comments

Comments
 (0)