Reorganize parm/gdas

dev/ci/cases/gfsv17/marine3dvar.yaml

@@ -22,5 +22,5 @@ prepoceanobs:
 marineanl:
   SOCA_INPUT_FIX_DIR: {{ HOMEgfs }}/fix/gdas/soca/1440x1080x75/soca
   SOCA_ANL_GEOM: {{ HOMEgfs }}/fix/gdas/soca/720x540x75/soca
-  SOCA_OBS_LIST: {{ HOMEgfs }}/sorc/gdas.cd/parm/soca/obs/obs_list.yaml.j2
+  SOCA_OBS_LIST: {{ HOMEgfs }}/parm/gdas/marine/obs/obs_list.yaml.j2
   SOCA_NINNER: 100

dev/ci/cases/gfsv17/s2sw.yaml

@@ -29,5 +29,5 @@ prepoceanobs:
 marineanl:
   SOCA_INPUT_FIX_DIR: {{ HOMEgfs }}/fix/gdas/soca/1440x1080x75/soca            
   SOCA_ANL_GEOM: {{ HOMEgfs }}/fix/gdas/soca/720x540x75/soca
-  SOCA_OBS_LIST: {{ HOMEgfs }}/sorc/gdas.cd/parm/soca/obs/obs_list.yaml.j2
+  SOCA_OBS_LIST: {{ HOMEgfs }}/parm/gdas/marine/obs/obs_list.yaml.j2
   SOCA_NINNER: 100

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

@@ -23,20 +23,17 @@ export STATICB_TYPE='diffusion'
 export BERROR_YAML="aero_background_error_static_${STATICB_TYPE}"
 export BERROR_DATA_DIR="${FIXgfs}/gdas/aero/clim_b"
 
-export CRTM_FIX_YAML="${PARMgfs}/gdas/aero_crtm_coeff.yaml.j2"
-export JEDI_FIX_YAML="${PARMgfs}/gdas/aero_jedi_fix.yaml.j2"
+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 JEDI_CONFIG_YAML="${PARMgfs}/gdas/aeroanl_jedi_config.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 AERO_BMATRIX_RESCALE_TMPL="aero_gen_bmatrix_rescale_default.yaml.j2"
+export AERO_BMATRIX_RESCALE_YAML="aero_gen_bmatrix_rescale_default.yaml.j2"
 
 export io_layout_x="{{ IO_LAYOUT_X }}"
 export io_layout_y="{{ IO_LAYOUT_Y }}"
 
-export JEDIEXE="${EXECgfs}/gdas.x"
-
 export aero_bkg_times="3,6,9"
 
 echo "END: config.aeroanl"

dev/parm/config/gcafs/config.aeroanlgenb

@@ -8,10 +8,11 @@ echo "BEGIN: config.aeroanlgenb"
 # Get task specific resources
 source "${EXPDIR}/config.resources" aeroanlgenb
 
-export JEDI_CONFIG_YAML="${PARMgfs}/gdas/aero_bmat_jedi_config.yaml.j2"
-export JCB_BASE_YAML="${PARMgfs}/gdas/aero/jcb-base.yaml.j2"
-export AERO_BMATRIX_STAGE_TMPL="${PARMgfs}/gdas/aero_stage_bmatrix_bkg.yaml.j2"
-export AERO_BMATRIX_FINALIZE_TMPL="${PARMgfs}/gdas/aero_finalize_bmatrix_bkg.yaml.j2"
+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 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/config.anlstat

@@ -8,7 +8,7 @@ echo "BEGIN: config.anlstat"
 # Get task specific resources
 source "${EXPDIR}/config.resources" anlstat
 
