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

GFS-UTILS update for build and ush scripts #1082

Merged
merged 8 commits into from
Oct 22, 2022
Merged

GFS-UTILS update for build and ush scripts #1082

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
ab7fc7b
Update gfs-utils ush script paths
KateFriedman-NOAA Oct 20, 2022
680c029
Update build_gfs_utils.sh for new repo home
KateFriedman-NOAA Oct 20, 2022
4573256
Update link_workflow.sh for new gfs-utils repo
KateFriedman-NOAA Oct 20, 2022
29ae219
Add h to getopts in build_gfs_utils.sh
KateFriedman-NOAA Oct 20, 2022
3467e86
Update gfs-utils hash to af933d3
KateFriedman-NOAA Oct 20, 2022
f272e64
Address SC2086 and SC2250 linter warnings
KateFriedman-NOAA Oct 20, 2022
ee871e9
Slight quote change to build command in build_gfs_utils.sh
KateFriedman-NOAA Oct 21, 2022
e5fd6b7
Merge branch 'develop' into feature/gfs-utils-ush
WalterKolczynski-NOAA Oct 22, 2022
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
2 changes: 1 addition & 1 deletion sorc/build_gfs_utils.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,6 @@ shift $((OPTIND-1))

BUILD_TYPE=${BUILD_TYPE:-"Release"} \
BUILD_VERBOSE=${BUILD_VERBOSE:-"NO"} \
${cwd}/gfs_utils.fd/ush/build.sh
"${cwd}"/gfs_utils.fd/ush/build.sh
WalterKolczynski-NOAA marked this conversation as resolved.
Show resolved Hide resolved

exit
8 changes: 4 additions & 4 deletions sorc/link_workflow.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,12 +44,12 @@ shift $((OPTIND-1))

script_dir=$(cd "$(dirname "${BASH_SOURCE[0]}")" &> /dev/null && pwd)
top_dir=$(cd "$(dirname "${script_dir}")" &> /dev/null && pwd)
cd ${script_dir}
cd "${script_dir}"

# shellcheck disable=SC1091
source gfs_utils.fd/ush/detect_machine.sh # (sets MACHINE_ID)
# shellcheck disable=
machine=$(echo $MACHINE_ID | cut -d. -f1)
machine=$(echo "${MACHINE_ID}" | cut -d. -f1)

#------------------------------
#--model fix fields
Expand Down Expand Up @@ -133,7 +133,7 @@ cd "${top_dir}/parm/post" || exit 1
done

cd "${top_dir}/scripts" || exit 8
$LINK "${script_dir}/ufs_utils.fd/scripts/exemcsfc_global_sfc_prep.sh" .
${LINK} "${script_dir}/ufs_utils.fd/scripts/exemcsfc_global_sfc_prep.sh" .
cd "${top_dir}/ush" || exit 8
for file in emcsfc_ice_blend.sh fv3gfs_driver_grid.sh fv3gfs_make_orog.sh global_cycle_driver.sh \
emcsfc_snow.sh fv3gfs_filter_topo.sh global_cycle.sh fv3gfs_make_grid.sh ; do
Expand Down Expand Up @@ -244,7 +244,7 @@ if [ -d "${script_dir}/gfs_wafs.fd" ]; then
wafs_awc_wafavn.x wafs_blending.x wafs_blending_0p25.x \
wafs_cnvgrib2.x wafs_gcip.x wafs_grib2_0p25.x \
wafs_makewafs.x wafs_setmissing.x; do
[[ -s $wafsexe ]] && rm -f $wafsexe
[[ -s ${wafsexe} ]] && rm -f ${wafsexe}
${LINK} "${script_dir}/gfs_wafs.fd/exec/${wafsexe}" .
done
fi
Expand Down