Consolidate JEDI-based atmospheric analysis task configuration YAMLs and create new Analysis class

.github/CODEOWNERS

@@ -210,19 +210,19 @@ ush/python/pygfs/task/aero_bmatrix.py @DavidNew-NOAA @CoryMartin-NOAA
 ush/python/pygfs/task/aero_emissions.py @bbakernoaa
 ush/python/pygfs/task/aero_prepobs.py @CoryMartin-NOAA
 ush/python/pygfs/task/analysis.py @DavidNew-NOAA @RussTreadon-NOAA
-ush/python/pygfs/task/analysis_stats.py @CoryMartin-NOAA
+ush/python/pygfs/task/analysis_stats.py @CoryMartin-NOAA @DavidNew-NOAA
 ush/python/pygfs/task/archive.py @DavidHuber-NOAA
 ush/python/pygfs/task/atm_analysis.py @DavidNew-NOAA @RussTreadon-NOAA
 ush/python/pygfs/task/atmens_analysis.py @DavidNew-NOAA @RussTreadon-NOAA
 ush/python/pygfs/task/bmatrix.py @DavidNew-NOAA
 ush/python/pygfs/task/gfs_forecast.py @aerorahul
-ush/python/pygfs/task/marine_analysis.py @guillaumevernieres @AndrewEichmann-NOAA
-ush/python/pygfs/task/marine_bmat.py @guillaumevernieres @AndrewEichmann-NOAA
-ush/python/pygfs/task/marine_letkf.py @guillaumevernieres @AndrewEichmann-NOAA
-ush/python/pygfs/task/oceanice_products.py @aerorahul @JesseMeng-NOAA @ChristopherHill-NOAA
+ush/python/pygfs/task/marine_analysis.py @guillaumevernieres @AndrewEichmann-NOAA @DavidNew-NOAA
+ush/python/pygfs/task/marine_bmat.py @guillaumevernieres @AndrewEichmann-NOAA @DavidNew-NOAA
+ush/python/pygfs/task/marine_letkf.py @guillaumevernieres @AndrewEichmann-NOAA @DavidNew-NOAA
+ush/python/pygfs/task/oceanice_products.py @aerorahul @JesseMeng-NOAA @ChristopherHill-NOAA @DavidNew-NOAA
 ush/python/pygfs/task/offline_analysis.py @CoryMartin-NOAA
-ush/python/pygfs/task/snow_analysis.py @jiaruidong2017
-ush/python/pygfs/task/snowens_analysis.py @jiaruidong2017
+ush/python/pygfs/task/snow_analysis.py @jiaruidong2017 @DavidNew-NOAA
+ush/python/pygfs/task/snowens_analysis.py @jiaruidong2017 @DavidNew-NOAA
 ush/python/pygfs/task/stage_ic.py @DavidHuber-NOAA @aerorahul
 ush/python/pygfs/task/upp.py @aerorahul @WenMeng-NOAA
 ush/python/pygfs/ufswm/__init__.py @aerorahul

dev/ci/cases/yamls/ufs_hybatmDA_defaults.ci.yaml

@@ -6,17 +6,19 @@ base:
   DO_JEDIATMENS: "YES"
   DO_TEST_MODE: "NO"
 atmanl:
-  JCB_ALGO_YAML_VAR: "${HOMEgfs}/sorc/gdas.cd/test/gw-ci/atm/jcb-prototype_3dvar_ufs_hybatmDA.yaml.j2"
-  JCB_ALGO_YAML_FV3INC: "${HOMEgfs}/sorc/gdas.cd/test/gw-ci/atm/jcb-prototype_3dvar-fv3inc_ufs_hybatmDA.yaml.j2"
   LAYOUT_X_ATMANL: 4
   LAYOUT_Y_ATMANL: 4
+  OBS_LIST_YAML: "${HOMEgfs}/sorc/gdas.cd/test/gw-ci/atm/atm_obs_list_ufs_hybatmDA.yaml.j2"
+  VAR_JEDI_TEST_YAML: "${HOMEgfs}/sorc/gdas.cd/test/gw-ci/atm/jedi-test_3dvar_ufs_hybatmDA.yaml.j2"
+  FV3INC_JEDI_TEST_YAML: "${HOMEgfs}/sorc/gdas.cd/test/gw-ci/atm/jedi-test_3dvar-fv3inc_ufs_hybatmDA.yaml.j2"
 atmensanl:
