Changeset 2128 for branches/devukmo2010/NEMO/OPA_SRC/DYN/dynspg_ts.F90

Timestamp:

2010-09-28T14:29:51+02:00 (14 years ago)

Author:

rfurner

Message:

merged branches OBS, ASM, Rivers, BDY & mixed_dynldf ready for vn3.3 merge

File:

• branches/devukmo2010/NEMO/OPA_SRC/DYN/dynspg_ts.F90 (modified) (3 diffs)

branches/devukmo2010/NEMO/OPA_SRC/DYN/dynspg_ts.F90

@@ -7 +7 @@
    !!              -   ! 2008-01  (R. Benshila)  change averaging method
    !!             3.2  ! 2009-07  (R. Benshila, G. Madec) Complete revisit associated to vvl reactivation
+   !!             3.3  ! 2010-09  (D. Storkey, E. O'Dea) update for BDY for Shelf configurations
   !!---------------------------------------------------------------------
 #if defined key_dynspg_ts   ||   defined key_esopa
@@ -352 +353 @@
          !                                                !  ------------------
          IF( lk_obc                     )   CALL obc_dta_bt( kt, jn   )
-         IF( lk_bdy  .OR.  ln_bdy_tides )   CALL bdy_dta_bt( kt, jn+1 )
+         IF( lk_bdy  .OR.  ln_bdy_tides )   CALL bdy_dta_bt( kt, jn+1, icycle )
 
          !                                                !* after ssh_e
@@ -379 +380 @@
          DO jj = 2, jpjm1                                      ! leap-frog on ssh_e
             DO ji = fs_2, fs_jpim1   ! vector opt.
-               ssha_e(ji,jj) = ( zsshb_e(ji,jj) - z2dt_e * ( zraur * emp(ji,jj) + zhdiv(ji,jj) ) ) * tmask(ji,jj,1)
+               ssha_e(ji,jj) = ( zsshb_e(ji,jj) - z2dt_e * ( zraur * ( emp(ji,jj)-rnf(ji,jj) ) + zhdiv(ji,jj) ) ) * tmask(ji,jj,1) 
             END DO
          END DO