Changeset 347 for codes/icosagcm/trunk/src/caldyn_gcm.f90

Timestamp:

08/01/15 15:05:27 (9 years ago)

Author:

dubos

Message:

Synced with aquaplanet branch HEAT@45 - tested with DCMIP4

File:

• codes/icosagcm/trunk/src/caldyn_gcm.f90 (modified) (6 diffs)

codes/icosagcm/trunk/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
@@ -294 +301 @@
 !       CALL write_output_fields(f_ps, f_phis, f_dps, f_u, f_theta_rhodz, f_q, &
 !            f_buf_i, f_buf_v, f_buf_u3d, f_buf_ulon, f_buf_ulat, f_buf_s, f_buf_p)
-       CALL un2ulonlat(f_u, f_buf_ulon, f_buf_ulat)
-       CALL output_field("ulon",f_buf_ulon)
-       CALL output_field("ulat",f_buf_ulat)
-
-       CALL output_field("ps",f_ps)
-       CALL output_field("dps",f_dps)
-       CALL output_field("mass",f_mass)
-       CALL output_field("dmass",f_dmass)
-       CALL output_field("vort",f_qv)
-       CALL output_field("theta",f_theta)
-       CALL output_field("exner",f_pk)
-       CALL output_field("pv",f_qv)
- 
+!       CALL un2ulonlat(f_u, f_buf_ulon, f_buf_ulat)
+!       CALL output_field("ulon",f_buf_ulon)
+!       CALL output_field("ulat",f_buf_ulat)
+
+!       CALL output_field("ps",f_ps)
+!       CALL output_field("dps",f_dps)
+!       CALL output_field("mass",f_mass)
+!       CALL output_field("dmass",f_dmass)
+!       CALL output_field("vort",f_qv)
+!       CALL output_field("theta",f_theta)
+!       CALL output_field("exner",f_pk)
+!       CALL output_field("pv",f_qv)
+! 
     END IF
     
@@ -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