Changeset 1176 for XIOS/dev/branch_yushan_merged/src

Timestamp:

06/21/17 09:09:59 (7 years ago)

Author:

yushan

Message:

save modif

Location:

XIOS/dev/branch_yushan_merged/src

Files:

• buffer_client.cpp (modified) (1 diff)
• client.cpp (modified) (1 diff)
• client_client_dht_template_impl.hpp (modified) (8 diffs)
• data_output.cpp (modified) (1 diff)
• io/nc4_data_input.cpp (modified) (1 diff)
• io/nc4_data_output.cpp (modified) (1 diff)
• test/test_complete_omp.f90 (modified) (1 diff)
• test/test_remap_omp.f90 (modified) (5 diffs)

XIOS/dev/branch_yushan_merged/src/buffer_client.cpp

@@ -88 +88 @@
       {
         MPI_Issend(buffer[current], count, MPI_CHAR, serverRank, 20, interComm, &request);
+        #pragma omp critical (_output)
         pending = true;
         if (current == 1) current = 0;

XIOS/dev/branch_yushan_merged/src/client.cpp

@@ -107 +107 @@
             MPI_Comm_rank(intraComm,&intraCommRank) ;
             
-            #pragma omp critical(_output)
+            /*#pragma omp critical(_output)
             {
               info(10)<<"intercommCreate::client "<<test_omp_rank<< " "<< &test_omp_rank <<" intraCommSize : "<<intraCommSize
                  <<" intraCommRank :"<<intraCommRank<<"  serverLeader "<< serverLeader
                  <<" globalComm : "<< &(CXios::globalComm) << endl ;  
-            }
+            }*/
 
             

XIOS/dev/branch_yushan_merged/src/client_client_dht_template_impl.hpp

@@ -104 +104 @@
   int clientRank;
   MPI_Comm_rank(commLevel,&clientRank);
+  ep_lib::MPI_Barrier(commLevel);
   int groupRankBegin = this->getGroupBegin()[level];
   int nbClient = this->getNbInGroup()[level];
@@ -180 +181 @@
   int currentIndex = 0;
   int nbRecvClient = recvRankClient.size();
-  for (int idx = 0; idx < nbRecvClient; ++idx)
-  {
-    if (0 != recvNbIndexClientCount[idx])
-    {
-      recvIndexFromClients(recvRankClient[idx], recvIndexBuff+currentIndex, recvNbIndexClientCount[idx], commLevel, request);
-    }
-    currentIndex += recvNbIndexClientCount[idx];
-  }
-
+  
   boost::unordered_map<int, size_t* >::iterator itbIndex = client2ClientIndex.begin(), itIndex,
                                                 iteIndex = client2ClientIndex.end();
@@ -194 +187 @@
     sendIndexToClients(itIndex->first, (itIndex->second), sendNbIndexBuff[itIndex->first-groupRankBegin], commLevel, request);
 
+
+
+  for (int idx = 0; idx < nbRecvClient; ++idx)
+  {
+    if (0 != recvNbIndexClientCount[idx])
+    {
+      recvIndexFromClients(recvRankClient[idx], recvIndexBuff+currentIndex, recvNbIndexClientCount[idx], commLevel, request);
+    }
+    currentIndex += recvNbIndexClientCount[idx];
+  }
+
+  
   std::vector<ep_lib::MPI_Status> status(request.size());
   MPI_Waitall(request.size(), &request[0], &status[0]);
+  
 
   CArray<size_t,1>* tmpGlobalIndex;
@@ -208 +214 @@
     --level;
     computeIndexInfoMappingLevel(*tmpGlobalIndex, this->internalComm_, level);
+      
   }
   else // Now, we are in the last level where necessary mappings are.
@@ -372 +379 @@
   MPI_Comm_rank(commLevel,&clientRank);
   computeSendRecvRank(level, clientRank);
+  ep_lib::MPI_Barrier(commLevel);
 
   int groupRankBegin = this->getGroupBegin()[level];
@@ -666 +674 @@
 
   int nRequest = 0;
+  
+
+  for (int idx = 0; idx < sendNbRank.size(); ++idx)
+  {
+    MPI_Isend(&sendNbElements[0]+idx, 1, MPI_INT,
+              sendNbRank[idx], MPI_DHT_INDEX_1, this->internalComm_, &request[nRequest]);
+    ++nRequest;
+  }
+  
   for (int idx = 0; idx < recvNbRank.size(); ++idx)
   {
     MPI_Irecv(&recvNbElements[0]+idx, 1, MPI_INT,
               recvNbRank[idx], MPI_DHT_INDEX_1, this->internalComm_, &request[nRequest]);
-    ++nRequest;
-  }
-
-  for (int idx = 0; idx < sendNbRank.size(); ++idx)
-  {
-    MPI_Isend(&sendNbElements[0]+idx, 1, MPI_INT,
-              sendNbRank[idx], MPI_DHT_INDEX_1, this->internalComm_, &request[nRequest]);
     ++nRequest;
   }
