Larger number of colors for the discrete adjoint.

su2code · Nov 14, 2023 · d45447a · d45447a
1 parent 21a0e4a
commit d45447a
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/Common/include/toolboxes/graph_toolbox.hpp b/Common/include/toolboxes/graph_toolbox.hpp
@@ -484,7 +484,7 @@ T createNaturalColoring(Index_t numInnerIndexes) {
  * \param[out] indexColor - Optional, vector with colors given to the outer indices.
  * \return Coloring in the same type of the input pattern.
  */
-template <typename Color_t = unsigned char, size_t MaxColors = 255, size_t MaxMB = 128, class T>
+template <typename Color_t = char, size_t MaxColors = 64, size_t MaxMB = 128, class T>
 T colorSparsePattern(const T& pattern, size_t groupSize = 1, bool balanceColors = false,
                      std::vector<Color_t>* indexColor = nullptr) {
   static_assert(std::is_integral<Color_t>::value, "");

diff --git a/SU2_CFD/include/solvers/CFVMFlowSolverBase.inl b/SU2_CFD/include/solvers/CFVMFlowSolverBase.inl
@@ -291,8 +291,9 @@ void CFVMFlowSolverBase<V, R>::HybridParallelInitialization(const CConfig& confi
 
 #ifdef CODI_REVERSE_TYPE
   /*--- For the discrete adjoint, the reducer strategy is costly. Prefer coloring, possibly with reduced edge color
-   *    group size. Find the maximum edge color group size that yields an efficient coloring. ---*/
-  const auto& coloring = geometry.GetEdgeColoring(&parallelEff, true);
+   *    group size. Find the maximum edge color group size that yields an efficient coloring. Also, allow larger numbers
+   *    of colors. ---*/
+  const auto& coloring = geometry.GetEdgeColoring<unsigned char, 255>(&parallelEff, true);
 #else
   const auto& coloring = geometry.GetEdgeColoring(&parallelEff);
 #endif

diff --git a/SU2_CFD/include/solvers/CScalarSolver.inl b/SU2_CFD/include/solvers/CScalarSolver.inl
@@ -48,8 +48,9 @@ CScalarSolver<VariableType>::CScalarSolver(CGeometry* geometry, CConfig* config,
   su2double parallelEff = 1.0;
 #ifdef CODI_REVERSE_TYPE
   /*--- For the discrete adjoint, the reducer strategy is costly. Prefer coloring, possibly with reduced edge color
-   *    group size. Find the maximum edge color group size that yields an efficient coloring. ---*/
-  const auto& coloring = geometry->GetEdgeColoring(&parallelEff, true);
+   *    group size. Find the maximum edge color group size that yields an efficient coloring. Also, allow larger numbers
+   *    of colors. ---*/
+  const auto& coloring = geometry->GetEdgeColoring<unsigned char, 255>(&parallelEff, true);
 #else
   const auto& coloring = geometry->GetEdgeColoring(&parallelEff);
 #endif