Merge pull request #3994 from pnorbert/fix-example-basics-values

Fix 1: bpls handle when BP5 throws logic error on minmax for unsuppor…
ornladios · Jan 9, 2024 · 5de40ef · 5de40ef
2 parents 4ace858 + 732255d
commit 5de40ef
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 12 deletions.
diff --git a/examples/basics/values/values.F90 b/examples/basics/values/values.F90
@@ -111,7 +111,7 @@ subroutine reader
     ! Note, every process reads everything in this example
 
     call adios2_declare_io(io, adios, "ValuesInput", ierr)
-    call adios2_open(engine, io, "adios2-values-f.bp", adios2_mode_read, MPI_COMM_SELF, ierr)
+    call adios2_open(engine, io, "adios2-values-f.bp", adios2_mode_readRandomAccess, MPI_COMM_SELF, ierr)
 
     call adios2_inquire_variable(var_gc, io, "GlobalConstant", ierr)
     call adios2_get(engine, var_gc, gc , ierr)

diff --git a/examples/basics/values/valuesWrite.cpp b/examples/basics/values/valuesWrite.cpp
@@ -19,6 +19,7 @@
  */
 
 #include <iostream>
+#include <string>
 #include <vector>
 
 #include <adios2.h>
@@ -80,6 +81,8 @@ int main(int argc, char *argv[])
 
         // 2. Global value, same value across processes, varying value over time
         adios2::Variable<int> varStep = io.DefineVariable<int>("Step");
+        adios2::Variable<std::string> varGlobalString =
+            io.DefineVariable<std::string>("GlobalString");
 
         // 3. Local value, varying across processes, constant over time
         adios2::Variable<int> varProcessID =
@@ -110,6 +113,11 @@ int main(int argc, char *argv[])
                     writer.Put<int>(varNproc, nproc);
                 }
                 writer.Put<int>(varStep, step);
+
+                std::string str = "This is step " + std::to_string(step);
+                // str will go out of scope before EndStep(), so we must use
+                // Sync mode in Put()
+                writer.Put<std::string>(varGlobalString, str, adios2::Mode::Sync);
             }
 
             // 3. and 4. Writing a local value on every process. Will be shown

diff --git a/source/utils/bpls/bpls.cpp b/source/utils/bpls/bpls.cpp
@@ -1144,21 +1144,27 @@ int printVariableInfo(core::Engine *fp, core::IO *io, core::Variable<T> *variabl
             if (timestep == false)
             {
                 MinMaxStruct MinMax;
-                if (fp->VariableMinMax(*variable, DefaultSizeT, MinMax))
+                try
                 {
-                    fprintf(outf, " = ");
-                    print_data(&MinMax.MinUnion, 0, adiosvartype, false);
-                    fprintf(outf, " / ");
-                    print_data(&MinMax.MaxUnion, 0, adiosvartype, false);
+                    if (fp->VariableMinMax(*variable, DefaultSizeT, MinMax))
+                    {
+                        fprintf(outf, " = ");
+                        print_data(&MinMax.MinUnion, 0, adiosvartype, false);
+                        fprintf(outf, " / ");
+                        print_data(&MinMax.MaxUnion, 0, adiosvartype, false);
+                    }
+                    else
+                    {
+                        fprintf(outf, " = ");
+                        print_data(&variable->m_Min, 0, adiosvartype, false);
+                        fprintf(outf, " / ");
+                        print_data(&variable->m_Max, 0, adiosvartype, false);
+                    }
+                    // fprintf(outf," {MIN / MAX} ");
                 }
-                else
+                catch (std::logic_error &)
                 {
-                    fprintf(outf, " = ");
-                    print_data(&variable->m_Min, 0, adiosvartype, false);
-                    fprintf(outf, " / ");
-                    print_data(&variable->m_Max, 0, adiosvartype, false);
                 }
-                // fprintf(outf," {MIN / MAX} ");
             }
 #if 0
             else