Changeset 10860 for NEMO/branches/2019/dev_r10742_ENHANCE-12_SimonM-Tides/src/OCE/TDE/tide_mod.F90

Timestamp:

2019-04-11T11:35:27+02:00 (5 years ago)

Author:

smueller

Message:

Relocation of the time-of-day computation in subroutine upd_tide (module tide_mod) to its callers (ticket #2194)

File:

• NEMO/branches/2019/dev_r10742_ENHANCE-12_SimonM-Tides/src/OCE/TDE/tide_mod.F90 (modified) (8 diffs)

NEMO/branches/2019/dev_r10742_ENHANCE-12_SimonM-Tides/src/OCE/TDE/tide_mod.F90

@@ -54 +54 @@
    LOGICAL , PUBLIC ::   ln_tide_ramp    !:
    INTEGER , PUBLIC ::   nb_harmo        !: Number of active tidal components
-   INTEGER , PUBLIC ::   kt_tide         !:
    REAL(wp), PUBLIC ::   rn_tide_ramp_dt     !:
    REAL(wp), PUBLIC ::   rn_scal_load    !:
@@ -64 +63 @@
    REAL(wp),         ALLOCATABLE, DIMENSION(:,:,:) ::   amp_load, phi_load
 
+   REAL(wp) ::   rn_tide_ramp_t !   Elapsed time in seconds
 
    REAL(wp) ::   sh_T, sh_s, sh_h, sh_p, sh_p1             ! astronomic angles
@@ -146 +146 @@
       ! Ensure that tidal components have been set in namelist_cfg
       IF( nb_harmo == 0 )   CALL ctl_stop( 'tide_init : No tidal components set in nam_tide' )
-      !
-      ! Reference time step for time-dependent tidal parameters
-      kt_tide = nit000
       !
       IF (.NOT.ln_scal_load ) rn_scal_load = 0._wp
@@ -339 +336 @@
       IF( nsec_day == NINT(0.5_wp * rdt) .OR. kt == nit000 ) THEN      ! start a new day
          !
-         ! If the run does not start from midnight then need to initialise tides
-         ! at the start of the current day (only occurs when kt==nit000)
-         IF ( nsec_day /= NINT(0.5_wp * rdt) ) THEN 
-            kt_tide = kt - (nsec_day - 0.5_wp * rdt)/rdt
-         ELSE
-            kt_tide = kt 
-         ENDIF
          CALL tide_harmo(tide_components, tide_harmonics, ndt05) ! Update oscillation parameters of tidal components for start of current day
          !
@@ -361 +351 @@
          IF( ln_tide_pot )   CALL tide_init_potential
          !
+         rn_tide_ramp_t = (kt - nit000)*rdt !   Elapsed time in seconds
       ENDIF
       !
@@ -730 +721 @@
 
 
-   SUBROUTINE upd_tide( kt, kit, time_offset )
+   SUBROUTINE upd_tide(pdelta)
       !!----------------------------------------------------------------------
       !!                 ***  ROUTINE upd_tide  ***
@@ -740 +731 @@
       !! ** 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  ::   joffset      ! local integer
-      INTEGER  ::   ji, jj, jk   ! dummy loop indices
-      REAL(wp) ::   zt, zramp    ! local scalar
-      REAL(wp), DIMENSION(nb_harmo) ::   zwt 
+      REAL, INTENT(in)              ::   pdelta      ! Temporal offset in seconds
+      INTEGER                       ::   jk          ! Dummy loop index
+      REAL(wp)                      ::   zt, zramp   ! Local scalars
+      REAL(wp), DIMENSION(nb_harmo) ::   zwt         ! Temporary array
       !!----------------------------------------------------------------------      
       !
-      !                               ! tide pulsation at model time step (or sub-time-step)
-      zt = ( kt - kt_tide ) * rdt
-      !
-      joffset = 0
-      IF( PRESENT( time_offset ) )   joffset = time_offset
-      !
-      IF( PRESENT( kit ) )   THEN
-         zt = zt + ( kit +  joffset - 1 ) * rdt / REAL( nn_baro, wp )
-      ELSE
-         zt = zt + joffset * rdt
-      ENDIF
-      !
-      zwt(:) = tide_harmonics(:)%omega * zt
-
+      zwt(:) = tide_harmonics(:)%omega * pdelta
+      !
       pot_astro(:,:) = 0._wp          ! update tidal potential (sum of all harmonics)
       DO jk = 1, nb_harmo   
@@ -772 +745 @@
       !
       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 )
+         zt = rn_tide_ramp_t + pdelta
          zramp = MIN(  MAX( zt / (rn_tide_ramp_dt*rday) , 0._wp ) , 1._wp  )
          pot_astro(:,:) = zramp * pot_astro(:,:)