Changeset 12119 for NEMO/branches/2019/dev_r11233_AGRIF-05_jchanut_vert_coord_interp/src/NST/agrif_user.F90

Timestamp:

2019-12-09T11:55:22+01:00 (4 years ago)

Author:

jchanut

Message:

#2222, remove useless mask checking (and restrict scale factor check at the boundary only until nesting tools are updated in sponge areas). Take into account special values in tracer updates, again, till nesting tools are updated.

File:

• NEMO/branches/2019/dev_r11233_AGRIF-05_jchanut_vert_coord_interp/src/NST/agrif_user.F90 (modified) (5 diffs)

NEMO/branches/2019/dev_r11233_AGRIF-05_jchanut_vert_coord_interp/src/NST/agrif_user.F90

@@ -259 +259 @@
       ! check if masks and bathymetries match
       IF(ln_chk_bathy) THEN
+         Agrif_UseSpecialValue = .FALSE.
          !
          IF(lwp) WRITE(numout,*) ' '
@@ -266 +267 @@
 # if ! defined key_vertical
          !
-         ! check if umask agree with parent along western and eastern boundaries:
-         CALL Agrif_Bc_variable(umsk_id,calledweight=1.,procname=interpumsk)
-         ! check if vmask agree with parent along northern and southern boundaries:
-         CALL Agrif_Bc_variable(vmsk_id,calledweight=1.,procname=interpvmsk)
-         ! check if tmask and vertical scale factors agree with parent over first two coarse grid points:
+         ! check if tmask and vertical scale factors agree with parent in sponge area:
          CALL Agrif_Bc_variable(e3t_id,calledweight=1.,procname=interpe3t)
          !
@@ -346 +343 @@
 
       CALL agrif_declare_variable((/2,2,0/),(/ind3,ind3,0/),(/'x','y','N'/),(/1,1,1/),(/nlci,nlcj,jpk/),e3t_id)
-      CALL agrif_declare_variable((/1,2,0/),(/ind2,ind3,0/),(/'x','y','N'/),(/1,1,1/),(/nlci,nlcj,jpk/),umsk_id)
-      CALL agrif_declare_variable((/2,1,0/),(/ind3,ind2,0/),(/'x','y','N'/),(/1,1,1/),(/nlci,nlcj,jpk/),vmsk_id)
+
 # if defined key_vertical
       CALL agrif_declare_variable((/2,2/),(/ind3,ind3/),(/'x','y'/),(/1,1/),(/nlci,nlcj/),mbkt_id)
@@ -401 +397 @@
 
       CALL Agrif_Set_bcinterp(e3t_id,interp=AGRIF_constant)
-      CALL Agrif_Set_bcinterp(umsk_id,interp=AGRIF_constant)
-      CALL Agrif_Set_bcinterp(vmsk_id,interp=AGRIF_constant)
 
 # if defined key_vertical
@@ -427 +421 @@
       CALL Agrif_Set_bc( vb2b_interp_id, (/0,ind1-1/) )
 
-      CALL Agrif_Set_bc(  e3t_id, (/-nn_sponge_len*Agrif_irhox(),ind1-1/) )     ! if west,  rhox=3, nn_sponge_len=2
-      CALL Agrif_Set_bc( umsk_id, (/0,0/) )                                     ! and nbghost=3:
-      CALL Agrif_Set_bc( vmsk_id, (/0,0/) )                                     ! columns 2 to 10
+!      CALL Agrif_Set_bc(  e3t_id, (/-nn_sponge_len*Agrif_irhox(),ind1-1/) )  
+! JC: check near the boundary only until matching in sponge has been sorted out:
+      CALL Agrif_Set_bc(  e3t_id, (/0,ind1-1/) )  
+
 # if defined key_vertical 
       ! extend the interpolation zone by 1 more point than necessary: