Changeset 1938 for XIOS/dev/dev_ym/XIOS_COUPLING/src/node

Timestamp:

09/22/20 16:28:47 (4 years ago)

Author:

ymipsl

Message:

XIOS Coupling branch : Solve spurious situation :

• when client have no data on their local grid or local grid is 0 sized
• when sever have no data on their local grid or local grid is 0 sized
• holes in grid (missing global point) that cover a full client or a full server

YM

Location:

XIOS/dev/dev_ym/XIOS_COUPLING/src/node

Files:

• axis.cpp (modified) (1 diff)
• domain.cpp (modified) (6 diffs)
• grid.cpp (modified) (2 diffs)

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

@@ -1840 +1840 @@
       gathererConnector_->transfer(event, 2, value, 0.); 
       bounds.resize(2,n) ;
-      bounds=CArray<double,2>(bounds.dataFirst(),shape(2,n),neverDeleteData) ; 
+      if (bounds.numElements() > 0 ) bounds=CArray<double,2>(bounds.dataFirst(),shape(2,n),neverDeleteData) ; 
     }
     else if (type=="label")

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

@@ -2275 +2275 @@
         for(int rank : ranks) vectGlobalIndex[rank].push_back(index) ;
       }
-      for(auto& vect : vectGlobalIndex ) globalIndex.emplace(vect.first, CArray<size_t,1>(vect.second.data(), shape(vect.second.size()),duplicateData)) ; 
+      for(auto& vect : vectGlobalIndex ) globalIndex.emplace(vect.first, CArray<size_t,1>(vect.second.data(), shape(vect.second.size()),duplicateData)) ;
+    // some servers receves no index (zeroIndex array) => root process take them into account.
+      if (context->getIntraCommRank()==0) 
+        for(auto& rank : zeroIndex) globalIndex[rank] = CArray<size_t,1>() ; 
     }
     else if (type==EDistributionType::NONE) // domain is not distributed ie all servers get the same local domain
@@ -2500 +2503 @@
       gathererConnector_->transfer(event, value, 0.); 
       lonvalue_2d.resize(ni,nj) ;
-      lonvalue_2d=CArray<double,2>(value.dataFirst(),shape(ni,nj),neverDeleteData) ; 
+      if (lonvalue_2d.numElements()>0) lonvalue_2d=CArray<double,2>(value.dataFirst(),shape(ni,nj),neverDeleteData) ; 
     }
     else if (type=="lat")
@@ -2507 +2510 @@
       gathererConnector_->transfer(event, value, 0.); 
       latvalue_2d.resize(ni,nj) ;
-      latvalue_2d=CArray<double,2>(value.dataFirst(),shape(ni,nj),neverDeleteData) ; 
+      if (latvalue_2d.numElements()>0) latvalue_2d=CArray<double,2>(value.dataFirst(),shape(ni,nj),neverDeleteData) ; 
     }
     else if (type=="boundslon")
@@ -2514 +2517 @@
       gathererConnector_->transfer(event, nvertex, value, 0.); 
       bounds_lon_2d.resize(nvertex,ni,nj) ;
-      bounds_lon_2d=CArray<double,3>(value.dataFirst(),shape(nvertex,ni,nj),neverDeleteData) ; 
+      if (bounds_lon_2d.numElements()>0) bounds_lon_2d=CArray<double,3>(value.dataFirst(),shape(nvertex,ni,nj),neverDeleteData) ; 
     }
     else if (type=="boundslat")
@@ -2521 +2524 @@
       gathererConnector_->transfer(event, nvertex, value, 0.); 
       bounds_lat_2d.resize(nvertex,ni,nj) ;
-      bounds_lat_2d=CArray<double,3>(value.dataFirst(),shape(nvertex,ni,nj),neverDeleteData) ; 
+      if (bounds_lat_2d.numElements()>0) bounds_lat_2d=CArray<double,3>(value.dataFirst(),shape(nvertex,ni,nj),neverDeleteData) ; 
     }
     else if (type=="area") 
@@ -2528 +2531 @@
       gathererConnector_->transfer(event, value, 0.); 
       area.resize(ni,nj) ;
-      area=CArray<double,2>(value.dataFirst(),shape(ni,nj),neverDeleteData) ; 
+      if (area.numElements()>0) area=CArray<double,2>(value.dataFirst(),shape(ni,nj),neverDeleteData) ; 
     }
   }

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

@@ -2668 +2668 @@
       }
     }
-    CGridRemoteConnector gridRemoteConnector(localViews, remoteViews, context->getIntraComm()) ;
+    CGridRemoteConnector gridRemoteConnector(localViews, remoteViews, context->getIntraComm(), client->getRemoteSize()) ;
     gridRemoteConnector.computeConnector() ;
     
@@ -2754 +2754 @@
       }
     }
-    CGridRemoteConnector gridRemoteConnector(localViews, remoteViews, context->getIntraComm()) ;
+    CGridRemoteConnector gridRemoteConnector(localViews, remoteViews, context->getIntraComm(), client->getRemoteSize()) ;
     gridRemoteConnector.computeConnector() ;