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

Timestamp:

05/18/17 17:40:03 (7 years ago)

Author:

yushan

Message:

test_remap back to work. No thread for now

File:

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

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

@@ -6 +6 @@
 #include "onetcdf4.hpp"
 #include "data_output.hpp"
+// mpi_std.hpp
 
 namespace xios
@@ -26 +27 @@
             CNc4DataOutput
                (CFile* file, const StdString & filename, bool exist, bool useClassicFormat,
-                bool useCFConvention,
-                ep_lib::MPI_Comm comm_file, bool multifile, bool isCollective = true,
-                const StdString& timeCounterName = "time_counter");
+                bool useCFConvention, MPI_Comm comm_file, bool multifile, 
+                bool isCollective = true, const StdString& timeCounterName = "time_counter");
 
             CNc4DataOutput(const CNc4DataOutput & dataoutput);       // Not implemented.
@@ -116 +116 @@
 
             /// Propriétés privées ///
-            ep_lib::MPI_Comm comm_file;
+            MPI_Comm comm_file;
             const StdString filename;
             std::map<Time, StdSize> timeToRecordCache;