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

Timestamp:

01/07/20 18:53:52 (4 years ago)

Author:

ymipsl

Message:

Supress unusefull idServer context variable that create some trouble when sending context attribute to server.

YM

File:

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

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

@@ -205 +205 @@
        {
          // Account for extra header info
-         minimumSize += CEventClient::headerSize + getIdServer().size() + sizeof(size_t);
+         minimumSize += CEventClient::headerSize + getId().size() + sizeof(size_t);
 
          const std::list<int>& ranks = client->getRanksServerLeader();
@@ -241 +241 @@
     {
       CMessage msg;
-      msg<<this->getIdServer(); // pb with context attribute -> to check : for now seem to be never used for context...
+      msg<<this->getId(); 
+      msg << attr.getName();
+      msg << attr;
+      const std::list<int>& ranks = client->getRanksServerLeader();
+      for (std::list<int>::const_iterator itRank = ranks.begin(), itRankEnd = ranks.end(); itRank != itRankEnd; ++itRank)
+        event.push(*itRank,1,msg);
+      client->sendEvent(event);
+    }
+    else client->sendEvent(event);
+  }
+
+/* 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)
+  {
+    CEventClient event(getType(),EVENT_ID_SEND_ATTRIBUTE);
+    if (client->isServerLeader())
+    {
+      CMessage msg;
       msg << attr.getName();
       msg << attr;
@@ -296 +314 @@
   }
 
+/* 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>::recvAttributFromClient(CEventServer& event)
+  {
+
+    CBufferIn* buffer=event.subEvents.begin()->buffer;
+    string attrId;
+    CAttributeMap & attrMap = *CContext::getCurrent();
+    *buffer>>attrId;
+    CAttribute* attr=attrMap[attrId];
+    info(50) << "attribut recu " << attrId << "  ";
+    if (attr->isEmpty()) info(50) << "--> empty" << endl;
+    else info(50) /*<attr->getValue()*/ << endl;
+    *buffer>>*attr;
+     info(50) << "attribut recu " << attrId << "  ";
+    if (attr->isEmpty()) info(50) << "--> empty" << endl;
+    else info(50) /*attr->getValue()*/ << endl;
+  }
+
+
    template <class T>
    bool CObjectTemplate<T>::dispatchEvent(CEventServer& event)