-  JCB_ALGO_YAML_LETKF: "${HOMEgfs}/sorc/gdas.cd/test/gw-ci/atm/jcb-prototype_lgetkf_ufs_hybatmDA.yaml.j2"
-  JCB_ALGO_YAML_OBS: "${HOMEgfs}/sorc/gdas.cd/test/gw-ci/atm/jcb-prototype_lgetkf_observer_ufs_hybatmDA.yaml.j2"
-  JCB_ALGO_YAML_SOL: "${HOMEgfs}/sorc/gdas.cd/test/gw-ci/atm/jcb-prototype_lgetkf_solver_ufs_hybatmDA.yaml.j2"
-  JCB_ALGO_YAML_FV3INC: "${HOMEgfs}/sorc/gdas.cd/test/gw-ci/atm/jcb-prototype_lgetkf-fv3inc_ufs_hybatmDA.yaml.j2"
   LAYOUT_X_ATMENSANL: 4
   LAYOUT_Y_ATMENSANL: 4
+  OBS_LIST_YAML: "${HOMEgfs}/sorc/gdas.cd/test/gw-ci/atm/atm_obs_list_ufs_hybatmDA.yaml.j2"
+  LETKF_JEDI_TEST_YAML: "${HOMEgfs}/sorc/gdas.cd/test/gw-ci/atm/jedi-test_lgetkf_ufs_hybatmDA.yaml.j2"
+  OBS_JEDI_TEST_YAML: "${HOMEgfs}/sorc/gdas.cd/test/gw-ci/atm/jedi-test_lgetkf-observer_ufs_hybatmDA.yaml.j2"
+  SOL_JEDI_TEST_YAML: "${HOMEgfs}/sorc/gdas.cd/test/gw-ci/atm/jedi-test_lgetkf-solver_ufs_hybatmDA.yaml.j2"
+  FV3INC_JEDI_TEST_YAML: "${HOMEgfs}/sorc/gdas.cd/test/gw-ci/atm/jedi-test_lgetkf-fv3inc_ufs_hybatmDA.yaml.j2"
 esfc:
   DONST: "NO"
 nsst:

dev/parm/config/gcafs/config.aeroanl.j2

@@ -18,18 +18,12 @@ case ${CASE} in
     exit 4
 esac
 export CASE_ANL
-export JCB_ALGO_YAML_VAR=${PARMgfs}/gdas/aero/jcb-prototype_3dvar.yaml.j2
-export STATICB_TYPE='diffusion'
-export BERROR_YAML="aero_background_error_static_${STATICB_TYPE}"
-export BERROR_DATA_DIR="${FIXgfs}/gdas/aero/clim_b"
 
-export JEDI_CONFIG_YAML="${PARMgfs}/gdas/aero/aero_det_jedi_config.yaml.j2"
-export STAGE_CRTM_COEFF_YAML="${PARMgfs}/gdas/aero/aero_stage_crtm_coeff.yaml.j2"
-export STAGE_JEDI_FIX_YAML="${PARMgfs}/gdas/aero/aero_stage_jedi_fix.yaml.j2"
-export STAGE_YAML="${PARMgfs}/gdas/aero/aero_det_stage.yaml.j2"
-export SAVE_YAML="${PARMgfs}/gdas/aero/aero_det_save.yaml.j2"
+export STATICB_TYPE='diffusion'
 
-export AERO_BMATRIX_RESCALE_YAML="aero_gen_bmatrix_rescale_default.yaml.j2"
+export TASK_CONFIG_YAML="${PARMgfs}/gdas/aero/aero_det_config.yaml.j2"
+export OBS_LIST_YAML="${PARMgfs}/gdas/aero/aero_obs_list.yaml.j2"
+export BIAS_FILES_YAML="${PARMgfs}/gdas/aero/aero_bias_files.yaml.j2"
 
 export io_layout_x="{{ IO_LAYOUT_X }}"
 export io_layout_y="{{ IO_LAYOUT_Y }}"

dev/parm/config/gcafs/config.aeroanlgenb

@@ -8,11 +8,10 @@ echo "BEGIN: config.aeroanlgenb"
 # Get task specific resources
 source "${EXPDIR}/config.resources" aeroanlgenb
 
