Changeset 4772 for branches/2014/dev_r4650_UKMO7_STARTHOUR/NEMOGCM/NEMO/OPA_SRC/ASM/asminc.F90

Timestamp:

2014-09-17T19:19:59+02:00 (10 years ago)

Author:

djlea

Message:

Changes to allow hour start time. First version.

File:

• branches/2014/dev_r4650_UKMO7_STARTHOUR/NEMOGCM/NEMO/OPA_SRC/ASM/asminc.F90 (modified) (9 diffs)

branches/2014/dev_r4650_UKMO7_STARTHOUR/NEMOGCM/NEMO/OPA_SRC/ASM/asminc.F90

@@ -17 +17 @@
    !!----------------------------------------------------------------------
    !!   asm_inc_init   : Initialize the increment arrays and IAU weights
-   !!   calc_date      : Compute the calendar date YYYYMMDD on a given step
+   !!   calc_date      : Compute the calendar date YYYYMMDDHH on a given step
    !!   tra_asm_inc    : Apply the tracer (T and S) increments
    !!   dyn_asm_inc    : Apply the dynamic (u and v) increments
@@ -45 +45 @@
    
    PUBLIC   asm_inc_init   !: Initialize the increment arrays and IAU weights
-   PUBLIC   calc_date      !: Compute the calendar date YYYYMMDD on a given step
+   PUBLIC   calc_date      !: Compute the calendar date YYYYMMDDHH on a given step
    PUBLIC   tra_asm_inc    !: Apply the tracer (T and S) increments
    PUBLIC   dyn_asm_inc    !: Apply the dynamic (u and v) increments
@@ -115 +115 @@
       INTEGER :: iiauper         ! Number of time steps in the IAU period
       INTEGER :: icycper         ! Number of time steps in the cycle
-      INTEGER :: iitend_date     ! Date YYYYMMDD of final time step
-      INTEGER :: iitbkg_date     ! Date YYYYMMDD of background time step for Jb term
-      INTEGER :: iitdin_date     ! Date YYYYMMDD of background time step for DI
-      INTEGER :: iitiaustr_date  ! Date YYYYMMDD of IAU interval start time step
-      INTEGER :: iitiaufin_date  ! Date YYYYMMDD of IAU interval final time step
+      INTEGER :: iitend_date     ! Date YYYYMMDDHH of final time step
+      INTEGER :: iitbkg_date     ! Date YYYYMMDDHH of background time step for Jb term
+      INTEGER :: iitdin_date     ! Date YYYYMMDDHH of background time step for DI
+      INTEGER :: iitiaustr_date  ! Date YYYYMMDDHH of IAU interval start time step
+      INTEGER :: iitiaufin_date  ! Date YYYYMMDDHH of IAU interval final time step
       INTEGER :: ios             ! Local integer output status for namelist read
 
@@ -556 +556 @@
       !!                    ***  ROUTINE calc_date  ***
       !!          
-      !! ** Purpose : Compute the calendar date YYYYMMDD at a given time step.
-      !!
-      !! ** Method  : Compute the calendar date YYYYMMDD at a given time step.
+      !! ** Purpose : Compute the calendar date YYYYMMDDHH at a given time step.
+      !!
+      !! ** Method  : Compute the calendar date YYYYMMDDHH at a given time step.
       !!
       !! ** Action  : 
@@ -570 +570 @@
       INTEGER :: imon0    ! Initial month
       INTEGER :: iday0    ! Initial day
+      INTEGER :: ihou0    ! Initial hour
       INTEGER :: iyea     ! Current year
       INTEGER :: imon     ! Current month
       INTEGER :: iday     ! Current day
+      INTEGER :: ihou     ! Current hour
       INTEGER :: idaystp  ! Number of days between initial and current date
+      INTEGER :: ihoustp  ! Number of hours
       INTEGER :: idaycnt  ! Day counter
 
@@ -579 +582 @@
 
       !-----------------------------------------------------------------------
-      ! Compute the calendar date YYYYMMDD
+      ! Compute the calendar date YYYYMMDDHH
       !-----------------------------------------------------------------------
 
@@ -585 +588 @@
       iyea0 =   kdate0 / 10000
       imon0 = ( kdate0 - ( iyea0 * 10000 ) ) / 100
-      iday0 =   kdate0 - ( iyea0 * 10000 ) - ( imon0 * 100 ) 
+      iday0 =   kdate0 - ( iyea0 * 10000 ) - ( imon0 * 100 )
+      ihou0 = nn_time0 
 
       ! Check that kt >= kit000 - 1
       IF ( kt < kit000 - 1 ) CALL ctl_stop( ' kt must be >= kit000 - 1')
 
-      ! If kt = kit000 - 1 then set the date to the restart date
-      IF ( kt == kit000 - 1 ) THEN
-
-         kdate = ndastp
-         RETURN
-
-      ENDIF
-
       ! Compute the number of days from the initial date
       idaystp = INT( REAL( kt - kit000 ) * rdt / 86400. )
-   
+      ihoustp = INT( REAL( kt - kit000 ) * rdt / 3600. ) - ( idaystp * 24 )
+
       iday    = iday0
       imon    = imon0
       iyea    = iyea0
+      ihou    = ihou0
       idaycnt = 0
+
+      ! Increment hours
+      ihou = ihou + ihoustp
+      IF ( ihou >= 24 ) THEN
+         ihou = ihou - 24
+         iday = iday + 1
+      ENDIF
 
       CALL calc_month_len( iyea, imonth_len )
@@ -611 +616 @@
          iday = iday + 1
          IF ( iday > imonth_len(imon) )  THEN
-            iday = 1
+            iday = iday - imonth_len(imon)
             imon = imon + 1
          ENDIF
@@ -622 +627 @@
       END DO
       !
-      kdate = iyea * 10000 + imon * 100 + iday
+      kdate = iyea * 1000000 + imon * 10000 + iday * 100 + ihou
       !
    END SUBROUTINE