diff --git a/source/adios2/engine/adios1/ADIOS1Reader.cpp b/source/adios2/engine/adios1/ADIOS1Reader.cpp
index b85dfeced84d0dfa1d8c7658e4d232f81a1e4bfb..99f42e0270faf2a505da9080096b5b974859ec15 100644
--- a/source/adios2/engine/adios1/ADIOS1Reader.cpp
+++ b/source/adios2/engine/adios1/ADIOS1Reader.cpp
@@ -18,9 +18,9 @@
namespace adios2
{
-ADIOS1Reader::ADIOS1Reader(IO &io, const std::string &name, const Mode openMode,
+ADIOS1Reader::ADIOS1Reader(IO &io, const std::string &name, const Mode mode,
MPI_Comm mpiComm)
-: Engine("ADIOS1Reader", io, name, openMode, mpiComm),
+: Engine("ADIOS1Reader", io, name, mode, mpiComm),
m_ADIOS1(name, mpiComm, io.m_DebugMode)
{
m_EndMessage = " in call to IO Open ADIOS1Reader " + m_Name + "\n";
@@ -35,9 +35,10 @@ ADIOS1Reader::~ADIOS1Reader()
/* m_ADIOS1 deconstructor does close and finalize */
}
-StepStatus ADIOS1Reader::BeginStep(const StepMode mode, const float timeout_sec)
+StepStatus ADIOS1Reader::BeginStep(const StepMode mode,
+ const float timeoutSeconds)
{
- return m_ADIOS1.AdvanceStep(mode, timeout_sec);
+ return m_ADIOS1.AdvanceStep(mode, timeoutSeconds);
}
// PRIVATE
@@ -97,4 +98,4 @@ void ADIOS1Reader::InitTransports()
m_ADIOS1.InitTransports(m_IO.m_TransportsParameters);
}
-} // end namespace
+} // end namespace adios2
diff --git a/source/adios2/engine/adios1/ADIOS1Reader.h b/source/adios2/engine/adios1/ADIOS1Reader.h
index 6932ece48f66233dcb5adccb1f42ffc529d78dd0..399fc34c326f1521b03cefb5246c5de55351ed39 100644
--- a/source/adios2/engine/adios1/ADIOS1Reader.h
+++ b/source/adios2/engine/adios1/ADIOS1Reader.h
@@ -48,7 +48,7 @@ public:
* @param debugMode
* @param hostLanguage
*/
- ADIOS1Reader(IO &adios, const std::string &name, const Mode openMode,
+ ADIOS1Reader(IO &adios, const std::string &name, const Mode mode,
MPI_Comm mpiComm);
~ADIOS1Reader();
@@ -85,7 +85,7 @@ private:
Variable<T> *InquireVariableCommon(const std::string &variableName);
};
-} // end namespace adios
+} // end namespace adios2
#include "ADIOS1Reader.inl"
diff --git a/source/adios2/engine/bp/BPFileReader.cpp b/source/adios2/engine/bp/BPFileReader.cpp
index 43bdc20063ef6cd71a75a7edcea1635b7ef73fab..4c806ea839bed6687ee5e7ddb582245e090ff1a5 100644
--- a/source/adios2/engine/bp/BPFileReader.cpp
+++ b/source/adios2/engine/bp/BPFileReader.cpp
@@ -16,9 +16,9 @@
namespace adios2
{
-BPFileReader::BPFileReader(IO &io, const std::string &name, const Mode openMode,
+BPFileReader::BPFileReader(IO &io, const std::string &name, const Mode mode,
MPI_Comm mpiComm)
-: Engine("BPFileReader", io, name, openMode, mpiComm),
+: Engine("BPFileReader", io, name, mode, mpiComm),
m_BP3Deserializer(mpiComm, m_DebugMode), m_FileManager(mpiComm, m_DebugMode),
m_SubFileManager(mpiComm, m_DebugMode)
{
diff --git a/source/adios2/engine/bp/BPFileReader.h b/source/adios2/engine/bp/BPFileReader.h
index 9a2427de15c267276d9383fd557ccc7fe7f9ea9d..14f04f4bb6eead78044abfcfa83dc00c224c9aef 100644
--- a/source/adios2/engine/bp/BPFileReader.h
+++ b/source/adios2/engine/bp/BPFileReader.h
@@ -37,7 +37,7 @@ public:
* @param openMode only read
* @param mpiComm
*/
- BPFileReader(IO &io, const std::string &name, const Mode openMode,
+ BPFileReader(IO &io, const std::string &name, const Mode mode,
MPI_Comm mpiComm);
virtual ~BPFileReader() = default;
diff --git a/source/adios2/engine/bp/BPFileWriter.h b/source/adios2/engine/bp/BPFileWriter.h
index b56b44773f33624831f355b26eaf7f7c904706a6..9f758d8ed633dae1ffd8d0934684b632ee682d9b 100644
--- a/source/adios2/engine/bp/BPFileWriter.h
+++ b/source/adios2/engine/bp/BPFileWriter.h
@@ -29,7 +29,7 @@ public:
* @param openMode w (supported), r, a from OpenMode in ADIOSTypes.h
* @param mpiComm MPI communicator
*/
- BPFileWriter(IO &io, const std::string &name, const Mode openMode,
+ BPFileWriter(IO &io, const std::string &name, const Mode mode,
MPI_Comm mpiComm);
~BPFileWriter();
diff --git a/source/adios2/engine/dataman/DataManReader.cpp b/source/adios2/engine/dataman/DataManReader.cpp
index 28109738bae0d03c9769ba15a4d03d5dadefbcd6..2c6fa387b9c2f9aaf1ee0817350e9336dea1d43a 100644
--- a/source/adios2/engine/dataman/DataManReader.cpp
+++ b/source/adios2/engine/dataman/DataManReader.cpp
@@ -15,10 +15,9 @@
namespace adios2
{
-DataManReader::DataManReader(IO &io, const std::string &name,
- const Mode openMode, MPI_Comm mpiComm)
-: Engine("DataManReader", io, name, openMode, mpiComm),
- m_Man(mpiComm, m_DebugMode)
+DataManReader::DataManReader(IO &io, const std::string &name, const Mode mode,
+ MPI_Comm mpiComm)
+: Engine("DataManReader", io, name, mode, mpiComm), m_Man(mpiComm, m_DebugMode)
{
m_EndMessage = " in call to IO Open DataManReader " + m_Name + "\n";
Init();
diff --git a/source/adios2/engine/dataman/DataManReader.h b/source/adios2/engine/dataman/DataManReader.h
index d834e55ef7bdd0f2d0f4621586f12a6a20ffdd62..7b7ec1934d9692216b9f3571bd027f6f0936ed47 100644
--- a/source/adios2/engine/dataman/DataManReader.h
+++ b/source/adios2/engine/dataman/DataManReader.h
@@ -35,7 +35,7 @@ public:
* @param nthreads
*/
using json = nlohmann::json;
- DataManReader(IO &io, const std::string &name, const Mode openMode,
+ DataManReader(IO &io, const std::string &name, const Mode mode,
MPI_Comm mpiComm);
virtual ~DataManReader() = default;
diff --git a/source/adios2/engine/hdf5/HDF5ReaderP.cpp b/source/adios2/engine/hdf5/HDF5ReaderP.cpp
index b3888f9414ad611b96c536ef0092dcfab4848bcb..a10a3e7b1b476d80c1960e2089236638108b8546 100644
--- a/source/adios2/engine/hdf5/HDF5ReaderP.cpp
+++ b/source/adios2/engine/hdf5/HDF5ReaderP.cpp
@@ -15,9 +15,9 @@
namespace adios2
{
-HDF5ReaderP::HDF5ReaderP(IO &io, const std::string &name, const Mode openMode,
+HDF5ReaderP::HDF5ReaderP(IO &io, const std::string &name, const Mode mode,
MPI_Comm mpiComm)
-: Engine("HDF5Reader", io, name, openMode, mpiComm), m_H5File(io.m_DebugMode)
+: Engine("HDF5Reader", io, name, mode, mpiComm), m_H5File(io.m_DebugMode)
{
m_EndMessage = ", in call to IO HDF5Reader Open " + m_Name + "\n";
Init();
diff --git a/source/adios2/engine/hdf5/HDF5ReaderP.h b/source/adios2/engine/hdf5/HDF5ReaderP.h
index 3808396b9d11f88ab3730f56d2a4b64af118a82c..786dbbfb39e426aa01493fd5ab9497980842b86e 100644
--- a/source/adios2/engine/hdf5/HDF5ReaderP.h
+++ b/source/adios2/engine/hdf5/HDF5ReaderP.h
@@ -29,7 +29,7 @@ public:
* @param mpiComm
* @param method
*/
- HDF5ReaderP(IO &adios, const std::string &name, const Mode openMode,
+ HDF5ReaderP(IO &adios, const std::string &name, const Mode mode,
MPI_Comm mpiComm);
~HDF5ReaderP();
diff --git a/source/adios2/engine/mixer/HDFMixer.cpp b/source/adios2/engine/mixer/HDFMixer.cpp
index 57721457783473525c610130765e2d4a7614aeb2..8c86fdc7e77eac108d55578407b3a58e5935b98d 100644
--- a/source/adios2/engine/mixer/HDFMixer.cpp
+++ b/source/adios2/engine/mixer/HDFMixer.cpp
@@ -19,7 +19,7 @@
namespace adios2
{
-HDFMixer::HDFMixer(IO &io, const std::string &name, const OpenMode openMode,
+HDFMixer::HDFMixer(IO &io, const std::string &name, const Mode mode,
MPI_Comm mpiComm)
: Engine("HDFMixer", io, name, openMode, mpiComm),
m_HDFVDSWriter(mpiComm, m_DebugMode),
diff --git a/source/adios2/engine/mixer/HDFMixer.h b/source/adios2/engine/mixer/HDFMixer.h
index 353950763ba3af53a6d38aee0f96b919a4f665fb..e4616f6fc298b31b89218e9290267cba03d98ab5 100644
--- a/source/adios2/engine/mixer/HDFMixer.h
+++ b/source/adios2/engine/mixer/HDFMixer.h
@@ -45,12 +45,12 @@ public:
* @param openMode w (supported), r, a from OpenMode in ADIOSTypes.h
* @param mpiComm MPI communicator
*/
- HDFMixer(IO &io, const std::string &name, const OpenMode openMode,
+ HDFMixer(IO &io, const std::string &name, const Mode mode,
MPI_Comm mpiComm);
~HDFMixer();
- void Advance(const float timeoutSeconds = 0.0) final;
+ void Advance(const float timeoutSeconds = 0.f) final;
/**
* Closes a single transport or all transports
@@ -104,6 +104,6 @@ private:
void WriteProfilingJSONFile();
};
-} // end namespace adios
+} // end namespace adios2
#endif /* ADIOS2_ENGINE_H5_HDFMIXER_H_ */
diff --git a/source/adios2/engine/mixer/HDFMixer.tcc b/source/adios2/engine/mixer/HDFMixer.tcc
index 63da2019da77727817f8cfe780ab74b60fc4d646..d3d92bcac52cc202c3643a17cbe70194d3a1fadc 100644
--- a/source/adios2/engine/mixer/HDFMixer.tcc
+++ b/source/adios2/engine/mixer/HDFMixer.tcc
@@ -43,4 +43,4 @@ void HDFMixer::DoWriteCommon(Variable<T> &variable, const T *values)
}
}
-} // end namespace adios
+} // end namespace adios2
diff --git a/source/adios2/engine/plugin/PluginEngine.cpp b/source/adios2/engine/plugin/PluginEngine.cpp
index 88dba1f9c30378d7579717b60814908dc326c33e..fd6713228be36b2e17eccf86666502802f3f7c77 100644
--- a/source/adios2/engine/plugin/PluginEngine.cpp
+++ b/source/adios2/engine/plugin/PluginEngine.cpp
@@ -50,20 +50,20 @@ void PluginEngine::RegisterPlugin(const std::string pluginName,
/******************************************************************************/
-PluginEngine::PluginEngine(IO &io, const std::string &name, const Mode openMode,
+PluginEngine::PluginEngine(IO &io, const std::string &name, const Mode mode,
MPI_Comm mpiComm)
-: Engine("Plugin", io, name, openMode, mpiComm), m_Impl(new Impl)
+: Engine("Plugin", io, name, mode, mpiComm), m_Impl(new Impl)
{
Init();
m_Impl->m_Plugin =
- m_Impl->m_HandleCreate(io, m_Impl->m_PluginName, openMode, mpiComm);
+ m_Impl->m_HandleCreate(io, m_Impl->m_PluginName, mode, mpiComm);
}
PluginEngine::~PluginEngine() { m_Impl->m_HandleDestroy(m_Impl->m_Plugin); }
StepStatus PluginEngine::BeginStep(StepMode mode, const float timeoutSeconds)
{
- return m_Impl->m_Plugin->BeginStep(mode, timeout_sec);
+ return m_Impl->m_Plugin->BeginStep(mode, timeoutSeconds);
}
void PluginEngine::PerformPuts() { m_Impl->m_Plugin->PerformPuts(); }
diff --git a/source/adios2/engine/plugin/PluginEngine.h b/source/adios2/engine/plugin/PluginEngine.h
index ad4373246f327d05862b95673ebaaeef2b34ff94..c8aa05b994a55f4ca4d2fbe74173bd954b2855e3 100644
--- a/source/adios2/engine/plugin/PluginEngine.h
+++ b/source/adios2/engine/plugin/PluginEngine.h
@@ -62,11 +62,12 @@ public:
static void RegisterPlugin(const std::string name);
public:
- PluginEngine(IO &io, const std::string &name, const Mode openMode,
+ PluginEngine(IO &io, const std::string &name, const Mode mode,
MPI_Comm mpiComm);
virtual ~PluginEngine();
- StepStatus BeginStep(StepMode mode, const float timeout_sec = 0.f) override;
+ StepStatus BeginStep(StepMode mode,
+ const float timeoutSeconds = 0.f) override;
void PerformPuts() override;
void PerformGets() override;
void EndStep() override;
diff --git a/source/adios2/engine/plugin/PluginEngineInterface.cpp b/source/adios2/engine/plugin/PluginEngineInterface.cpp
index 5b32f41173da0bc0ce081620362fc94f1e7a934e..f82ca774179a638f82499828fb3e1e7383f4e94d 100644
--- a/source/adios2/engine/plugin/PluginEngineInterface.cpp
+++ b/source/adios2/engine/plugin/PluginEngineInterface.cpp
@@ -14,9 +14,8 @@ namespace adios2
{
PluginEngineInterface::PluginEngineInterface(IO &io, const std::string &name,
- const Mode openMode,
- MPI_Comm mpiComm)
-: Engine("PluginInterface", io, name, openMode, mpiComm)
+ const Mode mode, MPI_Comm mpiComm)
+: Engine("PluginInterface", io, name, mode, mpiComm)
{
}
diff --git a/source/adios2/engine/plugin/PluginEngineInterface.h b/source/adios2/engine/plugin/PluginEngineInterface.h
index de41d78955727817e8271cbbbcd3265d175defd0..ada3e12eb5d4fda4bd9bb299c0c78f3b5f5515c3 100644
--- a/source/adios2/engine/plugin/PluginEngineInterface.h
+++ b/source/adios2/engine/plugin/PluginEngineInterface.h
@@ -31,7 +31,7 @@ class PluginEngineInterface : public Engine
friend class PluginEngine;
public:
- PluginEngineInterface(IO &io, const std::string &name, const Mode openMode,
+ PluginEngineInterface(IO &io, const std::string &name, const Mode mode,
MPI_Comm mpiComm);
virtual ~PluginEngineInterface() = default;
};