Merge Pull Request #5073 from gsjaardema/Trilinos/seacas-fix-cgns-reopen-db

Automatically Merged using Trilinos Pull Request AutoTester
PR Title: SEACAS: IOSS--Update db_zone property after reopening cgns database
PR Author: gsjaardema

packages/seacas/libraries/ioss/src/cgns/Iocgns_DatabaseIO.C

@@ -534,6 +534,9 @@ namespace Iocgns {
         set_int_byte_size_api(Ioss::USE_INT64_API);
       }
 
+      if (mode == CG_MODE_MODIFY) {
+	Utils::update_db_zone_property(m_cgnsFilePtr, get_region(), myProcessor, isParallel);
+      }
 #if 0
       // This isn't currently working since CGNS currently has chunking
       // disabled for HDF5 files and compression requires chunking.

packages/seacas/libraries/ioss/src/cgns/Iocgns_ParallelDatabaseIO.C

@@ -284,6 +284,9 @@ namespace Iocgns {
         set_int_byte_size_api(Ioss::USE_INT64_API);
       }
 
+      if (mode == CG_MODE_MODIFY) {
+	Utils::update_db_zone_property(m_cgnsFilePtr, get_region(), myProcessor, false);
+      }
 #if 0
       // This isn't currently working since CGNS currently has chunking
       // disabled for HDF5 files and compression requires chunking.

packages/seacas/libraries/ioss/src/cgns/Iocgns_Utils.C

@@ -57,6 +57,7 @@
 #include <Ioss_Wedge18.h>
 #include <Ioss_Wedge6.h>
 
+#include <tokenize.h>
 #include <numeric>
 #include <set>
 
@@ -77,6 +78,29 @@
   }
 
 namespace {
+  std::pair<std::string, int> decompose_name(const std::string &name, bool is_parallel)
+  {
+    int         proc = 0;
+    std::string zname{name};
+
+    if (is_parallel) {
+      // Name should/might be of the form `basename_proc-#`.  Strip
+      // off the `_proc-#` portion and return just the basename.
+      auto tokens = Ioss::tokenize(zname, "_");
+      zname       = tokens[0];
+      if (tokens.size() >= 2) {
+        size_t idx = tokens.size() - 1;
+        if (tokens[idx].substr(0, 5) == "proc-") {
+          auto ptoken = Ioss::tokenize(tokens[idx], "-");
+          proc        = std::stoi(ptoken[1]);
+          idx--;
+          zname = tokens[idx];
+        }
+      }
+    }
+    return std::make_pair(zname, proc);
+  }
+
   int power_2(int count)
   {
     // Return the maximum power of two which is less than or equal to 'count'
@@ -419,6 +443,64 @@ Ioss::MeshType Iocgns::Utils::check_mesh_type(int cgns_file_ptr)
   }
 }
 
+void Iocgns::Utils::update_db_zone_property(int cgns_file_ptr, const Ioss::Region *region,
+					    int myProcessor, bool is_parallel)
+{
+  // If an output file is closed/opened, make sure that the zones in the Region
+  // match the zones on the database (file). CGNS likes to sort the zones, so they
+  // might be in a different order after reopening.  Update the 'db_zone_id' property...
+  int num_zones = 0;
+  int base      = 1;
+  CGCHECK(cg_nzones(cgns_file_ptr, base, &num_zones));
+
+  // Read each zone and put names in a map indexed by zone id.
+  // Then iterate all of the region's structured blocks and element blocks
+  // and make sure that the zone exists in the map and then update the 'db_zone'
+  std::map<std::string, int> zones;
+
+  for (int zone = 1; zone <= num_zones; zone++) {
+    cgsize_t size[9];
+    char     zname[CGNS_MAX_NAME_LENGTH + 1];
+    CGCHECK(cg_zone_read(cgns_file_ptr, base, zone, zname, size));
+    auto name_proc = decompose_name(std::string(zname), is_parallel);
+    zones[name_proc.first] = zone;
+  }
+
+  const auto &sblocks = region->get_structured_blocks();
+  for (const auto &block : sblocks) {
+    if (block->is_active()) {
+      const std::string &name = block->name();
+      auto iter = zones.find(name);
+      if (iter != zones.end()) {
+	auto db_zone = (*iter).second;
+	block->property_update("db_zone", db_zone);
+      }
+      else {
+	std::ostringstream errmsg;
+	errmsg << "ERROR: CGNS: Structured Block " << name
+	       << " was not found on the CGNS database on processor " << myProcessor;
+	IOSS_ERROR(errmsg);
+      }
+    }
+  }
+
+  const auto &eblocks = region->get_element_blocks();
+  for (const auto &block : eblocks) {
+    const std::string &name = block->name();
+    auto iter = zones.find(name);
+    if (iter != zones.end()) {
+      auto db_zone = (*iter).second;
+      block->property_update("db_zone", db_zone);
+    }
+    else {
+      std::ostringstream errmsg;
+      errmsg << "ERROR: CGNS: Element Block " << name
+	     << " was not found on the CGNS database on processor " << myProcessor;
+      IOSS_ERROR(errmsg);
+    }
+  }
+}
+
 int Iocgns::Utils::get_db_zone(const Ioss::EntityBlock *block)
 {
   // Returns the zone of the entity as it appears on the cgns database.

packages/seacas/libraries/ioss/src/cgns/Iocgns_Utils.h

@@ -86,6 +86,8 @@ namespace Iocgns {
     static void cgns_error(int cgnsid, const char *file, const char *function, int lineno,
                            int processor);
 
+    static void update_db_zone_property(int cgns_file_ptr, const Ioss::Region *region,
+					int myProcessor, bool is_parallel);
     static int  get_db_zone(const Ioss::EntityBlock *block);
     static void set_field_index(const Ioss::Field &field, size_t index, CG_GridLocation_t location);
     static bool is_cell_field(const Ioss::Field &field);