Changeset 9090 for branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DOM

Timestamp:

2017-12-15T18:12:43+01:00 (6 years ago)

Author:

flavoni

Message:

change lbc_lnk in lbc_lnk_multi

Location:

branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DOM

Files:

• dommsk.F90 (modified) (2 diffs)
• domvvl.F90 (modified) (1 diff)
• iscplrst.F90 (modified) (2 diffs)

branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DOM/dommsk.F90

@@ -184 +184 @@
          END DO
       END DO
-      CALL lbc_lnk( umask  , 'U', 1._wp )      ! Lateral boundary conditions
-      CALL lbc_lnk( vmask  , 'V', 1._wp )
-      CALL lbc_lnk( fmask  , 'F', 1._wp )
-
+      CALL lbc_lnk_multi( umask, 'U', 1., vmask, 'V', 1., fmask, 'F', 1. )      ! Lateral boundary conditions
  
       ! Ocean/land mask at wu-, wv- and w points    (computed from tmask)
@@ -276 +273 @@
             END DO
 #if defined key_agrif 
-       IF( .NOT. AGRIF_Root() ) THEN 
-          IF ((nbondi ==  1).OR.(nbondi == 2)) fmask(nlci-1 , :     ,jk) = 0.e0      ! east 
-          IF ((nbondi == -1).OR.(nbondi == 2)) fmask(1      , :     ,jk) = 0.e0      ! west 
-          IF ((nbondj ==  1).OR.(nbondj == 2)) fmask(:      ,nlcj-1 ,jk) = 0.e0      ! north 
-          IF ((nbondj == -1).OR.(nbondj == 2)) fmask(:      ,1      ,jk) = 0.e0      ! south 
-       ENDIF 
+            IF( .NOT. AGRIF_Root() ) THEN 
+               IF ((nbondi ==  1).OR.(nbondi == 2)) fmask(nlci-1 , :     ,jk) = 0.e0      ! east 
+               IF ((nbondi == -1).OR.(nbondi == 2)) fmask(1      , :     ,jk) = 0.e0      ! west 
+               IF ((nbondj ==  1).OR.(nbondj == 2)) fmask(:      ,nlcj-1 ,jk) = 0.e0      ! north 
+               IF ((nbondj == -1).OR.(nbondj == 2)) fmask(:      ,1      ,jk) = 0.e0      ! south 
+            ENDIF 
 #endif 
          END DO

branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DOM/domvvl.F90

@@ -389 +389 @@
          !                       ! d - thickness diffusion transport: boundary conditions
          !                             (stored for tracer advction and continuity equation)
-         CALL lbc_lnk( un_td , 'U' , -1._wp)
-         CALL lbc_lnk( vn_td , 'V' , -1._wp)
+         CALL lbc_lnk_multi( un_td , 'U' , -1._wp, vn_td , 'V' , -1._wp)
 
          ! 4 - Time stepping of baroclinic scale factors

branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DOM/iscplrst.F90

@@ -175 +175 @@
             END DO
          END DO
-         CALL lbc_lnk( sshn   , 'T', 1._wp )
-         CALL lbc_lnk( zsmask1, 'T', 1._wp )
+         CALL lbc_lnk_multi( sshn, 'T', 1., zsmask1, 'T', 1. )
          zssh0   = sshn
          zsmask0 = zsmask1
@@ -345 +344 @@
           END DO
           
-          CALL lbc_lnk(tsn(:,:,:,1),'T',1._wp)
-          CALL lbc_lnk(tsn(:,:,:,2),'T',1._wp)
-          CALL lbc_lnk(ztmask1,     'T',1._wp)
+          CALL lbc_lnk_multi( tsn(:,:,:,jp_tem), 'T', 1., tsn(:,:,:,jp_sal), 'T', 1., ztmask1, 'T', 1.)
 
           ! update