Changeset 1601 for XIOS/dev/dev_trunk_omp/src/io/onetcdf4.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/onetcdf4.cpp (modified) (6 diffs)

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

@@ -3 +3 @@
 #include "onetcdf4.hpp"
 #include "group_template.hpp"
-#include "mpi.hpp"
+#include "ep_mpi.hpp"
 #include "netcdf.hpp"
 #include "netCdfInterface.hpp"
@@ -15 +15 @@
       CONetCDF4::CONetCDF4(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)
         : path()
         , wmpi(false)
@@ -33 +33 @@
 
       void CONetCDF4::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)
       {
          this->useClassicFormat = useClassicFormat;
@@ -44 +44 @@
          {
             int commSize = 0;
-            MPI_Comm_size(*comm, &commSize);
+            ep_lib::MPI_Comm_size(*comm, &commSize);
             if (commSize <= 1)
                comm = NULL;
@@ -58 +58 @@
             CTimer::get("Files : create").resume();
             if (wmpi)
-               CNetCdfInterface::createPar(filename, mode, *comm, MPI_INFO_NULL, this->ncidp);
+               CNetCdfInterface::createPar(filename, mode, to_mpi_comm((*comm)->mpi_comm), to_mpi_info(MPI_INFO_NULL), this->ncidp);
             else
                CNetCdfInterface::create(filename, mode, this->ncidp);
@@ -70 +70 @@
             CTimer::get("Files : open").resume();
             if (wmpi)
-               CNetCdfInterface::openPar(filename, mode, *comm, MPI_INFO_NULL, this->ncidp);
+               CNetCdfInterface::openPar(filename, mode, to_mpi_comm((*comm)->mpi_comm), to_mpi_info(MPI_INFO_NULL), this->ncidp);
             else
                CNetCdfInterface::open(filename, mode, this->ncidp);