Changeset 1209 for XIOS/dev/branch_openmp/src

Timestamp:

07/11/17 17:57:38 (7 years ago)

Author:

yushan

Message:

bug corrected. happened when certain threads send 0 elements in the allgatherv call

Location:

XIOS/dev/branch_openmp/src

Files:

• client_client_dht_template_impl.hpp (modified) (2 diffs)
• node/field.cpp (modified) (2 diffs)
• test/test_unstruct_omp.f90 (modified) (4 diffs)

XIOS/dev/branch_openmp/src/client_client_dht_template_impl.hpp

@@ -105 +105 @@
   int clientRank;
   MPI_Comm_rank(commLevel,&clientRank);
-  ep_lib::MPI_Barrier(commLevel);
+  //ep_lib::MPI_Barrier(commLevel);
   int groupRankBegin = this->getGroupBegin()[level];
   int nbClient = this->getNbInGroup()[level];
@@ -434 +434 @@
   MPI_Comm_rank(commLevel,&clientRank);
   computeSendRecvRank(level, clientRank);
-  ep_lib::MPI_Barrier(commLevel);
+  //ep_lib::MPI_Barrier(commLevel);
 
   int groupRankBegin = this->getGroupBegin()[level];

XIOS/dev/branch_openmp/src/node/field.cpp

@@ -26 +26 @@
 namespace xios{
 
-   /// ////////////////////// Définitions ////////////////////// ///
+   /// ////////////////////// Dfinitions ////////////////////// ///
 
    CField::CField(void)
@@ -716 +716 @@
      if (context->hasClient)
      {
-       printf("proc %d begein transformation\n", myRank);
        solveTransformedGrid();
-       printf("proc %d end transformation\n", myRank);
-       MPI_Barrier(context->client->intraComm);
      }
 

XIOS/dev/branch_openmp/src/test/test_unstruct_omp.f90

@@ -55 +55 @@
   if(mpi_rank < mpi_size-2) then
 
-  !$omp parallel default(private) firstprivate(dtime)
+  !$omp parallel default(firstprivate) firstprivate(dtime)
 
   CALL xios_initialize(id,return_comm=comm)
@@ -79 +79 @@
   ALLOCATE(field_A_glo(ncell_glo,llm))
   ALLOCATE(mask_glo(ncell_glo))
+
+  lon_glo(:) = 0
+  lat_glo(:) = 0
+  bounds_lon_glo(:,:) = 0
+  bounds_lat_glo(:,:) = 0
+  i_index_glo(:) = 0
+  field_A_glo(:,:) = 0
+  mask_glo(:) = 0
 
   ind=0
@@ -181 +189 @@
   ALLOCATE(mask(ncell))
   ALLOCATE(n_local(ncell))
+ 
+  i_index(:)=0
+  lon(:)=0
+  lat(:)=0
+  bounds_lon(:,:)=0
+  bounds_lat(:,:)=0
+  field_A_srf(:,:)=0
+  mask(:)=0
+  n_local(:)=0
+
   ncell=0
   data_n_index=0
@@ -203 +221 @@
   ALLOCATE(field_A_compressed(data_n_index,llm))
   ALLOCATE(data_i_index(data_n_index))
+  field_A_compressed(:,:)=0
+  data_i_index(:)=0
+
+
   data_n_index=0
   DO ind=1,ncell