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

Add option to link different orog/ugwd fix files for global nest #2532

Merged
merged 3 commits into from
Apr 27, 2024
Merged

Add option to link different orog/ugwd fix files for global nest #2532

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
824a4c6
add --nest option to link different orog/ugwd fix files for global nest
guoqing-noaa Apr 24, 2024
8cab61d
revert changes for FIX_DIR on Hera
guoqing-noaa Apr 26, 2024
fa57f95
Merge branch 'develop' into prDevelop
guoqing-noaa Apr 26, 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
21 changes: 18 additions & 3 deletions sorc/link_workflow.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ function usage() {
Builds all of the global-workflow components by calling the individual build
scripts in sequence.

Usage: ${BASH_SOURCE[0]} [-h][-o]
Usage: ${BASH_SOURCE[0]} [-h][-o][--nest]
-h:
Print this help message and exit
-o:
Expand All @@ -23,12 +23,17 @@ RUN_ENVIR="emc"

# Reset option counter in case this script is sourced
OPTIND=1
while getopts ":ho" option; do
while getopts ":ho-:" option; do
case "${option}" in
h) usage ;;
o)
echo "-o option received, configuring for NCO"
RUN_ENVIR="nco";;
-)
if [[ "${OPTARG}" == "nest" ]]; then
LINK_NEST=ON
fi
;;
:)
echo "[${BASH_SOURCE[0]}]: ${option} requires an argument"
usage
Expand Down Expand Up @@ -65,7 +70,13 @@ ${LINK_OR_COPY} "${HOMEgfs}/versions/run.${machine}.ver" "${HOMEgfs}/versions/ru
#------------------------------
case "${machine}" in
"wcoss2") FIX_DIR="/lfs/h2/emc/global/noscrub/emc.global/FIX/fix" ;;
"hera") FIX_DIR="/scratch1/NCEPDEV/global/glopara/fix" ;;
"hera")
if [[ "${LINK_NEST:-OFF}" == "ON" ]] ; then
FIX_DIR="/scratch2/BMC/wrfruc/Guoqing.Ge/fix"
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a temporary change to bring awareness.
Once the fix files are updated as requested in #2529, this will be removed.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

To be specific, only changes from line 73-79 are temporary in this PR.

else
FIX_DIR="/scratch1/NCEPDEV/global/glopara/fix"
fi
;;
"orion") FIX_DIR="/work/noaa/global/glopara/fix" ;;
"hercules") FIX_DIR="/work/noaa/global/glopara/fix" ;;
"jet") FIX_DIR="/lfs4/HFIP/hfv3gfs/glopara/git/fv3gfs/fix" ;;
Expand All @@ -78,6 +89,10 @@ esac

# Source fix version file
source "${HOMEgfs}/versions/fix.ver"
# global-nest uses different versions of orog and ugwd
if [[ "${LINK_NEST:-OFF}" == "ON" ]] ; then
source "${HOMEgfs}/versions/fix.nest.ver"
fi

# Link wxflow in ush/python, workflow and ci/scripts
# TODO: This will be unnecessary when wxflow is part of the virtualenv
Expand Down
4 changes: 4 additions & 0 deletions versions/fix.nest.ver
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#!/bin/bash
# Fix file subfolder versions
export orog_ver=global-nest.20240419
export ugwd_ver=global-nest.20240419
Loading