Changeset 5872 for branches/2014/dev_r4650_UKMO7_STARTHOUR/NEMOGCM/NEMO/OPA_SRC/DOM/daymod.F90

Timestamp:

2015-11-09T19:20:54+01:00 (8 years ago)

Author:

djlea

Message:

Fixes to enable restartability for runs of less than one day.

File:

• branches/2014/dev_r4650_UKMO7_STARTHOUR/NEMOGCM/NEMO/OPA_SRC/DOM/daymod.F90 (modified) (8 diffs)

branches/2014/dev_r4650_UKMO7_STARTHOUR/NEMOGCM/NEMO/OPA_SRC/DOM/daymod.F90

@@ -11 +11 @@
    !!                 ! 2004-01  (A.M. Treguier) new calculation based on adatrj
    !!                 ! 2006-08  (G. Madec)  surface module major update
+   !!                 ! 2015-11  (D. Lea) Allow non-zero initial time of day
    !!----------------------------------------------------------------------
 
@@ -90 +91 @@
       nday    =   ndastp - (nyear * 10000) - ( nmonth * 100 )
 
-      CALL ymds2ju( nyear, nmonth, nday, nn_time0*3600._wp, fjulday )  
+      nhour   =   nn_time0 / 100
+      nminute = ( nn_time0 - nhour * 100 )
+
+      CALL ymds2ju( nyear, nmonth, nday, nhour*3600._wp+nminute*60._wp, fjulday )  
       IF( ABS(fjulday - REAL(NINT(fjulday),wp)) < 0.1 / rday )   fjulday = REAL(NINT(fjulday),wp)   ! avoid truncation error
       IF( nn_time0*3600 - ndt05 .lt. 0 ) fjulday = fjulday + 1.                    ! move back to the day at nit000 (and not at nit000 - 1)
@@ -118 +122 @@
 
       ! number of seconds since the beginning of current year/month/week/day at the middle of the time-step
-      IF (nn_time0*3600-ndt05 .gt. 0) THEN
+      IF (nhour*3600+nminute*60-ndt05 .gt. 0) THEN
          ! 1 timestep before current middle of first time step is still the same day
-         nsec_year  = (nday_year-1) * nsecd + nn_time0*3600._wp - ndt05 
-         nsec_month = (nday-1)      * nsecd + nn_time0*3600._wp - ndt05    
+         nsec_year  = (nday_year-1) * nsecd + nhour*3600+nminute*60 - ndt05 
+         nsec_month = (nday-1)      * nsecd + nhour*3600+nminute*60 - ndt05    
       ELSE
          ! 1 time step before the middle of the first time step is the previous day 
-         nsec_year  = nday_year * nsecd + nn_time0*3600._wp - ndt05 
-         nsec_month = nday      * nsecd + nn_time0*3600._wp - ndt05   
-      ENDIF
-      nsec_week  = idweek    * nsecd + nn_time0*3600._wp - ndt05
-      nsec_day   =             nn_time0*3600._wp - ndt05 
+         nsec_year  = nday_year * nsecd + nhour*3600+nminute*60 - ndt05 
+         nsec_month = nday      * nsecd + nhour*3600+nminute*60 - ndt05   
+      ENDIF
+      nsec_week  = idweek    * nsecd + nhour*3600+nminute*60 - ndt05
+      nsec_day   =             nhour*3600+nminute*60 - ndt05 
       IF( nsec_day .lt. 0 ) nsec_day = nsec_day + nsecd
       IF( nsec_week .lt. 0 ) nsec_week = nsec_week + nsecd*7
@@ -313 +317 @@
       CHARACTER(len=*), INTENT(in) ::   cdrw       ! "READ"/"WRITE" flag
       !
-      REAL(wp) ::   zkt, zndastp
+      REAL(wp) ::   zkt, zndastp, zdayfrac, ksecs, ktime
+      INTEGER  ::   ihour, iminute
       !!----------------------------------------------------------------------
 
@@ -342 +347 @@
                ndastp = NINT( zndastp )
                CALL iom_get( numror, 'adatrj', adatrj  )
+          CALL iom_get( numror, 'ntime', ktime )
+          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
+           
+               ! 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          
             ELSE
                ! parameters corresponding to nit000 - 1 (as we start the step loop with a call to day)
                ndastp = ndate0        ! ndate0 read in the namelist in dom_nam
-               IF( nn_time0*3600-ndt05 .lt. 0 )  ndastp=ndastp-1      ! Start hour is specified in the namelist (default 0)
+               nhour   =   nn_time0 / 100
+               nminute = ( nn_time0 - nhour * 100 )
+               IF( nhour*3600+nminute*60-ndt05 .lt. 0 )  ndastp=ndastp-1      ! Start hour is specified in the namelist (default 0)
                adatrj = ( REAL( nit000-1, wp ) * rdttra(1) ) / rday
                ! note this is wrong if time step has changed during run
@@ -352 +383 @@
             ! parameters corresponding to nit000 - 1 (as we start the step loop with a call to day)
             ndastp = ndate0           ! ndate0 read in the namelist in dom_nam
-            IF( nn_time0*3600-ndt05 .lt. 0 )  ndastp=ndastp-1      ! Start hour is specified in the namelist (default 0)
+            nhour   =   nn_time0 / 100
+       nminute = ( nn_time0 - nhour * 100 )
+            IF( nhour*3600+nminute*60-ndt05 .lt. 0 )  ndastp=ndastp-1      ! Start hour is specified in the namelist (default 0)
             adatrj = ( REAL( nit000-1, wp ) * rdttra(1) ) / rday
          ENDIF
@@ -361 +394 @@
             WRITE(numout,*) '   date ndastp                                      : ', ndastp
             WRITE(numout,*) '   number of elapsed days since the begining of run : ', adatrj
+       WRITE(numout,*) '   nn_time0                                         : ',nn_time0
             WRITE(numout,*)
          ENDIF
@@ -376 +410 @@
          CALL iom_rstput( kt, nitrst, numrow, 'adatrj' , adatrj            )   ! number of elapsed days since
          !                                                                     ! the begining of the run [s]
+    CALL iom_rstput( kt, nitrst, numrow, 'ntime'  , REAL( nn_time0, wp) ) ! time
       ENDIF
       !