Skip to content
Snippets Groups Projects
Commit 63f1113c authored by Guillaume Samson's avatar Guillaume Samson :snowman2:
Browse files

Merge branch '82-agrif-maxsearch' into 'main'

Resolve "AGRIF default MaxSearch value is too large"

Closes #82

See merge request nemo/nemo!125
parents 642a532a a23f6d9a
No related branches found
No related tags found
No related merge requests found
...@@ -378,7 +378,7 @@ end type Agrif_Variables_List ...@@ -378,7 +378,7 @@ end type Agrif_Variables_List
integer :: Agrif_Regridding = 10 integer :: Agrif_Regridding = 10
integer :: Agrif_Minwidth integer :: Agrif_Minwidth
real :: Agrif_Efficiency = 0.7 real :: Agrif_Efficiency = 0.7
integer :: MaxSearch = 10 integer :: MaxSearch = 3
real(kind=8), dimension(3) :: Agrif_mind real(kind=8), dimension(3) :: Agrif_mind
!> @} !> @}
!> \name parameters for the interpolation of the child grids !> \name parameters for the interpolation of the child grids
......
...@@ -57,6 +57,7 @@ CONTAINS ...@@ -57,6 +57,7 @@ CONTAINS
! Set a_i, v_i, v_s, sv_i, oa_i, a_ip, v_ip, t_su, e_s, e_i: ! Set a_i, v_i, v_s, sv_i, oa_i, a_ip, v_ip, t_su, e_s, e_i:
Agrif_SpecialValue = -9999. Agrif_SpecialValue = -9999.
Agrif_UseSpecialValue = .TRUE. Agrif_UseSpecialValue = .TRUE.
CALL Agrif_Set_MaskMaxSearch(10)
CALL Agrif_init_variable(tra_iceini_id,procname=interp_tra_ice) CALL Agrif_init_variable(tra_iceini_id,procname=interp_tra_ice)
! !
CALL lbc_lnk( 'agrif_istate_ice', a_i,'T',1._wp, v_i,'T',1._wp, & CALL lbc_lnk( 'agrif_istate_ice', a_i,'T',1._wp, v_i,'T',1._wp, &
...@@ -78,6 +79,7 @@ CONTAINS ...@@ -78,6 +79,7 @@ CONTAINS
CALL Agrif_init_variable(v_iceini_id ,procname=interp_v_ice) CALL Agrif_init_variable(v_iceini_id ,procname=interp_v_ice)
use_sign_north = .FALSE. use_sign_north = .FALSE.
Agrif_UseSpecialValue = .FALSE. Agrif_UseSpecialValue = .FALSE.
CALL Agrif_Set_MaskMaxSearch(3)
! !
CALL lbc_lnk( 'agrif_istate_ice', u_ice, 'U', -1._wp, v_ice, 'V', -1._wp ) CALL lbc_lnk( 'agrif_istate_ice', u_ice, 'U', -1._wp, v_ice, 'V', -1._wp )
! !
......
...@@ -87,6 +87,7 @@ CONTAINS ...@@ -87,6 +87,7 @@ CONTAINS
Agrif_SpecialValue = 0.0_wp Agrif_SpecialValue = 0.0_wp
Agrif_UseSpecialValue = .TRUE. Agrif_UseSpecialValue = .TRUE.
l_vremap = ln_vert_remap l_vremap = ln_vert_remap
CALL Agrif_Set_MaskMaxSearch(10)
ts(:,:,:,:,Kbb) = 0.0_wp ts(:,:,:,:,Kbb) = 0.0_wp
uu(:,:,:,Kbb) = 0.0_wp uu(:,:,:,Kbb) = 0.0_wp
...@@ -106,6 +107,7 @@ CONTAINS ...@@ -106,6 +107,7 @@ CONTAINS
Agrif_UseSpecialValue = .FALSE. Agrif_UseSpecialValue = .FALSE.
l_ini_child = .FALSE. l_ini_child = .FALSE.
l_vremap = .FALSE. l_vremap = .FALSE.
CALL Agrif_Set_MaskMaxSearch(3)
Krhs_a = Kaa ; Kmm_a = Kmm Krhs_a = Kaa ; Kmm_a = Kmm
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment