Changeset 9124 for branches/2017/dev_merge_2017/NEMOGCM/NEMO/LIM_SRC_3/iceupdate.F90

Timestamp:

2017-12-19T09:26:25+01:00 (6 years ago)

Author:

gm

Message:

dev_merge_2017: ln_timing instead of nn_timing + restricted timing to nemo_init and routine called by step in OPA_SRC

File:

• branches/2017/dev_merge_2017/NEMOGCM/NEMO/LIM_SRC_3/iceupdate.F90 (modified) (6 diffs)

branches/2017/dev_merge_2017/NEMOGCM/NEMO/LIM_SRC_3/iceupdate.F90

@@ -105 +105 @@
       REAL(wp), DIMENSION(jpi,jpj,jpl) ::   zalb_cs, zalb_os     ! 3D workspace
       !!---------------------------------------------------------------------
-      IF( nn_timing == 1 )  CALL timing_start('ice_update')
+      IF( ln_timing )   CALL timing_start('ice_update')
 
       IF( kt == nit000 .AND. lwp ) THEN
@@ -297 +297 @@
       IF( ln_icectl                      )   CALL ice_prt       (kt, iiceprt, jiceprt, 3, 'Final state ice_update') ! prints
       IF( ln_ctl                         )   CALL ice_prt3D     ('iceupdate')                                       ! prints
-      IF( nn_timing == 1                 )   CALL timing_stop   ('ice_update')                                      ! timing
+      IF( ln_timing                      )   CALL timing_stop   ('ice_update')                                      ! timing
       !
    END SUBROUTINE ice_update_flx
@@ -334 +334 @@
       REAL(wp) ::   zat_v, zvtau_ice, zv_t, zrhoco  !   -      -
       !!---------------------------------------------------------------------
-
-      IF( nn_timing == 1 )  CALL timing_start('ice_update_tau')
+      IF( ln_timing )   CALL timing_start('ice_update_tau')
 
       IF( kt == nit000 .AND. lwp ) THEN
@@ -381 +380 @@
       CALL lbc_lnk_multi( utau, 'U', -1., vtau, 'V', -1. )   ! lateral boundary condition
       !
-      IF( nn_timing == 1 )  CALL timing_stop('ice_update_tau')
+      IF( ln_timing )   CALL timing_stop('ice_update_tau')
       !  
    END SUBROUTINE ice_update_tau
@@ -400 +399 @@
       IF(lwp) WRITE(numout,*) 'ice_update_init: ???? '
       IF(lwp) WRITE(numout,*) '~~~~~~~~~~~~~~~'
-
+      !
       !                                      ! allocate ice_update array
       IF( ice_update_alloc() /= 0 )   CALL ctl_stop( 'STOP', 'ice_update_init : unable to allocate standard arrays' )
@@ -407 +406 @@
       !
    END SUBROUTINE ice_update_init
+
 
    SUBROUTINE update_rst( cdrw, kt )