From b19a09b9c16c3a5a8776fa150c63821886dacae2 Mon Sep 17 00:00:00 2001 From: Guillaume Samson <guillaume.samson@mercator-ocean.fr> Date: Wed, 9 Nov 2022 16:38:15 +0000 Subject: [PATCH] Resolve "add atmospheric pressure to exchanges variables in CPL_OASIS testcase" --- tests/CPL_OASIS/EXPREF/namelist_cfg | 4 ++-- tools/TOYATM/EXP/namcouple | 11 ++++++++++- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/tests/CPL_OASIS/EXPREF/namelist_cfg b/tests/CPL_OASIS/EXPREF/namelist_cfg index f2402b69..1fee85b8 100644 --- a/tests/CPL_OASIS/EXPREF/namelist_cfg +++ b/tests/CPL_OASIS/EXPREF/namelist_cfg @@ -151,7 +151,7 @@ sn_rcv_cal = 'none' , 'no' , '' , '' , '' sn_rcv_co2 = 'none' , 'no' , '' , '' , '' sn_rcv_iceflx = 'none' , 'no' , '' , '' , '' - sn_rcv_mslp = 'none' , 'no' , '' , '' , '' + sn_rcv_mslp = 'coupled' , 'no' , '' , '' , '' sn_rcv_ts_ice = 'none' , 'no' , '' , '' , '' sn_rcv_isf = 'none' , 'no' , '' , '' , '' sn_rcv_icb = 'none' , 'no' , '' , '' , '' @@ -216,7 +216,7 @@ !----------------------------------------------------------------------- &namberg ! iceberg parameters (default: OFF) !----------------------------------------------------------------------- - ln_icebergs = .true. ! activate iceberg floats (force =F with "key_agrif") + ln_icebergs = .false. ! activate iceberg floats (force =F with "key_agrif") cn_dir = './' ! root directory for the location of drag coefficient files !______!___________!___________________!______________!______________!_________!___________!__________!__________!_______________! diff --git a/tools/TOYATM/EXP/namcouple b/tools/TOYATM/EXP/namcouple index 1890c33f..b73db51c 100755 --- a/tools/TOYATM/EXP/namcouple +++ b/tools/TOYATM/EXP/namcouple @@ -6,7 +6,7 @@ # Any line beginning with # is ignored. Blank lines are not allowed #################################################################### $NFIELDS -12 +13 $END ############################################ $RUNTIME @@ -89,6 +89,15 @@ INT=1 BILINEAR LR SCALAR LATLON 1 INT=1 # +ATSOLFLX O_MSLP 1 5400 4 rst.nc EXPOUT +180 90 180 148 lmdz torc +P 0 P 2 +CHECKIN BLASOLD SCRIPR CHECKOUT +INT=1 +100000. 0 +BILINEAR LR SCALAR LATLON 1 +INT=1 +# ATFLXEMP OTotRain 1 5400 3 rst.nc EXPOUT 180 90 180 148 lmdz torc P 0 P 2 -- GitLab