@@ -714 +724 @@
   
   int nRequest = 0;
-  for (int idx = 0; idx < recvBuffSize; ++idx)
-  {
-    MPI_Irecv(&recvBuff[0]+2*idx, 2, MPI_INT,
-              recvRank[idx], MPI_DHT_INDEX_0, this->internalComm_, &request[nRequest]);
-    ++nRequest;
-  }
+  
 
   for (int idx = 0; idx < sendBuffSize; ++idx)
@@ -734 +739 @@
     MPI_Isend(&sendBuff[idx*2], 2, MPI_INT,
               sendRank[idx], MPI_DHT_INDEX_0, this->internalComm_, &request[nRequest]);
+    ++nRequest;
+  }
+  
+  for (int idx = 0; idx < recvBuffSize; ++idx)
+  {
+    MPI_Irecv(&recvBuff[0]+2*idx, 2, MPI_INT,
+              recvRank[idx], MPI_DHT_INDEX_0, this->internalComm_, &request[nRequest]);
     ++nRequest;
   }

XIOS/dev/branch_yushan_merged/src/data_output.cpp

@@ -4 +4 @@
 #include "group_template.hpp"
 #include "context.hpp"
-
+//mpi.hpp
 namespace xios
 {
-      /// ////////////////////// Définitions ////////////////////// ///
+      /// ////////////////////// Dfinitions ////////////////////// ///
 
       CDataOutput::~CDataOutput(void)

XIOS/dev/branch_yushan_merged/src/io/nc4_data_input.cpp

@@ -57 +57 @@
     #ifdef _usingEP
     SuperClass::type = ONE_FILE;
-    //printf("SuperClass::type = %d\n", SuperClass::type);
+    printf("SuperClass::type = %d\n", SuperClass::type);
     #endif
     switch (SuperClass::type)

XIOS/dev/branch_yushan_merged/src/io/nc4_data_output.cpp

@@ -1102 +1102 @@
 
             SuperClassWriter::definition_end();
-            printf("SuperClass::type = %d\n", SuperClass::type);
+            printf("SuperClass::type = %d, typePrec = %d\n", SuperClass::type, typePrec);
             switch (SuperClass::type)
             {

XIOS/dev/branch_yushan_merged/src/test/test_complete_omp.f90

@@ -84 +84 @@
     jbegin=jbegin+nj
   ENDDO
+  
+  if((ni.LE.0) .OR. (nj.LE.0)) call MPI_Abort()
 
   iend=ibegin+ni-1 ; jend=jbegin+nj-1

XIOS/dev/branch_yushan_merged/src/test/test_remap_omp.f90

@@ -52 +52 @@
   if(rank < size-2) then
 
-  !$omp parallel default(firstprivate) firstprivate(dtime)
+  !$omp parallel default(private) firstprivate(dtime)
 
 !!! XIOS Initialization (get the local communicator)
@@ -69 +69 @@
 
   ierr=NF90_INQ_VARID(ncid,"bounds_lon",varid)
-  ierr=NF90_INQUIRE_VARIABLE(ncid, varid,dimids=dimids)
+  ierr=NF90_INQUIRE_VARIABLE(ncid, varid, dimids=dimids)
   ierr=NF90_INQUIRE_DIMENSION(ncid, dimids(1), len=src_nvertex)
   ierr=NF90_INQUIRE_DIMENSION(ncid, dimids(2), len=src_ni_glo)
@@ -82 +82 @@
     src_ibegin= remain * (div+1) + (rank-remain) * div ;
   ENDIF
+
+  if(src_ni .LE. 0) CALL MPI_ABORT()
+
 
   ALLOCATE(src_lon(src_ni), src_lon_tmp(src_ni))
@@ -95 +98 @@
   ALLOCATE(lval1(interpolatedLlm))
   ALLOCATE(lval2(llm2))
+  lval2 = 0
+  lval=0
+  lval1=0
 
   ierr=NF90_INQ_VARID(ncid,"lon",varid)
@@ -161 +167 @@
   ENDIF
 
+  if(dst_ni .LE. 0) CALL MPI_ABORT()
+
   ALLOCATE(dst_lon(dst_ni))
   ALLOCATE(dst_lat(dst_ni))