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

Move logical checks into if blocks #3339

Open
wants to merge 21 commits into
base: develop
Choose a base branch
from
+1,494 −575
Open

Move logical checks into if blocks #3339

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
2c9142b
Wrap && logical operations into if blocks
DavidHuber-NOAA Feb 20, 2025
7683ee2
Move all || operators into if blocks
DavidHuber-NOAA Feb 20, 2025
2f7233e
Fix spacing
DavidHuber-NOAA Feb 20, 2025
86ba57e
Simplify build scripts
DavidHuber-NOAA Feb 20, 2025
d29ec6f
Allow relative paths when running generate_workflows.sh
DavidHuber-NOAA Feb 20, 2025
9d68203
Merge branch 'fix/if_blocks' of github.com:davidhuber-noaa/global-wor…
DavidHuber-NOAA Feb 20, 2025
f46f45b
Apply suggestions from code review
DavidHuber-NOAA Feb 20, 2025
548d305
Double-quote DATA variables
DavidHuber-NOAA Feb 20, 2025
10bedbc
More double quotes
DavidHuber-NOAA Feb 20, 2025
2d7deaa
Use double equals
DavidHuber-NOAA Feb 20, 2025
c8449a8
Double-quote exit variables
DavidHuber-NOAA Feb 20, 2025
0591486
More exit double quotes
DavidHuber-NOAA Feb 20, 2025
61bf9b1
Double-quote exit variables and double equal logical operators
DavidHuber-NOAA Feb 20, 2025
77f94f3
Double-quote CASE
DavidHuber-NOAA Feb 20, 2025
440ad19
More double equals, double quotes, and double brackets
DavidHuber-NOAA Feb 20, 2025
e1d9829
Merge branch 'develop' into fix/if_blocks
DavidHuber-NOAA Feb 20, 2025
bf386ab
Add double quotes and curly braces
DavidHuber-NOAA Feb 24, 2025
e227fcd
Merge develop; resolve conflict in config.resources
DavidHuber-NOAA Feb 24, 2025
ec646d9
Merge branch 'develop' into fix/if_blocks
DavidHuber-NOAA Feb 25, 2025
f14b2fd
Merge develop; resolve conflict in exgdas_enkf_sfc.sh
DavidHuber-NOAA Feb 28, 2025
122bf76
Import COM variables as well (COM templates are needed).
DavidHuber-NOAA Feb 28, 2025
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
4 changes: 3 additions & 1 deletion ci/scripts/driver.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,9 @@ pr_list=$(${GH} pr list --repo "${REPO_URL}" --label "CI-${MACHINE_ID^}-Ready" -

for pr in ${pr_list}; do
pr_dir="${GFS_CI_ROOT}/PR/${pr}"
[[ ! -d ${pr_dir} ]] && mkdir -p "${pr_dir}"
if [[ ! -d ${pr_dir} ]]; then
mkdir -p "${pr_dir}"
fi
db_list=$("${ROOT_DIR}/ci/scripts/utils/pr_list_database.py" --add_pr "${pr}" --dbfile "${pr_list_dbfile}")
output_ci_single="${pr_dir}/output_single.log"
#############################################################
Expand Down
5 changes: 4 additions & 1 deletion ci/scripts/utils/launch_java_agent.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,10 @@
${JAVA} -version

GH=$(command -v gh || echo "${HOME}/bin/gh")
[[ -f "${GH}" ]] || ( echo "ERROR: GitHub CLI (gh) not found. (exiting with error)"; exit 1 )
if [[! -f "${GH}" ]]; then
echo "ERROR: GitHub CLI (gh) not found. (exiting with error)"
exit 1
fi
${GH} --version
export GH

Expand Down
4 changes: 3 additions & 1 deletion ctests/scripts/stage.sh.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,9 @@ HOMEgfs="@PROJECT_SOURCE_DIR@"
set +x
source "${HOMEgfs}/workflow/gw_setup.sh"
rc=$?
[[ "${rc}" -ne 0 ]] && exit "${status}"
if [[ "${rc}" -ne 0 ]]; then
exit "${status}"
fi
set -x
PYTHONPATH="${PYTHONPATH:+${PYTHONPATH}:}${HOMEgfs}/sorc/wxflow/src"
export PYTHONPATH
Expand Down
4 changes: 3 additions & 1 deletion ctests/scripts/validate.sh.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,9 @@ HOMEgfs="@PROJECT_SOURCE_DIR@"
set +x
source "${HOMEgfs}/workflow/gw_setup.sh"
rc=$?
[[ "${rc}" -ne 0 ]] && exit "${status}"
if [[ "${rc}" -ne 0 ]]; then
exit "${status}"
fi
set -x
PYTHONPATH="${PYTHONPATH:+${PYTHONPATH}:}${HOMEgfs}/sorc/wxflow/src"
export PYTHONPATH
Expand Down
5 changes: 4 additions & 1 deletion docs/doxygen/compile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,10 @@ else
echo "trying system doxygen"
doxygen=$(which doxygen)
rc=$?
[[ $rc -ne 0 ]] && (echo "doxygen not found, ABORT!"; exit 1)
if [[ $rc -ne 0 ]]; then
echo "doxygen not found, ABORT!"
exit 1
fi
fi

$doxygen
Expand Down
8 changes: 6 additions & 2 deletions env/AWSPW.env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,12 @@ if [[ -n "${ntasks:-}" && -n "${max_tasks_per_node:-}" && -n "${tasks_per_node:-
max_threads_per_task=$((max_tasks_per_node / tasks_per_node))
NTHREADSmax=${threads_per_task:-${max_threads_per_task}}
NTHREADS1=${threads_per_task:-1}
[[ ${NTHREADSmax} -gt ${max_threads_per_task} ]] && NTHREADSmax=${max_threads_per_task}
[[ ${NTHREADS1} -gt ${max_threads_per_task} ]] && NTHREADS1=${max_threads_per_task}
if [[ ${NTHREADSmax} -gt ${max_threads_per_task} ]]; then
NTHREADSmax=${max_threads_per_task}
fi
if [[ ${NTHREADS1} -gt ${max_threads_per_task} ]]; then
NTHREADS1=${max_threads_per_task}
fi
APRUN_default="${launcher} -n ${ntasks}"
else
echo "ERROR config.resources must be sourced before sourcing AWSPW.env"
Expand Down
24 changes: 18 additions & 6 deletions env/AZUREPW.env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,12 @@ if [[ -n "${ntasks:-}" && -n "${max_tasks_per_node:-}" && -n "${tasks_per_node:-
max_threads_per_task=$((max_tasks_per_node / tasks_per_node))
NTHREADSmax=${threads_per_task:-${max_threads_per_task}}
NTHREADS1=${threads_per_task:-1}
[[ ${NTHREADSmax} -gt ${max_threads_per_task} ]] && NTHREADSmax=${max_threads_per_task}
[[ ${NTHREADS1} -gt ${max_threads_per_task} ]] && NTHREADS1=${max_threads_per_task}
if [[ ${NTHREADSmax} -gt ${max_threads_per_task} ]]; then
NTHREADSmax=${max_threads_per_task}
fi
if [[ ${NTHREADS1} -gt ${max_threads_per_task} ]]; then
NTHREADS1=${max_threads_per_task}
fi
APRUN_default="${launcher} -n ${ntasks}"
else
echo "ERROR config.resources must be sourced before sourcing AZUREPW.env"
Expand Down Expand Up @@ -61,7 +65,9 @@ elif [[ "${step}" = "post" ]]; then
export APRUN_NP="${APRUN_default}"

export NTHREADS_DWN=${threads_per_task_dwn:-1}
[[ ${NTHREADS_DWN} -gt ${max_threads_per_task} ]] && export NTHREADS_DWN=${max_threads_per_task}
if [[ ${NTHREADS_DWN} -gt ${max_threads_per_task} ]]; then
export NTHREADS_DWN=${max_threads_per_task}
fi
export APRUN_DWN="${launcher} -n ${ntasks_dwn}"

elif [[ "${step}" = "atmos_products" ]]; then
Expand All @@ -79,11 +85,15 @@ elif [[ "${step}" = "ecen" ]]; then
export APRUN_ECEN="${APRUN_default}"

export NTHREADS_CHGRES=${threads_per_task_chgres:-12}
[[ ${NTHREADS_CHGRES} -gt ${max_tasks_per_node} ]] && export NTHREADS_CHGRES=${max_tasks_per_node}
if [[ ${NTHREADS_CHGRES} -gt ${max_tasks_per_node} ]]; then
export NTHREADS_CHGRES=${max_tasks_per_node}
fi
export APRUN_CHGRES="time"

export NTHREADS_CALCINC=${threads_per_task_calcinc:-1}
[[ ${NTHREADS_CALCINC} -gt ${max_threads_per_task} ]] && export NTHREADS_CALCINC=${max_threads_per_task}
if [[ ${NTHREADS_CALCINC} -gt ${max_threads_per_task} ]]; then
export NTHREADS_CALCINC=${max_threads_per_task}
fi
export APRUN_CALCINC="${APRUN_default}"

elif [[ "${step}" = "esfc" ]]; then
Expand All @@ -92,7 +102,9 @@ elif [[ "${step}" = "esfc" ]]; then
export APRUN_ESFC="${APRUN_default}"

export NTHREADS_CYCLE=${threads_per_task_cycle:-14}
[[ ${NTHREADS_CYCLE} -gt ${max_tasks_per_node} ]] && export NTHREADS_CYCLE=${max_tasks_per_node}
if [[ ${NTHREADS_CYCLE} -gt ${max_tasks_per_node} ]]; then
export NTHREADS_CYCLE=${max_tasks_per_node}
fi
export APRUN_CYCLE="${APRUN_default}"

elif [[ "${step}" = "epos" ]]; then
Expand Down
48 changes: 36 additions & 12 deletions env/GAEAC5.env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,12 @@ if [[ -n "${ntasks:-}" && -n "${max_tasks_per_node:-}" && -n "${tasks_per_node:-
max_threads_per_task=$((max_tasks_per_node / tasks_per_node))
NTHREADSmax=${threads_per_task:-${max_threads_per_task}}
NTHREADS1=${threads_per_task:-1}
[[ ${NTHREADSmax} -gt ${max_threads_per_task} ]] && NTHREADSmax=${max_threads_per_task}
[[ ${NTHREADS1} -gt ${max_threads_per_task} ]] && NTHREADS1=${max_threads_per_task}
if [[ ${NTHREADSmax} -gt ${max_threads_per_task} ]]; then
NTHREADSmax=${max_threads_per_task}
fi
if [[ ${NTHREADS1} -gt ${max_threads_per_task} ]]; then
NTHREADS1=${max_threads_per_task}
fi
# This may be useful when GaeaC5 is fully ported, so ignore SC warning
# shellcheck disable=SC2034
APRUN_default="${launcher} -n ${ntasks}"
Expand All @@ -49,7 +53,9 @@ case ${step} in
"waveinit" | "waveprep" | "wavepostsbs" | "wavepostbndpnt" | "wavepostpnt" | "wavepostbndpntbll")

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

Expand Down Expand Up @@ -135,7 +141,9 @@ case ${step} in
max_threads_per_task=$((max_tasks_per_node / tasks_per_node_ocnanalecen))

export NTHREADS_OCNANALECEN=${threads_per_task_ocnanalecen:-${max_threads_per_task}}
[[ ${NTHREADS_OCNANALECEN} -gt ${max_threads_per_task} ]] && export NTHREADS_OCNANALECEN=${max_threads_per_task}
if [[ ${NTHREADS_OCNANALECEN} -gt ${max_threads_per_task} ]]; then
export NTHREADS_OCNANALECEN=${max_threads_per_task}
fi
export APRUN_OCNANALECEN="${launcher} -n ${ntasks_ocnanalecen} --cpus-per-task=${NTHREADS_OCNANALECEN}"
;;
"marineanlchkpt")
Expand All @@ -158,11 +166,15 @@ case ${step} in
export APRUN_GSI="${APRUN_default} --cpus-per-task=${NTHREADS_GSI}"

export NTHREADS_CALCINC=${threads_per_task_calcinc:-1}
[[ ${NTHREADS_CALCINC} -gt ${max_threads_per_task} ]] && export NTHREADS_CALCINC=${max_threads_per_task}
if [[ ${NTHREADS_CALCINC} -gt ${max_threads_per_task} ]]; then
export NTHREADS_CALCINC=${max_threads_per_task}
fi
export APRUN_CALCINC="${launcher} \$ncmd --cpus-per-task=${NTHREADS_CALCINC}"

export NTHREADS_CYCLE=${threads_per_task_cycle:-12}
[[ ${NTHREADS_CYCLE} -gt ${max_tasks_per_node} ]] && export NTHREADS_CYCLE=${max_tasks_per_node}
if [[ ${NTHREADS_CYCLE} -gt ${max_tasks_per_node} ]]; then
export NTHREADS_CYCLE=${max_tasks_per_node}
fi
ntasks_cycle=${ntiles:-6}
export APRUN_CYCLE="${launcher} -n ${ntasks_cycle} --cpus-per-task=${NTHREADS_CYCLE}"

Expand All @@ -173,7 +185,9 @@ case ${step} in
"sfcanl")

export NTHREADS_CYCLE=${threads_per_task:-14}
[[ ${NTHREADS_CYCLE} -gt ${max_tasks_per_node} ]] && export NTHREADS_CYCLE=${max_tasks_per_node}
if [[ ${NTHREADS_CYCLE} -gt ${max_tasks_per_node} ]]; then
export NTHREADS_CYCLE=${max_tasks_per_node}
fi
export APRUN_CYCLE="${APRUN_default} --cpus-per-task=${NTHREADS_CYCLE}"
;;
"eobs")
Expand All @@ -187,7 +201,9 @@ case ${step} in


export NTHREADS_GSI=${NTHREADSmax}
[[ ${NTHREADS_GSI} -gt ${max_threads_per_task} ]] && export NTHREADS_GSI=${max_threads_per_task}
if [[ ${NTHREADS_GSI} -gt ${max_threads_per_task} ]]; then
export NTHREADS_GSI=${max_threads_per_task}
fi
export APRUN_GSI="${APRUN_default} --cpus-per-task=${NTHREADS_GSI}"
;;
"eupd")
Expand Down Expand Up @@ -234,11 +250,15 @@ case ${step} in
export APRUN_ECEN="${APRUN_default} --cpus-per-task=${NTHREADS_ECEN}"

export NTHREADS_CHGRES=${threads_per_task_chgres:-12}
[[ ${NTHREADS_CHGRES} -gt ${max_tasks_per_node} ]] && export NTHREADS_CHGRES=${max_tasks_per_node}
if [[ ${NTHREADS_CHGRES} -gt ${max_tasks_per_node} ]]; then
export NTHREADS_CHGRES=${max_tasks_per_node}
fi
export APRUN_CHGRES="time"

export NTHREADS_CALCINC=${threads_per_task_calcinc:-1}
[[ ${NTHREADS_CALCINC} -gt ${max_threads_per_task} ]] && export NTHREADS_CALCINC=${max_threads_per_task}
if [[ ${NTHREADS_CALCINC} -gt ${max_threads_per_task} ]]; then
export NTHREADS_CALCINC=${max_threads_per_task}
fi
export APRUN_CALCINC="${APRUN_default} --cpus-per-task=${NTHREADS_CALCINC}"

;;
Expand All @@ -248,7 +268,9 @@ case ${step} in
export APRUN_ESFC="${APRUN_default} --cpus-per-task=${NTHREADS_ESFC}"

export NTHREADS_CYCLE=${threads_per_task_cycle:-14}
[[ ${NTHREADS_CYCLE} -gt ${max_tasks_per_node} ]] && export NTHREADS_CYCLE=${max_tasks_per_node}
if [[ ${NTHREADS_CYCLE} -gt ${max_tasks_per_node} ]]; then
export NTHREADS_CYCLE=${max_tasks_per_node}
fi
export APRUN_CYCLE="${APRUN_default} --cpus-per-task=${NTHREADS_CYCLE}"

;;
Expand All @@ -266,7 +288,9 @@ case ${step} in
export APRUN_POSTSND="${APRUN_default} --cpus-per-task=${NTHREADS_POSTSND}"

export NTHREADS_POSTSNDCFP=${threads_per_task_postsndcfp:-1}
[[ ${NTHREADS_POSTSNDCFP} -gt ${max_threads_per_task} ]] && export NTHREADS_POSTSNDCFP=${max_threads_per_task}
if [[ ${NTHREADS_POSTSNDCFP} -gt ${max_threads_per_task} ]]; then
export NTHREADS_POSTSNDCFP=${max_threads_per_task}
fi
export APRUN_POSTSNDCFP="${launcher} -n ${ntasks_postsndcfp} ${mpmd_opt}"

;;
Expand Down
48 changes: 36 additions & 12 deletions env/GAEAC6.env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,12 @@ if [[ -n "${ntasks:-}" && -n "${max_tasks_per_node:-}" && -n "${tasks_per_node:-
max_threads_per_task=$((max_tasks_per_node / tasks_per_node))
NTHREADSmax=${threads_per_task:-${max_threads_per_task}}
NTHREADS1=${threads_per_task:-1}
[[ ${NTHREADSmax} -gt ${max_threads_per_task} ]] && NTHREADSmax=${max_threads_per_task}
[[ ${NTHREADS1} -gt ${max_threads_per_task} ]] && NTHREADS1=${max_threads_per_task}
if [[ ${NTHREADSmax} -gt ${max_threads_per_task} ]]; then
NTHREADSmax=${max_threads_per_task}
fi
if [[ ${NTHREADS1} -gt ${max_threads_per_task} ]]; then
NTHREADS1=${max_threads_per_task}
fi
# This may be useful when GaeaC6 is fully ported, so ignore SC warning
# shellcheck disable=SC2034
APRUN_default="${launcher} -n ${ntasks}"
Expand All @@ -49,7 +53,9 @@ case ${step} in
"waveinit" | "waveprep" | "wavepostsbs" | "wavepostbndpnt" | "wavepostpnt" | "wavepostbndpntbll")

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

Expand Down Expand Up @@ -135,7 +141,9 @@ case ${step} in
max_threads_per_task=$((max_tasks_per_node / tasks_per_node_ocnanalecen))

export NTHREADS_OCNANALECEN=${threads_per_task_ocnanalecen:-${max_threads_per_task}}
[[ ${NTHREADS_OCNANALECEN} -gt ${max_threads_per_task} ]] && export NTHREADS_OCNANALECEN=${max_threads_per_task}
if [[ ${NTHREADS_OCNANALECEN} -gt ${max_threads_per_task} ]]; then
export NTHREADS_OCNANALECEN=${max_threads_per_task}
fi
export APRUN_OCNANALECEN="${launcher} -n ${ntasks_ocnanalecen} --cpus-per-task=${NTHREADS_OCNANALECEN}"
;;
"marineanlchkpt")
Expand All @@ -158,11 +166,15 @@ case ${step} in
export APRUN_GSI="${APRUN_default} --cpus-per-task=${NTHREADS_GSI}"

export NTHREADS_CALCINC=${threads_per_task_calcinc:-1}
[[ ${NTHREADS_CALCINC} -gt ${max_threads_per_task} ]] && export NTHREADS_CALCINC=${max_threads_per_task}
if [[ ${NTHREADS_CALCINC} -gt ${max_threads_per_task} ]]; then
export NTHREADS_CALCINC=${max_threads_per_task}
fi
export APRUN_CALCINC="${launcher} \$ncmd --cpus-per-task=${NTHREADS_CALCINC}"

export NTHREADS_CYCLE=${threads_per_task_cycle:-12}
[[ ${NTHREADS_CYCLE} -gt ${max_tasks_per_node} ]] && export NTHREADS_CYCLE=${max_tasks_per_node}
if [[ ${NTHREADS_CYCLE} -gt ${max_tasks_per_node} ]]; then
export NTHREADS_CYCLE=${max_tasks_per_node}
fi
ntasks_cycle=${ntiles:-6}
export APRUN_CYCLE="${launcher} -n ${ntasks_cycle} --cpus-per-task=${NTHREADS_CYCLE}"

Expand All @@ -173,7 +185,9 @@ case ${step} in
"sfcanl")

export NTHREADS_CYCLE=${threads_per_task:-14}
[[ ${NTHREADS_CYCLE} -gt ${max_tasks_per_node} ]] && export NTHREADS_CYCLE=${max_tasks_per_node}
if [[ ${NTHREADS_CYCLE} -gt ${max_tasks_per_node} ]]; then
export NTHREADS_CYCLE=${max_tasks_per_node}
fi
export APRUN_CYCLE="${APRUN_default} --cpus-per-task=${NTHREADS_CYCLE}"
;;
"eobs")
Expand All @@ -187,7 +201,9 @@ case ${step} in


