- Timestamp:
- 2010-10-11T18:51:54+02:00 (14 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/DYN/sshwzv.F90
r1792 r2207 5 5 !!============================================================================== 6 6 !! History : 3.1 ! 2009-02 (G. Madec, M. Leclair) Original code 7 !! 3.3 ! 2010-05 (K. Mogensen, A. Weaver, M. Martin, D. Lea) Assimilation interface 8 !! 3.3 ! 2010-09 (D.Storkey and E.O'Dea) bug fixes for BDY module 7 9 !!---------------------------------------------------------------------- 8 10 … … 25 27 USE obc_par ! open boundary cond. parameter 26 28 USE obc_oce 29 USE bdy_oce 27 30 USE diaar5, ONLY : lk_diaar5 28 31 USE iom 32 USE sbcrnf, ONLY : h_rnf, nk_rnf ! River runoff 33 #if defined key_asminc 34 USE asminc ! Assimilation increment 35 #endif 29 36 30 37 IMPLICIT NONE … … 133 140 hur(:,:) = umask(:,:,1) / ( hu(:,:) + 1.e0 - umask(:,:,1) ) 134 141 hvr(:,:) = vmask(:,:,1) / ( hv(:,:) + 1.e0 - vmask(:,:,1) ) 135 ! 142 ! 136 143 ENDIF 137 144 … … 161 168 CALL lbc_lnk( ssha, 'T', 1. ) ! absolutly compulsory !! (jmm) 162 169 ENDIF 170 #endif 171 172 #if defined key_bdy 173 ssha(:,:) = ssha(:,:) * bdytmask(:,:) 174 CALL lbc_lnk( ssha, 'T', 1. ) 163 175 #endif 164 176 … … 183 195 ENDIF 184 196 197 ! Include the IAU weighted SSH increment 198 #if defined key_asminc 199 IF( ( lk_asminc ).AND.( ln_sshinc ).AND.( ln_asmiau ) ) THEN 200 CALL ssh_asm_inc( kt ) 201 ssha(:,:) = ssha(:,:) + z2dt * ssh_iau(:,:) 202 ENDIF 203 #endif 204 185 205 ! !------------------------------! 186 206 ! ! Now Vertical Velocity ! … … 191 211 & - ( fse3t_a(:,:,jk) & 192 212 & - fse3t_b(:,:,jk) ) * tmask(:,:,jk) / z2dt 213 #if defined key_bdy 214 wn(:,:,jk) = wn(:,:,jk) * bdytmask(:,:) 215 #endif 193 216 END DO 194 217 !
Note: See TracChangeset
for help on using the changeset viewer.