Changeset 3844

Timestamp:

Jul 2, 2015, 6:13:12 PM (10 years ago)

Author:

ymipsl

Message:

Bug fix correction for some openMP configuration

YM

Location:

dynamico_lmdz/aquaplanet/ICOSAGCM/src

Files:

• caldyn_gcm.f90 (modified) (5 diffs)
• timeloop_gcm.f90 (modified) (2 diffs)

dynamico_lmdz/aquaplanet/ICOSAGCM/src/caldyn_gcm.f90

@@ -223 +223 @@
           CALL compute_pvort(ps,u,theta_rhodz, mass,theta,qu,qv)
        ENDDO
+!       CALL checksum(f_mass)
+!       CALL checksum(f_theta)
 
        CALL send_message(f_qu,req_qu)
@@ -252 +254 @@
           END IF
        ENDDO       
+   
+!       CALL checksum(f_geopot)
+!       CALL checksum(f_dmass)
+!       CALL checksum(f_pk)
+!       CALL checksum(f_pk)
        
     CASE(enstrophy) ! enstrophy-conserving
@@ -439 +446 @@
     INTEGER :: i,j,ij,l
     REAL(rstd) :: p_ik, exner_ik
-    INTEGER,SAVE ::ij_omp_begin_ext, ij_omp_end_ext
-!$OMP THREADPRIVATE(ij_omp_begin_ext, ij_omp_end_ext)
-    LOGICAL,SAVE :: first=.TRUE.
-!$OMP THREADPRIVATE(first)
+    INTEGER    :: ij_omp_begin_ext, ij_omp_end_ext
 
 
     CALL trace_start("compute_geopot")
     
-    IF (first) THEN
-      first=.FALSE.
-      CALL distrib_level(ij_end_ext-ij_begin_ext+1,ij_omp_begin_ext,ij_omp_end_ext)
-      ij_omp_begin_ext=ij_omp_begin_ext+ij_begin_ext-1
-      ij_omp_end_ext=ij_omp_end_ext+ij_begin_ext-1
-    ENDIF
+    CALL distrib_level(ij_end_ext-ij_begin_ext+1,ij_omp_begin_ext,ij_omp_end_ext)
+    ij_omp_begin_ext=ij_omp_begin_ext+ij_begin_ext-1
+    ij_omp_end_ext=ij_omp_end_ext+ij_begin_ext-1
 
     IF(caldyn_eta==eta_mass) THEN
@@ -798 +799 @@
     INTEGER :: i,j,ij,l
     REAL(rstd) :: p_ik, exner_ik
-    INTEGER,SAVE ::ij_omp_begin, ij_omp_end
-!$OMP THREADPRIVATE(ij_omp_begin, ij_omp_end)
-    LOGICAL,SAVE :: first=.TRUE.
-!$OMP THREADPRIVATE(first)
+    INTEGER    :: ij_omp_begin, ij_omp_end
 
 
     CALL trace_start("compute_geopot")
-    
-    IF (first) THEN
-      first=.FALSE.
-      CALL distrib_level(ij_end-ij_begin+1,ij_omp_begin,ij_omp_end)
-      ij_omp_begin=ij_omp_begin+ij_begin-1
-      ij_omp_end=ij_omp_end+ij_begin-1
-    ENDIF
+
+    CALL distrib_level(ij_end-ij_begin+1,ij_omp_begin,ij_omp_end)
+    ij_omp_begin=ij_omp_begin+ij_begin-1
+    ij_omp_end=ij_omp_end+ij_begin-1
 
 !    REAL(rstd) :: wwuu(iim*3*jjm,llm+1) ! tmp var, don't know why but gain 30% on the whole code in opemp
@@ -959 +954 @@
     USE pression_mod
     USE omega_mod
-    USE write_field
+    USE write_field_mod
     USE vertical_interp_mod
     USE wind_mod

dynamico_lmdz/aquaplanet/ICOSAGCM/src/timeloop_gcm.f90

@@ -38 +38 @@
   USE check_conserve_mod
   USE output_field_mod
-  USE write_field
+  USE write_field_mod
   USE theta2theta_rhodz_mod
   USE sponge_mod
@@ -241 +241 @@
 
     DO stage=1,nb_stage
+!       CALL checksum(f_ps)
+!       CALL checksum(f_theta_rhodz)
+!       CALL checksum(f_mass)
        CALL caldyn((stage==1) .AND. (MOD(it,itau_out)==0), &
             f_phis,f_ps,f_mass,f_theta_rhodz,f_u, f_q, &
             f_hflux, f_wflux, f_dps, f_dmass, f_dtheta_rhodz, f_du)
+!       CALL checksum(f_dps)
+!       CALL checksum(f_dtheta_rhodz)
+!       CALL checksum(f_dmass)
        SELECT CASE (scheme)
        CASE(euler)