Changeset 3490 for branches/2012/dev_r3327_MERCATOR1_BDY/NEMOGCM/NEMO/OPA_SRC/SBC/updtide.F90

Timestamp:

2012-10-08T16:27:20+02:00 (12 years ago)

Author:

cbricaud

Message:

add Jerome Chanut 's modications for BDY, Mercator_1 2012 task

File:

• branches/2012/dev_r3327_MERCATOR1_BDY/NEMOGCM/NEMO/OPA_SRC/SBC/updtide.F90 (modified) (3 diffs)

branches/2012/dev_r3327_MERCATOR1_BDY/NEMOGCM/NEMO/OPA_SRC/SBC/updtide.F90

@@ -13 +13 @@
   USE sbctide
   USE dynspg_oce
+  USE tideini, ONLY: ln_tide_ramp, rdttideramp
 
   IMPLICIT NONE
@@ -33 +34 @@
     INTEGER, INTENT( in ) ::   kt,kit      ! ocean time-step index
     INTEGER  :: ji,jj,jk
+    REAL (wp) :: zramp
     REAL (wp), DIMENSION(nb_harmo) :: zwt 
-    !...............................................................................
-    ! Potentiel astronomique
     !...............................................................................
 
     pot_astro(:,:)=0.e0
+    zramp = 1.e0
 
     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  
     ENDIF
 
@@ -49 +56 @@
        do ji=1,jpi
           do jj=1,jpj
-             pot_astro(ji,jj)=pot_astro(ji,jj) + (amp_pot(ji,jj,jk)*COS(zwt(jk)+phi_pot(ji,jj,jk)))      
+             pot_astro(ji,jj)=pot_astro(ji,jj) + zramp*(amp_pot(ji,jj,jk)*COS(zwt(jk)+phi_pot(ji,jj,jk)))      
           enddo
        enddo