Revert "remove CDUMP"

This reverts commit f82dc68.

env/HERA.env

@@ -82,18 +82,13 @@ elif [[ "${step}" = "atmensanlfv3inc" ]]; then
     export NTHREADS_ATMENSANLFV3INC=${NTHREADSmax}
     export APRUN_ATMENSANLFV3INC="${APRUN} --cpus-per-task=${NTHREADS_ATMENSANLFV3INC}"    
 
-elif [[ "${step}" = "aeroanlvar" ]]; then
+elif [[ "${step}" = "aeroanlrun" ]]; then
 
     export APRUNCFP="${launcher} -n \$ncmd ${mpmd_opt}"
 
     export NTHREADS_AEROANL=${NTHREADSmax}
     export APRUN_AEROANL="${APRUN} --cpus-per-task=${NTHREADS_AEROANL}"
 
-elif [[ "${step}" = "aeroanlgenb" ]]; then
-
-    export NTHREADS_AEROANLGENB=${NTHREADSmax}
-    export APRUN_AEROANLGENB="${APRUN} --cpus-per-task=${NTHREADS_AEROANLGENB}"
-
 elif [[ "${step}" = "atmanlfv3inc" ]]; then
 
     export NTHREADS_ATMANLFV3INC=${NTHREADSmax}

env/HERCULES.env

@@ -86,17 +86,12 @@ case ${step} in
     export NTHREADS_ATMENSANLFV3INC=${NTHREADSmax}
     export APRUN_ATMENSANLFV3INC="${APRUN} --cpus-per-task=${NTHREADS_ATMENSANLFV3INC}"
  ;;
- "aeroanlvar")
+ "aeroanlrun")
 
     export APRUNCFP="${launcher} -n \$ncmd ${mpmd_opt}"
 
     export NTHREADS_AEROANL=${NTHREADSmax}
     export APRUN_AEROANL="${APRUN} --cpus-per-task=${NTHREADS_AEROANL}"
- ;;
-  "aeroanlgenb")
-
-    export NTHREADS_AEROANLGENB=${NTHREADSmax}
-    export APRUN_AEROANLGENB="${APRUN} --cpus-per-task=${NTHREADS_AEROANLGENB}"
  ;;
  "prepobsaero")
 

env/JET.env

@@ -70,17 +70,12 @@ elif [[ "${step}" = "atmensanlfv3inc" ]]; then
     export NTHREADS_ATMENSANLFV3INC=${NTHREADSmax}
     export APRUN_ATMENSANLFV3INC="${launcher} ${ntasks}"
 
-elif [[ "${step}" = "aeroanlvar" ]]; then
-
-    export NTHREADS_AEROANL=${NTHREADSmax}
-    export APRUN_AEROANL="${APRUN}"
-
-elif [[ "${step}" = "aeroanlgenb" ]]; then
+elif [[ "${step}" = "aeroanlrun" ]]; then
 
     export APRUNCFP="${launcher} -n \$ncmd ${mpmd_opt}"
 
-    export NTHREADS_AEROANLGENB=${NTHREADSmax}
-    export APRUN_AEROANLGENB="${APRUN} --cpus-per-task=${NTHREADS_AEROANLGENB}"
+    export NTHREADS_AEROANL=${NTHREADSmax}
+    export APRUN_AEROANL="${APRUN}"
 
 elif [[ "${step}" = "prepobsaero" ]]; then
 

env/ORION.env

@@ -78,18 +78,13 @@ elif [[ "${step}" = "atmensanlfv3inc" ]]; then
     export NTHREADS_ATMENSANLFV3INC=${NTHREADSmax}
     export APRUN_ATMENSANLFV3INC="${APRUN} --cpus-per-task=${NTHREADS_ATMENSANLFV3INC}"
 
-elif [[ "${step}" = "aeroanlvar" ]]; then
+elif [[ "${step}" = "aeroanlrun" ]]; then
 
     export APRUNCFP="${launcher} -n \$ncmd ${mpmd_opt}"
 
     export NTHREADS_AEROANL=${NTHREADSmax}
     export APRUN_AEROANL="${APRUN} --cpus-per-task=${NTHREADS_AEROANL}"
 
-elif [[ "${step}" = "aeroanlgenb" ]]; then
-
-    export NTHREADS_AEROANLGENB=${NTHREADSmax}
-    export APRUN_AEROANLGENB="${APRUN} --cpus-per-task=${NTHREADS_AEROANLGENB}"
-
 elif [[ "${step}" = "prepobsaero" ]]; then
 
     export NTHREADS_PREPOBSAERO=${NTHREADS1}

env/S4.env

@@ -70,18 +70,13 @@ elif [[ "${step}" = "atmensanlfv3inc" ]]; then
     export NTHREADS_ATMENSANLFV3INC=${NTHREADSmax}
     export APRUN_ATMENSANLFV3INC="${APRUN}"    
 
