Changeset 3852 for dynamico_lmdz/aquaplanet/ICOSA_LMDZ/src

Timestamp:

Jul 15, 2015, 1:08:35 PM (9 years ago)

Author:

ymipsl

Message:

Redonddant point on the frontier domain are not transfered any more from DYNAMICO to LMDZ

YM

Location:

dynamico_lmdz/aquaplanet/ICOSA_LMDZ/src

Files:

• distrib_icosa_lmdz.f90 (modified) (2 diffs)
• interface_icosa_lmdz.f90 (modified) (6 diffs)

dynamico_lmdz/aquaplanet/ICOSA_LMDZ/src/distrib_icosa_lmdz.f90

@@ -45 +45 @@
       DO j=jj_begin,jj_end
         DO i=ii_begin,ii_end
-          ij=(j-1)*iim+i
-          pos_tmp=pos_tmp+1
-          IF (pos_tmp >= klon_omp_begin .AND. pos_tmp <= klon_omp_end) nindex=nindex+1
+          IF (domain(ind)%own(i,j)) THEN 
+            pos_tmp=pos_tmp+1
+            IF (pos_tmp >= klon_omp_begin .AND. pos_tmp <= klon_omp_end) nindex=nindex+1
+          ENDIF
         ENDDO
       ENDDO
@@ -63 +64 @@
           DO i=ii_begin,ii_end
             ij=(j-1)*iim+i
-            pos=pos+1
-            IF (pos >= klon_omp_begin .AND. pos <= klon_omp_end) THEN
-              nindex=nindex+1
-              distrib_physic(ndomain_distrib)%index(nindex)=ij
+            IF (domain(ind)%own(i,j)) THEN
+              pos=pos+1
+              IF (pos >= klon_omp_begin .AND. pos <= klon_omp_end) THEN
+                nindex=nindex+1
+                distrib_physic(ndomain_distrib)%index(nindex)=ij
+              ENDIF
             ENDIF
           ENDDO

dynamico_lmdz/aquaplanet/ICOSA_LMDZ/src/interface_icosa_lmdz.f90

@@ -2 +2 @@
 
   USE field_mod, ONLY: t_field
-  USE transfert_mod, ONLY: t_message
+  USE transfert_mod, ONLY: t_message 
   
  
-  TYPE(t_message) :: req_u
+  TYPE(t_message),SAVE :: req_u
+  TYPE(t_message),SAVE :: req_dps0, req_dulon0, req_dulat0, req_dTemp0, req_dq0
 
   TYPE(t_field),POINTER,SAVE :: f_p(:) 
@@ -48 +49 @@
   USE xios_mod
   USE time_mod , init_time_icosa=> init_time 
-
+  USE transfert_mod
+  
 ! from LMDZ
   USE mod_grid_phy_lmdz, ONLY : unstructured
@@ -112 +114 @@
     CALL allocate_field(f_dps,field_t,type_real)
     CALL allocate_field(f_duc,field_t,type_real,3,llm)    
+
+    CALL init_message(f_dps,req_i0,req_dps0)
+    CALL init_message(f_dulon,req_i0,req_dulon0)
+    CALL init_message(f_dulat,req_i0,req_dulat0)
+    CALL init_message(f_dTemp,req_i0,req_dTemp0)
+    CALL init_message(f_dq,req_i0,req_dq0)
 !$OMP END PARALLEL    
 
@@ -117 +125 @@
     DO ind=1,ndomain
       CALL swap_dimensions(ind)
-      nbp_phys=nbp_phys+ii_nb*jj_nb
+      DO j=jj_begin,jj_end
+        DO i=ii_begin,ii_end
+          IF (domain(ind)%own(i,j)) nbp_phys=nbp_phys+1
+        ENDDO
+      ENDDO
     ENDDO
     
@@ -392 +404 @@
     ENDIF
 
-    IF(it==itaumax) THEN 
+
+    IF(it-itau0>=itaumax) THEN 
       lafin=.TRUE.
     ELSE 
@@ -485 +498 @@
     CALL transfer_lmdz_to_icosa(dq_phy   , f_dq )
     CALL transfer_lmdz_to_icosa(dps_phy  , f_dps )
-
-
+    
+    CALL send_message(f_dps,req_dps0)
+    CALL send_message(f_dulon,req_dulon0)
+    CALL send_message(f_dulat,req_dulat0)
+    CALL send_message(f_dTemp,req_dTemp0)
+    CALL send_message(f_dq,req_dq0)
+
+    CALL wait_message(req_dps0)
+    CALL wait_message(req_dulon0)
+    CALL wait_message(req_dulat0)
+    CALL wait_message(req_dTemp0)
+    CALL wait_message(req_dq0)