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

sandialabs · Mar 1, 2024 · da386f1 · da386f1
2 parents b20afcf + 009f3d1
commit da386f1
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 15 deletions.
diff --git a/packages/seacas/Jamfile b/packages/seacas/Jamfile
@@ -160,8 +160,7 @@ alias install-user-include : install-user-include0
                              install-user-include4
                              install-user-include5
                              install-user-include6
-                             install-user-include7
-                             install-user-include8 ;
+                             install-user-include7 ;
 
 # This rule copies all headers it finds in the include directory of the
 # source to the include directory of the install-root.
@@ -234,13 +233,6 @@ install install-user-include7
   ;
 
 
-explicit install-user-include8 ;
-install install-user-include8
-  : [ glob $(seacas-root)/libraries/suplib_cpp/fmt/*.h ]
-  : <location>$(install-root)/io_system/include/fmt
-  ;
-
-
 explicit install-user-env ;
 alias install-user-env : install-user-jamfile
                           install-user-bin install-user-include install-user-lib ;
@@ -525,6 +517,7 @@ lib ioss
     ]
     /tpl/trilinos//zoltan
     /tpl/parmetis//parmetis
+    /tpl/fmt//fmt
     /mpi//mpi
   : <define>BUILT_IN_SIERRA
     [ ifuserbuild
@@ -862,6 +855,7 @@ lib suplib_cpp
     # builds only and will not be present for user builds.
         [ glob $(seacas-root)/libraries/suplib_cpp/*.C ]
     ]
+    /tpl/fmt//fmt
   :
     [ ifdevbuild
     # Any parameters within this 'ifdevbuild' block apply to development
@@ -1389,6 +1383,7 @@ lib aprepro_lib
     ]
     exodus
     /tpl/netcdf-c//netcdf
+    /tpl/fmt//fmt
   : <define>EXODUS_SUPPORT
     <define>FMT_SUPPORT
     [ ifdevbuild

diff --git a/packages/seacas/libraries/ioss/src/exodus/Ioex_BaseDatabaseIO.C b/packages/seacas/libraries/ioss/src/exodus/Ioex_BaseDatabaseIO.C
@@ -579,12 +579,7 @@ namespace Ioex {
       Ioss::Utils::copy_string(qa[num_qa_records].qa_record[0][1], version, MAX_STR_LENGTH + 1);
 
       int ierr = 0;
-      if (isParallel && myProcessor != 0) {
-        ierr = ex_put_qa(get_file_pointer(), num_qa_records + 1, nullptr);
-      }
-      else {
-        ierr = ex_put_qa(get_file_pointer(), num_qa_records + 1, qa[0].qa_record);
-      }
+      ierr = ex_put_qa(get_file_pointer(), num_qa_records + 1, qa[0].qa_record);
       if (ierr < 0) {
         Ioex::exodus_error(get_file_pointer(), __LINE__, __func__, __FILE__);
       }