Changeset 13409 for NEMO/branches/UKMO/dev_r12866_HPC-02_Daley_Tiling_trial_extra_halo/src/OCE/timing.F90

Timestamp:

2020-08-17T15:28:54+02:00 (3 years ago)

Author:

hadcv

Message:

Remaining changes prior to trunk merge

File:

• NEMO/branches/UKMO/dev_r12866_HPC-02_Daley_Tiling_trial_extra_halo/src/OCE/timing.F90 (modified) (3 diffs)

NEMO/branches/UKMO/dev_r12866_HPC-02_Daley_Tiling_trial_extra_halo/src/OCE/timing.F90

@@ -93 +93 @@
       !!----------------------------------------------------------------------
       CHARACTER(len=*), INTENT(in) :: cdinfo
-      ! TODO: TO BE TILED
-      IF( ntile /= 0 .AND. ntile /= 1 ) RETURN
       !
        IF(ASSOCIATED(s_timer) ) s_timer_old => s_timer
@@ -111 +109 @@
 
       s_timer%l_tdone = .FALSE.
-      s_timer%niter = s_timer%niter + 1
+      IF( ntile == 0 .OR. ntile == 1 ) s_timer%niter = s_timer%niter + 1      ! All tiles count as one iteration
       s_timer%t_cpu = 0.
       s_timer%t_clock = 0.
@@ -140 +138 @@
       INTEGER  :: ifinal_count, iperiods    
       REAL(wp) :: zcpu_end, zmpitime,zcpu_raw,zclock_raw
-      ! TODO: TO BE TILED
-      IF( ntile /= 0 .AND. ntile /= nijtile ) RETURN
       !
       s_wrk => NULL()