Changeset 1445

Timestamp:

03/02/18 10:48:21 (6 years ago)

Author:

oabramkina

Message:

Changes concerning reading of a grid.

With introduction of new grid attributes and relaxing certain conditions on naming of attribues and coordinates in revisions r1430 and r1435, the algorithm on determining the type of a domain needed to be adjusted.

Tests: all three types of domain with various additional dimensions (scalar and axis with/without value/label).

Location:

XIOS/dev/XIOS_DEV_CMIP6/src/io

Files:

• inetcdf4.cpp (modified) (4 diffs)
• inetcdf4.hpp (modified) (1 diff)

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

@@ -501 +501 @@
     {
       const StdString& coord = *it;
-      if (this->hasVariable(coord, path) && !this->isTemporal(coord, path))
+      if (this->hasVariable(coord, path) && !this->isTemporal(coord, path) && this->isLonOrLat(coord, path))
       {
         std::map<StdString, StdSize> dimvar = this->getDimensions(&coord, path);
         if ((dimvar.size() == 1))
         {
-          // Check that the coordinate is not a scalar label
-          StdString dimTmp = dimvar.begin()->first;
-          if (dimTmp.compare("str_len") != 0)
-          {
-            dimVarList.insert(dimvar.begin()->first);
-            continue;
-          }
+          dimVarList.insert(dimvar.begin()->first);
+          continue;
         }
-        else
-          return false;
-      }
-    }
-
+      }
+    }
     return (dimVarList.size() != 1);
   }
@@ -534 +526 @@
     {
       const StdString& coord = *it;
-      if (this->hasVariable(coord, path) && !this->isTemporal(coord, path))
+      if (this->hasVariable(coord, path) && !this->isTemporal(coord, path) && this->isLonOrLat(coord, path))
       {
         std::map<StdString, StdSize> dimvar = this->getDimensions(&coord, path);
@@ -561 +553 @@
     {
       const StdString& coord = *it;
-      if (this->hasVariable(coord, path) && !this->isTemporal(coord, path))
+      if (this->hasVariable(coord, path) && !this->isTemporal(coord, path) && this->isLonOrLat(coord, path))
       {
         std::map<StdString, StdSize> dimvar = this->getDimensions(&coord, path);
@@ -791 +783 @@
       return *(++(++clist.rbegin()));
   }
+
+  bool CINetCDF4::isLonOrLat(const StdString& varname, const CVarPath* const path)
+  {
+  if (this->hasAttribute(CCFKeywords::XIOS_CF_units, &varname, path))
+  {
+    StdString unit = this->getAttributeValue(CCFKeywords::XIOS_CF_units, &varname, path);
+    return (CCFConvention::XIOS_CF_Latitude_units.end() != CCFConvention::XIOS_CF_Latitude_units.find(unit)
+            || CCFConvention::XIOS_CF_Longitude_units.end() != CCFConvention::XIOS_CF_Longitude_units.find(unit));
+    }
+  }
+
 } // namespace xios

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

@@ -135 +135 @@
       bool isCellGrid(const StdString& name, const CVarPath* const path = NULL);
 
+      bool isLonOrLat(const StdString& varname, const CVarPath* const path = NULL);
+
     protected:
       /// Getters ///