Changeset 1601 for XIOS/dev/dev_trunk_omp/src/io/nc4_data_input.hpp

Timestamp:

11/19/18 15:52:54 (6 years ago)

Author:

yushan

Message:

branch_openmp merged with trunk r1597

File:

• XIOS/dev/dev_trunk_omp/src/io/nc4_data_input.hpp (modified) (3 diffs)

XIOS/dev/dev_trunk_omp/src/io/nc4_data_input.hpp

@@ -3 +3 @@
 
 /// XIOS headers ///
+#include "mpi_std.hpp"
 #include "xios_spl.hpp"
 #include "data_input.hpp"
@@ -23 +24 @@
 
     /// Constructors ///
-    CNc4DataInput(const StdString& filename, MPI_Comm comm_file, bool multifile, bool isCollective = true,
+    CNc4DataInput(const StdString& filename, ep_lib::MPI_Comm comm_file, bool multifile, bool isCollective = true,
                   bool readMetaDataPar = false, bool ugridConvention = false, const StdString& timeCounterName = "time_counter");
     CNc4DataInput(const CNc4DataInput& dataInput);       // Not implemented.
@@ -70 +71 @@
   private:
     /// Private attributes ///
-    MPI_Comm comm_file;
+    ep_lib::MPI_Comm comm_file;
     const StdString filename;
     bool isCollective;