Changeset 1927 for XIOS

Timestamp:

09/07/20 16:40:49 (4 years ago)

Author:

ymipsl

Message:

Bug fix : Grid elements (domain axis, scalar) was not sent to server in the same order as it was defined in client side.

YM

Location:

XIOS/trunk/src/node

Files:

• context.cpp (modified) (1 diff)
• grid.cpp (modified) (1 diff)
• grid.hpp (modified) (1 diff)

XIOS/trunk/src/node/context.cpp

@@ -1884 +1884 @@
      {
        gridPtr->sendCreateChild(*it);
-       CGrid::get(*it)->sendAllAttributesToServer();
-       CGrid::get(*it)->sendAllDomains();
-       CGrid::get(*it)->sendAllAxis();
-       CGrid::get(*it)->sendAllScalars();
+       CGrid::get(*it)->sendGrid() ;
      }
    }

XIOS/trunk/src/node/grid.cpp

@@ -2649 +2649 @@
 
   /*!
-    Send all attributes of domains from client to server
+    Send all attributes of grid and all domain, axis, scalar from client to server
   */
-  void CGrid::sendAllDomains()
-  TRY
-  {
-    std::vector<CDomain*> domList = this->getVirtualDomainGroup()->getAllChildren();
-    int dSize = domList.size();
-    for (int i = 0; i < dSize; ++i)
-    {
-      sendAddDomain(domList[i]->getId());
-      domList[i]->sendAllAttributesToServer();
-    }
-  }
-  CATCH_DUMP_ATTR
-
-  /*!
-    Send all attributes of axis from client to server
-  */
-  void CGrid::sendAllAxis()
-  TRY
-  {
-    std::vector<CAxis*> aList = this->getVirtualAxisGroup()->getAllChildren();
-    int aSize = aList.size();
-
-    for (int i = 0; i < aSize; ++i)
-    {
-      sendAddAxis(aList[i]->getId());
-      aList[i]->sendAllAttributesToServer();
-    }
-  }
-  CATCH_DUMP_ATTR
-
-  /*!
-    Send all attributes of scalars from client to server
-  */
-  void CGrid::sendAllScalars()
-  TRY
-  {
-    std::vector<CScalar*> sList = this->getVirtualScalarGroup()->getAllChildren();
-    int sSize = sList.size();
-
-    for (int i = 0; i < sSize; ++i)
-    {
-      sendAddScalar(sList[i]->getId());
-      sList[i]->sendAllAttributesToServer();
+
+  void CGrid::sendGrid(void)
+  TRY
+  {
+    this->sendAllAttributesToServer();
+    auto domainList=getDomains() ;
+    auto axisList=getAxis() ;
+    auto scalarList=getScalars() ;
+    int domainIdx = 0, axisIdx = 0, scalarIdx = 0;
+    
+    for (int idx = 0; idx < axis_domain_order.numElements(); ++idx)
+    {
+      if (2 == axis_domain_order(idx)) // This is domain
+      {
+        sendAddDomain(domainList[domainIdx]->getId()) ;
+        domainList[domainIdx]->sendAllAttributesToServer();
+        domainIdx++ ;
+      }
+      else if (1 == axis_domain_order(idx))  // This is axis
+      {
+        sendAddAxis(axisList[axisIdx]->getId()) ;
+        axisList[axisIdx]->sendAllAttributesToServer();
+        axisIdx++ ;
+      }
+      else  // Of course, this is scalar
+      {
+        sendAddScalar(scalarList[scalarIdx]->getId()) ;
+        scalarList[scalarIdx]->sendAllAttributesToServer();
+        scalarIdx++ ;
+      }
     }
   }

XIOS/trunk/src/node/grid.hpp

@@ -147 +147 @@
          void sendAddAxis(const std::string& id="");
          void sendAddScalar(const std::string& id="");
-         void sendAllDomains();
-         void sendAllAxis();
-         void sendAllScalars();
+         void sendGrid(void) ;
 
          static void recvAddDomain(CEventServer& event);