Changeset 1361 for XIOS/dev

Timestamp:

12/06/17 14:05:12 (6 years ago)

Author:

ymipsl

Message:

Fix : when making a reference to an object and when attribut "name" is empty, the name was automatically set using référence name or id, even if the objcet has a defined id. Now take name first , then take id and after that look at the referenced object.

Side effect may be expected....

YM

File:

• XIOS/dev/XIOS_DEV_CMIP6/src/declare_ref_func.hpp (modified) (1 diff)

XIOS/dev/XIOS_DEV_CMIP6/src/declare_ref_func.hpp

@@ -90 +90 @@
 }                                                                      \
                                                                        \
-const StdString C##type::get##type##OutputName(void) const            \
+const StdString C##type::get##type##OutputName(void) const             \
 {                                                                      \
-  if (!this->name.isEmpty())                                           \
-    return this->name;                                                 \
-  else if (hasDirect##type##Reference())                               \
+  if (!this->name.isEmpty())  return this->name;                       \
+  else if (this->hasAutoGeneratedId() && hasDirect##type##Reference()) \
   {                                                                    \
     const C##type* refer_ptr = this, *tmp_ptr;                         \