Changeset 1491 for XIOS/dev/branch_openmp/src/io/nc4_data_input.hpp

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/io/nc4_data_input.hpp (modified) (2 diffs)

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

@@ -25 +25 @@
     /// Constructors ///
     CNc4DataInput(const StdString& filename, ep_lib::MPI_Comm comm_file, bool multifile, bool isCollective = true,
-                  const StdString& timeCounterName = "time_counter");
+                  bool readMetaDataPar = false, bool ugridConvention = false, const StdString& timeCounterName = "time_counter");
+                  //const StdString& timeCounterName = "time_counter");
     CNc4DataInput(const CNc4DataInput& dataInput);       // Not implemented.
     CNc4DataInput(const CNc4DataInput* const dataInput); // Not implemented.
@@ -74 +75 @@
     const StdString filename;
     bool isCollective;
+    bool ugridConvention;
   }; // class CNc4DataInput