Changeset 2280 for XIOS/trunk

Timestamp:

01/07/22 12:17:18 (3 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

Location:

XIOS/trunk/src

Files:

• config/axis_attribute.conf (modified) (1 diff)
• io/inetcdf4.cpp (modified) (4 diffs)
• io/inetcdf4.hpp (modified) (3 diffs)
• io/nc4_data_input.cpp (modified) (4 diffs)

XIOS/trunk/src/config/axis_attribute.conf

@@ -6 +6 @@
 
 DECLARE_ATTRIBUTE(StdString, unit)
+DECLARE_ATTRIBUTE(double, convert_from_factor)
 DECLARE_ATTRIBUTE(StdString, formula)
 DECLARE_ATTRIBUTE(StdString, formula_term)

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,

XIOS/trunk/src/io/inetcdf4.hpp

@@ -40 +40 @@
 
       /// Getters ///
-      StdSize getNbOfTimestep(const CVarPath* const path = NULL);
 
       StdString getUnlimitedDimensionName(const CVarPath* const path = NULL);
@@ -112 +111 @@
       /// Tests ///
       bool hasMissingValue(const StdString& name, const CVarPath* const path = NULL);
-
+      bool hasAttribute(const StdString& name, const StdString* const var  = NULL, const CVarPath* const path = NULL);
+      
+      template <class T>
       bool hasAttribute(const StdString& name, const StdString* const var  = NULL, const CVarPath* const path = NULL);
 
@@ -144 +145 @@
       int getDimension(const StdString& dimname, const CVarPath* const path = NULL);
       int getUnlimitedDimension(const CVarPath* const path = NULL);
+      bool hasUnlimitedDimension(const CVarPath* const path = NULL);
+
       int getAttributeId(const StdString& name,
                          const StdString* const var = NULL,

XIOS/trunk/src/io/nc4_data_input.cpp

@@ -35 +35 @@
     if (SuperClassWriter::isTemporal(fieldId))
     {
-//      return SuperClassWriter::getDimensions(&fieldId)[SuperClassWriter::getUnlimitedDimensionName()];
       return SuperClassWriter::getDimensions(&fieldId)[SuperClassWriter::getTimeCounterName()];
     }
@@ -159 +158 @@
     if (SuperClassWriter::isTemporal(fieldId))
     {
-      dimSizeMap.erase(SuperClassWriter::getUnlimitedDimensionName());
+      dimSizeMap.erase(SuperClassWriter::getTimeCounterName());
       dimList.pop_front() ;  // assume time dimension is first
     }
@@ -195 +194 @@
         listDimSize.push_front(*dimSizeMap.find(*it));
     }
+    
+    // read specific field attribute
+    if (field->add_offset.isEmpty())
+    {
+      if (SuperClassWriter::hasAttribute<float>("add_offset",&fieldId)) 
+        field->add_offset =  SuperClassWriter::getAttributeValue<float>("add_offset",&fieldId)[0] ;
+      else if (SuperClassWriter::hasAttribute<double>("add_offset",&fieldId))
+        field->add_offset =  SuperClassWriter::getAttributeValue<double>("add_offset",&fieldId)[0] ;
+    }
+
+    if (field->scale_factor.isEmpty())
+    {
+      if (SuperClassWriter::hasAttribute<float>("scale_factor",&fieldId)) 
+        field->scale_factor =  SuperClassWriter::getAttributeValue<float>("scale_factor",&fieldId)[0] ;
+      else if (SuperClassWriter::hasAttribute<double>("scale_factor",&fieldId))
+        field->scale_factor =  SuperClassWriter::getAttributeValue<double>("scale_factor",&fieldId)[0] ;
+    }
 
     // Now process domain and axis
@@ -579 +595 @@
         if (!axis->n.isEmpty()) n = axis->n.getValue();
         axis->value.resize(n);
-        for (int i = 0; i < n; ++i) axis->value(i) = readAxisValue(begin + i);
+        double convertFromFactor=1.0 ;
+        if (!axis->convert_from_factor.isEmpty()) convertFromFactor = axis->convert_from_factor ;
+        for (int i = 0; i < n; ++i) axis->value(i) = readAxisValue(begin + i)*convertFromFactor;
       }
     }