Commit fe2ebf98 authored by Jason Wang's avatar Jason Wang
Browse files

added test for ndcopy with memSelect

parent 2d7e9fbd

source/adios2/core/Engine.tcc

+2 −0
Original line number Diff line number Diff line
@@ -185,6 +185,7 @@ void Engine::CommonChecks(Variable<T> &variable, const T *data, 
            data, "for data argument in non-zero count block, " + hint);

    }



    /*

    if (!variable.m_MemoryStart.empty() && m_OpenMode == adios2::Mode::Read)

    {

        throw std::invalid_argument("ERROR: from Engine " + m_Name +
@@ -194,6 +195,7 @@ void Engine::CommonChecks(Variable<T> &variable, const T *data, 
                                    "mode, " +

                                    hint + "\n");

    }

    */

}



} // end namespace core

source/adios2/engine/dataman/DataManCommon.cpp

+2 −1
Original line number Diff line number Diff line
@@ -20,7 +20,8 @@ namespace engine 
DataManCommon::DataManCommon(const std::string engineType, IO &io,

                             const std::string &name, const Mode mode,

                             MPI_Comm mpiComm)

: Engine(engineType, io, name, mode, mpiComm)

: Engine(engineType, io, name, mode, mpiComm),

 m_FileTransport(mpiComm, m_DebugMode)

{



    // initialize parameters

source/adios2/engine/dataman/DataManCommon.h

+3 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
#include "adios2/ADIOSConfig.h"

#include "adios2/ADIOSMacros.h"

#include "adios2/core/Engine.h"

#include "adios2/toolkit/transport/file/FileFStream.h"

#include "adios2/toolkit/transportman/dataman/DataMan.h"



namespace adios2
@@ -45,6 +46,8 @@ protected: 
    bool m_IsLittleEndian;

    bool m_IsRowMajor;



    transport::FileFStream m_FileTransport;



    std::vector<std::string> m_StreamNames;

    std::vector<core::Operator *> m_Callbacks;

    std::mutex m_CallbackMutex;

source/adios2/engine/dataman/DataManReader.cpp

+3 −3
Original line number Diff line number Diff line
@@ -150,10 +150,10 @@ void DataManReader::Flush(const int transportIndex) {} 


void DataManReader::Init()

{

    if (m_WorkflowMode != "subscribe" && m_WorkflowMode != "p2p")

    if(m_WorkflowMode =="file")

    {

        throw(std::invalid_argument(

            "[DataManReader::Init] invalid workflow mode " + m_WorkflowMode));

        m_FileTransport.Open(m_Name, Mode::Read);

        return;

    }



    // initialize transports

source/adios2/engine/dataman/DataManReader.tcc

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ void DataManReader::GetDeferredCommon(Variable<T> &variable, T *data) 
    {

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

                                         variable.m_Start, variable.m_Count,

                                         m_CurrentStep) != 0)

                                         m_CurrentStep, variable.m_MemoryStart, variable.m_MemoryCount) != 0)

        {

        }

    }