Changeset 1601 for XIOS/dev/dev_trunk_omp/src/io/netcdf.hpp

Timestamp:

11/19/18 15:52:54 (6 years ago)

Author:

yushan

Message:

branch_openmp merged with trunk r1597

File:

• XIOS/dev/dev_trunk_omp/src/io/netcdf.hpp (modified) (4 diffs)

XIOS/dev/dev_trunk_omp/src/io/netcdf.hpp

@@ -1 +1 @@
 #ifndef __XIOS_NETCDF_HPP__
 #define __XIOS_NETCDF_HPP__
-#include "mpi.hpp"
+#include "mpi_std.hpp"
 #define MPI_INCLUDED
 #include <netcdf.h>
@@ -33 +33 @@
   {
 #if defined(USING_NETCDF_PAR)
-    return ::nc_create_par(path, cmode, comm, info, ncidp) ;
+    int status;
+    #pragma omp critical (_netcdf)
+    {
+      status = ::nc_create_par(path, cmode, comm, info, ncidp) ;
+    }
+    return status;
 #else
     ERROR("int nc_create_par(const char *path, int cmode, MPI_Comm comm, MPI_Info info,int *ncidp)",
@@ -44 +49 @@
   {
 #if defined(USING_NETCDF_PAR)
-    return ::nc_open_par(path, mode, comm, info, ncidp) ;
+    int status;
+    #pragma omp critical (_netcdf)
+    {
+      status = ::nc_open_par(path, mode, comm, info, ncidp) ;
+    }
+    return status;
 #else
     ERROR("int nc_open_par(const char *path, int mode, MPI_Comm comm, MPI_Info info,int *ncidp)",
@@ -55 +65 @@
   {
 #if defined(USING_NETCDF_PAR)
-    return ::nc_var_par_access(ncid, varid, par_access) ;
+    int status = ::nc_var_par_access(ncid, varid, par_access) ;
+    
+    return status;
 #else
     ERROR("int nc_var_par_access(int ncid, int varid, int par_access)",