From 2b33cd563c43cccf0964861d06dcb88461540231 Mon Sep 17 00:00:00 2001 From: JessicaMeixner-NOAA Date: Thu, 21 Nov 2024 14:53:18 -0600 Subject: [PATCH 1/8] update build and UFS model --- .gitmodules | 2 +- sorc/build_ww3prepost.sh | 1 + sorc/ufs_model.fd | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index 5c9e569243..a6d960fa8b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,6 @@ [submodule "sorc/ufs_model.fd"] path = sorc/ufs_model.fd - url = https://github.com/ufs-community/ufs-weather-model + url = https://github.com/jessicameixner-noaa/ufs-weather-model ignore = dirty [submodule "sorc/wxflow"] path = sorc/wxflow diff --git a/sorc/build_ww3prepost.sh b/sorc/build_ww3prepost.sh index 67ee5e1dc2..5c86774067 100755 --- a/sorc/build_ww3prepost.sh +++ b/sorc/build_ww3prepost.sh @@ -78,6 +78,7 @@ sed -e "s/DIST/SHRD/g"\ -e "s/OMPH / /g"\ -e "s/MPIT / /g"\ -e "s/MPI / /g"\ + -e "s/PIO / /g"\ -e "s/B4B / /g"\ -e "s/PDLIB / /g"\ -e "s/SCOTCH / /g"\ diff --git a/sorc/ufs_model.fd b/sorc/ufs_model.fd index 6a4e09e947..a03a9fdaed 160000 --- a/sorc/ufs_model.fd +++ b/sorc/ufs_model.fd @@ -1 +1 @@ -Subproject commit 6a4e09e94773ffa39ce7ab6a54a885efada91f21 +Subproject commit a03a9fdaed58eae77fd4c59c065c6451be72ce6a From a3d9b4cf558b99f84410effa62a2a438bfbd1398 Mon Sep 17 00:00:00 2001 From: JessicaMeixner-NOAA Date: Fri, 22 Nov 2024 10:18:44 -0600 Subject: [PATCH 2/8] update ush_configure for wave related variables --- ush/parsing_ufs_configure.sh | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/ush/parsing_ufs_configure.sh b/ush/parsing_ufs_configure.sh index 062b40591e..4096504590 100755 --- a/ush/parsing_ufs_configure.sh +++ b/ush/parsing_ufs_configure.sh @@ -77,6 +77,16 @@ if [[ "${cplwav}" = ".true." ]]; then local MULTIGRID="${waveMULTIGRID}" local WW3_user_sets_restname="false" + local WW3_user_histname="false" + local WW3_historync="false" + local WW3_restartnc="false" + local WW3_restart_from_binary="true" + local WW3_PIO_FORMAT="pnetcdf" + local WW3_PIO_IOTASKS=-99 + local WW3_PIO_STRIDE=4 + local WW3_PIO_REARR="box" + local WW3_PIO_ROOT=-99 + fi if [[ "${cplchm}" = ".true." ]]; then From b575ff6a08e9fd6531abe2a437a6bdeb20e680d9 Mon Sep 17 00:00:00 2001 From: JessicaMeixner-NOAA Date: Fri, 6 Dec 2024 10:18:22 -0600 Subject: [PATCH 3/8] update for CICE --- ush/parsing_namelists_CICE.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/ush/parsing_namelists_CICE.sh b/ush/parsing_namelists_CICE.sh index 3822094c97..90f20871c7 100755 --- a/ush/parsing_namelists_CICE.sh +++ b/ush/parsing_namelists_CICE.sh @@ -71,6 +71,7 @@ local CICE_DUMPFREQ="y" # "h","d","m" or "y" for restarts at intervals of "hour 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 )) # frequency of diagnostic output in timesteps, recommended for 1x per day local CICE_HISTFREQ_N="0, 0, ${FHOUT_ICE}, 1, 1" +local CICE_hist_suffix="'x','x','x','x','x'" if [[ "${RUN}" =~ "gdas" ]]; then local CICE_HIST_AVG=".false., .false., .false., .false., .false." # DA needs instantaneous else From 8020fc797ef926a49be384f4a596d2d20f2bc6af Mon Sep 17 00:00:00 2001 From: JessicaMeixner-NOAA Date: Fri, 6 Dec 2024 10:52:47 -0600 Subject: [PATCH 4/8] update ufs to version with fix for waves --- 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 a03a9fdaed..63ace62a36 160000 --- a/sorc/ufs_model.fd +++ b/sorc/ufs_model.fd @@ -1 +1 @@ -Subproject commit a03a9fdaed58eae77fd4c59c065c6451be72ce6a +Subproject commit 63ace62a36a263f03b914a92fc5536509e862dbc From 94f9f2a5e9092659b12f9f8509e89bfb5c898aaf Mon Sep 17 00:00:00 2001 From: Jessica Meixner Date: Mon, 9 Dec 2024 17:03:39 +0000 Subject: [PATCH 5/8] remove output every time-step --- 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 90f20871c7..16c89ee80d 100755 --- a/ush/parsing_namelists_CICE.sh +++ b/ush/parsing_namelists_CICE.sh @@ -70,7 +70,7 @@ local CICE_RESTART_FORMAT="pnetcdf2" 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 )) # frequency of diagnostic output in timesteps, recommended for 1x per day -local CICE_HISTFREQ_N="0, 0, ${FHOUT_ICE}, 1, 1" +local CICE_HISTFREQ_N="0, 0, ${FHOUT_ICE}, 0, 1" local CICE_hist_suffix="'x','x','x','x','x'" if [[ "${RUN}" =~ "gdas" ]]; then local CICE_HIST_AVG=".false., .false., .false., .false., .false." # DA needs instantaneous From 886e638bc4b33d69efff6083ddb4d84b563cbd34 Mon Sep 17 00:00:00 2001 From: Jessica Meixner Date: Tue, 10 Dec 2024 14:50:16 +0000 Subject: [PATCH 6/8] update link script for UPP update --- sorc/link_workflow.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/sorc/link_workflow.sh b/sorc/link_workflow.sh index b35b7ff35a..ec4f6e7e83 100755 --- a/sorc/link_workflow.sh +++ b/sorc/link_workflow.sh @@ -144,10 +144,15 @@ cd "${HOMEgfs}/parm/ufs" || exit 1 ${LINK_OR_COPY} "${HOMEgfs}/sorc/ufs_model.fd/tests/parm/noahmptable.tbl" . cd "${HOMEgfs}/parm/post" || exit 1 -for file in params_grib2_tbl_new nam_micro_lookup.dat +for file in params_grib2_tbl_new do ${LINK_OR_COPY} "${HOMEgfs}/sorc/upp.fd/parm/${file}" . done +cd "${HOMEgfs}/parm/post" || exit 1 +for file in nam_micro_lookup.dat +do + ${LINK_OR_COPY} "${HOMEgfs}/sorc/upp.fd/fix/${file}" . +done for dir in gfs gefs sfs do ${LINK_OR_COPY} "${HOMEgfs}/sorc/upp.fd/parm/${dir}" . From 32ec7b2968fa38699cced81e97303610cc95d3c0 Mon Sep 17 00:00:00 2001 From: Jessica Meixner Date: Tue, 10 Dec 2024 18:08:05 +0000 Subject: [PATCH 7/8] fix shel --- sorc/link_workflow.sh | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/sorc/link_workflow.sh b/sorc/link_workflow.sh index ec4f6e7e83..4748061a82 100755 --- a/sorc/link_workflow.sh +++ b/sorc/link_workflow.sh @@ -144,15 +144,8 @@ cd "${HOMEgfs}/parm/ufs" || exit 1 ${LINK_OR_COPY} "${HOMEgfs}/sorc/ufs_model.fd/tests/parm/noahmptable.tbl" . cd "${HOMEgfs}/parm/post" || exit 1 -for file in params_grib2_tbl_new -do - ${LINK_OR_COPY} "${HOMEgfs}/sorc/upp.fd/parm/${file}" . -done -cd "${HOMEgfs}/parm/post" || exit 1 -for file in nam_micro_lookup.dat -do - ${LINK_OR_COPY} "${HOMEgfs}/sorc/upp.fd/fix/${file}" . -done +${LINK_OR_COPY} "${HOMEgfs}/sorc/upp.fd/parm/params_grib2_tbl_new" . +${LINK_OR_COPY} "${HOMEgfs}/sorc/upp.fd/fix/nam_micro_lookup.dat" . for dir in gfs gefs sfs do ${LINK_OR_COPY} "${HOMEgfs}/sorc/upp.fd/parm/${dir}" . From 75a6d3c8889746533609dc8910a0028331955f81 Mon Sep 17 00:00:00 2001 From: Jessica Meixner Date: Fri, 13 Dec 2024 13:19:14 +0000 Subject: [PATCH 8/8] update config to false --- ush/parsing_ufs_configure.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ush/parsing_ufs_configure.sh b/ush/parsing_ufs_configure.sh index 4096504590..d8276476c4 100755 --- a/ush/parsing_ufs_configure.sh +++ b/ush/parsing_ufs_configure.sh @@ -80,7 +80,7 @@ if [[ "${cplwav}" = ".true." ]]; then local WW3_user_histname="false" local WW3_historync="false" local WW3_restartnc="false" - local WW3_restart_from_binary="true" + local WW3_restart_from_binary="false" local WW3_PIO_FORMAT="pnetcdf" local WW3_PIO_IOTASKS=-99 local WW3_PIO_STRIDE=4