Changeset 9124 for branches/2017/dev_merge_2017/NEMOGCM/NEMO/LIM_SRC_3/icethd.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/icethd.F90 (modified) (3 diffs)

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

@@ -98 +98 @@
       !!-------------------------------------------------------------------
       ! controls
-      IF( nn_timing == 1 )   CALL timing_start('icethd')                                                             ! timing
-      IF( ln_icediachk   )   CALL ice_cons_hsm(0, 'icethd', rdiag_v, rdiag_s, rdiag_t, rdiag_fv, rdiag_fs, rdiag_ft) ! conservation
+      IF( ln_timing    )   CALL timing_start('icethd')                                                             ! timing
+      IF( ln_icediachk )   CALL ice_cons_hsm(0, 'icethd', rdiag_v, rdiag_s, rdiag_t, rdiag_fv, rdiag_fs, rdiag_ft) ! conservation
 
       IF( kt == nit000 .AND. lwp ) THEN
@@ -271 +271 @@
       !                                                    !     & make sure at_i=SUM(a_i) & ato_i=1 where at_i=0
       !                   
-      IF( jpl > 1 )        CALL ice_itd_rem( kt )          ! --- Transport ice between thickness categories --- !
-      !
-      IF( ln_icedO )       CALL ice_thd_do                 ! --- frazil ice growing in leads --- !
+      IF( jpl > 1      )   CALL ice_itd_rem( kt )          ! --- Transport ice between thickness categories --- !
+      !
+      IF( ln_icedO     )   CALL ice_thd_do                 ! --- frazil ice growing in leads --- !
       !
       ! controls
-      IF( ln_icectl      )   CALL ice_prt    (kt, iiceprt, jiceprt, 1, ' - ice thermodyn. - ') ! prints
-      IF( ln_ctl         )   CALL ice_prt3D  ('icethd')                                        ! prints
-      IF( nn_timing == 1 )   CALL timing_stop('icethd')                                        ! timing
+      IF( ln_icectl )   CALL ice_prt    (kt, iiceprt, jiceprt, 1, ' - ice thermodyn. - ') ! prints
+      IF( ln_ctl    )   CALL ice_prt3D  ('icethd')                                        ! prints
+      IF( ln_timing )   CALL timing_stop('icethd')                                        ! timing
       !
    END SUBROUTINE ice_thd 
@@ -568 +568 @@
       REWIND( numnam_ice_cfg )              ! Namelist namthd in configuration namelist : Ice thermodynamics
       READ  ( numnam_ice_cfg, namthd, IOSTAT = ios, ERR = 902 )
-902   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namthd in configuration namelist', lwp )
+902   IF( ios >  0 ) CALL ctl_nam ( ios , 'namthd in configuration namelist', lwp )
       IF(lwm) WRITE ( numoni, namthd )
       !