Unverified Commit 24274c69 authored by Eisenhauer, Greg's avatar Eisenhauer, Greg Committed by GitHub
Browse files

Merge pull request #993 from eisenhauer/SstLastTimeoutDiscard 

Support discard on writer side, LastAvailable and timeout on reader side
parents 6577a335 5f9cf910

bindings/CXX11/cxx11/Engine.h

+2 −1
Original line number Diff line number Diff line
@@ -75,7 +75,8 @@ public: 
     * @param timeoutSeconds

     * @return current step status

     */

    StepStatus BeginStep(const StepMode mode, const float timeoutSeconds = 0.f);

    StepStatus BeginStep(const StepMode mode,

                         const float timeoutSeconds = -1.f);



    /**

     * Inspect current logical step

bindings/Fortran/modules/adios2_engine_begin_step_mod.f90

+3 −3
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ contains 
        !local

        integer status



        call adios2_begin_step_f2c(engine%f2c, step_mode, 0._4, status, ierr)

        call adios2_begin_step_f2c(engine%f2c, step_mode, -1._4, status, ierr)



    end subroutine
@@ -55,11 +55,11 @@ contains 


        if( engine%mode == adios2_mode_read ) then

            call adios2_begin_step_f2c(engine%f2c, &

                                       adios2_step_mode_next_available, 0._4, &

                                       adios2_step_mode_next_available, -1._4, &

                                       status, ierr)

        else

            call adios2_begin_step_f2c(engine%f2c, &

                                       adios2_step_mode_append, 0._4, &

                                       adios2_step_mode_append, -1.0_4, &

                                       status, ierr)

        end if

bindings/Python/py11Engine.h

+2 −1
Original line number Diff line number Diff line
@@ -33,7 +33,8 @@ public: 


    ~Engine() = default;



    StepStatus BeginStep(const StepMode mode, const float timeoutSeconds = 0.f);

    StepStatus BeginStep(const StepMode mode,

                         const float timeoutSeconds = -1.f);



    void Put(core::VariableBase *variable, const pybind11::array &array,

             const Mode launch = Mode::Deferred);

bindings/Python/py11glue.cpp

+1 −1
Original line number Diff line number Diff line
@@ -334,7 +334,7 @@ PYBIND11_MODULE(adios2, m) 
    pybind11::class_<adios2::py11::Engine>(m, "Engine")

        .def("BeginStep", &adios2::py11::Engine::BeginStep,

             pybind11::arg("mode") = adios2::StepMode::NextAvailable,

             pybind11::arg("timeoutSeconds") = 0.f)

             pybind11::arg("timeoutSeconds") = -1.f)



        .def("Put", (void (adios2::py11::Engine::*)(

                        adios2::core::VariableBase *, const pybind11::array &,

examples/heatTransfer/read/heatRead.cpp

+1 −1
Original line number Diff line number Diff line
@@ -121,7 +121,7 @@ int main(int argc, char *argv[]) 
        while (true)

        {

            adios2::StepStatus status =

                reader.BeginStep(adios2::StepMode::NextAvailable, 0.0f);

                reader.BeginStep(adios2::StepMode::NextAvailable);

            if (status != adios2::StepStatus::OK)

            {

                break;