-elif [[ "${step}" = "aeroanlvar" ]]; then
+elif [[ "${step}" = "aeroanlrun" ]]; then
 
     export APRUNCFP="${launcher} -n \$ncmd ${mpmd_opt}"
 
     export NTHREADS_AEROANL=${NTHREADSmax}
     export APRUN_AEROANL="${APRUN}"
 
-elif [[ "${step}" = "aeroanlgenb" ]]; then
-
-    export NTHREADS_AEROANLGENB=${NTHREADSmax}
-    export APRUN_AEROANLGENB="${APRUN} --cpus-per-task=${NTHREADS_AEROANLGENB}"
-
 elif [[ "${step}" = "prepobsaero" ]]; then
 
     export NTHREADS_PREPOBSAERO=${NTHREADS1}

env/WCOSS2.env

@@ -63,18 +63,13 @@ elif [[ "${step}" = "atmensanlfv3inc" ]]; then
     export NTHREADS_ATMENSANLFV3INC=${NTHREADSmax}
     export APRUN_ATMENSANLFV3INC="${APRUN}"
 
-elif [[ "${step}" = "aeroanlvar" ]]; then
+elif [[ "${step}" = "aeroanlrun" ]]; then
 
     export APRUNCFP="${launcher} -np \$ncmd ${mpmd_opt}"
 
     export NTHREADS_AEROANL=${NTHREADSmax}
     export APRUN_AEROANL="${APRUN}"
 
-elif [[ "${step}" = "aeroanlgenb" ]]; then
-
-    export NTHREADS_AEROANLGENB=${NTHREADSmax}
-    export APRUN_AEROANLGENB="${APRUN}"
-
 elif [[ "${step}" = "prepobsaero" ]]; then
 
     export NTHREADS_PREPOBSAERO=${NTHREADS1}

jobs/JGLOBAL_AERO_ANALYSIS_FINALIZE

@@ -8,17 +8,25 @@ source "${HOMEgfs}/ush/jjob_header.sh" -e "aeroanlfinal" -c "base aeroanl aeroan
 ##############################################
 # Set variables used in the script
 ##############################################
+# shellcheck disable=SC2153
+GDATE=$(date --utc +%Y%m%d%H -d "${PDY} ${cyc} - ${assim_freq} hours")
+gPDY=${GDATE:0:8}
+gcyc=${GDATE:8:2}
+GDUMP="gdas"
+
 
 ##############################################
 # Begin JOB SPECIFIC work
 ##############################################
 
 # Generate COM variables from templates
-YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \
-    COMOUT_CHEM_ANALYSIS:COM_CHEM_ANALYSIS_TMPL \
-    COMOUT_ATMOS_RESTART:COM_ATMOS_RESTART_TMPL
+YMD=${PDY} HH=${cyc} declare_from_tmpl -rx COM_OBS COM_CHEM_ANALYSIS
+
+RUN=${GDUMP} YMD=${gPDY} HH=${gcyc} declare_from_tmpl -rx \
+    COM_CHEM_ANALYSIS_PREV:COM_CHEM_ANALYSIS_TMPL \
+    COM_ATMOS_RESTART_PREV:COM_ATMOS_RESTART_TMPL
 
-mkdir -p "${COMOUT_CHEM_ANALYSIS}"
+mkdir -m 775 -p "${COM_CHEM_ANALYSIS}"
 
 ###############################################################
 # Run relevant script

jobs/JGLOBAL_AERO_ANALYSIS_INITIALIZE

@@ -19,15 +19,13 @@ GDUMP="gdas"
 ##############################################
 
 # Generate COM variables from templates
-YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \
-    COM_OBS:COM_OBS_TMPL \
-    COMOUT_CHEM_ANALYSIS:COM_CHEM_ANALYSIS_TMPL
+YMD=${PDY} HH=${cyc} declare_from_tmpl -rx COM_OBS COM_CHEM_ANALYSIS
 
 RUN=${GDUMP} YMD=${gPDY} HH=${gcyc} declare_from_tmpl -rx \
-    COMIN_ATMOS_RESTART_PREV:COM_ATMOS_RESTART_TMPL \
-    COMIN_CHEM_BMAT_PREV:COM_CHEM_BMAT_TMPL
+    COM_CHEM_ANALYSIS_PREV:COM_CHEM_ANALYSIS_TMPL \
+    COM_ATMOS_RESTART_PREV:COM_ATMOS_RESTART_TMPL
 
-mkdir -p "${COMOUT_CHEM_ANALYSIS}"
+mkdir -m 775 -p "${COM_CHEM_ANALYSIS}"
 
 ###############################################################
 # Run relevant script

jobs/JGLOBAL_AERO_ANALYSIS_VARIATIONAL → jobs/JGLOBAL_AERO_ANALYSIS_RUN

@@ -3,7 +3,7 @@
 source "${HOMEgfs}/ush/preamble.sh"
 export WIPE_DATA="NO"
 export DATA=${DATA:-${DATAROOT}/${RUN}aeroanl_${cyc}}
