Changeset 1534

Timestamp:

06/11/18 14:19:29 (5 years ago)

Author:

ymipsl

Message:

Bug fix : no return value in some case for "bool CINetCDF4::isLonOrLat()" methods

YM

File:

• XIOS/dev/XIOS_DEV_CMIP6/src/io/inetcdf4.cpp (modified) (1 diff)

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

@@ -808 +808 @@
   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));
-    }
+    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));
+    }
+    else return false ;
   }