Changeset 15020 for NEMO/branches/2021/ticket2680_C1D_PAPA/src/OCE/DOM/domqco.F90

Timestamp:

2021-06-18T15:21:42+02:00 (3 years ago)

Author:

gsamson

Message:

merge trunk into branch (#2680)

File:

• NEMO/branches/2021/ticket2680_C1D_PAPA/src/OCE/DOM/domqco.F90 (modified) (2 diffs)

NEMO/branches/2021/ticket2680_C1D_PAPA/src/OCE/DOM/domqco.F90

@@ -184 +184 @@
          !                                ! no 'key_qcoTest_FluxForm' : surface weighted ssh average
 
-      DO_2D_OVR( nn_hls, nn_hls-1, nn_hls, nn_hls-1 )                               ! start from 1 since lbc_lnk('F') doesn't update the 1st row/line
+      DO_2D_OVR( nn_hls-1, nn_hls-1, nn_hls-1, nn_hls-1 )
          ! round brackets added to fix the order of floating point operations
          ! needed to ensure halo 1 - halo 2 compatibility
@@ -197 +197 @@
 !!st         ELSE                                      !- Flux Form   (simple averaging)
 #else
-      DO_2D_OVR( nn_hls, nn_hls-1, nn_hls, nn_hls-1 )
+      DO_2D_OVR( nn_hls-1, nn_hls-1, nn_hls-1, nn_hls-1 )
          ! round brackets added to fix the order of floating point operations
          ! needed to ensure halo 1 - halo 2 compatibility
          pr3f(ji,jj) = 0.25_wp * ( ( pssh(ji,jj  ) + pssh(ji+1,jj  ) ) &
-            &                     + ( pssh(ji,jj+1) + pssh(ji+1,jj+1)  &
+            &                    + ( pssh(ji,jj+1) + pssh(ji+1,jj+1)   &
             &                       )                                  & ! bracket for halo 1 - halo 2 compatibility
             &                    ) * r1_hf_0(ji,jj)