Changeset 1486

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.

Location:

XIOS/dev/XIOS_DEV_CMIP6/src

Files:

• io/nc4_data_input.cpp (modified) (3 diffs)
• io/nc4_data_input.hpp (modified) (2 diffs)
• node/domain.cpp (modified) (1 diff)
• node/file.cpp (modified) (1 diff)

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))
       {

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

@@ -24 +24 @@
     /// Constructors ///
     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");
     CNc4DataInput(const CNc4DataInput& dataInput);       // Not implemented.
     CNc4DataInput(const CNc4DataInput* const dataInput); // Not implemented.
@@ -73 +73 @@
     const StdString filename;
     bool isCollective;
+    bool ugridConvention;
   }; // class CNc4DataInput
 

XIOS/dev/XIOS_DEV_CMIP6/src/node/domain.cpp

@@ -1498 +1498 @@
                << "Since 'bounds_lat_2d' is defined, 'latvalue_2d' must be defined too." << std::endl);
 
-       hasBounds = true;
+       // In case of reading UGRID bounds values are not required
+       hasBounds = (!bounds_lat_1d.isEmpty() || !bounds_lat_2d.isEmpty() );
      }
      else if (hasBoundValues)

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

@@ -661 +661 @@
 
       if (isOpen) data_out->closeFile();
-      if (time_counter_name.isEmpty()) data_in = shared_ptr<CDataInput>(new CNc4DataInput(oss.str(), readComm, multifile, isCollective, readMetaDataPar));
-      else data_in = shared_ptr<CDataInput>(new CNc4DataInput(oss.str(), readComm, multifile, isCollective, readMetaDataPar, time_counter_name));
+      bool ugridConvention = !convention.isEmpty() ? (convention == convention_attr::UGRID) : false;
+      if (time_counter_name.isEmpty())
+        data_in = shared_ptr<CDataInput>(new CNc4DataInput(oss.str(), readComm, multifile, isCollective, readMetaDataPar, ugridConvention));
+      else
+        data_in = shared_ptr<CDataInput>(new CNc4DataInput(oss.str(), readComm, multifile, isCollective, readMetaDataPar, ugridConvention, time_counter_name));
       isOpen = true;
     }