Changeset 807

Timestamp:

12/13/15 15:37:26 (8 years ago)

Author:

ymipsl

Message:

Fix problem for reading dimension variable in file.

When reading file, dimension was not query in correct order due to usage of map instead a list for dimension information storage.

YM

File:

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

XIOS/trunk/src/io/nc4_data_input.cpp

@@ -145 +145 @@
     bool isUnstructuredGrid = SuperClassWriter::isUnstructured(fieldId);
     std::map<StdString, StdSize> dimSizeMap = SuperClassWriter::getDimensions(&fieldId);
+    std::list<StdString> dimList = SuperClassWriter::getDimensionsList(&fieldId);
+    
     realGridDim = SuperClassWriter::isTemporal(fieldId) ? dimSizeMap.size() - 1 : dimSizeMap.size();
     if (isUnstructuredGrid) ++realGridDim;
@@ -154 +156 @@
 
     // Remove unlimited dimension from the map, we dont need it anymore
-    if (SuperClassWriter::isTemporal(fieldId)) dimSizeMap.erase(SuperClassWriter::getUnlimitedDimensionName());
+    if (SuperClassWriter::isTemporal(fieldId)) 
+    {
+      dimSizeMap.erase(SuperClassWriter::getUnlimitedDimensionName());
+      dimList.pop_front() ;  // assume time dimension is first
+    }
+    
     int mapSize = dimSizeMap.size() - 1;
     std::list<std::pair<StdString, StdSize> > listDimSize;
+/*
     for (std::map<StdString, StdSize>::const_iterator itMap = dimSizeMap.begin(); itMap != dimSizeMap.end(); ++itMap)
       listDimSize.push_front(*itMap);
+*/
+    for (std::list<StdString>::const_iterator it = dimList.begin(); it != dimList.end(); ++it)
+      listDimSize.push_front(*dimSizeMap.find(*it));
 
     // Now process domain and axis
@@ -274 +285 @@
     else if (this->isUnstructured(fieldId))
     {
+      /*
       if (domain->i_index.isEmpty())
          ERROR("CNc4DataInput::readDomainAttributeValueFromFile(...)",
@@ -279 +291 @@
               << "Trying to read attributes from unstructured grid."
               << "i_index of domain" << domain->getId() << " is mandatory");
-
+      
       int ni = domain->i_index.numElements();
+*/
+      int ni     = domain->ni;
+      int ibegin = domain->ibegin;
+      if (domain->i_index.isEmpty())
+      {
+        domain->i_index.resize(ni) ;
+        for(int idx = 0; idx < ni; ++idx) domain->i_index(idx)=ibegin+idx ;
+      }
+      
       std::vector<StdSize> nBeginLatLon(1,0), nSizeLatLon(1,0);
       nSizeLatLon[0]  = domain->ni_glo.getValue();