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

Timestamp:

02/19/16 14:34:03 (8 years ago)

Author:

mhnguyen

Message:

Relaxing constraints on reading attributes from a file.

+) If there is no coordinate (lon, lat) in file, there wont be error anymore.
It's user who will provide these info.

Test
+) On Curie
+) Correct on test_remap

File:

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

XIOS/trunk/src/io/inetcdf4.cpp

@@ -28 +28 @@
     this->timeCounterName = timeCounterName;
     if (!CNetCdfInterface::isDimExisted(this->ncidp, this->timeCounterName)) this->timeCounterName=this->getUnlimitedDimensionName() ;
-    
+
   }
 
@@ -63 +63 @@
     int varid = 0;
     int grpid = this->getGroup(path);
-    CNetCdfInterface::inqVarId(grpid, varname, varid);
+    if (this->hasVariable(varname, path))
+      CNetCdfInterface::inqVarId(grpid, varname, varid);
     return varid;
   }
@@ -344 +345 @@
     {
       const StdString& varname = *it;
-      if (varname.compare(0, name.size(), name) == 0) return true;
+      if ((varname.compare(0, name.size(), name) == 0) && (0 != name.size()))  return true;
     }
     return false;
@@ -726 +727 @@
                                        const CVarPath* const path)
   {
+    StdString lonName;
     std::list<StdString>::const_iterator itbList, itList, iteList;
     std::list<StdString> clist = this->getCoordinatesIdList(varname, path);
@@ -735 +737 @@
         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;
-      }
-    }
+        {
+          lonName = *itList;
+          return lonName;
+        }
+      }
+    }
+    return lonName;
   }
 
@@ -743 +749 @@
                                        const CVarPath* const path)
   {
+    StdString latName;
     std::list<StdString>::const_iterator itbList, itList, iteList;
     std::list<StdString> clist = this->getCoordinatesIdList(varname, path);
@@ -752 +759 @@
         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;
-      }
-    }
+        {
+          latName = *itList;
+          return latName;
+        }
+      }
+    }
+    return latName;
   }