Changeset 12127 for NEMO/branches/2019/dev_r12114_ticket_2263/src/OCE/SBC/updtide.F90

Timestamp:

2019-12-09T18:42:54+01:00 (4 years ago)

Author:

smasson

Message:

dev_r12114_ticket_2263: replace integer kt_offset by real pt_offset, see #2263

File:

• NEMO/branches/2019/dev_r12114_ticket_2263/src/OCE/SBC/updtide.F90 (modified) (3 diffs)

NEMO/branches/2019/dev_r12114_ticket_2263/src/OCE/SBC/updtide.F90

@@ -27 +27 @@
 CONTAINS
 
-   SUBROUTINE upd_tide( kt, kit, kt_offset )
+   SUBROUTINE upd_tide( kt, kit, pt_offset )
       !!----------------------------------------------------------------------
       !!                 ***  ROUTINE upd_tide  ***
@@ -39 +39 @@
       INTEGER, INTENT(in)           ::   kt      ! ocean time-step index
       INTEGER, INTENT(in), OPTIONAL ::   kit     ! external mode sub-time-step index (lk_dynspg_ts=T)
-      INTEGER, INTENT(in), OPTIONAL ::   kt_offset ! time offset in number 
+      REAL(wp),INTENT(in), OPTIONAL ::   pt_offset ! time offset in number 
                                                      ! of internal steps             (lk_dynspg_ts=F)
                                                      ! of external steps             (lk_dynspg_ts=T)
       !
-      INTEGER  ::   ioffset      ! local integer
       INTEGER  ::   ji, jj, jk   ! dummy loop indices
       REAL(wp) ::   zt, zramp    ! local scalar
+      REAL(wp) ::   zt_offset    
       REAL(wp), DIMENSION(nb_harmo) ::   zwt 
       !!----------------------------------------------------------------------      
       !
       !                               ! tide pulsation at model time step (or sub-time-step)
-      zt = ( kt - kt_tide ) * rdt
+      zt = REAL( kt - kt_tide, wp ) * rdt
       !
-      ioffset = 0
-      IF( PRESENT( kt_offset ) )   ioffset = kt_offset
+      zt_offset = 0._wp
+      IF( PRESENT( pt_offset ) )   zt_offset = pt_offset
       !
       IF( PRESENT( kit ) )   THEN
-         zt = zt + ( kit +  ioffset - 1 ) * rdt / REAL( nn_baro, wp )
+         zt = zt + ( REAL( kit, wp ) +  zt_offset - 1._wp ) * rdt / REAL( nn_baro, wp )
       ELSE
-         zt = zt + ioffset * rdt
+         zt = zt + zt_offset * rdt
       ENDIF
       !
@@ -70 +70 @@
       IF( ln_tide_ramp ) THEN         ! linear increase if asked
          zt = ( kt - nit000 ) * rdt
-         IF( PRESENT( kit ) )   zt = zt + ( kit + ioffset -1) * rdt / REAL( nn_baro, wp )
+         IF( PRESENT( kit ) )   zt = zt + ( REAL( kit, wp ) + zt_offset -1._wp ) * rdt / REAL( nn_baro, wp )
          zramp = MIN(  MAX( zt / (rdttideramp*rday) , 0._wp ) , 1._wp  )
          pot_astro(:,:) = zramp * pot_astro(:,:)