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

gfs utils update #1088

Merged
merged 4 commits into from
Oct 24, 2022
Merged

gfs utils update #1088

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d3cd70a
Update to match gfs-util machine changes
WalterKolczynski-NOAA Oct 23, 2022
b8fd464
Fix permissions on checkout.sh
WalterKolczynski-NOAA Oct 23, 2022
72f461b
Fix regex in build all
WalterKolczynski-NOAA Oct 23, 2022
bf0765a
Make linter corrections
WalterKolczynski-NOAA Oct 23, 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
23 changes: 0 additions & 23 deletions modulefiles/modulefile.ww3.hera.lua
View file
Open in desktop

This file was deleted.

25 changes: 0 additions & 25 deletions modulefiles/modulefile.ww3.orion.lua
View file
Open in desktop

This file was deleted.

21 changes: 0 additions & 21 deletions modulefiles/modulefile.ww3.s4.lua
View file
Open in desktop

This file was deleted.

22 changes: 0 additions & 22 deletions modulefiles/modulefile.ww3.wcoss2.lua
View file
Open in desktop

This file was deleted.

8 changes: 4 additions & 4 deletions sorc/build_all.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,11 +73,11 @@ fi
#------------------------------------
# GET MACHINE
#------------------------------------
target=""
export COMPILER="intel"
# shellcheck disable=SC1091
source gfs_utils.fd/ush/machine-setup.sh > /dev/null 2>&1
source gfs_utils.fd/ush/detect_machine.sh
# shellcheck disable=
if [[ -z "${target}" ]]; then
if [[ -z "${MACHINE_ID}" ]]; then
echo "FATAL: Unable to determine target machine"
exit 1
fi
Expand All @@ -88,7 +88,7 @@ fi
# shellcheck source-path=sorc
source ./partial_build.sh $_verbose_opt $_partial_opt

if [[ ${target} == "jet" ]]; then
if [[ ${MACHINE_ID} =~ jet.* ]]; then
Build_gldas="false"
Build_ww3_prepost="false"
fi
Expand Down
10 changes: 6 additions & 4 deletions sorc/build_gdas.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,16 @@ script_dir=$(dirname "${BASH_SOURCE[0]}")
cd "${script_dir}" || exit 1

# shellcheck disable=SC1091
source gfs_utils.fd/ush/machine-setup.sh > /dev/null 2>&1
source gfs_utils.fd/ush/detect_machine.sh
# shellcheck disable=

export BUILD_TARGET="${target}"
# detect_machine now includes the compiler on some machines
# but the GDAS build script does not want it
MACHINE_ID=$(echo ${MACHINE_ID} | cut -d "." -f 1)
Fixed Show fixed Hide fixed

# use more build jobs if on NOAA HPC
build_jobs=4
case "${target}" in
case "${MACHINE_ID}" in
hera|orion)
build_jobs=10
;;
Expand All @@ -24,7 +26,7 @@ if [ ! -d "../exec" ]; then
fi

cd gdas.cd
BUILD_JOBS="${build_jobs}" ./build.sh -t "${BUILD_TARGET}"
BUILD_JOBS="${build_jobs}" ./build.sh -t "${MACHINE_ID}"

exit

7 changes: 4 additions & 3 deletions sorc/build_ww3prepost.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,9 @@ set -x
script_dir=$(dirname "${BASH_SOURCE[0]}")
cd "${script_dir}" || exit 1

export RT_COMPILER="intel"
# shellcheck disable=SC1091
source gfs_utils.fd/ush/machine-setup.sh > /dev/null 2>&1
source ${script_dir}/ufs_model.fd/tests/detect_machine.sh
# shellcheck disable=

# Default settings
Expand Down Expand Up @@ -44,8 +45,8 @@ finalexecdir=$( pwd -P )/../exec

#Determine machine and load modules
set +x
module use ../modulefiles
module load modulefile.ww3.${target}
module use ${script_dir}/ufs_model.fd/modulefiles
Fixed Show fixed Hide fixed
module load ufs_${MACHINE_ID}
Fixed Show fixed Hide fixed
set -x

#Set WW3 directory, switch, prep and post exes
Expand Down
Empty file modified sorc/checkout.sh
100644 → 100755
View file
Open in desktop
Empty file.