-export JEDI_CONFIG_YAML="${PARMgfs}/gdas/anlstat_jedi_config.yaml.j2"
-export STAT_BASE_CONFIG_YAML="${PARMgfs}/gdas/stat_base_config.yaml.j2"
+export JEDI_CONFIG_YAML="${PARMgfs}/gdas/anlstat/anlstat_jedi_config.yaml.j2"
+export BASE_CONFIG_YAML="${PARMgfs}/gdas/anlstat/anlstat_base_config.yaml.j2"
 
 echo "END: config.anlstat"

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

@@ -66,14 +66,14 @@ snowanl:
 marineanl:
   SOCA_INPUT_FIX_DIR: "${FIXgfs}/gdas/soca/72x35x25/soca"
   SOCA_ANL_GEOM: "${FIXgfs}/gdas/soca/72x35x25/soca"
-  SOCA_OBS_LIST: "${PARMgfs}/gdas/soca/obs/obs_list.yaml"  # TODO: This is also repeated in oceanprepobs
+  SOCA_OBS_LIST: "${PARMgfs}/gdas/marine/obs/obs_list.yaml"  # TODO: This is also repeated in oceanprepobs
   SOCA_NINNER: 100
-  JCB_ALGO_YAML_VAR: "${PARMgfs}/gdas/soca/marine-jcb-3dfgat.yaml.j2"
+  JCB_ALGO_YAML_VAR: "${PARMgfs}/gdas/marine/marine-jcb-3dfgat.yaml.j2"
 
 prepoceanobs:
   SOCA_INPUT_FIX_DIR: "${FIXgfs}/gdas/soca/72x35x25/soca"
-  SOCA_OBS_LIST: "${PARMgfs}/gdas/soca/obs/obs_list.yaml"  # TODO: This is also repeated in ocnanal
-  OBSPREP_YAML: "${PARMgfs}/gdas/soca/obsprep/obsprep_config.yaml"
+  SOCA_OBS_LIST: "${PARMgfs}/gdas/marine/obs/obs_list.yaml"  # TODO: This is also repeated in ocnanal
+  OBSPREP_YAML: "${PARMgfs}/gdas/marine/obsprep/obsprep_config.yaml"
   use_exp_obs: "YES"
   dmpdir_exp: "${BASE_DATA}/experimental_obs"
 

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

@@ -23,19 +23,15 @@ export STATICB_TYPE='diffusion'
 export BERROR_YAML="aero_background_error_static_${STATICB_TYPE}"
 export BERROR_DATA_DIR="${FIXgfs}/gdas/aero/clim_b"
 
-export CRTM_FIX_YAML="${PARMgfs}/gdas/aero_crtm_coeff.yaml.j2"
-export JEDI_FIX_YAML="${PARMgfs}/gdas/aero_jedi_fix.yaml.j2"
-
-export JEDI_CONFIG_YAML="${PARMgfs}/gdas/aeroanl_jedi_config.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 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 io_layout_x="{{ IO_LAYOUT_X }}"
 export io_layout_y="{{ IO_LAYOUT_Y }}"
 
-export JEDIEXE="${EXECgfs}/gdas.x"
-
 if [[ "${DOIAU}" == "YES" ]]; then
   export aero_bkg_times="3,6,9"
 else

dev/parm/config/gfs/config.aeroanlgenb

@@ -8,10 +8,10 @@ echo "BEGIN: config.aeroanlgenb"
 # Get task specific resources
 source "${EXPDIR}/config.resources" aeroanlgenb
 
-export JEDI_CONFIG_YAML="${PARMgfs}/gdas/aero_bmat_jedi_config.yaml.j2"
-export JCB_BASE_YAML="${PARMgfs}/gdas/aero/jcb-base.yaml.j2"
-export AERO_BMATRIX_STAGE_TMPL="${PARMgfs}/gdas/aero_stage_bmatrix_bkg.yaml.j2"
-export AERO_BMATRIX_FINALIZE_TMPL="${PARMgfs}/gdas/aero_finalize_bmatrix_bkg.yaml.j2"
+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 aero_diffusion_iter=200
 export aero_diffusion_horiz_len=300e3
 export aero_diffusion_fixed_val=20.0

