IOSS: cgns - minor tweak to decomposition algorithm to avoid 0 intervals

sandialabs · Jan 28, 2025 · 94e88d4 · 94e88d4
1 parent 47bf712
commit 94e88d4
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 5 deletions.
diff --git a/packages/seacas/libraries/ioss/src/cgns/Iocgns_StructuredZoneData.C b/packages/seacas/libraries/ioss/src/cgns/Iocgns_StructuredZoneData.C
@@ -1,4 +1,4 @@
-// Copyright(C) 1999-2024 National Technology & Engineering Solutions
+// Copyright(C) 1999-2025 National Technology & Engineering Solutions
 // of Sandia, LLC (NTESS).  Under the terms of Contract DE-NA0003525 with
 // NTESS, the U.S. Government retains certain rights in this software.
 //
@@ -263,13 +263,13 @@ namespace Iocgns {
     size_t work2 = ord2 * m_ordinal[0] * m_ordinal[1];
 
     // Don't decompose along m_lineOrdinal direction and Avoid decompositions 1-cell thick.
-    if (m_lineOrdinal & Ordinal::I || m_ordinal[0] == 1 || ord0 == 1 || m_ordinal[0] - ord0 == 1) {
+    if (m_lineOrdinal & Ordinal::I || m_ordinal[0] == 1 || ord0 <= 1 || m_ordinal[0] - ord0 <= 1) {
       work0 = 0;
     }
-    if (m_lineOrdinal & Ordinal::J || m_ordinal[1] == 1 || ord1 == 1 || m_ordinal[1] - ord1 == 1) {
+    if (m_lineOrdinal & Ordinal::J || m_ordinal[1] == 1 || ord1 <= 1 || m_ordinal[1] - ord1 <= 1) {
       work1 = 0;
     }
-    if (m_lineOrdinal & Ordinal::K || m_ordinal[2] == 1 || ord2 == 1 || m_ordinal[2] - ord2 == 1) {
+    if (m_lineOrdinal & Ordinal::K || m_ordinal[2] == 1 || ord2 <= 1 || m_ordinal[2] - ord2 <= 1) {
       work2 = 0;
     }
 

diff --git a/packages/seacas/libraries/ioss/src/utest/Utst_structured_decomp.C b/packages/seacas/libraries/ioss/src/utest/Utst_structured_decomp.C
@@ -1,4 +1,4 @@
-// Copyright(C) 1999-2024 National Technology & Engineering Solutions
+// Copyright(C) 1999-2025 National Technology & Engineering Solutions
 // of Sandia, LLC (NTESS).  Under the terms of Contract DE-NA0003525 with
 // NTESS, the U.S. Government retains certain rights in this software.
 //
@@ -1151,3 +1151,17 @@ TEST_CASE("half_sphere")
   SECTION(name) { check_split_assign(zones, load_balance_tolerance, 8, 0.9, 1.1); }
   cleanup(zones);
 }
+
+TEST_CASE("hwt_cone")
+{
+  int                                       zone = 1;
+  std::vector<Iocgns::StructuredZoneData *> zones;
+  zones.push_back(new Iocgns::StructuredZoneData(zone++, "520x200x200"));
+  zones.push_back(new Iocgns::StructuredZoneData(zone++, "50x200x50"));
+
+  double load_balance_tolerance = 1.4;
+
+  std::string name = "hwt_cone_16384";
+  SECTION(name) { check_split_assign(zones, load_balance_tolerance, 16384, 0.9, 1.4); }
+  cleanup(zones);
+}