-export JEDI_CONFIG_YAML="${PARMgfs}/gdas/aero/aero_bmat_jedi_config.yaml.j2"
-export STAGE_YAML="${PARMgfs}/gdas/aero/aero_bmat_stage.yaml.j2"
-export SAVE_YAML="${PARMgfs}/gdas/aero/aero_bmat_save.yaml.j2"
+export TASK_CONFIG_YAML="${PARMgfs}/gdas/aero/aero_bmat_config.yaml.j2"
+export OBS_LIST_YAML="${PARMgfs}/gdas/aero/aero_obs_list.yaml.j2"
+export BIAS_FILES_YAML="${PARMgfs}/gdas/aero/aero_bias_files.yaml.j2"
 
-export RESCALE_YAML="${PARMgfs}/gdas/jcb-gdas/aero/algorithm/aero_gen_bmatrix_rescale_default.yaml.j2"
 export aero_diffusion_iter=200
 export aero_diffusion_horiz_len=300e3
 export aero_diffusion_fixed_val=20.0

dev/parm/config/gcafs/yaml/defaults.yaml

@@ -37,23 +37,25 @@ base:
   FHOUT_AERO: 3
 
 atmanl:
-  JCB_ALGO_YAML_VAR: "${PARMgfs}/gdas/atm/jcb-prototype_3dvar.yaml.j2"
-  JCB_ALGO_YAML_FV3INC: "${PARMgfs}/gdas/atm/jcb-prototype_3dvar-fv3inc.yaml.j2"
   STATICB_TYPE: "gsibec"
   LAYOUT_X_ATMANL: 8
   LAYOUT_Y_ATMANL: 8
   IO_LAYOUT_X: 1
   IO_LAYOUT_Y: 1
+  OBS_LIST_YAML: "${PARMgfs}/gdas/atm/atm_obs_list.yaml.j2"
+  VAR_JEDI_TEST_YAML: ""
+  FV3INC_JEDI_TEST_YAML: ""
 
 atmensanl:
-  JCB_ALGO_YAML_LETKF: "${PARMgfs}/gdas/atm/jcb-prototype_lgetkf.yaml.j2"
-  JCB_ALGO_YAML_OBS: "${PARMgfs}/gdas/atm/jcb-prototype_lgetkf_observer.yaml.j2"
-  JCB_ALGO_YAML_SOL: "${PARMgfs}/gdas/atm/jcb-prototype_lgetkf_solver.yaml.j2"
-  JCB_ALGO_YAML_FV3INC: "${PARMgfs}/gdas/atm/jcb-prototype_lgetkf-fv3inc.yaml.j2"
   LAYOUT_X_ATMENSANL: 8
   LAYOUT_Y_ATMENSANL: 8
   IO_LAYOUT_X: 1
   IO_LAYOUT_Y: 1
+  OBS_LIST_YAML: "${PARMgfs}/gdas/atm/atm_obs_list.yaml.j2"
+  LETKF_JEDI_TEST_YAML: ""
+  OBS_JEDI_TEST_YAML: ""
+  SOL_JEDI_TEST_YAML: ""
+  FV3INC_JEDI_TEST_YAML: ""
 
 aeroanl:
   IO_LAYOUT_X: 1

dev/parm/config/gfs/config.aeroanl.j2

@@ -18,16 +18,12 @@ case ${CASE} in
     exit 4
 esac
 export CASE_ANL
-export JCB_ALGO_YAML_VAR=${PARMgfs}/gdas/aero/jcb-prototype_3dvar.yaml.j2
+
 export STATICB_TYPE='diffusion'
-export BERROR_YAML="aero_background_error_static_${STATICB_TYPE}"
-export BERROR_DATA_DIR="${FIXgfs}/gdas/aero/clim_b"
-
-export JEDI_CONFIG_YAML="${PARMgfs}/gdas/aero/aero_det_jedi_config.yaml.j2"
-export STAGE_CRTM_COEFF_YAML="${PARMgfs}/gdas/aero/aero_stage_crtm_coeff.yaml.j2"
-export STAGE_JEDI_FIX_YAML="${PARMgfs}/gdas/aero/aero_stage_jedi_fix.yaml.j2"
-export STAGE_YAML="${PARMgfs}/gdas/aero/aero_det_stage.yaml.j2"
-export SAVE_YAML="${PARMgfs}/gdas/aero/aero_det_save.yaml.j2"
+
+export TASK_CONFIG_YAML="${PARMgfs}/gdas/aero/aero_det_config.yaml.j2"
+export OBS_LIST_YAML="${PARMgfs}/gdas/aero/aero_obs_list.yaml.j2"
+export BIAS_FILES_YAML="${PARMgfs}/gdas/aero/aero_bias_files.yaml.j2"
 
 export io_layout_x="{{ IO_LAYOUT_X }}"
 export io_layout_y="{{ IO_LAYOUT_Y }}"

