Changeset 1875 for XIOS/dev/dev_ym/XIOS_COUPLING/src/node/axis.cpp

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/node/axis.cpp (modified) (10 diffs)

XIOS/dev/dev_ym/XIOS_COUPLING/src/node/axis.cpp

@@ -575 +575 @@
    }
 
+   void CAxis::sendAxisToCouplerOut(CContextClient* client, const std::vector<int>& globalDim, int orderPositionInGrid, const string& fieldId, int posInGrid)
+   {
+     if (sendAxisToFileServer_done_.count(client)!=0) return ;
+     else sendAxisToFileServer_done_.insert(client) ;
+     
+     string axisId="_axis["+std::to_string(posInGrid)+"]_of_"+fieldId ;
+
+     if (!axis_ref.isEmpty())
+    {
+      auto axis_ref_tmp=axis_ref.getValue() ;
+      axis_ref.reset() ; // remove the reference, find an other way to do that more cleanly
+      this->sendAllAttributesToServer(client, axisId)  ; 
+      axis_ref = axis_ref_tmp ;
+    }
+    else this->sendAllAttributesToServer(client, axisId)  ; 
+  
+    this->sendAttributes(client, globalDim, orderPositionInGrid, CServerDistributionDescription::BAND_DISTRIBUTION, axisId) ;
+   }
+
+  void CAxis::makeAliasForCoupling(const string& fieldId, int posInGrid)
+  {
+    const string axisId = "_axis["+std::to_string(posInGrid)+"]_of_"+fieldId ;
+    this->createAlias(axisId) ;
+  }
+
   /*!
     Send attributes from one client to other clients
@@ -581 +606 @@
   */
   void CAxis::sendAttributes(CContextClient* client, const std::vector<int>& globalDim, int orderPositionInGrid,
-                             CServerDistributionDescription::ServerDistributionType distType)
-  TRY
-  {
-     sendDistributionAttribute(client, globalDim, orderPositionInGrid, distType);
+                             CServerDistributionDescription::ServerDistributionType distType, const string& axisId)
+  TRY
+  {
+     sendDistributionAttribute(client, globalDim, orderPositionInGrid, distType, axisId);
 
      // if (index.numElements() == n_glo.getValue())
@@ -590 +615 @@
          || (index.numElements() != n_glo))
      {
-       sendDistributedAttributes(client);       
+       sendDistributedAttributes(client, axisId);       
      }
      else
      {
-       sendNonDistributedAttributes(client);    
+       sendNonDistributedAttributes(client, axisId);    
      }     
   }
@@ -889 +914 @@
   */
   void CAxis::sendDistributionAttribute(CContextClient* client, const std::vector<int>& globalDim, int orderPositionInGrid,
-                                        CServerDistributionDescription::ServerDistributionType distType)
-  TRY
-  {
+                                        CServerDistributionDescription::ServerDistributionType distType, const string& axisId)
+  TRY
+  {
+    string serverAxisId = axisId.empty() ? this->getId() : axisId ; 
     int nbServer = client->serverSize;
 
@@ -914 +940 @@
         msgs.push_back(CMessage());
         CMessage& msg = msgs.back();
-        msg << this->getId();
+        msg << serverAxisId;
         msg << ni << begin;
         msg << isCompressible_;                    
@@ -962 +988 @@
     In the future, if new attributes are added, they should also be processed in this function
   */
-  void CAxis::sendNonDistributedAttributes(CContextClient* client)
-  TRY
-  {
+  void CAxis::sendNonDistributedAttributes(CContextClient* client, const string& axisId)
+  TRY
+  {
+    string serverAxisId = axisId.empty() ? this->getId() : axisId ; 
+
     CEventClient event(getType(), EVENT_ID_NON_DISTRIBUTED_ATTRIBUTES);
     size_t nbIndex = index.numElements();
@@ -996 +1024 @@
         msgs.push_back(CMessage());
         CMessage& msg = msgs.back();
-        msg << this->getId();
+        msg << serverAxisId;
         msg << index.getValue() << dataIndex << mask.getValue();
         msg << hasValue;
@@ -1087 +1115 @@
     In future, if new attributes are added, they should also be processed in this function
   */
-  void CAxis::sendDistributedAttributes(CContextClient* client)
-  TRY
-  {
+  void CAxis::sendDistributedAttributes(CContextClient* client, const string& axisId)
+  TRY
+  {
+    string serverAxisId = axisId.empty() ? this->getId() : axisId ; 
+    
     int ind, idx;
     int nbServer = client->serverSize;
@@ -1166 +1196 @@
 
       listData.push_back(CMessage());
-      listData.back() << this->getId()
+      listData.back() << serverAxisId
                       << list_indi.back() << list_dataInd.back();
 
@@ -1431 +1461 @@
   CATCH_DUMP_ATTR
 
-/*!
-  \brief Check if a axis is completed
-  Before make any axis processing, we must be sure that all axis informations have
-  been sent, for exemple when reading a grid in a file or when grid elements are sent by an
-  other context (coupling). So all direct reference of the axis (axis_ref) must be also completed
-  \return true if axis and axis reference are completed
-  */
-  bool CAxis::checkIfCompleted(void)
-  {
-    if (hasDirectAxisReference()) if (!getDirectAxisReference()->checkIfCompleted()) return false;
-    return isCompleted_ ;
-  }
-
-  /*!
-  \brief Set a axis as completed
-   When all information about a axis have been received, the axis is tagged as completed and is
-   suitable for processing
-  */
-  void CAxis::setCompleted(void)
-  {
-    if (hasDirectAxisReference()) getDirectAxisReference()->setCompleted() ;
-    isCompleted_=true ;
-  }
-
-  /*!
-  \brief Set a axis as uncompleted
-   When informations about a axis are expected from a grid reading from file or coupling, the axis is 
-   tagged as uncompleted and is not suitable for processing
-  */
-  void CAxis::setUncompleted(void)
-  {
-    if (hasDirectAxisReference()) getDirectAxisReference()->setUncompleted() ;
-    isCompleted_=false ;
-  }
-
-
-
   /*!
    * Go through the hierarchy to find the axis from which the transformations must be inherited