-source "${HOMEgfs}/ush/jjob_header.sh" -e "aeroanlvar" -c "base aeroanl aeroanlvar"
+source "${HOMEgfs}/ush/jjob_header.sh" -e "aeroanlrun" -c "base aeroanl aeroanlrun"
 
 ##############################################
 # Set variables used in the script
@@ -16,7 +16,7 @@ source "${HOMEgfs}/ush/jjob_header.sh" -e "aeroanlvar" -c "base aeroanl aeroanlv
 ###############################################################
 # Run relevant script
 
-EXSCRIPT=${GDASAEROVARSH:-${SCRgfs}/exglobal_aero_analysis_variational.py}
+EXSCRIPT=${GDASAERORUNSH:-${SCRgfs}/exglobal_aero_analysis_run.py}
 ${EXSCRIPT}
 status=$?
 [[ ${status} -ne 0 ]] && exit "${status}"

jobs/rocoto/aeroanlvar.sh → jobs/rocoto/aeroanlrun.sh

@@ -8,11 +8,11 @@ source "${HOMEgfs}/ush/preamble.sh"
 status=$?
 [[ ${status} -ne 0 ]] && exit "${status}"
 
-export job="aeroanlvar"
+export job="aeroanlrun"
 export jobid="${job}.$$"
 
 ###############################################################
 # Execute the JJOB
-"${HOMEgfs}/jobs/JGLOBAL_AERO_ANALYSIS_VARIATIONAL"
+"${HOMEgfs}/jobs/JGLOBAL_AERO_ANALYSIS_RUN"
 status=$?
 exit "${status}"

parm/config/gfs/config.aeroanl

@@ -5,36 +5,20 @@
 
 echo "BEGIN: config.aeroanl"
 
-# define analysis resolution based on deterministic res
-case ${CASE} in
-  "C1152" | "C768" | "C384" | "C192")
-    CASE_ANL="C192"
-    ;;
-  "C96" | "C48")
-    CASE_ANL=${CASE}
-    ;;
-  *)
-    echo "FATAL ERROR: Aerosol DA not supported at ${CASE} resolution"
-    exit 4
-esac
-export CASE_ANL
+export CASE_ANL=${CASE}
 export OBS_LIST="${PARMgfs}/gdas/aero/obs/lists/gdas_aero.yaml.j2"
-export STATICB_TYPE='diffusion'
+export STATICB_TYPE='identity'
 export BERROR_YAML="${PARMgfs}/gdas/aero/berror/staticb_${STATICB_TYPE}.yaml.j2"
-export BERROR_DATA_DIR="${FIXgfs}/gdas/aero/clim_b"
+export BERROR_DATA_DIR="${FIXgfs}/gdas/bump/aero/${CASE_ANL}/"
+export BERROR_DATE="20160630.000000"
 
 export CRTM_FIX_YAML="${PARMgfs}/gdas/aero_crtm_coeff.yaml.j2"
 export JEDI_FIX_YAML="${PARMgfs}/gdas/aero_jedi_fix.yaml.j2"
 
-export AERO_STAGE_VARIATIONAL_TMPL="${PARMgfs}/gdas/aero_stage_variational.yaml.j2"
-export AERO_FINALIZE_VARIATIONAL_TMPL="${PARMgfs}/gdas/aero_finalize_variational.yaml.j2"
-
 export io_layout_x=@IO_LAYOUT_X@
 export io_layout_y=@IO_LAYOUT_Y@
 
 export JEDIEXE="${EXECgfs}/gdas.x"
-export BMATEXE="${EXECgfs}/gdasapp_chem_diagb.x"
-export DIFFUSIONEXE="${EXECgfs}/gdas_fv3jedi_error_covariance_toolbox.x"
 
 if [[ "${DOIAU}" == "YES" ]]; then
   export aero_bkg_times="3,6,9"

parm/config/gfs/config.aeroanlrun

@@ -0,0 +1,11 @@
+#!/bin/bash -x
+
+########## config.aeroanlrun ##########
+# Aerosol Analysis specific
+
+echo "BEGIN: config.aeroanlrun"
+
+# Get task specific resources
+source "${EXPDIR}/config.resources" aeroanlrun
+
+echo "END: config.aeroanlrun"

parm/config/gfs/config.com

@@ -98,6 +98,5 @@ declare -rx COM_ICE_GRIB_GRID_TMPL=${COM_ICE_GRIB_TMPL}'/${GRID}'
 
 declare -rx COM_CHEM_HISTORY_TMPL=${COM_BASE}'/model_data/chem/history'
 declare -rx COM_CHEM_ANALYSIS_TMPL=${COM_BASE}'/analysis/chem'
-declare -rx COM_CHEM_BMAT_TMPL=${COM_CHEM_ANALYSIS_TMPL}'/bmatrix'
 
 declare -rx COM_MED_RESTART_TMPL=${COM_BASE}'/model_data/med/restart'