Changeset 804

Timestamp:

2008-01-31T10:44:45+01:00 (16 years ago)

Author:

ctlod

Message:

allow good date when perfoming restarts, see ticket:#55

File:

• branches/dev_001_SBC/NEMO/OPA_SRC/daymod.F90 (modified) (2 diffs)

branches/dev_001_SBC/NEMO/OPA_SRC/daymod.F90

@@ -123 +123 @@
 
          ! number of seconds since...
-         rsec_year  = REAL( nday_year - 1 ) * rday - rdttra(1)      ! 00h 1st day of the current year
-         rsec_day   = REAL( nday      - 1 ) * rday - rdttra(1)      ! 00h 1st day of the current month
-         rsec_month =                              - rdttra(1)      ! 00h         of the current day
+         IF( ln_rstart )   THEN
+            rsec_year  = REAL( nday_year ) * rday     - rdttra(1)      ! 00h 1st day of the current year
+            rsec_month = REAL( nday      ) * rday     - rdttra(1)      ! 00h 1st day of the current month
+            rsec_day   = REAL( nday      ) * rday     - rdttra(1)      ! 00h         of the current day
+         ELSE
+            rsec_year  = REAL( nday_year - 1 ) * rday - rdttra(1)      ! 00h 1st day of the current year
+            rsec_month = REAL( nday      - 1 ) * rday - rdttra(1)      ! 00h 1st day of the current month
+            rsec_day   =                              - rdttra(1)      ! 00h         of the current day
+         ENDIF
 
          ! control print
-         IF(lwp) WRITE(numout,*)' ==============>> time-step =', kt, ' Initial DATE= ',   &
+         IF(lwp) WRITE(numout,*)' ==============>> time-step =', kt, ' Initial DATE Y/M/D = ',   &
                &                   nyear, '/', nmonth, '/', nday, '  rsec_day:', rsec_day
 
-         !
          !                     ! -------------------------------- ! 
       ELSE                     !  Model calendar at time-step kt  !
@@ -178 +183 @@
             ndastp = nyear * 10000 + nmonth * 100 + nday   ! NEW date
             !
-!           IF(lwp) WRITE(numout,'(a,i8,a,i4,a,i2,a,i2,a,i3)') '======>> time-step =', kt,   &
-!              &   '      New day, DATE= ', nyear, '/', nmonth, '/', nday, '      nday_year = ', nday_year
-!           IF(lwp) WRITE(numout,'(a,F9.0,a,F9.0,a,F9.0)') '         rsec_year = ', rsec_year,   &
-!              &   '   rsec_month = ', rsec_month, '   rsec_day = ', rsec_day
+           IF(lwp) WRITE(numout,'(a,i8,a,i4,a,i2,a,i2,a,i3)') '======>> time-step =', kt,   &
+              &   '      New day, DATE Y/M/D = ', nyear, '/', nmonth, '/', nday, '      nday_year = ', nday_year
+           IF(lwp) WRITE(numout,'(a,F9.0,a,F9.0,a,F9.0)') '         rsec_year = ', rsec_year,   &
+              &   '   rsec_month = ', rsec_month, '   rsec_day = ', rsec_day
          ENDIF