From 7332dd25c70d73fcade7534ac7064e7ef19c8303 Mon Sep 17 00:00:00 2001 From: Denise Worthen Date: Mon, 21 Mar 2022 17:03:37 -0400 Subject: [PATCH] update c96 restart --- tests/tests/cpld_restart_c96_p8 | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/tests/tests/cpld_restart_c96_p8 b/tests/tests/cpld_restart_c96_p8 index bfbd5d8213..5e010f4905 100644 --- a/tests/tests/cpld_restart_c96_p8 +++ b/tests/tests/cpld_restart_c96_p8 @@ -1,8 +1,8 @@ # -# cpld_restart_c96_p8 test +# cpld_restart C96 P8 test # -export TEST_DESCR="Fully coupled FV3-CCPP-MOM6-CICE-CMEPS system - C96MX100 - P8 restart" +export TEST_DESCR="Fully coupled FV3-CCPP-GOCART-MOM6-CICE-CMEPS system - C96MX100" export CNTL_DIR="cpld_control_c96_p8" @@ -18,9 +18,6 @@ export LIST_FILES="sfcf024.tile1.nc \ atmf024.tile4.nc \ atmf024.tile5.nc \ atmf024.tile6.nc \ - 20210323.060000.out_pnt.ww3 \ - 20210323.060000.out_grd.ww3 \ - 20210323.060000.restart.ww3 \ RESTART/coupler.res \ RESTART/fv_core.res.nc \ RESTART/fv_core.res.tile1.nc \ @@ -55,7 +52,13 @@ export LIST_FILES="sfcf024.tile1.nc \ RESTART/sfc_data.tile6.nc \ RESTART/MOM.res.nc \ RESTART/iced.2021-03-23-21600.nc \ - RESTART/ufs.cpld.cpl.r.2021-03-23-21600.nc" + RESTART/ufs.cpld.cpl.r.2021-03-23-21600.nc \ + gocart.inst_aod.20210323_0600z.nc4 \ + 20210323.060000.out_pnt.ww3 \ + 20210323.060000.out_grd.ww3 \ + 20210323.060000.restart.ww3" + +#TODO: add comparison of CA restart files? export_fv3 export_cpl @@ -99,6 +102,7 @@ export BLCKY=`expr $NY_GLB / 2` export med_petlist_bounds=$MPB_cpl_c96 export atm_petlist_bounds=$APB_cpl_c96 +export chm_petlist_bounds=$CHM_cpl_c96 export ocn_petlist_bounds=$OPB_cpl_c96 export ice_petlist_bounds=$IPB_cpl_c96 export wav_petlist_bounds=$WPB_cpl_c96 @@ -117,6 +121,8 @@ export CPLWAV=.true. export CPLWAV2ATM=.true. export MOM6_USE_WAVES=True export eps_imesh=2.5e-1 +export CPLCHM=.true. +export FIELD_TABLE=field_table_thompson_noaero_tke_GOCART export TOPOEDITS=ufs.topo_edits_011818.nc export MOM6_ALLOW_LANDMASK_CHANGES=True