Skip to content

Commit

Permalink
Merge branch 'develop' into feature/ims_snowcover
Browse files Browse the repository at this point in the history
  • Loading branch information
jiaruidong2017 committed Sep 20, 2024
2 parents 5ddf552 + 3c86873 commit 0bfbff7
Show file tree
Hide file tree
Showing 7 changed files with 24 additions and 15 deletions.
5 changes: 0 additions & 5 deletions jobs/JGFS_ATMOS_CYCLONE_GENESIS
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,6 @@
source "${HOMEgfs}/ush/preamble.sh"
source "${HOMEgfs}/ush/jjob_header.sh" -e "genesis" -c "base genesis"

# Hack to temporary skip this as the tracker has not been build
# on Hercules Rocky 9 yet
# TODO: Remove this after tracker has been built for Rocky 9 #2639
if [[ "${machine}" == 'HERCULES' ]]; then exit 0; fi

##############################################
# Set variables used in the exglobal script
##############################################
Expand Down
5 changes: 0 additions & 5 deletions jobs/JGFS_ATMOS_CYCLONE_TRACKER
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,6 @@
source "${HOMEgfs}/ush/preamble.sh"
source "${HOMEgfs}/ush/jjob_header.sh" -e "tracker" -c "base tracker"

# Hack to temporary skip this as the tracker has not been build
# on Hercules Rocky 9 yet
# TODO: Remove this after tracker has been built for Rocky 9 #2639
if [[ "${machine}" == 'HERCULES' ]]; then exit 0; fi

export COMPONENT="atmos"


Expand Down
7 changes: 7 additions & 0 deletions parm/config/gfs/config.base
Original file line number Diff line number Diff line change
Expand Up @@ -492,4 +492,11 @@ if [[ "${machine}" =~ "PW" ]]; then
export DO_WAVE="NO"
fi

# The tracker and genesis are not installed on Orion/Hercules yet; this requires spack-stack builds of the package.
# TODO: we should place these in workflow/hosts/[orion|hercules].yaml.
if [[ "${machine}" == "ORION" || "${machine}" == "HERCULES" ]]; then
export DO_TRACKER="NO"
export DO_GENESIS="NO"
fi

echo "END: config.base"
16 changes: 14 additions & 2 deletions parm/config/gfs/config.resources.HERA
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,9 @@
case ${step} in
"anal")
if [[ "${CASE}" == "C384" ]]; then
export ntasks=270
export threads_per_task_anal=8
export ntasks_gdas=270
export ntasks_gfs=270
export threads_per_task=8
export tasks_per_node=$(( max_tasks_per_node / threads_per_task ))
fi
;;
Expand All @@ -26,6 +27,10 @@ case ${step} in

"eupd")
case ${CASE} in
"C768")
export ntasks=80
export threads_per_task=20
;;
"C384")
export ntasks=80
;;
Expand All @@ -43,6 +48,13 @@ case ${step} in
export tasks_per_node=$(( max_tasks_per_node / threads_per_task ))
;;

"upp")
if (( "${CASE:1}" >= 768 )); then
# Run fewer tasks per node for memory
tasks_per_node=20
fi
;;

*)
;;
esac
2 changes: 1 addition & 1 deletion parm/config/gfs/config.resources.S4
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ case ${step} in
*)
;;
esac
export tasks_node=$(( max_tasks_per_node / threads_per_task ))
export tasks_per_node=$(( max_tasks_per_node / threads_per_task ))
;;

"eobs")
Expand Down
2 changes: 1 addition & 1 deletion parm/config/gfs/config.ufs
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,7 @@ case "${fv3_res}" in
export rf_cutoff=100.0
export fv_sg_adj=450
export WRITE_GROUP_GDAS=2
export WRTTASK_PER_GROUP_PER_THREAD_PER_TILE_GDAS=10
export WRTTASK_PER_GROUP_PER_THREAD_PER_TILE_GDAS=15
export WRITE_GROUP_GFS=4
export WRTTASK_PER_GROUP_PER_THREAD_PER_TILE_GFS=20 #Note this should be 10 for WCOSS2
fi
Expand Down

0 comments on commit 0bfbff7

Please sign in to comment.