Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update ufs-weather-model #2663

Merged
merged 14 commits into from
Jun 12, 2024
Merged

Update ufs-weather-model #2663

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
8d2f63d
update model and module files - reversing update needed for wave jobs
JessicaMeixner-NOAA Jun 5, 2024
6e61e7f
remove upp submodule
aerorahul Jun 6, 2024
188b580
build upp.x from ufs_wm and link
aerorahul Jun 6, 2024
ff2c77b
Merge branch 'feature/updateufs_20240605' into feature/restore_upp_fr…
aerorahul Jun 6, 2024
466d99c
Merge pull request #13 from aerorahul/feature/restore_upp_from_ufswm
JessicaMeixner-NOAA Jun 6, 2024
8c3351f
update configs to add for gdas
JessicaMeixner-NOAA Jun 6, 2024
958fb02
update cleanup script to remove forecast directories -- update from R…
JessicaMeixner-NOAA Jun 6, 2024
d1165e4
update daily ocean file linking
JessicaMeixner-NOAA Jun 7, 2024
a987126
remove tabs for better spacing alignment
JessicaMeixner-NOAA Jun 7, 2024
8e2a26a
revert changes to allow for asynchronous development updates
JessicaMeixner-NOAA Jun 7, 2024
d8c47c1
simplify logic for if statement
JessicaMeixner-NOAA Jun 7, 2024
ccd87d4
copy config files for all RUN types
JessicaMeixner-NOAA Jun 7, 2024
5d598ba
revert ocean daily file issue, will address in seperate pr
JessicaMeixner-NOAA Jun 11, 2024
8e3156c
Merge branch 'NOAA-EMC:develop' into feature/updateufs_20240605
JessicaMeixner-NOAA Jun 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,6 @@
[submodule "sorc/gsi_monitor.fd"]
path = sorc/gsi_monitor.fd
url = https://github.com/NOAA-EMC/GSI-Monitor.git
[submodule "sorc/upp.fd"]
path = sorc/upp.fd
url = https://github.com/NOAA-EMC/UPP.git
ignore = dirty
[submodule "sorc/jcb"]
path = sorc/jcb
url = https://github.com/noaa-emc/jcb
Expand Down
3 changes: 1 addition & 2 deletions jobs/rocoto/waveinit.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@ source "${HOMEgfs}/ush/preamble.sh"
###############################################################
echo
echo "=============== START TO SOURCE FV3GFS WORKFLOW MODULES ==============="
#. ${HOMEgfs}/ush/load_fv3gfs_modules.sh
. ${HOMEgfs}/ush/load_ufswm_modules.sh
. ${HOMEgfs}/ush/load_fv3gfs_modules.sh
aerorahul marked this conversation as resolved.
Show resolved Hide resolved
status=$?
[[ ${status} -ne 0 ]] && exit ${status}

Expand Down
3 changes: 1 addition & 2 deletions jobs/rocoto/wavepostbndpnt.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@ source "${HOMEgfs}/ush/preamble.sh"
###############################################################
echo
echo "=============== START TO SOURCE FV3GFS WORKFLOW MODULES ==============="
#. ${HOMEgfs}/ush/load_fv3gfs_modules.sh
. ${HOMEgfs}/ush/load_ufswm_modules.sh
. ${HOMEgfs}/ush/load_fv3gfs_modules.sh
status=$?
[[ ${status} -ne 0 ]] && exit ${status}

Expand Down
3 changes: 1 addition & 2 deletions jobs/rocoto/wavepostbndpntbll.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@ source "${HOMEgfs}/ush/preamble.sh"
###############################################################
echo
echo "=============== START TO SOURCE FV3GFS WORKFLOW MODULES ==============="
#. ${HOMEgfs}/ush/load_fv3gfs_modules.sh
. ${HOMEgfs}/ush/load_ufswm_modules.sh
. ${HOMEgfs}/ush/load_fv3gfs_modules.sh
status=$?
[[ ${status} -ne 0 ]] && exit ${status}

Expand Down
3 changes: 1 addition & 2 deletions jobs/rocoto/wavepostpnt.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@ source "${HOMEgfs}/ush/preamble.sh"
###############################################################
echo
echo "=============== START TO SOURCE FV3GFS WORKFLOW MODULES ==============="
#. ${HOMEgfs}/ush/load_fv3gfs_modules.sh
. ${HOMEgfs}/ush/load_ufswm_modules.sh
. ${HOMEgfs}/ush/load_fv3gfs_modules.sh
status=$?
[[ ${status} -ne 0 ]] && exit ${status}

Expand Down
3 changes: 1 addition & 2 deletions jobs/rocoto/wavepostsbs.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@ source "${HOMEgfs}/ush/preamble.sh"

###############################################################
# Source FV3GFS workflow modules
#. ${HOMEgfs}/ush/load_fv3gfs_modules.sh
. ${HOMEgfs}/ush/load_ufswm_modules.sh
. ${HOMEgfs}/ush/load_fv3gfs_modules.sh
status=$?
[[ ${status} -ne 0 ]] && exit ${status}

