Changeset 1479

Timestamp:

04/13/18 09:34:16 (7 years ago)

Author:

ymipsl

Message:

Fix : when reading domain from a file, if the type of domain is given, it will be used instead guessing the type from metadata in the file.

YM

File:

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

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

@@ -185 +185 @@
 */
 
-    if (!SuperClassWriter::isRectilinear(fieldId))
+//    if (!SuperClassWriter::isRectilinear(fieldId))
+    if (true)
     {
       for (std::list<StdString>::const_iterator it = dimList.begin(); it != dimList.end(); ++it)
@@ -467 +468 @@
     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))
@@ -491 +493 @@
       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);