Changeset 1430 for XIOS/dev/XIOS_DEV_CMIP6/src/io/nc4_data_input.cpp

Timestamp:

02/16/18 16:32:08 (6 years ago)

Author:

oabramkina

Message:

Adding new grid-related attributes.

File:

• XIOS/dev/XIOS_DEV_CMIP6/src/io/nc4_data_input.cpp (modified) (1 diff)

XIOS/dev/XIOS_DEV_CMIP6/src/io/nc4_data_input.cpp

@@ -185 +185 @@
 */
     for (std::list<StdString>::const_iterator it = dimList.begin(); it != dimList.end(); ++it)
-      listDimSize.push_front(*dimSizeMap.find(*it));
+    {
+      // It is not required any more for dimension name and lon/lat names to be the same (aka lon(lon))
+      if (SuperClassWriter::isRectilinear(fieldId))
+      {
+        StdString lonName =   SuperClassWriter::getLonCoordName(fieldId);
+        StdString latName =   SuperClassWriter::getLatCoordName(fieldId);
+        StdString dimLonName = SuperClassWriter::getDimensions(&lonName).begin()->first;
+        StdString dimLatName = SuperClassWriter::getDimensions(&latName).begin()->first;
+        if ((lonName != dimLonName) && (*it == dimLonName))
+        {
+          StdSize dimSizeTmp = dimSizeMap.find(*it)->second;
+          listDimSize.push_front(make_pair(lonName, dimSizeTmp));
+        }
+        else if ((latName != dimLatName) && (*it == dimLatName))
+        {
+          StdSize dimSizeTmp = dimSizeMap.find(*it)->second;
+          listDimSize.push_front(make_pair(latName, dimSizeTmp));
+        }
+        else
+          listDimSize.push_front(*dimSizeMap.find(*it));
+      }
+      else
+        listDimSize.push_front(*dimSizeMap.find(*it));
+
+    }
 
     // Now process domain and axis