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

Timestamp:

01/07/22 12:17:18 (2 years ago)

Author:

ymipsl

Message:

Improve file reading reading

• add_offset and scaling_factor attributes are set when present in reading file
• Add new attribute for axis to scale axis_value when read from file : convert_from_factor
• fix bugs when time dimension in reading file is not unlimited

YM

File:

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

XIOS/trunk/src/io/inetcdf4.cpp

@@ -28 +28 @@
 
     this->timeCounterName = timeCounterName;
+
     if (!CNetCdfInterface::isDimExisted(this->ncidp, this->timeCounterName)) this->timeCounterName=this->getUnlimitedDimensionName() ;
 
@@ -87 +88 @@
     CNetCdfInterface::inqAtt(grpid, varid, attname, retvalue.first, retvalue.second);
     return retvalue;
+  }
+
+  
+  bool CINetCDF4::hasUnlimitedDimension(const CVarPath* const path)
+  {
+    int dimid = 0;
+    int grpid = this->getGroup(path);
+    CNetCdfInterface::inqUnLimDim(grpid, dimid);
+    if (dimid==-1) return false ;
+    else return true ;
   }
 
@@ -174 +185 @@
   }
 
-  StdSize CINetCDF4::getNbOfTimestep(const CVarPath* const path)
-  {
-    return this->getDimensions(NULL, path)[this->getUnlimitedDimensionName(path)];
-  }
-
   std::set<StdString> CINetCDF4::getBoundVariables(const CVarPath* const path)
   {
@@ -337 +343 @@
     return false;
   }
+
+  template <class T>
+  bool CINetCDF4::hasAttribute(const StdString& name, const StdString* const var, const CVarPath* const path)
+  {
+    std::list<StdString> atts = this->getAttributes(var, path);
+    std::list<StdString>::const_iterator it = atts.begin(), end = atts.end();
+    for (; it != end; it++)
+    {
+      const StdString& attname = *it;
+      if (attname.compare(0, name.size(), name) == 0)
+      { 
+        std::pair<nc_type , StdSize> attinfos = this->getAttribute(name, var, path);
+        std::vector<T> retvalue(attinfos.second);
+        nc_type type = CNetCdfInterface::getNcType<T>();
+        if (attinfos.first == type) return true;
+        else return false ;
+      }
+    }
+    return false;
+  }
+  
+  template bool  CINetCDF4::hasAttribute<double>(const StdString& name, const StdString* const var, const CVarPath* const path);
+  template bool  CINetCDF4::hasAttribute<float>(const StdString& name, const StdString* const var, const CVarPath* const path);
+  template bool  CINetCDF4::hasAttribute<int>(const StdString& name, const StdString* const var, const CVarPath* const path);
+  template bool  CINetCDF4::hasAttribute<char>(const StdString& name, const StdString* const var, const CVarPath* const path);
+  
 
   bool CINetCDF4::hasVariable(const StdString& name,