dev/parm/config/gfs/config.aeroanlgenb

@@ -8,9 +8,9 @@ echo "BEGIN: config.aeroanlgenb"
 # Get task specific resources
 source "${EXPDIR}/config.resources" aeroanlgenb
 
-export JEDI_CONFIG_YAML"${PARMgfs}/gdas/aero/aero_bmat_jedi_config.yaml.j2"
-export STAGE_YAML"${PARMgfs}/gdas/aero/aero_bmat_stage.yaml.j2"
-export SAVE_YAML"${PARMgfs}/gdas/aero/aero_bmat_save.yaml.j2"
+export TASK_CONFIG_YAML="${PARMgfs}/gdas/aero/aero_bmat_config.yaml.j2"
+export OBS_LIST_YAML="${PARMgfs}/gdas/aero/aero_obs_list.yaml.j2"
+export BIAS_FILES_YAML="${PARMgfs}/gdas/aero/aero_bias_files.yaml.j2"
 
 export aero_diffusion_iter=200
 export aero_diffusion_horiz_len=300e3

dev/parm/config/gfs/config.analcalc_fv3jedi

@@ -14,9 +14,7 @@ export layout_y_analcalc_fv3jedi=2
 # Get task specific resources
 source "${EXPDIR}/config.resources" analcalc_fv3jedi
 
-export STAGE_JEDI_FIX_YAML="${PARMgfs}/gdas/atm/atm_stage_jedi_fix.yaml.j2"
-export STAGE_YAML="${PARMgfs}/gdas/analcalc/analcalc_stage.yaml.j2"
-export JEDI_CONFIG_YAML="${PARMgfs}/gdas/analcalc/analcalc_jedi_config.yaml.j2"
+export TASK_CONFIG_YAML="${PARMgfs}/gdas/analcalc/analcalc_config.yaml.j2"
 
 if [[ ${DOHYBVAR} = "YES" ]]; then
     export CASE_ANL=${CASE_ENS}

dev/parm/config/gfs/config.atmanl.j2

@@ -5,33 +5,25 @@
 
 echo "BEGIN: config.atmanl"
 
-export JCB_ALGO_YAML_VAR="{{ JCB_ALGO_YAML_VAR }}"
-export JCB_ALGO_YAML_FV3INC="{{ JCB_ALGO_YAML_FV3INC }}"
-
+export OBS_LIST_YAML="{{ OBS_LIST_YAML }}"
+export VAR_JEDI_TEST_YAML="{{ VAR_JEDI_TEST_YAML }}"
+export FV3INC_JEDI_TEST_YAML="{{ FV3INC_JEDI_TEST_YAML }}"
 export STATICB_TYPE="{{ STATICB_TYPE }}"
+export layout_x_atmanl="{{ LAYOUT_X_ATMANL }}"
+export layout_y_atmanl="{{ LAYOUT_Y_ATMANL }}"
+export io_layout_x="{{ IO_LAYOUT_X }}"
+export io_layout_y="{{ IO_LAYOUT_Y }}"
+
+export TASK_CONFIG_YAML="${PARMgfs}/gdas/atm/atm_det_config.yaml.j2"
+export BIAS_FILES_YAML="${PARMgfs}/gdas/atm/atm_bias_files.yaml.j2"
+
 export LOCALIZATION_TYPE="bump"
-export INTERP_METHOD='barycentric'
 
 if [[ ${DOHYBVAR} = "YES" ]]; then
     # shellcheck disable=SC2153
     export CASE_ANL=${CASE_ENS}
-    export BERROR_YAML="atmosphere_background_error_hybrid_${STATICB_TYPE}_${LOCALIZATION_TYPE}"
 else
     export CASE_ANL=${CASE}
-    export BERROR_YAML="atmosphere_background_error_static_${STATICB_TYPE}"
 fi
 
