Skip to content

Commit

Permalink
Convert HERCULES.env to use cases. Update Hercules URL. NOAA-EMC#1588
Browse files Browse the repository at this point in the history
  • Loading branch information
DavidHuber-NOAA committed Dec 12, 2023
1 parent 1c042ce commit 1f5a3d1
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 9 deletions.
18 changes: 10 additions & 8 deletions env/HERCULES.env
Original file line number Diff line number Diff line change
Expand Up @@ -30,15 +30,16 @@ export NTHSTACK=1024000000
ulimit -s unlimited
ulimit -a

if [[ "${step}" = "waveinit" ]] || [[ "${step}" = "waveprep" ]] || [[ "${step}" = "wavepostsbs" ]] || \
[[ "${step}" = "wavepostbndpnt" ]] || [[ "${step}" = "wavepostpnt" ]] || [[ "${step}" == "wavepostbndpntbll" ]]; then
case ${step} in
"waveinit" | "waveprep" | "wavepostsbs" | "wavepostbndpnt" | "wavepostpnt" | "wavepostbndpntbll")

export CFP_MP="YES"
if [[ "${step}" = "waveprep" ]]; then export MP_PULSE=0 ; fi
export wavempexec=${launcher}
export wave_mpmd=${mpmd_opt}

elif [[ "${step}" = "fcst" ]]; then
;;
"fcst" )

export OMP_STACKSIZE=512M
if [[ "${CDUMP}" =~ "gfs" ]]; then
Expand All @@ -53,17 +54,18 @@ elif [[ "${step}" = "fcst" ]]; then
# With ESMF threading, the model wants to use the full node
export APRUN_UFS="${launcher} -n ${ntasks}"
unset nprocs ppn nnodes ntasks
;;

elif [[ "${step}" = "upp" ]]; then
"upp" )

nth_max=$((npe_node_max / npe_node_upp))

export NTHREADS_UPP=${nth_upp:-1}
[[ ${NTHREADS_UPP} -gt ${nth_max} ]] && export NTHREADS_UPP=${nth_max}
export APRUN_UPP="${launcher} -n ${npe_upp} --cpus-per-task=${NTHREADS_UPP}"

elif [[ "${step}" = "atmos_products" ]]; then
;;
"atmos_products")

export USE_CFP="YES" # Use MPMD for downstream product generation

fi
;;
esac
2 changes: 1 addition & 1 deletion ush/detect_machine.sh
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ case $(hostname -f) in

Orion-login-[1-4].HPC.MsState.Edu) MACHINE_ID=orion ;; ### orion1-4

hercules-login-[1-4].hpc.msstate.edu) MACHINE_ID=hercules ;; ### hercules1-4
Hercules-login-[1-4].HPC.MsState.Edu) MACHINE_ID=hercules ;; ### hercules1-4

cheyenne[1-6].cheyenne.ucar.edu) MACHINE_ID=cheyenne ;; ### cheyenne1-6
cheyenne[1-6].ib0.cheyenne.ucar.edu) MACHINE_ID=cheyenne ;; ### cheyenne1-6
Expand Down

0 comments on commit 1f5a3d1

Please sign in to comment.