Changeset 10856 for NEMO

Timestamp:

2019-04-09T17:46:52+02:00 (5 years ago)

Author:

smueller

Message:

Replacement of the temporary modification of a global variable in subroutine tide_update (module tide_mod) by an alternative, local mechanism (ticket #2194)

File:

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

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

@@ -335 +335 @@
       INTEGER, INTENT( in ) ::   kt     ! ocean time-step
       INTEGER               ::   jk     ! dummy loop index
-      INTEGER               ::   nsec_day_orig     ! Temporary variable
       !!----------------------------------------------------------------------
       
@@ -342 +341 @@
          ! 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 * rdt) ) THEN 
             kt_tide = kt - (nsec_day - 0.5_wp * rdt)/rdt
-            nsec_day = NINT(0.5_wp * rdt)
          ELSE
             kt_tide = kt 
          ENDIF
-         CALL tide_harmo(tide_components, tide_harmonics) ! Update oscillation parameters of tidal components
+         CALL tide_harmo(tide_components, tide_harmonics, ndt05) ! Update oscillation parameters of tidal components for start of current day
          !
          !
@@ -365 +361 @@
          IF( ln_tide_pot )   CALL tide_init_potential
          !
-         ! Reset nsec_day
-         nsec_day = nsec_day_orig 
       ENDIF
       !
@@ -372 +366 @@
 
 
-   SUBROUTINE tide_harmo( ptide_comp, ptide_harmo )
+   SUBROUTINE tide_harmo( ptide_comp, ptide_harmo, psec_day )
       !
       TYPE(tide),          DIMENSION(:), POINTER ::   ptide_comp   ! Array of selected tidal component parameters
       TYPE(tide_harmonic), DIMENSION(:), POINTER ::   ptide_harmo  ! Oscillation parameters of selected tidal components
-      !
-      CALL astronomic_angle
+      INTEGER, OPTIONAL ::   psec_day                              ! Number of seconds since the start of the current day
+      !
+      IF (PRESENT(psec_day)) THEN 
+         CALL astronomic_angle(psec_day)
+      ELSE
+         CALL astronomic_angle(nsec_day)
+      END IF
       CALL tide_pulse( ptide_comp, ptide_harmo )
       CALL tide_vuf(   ptide_comp, ptide_harmo )
@@ -384 +383 @@
 
 
-   SUBROUTINE astronomic_angle
+   SUBROUTINE astronomic_angle(psec_day)
       !!----------------------------------------------------------------------
       !!  tj is time elapsed since 1st January 1900, 0 hour, counted in julian
       !!  century (e.g. time in days divide by 36525)
       !!----------------------------------------------------------------------
+      INTEGER  ::   psec_day !   Number of seconds from midnight
       REAL(wp) ::   cosI, p, q, t2, t4, sin2I, s2, tgI2, P1, sh_tgn2, at1, at2
       REAL(wp) ::   zqy , zsy, zday, zdj, zhfrac
@@ -399 +399 @@
       zday = zdj + zqy - 1.
       !
-      zhfrac = nsec_day / 3600.
+      zhfrac = psec_day / 3600.
       !
       !----------------------------------------------------------------------