Move logical checks into if blocks (NOAA-EMC#3339)

Co-authored-by: Walter Kolczynski - NOAA <[email protected]>

ci/scripts/driver.sh

@@ -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"
   #############################################################

ci/scripts/utils/launch_java_agent.sh

@@ -103,7 +103,10 @@ echo "JAVA VERSION: "
 ${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 "FATAL ERROR: GitHub CLI (gh) not found. (exiting with error)"
+   exit 1
+fi
 ${GH} --version
 export GH
 

ctests/scripts/stage.sh.in

@@ -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 "${rc}"
+fi
 set -x
 PYTHONPATH="${PYTHONPATH:+${PYTHONPATH}:}${HOMEgfs}/sorc/wxflow/src"
 export PYTHONPATH

ctests/scripts/validate.sh.in

@@ -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 "${rc}"
+fi
 set -x
 PYTHONPATH="${PYTHONPATH:+${PYTHONPATH}:}${HOMEgfs}/sorc/wxflow/src"
 export PYTHONPATH

docs/doxygen/compile

@@ -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

env/AWSPW.env

@@ -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"

env/AZUREPW.env

@@ -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"
@@ -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
@@ -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
@@ -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

env/GAEAC5.env

@@ -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}"
@@ -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}
 
@@ -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")
@@ -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}"
 
@@ -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}"
 
     # REGRID requires multiple of 6 tasks
@@ -196,7 +210,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")
@@ -243,11 +259,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}"
 
  ;;
@@ -257,7 +277,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}"
 
  ;;
@@ -275,7 +297,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}"
 
  ;;

env/GAEAC6.env

@@ -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}"
@@ -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}
 
@@ -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")
@@ -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}"
 
@@ -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}"
 
     # REGRID requires multiple of 6 tasks
@@ -196,7 +210,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")
@@ -243,11 +259,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}"
 
  ;;
@@ -257,7 +277,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}"
 
  ;;
@@ -275,7 +297,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}"
 
  ;;