IOSS: Allow specifying names for the decomp omitted blocks

Author: gsjaardema

packages/seacas/libraries/ioss/src/main/io_shell.C

@@ -781,8 +781,11 @@ namespace {
       }
     }
 
-    if (!interFace.decomp_omitted_blocks.empty()) {
-      properties.add(Ioss::Property("DECOMP_OMITTED_BLOCK_IDS", interFace.decomp_omitted_blocks));
+    if (!interFace.decomp_omitted_block_ids.empty()) {
+      properties.add(Ioss::Property("DECOMP_OMITTED_BLOCK_IDS", interFace.decomp_omitted_block_ids));
+    }
+    if (!interFace.decomp_omitted_block_names.empty()) {
+      properties.add(Ioss::Property("DECOMP_OMITTED_BLOCK_NAMES", interFace.decomp_omitted_block_names));
     }
     if (interFace.retain_empty_blocks) {
       properties.add(Ioss::Property("RETAIN_EMPTY_BLOCKS", "YES"));

packages/seacas/libraries/ioss/src/main/shell_interface.C

@@ -242,8 +242,14 @@ void IOShell::Interface::enroll_options()
                   nullptr);
 
   options_.enroll(
-      "decomp_omit_blocks", Ioss::GetLongOption::OptType::MandatoryValue,
-      "comma-separated list of element block ids that should NOT be ignored "
+      "decomp_omit_block_ids", Ioss::GetLongOption::OptType::MandatoryValue,
+      "comma-separated list of element block ids that should be ignored "
+      "in\n"
+      "\t\tthe parallel decomposition. Only valid for zoltan decomp methods: rcb, rib, hsfc",
+      nullptr);
+  options_.enroll(
+      "decomp_omit_block_names", Ioss::GetLongOption::OptType::MandatoryValue,
+      "comma-separated list of element block names that should be ignored "
       "in\n"
       "\t\tthe parallel decomposition. Only valid for zoltan decomp methods: rcb, rib, hsfc",
       nullptr, nullptr, true);
@@ -750,15 +756,21 @@ bool IOShell::Interface::parse_options(int argc, char **argv, int my_processor)
 
 #if defined(SEACAS_HAVE_MPI)
   {
-    const char *temp = options_.retrieve("decomp_omit_blocks");
+    const char *temp = options_.retrieve("decomp_omit_block_ids");
     if (temp != nullptr) {
       auto omit_str = Ioss::tokenize(std::string(temp), ",");
       for (const auto &str : omit_str) {
         auto id = std::stoi(str);
-        decomp_omitted_blocks.push_back(id);
+        decomp_omitted_block_ids.push_back(id);
       }
     }
   }
+  {
+    const char *temp = options_.retrieve("decomp_omit_block_names");
+    if (temp != nullptr) {
+      decomp_omitted_block_names = std::string(temp);
+    }
+  }
 #endif
 
   {

packages/seacas/libraries/ioss/src/main/shell_interface.h

@@ -70,10 +70,12 @@ namespace IOShell {
     std::vector<std::string> omitted_blocks{};
     std::vector<std::string> omitted_sets{};
 
-    //! If non-empty, a list of element block ids that should be omitted in a parallel
-    //! decomposition. The blocks will still appear in the decomposed files, but will not
-    //! affect the balance. Only active element blocks will be load-balanced.
-    std::vector<int> decomp_omitted_blocks{};
+    //! If non-empty, a list of element block ids and/or names that
+    //! should be omitted in a parallel decomposition. The blocks will
+    //! still appear in the decomposed files, but will not affect the
+    //! balance. Only active element blocks will be load-balanced.
+    std::vector<int> decomp_omitted_block_ids{};
+    std::string decomp_omitted_block_names{};
 
     //! If non-zero, then put `split_times` timesteps in each file. Then close file and start new
     //! file.