Updates to heat2d after ADIOS API changes

Author: pnorbert

Tutorial/heat2d/cpp/visualization/heatVisualization.cpp

@@ -105,14 +105,19 @@ int main(int argc, char *argv[])
 
                 if (firstStep)
                 {
+                    size_t gndx = vTin.Shape()[0];
+                    size_t gndy = vTin.Shape()[1];
+
                     if (rank == 0)
                     {
                         std::cout << "gndx       = " << vTin.Shape()[0]
                                   << std::endl;
                         std::cout << "gndy       = " << vTin.Shape()[1]
                                   << std::endl;
                     }
-                    Tin.resize(std::accumulate(vTin.Count().begin(), vTin.Count().end(), vTin.Sizeof(), std::multiplies<size_t>()));
+                    //Tin.resize(std::accumulate(vTin.Count().begin(), vTin.Count().end(), vTin.Sizeof(), std::multiplies<size_t>()));
+                    Tin.resize(gndx*gndy);
+                    std::cout << "size       = " << Tin.size() << std::endl;
                 }
 
                 // Create a 2D selection for the subset

Tutorial/heat2d/fortran/adios2.xml

@@ -1,15 +1,6 @@
 <?xml version="1.0"?>
 <adios-config>
 
-    <!--===========================================
-           Configuration for the Simulation Output 
-        ==========================================-->
-
-    <io name="SimulationOutput">
-        <engine type="BPFile">
-        </engine>
-    </io>
-
     <!-- example engines 
 
         <engine type="BPFile">
@@ -34,6 +25,15 @@
 
     -->
 
+    <!--===========================================
+           Configuration for the Simulation Output 
+        ==========================================-->
+
+    <io name="SimulationOutput">
+        <engine type="BPFile">
+        </engine>
+    </io>
+
     <!-- 
          The following groups are only used by the C++ examples
     -->
@@ -56,7 +56,7 @@
         =============================================-->
 
     <io name="VizInput">
-        <engine type="bpfile">
+        <engine type="BPFile">
         </engine>
     </io>
 

Tutorial/heat2d/fortran/analysis/heatAnalysis_adios2_file.F90

@@ -45,14 +45,13 @@ program reader
 
     call adios2_init (adios2obj, "adios2.xml",  app_comm, adios2_debug_mode_on, ierr)
     call adios2_declare_io (io, adios2obj, 'SimulationOutput', ierr )
+    call adios2_open(fh, io, filename, adios2_mode_read, app_comm, ierr)
+
     ! For information purposes only:
-    call adios2_io_engine_type(io, engine_type, ierr)
     if (rank == 0) then
-        print '(" Using ",a, " engine for input")', engine_type
+        print '(" Using ",a, " engine for input")', trim(fh%type)
     endif
 
-    call adios2_open(fh, io, filename, adios2_mode_read, app_comm, ierr)
-
     ! We can inquire the dimensions, type and number of steps 
     ! of a variable directly from the metadata
     call adios2_inquire_variable(var_T, io, "T", ierr)
@@ -74,8 +73,8 @@ program reader
     allocate( T(readsize(1), readsize(2)) )
 
     !TODO:  Get the number of available steps
-    call adios2_variable_available_steps_start(var_T, steps_start, ierr)
-    call adios2_variable_available_steps_count(var_T, steps_count, ierr)
+    call adios2_variable_steps_start(var_T, steps_start, ierr)
+    call adios2_variable_steps(var_T, steps_count, ierr)
     ts = steps_start+steps_count-1 ! Let's read the last timestep
     if (rank == 0) then
         print '(" First available step = ", i0)', steps_start

Tutorial/heat2d/fortran/analysis/heatAnalysis_adios2_stream.F90

@@ -20,7 +20,6 @@ program reader
     type (adios2_io)         :: io   ! IO group handle
     type (adios2_engine)     :: fh   ! File handle
     type (adios2_variable)   :: var_T ! variable objects
-    character(:), allocatable :: engine_type ! some info
     ! Variable information
     integer                  :: vartype, nsteps, ndim
     integer*8, dimension(:), allocatable  :: dims
@@ -45,14 +44,13 @@ program reader
 
     call adios2_init (adios2obj, "adios2.xml",  app_comm, adios2_debug_mode_on, ierr)
     call adios2_declare_io (io, adios2obj, 'SimulationOutput', ierr )
+    call adios2_open(fh, io, streamname, adios2_mode_read, app_comm, ierr)
+
     ! For information purposes only:
-    call adios2_io_engine_type(io, engine_type, ierr)
     if (rank == 0) then
-        print '(" Using ",a, " engine for input")', engine_type
+        print '(" Using ",a, " engine for input")', trim(fh%type)
     endif
 
-    call adios2_open(fh, io, streamname, adios2_mode_read, app_comm, ierr)
-
     if (ierr .ne. 0) then
         print '(" Failed to open stream: ",a)', streamname
         print '(" open stream ierr=: ",i0)', ierr

Tutorial/heat2d/fortran/simulation/io_adios2.F90

@@ -22,17 +22,10 @@ subroutine io_init()
     use heat_vars
     use adios2
     implicit none
-    character(:), allocatable :: engine_type
 
     call adios2_init (adios, "adios2.xml",  app_comm, adios2_debug_mode_on, ierr)
     call adios2_declare_io (io, adios, 'SimulationOutput', ierr )
 
-    ! For information purposes only:
-    call adios2_io_engine_type(io, engine_type, ierr)
-    if (rank == 0) then
-        print '("Using ",a, " engine for output")', engine_type
-    endif
-
 end subroutine io_init
 
 subroutine io_finalize()
@@ -67,6 +60,10 @@ subroutine io_write(tstep,curr)
     if (tstep.eq.0) then
 
         call adios2_open (bp_writer, io, filename, adios2_mode_write, adios2_err)
+        ! For information purposes only:
+        if (rank == 0) then
+            print '("Using ",a, " engine for output")', bp_writer%type
+        endif
 
         ! Define T and dT array dimensions
         shape_dims(1) = gndx