Changeset 1009 for XIOS/dev/dev_olga/src/declare_ref_func.hpp

Timestamp:

12/05/16 17:47:54 (7 years ago)

Author:

oabramkina

Message:

First working version with compression by secondary servers.

File:

• XIOS/dev/dev_olga/src/declare_ref_func.hpp (modified) (3 diffs)

XIOS/dev/dev_olga/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());                \
 }                                                                      \
                                                                        \
@@ -95 +97 @@
     const C##type* refer_ptr = this, *tmp_ptr;                         \
     StdString nameRef = this->name_##_ref;                             \
-    std::set<const C##type*> tmpRefObjects;                                  \
+    std::set<const C##type*> tmpRefObjects;                            \
     while (refer_ptr->hasAutoGeneratedId() &&                          \
           (C##type::has(nameRef)))                                     \
@@ -102 +104 @@
       tmp_ptr = refer_ptr;                                             \
       refer_ptr = tmp_ptr->getDirect##type##Reference();               \
-      if (refer_ptr->hasDirect##type##Reference())                     \
-        nameRef = refer_ptr->name_##_ref;                              \
-      if (tmpRefObjects.end() != tmpRefObjects.find(refer_ptr))        \
-      {                                                                \
+      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))        \
+       {                                                                \
         ERROR("const StdString& C" #type "::get" #type "OutputName(void) const ",      \
-              << "Circular dependency stopped for " #name_ " object "  \
-              << "with id = \"" << refer_ptr->getId() << "\".");       \
-      }                                                                \
+               << "Circular dependency stopped for " #name_ " object "  \
+               << "with id = \"" << refer_ptr->getId() << "\".");       \
+       }                                                               \
     }                                                                  \
     return nameRef;                                                    \