Merge remote-tracking branch 'upstream/master' into finish-reorg

* upstream/master:
  Fix selection and deconstructor for adios1 reader to make it compile at least.
  Fix borked logic for testing ADIOS1 env vars

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()

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
         {

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