Changeset 1601 for XIOS/dev/dev_trunk_omp/src/io/inetcdf4.cpp

Timestamp:

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

Author:

yushan

Message:

branch_openmp merged with trunk r1597

File:

• XIOS/dev/dev_trunk_omp/src/io/inetcdf4.cpp (modified) (3 diffs)

XIOS/dev/dev_trunk_omp/src/io/inetcdf4.cpp

@@ -2 +2 @@
 #include "netCdfInterface.hpp"
 #include "netCdf_cf_constant.hpp"
-
+#include "ep_mpi.hpp"
 #include <boost/algorithm/string.hpp>
 
 namespace xios
 {
-  CINetCDF4::CINetCDF4(const StdString& filename, const MPI_Comm* comm /*= NULL*/, bool multifile /*= true*/,
+  CINetCDF4::CINetCDF4(const StdString& filename, const ep_lib::MPI_Comm* comm /*= NULL*/, bool multifile /*= true*/,
                        bool readMetaDataPar /*= false*/, const StdString& timeCounterName /*= "time_counter"*/)
   {
@@ -14 +14 @@
     {
       int commSize = 0;
-      MPI_Comm_size(*comm, &commSize);
+      ep_lib::MPI_Comm_size(*comm, &commSize);
       if (commSize <= 1)
         comm = NULL;
@@ -23 +23 @@
     // even if Parallel NetCDF ends up being used.
     if (mpi)
-      CNetCdfInterface::openPar(filename, NC_NOWRITE | NC_MPIIO, *comm, MPI_INFO_NULL, this->ncidp);
+      CNetCdfInterface::openPar(filename, NC_NOWRITE | NC_MPIIO, to_mpi_comm((*comm)->mpi_comm), to_mpi_info(MPI_INFO_NULL), this->ncidp);
     else
       CNetCdfInterface::open(filename, NC_NOWRITE, this->ncidp);