From 272803ada77a8733d8924ae8d26038b75e03eedb Mon Sep 17 00:00:00 2001
From: Norbert Podhorszki <pnorbert@ornl.gov>
Date: Mon, 8 May 2017 17:14:40 -0400
Subject: [PATCH] Address more PR comments before merging
---
examples/hello/timeBP/timeBPWriter.cpp | 8 ++++----
examples/hello/timeBP/timeBPWriter_nompi.cpp | 8 ++++----
source/adios2/ADIOS.h | 4 ++--
source/adios2/ADIOS.tcc | 2 +-
source/adios2/ADIOSTypes.h | 5 +++--
5 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/examples/hello/timeBP/timeBPWriter.cpp b/examples/hello/timeBP/timeBPWriter.cpp
index d2411293f..23cbe7484 100644
--- a/examples/hello/timeBP/timeBPWriter.cpp
+++ b/examples/hello/timeBP/timeBPWriter.cpp
@@ -48,13 +48,13 @@ int main(int argc, char *argv[])
{
// Define variable and local size
adios::Variable<double> &ioMyDoubles =
- adios.DefineLocalArray<double>("myDoubles", false, {Nx});
+ adios.DefineVariable<double>("myDoubles", {}, {}, {Nx});
- adios::Variable<float> &ioMyMatrix =
- adios.DefineLocalArray<float>("myMatrix", true, {rows, columns});
+ adios::Variable<float> &ioMyMatrix = adios.DefineVariable<float>(
+ "myMatrix", {adios::JoinedDim, columns}, {}, {rows, columns});
adios::Variable<float> &ioMyMatrix2 =
- adios.DefineLocalArray<float>("myMatrix2", false, {rows, columns});
+ adios.DefineVariable<float>("myMatrix2", {}, {}, {rows, columns});
// Define method for engine creation, it is basically straight-forward
// parameters
diff --git a/examples/hello/timeBP/timeBPWriter_nompi.cpp b/examples/hello/timeBP/timeBPWriter_nompi.cpp
index 3b8735fa6..3b27b9bdb 100644
--- a/examples/hello/timeBP/timeBPWriter_nompi.cpp
+++ b/examples/hello/timeBP/timeBPWriter_nompi.cpp
@@ -40,11 +40,11 @@ int main(int /*argc*/, char ** /*argv*/)
{
// Define variable and local size
adios::Variable<double> &ioMyDoubles =
- adios.DefineVariable<double>("myDoubles", {Nx});
- adios::Variable<float> &ioMyMatrix =
- adios.DefineVariable<float>("myMatrix", {rows, columns});
+ adios.DefineVariable<double>("myDoubles", {}, {}, {Nx});
+ adios::Variable<float> &ioMyMatrix = adios.DefineVariable<float>(
+ "myMatrix", {adios::JoinedDim, columns}, {}, {rows, columns});
adios::Variable<float> &ioMyMatrix2 =
- adios.DefineVariable<float>("myMatrix2", {rows, columns});
+ adios.DefineVariable<float>("myMatrix2", {}, {}, {rows, columns});
// Define method for engine creation, it is basically straight-forward
// parameters
diff --git a/source/adios2/ADIOS.h b/source/adios2/ADIOS.h
index 89a3d7eaa..7baca649e 100644
--- a/source/adios2/ADIOS.h
+++ b/source/adios2/ADIOS.h
@@ -104,7 +104,7 @@ public:
template <class T>
Variable<T> &DefineVariable(const std::string &name, const Dims shape = {},
const Dims start = {}, const Dims count = {},
- bool constantShape = false);
+ const bool constantShape = false);
template <class T>
Variable<T> &DefineLocalValue(const std::string &name)
@@ -370,7 +370,7 @@ protected: // no const to allow default empty and copy constructors
#define declare_template_instantiation(T) \
extern template Variable<T> &ADIOS::DefineVariable<T>( \
const std::string &name, const Dims, const Dims, const Dims, \
- bool constantShape); \
+ const bool constantShape); \
\
extern template Variable<T> &ADIOS::GetVariable<T>(const std::string &);
diff --git a/source/adios2/ADIOS.tcc b/source/adios2/ADIOS.tcc
index 1f44b7ee6..c6262014b 100644
--- a/source/adios2/ADIOS.tcc
+++ b/source/adios2/ADIOS.tcc
@@ -122,7 +122,7 @@ ADIOS::GetVariableMap()
template <typename T>
Variable<T> &ADIOS::DefineVariable(const std::string &name, const Dims shape,
const Dims start, const Dims count,
- bool constantShape)
+ const bool constantShape)
{
auto &variableMap = GetVariableMap<T>();
CheckVariableInput(name, shape);
diff --git a/source/adios2/ADIOSTypes.h b/source/adios2/ADIOSTypes.h
index f20d8a278..b460d41f4 100644
--- a/source/adios2/ADIOSTypes.h
+++ b/source/adios2/ADIOSTypes.h
@@ -14,6 +14,7 @@
#include <complex>
#include <cstddef>
#include <cstdint>
+#include <limits>
#include <type_traits>
#include "adios2/ADIOSConfig.h"
@@ -115,9 +116,9 @@ struct TypeInfo<T, typename std::enable_if<std::is_same<
};
const size_t UnknownDim = 0;
-const size_t JoinedDim = SIZE_MAX - 1;
-const size_t IrregularDim = JoinedDim - 1;
+const size_t JoinedDim = std::numeric_limits<size_t>::max() - 1;
const size_t LocalValueDim = JoinedDim - 1;
+const size_t IrregularDim = JoinedDim - 2;
const bool ConstantShape = true;
enum class VarClass
--
GitLab