Changeset 996 for XIOS/trunk/src/node/file.cpp

Timestamp:

11/18/16 15:04:43 (7 years ago)

Author:

mhnguyen

Message:

Some modifications to make sure there is no strange _undefined_id_ name appearing in netcdf file

+) Improve the algo to search for correct name
+) Some minor changes in code

Test
+) On Curie
+) Names are correct as they should be.

File:

• XIOS/trunk/src/node/file.cpp (modified) (2 diffs)

XIOS/trunk/src/node/file.cpp

@@ -235 +235 @@
       const int recordOffset = record_offset.isEmpty() ? 0 : record_offset;
 
-      set<CAxis*> setAxis;
-      set<CDomain*> setDomains;
-
+      // set<CAxis*> setAxis;
+      // set<CDomain*> setDomains;
+      set<StdString> setAxis;
+      set<StdString> setDomains;
+      
       std::vector<CField*>::iterator it, end = this->enabledFields.end();
       for (it = this->enabledFields.begin(); it != end; it++)
@@ -245 +247 @@
          std::vector<CAxis*> vecAxis = field->grid->getAxis();
          for (size_t i = 0; i < vecAxis.size(); ++i)
-            setAxis.insert(vecAxis[i]);
+            setAxis.insert(vecAxis[i]->getAxisOutputName());
+            // setAxis.insert(vecAxis[i]);
          std::vector<CDomain*> vecDomains = field->grid->getDomains();
          for (size_t i = 0; i < vecDomains.size(); ++i)
-            setDomains.insert(vecDomains[i]);
+            setDomains.insert(vecDomains[i]->getDomainOutputName());
+            // setDomains.insert(vecDomains[i]);
 
          field->resetNStep(recordOffset);