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

Timestamp:

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

Author:

yushan

Message:

Branch EP merged with Dev_cmip6 @r1490

Location:

XIOS/dev/branch_openmp/src/io

Files:

• inetcdf4.cpp (modified) (2 diffs)
• inetcdf4.hpp (modified) (1 diff)
• nc4_data_input.cpp (modified) (2 diffs)
• nc4_data_input.hpp (modified) (2 diffs)

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

@@ -7 +7 @@
 namespace xios
 {
-  CINetCDF4::CINetCDF4(const StdString& filename, const ep_lib::MPI_Comm* comm /*= NULL*/, bool multifile /*= true*/, const StdString& timeCounterName /*= "time_counter"*/)
+  //CINetCDF4::CINetCDF4(const StdString& filename, const ep_lib::MPI_Comm* comm /*= NULL*/, bool multifile /*= true*/, const StdString& timeCounterName /*= "time_counter"*/)
+  CINetCDF4::CINetCDF4(const StdString& filename, const ep_lib::MPI_Comm* comm /*= NULL*/, bool multifile /*= true*/,
+                       bool readMetaDataPar /*= false*/, const StdString& timeCounterName /*= "time_counter"*/)
   {
     // Don't use parallel mode if there is only one process
@@ -17 +19 @@
         comm = NULL;
     }
-    mpi = comm && !multifile;
+    //mpi = comm && !multifile;
+    mpi = comm && !multifile && readMetaDataPar;
     ep_lib::MPI_Info info_null;
 

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

@@ -23 +23 @@
       /// Constructors ///
       CINetCDF4(const StdString& filename, const ep_lib::MPI_Comm* comm = NULL, bool multifile = true,
-                const StdString& timeCounterName = "time_counter");
+                bool readMetaDataPar = false, const StdString& timeCounterName = "time_counter");
+                //const StdString& timeCounterName = "time_counter");
       CINetCDF4(const CINetCDF4& inetcdf4);       // Not implemented.
       CINetCDF4(const CINetCDF4* const inetcdf4); // Not implemented.

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

@@ -10 +10 @@
 namespace xios
 {
-  CNc4DataInput::CNc4DataInput(const StdString& filename, ep_lib::MPI_Comm comm_file, bool multifile, bool isCollective /*= true*/, const StdString& timeCounterName /*= "time_counter"*/)
+  //CNc4DataInput::CNc4DataInput(const StdString& filename, ep_lib::MPI_Comm comm_file, bool multifile, bool isCollective /*= true*/, const StdString& timeCounterName /*= "time_counter"*/)
+  CNc4DataInput::CNc4DataInput(const StdString& filename, ep_lib::MPI_Comm comm_file, bool multifile, bool isCollective /*= true*/,
+                               bool readMetaDataPar /*= false*/, bool ugridConvention /*= false*/, const StdString& timeCounterName /*= "time_counter"*/)
     : SuperClass()
-    , SuperClassWriter(filename, &comm_file, multifile, timeCounterName)
+    , SuperClassWriter(filename, &comm_file, multifile, readMetaDataPar, timeCounterName)
+    //, SuperClassWriter(filename, &comm_file, multifile, timeCounterName)
     , comm_file(comm_file)
     , filename(filename)
     , isCollective(isCollective)
+    , ugridConvention(ugridConvention)
     , readMetaDataDomains_(), readValueDomains_()
     , readMetaDataAxis_(), readValueAxis_()
@@ -422 +426 @@
       StdString boundsLonName = this->getBoundsId(lonName);
 
-      int nbVertex = this->getNbVertex(fieldId);
+      if (ugridConvention && domain->nvertex.isEmpty())
+      {
+        ERROR("void CNc4DataInput::readDomainAttributeValueFromFile(...)",
+          << " Attribute nvertex must be specified for domain " << domain->getDomainOutputName()
+          << " read from UGRID file " << this->filename << " ."<< std::endl);
+      }
+//      int nbVertex = this->getNbVertex(fieldId);
+      int nbVertex = (ugridConvention) ? domain->nvertex : this->getNbVertex(fieldId);
+      
       if (!domain->nvertex.isEmpty() && (domain->nvertex != nbVertex))
       {

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