From b8241ee162d6626eee4e1635b480b044d7bddbb7 Mon Sep 17 00:00:00 2001 From: Jessica Meixner Date: Wed, 21 Feb 2024 14:33:50 +0000 Subject: [PATCH 1/7] update ufs-weather-model to latest hash --- sorc/ufs_model.fd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sorc/ufs_model.fd b/sorc/ufs_model.fd index a837cfcb0c7..e464f5be220 160000 --- a/sorc/ufs_model.fd +++ b/sorc/ufs_model.fd @@ -1 +1 @@ -Subproject commit a837cfcb0c79803e13a1375a362d3d0b14b62320 +Subproject commit e464f5be2200744013c221b7eb7e1f2c85b79e22 From a2f707bb26dd5ef301ea1feb340ba105f8ed0873 Mon Sep 17 00:00:00 2001 From: Jessica Meixner Date: Wed, 21 Feb 2024 14:35:30 +0000 Subject: [PATCH 2/7] update ufs_utils --- sorc/ufs_utils.fd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sorc/ufs_utils.fd b/sorc/ufs_utils.fd index c3fb3bceaa1..b15058c925a 160000 --- a/sorc/ufs_utils.fd +++ b/sorc/ufs_utils.fd @@ -1 +1 @@ -Subproject commit c3fb3bceaa1a324599597c9cf8a42d19af817254 +Subproject commit b15058c925aba78ead87c9bffc47c10d9b52bea8 From 1c7af3df7b54381b0eddbc5167c56e016331298b Mon Sep 17 00:00:00 2001 From: Jessica Meixner Date: Thu, 22 Feb 2024 16:18:59 +0000 Subject: [PATCH 3/7] clean up comment --- parm/config/gfs/config.base.emc.dyn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parm/config/gfs/config.base.emc.dyn b/parm/config/gfs/config.base.emc.dyn index 5c02b000efc..63137f655f4 100644 --- a/parm/config/gfs/config.base.emc.dyn +++ b/parm/config/gfs/config.base.emc.dyn @@ -259,7 +259,7 @@ export gfs_cyc=@gfs_cyc@ # 0: no GFS cycle, 1: 00Z only, 2: 00Z and 12Z only, 4: # GFS output and frequency export FHMIN_GFS=0 export FHMAX_GFS=@FHMAX_GFS@ -export FHOUT_GFS=3 # Must be 6 for S2S until #1629 is addressed; 3 for ops +export FHOUT_GFS=3 export FHMAX_HF_GFS=0 export FHOUT_HF_GFS=1 export FHOUT_OCNICE_GFS=6 From d72cf089d22e744fdf05965dd32e90546a47c1b2 Mon Sep 17 00:00:00 2001 From: Jessica Meixner Date: Fri, 23 Feb 2024 20:15:25 +0000 Subject: [PATCH 4/7] update cice config and resources for c384 gdas --- parm/config/gfs/config.resources | 2 +- ush/parsing_namelists_CICE.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/parm/config/gfs/config.resources b/parm/config/gfs/config.resources index b06e6349930..dad9f877532 100644 --- a/parm/config/gfs/config.resources +++ b/parm/config/gfs/config.resources @@ -635,7 +635,7 @@ case ${step} in declare -x "wtime_${step}_gfs"="03:00:00" ;; "C384") - declare -x "wtime_${step}"="00:10:00" + declare -x "wtime_${step}"="00:30:00" declare -x "wtime_${step}_gfs"="06:00:00" ;; "C768" | "C1152") diff --git a/ush/parsing_namelists_CICE.sh b/ush/parsing_namelists_CICE.sh index 2dab096d16f..20c6ac77322 100755 --- a/ush/parsing_namelists_CICE.sh +++ b/ush/parsing_namelists_CICE.sh @@ -61,7 +61,7 @@ local CICE_RESTART_DIR="./CICE_RESTART/" local CICE_RESTART_FILE="cice_model.res" local CICE_DUMPFREQ="y" # "h","d","m" or "y" for restarts at intervals of "hours", "days", "months" or "years" local CICE_DUMPFREQ_N=10000 # Set this to a really large value, as cice, mom6 and cmeps restart interval is controlled by ufs.configure -local CICE_DIAGFREQ=6 +local CICE_DIAGFREQ=$(( 86400 / DT_CICE )) 86400/${DT_CICE} # frequency of diagnostic output in timesteps, recommended for 1x per day local CICE_HISTFREQ_N="0, 0, ${FHOUT_OCNICE}, 1, 1" if [[ "${RUN}" =~ "gdas" ]]; then local CICE_HIST_AVG=".false., .false., .false., .false., .false." # DA needs instantaneous From a6b10fc74f3180f09e423da1d79c604a3b59d27a Mon Sep 17 00:00:00 2001 From: Jessica Meixner Date: Fri, 23 Feb 2024 21:04:30 +0000 Subject: [PATCH 5/7] update model to latest --- sorc/ufs_model.fd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sorc/ufs_model.fd b/sorc/ufs_model.fd index e464f5be220..69886627284 160000 --- a/sorc/ufs_model.fd +++ b/sorc/ufs_model.fd @@ -1 +1 @@ -Subproject commit e464f5be2200744013c221b7eb7e1f2c85b79e22 +Subproject commit 698866272846e8c0f8f61ddb1b20d6463460cd63 From d0375d0059248b6190aa08ef742d64b7e75df1ba Mon Sep 17 00:00:00 2001 From: Jessica Meixner Date: Mon, 26 Feb 2024 13:50:20 +0000 Subject: [PATCH 6/7] update diag freq for cice from typo --- ush/parsing_namelists_CICE.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ush/parsing_namelists_CICE.sh b/ush/parsing_namelists_CICE.sh index 20c6ac77322..d749e6d890c 100755 --- a/ush/parsing_namelists_CICE.sh +++ b/ush/parsing_namelists_CICE.sh @@ -61,7 +61,7 @@ local CICE_RESTART_DIR="./CICE_RESTART/" local CICE_RESTART_FILE="cice_model.res" local CICE_DUMPFREQ="y" # "h","d","m" or "y" for restarts at intervals of "hours", "days", "months" or "years" local CICE_DUMPFREQ_N=10000 # Set this to a really large value, as cice, mom6 and cmeps restart interval is controlled by ufs.configure -local CICE_DIAGFREQ=$(( 86400 / DT_CICE )) 86400/${DT_CICE} # frequency of diagnostic output in timesteps, recommended for 1x per day +local CICE_DIAGFREQ=$(( 86400 / DT_CICE )) # frequency of diagnostic output in timesteps, recommended for 1x per day local CICE_HISTFREQ_N="0, 0, ${FHOUT_OCNICE}, 1, 1" if [[ "${RUN}" =~ "gdas" ]]; then local CICE_HIST_AVG=".false., .false., .false., .false., .false." # DA needs instantaneous From 23773871aaf99e6c98cdfe37625ae763817dceaf Mon Sep 17 00:00:00 2001 From: Jessica Meixner Date: Mon, 26 Feb 2024 18:28:50 +0000 Subject: [PATCH 7/7] remove unused variable wave_sys_ver --- parm/config/gefs/config.wave | 3 --- parm/config/gfs/config.wave | 3 --- ush/wave_grid_moddef.sh | 2 +- 3 files changed, 1 insertion(+), 7 deletions(-) diff --git a/parm/config/gefs/config.wave b/parm/config/gefs/config.wave index 9ea4a30199c..5f4448985c4 100644 --- a/parm/config/gefs/config.wave +++ b/parm/config/gefs/config.wave @@ -7,9 +7,6 @@ echo "BEGIN: config.wave" # Parameters that are common to all wave model steps -# System and version -export wave_sys_ver=v1.0.0 - export EXECwave="${HOMEgfs}/exec" export PARMwave="${HOMEgfs}/parm/wave" export USHwave="${HOMEgfs}/ush" diff --git a/parm/config/gfs/config.wave b/parm/config/gfs/config.wave index d64516208d1..8068ffcda68 100644 --- a/parm/config/gfs/config.wave +++ b/parm/config/gfs/config.wave @@ -7,9 +7,6 @@ echo "BEGIN: config.wave" # Parameters that are common to all wave model steps -# System and version -export wave_sys_ver=v1.0.0 - export EXECwave="${HOMEgfs}/exec" export PARMwave="${HOMEgfs}/parm/wave" export USHwave="${HOMEgfs}/ush" diff --git a/ush/wave_grid_moddef.sh b/ush/wave_grid_moddef.sh index f704c74af43..390860c960d 100755 --- a/ush/wave_grid_moddef.sh +++ b/ush/wave_grid_moddef.sh @@ -59,7 +59,7 @@ source "$HOMEgfs/ush/preamble.sh" # 0.c Define directories and the search path. # The tested variables should be exported by the postprocessor script. - if [ -z "$grdID" ] || [ -z "$EXECwave" ] || [ -z "$wave_sys_ver" ] + if [ -z "$grdID" ] || [ -z "$EXECwave" ] then set +x echo ' '