Changeset 921

Timestamp:

08/12/16 19:58:00 (8 years ago)

Author:

mhnguyen

Message:

Ticket 101: Wrong field name in timeseries mode

+) Change the way to return outputName

Test
+) On Curie
+) Correct

File:

• XIOS/trunk/src/declare_ref_func.hpp (modified) (2 diffs)

XIOS/trunk/src/declare_ref_func.hpp

@@ -23 +23 @@
 private:                                                               \
   std::vector<C##type*> refObjects;                                    \
+  StdString outputName_;
 
 // Definitions
@@ -88 +89 @@
 {                                                                      \
   if (!this->name.isEmpty())                                           \
-    return this->name;                                                 \
-  else if (hasAutoGeneratedId() && hasDirect##type##Reference())       \
-    return this->name_##_ref;                                          \
+    return this->name;                                                 \    
+  else if (hasDirect##type##Reference())                               \
+  {                                                                    \
+    const C##type* refer_ptr = this, *tmp_ptr;                         \
+    StdString nameRef = this->name_##_ref;                             \
+    while (refer_ptr->hasAutoGeneratedId() &&                          \
+          (C##type::has(nameRef)))                                     \             
+    {                                                                  \                                                            
+      tmp_ptr = refer_ptr;                                             \
+      refer_ptr = tmp_ptr->getDirect##type##Reference();               \
+      nameRef = (refer_ptr->hasDirect##type##Reference())              \
+                 ? refer_ptr->name_##_ref : nameRef;                   \
+    }                                                                  \    
+    return refer_ptr->name_##_ref;                                     \
+  }                                                                    \
   else                                                                 \
     return getId();                                                    \