Merge branch 'refactor' of https://github.com/williamfgc/adios2.git into refactor

examples/hello/adios1Writer/helloADIOS1Writer.cpp

@@ -38,7 +38,7 @@ int main(int argc, char *argv[])
          * Parameters, Transports, and Execution: Engines */
         adios::IO &adios1IO = adios.DeclareIO("ADIOS1IO");
         adios1IO.SetEngine("ADIOS1Writer");
-        adios1IO.AddTransport("file");
+        adios1IO.AddTransport("file", "library=MPI");
 
         /** global array : name, { shape (total) }, { start (local) }, { count
          * (local) }, all are constant dimensions */

source/adios2/engine/adios1/ADIOS1Writer.cpp

@@ -35,6 +35,7 @@ void ADIOS1Writer::Init()
 {
     InitParameters();
     InitTransports();
+    m_ADIOS1.Open();
 }
 
 #define declare_type(T)                                                        \

source/adios2/toolkit/interop/adios1/ADIOS1Common.cpp

@@ -98,7 +98,8 @@ void ADIOS1Common::InitTransports(
                 adios_select_method(m_ADIOSGroup, "POSIX", "", "");
             }
             else if (itLibrary->second == "MPI_File" ||
-                     itLibrary->second == "MPI-IO")
+                     itLibrary->second == "MPI-IO" ||
+                     itLibrary->second == "MPI")
             {
                 adios_select_method(m_ADIOSGroup, "MPI", "", "");
             }
@@ -123,14 +124,24 @@ void ADIOS1Common::InitTransports(
                                             "to Open\n");
         }
     }
+}
 
-    ReOpenAsNeeded();
+bool ADIOS1Common::Open()
+{
+    adios_open(&m_ADIOSFile, m_GroupName.c_str(), m_FileName.c_str(),
+               m_OpenModeString.c_str(), m_MPIComm);
+    if (adios_errno == err_no_error)
+    {
+        m_IsFileOpen = true;
+    }
+    return m_IsFileOpen;
 }
 
 bool ADIOS1Common::ReOpenAsNeeded()
 {
     if (!m_IsFileOpen)
     {
+        // Re-open in APPEND mode
         adios_open(&m_ADIOSFile, m_GroupName.c_str(), m_FileName.c_str(), "a",
                    m_MPIComm);
         if (adios_errno == err_no_error)

source/adios2/toolkit/interop/adios1/ADIOS1Common.h

@@ -60,6 +60,8 @@ public:
 
     void InitParameters(const Params &parameters);
     void InitTransports(const std::vector<Params> &transportsParameters);
+    bool Open();           // return true if file is opened
+    bool ReOpenAsNeeded(); // return true if file is open or reopened
 
     template <class T>
     void WriteVariable(const std::string &name, const ShapeID shapeID,
@@ -76,8 +78,6 @@ private:
 
     void Init();
 
-    bool ReOpenAsNeeded(); // return true if file is open or reopened
-
     void DefineVariable(const std::string &name, const ShapeID shapeID,
                         enum ADIOS_DATATYPES vartype, const std::string ldims,
                         const std::string gdims, const std::string offsets);