dev/parm/config/gfs/config.analcalc_fv3jedi

@@ -12,17 +12,16 @@ export layout_x_analcalc_fv3jedi=2
 export layout_y_analcalc_fv3jedi=2
 
 # Get task specific resources
-. "${EXPDIR}/config.resources" analcalc_fv3jedi
+source "${EXPDIR}/config.resources" analcalc_fv3jedi
 
-export JEDI_CONFIG_YAML="${PARMgfs}/gdas/analcalc_jedi_config.yaml.j2"
+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"
 
 if [[ ${DOHYBVAR} = "YES" ]]; then
     export CASE_ANL=${CASE_ENS}
 else
     export CASE_ANL=${CASE}
 fi
 
-export JEDI_FIX_YAML="${PARMgfs}/gdas/atm_jedi_fix.yaml.j2"
-export JEDI_BKG_INC_YAML="${PARMgfs}/gdas/staging/analcalc.yaml.j2"
-
 echo "END: config.analcalc_fv3jedi"

dev/parm/config/gfs/config.anlstat

@@ -8,10 +8,7 @@ echo "BEGIN: config.anlstat"
 # Get task specific resources
 source "${EXPDIR}/config.resources" anlstat
 
-export JEDI_CONFIG_YAML="${PARMgfs}/gdas/anlstat_jedi_config.yaml.j2"
-export STAT_BASE_CONFIG_YAML="${PARMgfs}/gdas/stat_base_config.yaml.j2"
-export JCB_BASE_YAML="${PARMgfs}/gdas/stat/aero/jcb-base.yaml.j2"
-export JCB_ALGO_YAML="${PARMgfs}/gdas/jcb-algorithms/anlstat.yaml.j2"
-export JEDIEXE="${HOMEgfs}/sorc/gdas.cd/build/bin/ioda-stats.x"
+export JEDI_CONFIG_YAML="${PARMgfs}/gdas/anlstat/anlstat_jedi_config.yaml.j2"
+export BASE_CONFIG_YAML="${PARMgfs}/gdas/anlstat/anlstat_base_config.yaml.j2"
 
 echo "END: config.anlstat"

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

@@ -21,13 +21,12 @@ else
     export BERROR_YAML="atmosphere_background_error_static_${STATICB_TYPE}"
 fi
 
-export CRTM_FIX_YAML="${PARMgfs}/gdas/atm_crtm_coeff.yaml.j2"
-export JEDI_FIX_YAML="${PARMgfs}/gdas/atm_jedi_fix.yaml.j2"
-
-export JEDI_CONFIG_YAML="${PARMgfs}/gdas/atmanl_jedi_config.yaml.j2"
-export VAR_BKG_STAGING_YAML="${PARMgfs}/gdas/staging/atm_var_bkg.yaml.j2"
-export BERROR_STAGING_YAML="${PARMgfs}/gdas/staging/atm_berror_${STATICB_TYPE}.yaml.j2"
-export FV3ENS_STAGING_YAML="${PARMgfs}/gdas/staging/atm_var_fv3ens.yaml.j2"
+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 }}"

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

@@ -12,11 +12,10 @@ export JCB_ALGO_YAML_FV3INC="{{ JCB_ALGO_YAML_FV3INC }}"
 
 export INTERP_METHOD='barycentric'
 
-export CRTM_FIX_YAML="${PARMgfs}/gdas/atm_crtm_coeff.yaml.j2"
-export JEDI_FIX_YAML="${PARMgfs}/gdas/atm_jedi_fix.yaml.j2"
-
-export JEDI_CONFIG_YAML="${PARMgfs}/gdas/atmensanl_jedi_config.yaml.j2"
-export LGETKF_BKG_STAGING_YAML="${PARMgfs}/gdas/staging/atm_lgetkf_bkg.yaml.j2"
+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 layout_x_atmensanl="{{ LAYOUT_X_ATMENSANL }}"
 export layout_y_atmensanl="{{ LAYOUT_Y_ATMENSANL }}"