-export JEDI_CONFIG_YAML="${PARMgfs}/gdas/atm/atm_det_jedi_config.yaml.j2"
-export STAGE_CRTM_COEFF_YAML="${PARMgfs}/gdas/atm/atm_stage_crtm_coeff.yaml.j2"
-export STAGE_JEDI_FIX_YAML="${PARMgfs}/gdas/atm/atm_stage_jedi_fix.yaml.j2"
-export STAGE_BKG_YAML="${PARMgfs}/gdas/atm/atm_det_stage_bkg.yaml.j2"
-export STAGE_BERROR_YAML="${PARMgfs}/gdas/atm/atm_det_stage_berror_${STATICB_TYPE}.yaml.j2"
-export STAGE_FV3ENS_YAML="${PARMgfs}/gdas/atm/atm_det_stage_fv3ens.yaml.j2"
-
-export layout_x_atmanl="{{ LAYOUT_X_ATMANL }}"
-export layout_y_atmanl="{{ LAYOUT_Y_ATMANL }}"
-
-export io_layout_x="{{ IO_LAYOUT_X }}"
-export io_layout_y="{{ IO_LAYOUT_Y }}"
-
 echo "END: config.atmanl"

dev/parm/config/gfs/config.atmensanl.j2

@@ -5,22 +5,17 @@
 
 echo "BEGIN: config.atmensanl"
 
-export JCB_ALGO_YAML_LETKF="{{ JCB_ALGO_YAML_LETKF }}"
-export JCB_ALGO_YAML_OBS="{{ JCB_ALGO_YAML_OBS }}"
-export JCB_ALGO_YAML_SOL="{{ JCB_ALGO_YAML_SOL }}"
-export JCB_ALGO_YAML_FV3INC="{{ JCB_ALGO_YAML_FV3INC }}"
-
-export INTERP_METHOD='barycentric'
-
-export JEDI_CONFIG_YAML="${PARMgfs}/gdas/atm/atm_ens_jedi_config.yaml.j2"
-export STAGE_CRTM_COEFF_YAML="${PARMgfs}/gdas/atm/atm_stage_crtm_coeff.yaml.j2"
-export STAGE_JEDI_FIX_YAML="${PARMgfs}/gdas/atm/atm_stage_jedi_fix.yaml.j2"
-export STAGE_BKG_YAML="${PARMgfs}/gdas/atm/atm_ens_stage_bkg.yaml.j2"
-
+export OBS_LIST_YAML="{{ OBS_LIST_YAML }}"
+export LETKF_JEDI_TEST_YAML="{{ LETKF_JEDI_TEST_YAML }}"
+export OBS_JEDI_TEST_YAML="{{ OBS_JEDI_TEST_YAML }}"
+export SOL_JEDI_TEST_YAML="{{ SOL_JEDI_TEST_YAML }}"
+export FV3INC_JEDI_TEST_YAML="{{ FV3INC_JEDI_TEST_YAML }}"
 export layout_x_atmensanl="{{ LAYOUT_X_ATMENSANL }}"
 export layout_y_atmensanl="{{ LAYOUT_Y_ATMENSANL }}"
-
 export io_layout_x="{{ IO_LAYOUT_X }}"
 export io_layout_y="{{ IO_LAYOUT_Y }}"
 
+export TASK_CONFIG_YAML="${PARMgfs}/gdas/atm/atm_ens_config.yaml.j2"
+export BIAS_FILES_YAML="${PARMgfs}/gdas/atm/atm_bias_files.yaml.j2"
+
 echo "END: config.atmensanl"

dev/parm/config/gfs/config.ecen_fv3jedi

@@ -14,9 +14,7 @@ export layout_y_ecen_fv3jedi=1
 # Get task specific resources
 source "${EXPDIR}/config.resources" ecen_fv3jedi
 
-export JEDI_CONFIG_YAML="${PARMgfs}/gdas/atm/atm_ecen_jedi_config.yaml.j2"
-export STAGE_JEDI_FIX_YAML="${PARMgfs}/gdas/atm/atm_stage_jedi_fix.yaml.j2"
-export STAGE_YAML="${PARMgfs}/gdas/atm/atm_ecen_stage.yaml.j2"
+export TASK_CONFIG_YAML="${PARMgfs}/gdas/atm/atm_ecen_config.yaml.j2"
 
 if [[ ${DOHYBVAR} = "YES" ]]; then
     export CASE_ANL=${CASE_ENS}

dev/parm/config/gfs/config.esnowanl.j2

@@ -8,21 +8,13 @@ echo "BEGIN: config.esnowanl"
 # Get task specific resources
 source "${EXPDIR}/config.resources" esnowanl
 
