Merge pull request #642 from sandialabs/do_not_lower_case_database_names

gsjaardema · web-flow · commit 3739611f70b1 · 2025-04-18T11:18:26.000-06:00
Do not lower case database names
diff --git a/packages/seacas/applications/cpup/cpup.C b/packages/seacas/applications/cpup/cpup.C
@@ -11,7 +11,7 @@
 #include <vector>
 
 #include "add_to_log.h"
-#define FMT_DEPRECATED_OSTREAM
+
 #include "fmt/ostream.h"
 #include "fmt/ranges.h"
 #include "format_time.h"
@@ -173,9 +173,12 @@ template <typename INT> void cpup(Cpup::SystemInterface &interFace, INT /*dummy*
     // Query the system to see if the number of files exceeds the system limit and we
     // need to force use of minimize_open_files...
     int max_files = open_file_limit() - 1; // We also have an output file.
+    if (debug_level & 1) {
+      fmt::print(stderr, "{} Open file limit = {}\n", time_stamp(tsFormat), max_files);
+    }
     if (interFace.processor_count() > max_files) {
       minimize_open_files = true;
-      fmt::print("Single file mode... (Max open = {})\n", max_files);
+      fmt::print("INFO: Automatically setting single file mode... (Max open = {})\n", max_files);
     }
   }
 
diff --git a/packages/seacas/applications/ejoin/EJ_Version.h b/packages/seacas/applications/ejoin/EJ_Version.h
@@ -1,4 +1,4 @@
-// Copyright(C) 1999-2020, 2022, 2023, 2024 National Technology & Engineering Solutions
+// Copyright(C) 1999-2020, 2022, 2023, 2024, 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.
 //
@@ -9,6 +9,6 @@
 
 static const std::array<std::string, 3> qainfo{
     "ejoin",
-    "2024/08/29",
-    "1.6.5",
+    "2025/04/18",
+    "1.6.6",
 };
diff --git a/packages/seacas/applications/ejoin/EJoin.C b/packages/seacas/applications/ejoin/EJoin.C
@@ -215,6 +215,7 @@ int main(int argc, char *argv[])
       if (dbi[p]->int_byte_size_api() > int_byte_size) {
         int_byte_size = dbi[p]->int_byte_size_api();
       }
+      dbi[p]->set_lower_case_database_names(false);
     }
 
     for (size_t p = 0; p < interFace.inputFiles_.size(); p++) {
diff --git a/packages/seacas/applications/slice/SL_Version.h b/packages/seacas/applications/slice/SL_Version.h
@@ -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.
 //
@@ -9,6 +9,6 @@
 
 static const std::array<std::string, 3> qainfo{
     "slice",
-    "2024/07/17",
-    "2.3.01",
+    "2025/04/18",
+    "2.3.02",
 };
diff --git a/packages/seacas/applications/slice/Slice.C b/packages/seacas/applications/slice/Slice.C
@@ -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.
 //
@@ -397,6 +397,7 @@ int main(int argc, char *argv[])
     dbi->set_int_byte_size_api(Ioss::USE_INT64_API);
   }
 
+  dbi->set_lower_case_database_names(false);
   dbi->set_surface_split_type(Ioss::SPLIT_BY_DONT_SPLIT);
   dbi->set_field_separator(0);
 
diff --git a/packages/seacas/libraries/ioss/src/Ioss_DatabaseIO.h b/packages/seacas/libraries/ioss/src/Ioss_DatabaseIO.h
@@ -772,7 +772,7 @@ namespace Ioss {
     bool         isParallel{false}; //!< true if running in parallel
 
     mutable bool lowerCaseVariableNames{true};
-    mutable bool lowerCaseDatabaseNames{false};
+    mutable bool lowerCaseDatabaseNames{true};
     bool         usingParallelIO{false};
 
     // List of element blocks that should be omitted or included from
diff --git a/packages/seacas/libraries/ioss/src/exodus/Ioex_ParallelDatabaseIO.C b/packages/seacas/libraries/ioss/src/exodus/Ioex_ParallelDatabaseIO.C
@@ -1216,7 +1216,7 @@ namespace Ioex {
       }
       else {
         block_name = Ioex::get_entity_name(get_file_pointer(), entity_type, id, basename,
-                                           maximumNameLength, db_has_name);
+                                           maximumNameLength, lowerCaseDatabaseNames, db_has_name);
       }
       if (get_use_generic_canonical_name()) {
         std::swap(block_name, alias);
@@ -1534,8 +1534,9 @@ namespace Ioex {
             side_set_name = alias;
           }
           else {
-            side_set_name = Ioex::get_entity_name(get_file_pointer(), EX_SIDE_SET, id, "surface",
-                                                  maximumNameLength, db_has_name);
+            side_set_name =
+                Ioex::get_entity_name(get_file_pointer(), EX_SIDE_SET, id, "surface",
+                                      maximumNameLength, lowerCaseDatabaseNames, db_has_name);
           }
 
           if (side_set_name == "universal_sideset") {
@@ -1897,7 +1898,7 @@ namespace Ioex {
       }
       else {
         Xset_name = Ioex::get_entity_name(get_file_pointer(), type, id, base + "list",
-                                          maximumNameLength, db_has_name);
+                                          maximumNameLength, lowerCaseDatabaseNames, db_has_name);
       }
 
       if (get_use_generic_canonical_name()) {
diff --git a/packages/seacas/libraries/ioss/src/main/io_info.C b/packages/seacas/libraries/ioss/src/main/io_info.C
@@ -15,7 +15,6 @@
 #include <stdint.h>
 #include <tokenize.h>
 
-#define FMT_DEPRECATED_OSTREAM
 #include <cstddef>
 #include <cstdlib>
 #include <fmt/format.h>
@@ -667,6 +666,9 @@ namespace Ioss {
       dbi->set_use_generic_canonical_name(true);
     }
 
+    dbi->set_lower_case_variable_names(false);
+    dbi->set_lower_case_database_names(false);
+
     if (interFace.surface_split_scheme() != Ioss::SPLIT_INVALID) {
       dbi->set_surface_split_type(Ioss::int_to_surface_split(interFace.surface_split_scheme()));
     }
diff --git a/packages/seacas/libraries/ioss/src/main/io_info_main.C b/packages/seacas/libraries/ioss/src/main/io_info_main.C
@@ -22,7 +22,7 @@
 
 namespace {
   std::string codename;
-  std::string version = "1.07 (2024/11/08)";
+  std::string version = "1.08 (2025/04/18)";
 
 #ifdef SEACAS_HAVE_MPI
   void mpi_finalize()
diff --git a/packages/seacas/libraries/ioss/src/main/io_modify.C b/packages/seacas/libraries/ioss/src/main/io_modify.C
@@ -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.
 //
@@ -71,7 +71,7 @@ using real = double;
 
 namespace {
   std::string codename;
-  std::string version = "2.07 (2024-04-15)";
+  std::string version = "2.08 (2025-04-18)";
 
   std::vector<Ioss::GroupingEntity *> attributes_modified;
 
@@ -524,6 +524,7 @@ namespace {
     if (dbi == nullptr || !dbi->ok(true)) {
       std::exit(EXIT_FAILURE);
     }
+    dbi->set_lower_case_database_names(false);
   }
 
   void handle_help(const std::string &topic)
diff --git a/packages/seacas/libraries/ioss/src/main/io_shell.C b/packages/seacas/libraries/ioss/src/main/io_shell.C
@@ -47,7 +47,7 @@
 
 namespace {
   std::string codename;
-  std::string version = "7.0 (2024/11/08)";
+  std::string version = "7.1 (2025/04/18)";
 
   bool mem_stats = false;
 
@@ -274,9 +274,8 @@ namespace {
       if (!interFace.lower_case_variable_names) {
         dbi->set_lower_case_variable_names(false);
       }
-      if (interFace.lower_case_database_names) {
-        dbi->set_lower_case_database_names(true);
-      }
+      dbi->set_lower_case_database_names(interFace.lower_case_database_names);
+
       if (interFace.outFiletype == "cgns") {
         // CGNS stores BCs (SideSets) on the zones which
         // correspond to element blocks.  If split input sideblocks
@@ -570,9 +569,8 @@ namespace {
     if (!interFace.lower_case_variable_names) {
       dbi1->set_lower_case_variable_names(false);
     }
-    if (interFace.lower_case_database_names) {
-      dbi1->set_lower_case_database_names(true);
-    }
+    dbi1->set_lower_case_database_names(interFace.lower_case_database_names);
+
     if (interFace.outFiletype == "cgns") {
       // CGNS stores BCs (SideSets) on the zones which
       // correspond to element blocks.  If split input sideblocks
@@ -624,9 +622,8 @@ namespace {
     if (!interFace.lower_case_variable_names) {
       dbi2->set_lower_case_variable_names(false);
     }
-    if (interFace.lower_case_database_names) {
-      dbi2->set_lower_case_database_names(true);
-    }
+    dbi2->set_lower_case_database_names(interFace.lower_case_database_names);
+
     if (interFace.outFiletype == "cgns") {
       // CGNS stores BCs (SideSets) on the zones which
       // correspond to element blocks.  If split input sideblocks
diff --git a/packages/seacas/libraries/ioss/src/main/shell_interface.h b/packages/seacas/libraries/ioss/src/main/shell_interface.h
@@ -99,7 +99,7 @@ namespace IOShell {
     bool quiet{false};
     bool in_memory_read{false};
     bool in_memory_write{false};
-    bool lower_case_variable_names{true};
+    bool lower_case_variable_names{false};
     bool lower_case_database_names{false};
     bool delete_timesteps{false};
     bool minimize_open_files{false};
diff --git a/packages/seacas/libraries/ioss/src/main/skinner.C b/packages/seacas/libraries/ioss/src/main/skinner.C
@@ -48,7 +48,7 @@
 namespace {
   template <typename INT> void skinner(Skinner::Interface &interFace, INT /*dummy*/);
   std::string                  codename;
