Changeset 1338 for XIOS/dev/branch_openmp/src/node/file.cpp

Timestamp:

11/21/17 10:47:57 (6 years ago)

Author:

yushan

Message:

dev_omp

File:

• XIOS/dev/branch_openmp/src/node/file.cpp (modified) (2 diffs)

XIOS/dev/branch_openmp/src/node/file.cpp

@@ -596 +596 @@
 
       bool isCollective = par_access.isEmpty() || par_access == par_access_attr::collective;
-
-      if (isOpen) data_out->closeFile();
-      if (time_counter_name.isEmpty()) data_in = boost::shared_ptr<CDataInput>(new CNc4DataInput(oss.str(), fileComm, multifile, isCollective));
-      else data_in = boost::shared_ptr<CDataInput>(new CNc4DataInput(oss.str(), fileComm, multifile, isCollective, time_counter_name));
-      isOpen = true;
+      #ifdef _usingEP
+        //printf("multifile was %d\n", multifile);
+        //multifile = true;
+        if (isOpen) data_out->closeFile();
+        if (time_counter_name.isEmpty()) data_in = boost::shared_ptr<CDataInput>(new CNc4DataInput(oss.str(), fileComm, multifile, isCollective));
+        else data_in = boost::shared_ptr<CDataInput>(new CNc4DataInput(oss.str(), fileComm, multifile, isCollective, time_counter_name));
+        isOpen = true;
+      #elif _usingMPI
+        if (isOpen) data_out->closeFile();
+        if (time_counter_name.isEmpty()) data_in = boost::shared_ptr<CDataInput>(new CNc4DataInput(oss.str(), fileComm, multifile, isCollective));
+        else data_in = boost::shared_ptr<CDataInput>(new CNc4DataInput(oss.str(), fileComm, multifile, isCollective, time_counter_name));
+        isOpen = true;
+      #endif
     }
   }
@@ -655 +663 @@
 
      // Now everything is ok, close it
-     close();
+     //close();
    }