Changeset 1134 for XIOS/dev/branch_yushan_merged/src/io/nc4_data_output.hpp

Timestamp:

05/16/17 17:54:30 (7 years ago)

Author:

yushan

Message:

branch merged with trunk r1130

File:

• XIOS/dev/branch_yushan_merged/src/io/nc4_data_output.hpp (modified) (2 diffs)

XIOS/dev/branch_yushan_merged/src/io/nc4_data_output.hpp

@@ -27 +27 @@
                (CFile* file, const StdString & filename, bool exist, bool useClassicFormat,
                 bool useCFConvention,
-                MPI_Comm comm_file, bool multifile, bool isCollective = true,
+                ep_lib::MPI_Comm comm_file, bool multifile, bool isCollective = true,
                 const StdString& timeCounterName = "time_counter");
 
@@ -116 +116 @@
 
             /// Propriétés privées ///
-            MPI_Comm comm_file;
+            ep_lib::MPI_Comm comm_file;
             const StdString filename;
             std::map<Time, StdSize> timeToRecordCache;