Changeset 2631

Timestamp:

05/29/24 19:16:58 (5 weeks ago)

Author:

ymipsl

Message:

Back port of XIOS2/trunk, rev.2280 :
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:

XIOS3/trunk/src

Files:

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

XIOS3/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)

XIOS3/trunk/src/io/inetcdf4.cpp

@@ -89 +89 @@
   }
 
+  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 ; 
+  } 
+  
   int CINetCDF4::getUnlimitedDimension(const CVarPath* const path)
   {
@@ -174 +183 @@
   }
 
-  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 +341 @@
     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,

XIOS3/trunk/src/io/inetcdf4.hpp

@@ -40 +40 @@
 
       /// Getters ///
-      StdSize getNbOfTimestep(const CVarPath* const path = NULL);
 
       StdString getUnlimitedDimensionName(const CVarPath* const path = NULL);
@@ -113 +112 @@
       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 +146 @@
       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,

XIOS3/trunk/src/io/nc4_data_input.cpp

@@ -36 +36 @@
     if (SuperClassWriter::isTemporal(fieldId))
     {
-//      return SuperClassWriter::getDimensions(&fieldId)[SuperClassWriter::getUnlimitedDimensionName()];
       return SuperClassWriter::getDimensions(&fieldId)[SuperClassWriter::getTimeCounterName()];
     }
@@ -151 +150 @@
     if (SuperClassWriter::isTemporal(fieldId))
     {
-      dimSizeMap.erase(SuperClassWriter::getUnlimitedDimensionName());
+      dimSizeMap.erase(SuperClassWriter::getTimeCounterName()); 
       dimList.pop_front() ;  // assume time dimension is first
     }
@@ -187 +186 @@
         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
@@ -571 +587 @@
         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; 
       }
     }