Changeset 1956 for XIOS/dev/dev_ym/XIOS_COUPLING/src/node/domain.cpp

Timestamp:

10/08/20 13:10:29 (4 years ago)

Author:

ymipsl

Message:

Xios coupling

• fix problem when sending grid mask from client to server

• remove methods about grid compression, which will be managed in other ways

YM

File:

• XIOS/dev/dev_ym/XIOS_COUPLING/src/node/domain.cpp (modified) (7 diffs)

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

@@ -246 +246 @@
 
    /*!
-    * Test whether the data defined on the domain can be outputted in a compressed way.
-    *
-    * \return true if and only if a mask was defined for this domain
+    * Compute if the domain can be ouput in a compressed way.
+    * In this case the workflow view on server side must be the same
+    * than the full view for all context rank. The result is stored on
+    * internal isCompressible_ attribute.
     */
-   bool CDomain::isCompressible(void) const
-   TRY
-   {
-      return isCompressible_;
+   void CDomain::computeIsCompressible(void)
+   TRY
+   {
+     // mesh is compressible contains some masked or indexed value, ie if full view is different of workflow view.
+     // But now assume that the size of the 2 view must be equal for everybody. True on server side
+     int isSameView = getLocalView(CElementView::FULL)->getSize() ==  getLocalView(CElementView::WORKFLOW)->getSize();
+     MPI_Allreduce(MPI_IN_PLACE, &isSameView, 1, MPI_INT, MPI_LAND, CContext::getCurrent()->getIntraComm()) ;
+     if (isSameView) isCompressible_ = false ;
+     else isCompressible_ = true ;
+     isCompressibleComputed_=true ;
    }
    CATCH
@@ -1307 +1314 @@
    CATCH_DUMP_ATTR
 
-   void CDomain::checkEligibilityForCompressedOutput(void)
-   TRY
-   {
-     // We don't check if the mask or the indexes are valid here, just if they have been defined at this point.
-     isCompressible_ = !mask_1d.isEmpty() || !mask_2d.isEmpty() || !data_i_index.isEmpty();
-   }
-   CATCH_DUMP_ATTR
 
    //----------------------------------------------------------------
@@ -2295 +2295 @@
  
 
-  void CDomain::distributeToServer(CContextClient* client, map<int, CArray<size_t,1>>& globalIndex, const string& domainId)
+  void CDomain::distributeToServer(CContextClient* client, map<int, CArray<size_t,1>>& globalIndex,
+                                   CScattererConnector* &scattererConnector, const string& domainId)
   TRY
   {
@@ -2305 +2306 @@
     CDistributedElement scatteredElement(ni_glo*nj_glo, globalIndex) ;
     scatteredElement.addFullView() ;
-    CScattererConnector scattererConnector(localElement_->getView(CElementView::FULL), scatteredElement.getView(CElementView::FULL), 
+    scattererConnector = new CScattererConnector(localElement_->getView(CElementView::FULL), scatteredElement.getView(CElementView::FULL), 
                                            context->getIntraComm(), client->getRemoteSize()) ;
-    scattererConnector.computeConnector() ;
+    scattererConnector->computeConnector() ;
 
     // phase 0
@@ -2321 +2322 @@
     CMessage message1 ;
     message1<<serverDomainId<<1<<localElement_->getView(CElementView::FULL)->getGlobalSize() ; 
-    scattererConnector.transfer(localElement_->getView(CElementView::FULL)->getGlobalIndex(),client,event1,message1) ;
+    scattererConnector->transfer(localElement_->getView(CElementView::FULL)->getGlobalIndex(),client,event1,message1) ;
     
-    sendDistributedAttributes(client, scattererConnector, domainId) ;
+    sendDistributedAttributes(client, *scattererConnector, domainId) ;
 
   
@@ -2338 +2339 @@
     map<int,CArray<size_t,1>> workflowGlobalIndex ;
     map<int,CArray<bool,1>> maskOut2 ; 
-    scattererConnector.transfer(maskOut, maskOut2, false) ;
+    scattererConnector->transfer(maskOut, maskOut2, false) ;
     scatteredElement.addView(CElementView::WORKFLOW, maskOut2) ;
     scatteredElement.getView(CElementView::WORKFLOW)->getGlobalIndexView(workflowGlobalIndex) ;
@@ -2407 +2408 @@
     else if (phasis==2)
     {
-      delete gathererConnector_ ;
+//      delete gathererConnector_ ;
       elementFrom_ = new  CDistributedElement(event) ;
       elementFrom_->addFullView() ;
-      gathererConnector_ =  new CGathererConnector(elementFrom_->getView(CElementView::FULL), localElement_->getView(CElementView::FULL)) ;
-      gathererConnector_ -> computeConnector() ;
+//      gathererConnector_ =  new CGathererConnector(elementFrom_->getView(CElementView::FULL), localElement_->getView(CElementView::FULL)) ;
+//      gathererConnector_ -> computeConnector() ;
     }
   }