-export JEDI_CONFIG_YAML="${PARMgfs}/gdas/snow/snow_ens_jedi_config.yaml.j2"
-export STAGE_JEDI_FIX_YAML="${PARMgfs}/gdas/snow/snow_stage_jedi_fix.yaml.j2"
-export STAGE_OROG_YAML="${PARMgfs}/gdas/snow/snow_stage_orog.yaml.j2"
-export STAGE_BERROR_YAML="${PARMgfs}/gdas/snow/snow_stage_berror.yaml.j2"
-export STAGE_BKG_YAML="${PARMgfs}/gdas/snow/snow_ens_stage_bkg.yaml.j2"
-export STAGE_IMS_SCF2IODA_YAML="${PARMgfs}/gdas/snow/snow_stage_ims_scf2ioda.yaml.j2"
-export STAGE_GTS_YAML="${PARMgfs}/gdas/snow/obs/config/bufr2ioda_mapping.yaml.j2"
-export SAVE_YAML="${PARMgfs}/gdas/snow/snow_ens_save.yaml.j2"
+export TASK_CONFIG_YAML="${PARMgfs}/gdas/snow/snow_ens_config.yaml.j2"
+export OBS_LIST_YAML="${PARMgfs}/gdas/snow/snow_obs_list.yaml.j2"
 
 # Name of the executable that applies increment to bkg and its namelist template
 export APPLY_INCR_EXE="${EXECgfs}/gdas_apply_incr.x"
 export ENS_APPLY_INCR_NML_TMPL="${PARMgfs}/gdas/snow/ens_apply_incr_nml.j2"
 
-export JEDI_CONFIG_YAML="${PARMgfs}/gdas/snow/snow_ens_jedi_config.yaml.j2"
-
 export io_layout_x="{{ IO_LAYOUT_X }}"
 export io_layout_y="{{ IO_LAYOUT_Y }}"
 

dev/parm/config/gfs/config.snowanl.j2

@@ -12,12 +12,8 @@ source "${EXPDIR}/config.resources" snowanl
 export APPLY_INCR_EXE="${EXECgfs}/gdas_apply_incr.x"
 export APPLY_INCR_NML_TMPL="${PARMgfs}/gdas/snow/apply_incr_nml.j2"
 
-export JEDI_CONFIG_YAML="${PARMgfs}/gdas/snow/snow_det_jedi_config.yaml.j2"
-export STAGE_JEDI_FIX_YAML="${PARMgfs}/gdas/snow/snow_stage_jedi_fix.yaml.j2"
-export STAGE_BKG_YAML="${PARMgfs}/gdas/snow/snow_det_stage_bkg.yaml.j2"
-export STAGE_BERROR_YAML="${PARMgfs}/gdas/snow/snow_stage_berror.yaml.j2"
-export STAGE_GTS_YAML="${PARMgfs}/gdas/snow/obs/config/bufr2ioda_mapping.yaml.j2"
-export STAGE_IMS_SCF2IODA_YAML="${PARMgfs}/gdas/snow/snow_stage_ims_scf2ioda.yaml.j2"
+export TASK_CONFIG_YAML="${PARMgfs}/gdas/snow/snow_det_config.yaml.j2"
+export OBS_LIST_YAML="${PARMgfs}/gdas/snow/snow_obs_list.yaml.j2"
 
 export io_layout_x="{{ IO_LAYOUT_X }}"
 export io_layout_y="{{ IO_LAYOUT_Y }}"

dev/parm/config/gfs/yaml/defaults.yaml

@@ -29,23 +29,25 @@ base:
   NMEM_ENS_GFS_OFFSET: 20
 
 atmanl:
-  JCB_ALGO_YAML_VAR: "${PARMgfs}/gdas/atm/jcb-prototype_3dvar.yaml.j2"
-  JCB_ALGO_YAML_FV3INC: "${PARMgfs}/gdas/atm/jcb-prototype_3dvar-fv3inc.yaml.j2"
   STATICB_TYPE: "gsibec"
   LAYOUT_X_ATMANL: 8
   LAYOUT_Y_ATMANL: 8
   IO_LAYOUT_X: 1
   IO_LAYOUT_Y: 1
+  OBS_LIST_YAML: "${PARMgfs}/gdas/atm/atm_obs_list.yaml.j2"
+  VAR_JEDI_TEST_YAML: ""
+  FV3INC_JEDI_TEST_YAML: ""
 
 atmensanl:
