Changeset 14122

Timestamp:

2020-12-07T18:37:04+01:00 (3 years ago)

Author:

jchanut

Message:

#2222, prevent from an out of bound error with AGRIF

File:

• NEMO/trunk/src/NST/agrif_oce_interp.F90 (modified) (3 diffs)

NEMO/trunk/src/NST/agrif_oce_interp.F90

@@ -651 +651 @@
       IF( ll_int_cons ) THEN  ! Conservative interpolation
          IF ( lk_tint2d_notinterp ) THEN
+            Agrif_UseSpecialValue = .FALSE.
             CALL Agrif_Bc_variable( ub2b_interp_id, calledweight=1._wp, procname=interpub2b_const )
             CALL Agrif_Bc_variable( vb2b_interp_id, calledweight=1._wp, procname=interpvb2b_const ) 
             ! Divergence conserving correction terms:
-            CALL Agrif_Bc_variable(    ub2b_cor_id, calledweight=1._wp, procname=        ub2b_cor )
-            CALL Agrif_Bc_variable(    vb2b_cor_id, calledweight=1._wp, procname=        vb2b_cor )
+            IF ( Agrif_Rhox()>1 ) CALL Agrif_Bc_variable(    ub2b_cor_id, calledweight=1._wp, procname=ub2b_cor )
+            IF ( Agrif_Rhoy()>1 ) CALL Agrif_Bc_variable(    vb2b_cor_id, calledweight=1._wp, procname=vb2b_cor )
          ELSE
             ! order matters here !!!!!!
@@ -1438 +1439 @@
          ptab(:,:) = 0._wp
          DO ji=i1+1,i2-1
-            DO jj=j1+1,j2
+            DO jj=j1+1,j2-1
                ptab(ji,jj) = 0.25_wp*( ( vb2_b(ji+1,jj  )*e1v(ji+1,jj  )   & 
                            &            -vb2_b(ji-1,jj  )*e1v(ji-1,jj  ) ) &
@@ -1542 +1543 @@
          ptab(:,:) = 0._wp
          DO ji=i1+1,i2-1
-            DO jj=j1+1,j2
+            DO jj=j1+1,j2-1
                ptab(ji,jj) = 0.25_wp*( ( ub2_b(ji  ,jj+1)*e2u(ji  ,jj+1)   & 
                            &            -ub2_b(ji  ,jj-1)*e2u(ji  ,jj-1) ) &