Changeset 15258

Timestamp:

2021-09-14T16:34:36+02:00 (3 years ago)

Author:

jroberts

Message:

Remove nn_timing=2 as cause merge conflict

File:

• branches/UKMO/dev_r5518_obs_oper_strthr/NEMOGCM/NEMO/OPA_SRC/DOM/daymod.F90 (modified) (5 diffs)

branches/UKMO/dev_r5518_obs_oper_strthr/NEMOGCM/NEMO/OPA_SRC/DOM/daymod.F90

@@ -324 +324 @@
          IF( iom_varid( numror, 'kt', ldstop = .FALSE. ) > 0 ) THEN
             ! Get Calendar informations
-            IF(nn_timing == 2)  CALL timing_start('iom_rstget')
             CALL iom_get( numror, 'kt', zkt )   ! last time-step of previous run
-            IF(nn_timing == 2)  CALL timing_stop('iom_rstget')
             IF(lwp) THEN
                WRITE(numout,*) ' *** Info read in restart : '
@@ -344 +342 @@
             ! define ndastp and adatrj
             IF ( nrstdt == 2 ) THEN
-               IF(nn_timing == 2)  CALL timing_start('iom_rstget')
                ! read the parameters correspondting to nit000 - 1 (last time step of previous run)
                CALL iom_get( numror, 'ndastp', zndastp )
@@ -350 +347 @@
                CALL iom_get( numror, 'adatrj', adatrj  )
           CALL iom_get( numror, 'ntime', ktime )
-               IF(nn_timing == 2)  CALL timing_stop('iom_rstget')
           nn_time0=INT(ktime)
                ! calculate start time in hours and minutes
@@ -409 +405 @@
          ENDIF
          ! calendar control
-         IF(nn_timing == 2)  CALL timing_start('iom_rstput')
          CALL iom_rstput( kt, nitrst, numrow, 'kt'     , REAL( kt    , wp) )   ! time-step
          CALL iom_rstput( kt, nitrst, numrow, 'ndastp' , REAL( ndastp, wp) )   ! date
@@ -415 +410 @@
          !                                                                     ! the begining of the run [s]
          CALL iom_rstput( kt, nitrst, numrow, 'ntime'  , REAL( nn_time0, wp) ) ! time
-         IF(nn_timing == 2)  CALL timing_stop('iom_rstput')
       ENDIF
       !