Changeset 3680 for branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/OPA_SRC/BDY/bdydyn2d.F90

Timestamp:

2012-11-27T15:42:24+01:00 (11 years ago)

Author:

rblod

Message:

First commit of the final branch for 2012 (future nemo_3_5), see ticket #1028

File:

• branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/OPA_SRC/BDY/bdydyn2d.F90 (modified) (8 diffs)

branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/OPA_SRC/BDY/bdydyn2d.F90

@@ -5 +5 @@
    !!======================================================================
    !! History :  3.4  !  2011     (D. Storkey) new module as part of BDY rewrite
+   !!            3.5  !  2012     (S. Mocavero, I. Epicoco) Optimization of BDY communications
    !!----------------------------------------------------------------------
 #if defined key_bdy 
@@ -51 +52 @@
             CYCLE
          CASE(jp_frs)
-            CALL bdy_dyn2d_frs( idx_bdy(ib_bdy), dta_bdy(ib_bdy) )
+            CALL bdy_dyn2d_frs( idx_bdy(ib_bdy), dta_bdy(ib_bdy), ib_bdy )
          CASE(jp_flather)
-            CALL bdy_dyn2d_fla( idx_bdy(ib_bdy), dta_bdy(ib_bdy) )
+            CALL bdy_dyn2d_fla( idx_bdy(ib_bdy), dta_bdy(ib_bdy), ib_bdy )
          CASE DEFAULT
             CALL ctl_stop( 'bdy_dyn2d : unrecognised option for open boundaries for barotropic variables' )
@@ -61 +62 @@
    END SUBROUTINE bdy_dyn2d
 
-   SUBROUTINE bdy_dyn2d_frs( idx, dta )
+   SUBROUTINE bdy_dyn2d_frs( idx, dta, ib_bdy )
       !!----------------------------------------------------------------------
       !!                  ***  SUBROUTINE bdy_dyn2d_frs  ***
@@ -74 +75 @@
       TYPE(OBC_INDEX), INTENT(in) ::   idx  ! OBC indices
       TYPE(OBC_DATA),  INTENT(in) ::   dta  ! OBC external data
+      INTEGER,         INTENT(in) ::   ib_bdy  ! BDY set index
       !!
       INTEGER  ::   jb, jk         ! dummy loop indices
@@ -97 +99 @@
          pv2d(ii,ij) = ( pv2d(ii,ij) + zwgt * ( dta%v2d(jb) - pv2d(ii,ij) ) ) * vmask(ii,ij,1)
       END DO 
-      CALL lbc_lnk( pu2d, 'U', -1. ) 
-      CALL lbc_lnk( pv2d, 'V', -1. )   ! Boundary points should be updated
+      CALL lbc_bdy_lnk( pu2d, 'U', -1., ib_bdy ) 
+      CALL lbc_bdy_lnk( pv2d, 'V', -1., ib_bdy)   ! Boundary points should be updated
       !
       IF( nn_timing == 1 ) CALL timing_stop('bdy_dyn2d_frs')
@@ -106 +108 @@
 
 
-   SUBROUTINE bdy_dyn2d_fla( idx, dta )
+   SUBROUTINE bdy_dyn2d_fla( idx, dta, ib_bdy )
       !!----------------------------------------------------------------------
       !!                 ***  SUBROUTINE bdy_dyn2d_fla  ***
@@ -127 +129 @@
       TYPE(OBC_INDEX),              INTENT(in) ::   idx  ! OBC indices
       TYPE(OBC_DATA),               INTENT(in) ::   dta  ! OBC external data
+      INTEGER,                      INTENT(in) ::   ib_bdy  ! BDY set index
 
       INTEGER  ::   jb, igrd                         ! dummy loop indices
@@ -177 +180 @@
          pv2d(ii,ij) = zforc + zcorr * vmask(ii,ij,1)
       END DO
-      CALL lbc_lnk( pu2d, 'U', -1. )   ! Boundary points should be updated
-      CALL lbc_lnk( pv2d, 'V', -1. )   !
+      CALL lbc_bdy_lnk( pu2d, 'U', -1., ib_bdy )   ! Boundary points should be updated
+      CALL lbc_bdy_lnk( pv2d, 'V', -1., ib_bdy )   !
       !
       IF( nn_timing == 1 ) CALL timing_stop('bdy_dyn2d_fla')