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

Timestamp:

11/21/17 10:47:57 (6 years ago)

Author:

yushan

Message:

dev_omp

Location:

XIOS/dev/branch_openmp/src/io

Files:

• nc4_data_input.cpp (modified) (1 diff)
• netCdfInterface.cpp (modified) (1 diff)

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

@@ -53 +53 @@
     CArray<double,1> fieldData(grid->getWrittenDataSize());
     if (!field->default_value.isEmpty()) fieldData = field->default_value;
-
+    #ifdef _usingEP
+      SuperClass::type = ONE_FILE;
+      printf("SuperClass::type = %d\n", SuperClass::type);
+    #endif
+        
     switch (SuperClass::type)
     {

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

@@ -128 +128 @@
 int CNetCdfInterface::close(int ncId)
 {
-  int status = nc_close(ncId);
-  if (NC_NOERR != status)
-  {
-    StdString errormsg(nc_strerror(status));
-    StdStringStream sstr;
-    sstr << "Error when calling function nc_close(ncId)" << std::endl
-         << errormsg << std::endl
-         << "Unable to close file, given its id: " << ncId << std::endl;
-    StdString e = sstr.str();
-    throw CNetCdfException(e);
-  }
-
+  int status = NC_NOERR;
+  #pragma omp master
+  {
+    status = nc_close(ncId);
+    if (NC_NOERR != status)
+    {
+      StdString errormsg(nc_strerror(status));
+      StdStringStream sstr;
+      sstr << "Error when calling function nc_close(ncId)" << std::endl
+           << errormsg << std::endl
+           << "Unable to close file, given its id: " << ncId << std::endl;
+      StdString e = sstr.str();
+      throw CNetCdfException(e);
+    }
+  }
   return status;
 }