Changeset 1534


Ignore:
Timestamp:
06/11/18 14:19:29 (2 years ago)
Author:
ymipsl
Message:

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

YM

File:
1 edited

Legend:

Unmodified
Added
Removed
  • XIOS/dev/XIOS_DEV_CMIP6/src/io/inetcdf4.cpp

    r1485 r1534  
    808808  bool CINetCDF4::isLonOrLat(const StdString& varname, const CVarPath* const path) 
    809809  { 
    810   if (this->hasAttribute(CCFKeywords::XIOS_CF_units, &varname, path)) 
    811   { 
    812     StdString unit = this->getAttributeValue(CCFKeywords::XIOS_CF_units, &varname, path); 
    813     return (CCFConvention::XIOS_CF_Latitude_units.end() != CCFConvention::XIOS_CF_Latitude_units.find(unit) 
    814             || CCFConvention::XIOS_CF_Longitude_units.end() != CCFConvention::XIOS_CF_Longitude_units.find(unit)); 
    815     } 
     810    if (this->hasAttribute(CCFKeywords::XIOS_CF_units, &varname, path)) 
     811    { 
     812      StdString unit = this->getAttributeValue(CCFKeywords::XIOS_CF_units, &varname, path); 
     813      return      (CCFConvention::XIOS_CF_Latitude_units.end() != CCFConvention::XIOS_CF_Latitude_units.find(unit) 
     814                || CCFConvention::XIOS_CF_Longitude_units.end() != CCFConvention::XIOS_CF_Longitude_units.find(unit)); 
     815    } 
     816    else return false ; 
    816817  } 
    817818 
Note: See TracChangeset for help on using the changeset viewer.