Changeset 2323 for trunk

Timestamp:

2010-10-27T16:26:04+02:00 (13 years ago)

Author:

smasson

Message:

bugfix: temporal shift in fldread in the trunk, see ticket:745

File:

• trunk/NEMO/OPA_SRC/SBC/fldread.F90 (modified) (13 diffs)

trunk/NEMO/OPA_SRC/SBC/fldread.F90

@@ -123 +123 @@
       INTEGER  ::   ireclast   ! last record to be read in the current year file
       INTEGER  ::   isecend    ! number of second since Jan. 1st 00h of nit000 year at nitend
+      INTEGER  ::   isecsbc    ! number of seconds between Jan. 1st 00h of nit000 year and the middle of sbc time step
       LOGICAL  ::   llnxtyr    ! open next year  file?
       LOGICAL  ::   llnxtmth   ! open next month file?
@@ -132 +133 @@
       !
       imf = SIZE( sd )
+      isecsbc = nsec_year + nsec1jan000 + NINT(0.5 * REAL(kn_fsbc - 1,wp) * rdttra(1))   ! centrered in the middle of sbc time step
+      !
       !                                         ! ===================== !
       DO jf = 1, imf                            !    LOOP OVER FIELD    !
          !                                      ! ===================== !
          !
-         IF( kt == nit000 )   CALL fld_init( sd(jf) )
+         IF( kt == nit000 )   CALL fld_init( kn_fsbc, sd(jf) )
          !
          ! read/update the after data?
-         IF( nsec_year + nsec1jan000 > sd(jf)%nswap_sec ) THEN 
+         IF( isecsbc > sd(jf)%nswap_sec ) THEN 
 
             IF( sd(jf)%ln_tint ) THEN         ! time interpolation: swap before record field
@@ -148 +151 @@
 
             ! update record informations
-            CALL fld_rec( sd(jf) )
+            CALL fld_rec( kn_fsbc, sd(jf) )
 
             ! do we have to change the year/month/day of the forcing field?? 
@@ -277 +280 @@
                ENDIF
                !
-               ztinta =  REAL( nsec_year + nsec1jan000 - sd(jf)%nrec_b(2), wp ) / REAL( sd(jf)%nrec_a(2) - sd(jf)%nrec_b(2), wp )
+               ztinta =  REAL( isecsbc - sd(jf)%nrec_b(2), wp ) / REAL( sd(jf)%nrec_a(2) - sd(jf)%nrec_b(2), wp )
                ztintb =  1. - ztinta
 !CDIR COLLAPSE
@@ -302 +305 @@
 
 
-   SUBROUTINE fld_init( sdjf )
+   SUBROUTINE fld_init( kn_fsbc, sdjf )
       !!---------------------------------------------------------------------
       !!                    ***  ROUTINE fld_init  ***
@@ -311 +314 @@
       !! ** Method  :   
       !!----------------------------------------------------------------------
+      INTEGER  , INTENT(in   ) ::   kn_fsbc     ! sbc computation period (in time step) 
       TYPE(FLD), INTENT(inout) ::   sdjf        ! input field related variables
       !!
@@ -331 +335 @@
             
       ! define record informations
-      CALL fld_rec( sdjf )
+      CALL fld_rec( kn_fsbc, sdjf )
+
+      ! Note: shifting time to be centrered in the middle of sbc time step impacts only nsec_* variables of the calendar 
 
       IF( sdjf%ln_tint ) THEN ! we need to read the previous record and we will put it in the current record structure
@@ -406 +412 @@
 
 
-   SUBROUTINE fld_rec( sdjf )
+   SUBROUTINE fld_rec( kn_fsbc, sdjf )
       !!---------------------------------------------------------------------
       !!                    ***  ROUTINE fld_rec  ***
@@ -414 +420 @@
       !! ** Method  :   
       !!----------------------------------------------------------------------
+      INTEGER  , INTENT(in   ) ::   kn_fsbc     ! sbc computation period (in time step) 
       TYPE(FLD), INTENT(inout) ::   sdjf        ! input field related variables
       !!
@@ -421 +428 @@
       INTEGER  ::   ifreq_sec   ! frequency mean (in seconds)
       !!----------------------------------------------------------------------
+      !
+      ! Note: shifting time to be centrered in the middle of sbc time step impacts only nsec_* variables of the calendar 
       !
       IF( sdjf%nfreqh == -1 ) THEN      ! monthly mean
@@ -458 +467 @@
          ELSE                                      ;   ztmp = REAL(nsec_year ,wp)   ! since 00h on Jan 1 of the current year
          ENDIF
+         ztmp = ztmp + 0.5 * REAL(kn_fsbc - 1, wp) * rdttra(1)   ! shift time to be centrered in the middle of sbc time step
+         ztmp = ztmp + 0.01 * rdttra(1)                          ! add 0.01 time step to avoid truncation error 
          IF( sdjf%ln_tint ) THEN                ! time interpolation, shift by 1/2 record
             !
@@ -471 +482 @@
             !       forcing record :  1     2     3
             !                   
-            ztmp= ztmp / ifreq_sec + 0.5
+            ztmp = ztmp / REAL(ifreq_sec, wp) + 0.5
          ELSE                 
             !
@@ -485 +496 @@
             !       forcing record :  1     2     3
             !                            
-            ztmp= ztmp / ifreq_sec
+            ztmp = ztmp / REAL(ifreq_sec, wp)
          ENDIF
          irec = 1 + INT( ztmp )