Refactor UFS-DA ATM ens component to use python g-w

env/CONTAINER.env

@@ -4,7 +4,7 @@ if [[ $# -ne 1 ]]; then
 
     echo "Must specify an input argument to set runtime environment variables!"
     echo "argument can be any one of the following:"
-    echo "atmanalrun atmensanalrun"
+    echo "atmanalrun atmensanlrun"
     echo "aeroanlrun"
     echo "anal sfcanl fcst post vrfy metp"
     echo "eobs eupd ecen efcs epos"

env/HERA.env

@@ -4,7 +4,7 @@ if [[ $# -ne 1 ]]; then
 
     echo "Must specify an input argument to set runtime environment variables!"
     echo "argument can be any one of the following:"
-    echo "atmanalrun atmensanalrun"
+    echo "atmanalrun atmensanlrun"
     echo "aeroanlrun"
     echo "anal sfcanl fcst post vrfy metp"
     echo "eobs eupd ecen efcs epos"
@@ -61,17 +61,17 @@ elif [[ "${step}" = "atmanalrun" ]]; then
     [[ ${NTHREADS_ATMANAL} -gt ${nth_max} ]] && export NTHREADS_ATMANAL=${nth_max}
     export APRUN_ATMANAL="${launcher} -n ${npe_atmanalrun}"
 
-elif [[ "${step}" = "atmensanalrun" ]]; then
+elif [[ "${step}" = "atmensanlrun" ]]; then
 
     export CFP_MP=${CFP_MP:-"YES"}
     export USE_CFP=${USE_CFP:-"YES"}
     export APRUNCFP="${launcher} -n \$ncmd ${mpmd_opt}"
 
-    nth_max=$((npe_node_max / npe_node_atmensanalrun))
+    nth_max=$((npe_node_max / npe_node_atmensanlrun))
 
-    export NTHREADS_ATMENSANAL=${nth_atmensanalrun:-${nth_max}}
-    [[ ${NTHREADS_ATMENSANAL} -gt ${nth_max} ]] && export NTHREADS_ATMENSANAL=${nth_max}
-    export APRUN_ATMENSANAL="${launcher} -n ${npe_atmensanalrun}"
+    export NTHREADS_ATMENSANL=${nth_atmensanlrun:-${nth_max}}
+    [[ ${NTHREADS_ATMENSANL} -gt ${nth_max} ]] && export NTHREADS_ATMENSANL=${nth_max}
+    export APRUN_ATMENSANL="${launcher} -n ${npe_atmensanlrun}"
 
 elif [[ "${step}" = "aeroanlrun" ]]; then
 

env/JET.env

@@ -4,7 +4,7 @@ if [[ $# -ne 1 ]]; then
 
     echo "Must specify an input argument to set runtime environment variables!"
     echo "argument can be any one of the following:"
-    echo "atmanalrun atmensanalrun"
+    echo "atmanalrun atmensanlrun"
     echo "anal sfcanl fcst post vrfy metp"
     echo "eobs eupd ecen efcs epos"
     echo "postsnd awips gempak"
@@ -51,13 +51,13 @@ elif [[ "${step}" = "atmanalrun" ]]; then
     [[ ${NTHREADS_ATMANAL} -gt ${nth_max} ]] && export NTHREADS_ATMANAL=${nth_max}
     export APRUN_ATMANAL="${launcher} ${npe_atmanalrun}"
 
-elif [[ "${step}" = "atmensanalrun" ]]; then
+elif [[ "${step}" = "atmensanlrun" ]]; then
 
-    nth_max=$((npe_node_max / npe_node_atmensanalrun))
+    nth_max=$((npe_node_max / npe_node_atmensanlrun))
 
-    export NTHREADS_ATMENSANAL=${nth_atmensanalrun:-${nth_max}}
-    [[ ${NTHREADS_ATMENSANAL} -gt ${nth_max} ]] && export NTHREADS_ATMENSANAL=${nth_max}
-    export APRUN_ATMENSANAL="${launcher} ${npe_atmensanalrun}"
+    export NTHREADS_ATMENSANL=${nth_atmensanlrun:-${nth_max}}
+    [[ ${NTHREADS_ATMENSANL} -gt ${nth_max} ]] && export NTHREADS_ATMENSANL=${nth_max}
+    export APRUN_ATMENSANL="${launcher} ${npe_atmensanlrun}"
 
 elif [[ "${step}" = "anal" ]]; then
 

env/ORION.env

@@ -4,7 +4,7 @@ if [[ $# -ne 1 ]]; then
 
     echo "Must specify an input argument to set runtime environment variables!"
     echo "argument can be any one of the following:"
-    echo "atmanalrun atmensanalrun"
+    echo "atmanalrun atmensanlrun"
     echo "aeroanlrun"
     echo "anal sfcanl fcst post vrfy metp"
     echo "eobs eupd ecen efcs epos"
@@ -61,17 +61,17 @@ elif [[ "${step}" = "atmanalrun" ]]; then
     [[ ${NTHREADS_ATMANAL} -gt ${nth_max} ]] && export NTHREADS_ATMANAL=${nth_max}
     export APRUN_ATMANAL="${launcher} -n ${npe_atmanalrun}"
 
-elif [[ "${step}" = "atmensanalrun" ]]; then
+elif [[ "${step}" = "atmensanlrun" ]]; then
 
     export CFP_MP=${CFP_MP:-"YES"}
     export USE_CFP=${USE_CFP:-"YES"}
     export APRUNCFP="${launcher} -n \$ncmd ${mpmd_opt}"
 
-    nth_max=$((npe_node_max / npe_node_atmensanalrun))
+    nth_max=$((npe_node_max / npe_node_atmensanlrun))
 
-    export NTHREADS_ATMENSANAL=${nth_atmensanalrun:-${nth_max}}
-    [[ ${NTHREADS_ATMENSANAL} -gt ${nth_max} ]] && export NTHREADS_ATMENSANAL=${nth_max}
-    export APRUN_ATMENSANAL="${launcher} -n ${npe_atmensanalrun}"
+    export NTHREADS_ATMENSANL=${nth_atmensanlrun:-${nth_max}}
+    [[ ${NTHREADS_ATMENSANL} -gt ${nth_max} ]] && export NTHREADS_ATMENSANL=${nth_max}
+    export APRUN_ATMENSANL="${launcher} -n ${npe_atmensanlrun}"
 
 elif [[ "${step}" = "aeroanlrun" ]]; then
 

env/S4.env

@@ -4,7 +4,7 @@ if [[ $# -ne 1 ]]; then
 
     echo "Must specify an input argument to set runtime environment variables!"
     echo "argument can be any one of the following:"
-    echo "atmanalrun atmensanalrun"
+    echo "atmanalrun atmensanlrun"
     echo "aeroanlrun"
     echo "anal sfcanl fcst post vrfy metp"
     echo "eobs eupd ecen efcs epos"
@@ -59,17 +59,17 @@ elif [[ "${step}" = "atmanalrun" ]]; then
     [[ ${NTHREADS_ATMANAL} -gt ${nth_max} ]] && export NTHREADS_ATMANAL=${nth_max}
     export APRUN_ATMANAL="${launcher} -n ${npe_atmanalrun}"
 
-elif [[ "${step}" = "atmensanalrun" ]]; then
+elif [[ "${step}" = "atmensanlrun" ]]; then
 
     export CFP_MP=${CFP_MP:-"YES"}
     export USE_CFP=${USE_CFP:-"YES"}
     export APRUNCFP="${launcher} -n \$ncmd ${mpmd_opt}"
 
-    nth_max=$((npe_node_max / npe_node_atmensanalrun))
+    nth_max=$((npe_node_max / npe_node_atmensanlrun))
 
-    export NTHREADS_ATMENSANAL=${nth_atmensanalrun:-${nth_max}}
-    [[ ${NTHREADS_ATMENSANAL} -gt ${nth_max} ]] && export NTHREADS_ATMENSANAL=${nth_max}
-    export APRUN_ATMENSANAL="${launcher} -n ${npe_atmensanalrun}"
+    export NTHREADS_ATMENSANL=${nth_atmensanlrun:-${nth_max}}
+    [[ ${NTHREADS_ATMENSANL} -gt ${nth_max} ]] && export NTHREADS_ATMENSANL=${nth_max}
+    export APRUN_ATMENSANL="${launcher} -n ${npe_atmensanlrun}"
 
 elif [[ "${step}" = "aeroanlrun" ]]; then
 

env/WCOSS2.env

@@ -4,7 +4,7 @@ if [[ $# -ne 1 ]]; then
 
     echo "Must specify an input argument to set runtime environment variables!"
     echo "argument can be any one of the following:"
-    echo "atmanalrun atmensanalrun"
+    echo "atmanalrun atmensanlrun"
     echo "aeroanlrun"
     echo "anal sfcanl fcst post vrfy metp"
     echo "eobs eupd ecen esfc efcs epos"
@@ -48,17 +48,17 @@ elif [[ "${step}" = "atmanalrun" ]]; then
     [[ ${NTHREADS_ATMANAL} -gt ${nth_max} ]] && export NTHREADS_ATMANAL=${nth_max}
     export APRUN_ATMANAL="${launcher} -n ${npe_atmanalrun}"
 
-elif [[ "${step}" = "atmensanalrun" ]]; then
+elif [[ "${step}" = "atmensanlrun" ]]; then
 
     export CFP_MP=${CFP_MP:-"YES"}
     export USE_CFP=${USE_CFP:-"YES"}
     export APRUNCFP="${launcher} -np \$ncmd ${mpmd_opt}"
 
-    nth_max=$((npe_node_max / npe_node_atmensanalrun))
+    nth_max=$((npe_node_max / npe_node_atmensanlrun))
 
-    export NTHREADS_ATMENSANAL=${nth_atmensanalrun:-${nth_max}}
-    [[ ${NTHREADS_ATMENSANAL} -gt ${nth_max} ]] && export NTHREADS_ATMENSANAL=${nth_max}
-    export APRUN_ATMENSANAL="${launcher} -n ${npe_atmensanalrun}"
+    export NTHREADS_ATMENSANL=${nth_atmensanlrun:-${nth_max}}
+    [[ ${NTHREADS_ATMENSANL} -gt ${nth_max} ]] && export NTHREADS_ATMENSANL=${nth_max}
+    export APRUN_ATMENSANL="${launcher} -n ${npe_atmensanlrun}"
 
 elif [[ "${step}" = "aeroanlrun" ]]; then
 

jobs/JGDAS_GLOBAL_ATMOS_ENSANAL_RUN → jobs/JGLOBAL_ATMENS_ANALYSIS_FINALIZE

@@ -1,21 +1,23 @@
-#!/bin/bash
+#! /usr/bin/env bash
 
 source "${HOMEgfs}/ush/preamble.sh"
-source "${HOMEgfs}/ush/jjob_header.sh" -e "atmensanalrun" -c "base atmensanal atmensanalrun"
-
+export WIPE_DATA="NO"
+export DATA=${DATA:-${DATAROOT}/${RUN}atmensanl_${cyc}}
+source "${HOMEgfs}/ush/jjob_header.sh" -e "atmensanlfinal" -c "base atmensanl atmensanlfinal"
 
 ##############################################
 # Set variables used in the script
 ##############################################
 export CDATE=${CDATE:-${PDY}${cyc}}
 export CDUMP=${CDUMP:-${RUN:-"gfs"}}
-export COMPONENT="atmos"
+
 
 ##############################################
 # Begin JOB SPECIFIC work
 ##############################################
 
-export GDATE=$(date +%Y%m%d%H -d "${CDATE:0:8} ${CDATE:8:2} - ${assim_freq} hours")
+GDATE=$(date +%Y%m%d%H -d "${CDATE:0:8} ${CDATE:8:2} - ${assim_freq} hours")
+export GDATE
 gPDY=${GDATE:0:8}
 export gcyc=${GDATE:8:2}
 export GDUMP=${GDUMP:-"gdas"}
@@ -24,27 +26,21 @@ export OPREFIX="${CDUMP}.t${cyc}z."
 export GPREFIX="${GDUMP}.t${gcyc}z."
 export APREFIX="${CDUMP}.t${cyc}z."
 
-export COMOUT=${COMOUT:-${ROTDIR}/${CDUMP}.${PDY}/${cyc}/${COMPONENT}}
-export COMOUT_ENS=${COMOUT_ENS:-${ROTDIR}/enkf${CDUMP}.${PDY}/${cyc}/${COMPONENT}}
+export COMOUT=${COMOUT:-${ROTDIR}/${CDUMP}.${PDY}/${cyc}}
 
-mkdir -p ${COMOUT}
-mkdir -p ${COMOUT_ENS}
+mkdir -p "${COMOUT}"
 
 # COMIN_GES and COMIN_GES_ENS are used in script
-export COMIN="${ROTDIR}/${CDUMP}.${PDY}/${cyc}/${COMPONENT}"
-export COMIN_GES="${ROTDIR}/${GDUMP}.${gPDY}/${gcyc}/${COMPONENT}"
-export COMIN_GES_ENS="${ROTDIR}/enkf${GDUMP}.${gPDY}/${gcyc}/${COMPONENT}"
-
-# Add UFSDA to PYTHONPATH
-export PYTHONPATH=${HOMEgfs}/sorc/gdas.cd/ush/:${PYTHONPATH}
+export COMIN_GES="${ROTDIR}/${GDUMP}.${gPDY}/${gcyc}/atmos"
+export COMIN_GES_ENS="${ROTDIR}/enkf${GDUMP}.${gPDY}/${gcyc}"
 
 ###############################################################
 # Run relevant script
 
-EXSCRIPT=${GDASRUNSH:-${HOMEgfs}/scripts/exgdas_global_atmos_ensanal_run.sh}
+EXSCRIPT=${GDASATMENSFINALPY:-${HOMEgfs}/scripts/exglobal_atmens_analysis_finalize.py}
 ${EXSCRIPT}
 status=$?
-[[ ${status} -ne 0 ]] && exit ${status}
+[[ ${status} -ne 0 ]] && exit "${status}"
 
 ##############################################
 # End JOB SPECIFIC work
@@ -53,14 +49,14 @@ status=$?
 ##############################################
 # Final processing
 ##############################################
-if [ -e "${pgmout}" ] ; then
-  cat ${pgmout}
+if [[ -e "${pgmout}" ]] ; then
+  cat "${pgmout}"
 fi
 
 ##########################################
 # Remove the Temporary working directory
 ##########################################
-cd ${DATAROOT}
-[[ ${KEEPDATA} = "NO" ]] && rm -rf ${DATA}
+cd "${DATAROOT}" || exit 1
+[[ ${KEEPDATA} = "NO" ]] && rm -rf "${DATA}"
 
 exit 0