APREPRO: Add basic support for change sets

Author: gsjaardema

Diff for: packages/seacas/libraries/aprepro_lib/apr_aprepro.cc

@@ -1,4 +1,4 @@
-// Copyright(C) 1999-2024 National Technology & Engineering Solutions
+// Copyright(C) 1999-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.
 //
@@ -33,8 +33,8 @@
 #endif
 
 namespace {
-  const std::string version_short{"6.35"};
-  const std::string version_date{"(2024/11/06)"};
+  const std::string version_short{"6.36"};
+  const std::string version_date{"(2025/02/05)"};
   const std::string version_string = version_short + " " + version_date;
 
   void output_copyright();

Diff for: packages/seacas/libraries/aprepro_lib/apr_builtin.h

@@ -1,5 +1,5 @@
 /*
- * Copyright(C) 1999-2024 National Technology & Engineering Solutions
+ * Copyright(C) 1999-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.
  *
@@ -128,6 +128,7 @@ namespace SEAMS {
   const char *do_exodus_info_range(char *filename, char *beg, char *end);
   const char *do_exodus_info(char *filename, char *prefix);
   const char *do_exodus_meta(char *filename);
+  const char *do_exodus_meta_cd(char *filename, double cs_index);
 #endif
 
   array *do_csv_array(const char *filename, double skip);

Diff for: packages/seacas/libraries/aprepro_lib/apr_exodus.cc

@@ -1,4 +1,4 @@
-// Copyright(C) 1999-2022 National Technology & Engineering Solutions
+// Copyright(C) 1999-2022, 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.
 //
@@ -7,6 +7,7 @@
 #if defined(EXODUS_SUPPORT)
 #include "aprepro.h"
 #include "exodusII.h"
+#include "exodusII_int.h"
 
 #include "apr_symrec.h"
 #include "apr_util.h"
@@ -16,6 +17,7 @@
 #include <cctype>
 #include <cstdlib>
 #include <cstring>
+#include "fmt/format.h"
 
 namespace {
   std::string LowerCase(std::string name);
@@ -53,12 +55,35 @@ namespace {
     names += str_name;
   }
 
+  void get_change_set_names(int exoid, SEAMS::Aprepro *aprepro)
+  {
+    int   idum;
+    float rdum;
+
+    // Get root of database...
+    int rootid = exoid & EX_FILE_ID_MASK;
+
+    std::string cs_names;
+
+    int               group_name_length = ex_inquire_int(rootid, EX_INQ_GROUP_NAME_LEN);
+    std::vector<char> group_name(group_name_length + 1, '\0');
+
+    int num_children = ex_inquire_int(rootid, EX_INQ_NUM_CHILD_GROUPS);
+    for (int i = 0; i < num_children; i++) {
+      ex_inquire(rootid + 1 + i, EX_INQ_GROUP_NAME, &idum, &rdum, group_name.data());
+      if (i > 0) {
+	cs_names += ",";
+      }
+      cs_names += group_name.data();
+    }
+    aprepro->add_variable("ex_change_set_names", cs_names);
+  }
 } // namespace
 
 namespace SEAMS {
   extern SEAMS::Aprepro *aprepro;
 
-  int open_exodus_file(char *filename)
+  int open_exodus_file(char *filename, int cs_idx)
   {
     int   cpu = sizeof(double);
     int   io  = 0;
@@ -78,7 +103,31 @@ namespace SEAMS {
       }
     }
 
+    // See if the file contains change sets.  If it does, open the first one.
+    int num_change_sets = ex_inquire_int(exo, EX_INQ_NUM_CHILD_GROUPS);
+    int active_change_set = 0;
+    if (num_change_sets >= 1) {
+      if (cs_idx == 0) {
+	cs_idx = 1;
+	aprepro->warning(fmt::format("Input database contains {} change sets. Rreading from change set {}.", num_change_sets, cs_idx));
+      }
+      if (cs_idx <= num_change_sets) {
+	active_change_set = cs_idx;
+	exo+= cs_idx;
+	get_change_set_names(exo, aprepro);
+      }
+      else {
+        yyerror(*aprepro, fmt::format("Specified change set index {} exceeds count {}", cs_idx, num_change_sets));
+	return -1;
+      }
+    }
+    if (cs_idx > 0) {
+      aprepro->warning(fmt::format("Input database does not contain change sets, but a change set index {} was specified.  Ignoring.", cs_idx));
+    }
+    
     aprepro->add_variable("ex_version", version);
+    aprepro->add_variable("ex_change_set_count", num_change_sets);
+    aprepro->add_variable("ex_active_change_set", active_change_set);
     return exo;
   }
 
@@ -88,8 +137,8 @@ namespace SEAMS {
 
     // Open the specified exodusII file, read the info records
     // then parse them as input to aprepro.
-    int exoid = open_exodus_file(filename);
-    if (exoid < 0) {
+    int exoid = open_exodus_file(filename, 0);
+    if (exoid <= 0) {
       return "";
     }
 
@@ -134,8 +183,8 @@ namespace SEAMS {
 
     // Open the specified exodusII file, read the info records
     // then parse them as input to aprepro.
-    int exoid = open_exodus_file(filename);
-    if (exoid < 0) {
+    int exoid = open_exodus_file(filename, 0);
+    if (exoid <= 0) {
       return "";
     }
 
@@ -180,14 +229,13 @@ namespace SEAMS {
     return "";
   }
 
-  const char *do_exodus_meta(char *filename)
+  const char *do_exodus_meta_cd(char *filename, double cs_index)
   {
-
     // Open the specified exodusII file, read the metadata and set
     // variables for each item.
     // Examples include "node_count", "element_count", ...
-    int exoid = open_exodus_file(filename);
-    if (exoid < 0) {
+    int exoid = open_exodus_file(filename, (int)cs_index);
+    if (exoid <= 0) {
       return "";
     }
 
@@ -410,6 +458,12 @@ namespace SEAMS {
     ex_close(exoid);
     return "";
   }
+
+  const char *do_exodus_meta(char *filename)
+  {
+    return do_exodus_meta_cd(filename, 0);
+  }
+
 } // namespace SEAMS
 
 namespace {

Diff for: packages/seacas/libraries/aprepro_lib/apr_init.cc

@@ -1,4 +1,4 @@
-// Copyright(C) 1999-2024 National Technology & Engineering Solutions
+// Copyright(C) 1999-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.
 //
@@ -231,6 +231,13 @@ namespace SEAMS {
 #endif
       {nullptr, nullptr, nullptr, nullptr}};
 
+  const str_cd_init string_cd_fncts[] = {
+#if defined(EXODUS_SUPPORT)
+      {"exodus_meta", do_exodus_meta_cd, "exodus_meta(filename, cs_index)",
+       "Creates several variables and arrays related to the exodus metadata in the `cs_indexth` change set in file. "},
+#endif
+      {nullptr, nullptr, nullptr, nullptr}};
+
   const str_d_init string_d_fncts[] = {
       {"IO", do_intout, "IO(x)", "Convert x to an integer and then to a string. "},
       {"to_string", do_tostring, "to_string(x)",
@@ -407,6 +414,7 @@ namespace SEAMS {
     internal_init_table(string_fncts,       strfnct,        SYMBOL_TYPE::STRING_FUNCTION);
     internal_init_table(string_c_fncts,     strfnct_c,      SYMBOL_TYPE::STRING_FUNCTION);
     internal_init_table(string_d_fncts,     strfnct_d,      SYMBOL_TYPE::STRING_FUNCTION);
+    internal_init_table(string_cd_fncts,    strfnct_cd,     SYMBOL_TYPE::STRING_FUNCTION);
     internal_init_table(string_dc_fncts,    strfnct_dc,     SYMBOL_TYPE::STRING_FUNCTION);
     internal_init_table(string_dcc_fncts,   strfnct_dcc,    SYMBOL_TYPE::STRING_FUNCTION);
     internal_init_table(string_ccc_fncts,   strfnct_ccc,    SYMBOL_TYPE::STRING_FUNCTION);