Changeset 14640

Timestamp:

2021-03-26T11:04:11+01:00 (3 years ago)

Author:

jchanut

Message:

AGFdomcfg: slight changes in boundary matching location to comply with what is expected in NEMO, #2638

Location:

utils/tools/DOMAINcfg/src

Files:

• agrif_connect.F90 (modified) (4 diffs)
• agrif_user.F90 (modified) (2 diffs)

utils/tools/DOMAINcfg/src/agrif_connect.F90

@@ -184 +184 @@
          DO ji = mi0(ind1), mi1(ind2)   
             DO jj = 1, jpj               
-               ztabramp(ji,jj) = REAL(ind2 - mig(ji), wp) * z1_spongearea * umask(ind1,jj,1)
+               ztabramp(ji,jj) = REAL(ind2 - mig(ji), wp) * z1_spongearea
             END DO
          ENDDO
@@ -203 +203 @@
          DO ji = mi0(ind1), mi1(ind2)
             DO jj = 1, jpj
-               ztabramp(ji,jj) = MAX( ztabramp(ji,jj), REAL( mig(ji) - ind1 ) * z1_spongearea * umask(ind2-1,jj,1) )
+               ztabramp(ji,jj) = MAX( ztabramp(ji,jj), REAL( mig(ji) - ind1 ) * z1_spongearea )
             ENDDO
          ENDDO
@@ -222 +222 @@
          DO jj = mj0(ind1), mj1(ind2) 
             DO ji = 1, jpi
-               ztabramp(ji,jj) = MAX( ztabramp(ji,jj), REAL( ind2 - mjg(jj) ) * z1_spongearea * vmask(ji,ind1,1) )
+               ztabramp(ji,jj) = MAX( ztabramp(ji,jj), REAL( ind2 - mjg(jj) ) * z1_spongearea  )
             END DO
          ENDDO
@@ -241 +241 @@
          DO jj = mj0(ind1), mj1(ind2)
             DO ji = 1, jpi
-               ztabramp(ji,jj) = MAX( ztabramp(ji,jj), REAL( mjg(jj) - ind1 ) * z1_spongearea * vmask(ji,ind2-1,1) )
+               ztabramp(ji,jj) = MAX( ztabramp(ji,jj), REAL( mjg(jj) - ind1 ) * z1_spongearea )
             END DO
          ENDDO

utils/tools/DOMAINcfg/src/agrif_user.F90

@@ -349 +349 @@
       CALL Agrif_Set_bcinterp(e3t_copy_id,interp=AGRIF_constant)
       CALL Agrif_Set_interp(e3t_copy_id,interp=AGRIF_constant)
-      CALL Agrif_Set_bc( e3t_copy_id, (/-npt_copy*irafx,max(nbghostcellsfine_tot_x,nbghostcellsfine_tot_y)-1/))
-
-      CALL Agrif_Set_bcinterp(e3t_connect_id,interp=AGRIF_linear)
-      CALL Agrif_Set_interp(e3t_connect_id,interp=AGRIF_linear)
-      CALL Agrif_Set_bc( e3t_connect_id, (/-(npt_copy+npt_connect)*irafx-1,-npt_copy*irafx/))
+      CALL Agrif_Set_bc( e3t_copy_id, (/-npt_copy*irafx-1,max(nbghostcellsfine_tot_x,nbghostcellsfine_tot_y)-1/))
+
+!      CALL Agrif_Set_bcinterp(e3t_connect_id,interp=AGRIF_linear)
+!      CALL Agrif_Set_interp(e3t_connect_id,interp=AGRIF_linear)
+      CALL Agrif_Set_bcinterp(e3t_connect_id,interp=AGRIF_constant)
+      CALL Agrif_Set_interp(e3t_connect_id,interp=AGRIF_constant)
+      CALL Agrif_Set_bc( e3t_connect_id, (/-(npt_copy+npt_connect)*irafx-1,-npt_copy*irafx-1/))
 
       CALL Agrif_Set_bcinterp(e3u_id, interp1=Agrif_linear, interp2=AGRIF_ppm)
@@ -368 +370 @@
       CALL Agrif_Set_bcinterp(bottom_level_id,interp=AGRIF_constant)
       CALL Agrif_Set_interp(bottom_level_id,interp=AGRIF_constant)
-      CALL Agrif_Set_bc( bottom_level_id, (/-npt_copy*irafx,max(nbghostcellsfine_tot_x,nbghostcellsfine_tot_y)-1/))
+      CALL Agrif_Set_bc( bottom_level_id, (/-npt_copy*irafx-1,max(nbghostcellsfine_tot_x,nbghostcellsfine_tot_y)-1/))
       CALL Agrif_Set_Updatetype( bottom_level_id, update = AGRIF_Update_Max)