Changeset 1179 for XIOS/dev/branch_yushan_merged/src

Timestamp:

06/21/17 17:57:47 (7 years ago)

Author:

yushan

Message:

MARK! This version is working for test_client and test_complete with large number of procs and threads

Location:

XIOS/dev/branch_yushan_merged/src

Files:

• buffer_client.cpp (modified) (1 diff)
• client.cpp (modified) (1 diff)
• context_server.cpp (modified) (1 diff)
• test/test_remap_omp.f90 (modified) (3 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/context_server.cpp

@@ -82 +82 @@
         ep_lib::MPI_Iprobe(rank,20,interComm,&flag,&status);
         traceOn();
-        if (flag==true)
+        if (flag)
         {
           it=buffers.find(rank);

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

@@ -52 +52 @@
   if(rank < size-2) then
 
-  !$omp parallel default(private) firstprivate(dtime)
+  !$omp parallel default(firstprivate) firstprivate(dtime)
 
 !!! XIOS Initialization (get the local communicator)
@@ -232 +232 @@
     CALL xios_send_field("src_field_2D",src_field_2D)
     
-    DO i=1,src_ni
-      src_field_2D_clone(i) = src_field_2D(i)
-      IF ((23.5 * ts < src_lat(i)) .AND. (src_lat(i) < 65.5 *ts) .AND. (0 < src_lon(i)) .AND. (src_lon(i) < 30*ts)) THEN      
-        src_field_2D_clone(i) = missing_value    
-      ENDIF
-    ENDDO
-
-    CALL xios_send_field("src_field_2D_clone",src_field_2D_clone)
-    CALL xios_send_field("src_field_3D",src_field_3D)
-    CALL xios_send_field("src_field_3D_clone",src_field_3D)
-    CALL xios_send_field("src_field_4D",src_field_4D)
-    CALL xios_send_field("src_field_3D_pression",src_field_pression)
+    !DO i=1,src_ni
+    !  src_field_2D_clone(i) = src_field_2D(i)
+    !  IF ((23.5 * ts < src_lat(i)) .AND. (src_lat(i) < 65.5 *ts) .AND. (0 < src_lon(i)) .AND. (src_lon(i) < 30*ts)) THEN      
+    !    src_field_2D_clone(i) = missing_value    
+    !  ENDIF
+    !ENDDO
+
+    !CALL xios_send_field("src_field_2D_clone",src_field_2D_clone)
+    !CALL xios_send_field("src_field_3D",src_field_3D)
+    !CALL xios_send_field("src_field_3D_clone",src_field_3D)
+    !CALL xios_send_field("src_field_4D",src_field_4D)
+    !CALL xios_send_field("src_field_3D_pression",src_field_pression)
     CALL xios_send_field("tmp_field_0",tmp_field_0)
     CALL xios_send_field("tmp_field_1",tmp_field_1)
@@ -258 +258 @@
   CALL xios_finalize()
   
-  print *, "Client : xios_finalize "
+  print *, "Client : xios_finalize ", rank
 
   !$omp barrier