Changeset 815 for XIOS/trunk/src/node/domain.cpp

Timestamp:

01/26/16 18:18:58 (8 years ago)

Author:

mhnguyen

Message:

Fixing the bug in ticket 72

+) The distributed axis on client side send info to correct corresponding server
+) Improve serverdistributiondescription class to make it more flexible
+) Create new test_basic_2D only for test cases of 2-d grid

Test
+) On Curie
+) All tests pass

File:

• XIOS/trunk/src/node/domain.cpp (modified) (9 diffs)

XIOS/trunk/src/node/domain.cpp

@@ -465 +465 @@
           lon_g.resize(ni_glo) ;
           lat_g.resize(nj_glo) ;
-          
-          
+
+
           int* ibegin_g = new int[client->clientSize] ;
           int* jbegin_g = new int[client->clientSize] ;
@@ -480 +480 @@
           v=nj ;
           MPI_Allgather(&v,1,MPI_INT,nj_g,1,MPI_INT,client->intraComm) ;
-          
+
           MPI_Allgatherv(lon.dataFirst(),ni,MPI_DOUBLE,lon_g.dataFirst(),ni_g, ibegin_g,MPI_DOUBLE,client->intraComm) ;
           MPI_Allgatherv(lat.dataFirst(),nj,MPI_DOUBLE,lat_g.dataFirst(),nj_g, jbegin_g,MPI_DOUBLE,client->intraComm) ;
-   
+
       delete[] ibegin_g ;
       delete[] jbegin_g ;
@@ -494 +494 @@
    {
      int i,j,k;
-     
+
      const int nvertexValue = 4;
      boundsLon.resize(nvertexValue,ni*nj);
@@ -510 +510 @@
        bounds_lon_end= (lon(0) +360 + lon(ni_glo-1))/2 ;
      }
-       
+
      for(j=0;j<nj;++j)
        for(i=0;i<ni;++i)
@@ -520 +520 @@
                                                                         : (lon(ibegin + i + 1)+lon(ibegin + i))/2;
        }
-    
+
 
     boundsLat.resize(nvertexValue,nj*ni);
@@ -546 +546 @@
       }
     }
-    
+
     double latStepEnd = lat(nj_glo-1)-lat(nj_glo-2);
     if (isSouthPole) bounds_lat_end=lat(nj_glo-1);
@@ -563 +563 @@
         if ( -90 + bounds_lat_end <= 0.1*std::abs(latStepEnd)) bounds_lat_end=-90 ;
       }
-    }      
-      
+    }
+
     for(j=0;j<nj;++j)
       for(i=0;i<ni;++i)
@@ -1222 +1222 @@
   void CDomain::sendServerAttribut(void)
   {
-    CServerDistributionDescription serverDescription(nGlobDomain_);
-
     CContext* context = CContext::getCurrent();
     CContextClient* client = context->client;
     int nbServer = client->serverSize;
 
-    if (isUnstructed_) serverDescription.computeServerDistribution(nbServer,0);
-    else serverDescription.computeServerDistribution(nbServer,1);
+    CServerDistributionDescription serverDescription(nGlobDomain_, nbServer);
+    if (isUnstructed_) serverDescription.computeServerDistribution(false, 0);
+    else serverDescription.computeServerDistribution(false, 1);
 
     std::vector<std::vector<int> > serverIndexBegin = serverDescription.getServerIndexBegin();
@@ -1372 +1371 @@
     indexEnd = indexBegin + range - 1;
 
-    CServerDistributionDescription serverDescription(nGlobDomain_);
-    if (isUnstructed_) serverDescription.computeServerGlobalIndexInRange(nbServer, std::make_pair<size_t,size_t>(indexBegin, indexEnd), 0);
-    else serverDescription.computeServerGlobalIndexInRange(nbServer, std::make_pair<size_t,size_t>(indexBegin, indexEnd), 1);
+    CServerDistributionDescription serverDescription(nGlobDomain_, nbServer);
+    if (isUnstructed_) serverDescription.computeServerGlobalIndexInRange(std::make_pair<size_t,size_t>(indexBegin, indexEnd), 0);
+    else serverDescription.computeServerGlobalIndexInRange(std::make_pair<size_t,size_t>(indexBegin, indexEnd), 1);
 
     CClientServerMapping* clientServerMap = new CClientServerMappingDistributed(serverDescription.getGlobalIndexRange(),