Changeset 11241 for NEMO/branches/2019/dev_r10984_HPC-13_IRRMANN_BDY_optimization/src/OCE/DYN/dynspg_ts.F90

Timestamp:

2019-07-10T11:46:48+02:00 (4 years ago)

Author:

girrmann

Message:

dev_r10984_HPC-13 : regroup communications in dyn_spg_ts, does not change the result, see #2285

File:

• NEMO/branches/2019/dev_r10984_HPC-13_IRRMANN_BDY_optimization/src/OCE/DYN/dynspg_ts.F90 (modified) (3 diffs)

NEMO/branches/2019/dev_r10984_HPC-13_IRRMANN_BDY_optimization/src/OCE/DYN/dynspg_ts.F90

@@ -557 +557 @@
          ! Sea Surface Height at u-,v-points (vvl case only)
          IF( .NOT.ln_linssh ) THEN                                
-            DO jj = 2, jpjm1
+            DO jj = 2, jpjm1   ! INNER domain, will be extended to whole domain later
                DO ji = 2, jpim1      ! NO Vector Opt.
                   zsshu_a(ji,jj) = r1_2 * ssumask(ji,jj) * r1_e1e2u(ji,jj)    &
@@ -567 +567 @@
                END DO
             END DO
-            CALL lbc_lnk_multi( 'dynspg_ts', zsshu_a, 'U', 1._wp, zsshv_a, 'V', 1._wp )
          ENDIF   
          !         
@@ -681 +680 @@
          ENDIF
 
-         
-         IF( .NOT.ln_linssh ) THEN                     !* Update ocean depth (variable volume case only)
-            hu_e (:,:) = hu_0(:,:) + zsshu_a(:,:)
+       
+         IF( .NOT. ln_linssh ) THEN
+            !                                             !* domain lateral boundary
+            CALL lbc_lnk_multi( 'dynspg_ts', ua_e   , 'U', -1._wp, va_e   , 'V', -1._wp &
+                 &                         , zsshu_a, 'U',  1._wp, zsshv_a, 'V',  1._wp )
+            !
+            hu_e (:,:) = hu_0(:,:) + zsshu_a(:,:)         !* Update ocean depth (variable volume case only)
             hv_e (:,:) = hv_0(:,:) + zsshv_a(:,:)
             hur_e(:,:) = ssumask(:,:) / ( hu_e(:,:) + 1._wp - ssumask(:,:) )
             hvr_e(:,:) = ssvmask(:,:) / ( hv_e(:,:) + 1._wp - ssvmask(:,:) )
             !
-         ENDIF
-         !                                             !* domain lateral boundary
-         CALL lbc_lnk_multi( 'dynspg_ts', ua_e, 'U', -1._wp, va_e , 'V', -1._wp )
+         ELSE
+            !                                             !* domain lateral boundary
+            CALL lbc_lnk_multi( 'dynspg_ts', ua_e   , 'U', -1._wp, va_e   , 'V', -1._wp )
+            !
+         ENDIF
          !
          !                                                 ! open boundaries