Expand Down
3 changes: 1 addition & 2 deletions jobs/rocoto/waveprep.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@ source "${HOMEgfs}/ush/preamble.sh"
###############################################################
echo
echo "=============== START TO SOURCE FV3GFS WORKFLOW MODULES ==============="
#. ${HOMEgfs}/ush/load_fv3gfs_modules.sh
. ${HOMEgfs}/ush/load_ufswm_modules.sh
. ${HOMEgfs}/ush/load_fv3gfs_modules.sh
status=$?
[[ ${status} -ne 0 ]] && exit ${status}

Expand Down
7 changes: 7 additions & 0 deletions scripts/exglobal_cleanup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,13 @@

source "${USHgfs}/preamble.sh"

# Remove DATAoutput from the forecast model run
# TODO: Handle this better
DATAfcst="${DATAROOT}/${RUN}fcst.${PDY:-}${cyc}"
if [[ -d "${DATAfcst}" ]]; then rm -rf "${DATAfcst}"; fi
#DATAefcs="${DATAROOT}/${RUN}efcs???${PDY:-}${cyc}"
rm -rf "${DATAROOT}/${RUN}efcs"*"${PDY:-}${cyc}"

###############################################################
# Clean up previous cycles; various depths
# PRIOR CYCLE: Leave the prior cycle alone
Expand Down
2 changes: 1 addition & 1 deletion sorc/build_upp.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,6 @@ if [[ ! -d "../exec" ]]; then
mkdir -p ../exec
fi

cd upp.fd/tests
cd ufs_model.fd/FV3/upp/tests
# shellcheck disable=SC2086
BUILD_JOBS=${BUILD_JOBS:-8} ./compile_upp.sh ${_opts}
9 changes: 4 additions & 5 deletions sorc/link_workflow.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -362,11 +362,10 @@ fi
#--link source code directories
#------------------------------
cd "${HOMEgfs}/sorc" || exit 8
# TODO: Commenting out until UPP is up-to-date with Rocky-8.
#if [[ -d ufs_model.fd ]]; then
# [[ -d upp.fd ]] && rm -rf upp.fd
# ${LINK} ufs_model.fd/FV3/upp upp.fd
#fi
if [[ -d ufs_model.fd ]]; then
[[ -d upp.fd ]] && rm -rf upp.fd
${LINK} ufs_model.fd/FV3/upp upp.fd
fi

if [[ -d gsi_enkf.fd ]]; then
[[ -d gsi.fd ]] && rm -rf gsi.fd
Expand Down
2 changes: 1 addition & 1 deletion sorc/ufs_model.fd
Open in desktop
Submodule ufs_model.fd updated 25 files
+1 −1 modulefiles/ufs_acorn.intel.lua
+5 −5 modulefiles/ufs_common.lua
+2 −2 modulefiles/ufs_gaea.intel.lua
+8 −3 modulefiles/ufs_hera.gnu.lua
+1 −1 modulefiles/ufs_hera.intel.lua
+1 −1 modulefiles/ufs_hercules.gnu.lua
+1 −1 modulefiles/ufs_hercules.intel.lua
+1 −1 modulefiles/ufs_jet.intel.lua
+1 −2 modulefiles/ufs_noaacloud.intel.lua
+1 −1 modulefiles/ufs_orion.intel.lua
+1 −1 modulefiles/ufs_s4.intel.lua
+1 −1 tests/bl_date.conf
+31 −31 tests/logs/OpnReqTests_control_p8_hera.log
+15 −9 tests/logs/OpnReqTests_cpld_control_nowave_noaero_p8_hera.log
+15 −15 tests/logs/OpnReqTests_regional_control_hera.log
+256 −256 tests/logs/RegressionTests_acorn.log
+265 −265 tests/logs/RegressionTests_derecho.log
+266 −266 tests/logs/RegressionTests_gaea.log
+543 −359 tests/logs/RegressionTests_hera.log
+440 −343 tests/logs/RegressionTests_hercules.log
+235 −235 tests/logs/RegressionTests_jet.log
+266 −266 tests/logs/RegressionTests_orion.log
+226 −226 tests/logs/RegressionTests_wcoss2.log
+7 −7 tests/rt.conf
+37 −1 tests/test_changes.list
1 change: 0 additions & 1 deletion sorc/upp.fd
Open in desktop
Submodule upp.fd deleted from 83e83a
2 changes: 1 addition & 1 deletion ush/forecast_postdet.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ FV3_out() {
echo "SUB ${FUNCNAME[0]}: copying output data for FV3"

# Copy configuration files
if [[ "${RUN}" == "gfs" || "${RUN}" == "gefs" ]]; then
if [[ "${RUN}" == "gfs" || "${RUN}" == "gdas" || "${RUN}" == "gefs" ]]; then
aerorahul marked this conversation as resolved.
Show resolved Hide resolved
${NCP} "${DATA}/input.nml" "${COMOUT_CONF}/ufs.input.nml"
${NCP} "${DATA}/model_configure" "${COMOUT_CONF}/ufs.model_configure"
${NCP} "${DATA}/ufs.configure" "${COMOUT_CONF}/ufs.ufs.configure"
Expand Down
Loading