Changeset 9853 for branches/UKMO/dev_isf_remapping_UKESM_GO6package_r9314/NEMOGCM/NEMO/OPA_SRC/DOM/daymod.F90

Timestamp:

2018-06-28T15:00:26+02:00 (6 years ago)

Author:

mathiot

Message:

update to dev_r5518_GO6_package@9321 to avoid conflict during merge

File:

• branches/UKMO/dev_isf_remapping_UKESM_GO6package_r9314/NEMOGCM/NEMO/OPA_SRC/DOM/daymod.F90 (modified) (3 diffs)

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

@@ -309 +309 @@
          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 : '
@@ -327 +329 @@
             ! 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 )
                ndastp = NINT( zndastp )
                CALL iom_get( numror, 'adatrj', adatrj  )
+               IF(nn_timing == 2)  CALL timing_stop('iom_rstget')
             ELSE
                ! parameters correspondting to nit000 - 1 (as we start the step loop with a call to day)
@@ -359 +363 @@
          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
          CALL iom_rstput( kt, nitrst, numrow, 'adatrj' , adatrj            )   ! number of elapsed days since
          !                                                                     ! the begining of the run [s]
+         IF(nn_timing == 2)  CALL timing_stop('iom_rstput')
       ENDIF
       !