diff --git a/bindings/python/src/ADIOSPy.cpp b/bindings/python/src/ADIOSPy.cpp index 8e2fe88080b3f5da4dbd110dfd3e60c2ab1e6261..e8dd0e0a0f22df439ab850348156566717272649 100644 --- a/bindings/python/src/ADIOSPy.cpp +++ b/bindings/python/src/ADIOSPy.cpp @@ -19,7 +19,7 @@ namespace adios { ADIOSPy::ADIOSPy(MPI_Comm mpiComm, const bool debug) - : ADIOS(mpiComm, adios::Verbose::ERROR, debug) +: ADIOS(mpiComm, adios::Verbose::ERROR, debug) { } diff --git a/bindings/python/src/MethodPy.cpp b/bindings/python/src/MethodPy.cpp index e1e57f3c102e0a8c62512d94fa4df07c8071fbd1..4310de6739be79c1495574d36e54e0229af0fa34 100644 --- a/bindings/python/src/MethodPy.cpp +++ b/bindings/python/src/MethodPy.cpp @@ -25,7 +25,7 @@ namespace py = pybind11; #endif MethodPy::MethodPy(const std::string type, const bool debugMode) - : Method(type, debugMode) +: Method(type, debugMode) { } diff --git a/bindings/python/src/VariablePy.cpp b/bindings/python/src/VariablePy.cpp index cc93adcb3fc2c40052bff6a8e8bc91e32b1efca2..7d677d567e1f3a645490300d5bbf90a3fc744117 100644 --- a/bindings/python/src/VariablePy.cpp +++ b/bindings/python/src/VariablePy.cpp @@ -16,9 +16,9 @@ namespace adios VariablePy::VariablePy(const std::string name, const pyList localDimensionsPy, const pyList globalDimensionsPy, const pyList globalOffsetsPy) - : m_Name{name}, m_LocalDimensions{ListToVector(localDimensionsPy)}, - m_GlobalDimensions{ListToVector(globalDimensionsPy)}, - m_GlobalOffsets{ListToVector(globalOffsetsPy)} +: m_Name{name}, m_LocalDimensions{ListToVector(localDimensionsPy)}, + m_GlobalDimensions{ListToVector(globalDimensionsPy)}, + m_GlobalOffsets{ListToVector(globalOffsetsPy)} { } diff --git a/include/core/Engine.h b/include/core/Engine.h index d648452690d6d2ab3e2bd3aee5ac693931961473..d536873c72dd08bbcd7e9307713159a73f956d4d 100644 --- a/include/core/Engine.h +++ b/include/core/Engine.h @@ -136,7 +136,8 @@ public: * @param variableName * @param values */ - template <class T> void Write(const std::string &variableName, const T *values) + template <class T> + void Write(const std::string &variableName, const T *values) { Write(variableName, values); } @@ -220,7 +221,8 @@ public: const unsigned long long int *values); virtual void Write(const std::string &variableName, const float *values); virtual void Write(const std::string &variableName, const double *values); - virtual void Write(const std::string &variableName, const long double *values); + virtual void Write(const std::string &variableName, + const long double *values); virtual void Write(const std::string &variableName, const std::complex<float> *values); virtual void Write(const std::string &variableName, diff --git a/include/core/Profiler.h b/include/core/Profiler.h index 84550456ce83a37d00f1aac4ba58c393a8d14c50..eee51ebee869b402a6d2071a8b1a613e9367755c 100644 --- a/include/core/Profiler.h +++ b/include/core/Profiler.h @@ -26,7 +26,7 @@ public: unsigned long long int ProcessTime = 0; Timer(const std::string process, const Support::Resolutions resolution) - : Process{process}, Resolution{resolution} + : Process{process}, Resolution{resolution} { } diff --git a/include/core/Variable.h b/include/core/Variable.h index 67930c46795349ff908fdf93446941eee0e77d1a..110ae7064cad92d899913204f9677e2781b9afee 100644 --- a/include/core/Variable.h +++ b/include/core/Variable.h @@ -52,8 +52,8 @@ public: Variable<T>(const std::string name, const Dims dimensions, const Dims globalDimensions, const Dims globalOffsets, const bool debugMode) - : VariableBase(name, GetType<T>(), sizeof(T), dimensions, - globalDimensions, globalOffsets, debugMode) + : VariableBase(name, GetType<T>(), sizeof(T), dimensions, globalDimensions, + globalOffsets, debugMode) { if (m_Dimensions == Dims{1}) m_IsScalar = true; diff --git a/include/core/VariableBase.h b/include/core/VariableBase.h index 25312d6cf829c448a6734637f7e98b488085a153..cc8c8f79a4806186e47dec2c4d5c5f691ea1039b 100644 --- a/include/core/VariableBase.h +++ b/include/core/VariableBase.h @@ -42,9 +42,9 @@ public: const std::size_t elementSize, const Dims dimensions, const Dims globalDimensions, const Dims globalOffsets, const bool debugMode) - : m_Name{name}, m_Type{type}, m_ElementSize{elementSize}, - m_Dimensions{dimensions}, m_GlobalDimensions{globalDimensions}, - m_GlobalOffsets{globalOffsets}, m_DebugMode{debugMode} + : m_Name{name}, m_Type{type}, m_ElementSize{elementSize}, + m_Dimensions{dimensions}, m_GlobalDimensions{globalDimensions}, + m_GlobalOffsets{globalOffsets}, m_DebugMode{debugMode} { } diff --git a/include/core/VariableCompound.h b/include/core/VariableCompound.h index 7200873a41487d26e76cd0432c268a5d3af5cb6a..c3bacfccaae20331e45876361388eb035812cd58 100644 --- a/include/core/VariableCompound.h +++ b/include/core/VariableCompound.h @@ -36,8 +36,8 @@ public: VariableCompound(const std::string name, const std::size_t sizeOfStruct, const Dims dimensions, const Dims globalDimensions, const Dims globalOffsets, const bool debugMode) - : VariableBase(name, "compound", sizeOfStruct, dimensions, - globalDimensions, globalOffsets, debugMode) + : VariableBase(name, "compound", sizeOfStruct, dimensions, globalDimensions, + globalOffsets, debugMode) { } diff --git a/source/core/Engine.cpp b/source/core/Engine.cpp index d59f815734fa5109cc0f29b1617282256093dbf4..4f2cb8a44bd1b01054bdb357193cf31c861f1c36 100644 --- a/source/core/Engine.cpp +++ b/source/core/Engine.cpp @@ -18,11 +18,10 @@ namespace adios Engine::Engine(ADIOS &adios, std::string engineType, std::string name, std::string accessMode, MPI_Comm mpiComm, const Method &method, bool debugMode, unsigned int nthreads, std::string endMessage) -: m_MPIComm{mpiComm}, m_EngineType{std::move(engineType)}, m_Name{std::move( - name)}, - m_AccessMode{std::move(accessMode)}, m_Method{method}, - m_ADIOS(adios), m_DebugMode{debugMode}, m_nThreads{nthreads}, - m_EndMessage(std::move(endMessage)) +: m_MPIComm{mpiComm}, m_EngineType{std::move(engineType)}, + m_Name{std::move(name)}, m_AccessMode{std::move(accessMode)}, + m_Method{method}, m_ADIOS(adios), m_DebugMode{debugMode}, + m_nThreads{nthreads}, m_EndMessage(std::move(endMessage)) { if (m_DebugMode == true) { @@ -98,14 +97,16 @@ void Engine::Write(Variable<std::complex<long double>> & /*variable*/, } void Engine::Write(VariableCompound & /*variable*/, const void * /*values*/) {} -void Engine::Write(const std::string & /*variableName*/, const char * /*values*/) +void Engine::Write(const std::string & /*variableName*/, + const char * /*values*/) { } void Engine::Write(const std::string & /*variableName*/, const unsigned char * /*values*/) { } -void Engine::Write(const std::string & /*variableName*/, const short * /*values*/) +void Engine::Write(const std::string & /*variableName*/, + const short * /*values*/) { } void Engine::Write(const std::string & /*variableName*/, @@ -135,7 +136,8 @@ void Engine::Write(const std::string & /*variableName*/, const unsigned long long int * /*values*/) { } -void Engine::Write(const std::string & /*variableName*/, const float * /*values*/) +void Engine::Write(const std::string & /*variableName*/, + const float * /*values*/) { } void Engine::Write(const std::string & /*variableName*/, @@ -158,7 +160,8 @@ void Engine::Write(const std::string & /*variableName*/, const std::complex<long double> * /*values*/) { } -void Engine::Write(const std::string & /*variableName*/, const void * /*values*/) +void Engine::Write(const std::string & /*variableName*/, + const void * /*values*/) { } diff --git a/source/core/Method.cpp b/source/core/Method.cpp index f3738786aa2eaa1c8ed56f6b92494e3fb67f4359..a97f101fc86f334a5c94bee6d8cdd07d133a4f1c 100644 --- a/source/core/Method.cpp +++ b/source/core/Method.cpp @@ -15,7 +15,7 @@ namespace adios { Method::Method(const std::string name, const bool debugMode) - : m_Name{name}, m_DebugMode{debugMode} +: m_Name{name}, m_DebugMode{debugMode} { // m_Type can stay empty (forcing the choice of the default engine) m_nThreads = 1; diff --git a/source/core/Transport.cpp b/source/core/Transport.cpp index 9b1f7f5ee20ef5d5b91204db0daa4c3dd56c01ed..3f3fd7728137341166862eaa09b6634d80b89942 100644 --- a/source/core/Transport.cpp +++ b/source/core/Transport.cpp @@ -15,7 +15,7 @@ namespace adios Transport::Transport(const std::string type, MPI_Comm mpiComm, const bool debugMode) - : m_Type{type}, m_MPIComm{mpiComm}, m_DebugMode{debugMode} +: m_Type{type}, m_MPIComm{mpiComm}, m_DebugMode{debugMode} { MPI_Comm_rank(m_MPIComm, &m_RankMPI); MPI_Comm_size(m_MPIComm, &m_SizeMPI); diff --git a/source/engine/adios1/ADIOS1Reader.cpp b/source/engine/adios1/ADIOS1Reader.cpp index a44996c149f2644d5e69215904ca908133410cf6..406c752d39d2e8357c1a0a008c2d2a975cf80425 100644 --- a/source/engine/adios1/ADIOS1Reader.cpp +++ b/source/engine/adios1/ADIOS1Reader.cpp @@ -26,10 +26,9 @@ BPFileReader::BPFileReader(ADIOS &adios, const std::string name, const Method &method, const IOMode iomode, const float timeout_sec, const bool debugMode, const unsigned int nthreads) - : Engine(adios, "BPFileReader", name, accessMode, mpiComm, method, - debugMode, nthreads, - " BPFileReader constructor (or call to ADIOS Open).\n"), - m_Buffer(accessMode, m_RankMPI, m_DebugMode) +: Engine(adios, "BPFileReader", name, accessMode, mpiComm, method, debugMode, + nthreads, " BPFileReader constructor (or call to ADIOS Open).\n"), + m_Buffer(accessMode, m_RankMPI, m_DebugMode) { Init(); } diff --git a/source/engine/adios1/ADIOS1Writer.cpp b/source/engine/adios1/ADIOS1Writer.cpp index d8c95ffe86f20f52031e3dc2c1bdac2b19e933e8..dc45da793801236e09720ba4a5626067a9fe7290 100644 --- a/source/engine/adios1/ADIOS1Writer.cpp +++ b/source/engine/adios1/ADIOS1Writer.cpp @@ -24,11 +24,9 @@ ADIOS1Writer::ADIOS1Writer(ADIOS &adios, const std::string name, const Method &method, const IOMode iomode, const float timeout_sec, const bool debugMode, const unsigned int nthreads) - : Engine(adios, "ADIOS1Writer", name, accessMode, mpiComm, method, - debugMode, nthreads, - " ADIOS1Writer constructor (or call to ADIOS Open).\n"), - m_groupname{method.m_Name.c_str()}, m_filename{name.c_str()}, - m_comm{mpiComm} +: Engine(adios, "ADIOS1Writer", name, accessMode, mpiComm, method, debugMode, + nthreads, " ADIOS1Writer constructor (or call to ADIOS Open).\n"), + m_groupname{method.m_Name.c_str()}, m_filename{name.c_str()}, m_comm{mpiComm} { Init(); adios_open(&m_adios_file, m_groupname, m_filename, accessMode.c_str(), diff --git a/source/engine/bp/BPFileReader.cpp b/source/engine/bp/BPFileReader.cpp index a44996c149f2644d5e69215904ca908133410cf6..406c752d39d2e8357c1a0a008c2d2a975cf80425 100644 --- a/source/engine/bp/BPFileReader.cpp +++ b/source/engine/bp/BPFileReader.cpp @@ -26,10 +26,9 @@ BPFileReader::BPFileReader(ADIOS &adios, const std::string name, const Method &method, const IOMode iomode, const float timeout_sec, const bool debugMode, const unsigned int nthreads) - : Engine(adios, "BPFileReader", name, accessMode, mpiComm, method, - debugMode, nthreads, - " BPFileReader constructor (or call to ADIOS Open).\n"), - m_Buffer(accessMode, m_RankMPI, m_DebugMode) +: Engine(adios, "BPFileReader", name, accessMode, mpiComm, method, debugMode, + nthreads, " BPFileReader constructor (or call to ADIOS Open).\n"), + m_Buffer(accessMode, m_RankMPI, m_DebugMode) { Init(); } diff --git a/source/engine/bp/BPFileWriter.cpp b/source/engine/bp/BPFileWriter.cpp index e68fae284241c517e90608222512fe49d1e92ece..2785781f002d0b499a7bbc328173080f435fb2ff 100644 --- a/source/engine/bp/BPFileWriter.cpp +++ b/source/engine/bp/BPFileWriter.cpp @@ -24,12 +24,11 @@ BPFileWriter::BPFileWriter(ADIOS &adios, const std::string name, const Method &method, const IOMode iomode, const float timeout_sec, const bool debugMode, const unsigned int nthreads) - : Engine(adios, "BPFileWriter", name, accessMode, mpiComm, method, - debugMode, nthreads, - " BPFileWriter constructor (or call to ADIOS Open).\n"), - m_Buffer{capsule::STLVector(accessMode, m_RankMPI, m_DebugMode)}, - m_BP1Aggregator{format::BP1Aggregator(m_MPIComm, debugMode)}, - m_MaxBufferSize{m_Buffer.m_Data.max_size()} +: Engine(adios, "BPFileWriter", name, accessMode, mpiComm, method, debugMode, + nthreads, " BPFileWriter constructor (or call to ADIOS Open).\n"), + m_Buffer{capsule::STLVector(accessMode, m_RankMPI, m_DebugMode)}, + m_BP1Aggregator{format::BP1Aggregator(m_MPIComm, debugMode)}, + m_MaxBufferSize{m_Buffer.m_Data.max_size()} { m_MetadataSet.TimeStep = 1; // starting at one to be compatible with ADIOS1.x Init(); diff --git a/source/engine/dataman/DataManReader.cpp b/source/engine/dataman/DataManReader.cpp index 2e65596e7ca9fa847b3b53d35f7e628ae39b7c3a..941fe8f6065d6e112a26e29c72d2ef626e8b0492 100644 --- a/source/engine/dataman/DataManReader.cpp +++ b/source/engine/dataman/DataManReader.cpp @@ -29,10 +29,9 @@ DataManReader::DataManReader(ADIOS &adios, const std::string name, const Method &method, const IOMode iomode, const float timeout_sec, const bool debugMode, const unsigned int nthreads) - : Engine(adios, "DataManReader", name, accessMode, mpiComm, method, - debugMode, nthreads, - " DataManReader constructor (or call to ADIOS Open).\n"), - m_Buffer(accessMode, m_RankMPI, m_DebugMode) +: Engine(adios, "DataManReader", name, accessMode, mpiComm, method, debugMode, + nthreads, " DataManReader constructor (or call to ADIOS Open).\n"), + m_Buffer(accessMode, m_RankMPI, m_DebugMode) { Init(); } diff --git a/source/engine/dataman/DataManWriter.cpp b/source/engine/dataman/DataManWriter.cpp index 8430a5921410eec2454d76053dfa749f4cb7436c..edb5275795a7bf872220c8c8ea49cd4954457a1a 100644 --- a/source/engine/dataman/DataManWriter.cpp +++ b/source/engine/dataman/DataManWriter.cpp @@ -27,10 +27,9 @@ DataManWriter::DataManWriter(ADIOS &adios, const std::string name, const Method &method, const IOMode iomode, const float timeout_sec, const bool debugMode, const unsigned int nthreads) - : Engine(adios, "DataManWriter", name, accessMode, mpiComm, method, - debugMode, nthreads, - " DataManWriter constructor (or call to ADIOS Open).\n"), - m_Buffer(accessMode, m_RankMPI, m_DebugMode) +: Engine(adios, "DataManWriter", name, accessMode, mpiComm, method, debugMode, + nthreads, " DataManWriter constructor (or call to ADIOS Open).\n"), + m_Buffer(accessMode, m_RankMPI, m_DebugMode) { Init(); } diff --git a/source/format/BP1Aggregator.cpp b/source/format/BP1Aggregator.cpp index 442c22f6166ab80cf0b3df5c92e746588cf17d6c..c81a72bbffa7ebc2e25a4b3fb9e8873883264202 100644 --- a/source/format/BP1Aggregator.cpp +++ b/source/format/BP1Aggregator.cpp @@ -22,7 +22,7 @@ namespace format { BP1Aggregator::BP1Aggregator(MPI_Comm mpiComm, const bool debugMode) - : m_MPIComm{mpiComm}, m_DebugMode{debugMode} +: m_MPIComm{mpiComm}, m_DebugMode{debugMode} { MPI_Comm_rank(m_MPIComm, &m_RankMPI); MPI_Comm_size(m_MPIComm, &m_SizeMPI); diff --git a/source/transport/file/FStream.cpp b/source/transport/file/FStream.cpp index 6496f4e05d542a4ce0e57de69b297e56881fb3c0..15bf60b58072ae17c4fa5fe171ef65789ea1c395 100644 --- a/source/transport/file/FStream.cpp +++ b/source/transport/file/FStream.cpp @@ -20,7 +20,7 @@ namespace transport { FStream::FStream(MPI_Comm mpiComm, const bool debugMode) - : Transport("fstream", mpiComm, debugMode) +: Transport("fstream", mpiComm, debugMode) { } diff --git a/source/transport/file/FileDescriptor.cpp b/source/transport/file/FileDescriptor.cpp index bfa9439d0327b296474b13f9dace9395f87c3030..d3433d2e50aa1613ef16aa95daf7d4553c51dc49 100644 --- a/source/transport/file/FileDescriptor.cpp +++ b/source/transport/file/FileDescriptor.cpp @@ -25,7 +25,7 @@ namespace transport { FileDescriptor::FileDescriptor(MPI_Comm mpiComm, const bool debugMode) - : Transport("POSIX_IO", mpiComm, debugMode) +: Transport("POSIX_IO", mpiComm, debugMode) { } diff --git a/source/transport/file/FilePointer.cpp b/source/transport/file/FilePointer.cpp index ce9c107235930e1eb177870fb2724f294facd7cc..704b93f08d55ad410d25f9a04a501c73d60d49a7 100644 --- a/source/transport/file/FilePointer.cpp +++ b/source/transport/file/FilePointer.cpp @@ -20,7 +20,7 @@ namespace transport { FilePointer::FilePointer(MPI_Comm mpiComm, const bool debugMode) - : Transport("FILE*", mpiComm, debugMode) +: Transport("FILE*", mpiComm, debugMode) { } diff --git a/source/transport/wan/MdtmMan.cpp b/source/transport/wan/MdtmMan.cpp index 6238bbe3d4162fd5d369e798ece7d50923b37512..55324e0c2f23d9f2ba33f5b1a43584becda3bac8 100644 --- a/source/transport/wan/MdtmMan.cpp +++ b/source/transport/wan/MdtmMan.cpp @@ -20,10 +20,10 @@ MdtmMan::MdtmMan(const std::string localIP, const std::string remoteIP, const int numberOfPipes, const std::vector<int> tolerances, const std::vector<int> priorities, MPI_Comm mpiComm, const bool debugMode) - : Transport("File", mpiComm, debugMode), m_LocalIP{localIP}, - m_RemoteIP{remoteIP}, m_Mode{mode}, m_Prefix{prefix}, - m_NumberOfPipes{numberOfPipes}, m_Tolerances{tolerances}, - m_Priorities{priorities} +: Transport("File", mpiComm, debugMode), m_LocalIP{localIP}, + m_RemoteIP{remoteIP}, m_Mode{mode}, m_Prefix{prefix}, + m_NumberOfPipes{numberOfPipes}, m_Tolerances{tolerances}, + m_Priorities{priorities} { }