Changeset 1172 for XIOS/dev/branch_yushan_merged/src/node/file.cpp

Timestamp:

06/15/17 19:32:13 (7 years ago)

Author:

yushan

Message:

save dev. need to unify the file type when using EP

File:

• XIOS/dev/branch_yushan_merged/src/node/file.cpp (modified) (1 diff)

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

@@ -579 +579 @@
 
       #ifdef _usingEP
-      if(omp_get_num_threads() != 1 ) multifile = true;
-      #endif
-
+      //printf("multifile was %d\n", multifile);
+      multifile = true;
       if (isOpen) data_out->closeFile();
       if (time_counter_name.isEmpty()) data_in = shared_ptr<CDataInput>(new CNc4DataInput(oss.str(), static_cast< ::MPI_Comm >(fileComm.mpi_comm), multifile, isCollective));
       else data_in = shared_ptr<CDataInput>(new CNc4DataInput(oss.str(), static_cast< ::MPI_Comm >(fileComm.mpi_comm), multifile, isCollective, time_counter_name));
       isOpen = true;
+      #else
+      if (isOpen) data_out->closeFile();
+      if (time_counter_name.isEmpty()) data_in = shared_ptr<CDataInput>(new CNc4DataInput(oss.str(), static_cast< ::MPI_Comm >(fileComm.mpi_comm), multifile, isCollective));
+      else data_in = shared_ptr<CDataInput>(new CNc4DataInput(oss.str(), static_cast< ::MPI_Comm >(fileComm.mpi_comm), multifile, isCollective, time_counter_name));
+      isOpen = true;
+      #endif
+
+      
     }
   }