diff --git a/cmake/FindADIOS1.cmake b/cmake/FindADIOS1.cmake index c40191677ef30d9995f8777c4a4161e64678130d..2bcd7158d27bad7f64644f371e92bff263fffff1 100644 --- a/cmake/FindADIOS1.cmake +++ b/cmake/FindADIOS1.cmake @@ -107,7 +107,7 @@ set(adios1_config_hints) foreach(PREFIX_VAR IN ITEMS ADIOS1_ROOT ADIOS1_DIR INSTALL_PREFIX) if(${PREFIX_VAR}) list(APPEND adios1_config_hints "${${PREFIX_VAR}}/bin") - elseif("$ENV{${PREFIX_VAR}}") + elseif(NOT ("$ENV{${PREFIX_VAR}}" STREQUAL "")) list(APPEND adios1_config_hints "$ENV{${PREFIX_VAR}}/bin") endif() endforeach() diff --git a/source/adios2/engine/adios1/ADIOS1Reader.cpp b/source/adios2/engine/adios1/ADIOS1Reader.cpp index daf4a418f5d85140ca40e34edbc0ec14f3c7d1bc..7ec1ac27934ac73522c8d769e7fe4afe7f626ca0 100644 --- a/source/adios2/engine/adios1/ADIOS1Reader.cpp +++ b/source/adios2/engine/adios1/ADIOS1Reader.cpp @@ -26,9 +26,11 @@ ADIOS1Reader::ADIOS1Reader(ADIOS &adios, const std::string &name, " ADIOS1Reader constructor (or call to ADIOS Open).\n") { Init(); - adios_read_init_method(read_method, mpiComm, ""); + adios_read_init_method(m_ReadMethod, mpiComm, ""); } +ADIOS1Reader::~ADIOS1Reader() { adios_read_finalize_method(m_ReadMethod); } + Variable<void> * ADIOS1Reader::InquireVariable(const std::string &variableName, const bool readIn) // not yet implemented @@ -194,7 +196,7 @@ void ADIOS1Reader::InitTransports() if (itTransport->second == "file" || itTransport->second == "File" || itTransport->second == "bp" || itTransport->second == "BP") { - read_method = ADIOS_READ_METHOD_BP; + m_ReadMethod = ADIOS_READ_METHOD_BP; } else { diff --git a/source/adios2/engine/adios1/ADIOS1Reader.h b/source/adios2/engine/adios1/ADIOS1Reader.h index 32f94c1f4608e9b67add7763b032d9db6dc451a4..51b9e044335625cdc6fd8274d408db3340ef24b0 100644 --- a/source/adios2/engine/adios1/ADIOS1Reader.h +++ b/source/adios2/engine/adios1/ADIOS1Reader.h @@ -110,7 +110,7 @@ private: return nullptr; // on failure } - enum ADIOS_READ_METHOD read_method = ADIOS_READ_METHOD_BP; + enum ADIOS_READ_METHOD m_ReadMethod = ADIOS_READ_METHOD_BP; }; } // end namespace adios