Commit 0ff7b477 authored by William F Godoy's avatar William F Godoy
Browse files

Resolving final conflict with master Variable

parent 331a3c82

bindings/C/c/adios2_c_FILE.cpp

+3 −6
Original line number Diff line number Diff line
@@ -103,8 +103,7 @@ adios2_FILE *adios2_fopen_glue(const char *name, const char *mode, 
    }

    catch (...)

    {

        static_cast<adios2_error>(

            adios2::helper::ExceptionToError("adios2_fopen"));

        adios2::helper::ExceptionToError("adios2_fopen");

    }

    return stream;

}
@@ -128,8 +127,7 @@ adios2_FILE *adios2_fopen_config_glue(const char *name, const char *mode, 
    }

    catch (...)

    {

        static_cast<adios2_error>(

            adios2::helper::ExceptionToError("adios2_fopen_config"));

        adios2::helper::ExceptionToError("adios2_fopen_config");

    }

    return stream;

}
@@ -433,8 +431,7 @@ adios2_step *adios2_fgets(adios2_step *step, adios2_FILE *stream) 
    }

    catch (...)

    {

        static_cast<adios2_error>(

            adios2::helper::ExceptionToError("adios2_fgets"));

        adios2::helper::ExceptionToError("adios2_fgets");

    }

    return step;

}

bindings/CXX11/cxx11/Variable.cpp

+3 −3
Original line number Diff line number Diff line
@@ -38,11 +38,11 @@ namespace adios2 
    }                                                                          \

                                                                               \

    template <>                                                                \

    void Variable<T>::SetBlockID(const size_t blockID)                         \

    void Variable<T>::SetBlockSelection(const size_t blockID)                  \

    {                                                                          \

        helper::CheckForNullptr(m_Variable,                                    \

                                "in call to Variable<T>::SetBlockID");         \

        m_Variable->SetBlockID(blockID);                                       \

                                "in call to Variable<T>::SetBlockSelection");  \

        m_Variable->SetBlockSelection(blockID);                                \

    }                                                                          \

                                                                               \

    template <>                                                                \

bindings/CXX11/cxx11/Variable.h

+8 −6
Original line number Diff line number Diff line
@@ -60,12 +60,14 @@ public: 
    void SetShape(const adios2::Dims &shape);



    /**

    * Read mode only. Use only for local variables variable.ShapeID() =

    * ShapeID::LocalArray or ShapeID::LocalValue

    * @param localBlock: variable block index defined at write time. Can be

     * Read mode only. Required for reading local variables, ShapeID() =

     * ShapeID::LocalArray or ShapeID::LocalValue. For Global Arrays it will Set

     * the appropriate Start and Count Selection for the global array

     * coordinates.

     * @param blockID: variable block index defined at write time. Blocks can be

     * inspected with bpls -D variableName

     */

    void SetBlockID(const size_t blockID);

    void SetBlockSelection(const size_t blockID);



    /**

     * Sets a variable selection modifying current {start, count}

source/adios2/core/VariableBase.cpp

+1 −1
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ void VariableBase::SetShape(const adios2::Dims &shape) 
    m_Shape = shape;

}



void VariableBase::SetBlockID(const size_t blockID)

void VariableBase::SetBlockSelection(const size_t blockID)

{

    m_BlockID = blockID;

    m_SelectionType = SelectionType::WriteBlock;

source/adios2/core/VariableBase.h

+1 −1
Original line number Diff line number Diff line
@@ -126,7 +126,7 @@ public: 
     * Use at read only for local variables

     * @param blockID

     */

    void SetBlockID(const size_t blockID);

    void SetBlockSelection(const size_t blockID);



    /**

     * Set new start and count dimensions