-  std::string                  version = "1.02";
+  std::string                  version = "1.03 (2025-04-18)";
 
   void transfer_field_data(Ioss::GroupingEntity *ige, Ioss::GroupingEntity *oge,
                            Ioss::Field::RoleType role, const Ioss::IntVector &ref_nodes);
@@ -207,6 +207,8 @@ namespace {
       dbi->set_int_byte_size_api(Ioss::USE_INT64_API);
     }
 
+    dbi->set_lower_case_database_names(false);
+
     // NOTE: 'region' owns 'db' pointer at this time...
     Ioss::Region region(dbi, "region_1");
     int          my_rank = region.get_database()->util().parallel_rank();
diff --git a/packages/seacas/libraries/ioss/src/main/struc_to_unstruc.C b/packages/seacas/libraries/ioss/src/main/struc_to_unstruc.C
@@ -1,4 +1,4 @@
-// Copyright(C) 1999-2023 National Technology & Engineering Solutions
+// Copyright(C) 1999-2023, 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.
 //
@@ -87,7 +87,7 @@ namespace {
 
 namespace {
   std::string codename;
-  std::string version = "5.01";
+  std::string version = "5.02 (2025-04-18)";
 } // namespace
 
 int main(int argc, char *argv[])
@@ -139,6 +139,8 @@ namespace {
       std::exit(EXIT_FAILURE);
     }
 
+    dbi->set_lower_case_database_names(false);
+
     // NOTE: 'region' owns 'db' pointer at this time...
     Ioss::Region region(dbi, "region_1");
 

Original file line number	Diff line number	Diff line change
`@@ -215,6 +215,7 @@ int main(int argc, char *argv[])`
`215`	`215`	`if (dbi[p]->int_byte_size_api() > int_byte_size) {`
`216`	`216`	`int_byte_size = dbi[p]->int_byte_size_api();`
`217`	`217`	`}`
	`218`	`+ dbi[p]->set_lower_case_database_names(false);`
`218`	`219`	`}`
`219`	`220`
`220`	`221`	`for (size_t p = 0; p < interFace.inputFiles_.size(); p++) {`
Original file line number	Diff line number	Diff line change
`@@ -1216,7 +1216,7 @@ namespace Ioex {`
`1216`	`1216`	`}`
`1217`	`1217`	`else {`
`1218`	`1218`	`block_name = Ioex::get_entity_name(get_file_pointer(), entity_type, id, basename,`
`1219`		`- maximumNameLength, db_has_name);`
	`1219`	`+ maximumNameLength, lowerCaseDatabaseNames, db_has_name);`
`1220`	`1220`	`}`
`1221`	`1221`	`if (get_use_generic_canonical_name()) {`
`1222`	`1222`	`std::swap(block_name, alias);`
`@@ -1534,8 +1534,9 @@ namespace Ioex {`
`1534`	`1534`	`side_set_name = alias;`
`1535`	`1535`	`}`
`1536`	`1536`	`else {`
`1537`		`- side_set_name = Ioex::get_entity_name(get_file_pointer(), EX_SIDE_SET, id, "surface",`
`1538`		`- maximumNameLength, db_has_name);`
	`1537`	`+ side_set_name =`
	`1538`	`+ Ioex::get_entity_name(get_file_pointer(), EX_SIDE_SET, id, "surface",`
	`1539`	`+ maximumNameLength, lowerCaseDatabaseNames, db_has_name);`
`1539`	`1540`	`}`
`1540`	`1541`
`1541`	`1542`	`if (side_set_name == "universal_sideset") {`
`@@ -1897,7 +1898,7 @@ namespace Ioex {`
`1897`	`1898`	`}`
`1898`	`1899`	`else {`
`1899`	`1900`	`Xset_name = Ioex::get_entity_name(get_file_pointer(), type, id, base + "list",`
`1900`		`- maximumNameLength, db_has_name);`
	`1901`	`+ maximumNameLength, lowerCaseDatabaseNames, db_has_name);`
`1901`	`1902`	`}`
`1902`	`1903`
`1903`	`1904`	`if (get_use_generic_canonical_name()) {`