export NTHREADS_GSI=${NTHREADSmax}
[[ ${NTHREADS_GSI} -gt ${max_threads_per_task} ]] && export NTHREADS_GSI=${max_threads_per_task}
if [[ ${NTHREADS_GSI} -gt ${max_threads_per_task} ]]; then
export NTHREADS_GSI=${max_threads_per_task}
fi
export APRUN_GSI="${APRUN_default} --cpus-per-task=${NTHREADS_GSI}"
;;
"eupd")
Expand Down Expand Up @@ -234,11 +250,15 @@ case ${step} in
export APRUN_ECEN="${APRUN_default} --cpus-per-task=${NTHREADS_ECEN}"

export NTHREADS_CHGRES=${threads_per_task_chgres:-12}
[[ ${NTHREADS_CHGRES} -gt ${max_tasks_per_node} ]] && export NTHREADS_CHGRES=${max_tasks_per_node}
if [[ ${NTHREADS_CHGRES} -gt ${max_tasks_per_node} ]]; then
export NTHREADS_CHGRES=${max_tasks_per_node}
fi
export APRUN_CHGRES="time"

export NTHREADS_CALCINC=${threads_per_task_calcinc:-1}
[[ ${NTHREADS_CALCINC} -gt ${max_threads_per_task} ]] && export NTHREADS_CALCINC=${max_threads_per_task}
if [[ ${NTHREADS_CALCINC} -gt ${max_threads_per_task} ]]; then
export NTHREADS_CALCINC=${max_threads_per_task}
fi
export APRUN_CALCINC="${APRUN_default} --cpus-per-task=${NTHREADS_CALCINC}"

