Changeset 1486 for XIOS/dev/XIOS_DEV_CMIP6/src/io/nc4_data_input.cpp

Timestamp:

04/20/18 14:33:46 (6 years ago)

Author:

oabramkina

Message:

XIOS_DEV_CMIP: minor modifications for reading UGRID.

Using attribute nvertex defined by a user and not deduced from metadata of a file being read.
Taking into account the fact that the bounds attribute is not required by UGRID.

File:

• XIOS/dev/XIOS_DEV_CMIP6/src/io/nc4_data_input.cpp (modified) (3 diffs)

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

@@ -11 +11 @@
 {
   CNc4DataInput::CNc4DataInput(const StdString& filename, MPI_Comm comm_file, bool multifile, bool isCollective /*= true*/,
-                               bool readMetaDataPar /*= false*/, const StdString& timeCounterName /*= "time_counter"*/)
+                               bool readMetaDataPar /*= false*/, bool ugridConvention /*= false*/, const StdString& timeCounterName /*= "time_counter"*/)
     : SuperClass()
     , SuperClassWriter(filename, &comm_file, multifile, readMetaDataPar, timeCounterName)
@@ -17 +17 @@
     , filename(filename)
     , isCollective(isCollective)
+    , ugridConvention(ugridConvention)
     , readMetaDataDomains_(), readValueDomains_()
     , readMetaDataAxis_(), readValueAxis_()
@@ -419 +420 @@
       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))
       {