Changeset 782 for XIOS/trunk/src/io/inetcdf4.cpp

Timestamp:

11/12/15 16:33:03 (9 years ago)

Author:

mhnguyen

Message:

Reading attributes of curvilinear grid from file

+) Correct some minor bugs detecting type of grid
+) Use constant string for attributes conforming to CF convention
+) Add part of code to read attributes of curvilinear grid

Test
+) On Curie
+) test_remap passes

File:

• XIOS/trunk/src/io/inetcdf4.cpp (modified) (16 diffs)

XIOS/trunk/src/io/inetcdf4.cpp

@@ -1 +1 @@
 #include "inetcdf4.hpp"
 #include "netCdfInterface.hpp"
+#include "netCdf_cf_constant.hpp"
 
 #include <boost/algorithm/string.hpp>
@@ -302 +303 @@
     {
       const StdString& attname = *it;
-      if (attname.compare(name) == 0)
+      if (attname.compare(0, name.size(), name) == 0)
         return retvalue;
       retvalue++;
@@ -326 +327 @@
     {
       const StdString& attname = *it;
-      if (attname.compare(name) == 0) return true;
+      if (attname.compare(0, name.size(), name) == 0) return true;
     }
     return false;
@@ -339 +340 @@
     {
       const StdString& varname = *it;
-      if (varname.compare(name) == 0) return true;
+      if (varname.compare(0, name.size(), name) == 0) return true;
     }
     return false;
@@ -347 +348 @@
                                  const CVarPath* const path)
   {
-    return this->hasAttribute("coordinates", &name, path);
+    return this->hasAttribute(CCFKeywords::XIOS_CF_coordinates, &name, path);
   }
 
@@ -353 +354 @@
                             const CVarPath* const path)
   {
-    return this->hasAttribute("bounds", &name, path);
+    return this->hasAttribute(CCFKeywords::XIOS_CF_bounds, &name, path);
   }
 
@@ -441 +442 @@
   {
     StdString retvalue;
-    if (this->hasAttribute("coordinates", &name, path))
-    {
-      return this->getAttributeValue("coordinates", &name, path);
+    if (this->hasAttribute(CCFKeywords::XIOS_CF_coordinates, &name, path))
+    {
+      return this->getAttributeValue(CCFKeywords::XIOS_CF_coordinates, &name, path);
     }
     else
@@ -464 +465 @@
   {
     StdString retvalue;
-    if (this->hasAttribute("bounds", &name, path))
-      retvalue = this->getAttributeValue("bounds", &name, path);
+    if (this->hasAttribute(CCFKeywords::XIOS_CF_bounds, &name, path))
+      retvalue = this->getAttributeValue(CCFKeywords::XIOS_CF_bounds, &name, path);
     return retvalue;
   }
@@ -509 +510 @@
       return false;
 
+    bool isCurVi = true;
+    unsigned int nbLonLat = 0;
     std::list<StdString> coords = this->getCoordinatesIdList(name, path);
     std::list<StdString>::const_iterator it = coords.begin(), end = coords.end();
@@ -514 +517 @@
     {
       const StdString& coord = *it;
-      if (this->hasVariable(coord, path))
+      if (this->hasVariable(coord, path) && !this->isTemporal(coord, path))
       {
         std::map<StdString, StdSize> dimvar = this->getDimensions(&coord, path);
-        if (dimvar.size() != 2) return false;
-      }
-      else return false;
-    }
-    return true;
+        if (2 == dimvar.size()) ++nbLonLat;
+      }
+    }
+    if (2 != nbLonLat) isCurVi = false;
+
+    return isCurVi;
   }
 
@@ -538 +542 @@
     {
       const StdString& coord = *it;
-      if (this->hasVariable(coord, path))
+      if (this->hasVariable(coord, path) && !this->isTemporal(coord, path))
       {
         std::map<StdString, StdSize> dimvar = this->getDimensions(&coord, path);
@@ -581 +585 @@
       else
       {
-        if (coord.compare(this->getUnlimitedDimensionName()) == 0)
+        StdString unlimitedDimName = this->getUnlimitedDimensionName();
+        if (coord.compare(0, unlimitedDimName.size(), unlimitedDimName) == 0)
           continue;
         i++;
@@ -612 +617 @@
         else
         {
-          if (coord.compare(this->getUnlimitedDimensionName()) == 0)
+          StdString unlimitedDimName = this->getUnlimitedDimensionName();
+          if (coord.compare(0, unlimitedDimName.size(), unlimitedDimName) == 0)
             continue;
           return false;
@@ -712 +718 @@
                           const CVarPath* const path, StdSize record);
 
-  template <>
-  void CINetCDF4::getData(CArray<double, 1>& data, const StdString& var,
-                          bool collective, StdSize record,
-                          const std::vector<StdSize>* start /*= NULL*/,
-                          const std::vector<StdSize>* count /*= NULL*/)
-  {
-    int varid = this->getVariable(var);
-
-    if (this->mpi && collective)
-      CNetCdfInterface::varParAccess(ncidp, varid, NC_COLLECTIVE);
-    else if (this->mpi && !collective)
-      CNetCdfInterface::varParAccess(ncidp, varid, NC_INDEPENDENT);
-
-    std::vector<StdSize> sstart, scount;
-    StdSize array_size = 1;
-    this->getDataInfo(var, NULL, record, sstart, scount, array_size, start, count);
-
-    if (data.numElements() != array_size)
-    {
-      ERROR("CONetCDF4::getData(...)",
-            << "[ Array size = " << data.numElements()
-            << ", Data size = "  << array_size
-            << " ] Invalid array size");
-    }
-
-    CNetCdfInterface::getVaraType(ncidp, varid, &sstart[0], &scount[0], data.dataFirst());
-  }
-
   //---------------------------------------------------------------
 
@@ -745 +723 @@
                                        const CVarPath* const path)
   {
+    std::list<StdString>::const_iterator itbList, itList, iteList;
     std::list<StdString> clist = this->getCoordinatesIdList(varname, path);
-    if (this->hasCoordinates(varname, path))
-      return *clist.begin();
-    else
-      return *clist.rbegin();
+    itbList = clist.begin(); iteList = clist.end();
+    for (itList = itbList; itList != iteList; ++itList)
+    {
+      if (this->hasAttribute(CCFKeywords::XIOS_CF_units, &(*itList), path))
+      {
+        StdString unit = this->getAttributeValue(CCFKeywords::XIOS_CF_units, &(*itList), path);
+        if (CCFConvention::XIOS_CF_Longitude_units.end() != CCFConvention::XIOS_CF_Longitude_units.find(unit))
+          return *itList;
+      }
+    }
   }
 
@@ -755 +740 @@
                                        const CVarPath* const path)
   {
+    std::list<StdString>::const_iterator itbList, itList, iteList;
     std::list<StdString> clist = this->getCoordinatesIdList(varname, path);
-    if (this->hasCoordinates(varname, path))
-      return *(++clist.begin());
-    else
-      return *(++clist.rbegin());
+    itbList = clist.begin(); iteList = clist.end();
+    for (itList = itbList; itList != iteList; ++itList)
+    {
+      if (this->hasAttribute(CCFKeywords::XIOS_CF_units, &(*itList), path))
+      {
+        StdString unit = this->getAttributeValue(CCFKeywords::XIOS_CF_units, &(*itList), path);
+        if (CCFConvention::XIOS_CF_Latitude_units.end() != CCFConvention::XIOS_CF_Latitude_units.find(unit))
+          return *itList;
+      }
+    }
   }