Changeset 1482 for XIOS/dev/branch_openmp/src/io

Timestamp:

04/13/18 16:25:46 (6 years ago)

Author:

yushan

Message:

Branch EP merged with Dev_cmip6 @r1481

File:

• XIOS/dev/branch_openmp/src/io/nc4_data_input.cpp (modified) (3 diffs)

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

@@ -189 +189 @@
 */
 
-    if (!SuperClassWriter::isRectilinear(fieldId))
+    //if (!SuperClassWriter::isRectilinear(fieldId))
+    if (true)
     {
       for (std::list<StdString>::const_iterator it = dimList.begin(); it != dimList.end(); ++it)
@@ -471 +472 @@
     itMapNj = itMapNi; ++itMapNj;
 
-    if (this->isRectilinear(fieldId) || this->isCurvilinear(fieldId))
+    if (CDomain::type_attr::rectilinear == domain->type || CDomain::type_attr::curvilinear == domain->type ||
+        this->isRectilinear(fieldId) || this->isCurvilinear(fieldId))
     {
       if (!domain->nj_glo.isEmpty() && (domain->nj_glo != itMapNj->second))
@@ -495 +497 @@
       domain->ni_glo.setValue(itMapNi->second);
     }
-    else if (this->isUnstructured(fieldId))
+    else if (CDomain::type_attr::unstructured == domain->type|| this->isUnstructured(fieldId))
     {
       domain->nj_glo.setValue(1);