Changeset 1491 for XIOS/dev/branch_openmp/src/node/file.cpp

Timestamp:

04/23/18 11:18:05 (6 years ago)

Author:

yushan

Message:

Branch EP merged with Dev_cmip6 @r1490

File:

• XIOS/dev/branch_openmp/src/node/file.cpp (modified) (1 diff)

XIOS/dev/branch_openmp/src/node/file.cpp

@@ -657 +657 @@
 
       bool isCollective = par_access.isEmpty() || par_access == par_access_attr::collective;
-      #ifdef _usingEP
-        if (isOpen) data_out->closeFile();
-        if (time_counter_name.isEmpty()) data_in = boost::shared_ptr<CDataInput>(new CNc4DataInput(oss.str(), readComm, multifile, isCollective));
-        else data_in = boost::shared_ptr<CDataInput>(new CNc4DataInput(oss.str(), readComm, multifile, isCollective, time_counter_name));
-        isOpen = true;
-      #elif _usingMPI
-        if (isOpen) data_out->closeFile();
-        if (time_counter_name.isEmpty()) data_in = boost::shared_ptr<CDataInput>(new CNc4DataInput(oss.str(), readComm, multifile, isCollective));
-        else data_in = boost::shared_ptr<CDataInput>(new CNc4DataInput(oss.str(), readComm, multifile, isCollective, time_counter_name));
-        isOpen = true;
-      #endif
+      bool  readMetaDataPar = true;
+      if (!context->hasServer) readMetaDataPar = (read_metadata_par.isEmpty()) ? false : read_metadata_par;
+      
+      if (isOpen) data_out->closeFile();
+      //if (time_counter_name.isEmpty()) data_in = boost::shared_ptr<CDataInput>(new CNc4DataInput(oss.str(), readComm, multifile, isCollective));
+      //else data_in = boost::shared_ptr<CDataInput>(new CNc4DataInput(oss.str(), readComm, multifile, isCollective, time_counter_name));
+      bool ugridConvention = !convention.isEmpty() ? (convention == convention_attr::UGRID) : false;
+      if (time_counter_name.isEmpty())
+        data_in = boost::shared_ptr<CDataInput>(new CNc4DataInput(oss.str(), readComm, multifile, isCollective, readMetaDataPar, ugridConvention));
+      else
+        data_in = boost::shared_ptr<CDataInput>(new CNc4DataInput(oss.str(), readComm, multifile, isCollective, readMetaDataPar, ugridConvention, time_counter_name));
+
+      isOpen = true;
     }
   }