Changeset 1462

Timestamp:

03/22/18 17:28:11 (6 years ago)

Author:

yushan

Message:

restore CINetCDF4::isRectilinear

File:

• XIOS/dev/branch_openmp/src/io/inetcdf4.cpp (modified) (2 diffs)

XIOS/dev/branch_openmp/src/io/inetcdf4.cpp

@@ -494 +494 @@
   }
 
+
   bool CINetCDF4::isRectilinear(const StdString& name, const CVarPath* const path)
+  {
+    std::list<StdString> varCoords = this->getCoordinatesIdList(name, path);
+    std::list<StdString>::const_iterator it = varCoords.begin(), end = varCoords.end();
+    for (; it != end; it++)
+    {
+      const StdString& coord = *it;
+      if (this->hasVariable(coord, path) && !this->isTemporal(coord, path))
+      {
+        std::map<StdString, StdSize> dimvar = this->getDimensions(&coord, path);
+        if ((dimvar.size() == 1) && (dimvar.find(coord) != dimvar.end()))
+          continue;
+        else
+          return false;
+      }
+    }
+    return true;
+  }
+
+/*
+  bool CINetCDF4::isRectilinear_1459(const StdString& name, const CVarPath* const path)
   {
     std::list<StdString> varCoords = this->getCoordinatesIdList(name, path);
@@ -536 +557 @@
     return (varDims1D.size() == 2);
   }
+*/
 
   bool CINetCDF4::isCurvilinear(const StdString& name, const CVarPath* const path)