From d65d3d257b38225fac74e86b770f43e1f8ae2d5a Mon Sep 17 00:00:00 2001 From: Jessica Meixner Date: Wed, 3 Jul 2024 21:07:49 -0400 Subject: [PATCH] Update ufs model hash to 20240625 (#2729) Updates UFS weather model hash to hash from 2024-06-24 which has orion porting updates + a few namelist updates. --- sorc/ufs_model.fd | 2 +- ush/parsing_namelists_CICE.sh | 7 +++++++ ush/parsing_ufs_configure.sh | 3 +++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/sorc/ufs_model.fd b/sorc/ufs_model.fd index 485ccdfc4a..e784814dfc 160000 --- a/sorc/ufs_model.fd +++ b/sorc/ufs_model.fd @@ -1 +1 @@ -Subproject commit 485ccdfc4a7ed6deeb02d82c2cebe51b37e892f5 +Subproject commit e784814dfce3fb01e82be6d3949f9811860041d7 diff --git a/ush/parsing_namelists_CICE.sh b/ush/parsing_namelists_CICE.sh index aa495d1864..3822094c97 100755 --- a/ush/parsing_namelists_CICE.sh +++ b/ush/parsing_namelists_CICE.sh @@ -59,6 +59,7 @@ local CICE_RUNID="unknown" local CICE_USE_RESTART_TIME=${use_restart_time} local CICE_RESTART_DIR="./CICE_RESTART/" local CICE_RESTART_FILE="cice_model.res" +local CICE_ICE_IC='cice_model.res.nc' local CICE_RESTART_DEFLATE=0 local CICE_RESTART_CHUNK=0,0 local CICE_RESTART_STRIDE=-99 @@ -117,6 +118,12 @@ local CICE_NPROC=${ntasks_cice6} local CICE_BLCKX=${block_size_x} local CICE_BLCKY=${block_size_y} local CICE_DECOMP=${processor_shape} +# ice_prescribed_nml section +local CICE_PRESCRIBED="false" +local MESH_DICE="none" +local stream_files_dice="none" + + # Ensure the template exists local template=${CICE_TEMPLATE:-"${PARMgfs}/ufs/ice_in.IN"} diff --git a/ush/parsing_ufs_configure.sh b/ush/parsing_ufs_configure.sh index 24ea80e56c..062b40591e 100755 --- a/ush/parsing_ufs_configure.sh +++ b/ush/parsing_ufs_configure.sh @@ -39,6 +39,8 @@ if [[ "${cpl}" = ".true." ]]; then local coupling_interval_slow_sec="${CPL_SLOW}" fi +local WRITE_ENDOFRUN_RESTART=.false. + if [[ "${cplflx}" = ".true." ]]; then local use_coldstart=${use_coldstart:-".false."} @@ -56,6 +58,7 @@ if [[ "${cplflx}" = ".true." ]]; then local ATMTILESIZE="${CASE:1}" local ocean_albedo_limit=0.06 local pio_rearranger=${pio_rearranger:-"box"} + local MED_history_n=1000000 fi if [[ "${cplice}" = ".true." ]]; then