Changeset 1134 for XIOS/dev/branch_yushan_merged/src/io/onetcdf4.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/onetcdf4.hpp (modified) (3 diffs)

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

@@ -7 +7 @@
 #include "data_output.hpp"
 #include "array_new.hpp"
-#include "mpi.hpp"
+#include "mpi_std.hpp"
 #include "netcdf.hpp"
 
@@ -28 +28 @@
             CONetCDF4(const StdString& filename, bool append, bool useClassicFormat = false,
                           bool useCFConvention = true,
-                      const MPI_Comm* comm = NULL, bool multifile = true,
+                      const ep_lib::MPI_Comm* comm = NULL, bool multifile = true,
                       const StdString& timeCounterName = "time_counter");
 
@@ -37 +37 @@
             /// Initialisation ///
             void initialize(const StdString& filename, bool append, bool useClassicFormat, bool useCFConvention,
-                            const MPI_Comm* comm, bool multifile, const StdString& timeCounterName);
+                            const ep_lib::MPI_Comm* comm, bool multifile, const StdString& timeCounterName);
             void close(void);
             void sync(void);