dev/parm/config/gfs/config.ecen_fv3jedi

@@ -12,17 +12,16 @@ export layout_x_ecen_fv3jedi=1
 export layout_y_ecen_fv3jedi=1
 
 # Get task specific resources
-. "${EXPDIR}/config.resources" ecen_fv3jedi
+source "${EXPDIR}/config.resources" ecen_fv3jedi
 
-export JEDI_CONFIG_YAML="${PARMgfs}/gdas/atm_ecen_jedi_config.yaml.j2"
+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"
 
 if [[ ${DOHYBVAR} = "YES" ]]; then
     export CASE_ANL=${CASE_ENS}
 else
     export CASE_ANL=${CASE}
 fi
 
-export JEDI_FIX_YAML="${PARMgfs}/gdas/atm_jedi_fix.yaml.j2"
-export JEDI_BKG_INC_YAML="${PARMgfs}/gdas/staging/atm_ecen.yaml.j2"
-
 echo "END: config.ecen_fv3jedi"

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

@@ -8,24 +8,20 @@ echo "BEGIN: config.esnowanl"
 # Get task specific resources
 source "${EXPDIR}/config.resources" esnowanl
 
-export OBS_LIST="${PARMgfs}/gdas/snow/obs/lists/gdas_snow.yaml.j2"
-export GTS_SNOW_STAGE_YAML="${PARMgfs}/gdas/snow/obs/config/bufr2ioda_mapping.yaml.j2"
-
-export JCB_BASE_YAML="${PARMgfs}/gdas/snow/jcb-base.yaml.j2"
-export JCB_ALGO_YAML_VAR="${PARMgfs}/gdas/snow/jcb-prototype_2dvar.yaml.j2"
-
-export JEDI_FIX_YAML="${PARMgfs}/gdas/snow_jedi_fix.yaml.j2"
-export BERROR_STAGING_YAML="${PARMgfs}/gdas/staging/snow_berror.yaml.j2"
-export SNOW_ENS_STAGE_TMPL="${PARMgfs}/gdas/snow_stage_ens_update.yaml.j2"
-export SNOW_OROG_STAGE_TMPL="${PARMgfs}/gdas/snow_stage_orog.yaml.j2"
-export SNOW_ENS_FINALIZE_TMPL="${PARMgfs}/gdas/snow_finalize_ens_update.yaml.j2"
-export SNOW_IMS_STAGE_TMPL="${PARMgfs}/gdas/staging/snow_ims_scf_to_ioda.yaml.j2"
+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"
 
 # 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/esnowanl_jedi_config.yaml.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.marineanl.j2

@@ -5,23 +5,23 @@
 
 echo "BEGIN: config.marineanl"
 
-export JEDI_CONFIG_YAML_ANALYSIS="${PARMgfs}/gdas/soca_analysis_jedi_config.yaml.j2"
+# TODO: This should be sourced in a config file specific to marine deterministic analysis
+#       and renamed to remove _DET
+
 export JCB_ALGO_YAML_VAR="{{ JCB_ALGO_YAML_VAR }}"
 
-export MARINE_OBS_YAML_DIR="${PARMgfs}/gdas/soca/obs/config"
-export MARINE_OBS_LIST_YAML="{{ SOCA_OBS_LIST }}"
-export SOCA_INPUT_FIX_DIR="{{ SOCA_INPUT_FIX_DIR }}"
-export SOCA_ANL_GEOM="{{ SOCA_ANL_GEOM }}"
-export SOCA_NINNER="{{ SOCA_NINNER }}"
+export OBS_LIST_YAML="{{ SOCA_OBS_LIST }}"
+export INPUT_FIX_DIR="{{ SOCA_INPUT_FIX_DIR }}"
+export ANL_GEOM="{{ SOCA_ANL_GEOM }}"
+export NINNER="{{ SOCA_NINNER }}"
+
 export DOMAIN_STACK_SIZE=116640000  #TODO: Make the stack size resolution dependent
