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

Merge pull request #4990 from eisenhauer/turn-off-derived 

Turn derived variables off
parents 026b6c71 ba3eecee

CMakeLists.txt

+1 −1
Original line number Diff line number Diff line
@@ -202,7 +202,7 @@ adios_option(Catalyst "Enable support for in situ visualization plugin using P 
adios_option(Campaign   "Enable support for Campaigns (requires SQLite3 and ZLIB)" AUTO)

adios_option(OpenSSL    "Enable support for OpenSSL" AUTO)

adios_option(AWSSDK     "Enable support for S3 compatible storage using AWS SDK's S3 module" OFF)

adios_option(Derived_Variable    "Enable support for derived variables" ON)

adios_option(Derived_Variable    "Enable support for derived variables" OFF)

adios_option(PIP        "Enable support for pip packaging" OFF)

adios_option(XRootD     "Enable support for XRootD" AUTO)

adios_option(CURL       "Enable support for CURL (HTTPS remote access)" AUTO)

source/adios2/toolkit/format/bp5/BP5Deserializer.cpp

+4 −0
Original line number Diff line number Diff line
@@ -10,7 +10,9 @@ 
#include "adios2/core/VariableBase.h"

#include "adios2/helper/adiosFunctions.h"

#include "adios2/helper/adiosType.h"

#ifdef ADIOS2_HAVE_DERIVED_VARIABLE

#include "adios2/toolkit/derived/ExprCodeStream.h"

#endif



#include "BP5Deserializer.h"

#include "BP5Deserializer.tcc"
@@ -1779,8 +1781,10 @@ BP5Deserializer::GenerateReadRequests(const bool doAllocTempBuffers, size_t *max 
            std::vector<std::string> derivedVarInputNameList;

            std::vector<VariableBase *> derivedVarInputVarList;

            std::map<std::string, std::unique_ptr<MinVarInfo>> *nameToVarInfo = nullptr;

#ifdef ADIOS2_HAVE_DERIVED_VARIABLE

            std::map<std::string, std::pair<Dims, Dims>> derivedInputSelections;

            bool derivedNeedsHalo = false;

#endif



            if (m_FlattenSteps)

            {