-  JCB_ALGO_YAML_LETKF: "${PARMgfs}/gdas/atm/jcb-prototype_lgetkf.yaml.j2"
-  JCB_ALGO_YAML_OBS: "${PARMgfs}/gdas/atm/jcb-prototype_lgetkf_observer.yaml.j2"
-  JCB_ALGO_YAML_SOL: "${PARMgfs}/gdas/atm/jcb-prototype_lgetkf_solver.yaml.j2"
-  JCB_ALGO_YAML_FV3INC: "${PARMgfs}/gdas/atm/jcb-prototype_lgetkf-fv3inc.yaml.j2"
   LAYOUT_X_ATMENSANL: 8
   LAYOUT_Y_ATMENSANL: 8
   IO_LAYOUT_X: 1
   IO_LAYOUT_Y: 1
+  OBS_LIST_YAML: "${PARMgfs}/gdas/atm/atm_obs_list.yaml.j2"
+  LETKF_JEDI_TEST_YAML: ""
+  OBS_JEDI_TEST_YAML: ""
+  SOL_JEDI_TEST_YAML: ""
+  FV3INC_JEDI_TEST_YAML: ""
 
 aeroanl:
   IO_LAYOUT_X: 1

jobs/JGDAS_AERO_ANALYSIS_GENERATE_BMATRIX

@@ -13,9 +13,12 @@ source "${HOMEgfs}/ush/jjob_header.sh" -e "aeroanlgenb" -c "base aeroanl aeroanl
 # Generate COM variables from templates
 YMD=${PDY} HH=${cyc} declare_from_tmpl -rx COMIN_OBS:COM_OBS_TMPL \
     COMOUT_CHEM_BMAT:COM_CHEM_BMAT_TMPL \
-    COMIN_ATMOS_RESTART:COM_ATMOS_RESTART_TMPL
+    COMIN_ATMOS_RESTART:COM_ATMOS_RESTART_TMPL \
+    COMOUT_CONF:COM_CONF_TMPL
+
 
 mkdir -p "${COMOUT_CHEM_BMAT}"
+mkdir -p "${COMOUT_CONF}"
 
 ###############################################################
 # Run relevant script

jobs/JGLOBAL_AERO_ANALYSIS_FINALIZE

@@ -18,6 +18,10 @@ YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \
     COMOUT_CONF:COM_CONF_TMPL \
     COMOUT_ATMOS_RESTART:COM_ATMOS_RESTART_TMPL
 
+mkdir -m 755 -p "${COMOUT_CHEM_ANALYSIS}"
+mkdir -m 755 -p "${COMOUT_ATMOS_RESTART}"
+mkdir -m 755 -p "${COMOUT_CONF}"
+
 ###############################################################
 # Run relevant script
 

jobs/JGLOBAL_ATMOS_ANALYSIS_CALC_FV3JEDI

@@ -26,7 +26,11 @@ YMD=${PDY} HH=${cyc} RUN=${RUN} declare_from_tmpl -rx \
 YMD=${PDY} HH=${cyc} RUN=${RUN} declare_from_tmpl -rx \
     COMOUT_ATMOS_ANALYSIS:COM_ATMOS_ANALYSIS_TMPL
 RUN=${GDUMP} YMD=${gPDY} HH=${gcyc} declare_from_tmpl -rx \
-    COMIN_ATMOS_HISTORY_PREV:COM_ATMOS_HISTORY_TMPL
+   COMIN_ATMOS_HISTORY_PREV:COM_ATMOS_HISTORY_TMPL
+YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \
+   COMOUT_CONF:COM_CONF_TMPL
+
+mkdir -m 775 -p "${COMOUT_CONF}"
 
 ##############################################
 # Run relevant script

jobs/JGLOBAL_ATM_ANALYSIS_INITIALIZE

@@ -24,8 +24,6 @@ RUN=${GDUMP} YMD=${gPDY} HH=${gcyc} declare_from_tmpl -rx \
     COMIN_ATMOS_ANALYSIS_PREV:COM_ATMOS_ANALYSIS_TMPL \
     COMIN_ATMOS_HISTORY_PREV:COM_ATMOS_HISTORY_TMPL
 
-mkdir -m 775 -p "${COMIN_ATMOS_ANALYSIS_PREV}"
-
 ###############################################################
 # Run relevant script