From d7994fae8631b251d2f90488102983afc9587123 Mon Sep 17 00:00:00 2001 From: "kate.friedman" Date: Mon, 7 Nov 2022 09:54:14 -0600 Subject: [PATCH 1/5] Update multi-prog in HERA.env - Create mpmd_opt variable and set it to "--multi-prog". - Replace instances of "--multi-prog" in launcher commands with new mpmd_opt variable. Refs #1060 --- env/HERA.env | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/env/HERA.env b/env/HERA.env index b7561883b53..f8edc55c421 100755 --- a/env/HERA.env +++ b/env/HERA.env @@ -17,6 +17,7 @@ step=$1 export npe_node_max=40 export launcher="srun -l --export=ALL" +export mpmd_opt="--multi-prog" # Configure MPI environment #export I_MPI_ADJUST_ALLREDUCE=5 @@ -47,17 +48,16 @@ if [ $step = "prep" -o $step = "prepbufr" ]; then elif [ $step = "waveinit" -o $step = "waveprep" -o $step = "wavepostsbs" -o $step = "wavepostbndpnt" -o $step = "wavepostbndpntbll" -o $step = "wavepostpnt" ]; then - export mpmd="--multi-prog" export CFP_MP="YES" if [ $step = "waveprep" ]; then export MP_PULSE=0 ; fi export wavempexec=${launcher} - export wave_mpmd=${mpmd} + export wave_mpmd=${mpmd_opt} elif [ $step = "atmanalrun" ]; then export CFP_MP=${CFP_MP:-"YES"} export USE_CFP=${USE_CFP:-"YES"} - export APRUNCFP="$launcher -n \$ncmd --multi-prog" + export APRUNCFP="$launcher -n \$ncmd ${mpmd_opt}" nth_max=$(($npe_node_max / $npe_node_atmanalrun)) @@ -69,7 +69,7 @@ elif [ $step = "atmensanalrun" ]; then export CFP_MP=${CFP_MP:-"YES"} export USE_CFP=${USE_CFP:-"YES"} - export APRUNCFP="$launcher -n \$ncmd --multi-prog" + export APRUNCFP="$launcher -n \$ncmd ${mpmd_opt}" nth_max=$(($npe_node_max / $npe_node_atmensanalrun)) @@ -79,7 +79,7 @@ elif [ $step = "atmensanalrun" ]; then elif [ $step = "aeroanlrun" ]; then - export APRUNCFP="$launcher -n \$ncmd --multi-prog" + export APRUNCFP="$launcher -n \$ncmd ${mpmd_opt}" nth_max=$(($npe_node_max / $npe_node_aeroanlrun)) @@ -94,7 +94,7 @@ elif [ $step = "anal" -o $step = "analcalc" ]; then export CFP_MP=${CFP_MP:-"YES"} export USE_CFP=${USE_CFP:-"YES"} - export APRUNCFP="$launcher -n \$ncmd --multi-prog" + export APRUNCFP="$launcher -n \$ncmd ${mpmd_opt}" nth_max=$(($npe_node_max / $npe_node_anal)) @@ -143,7 +143,7 @@ elif [ $step = "gldas" ]; then # periods being processed. npe_gldas_data_proc=$(($gldas_spinup_hours + 12)) - export APRUN_GLDAS_DATA_PROC="$launcher -n $npe_gldas_data_proc --multi-prog" + export APRUN_GLDAS_DATA_PROC="$launcher -n $npe_gldas_data_proc ${mpmd_opt}" elif [ $step = "eobs" ]; then @@ -158,7 +158,7 @@ elif [ $step = "eobs" ]; then export CFP_MP=${CFP_MP:-"YES"} export USE_CFP=${USE_CFP:-"YES"} - export APRUNCFP="$launcher -n \$ncmd --multi-prog" + export APRUNCFP="$launcher -n \$ncmd ${mpmd_opt}" elif [ $step = "eupd" ]; then @@ -170,7 +170,7 @@ elif [ $step = "eupd" ]; then export CFP_MP=${CFP_MP:-"YES"} export USE_CFP=${USE_CFP:-"YES"} - export APRUNCFP="$launcher -n \$ncmd --multi-prog" + export APRUNCFP="$launcher -n \$ncmd ${mpmd_opt}" elif [ $step = "fcst" ]; then @@ -280,7 +280,7 @@ elif [ $step = "awips" ]; then export NTHREADS_AWIPS=${nth_awips:-2} [[ $NTHREADS_AWIPS -gt $nth_max ]] && export NTHREADS_AWIPS=$nth_max - export APRUN_AWIPSCFP="$launcher -n $npe_awips --multi-prog" + export APRUN_AWIPSCFP="$launcher -n $npe_awips ${mpmd_opt}" elif [ $step = "gempak" ]; then @@ -288,5 +288,5 @@ elif [ $step = "gempak" ]; then export NTHREADS_GEMPAK=${nth_gempak:-1} [[ $NTHREADS_GEMPAK -gt $nth_max ]] && export NTHREADS_GEMPAK=$nth_max - export APRUN="$launcher -n $npe_gempak --multi-prog" + export APRUN="$launcher -n $npe_gempak ${mpmd_opt}" fi From 927c17d996edb3e503a6f97eb67d8b9467ab1f85 Mon Sep 17 00:00:00 2001 From: "kate.friedman" Date: Mon, 7 Nov 2022 09:56:33 -0600 Subject: [PATCH 2/5] Update launcher commands in ORION.env - Create new mpmd_opt variable (="--multi-prog") and replace instances of "--multi-prog" in launcher commands with mpmd_opt variable. - Update launcher commands that were missing "-n $npe" flags to now include npe # flag. Refs #1060 --- env/ORION.env | 52 +++++++++++++++++++++++++-------------------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/env/ORION.env b/env/ORION.env index 04bae19e0e0..b353cff894a 100755 --- a/env/ORION.env +++ b/env/ORION.env @@ -17,6 +17,7 @@ step=$1 export npe_node_max=40 export launcher="srun -l --export=ALL" +export mpmd_opt="--multi-prog" # Configure MPI environment export MPI_BUFS_PER_PROC=2048 @@ -46,17 +47,16 @@ if [ $step = "prep" -o $step = "prepbufr" ]; then elif [ $step = "waveinit" -o $step = "waveprep" -o $step = "wavepostsbs" -o $step = "wavepostbndpnt" -o $step = "wavepostpnt" ]; then - export mpmd="--multi-prog" export CFP_MP="YES" if [ $step = "waveprep" ]; then export MP_PULSE=0 ; fi export wavempexec=${launcher} - export wave_mpmd=${mpmd} + export wave_mpmd=${mpmd_opt} elif [ $step = "atmanalrun" ]; then export CFP_MP=${CFP_MP:-"YES"} export USE_CFP=${USE_CFP:-"YES"} - export APRUNCFP="$launcher -n \$ncmd --multi-prog" + export APRUNCFP="$launcher -n \$ncmd ${mpmd_opt}" nth_max=$(($npe_node_max / $npe_node_atmanalrun)) @@ -68,7 +68,7 @@ elif [ $step = "atmensanalrun" ]; then export CFP_MP=${CFP_MP:-"YES"} export USE_CFP=${USE_CFP:-"YES"} - export APRUNCFP="$launcher -n \$ncmd --multi-prog" + export APRUNCFP="$launcher -n \$ncmd ${mpmd_opt}" nth_max=$(($npe_node_max / $npe_node_atmensanalrun)) @@ -78,7 +78,7 @@ elif [ $step = "atmensanalrun" ]; then elif [ $step = "aeroanlrun" ]; then - export APRUNCFP="$launcher -n \$ncmd --multi-prog" + export APRUNCFP="$launcher -n \$ncmd ${mpmd_opt}" nth_max=$(($npe_node_max / $npe_node_aeroanlrun)) @@ -93,17 +93,17 @@ elif [ $step = "anal" -o $step = "analcalc" ]; then export CFP_MP=${CFP_MP:-"YES"} export USE_CFP=${USE_CFP:-"YES"} - export APRUNCFP="$launcher -n \$ncmd --multi-prog" + export APRUNCFP="$launcher -n \$ncmd ${mpmd_opt}" nth_max=$(($npe_node_max / $npe_node_anal)) export NTHREADS_GSI=${nth_anal:-$nth_max} [[ $NTHREADS_GSI -gt $nth_max ]] && export NTHREADS_GSI=$nth_max - export APRUN_GSI="$launcher" + export APRUN_GSI="$launcher -n ${npe_gsi:-$npe_anal}" export NTHREADS_CALCINC=${nth_calcinc:-1} [[ $NTHREADS_CALCINC -gt $nth_max ]] && export NTHREADS_CALCINC=$nth_max - export APRUN_CALCINC="$launcher" + export APRUN_CALCINC="$launcher \$ncmd" export NTHREADS_CYCLE=${nth_cycle:-12} [[ $NTHREADS_CYCLE -gt $npe_node_max ]] && export NTHREADS_CYCLE=$npe_node_max @@ -140,7 +140,7 @@ elif [ $step = "gldas" ]; then # periods being processed. npe_gldas_data_proc=$(($gldas_spinup_hours + 12)) - export APRUN_GLDAS_DATA_PROC="$launcher -n $npe_gldas_data_proc --multi-prog" + export APRUN_GLDAS_DATA_PROC="$launcher -n $npe_gldas_data_proc ${mpmd_opt}" elif [ $step = "eobs" ]; then @@ -149,25 +149,25 @@ elif [ $step = "eobs" ]; then export CFP_MP=${CFP_MP:-"YES"} export USE_CFP=${USE_CFP:-"YES"} - export APRUNCFP="$launcher -n \$ncmd --multi-prog" + export APRUNCFP="$launcher -n \$ncmd ${mpmd_opt}" nth_max=$(($npe_node_max / $npe_node_eobs)) export NTHREADS_GSI=${nth_eobs:-$nth_max} [[ $NTHREADS_GSI -gt $nth_max ]] && export NTHREADS_GSI=$nth_max - export APRUN_GSI="$launcher" + export APRUN_GSI="$launcher -n ${npe_gsi:-$npe_eobs}" elif [ $step = "eupd" ]; then export CFP_MP=${CFP_MP:-"YES"} export USE_CFP=${USE_CFP:-"YES"} - export APRUNCFP="$launcher -n \$ncmd --multi-prog" + export APRUNCFP="$launcher -n \$ncmd ${mpmd_opt}" nth_max=$(($npe_node_max / $npe_node_eupd)) export NTHREADS_ENKF=${nth_eupd:-$nth_max} [[ $NTHREADS_ENKF -gt $nth_max ]] && export NTHREADS_ENKF=$nth_max - export APRUN_ENKF="$launcher" + export APRUN_ENKF="$launcher -n ${npe_enkf:-$npe_eupd}" elif [ $step = "fcst" ]; then @@ -187,11 +187,11 @@ elif [ $step = "fcst" ]; then export NTHREADS_REGRID_NEMSIO=${nth_regrid_nemsio:-1} [[ $NTHREADS_REGRID_NEMSIO -gt $nth_max ]] && export NTHREADS_REGRID_NEMSIO=$nth_max - export APRUN_REGRID_NEMSIO="$launcher" + export APRUN_REGRID_NEMSIO="$launcher -n ${LEVS}" export NTHREADS_REMAP=${nth_remap:-2} [[ $NTHREADS_REMAP -gt $nth_max ]] && export NTHREADS_REMAP=$nth_max - export APRUN_REMAP="$launcher" + export APRUN_REMAP="$launcher -n ${npe_remap:-$npe_fcst}" export I_MPI_DAPL_UD="enable" elif [ $step = "efcs" ]; then @@ -205,7 +205,7 @@ elif [ $step = "efcs" ]; then export NTHREADS_REGRID_NEMSIO=${nth_regrid_nemsio:-1} [[ $NTHREADS_REGRID_NEMSIO -gt $nth_max ]] && export NTHREADS_REGRID_NEMSIO=$nth_max - export APRUN_REGRID_NEMSIO="$launcher $LEVS" + export APRUN_REGRID_NEMSIO="$launcher -n ${LEVS}" elif [ $step = "post" ]; then @@ -213,11 +213,11 @@ elif [ $step = "post" ]; then export NTHREADS_NP=${nth_np:-1} [[ $NTHREADS_NP -gt $nth_max ]] && export NTHREADS_NP=$nth_max - export APRUN_NP="$launcher" + export APRUN_NP="$launcher -n ${npe_post}" export NTHREADS_DWN=${nth_dwn:-1} [[ $NTHREADS_DWN -gt $nth_max ]] && export NTHREADS_DWN=$nth_max - export APRUN_DWN="$launcher" + export APRUN_DWN="$launcher -n ${npe_dwn}" elif [ $step = "ecen" ]; then @@ -225,7 +225,7 @@ elif [ $step = "ecen" ]; then export NTHREADS_ECEN=${nth_ecen:-$nth_max} [[ $NTHREADS_ECEN -gt $nth_max ]] && export NTHREADS_ECEN=$nth_max - export APRUN_ECEN="$launcher" + export APRUN_ECEN="$launcher -n $npe_ecen" export NTHREADS_CHGRES=${nth_chgres:-12} [[ $NTHREADS_CHGRES -gt $npe_node_max ]] && export NTHREADS_CHGRES=$npe_node_max @@ -233,7 +233,7 @@ elif [ $step = "ecen" ]; then export NTHREADS_CALCINC=${nth_calcinc:-1} [[ $NTHREADS_CALCINC -gt $nth_max ]] && export NTHREADS_CALCINC=$nth_max - export APRUN_CALCINC="$launcher" + export APRUN_CALCINC="$launcher -n $npe_ecen" elif [ $step = "esfc" ]; then @@ -253,11 +253,11 @@ elif [ $step = "epos" ]; then export NTHREADS_EPOS=${nth_epos:-$nth_max} [[ $NTHREADS_EPOS -gt $nth_max ]] && export NTHREADS_EPOS=$nth_max - export APRUN_EPOS="$launcher" + export APRUN_EPOS="$launcher -n $npe_epos" elif [ $step = "init" ]; then - export APRUN="$launcher" + export APRUN="$launcher -n ${npe_init}" elif [ $step = "postsnd" ]; then @@ -265,11 +265,11 @@ elif [ $step = "postsnd" ]; then export NTHREADS_POSTSND=${nth_postsnd:-1} [[ $NTHREADS_POSTSND -gt $nth_max ]] && export NTHREADS_POSTSND=$nth_max - export APRUN_POSTSND="$launcher" + export APRUN_POSTSND="$launcher -n ${npe_postsnd}" export NTHREADS_POSTSNDCFP=${nth_postsndcfp:-1} [[ $NTHREADS_POSTSNDCFP -gt $nth_max ]] && export NTHREADS_POSTSNDCFP=$nth_max - export APRUN_POSTSNDCFP="$launcher" + export APRUN_POSTSNDCFP="$launcher -n ${npe_postsnd} ${mpmd_opt}" elif [ $step = "awips" ]; then @@ -277,7 +277,7 @@ elif [ $step = "awips" ]; then export NTHREADS_AWIPS=${nth_awips:-2} [[ $NTHREADS_AWIPS -gt $nth_max ]] && export NTHREADS_AWIPS=$nth_max - export APRUN_AWIPSCFP="$launcher -n $npe_awips --multi-prog" + export APRUN_AWIPSCFP="$launcher -n $npe_awips ${mpmd_opt}" elif [ $step = "gempak" ]; then @@ -285,5 +285,5 @@ elif [ $step = "gempak" ]; then export NTHREADS_GEMPAK=${nth_gempak:-1} [[ $NTHREADS_GEMPAK -gt $nth_max ]] && export NTHREADS_GEMPAK=$nth_max - export APRUN="$launcher -n $npe_gempak --multi-prog" + export APRUN="$launcher -n $npe_gempak ${mpmd_opt}" fi From 6d86c636954d0aec35f7d724ad39867398f942df Mon Sep 17 00:00:00 2001 From: "kate.friedman" Date: Mon, 7 Nov 2022 10:00:46 -0600 Subject: [PATCH 3/5] Adjust C96 & C48 eobs resources in config.resources - Increase tasks from 20 to 40 for the lowest resolutions for the eobs jobs (C96 and C48). - The C96 eobs job was hitting the walltime with only 20 tasks. Refs #1060 --- parm/config/config.resources | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/parm/config/config.resources b/parm/config/config.resources index 7ee4d5305cf..bee8a83d466 100755 --- a/parm/config/config.resources +++ b/parm/config/config.resources @@ -598,14 +598,12 @@ elif [[ ${step} = "eobs" || ${step} = "eomg" ]]; then export wtime_eobs="00:15:00" export wtime_eomg="01:00:00" - if [ ${CASE} = "C768" ]; then + if [[ ${CASE} = "C768" ]]; then export npe_eobs=200 - elif [ ${CASE} = "C384" ]; then + elif [[ ${CASE} = "C384" ]]; then export npe_eobs=100 - elif [ ${CASE} = "C192" ]; then + elif [[ ${CASE} = "C192" || ${CASE} = "C96" || ${CASE} = "C48" ]]; then export npe_eobs=40 - elif [[ ${CASE} = "C96" || ${CASE} = "C48" ]]; then - export npe_eobs=20 fi export npe_eomg=${npe_eobs} export nth_eobs=2 From 03786337997c56bd977c47c002d9aacd290437bd Mon Sep 17 00:00:00 2001 From: "Kate.Friedman" Date: Mon, 7 Nov 2022 16:23:57 +0000 Subject: [PATCH 4/5] Update launcher command for task #s in HERA.env - Some launcher commands were missing the "-n $npe" flag. - Add "-n" and task # variable in launcher commands if missing. Refs #1060 --- env/HERA.env | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/env/HERA.env b/env/HERA.env index f8edc55c421..f343225f14c 100755 --- a/env/HERA.env +++ b/env/HERA.env @@ -100,11 +100,11 @@ elif [ $step = "anal" -o $step = "analcalc" ]; then export NTHREADS_GSI=${nth_anal:-$nth_max} [[ $NTHREADS_GSI -gt $nth_max ]] && export NTHREADS_GSI=$nth_max - export APRUN_GSI="$launcher" + export APRUN_GSI="$launcher -n ${npe_gsi:-$npe_anal}" export NTHREADS_CALCINC=${nth_calcinc:-1} [[ $NTHREADS_CALCINC -gt $nth_max ]] && export NTHREADS_CALCINC=$nth_max - export APRUN_CALCINC="$launcher" + export APRUN_CALCINC="$launcher \$ncmd" export NTHREADS_CYCLE=${nth_cycle:-12} [[ $NTHREADS_CYCLE -gt $npe_node_max ]] && export NTHREADS_CYCLE=$npe_node_max @@ -154,7 +154,7 @@ elif [ $step = "eobs" ]; then export NTHREADS_GSI=${nth_eobs:-$nth_max} [[ $NTHREADS_GSI -gt $nth_max ]] && export NTHREADS_GSI=$nth_max - export APRUN_GSI="$launcher" + export APRUN_GSI="$launcher -n ${npe_gsi:-$npe_eobs}" export CFP_MP=${CFP_MP:-"YES"} export USE_CFP=${USE_CFP:-"YES"} @@ -166,7 +166,7 @@ elif [ $step = "eupd" ]; then export NTHREADS_ENKF=${nth_eupd:-$nth_max} [[ $NTHREADS_ENKF -gt $nth_max ]] && export NTHREADS_ENKF=$nth_max - export APRUN_ENKF="$launcher" + export APRUN_ENKF="$launcher -n ${npe_enkf:-$npe_eupd}" export CFP_MP=${CFP_MP:-"YES"} export USE_CFP=${USE_CFP:-"YES"} @@ -190,11 +190,11 @@ elif [ $step = "fcst" ]; then export NTHREADS_REGRID_NEMSIO=${nth_regrid_nemsio:-1} [[ $NTHREADS_REGRID_NEMSIO -gt $nth_max ]] && export NTHREADS_REGRID_NEMSIO=$nth_max - export APRUN_REGRID_NEMSIO="$launcher" + export APRUN_REGRID_NEMSIO="$launcher -n ${LEVS}" export NTHREADS_REMAP=${nth_remap:-2} [[ $NTHREADS_REMAP -gt $nth_max ]] && export NTHREADS_REMAP=$nth_max - export APRUN_REMAP="$launcher" + export APRUN_REMAP="$launcher -n ${npe_remap:-$npe_fcst}" export I_MPI_DAPL_UD="enable" elif [ $step = "efcs" ]; then @@ -208,7 +208,7 @@ elif [ $step = "efcs" ]; then export NTHREADS_REGRID_NEMSIO=${nth_regrid_nemsio:-1} [[ $NTHREADS_REGRID_NEMSIO -gt $nth_max ]] && export NTHREADS_REGRID_NEMSIO=$nth_max - export APRUN_REGRID_NEMSIO="$launcher $LEVS" + export APRUN_REGRID_NEMSIO="$launcher -n ${LEVS}" elif [ $step = "post" ]; then @@ -216,11 +216,11 @@ elif [ $step = "post" ]; then export NTHREADS_NP=${nth_np:-1} [[ $NTHREADS_NP -gt $nth_max ]] && export NTHREADS_NP=$nth_max - export APRUN_NP="$launcher" + export APRUN_NP="$launcher -n ${npe_post}" export NTHREADS_DWN=${nth_dwn:-1} [[ $NTHREADS_DWN -gt $nth_max ]] && export NTHREADS_DWN=$nth_max - export APRUN_DWN="$launcher" + export APRUN_DWN="$launcher -n ${npe_dwn}" elif [ $step = "ecen" ]; then @@ -228,7 +228,7 @@ elif [ $step = "ecen" ]; then export NTHREADS_ECEN=${nth_ecen:-$nth_max} [[ $NTHREADS_ECEN -gt $nth_max ]] && export NTHREADS_ECEN=$nth_max - export APRUN_ECEN="$launcher" + export APRUN_ECEN="$launcher -n ${npe_ecen}" export NTHREADS_CHGRES=${nth_chgres:-12} [[ $NTHREADS_CHGRES -gt $npe_node_max ]] && export NTHREADS_CHGRES=$npe_node_max @@ -236,7 +236,7 @@ elif [ $step = "ecen" ]; then export NTHREADS_CALCINC=${nth_calcinc:-1} [[ $NTHREADS_CALCINC -gt $nth_max ]] && export NTHREADS_CALCINC=$nth_max - export APRUN_CALCINC="$launcher" + export APRUN_CALCINC="$launcher -n ${npe_ecen}" elif [ $step = "esfc" ]; then @@ -256,11 +256,11 @@ elif [ $step = "epos" ]; then export NTHREADS_EPOS=${nth_epos:-$nth_max} [[ $NTHREADS_EPOS -gt $nth_max ]] && export NTHREADS_EPOS=$nth_max - export APRUN_EPOS="$launcher" + export APRUN_EPOS="$launcher -n $npe_epos" elif [ $step = "init" ]; then - export APRUN="$launcher" + export APRUN="$launcher -n ${npe_init}" elif [ $step = "postsnd" ]; then @@ -268,11 +268,11 @@ elif [ $step = "postsnd" ]; then export NTHREADS_POSTSND=${nth_postsnd:-1} [[ $NTHREADS_POSTSND -gt $nth_max ]] && export NTHREADS_POSTSND=$nth_max - export APRUN_POSTSND="$launcher" + export APRUN_POSTSND="$launcher -n ${npe_postsnd}" export NTHREADS_POSTSNDCFP=${nth_postsndcfp:-1} [[ $NTHREADS_POSTSNDCFP -gt $nth_max ]] && export NTHREADS_POSTSNDCFP=$nth_max - export APRUN_POSTSNDCFP="$launcher" + export APRUN_POSTSNDCFP="$launcher -n ${npe_postsnd} ${mpmd_opt}" elif [ $step = "awips" ]; then From 790cfb8d56de64cd1e766e645b58c4566c817a86 Mon Sep 17 00:00:00 2001 From: "kate.friedman" Date: Mon, 14 Nov 2022 11:27:30 -0600 Subject: [PATCH 5/5] Address SC2250 linter warnings in R&D env files Refs #1060 --- env/HERA.env | 4 ++-- env/ORION.env | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/env/HERA.env b/env/HERA.env index f343225f14c..45dd1d5265d 100755 --- a/env/HERA.env +++ b/env/HERA.env @@ -287,6 +287,6 @@ elif [ $step = "gempak" ]; then nth_max=$(($npe_node_max / $npe_node_gempak)) export NTHREADS_GEMPAK=${nth_gempak:-1} - [[ $NTHREADS_GEMPAK -gt $nth_max ]] && export NTHREADS_GEMPAK=$nth_max - export APRUN="$launcher -n $npe_gempak ${mpmd_opt}" + [[ $NTHREADS_GEMPAK -gt ${nth_max} ]] && export NTHREADS_GEMPAK=${nth_max} + export APRUN="${launcher} -n ${npe_gempak} ${mpmd_opt}" fi diff --git a/env/ORION.env b/env/ORION.env index b353cff894a..d8bc5fc6648 100755 --- a/env/ORION.env +++ b/env/ORION.env @@ -281,9 +281,9 @@ elif [ $step = "awips" ]; then elif [ $step = "gempak" ]; then - nth_max=$(($npe_node_max / $npe_node_gempak)) + nth_max=$(($npe_node_max / ${npe_node_gempak})) export NTHREADS_GEMPAK=${nth_gempak:-1} - [[ $NTHREADS_GEMPAK -gt $nth_max ]] && export NTHREADS_GEMPAK=$nth_max - export APRUN="$launcher -n $npe_gempak ${mpmd_opt}" + [[ ${NTHREADS_GEMPAK} -gt ${nth_max} ]] && export NTHREADS_GEMPAK=${nth_max} + export APRUN="${launcher} -n ${npe_gempak} ${mpmd_opt}" fi