Changeset 2280 for XIOS/trunk/src/io/nc4_data_input.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/nc4_data_input.cpp (modified) (4 diffs)

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;
       }
     }