Changeset 996 for XIOS/trunk/src/declare_ref_func.hpp

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/declare_ref_func.hpp (modified) (2 diffs)

XIOS/trunk/src/declare_ref_func.hpp

@@ -51 +51 @@
     SuperClassAttribute::setAttributes(refer_ptr, apply);              \
   }                                                                    \
+  if (this->hasAttribute("name") && this->name.isEmpty()) \
+    this->name.setValue(this->get##type##OutputName());                \
 }                                                                      \
                                                                        \
@@ -102 +104 @@
       tmp_ptr = refer_ptr;                                             \
       refer_ptr = tmp_ptr->getDirect##type##Reference();               \
-      if (refer_ptr->hasDirect##type##Reference())                     \
+      if (refer_ptr->hasAutoGeneratedId() &&                           \
+          refer_ptr->hasDirect##type##Reference())                     \
         nameRef = refer_ptr->name_##_ref;                              \
+      else {                                                           \
+        nameRef = refer_ptr->getId(); break;                           \
+      }                                                                \
       if (tmpRefObjects.end() != tmpRefObjects.find(refer_ptr))        \
       {                                                                \