Changeset 1875 for XIOS/dev/dev_ym/XIOS_COUPLING/src/object_template_impl.hpp

Timestamp:

05/12/20 11:52:13 (4 years ago)

Author:

ymipsl

Message:

XIOS coupling branch
Some updates.

First coupling test is beginning to work...

YM

File:

• XIOS/dev/dev_ym/XIOS_COUPLING/src/object_template_impl.hpp (modified) (7 diffs)

XIOS/dev/dev_ym/XIOS_COUPLING/src/object_template_impl.hpp

@@ -216 +216 @@
 
    template<typename T>
-   void CObjectTemplate<T>::sendAllAttributesToServer(CContextClient* client)
+   void CObjectTemplate<T>::sendAllAttributesToServer(CContextClient* client, const string& objectId)
    {
      CAttributeMap& attrMap = *this;
@@ -222 +222 @@
      for (; it != itE; ++it)
      {
-       if (it->second->doSend() && !(it->second)->isEmpty()) sendAttributToServer(*(it->second), client);
+       if (it->second->doSend() && !(it->second)->isEmpty()) sendAttributToServer(*(it->second), client, objectId);
      }
    }
 
    template <class T>
-   void CObjectTemplate<T>::sendAttributToServer(const string& id, CContextClient* client)
+   void CObjectTemplate<T>::sendAttributToServer(const string& id, CContextClient* client, const string& objectId )
    {
       CAttributeMap & attrMap = *this;
@@ -235 +235 @@
 
   template <class T>
-  void CObjectTemplate<T>::sendAttributToServer(CAttribute& attr, CContextClient* client)
+  void CObjectTemplate<T>::sendAttributToServer(CAttribute& attr, CContextClient* client, const string& objectId)
   {
     CEventClient event(getType(),EVENT_ID_SEND_ATTRIBUTE);
@@ -241 +241 @@
     {
       CMessage msg;
-      msg<<this->getId(); 
+      if (objectId.empty()) msg << this->getId();
+      else msg << objectId;
       msg << attr.getName();
       msg << attr;
@@ -254 +255 @@
 /* specialisation for context, because context Id on client is not the same on server, and no need to transfer context Id */
   template <>
-  void CObjectTemplate<CContext>::sendAttributToServer(CAttribute& attr, CContextClient* client)
+  void CObjectTemplate<CContext>::sendAttributToServer(CAttribute& attr, CContextClient* client, const string& objectId)
   {
     CEventClient event(getType(),EVENT_ID_SEND_ATTRIBUTE);
@@ -278 +279 @@
 
   template<class T>
-  void CObjectTemplate<T>::sendAddItem(const StdString& id, int itemType, CContextClient* client)
+  void CObjectTemplate<T>::sendAddItem(const StdString& id, int itemType, CContextClient* client, const string& objectId)
   {
     typedef typename T::EEventId ItemType;
@@ -285 +286 @@
      {
        CMessage msg;
-       msg << this->getId();
+       if (objectId.empty()) msg << this->getId();
+       else msg << objectId;
        msg << id;
        const std::list<int>& ranks = client->getRanksServerLeader();