Changeset 3666 for branches/2012/dev_LOCEAN_UKMO_CMCC_INGV_2012/NEMOGCM/NEMO/OPA_SRC/BDY/bdyice_lim2.F90

Timestamp:

2012-11-26T15:22:04+01:00 (11 years ago)

Author:

cetlod

Message:

commit the changes resulting for the merged branches, see ticket #1025

File:

• branches/2012/dev_LOCEAN_UKMO_CMCC_INGV_2012/NEMOGCM/NEMO/OPA_SRC/BDY/bdyice_lim2.F90 (modified) (5 diffs)

branches/2012/dev_LOCEAN_UKMO_CMCC_INGV_2012/NEMOGCM/NEMO/OPA_SRC/BDY/bdyice_lim2.F90

@@ -6 +6 @@
    !!  History :  3.3  !  2010-09 (D. Storkey)  Original code
    !!             3.4  !  2011    (D. Storkey) rewrite in preparation for OBC-BDY merge
+   !!             3.5  !  2012    (S. Mocavero, I. Epicoco) Optimization of BDY communications
    !!----------------------------------------------------------------------
 #if defined   key_bdy   &&   defined key_lim2
@@ -53 +54 @@
             CYCLE
          CASE(jp_frs)
-            CALL bdy_ice_frs( idx_bdy(ib_bdy), dta_bdy(ib_bdy) )
+            CALL bdy_ice_frs( idx_bdy(ib_bdy), dta_bdy(ib_bdy), ib_bdy )
          CASE DEFAULT
             CALL ctl_stop( 'bdy_ice_lim_2 : unrecognised option for open boundaries for ice fields' )
@@ -61 +62 @@
    END SUBROUTINE bdy_ice_lim_2
 
-   SUBROUTINE bdy_ice_frs( idx, dta )
+   SUBROUTINE bdy_ice_frs( idx, dta, ib_bdy )
       !!------------------------------------------------------------------------------
       !!                 ***  SUBROUTINE bdy_ice_frs  ***
@@ -73 +74 @@
       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, jgrd   ! dummy loop indices
@@ -94 +96 @@
          END DO
       END DO 
-      CALL lbc_lnk( frld, 'T', 1. )                                         ! lateral boundary conditions
-      CALL lbc_lnk( hicif, 'T', 1. )   ;   CALL lbc_lnk( hsnif, 'T', 1. )
+      CALL lbc_bdy_lnk( frld, 'T', 1., ib_bdy )                                         ! lateral boundary conditions
+      CALL lbc_bdy_lnk( hicif, 'T', 1., ib_bdy )   ;   CALL lbc_bdy_lnk( hsnif, 'T', 1., ib_bdy )
       !      
       IF( nn_timing == 1 ) CALL timing_stop('bdy_ice_frs')