-export SOCA_ENS_BKG_STAGE_YAML_TMPL="${PARMgfs}/gdas/soca/soca_ens_bkg_stage.yaml.j2"
-export SOCA_FIX_YAML_TMPL="${PARMgfs}/gdas/soca/soca_fix_stage_${OCNRES}.yaml.j2"
-export MARINE_UTILITY_YAML_TMPL="${PARMgfs}/gdas/soca/soca_utils_stage.yaml.j2"
-export MARINE_ENSDA_STAGE_BKG_YAML_TMPL="${PARMgfs}/gdas/soca/ensda/stage_ens_mem.yaml.j2"
-export MARINE_DET_STAGE_BKG_YAML_TMPL="${PARMgfs}/gdas/soca/soca_det_bkg_stage.yaml.j2"
-export MARINE_DET_STAGE_FILES_YAML_TMPL="${PARMgfs}/gdas/soca/soca_det_files_stage.yaml.j2"
-export MARINE_DET_FINALIZE_YAML_TMPL="${PARMgfs}/gdas/soca/soca_det_finalize.yaml.j2"
-export MARINE_JCB_GDAS_ALGO="${PARMgfs}/gdas/jcb-gdas/algorithm/marine"
 export MARINE_JCB_GDAS_OBS="${PARMgfs}/gdas/jcb-gdas/observations/marine"
 
+export JEDI_CONFIG_YAML_DET="${PARMgfs}/gdas/marine/marine_det_jedi_config.yaml.j2"
+export STAGE_FIX_YAML="${PARMgfs}/gdas/marine/marine_stage_fix_${OCNRES}.yaml.j2"
+export STAGE_UTILITIES_YAML="${PARMgfs}/gdas/marine/marine_stage_utilities.yaml.j2"
+export STAGE_DET_BKG_YAML="${PARMgfs}/gdas/marine/marine_det_stage_bkg.yaml.j2"
+export STAGE_ENS_BKG_YAML="${PARMgfs}/gdas/marine/marine_ens_stage_bkg.yaml.j2"
+
 echo "END: config.marineanl"

dev/parm/config/gfs/config.marineanlecen

@@ -8,8 +8,8 @@ echo "BEGIN: config.marineanlecen"
 # Get task specific resources
 source "${EXPDIR}/config.resources" marineanlecen
 
-export JEDI_CONFIG_YAML_ECEN="${PARMgfs}/gdas/soca/soca_ecen_jedi_config.yaml.j2"
-export MARINE_ECEN_STAGE_YAML_TMPL="${PARMgfs}/gdas/soca/soca_ecen_stage.yaml.j2"
-export MARINE_ECEN_FINALIZE_YAML_TMPL="${PARMgfs}/gdas/soca/soca_ecen_finalize.yaml.j2"
+export JEDI_CONFIG_YAML="${PARMgfs}/gdas/marine/marine_ecen_jedi_config.yaml.j2"
+export STAGE_YAML="${PARMgfs}/gdas/marine/marine_ecen_stage.yaml.j2"
+export SAVE_YAML="${PARMgfs}/gdas/marine/marine_ecen_save.yaml.j2"
 
 echo "END: config.marineanlecen"

dev/parm/config/gfs/config.marineanlfinal

@@ -5,6 +5,10 @@
 
 echo "BEGIN: config.marineanlfinal"
 
+
 # Get task specific resources
-. "${EXPDIR}/config.resources" marineanlfinal
+source "${EXPDIR}/config.resources" marineanlfinal
+
+export SAVE_YAML="${PARMgfs}/gdas/marine/marine_det_save.yaml.j2"
+
 echo "END: config.marineanlfinal"

dev/parm/config/gfs/config.marineanlinit

