Changeset 2128 for branches/devukmo2010/NEMO/OPA_SRC/DYN/sshwzv.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/sshwzv.F90 (modified) (6 diffs)

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

@@ -5 +5 @@
    !!==============================================================================
    !! History :  3.1  !  2009-02  (G. Madec, M. Leclair)  Original code
+   !!            3.3  !  2010-05  (K. Mogensen, A. Weaver, M. Martin, D. Lea) Assimilation interface
+   !!            3.3  !  2010-09  (D.Storkey and E.O'Dea) bug fixes for BDY module
    !!----------------------------------------------------------------------
 
@@ -25 +27 @@
    USE obc_par         ! open boundary cond. parameter
    USE obc_oce
+   USE bdy_oce
    USE diaar5, ONLY :   lk_diaar5
    USE iom
+   USE sbcrnf, ONLY  : rnf_dep, rnf_mod_dep  ! River runoff 
+#if defined key_asminc   
+   USE asminc          ! Assimilation increment
+#endif
 
    IMPLICIT NONE
@@ -134 +141 @@
          hvr(:,:) = vmask(:,:,1) / ( hv(:,:) + 1.e0 - vmask(:,:,1) )
          !
+         DO jj=1,jpj  
+           DO ji=1,jpi  
+             rnf_dep(ji,jj)=0 
+             DO jk=1,rnf_mod_dep(ji,jj)                          ! recalculates rnf_dep to be the depth 
+               rnf_dep(ji,jj)=rnf_dep(ji,jj)+fse3t(ji,jj,jk)    ! in metres to the bottom of the relevant grid box 
+             ENDDO 
+           ENDDO 
+         ENDDO 
+         ! 
       ENDIF
 
@@ -161 +177 @@
          CALL lbc_lnk( ssha, 'T', 1. )  ! absolutly compulsory !! (jmm)
       ENDIF
+#endif
+
+#if defined key_bdy
+      ssha(:,:) = ssha(:,:) * bdytmask(:,:)
+      CALL lbc_lnk( ssha, 'T', 1. ) 
 #endif
 
@@ -183 +204 @@
       ENDIF
 
+! Include the IAU weighted SSH increment
+#if defined key_asminc
+      IF( ( lk_asminc ).AND.( ln_sshinc ).AND.( ln_asmiau ) ) THEN
+         CALL ssh_asm_inc( kt )
+         ssha(:,:) = ssha(:,:) + z2dt * ssh_iau(:,:)
+      ENDIF
+#endif
+
       !                                           !------------------------------!
       !                                           !     Now Vertical Velocity    !
@@ -191 +220 @@
               &                    - (  fse3t_a(:,:,jk)                   &
               &                       - fse3t_b(:,:,jk) ) * tmask(:,:,jk) / z2dt
+#if defined key_bdy
+         wn(:,:,jk) = wn(:,:,jk) * bdytmask(:,:)
+#endif
       END DO
       !