Commit 287651b5 authored by Jason Wang's avatar Jason Wang
Browse files

added option for two major reversion modes

parent def5d19a

source/adios2/engine/dataman/DataManCommon.h

+1 −0
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ protected: 


    bool m_IsLittleEndian;

    bool m_IsRowMajor;

    bool m_ContiguousMajor = true;



    transport::FileFStream m_FileTransport;

source/adios2/engine/dataman/DataManReader.cpp

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ namespace engine 
DataManReader::DataManReader(IO &io, const std::string &name, const Mode mode,

                             MPI_Comm mpiComm)

: DataManCommon("DataManReader", io, name, mode, mpiComm),

  m_DataManDeserializer(true, m_IsLittleEndian)

  m_DataManDeserializer(m_IsRowMajor, m_ContiguousMajor, m_IsLittleEndian)

{

    m_EndMessage = " in call to IO Open DataManReader " + m_Name + "\n";

    Init();

source/adios2/engine/dataman/DataManReader.tcc

+1 −2
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ void DataManReader::GetSyncCommon(Variable<T> &variable, T *data) 
template <class T>

void DataManReader::GetDeferredCommon(Variable<T> &variable, T *data)

{

    if (m_IsRowMajor)

    if (m_IsRowMajor || m_ContiguousMajor)

    {

        while (m_DataManDeserializer.Get(data, variable.m_Name,

                                         variable.m_Start, variable.m_Count,
@@ -43,7 +43,6 @@ void DataManReader::GetDeferredCommon(Variable<T> &variable, T *data) 
    }

    else

    {



        Dims start = variable.m_Start;

        Dims count = variable.m_Count;

        Dims memstart = variable.m_MemoryStart;

source/adios2/engine/dataman/DataManWriter.cpp

+2 −2
Original line number Diff line number Diff line
@@ -115,8 +115,8 @@ void DataManWriter::Init() 
        for (size_t i = 0; i < m_TransportChannels; ++i)

        {

            m_DataManSerializer.push_back(

                std::make_shared<format::DataManSerializer>(true,

                                                            m_IsLittleEndian));

                std::make_shared<format::DataManSerializer>(

                    m_IsRowMajor, m_ContiguousMajor, m_IsLittleEndian));

        }

    }

    else if (m_Format == "binary")

source/adios2/engine/dataman/DataManWriter.tcc

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ void DataManWriter::PutDeferredCommon(Variable<T> &variable, const T *values) 
        variable.m_Start.assign(variable.m_Count.size(), 0);

    }



    if (m_IsRowMajor)

    if (m_IsRowMajor || m_ContiguousMajor)

    {

        for (size_t i = 0; i < m_TransportChannels; ++i)

        {