Merge branch 'master' of https://github.com/sandialabs/seacas

Author: gsjaardema

packages/seacas/libraries/ioss/src/Ioss_Decomposition.C

@@ -323,9 +323,9 @@ namespace Ioss {
     }
     if (props.exists("DECOMP_OMITTED_BLOCK_NAMES")) {
       auto name_string = props.get("DECOMP_OMITTED_BLOCK_NAMES").get_string();
-      auto names = Ioss::tokenize(name_string, ",");
+      auto names       = Ioss::tokenize(name_string, ",");
       for (const auto &name : names) {
-	m_omittedBlockNames.push_back(name);
+        m_omittedBlockNames.push_back(name);
       }
     }
     if (props.exists("PARMETIS_COMMON_NODE_COUNT") &&

packages/seacas/libraries/ioss/src/Ioss_Decomposition.h

@@ -818,8 +818,8 @@ namespace Ioss {
     // The global element at index 'I' (0-based) is on block B in the
     // file decomposition.
     // if m_fileBlockIndex[B] <= I && m_fileBlockIndex[B+1] < I
-    std::vector<size_t>  m_fileBlockIndex;
-    std::vector<int64_t> m_omittedBlocks;
+    std::vector<size_t>      m_fileBlockIndex;
+    std::vector<int64_t>     m_omittedBlocks;
     std::vector<std::string> m_omittedBlockNames;
 
   private:

packages/seacas/libraries/ioss/src/Ioss_Doxygen.h

@@ -67,6 +67,7 @@ LOAD_BALANCE_THRESHOLD | {real} [1.4] | CGNS-Structured only -- Load imbalance p
 DECOMPOSITION_EXTRA | {name},{multiplier} | Specify the name of the element map or variable used if the decomposition method is `map` or `variable`.  If it contains a comma, the value following the comma is used to scale (divide) the values in the map/variable.  If it is 'auto', then all values will be scaled by `max_value/processorCount`
 DECOMP_OMITTED_BLOCK_IDS | {id_list} | A integer vector containing the
 element block ids that should be ignored during the parallel decomposition. The blocks will still appear in the decomposition, but will not affect the load balance. If specified via `IOSS_PROPERTIES` can be a comma-separated string of ids.
+DECOMP_OMITTED_BLOCK_NAMES | {name_list} | A comma-separated list of block names that should be ignored during the parallel decomposition. The blocks will still appear in the decomposition, but will not affect the load balance. 
 
 ### Valid values for Decomposition Method
 

packages/seacas/libraries/ioss/src/exodus/Ioex_DecompositionData.C

@@ -525,35 +525,43 @@ namespace Ioex {
       return;
     }
 
+    size_t           block_count = el_blocks.size();
     std::vector<INT> ids(block_count);
     ex_get_ids(filePtr, EX_ELEM_BLOCK, Data(ids));
 
     if (!decomposition.m_omittedBlockNames.empty()) {
       // Need to determine the id of each block name in the list...
       // Probably easiest to go through each id and get its name and
       // see if it exists in `m_omittedBlockNames`
-      int max_name_length = ex_inquire_int(exoid, EX_INQ_DB_MAX_USED_NAME_LENGTH);
-      size_t num_found = 0;
+      int max_name_length = ex_inquire_int(filePtr, EX_INQ_DB_MAX_USED_NAME_LENGTH);
+      max_name_length     = std::max(max_name_length, 32);
+      size_t num_found    = 0;
       for (INT id : ids) {
-	bool db_has_name = false;
-	name = Ioex::Utils::get_entity_name(filePtr, EX_ELEM_BLOCK, id, "block", max_name_length, false, db_has_name);
-	if (db_has_name) {
-	  bool found = std::find(decomposition.m_omittedBlockNames.begin(), decomposition.m_omittedBlockNames.end(),
-				 name) != decomposition.m_omittedBlockNames.end();
-	  if (found) {
-	    fmt::print(stderr, "Found name {} with id {}\n", name, id);
-	    decomposition.m_omittedBlocks.push_back(id);
-	    num_found++;
-	    if (num_found == decomposition.m_omittedBlockNames.size()) {
-	      break;
-	    }
-	  }
-	}
+        std::vector<char> buffer(max_name_length + 1);
+        buffer[0] = '\0';
+        ex_get_name(filePtr, EX_ELEM_BLOCK, id, Data(buffer));
+        if (buffer[0] != '\0') {
+          std::string name(Data(buffer));
+          bool        found = std::find(decomposition.m_omittedBlockNames.begin(),
+                                        decomposition.m_omittedBlockNames.end(),
+                                        name) != decomposition.m_omittedBlockNames.end();
+          if (found) {
+#if IOSS_DEBUG_OUTPUT
+            if (m_processor == 0) {
+              fmt::print(stderr, "Found name {} with id {}\n", name, id);
+            }
+#endif
+            decomposition.m_omittedBlocks.push_back(id);
+            num_found++;
+            if (num_found == decomposition.m_omittedBlockNames.size()) {
+              break;
+            }
+          }
+        }
       }
     }
 
     m_decomposition.show_progress(__func__);
-    size_t block_count = el_blocks.size();
     if (decomposition.m_fileBlockIndex.size() != block_count + 1) {
       std::ostringstream errmsg;
       fmt::print(errmsg, "ERROR: The `generate_adjacency` function was not called prior to calling "

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

@@ -782,10 +782,12 @@ namespace {
     }
 
     if (!interFace.decomp_omitted_block_ids.empty()) {
-      properties.add(Ioss::Property("DECOMP_OMITTED_BLOCK_IDS", interFace.decomp_omitted_block_ids));
+      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));
+      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.h

@@ -75,7 +75,7 @@ namespace IOShell {
     //! 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{};
+    std::string      decomp_omitted_block_names{};
 
     //! If non-zero, then put `split_times` timesteps in each file. Then close file and start new
     //! file.