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

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

@@ -72 +72 @@
       !!--------------------------------------------------------------------
       !
-      IF( nn_timing == 1 )   CALL timing_start('icedyn')
+      IF( ln_timing )   CALL timing_start('icedyn')
       !
       IF( kt == nit000 .AND. lwp ) THEN
@@ -123 +123 @@
       END SELECT
       !
-      IF( nn_timing == 1 )   CALL timing_stop('icedyn')
+      IF( ln_timing )   CALL timing_stop('icedyn')
       !
    END SUBROUTINE ice_dyn
+
 
    SUBROUTINE Hbig( phmax )
@@ -171 +172 @@
    END SUBROUTINE Hbig
 
+
    SUBROUTINE Hpiling
       !!-------------------------------------------------------------------
@@ -221 +223 @@
       REWIND( numnam_ice_cfg )         ! Namelist namdyn in configuration namelist : Ice dynamics
       READ  ( numnam_ice_cfg, namdyn, IOSTAT = ios, ERR = 902 )
-902   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namdyn in configuration namelist', lwp )
+902   IF( ios >  0 ) CALL ctl_nam ( ios , 'namdyn in configuration namelist', lwp )
       IF(lwm) WRITE ( numoni, namdyn )
       !