Changeset 1443 for XIOS

Timestamp:

02/28/18 11:18:22 (6 years ago)

Author:

oabramkina

Message:

Bugfix on reading of rectilinear domains:

taking into account that now scalar label is added to field coordinates.

File:

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

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

@@ -496 +496 @@
     std::list<StdString> coords = this->getCoordinatesIdList(name, path);
     std::list<StdString>::const_iterator it = coords.begin(), end = coords.end();
-    std::set<StdString> dimVarList;
+    int nb1Ddims = 0;
 
     for (; it != end; it++)
@@ -504 +504 @@
       {
         std::map<StdString, StdSize> dimvar = this->getDimensions(&coord, path);
-//        if ((dimvar.size() == 1) && (dimvar.find(coord) != dimvar.end()))
         if ((dimvar.size() == 1))
         {
-          dimVarList.insert(dimvar.begin()->first);
-          continue;
+          // Check that the coordinate is not a scalar label
+          StdString dimTmp = dimvar.begin()->first;
+          if (dimTmp.compare("str_len") != 0)
+          {
+            nb1Ddims++;
+            continue;
+          }
         }
         else
@@ -515 +519 @@
     }
 
-    return (dimVarList.size() != 1);
+    return (nb1Ddims != 1);
   }