Changeset 1192 for trunk

Timestamp:

2008-09-18T10:34:40+02:00 (16 years ago)

Author:

smasson

Message:

fix ticket #252

Location:

trunk/NEMO/OPA_SRC

Files:

• SBC/fldread.F90 (modified) (2 diffs)
• daymod.F90 (modified) (1 diff)

trunk/NEMO/OPA_SRC/SBC/fldread.F90

@@ -140 +140 @@
                ! to the NEW year/month. If it is the case, we are at the beginning of the year/month when calling fld_rec
                ! so sd(jf)%rec_a(1) = 1
-               IF( sd(jf)%rec_a(1) == 1 )   CALL fld_clopn( sd(jf), nyear, nmonth )
+               IF( sd(jf)%rec_a(1) == 1 .AND. .NOT. sd(jf)%ln_clim )   CALL fld_clopn( sd(jf), nyear, nmonth )
             ENDIF
 
@@ -301 +301 @@
          irec = nmonth + INT( ztmp )
 
-         IF( sdjf%ln_tint ) THEN   ;   sdjf%swap_sec = rmonth_half(irec)   ! swap at the middle of the month
-         ELSE                      ;   sdjf%swap_sec = rmonth_end( irec)   ! swap at the end    of the month
-         ENDIF
-
-         sdjf%rec_a(:) = (/ REAL( irec, wp ), rmonth_half(irec) /)   ! define after  record number and time
+         IF( sdjf%ln_tint ) THEN   ;   sdjf%swap_sec = rmonth_half(irec) + sec1jan000   ! swap at the middle of the month
+         ELSE                      ;   sdjf%swap_sec = rmonth_end( irec) + sec1jan000   ! swap at the end    of the month
+         ENDIF
+
+         sdjf%rec_a(:) = (/ REAL( irec, wp ), rmonth_half(irec) + sec1jan000 /)   ! define after  record number and time
          irec = irec - 1                                                          ! move back to previous record
-         sdjf%rec_b(:) = (/ REAL( irec, wp ), rmonth_half(irec) /)   ! define before record number and time
+         sdjf%rec_b(:) = (/ REAL( irec, wp ), rmonth_half(irec) + sec1jan000 /)   ! define before record number and time
          !
       ELSE                          ! higher frequency mean (in hours)

trunk/NEMO/OPA_SRC/daymod.F90

@@ -173 +173 @@
          rmonth_half(jm) = rmonth_half(jm-1) + 0.5 * rday * REAL( nmonth_len(jm-1) + nmonth_len(jm), wp )
       END DO
-      rmonth_half(:) = rmonth_half(:) + sec1jan000
 
       rmonth_end(0) = 0.