@@ -5,6 +5,10 @@
 
 echo "BEGIN: config.marineanlinit"
 
+
 # Get task specific resources
-. "${EXPDIR}/config.resources" marineanlinit
+source "${EXPDIR}/config.resources" marineanlinit
+
+export STAGE_YAML="${PARMgfs}/gdas/marine/marine_det_stage.yaml.j2"
+
 echo "END: config.marineanlinit"

dev/parm/config/gfs/config.marineanlletkf

@@ -6,12 +6,13 @@
 echo "BEGIN: config.marineanlletkf"
 
 # Get task specific resources
-. "${EXPDIR}/config.resources" marineanlletkf
+source "${EXPDIR}/config.resources" marineanlletkf
 
-export MARINE_LETKF_EXEC="${EXECgfs}/gdas.x"
-export MARINE_LETKF_YAML_TMPL="${PARMgfs}/gdas/soca/letkf/letkf.yaml.j2"
-export MARINE_LETKF_STAGE_YAML_TMPL="${PARMgfs}/gdas/soca/letkf/letkf_stage.yaml.j2"
-export MARINE_LETKF_SAVE_YAML_TMPL="${PARMgfs}/gdas/soca/letkf/letkf_save.yaml.j2"
+export LETKF_EXEC="${EXECgfs}/gdas.x"
+export LETKF_YAML="${PARMgfs}/gdas/marine/letkf/letkf.yaml.j2"
+
+export STAGE_YAML="${PARMgfs}/gdas/marine/marine_ens_stage.yaml.j2"
+export SAVE_YAML="${PARMgfs}/gdas/marine/marine_ens_save.yaml.j2"
 
 export GRIDGEN_EXEC="${EXECgfs}/gdas_soca_gridgen.x"
 export GRIDGEN_YAML="${HOMEgfs}/sorc/gdas.cd/parm/jcb-gdas/algorithm/marine/soca_gridgen.yaml.j2"

dev/parm/config/gfs/config.marineanlvar

@@ -6,6 +6,9 @@
 echo "BEGIN: config.marineanlvar"
 
 # Get task specific resources
-. "${EXPDIR}/config.resources" marineanlvar
+source "${EXPDIR}/config.resources" marineanlvar
+
+export JEDI_CONFIG_YAML="${PARMgfs}/gdas/marine/marine_det_jedi_config.yaml.j2"
+export JCB_ALGO_YAML_VAR="{{ JCB_ALGO_YAML_VAR }}"
 
 echo "END: config.marineanlvar"

dev/parm/config/gfs/config.marinebmat

@@ -6,9 +6,9 @@
 echo "BEGIN: config.marinebmat"
 
 # Get task specific resources
-. "${EXPDIR}/config.resources" marinebmat
+source "${EXPDIR}/config.resources" marinebmat
 
-export JEDI_CONFIG_YAML_BMAT="${PARMgfs}/gdas/soca_bmat_jedi_config.yaml.j2"
-export MARINE_BMAT_FINALIZE_YAML_TMPL="${PARMgfs}/gdas/soca/soca_bmat_finalize.yaml.j2"
+export JEDI_CONFIG_YAML="${PARMgfs}/gdas/marine/marine_bmat_jedi_config.yaml.j2"
+export SAVE_YAML="${PARMgfs}/gdas/marine/marine_bmat_save.yaml.j2"
 
 echo "END: config.marinebmat"

dev/parm/config/gfs/config.marinebmatinit

@@ -8,6 +8,6 @@ echo "BEGIN: config.marinebmatinit"
 # Get task specific resources
 source "${EXPDIR}/config.resources" marinebmatinit
 
-export JEDI_CONFIG_YAML_BMAT="${PARMgfs}/gdas/soca_bmat_jedi_config.yaml.j2"
+export JEDI_CONFIG_YAML="${PARMgfs}/gdas/marine/marine_bmat_jedi_config.yaml.j2"
 
 echo "END: config.marinebmatinit"