Changeset 364 for codes/icosagcm/trunk/src/timeloop_gcm.f90

Timestamp:

10/09/15 16:13:43 (9 years ago)

Author:

dubos

Message:

Bugfix : memory leak in transfert_mpi / New : detect send_message not paired with wait_message

File:

• codes/icosagcm/trunk/src/timeloop_gcm.f90 (modified) (8 diffs)

codes/icosagcm/trunk/src/timeloop_gcm.f90

@@ -195 +195 @@
     !$OMP MASTER
     CALL SYSTEM_CLOCK(start_clock)
+    CALL SYSTEM_CLOCK(count_rate=rate_clock)
     !$OMP END MASTER   
 
@@ -203 +204 @@
     DO it=itau0+1,itau0+itaumax
 
-       CALL check_conserve_detailed('detailed_budget 0', &
-            f_ps,f_dps,f_u,f_theta_rhodz,f_phis,it)
-
-       IF (xios_output) CALL xios_update_calendar(it)
+       IF (is_master) CALL print_iteration(it, itau0, itaumax, start_clock, rate_clock)
+       IF (xios_output) THEN
+          CALL xios_update_calendar(it)
+       ELSE
+          CALL update_time_counter(dt*it)
+       END IF
+
        IF (it==itau0+1 .OR. MOD(it,itau_sync)==0) THEN
           CALL send_message(f_ps,req_ps0)
@@ -220 +224 @@
        ENDIF
 
-       IF (is_master) PRINT *,"It No :",It,"   t :",dt*It
-
        IF (mod(it,itau_out)==0 ) THEN
-          CALL update_time_counter(dt*it)
           CALL write_output_fields_basic(f_ps, f_u, f_q)
        ENDIF
+
+       CALL check_conserve_detailed('detailed_budget 0', &
+            f_ps,f_dps,f_u,f_theta_rhodz,f_phis,it)
 
        CALL guided(it*dt,f_ps,f_theta_rhodz,f_u,f_q)
@@ -235 +239 @@
           CALL HEVI_scheme(it, fluxt_zero)
        END SELECT
-
+       
        CALL check_conserve_detailed('detailed_budget 1', &
             f_ps,f_dps,f_u,f_theta_rhodz,f_phis,it)
@@ -266 +270 @@
        
        IF(MOD(it,itau_adv)==0) THEN
-          IF(nqtot>0) CALL advect_tracer(f_hfluxt,f_wfluxt,f_u, f_q,f_rhodz)  ! update q and rhodz after RK step
+          CALL advect_tracer(f_hfluxt,f_wfluxt,f_u, f_q,f_rhodz)  ! update q and rhodz after RK step
           fluxt_zero=.TRUE.
           ! FIXME : check that rhodz is consistent with ps
@@ -278 +282 @@
              END DO
           ENDIF
-          
        END IF
        
@@ -301 +304 @@
     !$OMP MASTER
     CALL SYSTEM_CLOCK(stop_clock)
-    CALL SYSTEM_CLOCK(count_rate=rate_clock)
     
     IF (mpi_rank==0) THEN 
@@ -310 +312 @@
     ! CONTAINS
   END SUBROUTINE timeloop
-  
+
+  SUBROUTINE print_iteration(it,itau0,itaumax,start_clock,rate_clock)
+    INTEGER :: it, itau0, itaumax, start_clock, stop_clock, rate_clock, throughput
+    REAL :: per_step,total, elapsed
+    WRITE(*,'(A,I7,A,F8.1)') "It No :",it,"   t :",dt*it
+    IF(MOD(it,10)==0) THEN
+       CALL SYSTEM_CLOCK(stop_clock)
+       elapsed = (stop_clock-start_clock)*1./rate_clock
+       per_step = elapsed/(it-itau0)
+       throughput = dt/per_step
+       total = per_step*(itaumax-itau0)
+       WRITE(*,'(A,I5,A,F6.2,A,I6)') 'Time spent (s):',INT(elapsed), &
+            '  -- ms/step : ', 1000*per_step, &
+            '  -- Throughput :', throughput
+       WRITE(*,'(A,I5,A,I5)') 'Whole job (min) :', INT(total/60.), &
+            '  -- Completion in (min) : ', INT((total-elapsed)/60.)
+    END IF
+  END SUBROUTINE print_iteration
+
 END MODULE timeloop_gcm_mod