Changeset 9923 for NEMO/branches/2018/dev_r9838_ENHANCE04_MLF/src/OCE/SBC/updtide.F90

Timestamp:

2018-07-11T10:24:17+02:00 (6 years ago)

Author:

gm

Message:

#1911 (ENHANCE-04): step I.2: dev_r9838_ENHANCE04_MLF

File:

• NEMO/branches/2018/dev_r9838_ENHANCE04_MLF/src/OCE/SBC/updtide.F90 (modified) (5 diffs)

NEMO/branches/2018/dev_r9838_ENHANCE04_MLF/src/OCE/SBC/updtide.F90

@@ -6 +6 @@
    !! History :  9.0  !  07  (O. Le Galloudec)  Original code
    !!----------------------------------------------------------------------
-   !!   upd_tide       : update tidal potential
+
    !!----------------------------------------------------------------------
-   USE oce             ! ocean dynamics and tracers variables
-   USE dom_oce         ! ocean space and time domain
-   USE in_out_manager  ! I/O units
-   USE phycst          ! physical constant
-   USE sbctide         ! tide potential variable
-   USE tideini, ONLY: ln_tide_ramp, rdttideramp
+   !!   upd_tide      : update tidal potential
+   !!----------------------------------------------------------------------
+   USE oce            ! ocean dynamics and tracers variables
+   USE dom_oce        ! ocean space and time domain
+   USE in_out_manager ! I/O units
+   USE phycst         ! physical constant
+   USE sbctide        ! tide potential variable
+   USE tideini , ONLY : ln_tide_ramp, rn_ramp
 
    IMPLICIT NONE
@@ -37 +39 @@
       !! ** Action  :   pot_astro   actronomical potential
       !!----------------------------------------------------------------------      
-      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 ::   time_offset ! time offset in number 
-                                                     ! of internal steps             (lk_dynspg_ts=F)
-                                                     ! of external steps             (lk_dynspg_ts=T)
+      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 ::   time_offset ! time offset in number  of internal steps (lk_dynspg_ts=F)
+      !                                              !                        of external steps (lk_dynspg_ts=T)
       !
+      INTEGER  ::   ji, jj, jk   ! dummy loop indices
       INTEGER  ::   joffset      ! local integer
-      INTEGER  ::   ji, jj, jk   ! dummy loop indices
       REAL(wp) ::   zt, zramp    ! local scalar
       REAL(wp), DIMENSION(nb_harmo) ::   zwt 
@@ -50 +51 @@
       !
       !                               ! tide pulsation at model time step (or sub-time-step)
-      zt = ( kt - kt_tide ) * rdt
+      zt = ( kt - kt_tide ) * rn_Dt
       !
       joffset = 0
@@ -56 +57 @@
       !
       IF( PRESENT( kit ) )   THEN
-         zt = zt + ( kit +  joffset - 1 ) * rdt / REAL( nn_baro, wp )
+         zt = zt + ( kit +  joffset - 1 ) * rn_Dt / REAL( nn_e, wp )
       ELSE
-         zt = zt + joffset * rdt
+         zt = zt + joffset * rn_Dt
       ENDIF
       !
@@ -69 +70 @@
       !
       IF( ln_tide_ramp ) THEN         ! linear increase if asked
-         zt = ( kt - nit000 ) * rdt
-         IF( PRESENT( kit ) )   zt = zt + ( kit + joffset -1) * rdt / REAL( nn_baro, wp )
-         zramp = MIN(  MAX( zt / (rdttideramp*rday) , 0._wp ) , 1._wp  )
+         zt = ( kt - nit000 ) * rn_Dt
+         IF( PRESENT( kit ) )   zt = zt + ( kit + joffset -1) * rn_Dt / REAL( nn_e, wp )
+         zramp = MIN(  MAX( 0._wp , zt / (rn_ramp*rday) ) , 1._wp  )
          pot_astro(:,:) = zramp * pot_astro(:,:)
       ENDIF