Changeset 1334 for XIOS/dev/branch_openmp/src/io

Timestamp:

11/20/17 09:49:26 (6 years ago)

Author:

yushan

Message:

omp_dev

Location:

XIOS/dev/branch_openmp/src/io

Files:

• netCdfInterface.cpp (modified) (1 diff)
• netCdfInterface_impl.hpp (modified) (1 diff)

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

@@ -102 +102 @@
 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);
-  int status = xios::nc_open_par(fileName.c_str(), oMode, comm, MPI_INFO_NULL.mpi_info, &ncId);
+  int status;
+  #pragma omp critical (_netcdf)
+  status = xios::nc_open_par(fileName.c_str(), oMode, comm, MPI_INFO_NULL.mpi_info, &ncId);
+  
   if (NC_NOERR != status)
   {

XIOS/dev/branch_openmp/src/io/netCdfInterface_impl.hpp

@@ -85 +85 @@
   int CNetCdfInterface::getVaraType(int ncid, int varId, const StdSize* start, const StdSize* count, T* data)
   {
-    int status = ncGetVaraType(ncid, varId, start, count, data);
+    int status;
+    #pragma omp critical (_netcdf)
+    status = ncGetVaraType(ncid, varId, start, count, data);
     if (NC_NOERR != status)
     {