Update heat2d example for the ADIOS2 API changes (Put/Get)

Author: pnorbert

Tutorial/heat2d/cpp/analysis/heatAnalysis.cpp

@@ -20,6 +20,8 @@
 #include <stdexcept>
 #include <string>
 #include <vector>
+#include <chrono>
+#include <thread>
 
 #include "AnalysisSettings.h"
 
@@ -163,7 +165,7 @@ int main(int argc, char *argv[])
 
             // Arrays are read by scheduling one or more of them
             // and performing the reads at once
-            reader.GetDeferred<double>(*vTin, Tin.data());
+            reader.Get<double>(*vTin, Tin.data());
             /*printDataStep(Tin.data(), settings.readsize.data(),
                           settings.offset.data(), rank, step); */
             reader.EndStep();
@@ -182,8 +184,8 @@ int main(int argc, char *argv[])
 
             /* Output Tout and dT */
             writer->BeginStep();
-            writer->PutDeferred<double>(*vTout, Tout.data());
-            writer->PutDeferred<double>(*vdT, dT.data());
+            writer->Put<double>(*vTout, Tout.data());
+            writer->Put<double>(*vdT, dT.data());
             writer->EndStep();
 
             step++;

Tutorial/heat2d/cpp/simulation/IO_adios2.cpp

@@ -70,11 +70,11 @@ void IO::write(int step, const HeatTransfer &ht, const Settings &s,
                MPI_Comm comm)
 {
     writer->BeginStep();
-    // using PutDeferred() you promise the pointer to the data will be intact
+    // using Put() you promise the pointer to the data will be intact
     // until the end of the output step.
     // We need to have the vector object here not to destruct here until the end
     // of function.
     std::vector<double> v = ht.data_noghost();
-    writer->PutDeferred<double>(*varT, v.data());
+    writer->Put<double>(*varT, v.data());
     writer->EndStep();
 }

Tutorial/heat2d/cpp/visualization/heatVisualization.cpp

@@ -14,6 +14,8 @@
 #include <stdexcept>
 #include <string>
 #include <vector>
+#include <chrono>
+#include <thread>
 
 #include "VizOutput.h"
 #include "VizSettings.h"
@@ -115,7 +117,7 @@ int main(int argc, char *argv[])
                 // Create a 2D selection for the subset
                 vTin->SetSelection(
                     adios2::Box<adios2::Dims>({0, 0}, vTin->m_Shape));
-                reader.GetDeferred<double>(*vTin, Tin.data());
+                reader.Get<double>(*vTin, Tin.data());
                 reader.EndStep();
 
                 std::cout << "Visualization step " << step

Tutorial/heat2d/fortran/analysis/heatAnalysis_adios2_file.F90

@@ -15,11 +15,10 @@ program reader
     integer :: ts=0   ! actual step in file that we read
 
     ! ADIOS related variables
-    integer*8                :: adios2obj   ! ADIOS2 object
-    integer*8                :: io   ! IO group handle
-    integer*8                :: fh   ! File handle
-    integer*8                :: sel  ! ADIOS selection object
-    integer*8                :: var_T ! variable objects
+    type (adios2_adios)      :: adios2obj   ! ADIOS2 object
+    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 infoe
     ! Variable information
     integer                  :: ndim
@@ -85,7 +84,7 @@ program reader
     endif
     call adios2_set_step_selection(var_T, ts*1_8, 1_8, ierr)
     call adios2_set_selection(var_T, 2, offset, readsize, ierr)
-    call adios2_get_deferred(fh, var_T, T, ierr)
+    call adios2_get(fh, var_T, T, ierr)
     call adios2_close(fh, ierr)
     call print_array (T, offset, rank, ts)
 

Tutorial/heat2d/fortran/analysis/heatAnalysis_adios2_stream.F90

@@ -16,11 +16,10 @@ program reader
     integer :: i,j
 
     ! ADIOS2 related variables
-    integer*8                :: adios2obj   ! ADIOS2 object
-    integer*8                :: io   ! IO group handle
-    integer*8                :: fh   ! File handle
-    integer*8                :: sel  ! ADIOS selection object
-    integer*8                :: var_T ! variable objects
+    type (adios2_adios)      :: adios2obj   ! ADIOS2 object
+    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
@@ -100,7 +99,7 @@ program reader
         ! Arrays are read by scheduling one or more of them
         ! and performing the reads at once
         ! In streaming mode, always step 0 is the one available for read
-        call adios2_get_deferred(fh, "T", T, ierr)
+        call adios2_get(fh, "T", T, ierr)
 
         ! Read all deferred and then release resources to this step
         call adios2_end_step(fh, ierr)

Tutorial/heat2d/fortran/simulation/io_adios2.F90

@@ -8,10 +8,13 @@
 ! Author: William F Godoy
 !
 module heat_io
-
+    use adios2
     implicit none
     ! adios handlers
-    integer*8 :: adios, io, bp_writer, var_gndx, var_gndy, var_T, var_dT
+    type(adios2_adios)    :: adios
+    type(adios2_io)       :: io
+    type(adios2_engine)   :: bp_writer
+    type(adios2_variable) :: var_gndx, var_gndy, var_t, var_dT
 
 contains
 
@@ -74,14 +77,16 @@ subroutine io_write(tstep,curr)
         start_dims(2) = offy
         count_dims(2) = ndy
 
-        call adios2_define_variable (var_T, io, "T", 2, shape_dims, &
+        call adios2_define_variable (var_T, io, "T", adios2_type_dp, &
+                                     2, shape_dims, &
                                      start_dims, count_dims, &
                                      adios2_constant_dims,  &
-                                     T(1:ndx,1:ndy,curr), adios2_err )
+                                     adios2_err )
 
-        call adios2_define_variable( var_dT, io, "dT", 2, shape_dims, &
+        call adios2_define_variable( var_dT, io, "dT", adios2_type_dp, &
+                                     2, shape_dims, &
                                      start_dims, count_dims, &
-                                     adios2_constant_dims, dT, adios2_err )
+                                     adios2_constant_dims, adios2_err )
     endif
 
     call MPI_BARRIER(app_comm, adios2_err)
@@ -94,8 +99,8 @@ subroutine io_write(tstep,curr)
     ! here the T(1:ndx,1:ndy,curr)
     allocate(T_temp(1:ndx,1:ndy))
     T_temp = T(1:ndx,1:ndy,curr)
-    call adios2_put_deferred( bp_writer, var_T, T_temp, adios2_err )
-    call adios2_put_deferred( bp_writer, var_dT, dT, adios2_err )
+    call adios2_put( bp_writer, var_T, T_temp, adios2_err )
+    call adios2_put( bp_writer, var_dT, dT, adios2_err )
 
     call adios2_end_step( bp_writer, adios2_err)