Changeset 2353 for branches/nemo_v3_3_beta/NEMOGCM/NEMO/OPA_SRC/DOM/daymod.F90

Timestamp:

2010-11-04T12:18:58+01:00 (14 years ago)

Author:

smasson

Message:

nemo_v3_3_beta: cleaning/debug fldread, see Ticket #751

File:

• branches/nemo_v3_3_beta/NEMOGCM/NEMO/OPA_SRC/DOM/daymod.F90 (modified) (7 diffs)

branches/nemo_v3_3_beta/NEMOGCM/NEMO/OPA_SRC/DOM/daymod.F90

@@ -67 +67 @@
       !!              - nmonth_len, nyear_len, nmonth_half, nmonth_end through day_mth
       !!----------------------------------------------------------------------
-      INTEGER :: inbday, irest
+      INTEGER :: inbday, idweek
       REAL(wp) :: zjul
       !!----------------------------------------------------------------------
@@ -110 +110 @@
 
       !compute number of days between last monday and today      
-      IF( nn_leapy==1 )THEN
-         CALL ymds2ju( 1900, 01, 01, 0.0, zjul )  ! compute julian day value of 01.01.1900 (monday)
-         inbday = INT(fjulday) - NINT(zjul)       ! compute nb day between  01.01.1900 and current day fjulday 
-         irest = MOD(inbday,7)                    ! compute nb day between last monday and current day fjulday 
-         IF(irest==0 )irest = 7 
-      ENDIF
-
-      ! number of seconds since the beginning of current year/month at the middle of the time-step
+      CALL ymds2ju( 1900, 01, 01, 0.0, zjul )  ! compute julian day value of 01.01.1900 (our reference that was a Monday)
+      inbday = NINT(fjulday - zjul)            ! compute nb day between  01.01.1900 and current day  
+      idweek = MOD(inbday, 7)                  ! compute nb day between last monday and current day  
+
+      ! number of seconds since the beginning of current year/month/week/day at the middle of the time-step
       nsec_year  = nday_year * nsecd - ndt05   ! 1 time step before the middle of the first time step
       nsec_month = nday      * nsecd - ndt05   ! because day will be called at the beginning of step
+      nsec_week  = idweek    * nsecd - ndt05
       nsec_day   =             nsecd - ndt05
-      nsec_week  = 0
-      IF( nn_leapy==1 ) nsec_week  = irest     * nsecd - ndt05
 
       ! control print
@@ -213 +209 @@
       nsec_year  = nsec_year  + ndt 
       nsec_month = nsec_month + ndt                 
-      IF( nn_leapy==1 ) nsec_week  = nsec_week  + ndt
+      nsec_week  = nsec_week  + ndt
       nsec_day   = nsec_day   + ndt                
       adatrj  = adatrj  + rdttra(1) / rday
@@ -220 +216 @@
       IF( ABS(adatrj  - REAL(NINT(adatrj ),wp)) < zprec )   adatrj  = REAL(NINT(adatrj ),wp)   ! avoid truncation error
       
-      IF( nsec_day > nsecd ) THEN                        ! NEW day
+      IF( nsec_day > nsecd ) THEN                       ! New day
          !
          nday      = nday + 1
@@ -226 +222 @@
          nsec_day  = ndt05
          !
-         IF( nday == nmonth_len(nmonth) + 1 ) THEN      ! NEW month
+         IF( nday == nmonth_len(nmonth) + 1 ) THEN      ! New month
             nday   = 1
             nmonth = nmonth + 1
             nsec_month = ndt05
-            IF( nmonth == 13 ) THEN                     ! NEW year
+            IF( nmonth == 13 ) THEN                     ! New year
                nyear     = nyear + 1
                nmonth    = 1
@@ -240 +236 @@
          ENDIF
          !
-         ndastp = nyear * 10000 + nmonth * 100 + nday   ! NEW date
+         ndastp = nyear * 10000 + nmonth * 100 + nday   ! New date
          !
          !compute first day of the year in julian days
@@ -251 +247 @@
       ENDIF
 
-      IF( nsec_week .GT. 7*86400 ) nsec_week = ndt05
+      IF( nsec_week > 7*nsecd )   nsec_week = ndt05     ! New week
       
       IF(ln_ctl) THEN