Changeset 3970 for branches/2013/dev_r3867_MERCATOR1_DYN/NEMOGCM/NEMO/OPA_SRC/SBC/updtide.F90

Timestamp:

2013-07-11T15:59:14+02:00 (11 years ago)

Author:

cbricaud

Message:

Time splitting update, see ticket #1079

File:

• branches/2013/dev_r3867_MERCATOR1_DYN/NEMOGCM/NEMO/OPA_SRC/SBC/updtide.F90 (modified) (5 diffs)

branches/2013/dev_r3867_MERCATOR1_DYN/NEMOGCM/NEMO/OPA_SRC/SBC/updtide.F90

@@ -4 +4 @@
   !! Initialization of tidal forcing
   !! History :  9.0  !  07  (O. Le Galloudec)  Original code
+  !!            3.5  !  2013-07   (J. Chanut) Compliant with time splitting changes
   !!=================================================================================
 #if defined key_tide
@@ -26 +27 @@
 CONTAINS
 
-  SUBROUTINE upd_tide (kt,kit)
+  SUBROUTINE upd_tide (kt, kit, time_offset)
     !!----------------------------------------------------------------------
     !!                 ***  ROUTINE upd_tide  ***
@@ -32 +33 @@
     !! * Local declarations
 
-    INTEGER, INTENT( in ) ::   kt,kit      ! ocean time-step index
-    INTEGER  :: ji,jj,jk
-    REAL (wp) :: zramp
-    REAL (wp), DIMENSION(nb_harmo) :: zwt 
+    INTEGER, INTENT( in ) ::   kt            ! ocean time-step index
+    INTEGER, INTENT( in ), OPTIONAL  :: kit  ! Barotropic timestep counter (ts option)
+    INTEGER, INTENT( in ), OPTIONAL  :: time_offset ! time offset in units of timesteps
+    INTEGER                          :: time_add    ! time offset in units of timesteps
+    INTEGER  :: ji, jj, jk                   
+    REAL (wp) :: zramp, z_arg, z_t
     !...............................................................................
 
     pot_astro(:,:)=0.e0
     zramp = 1.e0
+    time_add = 0
 
-    IF (lk_dynspg_ts) THEN
-       zwt(:) = omega_tide(:)* ((kt-kt_tide)*rdt + kit*(rdt/REAL(nn_baro,wp)))
-       IF (ln_tide_ramp) THEN
-          zramp = MIN(MAX( ((kt-nit000)*rdt + kit*(rdt/REAL(nn_baro,wp)))/(rdttideramp*rday),0.),1.)
-       ENDIF
-    ELSE
-       zwt(:) = omega_tide(:)*(kt-kt_tide)*rdt
-       IF (ln_tide_ramp) THEN
-          zramp = MIN(MAX( ((kt-nit000)*rdt)/(rdttideramp*rday),0.),1.) 
-       ENDIF  
+    IF( PRESENT(time_offset) ) THEN
+       time_add = time_offset
+    ENDIF
+         
+    IF( PRESENT(kit) ) THEN  
+       z_arg = ((kt-kt_tide) * rdt + (kit+0.5*(time_add-1)) * rdt / REAL(nn_baro,wp) )
+    ELSE                              
+       z_arg = ((kt-kt_tide)+time_add) * rdt
     ENDIF
 
-    do jk=1,nb_harmo
-       do ji=1,jpi
-          do jj=1,jpj
-             pot_astro(ji,jj)=pot_astro(ji,jj) + zramp*(amp_pot(ji,jj,jk)*COS(zwt(jk)+phi_pot(ji,jj,jk)))      
-          enddo
-       enddo
-    enddo
+    IF (ln_tide_ramp) zramp = MIN(MAX( (z_arg + (kt_tide-nit000)*rdt)/(rdttideramp*rday),0.),1.)
+
+    DO jk=1,nb_harmo
+       z_t = z_arg * omega_tide(jk)
+       DO ji=1,jpi
+          DO jj=1,jpj
+             pot_astro(ji,jj)=pot_astro(ji,jj) + zramp * amp_pot(ji,jj,jk)*COS(z_t + phi_pot(ji,jj,jk))      
+          END DO
+       END DO
+    END DO
 
   END SUBROUTINE upd_tide
@@ -68 +73 @@
   !!----------------------------------------------------------------------
 CONTAINS
-  SUBROUTINE upd_tide( kt,kit )          ! Empty routine
-    INTEGER,INTENT (IN) :: kt, kit
+  SUBROUTINE upd_tide( kt)          ! Empty routine
+    INTEGER,INTENT (IN) :: kt
     WRITE(*,*) 'upd_tide: You should not have seen this print! error?', kt
   END SUBROUTINE upd_tide
@@ -78 +83 @@
 
 END MODULE updtide
+