From 39953b602e72526e93eab1058827a6a6c6c9afa3 Mon Sep 17 00:00:00 2001 From: clem <clement.rousset@locean.ipsl.fr> Date: Mon, 10 Jan 2022 14:27:33 +0100 Subject: [PATCH] make ICE_AGRIF work. It probably did not in debug mode. --- src/SAS/sbcssm.F90 | 6 +++--- tests/ICE_AGRIF/EXPREF/1_namelist_cfg | 2 +- tests/ICE_AGRIF/EXPREF/namelist_cfg | 1 + 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/SAS/sbcssm.F90 b/src/SAS/sbcssm.F90 index 23cdd66e6..bd72a97a2 100644 --- a/src/SAS/sbcssm.F90 +++ b/src/SAS/sbcssm.F90 @@ -129,9 +129,9 @@ CONTAINS ssu_m(:,:) = 0._wp ssv_m(:,:) = 0._wp ssh_m(:,:) = 0._wp - IF( .NOT. ln_linssh ) e3t_m(:,:) = e3t_0(:,:,1) !clem: necessary at least for sas2D + e3t_m(:,:) = e3t_0(:,:,1) !clem: necessary at least for sas2D frq_m(:,:) = 1._wp ! - - - ssh (:,:,Kmm) = 0._wp ! - - + ssh (:,:,Kmm) = 0._wp ! - - ENDIF IF ( nn_ice == 1 ) THEN @@ -159,7 +159,7 @@ CONTAINS CALL iom_put( 'sst_m', sst_m ) CALL iom_put( 'sss_m', sss_m ) CALL iom_put( 'ssh_m', ssh_m ) - IF( .NOT.ln_linssh ) CALL iom_put( 'e3t_m', e3t_m ) + CALL iom_put( 'e3t_m', e3t_m ) IF( ln_read_frq ) CALL iom_put( 'frq_m', frq_m ) ENDIF ! diff --git a/tests/ICE_AGRIF/EXPREF/1_namelist_cfg b/tests/ICE_AGRIF/EXPREF/1_namelist_cfg index d1028790e..e7a02052b 100644 --- a/tests/ICE_AGRIF/EXPREF/1_namelist_cfg +++ b/tests/ICE_AGRIF/EXPREF/1_namelist_cfg @@ -104,7 +104,7 @@ !----------------------------------------------------------------------- &namagrif ! AGRIF zoom ("key_agrif") !----------------------------------------------------------------------- - ln_init_chfrpar = .true. ! initialize child grids from parent + ln_chk_bathy = .false. ! =T check the parent bathymetry / !!====================================================================== !! *** Top/Bottom boundary condition *** !! diff --git a/tests/ICE_AGRIF/EXPREF/namelist_cfg b/tests/ICE_AGRIF/EXPREF/namelist_cfg index 4c2466874..33b2ce854 100644 --- a/tests/ICE_AGRIF/EXPREF/namelist_cfg +++ b/tests/ICE_AGRIF/EXPREF/namelist_cfg @@ -104,6 +104,7 @@ !----------------------------------------------------------------------- &namagrif ! AGRIF zoom ("key_agrif") !----------------------------------------------------------------------- + ln_chk_bathy = .false. ! =T check the parent bathymetry / !!====================================================================== !! *** Top/Bottom boundary condition *** !! -- GitLab