Dynamic topology phase IV

packages/seacas/libraries/exodus/include/exodusII.h

@@ -215,6 +215,7 @@ enum ex_inquiry {
   EX_INQ_NUM_ELEM_SET_VAR    = 69, /**< number of element set variables */
   EX_INQ_NUM_SIDE_SET_VAR    = 70, /**< number of sideset variables */
   EX_INQ_NUM_GLOBAL_VAR      = 71, /**< number of global variables */
+  EX_INQ_FILE_FORMAT         = 72, /**< netCDF file format */
   EX_INQ_INVALID             = -1
 };
 

packages/seacas/libraries/exodus/src/ex_inquire.c

@@ -975,6 +975,18 @@ static int ex_inquire_internal(int exoid, int req_info, int64_t *ret_int, float
 #endif
     break;
 
+  case EX_INQ_FILE_FORMAT:
+    /* return netCDF file format.
+     */
+
+    *ret_int = 0;
+#if NC_HAS_HDF5
+    int nc_format = 0;
+    nc_inq_format(exoid, &nc_format);
+    *ret_int = (int)nc_format;
+#endif
+    break;
+
   case EX_INQ_THREADSAFE:
 /* Return 1 if the library was compiled in thread-safe mode.
  * Return 0 otherwise

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

@@ -246,63 +246,75 @@ namespace Ioss {
       flush_database_nl();
     }
 
-    /** \brief If a database type supports groups and if the database
-     *         contains groups, open the specified group.
+    /** \brief If a database type supports change sets and if the database
+     *         contains change sets, open the specified set.
      *
-     *  If the group_name begins with '/', it specifies the absolute path
-     *  name from the root with '/' separating groups.  Otherwise, the
-     *  group_name specifies a child group of the currently active group.
-     *  If group_name == "/" then the root group is opened.
-     *
-     *  \param[in] group_name The name of the group to open.
+     *  \param[in] set_name The name of the set to open.
      *  \returns True if successful.
      */
-    bool open_group(const std::string &group_name)
+    bool open_change_set(const std::string &set_name)
     {
       IOSS_FUNC_ENTER(m_);
-      return open_group_nl(group_name);
+      return open_change_set_nl(set_name);
     }
 
-    /** \brief If a database type supports groups, create the specified
-     *        group as a child of the current group.
-     *
-     *  The name of the group must not contain a '/' character.
-     *  If the command is successful, then the group will be the
-     *  active group for all subsequent writes to the database.
+    /** \brief If a database type supports change sets, create the
+     *         specified set.
      *
-     *  \param[in] group_name The name of the subgroup to create.
+     *  \param[in] set_name The name of the set to create.
      *  \returns True if successful.
      */
-    bool create_subgroup(const std::string &group_name)
+    bool create_change_set(const std::string &set_name)
     {
       IOSS_FUNC_ENTER(m_);
-      return create_subgroup_nl(group_name);
+      return create_change_set_nl(set_name);
     }
 
-    bool open_root_group()
+    /** \brief If a database type supports change sets, and if the database
+     *         contains change sets, return the number of change sets.
+     */
+    int num_change_set()
     {
       IOSS_FUNC_ENTER(m_);
-      return open_root_group_nl();
+      return num_change_set_nl();
     }
 
-    int num_child_group()
+    /** \brief If a database type supports change sets, open the change set
+     *         specified [zero-based] index
+     *
+     *  \param[in] child_index The [zero-based] index of the change set to open.
+     *  \returns True if successful.
+     */
+    bool open_change_set(int set_index)
     {
       IOSS_FUNC_ENTER(m_);
-      return num_child_group_nl();
+      return open_change_set_nl(set_index);
     }
 
-    bool open_child_group(int index)
+    /** \brief If a database type supports change sets, return a list of set names
+     *
+     *  \param[in] return_full_names Flag to control return of relative
+     *             or full set name paths.
+     *  \returns True if successful.
+     */
+    Ioss::NameList change_set_describe(bool return_full_names = false)
     {
       IOSS_FUNC_ENTER(m_);
-      return open_child_group_nl(index);
+      return change_set_describe_nl(return_full_names);
     }
 
-    Ioss::NameList groups_describe(bool return_full_names = false)
+    /** \brief Checks if a database type supports changes sets
+     *
+     *  \returns True if successful.
+     */
+    bool supports_change_set()
     {
       IOSS_FUNC_ENTER(m_);
-      return groups_describe_nl(return_full_names);
+      return supports_change_set_nl();
     }
 
+    IOSS_NODISCARD virtual std::string get_change_set_name() const { return ""; }
+
     /** \brief Set the database to the given State.
      *
      *  All transitions must begin from the 'STATE_CLOSED' state or be to
@@ -356,7 +368,23 @@ namespace Ioss {
     void get_step_times()
     {
       IOSS_FUNC_ENTER(m_);
-      return get_step_times_nl();
+      get_step_times_nl();
+    }
+
+    /** \brief Return the list of timesteps in the database contingent on ceetain
+     *         controlling properties.
+     *
+     *  This is different from get_step_times() in that it does not set timestep
+     *  data on the region. If the database supports groups, it will return the
+     *  timestep data for the current group
+     *
+     *  \returns timesteps.
+     *
+     */
+    std::vector<double> get_db_step_times()
+    {
+      IOSS_FUNC_ENTER(m_);
+      return get_db_step_times_nl();
     }
 
     IOSS_NODISCARD virtual bool internal_edges_available() const { return false; }
@@ -790,12 +818,12 @@ namespace Ioss {
       return elemMap.global_to_local(global);
     }
 
-    virtual int  num_child_group_nl() { return 0; }
-    virtual bool open_child_group_nl(int /* index */) { return false; }
-    virtual bool open_root_group_nl() { return false; }
-    virtual bool open_group_nl(const std::string & /* group_name */) { return false; }
-    virtual bool create_subgroup_nl(const std::string & /* group_name */) { return false; }
-    virtual Ioss::NameList groups_describe_nl(bool /* return_full_names */)
+    virtual bool supports_change_set_nl() { return false; }
+    virtual bool open_change_set_nl(const std::string & /* set_name */) { return false; }
+    virtual bool open_change_set_nl(int /* index */) { return false; }
+    virtual bool create_change_set_nl(const std::string & /* set_name */) { return false; }
+    virtual int  num_change_set_nl() { return 0; }
+    virtual Ioss::NameList change_set_describe_nl(bool /* return_full_names */)
     {
       return Ioss::NameList();
     }
@@ -805,6 +833,7 @@ namespace Ioss {
 
     virtual void read_meta_data_nl() = 0;
     virtual void get_step_times_nl() {}
+    virtual std::vector<double> get_db_step_times_nl() { return std::vector<double>(); }
 
     virtual bool begin_state_nl(int state, double time);
     virtual bool end_state_nl(int state, double time);