;;
Expand All @@ -248,7 +268,9 @@ case ${step} in
export APRUN_ESFC="${APRUN_default} --cpus-per-task=${NTHREADS_ESFC}"

export NTHREADS_CYCLE=${threads_per_task_cycle:-14}
[[ ${NTHREADS_CYCLE} -gt ${max_tasks_per_node} ]] && export NTHREADS_CYCLE=${max_tasks_per_node}
if [[ ${NTHREADS_CYCLE} -gt ${max_tasks_per_node} ]]; then
export NTHREADS_CYCLE=${max_tasks_per_node}
fi
export APRUN_CYCLE="${APRUN_default} --cpus-per-task=${NTHREADS_CYCLE}"

;;
Expand All @@ -266,7 +288,9 @@ case ${step} in
export APRUN_POSTSND="${APRUN_default} --cpus-per-task=${NTHREADS_POSTSND}"

export NTHREADS_POSTSNDCFP=${threads_per_task_postsndcfp:-1}
[[ ${NTHREADS_POSTSNDCFP} -gt ${max_threads_per_task} ]] && export NTHREADS_POSTSNDCFP=${max_threads_per_task}
if [[ ${NTHREADS_POSTSNDCFP} -gt ${max_threads_per_task} ]]; then
export NTHREADS_POSTSNDCFP=${max_threads_per_task}
fi
export APRUN_POSTSNDCFP="${launcher} -n ${ntasks_postsndcfp} ${mpmd_opt}"

;;
Expand Down
Loading