Changeset 15272 for branches/UKMO/dev_r5518_obs_oper_strthr

Timestamp:

2021-09-20T12:32:09+02:00 (3 years ago)

Author:

jroberts

Message:

Sort out spacing in new code

File:

• branches/UKMO/dev_r5518_obs_oper_strthr/NEMOGCM/NEMO/OPA_SRC/DOM/daymod.F90 (modified) (4 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 : '
@@ -338 +340 @@
             ! Control of date
             IF( nit000 - NINT( zkt ) /= 1 .AND. nrstdt /= 0 )                                         &
-                 &   CALL ctl_stop( ' ===>>>> : problem with nit000 for the restart',                 &
-                 &                  ' verify the restart file or rerun with nrstdt = 0 (namelist)' )
+               &   CALL ctl_stop( ' ===>>>> : problem with nit000 for the restart',                 &
+               &                  ' verify the restart file or rerun with nrstdt = 0 (namelist)' )
             ! 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  )
-          CALL iom_get( numror, 'ntime', ktime )
-          nn_time0=INT(ktime)
+               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
-          zdayfrac=adatrj-INT(adatrj)
-          ksecs = NINT(zdayfrac*86400)        ! Nearest second to catch rounding errors in adatrj         
-          ihour = INT(ksecs/3600)
-          iminute = ksecs/60-ihour*60
-           
+               zdayfrac=adatrj-INT(adatrj)
+               ksecs = NINT(zdayfrac*86400)        ! Nearest second to catch rounding errors in adatrj
+               ihour = INT(ksecs/3600)
+               iminute = ksecs/60-ihour*60
+
                ! Add to nn_time0
                nhour   =   nn_time0 / 100
                nminute = ( nn_time0 - nhour * 100 )
-          nminute=nminute+iminute
-          
-          IF( nminute >= 60 ) THEN
-             nminute=nminute-60
-        nhour=nhour+1
-          ENDIF
-          nhour=nhour+ihour
-          IF( nhour >= 24 ) THEN
-        nhour=nhour-24
-             adatrj=adatrj+1
-          ENDIF          
-          nn_time0 = nhour * 100 + nminute
-          adatrj = INT(adatrj)                    ! adatrj set to integer as nn_time0 updated          
+               nminute=nminute+iminute
+
+               IF( nminute >= 60 ) THEN
+                  nminute=nminute-60
+                  nhour=nhour+1
+               ENDIF
+               nhour=nhour+ihour
+               IF( nhour >= 24 ) THEN
+                  nhour=nhour-24
+                  adatrj=adatrj+1
+               ENDIF
+               nn_time0 = nhour * 100 + nminute
+               adatrj = INT(adatrj)                    ! adatrj set to integer as nn_time0 updated
             ELSE
                ! parameters corresponding to nit000 - 1 (as we start the step loop with a call to day)
@@ -405 +409 @@
          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
@@ -410 +415 @@
          !                                                                     ! 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
       !