Changeset 15255 for branches/UKMO/dev_r5518_obs_oper_update/NEMOGCM/NEMO/OPA_SRC/SBC

Timestamp:

2021-09-14T13:46:08+02:00 (3 years ago)

Author:

jroberts

Message:

undo previous commit made in error

File:

• branches/UKMO/dev_r5518_obs_oper_update/NEMOGCM/NEMO/OPA_SRC/SBC/sbctide.F90 (modified) (3 diffs)

branches/UKMO/dev_r5518_obs_oper_update/NEMOGCM/NEMO/OPA_SRC/SBC/sbctide.F90

@@ -47 +47 @@
       INTEGER, INTENT( in ) ::   kt     ! ocean time-step
       INTEGER               ::   jk     ! dummy loop index
-      INTEGER               ::   nsec_day_orig     ! Temporary variable
       !!----------------------------------------------------------------------
 
-      IF( nsec_day == NINT(0.5_wp * rdttra(1)) .OR. kt == nit000 ) THEN    ! start a new day
+      IF( nsec_day == NINT(0.5_wp * rdttra(1)) ) THEN      ! start a new day
          !
          IF( kt == nit000 ) THEN
@@ -61 +60 @@
          pot_astro(:,:) = 0._wp
          !
-         ! 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)
-         ! Temporarily set nsec_day to beginning of day.
-         nsec_day_orig = nsec_day
-         IF ( nsec_day /= NINT(0.5_wp * rdttra(1)) ) THEN
-            kt_tide = kt - (nsec_day - 0.5_wp * rdttra(1))/rdttra(1)
-            nsec_day = NINT(0.5_wp * rdttra(1))
-         ELSE
-            kt_tide = kt 
-         ENDIF
+         CALL tide_harmo( omega_tide, v0tide, utide, ftide, ntide, nb_harmo )
          !
-         CALL tide_harmo( omega_tide, v0tide, utide, ftide, ntide, nb_harmo )
+         kt_tide = kt
          !
          IF(lwp) THEN
@@ -84 +74 @@
          !
          IF( ln_tide_pot )   CALL tide_init_potential
-         !
-         ! Reset nsec_day
-         nsec_day = nsec_day_orig
          !
       ENDIF