Changeset 2723 for trunk/NEMOGCM/NEMO

Timestamp:

2011-04-06T12:21:48+02:00 (13 years ago)

Author:

rblod

Message:

Correction in dynnxt for bdy, see ticket #811

File:

• trunk/NEMOGCM/NEMO/OPA_SRC/DYN/dynnxt.F90 (modified) (2 diffs)

trunk/NEMOGCM/NEMO/OPA_SRC/DYN/dynnxt.F90

@@ -16 +16 @@
    !!            3.2  !  2009-06  (G. Madec, R.Benshila)  re-introduce the vvl option
    !!            3.3  !  2010-09  (D. Storkey, E.O'Dea) Bug fix for BDY module
+   !!            3.3  !  2011-03  (P. Oddo) Bug fix for time-splitting+(BDY-OBC) and not VVL
    !!-------------------------------------------------------------------------
   
@@ -175 +176 @@
 # elif defined key_bdy 
       !                                !* BDY open boundaries
-      IF( .NOT. lk_dynspg_flt )   CALL bdy_dyn_frs( kt )
+      IF( .NOT. lk_dynspg_flt ) THEN
+         CALL bdy_dyn_frs( kt )
+#  if ! defined key_vvl
+         ua_e(:,:) = 0.e0
+         va_e(:,:) = 0.e0
+         ! Set these variables for use in bdy_dyn_fla
+         hur_e(:,:) = hur(:,:)
+         hvr_e(:,:) = hvr(:,:)
+         DO jk = 1, jpkm1   !! Vertically integrated momentum trends
+            ua_e(:,:) = ua_e(:,:) + fse3u(:,:,jk) * umask(:,:,jk) * ua(:,:,jk)
+            va_e(:,:) = va_e(:,:) + fse3v(:,:,jk) * vmask(:,:,jk) * va(:,:,jk)
+         END DO
+         ua_e(:,:) = ua_e(:,:) * hur(:,:)
+         va_e(:,:) = va_e(:,:) * hvr(:,:)
+         DO jk = 1 , jpkm1
+            ua(:,:,jk) = ua(:,:,jk) - ua_e(:,:)
+            va(:,:,jk) = va(:,:,jk) - va_e(:,:)
+         END DO
+         CALL bdy_dta_fla( kt+1, 0,2*nn_baro)
+         CALL bdy_dyn_fla( sshn_b )
+         CALL lbc_lnk( ua_e, 'U', -1. )   ! Boundary points should be updated
+         CALL lbc_lnk( va_e, 'V', -1. )   !
+         DO jk = 1 , jpkm1
+            ua(:,:,jk) = ( ua(:,:,jk) + ua_e(:,:) ) * umask(:,:,jk)
+            va(:,:,jk) = ( va(:,:,jk) + va_e(:,:) ) * vmask(:,:,jk)
+         END DO
+#  endif
+      ENDIF
 # endif
       !