Changeset 11245

Timestamp:

2019-07-10T17:27:04+02:00 (5 years ago)

Author:

girrmann

Message:

dev_r10984_HPC-13 : bugfix following [11241], see #2285

File:

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

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

@@ -567 +567 @@
                END DO
             END DO
+            !                    !* Update ocean depth (variable volume case only)
+            hu_e (2:jpim1,2:jpjm1) = hu_0(2:jpim1,2:jpjm1) + zsshu_a(2:jpim1,2:jpjm1)         
+            hv_e (2:jpim1,2:jpjm1) = hv_0(2:jpim1,2:jpjm1) + zsshv_a(2:jpim1,2:jpjm1)
+            hur_e(2:jpim1,2:jpjm1) = ssumask(2:jpim1,2:jpjm1) / ( hu_e(2:jpim1,2:jpjm1) + 1._wp - ssumask(2:jpim1,2:jpjm1) )
+            hvr_e(2:jpim1,2:jpjm1) = ssvmask(2:jpim1,2:jpjm1) / ( hv_e(2:jpim1,2:jpjm1) + 1._wp - ssvmask(2:jpim1,2:jpjm1) )
          ENDIF   
          !         
@@ -679 +684 @@
             END DO
          ENDIF
-
        
-         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 )
+         IF( .NOT. ln_linssh ) THEN                      !* domain lateral boundary
+            CALL lbc_lnk_multi( 'dynspg_ts', ua_e , 'U', -1._wp, va_e , 'V', -1._wp  &
+                 &                         , hu_e , 'U',  1._wp, hv_e , 'V',  1._wp  &
+                 &                         , hur_e, 'U',  1._wp, hvr_e, '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(:,:) )
-            !
-         ELSE
-            !                                             !* 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