Merge pull request #776 from tjotaha/generated_mesh_blocks_touching_sideset_fix

Generated mesh blocks touching sideset fix

Author: tokusanya

packages/seacas/libraries/ioss/src/catalyst_tests/cmake/Dependencies.cmake

@@ -1,3 +1,3 @@
 TRIBITS_PACKAGE_DEFINE_DEPENDENCIES(
-  LIB_OPTIONAL_TPLS GTest
+  LIB_OPTIONAL_TPLS ${SEACAS_GTest_TPL_name}
 )

packages/seacas/libraries/ioss/src/generated/Iogn_GeneratedMesh.C

@@ -11,6 +11,7 @@
 #include "Ioss_TriShell3.h"
 #include "Ioss_Utils.h"
 #include "generated/Iogn_GeneratedMesh.h"
+#include <algorithm>
 #include <cassert> // for assert
 #include <cmath>   // for atan2, cos, sin
 #include <fmt/format.h>
@@ -1623,19 +1624,11 @@ namespace Iogn {
     // If there is a shell block on this face, then the sideset is
     // applied to the shell block; if not, it is applied to the
     // underlying hex elements.
-    bool    underlying_shell = false;
-    int64_t shell_block      = 0;
-    for (size_t i = 0; i < shellBlocks.size(); i++) {
-      if (shellBlocks[i] == loc) {
-        underlying_shell = true;
-        shell_block      = i + 2;
-        break;
-      }
-    }
+    auto shell_ids = shell_ids_at_location(loc);
 
-    if (underlying_shell) {
+    if (!shell_ids.empty()) {
       // Get ids of shell elements at this location...
-      element_map(shell_block, elem_sides);
+      element_map(shell_ids.back(), elem_sides);
 
       // Insert face_ordinal in between each entry in elem_sides...
       // Face will be 0 for all shells...
@@ -1653,9 +1646,36 @@ namespace Iogn {
     }
   }
 
-  Ioss::NameList GeneratedMesh::sideset_touching_blocks(int64_t /*set_id*/) const
+  Ioss::NameList GeneratedMesh::sideset_touching_blocks(int64_t set_id) const
+  {
+    if (set_id <= 0 || (size_t)set_id > sidesets.size()) {
+      IOSS_ERROR(fmt::format("set_id out of range in sideset_touching_blocks: ", set_id));
+    }
+
+    Ioss::NameList result;
+    ShellLocation  loc       = sidesets[set_id - 1];
+    auto           shell_ids = shell_ids_at_location(loc);
+    if (!shell_ids.empty()) {
+      result.push_back("block_" + std::to_string(shell_ids.back()));
+    }
+    else {
+      result.push_back("block_1");
+    }
+    return result;
+  }
+
+  std::vector<size_t> GeneratedMesh::shell_ids_at_location(ShellLocation loc) const
   {
-    Ioss::NameList result(1, "block_1");
+    std::vector<size_t> result;
+
+    for (size_t i = 0; i < shellBlocks.size(); i++) {
+      if (shellBlocks[i] == loc) {
+        result.push_back(i + 2);
+      }
+    }
+    if (loc == MX || loc == MY || loc == MZ) {
+      std::reverse(result.begin(), result.end());
+    }
     return result;
   }
 

packages/seacas/libraries/ioss/src/generated/Iogn_GeneratedMesh.h

@@ -82,7 +82,9 @@ namespace Iogn {
        multicharacter string.  You can add multiple shell blocks to a face,
        for example, shell:xxx would add three layered shell blocks on the
        minimum x face.  An error is output if a non xXyYzZ character is
-       found, but execution continues.
+       found, but execution continues. The shell block ids start from 2 and
+       increase from left to right through the shell creations argument string.
+       Block id 1 is reserved for the cube block.
 
        - `nodeset` -- argument = xXyYzZ which specifies whether there is
        a nodeset at that location. `x` is minimum x face, `X` is
@@ -454,8 +456,20 @@ namespace Iogn {
      */
     virtual void sideset_elem_sides(int64_t id, Ioss::Int64Vector &elem_sides) const;
 
+    /**
+     * Returns names of element blocks and shell blocks touched by sideset given by set_id.
+     * If the sideset is on a shell block with multiple stacked shells, then return the
+     * outermost shell block name.
+     */
     IOSS_NODISCARD virtual Ioss::NameList sideset_touching_blocks(int64_t set_id) const;
 
+    /**
+     * For mesh face given by loc, returns the shell block ids of the shells on the face
+     * in innermost to outermost order. Returns an empty vector if no shells are defined
+     * on the face.
+     */
+    IOSS_NODISCARD virtual std::vector<size_t> shell_ids_at_location(ShellLocation loc) const;
+
     IOSS_NODISCARD int64_t get_num_x() const { return numX; }
     IOSS_NODISCARD int64_t get_num_y() const { return numY; }
     IOSS_NODISCARD int64_t get_num_z() const { return numZ; }

packages/seacas/libraries/ioss/src/unit_tests/CMakeLists.txt

@@ -19,6 +19,17 @@ TRIBITS_ADD_EXECUTABLE(
  SOURCES unitMain.C UnitTestDynamicTopology.C
 )
 
+TRIBITS_ADD_EXECUTABLE(
+ Utst_generatedmesh
+ SOURCES unitMain.C UnitTestGeneratedMesh.C
+)
+
+TRIBITS_ADD_TEST(
+        Utst_generatedmesh
+        NAME Utst_generatedmesh
+        NUM_MPI_PROCS 1
+)
+
 TRIBITS_ADD_TEST(
         Utst_dynamictopology
         NAME Utst_dynamictopology

packages/seacas/libraries/ioss/src/unit_tests/UnitTestGeneratedMesh.C

@@ -0,0 +1,81 @@
+// Copyright(C) 2024, 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.
+//
+// See packages/seacas/LICENSE for details
+
+#include "generated/Iogn_GeneratedMesh.h"
+#include "gtest/gtest.h"
+#include <stdexcept>
+
+TEST(GeneratedMesh, NoSideSets)
+{
+  Iogn::GeneratedMesh gm("10x12x14");
+  EXPECT_THROW(gm.sideset_touching_blocks(0), std::runtime_error);
+}
+
+TEST(GeneratedMesh, TwoSideSets)
+{
+  Iogn::GeneratedMesh gm("10x12x14|sideset:XY");
+  EXPECT_EQ(gm.sideset_count(), 2);
+  EXPECT_EQ(gm.sideset_touching_blocks(1)[0], "block_1");
+  EXPECT_EQ(gm.sideset_touching_blocks(2)[0], "block_1");
+}
+
+TEST(GeneratedMesh, OneShellOneSideSetDifferentSides)
+{
+  Iogn::GeneratedMesh gm("10x12x14|shell:z|sideset:Z");
+  EXPECT_EQ(gm.sideset_count(), 1);
+  EXPECT_EQ(gm.block_count(), 2);
+  EXPECT_EQ(gm.sideset_touching_blocks(1)[0], "block_1");
+}
+
+TEST(GeneratedMesh, OneShellOneSideSetSameSide)
+{
+  Iogn::GeneratedMesh gm("10x12x14|shell:z|sideset:z");
+  EXPECT_EQ(gm.sideset_count(), 1);
+  EXPECT_EQ(gm.block_count(), 2);
+  EXPECT_EQ(gm.sideset_touching_blocks(1)[0], "block_2");
+}
+
+TEST(GeneratedMesh, FourShellsOppositeSides)
+{
+  Iogn::GeneratedMesh gm("10x12x14|shell:yyYY|sideset:Y");
+  EXPECT_EQ(gm.sideset_count(), 1);
+  EXPECT_EQ(gm.block_count(), 5);
+  EXPECT_EQ(gm.sideset_touching_blocks(1)[0], "block_5");
+}
+
+TEST(GeneratedMesh, ShellIdsatLocationPXEmpty)
+{
+  Iogn::GeneratedMesh gm("10x12x14");
+  auto                shell_ids = gm.shell_ids_at_location(Iogn::GeneratedMesh::ShellLocation::PX);
+  EXPECT_TRUE(shell_ids.empty());
+}
+
+TEST(GeneratedMesh, ShellIdsatLocationMX)
+{
+  Iogn::GeneratedMesh gm("10x12x14|shell:xxx");
+  auto                shell_ids = gm.shell_ids_at_location(Iogn::GeneratedMesh::ShellLocation::MX);
+  EXPECT_EQ(shell_ids.size(), 3);
+  EXPECT_EQ(shell_ids.back(), 2);
+  EXPECT_EQ(shell_ids.front(), 4);
+  EXPECT_EQ(shell_ids[1], 3);
+}
+
+TEST(GeneratedMesh, ShellIdsatLocationPX)
+{
+  Iogn::GeneratedMesh gm("10x12x14|shell:xxxXX");
+  auto                shell_ids = gm.shell_ids_at_location(Iogn::GeneratedMesh::ShellLocation::PX);
+  EXPECT_EQ(shell_ids.size(), 2);
+  EXPECT_EQ(shell_ids.back(), 6);
+  EXPECT_EQ(shell_ids.front(), 5);
+}
+
+TEST(GeneratedMesh, ShellIdsatLocationMZ)
+{
+  Iogn::GeneratedMesh gm("10x12x14|shell:xxxXXyyyYYzZZ");
+  auto                shell_ids = gm.shell_ids_at_location(Iogn::GeneratedMesh::ShellLocation::MZ);
+  EXPECT_EQ(shell_ids.size(), 1);
+  EXPECT_EQ(shell_ids.front(), 12);
+}