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/link_workflow.sh b/sorc/link_workflow.sh index b35b7ff35a..4748061a82 100755 --- a/sorc/link_workflow.sh +++ b/sorc/link_workflow.sh @@ -144,10 +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 nam_micro_lookup.dat -do - ${LINK_OR_COPY} "${HOMEgfs}/sorc/upp.fd/parm/${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}" . diff --git a/sorc/ufs_model.fd b/sorc/ufs_model.fd index 6a4e09e947..63ace62a36 160000 --- a/sorc/ufs_model.fd +++ b/sorc/ufs_model.fd @@ -1 +1 @@ -Subproject commit 6a4e09e94773ffa39ce7ab6a54a885efada91f21 +Subproject commit 63ace62a36a263f03b914a92fc5536509e862dbc diff --git a/ush/parsing_namelists_CICE.sh b/ush/parsing_namelists_CICE.sh index 3822094c97..16c89ee80d 100755 --- a/ush/parsing_namelists_CICE.sh +++ b/ush/parsing_namelists_CICE.sh @@ -70,7 +70,8 @@ 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 else diff --git a/ush/parsing_ufs_configure.sh b/ush/parsing_ufs_configure.sh index 062b40591e..d8276476c4 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="false" + 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