Changeset 239 for codes/icosagcm/branches

Timestamp:

07/18/14 18:37:19 (10 years ago)

Author:

ymipsl

Message:

Fix openMP lmdz generic physics interface
YM

File:

• codes/icosagcm/branches/SATURN_DYNAMICO/ICOSAGCM/src/physics_lmdz_generic.f90 (modified) (11 diffs)

codes/icosagcm/branches/SATURN_DYNAMICO/ICOSAGCM/src/physics_lmdz_generic.f90

@@ -30 +30 @@
   REAL :: year_length
   
+ INTEGER,ALLOCATABLE,SAVE :: domain_offset(:)
+
   
 
@@ -56 +58 @@
     CALL getin('year_length',year_length)
 
+!$OMP PARALLEL
     CALL allocate_field(f_p,field_t,type_real,llm+1)
     CALL allocate_field(f_pks,field_t,type_real)
@@ -71 +74 @@
     CALL allocate_field(f_dps,field_t,type_real)
     CALL allocate_field(f_duc,field_t,type_real,3,llm)    
-    
+!$OMP END PARALLEL    
+
+    ALLOCATE(domain_offset(ndomain))
     nbp_phys=0
+    domain_offset(1)=0
     DO ind=1,ndomain
       CALL swap_dimensions(ind)
+      IF (ind<ndomain) THEN 
+        domain_offset(ind+1)=domain_offset(ind)+ii_nb*jj_nb
+      ENDIF
       nbp_phys=nbp_phys+ii_nb*jj_nb
     ENDDO
@@ -107 +116 @@
   USE disvert_mod
   USE transfert_mod
+  USE mpipara
   IMPLICIT NONE
     INTEGER,INTENT(IN)    :: it
@@ -160 +170 @@
     REAL(rstd) :: day
     REAL(rstd) :: real_time
-    
-    INTEGER,SAVE :: offset
-!$OMP THREADPRIVATE(offset)
+    INTEGER    :: offset
     LOGICAL :: lafin=.FALSE.
     LOGICAL,SAVE :: first=.TRUE.
@@ -187 +195 @@
       ALLOCATE(dq_phy(nbp_phys,llm,nqtot))
       ALLOCATE(dps_phy(nbp_phys))
+      
 !$OMP END MASTER
 !$OMP BARRIER
@@ -199 +208 @@
     day  = INT( MODULO(real_time,year_length) / day_length) 
     time = MODULO(real_time,day_length) / day_length
-    
+
+!$OMP MASTER    
+    IF (is_mpi_root) PRINT*,"Enterring in physic : day", day, "  time : ",time 
+!$OMP END MASTER    
     
     
@@ -205 +217 @@
     
     CALL transfert_message(f_u,req_u)
-    offset=0
     
     DO ind=1,ndomain
       CALL swap_dimensions(ind)
       IF (assigned_domain(ind)) THEN
+        offset=domain_offset(ind)
         CALL swap_geometry(ind)
       
@@ -248 +260 @@
 
 !$OMP BARRIER                       
-    offset=0 
 
     DO ind=1,ndomain
@@ -254 +265 @@
       IF (assigned_domain(ind)) THEN
         CALL swap_geometry(ind)
+        offset=domain_offset(ind)
       
         theta_rhodz=f_theta_rhodz(ind)
@@ -489 +501 @@
 
    DO l = 2, llm
-!$OMP DO
      DO j=jj_begin,jj_end
+! ---> Bug compilo intel ici en openmp
+! ---> Couper la boucle
+       if (j==jj_end+1) PRINT*,"this message must not be printed"
        DO i=ii_begin,ii_end
          ij=(j-1)*iim+i