Changeset 1328 for XIOS/dev/branch_openmp/src/io/netCdfInterface.cpp

Timestamp:

11/15/17 12:14:34 (6 years ago)

Author:

yushan

Message:

dev_omp

File:

• XIOS/dev/branch_openmp/src/io/netCdfInterface.cpp (modified) (7 diffs)

XIOS/dev/branch_openmp/src/io/netCdfInterface.cpp

@@ -10 +10 @@
 #include "netCdfInterface.hpp"
 #include "netCdfException.hpp"
-// mpi_std.hpp
 
 namespace xios
@@ -50 +49 @@
 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);
+  int status = xios::nc_create_par(fileName.c_str(), cMode, comm, MPI_INFO_NULL.mpi_info, &ncId);
   if (NC_NOERR != status)
   {
@@ -75 +74 @@
 int CNetCdfInterface::open(const StdString& fileName, int oMode, int& ncId)
 {
-  int status = NC_NOERR;
-  #pragma omp critical (_netcdf)
-  status = nc_open(fileName.c_str(), oMode, &ncId);
-  
+  int status = nc_open(fileName.c_str(), oMode, &ncId);
   if (NC_NOERR != status)
   {
@@ -106 +102 @@
 int CNetCdfInterface::openPar(const StdString& fileName, int oMode, MPI_Comm comm, MPI_Info info, int& ncId)
 {
-  int status;
-  #pragma omp critical (_netcdf)
-  status = xios::nc_open_par(fileName.c_str(), oMode, comm, info, &ncId); // nc_open
+  //int status = xios::nc_open_par(fileName.c_str(), oMode, comm, info, &ncId);
+  int status = xios::nc_open_par(fileName.c_str(), oMode, comm, MPI_INFO_NULL.mpi_info, &ncId);
   if (NC_NOERR != status)
   {
@@ -131 +126 @@
 int CNetCdfInterface::close(int ncId)
 {
-  int status = NC_NOERR;
-  #pragma omp critical (_netcdf)
-  //#pragma omp master
-  {
-  status = nc_close(ncId);
+  int status = nc_close(ncId);
   if (NC_NOERR != status)
   {
@@ -146 +137 @@
     throw CNetCdfException(e);
   }
-  }
+
   return status;
 }
@@ -356 +347 @@
 int CNetCdfInterface::inqDimLen(int ncid, int dimId, StdSize& dimLen)
 {
-  int status;
-  #pragma omp critical (_netcdf)
-  status = nc_inq_dimlen(ncid, dimId, &dimLen);
+  int status = nc_inq_dimlen(ncid, dimId, &dimLen);
   if (NC_NOERR != status)
   {