Changeset 1153 for XIOS/dev/branch_yushan_merged/src/io/netCdfInterface.cpp

Timestamp:

06/02/17 17:53:25 (7 years ago)

Author:

yushan

Message:

save modif

File:

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

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

@@ -75 +75 @@
 int CNetCdfInterface::open(const StdString& fileName, int oMode, int& ncId)
 {
-  int status = nc_open(fileName.c_str(), oMode, &ncId);
+  int status = NC_NOERR;
+  #pragma omp critical (_netcdf)
+  status = nc_open(fileName.c_str(), oMode, &ncId);
+  
   if (NC_NOERR != status)
   {
@@ -105 +108 @@
   int status;
   #pragma omp critical (_netcdf)
-  status = xios::nc_open_par(fileName.c_str(), oMode, comm, info, &ncId);
+  status = xios::nc_open_par(fileName.c_str(), oMode, comm, info, &ncId); // nc_open
   if (NC_NOERR != status)
   {
@@ -129 +132 @@
 {
   int status = NC_NOERR;
-  //#pragma omp critical (_netcdf)
-  #pragma omp master
+  #pragma omp critical (_netcdf)
+  //#pragma omp master
   {
   status = nc_close(ncId);