Changeset 1639 for XIOS/trunk/src/io/netCdfInterface.cpp

Timestamp:

01/22/19 16:43:32 (5 years ago)

Author:

yushan

Message:

revert erroneous commit on trunk

File:

• XIOS/trunk/src/io/netCdfInterface.cpp (modified) (3 diffs)

XIOS/trunk/src/io/netCdfInterface.cpp

@@ -10 +10 @@
 #include "netCdfInterface.hpp"
 #include "netCdfException.hpp"
-#include "ep_mpi.hpp"
+
 namespace xios
 {
@@ -47 +47 @@
 \return Status code
 */
-int CNetCdfInterface::createPar(const StdString& fileName, int cMode, ep_lib::MPI_Comm comm, ep_lib::MPI_Info info, int& ncId)
-{
-  #ifdef _usingMPI
+int CNetCdfInterface::createPar(const StdString& fileName, int cMode, MPI_Comm comm, MPI_Info info, int& ncId)
+{
   int status = xios::nc_create_par(fileName.c_str(), cMode, comm, info, &ncId);
-  #elif _usingEP
-  int status = xios::nc_create_par(fileName.c_str(), cMode, to_mpi_comm(comm->mpi_comm), to_mpi_info(info), &ncId);
-  #endif
   if (NC_NOERR != status)
   {
@@ -104 +100 @@
 \return Status code
 */
-int CNetCdfInterface::openPar(const StdString& fileName, int oMode, ep_lib::MPI_Comm comm, ep_lib::MPI_Info info, int& ncId)
-{
-  #ifdef _usingMPI
+int CNetCdfInterface::openPar(const StdString& fileName, int oMode, MPI_Comm comm, MPI_Info info, int& ncId)
+{
   int status = xios::nc_open_par(fileName.c_str(), oMode, comm, info, &ncId);
-  #elif _usingEP
-  int status = xios::nc_open_par(fileName.c_str(), oMode, to_mpi_comm(comm->mpi_comm), to_mpi_info(info), &ncId);
-  #endif
   if (NC_NOERR != status)
   {