Skip to content
Snippets Groups Projects
Commit 111d9cf8 authored by William F Godoy's avatar William F Godoy
Browse files

Solving more conflicts

parent 23bec8d9
No related branches found
No related tags found
1 merge request!294Bp1read : Initial Reading Capabilities and latest API
Hide whitespace changes
Inline Side-by-side
Showing
with 34 additions and 34 deletions
source/adios2/engine/adios1/ADIOS1Reader.cpp
+ 6
− 5
View file @ 111d9cf8
......@@ -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
source/adios2/engine/adios1/ADIOS1Reader.h
+ 2
− 2
View file @ 111d9cf8
......@@ -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"
......
source/adios2/engine/bp/BPFileReader.cpp
+ 2
− 2
View file @ 111d9cf8
......@@ -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)
{
......
source/adios2/engine/bp/BPFileReader.h
+ 1
− 1
View file @ 111d9cf8
......@@ -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;
......
source/adios2/engine/bp/BPFileWriter.h
+ 1
− 1
View file @ 111d9cf8
......@@ -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();
......
source/adios2/engine/dataman/DataManReader.cpp
+ 3
− 4
View file @ 111d9cf8
......@@ -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();
......
source/adios2/engine/dataman/DataManReader.h
+ 1
− 1
View file @ 111d9cf8
......@@ -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;
......
source/adios2/engine/hdf5/HDF5ReaderP.cpp
+ 2
− 2
View file @ 111d9cf8
......@@ -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();
......
source/adios2/engine/hdf5/HDF5ReaderP.h
+ 1
− 1
View file @ 111d9cf8
......@@ -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();
......
source/adios2/engine/mixer/HDFMixer.cpp
+ 1
− 1
View file @ 111d9cf8
......@@ -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),
......
source/adios2/engine/mixer/HDFMixer.h
+ 3
− 3
View file @ 111d9cf8
......@@ -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_ */
source/adios2/engine/mixer/HDFMixer.tcc
+ 1
− 1
View file @ 111d9cf8
......@@ -43,4 +43,4 @@ void HDFMixer::DoWriteCommon(Variable<T> &variable, const T *values)
}
}
} // end namespace adios
} // end namespace adios2
source/adios2/engine/plugin/PluginEngine.cpp
+ 4
− 4
View file @ 111d9cf8
......@@ -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(); }
......
source/adios2/engine/plugin/PluginEngine.h
+ 3
− 2
View file @ 111d9cf8
......@@ -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;
......
source/adios2/engine/plugin/PluginEngineInterface.cpp
+ 2
− 3
View file @ 111d9cf8
......@@ -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)
{
}
......
source/adios2/engine/plugin/PluginEngineInterface.h
+ 1
− 1
View file @ 111d9cf8
......@@ -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;
};
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment