Changeset 9124 for branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/BDY/bdyice.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/OPA_SRC/BDY/bdyice.F90 (modified) (7 diffs)

branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/BDY/bdyice.F90

@@ -58 +58 @@
       !!----------------------------------------------------------------------
       !
+      IF( ln_timing )   CALL timing_start('bdy_ice')
+      !
       CALL ice_var_glo2eqv
       !
@@ -63 +65 @@
          !
          SELECT CASE( cn_ice_lim(ib_bdy) )
-         CASE('none')
-            CYCLE
-         CASE('frs')
-            CALL bdy_ice_frs( idx_bdy(ib_bdy), dta_bdy(ib_bdy), kt, ib_bdy )
+         CASE('none')   ;   CYCLE
+         CASE('frs' )   ;   CALL bdy_ice_frs( idx_bdy(ib_bdy), dta_bdy(ib_bdy), kt, ib_bdy )
          CASE DEFAULT
             CALL ctl_stop( 'bdy_ice : unrecognised option for open boundaries for ice fields' )
@@ -73 +73 @@
       END DO
       !
-                        CALL ice_var_zapsmall
-                        CALL ice_var_agg(1)
+      CALL ice_var_zapsmall
+      CALL ice_var_agg(1)
+      !
       IF( ln_icectl )   CALL ice_prt( kt, iiceprt, jiceprt, 1, ' - ice thermo bdy - ' )
+      IF( ln_timing )   CALL timing_stop('bdy_ice')
       !
    END SUBROUTINE bdy_ice
@@ -102 +104 @@
       REAL(wp) ::   ztmelts, zdh
       !!------------------------------------------------------------------------------
-      !
-      IF( ln_timing )   CALL timing_start('bdy_ice_frs')
       !
       jgrd = 1      ! Everything is at T-points here
@@ -255 +255 @@
       IF( jpl > 1 )   CALL ice_itd_reb( kt )
       !      
-      IF( ln_timing )   CALL timing_stop('bdy_ice_frs')
-      !
    END SUBROUTINE bdy_ice_frs
 
@@ -277 +275 @@
       REAL(wp) ::   zmsk1, zmsk2, zflag
       !!------------------------------------------------------------------------------
-      !
-      IF( ln_timing )   CALL timing_start('bdy_ice_dyn')
       !
       DO ib_bdy=1, nb_bdy
@@ -355 +351 @@
       END DO
       !
-      IF( ln_timing )   CALL timing_stop('bdy_ice_dyn')
-      !
     END SUBROUTINE bdy_ice_dyn