Merge remote-tracking branch 'origin/develop' into dev/sfs

Author: NeilBarton-NOAA

.github/workflows/bash_code_analysis.yaml

@@ -100,4 +100,5 @@ jobs:
             */.git/*
             */*.yml
             */*.yaml
+            */*.j2
           check_all_files_with_shebangs: true

.gitlab-ci.yml

@@ -157,6 +157,14 @@ include:
         git remote add github "${GW_REPO_URL}"
         git fetch github
         ${GH} pr checkout "${PR_NUMBER}"
+        # Re-pin branch upstream to NOAA-EMC after `gh pr checkout` (which points it
+        # at the author's fork). Fixes submodule "not our ref" on git <= 2.45.
+        # Remove once Gaea ships git >= 2.47.
+        git remote set-url origin "${GW_REPO_URL}"
+        _br=$(git branch --show-current)
+        git config "branch.${_br}.remote"     origin
+        git config "branch.${_br}.pushRemote" origin
+        unset _br
         git submodule update --init --recursive -j 8
       fi
 

dev/ci/scripts/utils/gitlab/launch_gitlab_runner.sh

@@ -115,7 +115,7 @@ RUNNER_HOST_NODE="${host}"
 HOMEglobal="${HOMEglobal_}" source "${HOMEglobal_}/ush/detect_machine.sh"
 # Check the MACHINE_ID and set up the environment accordingly
 case "${MACHINE_ID}" in
-    ursa | hera | orion | hercules | wcoss2 | gaeac6)
+    ursa | hera | orion | hercules | wcoss2 | gaeac6 | derecho)
         echo "Running GitLab Runner script on ${MACHINE_ID}"
         ;;
     noaacloud)

dev/jobs/JGDAS_AERO_ANALYSIS_GENERATE_BMATRIX

@@ -41,7 +41,7 @@ EXSCRIPT=${GDASAEROBMATPY:-${SCRglobal}/exgdas_aero_analysis_generate_bmatrix.py
 ${EXSCRIPT} && true
 export err=$?
 if [[ ${err} -ne 0 ]]; then
-    err_exit
+    err_exit "Failed to generate bmatrix for aerosol analysis"
 fi
 
 ##############################################
@@ -61,7 +61,7 @@ fi
 cd "${DATAROOT}" && true
 export err=$?
 if [[ ${err} -ne 0 ]]; then
-    err_exit
+    err_exit "Failed to change directory to ${DATAROOT}"
 fi
 if [[ "${KEEPDATA}" == "NO" ]]; then
     rm -rf "${DATA}"

dev/jobs/JGDAS_ATMOS_CHGRES_FORENKF

@@ -36,7 +36,7 @@ declare -rx COMIN_ATMOS_HISTORY_MEM="${ROTDIR}/${RUN}.${PDY}/${cyc}/mem001/model
 ${CHGRESFCSTSH:-${SCRglobal}/exgdas_atmos_chgres_forenkf.sh} && true
 export err=$?
 if [[ ${err} -ne 0 ]]; then
-    err_exit
+    err_exit "Failed to run chgres for the ensemble"
 fi
 
 ##############################################

dev/jobs/JGDAS_ATMOS_GEMPAK

@@ -42,18 +42,18 @@ done
 
 export err=$?
 if [[ ${err} -ne 0 ]]; then
-    err_exit
+    err_exit "Failed to generate AWIPS products at 1 degree resolution for forecast hour ${FHR3}"
 fi
 
 ########################################################
-# Execute the script for quater-degree grib
+# Execute the script for quarter-degree grib
 ########################################################
 
 "${SCRglobal}/exgdas_atmos_nawips.sh" "0p25" "${FHR3}" "GDAS_GEMPAK" "${COMOUT_ATMOS_GEMPAK_0p25}" && true
 
 export err=$?
 if [[ ${err} -ne 0 ]]; then
-    err_exit
+    err_exit "Failed to generate AWIPS products at 0.25 degree resolution for forecast hour ${FHR3}"
 fi
 
 ############################################

dev/jobs/JGDAS_ATMOS_GEMPAK_META_NCDC

@@ -66,26 +66,27 @@ export pgmout=OUTPUT.$$
 "${HOMEglobal}/gempak/ush/gdas_meta_na.sh" && true
 export err=$?
 if [[ ${err} -ne 0 ]]; then
-    err_exit
+    err_exit "Failed to generate North American meta gempak products"
 fi
 
 "${HOMEglobal}/gempak/ush/gdas_meta_loop.sh" && true
 export err=$?
 if [[ ${err} -ne 0 ]]; then
-    err_exit
+    err_exit "Failed to generate looped image meta gempak products"
 fi
 
 if [[ "${cyc}" == '06' ]]; then
+    # TODO remove ECMWF and UKMET meta generation once the products are no longer needed
     "${HOMEglobal}/gempak/ush/gdas_ecmwf_meta_ver.sh" && true
     export err=$?
     if [[ ${err} -ne 0 ]]; then
-        err_exit
+        err_exit "Failed to generate ECMWF meta gempak products"
     fi
 
     "${HOMEglobal}/gempak/ush/gdas_ukmet_meta_ver.sh" && true
     export err=$?
     if [[ ${err} -ne 0 ]]; then
-        err_exit
+        err_exit "Failed to generate UKMET meta gempak products"
     fi
 fi
 ########################################################
@@ -101,7 +102,7 @@ if ((cyc % 12 == 0)); then
 fi
 export err=$?
 if [[ ${err} -ne 0 ]]; then
-    err_exit
+    err_exit "Failed to generate NCDC GIFs from GDAS GEMPAK products"
 fi
 ########################################################
 

dev/jobs/JGDAS_ATMOS_VERFOZN

@@ -42,7 +42,7 @@ if [[ ! -d ${TANKverf_ozn} ]]; then mkdir -p "${TANKverf_ozn}"; fi
 "${SCRglobal}/exgdas_atmos_verfozn.sh" && true
 export err=$?
 if [[ ${err} -ne 0 ]]; then
-    err_exit
+    err_exit "Failed to generate ozone monitor products"
 fi
 
 ################################

dev/jobs/JGDAS_ATMOS_VERFRAD

@@ -45,7 +45,7 @@ if [[ ! -d ${TANKverf_rad} ]]; then mkdir -p "${TANKverf_rad}"; fi
 "${SCRglobal}/exgdas_atmos_verfrad.sh" && true
 export err=$?
 if [[ ${err} -ne 0 ]]; then
-    err_exit
+    err_exit "Failed to generate radiance monitor products"
 fi
 
 ################################

dev/jobs/JGDAS_ENKF_POST

@@ -33,7 +33,7 @@ export LEVS=$((LEVS - 1))
 ${ENKFPOSTSH:-${SCRglobal}/exgdas_enkf_post.sh} && true
 export err=$?
 if [[ ${err} -ne 0 ]]; then
-    err_exit
+    err_exit "Failed to run ensemble post processing"
 fi
 
 ##############################################