Changeset 4354 for branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/OPA_SRC/BDY/bdydyn3d.F90

Timestamp:

2014-01-17T17:56:32+01:00 (10 years ago)

Author:

jchanut

Message:

Restore AGRIF and BDY compatibility, see ticket #1133

File:

• branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/OPA_SRC/BDY/bdydyn3d.F90 (modified) (6 diffs)

branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/OPA_SRC/BDY/bdydyn3d.F90

@@ -15 +15 @@
    !!----------------------------------------------------------------------
    USE timing          ! Timing
-   USE wrk_nemo        ! Memory Allocation
    USE oce             ! ocean dynamics and tracers 
    USE dom_oce         ! ocean space and time domain
@@ -266 +265 @@
       REAL(wp) ::   zwgt           ! boundary weight
       INTEGER  ::  ib_bdy          ! loop index
-      REAL(wp), POINTER, DIMENSION(:,:) :: phur1, phvr1     ! inverse depth at u and v points
       !!----------------------------------------------------------------------
       !
@@ -272 +270 @@
       !
       !-------------------------------------------------------
-      ! Remove barotropic part from before velocity
-      !-------------------------------------------------------
-      CALL wrk_alloc(jpi,jpj,pub2d,pvb2d,phur1,phvr1) 
-
-      pub2d(:,:) = 0.e0
-      pvb2d(:,:) = 0.e0
-
-      phur1(:,:) = 0.
-      phvr1(:,:) = 0.
-      DO jk = 1, jpkm1
-#if defined key_vvl
-         phur1(:,:) = phur1(:,:) + fse3u_a(:,:,jk) * umask(:,:,jk)
-         phvr1(:,:) = phvr1(:,:) + fse3v_a(:,:,jk) * vmask(:,:,jk)
-         pub2d(:,:) = pub2d(:,:) + fse3u_b(:,:,jk)* ub(:,:,jk)   *umask(:,:,jk) 
-         pvb2d(:,:) = pvb2d(:,:) + fse3v_b(:,:,jk)* vb(:,:,jk)   *vmask(:,:,jk)
-#else
-         pub2d(:,:) = pub2d(:,:) + fse3u(:,:,jk) * ub(:,:,jk)  * umask(:,:,jk)
-         pvb2d(:,:) = pvb2d(:,:) + fse3v(:,:,jk) * vb(:,:,jk)  * vmask(:,:,jk)
-#endif
-      END DO
-
-      IF( lk_vvl ) THEN
-         phur1(:,:) = umask(:,:,1) / ( phur1(:,:) + 1. - umask(:,:,1) )
-         phvr1(:,:) = vmask(:,:,1) / ( phvr1(:,:) + 1. - vmask(:,:,1) )
-         pub2d(:,:) = pub2d(:,:) * umask(:,:,1) * phur1(:,:)
-         pvb2d(:,:) = pvb2d(:,:) * vmask(:,:,1) * phvr1(:,:)
-      ELSE
-         pub2d(:,:) = pvb2d(:,:) * hur(:,:)
-         pvb2d(:,:) = pub2d(:,:) * hvr(:,:)
-      ENDIF
 
       DO ib_bdy=1, nb_bdy
@@ -312 +280 @@
                DO jk = 1, jpkm1
                   ua(ii,ij,jk) = ( ua(ii,ij,jk) + zwgt * ( dta_bdy(ib_bdy)%u3d(jb,jk) - &
-                                   ub(ii,ij,jk) + pub2d(ii,ij)) ) * umask(ii,ij,jk)
+                                   ub(ii,ij,jk) + ub_b(ii,ij)) ) * umask(ii,ij,jk)
                END DO
             END DO
@@ -323 +291 @@
                DO jk = 1, jpkm1
                   va(ii,ij,jk) = ( va(ii,ij,jk) + zwgt * ( dta_bdy(ib_bdy)%v3d(jb,jk) -  &
-                                   vb(ii,ij,jk) + pvb2d(ii,ij)) ) * vmask(ii,ij,jk)
+                                   vb(ii,ij,jk) + vb_b(ii,ij)) ) * vmask(ii,ij,jk)
                END DO
             END DO
@@ -329 +297 @@
       ENDDO
       !
-      CALL wrk_dealloc(jpi,jpj,pub2d,pvb2d,phur1,phvr1) 
-      !
       CALL lbc_lnk( ua, 'U', -1. )   ;   CALL lbc_lnk( va, 'V', -1. )   ! Boundary points should be updated
       !