From bbdd0841ba77406b9be025ed05df69df20d1544e Mon Sep 17 00:00:00 2001
From: Ruonan Wang <jason.ruonan.wang@gmail.com>
Date: Mon, 31 Jul 2017 14:14:03 -0400
Subject: [PATCH] changed printData signature to using size_t in heatRead
example
---
examples/heatTransfer/read/PrintData.cpp | 3 +--
examples/heatTransfer/read/PrintData.h | 3 +--
examples/heatTransfer/read/heatRead_adios1.cpp | 4 +++-
examples/heatTransfer/read/heatRead_adios2.cpp | 8 +++-----
4 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/examples/heatTransfer/read/PrintData.cpp b/examples/heatTransfer/read/PrintData.cpp
index ef84e6a40..3cbbdb677 100644
--- a/examples/heatTransfer/read/PrintData.cpp
+++ b/examples/heatTransfer/read/PrintData.cpp
@@ -15,8 +15,7 @@
#include "PrintData.h"
-void printData(double *xy, uint64_t *size, uint64_t *offset, int rank,
- int steps)
+void printData(double *xy, size_t *size, size_t *offset, int rank, int steps)
{
std::ofstream myfile;
std::string filename = "data." + std::to_string(rank);
diff --git a/examples/heatTransfer/read/PrintData.h b/examples/heatTransfer/read/PrintData.h
index 308ace340..b51ab9b8a 100644
--- a/examples/heatTransfer/read/PrintData.h
+++ b/examples/heatTransfer/read/PrintData.h
@@ -13,7 +13,6 @@
#include <cstdint>
-void printData(double *xy, uint64_t *size, uint64_t *offset, int rank,
- int steps);
+void printData(double *xy, size_t *size, size_t *offset, int rank, int steps);
#endif /* PRINTDATA_H_ */
diff --git a/examples/heatTransfer/read/heatRead_adios1.cpp b/examples/heatTransfer/read/heatRead_adios1.cpp
index 90e870e80..f08d9c7a1 100644
--- a/examples/heatTransfer/read/heatRead_adios1.cpp
+++ b/examples/heatTransfer/read/heatRead_adios1.cpp
@@ -69,6 +69,8 @@ int main(int argc, char *argv[])
// 1D decomposition of the columns, which is inefficient for reading!
uint64_t readsize[2] = {gndx, gndy / nproc};
uint64_t offset[2] = {0LL, rank * readsize[1]};
+ size_t readsize_size_t[2] = {gndx, gndy / nproc};
+ size_t offset_size_t[2] = {0LL, rank * readsize[1]};
if (rank == nproc - 1)
{
// last process should read all the rest of columns
@@ -90,7 +92,7 @@ int main(int argc, char *argv[])
adios_schedule_read(f, sel, "T", 0, vT->nsteps, T);
adios_perform_reads(f, 1);
- printData(T, readsize, offset, rank, vT->nsteps);
+ printData(T, readsize_size_t, offset_size_t, rank, vT->nsteps);
adios_read_close(f);
adios_free_varinfo(vT);
delete[] T;
diff --git a/examples/heatTransfer/read/heatRead_adios2.cpp b/examples/heatTransfer/read/heatRead_adios2.cpp
index b74c0edfa..35ec66837 100644
--- a/examples/heatTransfer/read/heatRead_adios2.cpp
+++ b/examples/heatTransfer/read/heatRead_adios2.cpp
@@ -93,10 +93,8 @@ int main(int argc, char *argv[])
}
// 1D decomposition of the columns, which is inefficient for reading!
- std::vector<uint64_t> readsize({gndx, gndy / nproc});
- std::vector<uint64_t> offset({0LL, rank * readsize[1]});
- adios2::Dims readsize_size_t({gndx, gndy / nproc});
- adios2::Dims offset_size_t({0LL, rank * readsize[1]});
+ adios2::Dims readsize({gndx, gndy / nproc});
+ adios2::Dims offset({0LL, rank * readsize[1]});
if (rank == nproc - 1)
{
// last process should read all the rest of columns
@@ -111,7 +109,7 @@ int main(int argc, char *argv[])
double *T = new double[vT->m_AvailableSteps * readsize[0] * readsize[1]];
// Create a 2D selection for the subset
- vT->SetSelection(offset_size_t, readsize_size_t);
+ vT->SetSelection(offset, readsize);
vT->SetStepSelection(0, vT->m_AvailableSteps);
// Arrays are read by scheduling one or more of them
--
GitLab