Changeset 1855 for XIOS/branchs/xios-2.5/src/io/nc4_data_input.cpp

Timestamp:

01/30/20 16:22:52 (4 years ago)

Author:

ymipsl

Message:

Import bug fix correction from trunk at rev 1578 :

Bug fix when reading rectilinear and attemp to call generate_rectilinear_domain filter. Coordinates in file was not taking into account.

and 1582 : Missing file for rev. 1578

YM

File:

• XIOS/branchs/xios-2.5/src/io/nc4_data_input.cpp (modified) (1 diff)

XIOS/branchs/xios-2.5/src/io/nc4_data_input.cpp

@@ -517 +517 @@
       domain->ni_glo.setValue(itMapNi->second);
     }
+    // determine if coordinates values are present in file
+    if ((CDomain::type_attr::rectilinear == domain->type))
+    {
+      // Ok, try to read some attributes such as longitude and latitude
+      domain->hasLatInReadFile_ = SuperClassWriter::hasVariable(itMapNj->first);
+      domain->hasLonInReadFile_  = SuperClassWriter::hasVariable(itMapNi->first);
+    }
+    else if ((CDomain::type_attr::curvilinear == domain->type) || (CDomain::type_attr::unstructured == domain->type) )
+    {
+      StdString latName = this->getLatCoordName(fieldId);
+      domain->hasLatInReadFile_ = SuperClassWriter::hasVariable(latName) ;
+      StdString lonName = this->getLonCoordName(fieldId);       
+      domain->hasLonInReadFile_ = SuperClassWriter::hasVariable(lonName) ; 
+      StdString boundsLatName = this->getBoundsId(latName);
+      domain->hasBoundsLatInReadFile_ = SuperClassWriter::hasVariable(boundsLatName) ; 
+      StdString boundsLonName = this->getBoundsId(lonName);
+      domain->hasBoundsLonInReadFile_ = SuperClassWriter::hasVariable(boundsLonName) ;
+    }
   }