From e7b07d5191c23232ad2353b702304340c3d6c125 Mon Sep 17 00:00:00 2001
From: Eric Sinsky - NOAA <48259628+EricSinsky-NOAA@users.noreply.github.com>
Date: Mon, 28 Oct 2024 13:51:06 -0400
Subject: [PATCH] Bring recent updates from develop and configure reforecast 
 (#3015)

<!--
  *** PLEASE READ ***

  Any PRs not following this template will be closed.

  Please delete all these comments before submitting the PR.

Please use a short (<60 char), descriptive title for the PR title above.
It should complete the sentence "If merged, this PR will _____".
Capitalize the first word and do not end with a period.

  No content should appear above the "Description" header.

If this PR is not merge-ready (e.g. it depends on other PRs not yet
merged), please mark it as draft until it is ready.

  PRs should meet these guidelines:
  - Each PR should address ONE topic and have an associated issue.
  - No hard-coded paths or personal directories.
  - No temporary or backup files should be committed (including logs).
- Any code that you disabled by being commented out should be removed or
reenabled.
-->
# Description
<!-- This description will become the commit message for the PR. -->
<!--
  Solely pointing to an issue is not an adequate description!

  Please use this format for your description:

Describe your changes. Focus on the *what* and *why*. The *how* will be
evident from the changes. In particular, be sure to note any interface
changes, such as command line syntax, that will need to be communicated
to users.

At the end of your description, please be sure to add the issue this PR
solves using the word "Resolves". If there are any issues that are
related but not yet resolved (including in other repos), you may use
"Refs".

  Resolves #1234
  Refs #4321
  Refs NOAA-EMC/repo#5678
-->

This PR brings recent changes from the develop branch to the GEFS
reforecast branch. This PR updates the GEFS reforecast branch to develop
hash ac3cde510d4aeed632e3b080b6227cb5a26ef6d0 (10/11/2024). This version
of global-workflow uses the ufs-weather-model hash
[6a4e09e](https://github.com/ufs-community/ufs-weather-model/tree/6a4e09e94773ffa39ce7ab6a54a885efada91f21)
(9/9/2024).

Furthermore, this PR ensures the following adjustments for the
reforecast:

- [x] Speed up rocoto by grouping post job
- [x] Optimize PE configuration
- [x]  Remove duplicate OCNSPPT and EPBL settings
- [x] Set restart_interval to fhmax
- [x] Turn off SHUM in config.efcs
- [x] Set FHMIN_WAV to 3 in config.base
- [x] Turn off ATM history file output
- [x] Change  HMS=${cyc}0000 to HMS=030000 in Wavepostpnt script (#2788)
- [x] Include YYYYMMDDHH (PDY) in job name
- [x] Change CA seed based on case and cyc for control member and
perturbed members
- [x] Fix post ensemble info
- [x] Add tob to ocean products (#2995 )
- [x] Move PEVPR from b group to a group for atmos products (#2995)
- [x] Add option to download initial condition from HPSS
- [x] Add ability to download and stage replay analysis from AWS, which
is needed for the repair_replay task
- [x] Add capability to run forecasts in 7-day intervals  (#2928)
- [x] Update defaults.yaml so that many of the reforecast-specific
settings can be used by default

<!-- For more on writing good commit messages, see
https://cbea.ms/git-commit/ -->

# Type of change
- [ ] Bug fix (fixes something broken)
- [ ] New feature (adds functionality)
- [x] Maintenance (code refactor, clean-up, new CI test, etc.)

# Change characteristics
<!-- Choose YES or NO from each of the following and delete the other
-->
- Is this a breaking change (a change in existing functionality)? NO
- Does this change require a documentation update? NO
- Does this change require an update to any of the following submodules?
NO
  - [ ] EMC verif-global <!-- NOAA-EMC/EMC_verif-global#1234 -->
  - [ ] GDAS <!-- NOAA-EMC/GDASApp#1234 -->
  - [ ] GFS-utils <!-- NOAA-EMC/gfs-utils#1234 -->
  - [ ] GSI <!-- NOAA-EMC/GSI#1234 -->
  - [ ] GSI-monitor <!-- NOAA-EMC/GSI-Monitor#1234 -->
  - [ ] GSI-utils <!-- NOAA-EMC/GSI-Utils#1234 -->
  - [ ] UFS-utils <!-- ufs-community/UFS_UTILS#1234 -->
  - [ ] UFS-weather-model <!-- ufs-community/ufs-weather-model#1234 -->
  - [ ] wxflow <!-- NOAA-EMC/wxflow#1234 -->

# How has this been tested?
<!-- Please list any test you conducted, including the machine.

Example:
- Clone and build on WCOSS
- Cycled test on Orion
- Forecast-only on Hera
-->

This branch is being tested on WCOSS2. When testing has succeeded, this
PR will be marked as ready for review.

# Checklist
- [ ] Any dependent changes have been merged and published
- [ ] My code follows the style guidelines of this project
- [ ] I have performed a self-review of my own code
- [ ] I have commented my code, particularly in hard-to-understand areas
- [ ] I have documented my code, including function, input, and output
descriptions
- [ ] My changes generate no new warnings
- [ ] New and existing tests pass with my changes
- [ ] This change is covered by an existing CI test or a new one has
been added
- [ ] I have made corresponding changes to the system documentation if
necessary

---------

Co-authored-by: Wei Huang <wei.huang@noaa.gov>
Co-authored-by: Kate Friedman <kate.friedman@noaa.gov>
Co-authored-by: Cory Martin <cory.r.martin@noaa.gov>
Co-authored-by: Andrew.Tangborn <Andrew.Tangborn@noaa.gov>
Co-authored-by: Walter Kolczynski - NOAA <Walter.Kolczynski@noaa.gov>
Co-authored-by: AndrewEichmann-NOAA <58948505+AndrewEichmann-NOAA@users.noreply.github.com>
Co-authored-by: DavidBurrows-NCO <82525974+DavidBurrows-NCO@users.noreply.github.com>
Co-authored-by: AnningCheng-NOAA <48297505+AnningCheng-NOAA@users.noreply.github.com>
Co-authored-by: David Huber <69919478+DavidHuber-NOAA@users.noreply.github.com>
Co-authored-by: Rahul Mahajan <aerorahul@users.noreply.github.com>
Co-authored-by: AntonMFernando-NOAA <167725623+AntonMFernando-NOAA@users.noreply.github.com>
Co-authored-by: BoCui-NOAA <53531984+BoCui-NOAA@users.noreply.github.com>
Co-authored-by: DavidNew-NOAA <134300700+DavidNew-NOAA@users.noreply.github.com>
Co-authored-by: Jeffrey Whitaker <jeffrey.s.whitaker@noaa.gov>
Co-authored-by: mingshichen-noaa <48537176+mingshichen-noaa@users.noreply.github.com>
Co-authored-by: Jiarui Dong <Jiarui.Dong@noaa.gov>
Co-authored-by: David Huber <david.huber@noaa.gov>
Co-authored-by: Guillaume Vernieres <guillaume.vernieres@gmail.com>
Co-authored-by: RussTreadon-NOAA <26926959+RussTreadon-NOAA@users.noreply.github.com>
Co-authored-by: Innocent Souopgui <162634017+InnocentSouopgui-NOAA@users.noreply.github.com>
Co-authored-by: Neil Barton <103681022+NeilBarton-NOAA@users.noreply.github.com>
---
 .github/ISSUE_TEMPLATE/NCO_bug_report.yml     |    2 +-
 .github/ISSUE_TEMPLATE/bug_report.yml         |   14 +-
 .github/ISSUE_TEMPLATE/dump_request.yml       |   37 +
 .github/ISSUE_TEMPLATE/feature_request.yml    |   17 +-
 .github/ISSUE_TEMPLATE/fix_file.yml           |   97 -
 .github/ISSUE_TEMPLATE/production_update.yml  |   29 +-
 .github/ISSUE_TEMPLATE/static_data.yml        |  134 ++
 .github/pull_request_template.md              |   63 +-
 .gitignore                                    |   43 +-
 ci/cases/gfsv17/C384mx025_3DVarAOWCDA.yaml    |    2 +-
 ci/cases/gfsv17/ocnanal.yaml                  |    2 +-
 ci/cases/pr/C48_S2SWA_gefs.yaml               |    4 +-
 ci/cases/pr/C48mx500_3DVarAOWCDA.yaml         |    2 +-
 ci/cases/pr/C96C48_hybatmDA.yaml              |    2 +-
 ci/cases/pr/C96C48_hybatmaerosnowDA.yaml      |    2 +-
 ci/cases/pr/C96C48_ufs_hybatmDA.yaml          |    4 +-
 ci/cases/pr/C96_S2SWA_gefs_replay_ics.yaml    |   22 +
 ci/cases/pr/C96_atm3DVar.yaml                 |    2 +-
 ci/cases/pr/C96_atm3DVar_extended.yaml        |    2 +-
 ci/cases/weekly/C384C192_hybatmda.yaml        |    2 +-
 ci/cases/weekly/C384_atm3DVar.yaml            |    2 +-
 ...ci_defaults.yaml => gefs_defaults_ci.yaml} |    0
 ci/cases/yamls/gefs_replay_ci.yaml            |   14 +
 docs/note_fixfield.txt                        |    2 +-
 docs/source/components.rst                    |    2 +-
 docs/source/errors_faq.rst                    |    9 +-
 docs/source/index.rst                         |    5 +-
 docs/source/init.rst                          |    4 +-
 docs/source/jobs.rst                          |    2 +-
 docs/source/run.rst                           |    1 -
 docs/source/setup.rst                         |   18 +-
 env/AWSPW.env                                 |   16 +-
 env/AZUREPW.env                               |   52 +-
 env/CONTAINER.env                             |    4 +-
 env/GAEA.env                                  |   51 +-
 env/GOOGLEPW.env                              |   56 +-
 env/HERA.env                                  |   75 +-
 env/HERCULES.env                              |   67 +-
 env/JET.env                                   |   57 +-
 env/ORION.env                                 |   68 +-
 env/S4.env                                    |   53 +-
 env/WCOSS2.env                                |   67 +-
 gempak/ush/gfs_meta_comp.sh                   |    2 +-
 gempak/ush/gfs_meta_mar_comp.sh               |    2 +-
 jobs/JGDAS_AERO_ANALYSIS_GENERATE_BMATRIX     |   46 +
 jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_CHKPT        |   58 -
 jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_POST         |   49 -
 jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_VRFY         |    2 +-
 jobs/JGEFS_ATMOS_ACC                          |    5 +-
 jobs/JGFS_ATMOS_CYCLONE_GENESIS               |    5 -
 jobs/JGFS_ATMOS_CYCLONE_TRACKER               |    5 -
 jobs/JGFS_ATMOS_VERIFICATION                  |    6 -
 jobs/JGLOBAL_AERO_ANALYSIS_FINALIZE           |   16 +-
 jobs/JGLOBAL_AERO_ANALYSIS_INITIALIZE         |   10 +-
 ..._RUN => JGLOBAL_AERO_ANALYSIS_VARIATIONAL} |    4 +-
 jobs/JGLOBAL_ATMOS_UPP                        |    7 +-
 jobs/JGLOBAL_ATMOS_VMINMON                    |   18 +-
 ...RUN => JGLOBAL_MARINE_ANALYSIS_CHECKPOINT} |   13 +-
 jobs/JGLOBAL_MARINE_ANALYSIS_FINALIZE         |   43 +
 ...REP => JGLOBAL_MARINE_ANALYSIS_INITIALIZE} |   36 +-
 jobs/JGLOBAL_MARINE_ANALYSIS_VARIATIONAL      |   38 +
 jobs/JGLOBAL_MARINE_BMAT                      |   16 +-
 jobs/JGLOBAL_STAGE_IC                         |   12 +
 jobs/JGLOBAL_WAVE_POST_PNT                    |    2 +-
 jobs/rocoto/{ocnanalrun.sh => aeroanlgenb.sh} |    5 +-
 jobs/rocoto/{aeroanlrun.sh => aeroanlvar.sh}  |    4 +-
 jobs/rocoto/arch_test.sh                      |    3 -
 jobs/rocoto/atmos_ensstat.sh                  |   18 +-
 jobs/rocoto/atmos_products.sh                 |   20 +-
 jobs/rocoto/marineanlchkpt.sh                 |   18 +
 .../{ocnanalchkpt.sh => marineanlfinal.sh}    |    4 +-
 .../{ocnanalprep.sh => marineanlinit.sh}      |    2 +-
 .../{ocnanalpost.sh => marineanlvar.sh}       |    4 +-
 jobs/rocoto/oceanice_products.sh              |   14 +-
 modulefiles/module_base.gaea.lua              |    9 +
 modulefiles/module_base.hercules.lua          |    6 +-
 modulefiles/module_base.jet.lua               |    4 +-
 modulefiles/module_base.orion.lua             |    6 +-
 modulefiles/module_base.wcoss2.lua            |    3 +-
 modulefiles/module_gwsetup.jet.lua            |    2 +-
 parm/archive/enkf.yaml.j2                     |   22 +-
 parm/archive/gdas.yaml.j2                     |   53 +-
 parm/archive/gdas_restarta.yaml.j2            |    2 +
 parm/archive/gefs_arcdir.yaml.j2              |   44 +
 parm/archive/gefs_extracted_atmos.yaml.j2     |   86 +
 parm/archive/gefs_extracted_ice.yaml.j2       |   33 +
 parm/archive/gefs_extracted_ocean.yaml.j2     |   40 +
 parm/archive/gefs_extracted_wave.yaml.j2      |   51 +
 .../{arcdir.yaml.j2 => gfs_arcdir.yaml.j2}    |    0
 parm/archive/gfsa.yaml.j2                     |    5 +-
 parm/archive/master_gefs.yaml.j2              |   12 +
 parm/config/gefs/config.atmos_ensstat         |    3 +
 parm/config/gefs/config.atmos_products        |    9 +-
 parm/config/gefs/config.base                  |   59 +-
 parm/config/gefs/config.cleanup               |    1 +
 parm/config/gefs/config.efcs                  |    6 +-
 parm/config/gefs/config.extractvars           |    2 +-
 parm/config/gefs/config.fcst                  |    2 +-
 parm/config/gefs/config.oceanice_products     |    2 +-
 parm/config/gefs/config.resources             |   20 +-
 parm/config/gefs/config.resources.AZUREPW     |   11 +
 parm/config/gefs/config.resources.GOOGLEPW    |   11 +
 parm/config/gefs/config.ufs                   |   51 +-
 parm/config/gefs/yaml/defaults.yaml           |   19 +-
 parm/config/gfs/config.aero                   |    2 +-
 parm/config/gfs/config.aeroanl                |   24 +-
 parm/config/gfs/config.aeroanlgenb            |   29 +
 parm/config/gfs/config.aeroanlrun             |   11 -
 parm/config/gfs/config.aeroanlvar             |   11 +
 parm/config/gfs/config.atmensanl              |    6 +-
 parm/config/gfs/config.base                   |   22 +-
 parm/config/gfs/config.com                    |    1 +
 parm/config/gfs/config.marineanl              |   20 +
 parm/config/gfs/config.marineanlchkpt         |   11 +
 parm/config/gfs/config.marineanlfinal         |   10 +
 parm/config/gfs/config.marineanlinit          |   10 +
 parm/config/gfs/config.marineanlvar           |   11 +
 parm/config/gfs/config.marinebmat             |    8 +
 parm/config/gfs/config.ocnanal                |   20 -
 parm/config/gfs/config.ocnanalchkpt           |   11 -
 parm/config/gfs/config.ocnanalpost            |   10 -
 parm/config/gfs/config.ocnanalprep            |   10 -
 parm/config/gfs/config.ocnanalrun             |   11 -
 parm/config/gfs/config.prepoceanobs           |    2 +-
 parm/config/gfs/config.prepsnowobs            |    3 -
 parm/config/gfs/config.resources              |  111 +-
 parm/config/gfs/config.resources.GAEA         |    6 +
 parm/config/gfs/config.resources.HERA         |   21 +-
 parm/config/gfs/config.resources.JET          |    5 +
 parm/config/gfs/config.resources.ORION        |   25 +-
 parm/config/gfs/config.resources.S4           |    8 +-
 parm/config/gfs/config.snowanl                |    1 +
 parm/config/gfs/config.ufs                    |   22 +-
 parm/config/gfs/config.wave                   |    2 +-
 parm/config/gfs/yaml/defaults.yaml            |    7 +-
 parm/gdas/aero_finalize_bmatrix_bkg.yaml.j2   |   19 +
 parm/gdas/aero_finalize_variational.yaml.j2   |   24 +
 parm/gdas/aero_stage_bmatrix_bkg.yaml.j2      |   38 +
 parm/gdas/aero_stage_variational.yaml.j2      |   50 +
 parm/post/oceanice_products_gefs.yaml         |    2 +-
 parm/post/upp.yaml                            |   36 +-
 .../{bufr_ij9km.txt => bufr_ij_gfs_C1152.txt} |    0
 .../{bufr_ij13km.txt => bufr_ij_gfs_C768.txt} |    0
 parm/product/bufr_ij_gfs_C96.txt              | 2115 +++++++++++++++++
 parm/product/gefs.0p25.fFFF.paramlist.a.txt   |    4 +-
 parm/product/gefs.0p25.fFFF.paramlist.b.txt   |   60 +-
 parm/stage/analysis.yaml.j2                   |    9 +-
 ...2 => atmosphere_ens_perturbations.yaml.j2} |    6 +-
 parm/stage/atmosphere_replay.yaml.j2          |    7 +
 parm/stage/master_gefs.yaml.j2                |   10 +-
 parm/stage/ocean.yaml.j2                      |    2 +-
 ...aml.j2 => ocean_ens_perturbations.yaml.j2} |    6 +-
 parm/ufs/gocart/ExtData.other                 |   20 +-
 .../exgdas_aero_analysis_generate_bmatrix.py  |   27 +
 scripts/exgdas_enkf_earc.py                   |    6 +-
 scripts/exgfs_aero_init_aerosol.py            |   16 +-
 scripts/exgfs_atmos_postsnd.sh                |  140 +-
 scripts/exgfs_wave_post_pnt.sh                |    4 +-
 ... => exglobal_aero_analysis_variational.py} |    6 +-
 scripts/exglobal_archive.py                   |   15 +-
 scripts/exglobal_atm_analysis_finalize.py     |    2 +
 .../exglobal_atm_analysis_fv3_increment.py    |   12 +-
 scripts/exglobal_atm_analysis_initialize.py   |    7 +-
 scripts/exglobal_atm_analysis_variational.py  |    6 +-
 scripts/exglobal_atmens_analysis_finalize.py  |    2 +
 .../exglobal_atmens_analysis_fv3_increment.py |   12 +-
 .../exglobal_atmens_analysis_initialize.py    |   10 +-
 scripts/exglobal_atmens_analysis_letkf.py     |   10 +-
 scripts/exglobal_atmens_analysis_obs.py       |    7 +-
 scripts/exglobal_atmens_analysis_sol.py       |    8 +-
 scripts/exglobal_atmos_upp.py                 |    2 +-
 scripts/exglobal_cleanup.sh                   |   25 +-
 .../exglobal_marine_analysis_checkpoint.py    |   29 +
 scripts/exglobal_marine_analysis_finalize.py  |   27 +
 .../exglobal_marine_analysis_initialize.py    |   24 +
 .../exglobal_marine_analysis_variational.py   |   24 +
 scripts/exglobal_prep_snow_obs.py             |    1 -
 scripts/exglobal_stage_ic.py                  |    7 +-
 sorc/build_all.sh                             |   10 +-
 sorc/gdas.cd                                  |    2 +-
 sorc/gfs_utils.fd                             |    2 +-
 sorc/gsi_enkf.fd                              |    2 +-
 sorc/gsi_monitor.fd                           |    2 +-
 sorc/gsi_utils.fd                             |    2 +-
 sorc/link_workflow.sh                         |   26 +-
 sorc/ufs_model.fd                             |    2 +-
 sorc/ufs_utils.fd                             |    2 +-
 sorc/verif-global.fd                          |    2 +-
 ush/check_ice_netcdf.sh                       |   43 -
 ush/detect_machine.sh                         |    2 +-
 ush/extractvars_tools.sh                      |    3 +-
 ush/forecast_postdet.sh                       |   30 +-
 ush/forecast_predet.sh                        |   53 +-
 ush/gfs_bufr.sh                               |   91 +-
 ush/ocnice_extractvars.sh                     |   14 +-
 ush/parsing_model_configure_FV3.sh            |   14 +-
 ush/parsing_namelists_FV3.sh                  |   18 -
 ush/parsing_namelists_MOM6.sh                 |    6 +
 ush/python/pygfs/__init__.py                  |    2 +
 ush/python/pygfs/jedi/__init__.py             |    1 +
 ush/python/pygfs/jedi/jedi.py                 |  336 +++
 ush/python/pygfs/task/aero_analysis.py        |  139 +-
 ush/python/pygfs/task/aero_bmatrix.py         |  294 +++
 ush/python/pygfs/task/analysis.py             |   47 +-
 ush/python/pygfs/task/archive.py              |    5 +-
 ush/python/pygfs/task/atm_analysis.py         |  272 ++-
 ush/python/pygfs/task/atmens_analysis.py      |  287 +--
 ush/python/pygfs/task/bmatrix.py              |   28 +
 ush/python/pygfs/task/marine_analysis.py      |  483 ++++
 ush/python/pygfs/task/marine_bmat.py          |   78 +-
 ush/python/pygfs/task/oceanice_products.py    |   16 +-
 ush/python/pygfs/task/snow_analysis.py        |   84 +-
 ush/python/pygfs/task/stage_ic.py             |   25 +-
 ush/python/pygfs/task/upp.py                  |    8 +-
 ush/python/pygfs/utils/marine_da_utils.py     |  122 +-
 versions/build.gaea.ver                       |    3 +-
 versions/build.hera.ver                       |    2 +-
 versions/build.hercules.ver                   |    2 +-
 versions/build.jet.ver                        |    6 +-
 versions/build.noaacloud.ver                  |    2 +-
 versions/build.orion.ver                      |    2 +-
 versions/build.s4.ver                         |    2 +-
 versions/build.spack.ver                      |   27 -
 versions/fix.ver                              |    1 +
 versions/run.gaea.ver                         |    4 +-
 versions/run.hera.ver                         |    2 +-
 versions/run.hercules.ver                     |    3 +-
 versions/run.jet.ver                          |   10 +-
 versions/run.noaacloud.ver                    |    2 +-
 versions/run.orion.ver                        |    3 +-
 versions/run.s4.ver                           |    2 +-
 versions/run.wcoss2.ver                       |    7 +-
 versions/{run.spack.ver => spack.ver}         |   18 +-
 workflow/applications/applications.py         |  132 +-
 workflow/applications/gefs.py                 |   18 +-
 workflow/applications/gfs_cycled.py           |   87 +-
 workflow/applications/gfs_forecast_only.py    |   18 +-
 workflow/hosts.py                             |    2 +-
 workflow/hosts/awspw.yaml                     |    1 +
 workflow/hosts/azurepw.yaml                   |    3 +-
 workflow/hosts/gaea.yaml                      |    1 +
 workflow/hosts/googlepw.yaml                  |    3 +-
 workflow/hosts/hera.yaml                      |    1 +
 workflow/hosts/hercules.yaml                  |    1 +
 workflow/hosts/jet.yaml                       |   23 +-
 workflow/hosts/orion.yaml                     |    3 +-
 workflow/hosts/s4.yaml                        |    1 +
 workflow/hosts/wcoss2.yaml                    |    1 +
 workflow/rocoto/gefs_tasks.py                 |  274 ++-
 workflow/rocoto/gefs_xml.py                   |   12 +-
 workflow/rocoto/gfs_cycled_xml.py             |   33 +-
 workflow/rocoto/gfs_forecast_only_xml.py      |   37 +-
 workflow/rocoto/gfs_tasks.py                  |  649 ++---
 workflow/rocoto/rocoto.py                     |   22 +
 workflow/rocoto/tasks.py                      |   26 +-
 workflow/rocoto/workflow_xml.py               |    3 +-
 workflow/setup_expt.py                        |   49 +-
 257 files changed, 6999 insertions(+), 2508 deletions(-)
 create mode 100644 .github/ISSUE_TEMPLATE/dump_request.yml
 delete mode 100644 .github/ISSUE_TEMPLATE/fix_file.yml
 create mode 100644 .github/ISSUE_TEMPLATE/static_data.yml
 create mode 100644 ci/cases/pr/C96_S2SWA_gefs_replay_ics.yaml
 rename ci/cases/yamls/{gefs_ci_defaults.yaml => gefs_defaults_ci.yaml} (100%)
 create mode 100644 ci/cases/yamls/gefs_replay_ci.yaml
 create mode 100755 jobs/JGDAS_AERO_ANALYSIS_GENERATE_BMATRIX
 delete mode 100755 jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_CHKPT
 delete mode 100755 jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_POST
 rename jobs/{JGLOBAL_AERO_ANALYSIS_RUN => JGLOBAL_AERO_ANALYSIS_VARIATIONAL} (83%)
 rename jobs/{JGDAS_GLOBAL_OCEAN_ANALYSIS_RUN => JGLOBAL_MARINE_ANALYSIS_CHECKPOINT} (65%)
 create mode 100755 jobs/JGLOBAL_MARINE_ANALYSIS_FINALIZE
 rename jobs/{JGDAS_GLOBAL_OCEAN_ANALYSIS_PREP => JGLOBAL_MARINE_ANALYSIS_INITIALIZE} (60%)
 create mode 100755 jobs/JGLOBAL_MARINE_ANALYSIS_VARIATIONAL
 rename jobs/rocoto/{ocnanalrun.sh => aeroanlgenb.sh} (82%)
 rename jobs/rocoto/{aeroanlrun.sh => aeroanlvar.sh} (83%)
 delete mode 100755 jobs/rocoto/arch_test.sh
 create mode 100755 jobs/rocoto/marineanlchkpt.sh
 rename jobs/rocoto/{ocnanalchkpt.sh => marineanlfinal.sh} (82%)
 rename jobs/rocoto/{ocnanalprep.sh => marineanlinit.sh} (89%)
 rename jobs/rocoto/{ocnanalpost.sh => marineanlvar.sh} (82%)
 create mode 100644 parm/archive/gefs_arcdir.yaml.j2
 create mode 100644 parm/archive/gefs_extracted_atmos.yaml.j2
 create mode 100644 parm/archive/gefs_extracted_ice.yaml.j2
 create mode 100644 parm/archive/gefs_extracted_ocean.yaml.j2
 create mode 100644 parm/archive/gefs_extracted_wave.yaml.j2
 rename parm/archive/{arcdir.yaml.j2 => gfs_arcdir.yaml.j2} (100%)
 create mode 100644 parm/archive/master_gefs.yaml.j2
 create mode 120000 parm/config/gefs/config.cleanup
 create mode 100644 parm/config/gefs/config.resources.AZUREPW
 create mode 100644 parm/config/gefs/config.resources.GOOGLEPW
 create mode 100644 parm/config/gfs/config.aeroanlgenb
 delete mode 100644 parm/config/gfs/config.aeroanlrun
 create mode 100644 parm/config/gfs/config.aeroanlvar
 create mode 100644 parm/config/gfs/config.marineanl
 create mode 100644 parm/config/gfs/config.marineanlchkpt
 create mode 100644 parm/config/gfs/config.marineanlfinal
 create mode 100644 parm/config/gfs/config.marineanlinit
 create mode 100644 parm/config/gfs/config.marineanlvar
 delete mode 100644 parm/config/gfs/config.ocnanal
 delete mode 100644 parm/config/gfs/config.ocnanalchkpt
 delete mode 100644 parm/config/gfs/config.ocnanalpost
 delete mode 100644 parm/config/gfs/config.ocnanalprep
 delete mode 100644 parm/config/gfs/config.ocnanalrun
 create mode 100644 parm/gdas/aero_finalize_bmatrix_bkg.yaml.j2
 create mode 100644 parm/gdas/aero_finalize_variational.yaml.j2
 create mode 100644 parm/gdas/aero_stage_bmatrix_bkg.yaml.j2
 create mode 100644 parm/gdas/aero_stage_variational.yaml.j2
 rename parm/product/{bufr_ij9km.txt => bufr_ij_gfs_C1152.txt} (100%)
 rename parm/product/{bufr_ij13km.txt => bufr_ij_gfs_C768.txt} (100%)
 create mode 100644 parm/product/bufr_ij_gfs_C96.txt
 rename parm/stage/{atmosphere_perturbation.yaml.j2 => atmosphere_ens_perturbations.yaml.j2} (79%)
 create mode 100644 parm/stage/atmosphere_replay.yaml.j2
 rename parm/stage/{ocean_replay.yaml.j2 => ocean_ens_perturbations.yaml.j2} (79%)
 create mode 100755 scripts/exgdas_aero_analysis_generate_bmatrix.py
 rename scripts/{exglobal_aero_analysis_run.py => exglobal_aero_analysis_variational.py} (84%)
 create mode 100755 scripts/exglobal_marine_analysis_checkpoint.py
 create mode 100755 scripts/exglobal_marine_analysis_finalize.py
 create mode 100755 scripts/exglobal_marine_analysis_initialize.py
 create mode 100755 scripts/exglobal_marine_analysis_variational.py
 delete mode 100755 ush/check_ice_netcdf.sh
 create mode 100644 ush/python/pygfs/jedi/__init__.py
 create mode 100644 ush/python/pygfs/jedi/jedi.py
 create mode 100644 ush/python/pygfs/task/aero_bmatrix.py
 create mode 100644 ush/python/pygfs/task/bmatrix.py
 create mode 100644 ush/python/pygfs/task/marine_analysis.py
 delete mode 100644 versions/build.spack.ver
 rename versions/{run.spack.ver => spack.ver} (66%)

diff --git a/.github/ISSUE_TEMPLATE/NCO_bug_report.yml b/.github/ISSUE_TEMPLATE/NCO_bug_report.yml
index cc53205807..79632779aa 100644
--- a/.github/ISSUE_TEMPLATE/NCO_bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/NCO_bug_report.yml
@@ -1,4 +1,4 @@
-name: NCO Bug report
+name: NCO Bug Report
 description: Report something that is incorrect or broken
 labels: ["nco-bug", "triage"]
 assignees:
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index 216293781c..d43d2eb3d7 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -1,4 +1,4 @@
-name: Bug report
+name: Bug Report
 description: Report something that is incorrect or broken
 labels: ["bug", "triage"]
 
@@ -9,6 +9,8 @@ body:
         Your bug may already be reported!
         Please search on the [Issue tracker](https://github.com/NOAA-EMC/global-workflow/issues) before creating one.
 
+        Is this actually a workflow bug? If not, please open an issue in the appropriate repository first.
+
   - type: textarea
     id: current_behavior
     attributes:
@@ -46,6 +48,13 @@ body:
     validations:
       required: true
 
+  - type: input
+    id: hash
+    attributes:
+      label: What global-workflow hash are you using?
+    validations:
+      required: true
+
   - type: textarea
     id: reproduction_steps
     attributes:
@@ -63,8 +72,9 @@ body:
     attributes:
       label: Additional information
       description: Provide context or any additional information about the bug.
+      placeholder: Optional
     validations:
-      required: true
+      required: false
 
   - type: textarea
     id: propsed_implementation
diff --git a/.github/ISSUE_TEMPLATE/dump_request.yml b/.github/ISSUE_TEMPLATE/dump_request.yml
new file mode 100644
index 0000000000..4481e7f6e0
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/dump_request.yml
@@ -0,0 +1,37 @@
+name: Global Observation Dump Request
+description: Request additional dates be added to a machine's global dump archive (GDA) or introduce experimental dump data to the GDA
+labels: ["Static Data Mgmt"]
+assignees:
+  - KateFriedman-NOAA
+  - WalterKolczynski-NOAA
+
+body:
+  - type: dropdown
+    attributes:
+      label: Machine
+      options:
+        - WCOSS2
+        - Hera/Ursa
+        - Orion/Hercules
+        - Jet
+      multiple: true
+    validations:
+      required: true
+
+  - type: input
+    attributes:
+      label: Start date
+    validations:
+      required: true
+
+  - type: input
+    attributes:
+      label: End date
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Additional information
+      placeholder: |
+        Any additional information needed (experimental obs, etc.)
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml
index 3aed58c520..7e0ddb2459 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.yml
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -1,4 +1,4 @@
-name: Feature request
+name: Feature Request
 description: Request new capability
 labels: ["feature", "triage"]
 
@@ -10,8 +10,7 @@ body:
         - Something is wrong or broken
         - It is a request from NCO
         - It is initiating a production update
-        - Files need to be updated or added to fix
-
+        - Files need to be updated in a directory managed by workflow CMs under "glopara"
 
         Please search on the [Issue tracker](https://github.com/NOAA-EMC/global-workflow/issues) to make sure the feature has not already been requested to avoid duplicates.
   
@@ -34,7 +33,17 @@ body:
     id: criteria
     attributes:
       label: Acceptance Criteria
-      placeholder: What does it mean for this issue to be complete?
+      description: |
+        A checklist of criteria to be satisfied before this feature is considered complete.
+
+        Examples:
+          - Forecast with option X completes successfully
+          - File X produced
+          - Output unchanged
+      placeholder: |
+        - [ ] Criterion #1
+        - [ ] Criterion #2
+        - [ ] Criterion #3
     validations:
       required: true
   
diff --git a/.github/ISSUE_TEMPLATE/fix_file.yml b/.github/ISSUE_TEMPLATE/fix_file.yml
deleted file mode 100644
index 3f5b69cd1d..0000000000
--- a/.github/ISSUE_TEMPLATE/fix_file.yml
+++ /dev/null
@@ -1,97 +0,0 @@
-name: Fix File Update
-description: Request fix files be added or updated
-labels: ["Fix Files", "triage"]
-assignees:
-  - KateFriedman-NOAA
-  - WalterKolczynski-NOAA
-
-body:
-  - type: dropdown
-    attributes:
-      label: Target fix directory
-      options:
-        - NEW
-        - aer
-        - am
-        - chem
-        - cice
-        - cpl
-        - datm
-        - gdas/crtm
-        - gdas/fv3jedi
-        - gdas/gsibec
-        - gldas
-        - glwu
-        - gsi
-        - lut
-        - mom6
-        - orog
-        - raw
-        - reg2grb2
-        - sfc_climo
-        - ugwd
-        - verif
-        - wave
-      multiple: true
-    validations:
-      required: true
-
-  - type: checkboxes
-    attributes:
-      label: Type of change
-      options:
-        - label: Update existing files
-        - label: Remove files
-        - label: Add new files to existing directory
-        - label: Add new fix directory
-    validations:
-      required: true
-
-  - type: dropdown
-    attributes:
-      label: Any workflow changes needed?
-      description: |
-        Any change other than adding files to an existing directory will require at least a new fix version.
-      options:
-        - No change needed
-        - Fix version only
-        - Fix version + additional changes
-    validations:
-      required: true
-
-  - type: textarea
-    attributes:
-      label: Related issues
-      description: Please link any related issues in other repositories
-      placeholder: NOAA-EMC/repo#1234
-    validations:
-      required: false
-
-  - type: input
-    attributes:
-      label: Pickup location
-      description: |
-        Please provide a path to the data on either Hera or WCOSS.
-
-        If this requires a version update, please provide the *entire* directory, including unchanged files from current fix.
-      placeholder: '/path/to/new/fix'
-    validations:
-      required: true
-
-  - type: input
-    attributes:
-      label: Size
-      description: How much bigger/smaller is the new set from the existing set (in MB)?
-      placeholder: '0'
-    validations:
-      required: true
-
-  - type: markdown
-    attributes:
-      value: |
-        # Tasks
-        - [ ] Discuss needs with global-workflow developer assigned to request.
-        - [ ] Add/update/remove fix file(s) in fix sets on supported platforms (global-workflow assignee task).
-        - [ ] Update "Fix File Management" spreadsheet (https://docs.google.com/spreadsheets/d/1BeIvcz6TO3If4YCqkUK-oz_kGS9q2wTjwLS-BBemSEY/edit?usp=sharing).
-        - [ ] Make related workflow/component updates.
-
diff --git a/.github/ISSUE_TEMPLATE/production_update.yml b/.github/ISSUE_TEMPLATE/production_update.yml
index ac9ada505a..cb1fb588d8 100644
--- a/.github/ISSUE_TEMPLATE/production_update.yml
+++ b/.github/ISSUE_TEMPLATE/production_update.yml
@@ -33,18 +33,19 @@ body:
     validations:
       required: true
 
-  - type: markdown
+  - type: checkboxes
     attributes:
-      value: |
-        ** Tasks **
-        - [ ] Create release branch
-        - [ ] Make workflow changes for upgrade in release branch (add additional checklist items as needed)
-        - [ ] Create release notes
-        - [ ] Cut hand-off tag for CDF
-        - [ ] Submit CDF to NCO
-        - [ ] Implementation into operations complete
-        - [ ] Merge release branch into operational branch
-        - [ ] Cut version tag from operational branch
-        - [ ] Release new version tag
-        - [ ] Announce to users
-        - [ ] Update Read-The-Docs operations status version in develop
+      label: Tasks
+      description: List of tasks to complete update. For use after issue is created.
+      options:
+        - label: Create release branch
+        - label: Make workflow changes for upgrade in release branch (add additional checklist items as needed)
+        - label: Create release notes
+        - label: Cut hand-off tag for CDF
+        - label: Submit CDF to NCO
+        - label: Implementation into operations complete
+        - label: Merge release branch into operational branch
+        - label: Cut version tag from operational branch
+        - label: Release new version tag
+        - label: Announce to users
+        - label: Update Read-The-Docs operations status version in develop
diff --git a/.github/ISSUE_TEMPLATE/static_data.yml b/.github/ISSUE_TEMPLATE/static_data.yml
new file mode 100644
index 0000000000..f29f155cf8
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/static_data.yml
@@ -0,0 +1,134 @@
+name: Static Data Update
+description: Request static data be added or updated
+labels: ["Static Data Mgmt"]
+assignees:
+  - KateFriedman-NOAA
+  - WalterKolczynski-NOAA
+
+body:
+  - type: dropdown
+    attributes:
+      label: Type of static data
+      description: |
+        - Fix: large static files needed to run global-workflow
+        - Initial conditions: ICs needed to run one of global-workflow's included tests
+        - Experimental data: Temporary datasets needed for development that will be replaced by other sources for operations (e.g. data that will be in DCOM)
+      options:
+        - Fix
+        - Initial conditions
+        - Experimental data
+    validations:
+      required: true
+
+  - type: dropdown
+    attributes:
+      label: Target directory
+      options:
+        - "Fix: aer"
+        - "Fix: am"
+        - "Fix: chem"
+        - "Fix: cice"
+        - "Fix: cpl"
+        - "Fix: datm"
+        - "Fix: gdas/crtm"
+        - "Fix: gdas/fv3jedi"
+        - "Fix: gdas/gsibec"
+        - "Fix: gldas"
+        - "Fix: glwu"
+        - "Fix: gsi"
+        - "Fix: lut"
+        - "Fix: mom6"
+        - "Fix: orog"
+        - "Fix: raw"
+        - "Fix: reg2grb2"
+        - "Fix: sfc_climo"
+        - "Fix: ugwd"
+        - "Fix: verif"
+        - "Fix: wave"
+        - "Fix: *NEW*"
+        - "ICs: C48/C48 mx500"
+        - "ICs: C96/C48"
+        - "ICs: C96 mx100"
+        - "ICs: C384/C192"
+        - "ICs: C384 mx025"
+        - "ICs: C768 mx025"
+        - "ICs: C1152 mx025"
+        - "ICs: *NEW RESOLUTION*"
+        - "Exp Data: GOCART emissions"
+        - "Exp Data: JEDI obs"
+        - "Exp Data: *NEW*"
+      multiple: true
+    validations:
+      required: true
+
+  - type: checkboxes
+    attributes:
+      label: Type of change
+      options:
+        - label: Update existing files (Version update needed)
+        - label: Remove files (Version update needed)
+        - label: Add new files to existing directory
+        - label: Add new directory (Version update needed if fix)
+    validations:
+      required: true
+
+  - type: dropdown
+    attributes:
+      label: Any workflow changes needed?
+      description: |
+        ANY fix or IC change other than adding files will require at least a new version.
+      options:
+        - No change needed
+        - Fix/IC version update only
+        - Fix/IC version update + additional changes
+        - Non-version changes only
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: |
+        Please list all related issues. If this request requires a workflow update (including a fix version update), please open a *separate* global-workflow issue to track the change.
+      description: Please link any related issues
+      placeholder: NOAA-EMC/repo#1234
+    validations:
+      required: false
+
+  - type: input
+    attributes:
+      label: Pickup location
+      description: |
+        Please provide a path to the data on either Hera or WCOSS.
+
+        If this requires a version update, please provide a CLEAN copy of the *entire* directory, including the structure and unchanged files from current directory.
+
+        If this is just adding additional files, you may provide just the new files. The directory structure should still match the target.
+      placeholder: '/path/to/new/data'
+    validations:
+      required: true
+
+  - type: input
+    attributes:
+      label: Size
+      description: How much data needs to be copied (size of pickup location in MB)?
+      placeholder: '0'
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Additional information
+      description: |
+        Please provide any additional information needed for this request. If this is a new directory, please provide a short description and a point of contact.
+    validations:
+      required: false
+
+  - type: markdown
+    attributes:
+      value: |
+        # Tasks
+        - [ ] Discuss needs with global-workflow developer assigned to request
+        - [ ] Stage a CLEAN copy of data on Hera or WCOSS in the location provided above
+        - [ ] [global-workflow CM] Update data in "glopara"-managed space on supported platforms
+        - [ ] [Fix only] Update "Fix File Management" [spreadsheet](https://docs.google.com/spreadsheets/d/1BeIvcz6TO3If4YCqkUK-oz_kGS9q2wTjwLS-BBemSEY/edit?usp=sharing)
+        - [ ] Make related workflow/component updates (if any)
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index 3f8fe65065..9a1d61eb30 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -1,19 +1,28 @@
-<!-- PLEASE READ -->
-<!-- Any PRs not following this template will be closed -->
 <!--
-    Please use a short (<60 char), descriptive title above. It should complete the sentence "If merged, this PR will _____". Capitalize the first word and do not end with a period.
+  *** PLEASE READ ***
 
-    PRs should meet these guidelines:
-    - Each PR should address ONE topic and have an associated issue.
-    - No hard-coded paths or personal directories.
-    - No temporary or backup files should be committed (including logs).
-    - Any code that you disabled by being commented out should be removed or reenabled.
+  Any PRs not following this template will be closed.
 
-    Please delete all these comments before submitting the PR.
+  Please delete all these comments before submitting the PR.
+
+  Please use a short (<60 char), descriptive title for the PR title above. It should complete the sentence "If merged, this PR will _____". Capitalize the first word and do not end with a period.
+
+  No content should appear above the "Description" header.
+
+  If this PR is not merge-ready (e.g. it depends on other PRs not yet merged), please mark it as draft until it is ready.
+
+  PRs should meet these guidelines:
+  - Each PR should address ONE topic and have an associated issue.
+  - No hard-coded paths or personal directories.
+  - No temporary or backup files should be committed (including logs).
+  - Any code that you disabled by being commented out should be removed or reenabled.
 -->
 # Description
-<!-- This description will become the commit message for the PR-->
-<!-- Please use this format for your description:
+<!-- This description will become the commit message for the PR. -->
+<!--
+  Solely pointing to an issue is not an adequate description!
+
+  Please use this format for your description:
 
   Describe your changes. Focus on the *what* and *why*. The *how* will be evident from the changes. In particular, be sure to note any interface changes, such as command line syntax, that will need to be communicated to users.
 
@@ -23,27 +32,27 @@
   Refs #4321
   Refs NOAA-EMC/repo#5678
 -->
+<!-- For more on writing good commit messages, see https://cbea.ms/git-commit/ -->
 
 # Type of change
-<!-- Delete all except one -->
-- Bug fix (fixes something broken)
-- New feature (adds functionality)
-- Maintenance (code refactor, clean-up, new CI test, etc.)
+- [ ] Bug fix (fixes something broken)
+- [ ] New feature (adds functionality)
+- [ ] Maintenance (code refactor, clean-up, new CI test, etc.)
 
 # Change characteristics
+<!-- Choose YES or NO from each of the following and delete the other -->
 - Is this a breaking change (a change in existing functionality)? YES/NO
 - Does this change require a documentation update? YES/NO
 - Does this change require an update to any of the following submodules? YES/NO (If YES, please add a link to any PRs that are pending.)
-  - [ ] EMC verif-global
-  - [ ] GDAS
-  - [ ] GFS-utils
-  - [ ] GSI
-  - [ ] GSI-monitor
-  - [ ] GSI-utils
-  - [ ] UFS-utils
-  - [ ] UFS-weather-model
-  - [ ] wxflow
-
+  - [ ] EMC verif-global <!-- NOAA-EMC/EMC_verif-global#1234 -->
+  - [ ] GDAS <!-- NOAA-EMC/GDASApp#1234 -->
+  - [ ] GFS-utils <!-- NOAA-EMC/gfs-utils#1234 -->
+  - [ ] GSI <!-- NOAA-EMC/GSI#1234 -->
+  - [ ] GSI-monitor <!-- NOAA-EMC/GSI-Monitor#1234 -->
+  - [ ] GSI-utils <!-- NOAA-EMC/GSI-Utils#1234 -->
+  - [ ] UFS-utils <!-- ufs-community/UFS_UTILS#1234 -->
+  - [ ] UFS-weather-model <!-- ufs-community/ufs-weather-model#1234 -->
+  - [ ] wxflow <!-- NOAA-EMC/wxflow#1234 -->
 
 # How has this been tested?
 <!-- Please list any test you conducted, including the machine.
@@ -59,6 +68,8 @@ Example:
 - [ ] My code follows the style guidelines of this project
 - [ ] I have performed a self-review of my own code
 - [ ] I have commented my code, particularly in hard-to-understand areas
+- [ ] I have documented my code, including function, input, and output descriptions
 - [ ] My changes generate no new warnings
 - [ ] New and existing tests pass with my changes
-- [ ] I have made corresponding changes to the documentation if necessary
+- [ ] This change is covered by an existing CI test or a new one has been added
+- [ ] I have made corresponding changes to the system documentation if necessary
diff --git a/.gitignore b/.gitignore
index f5e33f4f61..8fc6d0b20b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -53,11 +53,8 @@ parm/gdas/soca
 parm/gdas/jcb-gdas
 parm/gdas/jcb-algorithms
 parm/monitor
-parm/post/AEROSOL_LUTS.dat
 parm/post/nam_micro_lookup.dat
 parm/post/optics_luts_DUST.dat
-parm/post/gtg.config.gfs
-parm/post/gtg_imprintings.txt
 parm/post/optics_luts_DUST_nasa.dat
 parm/post/optics_luts_NITR_nasa.dat
 parm/post/optics_luts_SALT.dat
@@ -70,51 +67,19 @@ parm/post/optics_luts_WASO.dat
 parm/post/optics_luts_WASO_nasa.dat
 parm/post/params_grib2_tbl_new
 parm/post/post_tag_gfs128
-parm/post/post_tag_gfs65
-parm/post/postcntrl_gefs.xml
-parm/post/postcntrl_gefs_aerosol.xml
-parm/post/postcntrl_gefs_anl.xml
-parm/post/postcntrl_gefs_chem.xml
-parm/post/postcntrl_gefs_f00.xml
-parm/post/postcntrl_gfs.xml
-parm/post/postcntrl_gfs_anl.xml
-parm/post/postcntrl_gfs_f00.xml
-parm/post/postcntrl_gfs_f00_two.xml
-parm/post/postcntrl_gfs_flux.xml
-parm/post/postcntrl_gfs_flux_f00.xml
-parm/post/postcntrl_gfs_goes.xml
-parm/post/postcntrl_gfs_goes.xml-new
-parm/post/postcntrl_gfs_two.xml
-parm/post/postcntrl_gfs_wafs.xml
-parm/post/postcntrl_gfs_wafs_anl.xml
-parm/post/postxconfig-NT-GEFS-ANL.txt
-parm/post/postxconfig-NT-GEFS-F00.txt
-parm/post/postxconfig-NT-GEFS-F00-aerosol.txt
-parm/post/postxconfig-NT-GEFS-WAFS.txt
-parm/post/postxconfig-NT-GEFS-aerosol.txt
-parm/post/postxconfig-NT-GEFS.txt
-parm/post/postxconfig-NT-GFS-ANL.txt
-parm/post/postxconfig-NT-GFS-F00-TWO.txt
-parm/post/postxconfig-NT-GFS-F00.txt
-parm/post/postxconfig-NT-GFS-FLUX-F00.txt
-parm/post/postxconfig-NT-GFS-FLUX.txt
-parm/post/postxconfig-NT-GFS-GOES.txt
-parm/post/postxconfig-NT-GFS-TWO.txt
-parm/post/postxconfig-NT-GFS-WAFS-ANL.txt
-parm/post/postxconfig-NT-GFS-WAFS.txt
-parm/post/postxconfig-NT-GFS.txt
-parm/post/postxconfig-NT-gefs-aerosol.txt
-parm/post/postxconfig-NT-gefs-chem.txt
+parm/post/gfs
+parm/post/gefs
 parm/post/ocean.csv
 parm/post/ice.csv
 parm/post/ocnicepost.nml.jinja2
 parm/ufs/noahmptable.tbl
 parm/ufs/model_configure.IN
-parm/ufs/model_configure_nest.IN
+parm/ufs/input_global_nest.nml.IN
 parm/ufs/MOM_input_*.IN
 parm/ufs/MOM6_data_table.IN
 parm/ufs/ice_in.IN
 parm/ufs/ufs.configure.*.IN
+parm/ufs/post_itag_gfs
 parm/wafs
 
 # Ignore sorc and logs folders from externals
diff --git a/ci/cases/gfsv17/C384mx025_3DVarAOWCDA.yaml b/ci/cases/gfsv17/C384mx025_3DVarAOWCDA.yaml
index d97c9567e9..99ba7c3661 100644
--- a/ci/cases/gfsv17/C384mx025_3DVarAOWCDA.yaml
+++ b/ci/cases/gfsv17/C384mx025_3DVarAOWCDA.yaml
@@ -8,7 +8,7 @@ arguments:
   resdetatmos: 384
   resdetocean: 0.25
   nens: 0
-  gfs_cyc: 4
+  interval: 6
   start: cold
   comroot: {{ 'RUNTESTS' | getenv }}/COMROOT
   expdir: {{ 'RUNTESTS' | getenv }}/EXPDIR
diff --git a/ci/cases/gfsv17/ocnanal.yaml b/ci/cases/gfsv17/ocnanal.yaml
index 483250db10..d559f544e4 100644
--- a/ci/cases/gfsv17/ocnanal.yaml
+++ b/ci/cases/gfsv17/ocnanal.yaml
@@ -16,7 +16,7 @@ base:
   FHMAX_GFS: 240
   ACCOUNT: {{ 'HPC_ACCOUNT' | getenv }}
 
-ocnanal:
+marineanl:
   SOCA_INPUT_FIX_DIR: {{ HOMEgfs }}/fix/gdas/soca/1440x1080x75/soca
   SOCA_OBS_LIST: {{ HOMEgfs }}/sorc/gdas.cd/parm/soca/obs/obs_list.yaml
   SOCA_NINNER: 100
diff --git a/ci/cases/pr/C48_S2SWA_gefs.yaml b/ci/cases/pr/C48_S2SWA_gefs.yaml
index a924b416c3..f39031f1a1 100644
--- a/ci/cases/pr/C48_S2SWA_gefs.yaml
+++ b/ci/cases/pr/C48_S2SWA_gefs.yaml
@@ -9,13 +9,13 @@ arguments:
   resdetocean: 5.0
   resensatmos: 48
   nens: 2
-  gfs_cyc: 1
+  interval: 24
   start: cold
   comroot: {{ 'RUNTESTS' | getenv }}/COMROOT
   expdir: {{ 'RUNTESTS' | getenv }}/EXPDIR
   idate: 2021032312
   edate: 2021032312
-  yaml: {{ HOMEgfs }}/ci/cases/yamls/gefs_ci_defaults.yaml
+  yaml: {{ HOMEgfs }}/ci/cases/yamls/gefs_defaults_ci.yaml
 
 skip_ci_on_hosts:
   - wcoss2
diff --git a/ci/cases/pr/C48mx500_3DVarAOWCDA.yaml b/ci/cases/pr/C48mx500_3DVarAOWCDA.yaml
index e1b76f0db8..2de5fea7ff 100644
--- a/ci/cases/pr/C48mx500_3DVarAOWCDA.yaml
+++ b/ci/cases/pr/C48mx500_3DVarAOWCDA.yaml
@@ -13,7 +13,7 @@ arguments:
   idate: 2021032412
   edate: 2021032418
   nens: 0
-  gfs_cyc: 0
+  interval: 0
   start: warm
   yaml: {{ HOMEgfs }}/ci/cases/yamls/soca_gfs_defaults_ci.yaml
 
diff --git a/ci/cases/pr/C96C48_hybatmDA.yaml b/ci/cases/pr/C96C48_hybatmDA.yaml
index 7617e39217..b527903d69 100644
--- a/ci/cases/pr/C96C48_hybatmDA.yaml
+++ b/ci/cases/pr/C96C48_hybatmDA.yaml
@@ -14,6 +14,6 @@ arguments:
   idate: 2021122018
   edate: 2021122106
   nens: 2
-  gfs_cyc: 1
+  interval: 24
   start: cold
   yaml: {{ HOMEgfs }}/ci/cases/yamls/gfs_defaults_ci.yaml
diff --git a/ci/cases/pr/C96C48_hybatmaerosnowDA.yaml b/ci/cases/pr/C96C48_hybatmaerosnowDA.yaml
index 7387e55b24..be5ad32238 100644
--- a/ci/cases/pr/C96C48_hybatmaerosnowDA.yaml
+++ b/ci/cases/pr/C96C48_hybatmaerosnowDA.yaml
@@ -13,7 +13,7 @@ arguments:
   idate: 2021122012
   edate: 2021122100
   nens: 2
-  gfs_cyc: 1
+  interval: 24
   start: cold
   yaml: {{ HOMEgfs }}/ci/cases/yamls/atmaerosnowDA_defaults_ci.yaml
 
diff --git a/ci/cases/pr/C96C48_ufs_hybatmDA.yaml b/ci/cases/pr/C96C48_ufs_hybatmDA.yaml
index 0b5aa7b6ac..41a8baa725 100644
--- a/ci/cases/pr/C96C48_ufs_hybatmDA.yaml
+++ b/ci/cases/pr/C96C48_ufs_hybatmDA.yaml
@@ -11,9 +11,9 @@ arguments:
   expdir: {{ 'RUNTESTS' | getenv }}/EXPDIR
   icsdir: {{ 'ICSDIR_ROOT' | getenv }}/C96C48/20240610
   idate: 2024022318
-  edate: 2024022400
+  edate: 2024022406
   nens: 2
-  gfs_cyc: 1
+  interval: 24
   start: warm
   yaml: {{ HOMEgfs }}/ci/cases/yamls/ufs_hybatmDA_defaults.ci.yaml
 
diff --git a/ci/cases/pr/C96_S2SWA_gefs_replay_ics.yaml b/ci/cases/pr/C96_S2SWA_gefs_replay_ics.yaml
new file mode 100644
index 0000000000..7118dde53f
--- /dev/null
+++ b/ci/cases/pr/C96_S2SWA_gefs_replay_ics.yaml
@@ -0,0 +1,22 @@
+experiment:
+  system: gefs
+  mode: forecast-only
+
+arguments:
+  pslot: {{ 'pslot' | getenv }}
+  app: S2SWA
+  resdetatmos: 96
+  resdetocean: 1.0
+  resensatmos: 96
+  nens: 2
+  interval: 6
+  start: warm
+  comroot: {{ 'RUNTESTS' | getenv }}/COMROOT
+  expdir: {{ 'RUNTESTS' | getenv }}/EXPDIR
+  idate: 2020110100
+  edate: 2020110100
+  yaml: {{ HOMEgfs }}/ci/cases/yamls/gefs_replay_ci.yaml
+  icsdir: {{ 'ICSDIR_ROOT' | getenv }}/C96mx100/20240610
+
+skip_ci_on_hosts:
+  - wcoss2
diff --git a/ci/cases/pr/C96_atm3DVar.yaml b/ci/cases/pr/C96_atm3DVar.yaml
index e9e6c2b31c..fc09beeacf 100644
--- a/ci/cases/pr/C96_atm3DVar.yaml
+++ b/ci/cases/pr/C96_atm3DVar.yaml
@@ -12,7 +12,7 @@ arguments:
   idate: 2021122018
   edate: 2021122106
   nens: 0
-  gfs_cyc: 1
+  interval: 24
   start: cold
   yaml: {{ HOMEgfs }}/ci/cases/yamls/gfs_defaults_ci.yaml
 
diff --git a/ci/cases/pr/C96_atm3DVar_extended.yaml b/ci/cases/pr/C96_atm3DVar_extended.yaml
index cdf69f04e0..8ab67a750e 100644
--- a/ci/cases/pr/C96_atm3DVar_extended.yaml
+++ b/ci/cases/pr/C96_atm3DVar_extended.yaml
@@ -12,7 +12,7 @@ arguments:
   idate: 2021122018
   edate: 2021122118
   nens: 0
-  gfs_cyc: 4
+  interval: 6
   start: cold
   yaml: {{ HOMEgfs }}/ci/cases/yamls/gfs_extended_ci.yaml
 
diff --git a/ci/cases/weekly/C384C192_hybatmda.yaml b/ci/cases/weekly/C384C192_hybatmda.yaml
index 131ada95d5..6053f73124 100644
--- a/ci/cases/weekly/C384C192_hybatmda.yaml
+++ b/ci/cases/weekly/C384C192_hybatmda.yaml
@@ -14,6 +14,6 @@ arguments:
   idate: 2023040118
   edate: 2023040200
   nens: 2
-  gfs_cyc: 1
+  interval: 24
   start: cold
   yaml: {{ HOMEgfs }}/ci/cases/yamls/gfs_defaults_ci.yaml
diff --git a/ci/cases/weekly/C384_atm3DVar.yaml b/ci/cases/weekly/C384_atm3DVar.yaml
index 40487f3b47..1a14059ab1 100644
--- a/ci/cases/weekly/C384_atm3DVar.yaml
+++ b/ci/cases/weekly/C384_atm3DVar.yaml
@@ -14,6 +14,6 @@ arguments:
   idate: 2023040118
   edate: 2023040200
   nens: 0
-  gfs_cyc: 1
+  interval: 24
   start: cold
   yaml: {{ HOMEgfs }}/ci/cases/yamls/gfs_defaults_ci.yaml
diff --git a/ci/cases/yamls/gefs_ci_defaults.yaml b/ci/cases/yamls/gefs_defaults_ci.yaml
similarity index 100%
rename from ci/cases/yamls/gefs_ci_defaults.yaml
rename to ci/cases/yamls/gefs_defaults_ci.yaml
diff --git a/ci/cases/yamls/gefs_replay_ci.yaml b/ci/cases/yamls/gefs_replay_ci.yaml
new file mode 100644
index 0000000000..dfbd9ae065
--- /dev/null
+++ b/ci/cases/yamls/gefs_replay_ci.yaml
@@ -0,0 +1,14 @@
+defaults:
+  !INC {{ HOMEgfs }}/parm/config/gefs/yaml/defaults.yaml
+base:
+  ACCOUNT: {{ 'HPC_ACCOUNT' | getenv }}
+  REPLAY_ICS: "YES"
+  FCST_BREAKPOINTS: ""
+  FHMAX_GFS: 48
+  FHMAX_HF_GFS: 24
+  DO_EXTRACTVARS: "YES"
+  FHOUT_HF_GFS: 3
+  FHOUT_OCN_GFS: 24
+  FHOUT_ICE_GFS: 24
+  HOMEDIR: {{ 'RUNTESTS' | getenv }}/GLOBAL
+
diff --git a/docs/note_fixfield.txt b/docs/note_fixfield.txt
index a7a4001561..32e44b9d98 100644
--- a/docs/note_fixfield.txt
+++ b/docs/note_fixfield.txt
@@ -4,7 +4,7 @@ They are saved locally on all platforms
 
 Hera: /scratch1/NCEPDEV/global/glopara/fix
 Orion/Hercules: /work/noaa/global/glopara/fix
-Jet: /mnt/lfs4/HFIP/hfv3gfs/glopara/git/fv3gfs/fix
+Jet: /mnt/lfs5/HFIP/hfv3gfs/glopara/FIX/fix
 S4: /data/prod/glopara/fix
 
 ------------------------------------------------------------------------------
diff --git a/docs/source/components.rst b/docs/source/components.rst
index 869ef89bab..f5a60a96af 100644
--- a/docs/source/components.rst
+++ b/docs/source/components.rst
@@ -59,7 +59,7 @@ Observation data, also known as dump data, is prepared in production and then ar
 
 * Hera: ``/scratch1/NCEPDEV/global/glopara/dump``
 * Orion/Hercules: ``/work/noaa/rstprod/dump``
-* Jet: ``/mnt/lfs4/HFIP/hfv3gfs/glopara/dump``
+* Jet: ``/mnt/lfs5/HFIP/hfv3gfs/glopara/dump``
 * WCOSS2: ``/lfs/h2/emc/global/noscrub/emc.global/dump``
 * S4: ``/data/prod/glopara/dump``
 
diff --git a/docs/source/errors_faq.rst b/docs/source/errors_faq.rst
index 519e29bace..d2cdc7b306 100644
--- a/docs/source/errors_faq.rst
+++ b/docs/source/errors_faq.rst
@@ -2,6 +2,14 @@
 Common Errors Known Issues
 ==========================
 
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+Error: Reserved Variables Causing Workflow Issues
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Several variables are reserved in the workflow and should not be used as environment variables in your shell. Some of the common ones include (but are not limited to):
+``HOMEgfs``, ``machine``, ``ROTDIR``, ``COMROT``, ``COMROOT``, ``COMOUT``, ``COMIN``, ``STMP``, ``PTMP``, ``DATAROOT``, ``DATA``, ``ACCOUNT``, ``PDY``, ``cyc``, ``RUN``, etc.
+If you are using any of these variables in your shell, you may encounter unexpected behavior in the workflow.
+
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 Error: "ImportError" message when running setup script
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -42,4 +50,3 @@ Issue: Directory name change for EnKF folder in ROTDIR
 **Issue:** The EnKF ROTDIR folders were renamed during the GFS v15 development process to remove the period between "enkf" and "gdas": enkf.gdas.$PDY → enkfgdas.$PDY
 
 **Fix:** Older tarballs on HPSS will have the older directory name with the period between 'enkf' and 'gdas'. Make sure to rename folder to 'enkfgdas.$PDY' after obtaining. Only an issue for the initial cycle.
-
diff --git a/docs/source/index.rst b/docs/source/index.rst
index a5161789b3..637a4ef70a 100644
--- a/docs/source/index.rst
+++ b/docs/source/index.rst
@@ -1,6 +1,6 @@
 
 ###############
-Global Workflow 
+Global Workflow
 ###############
 
 **Global-workflow** is the end-to-end workflow designed to run global configurations of medium range weather forecasting for the UFS weather model. It supports both development and operational implementations. In its current format it supports the Global Forecast System (GFS) and the Global Ensemble Forecast System (GEFS) configurations
@@ -31,7 +31,7 @@ GitHub updates: Users should adjust their "Watch" settings for this repo so they
 Table of Contents
 =================
 
-.. toctree:: 
+.. toctree::
    :numbered:
    :maxdepth: 3
 
@@ -42,3 +42,4 @@ Table of Contents
    output.rst
    run.rst
    noaa_csp.rst
+   errors_faq.rst
diff --git a/docs/source/init.rst b/docs/source/init.rst
index e1cabdc8e0..aa71e4e294 100644
--- a/docs/source/init.rst
+++ b/docs/source/init.rst
@@ -111,7 +111,7 @@ Warm-start cycled w/ coupled (S2S) model C48 atmosphere C48 enkf (80 members) 5
    Hera: /scratch1/NCEPDEV/global/glopara/data/ICSDIR/C48C48mx500
    Orion/Hercules: /work/noaa/global/glopara/data/ICSDIR/C48C48mx500
    WCOSS2: /lfs/h2/emc/global/noscrub/emc.global/data/ICSDIR/C48C48mx500
-   Jet: /lfs4/HFIP/hfv3gfs/glopara/data/ICSDIR/C48C48mx500
+   Jet: /lfs5/HFIP/hfv3gfs/glopara/data/ICSDIR/C48C48mx500
    AWS: https://noaa-nws-global-pds.s3.amazonaws.com/index.html#data/ICSDIR/C48C48mx500
 
 Start date = 2021032312
@@ -227,7 +227,7 @@ Forecast-only P8 prototype initial conditions are made available to users on sup
     WCOSS2: /lfs/h2/emc/global/noscrub/emc.global/IC/COUPLED
     HERA: /scratch1/NCEPDEV/climate/role.ufscpara/IC
     ORION/Hercules: /work/noaa/global/glopara/data/ICSDIR/prototype_ICs
-    JET: /mnt/lfs4/HFIP/hfv3gfs/glopara/data/ICSDIR/prototype_ICs
+    JET: /mnt/lfs5/HFIP/hfv3gfs/glopara/data/ICSDIR/prototype_ICs
     S4: /data/prod/glopara/coupled_ICs
 
 These locations are known within the workflow via paths set in ``parm/config/config.coupled_ic``.
diff --git a/docs/source/jobs.rst b/docs/source/jobs.rst
index 0e3700bf20..2cdecb01de 100644
--- a/docs/source/jobs.rst
+++ b/docs/source/jobs.rst
@@ -8,7 +8,7 @@ GFS Configuration
 
 The sequence of jobs that are run for an end-to-end (analysis+forecast+post processing+verification) GFS configuration using the Global Workflow is shown above. The system utilizes a collection of scripts that perform the tasks for each step.
 
-For any cycle the system consists of two suites -- the "gdas" suite which provides the initial guess fields, and the "gfs" suite which creates the initial conditions and forecast of the system. As with the operational system, the gdas runs for each cycle (00, 06, 12, and 18 UTC), however, to save time and space in experiments, the gfs (right side of the diagram) is initially setup to run for only the 00 UTC cycle (See the "run GFS this cycle?" portion of the diagram). The option to run the GFS for all four cycles is available (see the ``gfs_cyc`` variable in configuration file).
+For any cycle the system consists of two suites -- the "gdas" suite which provides the initial guess fields, and the "gfs" suite which creates the initial conditions and forecast of the system.
 
 An experimental run is different from operations in the following ways:
 
diff --git a/docs/source/run.rst b/docs/source/run.rst
index 817ed3ccfa..f160f791c9 100644
--- a/docs/source/run.rst
+++ b/docs/source/run.rst
@@ -13,4 +13,3 @@ Here we will show how you can run an experiment using the Global Workflow. The G
    start.rst
    monitor_rocoto.rst
    view.rst
-   errors_faq.rst
diff --git a/docs/source/setup.rst b/docs/source/setup.rst
index 1715899927..e7d5323e40 100644
--- a/docs/source/setup.rst
+++ b/docs/source/setup.rst
@@ -32,7 +32,7 @@ The following command examples include variables for reference but users should
 ::
 
    cd workflow
-   ./setup_expt.py gfs forecast-only --idate $IDATE --edate $EDATE [--app $APP] [--start $START] [--gfs_cyc $GFS_CYC] [--resdetatmos $RESDETATMOS] [--resdetocean $RESDETOCEAN]
+   ./setup_expt.py gfs forecast-only --idate $IDATE --edate $EDATE [--app $APP] [--start $START] [--interval $INTERVAL_GFS] [--resdetatmos $RESDETATMOS] [--resdetocean $RESDETOCEAN]
      [--pslot $PSLOT] [--configdir $CONFIGDIR] [--comroot $COMROOT] [--expdir $EXPDIR]
 
 where:
@@ -51,12 +51,12 @@ where:
 
    * ``$START`` is the start type (warm or cold [default])
    * ``$IDATE`` is the initial start date of your run (first cycle CDATE, YYYYMMDDCC)
-   * ``$EDATE`` is the ending date of your run (YYYYMMDDCC) and is the last cycle that will complete
+   * ``$EDATE`` is the ending date of your run (YYYYMMDDCC) and is the last cycle that will complete [default: $IDATE]
    * ``$PSLOT`` is the name of your experiment [default: test]
    * ``$CONFIGDIR`` is the path to the ``/config`` folder under the copy of the system you're using [default: $TOP_OF_CLONE/parm/config/]
    * ``$RESDETATMOS`` is the resolution of the atmosphere component of the system (i.e. 768 for C768) [default: 384]
    * ``$RESDETOCEAN`` is the resolution of the ocean component of the system (i.e. 0.25 for 1/4 degree) [default: 0.; determined based on atmosphere resolution]
-   * ``$GFS_CYC`` is the forecast frequency (0 = none, 1 = 00z only [default], 2 = 00z & 12z, 4 = all cycles)
+   * ``$INTERVAL_GFS`` is the forecast interval in hours [default: 6]
    * ``$COMROOT`` is the path to your experiment output directory. Your ``ROTDIR`` (rotating com directory) will be created using ``COMROOT`` and ``PSLOT``. [default: $HOME (but do not use default due to limited space in home directories normally, provide a path to a larger scratch space)]
    * ``$EXPDIR`` is the path to your experiment directory where your configs will be placed and where you will find your workflow monitoring files (i.e. rocoto database and xml file). DO NOT include PSLOT folder at end of path, it will be built for you. [default: $HOME]
 
@@ -67,7 +67,7 @@ Atm-only:
 ::
 
    cd workflow
-   ./setup_expt.py gfs forecast-only --pslot test --idate 2020010100 --edate 2020010118 --resdetatmos 384 --gfs_cyc 4 --comroot /some_large_disk_area/Joe.Schmo/comroot --expdir /some_safe_disk_area/Joe.Schmo/expdir
+   ./setup_expt.py gfs forecast-only --pslot test --idate 2020010100 --edate 2020010118 --resdetatmos 384 --interval 6 --comroot /some_large_disk_area/Joe.Schmo/comroot --expdir /some_safe_disk_area/Joe.Schmo/expdir
 
 Coupled:
 
@@ -144,7 +144,8 @@ The following command examples include variables for reference but users should
 ::
 
    cd workflow
-   ./setup_expt.py gfs cycled --idate $IDATE --edate $EDATE [--app $APP] [--start $START] [--gfs_cyc $GFS_CYC]
+   ./setup_expt.py gfs cycled --idate $IDATE --edate $EDATE [--app $APP] [--start $START]
+     [--interval $INTERVAL_GFS] [--sdate_gfs $SDATE_GFS]
      [--resdetatmos $RESDETATMOS] [--resdetocean $RESDETOCEAN] [--resensatmos $RESENSATMOS] [--nens $NENS] [--run $RUN]
      [--pslot $PSLOT] [--configdir $CONFIGDIR] [--comroot $COMROOT] [--expdir $EXPDIR] [--icsdir $ICSDIR]
 
@@ -163,9 +164,10 @@ where:
      - S2SWA: atm-ocean-ice-wave-aerosols
 
    * ``$IDATE`` is the initial start date of your run (first cycle CDATE, YYYYMMDDCC)
-   * ``$EDATE`` is the ending date of your run (YYYYMMDDCC) and is the last cycle that will complete
+   * ``$EDATE`` is the ending date of your run (YYYYMMDDCC) and is the last cycle that will complete [default: $IDATE]
    * ``$START`` is the start type (warm or cold [default])
-   * ``$GFS_CYC`` is the forecast frequency (0 = none, 1 = 00z only [default], 2 = 00z & 12z, 4 = all cycles)
+   * ``$INTERVAL_GFS`` is the forecast interval in hours [default: 6]
+   * ``$SDATE_GFS`` cycle to begin GFS forecast [default: $IDATE + 6]
    * ``$RESDETATMOS`` is the resolution of the atmosphere component of the deterministic forecast [default: 384]
    * ``$RESDETOCEAN`` is the resolution of the ocean component of the deterministic forecast [default: 0.; determined based on atmosphere resolution]
    * ``$RESENSATMOS`` is the resolution of the atmosphere component of the ensemble forecast [default: 192]
@@ -184,7 +186,7 @@ Example:
 ::
 
    cd workflow
-   ./setup_expt.py gfs cycled --pslot test --configdir /home/Joe.Schmo/git/global-workflow/parm/config --idate 2020010100 --edate 2020010118 --comroot /some_large_disk_area/Joe.Schmo/comroot --expdir /some_safe_disk_area/Joe.Schmo/expdir --resdetatmos 384 --resensatmos 192 --nens 80 --gfs_cyc 4
+   ./setup_expt.py gfs cycled --pslot test --configdir /home/Joe.Schmo/git/global-workflow/parm/config --idate 2020010100 --edate 2020010118 --comroot /some_large_disk_area/Joe.Schmo/comroot --expdir /some_safe_disk_area/Joe.Schmo/expdir --resdetatmos 384 --resensatmos 192 --nens 80 --interval 6
 
 Example ``setup_expt.py`` on Orion:
 
diff --git a/env/AWSPW.env b/env/AWSPW.env
index 7fe17d2492..e366128a1d 100755
--- a/env/AWSPW.env
+++ b/env/AWSPW.env
@@ -27,7 +27,7 @@ if [[ -n "${ntasks:-}" && -n "${max_tasks_per_node:-}" && -n "${tasks_per_node:-
     NTHREADS1=${threads_per_task:-1}
     [[ ${NTHREADSmax} -gt ${max_threads_per_task} ]] && NTHREADSmax=${max_threads_per_task}
     [[ ${NTHREADS1} -gt ${max_threads_per_task} ]] && NTHREADS1=${max_threads_per_task}
-    export APRUN="${launcher} -n ${ntasks}"
+    APRUN_default="${launcher} -n ${ntasks}"
 else
     echo "ERROR config.resources must be sourced before sourcing AWSPW.env"
     exit 2
@@ -53,7 +53,7 @@ elif [[ "${step}" = "waveinit" ]] || [[ "${step}" = "waveprep" ]] || [[ "${step}
 elif [[ "${step}" = "post" ]]; then
 
     export NTHREADS_NP=${NTHREADS1}
-    export APRUN_NP="${APRUN}"
+    export APRUN_NP="${APRUN_default}"
 
     export NTHREADS_DWN=${threads_per_task_dwn:-1}
     [[ ${NTHREADS_DWN} -gt ${max_threads_per_task} ]] && export NTHREADS_DWN=${max_threads_per_task}
@@ -71,7 +71,7 @@ elif [[ "${step}" = "oceanice_products" ]]; then
 elif [[ "${step}" = "ecen" ]]; then
 
     export NTHREADS_ECEN=${NTHREADSmax}
-    export APRUN_ECEN="${APRUN}"
+    export APRUN_ECEN="${APRUN_default}"
 
     export NTHREADS_CHGRES=${threads_per_task_chgres:-12}
     [[ ${NTHREADS_CHGRES} -gt ${max_tasks_per_node} ]] && export NTHREADS_CHGRES=${max_tasks_per_node}
@@ -79,25 +79,25 @@ elif [[ "${step}" = "ecen" ]]; then
 
     export NTHREADS_CALCINC=${threads_per_task_calcinc:-1}
     [[ ${NTHREADS_CALCINC} -gt ${max_threads_per_task} ]] && export NTHREADS_CALCINC=${max_threads_per_task}
-    export APRUN_CALCINC="${APRUN}"
+    export APRUN_CALCINC="${APRUN_default}"
 
 elif [[ "${step}" = "esfc" ]]; then
 
     export NTHREADS_ESFC=${NTHREADSmax}
-    export APRUN_ESFC="${APRUN}"
+    export APRUN_ESFC="${APRUN_default}"
 
     export NTHREADS_CYCLE=${threads_per_task_cycle:-14}
     [[ ${NTHREADS_CYCLE} -gt ${max_tasks_per_node} ]] && export NTHREADS_CYCLE=${max_tasks_per_node}
-    export APRUN_CYCLE="${APRUN}"
+    export APRUN_CYCLE="${APRUN_default}"
 
 elif [[ "${step}" = "epos" ]]; then
 
     export NTHREADS_EPOS=${NTHREADSmax}
-    export APRUN_EPOS="${APRUN}"
+    export APRUN_EPOS="${APRUN_default}"
 
 elif [[ "${step}" = "fit2obs" ]]; then
 
     export NTHREADS_FIT2OBS=${NTHREADS1}
-    export MPIRUN="${APRUN}"
+    export MPIRUN="${APRUN_default}"
 
 fi
diff --git a/env/AZUREPW.env b/env/AZUREPW.env
index 706c659e95..c2faeb2bf6 100755
--- a/env/AZUREPW.env
+++ b/env/AZUREPW.env
@@ -27,7 +27,7 @@ if [[ -n "${ntasks:-}" && -n "${max_tasks_per_node:-}" && -n "${tasks_per_node:-
     NTHREADS1=${threads_per_task:-1}
     [[ ${NTHREADSmax} -gt ${max_threads_per_task} ]] && NTHREADSmax=${max_threads_per_task}
     [[ ${NTHREADS1} -gt ${max_threads_per_task} ]] && NTHREADS1=${max_threads_per_task}
-    APRUN="${launcher} -n ${ntasks}"
+    APRUN_default="${launcher} -n ${ntasks}"
 else
     echo "ERROR config.resources must be sourced before sourcing AZUREPW.env"
     exit 2
@@ -43,13 +43,61 @@ if [[ "${step}" = "fcst" ]] || [[ "${step}" = "efcs" ]]; then
     export APRUN_UFS="${launcher} -n ${ufs_ntasks}"
     unset nnodes ufs_ntasks
 
+elif [[ "${step}" = "waveinit" ]] || [[ "${step}" = "waveprep" ]] || [[ "${step}" = "wavepostsbs" ]] || [[ "${step}" = "wavepostbndpnt" ]] || [[ "${step}" = "wavepostbndpntbll" ]] || [[ "${step}" = "wavepostpnt" ]]; then
+
+    export CFP_MP="YES"
+    if [[ "${step}" = "waveprep" ]]; then export MP_PULSE=0 ; fi
+    export wavempexec=${launcher}
+    export wave_mpmd=${mpmd_opt}
+
 elif [[ "${step}" = "post" ]]; then
 
     export NTHREADS_NP=${NTHREADS1}
-    export APRUN_NP="${APRUN}"
+    export APRUN_NP="${APRUN_default}"
 
     export NTHREADS_DWN=${threads_per_task_dwn:-1}
     [[ ${NTHREADS_DWN} -gt ${max_threads_per_task} ]] && export NTHREADS_DWN=${max_threads_per_task}
     export APRUN_DWN="${launcher} -n ${ntasks_dwn}"
 
+elif [[ "${step}" = "atmos_products" ]]; then
+
+    export USE_CFP="YES"  # Use MPMD for downstream product generation on Hera
+
+elif [[ "${step}" = "oceanice_products" ]]; then
+
+    export NTHREADS_OCNICEPOST=${NTHREADS1}
+    export APRUN_OCNICEPOST="${launcher} -n 1 --cpus-per-task=${NTHREADS_OCNICEPOST}"
+
+elif [[ "${step}" = "ecen" ]]; then
+
+    export NTHREADS_ECEN=${NTHREADSmax}
+    export APRUN_ECEN="${APRUN}"
+
+    export NTHREADS_CHGRES=${threads_per_task_chgres:-12}
+    [[ ${NTHREADS_CHGRES} -gt ${max_tasks_per_node} ]] && export NTHREADS_CHGRES=${max_tasks_per_node}
+    export APRUN_CHGRES="time"
+
+    export NTHREADS_CALCINC=${threads_per_task_calcinc:-1}
+    [[ ${NTHREADS_CALCINC} -gt ${max_threads_per_task} ]] && export NTHREADS_CALCINC=${max_threads_per_task}
+    export APRUN_CALCINC="${APRUN}"
+
+elif [[ "${step}" = "esfc" ]]; then
+
+    export NTHREADS_ESFC=${NTHREADSmax}
+    export APRUN_ESFC="${APRUN}"
+
+    export NTHREADS_CYCLE=${threads_per_task_cycle:-14}
+    [[ ${NTHREADS_CYCLE} -gt ${max_tasks_per_node} ]] && export NTHREADS_CYCLE=${max_tasks_per_node}
+    export APRUN_CYCLE="${APRUN}"
+
+elif [[ "${step}" = "epos" ]]; then
+
+    export NTHREADS_EPOS=${NTHREADSmax}
+    export APRUN_EPOS="${APRUN}"
+
+elif [[ "${step}" = "fit2obs" ]]; then
+
+    export NTHREADS_FIT2OBS=${NTHREADS1}
+    export MPIRUN="${APRUN}"
+
 fi
diff --git a/env/CONTAINER.env b/env/CONTAINER.env
index c40543794b..ba01fcf0dd 100755
--- a/env/CONTAINER.env
+++ b/env/CONTAINER.env
@@ -26,7 +26,7 @@ ulimit -s unlimited
 ulimit -a
 
 
-if [ "${step}" = "ocnanalrun" ]; then
+if [ "${step}" = "marineanlvar" ]; then
     export NTHREADS_OCNANAL=1
-    export APRUN_OCNANAL="${launcher} -n 2"
+    export APRUN_MARINEANLVAR="${launcher} -n 2"
 fi
diff --git a/env/GAEA.env b/env/GAEA.env
index 6809a9b186..7736e0f1ea 100755
--- a/env/GAEA.env
+++ b/env/GAEA.env
@@ -28,18 +28,48 @@ if [[ -n "${ntasks:-}" && -n "${max_tasks_per_node:-}" && -n "${tasks_per_node:-
     [[ ${NTHREADS1} -gt ${max_threads_per_task} ]] && NTHREADS1=${max_threads_per_task}
     # This may be useful when Gaea is fully ported, so ignore SC warning
     # shellcheck disable=SC2034
-    APRUN="${launcher} -n ${ntasks}"
+    APRUN_default="${launcher} -n ${ntasks}"
 else
     echo "ERROR config.resources must be sourced before sourcing GAEA.env"
     exit 2
 fi
 
-if [[ "${step}" = "waveinit" ]]; then
+if [[ "${step}" = "prep" ]]; then
 
-    export CFP_MP="YES"
-    if [[ "${step}" = "waveprep" ]]; then export MP_PULSE=0 ; fi
-    export wavempexec=${launcher}
-    export wave_mpmd=${mpmd_opt}
+    export POE="NO"
+    export BACK="NO"
+    export sys_tp="GAEA"
+    export launcher_PREP="srun"
+
+elif [[ "${step}" = "anal" ]] || [[ "${step}" = "analcalc" ]]; then
+
+    export MKL_NUM_THREADS=4
+    export MKL_CBWR=AUTO
+
+    export CFP_MP=${CFP_MP:-"YES"}
+    export USE_CFP=${USE_CFP:-"YES"}
+    export APRUNCFP="${launcher} -n \$ncmd ${mpmd_opt}"
+
+    export NTHREADS_GSI=${NTHREADSmax}
+    export APRUN_GSI="${APRUN_default} --cpus-per-task=${NTHREADS_GSI}"
+
+    export NTHREADS_CALCINC=${threads_per_task_calcinc:-1}
+    [[ ${NTHREADS_CALCINC} -gt ${max_threads_per_task} ]] && export NTHREADS_CALCINC=${max_threads_per_task}
+    export APRUN_CALCINC="${launcher} \$ncmd --cpus-per-task=${NTHREADS_CALCINC}"
+
+    export NTHREADS_CYCLE=${threads_per_task_cycle:-12}
+    [[ ${NTHREADS_CYCLE} -gt ${max_tasks_per_node} ]] && export NTHREADS_CYCLE=${max_tasks_per_node}
+    ntasks_cycle=${ntiles:-6}
+    export APRUN_CYCLE="${launcher} -n ${ntasks_cycle} --cpus-per-task=${NTHREADS_CYCLE}"
+
+    export NTHREADS_GAUSFCANL=1
+    ntasks_gausfcanl=${ntasks_gausfcanl:-1}
+    export APRUN_GAUSFCANL="${launcher} -n ${ntasks_gausfcanl} --cpus-per-task=${NTHREADS_GAUSFCANL}"
+
+elif [[ "${step}" = "sfcanl" ]]; then
+
+    export NTHREADS_CYCLE=${threads_per_task:-14}
+    export APRUN_CYCLE="${APRUN_default} --cpus-per-task=${NTHREADS_CYCLE}"
 
 elif [[ "${step}" = "fcst" ]]; then
 
@@ -49,9 +79,14 @@ elif [[ "${step}" = "fcst" ]]; then
     export APRUN_UFS="${launcher} -n ${ufs_ntasks}"
     unset nnodes ufs_ntasks
 
+elif [[ "${step}" = "upp" ]]; then
+
+    export NTHREADS_UPP=${NTHREADS1}
+    export APRUN_UPP="${APRUN_default} --cpus-per-task=${NTHREADS_UPP}"
+
 elif [[ "${step}" = "atmos_products" ]]; then
 
-    export USE_CFP="YES"  # Use MPMD for downstream product generation on Hera
+    export USE_CFP="YES"  # Use MPMD for downstream product generation on Gaea
 
 elif [[ "${step}" = "oceanice_products" ]]; then
 
@@ -61,6 +96,6 @@ elif [[ "${step}" = "oceanice_products" ]]; then
 elif [[ "${step}" = "fit2obs" ]]; then
 
     export NTHREADS_FIT2OBS=${NTHREADS1}
-    export MPIRUN="${APRUN} --cpus-per-task=${NTHREADS_FIT2OBS}"
+    export MPIRUN="${APRUN_default} --cpus-per-task=${NTHREADS_FIT2OBS}"
 
 fi
diff --git a/env/GOOGLEPW.env b/env/GOOGLEPW.env
index f5582ccd4d..c3b5ec806a 100755
--- a/env/GOOGLEPW.env
+++ b/env/GOOGLEPW.env
@@ -27,7 +27,7 @@ if [[ -n "${ntasks:-}" && -n "${max_tasks_per_node:-}" && -n "${tasks_per_node:-
     NTHREADS1=${threads_per_task:-1}
     [[ ${NTHREADSmax} -gt ${max_threads_per_task} ]] && NTHREADSmax=${max_threads_per_task}
     [[ ${NTHREADS1} -gt ${max_threads_per_task} ]] && NTHREADS1=${max_threads_per_task}
-    APRUN="${launcher} -n ${ntasks}"
+    APRUN_default="${launcher} -n ${ntasks}"
 else
     echo "ERROR config.resources must be sourced before sourcing GOOGLEPW.env"
     exit 2
@@ -43,13 +43,65 @@ if [[ "${step}" = "fcst" ]] || [[ "${step}" = "efcs" ]]; then
     export APRUN_UFS="${launcher} -n ${ufs_ntasks}"
     unset nnodes ufs_ntasks
 
+elif [[ "${step}" = "prep_emissions" ]]; then
+
+    export APRUN
+
+elif [[ "${step}" = "waveinit" ]] || [[ "${step}" = "waveprep" ]] || [[ "${step}" = "wavepostsbs" ]] || [[ "${step}" = "wavepostbndpnt" ]] || [[ "${step}" = "wavepostbndpntbll" ]] || [[ "${step}" = "wavepostpnt" ]]; then
+
+    export CFP_MP="YES"
+    if [[ "${step}" = "waveprep" ]]; then export MP_PULSE=0 ; fi
+    export wavempexec=${launcher}
+    export wave_mpmd=${mpmd_opt}
+
 elif [[ "${step}" = "post" ]]; then
 
     export NTHREADS_NP=${NTHREADS1}
-    export APRUN_NP="${APRUN}"
+    export APRUN_NP="${APRUN_default}"
 
     export NTHREADS_DWN=${threads_per_task_dwn:-1}
     [[ ${NTHREADS_DWN} -gt ${max_threads_per_task} ]] && export NTHREADS_DWN=${max_threads_per_task}
     export APRUN_DWN="${launcher} -n ${ntasks_dwn}"
 
+elif [[ "${step}" = "atmos_products" ]]; then
+
+    export USE_CFP="YES"  # Use MPMD for downstream product generation on Hera
+
+elif [[ "${step}" = "oceanice_products" ]]; then
+
+    export NTHREADS_OCNICEPOST=${NTHREADS1}
+    export APRUN_OCNICEPOST="${launcher} -n 1 --cpus-per-task=${NTHREADS_OCNICEPOST}"
+
+elif [[ "${step}" = "ecen" ]]; then
+
+    export NTHREADS_ECEN=${NTHREADSmax}
+    export APRUN_ECEN="${APRUN_default}"
+
+    export NTHREADS_CHGRES=${threads_per_task_chgres:-12}
+    [[ ${NTHREADS_CHGRES} -gt ${max_tasks_per_node} ]] && export NTHREADS_CHGRES=${max_tasks_per_node}
+    export APRUN_CHGRES="time"
+
+    export NTHREADS_CALCINC=${threads_per_task_calcinc:-1}
+    [[ ${NTHREADS_CALCINC} -gt ${max_threads_per_task} ]] && export NTHREADS_CALCINC=${max_threads_per_task}
+    export APRUN_CALCINC="${APRUN_default}"
+
+elif [[ "${step}" = "esfc" ]]; then
+
+    export NTHREADS_ESFC=${NTHREADSmax}
+    export APRUN_ESFC="${APRUN_default}"
+
+    export NTHREADS_CYCLE=${threads_per_task_cycle:-14}
+    [[ ${NTHREADS_CYCLE} -gt ${max_tasks_per_node} ]] && export NTHREADS_CYCLE=${max_tasks_per_node}
+    export APRUN_CYCLE="${APRUN_default}"
+
+elif [[ "${step}" = "epos" ]]; then
+
+    export NTHREADS_EPOS=${NTHREADSmax}
+    export APRUN_EPOS="${APRUN_default}"
+
+elif [[ "${step}" = "fit2obs" ]]; then
+
+    export NTHREADS_FIT2OBS=${NTHREADS1}
+    export MPIRUN="${APRUN}"
+
 fi
diff --git a/env/HERA.env b/env/HERA.env
index 8d59c870cc..09743967b5 100755
--- a/env/HERA.env
+++ b/env/HERA.env
@@ -39,7 +39,7 @@ if [[ -n "${ntasks:-}" && -n "${max_tasks_per_node:-}" && -n "${tasks_per_node:-
     NTHREADS1=${threads_per_task:-1}
     [[ ${NTHREADSmax} -gt ${max_threads_per_task} ]] && NTHREADSmax=${max_threads_per_task}
     [[ ${NTHREADS1} -gt ${max_threads_per_task} ]] && NTHREADS1=${max_threads_per_task}
-    APRUN="${launcher} -n ${ntasks}"
+    APRUN_default="${launcher} -n ${ntasks}"
 else
     echo "ERROR config.resources must be sourced before sourcing HERA.env"
     exit 2
@@ -54,11 +54,11 @@ if [[ "${step}" = "prep" ]] || [[ "${step}" = "prepbufr" ]]; then
 
 elif [[ "${step}" = "prepsnowobs" ]]; then
 
-    export APRUN_CALCFIMS="${APRUN}"
+    export APRUN_CALCFIMS="${APRUN_default}"
 
 elif [[ "${step}" = "prep_emissions" ]]; then
 
-    export APRUN="${APRUN}"
+    export APRUN="${APRUN_default}"
 
 elif [[ "${step}" = "waveinit" ]] || [[ "${step}" = "waveprep" ]] || [[ "${step}" = "wavepostsbs" ]] || [[ "${step}" = "wavepostbndpnt" ]] || [[ "${step}" = "wavepostbndpntbll" ]] || [[ "${step}" = "wavepostpnt" ]]; then
 
@@ -70,90 +70,93 @@ elif [[ "${step}" = "waveinit" ]] || [[ "${step}" = "waveprep" ]] || [[ "${step}
 elif [[ "${step}" = "atmanlvar" ]]; then
 
     export NTHREADS_ATMANLVAR=${NTHREADSmax}
-    export APRUN_ATMANLVAR="${APRUN} --cpus-per-task=${NTHREADS_ATMANLVAR}"
+    export APRUN_ATMANLVAR="${APRUN_default} --cpus-per-task=${NTHREADS_ATMANLVAR}"
 
 elif [[ "${step}" = "atmensanlobs" ]]; then
 
     export NTHREADS_ATMENSANLOBS=${NTHREADSmax}
-    export APRUN_ATMENSANLOBS="${APRUN} --cpus-per-task=${NTHREADS_ATMENSANLOBS}"
+    export APRUN_ATMENSANLOBS="${APRUN_default} --cpus-per-task=${NTHREADS_ATMENSANLOBS}"
 
 elif [[ "${step}" = "atmensanlsol" ]]; then
 
     export NTHREADS_ATMENSANLSOL=${NTHREADSmax}
-    export APRUN_ATMENSANLSOL="${APRUN} --cpus-per-task=${NTHREADS_ATMENSANLSOL}"
+    export APRUN_ATMENSANLSOL="${APRUN_default} --cpus-per-task=${NTHREADS_ATMENSANLSOL}"
 
 elif [[ "${step}" = "atmensanlletkf" ]]; then
 
     export NTHREADS_ATMENSANLLETKF=${NTHREADSmax}
-    export APRUN_ATMENSANLLETKF="${APRUN} --cpus-per-task=${NTHREADS_ATMENSANLLETKF}"
+    export APRUN_ATMENSANLLETKF="${APRUN_default} --cpus-per-task=${NTHREADS_ATMENSANLLETKF}"
 
 elif [[ "${step}" = "atmensanlfv3inc" ]]; then
 
     export NTHREADS_ATMENSANLFV3INC=${NTHREADSmax}
-    export APRUN_ATMENSANLFV3INC="${APRUN} --cpus-per-task=${NTHREADS_ATMENSANLFV3INC}"
+    export APRUN_ATMENSANLFV3INC="${APRUN_default} --cpus-per-task=${NTHREADS_ATMENSANLFV3INC}"
 
-elif [[ "${step}" = "aeroanlrun" ]]; then
+elif [[ "${step}" = "aeroanlvar" ]]; then
 
     export APRUNCFP="${launcher} -n \$ncmd ${mpmd_opt}"
 
     export NTHREADS_AEROANL=${NTHREADSmax}
-    export APRUN_AEROANL="${APRUN} --cpus-per-task=${NTHREADS_AEROANL}"
+    export APRUN_AEROANL="${APRUN_default} --cpus-per-task=${NTHREADS_AEROANL}"
+
+elif [[ "${step}" = "aeroanlgenb" ]]; then
+
+    export NTHREADS_AEROANLGENB=${NTHREADSmax}
+    export APRUN_AEROANLGENB="${APRUN_default} --cpus-per-task=${NTHREADS_AEROANLGENB}"
 
 elif [[ "${step}" = "atmanlfv3inc" ]]; then
 
     export NTHREADS_ATMANLFV3INC=${NTHREADSmax}
-    export APRUN_ATMANLFV3INC="${APRUN} --cpus-per-task=${NTHREADS_ATMANLFV3INC}"
+    export APRUN_ATMANLFV3INC="${APRUN_default} --cpus-per-task=${NTHREADS_ATMANLFV3INC}"
 
 elif [[ "${step}" = "prepobsaero" ]]; then
 
     export NTHREADS_PREPOBSAERO=${NTHREADS1}
-    export APRUN_PREPOBSAERO="${APRUN} --cpus-per-task=${NTHREADS_PREPOBSAERO}"
+    export APRUN_PREPOBSAERO="${APRUN_default} --cpus-per-task=${NTHREADS_PREPOBSAERO}"
 
 elif [[ "${step}" = "snowanl" ]]; then
 
     export NTHREADS_SNOWANL=${NTHREADSmax}
-    export APRUN_SNOWANL="${APRUN} --cpus-per-task=${NTHREADS_SNOWANL}"
+    export APRUN_SNOWANL="${APRUN_default} --cpus-per-task=${NTHREADS_SNOWANL}"
 
     export APRUN_APPLY_INCR="${launcher} -n 6"
 
 elif [[ "${step}" = "esnowrecen" ]]; then
 
     export NTHREADS_ESNOWRECEN=${NTHREADSmax}
-    export APRUN_ESNOWRECEN="${APRUN} --cpus-per-task=${NTHREADS_ESNOWRECEN}"
+    export APRUN_ESNOWRECEN="${APRUN_default} --cpus-per-task=${NTHREADS_ESNOWRECEN}"
 
     export APRUN_APPLY_INCR="${launcher} -n 6"
 
 elif [[ "${step}" = "marinebmat" ]]; then
 
     export APRUNCFP="${launcher} -n \$ncmd --multi-prog"
-    export APRUN_MARINEBMAT="${APRUN}"
+    export APRUN_MARINEBMAT="${APRUN_default}"
 
 elif [[ "${step}" = "marinebmat" ]]; then
 
     export APRUNCFP="${launcher} -n \$ncmd --multi-prog"
-    export APRUN_MARINEBMAT="${APRUN}"
+    export APRUN_MARINEBMAT="${APRUN_default}"
 
-elif [[ "${step}" = "ocnanalrun" ]]; then
+elif [[ "${step}" = "marineanlvar" ]]; then
 
     export APRUNCFP="${launcher} -n \$ncmd --multi-prog"
+    export APRUN_MARINEANLVAR="${APRUN_default}"
 
-    export APRUN_OCNANAL="${APRUN}"
-
-elif [[ "${step}" = "ocnanalchkpt" ]]; then
+elif [[ "${step}" = "marineanlchkpt" ]]; then
 
     export APRUNCFP="${launcher} -n \$ncmd --multi-prog"
-
-    export APRUN_OCNANAL="${APRUN}"
+    export APRUN_MARINEANLCHKPT="${APRUN_default}"
 
 elif [[ "${step}" = "ocnanalecen" ]]; then
 
     export NTHREADS_OCNANALECEN=${NTHREADSmax}
-    export APRUN_OCNANALECEN="${APRUN} --cpus-per-task=${NTHREADS_OCNANALECEN}"
+    export APRUN_OCNANALECEN="${APRUN_default} --cpus-per-task=${NTHREADS_OCNANALECEN}"
 
 elif [[ "${step}" = "marineanalletkf" ]]; then
 
     export NTHREADS_MARINEANALLETKF=${NTHREADSmax}
-    export APRUN_MARINEANALLETKF="${APRUN} --cpus-per-task=${NTHREADS_MARINEANALLETKF}"
+    export APRUN_MARINEANALLETKF="${APRUN_default} --cpus-per-task=${NTHREADS_MARINEANALLETKF}"
 
 elif [[ "${step}" = "anal" ]] || [[ "${step}" = "analcalc" ]]; then
 
@@ -165,7 +168,7 @@ elif [[ "${step}" = "anal" ]] || [[ "${step}" = "analcalc" ]]; then
     export APRUNCFP="${launcher} -n \$ncmd ${mpmd_opt}"
 
     export NTHREADS_GSI=${NTHREADSmax}
-    export APRUN_GSI="${APRUN} --cpus-per-task=${NTHREADS_GSI}"
+    export APRUN_GSI="${APRUN_default} --cpus-per-task=${NTHREADS_GSI}"
 
     export NTHREADS_CALCINC=${threads_per_task_calcinc:-1}
     [[ ${NTHREADS_CALCINC} -gt ${max_threads_per_task} ]] && export NTHREADS_CALCINC=${max_threads_per_task}
@@ -183,7 +186,7 @@ elif [[ "${step}" = "anal" ]] || [[ "${step}" = "analcalc" ]]; then
 elif [[ "${step}" = "sfcanl" ]]; then
 
     export NTHREADS_CYCLE=${threads_per_task:-14}
-    export APRUN_CYCLE="${APRUN} --cpus-per-task=${NTHREADS_CYCLE}"
+    export APRUN_CYCLE="${APRUN_default} --cpus-per-task=${NTHREADS_CYCLE}"
 
 elif [[ "${step}" = "eobs" ]]; then
 
@@ -191,7 +194,7 @@ elif [[ "${step}" = "eobs" ]]; then
     export MKL_CBWR=AUTO
 
     export NTHREADS_GSI=${NTHREADSmax}
-    export APRUN_GSI="${APRUN} --cpus-per-task=${NTHREADS_GSI}"
+    export APRUN_GSI="${APRUN_default} --cpus-per-task=${NTHREADS_GSI}"
 
     export CFP_MP=${CFP_MP:-"YES"}
     export USE_CFP=${USE_CFP:-"YES"}
@@ -217,7 +220,7 @@ elif [[ "${step}" = "fcst" ]] || [[ "${step}" = "efcs" ]]; then
 elif [[ "${step}" = "upp" ]]; then
 
     export NTHREADS_UPP=${NTHREADS1}
-    export APRUN_UPP="${APRUN} --cpus-per-task=${NTHREADS_UPP}"
+    export APRUN_UPP="${APRUN_default} --cpus-per-task=${NTHREADS_UPP}"
 
 elif [[ "${step}" = "atmos_products" ]]; then
 
@@ -231,7 +234,7 @@ elif [[ "${step}" = "oceanice_products" ]]; then
 elif [[ "${step}" = "ecen" ]]; then
 
     export NTHREADS_ECEN=${NTHREADSmax}
-    export APRUN_ECEN="${APRUN} --cpus-per-task=${NTHREADS_ECEN}"
+    export APRUN_ECEN="${APRUN_default} --cpus-per-task=${NTHREADS_ECEN}"
 
     export NTHREADS_CHGRES=${threads_per_task_chgres:-12}
     [[ ${NTHREADS_CHGRES} -gt ${max_tasks_per_node} ]] && export NTHREADS_CHGRES=${max_tasks_per_node}
@@ -239,28 +242,28 @@ elif [[ "${step}" = "ecen" ]]; then
 
     export NTHREADS_CALCINC=${threads_per_task_calcinc:-1}
     [[ ${NTHREADS_CALCINC} -gt ${max_threads_per_task} ]] && export NTHREADS_CALCINC=${max_threads_per_task}
-    export APRUN_CALCINC="${APRUN} --cpus-per-task=${NTHREADS_CALCINC}"
+    export APRUN_CALCINC="${APRUN_default} --cpus-per-task=${NTHREADS_CALCINC}"
 
 elif [[ "${step}" = "esfc" ]]; then
 
     export NTHREADS_ESFC=${threads_per_task_esfc:-${max_threads_per_task}}
-    export APRUN_ESFC="${APRUN} --cpus-per-task=${NTHREADS_ESFC}"
+    export APRUN_ESFC="${APRUN_default} --cpus-per-task=${NTHREADS_ESFC}"
 
     export NTHREADS_CYCLE=${threads_per_task_cycle:-14}
     [[ ${NTHREADS_CYCLE} -gt ${max_tasks_per_node} ]] && export NTHREADS_CYCLE=${max_tasks_per_node}
-    export APRUN_CYCLE="${APRUN} --cpus-per-task=${NTHREADS_CYCLE}"
+    export APRUN_CYCLE="${APRUN_default} --cpus-per-task=${NTHREADS_CYCLE}"
 
 elif [[ "${step}" = "epos" ]]; then
 
     export NTHREADS_EPOS=${NTHREADSmax}
-    export APRUN_EPOS="${APRUN} --cpus-per-task=${NTHREADS_EPOS}"
+    export APRUN_EPOS="${APRUN_default} --cpus-per-task=${NTHREADS_EPOS}"
 
 elif [[ "${step}" = "postsnd" ]]; then
 
     export CFP_MP="YES"
 
     export NTHREADS_POSTSND=${NTHREADS1}
-    export APRUN_POSTSND="${APRUN} --cpus-per-task=${NTHREADS_POSTSND}"
+    export APRUN_POSTSND="${APRUN_default} --cpus-per-task=${NTHREADS_POSTSND}"
 
     export NTHREADS_POSTSNDCFP=${threads_per_task_postsndcfp:-1}
     [[ ${NTHREADS_POSTSNDCFP} -gt ${max_threads_per_task} ]] && export NTHREADS_POSTSNDCFP=${max_threads_per_task}
@@ -269,7 +272,7 @@ elif [[ "${step}" = "postsnd" ]]; then
 elif [[ "${step}" = "awips" ]]; then
 
     export NTHREADS_AWIPS=${NTHREADS1}
-    export APRUN_AWIPSCFP="${APRUN} ${mpmd_opt}"
+    export APRUN_AWIPSCFP="${APRUN_default} ${mpmd_opt}"
 
 elif [[ "${step}" = "gempak" ]]; then
 
@@ -281,6 +284,6 @@ elif [[ "${step}" = "gempak" ]]; then
 elif [[ "${step}" = "fit2obs" ]]; then
 
     export NTHREADS_FIT2OBS=${NTHREADS1}
-    export MPIRUN="${APRUN} --cpus-per-task=${NTHREADS_FIT2OBS}"
+    export MPIRUN="${APRUN_default} --cpus-per-task=${NTHREADS_FIT2OBS}"
 
 fi
diff --git a/env/HERCULES.env b/env/HERCULES.env
index 79ff8391bd..9ec112c699 100755
--- a/env/HERCULES.env
+++ b/env/HERCULES.env
@@ -36,7 +36,7 @@ if [[ -n "${ntasks:-}" && -n "${max_tasks_per_node:-}" && -n "${tasks_per_node:-
     NTHREADS1=${threads_per_task:-1}
     [[ ${NTHREADSmax} -gt ${max_threads_per_task} ]] && NTHREADSmax=${max_threads_per_task}
     [[ ${NTHREADS1} -gt ${max_threads_per_task} ]] && NTHREADS1=${max_threads_per_task}
-    APRUN="${launcher} -n ${ntasks}"
+    APRUN_default="${launcher} -n ${ntasks}"
 else
     echo "ERROR config.resources must be sourced before sourcing HERCULES.env"
     exit 2
@@ -52,11 +52,11 @@ case ${step} in
  ;;
  "prepsnowobs")
 
-    export APRUN_CALCFIMS="${APRUN}"
+    export APRUN_CALCFIMS="${APRUN_default}"
  ;;
  "prep_emissions")
 
-    export APRUN="${APRUN}"
+    export APRUN="${APRUN_default}"
  ;;
  "waveinit" | "waveprep" | "wavepostsbs" | "wavepostbndpnt" | "wavepostpnt" | "wavepostbndpntbll")
 
@@ -69,56 +69,61 @@ case ${step} in
  "atmanlvar")
 
     export NTHREADS_ATMANLVAR=${NTHREADSmax}
-    export APRUN_ATMANLVAR="${APRUN} --cpus-per-task=${NTHREADS_ATMANLVAR}"
+    export APRUN_ATMANLVAR="${APRUN_default} --cpus-per-task=${NTHREADS_ATMANLVAR}"
  ;;
  "atmanlfv3inc")
 
     export NTHREADS_ATMANLFV3INC=${NTHREADSmax}
-    export APRUN_ATMANLFV3INC="${APRUN} --cpus-per-task=${NTHREADS_ATMANLFV3INC}"
+    export APRUN_ATMANLFV3INC="${APRUN_default} --cpus-per-task=${NTHREADS_ATMANLFV3INC}"
  ;;
  "atmensanlobs")
 
     export NTHREADS_ATMENSANLOBS=${NTHREADSmax}
-    export APRUN_ATMENSANLOBS="${APRUN} --cpus-per-task=${NTHREADS_ATMENSANLOBS}"
+    export APRUN_ATMENSANLOBS="${APRUN_default} --cpus-per-task=${NTHREADS_ATMENSANLOBS}"
  ;;
  "atmensanlsol")
 
     export NTHREADS_ATMENSANLSOL=${NTHREADSmax}
-    export APRUN_ATMENSANLSOL="${APRUN} --cpus-per-task=${NTHREADS_ATMENSANLSOL}"
+    export APRUN_ATMENSANLSOL="${APRUN_default} --cpus-per-task=${NTHREADS_ATMENSANLSOL}"
  ;;
  "atmensanlletkf")
 
     export NTHREADS_ATMENSANLLETKF=${NTHREADSmax}
-    export APRUN_ATMENSANLLETKF="${APRUN} --cpus-per-task=${NTHREADS_ATMENSANLLETKF}"
+    export APRUN_ATMENSANLLETKF="${APRUN_default} --cpus-per-task=${NTHREADS_ATMENSANLLETKF}"
  ;;
  "atmensanlfv3inc")
 
     export NTHREADS_ATMENSANLFV3INC=${NTHREADSmax}
-    export APRUN_ATMENSANLFV3INC="${APRUN} --cpus-per-task=${NTHREADS_ATMENSANLFV3INC}"
+    export APRUN_ATMENSANLFV3INC="${APRUN_default} --cpus-per-task=${NTHREADS_ATMENSANLFV3INC}"
  ;;
- "aeroanlrun")
+ "aeroanlvar")
 
     export APRUNCFP="${launcher} -n \$ncmd ${mpmd_opt}"
 
     export NTHREADS_AEROANL=${NTHREADSmax}
-    export APRUN_AEROANL="${APRUN} --cpus-per-task=${NTHREADS_AEROANL}"
+    export APRUN_AEROANL="${APRUN_default} --cpus-per-task=${NTHREADS_AEROANL}"
+ ;;
+  "aeroanlgenb")
+
+    export NTHREADS_AEROANLGENB=${NTHREADSmax}
+    export APRUN_AEROANLGENB="${APRUN_default} --cpus-per-task=${NTHREADS_AEROANLGENB}"
  ;;
  "prepobsaero")
 
     export NTHREADS_PREPOBSAERO=${NTHREADS1}
-    export APRUN_PREPOBSAERO="${APRUN} --cpus-per-task=${NTHREADS_PREPOBSAERO}"
+    export APRUN_PREPOBSAERO="${APRUN_default} --cpus-per-task=${NTHREADS_PREPOBSAERO}"
 ;;
  "snowanl")
 
     export NTHREADS_SNOWANL=${NTHREADSmax}
-    export APRUN_SNOWANL="${APRUN} --cpus-per-task=${NTHREADS_SNOWANL}"
+    export APRUN_SNOWANL="${APRUN_default} --cpus-per-task=${NTHREADS_SNOWANL}"
 
     export APRUN_APPLY_INCR="${launcher} -n 6"
  ;;
  "esnowrecen")
 
     export NTHREADS_ESNOWRECEN=${NTHREADSmax}
-    export APRUN_ESNOWRECEN="${APRUN} --cpus-per-task=${NTHREADS_ESNOWRECEN}"
+    export APRUN_ESNOWRECEN="${APRUN_default} --cpus-per-task=${NTHREADS_ESNOWRECEN}"
 
     export APRUN_APPLY_INCR="${launcher} -n 6"
  ;;
@@ -126,12 +131,12 @@ case ${step} in
  "marinebmat")
 
     export APRUNCFP="${launcher} -n \$ncmd ${mpmd_opt}"
-    export APRUN_MARINEBMAT="${APRUN}"
+    export APRUN_MARINEBMAT="${APRUN_default}"
  ;;
- "ocnanalrun")
+ "marineanlvar")
 
     export APRUNCFP="${launcher} -n \$ncmd ${mpmd_opt}"
-    export APRUN_OCNANAL="${APRUN}"
+    export APRUN_MARINEANLVAR="${APRUN_default}"
  ;;
 "ocnanalecen")
 
@@ -143,12 +148,12 @@ case ${step} in
     [[ ${NTHREADS_OCNANALECEN} -gt ${max_threads_per_task} ]] && export NTHREADS_OCNANALECEN=${max_threads_per_task}
     export APRUN_OCNANALECEN="${launcher} -n ${ntasks_ocnanalecen} --cpus-per-task=${NTHREADS_OCNANALECEN}"
 ;;
- "ocnanalchkpt")
+ "marineanlchkpt")
 
     export APRUNCFP="${launcher} -n \$ncmd ${mpmd_opt}"
 
     export NTHREADS_OCNANAL=${NTHREADSmax}
-    export APRUN_OCNANAL="${APRUN} --cpus-per-task=${NTHREADS_OCNANAL}"
+    export APRUN_MARINEANLCHKPT="${APRUN_default} --cpus-per-task=${NTHREADS_OCNANAL}"
  ;;
  "anal" | "analcalc")
 
@@ -161,7 +166,7 @@ case ${step} in
 
 
     export NTHREADS_GSI=${threads_per_task_anal:-${max_threads_per_task}}
-    export APRUN_GSI="${APRUN} --cpus-per-task=${NTHREADS_GSI}"
+    export APRUN_GSI="${APRUN_default} --cpus-per-task=${NTHREADS_GSI}"
 
     export NTHREADS_CALCINC=${threads_per_task_calcinc:-1}
     [[ ${NTHREADS_CALCINC} -gt ${max_threads_per_task} ]] && export NTHREADS_CALCINC=${max_threads_per_task}
@@ -180,7 +185,7 @@ case ${step} in
 
     export NTHREADS_CYCLE=${threads_per_task:-14}
     [[ ${NTHREADS_CYCLE} -gt ${max_tasks_per_node} ]] && export NTHREADS_CYCLE=${max_tasks_per_node}
-    export APRUN_CYCLE="${APRUN} --cpus-per-task=${NTHREADS_CYCLE}"
+    export APRUN_CYCLE="${APRUN_default} --cpus-per-task=${NTHREADS_CYCLE}"
  ;;
  "eobs")
 
@@ -194,7 +199,7 @@ case ${step} in
 
     export NTHREADS_GSI=${NTHREADSmax}
     [[ ${NTHREADS_GSI} -gt ${max_threads_per_task} ]] && export NTHREADS_GSI=${max_threads_per_task}
-    export APRUN_GSI="${APRUN} --cpus-per-task=${NTHREADS_GSI}"
+    export APRUN_GSI="${APRUN_default} --cpus-per-task=${NTHREADS_GSI}"
  ;;
  "eupd")
 
@@ -220,7 +225,7 @@ case ${step} in
  "upp")
 
     export NTHREADS_UPP=${NTHREADS1}
-    export APRUN_UPP="${APRUN} --cpus-per-task=${NTHREADS_UPP}"
+    export APRUN_UPP="${APRUN_default} --cpus-per-task=${NTHREADS_UPP}"
  ;;
 
  "atmos_products")
@@ -237,7 +242,7 @@ case ${step} in
  "ecen")
 
     export NTHREADS_ECEN=${NTHREADSmax}
-    export APRUN_ECEN="${APRUN} --cpus-per-task=${NTHREADS_ECEN}"
+    export APRUN_ECEN="${APRUN_default} --cpus-per-task=${NTHREADS_ECEN}"
 
     export NTHREADS_CHGRES=${threads_per_task_chgres:-12}
     [[ ${NTHREADS_CHGRES} -gt ${max_tasks_per_node} ]] && export NTHREADS_CHGRES=${max_tasks_per_node}
@@ -245,23 +250,23 @@ case ${step} in
 
     export NTHREADS_CALCINC=${threads_per_task_calcinc:-1}
     [[ ${NTHREADS_CALCINC} -gt ${max_threads_per_task} ]] && export NTHREADS_CALCINC=${max_threads_per_task}
-    export APRUN_CALCINC="${APRUN} --cpus-per-task=${NTHREADS_CALCINC}"
+    export APRUN_CALCINC="${APRUN_default} --cpus-per-task=${NTHREADS_CALCINC}"
 
  ;;
  "esfc")
 
     export NTHREADS_ESFC=${NTHREADSmax}
-    export APRUN_ESFC="${APRUN} --cpus-per-task=${NTHREADS_ESFC}"
+    export APRUN_ESFC="${APRUN_default} --cpus-per-task=${NTHREADS_ESFC}"
 
     export NTHREADS_CYCLE=${threads_per_task_cycle:-14}
     [[ ${NTHREADS_CYCLE} -gt ${max_tasks_per_node} ]] && export NTHREADS_CYCLE=${max_tasks_per_node}
-    export APRUN_CYCLE="${APRUN} --cpus-per-task=${NTHREADS_CYCLE}"
+    export APRUN_CYCLE="${APRUN_default} --cpus-per-task=${NTHREADS_CYCLE}"
 
  ;;
  "epos")
 
     export NTHREADS_EPOS=${NTHREADSmax}
-    export APRUN_EPOS="${APRUN} --cpus-per-task=${NTHREADS_EPOS}"
+    export APRUN_EPOS="${APRUN_default} --cpus-per-task=${NTHREADS_EPOS}"
 
  ;;
  "postsnd")
@@ -269,7 +274,7 @@ case ${step} in
     export CFP_MP="YES"
 
     export NTHREADS_POSTSND=${NTHREADS1}
-    export APRUN_POSTSND="${APRUN} --cpus-per-task=${NTHREADS_POSTSND}"
+    export APRUN_POSTSND="${APRUN_default} --cpus-per-task=${NTHREADS_POSTSND}"
 
     export NTHREADS_POSTSNDCFP=${threads_per_task_postsndcfp:-1}
     [[ ${NTHREADS_POSTSNDCFP} -gt ${max_threads_per_task} ]] && export NTHREADS_POSTSNDCFP=${max_threads_per_task}
@@ -279,7 +284,7 @@ case ${step} in
  "awips")
 
     export NTHREADS_AWIPS=${NTHREADS1}
-    export APRUN_AWIPSCFP="${APRUN} ${mpmd_opt}"
+    export APRUN_AWIPSCFP="${APRUN_default} ${mpmd_opt}"
 
  ;;
  "gempak")
@@ -290,7 +295,7 @@ case ${step} in
  "fit2obs")
 
     export NTHREADS_FIT2OBS=${NTHREADS1}
-    export MPIRUN="${APRUN} --cpus-per-task=${NTHREADS_FIT2OBS}"
+    export MPIRUN="${APRUN_default} --cpus-per-task=${NTHREADS_FIT2OBS}"
 
  ;;
  *)
diff --git a/env/JET.env b/env/JET.env
index 4294a00de1..dbc249d4d6 100755
--- a/env/JET.env
+++ b/env/JET.env
@@ -27,7 +27,7 @@ if [[ -n "${ntasks:-}" && -n "${max_tasks_per_node:-}" && -n "${tasks_per_node:-
     NTHREADS1=${threads_per_task:-1}
     [[ ${NTHREADSmax} -gt ${max_threads_per_task} ]] && NTHREADSmax=${max_threads_per_task}
     [[ ${NTHREADS1} -gt ${max_threads_per_task} ]] && NTHREADS1=${max_threads_per_task}
-    APRUN="${launcher} -n ${ntasks}"
+    APRUN_default="${launcher} -n ${ntasks}"
 else
     echo "ERROR config.resources must be sourced before sourcing JET.env"
     exit 2
@@ -58,18 +58,18 @@ elif [[ "${step}" = "waveinit" ]] || [[ "${step}" = "waveprep" ]] || [[ "${step}
 elif [[ "${step}" = "atmanlvar" ]]; then
 
     export NTHREADS_ATMANLVAR=${NTHREADSmax}
-    export APRUN_ATMANLVAR="${APRUN}"
+    export APRUN_ATMANLVAR="${APRUN_default}"
 
 elif [[ "${step}" = "atmensanlobs" ]]; then
 
     export NTHREADS_ATMENSANLOBS=${NTHREADSmax}
-    export APRUN_ATMENSANLOBS="${APRUN}"
+    export APRUN_ATMENSANLOBS="${APRUN_default}"
 
 elif [[ "${step}" = "atmensanlsol" ]]; then
 
     export NTHREADS_ATMENSANLSOL=${NTHREADSmax}
-    export APRUN_ATMENSANLSOL="${APRUN}"
-	
+    export APRUN_ATMENSANLSOL="${APRUN_default}"
+
 elif [[ "${step}" = "atmensanlletkf" ]]; then
 
     export NTHREADS_ATMENSANLLETKF=${NTHREADSmax}
@@ -80,46 +80,51 @@ elif [[ "${step}" = "atmensanlfv3inc" ]]; then
     export NTHREADS_ATMENSANLFV3INC=${NTHREADSmax}
     export APRUN_ATMENSANLFV3INC="${launcher} ${ntasks}"
 
-elif [[ "${step}" = "aeroanlrun" ]]; then
+elif [[ "${step}" = "aeroanlvar" ]]; then
+
+    export NTHREADS_AEROANL=${NTHREADSmax}
+    export APRUN_AEROANL="${APRUN_default}"
+
+elif [[ "${step}" = "aeroanlgenb" ]]; then
 
     export APRUNCFP="${launcher} -n \$ncmd ${mpmd_opt}"
 
-    export NTHREADS_AEROANL=${NTHREADSmax}
-    export APRUN_AEROANL="${APRUN}"
+    export NTHREADS_AEROANLGENB=${NTHREADSmax}
+    export APRUN_AEROANLGENB="${APRUN_default} --cpus-per-task=${NTHREADS_AEROANLGENB}"
 
 elif [[ "${step}" = "prepobsaero" ]]; then
 
     export NTHREADS_PREPOBSAERO=${NTHREADS1}
-    export APRUN_PREPOBSAERO="${APRUN} --cpus-per-task=${NTHREADS_PREPOBSAERO}"
+    export APRUN_PREPOBSAERO="${APRUN_default} --cpus-per-task=${NTHREADS_PREPOBSAERO}"
 
 elif [[ "${step}" = "snowanl" ]]; then
 
     export NTHREADS_SNOWANL=${NTHREADSmax}
-    export APRUN_SNOWANL="${APRUN}"
+    export APRUN_SNOWANL="${APRUN_default}"
 
     export APRUN_APPLY_INCR="${launcher} -n 6"
 
 elif [[ "${step}" = "esnowrecen" ]]; then
 
     export NTHREADS_ESNOWRECEN=${NTHREADSmax}
-    export APRUN_ESNOWRECEN="${APRUN} --cpus-per-task=${NTHREADS_ESNOWRECEN}"
+    export APRUN_ESNOWRECEN="${APRUN_default} --cpus-per-task=${NTHREADS_ESNOWRECEN}"
 
     export APRUN_APPLY_INCR="${launcher} -n 6"
 
 elif [[ "${step}" = "atmanlfv3inc" ]]; then
 
     export NTHREADS_ATMANLFV3INC=${NTHREADSmax}
-    export APRUN_ATMANLFV3INC="${APRUN}"
+    export APRUN_ATMANLFV3INC="${APRUN_default}"
 
 elif [[ "${step}" = "marinebmat" ]]; then
 
     export APRUNCFP="${launcher} -n \$ncmd ${mpmd_opt}"
-    export APRUN_MARINEBMAT="${APRUN}"
+    export APRUN_MARINEBMAT="${APRUN_default}"
 
-elif [[ "${step}" = "ocnanalrun" ]]; then
+elif [[ "${step}" = "marineanlvar" ]]; then
 
     export APRUNCFP="${launcher} -n \$ncmd ${mpmd_opt}"
-    export APRUN_OCNANAL="${APRUN}"
+    export APRUN_MARINEANLVAR="${APRUN_default}"
 
 elif [[ "${step}" = "anal" ]] || [[ "${step}" = "analcalc" ]]; then
 
@@ -131,7 +136,7 @@ elif [[ "${step}" = "anal" ]] || [[ "${step}" = "analcalc" ]]; then
     export APRUNCFP="${launcher} -n \$ncmd ${mpmd_opt}"
 
     export NTHREADS_GSI=${threads_per_task_anal:-${max_threads_per_task}}
-    export APRUN_GSI="${APRUN}"
+    export APRUN_GSI="${APRUN_default}"
 
     export NTHREADS_CALCINC=${threads_per_task_calcinc:-1}
     [[ ${NTHREADS_CALCINC} -gt ${max_threads_per_task} ]] && export NTHREADS_CALCINC=${max_threads_per_task}
@@ -149,7 +154,7 @@ elif [[ "${step}" = "anal" ]] || [[ "${step}" = "analcalc" ]]; then
 elif [[ "${step}" = "sfcanl" ]]; then
     export NTHREADS_CYCLE=${threads_per_task:-14}
     [[ ${NTHREADS_CYCLE} -gt ${max_tasks_per_node} ]] && export NTHREADS_CYCLE=${max_tasks_per_node}
-    export APRUN_CYCLE="${APRUN}"
+    export APRUN_CYCLE="${APRUN_default}"
 
 elif [[ "${step}" = "eobs" ]]; then
 
@@ -157,7 +162,7 @@ elif [[ "${step}" = "eobs" ]]; then
     export MKL_CBWR=AUTO
 
     export NTHREADS_GSI=${NTHREADSmax}
-    export APRUN_GSI="${APRUN}"
+    export APRUN_GSI="${APRUN_default}"
 
     export CFP_MP=${CFP_MP:-"YES"}
     export USE_CFP=${USE_CFP:-"YES"}
@@ -183,7 +188,7 @@ elif [[ "${step}" = "fcst" ]] || [[ "${step}" = "efcs" ]]; then
 elif [[ "${step}" = "upp" ]]; then
 
     export NTHREADS_UPP=${NTHREADS1}
-    export APRUN_UPP="${APRUN}"
+    export APRUN_UPP="${APRUN_default}"
 
 elif [[ "${step}" = "atmos_products" ]]; then
 
@@ -197,7 +202,7 @@ elif [[ "${step}" = "oceanice_products" ]]; then
 elif [[ "${step}" = "ecen" ]]; then
 
     export NTHREADS_ECEN=${NTHREADSmax}
-    export APRUN_ECEN="${APRUN}"
+    export APRUN_ECEN="${APRUN_default}"
 
     export NTHREADS_CHGRES=${threads_per_task_chgres:-12}
     [[ ${NTHREADS_CHGRES} -gt ${max_tasks_per_node} ]] && export NTHREADS_CHGRES=${max_tasks_per_node}
@@ -205,28 +210,28 @@ elif [[ "${step}" = "ecen" ]]; then
 
     export NTHREADS_CALCINC=${threads_per_task_calcinc:-1}
     [[ ${NTHREADS_CALCINC} -gt ${max_threads_per_task} ]] && export NTHREADS_CALCINC=${max_threads_per_task}
-    export APRUN_CALCINC="${APRUN}"
+    export APRUN_CALCINC="${APRUN_default}"
 
 elif [[ "${step}" = "esfc" ]]; then
 
     export NTHREADS_ESFC=${NTHREADSmax}
-    export APRUN_ESFC="${APRUN}"
+    export APRUN_ESFC="${APRUN_default}"
 
     export NTHREADS_CYCLE=${threads_per_task_cycle:-14}
     [[ ${NTHREADS_CYCLE} -gt ${max_tasks_per_node} ]] && export NTHREADS_CYCLE=${max_tasks_per_node}
-    export APRUN_CYCLE="${APRUN}"
+    export APRUN_CYCLE="${APRUN_default}"
 
 elif [[ "${step}" = "epos" ]]; then
 
     export NTHREADS_EPOS=${NTHREADSmax}
-    export APRUN_EPOS="${APRUN}"
+    export APRUN_EPOS="${APRUN_default}"
 
 elif [[ "${step}" = "postsnd" ]]; then
 
     export CFP_MP="YES"
 
     export NTHREADS_POSTSND=${NTHREADS1}
-    export APRUN_POSTSND="${APRUN}"
+    export APRUN_POSTSND="${APRUN_default}"
 
     export NTHREADS_POSTSNDCFP=${threads_per_task_postsndcfp:-1}
     [[ ${NTHREADS_POSTSNDCFP} -gt ${max_threads_per_task} ]] && export NTHREADS_POSTSNDCFP=${max_threads_per_task}
@@ -243,6 +248,6 @@ elif [[ "${step}" = "gempak" ]]; then
 elif [[ "${step}" = "fit2obs" ]]; then
 
     export NTHREADS_FIT2OBS=${NTHREADS1}
-    export MPIRUN="${APRUN}"
+    export MPIRUN="${APRUN_default}"
 
 fi
diff --git a/env/ORION.env b/env/ORION.env
index 7838d28640..3b8053d060 100755
--- a/env/ORION.env
+++ b/env/ORION.env
@@ -34,7 +34,7 @@ if [[ -n "${ntasks:-}" && -n "${max_tasks_per_node:-}" && -n "${tasks_per_node:-
     NTHREADS1=${threads_per_task:-1}
     [[ ${NTHREADSmax} -gt ${max_threads_per_task} ]] && NTHREADSmax=${max_threads_per_task}
     [[ ${NTHREADS1} -gt ${max_threads_per_task} ]] && NTHREADS1=${max_threads_per_task}
-    APRUN="${launcher} -n ${ntasks}"
+    APRUN_default="${launcher} -n ${ntasks}"
 else
     echo "ERROR config.resources must be sourced before sourcing ORION.env"
     exit 2
@@ -66,87 +66,93 @@ elif [[ "${step}" = "waveinit" ]] || [[ "${step}" = "waveprep" ]] || [[ "${step}
 elif [[ "${step}" = "atmanlvar" ]]; then
 
     export NTHREADS_ATMANLVAR=${NTHREADSmax}
-    export APRUN_ATMANLVAR="${APRUN} --cpus-per-task=${NTHREADS_ATMANLVAR}"
+    export APRUN_ATMANLVAR="${APRUN_default} --cpus-per-task=${NTHREADS_ATMANLVAR}"
 
 elif [[ "${step}" = "atmensanlobs" ]]; then
 
     export NTHREADS_ATMENSANLOBS=${NTHREADSmax}
-    export APRUN_ATMENSANLOBS="${APRUN} --cpus-per-task=${NTHREADS_ATMENSANLOBS}"
+    export APRUN_ATMENSANLOBS="${APRUN_default} --cpus-per-task=${NTHREADS_ATMENSANLOBS}"
 
 elif [[ "${step}" = "atmensanlsol" ]]; then
 
     export NTHREADS_ATMENSANLSOL=${NTHREADSmax}
-    export APRUN_ATMENSANLSOL="${APRUN} --cpus-per-task=${NTHREADS_ATMENSANLSOL}"
+    export APRUN_ATMENSANLSOL="${APRUN_default} --cpus-per-task=${NTHREADS_ATMENSANLSOL}"
 elif [[ "${step}" = "atmensanlletkf" ]]; then
 
     export NTHREADS_ATMENSANLLETKF=${NTHREADSmax}
-    export APRUN_ATMENSANLLETKF="${APRUN} --cpus-per-task=${NTHREADS_ATMENSANLLETKF}"
+    export APRUN_ATMENSANLLETKF="${APRUN_default} --cpus-per-task=${NTHREADS_ATMENSANLLETKF}"
 
 elif [[ "${step}" = "atmensanlfv3inc" ]]; then
 
     export NTHREADS_ATMENSANLFV3INC=${NTHREADSmax}
-    export APRUN_ATMENSANLFV3INC="${APRUN} --cpus-per-task=${NTHREADS_ATMENSANLFV3INC}"
+    export APRUN_ATMENSANLFV3INC="${APRUN_default} --cpus-per-task=${NTHREADS_ATMENSANLFV3INC}"
 
-elif [[ "${step}" = "aeroanlrun" ]]; then
+elif [[ "${step}" = "aeroanlvar" ]]; then
 
     export APRUNCFP="${launcher} -n \$ncmd ${mpmd_opt}"
 
     export NTHREADS_AEROANL=${NTHREADSmax}
-    export APRUN_AEROANL="${APRUN} --cpus-per-task=${NTHREADS_AEROANL}"
+    export APRUN_AEROANL="${APRUN_default} --cpus-per-task=${NTHREADS_AEROANL}"
+
+elif [[ "${step}" = "aeroanlgenb" ]]; then
+
+    export NTHREADS_AEROANLGENB=${NTHREADSmax}
+    export APRUN_AEROANLGENB="${APRUN_default} --cpus-per-task=${NTHREADS_AEROANLGENB}"
 
 elif [[ "${step}" = "prepobsaero" ]]; then
 
     export NTHREADS_PREPOBSAERO=${NTHREADS1}
-    export APRUN_PREPOBSAERO="${APRUN} --cpus-per-task=${NTHREADS_PREPOBSAERO}"
+    export APRUN_PREPOBSAERO="${APRUN_default} --cpus-per-task=${NTHREADS_PREPOBSAERO}"
 
 elif [[ "${step}" = "snowanl" ]]; then
 
     export NTHREADS_SNOWANL=${NTHREADSmax}
-    export APRUN_SNOWANL="${APRUN} --cpus-per-task=${NTHREADS_SNOWANL}"
+    export APRUN_SNOWANL="${APRUN_default} --cpus-per-task=${NTHREADS_SNOWANL}"
 
     export APRUN_APPLY_INCR="${launcher} -n 6"
 
 elif [[ "${step}" = "esnowrecen" ]]; then
 
     export NTHREADS_ESNOWRECEN=${NTHREADSmax}
-    export APRUN_ESNOWRECEN="${APRUN} --cpus-per-task=${NTHREADS_ESNOWRECEN}"
+    export APRUN_ESNOWRECEN="${APRUN_default} --cpus-per-task=${NTHREADS_ESNOWRECEN}"
 
     export APRUN_APPLY_INCR="${launcher} -n 6"
 
 elif [[ "${step}" = "atmanlfv3inc" ]]; then
 
     export NTHREADS_ATMANLFV3INC=${NTHREADSmax}
-    export APRUN_ATMANLFV3INC="${APRUN} --cpus-per-task=${NTHREADS_ATMANLFV3INC}"
+    export APRUN_ATMANLFV3INC="${APRUN_default} --cpus-per-task=${NTHREADS_ATMANLFV3INC}"
 
 elif [[ "${step}" = "marinebmat" ]]; then
 
     export APRUNCFP="${launcher} -n \$ncmd ${mpmd_opt}"
 
     export NTHREADS_MARINEBMAT=${NTHREADSmax}
-    export APRUN_MARINEBMAT="${APRUN}"
+    export APRUN_MARINEBMAT="${APRUN_default}"
 
-elif [[ "${step}" = "ocnanalrun" ]]; then
+elif [[ "${step}" = "marineanlvar" ]]; then
 
     export APRUNCFP="${launcher} -n \$ncmd ${mpmd_opt}"
 
-    export APRUN_OCNANAL="${APRUN}"
+    export APRUN_MARINEANLVAR="${APRUN_default}"
 
-elif [[ "${step}" = "ocnanalchkpt" ]]; then
+elif [[ "${step}" = "marineanlchkpt" ]]; then
 
     export APRUNCFP="${launcher} -n \$ncmd ${mpmd_opt}"
 
     export NTHREADS_OCNANAL=${NTHREADSmax}
-    export APRUN_OCNANAL="${APRUN} --cpus-per-task=${NTHREADS_OCNANAL}"
+
+    export APRUN_MARINEANLCHKPT="${APRUN_default} --cpus-per-task=${NTHREADS_OCNANAL}"
 
 elif [[ "${step}" = "ocnanalecen" ]]; then
 
     export NTHREADS_OCNANALECEN=${NTHREADSmax}
-    export APRUN_OCNANALECEN="${APRUN} --cpus-per-task=${NTHREADS_OCNANALECEN}"
+    export APRUN_OCNANALECEN="${APRUN_default} --cpus-per-task=${NTHREADS_OCNANALECEN}"
 
 elif [[ "${step}" = "marineanalletkf" ]]; then
 
     export NTHREADS_MARINEANALLETKF=${NTHREADSmax}
-    export APRUN_MARINEANALLETKF="${APRUN} --cpus-per-task=${NTHREADS_MARINEANALLETKF}"
+    export APRUN_MARINEANALLETKF="${APRUN_default} --cpus-per-task=${NTHREADS_MARINEANALLETKF}"
 
 elif [[ "${step}" = "anal" ]] || [[ "${step}" = "analcalc" ]]; then
 
@@ -158,7 +164,7 @@ elif [[ "${step}" = "anal" ]] || [[ "${step}" = "analcalc" ]]; then
     export APRUNCFP="${launcher} -n \$ncmd ${mpmd_opt}"
 
     export NTHREADS_GSI=${NTHREADSmax}
-    export APRUN_GSI="${APRUN} --cpus-per-task=${NTHREADS_GSI}"
+    export APRUN_GSI="${APRUN_default} --cpus-per-task=${NTHREADS_GSI}"
 
     export NTHREADS_CALCINC=${threads_per_task_calcinc:-1}
     [[ ${NTHREADS_CALCINC} -gt ${max_threads_per_task} ]] && export NTHREADS_CALCINC=${max_threads_per_task}
@@ -176,7 +182,7 @@ elif [[ "${step}" = "anal" ]] || [[ "${step}" = "analcalc" ]]; then
 elif [[ "${step}" = "sfcanl" ]]; then
     export NTHREADS_CYCLE=${threads_per_task:-14}
     [[ ${NTHREADS_CYCLE} -gt ${max_tasks_per_node} ]] && export NTHREADS_CYCLE=${max_tasks_per_node}
-    export APRUN_CYCLE="${APRUN} --cpus-per-task=${NTHREADS_CYCLE}"
+    export APRUN_CYCLE="${APRUN_default} --cpus-per-task=${NTHREADS_CYCLE}"
 
 elif [[ "${step}" = "eobs" ]]; then
 
@@ -189,7 +195,7 @@ elif [[ "${step}" = "eobs" ]]; then
 
     export NTHREADS_GSI=${NTHREADSmax}
     [[ ${NTHREADS_GSI} -gt ${max_threads_per_task} ]] && export NTHREADS_GSI=${max_threads_per_task}
-    export APRUN_GSI="${APRUN} --cpus-per-task=${NTHREADS_GSI}"
+    export APRUN_GSI="${APRUN_default} --cpus-per-task=${NTHREADS_GSI}"
 
 elif [[ "${step}" = "eupd" ]]; then
 
@@ -211,7 +217,7 @@ elif [[ "${step}" = "fcst" ]] || [[ "${step}" = "efcs" ]]; then
 elif [[ "${step}" = "upp" ]]; then
 
     export NTHREADS_UPP=${NTHREADS1}
-    export APRUN_UPP="${APRUN} --cpus-per-task=${NTHREADS_UPP}"
+    export APRUN_UPP="${APRUN_default} --cpus-per-task=${NTHREADS_UPP}"
 
 elif [[ "${step}" = "atmos_products" ]]; then
 
@@ -225,7 +231,7 @@ elif [[ "${step}" = "oceanice_products" ]]; then
 elif [[ "${step}" = "ecen" ]]; then
 
     export NTHREADS_ECEN=${NTHREADSmax}
-    export APRUN_ECEN="${APRUN} --cpus-per-task=${NTHREADS_ECEN}"
+    export APRUN_ECEN="${APRUN_default} --cpus-per-task=${NTHREADS_ECEN}"
 
     export NTHREADS_CHGRES=${threads_per_task:-12}
     [[ ${NTHREADS_CHGRES} -gt ${max_tasks_per_node} ]] && export NTHREADS_CHGRES=${max_tasks_per_node}
@@ -233,28 +239,28 @@ elif [[ "${step}" = "ecen" ]]; then
 
     export NTHREADS_CALCINC=${threads_per_task_calcinc:-1}
     [[ ${NTHREADS_CALCINC} -gt ${max_threads_per_task} ]] && export NTHREADS_CALCINC=${max_threads_per_task}
-    export APRUN_CALCINC="${APRUN} --cpus-per-task=${NTHREADS_CALCINC}"
+    export APRUN_CALCINC="${APRUN_default} --cpus-per-task=${NTHREADS_CALCINC}"
 
 elif [[ "${step}" = "esfc" ]]; then
 
     export NTHREADS_ESFC=${NTHREADSmax}
-    export APRUN_ESFC="${APRUN} --cpus-per-task=${NTHREADS_ESFC}"
+    export APRUN_ESFC="${APRUN_default} --cpus-per-task=${NTHREADS_ESFC}"
 
     export NTHREADS_CYCLE=${threads_per_task_cycle:-14}
     [[ ${NTHREADS_CYCLE} -gt ${max_tasks_per_node} ]] && export NTHREADS_CYCLE=${max_tasks_per_node}
-    export APRUN_CYCLE="${APRUN} --cpus-per-task=${NTHREADS_CYCLE}"
+    export APRUN_CYCLE="${APRUN_default} --cpus-per-task=${NTHREADS_CYCLE}"
 
 elif [[ "${step}" = "epos" ]]; then
 
     export NTHREADS_EPOS=${NTHREADSmax}
-    export APRUN_EPOS="${APRUN} --cpus-per-task=${NTHREADS_EPOS}"
+    export APRUN_EPOS="${APRUN_default} --cpus-per-task=${NTHREADS_EPOS}"
 
 elif [[ "${step}" = "postsnd" ]]; then
 
     export CFP_MP="YES"
 
     export NTHREADS_POSTSND=${NTHREADS1}
-    export APRUN_POSTSND="${APRUN} --cpus-per-task=${NTHREADS_POSTSND}"
+    export APRUN_POSTSND="${APRUN_default} --cpus-per-task=${NTHREADS_POSTSND}"
 
     export NTHREADS_POSTSNDCFP=${threads_per_task_postsndcfp:-1}
     [[ ${NTHREADS_POSTSNDCFP} -gt ${max_threads_per_task} ]] && export NTHREADS_POSTSNDCFP=${max_threads_per_task}
@@ -263,7 +269,7 @@ elif [[ "${step}" = "postsnd" ]]; then
 elif [[ "${step}" = "awips" ]]; then
 
     export NTHREADS_AWIPS=${NTHREADS1}
-    export APRUN_AWIPSCFP="${APRUN} ${mpmd_opt}"
+    export APRUN_AWIPSCFP="${APRUN_default} ${mpmd_opt}"
 
 elif [[ "${step}" = "gempak" ]]; then
 
@@ -272,6 +278,6 @@ elif [[ "${step}" = "gempak" ]]; then
 elif [[ "${step}" = "fit2obs" ]]; then
 
     export NTHREADS_FIT2OBS=${NTHREADS1}
-    export MPIRUN="${APRUN} --cpus-per-task=${NTHREADS_FIT2OBS}"
+    export MPIRUN="${APRUN_default} --cpus-per-task=${NTHREADS_FIT2OBS}"
 
 fi
diff --git a/env/S4.env b/env/S4.env
index a29ec49fb4..5d5ffd23b1 100755
--- a/env/S4.env
+++ b/env/S4.env
@@ -27,7 +27,7 @@ if [[ -n "${ntasks:-}" && -n "${max_tasks_per_node:-}" && -n "${tasks_per_node:-
     NTHREADS1=${threads_per_task:-1}
     [[ ${NTHREADSmax} -gt ${max_threads_per_task} ]] && NTHREADSmax=${max_threads_per_task}
     [[ ${NTHREADS1} -gt ${max_threads_per_task} ]] && NTHREADS1=${max_threads_per_task}
-    APRUN="${launcher} -n ${ntasks}"
+    APRUN_default="${launcher} -n ${ntasks}"
 else
     echo "ERROR config.resources must be sourced before sourcing S4.env"
     exit 2
@@ -42,11 +42,11 @@ if [[ "${step}" = "prep" ]] || [[ "${step}" = "prepbufr" ]]; then
 
 elif [[ "${step}" = "prepsnowobs" ]]; then
 
-    export APRUN_CALCFIMS="${APRUN}"
+    export APRUN_CALCFIMS="${APRUN_default}"
 
 elif [[ "${step}" = "prep_emissions" ]]; then
 
-    export APRUN="${APRUN}"
+    export APRUN="${APRUN_default}"
 
 elif [[ "${step}" = "waveinit" ]] || [[ "${step}" = "waveprep" ]] || [[ "${step}" = "wavepostsbs" ]] || [[ "${step}" = "wavepostbndpnt" ]] || [[ "${step}" = "wavepostbndpntbll" ]] || [[ "${step}" = "wavepostpnt" ]]; then
 
@@ -58,58 +58,63 @@ elif [[ "${step}" = "waveinit" ]] || [[ "${step}" = "waveprep" ]] || [[ "${step}
 elif [[ "${step}" = "atmanlvar" ]]; then
 
     export NTHREADS_ATMANLVAR=${NTHREADSmax}
-    export APRUN_ATMANLVAR="${APRUN}"
+    export APRUN_ATMANLVAR="${APRUN_default}"
 
 elif [[ "${step}" = "atmensanlobs" ]]; then
 
     export NTHREADS_ATMENSANLOBS=${NTHREADSmax}
-    export APRUN_ATMENSANLOBS="${APRUN}"
+    export APRUN_ATMENSANLOBS="${APRUN_default}"
 
 elif [[ "${step}" = "atmensanlsol" ]]; then
 
     export NTHREADS_ATMENSANLSOL=${NTHREADSmax}
-    export APRUN_ATMENSANLSOL="${APRUN}"
+    export APRUN_ATMENSANLSOL="${APRUN_default}"
 
 elif [[ "${step}" = "atmensanlletkf" ]]; then
 
     export NTHREADS_ATMENSANLLETKF=${NTHREADSmax}
-    export APRUN_ATMENSANLLETKF="${APRUN}"
+    export APRUN_ATMENSANLLETKF="${APRUN_default}"
 
 elif [[ "${step}" = "atmensanlfv3inc" ]]; then
 
     export NTHREADS_ATMENSANLFV3INC=${NTHREADSmax}
-    export APRUN_ATMENSANLFV3INC="${APRUN}"
+    export APRUN_ATMENSANLFV3INC="${APRUN_default}"
 
-elif [[ "${step}" = "aeroanlrun" ]]; then
+elif [[ "${step}" = "aeroanlvar" ]]; then
 
     export APRUNCFP="${launcher} -n \$ncmd ${mpmd_opt}"
 
     export NTHREADS_AEROANL=${NTHREADSmax}
-    export APRUN_AEROANL="${APRUN}"
+    export APRUN_AEROANL="${APRUN_default}"
+
+elif [[ "${step}" = "aeroanlgenb" ]]; then
+
+    export NTHREADS_AEROANLGENB=${NTHREADSmax}
+    export APRUN_AEROANLGENB="${APRUN_default} --cpus-per-task=${NTHREADS_AEROANLGENB}"
 
 elif [[ "${step}" = "prepobsaero" ]]; then
 
     export NTHREADS_PREPOBSAERO=${NTHREADS1}
-    export APRUN_PREPOBSAERO="${APRUN} --cpus-per-task=${NTHREADS_PREPOBSAERO}"
+    export APRUN_PREPOBSAERO="${APRUN_default} --cpus-per-task=${NTHREADS_PREPOBSAERO}"
 
 elif [[ "${step}" = "snowanl" ]]; then
 
     export NTHREADS_SNOWANL=${NTHREADSmax}
-    export APRUN_SNOWANL="${APRUN}"
+    export APRUN_SNOWANL="${APRUN_default}"
 
     export APRUN_APPLY_INCR="${launcher} -n 6"
 
 elif [[ "${step}" = "esnowrecen" ]]; then
 
     export NTHREADS_ESNOWRECEN=${NTHREADSmax}
-    export APRUN_ESNOWRECEN="${APRUN} --cpus-per-task=${NTHREADS_ESNOWRECEN}"
+    export APRUN_ESNOWRECEN="${APRUN_default} --cpus-per-task=${NTHREADS_ESNOWRECEN}"
 
     export APRUN_APPLY_INCR="${launcher} -n 6"
 
 elif [[ "${step}" = "atmanlfv3inc" ]]; then
 
     export NTHREADS_ATMANLFV3INC=${NTHREADSmax}
-    export APRUN_ATMANLFV3INC="${APRUN}"
+    export APRUN_ATMANLFV3INC="${APRUN_default}"
 
 elif [[ "${step}" = "marinebmat" ]]; then
      echo "WARNING: ${step} is not enabled on S4!"
@@ -127,7 +132,7 @@ elif [[ "${step}" = "anal" ]] || [[ "${step}" = "analcalc" ]]; then
     export APRUNCFP="${launcher} -n \$ncmd ${mpmd_opt}"
 
     export NTHREADS_GSI=${NTHREADSmax}
-    export APRUN_GSI="${APRUN}"
+    export APRUN_GSI="${APRUN_default}"
 
     export NTHREADS_CALCINC=${threads_per_task_calcinc:-1}
     [[ ${NTHREADS_CALCINC} -gt ${max_threads_per_task} ]] && export NTHREADS_CALCINC=${max_threads_per_task}
@@ -146,7 +151,7 @@ elif [[ "${step}" = "anal" ]] || [[ "${step}" = "analcalc" ]]; then
 elif [[ "${step}" = "sfcanl" ]]; then
     export NTHREADS_CYCLE=${threads_per_task:-14}
     [[ ${NTHREADS_CYCLE} -gt ${max_tasks_per_node} ]] && export NTHREADS_CYCLE=${max_tasks_per_node}
-    export APRUN_CYCLE="${APRUN}"
+    export APRUN_CYCLE="${APRUN_default}"
 
 elif [[ "${step}" = "eobs" ]]; then
 
@@ -154,7 +159,7 @@ elif [[ "${step}" = "eobs" ]]; then
     export MKL_CBWR=AUTO
 
     export NTHREADS_GSI=${NTHREADSmax}
-    export APRUN_GSI="${APRUN}"
+    export APRUN_GSI="${APRUN_default}"
 
     export CFP_MP=${CFP_MP:-"YES"}
     export USE_CFP=${USE_CFP:-"YES"}
@@ -181,7 +186,7 @@ elif [[ "${step}" = "upp" ]]; then
 
     export NTHREADS_UPP=${NTHREADS1}
     export OMP_NUM_THREADS="${NTHREADS_UPP}"
-    export APRUN_UPP="${APRUN}"
+    export APRUN_UPP="${APRUN_default}"
 
 elif [[ "${step}" = "atmos_products" ]]; then
 
@@ -195,7 +200,7 @@ elif [[ "${step}" = "oceanice_products" ]]; then
 elif [[ "${step}" = "ecen" ]]; then
 
     export NTHREADS_ECEN=${NTHREADSmax}
-    export APRUN_ECEN="${APRUN}"
+    export APRUN_ECEN="${APRUN_default}"
 
     export NTHREADS_CHGRES=${threads_per_task_chgres:-12}
     [[ ${NTHREADS_CHGRES} -gt ${max_tasks_per_node} ]] && export NTHREADS_CHGRES=${max_tasks_per_node}
@@ -203,25 +208,25 @@ elif [[ "${step}" = "ecen" ]]; then
 
     export NTHREADS_CALCINC=${threads_per_task_calcinc:-1}
     [[ ${NTHREADS_CALCINC} -gt ${max_threads_per_task} ]] && export NTHREADS_CALCINC=${max_threads_per_task}
-    export APRUN_CALCINC="${APRUN}"
+    export APRUN_CALCINC="${APRUN_default}"
 
 elif [[ "${step}" = "esfc" ]]; then
 
     export NTHREADS_ESFC=${NTHREADSmax}
-    export APRUN_ESFC="${APRUN}"
+    export APRUN_ESFC="${APRUN_default}"
 
     export NTHREADS_CYCLE=${threads_per_task_cycle:-14}
     [[ ${NTHREADS_CYCLE} -gt ${max_tasks_per_node} ]] && export NTHREADS_CYCLE=${max_tasks_per_node}
-    export APRUN_CYCLE="${APRUN}"
+    export APRUN_CYCLE="${APRUN_default}"
 
 elif [[ "${step}" = "epos" ]]; then
 
     export NTHREADS_EPOS=${NTHREADSmax}
-    export APRUN_EPOS="${APRUN}"
+    export APRUN_EPOS="${APRUN_default}"
 
 elif [[ "${step}" = "fit2obs" ]]; then
 
     export NTHREADS_FIT2OBS=${NTHREADS1}
-    export MPIRUN="${APRUN}"
+    export MPIRUN="${APRUN_default}"
 
 fi
diff --git a/env/WCOSS2.env b/env/WCOSS2.env
index adff54d636..cea24fb26b 100755
--- a/env/WCOSS2.env
+++ b/env/WCOSS2.env
@@ -21,7 +21,7 @@ if [[ -n "${ntasks:-}" && -n "${max_tasks_per_node:-}" && -n "${tasks_per_node:-
     NTHREADS1=${threads_per_task:-1}
     [[ ${NTHREADSmax} -gt ${max_threads_per_task} ]] && NTHREADSmax=${max_threads_per_task}
     [[ ${NTHREADS1} -gt ${max_threads_per_task} ]] && NTHREADS1=${max_threads_per_task}
-    APRUN="${launcher} -n ${ntasks}"
+    APRUN_default="${launcher} -n ${ntasks}"
 else
     echo "ERROR config.resources must be sourced before sourcing WCOSS2.env"
     exit 2
@@ -36,11 +36,11 @@ if [[ "${step}" = "prep" ]] || [[ "${step}" = "prepbufr" ]]; then
 
 elif [[ "${step}" = "prepsnowobs" ]]; then
 
-    export APRUN_CALCFIMS="${APRUN}"
+    export APRUN_CALCFIMS="${APRUN_default}"
 
 elif [[ "${step}" = "prep_emissions" ]]; then
 
-    export APRUN="${APRUN}"
+    export APRUN="${APRUN_default}"
 
 elif [[ "${step}" = "waveinit" ]] || [[ "${step}" = "waveprep" ]] || [[ "${step}" = "wavepostsbs" ]] || [[ "${step}" = "wavepostbndpnt" ]] || [[ "${step}" = "wavepostbndpntbll"  ]] || [[ "${step}" = "wavepostpnt" ]]; then
 
@@ -51,85 +51,90 @@ elif [[ "${step}" = "waveinit" ]] || [[ "${step}" = "waveprep" ]] || [[ "${step}
 elif [[ "${step}" = "atmanlvar" ]]; then
 
     export NTHREADS_ATMANLVAR=${NTHREADSmax}
-    export APRUN_ATMANLVAR="${APRUN}"
+    export APRUN_ATMANLVAR="${APRUN_default}"
 
 elif [[ "${step}" = "atmensanlobs"  ]]; then
 
     export NTHREADS_ATMENSANLOBS=${NTHREADSmax}
-    export APRUN_ATMENSANLOBS="${APRUN}"
+    export APRUN_ATMENSANLOBS="${APRUN_default}"
 
 elif [[ "${step}" = "atmensanlsol" ]]; then
 
     export NTHREADS_ATMENSANLSOL=${NTHREADSmax}
-    export APRUN_ATMENSANLSOL="${APRUN}"
+    export APRUN_ATMENSANLSOL="${APRUN_default}"
 
 elif [[ "${step}" = "atmensanlletkf" ]]; then
 
     export NTHREADS_ATMENSANLLETKF=${NTHREADSmax}
-    export APRUN_ATMENSANLLETKF="${APRUN}"
+    export APRUN_ATMENSANLLETKF="${APRUN_default}"
 
 elif [[ "${step}" = "atmensanlfv3inc" ]]; then
 
     export NTHREADS_ATMENSANLFV3INC=${NTHREADSmax}
-    export APRUN_ATMENSANLFV3INC="${APRUN}"
+    export APRUN_ATMENSANLFV3INC="${APRUN_default}"
 
-elif [[ "${step}" = "aeroanlrun" ]]; then
+elif [[ "${step}" = "aeroanlvar" ]]; then
 
     export APRUNCFP="${launcher} -np \$ncmd ${mpmd_opt}"
 
     export NTHREADS_AEROANL=${NTHREADSmax}
-    export APRUN_AEROANL="${APRUN}"
+    export APRUN_AEROANL="${APRUN_default}"
+
+elif [[ "${step}" = "aeroanlgenb" ]]; then
+
+    export NTHREADS_AEROANLGENB=${NTHREADSmax}
+    export APRUN_AEROANLGENB="${APRUN_default}"
 
 elif [[ "${step}" = "prepobsaero" ]]; then
 
     export NTHREADS_PREPOBSAERO=${NTHREADS1}
-    export APRUN_PREPOBSAERO="${APRUN} --ppn ${tasks_per_node}--cpu-bind depth --depth=${NTHREADS_PREPOBSAERO}"
+    export APRUN_PREPOBSAERO="${APRUN_default} --ppn ${tasks_per_node}--cpu-bind depth --depth=${NTHREADS_PREPOBSAERO}"
 
 elif [[ "${step}" = "snowanl" ]]; then
 
     export NTHREADS_SNOWANL=${NTHREADSmax}
-    export APRUN_SNOWANL="${APRUN}"
+    export APRUN_SNOWANL="${APRUN_default}"
 
     export APRUN_APPLY_INCR="${launcher} -n 6"
 
 elif [[ "${step}" = "esnowrecen" ]]; then
 
     export NTHREADS_ESNOWRECEN=${NTHREADSmax}
-    export APRUN_ESNOWRECEN="${APRUN}"
+    export APRUN_ESNOWRECEN="${APRUN_default}"
 
     export APRUN_APPLY_INCR="${launcher} -n 6"
 
 elif [[ "${step}" = "marinebmat" ]]; then
 
     export APRUNCFP="${launcher} -n \$ncmd --multi-prog"
-    export APRUN_MARINEBMAT="${APRUN}"
+    export APRUN_MARINEBMAT="${APRUN_default}"
 
 elif [[ "${step}" = "ocnanalrun" ]]; then
 
     export APRUNCFP="${launcher} -n \$ncmd --multi-prog"
 
-    export APRUN_OCNANAL="${APRUN}"
+    export APRUN_OCNANAL="${APRUN_default}"
 
 elif [[ "${step}" = "ocnanalchkpt" ]]; then
 
     export APRUNCFP="${launcher} -n \$ncmd --multi-prog"
 
-    export APRUN_OCNANAL="${APRUN}"
+    export APRUN_OCNANAL="${APRUN_default}"
 
 elif [[ "${step}" = "ocnanalecen" ]]; then
 
     export NTHREADS_OCNANALECEN=${NTHREADSmax}
-    export APRUN_OCNANALECEN="${APRUN} --cpus-per-task=${NTHREADS_OCNANALECEN}"
+    export APRUN_OCNANALECEN="${APRUN_default} --cpus-per-task=${NTHREADS_OCNANALECEN}"
 
 elif [[ "${step}" = "marineanalletkf" ]]; then
 
     export NTHREADS_MARINEANALLETKF=${NTHREADSmax}
-    export APRUN_MARINEANALLETKF="${APRUN} --cpus-per-task=${NTHREADS_MARINEANALLETKF}"
+    export APRUN_MARINEANALLETKF="${APRUN_default} --cpus-per-task=${NTHREADS_MARINEANALLETKF}"
     
 elif [[ "${step}" = "atmanlfv3inc" ]]; then
 
     export NTHREADS_ATMANLFV3INC=${NTHREADSmax}
-    export APRUN_ATMANLFV3INC="${APRUN}"
+    export APRUN_ATMANLFV3INC="${APRUN_default}"
 
 elif [[ "${step}" = "anal" ]] || [[ "${step}" = "analcalc" ]]; then
 
@@ -142,7 +147,7 @@ elif [[ "${step}" = "anal" ]] || [[ "${step}" = "analcalc" ]]; then
     fi
 
     export NTHREADS_GSI=${NTHREADSmax}
-    export APRUN_GSI="${APRUN} -ppn ${tasks_per_node} --cpu-bind depth --depth ${NTHREADS_GSI}"
+    export APRUN_GSI="${APRUN_default} -ppn ${tasks_per_node} --cpu-bind depth --depth ${NTHREADS_GSI}"
 
     export NTHREADS_CALCINC=${threads_per_task_calcinc:-1}
     [[ ${NTHREADS_CALCINC} -gt ${max_threads_per_task} ]] && export NTHREADS_CALCINC=${max_threads_per_task}
@@ -169,7 +174,7 @@ elif [[ "${step}" = "sfcanl" ]]; then
 
     export NTHREADS_CYCLE=${threads_per_task:-14}
     [[ ${NTHREADS_CYCLE} -gt ${max_tasks_per_node} ]] && export NTHREADS_CYCLE=${max_tasks_per_node}
-    export APRUN_CYCLE="${APRUN}"
+    export APRUN_CYCLE="${APRUN_default}"
 
 elif [[ "${step}" = "eobs" ]]; then
 
@@ -178,7 +183,7 @@ elif [[ "${step}" = "eobs" ]]; then
     export FI_OFI_RXM_SAR_LIMIT=3145728
 
     export NTHREADS_GSI=${NTHREADSmax}
-    export APRUN_GSI="${APRUN} -ppn ${tasks_per_node} --cpu-bind depth --depth ${NTHREADS_GSI}"
+    export APRUN_GSI="${APRUN_default} -ppn ${tasks_per_node} --cpu-bind depth --depth ${NTHREADS_GSI}"
 
     export CFP_MP=${CFP_MP:-"NO"}
     export USE_CFP=${USE_CFP:-"YES"}
@@ -219,7 +224,7 @@ elif [[ "${step}" = "fcst" ]] || [[ "${step}" = "efcs" ]]; then
 elif [[ "${step}" = "upp" ]]; then
 
     export NTHREADS_UPP=${NTHREADS1}
-    export APRUN_UPP="${APRUN} -ppn ${tasks_per_node} --cpu-bind depth --depth ${NTHREADS_UPP}"
+    export APRUN_UPP="${APRUN_default} -ppn ${tasks_per_node} --cpu-bind depth --depth ${NTHREADS_UPP}"
 
 elif [[ "${step}" = "atmos_products" ]]; then
 
@@ -233,7 +238,7 @@ elif [[ "${step}" = "oceanice_products" ]]; then
 elif [[ "${step}" = "ecen" ]]; then
 
     export NTHREADS_ECEN=${NTHREADSmax}
-    export APRUN_ECEN="${APRUN} -ppn ${tasks_per_node} --cpu-bind depth --depth ${NTHREADS_ECEN}"
+    export APRUN_ECEN="${APRUN_default} -ppn ${tasks_per_node} --cpu-bind depth --depth ${NTHREADS_ECEN}"
 
     export NTHREADS_CHGRES=${threads_per_task_chgres:-14}
     [[ ${NTHREADS_CHGRES} -gt ${max_tasks_per_node} ]] && export NTHREADS_CHGRES=${max_tasks_per_node}
@@ -241,25 +246,25 @@ elif [[ "${step}" = "ecen" ]]; then
 
     export NTHREADS_CALCINC=${threads_per_task_calcinc:-1}
     [[ ${NTHREADS_CALCINC} -gt ${max_threads_per_task} ]] && export NTHREADS_CALCINC=${max_threads_per_task}
-    export APRUN_CALCINC="${APRUN}"
+    export APRUN_CALCINC="${APRUN_default}"
 
     export NTHREADS_CYCLE=${threads_per_task_cycle:-14}
     [[ ${NTHREADS_CYCLE} -gt ${max_tasks_per_node} ]] && export NTHREADS_CYCLE=${max_tasks_per_node}
-    export APRUN_CYCLE="${APRUN} -ppn ${tasks_per_node_cycle} --cpu-bind depth --depth ${NTHREADS_CYCLE}"
+    export APRUN_CYCLE="${APRUN_default} -ppn ${tasks_per_node_cycle} --cpu-bind depth --depth ${NTHREADS_CYCLE}"
 
 elif [[ "${step}" = "esfc" ]]; then
 
     export NTHREADS_ESFC=${NTHREADSmax}
-    export APRUN_ESFC="${APRUN} -ppn ${tasks_per_node} --cpu-bind depth --depth ${NTHREADS_ESFC}"
+    export APRUN_ESFC="${APRUN_default} -ppn ${tasks_per_node} --cpu-bind depth --depth ${NTHREADS_ESFC}"
 
     export NTHREADS_CYCLE=${threads_per_task_cycle:-14}
     [[ ${NTHREADS_CYCLE} -gt ${max_tasks_per_node} ]] && export NTHREADS_CYCLE=${max_tasks_per_node}
-    export APRUN_CYCLE="${APRUN} -ppn ${tasks_per_node_cycle} --cpu-bind depth --depth ${NTHREADS_CYCLE}"
+    export APRUN_CYCLE="${APRUN_default} -ppn ${tasks_per_node_cycle} --cpu-bind depth --depth ${NTHREADS_CYCLE}"
 
 elif [[ "${step}" = "epos" ]]; then
 
     export NTHREADS_EPOS=${NTHREADSmax}
-    export APRUN_EPOS="${APRUN} -ppn ${tasks_per_node} --cpu-bind depth --depth ${NTHREADS_EPOS}"
+    export APRUN_EPOS="${APRUN_default} -ppn ${tasks_per_node} --cpu-bind depth --depth ${NTHREADS_EPOS}"
 
 elif [[ "${step}" = "postsnd" ]]; then
 
@@ -267,12 +272,12 @@ elif [[ "${step}" = "postsnd" ]]; then
     export OMP_NUM_THREADS=1
 
     export NTHREADS_POSTSND=${NTHREADS1}
-    export APRUN_POSTSND="${APRUN} --depth=${NTHREADS_POSTSND} --cpu-bind depth"
-
     export NTHREADS_POSTSNDCFP=${threads_per_task_postsndcfp:-1}
     [[ ${NTHREADS_POSTSNDCFP} -gt ${max_threads_per_task} ]] && export NTHREADS_POSTSNDCFP=${max_threads_per_task}
     export APRUN_POSTSNDCFP="${launcher} -np ${ntasks_postsndcfp} ${mpmd_opt}"
 
+    export mpmd_opt="-ppn ${tasks_per_node} ${mpmd_opt}"
+
 elif [[ "${step}" = "awips" ]]; then
 
     export NTHREADS_AWIPS=${NTHREADS1}
diff --git a/gempak/ush/gfs_meta_comp.sh b/gempak/ush/gfs_meta_comp.sh
index 36d18d8659..38c15a60c7 100755
--- a/gempak/ush/gfs_meta_comp.sh
+++ b/gempak/ush/gfs_meta_comp.sh
@@ -24,7 +24,7 @@ device="nc | ${metaname}"
 
 export COMIN="gfs.multi"
 mkdir "${COMIN}"
-for cycle in $(seq -f "%02g" -s ' ' 0  "${STEP_GFS}" "${cyc}"); do
+for cycle in $(seq -f "%02g" -s ' ' 0  "${INTERVAL_GFS}" "${cyc}"); do
     YMD=${PDY} HH=${cycle} GRID="1p00" declare_from_tmpl gempak_dir:COM_ATMOS_GEMPAK_TMPL
     for file_in in "${gempak_dir}/gfs_1p00_${PDY}${cycle}f"*; do
         file_out="${COMIN}/$(basename "${file_in}")"
diff --git a/gempak/ush/gfs_meta_mar_comp.sh b/gempak/ush/gfs_meta_mar_comp.sh
index d25fc0dc9a..91f8a48876 100755
--- a/gempak/ush/gfs_meta_mar_comp.sh
+++ b/gempak/ush/gfs_meta_mar_comp.sh
@@ -15,7 +15,7 @@ cp "${HOMEgfs}/gempak/fix/datatype.tbl" datatype.tbl
 
 export COMIN="gfs.multi"
 mkdir -p "${COMIN}"
-for cycle in $(seq -f "%02g" -s ' ' 0 "${STEP_GFS}" "${cyc}"); do
+for cycle in $(seq -f "%02g" -s ' ' 0 "${INTERVAL_GFS}" "${cyc}"); do
     YMD=${PDY} HH=${cycle} GRID="1p00" declare_from_tmpl gempak_dir:COM_ATMOS_GEMPAK_TMPL
     for file_in in "${gempak_dir}/gfs_1p00_${PDY}${cycle}f"*; do
         file_out="${COMIN}/$(basename "${file_in}")"
diff --git a/jobs/JGDAS_AERO_ANALYSIS_GENERATE_BMATRIX b/jobs/JGDAS_AERO_ANALYSIS_GENERATE_BMATRIX
new file mode 100755
index 0000000000..81c89e9155
--- /dev/null
+++ b/jobs/JGDAS_AERO_ANALYSIS_GENERATE_BMATRIX
@@ -0,0 +1,46 @@
+#! /usr/bin/env bash
+
+source "${HOMEgfs}/ush/preamble.sh"
+source "${HOMEgfs}/ush/jjob_header.sh" -e "aeroanlgenb" -c "base aeroanl aeroanlgenb"
+
+##############################################
+# Set variables used in the script
+##############################################
+
+##############################################
+# Begin JOB SPECIFIC work
+##############################################
+
+# 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
+
+mkdir -p "${COMOUT_CHEM_BMAT}"
+
+###############################################################
+# Run relevant script
+
+EXSCRIPT=${GDASAEROBMATPY:-${SCRgfs}/exgdas_aero_analysis_generate_bmatrix.py}
+${EXSCRIPT}
+status=$?
+[[ ${status} -ne 0 ]] && exit "${status}"
+
+##############################################
+# End JOB SPECIFIC work
+##############################################
+
+##############################################
+# Final processing
+##############################################
+if [[ -e "${pgmout}" ]] ; then
+  cat "${pgmout}"
+fi
+
+##########################################
+# Remove the Temporary working directory
+##########################################
+cd "${DATAROOT}" || exit 1
+[[ "${KEEPDATA}" = "NO" ]] && rm -rf "${DATA}"
+
+exit 0
diff --git a/jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_CHKPT b/jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_CHKPT
deleted file mode 100755
index 875fe9d0ee..0000000000
--- a/jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_CHKPT
+++ /dev/null
@@ -1,58 +0,0 @@
-#!/bin/bash
-source "${HOMEgfs}/ush/preamble.sh"
-export WIPE_DATA="NO"
-export DATA="${DATAROOT}/${RUN}ocnanal_${cyc}"
-source "${HOMEgfs}/ush/jjob_header.sh" -e "ocnanalchkpt" -c "base ocnanal ocnanalchkpt"
-
-
-##############################################
-# Set variables used in the script
-##############################################
-# Ignore possible spelling error (nothing is misspelled)
-# shellcheck disable=SC2153
-GDATE=$(date --utc +%Y%m%d%H -d "${PDY} ${cyc} - ${assim_freq} hours")
-export GDATE
-export gPDY=${GDATE:0:8}
-export gcyc=${GDATE:8:2}
-export GDUMP=${GDUMP:-"gdas"}
-
-export GPREFIX="${GDUMP}.t${gcyc}z."
-# Ignore possible spelling error (nothing is misspelled)
-# shellcheck disable=SC2153
-export APREFIX="${RUN}.t${cyc}z."
-
-# Generate COM variables from templates
-YMD=${PDY} HH=${cyc} declare_from_tmpl -rx COM_ATMOS_ANALYSIS
-
-RUN=${GDUMP} YMD=${gPDY} HH=${gcyc} declare_from_tmpl -rx COM_ATMOS_HISTORY_PREV:COM_ATMOS_HISTORY_TMPL
-
-
-##############################################
-# Begin JOB SPECIFIC work
-##############################################
-
-###############################################################
-# Run relevant script
-
-EXSCRIPT=${GDASOCNCHKPTSH:-${HOMEgfs}/sorc/gdas.cd/scripts/exgdas_global_marine_analysis_chkpt.sh}
-${EXSCRIPT}
-status=$?
-[[ ${status} -ne 0 ]] && exit "${status}"
-
-##############################################
-# End JOB SPECIFIC work
-##############################################
-
-##############################################
-# Final processing
-##############################################
-if [[ -e "${pgmout}" ]] ; then
-  cat "${pgmout}"
-fi
-
-##########################################
-# Do not remove the Temporary working directory (do this in POST)
-##########################################
-cd "${DATAROOT}" || exit 1
-
-exit 0
diff --git a/jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_POST b/jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_POST
deleted file mode 100755
index 00597f14f8..0000000000
--- a/jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_POST
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/bin/bash
-source "${HOMEgfs}/ush/preamble.sh"
-export WIPE_DATA="NO"
-export DATA="${DATAROOT}/${RUN}ocnanal_${cyc}"
-source "${HOMEgfs}/ush/jjob_header.sh" -e "ocnanalpost" -c "base ocnanalpost"
-
-
-##############################################
-# Set variables used in the script
-##############################################
-# TODO remove this CDUMP declaration when the GDAS script
-#      exgdas_global_marine_analysis_post.py is updated to look for RUN instead
-#      of CDUMP.
-export CDUMP=${CDUMP:-${RUN:-"gfs"}}
-export CDATE=${CDATE:-${PDY}${cyc}}
-export GDUMP=${GDUMP:-"gdas"}
-
-# Generate COM variables from templates
-YMD=${PDY} HH=${cyc} declare_from_tmpl -rx COM_OCEAN_ANALYSIS COM_ICE_ANALYSIS COM_ICE_RESTART
-
-mkdir -p "${COM_OCEAN_ANALYSIS}"
-mkdir -p "${COM_ICE_ANALYSIS}"
-mkdir -p "${COM_ICE_RESTART}"
-
-##############################################
-# Begin JOB SPECIFIC work
-##############################################
-
-# Add UFSDA to PYTHONPATH
-ufsdaPATH="${HOMEgfs}/sorc/gdas.cd/ush/"
-PYTHONPATH="${PYTHONPATH:+${PYTHONPATH}:}${ufsdaPATH}"
-export PYTHONPATH
-
-###############################################################
-# Run relevant script
-###############################################################
-
-EXSCRIPT=${GDASOCNPOSTPY:-${HOMEgfs}/sorc/gdas.cd/scripts/exgdas_global_marine_analysis_post.py}
-${EXSCRIPT}
-status=$?
-[[ ${status} -ne 0 ]] && exit "${status}"
-
-##########################################
-# Remove the Temporary working directory
-##########################################
-cd "${DATAROOT}" || exit 1
-[[ "${KEEPDATA}" = "NO" ]] && rm -rf "${DATA}"
-
-exit 0
diff --git a/jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_VRFY b/jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_VRFY
index 0d90c46184..31df1e45c7 100755
--- a/jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_VRFY
+++ b/jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_VRFY
@@ -1,6 +1,6 @@
 #!/bin/bash
 source "${HOMEgfs}/ush/preamble.sh"
-source "${HOMEgfs}/ush/jjob_header.sh" -e "ocnanalprep" -c "base ocnanal ocnanalprep"
+source "${HOMEgfs}/ush/jjob_header.sh" -e "marineanlinit" -c "base ocnanal marineanlinit"
 
 
 ##############################################
diff --git a/jobs/JGEFS_ATMOS_ACC b/jobs/JGEFS_ATMOS_ACC
index 9c133fe80f..1f1c044db7 100755
--- a/jobs/JGEFS_ATMOS_ACC
+++ b/jobs/JGEFS_ATMOS_ACC
@@ -12,9 +12,10 @@ source "${HOMEgfs}/ush/jjob_header.sh" -e "repair_replay" -c "base repair_replay
 # Construct COM variables from templates
 YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \
     COMIN_ATMOS_MASTER:COM_ATMOS_MASTER_TMPL \
-    COMOUT_ATMOS_MASTER:COM_ATMOS_MASTER_TMPL
+    COMOUT_ATMOS_MASTER:COM_ATMOS_MASTER_TMPL \
+    COMIN_TOP:COM_TOP_TMPL
 
-export COMIN_03=${HOMEgfs}/anl
+export COMIN_03=${COMIN_TOP}/mem000/model/atmos/input
 
 ########################################################
 # Execute the acc script.
diff --git a/jobs/JGFS_ATMOS_CYCLONE_GENESIS b/jobs/JGFS_ATMOS_CYCLONE_GENESIS
index de130bf9aa..a80bcc1153 100755
--- a/jobs/JGFS_ATMOS_CYCLONE_GENESIS
+++ b/jobs/JGFS_ATMOS_CYCLONE_GENESIS
@@ -3,11 +3,6 @@
 source "${HOMEgfs}/ush/preamble.sh"
 source "${HOMEgfs}/ush/jjob_header.sh" -e "genesis" -c "base genesis"
 
-# Hack to temporary skip this as the tracker has not been build
-#   on Hercules Rocky 9 yet
-# TODO: Remove this after tracker has been built for Rocky 9 #2639
-if [[ "${machine}" == 'HERCULES' ]]; then exit 0; fi
-
 ##############################################
 # Set variables used in the exglobal script
 ##############################################
diff --git a/jobs/JGFS_ATMOS_CYCLONE_TRACKER b/jobs/JGFS_ATMOS_CYCLONE_TRACKER
index 067de2c4aa..24fe33f8ca 100755
--- a/jobs/JGFS_ATMOS_CYCLONE_TRACKER
+++ b/jobs/JGFS_ATMOS_CYCLONE_TRACKER
@@ -3,11 +3,6 @@
 source "${HOMEgfs}/ush/preamble.sh"
 source "${HOMEgfs}/ush/jjob_header.sh" -e "tracker" -c "base tracker"
 
-# Hack to temporary skip this as the tracker has not been build
-#   on Hercules Rocky 9 yet
-# TODO: Remove this after tracker has been built for Rocky 9 #2639
-if [[ "${machine}" == 'HERCULES' ]]; then exit 0; fi
-
 export COMPONENT="atmos"
 
 
diff --git a/jobs/JGFS_ATMOS_VERIFICATION b/jobs/JGFS_ATMOS_VERIFICATION
index 48133364e5..fde0d73b1e 100755
--- a/jobs/JGFS_ATMOS_VERIFICATION
+++ b/jobs/JGFS_ATMOS_VERIFICATION
@@ -16,12 +16,6 @@ source "${HOMEgfs}/ush/jjob_header.sh" -e "metp" -c "base metp"
 ## METPCASE : METplus verification use case (g2g1 | g2o1 | pcp1)
 ###############################################################
 
-# TODO: This should not be permitted as DATAROOT is set at the job-card level.
-# TODO: DATAROOT is being used as DATA in metp jobs.  This should be rectified in metp.
-# TODO: The temporary directory is DATA and is created at the top of the J-Job.
-# TODO: remove this line
-export DATAROOT=${DATA}
-
 VDATE=$(date --utc +%Y%m%d%H -d "${PDY} ${cyc} - ${VRFYBACK_HRS} hours")
 export VDATE=${VDATE:0:8}
 
diff --git a/jobs/JGLOBAL_AERO_ANALYSIS_FINALIZE b/jobs/JGLOBAL_AERO_ANALYSIS_FINALIZE
index 455f572da5..9c68d1fed6 100755
--- a/jobs/JGLOBAL_AERO_ANALYSIS_FINALIZE
+++ b/jobs/JGLOBAL_AERO_ANALYSIS_FINALIZE
@@ -8,25 +8,15 @@ 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 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 -m 775 -p "${COM_CHEM_ANALYSIS}"
+YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \
+    COMOUT_CHEM_ANALYSIS:COM_CHEM_ANALYSIS_TMPL \
+    COMOUT_ATMOS_RESTART:COM_ATMOS_RESTART_TMPL
 
 ###############################################################
 # Run relevant script
diff --git a/jobs/JGLOBAL_AERO_ANALYSIS_INITIALIZE b/jobs/JGLOBAL_AERO_ANALYSIS_INITIALIZE
index b2a2893bc0..921b1458b2 100755
--- a/jobs/JGLOBAL_AERO_ANALYSIS_INITIALIZE
+++ b/jobs/JGLOBAL_AERO_ANALYSIS_INITIALIZE
@@ -19,13 +19,13 @@ GDUMP="gdas"
 ##############################################
 
 # Generate COM variables from templates
-YMD=${PDY} HH=${cyc} declare_from_tmpl -rx COM_OBS COM_CHEM_ANALYSIS
+YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \
+    COM_OBS:COM_OBS_TMPL \
+    COMOUT_CHEM_ANALYSIS:COM_CHEM_ANALYSIS_TMPL
 
 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 -m 775 -p "${COM_CHEM_ANALYSIS}"
+    COMIN_ATMOS_RESTART_PREV:COM_ATMOS_RESTART_TMPL \
+    COMIN_CHEM_BMAT_PREV:COM_CHEM_BMAT_TMPL
 
 ###############################################################
 # Run relevant script
diff --git a/jobs/JGLOBAL_AERO_ANALYSIS_RUN b/jobs/JGLOBAL_AERO_ANALYSIS_VARIATIONAL
similarity index 83%
rename from jobs/JGLOBAL_AERO_ANALYSIS_RUN
rename to jobs/JGLOBAL_AERO_ANALYSIS_VARIATIONAL
index 43749b78c5..290d7225dd 100755
--- a/jobs/JGLOBAL_AERO_ANALYSIS_RUN
+++ b/jobs/JGLOBAL_AERO_ANALYSIS_VARIATIONAL
@@ -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 "aeroanlrun" -c "base aeroanl aeroanlrun"
+source "${HOMEgfs}/ush/jjob_header.sh" -e "aeroanlvar" -c "base aeroanl aeroanlvar"
 
 ##############################################
 # Set variables used in the script
@@ -16,7 +16,7 @@ source "${HOMEgfs}/ush/jjob_header.sh" -e "aeroanlrun" -c "base aeroanl aeroanlr
 ###############################################################
 # Run relevant script
 
-EXSCRIPT=${GDASAERORUNSH:-${SCRgfs}/exglobal_aero_analysis_run.py}
+EXSCRIPT=${GDASAEROVARSH:-${SCRgfs}/exglobal_aero_analysis_variational.py}
 ${EXSCRIPT}
 status=$?
 [[ ${status} -ne 0 ]] && exit "${status}"
diff --git a/jobs/JGLOBAL_ATMOS_UPP b/jobs/JGLOBAL_ATMOS_UPP
index 1aa62cdbb3..0e70e97025 100755
--- a/jobs/JGLOBAL_ATMOS_UPP
+++ b/jobs/JGLOBAL_ATMOS_UPP
@@ -12,8 +12,11 @@ source "${HOMEgfs}/ush/jjob_header.sh" -e "upp" -c "base upp"
 ##############################################
 
 # Construct COM variables from templates
-YMD=${PDY} HH=${cyc} declare_from_tmpl -rx COM_ATMOS_ANALYSIS COM_ATMOS_HISTORY COM_ATMOS_MASTER
-if [[ ! -d ${COM_ATMOS_MASTER} ]]; then mkdir -m 775 -p "${COM_ATMOS_MASTER}"; fi
+YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \
+   COMIN_ATMOS_ANALYSIS:COM_ATMOS_ANALYSIS_TMPL \
+   COMIN_ATMOS_HISTORY:COM_ATMOS_HISTORY_TMPL \
+   COMOUT_ATMOS_MASTER:COM_ATMOS_MASTER_TMPL
+if [[ ! -d ${COMOUT_ATMOS_MASTER} ]]; then mkdir -p "${COMOUT_ATMOS_MASTER}"; fi
 
 
 ###############################################################
diff --git a/jobs/JGLOBAL_ATMOS_VMINMON b/jobs/JGLOBAL_ATMOS_VMINMON
index 8ad9b91792..26cdc73c95 100755
--- a/jobs/JGLOBAL_ATMOS_VMINMON
+++ b/jobs/JGLOBAL_ATMOS_VMINMON
@@ -17,16 +17,18 @@ export gcyc=${GDATE:8:2}
 #############################################
 # TANKverf - WHERE OUTPUT DATA WILL RESIDE
 #############################################
-YMD=${PDY} HH=${cyc} declare_from_tmpl -rx COM_ATMOS_ANALYSIS
-YMD=${PDY} HH=${cyc} declare_from_tmpl -rx COM_ATMOS_MINMON
-YMD=${gPDY} HH=${gcyc} declare_from_tmpl -rx COM_ATMOS_MINMON_PREV:COM_ATMOS_MINMON_TMPL
+YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \
+	COMIN_ATMOS_ANALYSIS:COM_ATMOS_ANALYSIS_TMPL \
+	COMOUT_ATMOS_MINMON:COM_ATMOS_MINMON_TMPL
 
-export gsistat="${COM_ATMOS_ANALYSIS}/${RUN}.t${cyc}z.gsistat"
-export M_TANKverf=${M_TANKverf:-${COM_ATMOS_MINMON}}
-export M_TANKverfM1=${M_TANKverfM1:-${COM_ATMOS_MINMON_PREV}}
+YMD=${gPDY} HH=${gcyc} declare_from_tmpl -rx \
+	COMIN_ATMOS_MINMON_PREV:COM_ATMOS_MINMON_TMPL
 
-if [[ ! -d ${M_TANKverf} ]]; then mkdir -p -m 775 "${M_TANKverf}" ; fi
-if [[ ! -d ${M_TANKverfM1} ]]; then mkdir -p -m 775 "${M_TANKverfM1}" ; fi
+export gsistat="${COMIN_ATMOS_ANALYSIS}/${RUN}.t${cyc}z.gsistat"
+export M_TANKverf=${M_TANKverf:-${COMOUT_ATMOS_MINMON}}
+export M_TANKverfM1=${M_TANKverfM1:-${COMIN_ATMOS_MINMON_PREV}}
+
+if [[ ! -d ${M_TANKverf} ]]; then mkdir -p "${M_TANKverf}" ; fi
 
 ########################################################
 # Execute the script.
diff --git a/jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_RUN b/jobs/JGLOBAL_MARINE_ANALYSIS_CHECKPOINT
similarity index 65%
rename from jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_RUN
rename to jobs/JGLOBAL_MARINE_ANALYSIS_CHECKPOINT
index 5871497223..8cd7b1ab7c 100755
--- a/jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_RUN
+++ b/jobs/JGLOBAL_MARINE_ANALYSIS_CHECKPOINT
@@ -1,8 +1,9 @@
 #!/bin/bash
 source "${HOMEgfs}/ush/preamble.sh"
 export WIPE_DATA="NO"
-export DATA="${DATAROOT}/${RUN}ocnanal_${cyc}"
-source "${HOMEgfs}/ush/jjob_header.sh" -e "ocnanalrun" -c "base ocnanal ocnanalrun"
+export DATAjob="${DATAROOT}/${RUN}marineanalysis.${PDY:-}${cyc}"
+export DATA="${DATAjob}/marinevariational"
+source "${HOMEgfs}/ush/jjob_header.sh" -e "marineanlchkpt" -c "base marineanl marineanlchkpt"
 
 
 ##############################################
@@ -13,11 +14,10 @@ source "${HOMEgfs}/ush/jjob_header.sh" -e "ocnanalrun" -c "base ocnanal ocnanalr
 # Begin JOB SPECIFIC work
 ##############################################
 
-
 ###############################################################
 # Run relevant script
 
-EXSCRIPT=${GDASOCNRUNSH:-${HOMEgfs}/sorc/gdas.cd/scripts/exgdas_global_marine_analysis_run.sh}
+EXSCRIPT=${GDASMARINEANALYSIS:-${SCRgfs}/exglobal_marine_analysis_checkpoint.py}
 ${EXSCRIPT}
 status=$?
 [[ ${status} -ne 0 ]] && exit "${status}"
@@ -33,9 +33,4 @@ if [[ -e "${pgmout}" ]] ; then
   cat "${pgmout}"
 fi
 
-##########################################
-# Do not remove the Temporary working directory (do this in POST)
-##########################################
-cd "${DATAROOT}" || exit 1
-
 exit 0
diff --git a/jobs/JGLOBAL_MARINE_ANALYSIS_FINALIZE b/jobs/JGLOBAL_MARINE_ANALYSIS_FINALIZE
new file mode 100755
index 0000000000..2614639184
--- /dev/null
+++ b/jobs/JGLOBAL_MARINE_ANALYSIS_FINALIZE
@@ -0,0 +1,43 @@
+#!/bin/bash
+source "${HOMEgfs}/ush/preamble.sh"
+export WIPE_DATA="NO"
+export DATAjob="${DATAROOT}/${RUN}marineanalysis.${PDY:-}${cyc}"
+export DATA="${DATAjob}/marinevariational"
+source "${HOMEgfs}/ush/jjob_header.sh" -e "marineanlfinal" -c "base marineanl marineanlfinal"
+
+##############################################
+# Set variables used in the script
+##############################################
+
+##############################################
+# Begin JOB SPECIFIC work
+##############################################
+
+# Generate COM variables from templates
+YMD=${PDY} HH=${cyc} declare_from_tmpl -rx COMIN_OBS:COM_OBS_TMPL
+
+YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \
+   COMOUT_OCEAN_ANALYSIS:COM_OCEAN_ANALYSIS_TMPL \
+   COMOUT_ICE_ANALYSIS:COM_ICE_ANALYSIS_TMPL \
+   COMOUT_ICE_RESTART:COM_ICE_RESTART_TMPL
+
+mkdir -p "${COMOUT_OCEAN_ANALYSIS}"
+mkdir -p "${COMOUT_ICE_ANALYSIS}"
+mkdir -p "${COMOUT_ICE_RESTART}"
+
+###############################################################
+# Run relevant script
+###############################################################
+
+EXSCRIPT=${GDASMARINEANALYSIS:-${SCRgfs}/exglobal_marine_analysis_finalize.py}
+${EXSCRIPT}
+status=$?
+[[ ${status} -ne 0 ]] && exit "${status}"
+
+##########################################
+# Remove the Temporary working directory
+##########################################
+cd "${DATAROOT}" || exit 1
+[[ "${KEEPDATA}" = "NO" ]] && rm -rf "${DATA}"
+
+exit 0
diff --git a/jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_PREP b/jobs/JGLOBAL_MARINE_ANALYSIS_INITIALIZE
similarity index 60%
rename from jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_PREP
rename to jobs/JGLOBAL_MARINE_ANALYSIS_INITIALIZE
index 664df3aad6..eb167af94d 100755
--- a/jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_PREP
+++ b/jobs/JGLOBAL_MARINE_ANALYSIS_INITIALIZE
@@ -1,7 +1,9 @@
 #!/bin/bash
+
 source "${HOMEgfs}/ush/preamble.sh"
-export DATA="${DATAROOT}/${RUN}ocnanal_${cyc}"
-source "${HOMEgfs}/ush/jjob_header.sh" -e "ocnanalprep" -c "base ocnanal ocnanalprep"
+export DATAjob="${DATAROOT}/${RUN}marineanalysis.${PDY:-}${cyc}"
+export DATA="${DATAjob}/marinevariational"
+source "${HOMEgfs}/ush/jjob_header.sh" -e "marineanlinit" -c "base marineanl marineanlinit"
 
 
 ##############################################
@@ -10,42 +12,30 @@ source "${HOMEgfs}/ush/jjob_header.sh" -e "ocnanalprep" -c "base ocnanal ocnanal
 # Ignore possible spelling error (nothing is misspelled)
 # shellcheck disable=SC2153
 GDATE=$(date --utc +%Y%m%d%H -d "${PDY} ${cyc} - ${assim_freq} hours")
-export GDATE
-export gPDY=${GDATE:0:8}
-export gcyc=${GDATE:8:2}
+gPDY=${GDATE:0:8}
+gcyc=${GDATE:8:2}
 export GDUMP=${GDUMP:-"gdas"}
 
-export OPREFIX="${RUN}.t${cyc}z."
-export GPREFIX="${GDUMP}.t${gcyc}z."
-export APREFIX="${RUN}.t${cyc}z."
+##############################################
+# Begin JOB SPECIFIC work
+##############################################
 
 # Generate COM variables from templates
 YMD=${PDY} HH=${cyc} declare_from_tmpl -rx COM_OBS
 
 RUN=${GDUMP} YMD=${gPDY} HH=${gcyc} declare_from_tmpl -rx \
-   COM_OCEAN_HISTORY_PREV:COM_OCEAN_HISTORY_TMPL \
-   COM_ICE_HISTORY_PREV:COM_ICE_HISTORY_TMPL \
-   COM_ICE_RESTART_PREV:COM_ICE_RESTART_TMPL
+   COMIN_OCEAN_HISTORY_PREV:COM_OCEAN_HISTORY_TMPL \
+   COMIN_ICE_HISTORY_PREV:COM_ICE_HISTORY_TMPL \
+   COMIN_ICE_RESTART_PREV:COM_ICE_RESTART_TMPL
 
 YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \
    COMIN_OCEAN_BMATRIX:COM_OCEAN_BMATRIX_TMPL \
    COMIN_ICE_BMATRIX:COM_ICE_BMATRIX_TMPL
 
-##############################################
-# Begin JOB SPECIFIC work
-##############################################
-
-# Add UFSDA to PYTHONPATH
-ufsdaPATH="${HOMEgfs}/sorc/gdas.cd/ush/"
-# shellcheck disable=SC2311
-pyiodaPATH="${HOMEgfs}/sorc/gdas.cd/build/lib/python$(detect_py_ver)/"
-PYTHONPATH="${PYTHONPATH:+${PYTHONPATH}:}${ufsdaPATH}:${pyiodaPATH}"
-export PYTHONPATH
-
 ###############################################################
 # Run relevant script
 
-EXSCRIPT=${GDASOCNPREPPY:-${HOMEgfs}/sorc/gdas.cd/scripts/exgdas_global_marine_analysis_prep.py}
+EXSCRIPT=${GDASMARINEANALYSIS:-${SCRgfs}/exglobal_marine_analysis_initialize.py}
 ${EXSCRIPT}
 status=$?
 [[ ${status} -ne 0 ]] && exit "${status}"
diff --git a/jobs/JGLOBAL_MARINE_ANALYSIS_VARIATIONAL b/jobs/JGLOBAL_MARINE_ANALYSIS_VARIATIONAL
new file mode 100755
index 0000000000..7780353294
--- /dev/null
+++ b/jobs/JGLOBAL_MARINE_ANALYSIS_VARIATIONAL
@@ -0,0 +1,38 @@
+#! /usr/bin/env bash
+
+source "${HOMEgfs}/ush/preamble.sh"
+export WIPE_DATA="NO"
+export DATAjob="${DATAROOT}/${RUN}marineanalysis.${PDY:-}${cyc}"
+export DATA="${DATAjob}/marinevariational"
+source "${HOMEgfs}/ush/jjob_header.sh" -e "marineanlvar" -c "base marineanl marineanlvar"
+
+##############################################
+# Set variables used in the script
+##############################################
+
+
+##############################################
+# Begin JOB SPECIFIC work
+##############################################
+
+
+###############################################################
+# Run relevant script
+
+EXSCRIPT=${GDASMARINERUNSH:-${SCRgfs}/exglobal_marine_analysis_variational.py}
+${EXSCRIPT}
+status=$?
+[[ ${status} -ne 0 ]] && exit "${status}"
+
+##############################################
+# End JOB SPECIFIC work
+##############################################
+
+##############################################
+# Final processing
+##############################################
+if [[ -e "${pgmout}" ]] ; then
+  cat "${pgmout}"
+fi
+
+exit 0
diff --git a/jobs/JGLOBAL_MARINE_BMAT b/jobs/JGLOBAL_MARINE_BMAT
index 3dacec9278..3189df0463 100755
--- a/jobs/JGLOBAL_MARINE_BMAT
+++ b/jobs/JGLOBAL_MARINE_BMAT
@@ -2,17 +2,17 @@
 
 source "${HOMEgfs}/ush/preamble.sh"
 
-if (( 10#${ENSMEM:-0} > 0 )); then
-  export DATAjob="${DATAROOT}/${RUN}marinebmat.${PDY:-}${cyc}"
-  export DATA="${DATAjob}/${jobid}"
-  # Create the directory to hold ensemble perturbations
-  export DATAenspert="${DATAjob}/enspert"
-  if [[ ! -d "${DATAenspert}" ]]; then mkdir -p "${DATAenspert}"; fi
-fi
+export DATAjob="${DATAROOT}/${RUN}marineanalysis.${PDY:-}${cyc}"
+export DATA="${DATAjob}/${jobid}"
+# Create the directory to hold ensemble perturbations
+export DATAens="${DATAjob}/ensdata"
+export DATAstaticb="${DATAjob}/staticb"
+if [[ ! -d "${DATAens}" ]]; then mkdir -p "${DATAens}"; fi
+if [[ ! -d "${DATAstaticb}" ]]; then mkdir -p "${DATAstaticb}"; fi
 
 # source config.base, config.ocnanal and config.marinebmat
 # and pass marinebmat to ${machine}.env
-source "${HOMEgfs}/ush/jjob_header.sh" -e "marinebmat" -c "base ocnanal marinebmat"
+source "${HOMEgfs}/ush/jjob_header.sh" -e "marinebmat" -c "base marineanl marinebmat"
 
 ##############################################
 # Set variables used in the script
diff --git a/jobs/JGLOBAL_STAGE_IC b/jobs/JGLOBAL_STAGE_IC
index b8126f8efe..6c9d1793d4 100755
--- a/jobs/JGLOBAL_STAGE_IC
+++ b/jobs/JGLOBAL_STAGE_IC
@@ -3,6 +3,18 @@
 source "${HOMEgfs}/ush/preamble.sh"
 source "${HOMEgfs}/ush/jjob_header.sh" -e "stage_ic" -c "base stage_ic"
 
+# Since ICs will download to DATA if DO_DOWNLOAD_ICS is YES, set ICSDIR to DATA
+if [[ "${DO_DOWNLOAD_ICS}" == "YES" ]]; then
+  export ICSDIR=${DATA}
+fi
+
+if [[ "${DO_REPAIR_REPLAY}" == "YES" ]]; then
+  # Since replay analysis will download to DATA if DO_DOWNLOAD_ANLY is YES, set ICSDIR to DATA
+  if [[ "${DO_DOWNLOAD_ANLY}" == "YES" ]]; then
+    export ANLYDIR=${DATA}
+  fi
+fi
+
 # Execute staging
 "${SCRgfs}/exglobal_stage_ic.py"
 err=$?
diff --git a/jobs/JGLOBAL_WAVE_POST_PNT b/jobs/JGLOBAL_WAVE_POST_PNT
index 769159be61..6be2d88906 100755
--- a/jobs/JGLOBAL_WAVE_POST_PNT
+++ b/jobs/JGLOBAL_WAVE_POST_PNT
@@ -25,7 +25,7 @@ export WAV_MOD_TAG=${RUN}wave${waveMEMB}
 
 export CFP_VERBOSE=1
 
-export FHMAX_WAV_PNT=${FHMAX_WAV}
+export FHMAX_WAV_PNT=$(( FHMAX_WAV - OFFSET_START_HOUR ))
 export DOSPC_WAV='YES' # Spectral post
 export DOBLL_WAV='YES' # Bulletin post
 export DOBNDPNT_WAV='NO'  #not boundary points
diff --git a/jobs/rocoto/ocnanalrun.sh b/jobs/rocoto/aeroanlgenb.sh
similarity index 82%
rename from jobs/rocoto/ocnanalrun.sh
rename to jobs/rocoto/aeroanlgenb.sh
index 5f998af989..d0bc5dda9b 100755
--- a/jobs/rocoto/ocnanalrun.sh
+++ b/jobs/rocoto/aeroanlgenb.sh
@@ -8,11 +8,12 @@ source "${HOMEgfs}/ush/preamble.sh"
 status=$?
 [[ ${status} -ne 0 ]] && exit "${status}"
 
-export job="ocnanalrun"
+export job="aeroanlgenb"
 export jobid="${job}.$$"
 
 ###############################################################
+
 # Execute the JJOB
-"${HOMEgfs}"/jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_RUN
+"${HOMEgfs}/jobs/JGDAS_AERO_ANALYSIS_GENERATE_BMATRIX"
 status=$?
 exit "${status}"
diff --git a/jobs/rocoto/aeroanlrun.sh b/jobs/rocoto/aeroanlvar.sh
similarity index 83%
rename from jobs/rocoto/aeroanlrun.sh
rename to jobs/rocoto/aeroanlvar.sh
index 529bb2d7d1..7aa7d831f9 100755
--- a/jobs/rocoto/aeroanlrun.sh
+++ b/jobs/rocoto/aeroanlvar.sh
@@ -8,11 +8,11 @@ source "${HOMEgfs}/ush/preamble.sh"
 status=$?
 [[ ${status} -ne 0 ]] && exit "${status}"
 
-export job="aeroanlrun"
+export job="aeroanlvar"
 export jobid="${job}.$$"
 
 ###############################################################
 # Execute the JJOB
-"${HOMEgfs}/jobs/JGLOBAL_AERO_ANALYSIS_RUN"
+"${HOMEgfs}/jobs/JGLOBAL_AERO_ANALYSIS_VARIATIONAL"
 status=$?
 exit "${status}"
diff --git a/jobs/rocoto/arch_test.sh b/jobs/rocoto/arch_test.sh
deleted file mode 100755
index c723c842aa..0000000000
--- a/jobs/rocoto/arch_test.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#! /usr/bin/env bash
-###############################################################
-exit 0
diff --git a/jobs/rocoto/atmos_ensstat.sh b/jobs/rocoto/atmos_ensstat.sh
index 76ed7f0a72..b5716323a9 100755
--- a/jobs/rocoto/atmos_ensstat.sh
+++ b/jobs/rocoto/atmos_ensstat.sh
@@ -15,11 +15,17 @@ if (( status != 0 )); then exit "${status}"; fi
 export job="atmos_ensstat"
 export jobid="${job}.$$"
 
-export FORECAST_HOUR=$(( 10#${FHR3} ))
-
-###############################################################
-# Execute the JJOB
-###############################################################
-"${HOMEgfs}/jobs/JGLOBAL_ATMOS_ENSSTAT"
+# shellcheck disable=SC2153,SC2001
+IFS='_' read -ra fhrs <<< "${FHRLST//f}" # strip off the 'f's and convert to array
+for fhr in "${fhrs[@]}"; do
+    # The analysis fhr is -001.  Performing math on negative, leading 0 integers is tricky.
+    # The negative needs to be in front of "10#", so do some regex magic to make it happen.
+    fhr="10#${fhr}"
+    fhr=${fhr//10\#-/-10\#}
+    export FORECAST_HOUR=$(( fhr ))
+    "${HOMEgfs}/jobs/JGLOBAL_ATMOS_ENSSTAT"
+    status=$?
+    if (( status != 0 )); then exit "${status}"; fi
+done
 
 exit $?
diff --git a/jobs/rocoto/atmos_products.sh b/jobs/rocoto/atmos_products.sh
index f6adbcf861..3aa7d70ddd 100755
--- a/jobs/rocoto/atmos_products.sh
+++ b/jobs/rocoto/atmos_products.sh
@@ -15,13 +15,17 @@ if (( status != 0 )); then exit "${status}"; fi
 export job="atmos_products"
 export jobid="${job}.$$"
 
-# Negatation needs to be before the base
-fhr3_base="10#${FHR3}"
-export FORECAST_HOUR=$(( ${fhr3_base/10#-/-10#} ))
-
-###############################################################
-# Execute the JJOB
-###############################################################
-"${HOMEgfs}/jobs/JGLOBAL_ATMOS_PRODUCTS"
+#shellcheck disable=SC2153,SC2001
+IFS='_' read -ra fhrs <<< "${FHRLST//f}" # strip off the 'f's and convert to array
+for fhr in "${fhrs[@]}"; do
+    # The analysis fhr is -001.  Performing math on negative, leading 0 integers is tricky.
+    # The negative needs to be in front of "10#", so do some regex magic to make it happen.
+    fhr="10#${fhr}"
+    fhr=${fhr//10\#-/-10\#}
+    export FORECAST_HOUR=$(( fhr ))
+    "${HOMEgfs}/jobs/JGLOBAL_ATMOS_PRODUCTS"
+    status=$?
+    if (( status != 0 )); then exit "${status}"; fi
+done
 
 exit $?
diff --git a/jobs/rocoto/marineanlchkpt.sh b/jobs/rocoto/marineanlchkpt.sh
new file mode 100755
index 0000000000..69e10a7fa8
--- /dev/null
+++ b/jobs/rocoto/marineanlchkpt.sh
@@ -0,0 +1,18 @@
+#! /usr/bin/env bash
+
+source "${HOMEgfs}/ush/preamble.sh"
+
+###############################################################
+# Source UFSDA workflow modules
+. "${HOMEgfs}/ush/load_ufsda_modules.sh"
+status=$?
+[[ ${status} -ne 0 ]] && exit "${status}"
+
+export job="marineanlchkpt"
+export jobid="${job}.$$"
+
+###############################################################
+# Execute the JJOB
+"${HOMEgfs}"/jobs/JGLOBAL_MARINE_ANALYSIS_CHECKPOINT
+status=$?
+exit "${status}"
diff --git a/jobs/rocoto/ocnanalchkpt.sh b/jobs/rocoto/marineanlfinal.sh
similarity index 82%
rename from jobs/rocoto/ocnanalchkpt.sh
rename to jobs/rocoto/marineanlfinal.sh
index ae98bc8e88..8f0c8fa3a3 100755
--- a/jobs/rocoto/ocnanalchkpt.sh
+++ b/jobs/rocoto/marineanlfinal.sh
@@ -8,11 +8,11 @@ source "${HOMEgfs}/ush/preamble.sh"
 status=$?
 [[ ${status} -ne 0 ]] && exit "${status}"
 
-export job="ocnanalchkpt"
+export job="marineanlfinal"
 export jobid="${job}.$$"
 
 ###############################################################
 # Execute the JJOB
-"${HOMEgfs}"/jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_CHKPT
+"${HOMEgfs}"/jobs/JGLOBAL_MARINE_ANALYSIS_FINALIZE
 status=$?
 exit "${status}"
diff --git a/jobs/rocoto/ocnanalprep.sh b/jobs/rocoto/marineanlinit.sh
similarity index 89%
rename from jobs/rocoto/ocnanalprep.sh
rename to jobs/rocoto/marineanlinit.sh
index 3830fe1c39..953fc0dcfd 100755
--- a/jobs/rocoto/ocnanalprep.sh
+++ b/jobs/rocoto/marineanlinit.sh
@@ -14,6 +14,6 @@ export jobid="${job}.$$"
 
 ###############################################################
 # Execute the JJOB
-"${HOMEgfs}"/jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_PREP
+"${HOMEgfs}"/jobs/JGLOBAL_MARINE_ANALYSIS_INITIALIZE
 status=$?
 exit "${status}"
diff --git a/jobs/rocoto/ocnanalpost.sh b/jobs/rocoto/marineanlvar.sh
similarity index 82%
rename from jobs/rocoto/ocnanalpost.sh
rename to jobs/rocoto/marineanlvar.sh
index b99a4e05ca..35a21a2bcb 100755
--- a/jobs/rocoto/ocnanalpost.sh
+++ b/jobs/rocoto/marineanlvar.sh
@@ -8,11 +8,11 @@ source "${HOMEgfs}/ush/preamble.sh"
 status=$?
 [[ ${status} -ne 0 ]] && exit "${status}"
 
-export job="ocnanalpost"
+export job="marineanlvar"
 export jobid="${job}.$$"
 
 ###############################################################
 # Execute the JJOB
-"${HOMEgfs}"/jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_POST
+"${HOMEgfs}/jobs/JGLOBAL_MARINE_ANALYSIS_VARIATIONAL"
 status=$?
 exit "${status}"
diff --git a/jobs/rocoto/oceanice_products.sh b/jobs/rocoto/oceanice_products.sh
index 2a3b617d05..3d92d68834 100755
--- a/jobs/rocoto/oceanice_products.sh
+++ b/jobs/rocoto/oceanice_products.sh
@@ -15,11 +15,13 @@ if (( status != 0 )); then exit "${status}"; fi
 export job="oceanice_products"
 export jobid="${job}.$$"
 
-export FORECAST_HOUR=$(( 10#${FHR3} ))
-
-###############################################################
-# Execute the JJOB
-###############################################################
-"${HOMEgfs}/jobs/JGLOBAL_OCEANICE_PRODUCTS"
+# shellcheck disable=SC2153,SC2001
+IFS='_' read -ra fhrs <<< "${FHRLST//f}" # strip off the 'f's and convert to array
+for fhr in "${fhrs[@]}"; do
+    export FORECAST_HOUR=$(( 10#${fhr} ))
+    "${HOMEgfs}/jobs/JGLOBAL_OCEANICE_PRODUCTS"
+    status=$?
+    if (( status != 0 )); then exit "${status}"; fi
+done
 
 exit $?
diff --git a/modulefiles/module_base.gaea.lua b/modulefiles/module_base.gaea.lua
index 55ad6b0c34..f379225380 100644
--- a/modulefiles/module_base.gaea.lua
+++ b/modulefiles/module_base.gaea.lua
@@ -15,6 +15,7 @@ load(pathJoin("cdo", (os.getenv("cdo_ver") or "None")))
 load(pathJoin("hdf5", (os.getenv("hdf5_ver") or "None")))
 load(pathJoin("netcdf-c", (os.getenv("netcdf_c_ver") or "None")))
 load(pathJoin("netcdf-fortran", (os.getenv("netcdf_fortran_ver") or "None")))
+load(pathJoin("perlbrew", (os.getenv("perl_ver") or "None")))
 
 load(pathJoin("nco", (os.getenv("nco_ver") or "None")))
 load(pathJoin("prod_util", (os.getenv("prod_util_ver") or "None")))
@@ -25,6 +26,7 @@ load(pathJoin("crtm", (os.getenv("crtm_ver") or "None")))
 load(pathJoin("bufr", (os.getenv("bufr_ver") or "None")))
 load(pathJoin("wgrib2", (os.getenv("wgrib2_ver") or "None")))
 load(pathJoin("py-netcdf4", (os.getenv("py_netcdf4_ver") or "None")))
+load(pathJoin("py-f90nml", (os.getenv("py_f90nml_ver") or "None")))
 load(pathJoin("py-pyyaml", (os.getenv("py_pyyaml_ver") or "None")))
 load(pathJoin("py-jinja2", (os.getenv("py_jinja2_ver") or "None")))
 load(pathJoin("py-pandas", (os.getenv("py_pandas_ver") or "None")))
@@ -36,4 +38,11 @@ load(pathJoin("py-xarray", (os.getenv("py_xarray_ver") or "None")))
 setenv("WGRIB2","wgrib2")
 setenv("UTILROOT",(os.getenv("prod_util_ROOT") or "None"))
 
+prepend_path("MODULEPATH", pathJoin("/gpfs/f5/ufs-ard/world-shared/global/glopara/data/git/prepobs/v" .. (os.getenv("prepobs_run_ver") or "None"), "modulefiles"))
+load(pathJoin("prepobs", (os.getenv("prepobs_run_ver") or "None")))
+
+prepend_path("MODULEPATH", pathJoin("/gpfs/f5/ufs-ard/world-shared/global/glopara/data/git/Fit2Obs/v" .. (os.getenv("fit2obs_ver") or "None"), "modulefiles"))
+load(pathJoin("fit2obs", (os.getenv("fit2obs_ver") or "None")))
+
+
 whatis("Description: GFS run setup environment")
diff --git a/modulefiles/module_base.hercules.lua b/modulefiles/module_base.hercules.lua
index fdc5f58698..4245b0d6f9 100644
--- a/modulefiles/module_base.hercules.lua
+++ b/modulefiles/module_base.hercules.lua
@@ -43,12 +43,10 @@ setenv("WGRIB2","wgrib2")
 setenv("WGRIB","wgrib")
 setenv("UTILROOT",(os.getenv("prod_util_ROOT") or "None"))
 
---prepend_path("MODULEPATH", pathJoin"/work/noaa/global/glopara/git/prepobs/v" .. (os.getenv("prepobs_run_ver") or "None"), "modulefiles")
-prepend_path("MODULEPATH", pathJoin("/work/noaa/global/kfriedma/glopara/git/prepobs/v" .. (os.getenv("prepobs_run_ver") or "None"), "modulefiles"))
+prepend_path("MODULEPATH", pathJoin("/work/noaa/global/glopara/git_rocky9/prepobs/v" .. (os.getenv("prepobs_run_ver") or "None"), "modulefiles"))
 load(pathJoin("prepobs", (os.getenv("prepobs_run_ver") or "None")))
 
---prepend_path("MODULEPATH", pathJoin("/work/noaa/global/glopara/git/Fit2Obs/v" .. (os.getenv("fit2obs_ver") or "None"), "modulefiles"))
-prepend_path("MODULEPATH", pathJoin("/work/noaa/global/kfriedma/glopara/git/Fit2Obs/v" .. (os.getenv("fit2obs_ver") or "None"), "modulefiles"))
+prepend_path("MODULEPATH", pathJoin("/work/noaa/global/glopara/git_rocky9/Fit2Obs/v" .. (os.getenv("fit2obs_ver") or "None"), "modulefiles"))
 load(pathJoin("fit2obs", (os.getenv("fit2obs_ver") or "None")))
 
 whatis("Description: GFS run environment")
diff --git a/modulefiles/module_base.jet.lua b/modulefiles/module_base.jet.lua
index 76320688b0..56735a2057 100644
--- a/modulefiles/module_base.jet.lua
+++ b/modulefiles/module_base.jet.lua
@@ -49,10 +49,10 @@ setenv("WGRIB2","wgrib2")
 setenv("WGRIB","wgrib")
 setenv("UTILROOT",(os.getenv("prod_util_ROOT") or "None"))
 
-prepend_path("MODULEPATH", pathJoin("/lfs4/HFIP/hfv3gfs/glopara/git/prepobs/v" .. (os.getenv("prepobs_run_ver") or "None"), "modulefiles"))
+prepend_path("MODULEPATH", pathJoin("/lfs5/HFIP/hfv3gfs/glopara/git/prepobs/v" .. (os.getenv("prepobs_run_ver") or "None"), "modulefiles"))
 load(pathJoin("prepobs", (os.getenv("prepobs_run_ver") or "None")))
 
-prepend_path("MODULEPATH", pathJoin("/lfs4/HFIP/hfv3gfs/glopara/git/Fit2Obs/v" .. (os.getenv("fit2obs_ver") or "None"), "modulefiles"))
+prepend_path("MODULEPATH", pathJoin("/lfs5/HFIP/hfv3gfs/glopara/git/Fit2Obs/v" .. (os.getenv("fit2obs_ver") or "None"), "modulefiles"))
 load(pathJoin("fit2obs", (os.getenv("fit2obs_ver") or "None")))
 
 whatis("Description: GFS run environment")
diff --git a/modulefiles/module_base.orion.lua b/modulefiles/module_base.orion.lua
index 5cee9e5e31..e7b51ed563 100644
--- a/modulefiles/module_base.orion.lua
+++ b/modulefiles/module_base.orion.lua
@@ -42,12 +42,10 @@ setenv("WGRIB2","wgrib2")
 setenv("WGRIB","wgrib")
 setenv("UTILROOT",(os.getenv("prod_util_ROOT") or "None"))
 
---prepend_path("MODULEPATH", pathJoin"/work/noaa/global/glopara/git/prepobs/v" .. (os.getenv("prepobs_run_ver") or "None"), "modulefiles")
-prepend_path("MODULEPATH", pathJoin("/work/noaa/global/kfriedma/glopara/git/prepobs/v" .. (os.getenv("prepobs_run_ver") or "None"), "modulefiles"))
+prepend_path("MODULEPATH", pathJoin("/work/noaa/global/glopara/git_rocky9/prepobs/v" .. (os.getenv("prepobs_run_ver") or "None"), "modulefiles"))
 load(pathJoin("prepobs", (os.getenv("prepobs_run_ver") or "None")))
 
---prepend_path("MODULEPATH", pathJoin("/work/noaa/global/glopara/git/Fit2Obs/v" .. (os.getenv("fit2obs_ver") or "None"), "modulefiles"))
-prepend_path("MODULEPATH", pathJoin("/work/noaa/global/kfriedma/glopara/git/Fit2Obs/v" .. (os.getenv("fit2obs_ver") or "None"), "modulefiles"))
+prepend_path("MODULEPATH", pathJoin("/work/noaa/global/glopara/git_rocky9/Fit2Obs/v" .. (os.getenv("fit2obs_ver") or "None"), "modulefiles"))
 load(pathJoin("fit2obs", (os.getenv("fit2obs_ver") or "None")))
 
 whatis("Description: GFS run environment")
diff --git a/modulefiles/module_base.wcoss2.lua b/modulefiles/module_base.wcoss2.lua
index 49d5abc678..d9f1a717e9 100644
--- a/modulefiles/module_base.wcoss2.lua
+++ b/modulefiles/module_base.wcoss2.lua
@@ -30,13 +30,14 @@ load(pathJoin("g2tmpl", (os.getenv("g2tmpl_ver") or "None")))
 load(pathJoin("ncdiag", (os.getenv("ncdiag_ver") or "None")))
 load(pathJoin("crtm", (os.getenv("crtm_ver") or "None")))
 load(pathJoin("wgrib2", (os.getenv("wgrib2_ver") or "None")))
+load(pathJoin("awscli", (os.getenv("awscli_ver") or "None")))
 
 prepend_path("MODULEPATH", "/apps/ops/para/libs/modulefiles/compiler/intel/19.1.3.304")
 setenv("HPC_OPT", "/apps/ops/para/libs")
 load(pathJoin("met", (os.getenv("met_ver") or "None")))
 load(pathJoin("metplus", (os.getenv("metplus_ver") or "None")))
 
-prepend_path("MODULEPATH", pathJoin("/lfs/h2/emc/global/save/emc.global/git/prepobs/v" .. (os.getenv("prepobs_run_ver") or "None"), "modulefiles"))
+prepend_path("MODULEPATH", pathJoin("/lfs/h2/emc/global/save/emc.global/git/prepobs/gfsv17_v" .. (os.getenv("prepobs_run_ver") or "None"), "modulefiles"))
 load(pathJoin("prepobs", (os.getenv("prepobs_run_ver") or "None")))
 
 prepend_path("MODULEPATH", pathJoin("/lfs/h2/emc/global/save/emc.global/git/Fit2Obs/v" .. (os.getenv("fit2obs_ver") or "None"), "modulefiles"))
diff --git a/modulefiles/module_gwsetup.jet.lua b/modulefiles/module_gwsetup.jet.lua
index bc14b19a79..a722c812a5 100644
--- a/modulefiles/module_gwsetup.jet.lua
+++ b/modulefiles/module_gwsetup.jet.lua
@@ -4,7 +4,7 @@ Load environment to run GFS workflow setup scripts on Jet
 
 load(pathJoin("rocoto"))
 
-prepend_path("MODULEPATH", "/mnt/lfs4/HFIP/hfv3gfs/role.epic/spack-stack/spack-stack-1.6.0/envs/gsi-addon-dev-rocky8/install/modulefiles/Core")
+prepend_path("MODULEPATH", "/contrib/spack-stack/spack-stack-1.6.0/envs/gsi-addon-intel/install/modulefiles/Core")
 
 local stack_intel_ver=os.getenv("stack_intel_ver") or "2021.5.0"
 local python_ver=os.getenv("python_ver") or "3.11.6"
diff --git a/parm/archive/enkf.yaml.j2 b/parm/archive/enkf.yaml.j2
index d3f16e8e69..f5662bc687 100644
--- a/parm/archive/enkf.yaml.j2
+++ b/parm/archive/enkf.yaml.j2
@@ -4,15 +4,15 @@ enkf:
     required:
         # Logs
         {% for mem in range(1, nmem_ens + 1) %}
-        - "logs/{{ cycle_YMDH }}/{{ RUN }}fcst_mem{{ '%03d' % mem }}.log"
+        - "logs/{{ cycle_YMDH }}/{{ RUN }}_fcst_mem{{ '%03d' % mem }}.log"
         {% endfor %}
         {% for fhr in range(fhmin, fhmax + 1, fhout) %}
-        - "logs/{{ cycle_YMDH }}/{{ RUN }}epos{{ '%03d' % (fhr - fhmin) }}.log"
+        - "logs/{{ cycle_YMDH }}/{{ RUN }}_epos{{ '%03d' % (fhr - fhmin) }}.log"
         {% endfor %}
-        - "logs/{{ cycle_YMDH }}/{{ RUN }}echgres.log"
-        - "logs/{{ cycle_YMDH }}/{{ RUN }}esfc.log"
+        - "logs/{{ cycle_YMDH }}/{{ RUN }}_echgres.log"
+        - "logs/{{ cycle_YMDH }}/{{ RUN }}_esfc.log"
         {% for grp in range(IAUFHRS | length) %}
-        - "logs/{{ cycle_YMDH }}/{{ RUN }}ecen{{ '%03d' % grp }}.log"
+        - "logs/{{ cycle_YMDH }}/{{ RUN }}_ecen{{ '%03d' % grp }}.log"
         {% endfor %}
 
         {% if lobsdiag_forenkf %}
@@ -27,13 +27,13 @@ enkf:
            {% else %}
               {% set steps = ["eobs", "eupd"] %}
               {% for mem in range(1, nmem_ens + 1) %}
-                 {% do steps.append("eomg_mem{{ '%03d' % mem }}") %}
+                 {% do steps.append("eomg_mem" ~ '%03d' % mem) %}
               {% endfor %}
            {% endif %}
         {% endif %}
 
         {% for step in steps %}
-        - "logs/{{ cycle_YMDH }}/{{ RUN }}{{ step }}.log"
+        - "logs/{{ cycle_YMDH }}/{{ RUN }}_{{ step }}.log"
         {% endfor %}
 
         # Ensemble mean and spread
@@ -54,12 +54,14 @@ enkf:
                            "radstat.ensmean"] %}
         {% else %}
         {% if lobsdiag_forenkf %}
-        {% set da_files = ["atmens_observer.yaml",
-                           "atmens_solver.yaml",
+        {% set da_files = ["atmensanlobs.yaml",
+                           "atmensanlsol.yaml",
+                           "atmensanlfv3inc.yaml",
                            "atminc.ensmean.nc",
                            "atmensstat"] %}
         {% else %}
-        {% set da_files = ["atmens.yaml",
+        {% set da_files = ["atmensanlletkf.yaml",
+                           "atmensanlfv3inc.yaml",
                            "atminc.ensmean.nc",
                            "atmensstat"] %}
         {% endif %}
diff --git a/parm/archive/gdas.yaml.j2 b/parm/archive/gdas.yaml.j2
index db92141ede..1e9597ba1c 100644
--- a/parm/archive/gdas.yaml.j2
+++ b/parm/archive/gdas.yaml.j2
@@ -5,33 +5,33 @@ gdas:
     required:
         {% if MODE == "cycled" %}
         # Cycled logs
-        - "logs/{{ cycle_YMDH }}/{{ RUN }}atmanlprod.log"
-        - "logs/{{ cycle_YMDH }}/{{ RUN }}prep.log"
+        - "logs/{{ cycle_YMDH }}/{{ RUN }}_atmanlprod.log"
+        - "logs/{{ cycle_YMDH }}/{{ RUN }}_prep.log"
             {% if DO_JEDIATMVAR %}
-        - "logs/{{ cycle_YMDH }}/{{ RUN }}prepatmiodaobs.log"
-        - "logs/{{ cycle_YMDH }}/{{ RUN }}atmanlinit.log"
-        - "logs/{{ cycle_YMDH }}/{{ RUN }}atmanlprod.log"
-        - "logs/{{ cycle_YMDH }}/{{ RUN }}atmanlfinal.log"
-        - "logs/{{ cycle_YMDH }}/{{ RUN }}atmanlfv3inc.log"
-        - "logs/{{ cycle_YMDH }}/{{ RUN }}atmanlvar.log"
+        - "logs/{{ cycle_YMDH }}/{{ RUN }}_prepatmiodaobs.log"
+        - "logs/{{ cycle_YMDH }}/{{ RUN }}_atmanlinit.log"
+        - "logs/{{ cycle_YMDH }}/{{ RUN }}_atmanlprod.log"
+        - "logs/{{ cycle_YMDH }}/{{ RUN }}_atmanlfinal.log"
+        - "logs/{{ cycle_YMDH }}/{{ RUN }}_atmanlfv3inc.log"
+        - "logs/{{ cycle_YMDH }}/{{ RUN }}_atmanlvar.log"
             {% else %}
-        - "logs/{{ cycle_YMDH }}/{{ RUN }}anal.log"
-        - "logs/{{ cycle_YMDH }}/{{ RUN }}analdiag.log"
+        - "logs/{{ cycle_YMDH }}/{{ RUN }}_anal.log"
+        - "logs/{{ cycle_YMDH }}/{{ RUN }}_analdiag.log"
             {% endif %}
-        - "logs/{{ cycle_YMDH }}/{{ RUN }}atmanlupp.log"
+        - "logs/{{ cycle_YMDH }}/{{ RUN }}_atmanlupp.log"
             {% if DO_JEDIOCNVAR %}
-        - "logs/{{ cycle_YMDH }}/{{ RUN }}prepoceanobs.log"
-        - "logs/{{ cycle_YMDH }}/{{ RUN }}ocnanalprep.log"
-        - "logs/{{ cycle_YMDH }}/{{ RUN }}marinebmat.log"
-        - "logs/{{ cycle_YMDH }}/{{ RUN }}ocnanalrun.log"
-        - "logs/{{ cycle_YMDH }}/{{ RUN }}ocnanalpost.log"
-        - "logs/{{ cycle_YMDH }}/{{ RUN }}ocnanalchkpt.log"
+        - "logs/{{ cycle_YMDH }}/{{ RUN }}_prepoceanobs.log"
+        - "logs/{{ cycle_YMDH }}/{{ RUN }}_marineanlinit.log"
+        - "logs/{{ cycle_YMDH }}/{{ RUN }}_marinebmat.log"
+        - "logs/{{ cycle_YMDH }}/{{ RUN }}_marineanlvar.log"
+        - "logs/{{ cycle_YMDH }}/{{ RUN }}_marineanlfinal.log"
+        - "logs/{{ cycle_YMDH }}/{{ RUN }}_marineanlchkpt.log"
                 {% if DOHYBVAR %}
-        - "logs/{{ cycle_YMDH }}/{{ RUN }}ocnanalecen.log"
+        - "logs/{{ cycle_YMDH }}/{{ RUN }}_ocnanalecen.log"
                 {% endif %}
             {% endif %}
             {% if DO_VRFY_OCEANDA %}
-        - "logs/{{ cycle_YMDH }}/{{ RUN }}ocnanalvrfy.log"
+        - "logs/{{ cycle_YMDH }}/{{ RUN }}_ocnanalvrfy.log"
             {% endif %}
 
         # Analysis GRIB2 (sub-sampled) data
@@ -58,7 +58,8 @@ gdas:
 
         # Analysis state
             {% if DO_JEDIATMVAR %}
-        - "{{ COMIN_ATMOS_ANALYSIS | relpath(ROTDIR) }}/{{ head }}atmvar.yaml"
+        - "{{ COMIN_ATMOS_ANALYSIS | relpath(ROTDIR) }}/{{ head }}atmanlvar.yaml"
+        - "{{ COMIN_ATMOS_ANALYSIS | relpath(ROTDIR) }}/{{ head }}atmanlfv3inc.yaml"
         - "{{ COMIN_ATMOS_ANALYSIS | relpath(ROTDIR) }}/{{ head }}atmstat"
             {% else %}
         - "{{ COMIN_ATMOS_ANALYSIS | relpath(ROTDIR) }}/{{ head }}gsistat"
@@ -84,7 +85,7 @@ gdas:
         - "{{ COMIN_ATMOS_OZNMON | relpath(ROTDIR) }}/time/bad_pen.{{ cycle_YMDH }}"
         - "{{ COMIN_ATMOS_OZNMON | relpath(ROTDIR) }}/time/stdout.time.tar.gz"
         - "{{ COMIN_ATMOS_OZNMON | relpath(ROTDIR) }}/horiz/stdout.horiz.tar.gz"
-        - "logs/{{ cycle_YMDH }}/{{ RUN }}verfozn.log"
+        - "logs/{{ cycle_YMDH }}/{{ RUN }}_verfozn.log"
             {% endif %}
 
         # Radiance verification
@@ -93,7 +94,7 @@ gdas:
         - "{{ COMIN_ATMOS_RADMON | relpath(ROTDIR) }}/radmon_bcoef.tar.gz"
         - "{{ COMIN_ATMOS_RADMON | relpath(ROTDIR) }}/radmon_bcor.tar.gz"
         - "{{ COMIN_ATMOS_RADMON | relpath(ROTDIR) }}/radmon_time.tar.gz"
-        - "logs/{{ cycle_YMDH }}/{{ RUN }}verfrad.log"
+        - "logs/{{ cycle_YMDH }}/{{ RUN }}_verfrad.log"
             {% endif %}
 
         # Minimization monitor
@@ -103,18 +104,18 @@ gdas:
         - "{{ COMIN_ATMOS_MINMON | relpath(ROTDIR) }}/{{ cycle_YMDH }}.gnorms.ieee_d"
         - "{{ COMIN_ATMOS_MINMON | relpath(ROTDIR) }}/{{ cycle_YMDH }}.reduction.ieee_d"
         - "{{ COMIN_ATMOS_MINMON | relpath(ROTDIR) }}/gnorm_data.txt"
-        - "logs/{{ cycle_YMDH }}/{{ RUN }}vminmon.log"
+        - "logs/{{ cycle_YMDH }}/{{ RUN }}_vminmon.log"
             {% endif %}
         {% endif %}  # End of cycled data
 
         # Forecast and post logs
-        - "logs/{{ cycle_YMDH }}/{{ RUN }}fcst_seg0.log"
+        - "logs/{{ cycle_YMDH }}/{{ RUN }}_fcst_seg0.log"
 
         {% for fhr in range(0, FHMAX + 1, 3) %}
             {% set fhr3 = '%03d' % fhr %}
-        - "logs/{{ cycle_YMDH }}/{{ RUN }}atmos_prod_f{{ fhr3 }}.log"
+        - "logs/{{ cycle_YMDH }}/{{ RUN }}_atmos_prod_f{{ fhr3 }}.log"
             {% if not WRITE_DOPOST %}
-        - "logs/{{ cycle_YMDH }}/{{ RUN }}atmos_upp_f{{ fhr3 }}.log"
+        - "logs/{{ cycle_YMDH }}/{{ RUN }}_atmos_upp_f{{ fhr3 }}.log"
             {% endif %}  ## not WRITE_DOPOST
         # Forecast GRIB2 data
         - "{{ COMIN_ATMOS_GRIB_0p25 | relpath(ROTDIR) }}/{{ head }}pgrb2.0p25.f{{ fhr3 }}"
diff --git a/parm/archive/gdas_restarta.yaml.j2 b/parm/archive/gdas_restarta.yaml.j2
index 9d86292065..fc5ce9478d 100644
--- a/parm/archive/gdas_restarta.yaml.j2
+++ b/parm/archive/gdas_restarta.yaml.j2
@@ -32,6 +32,8 @@ gdas_restarta:
         - "{{ COMIN_ATMOS_ANALYSIS | relpath(ROTDIR) }}/{{ head }}abias_int"
         - "{{ COMIN_ATMOS_ANALYSIS | relpath(ROTDIR) }}/{{ head }}dtfanl.nc"
         - "{{ COMIN_ATMOS_ANALYSIS | relpath(ROTDIR) }}/{{ head }}loginc.txt"
+        {% else %}
+        - "{{ COMIN_ATMOS_ANALYSIS | relpath(ROTDIR) }}/{{ head }}rad_varbc_params.tar"
         {% endif %}
 
         # Snow surface data
diff --git a/parm/archive/gefs_arcdir.yaml.j2 b/parm/archive/gefs_arcdir.yaml.j2
new file mode 100644
index 0000000000..d1008bc5c4
--- /dev/null
+++ b/parm/archive/gefs_arcdir.yaml.j2
@@ -0,0 +1,44 @@
+{% set cycle_HH = current_cycle | strftime("%H") %}
+{% set cycle_YMDH = current_cycle | to_YMDH %}
+{% set cycle_YMD = current_cycle | to_YMD %}
+{% set head = RUN + ".t" + cycle_HH + "z." %}
+
+# Declare the GEFS_ARCH where atmos data will be sent
+{% set GEFS_ARCH = ROTDIR ~ "/gefsarch" %}
+
+{% set file_set = [] %}
+
+{% set tmpl_dict = ({ '${ROTDIR}':ROTDIR,
+                      '${RUN}':RUN,
+                      '${YMD}':cycle_YMD,
+                      '${HH}':cycle_HH,
+                      '${GRID}': '1p00',
+                      '${MEMDIR}': 'ensstat' }) %}
+
+{% set COMIN_ATMOS_ENSSTAT_1p00 = COM_ATMOS_GRIB_GRID_TMPL | replace_tmpl(tmpl_dict) %}
+
+{% if REPLAY_ICS %}
+    {% set ofst_hr = FHOUT_GFS %}
+{% else %}
+    {% set ofst_hr = FHMIN_GFS %}
+{% endif %}
+
+# Select ensstat files to copy to the arcdir
+{% if RUN == "gefs" %}
+    {% set ensstat_files = [] %}
+    {% if path_exists(COMIN_ATMOS_ENSSTAT_1p00) %}
+        {% for fhr in range(ofst_hr, FHMAX_GFS + FHOUT_GFS, FHOUT_GFS) %}
+            {% do ensstat_files.append([COMIN_ATMOS_ENSSTAT_1p00 ~ "/" ~ head ~ "mean.pres_." ~
+                                        "1p00" ~ ".f" ~ '%03d'|format(fhr) ~ ".grib2",
+                                        GEFS_ARCH]) %}
+        {% endfor %}
+    {% endif %}
+{% endif %}
+{% set file_set = ensstat_files %}
+# Actually write the yaml
+mkdir:
+    - "{{ GEFS_ARCH }}"
+copy:
+   {% for source_dest_pair in file_set %}
+   - {{ source_dest_pair }}
+   {% endfor %}
diff --git a/parm/archive/gefs_extracted_atmos.yaml.j2 b/parm/archive/gefs_extracted_atmos.yaml.j2
new file mode 100644
index 0000000000..7ceba551bf
--- /dev/null
+++ b/parm/archive/gefs_extracted_atmos.yaml.j2
@@ -0,0 +1,86 @@
+{% set cycle_HH = current_cycle | strftime("%H") %}
+{% set cycle_YMD = current_cycle | to_YMD %}
+{% set cycle_YMDH = current_cycle | to_YMDH %}
+{% set head = RUN + ".t" + cycle_HH + "z." %}
+
+gefs_atmos:
+    name: "GEFS_ATMOS"
+    target: "{{ ATARDIR }}/{{ cycle_YMDH }}/gefs_atmos.tar"
+    required:
+#select mem%03d and ensstat files required
+{% set members = ["ensstat"] %}
+{% for mem_nm in range(0, NMEM_ENS + 1) %}
+    {% do members.append("mem" ~ '%03d' % mem_nm ) %}
+{% endfor %}
+
+{% if REPLAY_ICS %}
+    {% set ofst_hr = OFFSET_START_HOUR %}
+{% else %}
+    {% set ofst_hr = FHMIN_GFS %}
+{% endif %}
+
+{% for mem in members %}
+    {% for res in ['0p25', '0p50', '1p00'] %}
+        {% set tmpl_dict = ({ '${ROTDIR}':ROTDIR,
+                              '${RUN}':RUN,
+                              '${YMD}':cycle_YMD,
+                              '${HH}':cycle_HH,
+                              '${GRID}':res,
+                              '${MEMDIR}':mem }) %}
+
+        {% set COMIN_ATMOS_GRIB = COM_ATMOS_GRIB_GRID_TMPL | replace_tmpl(tmpl_dict) %}
+
+# Select pgrb and grib files to copy to the atardir
+        {% if path_exists(COMIN_ATMOS_GRIB) %}
+            {% if FHMAX_HF_GFS  == 0 %}
+                {% for fhr in range(ofst_hr, FHMAX_GFS + FHOUT_GFS, FHOUT_GFS) %}
+                    {% if mem=="ensstat" %}
+                        {% set file_name = head ~ "mean.pres_." ~ res ~ ".f" ~ '%03d'|format(fhr) ~ ".grib2" %}
+                        {% set file_path = COMIN_ATMOS_GRIB ~ "/" ~ file_name %}
+                        - "{{ file_path | relpath(ROTDIR)}}"
+                    {% else %}
+                        {% set file_name = head ~ "pgrb2." ~ res ~ ".f" ~ '%03d'|format(fhr) %}
+                        {% set file_path = COMIN_ATMOS_GRIB ~ "/" ~ file_name %}
+                        - "{{ file_path | relpath(ROTDIR)}}"
+                        {% set file_name = head ~ "pgrb2b." ~ res ~ ".f" ~ '%03d'|format(fhr) %}
+                        {% set file_path = COMIN_ATMOS_GRIB ~ "/" ~ file_name %}
+                        - "{{ file_path | relpath(ROTDIR)}}"
+                    {% endif %}
+                {% endfor %}
+            {% else %}
+                 {% if res == "0p25" %}
+                    {% for fhr in range(ofst_hr, FHMAX_HF_GFS + FHOUT_HF_GFS, FHOUT_HF_GFS) %}
+                        {% if mem=="ensstat" %}
+                            {% set file_name = head ~ "mean.pres_." ~ res ~ ".f" ~ '%03d'|format(fhr) ~ ".grib2" %}
+                            {% set file_path = COMIN_ATMOS_GRIB ~ "/" ~ file_name %}
+                            - "{{ file_path | relpath(ROTDIR)}}"
+                        {% else %}
+                            {% set file_name = head ~ "pgrb2." ~ res ~ ".f" ~ '%03d'|format(fhr) %}
+                            {% set file_path = COMIN_ATMOS_GRIB ~ "/" ~ file_name %}
+                            - "{{ file_path | relpath(ROTDIR)}}"
+                            {% set file_name = head ~ "pgrb2b." ~ res ~ ".f" ~ '%03d'|format(fhr) %}
+                            {% set file_path = COMIN_ATMOS_GRIB ~ "/" ~ file_name %}
+                            - "{{ file_path | relpath(ROTDIR)}}"
+                        {% endif %}
+                    {% endfor %}
+                {% endif %}
+                {% if res == "0p50" %}
+                    {% for fhr in range(FHMAX_HF_GFS + FHOUT_GFS, FHMAX_GFS + FHOUT_GFS, FHOUT_GFS) %}
+                        {% if mem=="ensstat" %}
+                            {% set file_name = head ~ "mean.pres_." ~ res ~ ".f" ~ '%03d'|format(fhr) ~ ".grib2" %}
+                            {% set file_path = COMIN_ATMOS_GRIB ~ "/" ~ file_name %}
+                            - "{{ file_path | relpath(ROTDIR)}}"
+                        {% else %}
+                            {% set file_name = head ~ "pgrb2." ~ res ~ ".f" ~ '%03d'|format(fhr) %}
+                            {% set file_path = COMIN_ATMOS_GRIB ~ "/" ~ file_name %}
+                            - "{{ file_path | relpath(ROTDIR)}}"
+                            {% set file_name = head ~ "pgrb2b." ~ res ~ ".f" ~ '%03d'|format(fhr) %}
+                            {% set file_path = COMIN_ATMOS_GRIB ~ "/" ~ file_name %}
+                            - "{{ file_path | relpath(ROTDIR)}}"
+                        {% endif %}
+                    {% endfor %}
+                {% endif %}
+            {% endif %}
+        {% endif %}
+    {% endfor %}
+{% endfor %}
diff --git a/parm/archive/gefs_extracted_ice.yaml.j2 b/parm/archive/gefs_extracted_ice.yaml.j2
new file mode 100644
index 0000000000..786d502f23
--- /dev/null
+++ b/parm/archive/gefs_extracted_ice.yaml.j2
@@ -0,0 +1,33 @@
+{% set cycle_HH = current_cycle | strftime("%H") %}
+{% set cycle_YMD = current_cycle | to_YMD %}
+{% set cycle_YMDH = current_cycle | to_YMDH %}
+{% set head = RUN + ".ice.t" + cycle_HH + "z." %}
+
+gefs_ice:
+    name: "GEFS_ICE"
+    target: "{{ ATARDIR }}/{{ cycle_YMDH }}/gefs_ice.tar"
+    required:
+#select mem%03d and ensstat files required
+{% set members = [] %}
+{% for mem_nm in range(0, NMEM_ENS + 1) %}
+    {% do members.append("mem" ~ '%03d' % mem_nm ) %}
+{% endfor %}
+
+{% for mem in members %}
+    {% set tmpl_dict = ({ '${ROTDIR}':ROTDIR,
+                          '${RUN}':RUN,
+                          '${YMD}':cycle_YMD,
+                          '${HH}':cycle_HH,
+                          '${MEMDIR}':mem }) %}
+
+    {% set COMIN_ICE_HISTORY = COM_ICE_HISTORY_TMPL | replace_tmpl(tmpl_dict) %}
+
+# Select netcdf files to copy to the atardir
+    {% if path_exists(COMIN_ICE_HISTORY) %}
+        {% for fhr in range(FHMIN_GFS + FHOUT_ICE_GFS, FHMAX_GFS + FHOUT_ICE_GFS, FHOUT_ICE_GFS) %}
+            {% set file_name = head ~ FHOUT_ICE_GFS ~ "hr_avg" ~ ".f" ~ '%03d'|format(fhr) ~ ".nc" %}
+            {% set file_path = COMIN_ICE_HISTORY ~ "/" ~ file_name %}
+            - "{{ file_path | relpath(ROTDIR)}}"
+        {% endfor %}
+    {% endif %}
+{% endfor %}
diff --git a/parm/archive/gefs_extracted_ocean.yaml.j2 b/parm/archive/gefs_extracted_ocean.yaml.j2
new file mode 100644
index 0000000000..e5e3b36e3b
--- /dev/null
+++ b/parm/archive/gefs_extracted_ocean.yaml.j2
@@ -0,0 +1,40 @@
+{% set cycle_HH = current_cycle | strftime("%H") %}
+{% set cycle_YMD = current_cycle | to_YMD %}
+{% set cycle_YMDH = current_cycle | to_YMDH %}
+{% set head = RUN + ".ocean.t" + cycle_HH + "z." %}
+
+gefs_ocean:
+    name: "GEFS_OCEAN"
+    target: "{{ ATARDIR }}/{{ cycle_YMDH }}/gefs_ocean.tar"
+    required:
+#select mem%03d and ensstat files required
+{% set members = [] %}
+{% for mem_nm in range(0, NMEM_ENS + 1) %}
+    {% do members.append("mem" ~ '%03d' % mem_nm ) %}
+{% endfor %}
+
+{% if OCNRES == "025" %}
+    {% set res = "1p00" %}
+{% else %}
+    {% set res = (OCNRES|string())[0] ~ "p" ~ (OCNRES|string())[-2:] %}
+{% endif %}
+
+{% for mem in members %}
+    {% set tmpl_dict = ({ '${ROTDIR}':ROTDIR,
+                          '${RUN}':RUN,
+                          '${YMD}':cycle_YMD,
+                          '${HH}':cycle_HH,
+                          '${MEMDIR}':mem }) %}
+
+    {% set COMIN_OCEAN_NETCDF = COM_OCEAN_NETCDF_TMPL | replace_tmpl(tmpl_dict) %}
+
+    # Select netcdf files to copy to the atardir
+    {% set netcdf_grid_dir = COMIN_OCEAN_NETCDF ~ "/" ~ res %}
+    {% if path_exists(netcdf_grid_dir) %}
+        {% for fhr in range(FHMIN_GFS + FHOUT_OCN_GFS, FHMAX_GFS + FHOUT_OCN_GFS, FHOUT_OCN_GFS) %}
+            {% set file_name = head ~ res ~ ".f" ~ '%03d'|format(fhr) ~ ".nc" %}
+            {% set file_path = netcdf_grid_dir ~ "/" ~ file_name %}
+            - "{{ file_path | relpath(ROTDIR)}}"
+        {% endfor %}
+    {% endif %}
+{% endfor %}
diff --git a/parm/archive/gefs_extracted_wave.yaml.j2 b/parm/archive/gefs_extracted_wave.yaml.j2
new file mode 100644
index 0000000000..e0aa07c816
--- /dev/null
+++ b/parm/archive/gefs_extracted_wave.yaml.j2
@@ -0,0 +1,51 @@
+{% set cycle_HH = current_cycle | strftime("%H") %}
+{% set cycle_YMD = current_cycle | to_YMD %}
+{% set cycle_YMDH = current_cycle | to_YMDH %}
+{% set head = RUN + "wave.t" + cycle_HH + "z." %}
+
+gefs_wave:
+    name: "GEFS_WAVE"
+    target: "{{ ATARDIR }}/{{ cycle_YMDH }}/gefs_wave.tar"
+    required:
+{% if REPLAY_ICS %}
+    {% set ofst_hr = OFFSET_START_HOUR %}
+{% else %}
+    {% set ofst_hr = FHMIN_GFS %}
+{% endif %}
+
+{% set res = (waveGRD[-3:])[0] ~ "p" ~ (waveGRD[-3:])[-2:] %}
+
+#select mem%03d and ensstat files required
+{% set members = [] %}
+{% for mem_nm in range(0, NMEM_ENS + 1) %}
+    {% do members.append("mem" ~ '%03d' % mem_nm ) %}
+{% endfor %}
+
+{% for mem in members %}
+    {% set tmpl_dict = ({ '${ROTDIR}':ROTDIR,
+                          '${RUN}':RUN,
+                          '${YMD}':cycle_YMD,
+                          '${HH}':cycle_HH,
+                          '${MEMDIR}':mem }) %}
+
+    {% set COMIN_WAVE_GRID = COM_WAVE_GRID_TMPL | replace_tmpl(tmpl_dict) %}
+    # Select grib2 files to copy to the atardir
+    {% if path_exists(COMIN_WAVE_GRID) %}
+        {% for fhr in range(ofst_hr, FHMAX_GFS + FHOUT_WAV, FHOUT_WAV) %}
+            {% set file_name = head ~ "global." ~ res ~ ".f" ~ '%03d'|format(fhr) ~ ".grib2" %}
+            {% set file_path = COMIN_WAVE_GRID ~ "/" ~ file_name %}
+        - "{{ file_path | relpath(ROTDIR)}}"
+        {% endfor %}
+    {% endif %}
+
+    {% set COMIN_WAVE_STATION = COM_WAVE_STATION_TMPL | replace_tmpl(tmpl_dict) %}
+    # Select station files to copy to the atardir
+    {% if path_exists(COMIN_WAVE_STATION) %}
+        {% set file_path = COMIN_WAVE_STATION ~ "/" ~ RUN ~ "wave.t" ~ cycle_HH ~ "z.spec_tar.gz" %}
+        - "{{ file_path | relpath(ROTDIR)}}"
+        {% set file_path = COMIN_WAVE_STATION ~ "/" ~ RUN ~ "wave.t" ~ cycle_HH ~ "z.cbull_tar" %}
+        - "{{ file_path | relpath(ROTDIR)}}"
+        {% set file_path = COMIN_WAVE_STATION ~ "/" ~ RUN ~ "wave.t" ~ cycle_HH ~ "z.bull_tar" %}
+        - "{{ file_path | relpath(ROTDIR)}}"
+    {% endif %}
+{% endfor %}
diff --git a/parm/archive/arcdir.yaml.j2 b/parm/archive/gfs_arcdir.yaml.j2
similarity index 100%
rename from parm/archive/arcdir.yaml.j2
rename to parm/archive/gfs_arcdir.yaml.j2
diff --git a/parm/archive/gfsa.yaml.j2 b/parm/archive/gfsa.yaml.j2
index 4a86778e2e..dcf059d871 100644
--- a/parm/archive/gfsa.yaml.j2
+++ b/parm/archive/gfsa.yaml.j2
@@ -6,7 +6,7 @@ gfsa:
         # Logs
         # TODO explicitly name all logs to include
         {% for log in glob("logs/" ~ cycle_YMDH ~ "/gfs*.log") %}
-        {% if not "gfsarch.log" in log %}
+        {% if not "gfs_arch.log" in log %}
         - "{{ log }}"
         {% endif %}
         {% endfor %}
@@ -32,7 +32,8 @@ gfsa:
 
         # State data
         {% if DO_JEDIATMVAR %}
-        - "{{ COMIN_ATMOS_ANALYSIS | relpath(ROTDIR) }}/{{ head }}atmvar.yaml"
+        - "{{ COMIN_ATMOS_ANALYSIS | relpath(ROTDIR) }}/{{ head }}atmanlvar.yaml"
+        - "{{ COMIN_ATMOS_ANALYSIS | relpath(ROTDIR) }}/{{ head }}atmanlfv3inc.yaml"
         - "{{ COMIN_ATMOS_ANALYSIS | relpath(ROTDIR) }}/{{ head }}atmstat"
         {% else %}
         - "{{ COMIN_ATMOS_ANALYSIS | relpath(ROTDIR) }}/{{ head }}gsistat"
diff --git a/parm/archive/master_gefs.yaml.j2 b/parm/archive/master_gefs.yaml.j2
new file mode 100644
index 0000000000..5dc046dcfd
--- /dev/null
+++ b/parm/archive/master_gefs.yaml.j2
@@ -0,0 +1,12 @@
+# Set variables/lists needed to parse the gefs templates
+{% set cycle_HH = current_cycle | strftime("%H") %}
+{% set cycle_YMD = current_cycle | to_YMD %}
+{% set cycle_YMDH = current_cycle | to_YMDH %}
+
+datasets:
+{% filter indent(width=4) %}
+    {% include "gefs_extracted_atmos.yaml.j2" %}
+    {% include "gefs_extracted_ocean.yaml.j2" %}
+    {% include "gefs_extracted_ice.yaml.j2" %}
+    {% include "gefs_extracted_wave.yaml.j2" %}
+{% endfilter %}
diff --git a/parm/config/gefs/config.atmos_ensstat b/parm/config/gefs/config.atmos_ensstat
index d371f75887..e0567e189d 100644
--- a/parm/config/gefs/config.atmos_ensstat
+++ b/parm/config/gefs/config.atmos_ensstat
@@ -8,4 +8,7 @@ echo "BEGIN: config.atmos_ensstat"
 # Get task specific resources
 . "${EXPDIR}/config.resources" atmos_ensstat
 
+# No. of forecast hours to process in a single job
+export NFHRS_PER_GROUP=${FHMAX_GFS}
+
 echo "END: config.atmos_ensstat"
diff --git a/parm/config/gefs/config.atmos_products b/parm/config/gefs/config.atmos_products
index 4a0fb8b49f..9fc88459e9 100644
--- a/parm/config/gefs/config.atmos_products
+++ b/parm/config/gefs/config.atmos_products
@@ -9,14 +9,19 @@ echo "BEGIN: config.atmos_products"
 . "${EXPDIR}/config.resources" atmos_products
 
 # No. of forecast hours to process in a single job
-export NFHRS_PER_GROUP=3
+export NFHRS_PER_GROUP=${FHMAX_GFS}
 
 # Scripts used by this job
 export INTERP_ATMOS_MASTERSH="${USHgfs}/interp_atmos_master.sh"
 export INTERP_ATMOS_SFLUXSH="${USHgfs}/interp_atmos_sflux.sh"
 
 export downset=2
-export FHOUT_PGBS=${FHOUT_GFS:-3}  # Output frequency of supplemental gfs pgb file at 1.0 and 0.5 deg
+
+if [[ "${FHMAX_HF_GFS:-0}" == "0" ]]; then
+    export FHOUT_PGBS=${FHOUT_GFS:-3}  # Output frequency of supplemental gfs pgb file at 1.0 and 0.5 deg
+else
+    export FHOUT_PGBS=${FHOUT_HF_GFS:-1}
+fi
 export FLXGF="NO"  # Create interpolated sflux.1p00 file
 
 # paramlist files for the different forecast hours and downsets
diff --git a/parm/config/gefs/config.base b/parm/config/gefs/config.base
index c2d19c0609..f16bd6a9bf 100644
--- a/parm/config/gefs/config.base
+++ b/parm/config/gefs/config.base
@@ -48,6 +48,9 @@ export NOSCRUB="@NOSCRUB@"
 # Base directories for various builds
 export BASE_GIT="@BASE_GIT@"
 
+# Base directory for staged data
+export BASE_DATA="@BASE_DATA@"
+
 # Toggle to turn on/off GFS downstream processing.
 export DO_BUFRSND="@DO_BUFRSND@"     # BUFR sounding products
 export DO_GEMPAK="@DO_GEMPAK@"       # GEMPAK products
@@ -225,7 +228,17 @@ export FHOUT_OCN=3
 export FHOUT_ICE=3
 
 # GFS cycle info
-export gfs_cyc=@gfs_cyc@ # 0: no GFS cycle, 1: 00Z only, 2: 00Z and 12Z only, 4: all 4 cycles.
+export INTERVAL_GFS=@INTERVAL_GFS@ # Frequency of GFS forecast
+export SDATE_GFS=@SDATE_GFS@
+
+# set variables needed for use with REPLAY ICs
+export REPLAY_ICS=@REPLAY_ICS@
+if [[ "${REPLAY_ICS:-NO}" == "YES" ]]; then
+    export OFFSET_START_HOUR=$(( assim_freq / 2 ))
+else
+    export OFFSET_START_HOUR=0
+fi
+
 
 # GFS output and frequency
 export FHMIN_GFS=0
@@ -236,19 +249,14 @@ export FCST_SEGMENTS="${FHMIN_GFS},${breakpnts:+${breakpnts},}${FHMAX_GFS}"
 
 export FHOUT_GFS=6
 export FHMAX_HF_GFS=@FHMAX_HF_GFS@
-export FHOUT_HF_GFS=1
-export FHOUT_OCN_GFS=6
-export FHOUT_ICE_GFS=6
-export FHMIN_WAV=0
+export FHOUT_HF_GFS=@FHOUT_HF_GFS@
+export FHOUT_OCN_GFS=@FHOUT_OCN_GFS@
+export FHOUT_ICE_GFS=@FHOUT_ICE_GFS@
+export FHMIN_WAV=${OFFSET_START_HOUR:-0}
 export FHOUT_WAV=3
 export FHMAX_HF_WAV=120
 export FHOUT_HF_WAV=1
 export FHMAX_WAV=${FHMAX_GFS}
-if (( gfs_cyc != 0 )); then
-    export STEP_GFS=$(( 24 / gfs_cyc ))
-else
-    export STEP_GFS="0"
-fi
 export ILPOST=1           # gempak output frequency up to F120
 
 export FHMIN_ENKF=${FHMIN_GFS}
@@ -269,10 +277,6 @@ export OUTPUT_GRID="gaussian_grid"
 export WRITE_DOPOST=".true." # WRITE_DOPOST=true, use inline POST
 export WRITE_NSFLIP=".true."
 
-# Override normal post flat files for GEFS
-export FLTFILEGFS="${PARMgfs}/post/postxconfig-NT-GEFS.txt"
-export FLTFILEGFSF00="${PARMgfs}/post/postxconfig-NT-GEFS-F00.txt"
-
 # Microphysics Options: 99-ZhaoCarr, 8-Thompson; 6-WSM6, 10-MG, 11-GFDL
 export imp_physics=8
 
@@ -292,20 +296,9 @@ export NMEM_ENS=@NMEM_ENS@
 export ENSMEM=${ENSMEM:-"000"}
 export MEMDIR="mem${ENSMEM}"
 
-# initialize ocean ensemble members with perturbations
-#   if true, only occurs for members greater than zero
-export REPLAY_ICS=@REPLAY_ICS@
-if [[ "${REPLAY_ICS:-NO}" == "YES" ]]; then
-    export OFFSET_START_HOUR=$(( assim_freq / 2 ))
-else
-    export OFFSET_START_HOUR=0
-fi
-
 export DOIAU="NO"  # While we are not doing IAU, we may want to warm start w/ IAU in the future
-# Check if cycle is cold starting
-if [[ "${EXP_WARM_START}" = ".false." ]]; then
-  export IAU_FHROT=${OFFSET_START_HOUR}
-else
+# Check if cycle is warm starting with IAU
+if [[ "${EXP_WARM_START}" = ".true." ]]; then
   if [[ "${DOIAU}" = "YES" ]]; then
     export IAU_FHROT=3
   else
@@ -341,14 +334,20 @@ export ARCH_CYC=00           # Archive data at this cycle for warm_start capabil
 export ARCH_WARMICFREQ=4     # Archive frequency in days for warm_start capability
 export ARCH_FCSTICFREQ=1     # Archive frequency in days for gdas and gfs forecast-only capability
 
+export DO_DOWNLOAD_ICS="YES" # Set to YES to download ICs from HPSS, set to NO to copy ICs locally
+export HPSSICARCH="/NCEPDEV/emc-marine/2year/Neil.Barton/ICS/HR4/C384mx025" # ICs directory on HPSS
+
+export DO_DOWNLOAD_ANLY="YES" # Set to YES to download f03 replay analysis from AWS, set to NO to copy f03 analysis locally
+export ANLYDIR="" # f03 replay analysis directory on disk. May be left blank if DO_DOWNLOAD_ANLY is set to YES
+
 export DELETE_COM_IN_ARCHIVE_JOB="YES"   # NO=retain ROTDIR.  YES default in arch.sh and earc.sh.
 
 # Number of regional collectives to create soundings for
 export NUM_SND_COLLECTIVES=${NUM_SND_COLLECTIVES:-9}
 
-# The tracker, genesis, and METplus jobs are not supported on AWS yet
-# TODO: we should place these in workflow/hosts/awspw.yaml as part of AWS setup, not for general.
-if [[ "${machine}" == "AWSPW" ]]; then
+# The tracker, genesis, and METplus jobs are not supported on CSPs yet
+# TODO: we should place these in workflow/hosts/[aws|azure|google]pw.yaml as part of CSP's setup, not for general.
+if [[ "${machine}" =~ "PW" ]]; then
    export DO_WAVE="NO"
 fi
 
diff --git a/parm/config/gefs/config.cleanup b/parm/config/gefs/config.cleanup
new file mode 120000
index 0000000000..839ed6c194
--- /dev/null
+++ b/parm/config/gefs/config.cleanup
@@ -0,0 +1 @@
+../gfs/config.cleanup
\ No newline at end of file
diff --git a/parm/config/gefs/config.efcs b/parm/config/gefs/config.efcs
index 807ed66d48..553be13149 100644
--- a/parm/config/gefs/config.efcs
+++ b/parm/config/gefs/config.efcs
@@ -46,10 +46,6 @@ export SKEB_LSCALE="500.E3,1000.E3,2000.E3,2000.E3,2000.E3"
 export SKEBNORM=1
 export SKEB_NPASS=30
 export SKEB_VDOF=5
-export DO_SHUM="YES"
-export SHUM=0.005
-export SHUM_TAU=21600.
-export SHUM_LSCALE=500000.
 export DO_SPPT="YES"
 export SPPT="0.56,0.28,0.14,0.056,0.028"
 export SPPT_TAU="2.16E4,2.592E5,2.592E6,7.776E6,3.1536E7"
@@ -78,6 +74,6 @@ if [[ "${REPLAY_ICS:-NO}" == "YES" ]]; then
 else
     export ODA_INCUPD="False"
 fi
-export restart_interval="${restart_interval_enkfgfs:-12}"
+export restart_interval="${FHMAX}"
 
 echo "END: config.efcs"
diff --git a/parm/config/gefs/config.extractvars b/parm/config/gefs/config.extractvars
index cc93fcf5e0..7f1166a869 100644
--- a/parm/config/gefs/config.extractvars
+++ b/parm/config/gefs/config.extractvars
@@ -14,7 +14,7 @@ export compress_ice=1 #1: Compress extracted ice product, 0: Do not compress ext
 
 export ocnres="1p00" # Resolution of ocean products
 export iceres="native" # Resolution of ice products
-export wavres="0p25" # Resolution of wave products
+export wavres="${waveGRD:4:1}p${waveGRD:5:2}"  # Resolution of wave products
 
 export depthvar_name="z_l" # Name of depth variable in NetCDF ocean products
 export zmin="0." # Minimum depth to extract from NetCDF ocean products
diff --git a/parm/config/gefs/config.fcst b/parm/config/gefs/config.fcst
index efdedb24f4..91f8184cdb 100644
--- a/parm/config/gefs/config.fcst
+++ b/parm/config/gefs/config.fcst
@@ -255,7 +255,7 @@ else
 fi
 
 # Write gfs restart files to rerun fcst from any break point
-export restart_interval=${restart_interval_gfs:-12}
+export restart_interval="${FHMAX}"
 
 # Turn off dry mass adjustment in GFS
 export adjust_dry_mass=".false."
diff --git a/parm/config/gefs/config.oceanice_products b/parm/config/gefs/config.oceanice_products
index 3b8b064947..9ce81de4de 100644
--- a/parm/config/gefs/config.oceanice_products
+++ b/parm/config/gefs/config.oceanice_products
@@ -10,6 +10,6 @@ source "${EXPDIR}/config.resources" oceanice_products
 export OCEANICEPRODUCTS_CONFIG="${PARMgfs}/post/oceanice_products_gefs.yaml"
 
 # No. of forecast hours to process in a single job
-export NFHRS_PER_GROUP=3
+export NFHRS_PER_GROUP=${FHMAX_GFS}
 
 echo "END: config.oceanice_products"
diff --git a/parm/config/gefs/config.resources b/parm/config/gefs/config.resources
index 768d95b8c1..5baa3a774b 100644
--- a/parm/config/gefs/config.resources
+++ b/parm/config/gefs/config.resources
@@ -43,6 +43,14 @@ case ${machine} in
     export PARTITION_BATCH="compute"
     max_tasks_per_node=36
     ;;
+  "AZUREPW")
+    export PARTITION_BATCH="compute"
+    max_tasks_per_node=24
+    ;;
+  "GOOGLEPW")
+    export PARTITION_BATCH="compute"
+    max_tasks_per_node=32
+    ;;
   *)
     echo "FATAL ERROR: Unknown machine encountered by ${BASH_SOURCE[0]}"
     exit 2
@@ -53,11 +61,11 @@ export max_tasks_per_node
 case ${step} in
 
   "stage_ic")
-    export walltime="00:15:00"
+    export walltime="06:00:00"
     export ntasks=1
     export tasks_per_node=1
     export threads_per_task=1
-    export is_exclusive=True
+    export memory="4096M"
     ;;
 
   "waveinit")
@@ -296,6 +304,14 @@ case ${step} in
     export threads_per_task=1
     export memory="4096M"
     ;;
+
+  "cleanup")
+    export walltime="00:15:00"
+    export ntasks=1
+    export tasks_per_node=1
+    export threads_per_task=1
+    export memory="4096M"
+    ;;
   *)
     echo "FATAL ERROR: Invalid job ${step} passed to ${BASH_SOURCE[0]}"
     exit 1
diff --git a/parm/config/gefs/config.resources.AZUREPW b/parm/config/gefs/config.resources.AZUREPW
new file mode 100644
index 0000000000..96303139d8
--- /dev/null
+++ b/parm/config/gefs/config.resources.AZUREPW
@@ -0,0 +1,11 @@
+#! /usr/bin/env bash
+
+# AZURE-specific job resources
+
+export is_exclusive="True"
+unset memory
+
+# shellcheck disable=SC2312
+for mem_var in $(env | grep '^memory_' | cut -d= -f1); do
+  unset "${mem_var}"
+done
diff --git a/parm/config/gefs/config.resources.GOOGLEPW b/parm/config/gefs/config.resources.GOOGLEPW
new file mode 100644
index 0000000000..21e54013c7
--- /dev/null
+++ b/parm/config/gefs/config.resources.GOOGLEPW
@@ -0,0 +1,11 @@
+#! /usr/bin/env bash
+
+# GOOGLE-specific job resources
+
+export is_exclusive="True"
+unset memory
+
+# shellcheck disable=SC2312
+for mem_var in $(env | grep '^memory_' | cut -d= -f1); do
+  unset "${mem_var}"
+done
diff --git a/parm/config/gefs/config.ufs b/parm/config/gefs/config.ufs
index 584e4769a8..9e1f76b806 100644
--- a/parm/config/gefs/config.ufs
+++ b/parm/config/gefs/config.ufs
@@ -80,8 +80,8 @@ case "${fv3_res}" in
         export nthreads_fv3_gfs=1
         export nthreads_ufs=1
         export nthreads_ufs_gfs=1
-	      export xr_cnvcld=.false. # Do not pass conv. clouds to Xu-Randall cloud fraction
-	      export cdmbgwd="0.071,2.1,1.0,1.0"  # mountain blocking, ogwd, cgwd, cgwd src scaling
+        export xr_cnvcld=.false. # Do not pass conv. clouds to Xu-Randall cloud fraction
+        export cdmbgwd="0.071,2.1,1.0,1.0"  # mountain blocking, ogwd, cgwd, cgwd src scaling
         export cdmbgwd_gsl="40.0,1.77,1.0,1.0"   # settings for GSL drag suite
         export k_split=1
         export n_split=4
@@ -104,8 +104,8 @@ case "${fv3_res}" in
         export nthreads_fv3_gfs=1
         export nthreads_ufs=1
         export nthreads_ufs_gfs=1
-	      export xr_cnvcld=".false."  # Do not pass conv. clouds to Xu-Randall cloud fraction
-	      export cdmbgwd="0.14,1.8,1.0,1.0"  # mountain blocking, ogwd, cgwd, cgwd src scaling
+        export xr_cnvcld=".false."  # Do not pass conv. clouds to Xu-Randall cloud fraction
+        export cdmbgwd="0.14,1.8,1.0,1.0"  # mountain blocking, ogwd, cgwd, cgwd src scaling
         export cdmbgwd_gsl="20.0,2.5,1.0,1.0"   # settings for GSL drag suite
         export knob_ugwp_tauamp=3.0e-3      # setting for UGWPv1 non-stationary GWD
         export k_split=1
@@ -145,12 +145,12 @@ case "${fv3_res}" in
         export DELTIM=300
         export layout_x=6
         export layout_y=8
-        export layout_x_gfs=8
-        export layout_y_gfs=8
+        export layout_x_gfs=16
+        export layout_y_gfs=12
         export nthreads_fv3=1
-        export nthreads_fv3_gfs=2
+        export nthreads_fv3_gfs=1
         export nthreads_ufs=1
-        export nthreads_ufs_gfs=2
+        export nthreads_ufs_gfs=1
         export cdmbgwd="1.1,0.72,1.0,1.0"  # mountain blocking, ogwd, cgwd, cgwd src scaling
         export cdmbgwd_gsl="5.0,5.0,1.0,1.0"   # settings for GSL drag suite
         export knob_ugwp_tauamp=0.8e-3      # setting for UGWPv1 non-stationary GWD
@@ -161,8 +161,9 @@ case "${fv3_res}" in
         export fv_sg_adj=900
         export WRITE_GROUP=2
         export WRTTASK_PER_GROUP_PER_THREAD_PER_TILE=8
-        export WRITE_GROUP_GFS=2
-        export WRTTASK_PER_GROUP_PER_THREAD_PER_TILE_GFS=10
+        export WRITE_GROUP_GFS=1
+        export WRTTASK_PER_GROUP_PER_THREAD_PER_TILE_GFS=8
+        export OUTPUT_HISTORY=".false."
         ;;
     "C768")
         export DELTIM=150
@@ -254,21 +255,33 @@ export ntasks_fv3_gfs
 export ntasks_quilt
 export ntasks_quilt_gfs
 
-# Determine whether to use parallel NetCDF based on resolution
+# Determine whether to use compression in the write grid component
+# and whether to use parallel NetCDF based on resolution
 case ${fv3_res} in
-  "C48" | "C96" | "C192" | "C384")
+  "C48" | "C96" | "C192")
+    zstandard_level=0
+    ideflate=0
+    quantize_nsd=0
     OUTPUT_FILETYPE_ATM="netcdf"
     OUTPUT_FILETYPE_SFC="netcdf"
     ;;
-  "C768" | "C1152" | "C3072")
+  "C384" | "C768" | "C1152" | "C3072")
+    zstandard_level=0
+    ideflate=1
+    quantize_nsd=5
     OUTPUT_FILETYPE_ATM="netcdf_parallel"
-    OUTPUT_FILETYPE_SFC="netcdf_parallel"
+    if [[ "${fv3_res}" == "C384" ]]; then
+      OUTPUT_FILETYPE_SFC="netcdf"  # For C384, the write grid component is better off with serial netcdf
+    else
+      OUTPUT_FILETYPE_SFC="netcdf_parallel"
+    fi
     ;;
   *)
     echo "FATAL ERROR: Unrecognized FV3 resolution ${fv3_res}"
     exit 15
     ;;
 esac
+export zstandard_level ideflate quantize_nsd
 export OUTPUT_FILETYPE_ATM OUTPUT_FILETYPE_SFC
 
 # cpl defaults
@@ -353,7 +366,7 @@ if [[ "${skip_mom6}" == "false" ]]; then
       if [[ ${RUN} == "gfs" || "${RUN}" == "gefs" ]]; then
         MOM6_DIAG_COORD_DEF_Z_FILE="interpolate_zgrid_40L.nc"
         MOM6_DIAG_MISVAL="-1e34"
-      else            
+      else
         MOM6_DIAG_COORD_DEF_Z_FILE="oceanda_zgrid_75L.nc"
         MOM6_DIAG_MISVAL="0.0"
       fi
@@ -361,7 +374,7 @@ if [[ "${skip_mom6}" == "false" ]]; then
       TOPOEDITS=""
       ;;
     "025")
-      ntasks_mom6=220
+      ntasks_mom6=130
       OCNTIM=1800
       NX_GLB=1440
       NY_GLB=1080
@@ -429,7 +442,7 @@ if [[ "${skip_cice6}" == "false" ]]; then
       cice6_processor_shape="slenderX2"
       ;;
     "025")
-      ntasks_cice6=120
+      ntasks_cice6=72
       cice6_processor_shape="slenderX2"
       ;;
     *)
@@ -449,7 +462,7 @@ if [[ "${skip_ww3}" == "false" ]]; then
   export cplwav=".true."
   export cplwav2atm=".true."
   model_list="${model_list}.wave"
-  nthreads_ww3=2
+  nthreads_ww3=1
   case "${ww3_res}" in
     "gnh_10m;aoc_9km;gsh_15m")
       ntasks_ww3=140
@@ -458,7 +471,7 @@ if [[ "${skip_ww3}" == "false" ]]; then
       ntasks_ww3=100
       ;;
     "glo_025")
-      ntasks_ww3=262
+      ntasks_ww3=250
       ;;
     "glo_100")
       ntasks_ww3=20
diff --git a/parm/config/gefs/yaml/defaults.yaml b/parm/config/gefs/yaml/defaults.yaml
index b420a62e7b..ed7b68be7f 100644
--- a/parm/config/gefs/yaml/defaults.yaml
+++ b/parm/config/gefs/yaml/defaults.yaml
@@ -8,10 +8,15 @@ base:
   DO_GEMPAK: "NO"
   DO_AWIPS: "NO"
   KEEPDATA: "NO"
-  DO_EXTRACTVARS: "NO"
-  DO_REPAIR_REPLAY: "NO"
-  FHMAX_GFS: 120
-  FHMAX_HF_GFS: 0
-  FCST_BREAKPOINTS: "48"
-  REPLAY_ICS: "NO"
-  USE_OCN_PERTURB_FILES: "false"
+  DO_EXTRACTVARS: "YES"
+  DO_REPAIR_REPLAY: "YES"
+  FHMAX_GFS: 384
+  FHMAX_HF_GFS: 240
+  FHOUT_HF_GFS: 3
+  FCST_BREAKPOINTS: ""
+  REPLAY_ICS: "YES"
+  USE_OCN_PERTURB_FILES: "true"
+  FHOUT_OCN_GFS: 24
+  FHOUT_ICE_GFS: 24
+  HPSSARCH: "YES"
+  LOCALARCH: "NO"
diff --git a/parm/config/gfs/config.aero b/parm/config/gfs/config.aero
index 2fae019574..f49593a439 100644
--- a/parm/config/gfs/config.aero
+++ b/parm/config/gfs/config.aero
@@ -24,7 +24,7 @@ case ${machine} in
     AERO_INPUTS_DIR="/gpfs/f5/epic/proj-shared/global/glopara/data/gocart_emissions"
     ;;
   "JET")
-    AERO_INPUTS_DIR="/lfs4/HFIP/hfv3gfs/glopara/data/gocart_emissions"
+    AERO_INPUTS_DIR="/lfs5/HFIP/hfv3gfs/glopara/data/gocart_emissions"
     ;;
   *)
     echo "FATAL ERROR: Machine ${machine} unsupported for aerosols"
diff --git a/parm/config/gfs/config.aeroanl b/parm/config/gfs/config.aeroanl
index a1b7e1d44b..5ac03bd7ee 100644
--- a/parm/config/gfs/config.aeroanl
+++ b/parm/config/gfs/config.aeroanl
@@ -5,20 +5,36 @@
 
 echo "BEGIN: config.aeroanl"
 
-export CASE_ANL=${CASE}
+# 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 OBS_LIST="${PARMgfs}/gdas/aero/obs/lists/gdas_aero.yaml.j2"
-export STATICB_TYPE='identity'
+export STATICB_TYPE='diffusion'
 export BERROR_YAML="${PARMgfs}/gdas/aero/berror/staticb_${STATICB_TYPE}.yaml.j2"
-export BERROR_DATA_DIR="${FIXgfs}/gdas/bump/aero/${CASE_ANL}/"
-export BERROR_DATE="20160630.000000"
+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 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"
diff --git a/parm/config/gfs/config.aeroanlgenb b/parm/config/gfs/config.aeroanlgenb
new file mode 100644
index 0000000000..b41b22a524
--- /dev/null
+++ b/parm/config/gfs/config.aeroanlgenb
@@ -0,0 +1,29 @@
+#!/bin/bash -x
+
+########## config.aeroanlgenb ##########
+# Aerosol Variance specific
+
+echo "BEGIN: config.aeroanlgenb"
+
+# Get task specific resources
+source "${EXPDIR}/config.resources" aeroanlgenb
+
+export BMATYAML="${PARMgfs}/gdas/aero/berror/aero_diagb.yaml.j2"
+export DIFFUSIONYAML="${PARMgfs}/gdas/aero/berror/aero_diffusionparm.yaml.j2"
+export INTERPYAML="${PARMgfs}/gdas/aero/berror/aero_interp.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 aero_diffusion_iter=10
+export aero_diffusion_horiz_len=2500e3
+export aero_diffusion_fixed_val=1.0
+export npx_clim_b=97
+export npy_clim_b=97
+export aero_diagb_weight=0.9
+export aero_staticb_rescaling_factor=2.0
+export aero_diagb_rescale=20.0
+export aero_diagb_n_halo=4
+export aero_diagb_n_neighbors=16
+export aero_diagb_smooth_horiz_iter=0
+export aero_diagb_smooth_vert_iter=0
+
+echo "END: config.aeroanlgenb"
diff --git a/parm/config/gfs/config.aeroanlrun b/parm/config/gfs/config.aeroanlrun
deleted file mode 100644
index 012e5b79f3..0000000000
--- a/parm/config/gfs/config.aeroanlrun
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/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"
diff --git a/parm/config/gfs/config.aeroanlvar b/parm/config/gfs/config.aeroanlvar
new file mode 100644
index 0000000000..4282b6c840
--- /dev/null
+++ b/parm/config/gfs/config.aeroanlvar
@@ -0,0 +1,11 @@
+#!/bin/bash -x
+
+########## config.aeroanlvar ##########
+# Aerosol Analysis specific
+
+echo "BEGIN: config.aeroanlvar"
+
+# Get task specific resources
+source "${EXPDIR}/config.resources" aeroanlvar
+
+echo "END: config.aeroanlvar"
diff --git a/parm/config/gfs/config.atmensanl b/parm/config/gfs/config.atmensanl
index ddd3d88659..f5a1278248 100644
--- a/parm/config/gfs/config.atmensanl
+++ b/parm/config/gfs/config.atmensanl
@@ -6,7 +6,11 @@
 echo "BEGIN: config.atmensanl"
 
 export JCB_BASE_YAML="${PARMgfs}/gdas/atm/jcb-base.yaml.j2"
-export JCB_ALGO_YAML=@JCB_ALGO_YAML@
+if [[ ${lobsdiag_forenkf} = ".false." ]] ; then
+    export JCB_ALGO_YAML=@JCB_ALGO_YAML_LETKF@
+else
+    export JCB_ALGO_YAML=@JCB_ALGO_YAML_OBS@
+fi    
 
 export INTERP_METHOD='barycentric'
 
diff --git a/parm/config/gfs/config.base b/parm/config/gfs/config.base
index 517e74ebff..ccb05abe88 100644
--- a/parm/config/gfs/config.base
+++ b/parm/config/gfs/config.base
@@ -63,6 +63,9 @@ export NOSCRUB="@NOSCRUB@"
 # Base directories for various builds
 export BASE_GIT="@BASE_GIT@"
 
+# Base directory for staged data
+export BASE_DATA="@BASE_DATA@"
+
 # Toggle to turn on/off GFS downstream processing.
 export DO_GOES="@DO_GOES@"               # GOES products
 export DO_BUFRSND="@DO_BUFRSND@"         # BUFR sounding products
@@ -95,7 +98,7 @@ export MODE="@MODE@" # cycled/forecast-only
 # Build paths relative to $HOMEgfs
 export FIXgsi="${HOMEgfs}/fix/gsi"
 export HOMEpost="${HOMEgfs}"
-export HOMEobsproc="${BASE_GIT:-}/obsproc/v${obsproc_run_ver:-1.1.2}"
+export HOMEobsproc="${BASE_GIT:-}/obsproc/v${obsproc_run_ver:-}"
 
 # CONVENIENT utility scripts and other environment parameters
 export NCP="/bin/cp -p"
@@ -280,7 +283,8 @@ export FHOUT_ICE=3
 export EUPD_CYC="@EUPD_CYC@"
 
 # GFS cycle info
-export gfs_cyc=@gfs_cyc@ # 0: no GFS cycle, 1: 00Z only, 2: 00Z and 12Z only, 4: all 4 cycles.
+export INTERVAL_GFS=@INTERVAL_GFS@ # Frequency of GFS forecast
+export SDATE_GFS=@SDATE_GFS@
 
 # GFS output and frequency
 export FHMIN_GFS=0
@@ -299,11 +303,7 @@ export FHMAX_HF_WAV=120
 export FHOUT_HF_WAV=1
 export FHMAX_WAV=${FHMAX:-9}
 export FHMAX_WAV_GFS=${FHMAX_GFS}
-if (( gfs_cyc != 0 )); then
-    export STEP_GFS=$(( 24 / gfs_cyc ))
-else
-    export STEP_GFS="0"
-fi
+
 # TODO: Change gempak to use standard out variables (#2348)
 export ILPOST=${FHOUT_HF_GFS}           # gempak output frequency up to F120
 if (( FHMAX_HF_GFS < 120 )); then
@@ -489,6 +489,14 @@ if [[ "${machine}" =~ "PW" ]]; then
    export DO_TRACKER="NO"
    export DO_GENESIS="NO"
    export DO_METP="NO"
+   export DO_WAVE="NO"
+fi
+
+# The tracker and genesis are not installed on Orion/Hercules yet; this requires spack-stack builds of the package.
+# TODO: we should place these in workflow/hosts/[orion|hercules].yaml.
+if [[ "${machine}" == "ORION" || "${machine}" == "HERCULES" ]]; then
+   export DO_TRACKER="NO"
+   export DO_GENESIS="NO"
 fi
 
 echo "END: config.base"
diff --git a/parm/config/gfs/config.com b/parm/config/gfs/config.com
index 02a5b1edf5..61d592561d 100644
--- a/parm/config/gfs/config.com
+++ b/parm/config/gfs/config.com
@@ -98,5 +98,6 @@ declare -rx COM_ICE_GRIB_GRID_TMPL=${COM_ICE_GRIB_TMPL}'/${GRID}'
 
 declare -rx COM_CHEM_HISTORY_TMPL=${COM_BASE}'/model/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/med/restart'
diff --git a/parm/config/gfs/config.marineanl b/parm/config/gfs/config.marineanl
new file mode 100644
index 0000000000..a19fc015e2
--- /dev/null
+++ b/parm/config/gfs/config.marineanl
@@ -0,0 +1,20 @@
+#!/bin/bash
+
+########## config.marineanl ##########
+# configuration common to all ocean analysis tasks
+
+echo "BEGIN: config.marineanl"
+
+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_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_JCB_GDAS_ALGO="${PARMgfs}/gdas/jcb-gdas/algorithm/marine"
+
+echo "END: config.marineanl"
diff --git a/parm/config/gfs/config.marineanlchkpt b/parm/config/gfs/config.marineanlchkpt
new file mode 100644
index 0000000000..7dd6ff79b2
--- /dev/null
+++ b/parm/config/gfs/config.marineanlchkpt
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+########## config.marineanlchkpt ##########
+# Marine Analysis specific
+
+echo "BEGIN: config.marineanlchkpt"
+
+# Get task specific resources
+. "${EXPDIR}/config.resources" marineanlchkpt
+
+echo "END: config.marineanlchkpt"
diff --git a/parm/config/gfs/config.marineanlfinal b/parm/config/gfs/config.marineanlfinal
new file mode 100644
index 0000000000..ccde289088
--- /dev/null
+++ b/parm/config/gfs/config.marineanlfinal
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+########## config.marineanlfinal ##########
+# Post Ocn Analysis specific
+
+echo "BEGIN: config.marineanlfinal"
+
+# Get task specific resources
+. "${EXPDIR}/config.resources" marineanlfinal
+echo "END: config.marineanlfinal"
diff --git a/parm/config/gfs/config.marineanlinit b/parm/config/gfs/config.marineanlinit
new file mode 100644
index 0000000000..01489fc0b8
--- /dev/null
+++ b/parm/config/gfs/config.marineanlinit
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+########## config.marineanlinit ##########
+# Pre Marine Analysis specific
+
+echo "BEGIN: config.marineanlinit"
+
+# Get task specific resources
+. "${EXPDIR}/config.resources" marineanlinit
+echo "END: config.marineanlinit"
diff --git a/parm/config/gfs/config.marineanlvar b/parm/config/gfs/config.marineanlvar
new file mode 100644
index 0000000000..5ed6d444eb
--- /dev/null
+++ b/parm/config/gfs/config.marineanlvar
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+########## config.marineanlvar ##########
+# Marine Analysis specific
+
+echo "BEGIN: config.marineanlvar"
+
+# Get task specific resources
+. "${EXPDIR}/config.resources" marineanlvar
+
+echo "END: config.marineanlvar"
diff --git a/parm/config/gfs/config.marinebmat b/parm/config/gfs/config.marinebmat
index d88739dced..00352737d0 100644
--- a/parm/config/gfs/config.marinebmat
+++ b/parm/config/gfs/config.marinebmat
@@ -8,4 +8,12 @@ echo "BEGIN: config.marinebmat"
 # Get task specific resources
 . "${EXPDIR}/config.resources" marinebmat
 
+export BERROR_DIAGB_YAML="${PARMgfs}/gdas/soca/berror/soca_diagb.yaml.j2"
+export BERROR_VTSCALES_YAML="${PARMgfs}/gdas/soca/berror/soca_vtscales.yaml.j2"
+export BERROR_DIFFV_YAML="${PARMgfs}/gdas/soca/berror/soca_parameters_diffusion_vt.yaml.j2"
+export BERROR_HZSCALES_YAML="${PARMgfs}/gdas/soca/berror/soca_setcorscales.yaml"
+export BERROR_DIFFH_YAML="${PARMgfs}/gdas/soca/berror/soca_parameters_diffusion_hz.yaml.j2"
+export BERROR_ENS_RECENTER_YAML="${PARMgfs}/gdas/soca/berror/soca_ensb.yaml.j2"
+export BERROR_HYB_WEIGHTS_YAML="${PARMgfs}/gdas/soca/berror/soca_ensweights.yaml.j2"
+
 echo "END: config.marinebmat"
diff --git a/parm/config/gfs/config.ocnanal b/parm/config/gfs/config.ocnanal
deleted file mode 100644
index 4d58f2dedf..0000000000
--- a/parm/config/gfs/config.ocnanal
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/bash
-
-########## config.ocnanal ##########
-# configuration common to all ocean analysis tasks
-
-echo "BEGIN: config.ocnanal"
-
-export OBS_YAML_DIR="${HOMEgfs}/sorc/gdas.cd/parm/soca/obs/config"
-export OBS_LIST=@SOCA_OBS_LIST@  # TODO(GA): doesn't look necessary as is to have
-export OBS_YAML="${OBS_LIST}"    #           OBS_LIST and OBS_YAML pick one or add logic
-export SOCA_INPUT_FIX_DIR=@SOCA_INPUT_FIX_DIR@
-export SOCA_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 JEDI_BIN=${HOMEgfs}/sorc/gdas.cd/build/bin  # TODO(GA): remove once analysis "run"
-                                                   #          and "checkpoint" are refactored
-
-echo "END: config.ocnanal"
diff --git a/parm/config/gfs/config.ocnanalchkpt b/parm/config/gfs/config.ocnanalchkpt
deleted file mode 100644
index c059fdba42..0000000000
--- a/parm/config/gfs/config.ocnanalchkpt
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash
-
-########## config.ocnanalchkpt ##########
-# Ocn Analysis specific
-
-echo "BEGIN: config.ocnanalchkpt"
-
-# Get task specific resources
-. "${EXPDIR}/config.resources" ocnanalchkpt
-
-echo "END: config.ocnanalchkpt"
diff --git a/parm/config/gfs/config.ocnanalpost b/parm/config/gfs/config.ocnanalpost
deleted file mode 100644
index bc4d945865..0000000000
--- a/parm/config/gfs/config.ocnanalpost
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-########## config.ocnanalpost ##########
-# Post Ocn Analysis specific
-
-echo "BEGIN: config.ocnanalpost"
-
-# Get task specific resources
-. "${EXPDIR}/config.resources" ocnanalpost
-echo "END: config.ocnanalpost"
diff --git a/parm/config/gfs/config.ocnanalprep b/parm/config/gfs/config.ocnanalprep
deleted file mode 100644
index 225eb089c3..0000000000
--- a/parm/config/gfs/config.ocnanalprep
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-########## config.ocnanalprep ##########
-# Pre Ocn Analysis specific
-
-echo "BEGIN: config.ocnanalprep"
-
-# Get task specific resources
-. "${EXPDIR}/config.resources" ocnanalprep
-echo "END: config.ocnanalprep"
diff --git a/parm/config/gfs/config.ocnanalrun b/parm/config/gfs/config.ocnanalrun
deleted file mode 100644
index 5345b6c684..0000000000
--- a/parm/config/gfs/config.ocnanalrun
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash
-
-########## config.ocnanalrun ##########
-# Ocn Analysis specific
-
-echo "BEGIN: config.ocnanalrun"
-
-# Get task specific resources
-. "${EXPDIR}/config.resources" ocnanalrun
-
-echo "END: config.ocnanalrun"
diff --git a/parm/config/gfs/config.prepoceanobs b/parm/config/gfs/config.prepoceanobs
index 746ce79257..0963a5c42d 100644
--- a/parm/config/gfs/config.prepoceanobs
+++ b/parm/config/gfs/config.prepoceanobs
@@ -8,7 +8,7 @@ export OCNOBS2IODAEXEC=${HOMEgfs}/sorc/gdas.cd/build/bin/gdas_obsprovider2ioda.x
 
 export SOCA_INPUT_FIX_DIR=@SOCA_INPUT_FIX_DIR@
 
-export OBS_YAML_DIR="${PARMgfs}/gdas/soca/obs/config"
+export MARINE_OBS_YAML_DIR="${PARMgfs}/gdas/soca/obs/config"
 export OBSPREP_YAML=@OBSPREP_YAML@
 export OBS_LIST=@SOCA_OBS_LIST@
 export OBS_YAML=${OBS_LIST}
diff --git a/parm/config/gfs/config.prepsnowobs b/parm/config/gfs/config.prepsnowobs
index 60ca16ce9e..20bdd89ddf 100644
--- a/parm/config/gfs/config.prepsnowobs
+++ b/parm/config/gfs/config.prepsnowobs
@@ -8,11 +8,8 @@ echo "BEGIN: config.prepsnowobs"
 # Get task specific resources
 . "${EXPDIR}/config.resources" prepsnowobs
 
-export GTS_OBS_LIST="${PARMgfs}/gdas/snow/prep/prep_gts.yaml.j2"
 export IMS_OBS_LIST="${PARMgfs}/gdas/snow/prep/prep_ims.yaml.j2"
 
-export BUFR2IODAX="${EXECgfs}/bufr2ioda.x"
-
 export CALCFIMSEXE="${EXECgfs}/calcfIMS.exe"
 export FIMS_NML_TMPL="${PARMgfs}/gdas/snow/prep/fims.nml.j2"
 
diff --git a/parm/config/gfs/config.resources b/parm/config/gfs/config.resources
index 2f541ff945..79dbb487db 100644
--- a/parm/config/gfs/config.resources
+++ b/parm/config/gfs/config.resources
@@ -16,7 +16,7 @@ if (( $# != 1 )); then
     echo "atmanlinit atmanlvar atmanlfv3inc atmanlfinal"
     echo "atmensanlinit atmensanlobs atmensanlsol atmensanlletkf atmensanlfv3inc atmensanlfinal"
     echo "snowanl esnowrecen"
-    echo "prepobsaero aeroanlinit aeroanlrun aeroanlfinal"
+    echo "prepobsaero aeroanlinit aeroanlvar aeroanlfinal aeroanlgenb"
     echo "anal sfcanl analcalc analdiag fcst echgres"
     echo "upp atmos_products"
     echo "tracker genesis genesis_fsu"
@@ -26,7 +26,7 @@ if (( $# != 1 )); then
     echo "waveinit waveprep wavepostsbs wavepostbndpnt wavepostbndpntbll wavepostpnt"
     echo "wavegempak waveawipsbulls waveawipsgridded"
     echo "postsnd awips gempak npoess"
-    echo "ocnanalprep prepoceanobs marinebmat ocnanalrun ocnanalecen marineanalletkf ocnanalchkpt ocnanalpost ocnanalvrfy"
+    echo "marineanlinit prepoceanobs marinebmat marineanlvar ocnanalecen marineanalletkf marineanlchkpt marineanlfinal ocnanalvrfy"
     exit 1
 
 fi
@@ -38,6 +38,7 @@ echo "BEGIN: config.resources"
 case ${machine} in
   "WCOSS2")
               max_tasks_per_node=128
+              # WCOSS2 nodes have 512GB of RAM, but only 500GB are reservable
               # shellcheck disable=SC2034
               mem_node_max="500GB"
     ;;
@@ -54,12 +55,12 @@ case ${machine} in
   "ORION")
               max_tasks_per_node=40
               # shellcheck disable=SC2034
-              mem_node_max="192GB"
+              mem_node_max="180GB"
     ;;
   "HERCULES")
               max_tasks_per_node=80
               # shellcheck disable=SC2034
-              mem_node_max="512GB"
+              mem_node_max="500GB"
     ;;
   "JET")
     case ${PARTITION_BATCH} in
@@ -145,10 +146,10 @@ export max_tasks_per_node
 case ${step} in
   "prep")
     walltime='00:30:00'
-    ntasks=4
-    tasks_per_node=2
+    ntasks=14
+    tasks_per_node=14
     threads_per_task=1
-    memory="40GB"
+    memory="${mem_node_max}"
     ;;
 
   "prepsnowobs")
@@ -401,12 +402,12 @@ case ${step} in
         layout_y=8
         ;;
       "C384")
-        layout_x=8
-        layout_y=8
+        layout_x=6
+        layout_y=6
         ;;
       "C192" | "C96")
-        layout_x=8
-        layout_y=8
+        layout_x=4
+        layout_y=4
         ;;
       "C48" )
         # this case is for testing only
@@ -427,27 +428,61 @@ case ${step} in
     memory="3072M"
     ;;
 
-  "aeroanlrun")
+  "aeroanlvar")
     case ${CASE} in
       "C768")
         layout_x=8
         layout_y=8
         ;;
       "C384")
-        layout_x=8
-        layout_y=8
+        layout_x=6
+        layout_y=6
         ;;
       "C192" | "C96")
+        layout_x=4
+        layout_y=4
+        ;;
+      "C48" )
+        # this case is for testing only
+        layout_x=1
+        layout_y=1
+        ;;
+      *)
+        echo "FATAL ERROR: Resources not defined for job ${step} at resolution ${CASE}"
+        exit 4
+    esac
+
+    export layout_x
+    export layout_y
+
+    walltime="00:30:00"
+    ntasks=$(( layout_x * layout_y * 6 ))
+    threads_per_task=1
+    tasks_per_node=$(( max_tasks_per_node / threads_per_task ))
+    export is_exclusive=True
+    ;;
+
+  "aeroanlgenb")
+    case ${CASE} in
+      "C768")
         layout_x=8
         layout_y=8
         ;;
+      "C384")
+        layout_x=6
+        layout_y=6
+        ;;
+      "C192" | "C96")
+        layout_x=4
+        layout_y=4
+        ;;
       "C48" )
         # this case is for testing only
         layout_x=1
         layout_y=1
         ;;
       *)
-        echo "FATAL ERROR: Resources not defined for job ${step} at resolution ${CASE}"
+        echo "FATAL ERROR: Resources not defined for job ${job} at resolution ${CASE}"
         exit 4
     esac
 
@@ -459,8 +494,10 @@ case ${step} in
     threads_per_task=1
     tasks_per_node=$(( max_tasks_per_node / threads_per_task ))
     export is_exclusive=True
+
     ;;
 
+
   "aeroanlfinal")
     walltime="00:10:00"
     ntasks=1
@@ -469,7 +506,7 @@ case ${step} in
     memory="3072M"
     ;;
 
-  "ocnanalprep")
+  "marineanlinit")
     walltime="00:10:00"
     ntasks=1
     threads_per_task=1
@@ -491,6 +528,7 @@ case ${step} in
     case ${OCNRES} in
       "025") ntasks=480;;
       "050")  ntasks=16;;
+      "100")  ntasks=16;;
       "500")  ntasks=16;;
       *)
         echo "FATAL ERROR: Resources not defined for job ${step} at resolution ${OCNRES}"
@@ -503,7 +541,7 @@ case ${step} in
     tasks_per_node=$(( max_tasks_per_node / threads_per_task ))
     ;;
 
-  "ocnanalrun")
+  "marineanlvar")
     ntasks=16
     case ${OCNRES} in
       "025")
@@ -514,6 +552,10 @@ case ${step} in
         ntasks=16
         memory="96GB"
         ;;
+      "100")
+        ntasks=16
+        memory="96GB"
+        ;;
       "500")
         ntasks=16
         memory="24GB"
@@ -540,6 +582,10 @@ case ${step} in
         ntasks=16
         memory="96GB"
         ;;
+      "100")
+        ntasks=16
+        memory="96GB"
+        ;;
       "500")
         ntasks=16
         memory="24GB"
@@ -566,6 +612,10 @@ case ${step} in
         ntasks=16
         memory="96GB"
         ;;
+      "100")
+        ntasks=16
+        memory="96GB"
+        ;;
       "500")
         ntasks=16
         memory="24GB"
@@ -582,7 +632,7 @@ case ${step} in
     ;;
 
 
-  "ocnanalchkpt")
+  "marineanlchkpt")
     walltime="00:10:00"
     ntasks=1
     threads_per_task=1
@@ -594,6 +644,9 @@ case ${step} in
       "050")
         memory="32GB"
         ntasks=16;;
+      "100")
+        memory="32GB"
+        ntasks=16;;
       "500")
         memory="32GB"
         ntasks=8;;
@@ -603,7 +656,7 @@ case ${step} in
     esac
     ;;
 
-  "ocnanalpost")
+  "marineanlfinal")
     walltime="00:30:00"
     ntasks=${max_tasks_per_node}
     threads_per_task=1
@@ -875,7 +928,7 @@ case ${step} in
     ;;
 
   "verfozn")
-    walltime="00:05:00"
+    walltime="00:10:00"
     ntasks=1
     threads_per_task=1
     tasks_per_node=1
@@ -1155,10 +1208,22 @@ case ${step} in
 
   "postsnd")
     walltime="02:00:00"
-    ntasks=40
-    threads_per_task=8
-    tasks_per_node=10
+    export ntasks=141
     export ntasks_postsndcfp=9
+    case ${CASE} in
+      "C768")
+        tasks_per_node=21
+        threads_per_task=6
+        ;;
+      "C1152")
+        tasks_per_node=9
+        threads_per_task=14
+        ;;
+      *)
+        tasks_per_node=21
+        threads_per_task=6
+        ;;
+    esac
     export tasks_per_node_postsndcfp=1
     postsnd_req_cores=$(( tasks_per_node * threads_per_task ))
     if (( postsnd_req_cores > max_tasks_per_node )); then
diff --git a/parm/config/gfs/config.resources.GAEA b/parm/config/gfs/config.resources.GAEA
index 51007b5b4f..c50601da00 100644
--- a/parm/config/gfs/config.resources.GAEA
+++ b/parm/config/gfs/config.resources.GAEA
@@ -3,6 +3,11 @@
 # Gaea-specific job resources
 
 case ${step} in
+  "prep")
+    # Run on two nodes (requires ~400GB total)
+    tasks_per_node=7
+    ;;
+
   "eobs")
     # The number of tasks and cores used must be the same for eobs
     # See https://github.com/NOAA-EMC/global-workflow/issues/2092 for details
@@ -21,6 +26,7 @@ case ${step} in
 
 esac
 
+unset memory
 # shellcheck disable=SC2312
 for mem_var in $(env | grep '^memory_' | cut -d= -f1); do
   unset "${mem_var}"
diff --git a/parm/config/gfs/config.resources.HERA b/parm/config/gfs/config.resources.HERA
index e79d4c5b0a..ac3067d9f9 100644
--- a/parm/config/gfs/config.resources.HERA
+++ b/parm/config/gfs/config.resources.HERA
@@ -3,10 +3,16 @@
 # Hera-specific job resources
 
 case ${step} in
+  "prep")
+    # Run on 7 nodes for memory requirement
+    tasks_per_node=2
+    ;;
+
   "anal")
     if [[ "${CASE}" == "C384" ]]; then
-      export ntasks=270
-      export threads_per_task_anal=8
+      export ntasks_gdas=270
+      export ntasks_gfs=270
+      export threads_per_task=8
       export tasks_per_node=$(( max_tasks_per_node / threads_per_task ))
     fi
     ;;
@@ -26,6 +32,10 @@ case ${step} in
 
   "eupd")
     case ${CASE} in
+      "C768")
+        export ntasks=80
+        export threads_per_task=20
+        ;;
       "C384")
         export ntasks=80
         ;;
@@ -43,6 +53,13 @@ case ${step} in
     export tasks_per_node=$(( max_tasks_per_node / threads_per_task ))
     ;;
 
+  "upp")
+    if (( "${CASE:1}" >= 768 )); then
+       # Run fewer tasks per node for memory
+       tasks_per_node=20
+    fi
+    ;;
+
   *)
     ;;
 esac
diff --git a/parm/config/gfs/config.resources.JET b/parm/config/gfs/config.resources.JET
index 47b953c0f4..bbd308f439 100644
--- a/parm/config/gfs/config.resources.JET
+++ b/parm/config/gfs/config.resources.JET
@@ -3,6 +3,11 @@
 # Jet-specific job resources
 
 case ${step} in
+  "prep")
+    # Run on 7 nodes for memory requirement
+    tasks_per_node=2
+    ;;
+
   "anal")
     if [[ "${CASE}" == "C384" ]]; then
       export ntasks=270
diff --git a/parm/config/gfs/config.resources.ORION b/parm/config/gfs/config.resources.ORION
index e3e81b0182..461b6f14f7 100644
--- a/parm/config/gfs/config.resources.ORION
+++ b/parm/config/gfs/config.resources.ORION
@@ -3,14 +3,35 @@
 # Orion-specific job resources
 
 case ${step} in
+  "prep")
+    # Run on 2 nodes for memory requirement
+    # This may not be enough and may need to run on more nodes.
+    export tasks_per_node=7
+    ;;
+
   "anal")
     # TODO:
     # On Orion, after Rocky 9 upgrade, GSI performance is degraded.
     # Remove this block once GSI issue is resolved
     # https://github.com/NOAA-EMC/GSI/pull/764
     # https://github.com/JCSDA/spack-stack/issues/1166
-    export wtime_anal_gdas="02:40:00"
-    export wtime_anal_gfs="02:00:00"
+    export walltime_gdas="02:40:00"
+    export walltime_gfs="02:00:00"
+  ;;
+  "eobs")
+    # TODO:
+    # Remove this block once the GSI issue is resolved.
+    export walltime="00:45:00"
+  ;;
+  "atmanlvar")
+    # Run on 8 nodes for memory requirement
+    export tasks_per_node=8
+    export walltime="00:45:00"
+  ;;
+  "atmensanlobs")
+    # Run on 8 nodes for memory requirement
+    export tasks_per_node=8
+    export walltime="00:45:00"
   ;;
   *)
   ;;
diff --git a/parm/config/gfs/config.resources.S4 b/parm/config/gfs/config.resources.S4
index 1af64bf250..fa64068e81 100644
--- a/parm/config/gfs/config.resources.S4
+++ b/parm/config/gfs/config.resources.S4
@@ -3,6 +3,12 @@
 # S4-specific job resources
 
 case ${step} in
+  "prep")
+    # Run on two nodes for memory requirement
+    # This may not be enough memory.  Decrease tasks/node to 2 if necessary.
+    tasks_per_node=7
+    ;;
+
   "anal")
     case ${CASE} in
       "C384")
@@ -32,7 +38,7 @@ case ${step} in
       *)
         ;;
     esac
-    export tasks_node=$(( max_tasks_per_node / threads_per_task ))
+    export tasks_per_node=$(( max_tasks_per_node / threads_per_task ))
     ;;
 
   "eobs")
diff --git a/parm/config/gfs/config.snowanl b/parm/config/gfs/config.snowanl
index a2984f190b..b1460dfa67 100644
--- a/parm/config/gfs/config.snowanl
+++ b/parm/config/gfs/config.snowanl
@@ -9,6 +9,7 @@ echo "BEGIN: config.snowanl"
 source "${EXPDIR}/config.resources" snowanl
 
 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"
 
 # Name of the JEDI executable and its yaml template
 export JEDIEXE="${EXECgfs}/gdas.x"
diff --git a/parm/config/gfs/config.ufs b/parm/config/gfs/config.ufs
index 148793927f..6309c4073b 100644
--- a/parm/config/gfs/config.ufs
+++ b/parm/config/gfs/config.ufs
@@ -281,7 +281,7 @@ case "${fv3_res}" in
           export rf_cutoff=100.0
           export fv_sg_adj=450
           export WRITE_GROUP_GDAS=2
-          export WRTTASK_PER_GROUP_PER_THREAD_PER_TILE_GDAS=10
+          export WRTTASK_PER_GROUP_PER_THREAD_PER_TILE_GDAS=15
           export WRITE_GROUP_GFS=4
           export WRTTASK_PER_GROUP_PER_THREAD_PER_TILE_GFS=20 #Note this should be 10 for WCOSS2
         fi
@@ -356,21 +356,33 @@ export ntasks_fv3_gfs
 export ntasks_quilt_gdas
 export ntasks_quilt_gfs
 
-# Determine whether to use parallel NetCDF based on resolution
+# Determine whether to use compression in the write grid component
+# and whether to use parallel NetCDF based on resolution
 case ${fv3_res} in
-  "C48" | "C96" | "C192" | "C384")
+  "C48" | "C96" | "C192")
+    zstandard_level=0
+    ideflate=0
+    quantize_nsd=0
     OUTPUT_FILETYPE_ATM="netcdf"
     OUTPUT_FILETYPE_SFC="netcdf"
     ;;
-  "C768" | "C1152" | "C3072")
+  "C384" | "C768" | "C1152" | "C3072")
+    zstandard_level=0
+    ideflate=1
+    quantize_nsd=5
     OUTPUT_FILETYPE_ATM="netcdf_parallel"
-    OUTPUT_FILETYPE_SFC="netcdf_parallel"
+    if [[ "${fv3_res}" == "C384" ]]; then
+      OUTPUT_FILETYPE_SFC="netcdf"  # For C384, the write grid component is better off with serial netcdf
+    else
+      OUTPUT_FILETYPE_SFC="netcdf_parallel"
+    fi
     ;;
   *)
     echo "FATAL ERROR: Unrecognized FV3 resolution ${fv3_res}"
     exit 15
     ;;
 esac
+export zstandard_level ideflate quantize_nsd
 export OUTPUT_FILETYPE_ATM OUTPUT_FILETYPE_SFC
 
 # cpl defaults
diff --git a/parm/config/gfs/config.wave b/parm/config/gfs/config.wave
index db4eb9f708..ea68508547 100644
--- a/parm/config/gfs/config.wave
+++ b/parm/config/gfs/config.wave
@@ -117,7 +117,7 @@ if [[ "${RUN}" == "gdas" ]]; then
   export WAVNCYC=4
   export WAVHCYC=${assim_freq:-6}
   export FHMAX_WAV_CUR=48 # RTOFS forecasts only out to 8 days
-elif [[ ${gfs_cyc} -ne 0 ]]; then
+elif (( INTERVAL_GFS > 0 )); then
   export WAVHCYC=${assim_freq:-6}
   export FHMAX_WAV_CUR=192 # RTOFS forecasts only out to 8 days
 else
diff --git a/parm/config/gfs/yaml/defaults.yaml b/parm/config/gfs/yaml/defaults.yaml
index b423601df3..dfc67d1237 100644
--- a/parm/config/gfs/yaml/defaults.yaml
+++ b/parm/config/gfs/yaml/defaults.yaml
@@ -31,7 +31,8 @@ atmanl:
   IO_LAYOUT_Y: 1
 
 atmensanl:
-  JCB_ALGO_YAML: "${PARMgfs}/gdas/atm/jcb-prototype_lgetkf.yaml.j2"
+  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"
   LAYOUT_X_ATMENSANL: 8
   LAYOUT_Y_ATMENSANL: 8
   IO_LAYOUT_X: 1
@@ -51,7 +52,7 @@ snowanl:
   IO_LAYOUT_X: 1
   IO_LAYOUT_Y: 1
 
-ocnanal:
+marineanl:
   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 oceanprepobs
   SOCA_NINNER: 100
@@ -60,4 +61,4 @@ 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"
-  DMPDIR: "/scratch1/NCEPDEV/global/glopara/data/experimental_obs"
+  DMPDIR: "${BASE_DATA}/experimental_obs"
diff --git a/parm/gdas/aero_finalize_bmatrix_bkg.yaml.j2 b/parm/gdas/aero_finalize_bmatrix_bkg.yaml.j2
new file mode 100644
index 0000000000..b33f280945
--- /dev/null
+++ b/parm/gdas/aero_finalize_bmatrix_bkg.yaml.j2
@@ -0,0 +1,19 @@
+{% set cycle_HH = current_cycle | strftime("%H") %}
+{% set HEAD = RUN + ".t" + cycle_HH + "z." %}
+{% set offset_td = "+6H" | to_timedelta %}
+{% set background_time = current_cycle | add_to_datetime(offset_td) %}
+copy:
+### copy YAMLs used
+{% set yaml_list = ['chem_diagb.yaml', 'chem_diffusion.yaml'] %}
+{% for fname in yaml_list %}
+- ["{{ DATA }}/{{ HEAD }}{{ fname }}", "{{ COMOUT_CHEM_BMAT }}/{{ HEAD }}{{ fname }}"]
+{% endfor %}
+### copy stddev files to ROTDIR
+{% for tile in range(1, ntiles+1) %}
+- ["{{ DATA }}/stddev/{{ background_time | to_fv3time }}.stddev.fv_tracer.res.tile{{ tile }}.nc", "{{ COMOUT_CHEM_BMAT }}/{{ background_time | to_fv3time }}.stddev.fv_tracer.res.tile{{ tile }}.nc"]
+{% endfor %}
+### copy coupler file
+- ["{{ DATA }}/stddev/{{ background_time | to_fv3time }}.stddev.coupler.res", "{{ COMOUT_CHEM_BMAT }}/{{ background_time | to_fv3time }}.stddev.coupler.res"]
+### copy diffusion files
+- ["{{ DATA }}/diffusion/diffusion_hz.nc", "{{ COMOUT_CHEM_BMAT }}/{{ HEAD }}aero_diffusion_hz.nc"]
+- ["{{ DATA }}/diffusion/diffusion_vt.nc", "{{ COMOUT_CHEM_BMAT }}/{{ HEAD }}aero_diffusion_vt.nc"]
diff --git a/parm/gdas/aero_finalize_variational.yaml.j2 b/parm/gdas/aero_finalize_variational.yaml.j2
new file mode 100644
index 0000000000..7dadd36291
--- /dev/null
+++ b/parm/gdas/aero_finalize_variational.yaml.j2
@@ -0,0 +1,24 @@
+######################################
+# set some variables
+######################################
+{% if DOIAU == True %}
+    {% set bkgtime = AERO_WINDOW_BEGIN %}
+{% else %}
+    {% set bkgtime = current_cycle %}
+{% endif %}
+######################################
+mkdir:
+- "{{ COMOUT_CHEM_ANALYSIS }}"
+- "{{ COMOUT_ATMOS_RESTART }}"
+copy:
+## copy variational YAML to ROTDIR
+- ["{{ DATA }}/{{ APREFIX }}aerovar.yaml", "{{ COMOUT_CHEM_ANALYSIS }}/{{ APREFIX }}aerovar.yaml"]
+## copy increments
+{% for tile in range(1,ntiles+1) %}
+- ["{{ DATA }}/anl/aeroinc.{{ current_cycle | to_fv3time }}.fv_tracer.res.tile{{ tile }}.nc", "{{ COMOUT_CHEM_ANALYSIS }}/aeroinc.{{ current_cycle | to_fv3time }}.fv_tracer.res.tile{{ tile }}.nc"]
+{% endfor %}
+- ["{{ DATA }}/anl/aeroinc_gauss.{{ current_cycle | to_isotime }}.gaussian.modelLevels.nc", "{{ COMOUT_CHEM_ANALYSIS }}/{{ APREFIX }}aeroinc.nc"]
+## copy analysis
+{% for tile in range(1,ntiles+1) %}
+- ["{{ DATA }}/anl/{{ bkgtime | to_fv3time }}.fv_tracer.res.tile{{ tile }}.nc", "{{ COMOUT_ATMOS_RESTART }}/{{ bkgtime | to_fv3time }}.aeroanl_fv_tracer.res.tile{{ tile }}.nc"]
+{% endfor %}
diff --git a/parm/gdas/aero_stage_bmatrix_bkg.yaml.j2 b/parm/gdas/aero_stage_bmatrix_bkg.yaml.j2
new file mode 100644
index 0000000000..9005b9ff12
--- /dev/null
+++ b/parm/gdas/aero_stage_bmatrix_bkg.yaml.j2
@@ -0,0 +1,38 @@
+######################################
+# set some variables
+######################################
+{% set offset_td = "+6H" | to_timedelta %}
+{% set background_time = current_cycle | add_to_datetime(offset_td) %}
+{% set ftype_list = ['fv_core.res', 'fv_tracer.res'] %}
+######################################
+# create working directories
+######################################
+mkdir:
+- "{{ DATA }}/bkg"
+- "{{ DATA }}/stddev"
+- "{{ DATA }}/clm_stddev"
+- "{{ DATA }}/diffusion"
+copy:
+######################################
+# copy deterministic background files
+######################################
+# define variables
+# Declare a dict of search and replace terms to run on each template
+{% set tmpl_dict = {'${ROTDIR}':ROTDIR,
+                    '${RUN}':RUN,
+                    '${YMD}':current_cycle | to_YMD,
+                    '${HH}':current_cycle | strftime("%H"),
+                    '${MEMDIR}':""} %}
+
+- ["{{ COM_ATMOS_RESTART_TMPL | replace_tmpl(tmpl_dict) }}/{{ background_time | to_fv3time }}.coupler.res", "{{ DATA }}/bkg/{{ background_time | to_fv3time }}.coupler.res"]
+{% for ftype in ftype_list %}
+  {% for tile in range(1, ntiles+1) %}
+- ["{{ COM_ATMOS_RESTART_TMPL | replace_tmpl(tmpl_dict) }}/{{ background_time | to_fv3time }}.{{ ftype }}.tile{{ tile }}.nc", "{{ DATA }}/bkg/{{ background_time | to_fv3time }}.{{ ftype }}.tile{{ tile }}.nc"]
+  {% endfor %}
+{% endfor %}
+# copy climatological stddev files
+######################################
+{% for tile in range(1, ntiles+1) %}
+- ["{{ BERROR_DATA_DIR }}/stddev.fv_tracer.res.tile{{ tile }}.nc", "{{ DATA }}/clm_stddev/stddev.fv_tracer.res.tile{{ tile }}.nc"]
+{% endfor %}
+
diff --git a/parm/gdas/aero_stage_variational.yaml.j2 b/parm/gdas/aero_stage_variational.yaml.j2
new file mode 100644
index 0000000000..afd0e1b946
--- /dev/null
+++ b/parm/gdas/aero_stage_variational.yaml.j2
@@ -0,0 +1,50 @@
+######################################
+# set some variables
+######################################
+{% if DOIAU == True %}
+    {% set bkg_times = [] %}
+    {% for fh in range(0, 7, 3) %}
+      {% set offset = fh | string + "H" %}
+      {% set fcst_timedelta = offset | to_timedelta %}
+      {% set fcst_time = AERO_WINDOW_BEGIN | add_to_datetime(fcst_timedelta) %}
+      {% do bkg_times.append(fcst_time) %}
+    {% endfor %}
+{% else %}
+    {% set bkg_times = [] %}
+    {% do bkg_times.append(current_cycle) %}
+{% endif %}
+{% set fvfiles = ['fv_core.res.', 'fv_tracer.res.'] %}
+######################################
+mkdir:
+- "{{ DATA }}/anl"
+- "{{ DATA }}/diags"
+- "{{ DATA }}/berror"
+- "{{ DATA }}/bkg"
+copy:
+######################################
+## copy backgrounds
+{% for bkgtime in bkg_times %}
+- ["{{ COMIN_ATMOS_RESTART_PREV }}/{{ bkgtime | to_fv3time }}.coupler.res", "{{ DATA }}/bkg/{{ bkgtime | to_fv3time }}.coupler.res"]
+  {% for fvfile in fvfiles %}
+    {% for tile in range(1,ntiles+1) %}
+- ["{{ COMIN_ATMOS_RESTART_PREV }}/{{ bkgtime | to_fv3time }}.{{ fvfile }}tile{{ tile }}.nc", "{{ DATA }}/bkg/{{ bkgtime | to_fv3time }}.{{ fvfile }}tile{{ tile }}.nc"]
+    {% endfor %}
+  {% endfor %}
+{% endfor %}
+######################################
+## copy backgrounds again for fv_tracer to create analysis files later
+{% for tile in range(1,ntiles+1) %}
+- ["{{ COMIN_ATMOS_RESTART_PREV }}/{{ bkg_times[0] | to_fv3time }}.fv_tracer.res.tile{{ tile }}.nc", "{{ DATA }}/anl/{{ bkg_times[0] | to_fv3time }}.fv_tracer.res.tile{{ tile }}.nc"]
+{% endfor %}
+
+######################################
+## copy berror files from COMIN_CHEM_BMAT_PREV
+## stddev files
+{% for tile in range(1, ntiles+1) %}
+- ["{{ COMIN_CHEM_BMAT_PREV }}/{{ current_cycle | to_fv3time }}.stddev.fv_tracer.res.tile{{ tile }}.nc", "{{ DATA }}/berror/{{ current_cycle | to_fv3time }}.stddev.fv_tracer.res.tile{{ tile }}.nc"]
+{% endfor %}
+### copy coupler file
+- ["{{ COMIN_CHEM_BMAT_PREV }}/{{ current_cycle | to_fv3time }}.stddev.coupler.res", "{{ DATA }}/berror/{{ current_cycle | to_fv3time }}.stddev.coupler.res"]
+### copy diffusion files
+- ["{{ COMIN_CHEM_BMAT_PREV }}/{{ GPREFIX }}aero_diffusion_hz.nc", "{{ DATA }}/berror/diffusion_hz.nc"]
+- ["{{ COMIN_CHEM_BMAT_PREV }}/{{ GPREFIX }}aero_diffusion_vt.nc", "{{ DATA }}/berror/diffusion_vt.nc"]
diff --git a/parm/post/oceanice_products_gefs.yaml b/parm/post/oceanice_products_gefs.yaml
index fea88df2bb..f961fab83f 100644
--- a/parm/post/oceanice_products_gefs.yaml
+++ b/parm/post/oceanice_products_gefs.yaml
@@ -33,7 +33,7 @@ ocean:
     {% elif model_grid == 'mx500' %}
     ocean_levels: [5, 15, 25, 35, 45, 55, 65, 75, 85, 95, 105, 115, 125, 135, 145, 155, 165, 175, 185, 195, 205, 215, 226, 241, 267]
     {% endif %}
-  subset: ['SSH', 'SST', 'SSS', 'speed', 'MLD_003', 'latent', 'sensible', 'SW', 'LW', 'LwLatSens', 'Heat_PmE', 'SSU', 'SSV', 'taux', 'tauy', 'temp', 'so', 'uo', 'vo']
+  subset: ['SSH', 'SST', 'SSS', 'speed', 'MLD_003', 'latent', 'sensible', 'SW', 'LW', 'LwLatSens', 'Heat_PmE', 'SSU', 'SSV', 'taux', 'tauy', 'temp', 'tob', 'so', 'uo', 'vo']
   data_in:
     copy:
       - ["{{ COM_OCEAN_HISTORY }}/{{ RUN }}.ocean.t{{ current_cycle | strftime('%H') }}z.{{ interval }}hr_avg.f{{ '%03d' % forecast_hour }}.nc", "{{ DATA }}/ocean.nc"]
diff --git a/parm/post/upp.yaml b/parm/post/upp.yaml
index a39e2be877..dd9aed3358 100644
--- a/parm/post/upp.yaml
+++ b/parm/post/upp.yaml
@@ -18,13 +18,13 @@ analysis:
     rdaod: True
   data_in:
     copy:
-      - ["{{ PARMgfs }}/post/postxconfig-NT-GFS-ANL.txt", "{{ DATA }}/postxconfig-NT.txt"]
-      - ["{{ COM_ATMOS_ANALYSIS }}/{{ RUN }}.t{{ current_cycle | strftime('%H') }}z.atmanl.nc", "{{ DATA }}/{{ atmos_filename }}"]
-      - ["{{ COM_ATMOS_ANALYSIS }}/{{ RUN }}.t{{ current_cycle | strftime('%H') }}z.sfcanl.nc", "{{ DATA }}/{{ flux_filename }}"]
+      - ["{{ PARMgfs }}/post/gfs/postxconfig-NT-gfs-anl.txt", "{{ DATA }}/postxconfig-NT.txt"]
+      - ["{{ COMIN_ATMOS_ANALYSIS }}/{{ RUN }}.t{{ current_cycle | strftime('%H') }}z.atmanl.nc", "{{ DATA }}/{{ atmos_filename }}"]
+      - ["{{ COMIN_ATMOS_ANALYSIS }}/{{ RUN }}.t{{ current_cycle | strftime('%H') }}z.sfcanl.nc", "{{ DATA }}/{{ flux_filename }}"]
   data_out:
     copy:
-      - ["{{ DATA }}/GFSPRS.GrbF00", "{{ COM_ATMOS_MASTER }}/{{ RUN }}.t{{ current_cycle | strftime('%H') }}z.master.grb2anl"]
-      - ["{{ DATA }}/GFSPRS.GrbF00.idx", "{{ COM_ATMOS_MASTER }}/{{ RUN }}.t{{ current_cycle | strftime('%H') }}z.master.grb2ianl"]
+      - ["{{ DATA }}/GFSPRS.GrbF00", "{{ COMOUT_ATMOS_MASTER }}/{{ RUN }}.t{{ current_cycle | strftime('%H') }}z.master.grb2anl"]
+      - ["{{ DATA }}/GFSPRS.GrbF00.idx", "{{ COMOUT_ATMOS_MASTER }}/{{ RUN }}.t{{ current_cycle | strftime('%H') }}z.master.grb2ianl"]
 
 forecast:
   config:
@@ -32,18 +32,18 @@ forecast:
   data_in:
     copy:
       {% if forecast_hour == 0 %}
-      - ["{{ PARMgfs }}/post/postxconfig-NT-GFS-F00-TWO.txt", "{{ DATA }}/postxconfig-NT.txt"]
+      - ["{{ PARMgfs }}/post/gfs/postxconfig-NT-gfs-f00-two.txt", "{{ DATA }}/postxconfig-NT.txt"]
       {% else %}
-      - ["{{ PARMgfs }}/post/postxconfig-NT-GFS-TWO.txt", "{{ DATA }}/postxconfig-NT.txt"]
+      - ["{{ PARMgfs }}/post/gfs/postxconfig-NT-gfs-two.txt", "{{ DATA }}/postxconfig-NT.txt"]
       {% endif %}
-      - ["{{ COM_ATMOS_HISTORY }}/{{ RUN }}.t{{ current_cycle | strftime('%H') }}z.atmf{{ '%03d' % forecast_hour }}.nc", "{{ DATA }}/{{ atmos_filename }}"]
-      - ["{{ COM_ATMOS_HISTORY }}/{{ RUN }}.t{{ current_cycle | strftime('%H') }}z.sfcf{{ '%03d' % forecast_hour }}.nc", "{{ DATA }}/{{ flux_filename }}"]
+      - ["{{ COMIN_ATMOS_HISTORY }}/{{ RUN }}.t{{ current_cycle | strftime('%H') }}z.atmf{{ '%03d' % forecast_hour }}.nc", "{{ DATA }}/{{ atmos_filename }}"]
+      - ["{{ COMIN_ATMOS_HISTORY }}/{{ RUN }}.t{{ current_cycle | strftime('%H') }}z.sfcf{{ '%03d' % forecast_hour }}.nc", "{{ DATA }}/{{ flux_filename }}"]
   data_out:
     copy:
-      - ["{{ DATA }}/GFSPRS.GrbF{{ '%02d' % forecast_hour }}", "{{ COM_ATMOS_MASTER }}/{{ RUN }}.t{{ current_cycle | strftime('%H') }}z.master.grb2f{{ '%03d' % forecast_hour }}"]
-      - ["{{ DATA }}/GFSFLX.GrbF{{ '%02d' % forecast_hour }}", "{{ COM_ATMOS_MASTER }}/{{ RUN }}.t{{ current_cycle | strftime('%H') }}z.sfluxgrbf{{ '%03d' % forecast_hour }}.grib2"]
-      - ["{{ DATA }}/GFSPRS.GrbF{{ '%02d' % forecast_hour }}.idx", "{{ COM_ATMOS_MASTER }}/{{ RUN }}.t{{ current_cycle | strftime('%H') }}z.master.grb2if{{ '%03d' % forecast_hour }}"]
-      - ["{{ DATA }}/GFSFLX.GrbF{{ '%02d' % forecast_hour }}.idx", "{{ COM_ATMOS_MASTER }}/{{ RUN }}.t{{ current_cycle | strftime('%H') }}z.sfluxgrbf{{ '%03d' % forecast_hour }}.grib2.idx"]
+      - ["{{ DATA }}/GFSPRS.GrbF{{ '%02d' % forecast_hour }}", "{{ COMOUT_ATMOS_MASTER }}/{{ RUN }}.t{{ current_cycle | strftime('%H') }}z.master.grb2f{{ '%03d' % forecast_hour }}"]
+      - ["{{ DATA }}/GFSFLX.GrbF{{ '%02d' % forecast_hour }}", "{{ COMOUT_ATMOS_MASTER }}/{{ RUN }}.t{{ current_cycle | strftime('%H') }}z.sfluxgrbf{{ '%03d' % forecast_hour }}.grib2"]
+      - ["{{ DATA }}/GFSPRS.GrbF{{ '%02d' % forecast_hour }}.idx", "{{ COMOUT_ATMOS_MASTER }}/{{ RUN }}.t{{ current_cycle | strftime('%H') }}z.master.grb2if{{ '%03d' % forecast_hour }}"]
+      - ["{{ DATA }}/GFSFLX.GrbF{{ '%02d' % forecast_hour }}.idx", "{{ COMOUT_ATMOS_MASTER }}/{{ RUN }}.t{{ current_cycle | strftime('%H') }}z.sfluxgrbf{{ '%03d' % forecast_hour }}.grib2.idx"]
 
 goes:
   config:
@@ -81,10 +81,10 @@ goes:
       {% endfor %}
       - ["{{ 'CRTM_FIX' | getenv }}/AerosolCoeff.bin", "{{ DATA }}/"]
       - ["{{ 'CRTM_FIX' | getenv }}/CloudCoeff.bin", "{{ DATA }}/"]
-      - ["{{ PARMgfs }}/post/postxconfig-NT-GFS-GOES.txt", "{{ DATA }}/postxconfig-NT.txt"]
-      - ["{{ COM_ATMOS_HISTORY }}/{{ RUN }}.t{{ current_cycle | strftime('%H') }}z.atmf{{ '%03d' % forecast_hour }}.nc", "{{ DATA }}/{{ atmos_filename }}"]
-      - ["{{ COM_ATMOS_HISTORY }}/{{ RUN }}.t{{ current_cycle | strftime('%H') }}z.sfcf{{ '%03d' % forecast_hour }}.nc", "{{ DATA }}/{{ flux_filename }}"]
+      - ["{{ PARMgfs }}/post/gfs/postxconfig-NT-gfs-goes.txt", "{{ DATA }}/postxconfig-NT.txt"]
+      - ["{{ COMIN_ATMOS_HISTORY }}/{{ RUN }}.t{{ current_cycle | strftime('%H') }}z.atmf{{ '%03d' % forecast_hour }}.nc", "{{ DATA }}/{{ atmos_filename }}"]
+      - ["{{ COMIN_ATMOS_HISTORY }}/{{ RUN }}.t{{ current_cycle | strftime('%H') }}z.sfcf{{ '%03d' % forecast_hour }}.nc", "{{ DATA }}/{{ flux_filename }}"]
   data_out:
     copy:
-      - ["{{ DATA }}/GFSPRS.GrbF{{ '%02d' % forecast_hour }}", "{{ COM_ATMOS_MASTER }}/{{ RUN }}.t{{ current_cycle | strftime('%H') }}z.special.grb2f{{ '%03d' % forecast_hour }}"]
-      - ["{{ DATA }}/GFSPRS.GrbF{{ '%02d' % forecast_hour }}.idx", "{{ COM_ATMOS_MASTER }}/{{ RUN }}.t{{ current_cycle | strftime('%H') }}z.special.grb2if{{ '%03d' % forecast_hour }}"]
+      - ["{{ DATA }}/GFSGOES.GrbF{{ '%02d' % forecast_hour }}", "{{ COMOUT_ATMOS_MASTER }}/{{ RUN }}.t{{ current_cycle | strftime('%H') }}z.special.grb2f{{ '%03d' % forecast_hour }}"]
+      - ["{{ DATA }}/GFSGOES.GrbF{{ '%02d' % forecast_hour }}.idx", "{{ COMOUT_ATMOS_MASTER }}/{{ RUN }}.t{{ current_cycle | strftime('%H') }}z.special.grb2if{{ '%03d' % forecast_hour }}"]
diff --git a/parm/product/bufr_ij9km.txt b/parm/product/bufr_ij_gfs_C1152.txt
similarity index 100%
rename from parm/product/bufr_ij9km.txt
rename to parm/product/bufr_ij_gfs_C1152.txt
diff --git a/parm/product/bufr_ij13km.txt b/parm/product/bufr_ij_gfs_C768.txt
similarity index 100%
rename from parm/product/bufr_ij13km.txt
rename to parm/product/bufr_ij_gfs_C768.txt
diff --git a/parm/product/bufr_ij_gfs_C96.txt b/parm/product/bufr_ij_gfs_C96.txt
new file mode 100644
index 0000000000..c005cc3170
--- /dev/null
+++ b/parm/product/bufr_ij_gfs_C96.txt
@@ -0,0 +1,2115 @@
+     1   235    22    69.58  -140.18
+     2   247    21    69.90  -128.97
+     3   256    22    69.58  -120.75
+     4   244    26    65.00  -132.00
+     5   256    26    65.00  -120.00
+     6   275    26    65.10  -102.43
+     7   235    32    60.00  -140.00
+     8   256    32    60.00  -120.00
+     9   278    32    60.00  -100.00
+    10   249    35    57.00  -127.00
+    11   226    21    70.20  -148.47
+    12   271    39    53.63  -106.20
+    13   216    24    67.10  -157.85
+    14   272    38    53.99  -105.12
+    15   259    39    52.88  -118.07
+    16   270    29    62.50  -107.00
+    17   267    49    43.90  -110.00
+    18   281    47    45.80   -97.45
+    19   283    49    43.50   -95.60
+    20   286    60    33.22   -92.80
+    21   283    51    42.04   -94.79
+    22   285    51    42.11   -92.92
+    23   293    60    34.10   -86.10
+    24   294    58    35.20   -84.80
+    25   295    59    34.80   -84.05
+    26   298    57    36.72   -80.97
+    27   264    44    48.32  -113.35
+    28   270    51    42.20  -107.20
+    29   273    50    42.76  -104.45
+    30   275    51    42.30  -102.40
+    31   278    50    42.60   -99.90
+    32   271    54    39.10  -106.20
+    33   290    56    37.30   -88.90
+    34   286    53    40.20   -92.60
+    35   280    59    34.90   -98.10
+    36   272    44    48.31  -105.10
+    37   289    59    34.25   -89.87
+    38   272    53    40.13  -105.24
+    39   281    56    37.48   -96.93
+    40   295    58    35.96   -84.29
+    41   277    50    42.86  -100.41
+    42   284    52    41.02   -94.36
+    43   302    51    42.04   -77.76
+    44   300    54    39.17   -79.52
+    45   289    62    31.71   -89.41
+    46   299    48    44.92   -80.42
+    47   274    48    45.27  -103.54
+    48   273    48    44.79  -104.73
+    49   274    48    44.46  -103.85
+    50   273    50    43.35  -104.69
+    51   274    49    43.53  -103.65
+    52   282    47    45.50   -95.90
+    53   285    49    44.10   -93.50
+    54   260    58    35.34  -116.88
+    55   291    59    34.40   -87.60
+    56   255    45    47.50  -121.10
+    57   254    48    44.50  -122.70
+    58   262    49    44.00  -115.00
+    59   255    46    46.90  -121.30
+    60   256    49    44.10  -120.50
+    61   255    50    42.70  -121.40
+    62   266    61    32.42  -110.73
+    63   281    57    36.61   -97.49
+    64   255    47    45.68  -121.27
+    65   255    47    45.72  -121.56
+    66   256    47    45.68  -120.82
+    67   256    47    45.72  -120.21
+    68   255    55    38.06  -121.77
+    69   254    56    37.10  -122.28
+    70   254    56    37.82  -122.47
+    71   254    55    37.94  -122.50
+    72   255    56    37.07  -121.12
+    73   264    53    40.20  -113.30
+    74   306    53    40.42   -73.98
+    75   305    56    37.20   -74.80
+    76   305    57    36.05   -74.25
+    77   302    61    32.80   -77.20
+    78   306    55    38.60   -73.75
+    79   291    65    29.20   -87.25
+    80   293    46    46.31   -85.46
+    81   291    46    47.18   -87.22
+    82   290    50    42.97   -88.55
+    83   307    48    44.94   -72.51
+    84   297    56    37.27   -82.10
+    85   297    56    90.00     0.00
+    86   217    17    74.30  -156.60
+    87   235    16    75.00  -140.00
+    88   200    31    60.60  -173.30
+    89   212    32    59.90  -161.75
+    90   225    29    62.88  -149.83
+    91   226    31    60.79  -148.83
+    92   225    31    60.49  -149.79
+    93   225    31    60.95  -149.14
+    94   226    31    60.78  -148.72
+    95   263    65    29.22  -114.28
+    96   297    57    36.20   -81.65
+    97   291    50    42.59   -87.94
+    98   259    50    42.59  -117.87
+    99   254    46    47.08  -122.36
+   100   252    46    46.91  -124.11
+   101   288    45    47.66   -90.91
+   102   287    46    46.77   -91.25
+   103   213    37    55.31  -160.52
+   104   302    58    35.33   -77.60
+   105   307    48    44.53   -72.61
+   106   299    51    41.63   -80.21
+   107   298    55    38.69   -80.65
+   108   259    59    34.57  -117.67
+   109   259    59    34.63  -117.61
+   110   293    47    45.97   -86.17
+   111   292    46    46.42   -86.65
+   112   289    54    39.16   -89.67
+   113   276    49    44.05  -101.60
+   114   293    49    43.58   -86.24
+   115   294    50    43.43   -85.30
+   116   294    50    43.37   -84.44
+   117   273    59    34.38  -104.23
+   118   333    46    46.70   -48.00
+   119   326    46    47.20   -55.10
+   120   293    50    42.75   -86.10
+   121   292    51    42.41   -86.28
+   122   259    48    45.35  -117.23
+   123   283    52    41.59   -95.34
+   124   291    49    43.78   -87.85
+   125   275    63    30.90  -102.85
+   126   287    60    33.64   -91.75
+   127   286    57    36.22   -92.28
+   128   274    62    31.38  -103.51
+   129   298    68    26.42   -81.44
+   130   298    67    26.75   -80.94
+   131   279    63    31.18   -99.32
+   132   277    63    30.59  -100.65
+   133   255    54    39.08  -120.94
+   134   256    56    37.51  -120.04
+   135   256    56    37.58  -120.27
+   136   257    57    36.83  -119.33
+   137   255    58    35.85  -121.31
+   138   255    45    47.31  -121.85
+   139   255    55    38.49  -121.22
+   140   256    54    39.13  -120.80
+   141   254    52    40.72  -122.43
+   142   305    53    40.50   -74.45
+   143   310    51    42.99   -70.62
+   144   306    47    45.50   -73.57
+   145   307    53    41.10   -72.89
+   146   254    54    39.69  -121.91
+   147   255    54    39.17  -121.11
+   148   257    58    35.62  -119.69
+   149   255    58    35.66  -121.28
+   150   253    55    38.61  -123.21
+   151   253    55    38.51  -123.22
+   152   253    55    38.78  -122.99
+   153   256    56    37.11  -120.24
+   154   254    53    39.99  -122.06
+   155   253    54    39.00  -123.12
+   156   253    55    38.51  -122.96
+   157   271    60    33.50  -106.18
+   158   271    60    33.82  -106.65
+   159   265    53    40.58  -111.63
+   160   296    49    43.78   -82.99
+   161   233    34    58.00  -142.00
+   162   232    38    54.00  -143.00
+   163   238    36    56.00  -137.00
+   164   219    37    55.00  -155.00
+   165   236    39    53.00  -139.00
+   166   227    41    51.10  -147.40
+   167   212    40    52.00  -162.00
+   168   221    43    49.50  -153.70
+   169   204    43    49.20  -168.80
+   170   240    43    50.00  -135.00
+   171   247    55    38.50  -129.00
+   172   250    60    34.00  -126.00
+   173   253    64    29.50  -123.00
+   174   256    69    25.00  -120.00
+   175   262    69    25.00  -115.00
+   176   234    49    44.30  -140.80
+   177   231    45    47.70  -144.10
+   178   238    56    37.40  -137.00
+   179   237    46    47.00  -138.00
+   180   240    49    43.60  -135.50
+   181   242    54    39.70  -133.30
+   182   246    44    48.50  -129.50
+   183   248    48    44.60  -127.50
+   184   234    42    50.50  -141.38
+   185   249    53    40.50  -126.98
+   186   182    37    55.00   170.00
+   187   192    37    55.00   180.00
+   188   187    32    60.00   175.00
+   189   267    50    42.80  -109.81
+   190   254    54    39.15  -122.15
+   191   255    52    40.88  -121.66
+   192   256    55    37.99  -120.38
+   193   258    56    37.74  -118.59
+   194   257    57    36.20  -119.10
+   195   258    58    35.97  -118.54
+   196   258    59    34.83  -118.95
+   197   256    57    36.14  -120.35
+   198   258    57    36.65  -118.48
+   199   306    51    42.47   -73.29
+   200   297    54    39.21   -82.23
+   201   266    53    40.48  -111.43
+   202   263    61    33.02  -114.24
+   203   267    62    31.49  -110.30
+   204   269    62    32.02  -107.87
+   205   273    63    30.43  -104.33
+   206   278    66    28.39  -100.29
+   207   279    68    26.57   -98.82
+   208   282    65    28.71   -95.96
+   209   287    64    29.81   -91.66
+   210   298    70    24.70   -81.51
+   211   313    77    17.98   -67.08
+   212   255    47    46.19  -121.70
+   213   254    47    46.28  -122.28
+   214   254    48    45.35  -121.94
+   215   254    49    44.17  -122.06
+   216   279    48    45.03   -99.11
+   217   281    47    45.46   -96.99
+   218   283    55    38.28   -95.22
+   219   281    53    39.86   -96.63
+   220   271    49    44.38  -106.72
+   221   269    48    44.52  -108.08
+   222   288    48    45.10   -90.30
+   223   286    48    44.46   -92.29
+   224   270    56    37.29  -107.06
+   225   269    55    38.23  -108.56
+   226   269    53    40.05  -107.89
+   227   287    51    41.64   -91.54
+   228   272    54    39.05  -105.51
+   229   271    53    40.05  -106.36
+   230   291    55    38.76   -87.61
+   231   290    54    39.07   -88.53
+   232   288    52    40.94   -90.43
+   233   288    53    39.77   -90.24
+   234   290    54    39.48   -88.28
+   235   278    50    43.39   -99.84
+   236   275    50    43.02  -102.52
+   237   273    49    43.89  -104.32
+   238   275    48    44.56  -102.66
+   239   272    49    43.74  -105.74
+   240   289    47    46.15   -89.21
+   241   291    46    46.54   -87.39
+   242   293    46    46.68   -85.97
+   243   290    46    46.61   -88.91
+   244   292    66    28.00   -87.00
+   245   285    66    28.20   -93.70
+   246   286    66    28.50   -92.30
+   247   287    66    27.90   -91.00
+   248   290    66    28.00   -89.00
+   249   294    66    28.00   -85.00
+   250   300    63    31.00   -79.00
+   251   316    45    48.00   -65.00
+   252   266    54    39.30  -111.46
+   253   273    57    36.74  -104.65
+   254   302    56    36.99   -77.00
+   255   302    56    37.86   -76.89
+   256   303    55    38.54   -76.03
+   257   302    57    36.77   -77.79
+   258   312    49    43.78   -68.86
+   259   299    55    38.40   -80.00
+   260   259    58    35.10  -117.56
+   261   274    50    43.37  -103.39
+   262   274    49    44.41  -103.48
+   263   290    51    42.21   -88.32
+   264   291    53    40.46   -88.10
+   265   299    61    32.78   -79.92
+   266   299    61    32.66   -79.93
+   267   298    62    32.03   -80.89
+   268   259    45    47.97  -117.43
+   269   298    57    36.22   -81.10
+   270   297    52    42.47   -82.76
+   271   294    48    43.80   -83.72
+   272   296    49    44.02   -82.79
+   273   292    51    41.69   -87.15
+   274   291    52    41.61   -88.10
+   275   299    57    36.46   -80.55
+   276   264    56    37.20  -112.99
+   277   266    55    38.29  -111.26
+   278   265    55    38.74  -112.10
+   279   258    56    37.20  -118.80
+   280   274    45    47.61  -103.26
+   281   281    56    37.80   -97.01
+   282   284    59    34.60   -94.30
+   283   283    55    37.90   -95.20
+   284   276    55    38.50  -101.50
+   285   272    56    37.40  -105.20
+   286   272    57    36.00  -105.30
+   287   276    59    34.20  -101.70
+   288   279    60    33.60   -99.30
+   289   281    60    33.70   -97.40
+   290   286    56    37.10   -92.30
+   291   270    52    41.00  -107.00
+   292   263    47    46.25  -114.15
+   293   264    46    47.00  -112.50
+   294   263    44    49.00  -114.00
+   295   269    43    49.50  -108.00
+   296   274    44    49.00  -104.00
+   297   279    45    47.50   -99.00
+   298   280    47    46.20   -97.50
+   299   283    47    46.00   -95.00
+   300   295    52    40.80   -84.20
+   301   299    55    38.00   -80.00
+   302   296    59    34.50   -82.50
+   303   280    51    41.73   -98.01
+   304   283    52    41.58   -95.34
+   305   281    51    42.24   -96.98
+   306   279    56    37.70   -98.75
+   307   280    44    48.75   -98.39
+   308   281    44    48.75   -96.94
+   309   282    48    44.46   -96.25
+   310   283    50    43.17   -95.21
+   311   278    50    43.22   -99.40
+   312   279    50    43.26   -98.76
+   313   280    52    40.90   -97.62
+   314   278    52    40.79   -99.78
+   315   280    53    40.15   -97.58
+   316   279    54    39.73   -99.32
+   317   288    57    36.77   -90.32
+   318   291    56    37.36   -87.40
+   319   293    54    39.05   -85.61
+   320   296    56    37.75   -82.64
+   321   295    57    36.61   -83.74
+   322   294    57    36.86   -84.86
+   323   295    55    38.06   -83.98
+   324   276    52    41.12  -101.77
+   325   277    51    41.96  -100.57
+   326   267    49    43.55  -109.69
+   327   266    50    42.71  -110.94
+   328   267    51    41.82  -110.56
+   329   268    48    44.87  -108.79
+   330   269    48    44.91  -108.45
+   331   271    49    43.71  -106.63
+   332   289    49    43.52   -89.77
+   333   290    49    43.77   -88.49
+   334   288    50    42.89   -90.24
+   335   290    50    43.04   -88.24
+   336   289    49    44.04   -89.31
+   337   289    52    41.35   -89.15
+   338   292    51    41.70   -86.82
+   339   291    52    41.07   -87.85
+   340   289    51    41.89   -89.08
+   341   287    47    45.42   -91.77
+   342   284    48    45.10   -94.51
+   343   282    48    44.73   -96.27
+   344   275    53    40.10  -102.24
+   345   275    55    38.76  -102.79
+   346   292    48    45.29   -86.98
+   347   289    49    44.36   -89.84
+   348   305    53    39.99   -74.17
+   349   293    56    37.70   -85.87
+   350   280    56    37.67   -98.12
+   351   280    56    37.28   -98.04
+   352   282    55    38.30   -95.72
+   353   282    56    37.85   -96.29
+   354   280    55    38.75   -98.23
+   355   307    54    39.55   -73.90
+   356   308    54    39.70   -71.60
+   357   283    56    37.09   -95.57
+   358   280    55    38.35   -97.69
+   359   279    56    37.35   -99.35
+   360   279    58    35.30   -98.90
+   361   281    58    35.50   -97.00
+   362   283    59    34.98   -94.69
+   363   276    57    36.60  -101.60
+   364   301    51    42.50   -78.68
+   365   304    49    43.76   -75.68
+   366   287    61    32.35   -91.03
+   367   298    68    25.86   -81.38
+   368   297    65    28.84   -82.33
+   369   296    62    32.07   -82.90
+   370   291    62    31.71   -87.78
+   371   290    60    33.45   -88.82
+   372   287    59    34.89   -91.20
+   373   293    58    35.48   -86.09
+   374   291    58    35.62   -87.84
+   375   294    56    36.95   -85.26
+   376   275    60    33.62  -103.02
+   377   278    58    35.21  -100.25
+   378   277    54    39.13  -100.87
+   379   287    56    37.01   -91.36
+   380   284    55    38.37   -93.79
+   381   286    54    39.42   -92.44
+   382   300    59    34.61   -79.06
+   383   309    51    41.65   -70.52
+   384   298    60    33.46   -80.85
+   385   287    47    45.50   -91.00
+   386   285    47    45.89   -93.27
+   387   286    48    45.15   -92.54
+   388   282    48    45.23   -96.00
+   389   288    49    44.03   -90.08
+   390   254    52    41.32  -122.32
+   391   257    50    42.55  -119.66
+   392   256    50    43.33  -120.84
+   393   253    52    41.39  -123.49
+   394   255    52    41.43  -121.46
+   395   259    47    45.36  -117.25
+   396   258    49    44.40  -118.96
+   397   302    57    36.33   -77.64
+   398   299    59    34.89   -79.76
+   399   298    53    40.47   -81.42
+   400   300    52    40.82   -79.53
+   401   300    53    40.63   -79.11
+   402   300    54    39.58   -79.34
+   403   299    53    40.14   -80.29
+   404   304    51    42.46   -75.06
+   405   276    57    36.68  -101.50
+   406   292    61    33.17   -86.77
+   407   289    63    31.27   -89.26
+   408   298    66    28.29   -81.44
+   409   297    65    28.82   -81.81
+   410   283    64    30.36   -95.41
+   411   283    63    30.73   -95.47
+   412   276    48    45.02  -102.02
+   413   278    65    29.21   -99.74
+   414   280    58    35.87   -98.42
+   415   290    52    40.92   -88.62
+   416   307    52    41.56   -73.05
+   417   260    44    48.69  -116.32
+   418   258    44    48.65  -118.73
+   419   256    45    47.76  -120.65
+   420   256    44    48.49  -120.24
+   421   261    45    47.54  -116.14
+   422   253    52    40.73  -122.94
+   423   253    52    40.94  -123.63
+   424   253    53    40.34  -123.07
+   425   253    53    39.75  -123.21
+   426   285    57    36.54   -93.20
+   427   203    28    63.68  -170.50
+   428   223    23    68.13  -151.73
+   429   201    28    63.77  -171.73
+   430   207    31    60.37  -166.27
+   431   212    35    56.65  -161.37
+   432   171    38    54.05   159.43
+   433   307    48    44.89   -72.23
+   434   276    50    43.46  -101.50
+   435   274    49    43.99  -103.79
+   436   295    65    29.30   -84.04
+   437   282    66    27.90   -96.64
+   438   294    59    34.31   -84.42
+   439   295    59    34.27   -83.83
+   440   294    52    41.34   -84.43
+   441   293    52    41.28   -85.84
+   442   293    51    41.81   -85.44
+   443   292    52    41.57   -86.73
+   444   274    44    48.93  -103.30
+   445   278    44    48.88   -99.62
+   446   274    47    46.19  -103.43
+   447   279    47    46.02   -99.35
+   448   280    47    46.17   -98.07
+   449   295    47    46.01   -83.74
+   450   289    46    46.88   -89.32
+   451   292    46    45.58   -87.00
+   452   259    59    34.36  -117.63
+   453   257    59    34.94  -119.69
+   454   256    59    34.48  -120.23
+   455   256    59    34.61  -120.08
+   456   266    49    43.74  -111.10
+   457   295    59    34.85   -84.00
+   458   274    49    44.35  -103.77
+   459   273    49    44.41  -104.36
+   460   283    56    37.80   -94.77
+   461   286    56    37.64   -92.65
+   462   285    55    38.35   -93.34
+   463   255    54    39.49  -121.61
+   464   290    60    33.90   -88.33
+   465   274    59    34.64  -103.63
+   466   304    54    38.83   -75.43
+   467   279    61    32.54   -99.25
+   468   284    54    38.81   -94.26
+   469   280    57    36.34   -97.92
+   470   279    59    34.36   -98.98
+   471   293    52    40.72   -85.93
+   472   281    63    30.72   -97.38
+   473   279    53    40.32   -98.44
+   474   293    62    31.46   -85.46
+   475   293    61    32.54   -85.79
+   476   276    44    48.50  -101.40
+   477   296    57    36.17   -83.40
+   478   304    50    43.47   -75.46
+   479   296    61    32.68   -83.35
+   480   291    57    36.74   -87.29
+   481   263    63    31.40  -114.49
+   482   264    61    32.37  -112.87
+   483   268    61    32.82  -109.68
+   484   261    44    48.39  -115.55
+   485   273    44    48.76  -104.52
+   486   253    56    37.70  -123.00
+   487   253    55    38.32  -123.07
+   488   273    46    46.37  -104.28
+   489   266    48    44.42  -111.37
+   490   265    51    42.17  -112.28
+   491   261    54    39.50  -115.95
+   492   257    55    38.30  -119.16
+   493   306    48    44.65   -73.49
+   494   304    52    41.14   -75.38
+   495   304    53    39.98   -75.82
+   496   275    56    37.28  -102.61
+   497   310    47    45.64   -70.26
+   498   311    45    47.46   -69.22
+   499   313    47    45.56   -67.43
+   500   306    51    42.05   -73.20
+   501   268    51    42.11  -109.45
+   502   269    51    42.49  -107.83
+   503   268    51    42.48  -108.84
+   504   267    50    43.20  -110.40
+   505   282    53    40.61   -95.87
+   506   281    52    41.24   -96.59
+   507   292    52    41.45   -87.01
+   508   290    52    41.42   -88.41
+   509   279    53    39.76   -98.79
+   510   271    53    40.51  -106.87
+   511   270    54    39.43  -107.38
+   512   271    54    39.48  -106.15
+   513   270    53    40.50  -107.52
+   514   289    52    41.02   -89.39
+   515   290    55    38.72   -88.18
+   516   280    54    39.06   -98.17
+   517   282    56    37.13   -96.19
+   518   282    55    38.37   -96.54
+   519   302    50    42.64   -77.05
+   520   303    51    41.77   -76.45
+   521   271    52    40.73  -106.28
+   522   303    50    43.45   -76.51
+   523   284    50    43.08   -94.27
+   524   283    50    43.40   -94.75
+   525   283    53    40.35   -94.92
+   526   295    55    38.22   -83.59
+   527   285    55    38.71   -93.18
+   528   285    54    39.42   -93.13
+   529   269    49    43.71  -108.39
+   530   266    50    43.18  -111.04
+   531   274    47    45.59  -103.55
+   532   222    31    60.82  -152.72
+   533   214    22    69.00  -160.00
+   534   190    40    52.00   177.55
+   535   207    35    57.00  -166.00
+   536   221    29    62.22  -153.08
+   537   217    32    59.73  -157.26
+   538   227    30    61.89  -147.32
+   539   207    25    66.27  -166.05
+   540   259    60    34.10  -117.23
+   541   284    53    40.63   -93.90
+   542   266    60    33.40  -110.77
+   543   264    60    33.97  -112.74
+   544   303    55    38.80   -76.07
+   545   305    52    41.05   -74.63
+   546   231    29    62.72  -143.97
+   547   231    24    67.75  -144.11
+   548   231    26    65.59  -144.36
+   549   223    30    61.95  -151.00
+   550   220    35    57.27  -154.56
+   551   227    25    66.15  -148.03
+   552   232    24    67.03  -143.29
+   553   213    26    65.20  -161.15
+   554   223    32    59.75  -151.37
+   555   215    28    63.39  -158.83
+   556   242    35    56.97  -134.00
+   557   211    23    67.95  -162.31
+   558   224    31    60.59  -150.32
+   559   225    31    60.37  -149.41
+   560   232    30    61.32  -142.59
+   561   223    32    60.03  -151.66
+   562   215    23    68.07  -158.71
+   563   214    30    61.58  -159.54
+   564   229    29    63.03  -145.49
+   565   209    26    65.41  -164.66
+   566   221    28    63.44  -153.36
+   567   240    33    59.25  -135.52
+   568   243    37    55.58  -133.10
+   569   224    28    63.49  -150.88
+   570   232    29    62.97  -143.34
+   571   233    28    64.05  -141.93
+   572   220    25    66.85  -154.34
+   573   222    25    66.08  -152.17
+   574   218    30    61.64  -156.44
+   575   218    22    69.50  -156.50
+   576   226    22    69.00  -149.00
+   577   226    24    67.75  -149.00
+   578   218    26    65.34  -155.95
+   579   219    27    64.10  -155.56
+   580   223    27    64.31  -151.08
+   581   214    31    60.32  -160.20
+   582   210    30    62.10  -163.80
+   583   212    21    70.40  -161.90
+   584   217    20    71.32  -156.62
+   585   312    51    42.35   -67.70
+   586   308    54    39.30   -72.00
+   587   314    54    39.30   -65.70
+   588   310    56    37.30   -70.10
+   589   305    57    36.30   -74.60
+   590   306    58    35.60   -73.80
+   591   309    59    34.90   -70.80
+   592   303    60    33.80   -76.00
+   593   307    61    32.80   -72.30
+   594   245    45    48.10  -130.50
+   595   249    45    48.10  -126.60
+   596   246    48    45.30  -129.70
+   597   251    48    45.30  -125.60
+   598   246    51    41.75  -129.90
+   599   250    51    41.90  -125.80
+   600   251    54    39.20  -125.50
+   601   251    57    36.40  -125.40
+   602   251    60    33.30  -125.00
+   603   254    59    34.60  -122.30
+   604   255    63    30.90  -121.50
+   605   260    64    29.60  -117.00
+   606   304    56    37.54   -76.01
+   607   270    61    32.99  -106.97
+   608   267    62    32.15  -109.84
+   609   295    50    42.63   -83.98
+   610   295    50    42.99   -84.14
+   611   296    51    42.10   -83.16
+   612   295    51    41.87   -84.07
+   613   294    48    44.02   -83.54
+   614   295    50    43.46   -83.45
+   615   296    51    41.94   -83.43
+   616   274    53    40.61  -103.26
+   617   274    53    40.34  -103.80
+   618   285    53    40.08   -93.59
+   619   285    53    40.48   -93.01
+   620   284    53    40.25   -94.33
+   621   285    52    40.68   -92.90
+   622   286    51    41.71   -92.73
+   623   285    51    42.47   -93.27
+   624   290    55    38.66   -88.45
+   625   291    54    39.02   -87.65
+   626   289    54    39.53   -89.33
+   627   268    50    43.31  -109.19
+   628   269    51    41.67  -107.98
+   629   266    49    43.50  -110.96
+   630   280    54    39.47   -98.13
+   631   284    56    37.85   -94.31
+   632   290    51    41.93   -88.71
+   633   267    56    37.44  -110.56
+   634   271    53    40.45  -106.75
+   635   281    56    37.32   -97.39
+   636   271    56    37.45  -106.80
+   637   270    49    44.03  -107.45
+   638   266    51    42.08  -110.96
+   639   269    55    38.79  -108.06
+   640   271    53    40.35  -106.70
+   641   290    65    29.30   -88.84
+   642   376    62    32.13    -7.88
+   643   307    51    41.89   -72.71
+   644    12    32    60.20    11.10
+   645    20    32    59.67    17.93
+   646    20    33    59.35    17.95
+   647    27    31    60.32    24.97
+   648   383    32    60.13    -1.18
+   649   380    36    56.50    -4.58
+   650   324   131   -33.00   -57.00
+   651   383    41    51.68    -1.78
+   652   383    41    51.75    -1.58
+   653   383    41    51.29    -0.27
+   654   378    40    52.25    -6.33
+   655   360    28    63.97   -22.60
+   656   377    30    62.02    -6.76
+   657    14    36    55.77    12.53
+   658     5    40    52.03     4.35
+   659     5    42    50.90     4.47
+   660     8    46    46.82     6.95
+   661     3    44    48.73     2.40
+   662   376    50    43.37    -8.42
+   663   383    51    41.67    -1.02
+   664   379    56    37.17    -5.62
+   665   360    78    16.75   -22.95
+   666    16    24    67.27    14.37
+   667   194    20    70.97  -178.53
+   668   193    22    68.92  -179.48
+   669   203    25    66.17  -169.83
+   670   182    27    64.68   170.42
+   671   190    27    64.73   177.50
+   672   192    29    63.05   179.32
+   673    68    39    53.21    63.55
+   674   378    34    58.22    -6.32
+   675     2    40    52.63     1.32
+   676    72    42    50.22    66.83
+   677    79    43    49.80    73.15
+   678   379    42    50.08    -5.25
+   679   378    38    54.65    -6.22
+   680   307    59    34.90   -73.00
+   681   304    61    32.30   -75.20
+   682   301    61    32.50   -79.07
+   683   302    65    29.30   -77.40
+   684   299    62    31.40   -80.87
+   685   301    65    28.90   -78.50
+   686   301    61    32.80   -79.62
+   687   299    62    32.28   -80.41
+   688   289    68    25.90   -89.70
+   689   285    68    25.90   -93.60
+   690   293    68    25.90   -85.90
+   691   283    66    27.90   -95.00
+   692   282    67    27.00   -96.50
+   693   309    55    38.50   -70.70
+   694   311    50    42.60   -68.60
+   695   311    50    43.53   -70.14
+   696   310    53    40.50   -69.40
+   697   306    55    38.50   -74.70
+   698   313    52    41.10   -66.60
+   699   305    57    36.60   -74.80
+   700   308    53    40.70   -72.10
+   701   307    53    40.30   -73.20
+   702   314    49    44.30   -67.30
+   703   307    53    40.37   -73.70
+   704   304    56    37.76   -75.33
+   705   291    45    48.06   -87.78
+   706   293    48    45.33   -86.42
+   707   297    48    45.35   -82.84
+   708   292    45    47.56   -86.55
+   709   297    52    41.68   -82.40
+   710   290    45    47.32   -89.87
+   711   292    50    42.67   -87.02
+   712   297    49    44.28   -82.42
+   713   303    50    43.62   -77.41
+   714   297    52    42.47   -81.22
+   715   301    50    43.40   -79.45
+   716   301    50    42.74   -79.35
+   717   292    51    42.14   -87.66
+   718   226    36    56.30  -148.20
+   719   245    51    42.50  -130.50
+   720   218    40    51.90  -155.90
+   721   245    47    46.10  -131.00
+   722   238    52    40.90  -137.50
+   723   252    54    39.20  -124.00
+   724   251    50    42.75  -124.82
+   725   252    47    46.20  -124.20
+   726   252    53    40.40  -124.50
+   727   195    35    57.00  -177.70
+   728   257    61    32.40  -119.50
+   729   259    61    32.49  -118.03
+   730   106    76    18.77    98.96
+   731   110    78    16.47   102.78
+   732   107    79    15.77   100.14
+   733   112    80    15.25   104.87
+   734   108    81    13.67   100.61
+   735   108    88     7.19   100.61
+   736   211    71    23.40  -162.30
+   737   216    78    17.20  -157.80
+   738   213    75    19.30  -160.80
+   739   222    77    17.40  -152.50
+   740    10    37    55.52     8.55
+   741     6    40    52.31     4.76
+   742     8    40    52.28     6.89
+   743   223    32    59.77  -151.17
+   744     7    44    48.98     6.25
+   745   280    64    29.70   -98.01
+   746   292    57    36.25   -86.57
+   747   283    57    36.18   -95.56
+   748   258    58    35.24  -119.03
+   749   288    55    38.62   -90.18
+   750   273    55    38.46  -104.18
+   751   297    52    41.50   -81.60
+   752   264    50    43.11  -112.68
+   753   261    45    47.47  -115.80
+   754     3    52    41.28     2.07
+   755   380    53    40.42    -4.25
+   756   380    53    39.50    -0.47
+   757   277    57    36.50  -100.80
+   758   276    64    30.30  -101.70
+   759   275    66    27.70  -102.50
+   760   279    63    30.50   -99.10
+   761   279    66    28.40   -98.70
+   762   279    68    26.30   -98.80
+   763   281    70    24.40   -97.40
+   764   283    68    25.90   -95.30
+   765   284    70    24.50   -94.40
+   766   283    71    23.30   -95.60
+   767   284    76    18.30   -94.20
+   768   285    73    21.40   -93.10
+   769   287    71    23.30   -91.60
+   770   290    71    23.70   -88.70
+   771   294    71    23.00   -85.00
+   772   280    71    23.50   -98.00
+   773   287    47    46.02   -91.45
+   774   296    54    38.83   -82.80
+   775   301    54    38.88   -78.52
+   776   300    54    39.62   -78.76
+   777   302    54    39.61   -77.01
+   778    10    39    53.05     8.79
+   779    15    40    52.47    13.40
+   780     8    42    50.87     7.15
+   781    10    42    50.05     8.58
+   782    10    44    48.68     9.22
+   783    13    44    48.35    11.78
+   784    16    44    48.23    14.19
+   785    18    45    48.12    16.57
+   786    16    42    50.10    14.26
+   787    20    38    54.38    18.47
+   788    23    40    52.17    20.97
+   789    19    41    51.10    16.89
+   790    21    45    47.43    19.18
+   791    22    48    44.78    20.53
+   792    25    50    42.69    23.41
+   793    30    50    42.57    27.52
+   794    30    50    43.23    27.83
+   795    27    51    42.07    24.86
+   796    28    48    44.57    26.09
+   797    14    47    45.50    12.33
+   798    14    51    41.80    12.60
+   799    14    51    41.80    12.23
+   800    26    58    35.53    24.15
+   801    32    52    40.97    29.08
+   802    36    53    40.13    33.00
+   803    43    56    37.75    40.20
+   804    36    58    35.15    33.28
+   805   200    27    64.43  -173.23
+   806    33    32    59.58    30.18
+   807    41    36    55.75    37.57
+   808    89    37    55.03    82.90
+   809   141    50    43.12   131.90
+   810    83    50    43.23    76.93
+   811    48    51    41.68    44.95
+   812    80    50    43.07    74.47
+   813    74    52    41.27    69.27
+   814    39    62    31.98    35.98
+   815    38    62    31.87    35.22
+   816    50    69    24.88    46.77
+   817    50    70    24.72    46.72
+   818    52    65    29.22    47.98
+   819    47    57    36.32    43.15
+   820    48    60    33.22    44.23
+   821    51    63    30.57    47.78
+   822    53    66    28.00    49.00
+   823    54    67    27.00    50.00
+   824    55    58    35.68    51.32
+   825    66    63    31.05    61.47
+   826    76    59    34.42    70.47
+   827    71    63    31.31    65.85
+   828    56    69    25.25    51.57
+   829    60    69    25.25    55.33
+   830    59    70    24.42    54.65
+   831   311    14    76.53   -68.75
+   832    83    65    28.58    77.20
+   833    89    77    17.72    83.30
+   834   115    50    43.20   107.17
+   835    92    66    27.70    85.37
+   836   122    72    22.32   114.17
+   837   130    69    25.03   121.52
+   838   124    85    10.72   115.83
+   839   136    56    37.55   126.80
+   840   138    58    35.18   128.93
+   841   151    52    40.70   141.37
+   842   147    58    35.25   136.93
+   843   150    58    35.55   139.78
+   844   150    58    35.76   140.38
+   845   145    59    34.68   135.53
+   846   107    90     5.30   100.27
+   847   109    93     2.75   101.72
+   848   111    95     1.38   103.72
+   849   112    72    22.82   104.97
+   850   113    74    21.02   105.80
+   851   114    84    10.82   106.67
+   852   136    41    51.72   126.65
+   853   125    53    39.80   116.47
+   854   129    57    36.07   120.33
+   855   111    63    30.67   104.02
+   856   117    59    34.30   108.93
+   857   122    59    34.52   113.83
+   858   130    63    31.17   121.43
+   859   368    66    27.93   -15.38
+   860   376    60    33.57    -7.67
+   861   376    62    31.62    -8.03
+   862     6    72    22.82     5.47
+   863     3    82    13.48     2.17
+   864   381    78    16.72    -3.00
+   865   366    80    14.73   -17.50
+   866   367    82    13.35   -16.80
+   867    78   104    -7.30    72.42
+   868    25    70    24.22    23.30
+   869    30    62    31.33    27.22
+   870    40    97    -1.28    36.83
+   871    40   100    -3.42    37.07
+   872    41   101    -4.92    38.23
+   873    17   101    -4.38    15.45
+   874     4    89     6.58     3.33
+   875     4    89     5.60    -0.17
+   876   376    88     7.38    -7.53
+   877   380    90     5.25    -3.93
+   878   373    89     6.23   -10.37
+   879    15   105    -8.85    13.23
+   880    34   122   -24.37    31.05
+   881    20   132   -33.97    18.60
+   882   217    20    71.30  -156.78
+   883   231    21    70.13  -143.63
+   884   207    22    68.88  -166.13
+   885   211    24    66.87  -162.63
+   886   222    22    69.37  -152.13
+   887   223    24    66.92  -151.52
+   888   222    26    65.17  -152.10
+   889   230    25    66.57  -145.27
+   890   208    27    64.50  -165.43
+   891   213    28    63.88  -160.80
+   892   207    30    61.78  -166.03
+   893   212    31    60.78  -161.80
+   894   217    27    64.73  -156.93
+   895   219    29    62.97  -155.62
+   896   218    29    62.90  -155.98
+   897   219    31    61.10  -155.58
+   898   224    29    62.30  -150.10
+   899   223    30    61.97  -151.18
+   900   223    31    60.57  -151.25
+   901   227    27    64.82  -147.87
+   902   228    27    64.67  -147.10
+   903   229    28    63.97  -145.70
+   904   229    28    64.00  -145.73
+   905   229    30    62.15  -145.45
+   906   225    30    61.25  -149.80
+   907   224    31    61.17  -150.02
+   908   225    30    61.60  -149.08
+   909   228    32    61.13  -146.35
+   910   225    32    60.12  -149.45
+   911   234    27    64.78  -141.15
+   912   233    29    62.97  -141.93
+   913   229    31    60.50  -145.50
+   914   212    33    58.65  -162.07
+   915   203    35    57.15  -170.22
+   916   211    37    55.20  -162.73
+   917   215    33    59.05  -158.52
+   918   217    33    58.68  -156.65
+   919   219    32    59.75  -154.92
+   920   223    32    59.63  -151.50
+   921   228    32    59.43  -146.33
+   922   222    34    57.75  -152.50
+   923   236    32    59.52  -139.67
+   924   240    32    59.47  -135.30
+   925   240    34    58.42  -135.73
+   926   240    35    57.07  -135.35
+   927   241    34    58.37  -134.58
+   928   243    35    56.82  -132.97
+   929   243    36    56.48  -132.37
+   930   244    37    55.35  -131.70
+   931   244    37    55.03  -131.57
+   932   186    40    52.72   174.12
+   933   196    41    51.88  -176.65
+   934   204    39    52.95  -168.85
+   935   207    38    53.90  -166.55
+   936   245    40    51.93  -131.02
+   937   249    26    65.28  -126.75
+   938   251    19    72.00  -125.28
+   939   259    36    56.23  -117.43
+   940   257    14    76.23  -119.33
+   941   277    35    56.87  -101.08
+   942   280    36    55.75   -97.87
+   943   298    22    68.78   -81.25
+   944   318     8    82.50   -62.33
+   945   254    44    49.03  -122.37
+   946   249    42    50.68  -127.37
+   947   263    39    53.55  -114.10
+   948   263    39    53.30  -113.58
+   949   269    38    54.13  -108.52
+   950   266    42    50.27  -111.18
+   951   274    39    53.33  -104.00
+   952   308    46    46.90   -71.50
+   953   321    45    47.57   -59.17
+   954   257    43    49.95  -119.40
+   955   246    34    58.42  -130.00
+   956   299    50    43.17   -79.93
+   957   299    50    43.47   -80.38
+   958   317    48    44.88   -63.50
+   959   315    48    44.98   -64.92
+   960   315    49    43.72   -65.25
+   961   266    26    65.77  -111.25
+   962   296    51    42.27   -82.97
+   963   320    49    43.93   -60.02
+   964   317    48    44.63   -63.50
+   965   314    49    43.87   -66.10
+   966   314    48    45.32   -65.88
+   967   298    50    43.03   -81.15
+   968   300    49    43.67   -79.63
+   969   302    47    45.95   -77.32
+   970   306    47    45.47   -73.75
+   971   306    47    45.68   -74.03
+   972   304    48    45.32   -75.67
+   973   301    49    44.23   -78.37
+   974   300    48    44.97   -79.30
+   975   298    48    44.75   -81.10
+   976   314    47    45.83   -66.43
+   977   316    47    46.12   -64.68
+   978   317    47    46.28   -63.13
+   979   320    47    46.17   -60.05
+   980   308    46    46.80   -71.40
+   981   303    46    46.38   -75.97
+   982   302    45    48.05   -77.78
+   983   300    46    46.37   -79.42
+   984   294    45    47.97   -84.78
+   985   298    44    48.57   -81.37
+   986   291    40    52.23   -87.88
+   987   289    44    48.37   -89.32
+   988   253    44    48.65  -123.43
+   989   328    45    47.62   -52.73
+   990   326    44    48.95   -54.57
+   991   323    43    49.22   -57.40
+   992   314    42    50.22   -66.27
+   993   322    44    48.53   -58.55
+   994   320    39    53.32   -60.42
+   995   305    43    49.77   -74.53
+   996   306    39    53.75   -73.67
+   997   292    43    49.78   -86.93
+   998   298    41    51.27   -80.65
+   999   299    41    51.28   -80.60
+  1000   288    41    51.45   -90.20
+  1001   289    38    53.83   -89.87
+  1002   284    43    49.78   -94.37
+  1003   281    43    49.90   -97.23
+  1004   278    43    49.78   -99.65
+  1005   276    38    54.68  -101.68
+  1006   273    42    50.43  -104.67
+  1007   271    40    52.17  -106.68
+  1008   277    38    53.97  -101.10
+  1009   272    39    53.22  -105.68
+  1010   266    43    50.02  -110.72
+  1011   264    43    49.63  -112.80
+  1012   263    41    51.12  -114.02
+  1013   261    43    49.62  -115.78
+  1014   259    43    49.30  -117.63
+  1015   253    43    49.18  -123.17
+  1016   251    43    49.72  -124.90
+  1017   254    38    53.88  -122.68
+  1018   312    34    58.10   -68.42
+  1019   301    33    58.45   -78.12
+  1020   311    28    63.75   -68.53
+  1021   284    33    58.75   -94.07
+  1022   296    27    64.20   -83.37
+  1023   293    10    79.98   -85.93
+  1024   270    35    57.35  -107.13
+  1025   283    16    74.72   -94.95
+  1026   272    22    69.10  -105.12
+  1027   282    27    64.30   -96.00
+  1028   265    37    54.77  -112.02
+  1029   265    32    60.02  -111.95
+  1030   262    29    62.50  -114.40
+  1031   254    33    58.83  -122.58
+  1032   255    30    61.80  -121.20
+  1033   247    32    60.12  -128.82
+  1034   242    23    68.32  -133.53
+  1035   240    31    60.72  -135.07
+  1036   236    28    64.05  -139.13
+  1037   235    24    67.57  -139.82
+  1038   297    70    24.55   -81.75
+  1039   298    70    24.73   -81.05
+  1040   299    68    25.82   -80.28
+  1041   299    68    25.90   -80.28
+  1042   299    68    26.07   -80.15
+  1043   299    69    25.65   -80.43
+  1044   299    67    26.68   -80.12
+  1045   299    68    26.20   -80.17
+  1046   298    66    28.10   -80.65
+  1047   299    66    27.65   -80.42
+  1048   298    66    28.43   -81.32
+  1049   298    65    29.18   -81.05
+  1050   297    63    30.50   -81.69
+  1051   297    64    30.22   -81.88
+  1052   298    62    32.13   -81.19
+  1053   298    62    32.22   -80.70
+  1054   299    61    32.90   -80.03
+  1055   297    66    27.70   -82.38
+  1056   299    67    27.50   -80.37
+  1057   297    68    26.58   -81.87
+  1058   297    68    26.53   -81.75
+  1059   296    66    27.97   -82.53
+  1060   296    67    27.40   -82.55
+  1061   296    66    27.92   -82.68
+  1062   297    66    27.99   -82.02
+  1063   296    64    29.62   -83.10
+  1064   297    63    31.25   -82.40
+  1065   298    63    31.25   -81.47
+  1066   298    63    31.15   -81.37
+  1067   295    64    30.38   -84.37
+  1068   297    64    29.68   -82.27
+  1069   294    60    33.36   -84.57
+  1070   295    62    31.53   -84.18
+  1071   296    63    30.78   -83.28
+  1072   295    61    32.70   -83.65
+  1073   297    60    33.37   -81.97
+  1074   294    60    33.65   -84.42
+  1075   294    60    33.78   -84.52
+  1076   295    60    33.88   -84.30
+  1077   294    64    29.73   -84.98
+  1078   293    63    30.56   -85.92
+  1079   292    63    30.47   -87.18
+  1080   290    63    30.68   -88.25
+  1081   291    63    30.63   -88.07
+  1082   293    64    30.22   -85.68
+  1083   294    61    32.33   -84.83
+  1084   294    61    32.52   -84.93
+  1085   292    61    32.30   -86.40
+  1086   293    63    31.32   -85.45
+  1087   292    60    33.57   -86.75
+  1088   291    60    33.22   -87.62
+  1089   293    60    33.58   -85.85
+  1090   291    61    32.90   -87.25
+  1091   285    64    29.78   -93.30
+  1092   292    61    33.17   -86.77
+  1093   288    65    29.10   -90.20
+  1094   288    64    29.98   -90.25
+  1095   286    64    30.03   -91.88
+  1096   288    64    30.05   -90.03
+  1097   287    63    30.53   -91.15
+  1098   289    65    29.33   -89.40
+  1099   289    64    30.33   -89.82
+  1100   290    61    32.33   -88.75
+  1101   289    62    31.47   -89.33
+  1102   288    61    32.32   -90.08
+  1103   287    60    33.48   -90.98
+  1104   288    63    31.18   -90.47
+  1105   288    60    33.50   -90.08
+  1106   285    63    31.05   -93.20
+  1107   285    64    30.12   -93.22
+  1108   286    64    30.20   -91.98
+  1109   284    64    29.95   -94.02
+  1110   283    65    29.30   -94.80
+  1111   283    64    29.97   -95.35
+  1112   283    64    29.65   -95.28
+  1113   282    63    30.58   -96.37
+  1114   283    63    31.23   -94.75
+  1115   283    61    32.34   -95.40
+  1116   284    61    32.34   -94.65
+  1117   284    61    32.47   -93.82
+  1118   286    61    32.52   -92.03
+  1119   286    62    31.40   -92.30
+  1120   281    61    32.83   -97.30
+  1121   281    68    25.90   -97.43
+  1122   280    68    26.23   -97.65
+  1123   280    68    26.18   -98.23
+  1124   280    66    27.77   -97.50
+  1125   280    66    27.73   -98.03
+  1126   278    67    27.55   -99.47
+  1127   283    65    29.12   -95.47
+  1128   279    64    29.53   -98.47
+  1129   280    64    30.30   -97.70
+  1130   281    65    28.85   -96.92
+  1131   281    62    31.62   -97.22
+  1132   280    63    31.07   -97.83
+  1133   281    61    32.84   -96.85
+  1134   283    60    33.63   -95.45
+  1135   281    61    32.90   -97.03
+  1136   258    58    35.07  -118.15
+  1137   281    61    32.82   -97.37
+  1138   280    62    32.22   -98.18
+  1139   277    65    29.37  -100.92
+  1140   273    62    31.83  -104.80
+  1141   277    62    31.37  -100.50
+  1142   275    57    36.02  -102.55
+  1143   274    64    30.37  -104.02
+  1144   276    62    31.95  -102.18
+  1145   274    62    31.78  -103.20
+  1146   278    61    32.41   -99.68
+  1147   276    60    33.65  -101.82
+  1148   273    60    33.30  -104.53
+  1149   273    61    32.33  -104.27
+  1150   274    61    32.68  -103.22
+  1151   271    62    32.24  -106.22
+  1152   270    61    32.28  -106.92
+  1153   271    62    31.80  -106.40
+  1154   270    60    33.23  -107.27
+  1155   270    61    32.27  -107.72
+  1156   267    62    31.57  -110.33
+  1157   268    62    31.47  -109.60
+  1158   266    62    32.12  -110.93
+  1159   265    60    33.43  -112.02
+  1160   262    61    32.65  -114.60
+  1161   259    60    34.05  -117.60
+  1162   260    60    33.83  -116.50
+  1163   258    59    34.20  -118.35
+  1164   258    59    34.22  -118.48
+  1165   256    58    35.23  -120.63
+  1166   260    61    32.73  -117.17
+  1167   260    61    32.57  -116.98
+  1168   257    60    33.25  -119.45
+  1169   258    60    33.40  -118.42
+  1170   259    61    33.13  -117.28
+  1171   260    61    32.85  -117.12
+  1172   258    60    33.93  -118.40
+  1173   258    60    33.82  -118.15
+  1174   259    60    33.68  -117.87
+  1175   301    59    34.27   -77.90
+  1176   300    58    35.17   -79.02
+  1177   300    59    34.98   -78.87
+  1178   304    58    35.27   -75.55
+  1179   303    59    34.78   -76.87
+  1180   300    58    35.87   -78.78
+  1181   302    58    35.64   -77.39
+  1182   301    58    35.33   -77.97
+  1183   301    58    35.84   -77.90
+  1184   302    59    34.82   -77.61
+  1185   308    57    36.82   -72.10
+  1186   303    57    36.90   -76.19
+  1187   303    56    37.13   -76.50
+  1188   302    59    34.90   -76.88
+  1189   302    58    35.07   -77.05
+  1190   298    60    33.95   -81.12
+  1191   299    59    34.18   -79.72
+  1192   296    60    33.95   -83.32
+  1193   297    59    34.84   -82.35
+  1194   297    59    34.90   -82.22
+  1195   296    59    34.50   -82.72
+  1196   298    58    35.22   -80.93
+  1197   298    58    35.73   -81.37
+  1198   296    58    35.43   -82.55
+  1199   299    57    36.08   -79.94
+  1200   299    56    37.21   -80.41
+  1201   297    57    36.48   -82.40
+  1202   299    57    36.13   -80.22
+  1203   294    59    34.35   -85.16
+  1204   292    59    34.65   -86.77
+  1205   291    59    34.75   -87.62
+  1206   294    59    35.03   -85.20
+  1207   295    58    35.82   -83.98
+  1208   294    58    35.95   -85.08
+  1209   292    57    36.13   -86.68
+  1210   290    59    34.27   -88.77
+  1211   288    59    35.05   -90.00
+  1212   290    58    35.59   -88.92
+  1213   286    59    34.83   -92.25
+  1214   286    59    34.73   -92.23
+  1215   288    58    35.83   -90.65
+  1216   285    59    34.48   -93.10
+  1217   286    59    34.18   -91.93
+  1218   284    60    33.45   -93.98
+  1219   286    60    33.22   -92.80
+  1220   284    58    35.33   -94.37
+  1221   284    57    36.00   -94.17
+  1222   285    57    36.27   -93.15
+  1223   286    57    36.20   -92.47
+  1224   287    58    35.73   -91.65
+  1225   286    57    36.88   -91.90
+  1226   289    56    37.23   -89.57
+  1227   284    57    36.91   -94.02
+  1228   284    56    37.15   -94.50
+  1229   279    60    33.98   -98.50
+  1230   279    59    34.98   -99.05
+  1231   279    58    35.33   -99.20
+  1232   278    57    36.30   -99.77
+  1233   280    58    35.40   -97.60
+  1234   281    57    36.73   -97.10
+  1235   280    59    34.60   -98.40
+  1236   281    59    34.30   -97.02
+  1237   282    57    36.20   -95.90
+  1238   282    57    36.76   -96.01
+  1239   282    59    34.88   -95.78
+  1240   281    58    35.23   -97.47
+  1241   274    57    36.45  -103.15
+  1242   278    59    34.43  -100.28
+  1243   268    58    35.52  -108.78
+  1244   276    58    35.23  -101.70
+  1245   271    62    31.87  -106.70
+  1246   271    59    35.05  -106.62
+  1247   271    58    35.62  -106.08
+  1248   269    57    36.75  -108.23
+  1249   274    58    35.18  -103.60
+  1250   272    58    35.65  -105.15
+  1251   263    58    35.27  -113.95
+  1252   266    57    36.93  -111.45
+  1253   265    59    34.53  -112.47
+  1254   265    59    34.65  -112.42
+  1255   266    59    35.02  -110.73
+  1256   267    59    34.27  -110.00
+  1257   268    59    34.51  -109.38
+  1258   265    58    35.13  -111.67
+  1259   265    58    35.23  -111.82
+  1260   265    58    35.95  -112.15
+  1261   262    59    34.77  -114.62
+  1262   259    59    34.92  -117.90
+  1263   260    59    34.84  -116.78
+  1264   258    59    34.73  -118.22
+  1265   259    59    34.63  -118.08
+  1266   258    58    35.43  -119.05
+  1267   262    57    36.08  -115.17
+  1268   261    57    36.62  -116.02
+  1269   257    57    36.77  -119.72
+  1270   257    60    34.12  -119.12
+  1271   257    59    34.43  -119.83
+  1272   257    59    34.21  -119.20
+  1273   256    59    34.75  -120.57
+  1274   256    59    34.90  -120.45
+  1275   256    58    35.66  -120.63
+  1276   302    56    37.50   -77.33
+  1277   301    55    38.13   -78.44
+  1278   301    56    37.35   -78.43
+  1279   304    55    37.93   -75.48
+  1280   302    54    38.95   -77.44
+  1281   302    55    38.27   -77.45
+  1282   303    55    38.28   -76.40
+  1283   304    55    38.33   -75.51
+  1284   302    54    38.84   -77.03
+  1285   303    54    39.18   -76.67
+  1286   302    54    39.70   -77.73
+  1287   303    54    39.33   -76.42
+  1288   305    54    39.45   -74.57
+  1289   304    54    39.37   -75.07
+  1290   304    53    39.88   -75.25
+  1291   304    53    40.08   -75.01
+  1292   304    54    39.68   -75.60
+  1293   305    53    40.28   -74.82
+  1294   305    53    40.02   -74.60
+  1295   305    52    40.80   -74.42
+  1296   300    56    37.33   -79.19
+  1297   300    57    36.57   -79.33
+  1298   299    56    37.32   -79.97
+  1299   299    55    37.95   -79.83
+  1300   298    56    37.78   -81.12
+  1301   298    56    37.30   -81.19
+  1302   299    55    37.87   -80.40
+  1303   297    55    38.37   -81.60
+  1304   299    54    38.88   -79.85
+  1305   299    54    39.30   -80.23
+  1306   299    54    39.65   -79.92
+  1307   301    54    39.40   -77.98
+  1308   294    54    39.05   -84.67
+  1309   294    55    38.03   -84.60
+  1310   293    55    38.18   -85.73
+  1311   296    56    37.59   -83.32
+  1312   292    56    37.75   -87.16
+  1313   293    55    37.91   -85.97
+  1314   295    56    37.08   -84.08
+  1315   296    55    38.37   -82.55
+  1316   295    54    39.42   -83.83
+  1317   292    55    38.25   -86.95
+  1318   298    54    39.34   -81.43
+  1319   298    53    40.18   -80.65
+  1320   296    53    40.00   -82.88
+  1321   296    53    39.82   -82.93
+  1322   297    53    39.95   -81.90
+  1323   295    53    39.90   -84.20
+  1324   294    54    39.09   -84.42
+  1325   291    55    38.05   -87.53
+  1326   290    55    38.65   -88.97
+  1327   289    56    37.78   -89.25
+  1328   288    55    38.75   -90.37
+  1329   288    55    38.66   -90.65
+  1330   290    56    37.07   -88.77
+  1331   294    56    37.05   -84.61
+  1332   291    54    39.45   -87.32
+  1333   292    54    39.15   -86.62
+  1334   292    54    39.73   -86.27
+  1335   292    53    40.41   -86.93
+  1336   289    53    39.84   -89.67
+  1337   287    53    39.95   -91.20
+  1338   290    53    40.48   -88.92
+  1339   291    53    40.12   -87.60
+  1340   285    56    37.23   -93.38
+  1341   286    54    38.82   -92.22
+  1342   288    56    37.77   -90.43
+  1343   287    55    38.13   -91.77
+  1344   286    55    38.10   -92.55
+  1345   283    54    39.32   -94.72
+  1346   284    54    39.12   -94.60
+  1347   283    54    38.83   -94.89
+  1348   283    53    39.77   -94.92
+  1349   281    56    37.65   -97.43
+  1350   280    55    38.07   -97.87
+  1351   283    56    37.66   -95.48
+  1352   281    55    38.06   -97.28
+  1353   278    56    37.77   -99.97
+  1354   277    55    37.93  -100.72
+  1355   277    56    37.04  -100.97
+  1356   279    55    38.34   -98.86
+  1357   279    54    38.85   -99.27
+  1358   279    56    37.27   -98.55
+  1359   281    54    39.13   -96.67
+  1360   282    55    38.33   -96.19
+  1361   283    54    39.07   -95.62
+  1362   282    54    38.95   -95.67
+  1363   280    54    39.55   -97.65
+  1364   279    54    38.87   -98.82
+  1365   280    55    38.80   -97.65
+  1366   276    56    37.01  -101.88
+  1367   272    56    37.45  -105.87
+  1368   270    56    37.15  -107.75
+  1369   269    55    37.95  -107.90
+  1370   274    55    38.05  -103.52
+  1371   275    55    38.07  -102.68
+  1372   273    55    38.28  -104.52
+  1373   276    54    39.37  -101.70
+  1374   278    54    39.38   -99.83
+  1375   273    54    38.82  -104.72
+  1376   273    54    39.57  -104.85
+  1377   270    54    39.65  -106.92
+  1378   271    54    39.22  -106.87
+  1379   270    55    38.53  -106.93
+  1380   273    55    38.70  -104.77
+  1381   273    53    39.75  -104.87
+  1382   274    53    40.17  -103.22
+  1383   272    53    39.91  -105.12
+  1384   266    54    39.62  -110.75
+  1385   268    56    37.62  -109.47
+  1386   266    55    38.37  -110.72
+  1387   263    56    37.04  -113.50
+  1388   264    56    37.70  -113.10
+  1389   265    56    37.70  -112.15
+  1390   269    54    39.12  -108.53
+  1391   269    55    38.50  -107.90
+  1392   269    56    37.30  -108.67
+  1393   273    53    40.43  -104.63
+  1394   272    53    40.45  -105.01
+  1395   267    54    39.00  -110.17
+  1396   267    55    38.76  -109.75
+  1397   264    54    39.33  -112.58
+  1398   265    51    41.78  -111.85
+  1399   258    56    37.37  -118.37
+  1400   256    56    37.28  -120.52
+  1401   255    55    38.52  -121.50
+  1402   255    55    38.55  -121.30
+  1403   255    55    38.70  -121.58
+  1404   260    55    38.05  -117.08
+  1405   258    55    38.55  -118.63
+  1406   262    54    39.28  -114.85
+  1407   262    56    37.62  -114.52
+  1408   257    54    39.50  -119.78
+  1409   257    54    39.57  -119.79
+  1410   255    57    36.58  -121.85
+  1411   255    57    36.66  -121.60
+  1412   255    55    37.90  -121.25
+  1413   255    56    37.70  -121.82
+  1414   254    56    37.73  -122.22
+  1415   254    56    37.62  -122.38
+  1416   254    56    37.37  -121.93
+  1417   253    55    38.52  -122.82
+  1418   307    52    40.87   -72.86
+  1419   305    52    40.70   -74.17
+  1420   305    52    40.84   -74.07
+  1421   306    52    40.77   -73.90
+  1422   307    52    40.80   -73.10
+  1423   306    51    41.63   -73.87
+  1424   306    52    41.07   -73.69
+  1425   305    52    41.50   -74.10
+  1426   307    52    41.17   -73.12
+  1427   307    52    41.27   -72.87
+  1428   308    52    41.33   -72.05
+  1429   308    52    41.17   -71.58
+  1430   309    51    41.65   -70.52
+  1431   310    52    41.25   -70.07
+  1432   309    51    41.92   -70.73
+  1433   309    51    41.68   -70.97
+  1434   310    51    41.67   -70.28
+  1435   308    51    41.73   -71.43
+  1436   308    52    41.60   -71.42
+  1437   307    51    41.93   -72.68
+  1438   308    51    41.73   -72.18
+  1439   307    50    42.57   -72.27
+  1440   307    51    41.73   -72.65
+  1441   309    50    42.58   -70.92
+  1442   309    51    42.37   -71.03
+  1443   308    51    42.27   -71.87
+  1444   303    53    40.38   -75.97
+  1445   303    53    40.20   -76.76
+  1446   303    53    40.12   -76.29
+  1447   300    52    41.18   -78.90
+  1448   301    53    40.30   -78.32
+  1449   300    53    40.32   -78.83
+  1450   301    52    40.84   -77.85
+  1451   304    52    41.33   -75.73
+  1452   302    52    41.25   -76.92
+  1453   305    51    41.70   -74.80
+  1454   303    51    42.22   -75.98
+  1455   303    51    42.48   -76.44
+  1456   302    51    42.17   -76.90
+  1457   307    49    43.53   -72.95
+  1458   304    53    40.65   -75.43
+  1459   306    50    42.75   -73.80
+  1460   306    50    43.33   -73.62
+  1461   304    48    44.68   -75.47
+  1462   303    50    43.12   -76.12
+  1463   304    50    43.15   -75.37
+  1464   299    53    40.50   -80.22
+  1465   299    52    40.77   -80.40
+  1466   299    53    40.34   -79.93
+  1467   300    53    40.28   -79.40
+  1468   298    52    40.91   -81.43
+  1469   300    51    42.15   -79.26
+  1470   297    52    41.42   -81.87
+  1471   296    52    40.82   -82.52
+  1472   298    52    41.27   -80.67
+  1473   299    51    42.08   -80.18
+  1474   301    51    41.80   -78.62
+  1475   299    52    41.38   -79.87
+  1476   301    50    42.93   -78.73
+  1477   300    50    43.10   -78.94
+  1478   302    50    43.12   -77.67
+  1479   291    51    41.98   -87.90
+  1480   290    51    41.92   -88.25
+  1481   290    53    40.03   -88.28
+  1482   290    53    39.83   -88.87
+  1483   289    53    40.66   -89.68
+  1484   289    51    41.74   -89.68
+  1485   294    52    41.00   -85.20
+  1486   293    53    40.25   -85.40
+  1487   291    51    41.62   -87.42
+  1488   291    51    41.78   -87.75
+  1489   291    51    41.87   -87.60
+  1490   291    51    42.42   -87.87
+  1491   292    51    41.70   -86.32
+  1492   295    52    41.60   -83.80
+  1493   295    52    41.02   -83.67
+  1494   296    51    42.23   -83.33
+  1495   296    51    42.42   -83.02
+  1496   296    50    42.92   -82.53
+  1497   291    45    47.45   -87.90
+  1498   294    50    42.77   -84.60
+  1499   294    51    42.27   -84.47
+  1500   294    51    42.30   -85.25
+  1501   289    51    42.20   -89.10
+  1502   288    52    41.45   -90.52
+  1503   287    51    41.88   -91.70
+  1504   287    52    40.78   -91.13
+  1505   285    52    41.53   -93.65
+  1506   286    52    41.10   -92.45
+  1507   283    52    40.75   -95.41
+  1508   288    51    42.40   -90.70
+  1509   287    50    43.28   -91.74
+  1510   286    50    42.55   -92.40
+  1511   285    50    43.15   -93.33
+  1512   284    50    42.55   -94.20
+  1513   283    50    42.60   -95.23
+  1514   282    52    41.30   -95.90
+  1515   281    52    40.84   -96.75
+  1516   281    53    40.30   -96.75
+  1517   280    52    40.97   -98.32
+  1518   279    51    41.62   -98.95
+  1519   279    52    40.73   -99.00
+  1520   282    51    41.76   -96.18
+  1521   283    53    40.08   -95.60
+  1522   278    52    41.44   -99.64
+  1523   281    51    41.98   -97.43
+  1524   281    52    41.45   -97.34
+  1525   279    51    42.47   -98.69
+  1526   282    51    42.40   -96.38
+  1527   282    52    41.32   -96.37
+  1528   275    52    41.10  -102.98
+  1529   277    52    41.13  -100.68
+  1530   276    53    40.51  -101.62
+  1531   279    53    40.45   -99.33
+  1532   275    51    42.05  -102.80
+  1533   275    50    42.83  -103.10
+  1534   273    52    41.15  -104.82
+  1535   272    52    41.32  -105.67
+  1536   273    53    39.87  -104.67
+  1537   274    51    41.87  -103.60
+  1538   271    50    42.92  -106.47
+  1539   268    53    40.43  -109.52
+  1540   270    53    40.48  -107.22
+  1541   270    54    39.53  -107.73
+  1542   265    52    40.78  -111.97
+  1543   265    53    40.22  -111.72
+  1544   268    52    41.60  -109.07
+  1545   270    51    41.80  -107.20
+  1546   265    52    41.20  -112.02
+  1547   269    50    42.82  -108.73
+  1548   269    50    43.07  -108.47
+  1549   266    52    41.28  -111.03
+  1550   266    49    43.60  -110.73
+  1551   264    50    42.92  -112.60
+  1552   265    49    43.52  -112.07
+  1553   261    48    44.88  -116.10
+  1554   258    53    40.07  -118.57
+  1555   263    52    40.73  -114.03
+  1556   261    52    40.87  -115.73
+  1557   261    52    40.83  -115.78
+  1558   261    51    41.67  -115.78
+  1559   259    52    40.90  -117.80
+  1560   256    53    40.38  -120.57
+  1561   256    54    39.28  -120.70
+  1562   256    54    39.32  -120.13
+  1563   256    54    38.90  -120.00
+  1564   263    49    43.50  -114.30
+  1565   262    51    42.48  -114.48
+  1566   263    50    42.55  -113.77
+  1567   255    51    42.15  -121.73
+  1568   253    54    39.13  -123.20
+  1569   254    53    40.15  -122.25
+  1570   254    53    40.50  -122.30
+  1571   252    52    40.98  -124.10
+  1572   252    51    41.78  -124.23
+  1573   256    52    41.50  -120.53
+  1574   253    51    42.37  -122.87
+  1575   308    50    43.20   -71.50
+  1576   309    50    43.08   -70.82
+  1577   309    49    43.65   -70.32
+  1578   309    50    43.40   -70.72
+  1579   312    48    44.45   -68.37
+  1580   311    49    44.07   -69.10
+  1581   313    48    44.92   -67.00
+  1582   312    45    47.28   -68.32
+  1583   311    48    44.80   -68.83
+  1584   307    50    43.35   -72.52
+  1585   307    49    43.63   -72.30
+  1586   308    49    44.36   -71.55
+  1587   308    48    44.42   -72.02
+  1588   307    49    44.20   -72.57
+  1589   308    49    43.57   -71.42
+  1590   309    48    44.58   -71.18
+  1591   307    50    42.90   -72.27
+  1592   306    48    44.47   -73.15
+  1593   309    48    44.53   -70.53
+  1594   310    49    44.05   -70.28
+  1595   310    49    44.32   -69.80
+  1596   310    47    45.47   -69.58
+  1597   311    47    45.65   -68.68
+  1598   306    48    44.65   -73.47
+  1599   305    48    44.93   -74.85
+  1600   303    49    44.00   -76.01
+  1601   305    49    44.38   -74.19
+  1602   295    50    42.70   -83.47
+  1603   294    48    44.90   -84.72
+  1604   293    50    42.88   -85.52
+  1605   292    51    42.14   -86.44
+  1606   293    51    42.23   -85.55
+  1607   292    50    43.17   -86.25
+  1608   295    50    42.97   -83.75
+  1609   296    50    42.67   -83.42
+  1610   295    49    43.53   -84.08
+  1611   294    49    44.36   -84.67
+  1612   293    49    44.28   -85.42
+  1613   292    49    44.28   -86.25
+  1614   293    48    44.73   -85.58
+  1615   295    48    45.07   -83.57
+  1616   296    48    44.45   -83.40
+  1617   291    50    42.95   -87.90
+  1618   289    50    43.13   -89.33
+  1619   290    50    42.62   -89.04
+  1620   288    50    43.21   -90.18
+  1621   287    49    43.87   -91.25
+  1622   287    48    44.87   -91.48
+  1623   286    49    43.92   -92.50
+  1624   290    48    44.48   -88.13
+  1625   291    49    44.13   -87.68
+  1626   290    49    43.98   -88.55
+  1627   289    48    44.93   -89.63
+  1628   289    48    44.78   -89.67
+  1629   292    47    45.73   -87.08
+  1630   291    48    45.12   -87.63
+  1631   285    48    44.85   -93.57
+  1632   281    49    43.58   -96.73
+  1633   281    49    44.31   -96.82
+  1634   281    50    42.92   -97.38
+  1635   279    49    43.80   -99.32
+  1636   280    49    44.38   -98.22
+  1637   280    49    43.77   -98.03
+  1638   281    48    44.92   -97.15
+  1639   284    47    45.55   -94.07
+  1640   284    46    46.40   -94.13
+  1641   283    48    44.55   -95.08
+  1642   283    47    45.87   -95.40
+  1643   282    48    44.45   -95.82
+  1644   284    49    44.32   -94.50
+  1645   284    47    45.95   -94.35
+  1646   285    48    44.88   -93.22
+  1647   285    48    44.95   -93.07
+  1648   284    49    44.22   -93.91
+  1649   284    49    43.65   -94.42
+  1650   285    49    43.68   -93.37
+  1651   280    47    45.45   -98.43
+  1652   275    49    44.06  -103.05
+  1653   272    49    44.35  -105.53
+  1654   270    48    44.77  -106.97
+  1655   267    48    44.54  -110.42
+  1656   269    49    43.97  -107.95
+  1657   272    47    45.45  -105.40
+  1658   273    46    47.13  -104.80
+  1659   277    47    45.55  -100.41
+  1660   278    49    44.38  -100.28
+  1661   276    47    45.93  -102.17
+  1662   268    48    44.52  -109.02
+  1663   267    50    42.58  -110.11
+  1664   266    48    44.68  -111.12
+  1665   269    47    45.80  -108.53
+  1666   268    46    47.05  -109.47
+  1667   264    47    45.95  -112.50
+  1668   264    48    45.25  -112.55
+  1669   266    47    45.78  -111.15
+  1670   267    47    45.70  -110.45
+  1671   261    49    43.57  -116.22
+  1672   258    49    43.58  -118.95
+  1673   255    49    44.25  -121.15
+  1674   263    48    45.12  -113.88
+  1675   261    47    45.95  -116.13
+  1676   258    47    45.68  -118.85
+  1677   259    48    44.83  -117.82
+  1678   253    50    43.23  -123.35
+  1679   252    50    43.42  -124.25
+  1680   253    49    44.12  -123.22
+  1681   253    48    44.92  -123.00
+  1682   252    48    44.58  -124.06
+  1683   254    47    45.60  -122.60
+  1684   254    47    45.55  -122.40
+  1685   253    47    45.53  -122.95
+  1686   255    47    45.62  -121.17
+  1687   312    47    46.12   -67.80
+  1688   310    46    46.62   -69.53
+  1689   312    46    46.87   -68.01
+  1690   312    46    46.68   -68.05
+  1691   295    46    46.47   -84.37
+  1692   294    47    46.25   -84.47
+  1693   294    47    45.57   -84.80
+  1694   289    47    45.63   -89.47
+  1695   291    46    46.53   -87.55
+  1696   291    46    46.35   -87.40
+  1697   291    47    45.82   -88.12
+  1698   290    46    47.17   -88.50
+  1699   288    46    46.53   -90.13
+  1700   286    46    46.83   -92.18
+  1701   285    45    47.38   -92.83
+  1702   282    46    46.83   -95.89
+  1703   287    45    47.82   -91.83
+  1704   285    44    48.57   -93.38
+  1705   284    44    48.73   -94.62
+  1706   281    46    46.90   -96.80
+  1707   279    46    46.93   -98.68
+  1708   283    45    47.50   -94.93
+  1709   283    44    48.93   -95.33
+  1710   281    45    47.95   -97.18
+  1711   279    45    48.10   -98.87
+  1712   277    46    46.77  -100.75
+  1713   275    46    46.80  -102.80
+  1714   274    44    48.18  -103.63
+  1715   276    44    48.27  -101.28
+  1716   276    45    47.65  -101.43
+  1717   271    44    48.22  -106.62
+  1718   270    45    47.33  -106.93
+  1719   272    45    48.10  -105.58
+  1720   273    45    47.70  -104.20
+  1721   265    46    46.60  -112.00
+  1722   263    46    46.92  -114.08
+  1723   266    45    47.48  -111.37
+  1724   267    44    48.55  -109.77
+  1725   263    44    48.30  -114.27
+  1726   265    44    48.60  -112.37
+  1727   256    46    46.57  -120.53
+  1728   255    45    47.28  -121.33
+  1729   256    45    47.40  -120.02
+  1730   256    45    47.40  -120.20
+  1731   257    45    47.30  -119.52
+  1732   257    46    47.20  -119.32
+  1733   260    46    46.38  -117.02
+  1734   260    45    47.77  -116.82
+  1735   257    46    46.32  -119.27
+  1736   257    47    46.27  -119.12
+  1737   258    47    46.10  -118.28
+  1738   259    45    47.63  -117.53
+  1739   259    45    47.68  -117.32
+  1740   260    46    46.75  -117.12
+  1741   259    45    47.70  -117.60
+  1742   259    44    48.55  -117.88
+  1743   256    46    47.03  -120.53
+  1744   253    45    48.12  -123.50
+  1745   257    44    48.42  -119.53
+  1746   252    47    46.15  -123.88
+  1747   253    46    46.97  -122.90
+  1748   252    46    46.97  -123.93
+  1749   253    47    46.12  -122.94
+  1750   254    45    47.45  -122.30
+  1751   254    45    47.50  -122.22
+  1752   254    45    47.53  -122.30
+  1753   254    45    47.90  -122.28
+  1754   254    45    47.27  -122.58
+  1755   298    66    27.65   -81.33
+  1756   252    45    47.95  -124.55
+  1757   254    44    48.80  -122.53
+  1758   264    53    40.17  -112.93
+  1759   272    46    46.43  -105.87
+  1760   283    48    44.67   -95.45
+  1761   288    50    43.22   -90.53
+  1762   304    49    44.05   -75.73
+  1763   310    49    43.90   -70.25
+  1764   308    50    42.93   -71.43
+  1765   271    51    41.90  -106.19
+  1766   277    53    40.09  -100.65
+  1767   276    50    42.91  -101.69
+  1768   281    53    40.10   -97.34
+  1769   280    51    42.21   -97.79
+  1770   285    51    41.90   -93.70
+  1771   288    52    41.61   -90.57
+  1772   295    53    39.82   -84.03
+  1773   290    51    41.77   -88.48
+  1774   292    52    40.81   -87.05
+  1775   293    54    38.83   -85.42
+  1776   306    53    40.65   -73.78
+  1777   308    51    42.47   -71.28
+  1778   309    50    42.72   -71.12
+  1779   307    51    42.20   -72.53
+  1780   307    51    42.15   -72.72
+  1781   310    51    41.67   -69.97
+  1782   306    50    42.85   -73.93
+  1783   276    56    37.77  -102.18
+  1784   273    54    38.97  -104.82
+  1785   274    54    39.26  -103.70
+  1786   273    53    40.18  -104.72
+  1787   279    56    37.65   -99.09
+  1788   282    56    37.38   -95.63
+  1789   281    55    38.31   -97.30
+  1790   286    56    37.52   -92.70
+  1791   284    54    39.58   -94.19
+  1792   288    54    39.66   -90.48
+  1793   289    53    40.15   -89.33
+  1794   305    54    39.02   -74.92
+  1795   259    58    35.68  -117.68
+  1796   271    61    32.41  -106.35
+  1797   269    57    36.84  -107.91
+  1798   279    57    36.07   -99.22
+  1799   278    57    36.43   -99.53
+  1800   281    57    36.69   -97.48
+  1801   282    58    35.68   -95.86
+  1802   280    59    34.98   -97.52
+  1803   289    57    36.88   -89.97
+  1804   292    56    36.97   -86.42
+  1805   303    57    36.27   -76.18
+  1806   261    61    32.83  -115.58
+  1807   261    60    33.63  -116.17
+  1808   262    60    33.62  -114.72
+  1809   274    58    35.08  -103.61
+  1810   271    61    33.08  -106.12
+  1811   271    61    32.90  -106.40
+  1812   277    61    33.02  -100.98
+  1813   278    63    30.50   -99.77
+  1814   282    62    31.78   -95.71
+  1815   284    60    34.11   -94.29
+  1816   286    62    31.90   -92.78
+  1817   289    63    30.40   -89.07
+  1818   290    60    34.09   -88.86
+  1819   297    62    31.90   -81.63
+  1820   296    63    30.89   -83.01
+  1821   299    60    33.97   -80.47
+  1822   300    60    33.68   -78.93
+  1823   301    60    33.82   -78.72
+  1824   299    66    28.47   -80.55
+  1825   260    61    32.55  -116.97
+  1826   262    61    32.63  -115.24
+  1827   271    62    31.63  -106.43
+  1828   258    65    28.88  -118.30
+  1829   266    65    29.07  -110.97
+  1830   271    65    28.70  -105.97
+  1831   265    67    27.32  -112.30
+  1832   266    66    27.97  -110.93
+  1833   266    66    27.95  -110.80
+  1834   278    67    27.43   -99.57
+  1835   280    68    26.02   -98.23
+  1836   274    69    25.53  -103.45
+  1837   278    68    25.87  -100.20
+  1838   278    68    25.78  -100.10
+  1839   280    68    25.77   -97.53
+  1840   267    70    24.17  -110.42
+  1841   267    70    24.07  -110.37
+  1842   267    71    23.15  -109.70
+  1843   270    69    24.82  -107.40
+  1844   273    70    24.13  -104.53
+  1845   271    71    23.20  -106.42
+  1846   271    71    23.17  -106.27
+  1847   279    71    23.73   -99.13
+  1848   279    71    23.72   -98.97
+  1849   275    72    22.90  -102.68
+  1850   277    72    22.15  -100.98
+  1851   280    72    22.28   -97.87
+  1852   275    73    21.88  -102.30
+  1853   292    74    21.03   -86.87
+  1854   272    74    20.68  -105.25
+  1855   274    74    20.52  -103.32
+  1856   289    74    20.98   -89.65
+  1857   292    74    20.53   -86.93
+  1858   273    76    19.15  -104.57
+  1859   277    75    19.85  -101.03
+  1860   278    75    19.35   -99.57
+  1861   279    75    19.43   -99.10
+  1862   282    76    19.15   -96.18
+  1863   284    77    18.10   -94.58
+  1864   287    76    18.65   -91.80
+  1865   276    77    17.60  -101.47
+  1866   278    78    16.83   -99.92
+  1867   278    78    16.77   -99.75
+  1868   282    79    15.78   -96.27
+  1869   286    80    14.78   -92.38
+  1870   316    61    32.37   -64.68
+  1871   300    67    26.70   -78.97
+  1872   301    68    26.55   -78.69
+  1873   300    68    25.73   -79.30
+  1874   302    69    25.05   -77.47
+  1875   304    71    23.50   -75.76
+  1876   296    73    21.83   -82.78
+  1877   297    71    22.98   -82.40
+  1878   298    71    23.13   -81.28
+  1879   301    73    21.42   -77.85
+  1880   302    74    20.33   -77.12
+  1881   303    74    20.40   -76.62
+  1882   304    75    19.96   -75.85
+  1883   304    75    20.08   -75.15
+  1884   305    74    20.35   -74.50
+  1885   305    74    20.65   -74.92
+  1886   298    73    21.62   -81.55
+  1887   300    73    21.78   -78.78
+  1888   302    74    20.95   -76.94
+  1889   304    75    19.90   -75.12
+  1890   298    75    19.28   -81.35
+  1891   301    76    18.50   -77.92
+  1892   303    77    17.93   -76.78
+  1893   308    75    19.75   -72.18
+  1894   307    76    18.57   -72.30
+  1895   309    75    19.75   -70.55
+  1896   309    75    19.46   -70.69
+  1897   312    76    18.57   -68.37
+  1898   310    76    18.43   -69.67
+  1899   310    76    18.47   -69.88
+  1900   313    76    18.50   -67.12
+  1901   313    76    18.27   -67.15
+  1902   313    77    18.02   -66.57
+  1903   314    76    18.43   -66.00
+  1904   315    76    18.33   -64.97
+  1905   315    77    17.70   -64.80
+  1906   316    76    18.45   -64.53
+  1907   290    77    17.53   -88.30
+  1908   289    78    16.92   -89.88
+  1909   287    80    15.32   -91.47
+  1910   290    79    15.72   -88.60
+  1911   288    80    14.58   -90.52
+  1912   288    81    13.92   -90.82
+  1913   289    81    13.57   -89.83
+  1914   289    81    13.70   -89.12
+  1915   290    82    13.43   -89.05
+  1916   291    82    13.28   -87.67
+  1917   293    78    16.46   -85.92
+  1918   292    79    16.32   -86.53
+  1919   292    79    15.73   -86.87
+  1920   291    79    15.72   -87.48
+  1921   292    80    15.17   -87.12
+  1922   291    79    15.45   -87.93
+  1923   295    80    15.22   -83.80
+  1924   293    80    14.90   -85.93
+  1925   290    80    14.78   -88.78
+  1926   290    81    14.33   -88.17
+  1927   291    81    14.05   -87.22
+  1928   292    82    13.30   -87.18
+  1929   296    81    14.05   -83.37
+  1930   293    83    12.15   -86.17
+  1931   294    85     9.97   -84.78
+  1932   295    85    10.00   -84.22
+  1933   295    85     9.95   -84.15
+  1934   296    85    10.00   -83.05
+  1935   293    85    10.60   -85.55
+  1936   296    86     9.43   -82.52
+  1937   300    86     9.05   -79.37
+  1938   297    87     8.39   -82.42
+  1939   297    86     9.35   -82.25
+  1940   298    87     8.08   -80.94
+  1941   300    86     8.97   -79.51
+  1942   317    77    18.20   -63.05
+  1943   318    78    16.75   -62.17
+  1944   318    78    17.29   -62.68
+  1945   318    78    17.20   -62.58
+  1946   319    78    17.12   -61.78
+  1947   317    77    18.04   -63.12
+  1948   317    77    17.48   -62.98
+  1949   317    77    17.90   -62.85
+  1950   319    79    16.27   -61.52
+  1951   319    79    15.53   -61.30
+  1952   319    79    15.53   -61.40
+  1953   319    80    15.30   -61.40
+  1954   321    82    13.07   -59.48
+  1955   310    83    12.50   -70.01
+  1956   311    83    12.20   -68.97
+  1957   312    83    12.15   -68.28
+  1958   297    83    12.58   -81.72
+  1959   305    84    11.13   -74.23
+  1960   304    85    10.45   -75.52
+  1961   305    84    10.90   -74.77
+  1962   306    88     7.10   -73.20
+  1963   304    89     6.22   -75.60
+  1964   304    89     6.18   -75.43
+  1965   304    91     4.82   -75.80
+  1966   305    91     4.70   -74.13
+  1967   308    85    10.57   -71.73
+  1968   313    85    10.60   -66.98
+  1969   320    99    -2.83   -60.70
+  1970   333    98    -1.43   -48.48
+  1971   321    99    -3.15   -59.98
+  1972   343   100    -3.78   -38.53
+  1973   332   102    -5.53   -49.15
+  1974   339   101    -5.05   -42.82
+  1975   347   102    -5.92   -35.25
+  1976   342   104    -7.88   -40.08
+  1977   316   105    -8.70   -63.90
+  1978   332   105    -8.27   -49.28
+  1979   337   106    -9.07   -44.37
+  1980   333   107   -10.70   -48.40
+  1981   343   110   -13.00   -38.52
+  1982   325   113   -15.65   -56.10
+  1983   334   121   -23.00   -47.13
+  1984   332   120   -22.32   -49.07
+  1985   338   120   -22.90   -43.17
+  1986   335   121   -23.62   -46.65
+  1987   330   128   -30.08   -51.18
+  1988   289    97    -0.90   -89.62
+  1989   301    96    -0.12   -78.35
+  1990   299    98    -2.15   -79.88
+  1991   300   105    -8.08   -79.12
+  1992   302   109   -12.02   -77.03
+  1993   315   112   -14.75   -64.80
+  1994   312   114   -16.50   -68.17
+  1995   309   132   -33.38   -70.78
+  1996   309   133   -34.97   -71.22
+  1997   323   123   -25.16   -57.38
+  1998   322   125   -27.45   -59.05
+  1999   320   131   -32.92   -60.78
+  2000   322   133   -34.82   -58.53
+  2001   313   145   -45.78   -67.45
+  2002   215    72    21.98  -159.35
+  2003   216    73    21.32  -158.07
+  2004   216    73    21.35  -157.93
+  2005   217    73    21.15  -157.10
+  2006   218    74    20.90  -156.43
+  2007   155    82    13.35   144.80
+  2008   156    80    15.12   145.73
+  2009   178    75    19.28   166.65
+  2010   219    75    19.72  -155.07
+  2011   162    88     7.47   151.85
+  2012   169    89     6.97   158.22
+  2013   174    90     5.33   163.03
+  2014   179    87     8.73   167.73
+  2015   183    88     7.08   171.38
+  2016   144    88     7.33   134.48
+  2017   148    86     9.48   138.08
+  2018   155    81    14.20   145.20
+  2019   156    80    15.00   145.60
+  2020   156    76    18.80   145.70
+  2021   144    87     8.10   134.70
+  2022   142    90     5.30   132.20
+  2023   147    87     8.30   137.50
+  2024   150    85    10.00   139.80
+  2025   150    86     9.80   140.50
+  2026   144    88     7.40   134.90
+  2027   155    87     8.60   144.60
+  2028   157    88     7.40   147.10
+  2029   160    88     7.40   149.20
+  2030   160    87     8.60   149.70
+  2031   163    87     8.60   151.90
+  2032   163    89     6.90   152.70
+  2033   165    90     5.50   153.80
+  2034   166    92     3.80   155.00
+  2035   168    90     5.80   157.30
+  2036   169    89     7.00   157.90
+  2037   171    89     6.80   159.80
+  2038   172    89     6.20   160.70
+  2039   174    83    11.80   162.50
+  2040   177    86     8.90   165.70
+  2041   181    88     7.30   168.80
+  2042   181    90     5.90   169.60
+  2043   182    84    11.20   169.80
+  2044   182    86     9.50   170.20
+  2045   184    89     6.10   171.80
+  2046   234   115   -18.07  -140.95
+  2047   187   136   -37.02   174.80
+  2048   140   109   -12.42   130.87
+  2049   163   126   -27.63   152.72
+  2050   124   130   -31.92   115.97
+  2051   162   132   -33.95   151.18
+  2052   155   136   -37.67   144.83
+  2053   159   134   -35.40   148.98
+  2054   158   142   -42.83   147.50
+  2055   114   103    -6.15   106.85
+  2056   292    62    31.42   -87.05
+  2057   129    80    15.18   120.57
+  2058   130    80    14.52   121.00
+  2059   131    89     6.90   122.07
+  2060   302    60    33.49   -77.59
+  2061   262    65    29.37  -114.47
+  2062   263    53    40.33  -113.50
+  2063   300    58    35.17   -79.50
+  2064   276    44    48.83  -101.67
+  2065   276    44    44.22    -0.67
+  2066    23   126   -28.00    21.50
+  2067   312   139   -40.50   -68.00
+  2068   321   125   -27.33   -59.50
+  2069   144   126   -28.23   134.98
+  2070   356    55    38.70   -27.10
+  2071   225    31    61.20  -149.80
+  2072   369   104    -7.90   -14.40
+  2073   149    58    35.70   139.30
+  2074   326    44    48.90   -54.50
+  2075     6    49    43.50     4.90
+  2076   375    40    52.70    -8.90
+  2077   142   112   -14.50   132.30
+  2078   376    55    38.10    -7.90
+  2079   129    70    24.20   120.60
+  2080   108    82    12.70   101.00
+  2081    45    74    20.30    41.60
+  2082   202   111   -14.30  -170.70
+  2083   311   151   -51.60   -69.30
+  2084   268   125   -27.20  -109.40
+  2085    95    72    22.60    88.50
+  2086   347   105    -8.10   -34.90
+  2087   335   121   -23.40   -46.50
+  2088    86    88     7.20    79.90
+  2089   313    85    10.60   -67.00
+  2090   329    91     4.80   -52.40
+  2091    78    76    19.10    72.80
+  2092    51   116   -18.80    47.50
+  2093   266    62    32.20  -110.90
+  2094   275    49    44.10  -103.10
+  2095   228    27    64.60  -147.00
+  2096   256    59    34.80  -120.60
+  2097   259    59    34.60  -118.10
+  2098   263    53    40.19  -113.47
+  2099    74    59    34.95    69.27
+  2100   383    40    52.83    -1.32
+  2101     8    86     9.01     7.26
+  2102   260    71    23.61  -116.48
+  2103    68    47    46.00    63.56
+  2104    73    45    47.67    67.73
+  2105   218    75    19.73  -156.05
+  2106   240    33    59.23  -135.43
+  2107   228    31    61.13  -146.25
+  2108   217    74    20.78  -156.95
+  2109   217    74    21.02  -156.63
+  2110   314    77    17.85   -66.52
+  2111   313    77    18.17   -67.15
+  2112   285    58    35.25   -93.09
+  2113   137   113   -15.51   128.15
+  2114   377    35    57.48    -7.36
+  2115    11    38    54.38    10.13
diff --git a/parm/product/gefs.0p25.fFFF.paramlist.a.txt b/parm/product/gefs.0p25.fFFF.paramlist.a.txt
index a4a3ace385..520e30e6e9 100644
--- a/parm/product/gefs.0p25.fFFF.paramlist.a.txt
+++ b/parm/product/gefs.0p25.fFFF.paramlist.a.txt
@@ -12,13 +12,15 @@
 :CSNOW:surface:
 :CFRZR:surface:
 :CICEP:surface:
+:FDNSSTMP:surface:
 :PWAT:entire atmosphere (considered as a single layer):
 :CAPE:180-0 mb above ground:
 :CAPE:surface:
 :CIN:180-0 mb above ground:
 :CIN:surface:
 :HLCY:3000-0 m above ground:
-:TCDC:entire atmosphere:
+:TCDC:entire atmosphere (considered as a single layer):
+:PEVPR:surface:
 :WEASD:surface:
 :SNOD:surface:
 :ULWRF:top of atmosphere:
diff --git a/parm/product/gefs.0p25.fFFF.paramlist.b.txt b/parm/product/gefs.0p25.fFFF.paramlist.b.txt
index f7fdb73ddf..5c406ce34d 100644
--- a/parm/product/gefs.0p25.fFFF.paramlist.b.txt
+++ b/parm/product/gefs.0p25.fFFF.paramlist.b.txt
@@ -33,32 +33,32 @@
 :CAPE:255-0 mb above ground:
 :CDUVB:surface:
 :CIN:255-0 mb above ground:
-:CLWMR:1000 mb:
-:CLWMR:100 mb:
-:CLWMR:10 mb:
-:CLWMR:150 mb:
-:CLWMR:200 mb:
-:CLWMR:20 mb:
-:CLWMR:250 mb:
-:CLWMR:300 mb:
-:CLWMR:30 mb:
-:CLWMR:350 mb:
-:CLWMR:400 mb:
-:CLWMR:450 mb:
-:CLWMR:500 mb:
-:CLWMR:50 mb:
-:CLWMR:550 mb:
-:CLWMR:600 mb:
-:CLWMR:650 mb:
-:CLWMR:700 mb:
-:CLWMR:70 mb:
-:CLWMR:750 mb:
-:CLWMR:800 mb:
-:CLWMR:850 mb:
-:CLWMR:900 mb:
-:CLWMR:925 mb:
-:CLWMR:950 mb:
-:CLWMR:975 mb:
+:CLMR:1000 mb:
+:CLMR:100 mb:
+:CLMR:10 mb:
+:CLMR:150 mb:
+:CLMR:200 mb:
+:CLMR:20 mb:
+:CLMR:250 mb:
+:CLMR:300 mb:
+:CLMR:30 mb:
+:CLMR:350 mb:
+:CLMR:400 mb:
+:CLMR:450 mb:
+:CLMR:500 mb:
+:CLMR:50 mb:
+:CLMR:550 mb:
+:CLMR:600 mb:
+:CLMR:650 mb:
+:CLMR:700 mb:
+:CLMR:70 mb:
+:CLMR:750 mb:
+:CLMR:800 mb:
+:CLMR:850 mb:
+:CLMR:900 mb:
+:CLMR:925 mb:
+:CLMR:950 mb:
+:CLMR:975 mb:
 :CNWAT:surface:
 :CPRAT:surface:
 :CWAT:entire atmosphere (considered as a single layer):
@@ -151,7 +151,6 @@
 :O3MR:5 mb:
 :O3MR:70 mb:
 :O3MR:7 mb:
-:PEVPR:surface:
 :PLI:30-0 mb above ground:
 :PLPL:255-0 mb above ground:
 :POT:0.995 sigma level:
@@ -276,9 +275,9 @@
 :TCDC:475 mb:
 :TCDC:boundary layer cloud layer:
 :TCDC:convective cloud layer:
-:TCDC:high cloud layer:
-:TCDC:low cloud layer:
-:TCDC:middle cloud layer:
+:HCDC:high cloud layer:
+:LCDC:low cloud layer:
+:MCDC:middle cloud layer:
 :TMP:0.995 sigma level:
 :TMP:1000 mb:
 :TMP:100 m above ground:
@@ -346,6 +345,7 @@
 :TMP:surface:
 :TMP:tropopause:
 :TOZNE:entire atmosphere (considered as a single layer):
+:TSNOWP:surface:
 :TSOIL:0.1-0.4 m below ground:
 :TSOIL:0.4-1 m below ground:
 :TSOIL:1-2 m below ground:
diff --git a/parm/stage/analysis.yaml.j2 b/parm/stage/analysis.yaml.j2
index d30389644a..424bf2b5fe 100644
--- a/parm/stage/analysis.yaml.j2
+++ b/parm/stage/analysis.yaml.j2
@@ -10,17 +10,10 @@ analysis:
         {% for mem in range(first_mem, last_mem + 1) %}
         {% set imem = mem - first_mem %}
         {% set COMOUT_ATMOS_ANALYSIS_MEM = COMOUT_ATMOS_ANALYSIS_MEM_list[imem] %}
-        {% for ftype in ["abias", "abias_air", "abias_int", "abias_pc", "atminc.nc", "radstat", "ratminc.nc"] %}
+        {% for ftype in ["abias", "abias_air", "abias_int", "abias_pc", "atminc.nc", "atmi009.nc", "atmi003.nc", "radstat", "ratminc.nc", "ratmi009.nc", "ratmi003.nc", "rad_varbc_params.tar"] %}
         {% if path_exists(ICSDIR ~ "/" ~ COMOUT_ATMOS_ANALYSIS_MEM | relpath(ROTDIR) ~ "/" ~ RUN ~ ".t" ~ current_cycle_HH ~ "z." ~ ftype) %}
         - ["{{ ICSDIR }}/{{ COMOUT_ATMOS_ANALYSIS_MEM | relpath(ROTDIR) }}/{{ RUN }}.t{{ current_cycle_HH }}z.{{ ftype }}", "{{ COMOUT_ATMOS_ANALYSIS_MEM }}"]
         {% endif %}
         {% endfor %}
-        {% if DO_JEDIATMVAR %}
-        {% for ftype in ["satbias.nc", "satbias_cov.nc", "tlapse.txt"] %}
-        {% for file in glob(ICSDIR ~ "/" ~ COMOUT_ATMOS_ANALYSIS_MEM | relpath(ROTDIR) ~ "/" ~ RUN ~ ".t" ~ current_cycle_HH ~ "z.atms_*." ~ ftype) %}
-        - ["{{ file }}", "{{ COMOUT_ATMOS_ANALYSIS_MEM }}"]
-        {% endfor %}
-        {% endfor %}
-        {% endif %}
         {% endfor %} # mem loop
 {% endif %}
diff --git a/parm/stage/atmosphere_perturbation.yaml.j2 b/parm/stage/atmosphere_ens_perturbations.yaml.j2
similarity index 79%
rename from parm/stage/atmosphere_perturbation.yaml.j2
rename to parm/stage/atmosphere_ens_perturbations.yaml.j2
index 0e097b71dc..d9caf58b72 100644
--- a/parm/stage/atmosphere_perturbation.yaml.j2
+++ b/parm/stage/atmosphere_ens_perturbations.yaml.j2
@@ -1,12 +1,12 @@
-atmosphere_perturbation:
+atmosphere_ens_perturbation:
     mkdir:
-        {% for mem in range(first_mem, last_mem + 1) %}
+        {% for mem in range(first_mem + 1, last_mem + 1) %}
         {% set imem = mem - first_mem %}
         {% set COMOUT_ATMOS_ANALYSIS_MEM = COMOUT_ATMOS_ANALYSIS_MEM_list[imem] %}
         - "{{ COMOUT_ATMOS_ANALYSIS_MEM }}"
         {% endfor %} # mem loop
     copy:
-        {% for mem in range(first_mem, last_mem + 1) %}
+        {% for mem in range(first_mem + 1, last_mem + 1) %}
         {% set imem = mem - first_mem %}
         {% set COMOUT_ATMOS_ANALYSIS_MEM = COMOUT_ATMOS_ANALYSIS_MEM_list[imem] %}
         - ["{{ ICSDIR }}/{{ COMOUT_ATMOS_ANALYSIS_MEM | relpath(ROTDIR) }}/{{ m_prefix }}.fv3_perturbation.nc", "{{ COMOUT_ATMOS_ANALYSIS_MEM }}/{{ RUN }}.t{{ current_cycle_HH }}z.atminc.nc"]
diff --git a/parm/stage/atmosphere_replay.yaml.j2 b/parm/stage/atmosphere_replay.yaml.j2
new file mode 100644
index 0000000000..51827ee9a2
--- /dev/null
+++ b/parm/stage/atmosphere_replay.yaml.j2
@@ -0,0 +1,7 @@
+atmosphere_replay:
+    mkdir:
+        {% set COMOUT_ATMOS_INPUT_MEM = COMOUT_ATMOS_INPUT_MEM_list[0] %}
+        - "{{ COMOUT_ATMOS_INPUT_MEM }}"
+    copy:
+        - ["{{ ANLYDIR }}/GFSPRS.GrbF03", "{{ COMOUT_ATMOS_INPUT_MEM }}"]
+        - ["{{ ANLYDIR }}/GFSFLX.GrbF03", "{{ COMOUT_ATMOS_INPUT_MEM }}"]
diff --git a/parm/stage/master_gefs.yaml.j2 b/parm/stage/master_gefs.yaml.j2
index bdd4c8de5f..fabc621be6 100644
--- a/parm/stage/master_gefs.yaml.j2
+++ b/parm/stage/master_gefs.yaml.j2
@@ -116,7 +116,13 @@
 
 {% if REPLAY_ICS %}
 {% filter indent(width=4) %}
-{% include "atmosphere_perturbation.yaml.j2" %}
+{% include "atmosphere_ens_perturbations.yaml.j2" %}
+{% endfilter %}
+{% endif %}
+
+{% if DO_REPAIR_REPLAY %}
+{% filter indent(width=4) %}
+{% include "atmosphere_replay.yaml.j2" %}
 {% endfilter %}
 {% endif %}
 
@@ -137,7 +143,7 @@
 {% endif %}
 {% if REPLAY_ICS %}
 {% filter indent(width=4) %}
-{% include "ocean_replay.yaml.j2" %}
+{% include "ocean_ens_perturbations.yaml.j2" %}
 {% endfilter %}
 {% endif %}
 {% if EXP_WARM_START %}
diff --git a/parm/stage/ocean.yaml.j2 b/parm/stage/ocean.yaml.j2
index 75a472dff0..b57c36d4ac 100644
--- a/parm/stage/ocean.yaml.j2
+++ b/parm/stage/ocean.yaml.j2
@@ -11,7 +11,7 @@ ocean:
         {% set COMOUT_OCEAN_RESTART_PREV_MEM = COMOUT_OCEAN_RESTART_PREV_MEM_list[imem] %}
         - ["{{ ICSDIR }}/{{ COMOUT_OCEAN_RESTART_PREV_MEM | relpath(ROTDIR) }}/{{ m_prefix }}.MOM.res.nc", "{{ COMOUT_OCEAN_RESTART_PREV_MEM }}"]
         {% if OCNRES == "025" %}
-        {% for nn in range(1, 3) %}
+        {% for nn in range(1, 4) %}
         - ["{{ ICSDIR }}/{{ COMOUT_OCEAN_RESTART_PREV_MEM | relpath(ROTDIR) }}/{{ m_prefix }}.MOM.res_{{ nn }}.nc", "{{ COMOUT_OCEAN_RESTART_PREV_MEM }}"]
         {% endfor %}
         {% endif %}
diff --git a/parm/stage/ocean_replay.yaml.j2 b/parm/stage/ocean_ens_perturbations.yaml.j2
similarity index 79%
rename from parm/stage/ocean_replay.yaml.j2
rename to parm/stage/ocean_ens_perturbations.yaml.j2
index 8b52108bec..fede3816a7 100644
--- a/parm/stage/ocean_replay.yaml.j2
+++ b/parm/stage/ocean_ens_perturbations.yaml.j2
@@ -1,12 +1,12 @@
-ocean_replay:
+ocean_ens_perturbation:
     mkdir:
-        {% for mem in range(first_mem, last_mem + 1) %}
+        {% for mem in range(first_mem + 1, last_mem + 1) %}
         {% set imem = mem - first_mem %}
         {% set COMOUT_OCEAN_ANALYSIS_MEM = COMOUT_OCEAN_ANALYSIS_MEM_list[imem] %}
         - "{{ COMOUT_OCEAN_ANALYSIS_MEM }}"
         {% endfor %} # mem loop
     copy:
-        {% for mem in range(first_mem, last_mem + 1) %}
+        {% for mem in range(first_mem + 1, last_mem + 1) %}
         {% set imem = mem - first_mem %}
         {% set COMOUT_OCEAN_ANALYSIS_MEM = COMOUT_OCEAN_ANALYSIS_MEM_list[imem] %}
         - ["{{ ICSDIR }}/{{ COMOUT_OCEAN_ANALYSIS_MEM | relpath(ROTDIR) }}/{{ m_prefix }}.mom6_perturbation.nc", "{{ COMOUT_OCEAN_ANALYSIS_MEM }}/mom6_increment.nc"]
diff --git a/parm/ufs/gocart/ExtData.other b/parm/ufs/gocart/ExtData.other
index 7a0d63d6ca..5d2ddc5102 100644
--- a/parm/ufs/gocart/ExtData.other
+++ b/parm/ufs/gocart/ExtData.other
@@ -17,12 +17,12 @@ DU_UTHRES         '1'  Y E           -           none none uthres      ExtData/n
 
 #====== Sulfate Sources =================================================
 # Anthropogenic (BF & FF) emissions -- allowed to input as two layers
-SU_ANTHROL1 NA  N Y %y4-%m2-%d2t12:00:00 none none SO2      ExtData/nexus/CEDS/v2019/monthly/%y4/CEDS_2019_monthly.%y4%m2.nc
-SU_ANTHROL2 NA  N Y %y4-%m2-%d2t12:00:00 none none SO2_elev ExtData/nexus/CEDS/v2019/monthly/%y4/CEDS_2019_monthly.%y4%m2.nc
+SU_ANTHROL1 NA  Y Y %y4-%m2-%d2t12:00:00 none none SO2      ExtData/nexus/CEDS/v2019/monthly/%y4/CEDS_2019_monthly.%y4%m2.nc
+SU_ANTHROL2 NA  Y Y %y4-%m2-%d2t12:00:00 none none SO2_elev ExtData/nexus/CEDS/v2019/monthly/%y4/CEDS_2019_monthly.%y4%m2.nc
 
 # Ship emissions
-SU_SHIPSO2 NA  N Y %y4-%m2-%d2t12:00:00 none none SO2_ship  ExtData/nexus/CEDS/v2019/monthly/%y4/CEDS_2019_monthly.%y4%m2.nc
-SU_SHIPSO4 NA  N Y %y4-%m2-%d2t12:00:00 none none SO4_ship  ExtData/nexus/CEDS/v2019/monthly/%y4/CEDS_2019_monthly.%y4%m2.nc
+SU_SHIPSO2 NA  Y Y %y4-%m2-%d2t12:00:00 none none SO2_ship  ExtData/nexus/CEDS/v2019/monthly/%y4/CEDS_2019_monthly.%y4%m2.nc
+SU_SHIPSO4 NA  Y Y %y4-%m2-%d2t12:00:00 none none SO4_ship  ExtData/nexus/CEDS/v2019/monthly/%y4/CEDS_2019_monthly.%y4%m2.nc
 
 # Aircraft fuel consumption
 SU_AIRCRAFT NA  Y Y %y4-%m2-%d2t12:00:00 none none none /dev/null
@@ -63,11 +63,11 @@ OC_MTPO     NA  Y Y %y4-%m2-%d2t12:00:00 none none mtpo     ExtData/nexus/MEGAN_
 OC_BIOFUEL NA  Y Y %y4-%m2-%d2t12:00:00 none none biofuel /dev/null
 
 # Anthropogenic (BF & FF) emissions -- allowed to input as two layers
-OC_ANTEOC1 NA  N Y %y4-%m2-%d2t12:00:00 none none OC       ExtData/nexus/CEDS/v2019/monthly/%y4/CEDS_2019_monthly.%y4%m2.nc
-OC_ANTEOC2 NA  N Y %y4-%m2-%d2t12:00:00 none none OC_elev  ExtData/nexus/CEDS/v2019/monthly/%y4/CEDS_2019_monthly.%y4%m2.nc
+OC_ANTEOC1 NA  Y Y %y4-%m2-%d2t12:00:00 none none OC       ExtData/nexus/CEDS/v2019/monthly/%y4/CEDS_2019_monthly.%y4%m2.nc
+OC_ANTEOC2 NA  Y Y %y4-%m2-%d2t12:00:00 none none OC_elev  ExtData/nexus/CEDS/v2019/monthly/%y4/CEDS_2019_monthly.%y4%m2.nc
 
 # EDGAR based ship emissions
-OC_SHIP    NA  N Y %y4-%m2-%d2t12:00:00 none none OC_ship  ExtData/nexus/CEDS/v2019/monthly/%y4/CEDS_2019_monthly.%y4%m2.nc
+OC_SHIP    NA  Y Y %y4-%m2-%d2t12:00:00 none none OC_ship  ExtData/nexus/CEDS/v2019/monthly/%y4/CEDS_2019_monthly.%y4%m2.nc
 
 # Aircraft fuel consumption
 OC_AIRCRAFT NA  N Y %y4-%m2-%d2t12:00:00 none none oc_aviation /dev/null
@@ -88,11 +88,11 @@ pSOA_ANTHRO_VOC NA Y Y %y4-%m2-%d2t12:00:00 none none biofuel /dev/null
 BC_BIOFUEL NA  Y Y %y4-%m2-%d2t12:00:00 none none biofuel /dev/null
 
 # Anthropogenic (BF & FF) emissions -- allowed to input as two layers
-BC_ANTEBC1 NA  N Y %y4-%m2-%d2t12:00:00 none none BC       ExtData/nexus/CEDS/v2019/monthly/%y4/CEDS_2019_monthly.%y4%m2.nc
-BC_ANTEBC2 NA  N Y %y4-%m2-%d2t12:00:00 none none BC_elev  ExtData/nexus/CEDS/v2019/monthly/%y4/CEDS_2019_monthly.%y4%m2.nc
+BC_ANTEBC1 NA  Y Y %y4-%m2-%d2t12:00:00 none none BC       ExtData/nexus/CEDS/v2019/monthly/%y4/CEDS_2019_monthly.%y4%m2.nc
+BC_ANTEBC2 NA  Y Y %y4-%m2-%d2t12:00:00 none none BC_elev  ExtData/nexus/CEDS/v2019/monthly/%y4/CEDS_2019_monthly.%y4%m2.nc
 
 # EDGAR based ship emissions
-BC_SHIP NA  N Y %y4-%m2-%d2t12:00:00 none none BC_ship     ExtData/nexus/CEDS/v2019/monthly/%y4/CEDS_2019_monthly.%y4%m2.nc
+BC_SHIP NA  Y Y %y4-%m2-%d2t12:00:00 none none BC_ship     ExtData/nexus/CEDS/v2019/monthly/%y4/CEDS_2019_monthly.%y4%m2.nc
 
 # Aircraft fuel consumption
 BC_AIRCRAFT NA  N Y %y4-%m2-%d2t12:00:00 none none bc_aviation /dev/null
diff --git a/scripts/exgdas_aero_analysis_generate_bmatrix.py b/scripts/exgdas_aero_analysis_generate_bmatrix.py
new file mode 100755
index 0000000000..0d8389c40d
--- /dev/null
+++ b/scripts/exgdas_aero_analysis_generate_bmatrix.py
@@ -0,0 +1,27 @@
+#!/usr/bin/env python3
+# exgdas_aero_analysis_generate_bmatrix.py
+# This script creates an AerosolBMatrix object
+# and runs the methods needed
+# to stage files, compute the variance, and write to com
+# files needed for the variational solver
+import os
+
+from wxflow import Logger, cast_strdict_as_dtypedict
+from pygfs.task.aero_bmatrix import AerosolBMatrix
+
+# Initialize root logger
+logger = Logger(level='DEBUG', colored_log=True)
+
+
+if __name__ == '__main__':
+
+    # Take configuration from environment and cast it as python dictionary
+    config = cast_strdict_as_dtypedict(os.environ)
+
+    # Instantiate the aerosol variance and diffusion correlation tasks
+    AeroB = AerosolBMatrix(config)
+    AeroB.initialize()
+    AeroB.interpBackground()
+    AeroB.computeVariance()
+    AeroB.computeDiffusion()
+    AeroB.finalize()
diff --git a/scripts/exgdas_enkf_earc.py b/scripts/exgdas_enkf_earc.py
index a515ec9746..c724bdbd67 100755
--- a/scripts/exgdas_enkf_earc.py
+++ b/scripts/exgdas_enkf_earc.py
@@ -28,11 +28,13 @@ def main():
             'DOHYBVAR', 'DOIAU_ENKF', 'IAU_OFFSET', 'DOIAU',
             'DO_CALC_INCREMENT', 'assim_freq', 'ARCH_CYC',
             'ARCH_WARMICFREQ', 'ARCH_FCSTICFREQ',
-            'IAUFHRS_ENKF']
+            'IAUFHRS_ENKF', 'NET']
 
     archive_dict = AttrDict()
     for key in keys:
-        archive_dict[key] = archive.task_config[key]
+        archive_dict[key] = archive.task_config.get(key)
+        if archive_dict[key] is None:
+            print(f"Warning: key ({key}) not found in task_config!")
 
     # Also import all COMIN* directory and template variables
     for key in archive.task_config.keys():
diff --git a/scripts/exgfs_aero_init_aerosol.py b/scripts/exgfs_aero_init_aerosol.py
index aed6b88647..bc4e495e42 100755
--- a/scripts/exgfs_aero_init_aerosol.py
+++ b/scripts/exgfs_aero_init_aerosol.py
@@ -11,13 +11,13 @@
 ---------
 This script requires the following environment variables be set beforehand:
 
-CDATE: 		Initial time in YYYYMMDDHH format
-STEP_GFS: 	Forecast cadence (frequency) in hours
-FHMAX_GFS: 	Forecast length in hours
-RUN: 		Forecast phase (gfs or gdas). Currently always expected to be gfs.
-ROTDIR: 	Rotating (COM) directory
-USHgfs: 	Path to global-workflow `ush` directory
-PARMgfs: 	Path to global-workflow `parm` directory
+CDATE:        Initial time in YYYYMMDDHH format
+INTERVAL_GFS: Forecast cadence (frequency) in hours
+FHMAX_GFS:    Forecast length in hours
+RUN:          Forecast phase (gfs or gdas). Currently always expected to be gfs.
+ROTDIR:       Rotating (COM) directory
+USHgfs:       Path to global-workflow `ush` directory
+PARMgfs:      Path to global-workflow `parm` directory
 
 Additionally, the following data files are used:
 
@@ -66,7 +66,7 @@
 def main() -> None:
     # Read in environment variables and make sure they exist
     cdate = get_env_var("CDATE")
-    incr = int(get_env_var('STEP_GFS'))
+    incr = int(get_env_var('INTERVAL_GFS'))
     fcst_length = int(get_env_var('FHMAX_GFS'))
     run = get_env_var("RUN")
     rot_dir = get_env_var("ROTDIR")
diff --git a/scripts/exgfs_atmos_postsnd.sh b/scripts/exgfs_atmos_postsnd.sh
index caf5443a50..8f2aa43568 100755
--- a/scripts/exgfs_atmos_postsnd.sh
+++ b/scripts/exgfs_atmos_postsnd.sh
@@ -18,11 +18,16 @@
 #   7) 2018-07-18       Guang Ping Lou Generalize this version to other platforms
 #   8) 2019-10-18       Guang Ping Lou Transition to reading in NetCDF model data
 #   9) 2019-12-18       Guang Ping Lou generalizing to reading in NetCDF or nemsio
+#  10) 2024-08-08       Bo Cui Update to handle one forecast at a time
+#                          For GFSv17 bufr, total number of forecast hours is 141(num_hours=141) 
+#                          it requires 7 nodes & allocate 21 processes per node(num_ppn=21)
 ################################################################
 
 source "${USHgfs}/preamble.sh"
 
-cd $DATA
+runscript=${USHgfs}/gfs_bufr.sh 
+
+cd "${DATA}" || exit 2
 
 ########################################
 
@@ -44,47 +49,109 @@ export NINT3=${FHOUT_GFS:-3}
 
 rm -f -r "${COM_ATMOS_BUFR}"
 mkdir -p "${COM_ATMOS_BUFR}"
+
 GETDIM="${USHgfs}/getncdimlen"
 LEVS=$(${GETDIM} "${COM_ATMOS_HISTORY}/${RUN}.${cycle}.atmf000.${atmfm}" pfull)
 declare -x LEVS
 
-### Loop for the hour and wait for the sigma and surface flux file:
-export FSTART=$STARTHOUR
-sleep_interval=10
-max_tries=360
-#
-while [ $FSTART -lt $ENDHOUR ]
-do
-export FINT=$NINT1
-   # Define the end hour for the input
-   export FEND=$(expr $FSTART + $INCREMENT) 
-   if test $FEND -lt 100; then FEND=0$FEND; fi 
-   if [ $FSTART -eq 00 ]
-   then 
-       export F00FLAG=YES
-   else
-       export F00FLAG=NO
-   fi
-   
-   if [ $FEND -eq $ENDHOUR ]
-   then
-       export MAKEBUFR=YES
-   fi
-
-   filename="${COM_ATMOS_HISTORY}/${RUN}.${cycle}.atm.logf${FEND}.${logfm}"
-   if ! wait_for_file "${filename}" "${sleep_interval}" "${max_tries}"; then
-     err_exit "FATAL ERROR: logf${FEND} not found after waiting $((sleep_interval * ( max_tries - 1) )) secs"
-   fi
+# Initialize an empty list to store the hours
+hour_list=()
 
-## 1-hourly output before $NEND1, 3-hourly output after
-   if [[ $((10#$FEND)) -gt $((10#$NEND1)) ]]; then
-     export FINT=$NINT3
-   fi
-   ${USHgfs}/gfs_bufr.sh
-  
-   export FSTART="${FEND}"
+# Generate hours from 0 to NEND1 with interval NINT1
+for (( hour=0; hour<=NEND1 && hour<=ENDHOUR; hour+=NINT1 )); do
+  hour_list+=("$(printf "%03d" "$hour")")
+done
+
+# Generate hours from NEND1 + NINT3 to ENDHOUR with interval NINT3
+for (( hour=NEND1+NINT3; hour<=ENDHOUR; hour+=NINT3 )); do
+  hour_list+=("$(printf "%03d" "$hour")")
+done
+
+# Print the hour list
+echo "Hour List:" "${hour_list[@]}"
+
+# Count the number of elements in the hour_list
+export ntasks="${#hour_list[@]}"
+
+# Print the total number of hours
+echo "Total number of hours: $ntasks"
+
+# allocate 21 processes per node
+# don't allocate more processes, or it might have memory issue
+#export tasks_per_node=21
+#export APRUN="mpiexec -np ${ntasks} -ppn ${tasks_per_node} --cpu-bind core cfp "
+
+if [ -s "${DATA}/poescript_bufr" ]; then
+  rm ${DATA}/poescript_bufr
+fi
+
+for fhr in "${hour_list[@]}"; do
+
+  if [ ! -s "${DATA}/${fhr}" ]; then mkdir -p ${DATA}/${fhr}; fi
+  export FINT=${NINT1}
+  ## 1-hourly output before $NEND1, 3-hourly output after
+  if [[ $((10#${fhr})) -gt $((10#${NEND1})) ]]; then
+    export FINT=${NINT3}
+  fi
+  if [[ $((10#${fhr})) -eq 0 ]]; then 
+     export F00FLAG="YES"
+  else
+     export F00FLAG="NO"
+  fi
+
+  # Convert fhr to integer
+  fhr_int=$((10#$fhr))
+
+  # Get previous hour
+  if (( fhr_int == STARTHOUR )); then
+    fhr_p=${fhr_int}
+  else
+    fhr_p=$(( fhr_int - FINT ))
+  fi
+
+  # Format fhr_p with leading zeros
+  fhr_p="$(printf "%03d" "$fhr_p")" 
+
+  filename="${COM_ATMOS_HISTORY}/${RUN}.${cycle}.atm.logf${fhr}.${logfm}"
+  if [[ -z ${filename} ]]; then
+    echo "File ${filename} is required but not found."
+    err_exit "FATAL ERROR: logf${fhr} not found."
+  else
+    echo "${runscript} \"${fhr}\" \"${fhr_p}\" \"${FINT}\" \"${F00FLAG}\" \"${DATA}/${fhr}\"" >> "${DATA}/poescript_bufr"
+  fi
 done
 
+# Run with MPMD 
+"${USHgfs}/run_mpmd.sh" "${DATA}/poescript_bufr"
+
+cd "${DATA}" || exit 2
+
+# Initialize fortnum
+fortnum=20
+
+# Loop through each element in the array
+for fhr in "${hour_list[@]}"; do
+    # Increment fortnum
+    fortnum=$((fortnum + 1))
+    ${NLN} "${DATA}/${fhr}/fort.${fortnum}" "fort.${fortnum}"
+done
+
+# start to generate bufr products at fhr=${ENDHOUR}
+
+export MAKEBUFR=YES
+export fhr="$(printf "%03d" "$ENDHOUR")" 
+export FINT=${NINT1}
+## 1-hourly output before $NEND1, 3-hourly output after
+if [[ $((10#${fhr})) -gt $((10#${NEND1})) ]]; then
+  export FINT=${NINT3}
+fi
+if [[ $((10#${fhr})) -eq 0 ]]; then
+  export F00FLAG="YES"
+else
+  export F00FLAG="NO"
+fi
+${runscript} "${fhr}" "${fhr_p}" "${FINT}" "${F00FLAG}" "${DATA}" 
+
 ##############################################################
 # Tar and gzip the individual bufr files and send them to /com
 ##############################################################
@@ -105,7 +172,7 @@ fi
 # add appropriate WMO Headers.
 ########################################
 rm -rf poe_col
-for (( m = 1; m <= NUM_SND_COLLECTIVES ; m++ )); do
+for (( m = 1; m <= NUM_SND_COLLECTIVES; m++ )); do
     echo "sh ${USHgfs}/gfs_sndp.sh ${m} " >> poe_col
 done
 
@@ -123,4 +190,5 @@ ${APRUN_POSTSNDCFP} cmdfile
 sh "${USHgfs}/gfs_bfr2gpk.sh"
 
 
+
 ############## END OF SCRIPT #######################
diff --git a/scripts/exgfs_wave_post_pnt.sh b/scripts/exgfs_wave_post_pnt.sh
index 0b8874f3fb..06769303a1 100755
--- a/scripts/exgfs_wave_post_pnt.sh
+++ b/scripts/exgfs_wave_post_pnt.sh
@@ -252,7 +252,9 @@ source "${USHgfs}/preamble.sh"
                                ww3_outp_spec.inp.tmpl > ww3_outp.inp
 
     ${NLN} mod_def.$waveuoutpGRD mod_def.ww3
-    HMS="${cyc}0000"
+    #export OFFSET_START_HOUR=$( printf "%02d" ${half_assim} )
+    hh=$( printf "%02d" $(( cyc + OFFSET_START_HOUR )) )
+    HMS="${hh}0000"
     if [[ -f "${COMIN_WAVE_HISTORY}/${WAV_MOD_TAG}.out_pnt.${waveuoutpGRD}.${PDY}.${HMS}" ]]; then
       ${NLN} "${COMIN_WAVE_HISTORY}/${WAV_MOD_TAG}.out_pnt.${waveuoutpGRD}.${PDY}.${HMS}" \
         "./out_pnt.${waveuoutpGRD}"
diff --git a/scripts/exglobal_aero_analysis_run.py b/scripts/exglobal_aero_analysis_variational.py
similarity index 84%
rename from scripts/exglobal_aero_analysis_run.py
rename to scripts/exglobal_aero_analysis_variational.py
index 85f4b963a4..dd5bb4f65a 100755
--- a/scripts/exglobal_aero_analysis_run.py
+++ b/scripts/exglobal_aero_analysis_variational.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
-# exglobal_aero_analysis_run.py
+# exglobal_aero_analysis_variational.py
 # This script creates an AerosolAnalysis object
-# and runs the execute method
+# and runs the variational method
 # which executes the global aerosol variational analysis
 import os
 
@@ -19,4 +19,4 @@
 
     # Instantiate the aerosol analysis task
     AeroAnl = AerosolAnalysis(config)
-    AeroAnl.execute()
+    AeroAnl.variational()
diff --git a/scripts/exglobal_archive.py b/scripts/exglobal_archive.py
index ec8154317f..4ee9e5ed0e 100755
--- a/scripts/exglobal_archive.py
+++ b/scripts/exglobal_archive.py
@@ -30,17 +30,22 @@ def main():
             'FHOUT_HF_WAV', 'FHMAX_WAV', 'FHMAX_HF_WAV', 'FHMAX_WAV_GFS',
             'restart_interval_gdas', 'restart_interval_gfs',
             'AERO_ANL_RUN', 'AERO_FCST_RUN', 'DOIBP_WAV', 'DO_JEDIOCNVAR',
-            'NMEM_ENS', 'DO_JEDIATMVAR', 'DO_VRFY_OCEANDA', 'FHMAX_FITS',
-            'IAUFHRS', 'DO_FIT2OBS']
+            'NMEM_ENS', 'DO_JEDIATMVAR', 'DO_VRFY_OCEANDA', 'FHMAX_FITS', 'waveGRD',
+            'IAUFHRS', 'DO_FIT2OBS', 'NET', 'FHOUT_HF_GFS', 'FHMAX_HF_GFS', 'REPLAY_ICS',
+            'OFFSET_START_HOUR']
 
     archive_dict = AttrDict()
     for key in keys:
-        archive_dict[key] = archive.task_config[key]
+        archive_dict[key] = archive.task_config.get(key)
+        if archive_dict[key] is None:
+            print(f"Warning: key ({key}) not found in task_config!")
 
     # Also import all COMIN* and COMOUT* directory and template variables
     for key in archive.task_config.keys():
-        if key.startswith("COMIN_") or key.startswith("COMOUT_"):
-            archive_dict[key] = archive.task_config[key]
+        if key.startswith("COM_") or key.startswith("COMIN_") or key.startswith("COMOUT_"):
+            archive_dict[key] = archive.task_config.get(key)
+            if archive_dict[key] is None:
+                print(f"Warning: key ({key}) not found in task_config!")
 
     cwd = os.getcwd()
 
diff --git a/scripts/exglobal_atm_analysis_finalize.py b/scripts/exglobal_atm_analysis_finalize.py
index 3f4313631c..35220928c9 100755
--- a/scripts/exglobal_atm_analysis_finalize.py
+++ b/scripts/exglobal_atm_analysis_finalize.py
@@ -21,4 +21,6 @@
 
     # Instantiate the atm analysis task
     AtmAnl = AtmAnalysis(config)
+
+    # Finalize JEDI variational analysis
     AtmAnl.finalize()
diff --git a/scripts/exglobal_atm_analysis_fv3_increment.py b/scripts/exglobal_atm_analysis_fv3_increment.py
index 66f6796343..72413ddbd4 100755
--- a/scripts/exglobal_atm_analysis_fv3_increment.py
+++ b/scripts/exglobal_atm_analysis_fv3_increment.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 # exglobal_atm_analysis_fv3_increment.py
 # This script creates an AtmAnalysis object
-# and runs the init_fv3_increment and fv3_increment methods
+# and runs the initialize_fv3inc and execute methods
 # which convert the JEDI increment into an FV3 increment
 import os
 
@@ -17,7 +17,9 @@
     # Take configuration from environment and cast it as python dictionary
     config = cast_strdict_as_dtypedict(os.environ)
 
-    # Instantiate the atm analysis task
-    AtmAnl = AtmAnalysis(config)
-    AtmAnl.init_fv3_increment()
-    AtmAnl.fv3_increment()
+    # Instantiate the atm analysis object
+    AtmAnl = AtmAnalysis(config, 'atmanlfv3inc')
+
+    # Initialize and execute FV3 increment converter
+    AtmAnl.initialize_jedi()
+    AtmAnl.execute(config.APRUN_ATMANLFV3INC)
diff --git a/scripts/exglobal_atm_analysis_initialize.py b/scripts/exglobal_atm_analysis_initialize.py
index 1793b24b0b..9deae07bb3 100755
--- a/scripts/exglobal_atm_analysis_initialize.py
+++ b/scripts/exglobal_atm_analysis_initialize.py
@@ -20,5 +20,8 @@
     config = cast_strdict_as_dtypedict(os.environ)
 
     # Instantiate the atm analysis task
-    AtmAnl = AtmAnalysis(config)
-    AtmAnl.initialize()
+    AtmAnl = AtmAnalysis(config, 'atmanlvar')
+
+    # Initialize JEDI variational analysis
+    AtmAnl.initialize_jedi()
+    AtmAnl.initialize_analysis()
diff --git a/scripts/exglobal_atm_analysis_variational.py b/scripts/exglobal_atm_analysis_variational.py
index 07bc208331..8359532069 100755
--- a/scripts/exglobal_atm_analysis_variational.py
+++ b/scripts/exglobal_atm_analysis_variational.py
@@ -18,5 +18,7 @@
     config = cast_strdict_as_dtypedict(os.environ)
 
     # Instantiate the atm analysis task
-    AtmAnl = AtmAnalysis(config)
-    AtmAnl.variational()
+    AtmAnl = AtmAnalysis(config, 'atmanlvar')
+
+    # Execute JEDI variational analysis
+    AtmAnl.execute(config.APRUN_ATMANLVAR, ['fv3jedi', 'variational'])
diff --git a/scripts/exglobal_atmens_analysis_finalize.py b/scripts/exglobal_atmens_analysis_finalize.py
index b49cb3c413..d68c260e78 100755
--- a/scripts/exglobal_atmens_analysis_finalize.py
+++ b/scripts/exglobal_atmens_analysis_finalize.py
@@ -21,4 +21,6 @@
 
     # Instantiate the atmens analysis task
     AtmEnsAnl = AtmEnsAnalysis(config)
+
+    # Finalize ensemble DA analysis
     AtmEnsAnl.finalize()
diff --git a/scripts/exglobal_atmens_analysis_fv3_increment.py b/scripts/exglobal_atmens_analysis_fv3_increment.py
index c50b00548f..48eb6a6a1e 100755
--- a/scripts/exglobal_atmens_analysis_fv3_increment.py
+++ b/scripts/exglobal_atmens_analysis_fv3_increment.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 # exglobal_atmens_analysis_fv3_increment.py
 # This script creates an AtmEnsAnalysis object
-# and runs the init_fv3_increment and fv3_increment methods
+# and runs the initialize_fv3inc and execute methods
 # which convert the JEDI increment into an FV3 increment
 import os
 
@@ -17,7 +17,9 @@
     # Take configuration from environment and cast it as python dictionary
     config = cast_strdict_as_dtypedict(os.environ)
 
-    # Instantiate the atmens analysis task
-    AtmEnsAnl = AtmEnsAnalysis(config)
-    AtmEnsAnl.init_fv3_increment()
-    AtmEnsAnl.fv3_increment()
+    # Instantiate the atmens analysis object
+    AtmEnsAnl = AtmEnsAnalysis(config, 'atmensanlfv3inc')
+
+    # Initialize and execute JEDI FV3 increment converter
+    AtmEnsAnl.initialize_jedi()
+    AtmEnsAnl.execute(config.APRUN_ATMENSANLFV3INC)
diff --git a/scripts/exglobal_atmens_analysis_initialize.py b/scripts/exglobal_atmens_analysis_initialize.py
index 1d578b44f2..326fe80628 100755
--- a/scripts/exglobal_atmens_analysis_initialize.py
+++ b/scripts/exglobal_atmens_analysis_initialize.py
@@ -20,5 +20,11 @@
     config = cast_strdict_as_dtypedict(os.environ)
 
     # Instantiate the atmens analysis task
-    AtmEnsAnl = AtmEnsAnalysis(config)
-    AtmEnsAnl.initialize()
+    if not config.lobsdiag_forenkf:
+        AtmEnsAnl = AtmEnsAnalysis(config, 'atmensanlletkf')
+    else:
+        AtmEnsAnl = AtmEnsAnalysis(config, 'atmensanlobs')
+
+    # Initialize JEDI ensemble DA analysis
+    AtmEnsAnl.initialize_jedi()
+    AtmEnsAnl.initialize_analysis()
diff --git a/scripts/exglobal_atmens_analysis_letkf.py b/scripts/exglobal_atmens_analysis_letkf.py
index 30394537cd..45b06524fe 100755
--- a/scripts/exglobal_atmens_analysis_letkf.py
+++ b/scripts/exglobal_atmens_analysis_letkf.py
@@ -1,8 +1,8 @@
 #!/usr/bin/env python3
 # exglobal_atmens_analysis_letkf.py
 # This script creates an AtmEnsAnalysis object
-# and runs the letkf method
-# which executes the global atm local ensemble analysis
+# and runs the execute method which executes
+# the global atm local ensemble analysis
 import os
 
 from wxflow import Logger, cast_strdict_as_dtypedict
@@ -18,5 +18,7 @@
     config = cast_strdict_as_dtypedict(os.environ)
 
     # Instantiate the atmens analysis task
-    AtmEnsAnl = AtmEnsAnalysis(config)
-    AtmEnsAnl.letkf()
+    AtmEnsAnl = AtmEnsAnalysis(config, 'atmensanlletkf')
+
+    # Execute the JEDI ensemble DA analysis
+    AtmEnsAnl.execute(config.APRUN_ATMENSANLLETKF, ['fv3jedi', 'localensembleda'])
diff --git a/scripts/exglobal_atmens_analysis_obs.py b/scripts/exglobal_atmens_analysis_obs.py
index e4b5c98952..c701f8cb4e 100755
--- a/scripts/exglobal_atmens_analysis_obs.py
+++ b/scripts/exglobal_atmens_analysis_obs.py
@@ -18,6 +18,7 @@
     config = cast_strdict_as_dtypedict(os.environ)
 
     # Instantiate the atmens analysis task
-    AtmEnsAnl = AtmEnsAnalysis(config)
-    AtmEnsAnl.init_observer()
-    AtmEnsAnl.observe()
+    AtmEnsAnl = AtmEnsAnalysis(config, 'atmensanlobs')
+
+    # Initialize and execute JEDI ensembler DA analysis in observer mode
+    AtmEnsAnl.execute(config.APRUN_ATMENSANLOBS, ['fv3jedi', 'localensembleda'])
diff --git a/scripts/exglobal_atmens_analysis_sol.py b/scripts/exglobal_atmens_analysis_sol.py
index db55959753..be78e694b1 100755
--- a/scripts/exglobal_atmens_analysis_sol.py
+++ b/scripts/exglobal_atmens_analysis_sol.py
@@ -18,6 +18,8 @@
     config = cast_strdict_as_dtypedict(os.environ)
 
     # Instantiate the atmens analysis task
-    AtmEnsAnl = AtmEnsAnalysis(config)
-    AtmEnsAnl.init_solver()
-    AtmEnsAnl.solve()
+    AtmEnsAnl = AtmEnsAnalysis(config, 'atmensanlsol')
+
+    # Initialize and execute JEDI ensemble DA analysis in solver mode
+    AtmEnsAnl.initialize_jedi()
+    AtmEnsAnl.execute(config.APRUN_ATMENSANLSOL, ['fv3jedi', 'localensembleda'])
diff --git a/scripts/exglobal_atmos_upp.py b/scripts/exglobal_atmos_upp.py
index 6cdbc1bc51..f87f06d2c9 100755
--- a/scripts/exglobal_atmos_upp.py
+++ b/scripts/exglobal_atmos_upp.py
@@ -19,7 +19,7 @@ def main():
 
     # Pull out all the configuration keys needed to run the rest of UPP steps
     keys = ['HOMEgfs', 'DATA', 'current_cycle', 'RUN', 'NET',
-            'COM_ATMOS_ANALYSIS', 'COM_ATMOS_HISTORY', 'COM_ATMOS_MASTER',
+            'COMIN_ATMOS_ANALYSIS', 'COMIN_ATMOS_HISTORY', 'COMOUT_ATMOS_MASTER',
             'upp_run',
             'APRUN_UPP',
             'forecast_hour', 'valid_datetime',
diff --git a/scripts/exglobal_cleanup.sh b/scripts/exglobal_cleanup.sh
index 75b1f927bc..73637a0d55 100755
--- a/scripts/exglobal_cleanup.sh
+++ b/scripts/exglobal_cleanup.sh
@@ -11,14 +11,6 @@ DATAfcst="${DATAROOT}/${RUN}fcst.${PDY:-}${cyc}"
 if [[ -d "${DATAfcst}" ]]; then rm -rf "${DATAfcst}"; fi
 #DATAefcs="${DATAROOT}/${RUN}efcs???${PDY:-}${cyc}"
 rm -rf "${DATAROOT}/${RUN}efcs"*"${PDY:-}${cyc}"
-
-# In XML, DATAROOT is defined as:
-#DATAROOT="${STMP}/RUNDIRS/${PSLOT}/${RUN}.${PDY}${cyc}"
-# cleanup is only executed after the entire cycle is successfully completed.
-# removing DATAROOT should be possible if that is the case.
-rm -rf "${DATAROOT}"
-
-echo "Cleanup ${DATAROOT} completed!"
 ###############################################################
 
 if [[ "${CLEANUP_COM:-YES}" == NO ]] ; then
@@ -49,10 +41,10 @@ function remove_files() {
     find_exclude_string="${find_exclude_string[*]/%-or}"
     # Remove all regular files that do not match
     # shellcheck disable=SC2086
-    find "${directory}" -type f -not \( ${find_exclude_string} \) -delete
+    find "${directory}" -type f -not \( ${find_exclude_string} \) -ignore_readdir_race -delete
     # Remove all symlinks that do not match
     # shellcheck disable=SC2086
-    find "${directory}" -type l -not \( ${find_exclude_string} \) -delete
+    find "${directory}" -type l -not \( ${find_exclude_string} \) -ignore_readdir_race -delete
     # Remove any empty directories
     find "${directory}" -type d -empty -delete
 }
@@ -113,3 +105,16 @@ if (( GDATE < RDATE )); then
 fi
 deletion_target="${ROTDIR}/${RUN}.${RDATE:0:8}"
 if [[ -d ${deletion_target} ]]; then rm -rf "${deletion_target}"; fi
+
+# sync and wait to avoid filesystem synchronization issues
+sync && sleep 1
+
+# Finally, delete DATAROOT.
+# This will also delete the working directory, so save it until the end.
+# In XML, DATAROOT is defined as:
+#DATAROOT="${STMP}/RUNDIRS/${PSLOT}/${RUN}.${PDY}${cyc}"
+# cleanup is only executed after the entire cycle is successfully completed.
+# removing DATAROOT should be possible if that is the case.
+rm -rf "${DATAROOT}"
+
+echo "Cleanup ${DATAROOT} completed!"
diff --git a/scripts/exglobal_marine_analysis_checkpoint.py b/scripts/exglobal_marine_analysis_checkpoint.py
new file mode 100755
index 0000000000..84b180b287
--- /dev/null
+++ b/scripts/exglobal_marine_analysis_checkpoint.py
@@ -0,0 +1,29 @@
+#!/usr/bin/env python3
+# exglobal_marine_analysis_checkpoint.py
+# This script creates a MarineAnalysis object
+# and runs the checkpoint methods which inserts
+# the seaice analysis into the CICE6 restart or
+# create a soca MOM6 IAU increment
+import os
+
+from wxflow import Logger, cast_strdict_as_dtypedict
+from pygfs.task.marine_analysis import MarineAnalysis
+
+# Initialize root logger
+logger = Logger(level='DEBUG', colored_log=True)
+
+
+if __name__ == '__main__':
+
+    # Take configuration from environment and cast it as python dictionary
+    config = cast_strdict_as_dtypedict(os.environ)
+
+    # Create a MarineAnalysis object
+    MarineAnl = MarineAnalysis(config)
+
+    # Prepare the SOCA increment for MOM6 IAU
+    MarineAnl.checkpoint_mom6_iau('socaincr2mom6.yaml')
+
+    # Insert the seaice analysis into the CICE6 restarts in 2 sequential stages
+    MarineAnl.checkpoint_cice6('soca_2cice_arctic.yaml')
+    MarineAnl.checkpoint_cice6('soca_2cice_antarctic.yaml')
diff --git a/scripts/exglobal_marine_analysis_finalize.py b/scripts/exglobal_marine_analysis_finalize.py
new file mode 100755
index 0000000000..daa3fbb487
--- /dev/null
+++ b/scripts/exglobal_marine_analysis_finalize.py
@@ -0,0 +1,27 @@
+#!/usr/bin/env python3
+# exglobal_marine_analysis_finalize.py
+# This script creates an MarineAnalysis object
+# and makes copies of the variational analysis output
+# to the COMROOT
+import os
+
+from wxflow import Logger, cast_strdict_as_dtypedict
+from pygfs.task.marine_analysis import MarineAnalysis
+
+# Initialize root logger
+logger = Logger(level='DEBUG', colored_log=True)
+
+
+if __name__ == '__main__':
+
+    # Take configuration from environment and cast it as python dictionary
+    config = cast_strdict_as_dtypedict(os.environ)
+
+    # Create a MarineAnalysis object
+    MarineAnl = MarineAnalysis(config)
+
+    # Make a copy of the analysis output to the COMROOT
+    MarineAnl.finalize()
+
+    # Compute the observation space statistics
+    MarineAnl.obs_space_stats()
diff --git a/scripts/exglobal_marine_analysis_initialize.py b/scripts/exglobal_marine_analysis_initialize.py
new file mode 100755
index 0000000000..37e45a5b73
--- /dev/null
+++ b/scripts/exglobal_marine_analysis_initialize.py
@@ -0,0 +1,24 @@
+#!/usr/bin/env python3
+# exglobal_marine_analysis_initialize.py
+# This script creates an MarineAnalysis object
+# and runs the initialize method
+# which create and stage the runtime directory
+# and create the YAML configuration
+# for a global marine variational analysis
+import os
+
+from wxflow import Logger, cast_strdict_as_dtypedict
+from pygfs.task.marine_analysis import MarineAnalysis
+
+# Initialize root logger
+logger = Logger(level='DEBUG', colored_log=True)
+
+
+if __name__ == '__main__':
+
+    # Take configuration from environment and cast it as python dictionary
+    config = cast_strdict_as_dtypedict(os.environ)
+
+    # Create a MarineAnalysis object
+    MarineAnl = MarineAnalysis(config)
+    MarineAnl.initialize()
diff --git a/scripts/exglobal_marine_analysis_variational.py b/scripts/exglobal_marine_analysis_variational.py
new file mode 100755
index 0000000000..e03c56b1e5
--- /dev/null
+++ b/scripts/exglobal_marine_analysis_variational.py
@@ -0,0 +1,24 @@
+#!/usr/bin/env python3
+# exglobal_marine_analysis_variational.py
+# This script creates an MarineAnalysis object
+# and runs the execute method
+# which executes the global marine variational analysis
+import os
+
+from wxflow import Logger, cast_strdict_as_dtypedict
+from pygfs.task.marine_analysis import MarineAnalysis
+
+# Initialize root logger
+logger = Logger(level='DEBUG', colored_log=True)
+
+
+if __name__ == '__main__':
+
+    # Take configuration from environment and cast it as python dictionary
+    config = cast_strdict_as_dtypedict(os.environ)
+
+    # Create a MarineAnalysis object
+    MarineAnl = MarineAnalysis(config)
+
+    # Run the variational application
+    MarineAnl.variational()
diff --git a/scripts/exglobal_prep_snow_obs.py b/scripts/exglobal_prep_snow_obs.py
index a6a9070151..aa1eb1bb7d 100755
--- a/scripts/exglobal_prep_snow_obs.py
+++ b/scripts/exglobal_prep_snow_obs.py
@@ -20,6 +20,5 @@
 
     # Instantiate the snow prepare task
     SnowAnl = SnowAnalysis(config)
-    SnowAnl.prepare_GTS()
     if SnowAnl.task_config.cyc == 0:
         SnowAnl.prepare_IMS()
diff --git a/scripts/exglobal_stage_ic.py b/scripts/exglobal_stage_ic.py
index d4c212a297..9d65db673a 100755
--- a/scripts/exglobal_stage_ic.py
+++ b/scripts/exglobal_stage_ic.py
@@ -22,10 +22,15 @@ def main():
             'assim_freq', 'current_cycle', 'previous_cycle',
             'ROTDIR', 'ICSDIR', 'STAGE_IC_YAML_TMPL', 'DO_JEDIATMVAR',
             'OCNRES', 'waveGRD', 'ntiles', 'DOIAU', 'DO_JEDIOCNVAR',
-            'REPLAY_ICS', 'DO_WAVE', 'DO_OCN', 'DO_ICE', 'DO_NEST']
+            'REPLAY_ICS', 'DO_WAVE', 'DO_OCN', 'DO_ICE', 'DO_NEST',
+            'HPSSICARCH', 'DO_DOWNLOAD_ICS',
+            'DO_REPAIR_REPLAY', 'ANLYDIR', 'DO_DOWNLOAD_ANLY']
 
     stage_dict = AttrDict()
     for key in keys:
+        # Make sure OCNRES is three digits
+        if key == "OCNRES":
+            stage.task_config.OCNRES = f"{stage.task_config.OCNRES :03d}"
         stage_dict[key] = stage.task_config[key]
 
     # Also import all COM* directory and template variables
diff --git a/sorc/build_all.sh b/sorc/build_all.sh
index b6c4e6cc1c..b2f4e6ce0e 100755
--- a/sorc/build_all.sh
+++ b/sorc/build_all.sh
@@ -131,21 +131,21 @@ build_jobs["ufs"]=8
 big_jobs=$((big_jobs+1))
 build_opts["ufs"]="${_wave_opt} ${_verbose_opt} ${_build_ufs_opt} ${_build_debug}"
 
-build_jobs["upp"]=2
+build_jobs["upp"]=1
 build_opts["upp"]="${_build_debug}"
 
-build_jobs["ufs_utils"]=2
+build_jobs["ufs_utils"]=1
 build_opts["ufs_utils"]="${_verbose_opt} ${_build_debug}"
 
 build_jobs["gfs_utils"]=1
 build_opts["gfs_utils"]="${_verbose_opt} ${_build_debug}"
 
-build_jobs["ww3prepost"]=2
+build_jobs["ww3prepost"]=1
 build_opts["ww3prepost"]="${_wave_opt} ${_verbose_opt} ${_build_ufs_opt} ${_build_debug}"
 
 # Optional DA builds
 if [[ "${_build_ufsda}" == "YES" ]]; then
-   if [[ "${MACHINE_ID}" != "orion" && "${MACHINE_ID}" != "hera" && "${MACHINE_ID}" != "hercules" && "${MACHINE_ID}" != "wcoss2" && "${MACHINE_ID}" != "noaacloud" ]]; then
+   if [[ "${MACHINE_ID}" != "orion" && "${MACHINE_ID}" != "hera" && "${MACHINE_ID}" != "hercules" && "${MACHINE_ID}" != "wcoss2" && "${MACHINE_ID}" != "noaacloud" && "${MACHINE_ID}" != "gaea" ]]; then
       echo "NOTE: The GDAS App is not supported on ${MACHINE_ID}.  Disabling build."
    else
       build_jobs["gdas"]=8
@@ -154,7 +154,7 @@ if [[ "${_build_ufsda}" == "YES" ]]; then
    fi
 fi
 if [[ "${_build_gsi}" == "YES" ]]; then
-   build_jobs["gsi_enkf"]=8
+   build_jobs["gsi_enkf"]=2
    build_opts["gsi_enkf"]="${_verbose_opt} ${_build_debug}"
 fi
 if [[ "${_build_gsi}" == "YES" || "${_build_ufsda}" == "YES" ]] ; then
diff --git a/sorc/gdas.cd b/sorc/gdas.cd
index 09594d1c03..55e895f1dc 160000
--- a/sorc/gdas.cd
+++ b/sorc/gdas.cd
@@ -1 +1 @@
-Subproject commit 09594d1c032fd187f9869ac74b2b5b351112e93c
+Subproject commit 55e895f1dcf4e6be36eb0eb4c8a7995d429157e0
diff --git a/sorc/gfs_utils.fd b/sorc/gfs_utils.fd
index b9b965317e..856a42076a 160000
--- a/sorc/gfs_utils.fd
+++ b/sorc/gfs_utils.fd
@@ -1 +1 @@
-Subproject commit b9b965317e74243d8404a609b5799186850ef03c
+Subproject commit 856a42076a65256aaae9b29f4891532cb4a3fbca
diff --git a/sorc/gsi_enkf.fd b/sorc/gsi_enkf.fd
index 529bb796be..9f44c8798c 160000
--- a/sorc/gsi_enkf.fd
+++ b/sorc/gsi_enkf.fd
@@ -1 +1 @@
-Subproject commit 529bb796bea0e490f186729cd168a91c034bb12d
+Subproject commit 9f44c8798c2087aca06df8f629699632e57df431
diff --git a/sorc/gsi_monitor.fd b/sorc/gsi_monitor.fd
index e1f9f21af1..278ee629e8 160000
--- a/sorc/gsi_monitor.fd
+++ b/sorc/gsi_monitor.fd
@@ -1 +1 @@
-Subproject commit e1f9f21af16ce912fdc2cd75c5b27094a550a0c5
+Subproject commit 278ee629e87558822e8d13b3fb3b0e16006aa856
diff --git a/sorc/gsi_utils.fd b/sorc/gsi_utils.fd
index 9382fd01c2..a6ea311e5c 160000
--- a/sorc/gsi_utils.fd
+++ b/sorc/gsi_utils.fd
@@ -1 +1 @@
-Subproject commit 9382fd01c2a626c8934c3f553d420a45de2b4dec
+Subproject commit a6ea311e5c82369d255e3afdc99c1bce0c9a3014
diff --git a/sorc/link_workflow.sh b/sorc/link_workflow.sh
index 1b8ee17a6b..d7b2ab912e 100755
--- a/sorc/link_workflow.sh
+++ b/sorc/link_workflow.sh
@@ -73,7 +73,7 @@ case "${machine}" in
   "hera")     FIX_DIR="/scratch1/NCEPDEV/global/glopara/fix" ;;
   "orion")    FIX_DIR="/work/noaa/global/glopara/fix" ;;
   "hercules") FIX_DIR="/work/noaa/global/glopara/fix" ;;
-  "jet")      FIX_DIR="/lfs4/HFIP/hfv3gfs/glopara/git/fv3gfs/fix" ;;
+  "jet")      FIX_DIR="/lfs5/HFIP/hfv3gfs/glopara/FIX/fix" ;;
   "s4")       FIX_DIR="/data/prod/glopara/fix" ;;
   "gaea")     FIX_DIR="/gpfs/f5/ufs-ard/world-shared/global/glopara/data/fix" ;;
   "noaacloud") FIX_DIR="/contrib/global-workflow-shared-data/fix" ;;
@@ -162,20 +162,13 @@ cd "${HOMEgfs}/parm/ufs" || exit 1
 ${LINK_OR_COPY} "${HOMEgfs}/sorc/ufs_model.fd/tests/parm/noahmptable.tbl" .
 
 cd "${HOMEgfs}/parm/post" || exit 1
-for file in postxconfig-NT-GEFS-F00.txt postxconfig-NT-GEFS.txt postxconfig-NT-GEFS-WAFS.txt \
-    postxconfig-NT-GEFS-F00-aerosol.txt postxconfig-NT-GEFS-aerosol.txt \
-    postxconfig-NT-GFS-ANL.txt postxconfig-NT-GFS-F00.txt postxconfig-NT-GFS-FLUX-F00.txt \
-    postxconfig-NT-GFS.txt postxconfig-NT-GFS-FLUX.txt postxconfig-NT-GFS-GOES.txt \
-    postxconfig-NT-GFS-F00-TWO.txt postxconfig-NT-GFS-TWO.txt \
-    params_grib2_tbl_new post_tag_gfs128 post_tag_gfs65 nam_micro_lookup.dat
+for file in params_grib2_tbl_new nam_micro_lookup.dat
 do
   ${LINK_OR_COPY} "${HOMEgfs}/sorc/upp.fd/parm/${file}" .
 done
-for file in optics_luts_DUST.dat optics_luts_DUST_nasa.dat optics_luts_NITR_nasa.dat \
-    optics_luts_SALT.dat optics_luts_SALT_nasa.dat optics_luts_SOOT.dat optics_luts_SOOT_nasa.dat \
-    optics_luts_SUSO.dat optics_luts_SUSO_nasa.dat optics_luts_WASO.dat optics_luts_WASO_nasa.dat
+for dir in gfs gefs
 do
-  ${LINK_OR_COPY} "${HOMEgfs}/sorc/upp.fd/fix/chem/${file}" .
+  ${LINK_OR_COPY} "${HOMEgfs}/sorc/upp.fd/parm/${dir}" .
 done
 for file in ice.csv ocean.csv ocnicepost.nml.jinja2
 do
@@ -202,7 +195,7 @@ done
 
 # Link these templates from ufs-weather-model
 cd "${HOMEgfs}/parm/ufs" || exit 1
-declare -a ufs_templates=("model_configure.IN" "model_configure_nest.IN"\
+declare -a ufs_templates=("model_configure.IN" "input_global_nest.nml.IN"\
                           "MOM_input_025.IN" "MOM_input_050.IN" "MOM_input_100.IN" "MOM_input_500.IN" \
                           "MOM6_data_table.IN" \
                           "ice_in.IN" \
@@ -219,7 +212,8 @@ declare -a ufs_templates=("model_configure.IN" "model_configure_nest.IN"\
                           "ufs.configure.s2swa.IN" \
                           "ufs.configure.s2swa_esmf.IN" \
                           "ufs.configure.leapfrog_atm_wav.IN" \
-                          "ufs.configure.leapfrog_atm_wav_esmf.IN" )
+                          "ufs.configure.leapfrog_atm_wav_esmf.IN" \
+                          "post_itag_gfs")
 for file in "${ufs_templates[@]}"; do
   [[ -s "${file}" ]] && rm -f "${file}"
   ${LINK_OR_COPY} "${HOMEgfs}/sorc/ufs_model.fd/tests/parm/${file}" .
@@ -238,7 +232,7 @@ if [[ -d "${HOMEgfs}/sorc/gdas.cd" ]]; then
   cd "${HOMEgfs}/fix" || exit 1
   [[ ! -d gdas ]] && mkdir -p gdas
   cd gdas || exit 1
-  for gdas_sub in fv3jedi gsibec obs soca; do
+  for gdas_sub in fv3jedi gsibec obs soca aero; do
     if [[ -d "${gdas_sub}" ]]; then
        rm -rf "${gdas_sub}"
     fi
@@ -281,7 +275,6 @@ if [[ -d "${HOMEgfs}/sorc/gdas.cd/build" ]]; then
   done
 fi
 
-
 #------------------------------
 #--add DA Monitor file (NOTE: ensure to use correct version)
 #------------------------------
@@ -368,14 +361,17 @@ if [[ -d "${HOMEgfs}/sorc/gdas.cd/build" ]]; then
   declare -a JEDI_EXE=("gdas.x" \
                        "gdas_soca_gridgen.x" \
                        "gdas_soca_error_covariance_toolbox.x" \
+                       "gdas_fv3jedi_error_covariance_toolbox.x" \
                        "gdas_soca_setcorscales.x" \
                        "gdas_soca_diagb.x" \
                        "fv3jedi_plot_field.x" \
+                       "gdasapp_chem_diagb.x" \
                        "fv3jedi_fv3inc.x" \
                        "gdas_ens_handler.x" \
                        "gdas_incr_handler.x" \
                        "gdas_obsprovider2ioda.x" \
                        "gdas_socahybridweights.x" \
+                       "gdassoca_obsstats.x" \
                        "gdasapp_land_ensrecenter.x" \
                        "bufr2ioda.x" \
                        "calcfIMS.exe" \
diff --git a/sorc/ufs_model.fd b/sorc/ufs_model.fd
index ee4f19a0a6..6a4e09e947 160000
--- a/sorc/ufs_model.fd
+++ b/sorc/ufs_model.fd
@@ -1 +1 @@
-Subproject commit ee4f19a0a630fc2245a313bfe20302b5a6b555aa
+Subproject commit 6a4e09e94773ffa39ce7ab6a54a885efada91f21
diff --git a/sorc/ufs_utils.fd b/sorc/ufs_utils.fd
index 3ef2e6bd72..06eec5b6f6 160000
--- a/sorc/ufs_utils.fd
+++ b/sorc/ufs_utils.fd
@@ -1 +1 @@
-Subproject commit 3ef2e6bd725d2662fd6ee95897cb7bac222e5144
+Subproject commit 06eec5b6f636123835e2dfd9fc5229980c006735
diff --git a/sorc/verif-global.fd b/sorc/verif-global.fd
index 92904d2c43..b2ee80cac7 160000
--- a/sorc/verif-global.fd
+++ b/sorc/verif-global.fd
@@ -1 +1 @@
-Subproject commit 92904d2c431969345968f74e676717057ec0042a
+Subproject commit b2ee80cac7921a3016fa5a857cc58acfccc4baea
diff --git a/ush/check_ice_netcdf.sh b/ush/check_ice_netcdf.sh
deleted file mode 100755
index 9d2d945a8b..0000000000
--- a/ush/check_ice_netcdf.sh
+++ /dev/null
@@ -1,43 +0,0 @@
-#! /usr/bin/env bash
-
-yyyy=${1?}
-mm=${2?}
-dd=${3?}
-cyc=${4?}
-fhr=${5?}
-ROTDIR=${6?}
-member=${7?}
-FHOUT_ICE_GFS=${8?}
-
-fhri=$((10#${fhr}))
-
-#Will need to consider fhmin in the future to calculate the offset if we are to stick with this approach. 
-((offset = ( cyc ) % FHOUT_ICE_GFS))
-
-if (( offset != 0  )); then
-  (( fhri = fhri - cyc ))
-  fhr3=$(printf %03i "${fhri}")
-  if (( fhri <= FHOUT_ICE_GFS  )); then
-    (( interval = FHOUT_ICE_GFS - cyc )) 
-    ncfile=${ROTDIR}/gefs.${yyyy}${mm}${dd}/${cyc}/mem${member}/model/ice/history/gefs.ice.t${cyc}z.${interval}hr_avg.f${fhr3}.nc
-  else
-    ncfile=${ROTDIR}/gefs.${yyyy}${mm}${dd}/${cyc}/mem${member}/model/ice/history/gefs.ice.t${cyc}z.${FHOUT_ICE_GFS}hr_avg.f${fhr3}.nc
-  fi
-else
-  ncfile=${ROTDIR}/gefs.${yyyy}${mm}${dd}/${cyc}/mem${member}/model/ice/history/gefs.ice.t${cyc}z.${FHOUT_ICE_GFS}hr_avg.f${fhr}.nc
-fi
-
-#Check if netcdf file exists.
-if [[ ! -f "${ncfile}" ]];then
-  rc=1
-else
-  #Check if netcdf file is older than 2 minutes.
-  ncage="$(find "${ncfile}" -mmin -2)"
-  if [[ -n "${ncage}" ]]; then
-    rc=1
-  else
-    rc=0
-  fi
-fi
-
-exit "${rc}"
diff --git a/ush/detect_machine.sh b/ush/detect_machine.sh
index b049a6040e..8ad217140a 100755
--- a/ush/detect_machine.sh
+++ b/ush/detect_machine.sh
@@ -67,7 +67,7 @@ if [[ -d /lfs/h3 ]]; then
 elif [[ -d /lfs/h1 && ! -d /lfs/h3 ]]; then
   # We are on NOAA TDS Acorn
   MACHINE_ID=acorn
-elif [[ -d /mnt/lfs1 ]]; then
+elif [[ -d /mnt/lfs5 ]]; then
   # We are on NOAA Jet
   MACHINE_ID=jet
 elif [[ -d /scratch1 ]]; then
diff --git a/ush/extractvars_tools.sh b/ush/extractvars_tools.sh
index daf61a3d2e..51c2586cb5 100644
--- a/ush/extractvars_tools.sh
+++ b/ush/extractvars_tools.sh
@@ -17,7 +17,8 @@ check_atmos() {
   done
   mapfile -t requestedvar_in_allgrb2file_arr < "${requestedvar_in_allgrb2file}"
   while read -r vari; do
-    if [[ ! ${requestedvar_in_allgrb2file_arr[*]} =~ ${vari} ]] ;then
+    # shellcheck disable=SC2076
+    if [[ ! ${requestedvar_in_allgrb2file_arr[*]} =~ "${vari}" ]] ;then
       echo "WARNING: PARM VARIABLE (${vari}) is not available in pgrb and pgrb2b for f${fnhl}."
     fi
   done <"${varlistl}"
diff --git a/ush/forecast_postdet.sh b/ush/forecast_postdet.sh
index 8af9054972..58755d41d9 100755
--- a/ush/forecast_postdet.sh
+++ b/ush/forecast_postdet.sh
@@ -37,7 +37,7 @@ FV3_postdet() {
     fi
 
     # Get list of FV3 restart files
-    local file_list 
+    local file_list
     file_list=$(FV3_restarts)
     echo "Copying FV3 restarts for 'RUN=${RUN}' at '${restart_date}' from '${restart_dir}'"
     local fv3_file restart_file
@@ -60,6 +60,24 @@ FV3_postdet() {
           break
         fi
       done
+      # Replace fv_tracer with aeroanl_fv_tracer restart files from current cycle (if found)
+      local nn
+      local use_anl_aero="YES"
+      for (( nn = 1; nn <= ntiles; nn++ )); do
+        test_tracer_file="${COMOUT_ATMOS_RESTART}/${restart_date:0:8}.${restart_date:8:2}0000.aeroanl_fv_tracer.res.tile${nn}.nc"
+        if [[ ! -f  "${test_tracer_file}" ]]; then
+          use_anl_aero="NO"
+          echo "WARNING: File ${test_tracer_file} does not exist, will not replace any files from the aerosol analysis"
+          break
+        fi
+      done
+      if [[ ${use_anl_aero} == "YES" ]]; then
+        for (( nn = 1; nn <= ntiles; nn++ )); do
+          rm -f "${DATA}/INPUT/fv_tracer.res.tile${nn}.nc"
+          ${NCP} "${COMOUT_ATMOS_RESTART}/${restart_date:0:8}.${restart_date:8:2}0000.aeroanl_fv_tracer.res.tile${nn}.nc" \
+                 "${DATA}/INPUT/fv_tracer.res.tile${nn}.nc"
+        done
+      fi # if [[ ${use_anl_aero} == "YES" ]]; then
     fi  # if [[ "${RERUN}" != "YES" ]]; then
 
   fi  # if [[ "${warm_start}" == ".true." ]]; then
@@ -215,14 +233,14 @@ EOF
         ${NLN} "${COMOUT_ATMOS_HISTORY}/${RUN}.t${cyc}z.atmf${FH3}.nc" "atmf${f_hhmmss}.nc"
         ${NLN} "${COMOUT_ATMOS_HISTORY}/${RUN}.t${cyc}z.sfcf${FH3}.nc" "sfcf${f_hhmmss}.nc"
         ${NLN} "${COMOUT_ATMOS_HISTORY}/${RUN}.t${cyc}z.atm.logf${FH3}.txt" "log.atm.f${f_hhmmss}"
-        ${NLN} "${COMOUT_ATMOS_HISTORY}/${RUN}.t${cyc}z.cubed_sphere_grid_atmf${FH3}.nc" "cubed_sphere_grid_atmf${f_hhmmss}.nc"
-        ${NLN} "${COMOUT_ATMOS_HISTORY}/${RUN}.t${cyc}z.cubed_sphere_grid_sfcf${FH3}.nc" "cubed_sphere_grid_sfcf${f_hhmmss}.nc"
       else
         ${NLN} "${COMOUT_ATMOS_HISTORY}/${RUN}.t${cyc}z.atmf${FH3}.nc" "atmf${FH3}.nc"
         ${NLN} "${COMOUT_ATMOS_HISTORY}/${RUN}.t${cyc}z.sfcf${FH3}.nc" "sfcf${FH3}.nc"
         ${NLN} "${COMOUT_ATMOS_HISTORY}/${RUN}.t${cyc}z.atm.logf${FH3}.txt" "log.atm.f${FH3}"
-        ${NLN} "${COMOUT_ATMOS_HISTORY}/${RUN}.t${cyc}z.cubed_sphere_grid_atmf${FH3}.nc" "cubed_sphere_grid_atmf${FH3}.nc"
-        ${NLN} "${COMOUT_ATMOS_HISTORY}/${RUN}.t${cyc}z.cubed_sphere_grid_sfcf${FH3}.nc" "cubed_sphere_grid_sfcf${FH3}.nc"
+        if [[ "${DO_JEDIATMVAR:-}" == "YES" ]]; then
+          ${NLN} "${COMOUT_ATMOS_HISTORY}/${RUN}.t${cyc}z.cubed_sphere_grid_atmf${FH3}.nc" "cubed_sphere_grid_atmf${FH3}.nc"
+          ${NLN} "${COMOUT_ATMOS_HISTORY}/${RUN}.t${cyc}z.cubed_sphere_grid_sfcf${FH3}.nc" "cubed_sphere_grid_sfcf${FH3}.nc"
+        fi
       fi
       if [[ "${WRITE_DOPOST}" == ".true." ]]; then
         ${NLN} "${COMOUT_ATMOS_MASTER}/${RUN}.t${cyc}z.master.grb2f${FH3}" "GFSPRS.GrbF${FH2}"
@@ -265,7 +283,7 @@ FV3_out() {
   ${NCP} "${DATA}/model_configure" "${COMOUT_CONF}/ufs.model_configure"
   ${NCP} "${DATA}/ufs.configure" "${COMOUT_CONF}/ufs.ufs.configure"
   ${NCP} "${DATA}/diag_table" "${COMOUT_CONF}/ufs.diag_table"
- 
+
 
   # Determine the dates for restart files to be copied to COM
   local restart_date restart_dates
diff --git a/ush/forecast_predet.sh b/ush/forecast_predet.sh
index 6255b95175..41375e20cc 100755
--- a/ush/forecast_predet.sh
+++ b/ush/forecast_predet.sh
@@ -388,11 +388,6 @@ FV3_predet(){
       ISEED_SPPT=$((base_seed + 3)),$((base_seed + 4)),$((base_seed + 5)),$((base_seed + 6)),$((base_seed + 7))
     fi
 
-    if [[ "${DO_CA:-}" == "YES" ]]; then
-      do_ca=".true."
-      ISEED_CA=$(( (base_seed + 18) % 2147483647 ))
-    fi
-
     if [[ "${DO_LAND_PERT:-}" == "YES" ]]; then
       lndp_type=${lndp_type:-2}
       ISEED_LNDP=$(( (base_seed + 5) % 2147483647 ))
@@ -403,6 +398,16 @@ FV3_predet(){
       n_var_lndp=$(echo "${lndp_var_list}" | wc -w)
     fi
 
+  else
+
+    local imem=${MEMBER#0}
+    local base_seed=$((current_cycle*10000 + imem*100))
+
+    if [[ "${DO_CA:-}" == "YES" ]]; then
+      do_ca=".true."
+      ISEED_CA=$(( (base_seed + 18) % 2147483647 ))
+    fi
+
   fi  # end of ensemble member specific options
 
   #--------------------------------------------------------------------------
@@ -498,7 +503,7 @@ FV3_predet(){
     local month mm
     for (( month = 1; month <=12; month++ )); do
       mm=$(printf %02d "${month}")
-      ${NCP} "${FIXgfs}/aer/merra2.aerclim.2003-2014.m${mm}.nc" "aeroclim.m${mm}.nc"
+      ${NCP} "${FIXgfs}/aer/merra2.aerclim.2014-2023.m${mm}.nc" "aeroclim.m${mm}.nc"
     done
   fi
 
@@ -537,12 +542,27 @@ FV3_predet(){
 
   # Inline UPP fix files
   if [[ "${WRITE_DOPOST:-}" == ".true." ]]; then
-    ${NCP} "${PARMgfs}/post/post_tag_gfs${LEVS}"                              "${DATA}/itag"
-    ${NCP} "${FLTFILEGFS:-${PARMgfs}/post/postxconfig-NT-GFS-TWO.txt}"        "${DATA}/postxconfig-NT.txt"
-    ${NCP} "${FLTFILEGFSF00:-${PARMgfs}/post/postxconfig-NT-GFS-F00-TWO.txt}" "${DATA}/postxconfig-NT_FH00.txt"
-    ${NCP} "${POSTGRB2TBL:-${PARMgfs}/post/params_grib2_tbl_new}"             "${DATA}/params_grib2_tbl_new"
-  fi
+    ${NCP} "${POSTGRB2TBL:-${PARMgfs}/post/params_grib2_tbl_new}" "${DATA}/params_grib2_tbl_new"
+    ${NCP} "${PARMgfs}/ufs/post_itag_gfs"                         "${DATA}/itag"  # TODO: Need a GEFS version when available in the UFS-weather-model
+    # TODO: These should be replaced with ones from the ufs-weather-model when available there
+    if [[ "${RUN}" =~ "gdas" || "${RUN}" =~ "gfs" ]]; then  # RUN = gdas | enkfgdas | gfs | enkfgfs
+      ${NCP} "${PARMgfs}/post/gfs/postxconfig-NT-gfs-two.txt"     "${DATA}/postxconfig-NT.txt"
+      ${NCP} "${PARMgfs}/post/gfs/postxconfig-NT-gfs-f00-two.txt" "${DATA}/postxconfig-NT_FH00.txt"
+    elif [[ "${RUN}" == "gefs" ]]; then  # RUN = gefs
+      ${NCP} "${PARMgfs}/post/gefs/postxconfig-NT-gefs.txt"       "${DATA}/postxconfig-NT.txt"
+      ${NCP} "${PARMgfs}/post/gefs/postxconfig-NT-gefs-f00.txt"   "${DATA}/postxconfig-NT_FH00.txt"
+    fi
+
+    memnum=$(echo "${ENSMEM}" | cut -c2-3)
+    if [[ "${ENSMEM}" == "000" ]]; then
+      export e1=1
+    else
+      export e1=3
+    fi
+    export e2=${memnum}
+    export e3=10
 
+  fi
 }
 
 # Disable variable not used warnings
@@ -636,15 +656,8 @@ CICE_predet(){
 
   # CICE does not have a concept of high frequency output like FV3
   # Convert output settings into an explicit list for CICE
-  if (( $(( ( cyc + FHMIN ) % FHOUT_ICE )) == 0 )); then
-    # shellcheck disable=SC2312
-    mapfile -t CICE_OUTPUT_FH < <(seq "${FHMIN}" "${FHOUT_ICE}" "${FHMAX}") || exit 10
-  else
-    CICE_OUTPUT_FH=("${FHMIN}")
-    # shellcheck disable=SC2312
-    mapfile -t -O "${#CICE_OUTPUT_FH[@]}" CICE_OUTPUT_FH < <(seq "$(( FHMIN + $(( ( cyc + FHMIN ) % FHOUT_ICE )) ))" "${FHOUT_ICE}" "${FHMAX}") || exit 10
-    CICE_OUTPUT_FH+=("${FHMAX}")
-  fi
+  # shellcheck disable=SC2312
+  mapfile -t CICE_OUTPUT_FH < <(seq "${FHMIN}" "${FHOUT_ICE}" "${FHMAX}") || exit 10
 
   # Fix files
   ${NCP} "${FIXgfs}/cice/${ICERES}/${CICE_GRID}" "${DATA}/"
diff --git a/ush/gfs_bufr.sh b/ush/gfs_bufr.sh
index 8a7d9b1091..0a7a8e8522 100755
--- a/ush/gfs_bufr.sh
+++ b/ush/gfs_bufr.sh
@@ -18,8 +18,17 @@
 # 2018-05-30  Guang Ping Lou: Make sure all files are available.
 # 2019-10-10  Guang Ping Lou: Read in NetCDF files
 # 2024-03-03 Bo Cui: Add options to use different bufr table for different resolution NetCDF files
+# 2024-08-08 Bo Cui: Update to handle one forecast at a time
 # echo "History: February 2003 - First implementation of this utility script"
 #
+fhr="$1"
+fhr_p="$2"
+FINT="$3"
+F00FLAG="$4"
+workdir="$5"
+
+cd "${workdir}" || exit 2
+
 source "${USHgfs}/preamble.sh"
 
 if [[ "${F00FLAG}" == "YES" ]]; then
@@ -37,63 +46,69 @@ else
    bufrflag=".false."
 fi
 
-##fformat="nc"
-##fformat="nemsio"
+# check if read in bufr_ij_gfs_${CASE}.txt 
+
+if [[ -s "${PARMgfs}/product/bufr_ij_gfs_${CASE}.txt"  ]]; then
+  # use predetermined grid point(i,j) in bufr_gfs_${CASE}.txt 
+  ${NLN} "${PARMgfs}/product/bufr_ij_gfs_${CASE}.txt" fort.7
+  np1=0
+else
+  # find the nearest neighbor grid point(i,j) in the code
+  np1=1
+  echo "No bufr_ij_gfs_${CASE}.txt For CASE ${CASE}"
+  echo "Find the nearest neighbor grid (i,j) in the code"
+fi   
+
+##fformat="netcdf"
 
 CLASS="class1fv3"
 cat << EOF > gfsparm
  &NAMMET
   levs=${LEVS},makebufr=${bufrflag},
   dird="${COM_ATMOS_BUFR}/bufr",
-  nstart=${FSTART},nend=${FEND},nint=${FINT},
+  nstart=${fhr},nend=${fhr},nint=${FINT},
   nend1=${NEND1},nint1=${NINT1},nint3=${NINT3},
-  nsfc=80,f00=${f00flag},fformat=${fformat},np1=0
+  nsfc=80,f00=${f00flag},fformat=${fformat},np1=${np1},
+  fnsig="sigf${fhr}",
+  fngrib="flxf${fhr}", 
+  fngrib2="flxf${fhr_p}" 
 /
 EOF
 
-sleep_interval=10
-max_tries=1000
-for (( hr = 10#${FSTART}; hr <= 10#${FEND}; hr = hr + 10#${FINT} )); do
-   hh2=$(printf %02i "${hr}")
-   hh3=$(printf %03i "${hr}")
-
-   #---------------------------------------------------------
-   # Make sure all files are available:
-   filename="${COM_ATMOS_HISTORY}/${RUN}.${cycle}.atm.logf${hh3}.${logfm}"
-   if ! wait_for_file "${filename}" "${sleep_interval}" "${max_tries}"; then
-     echo "FATAL ERROR: COULD NOT LOCATE logf${hh3} file"
-     exit 2
-   fi
-   
-   #------------------------------------------------------------------
-   ${NLN} "${COM_ATMOS_HISTORY}/${RUN}.${cycle}.atmf${hh3}.${atmfm}" "sigf${hh2}"
-   ${NLN} "${COM_ATMOS_HISTORY}/${RUN}.${cycle}.sfcf${hh3}.${atmfm}" "flxf${hh2}"
-done
+#---------------------------------------------------------
+# Make sure all files are available:
+
+filename="${COM_ATMOS_HISTORY}/${RUN}.${cycle}.atm.logf${fhr}.${logfm}"
+if [[ -z ${filename} ]]; then
+  echo "FATAL ERROR: COULD NOT LOCATE logf${fhr} file"
+  exit 2
+fi
+
+filename="${COM_ATMOS_HISTORY}/${RUN}.${cycle}.atm.logf${fhr_p}.${logfm}"
+if [[ -z ${filename} ]]; then
+  echo "FATAL ERROR: COULD NOT LOCATE logf${fhr_p} file"
+  exit 2
+fi
+
+#------------------------------------------------------------------
+${NLN} "${COM_ATMOS_HISTORY}/${RUN}.${cycle}.atmf${fhr}.${atmfm}" "sigf${fhr}"
+${NLN} "${COM_ATMOS_HISTORY}/${RUN}.${cycle}.sfcf${fhr}.${atmfm}" "flxf${fhr}"
+${NLN} "${COM_ATMOS_HISTORY}/${RUN}.${cycle}.sfcf${fhr_p}.${atmfm}" "flxf${fhr_p}"
 
 #  define input BUFR table file.
 ${NLN} "${PARMgfs}/product/bufr_gfs_${CLASS}.tbl" fort.1
 ${NLN} "${STNLIST:-${PARMgfs}/product/bufr_stalist.meteo.gfs}" fort.8
 
-case "${CASE}" in
-    "C768")
-        ${NLN} "${PARMgfs}/product/bufr_ij13km.txt" fort.7
-        ;;
-    "C1152")
-        ${NLN} "${PARMgfs}/product/bufr_ij9km.txt"  fort.7
-        ;;
-    *)
-        echo "WARNING: No bufr table for this resolution, using the one for C768"
-        ${NLN} "${PARMgfs}/product/bufr_ij13km.txt" fort.7
-        ;;
-esac
-
-${APRUN_POSTSND} "${EXECgfs}/${pgm}" < gfsparm > "out_gfs_bufr_${FEND}"
+
+#------------------------------------------------------------------
+"${EXECgfs}/${pgm}" < gfsparm > "out_gfs_bufr_${fhr}"
+
 export err=$?
 
 if [[ "${err}" -ne 0 ]]; then
    echo "GFS postsnd job error, Please check files "
-   echo "${COM_ATMOS_HISTORY}/${RUN}.${cycle}.atmf${hh2}.${atmfm}"
-   echo "${COM_ATMOS_HISTORY}/${RUN}.${cycle}.sfcf${hh2}.${atmfm}"
+   echo "${COM_ATMOS_HISTORY}/${RUN}.${cycle}.atmf${fhr}.${atmfm}"
+   echo "${COM_ATMOS_HISTORY}/${RUN}.${cycle}.sfcf${fhr}.${atmfm}"
    err_chk
 fi
 
diff --git a/ush/ocnice_extractvars.sh b/ush/ocnice_extractvars.sh
index 51276172b9..78c4cbd91e 100755
--- a/ush/ocnice_extractvars.sh
+++ b/ush/ocnice_extractvars.sh
@@ -21,15 +21,23 @@ comout_rfcst_prod_ocnice=${6}
 
 [[ -d "${subdata}" ]] || mkdir -p "${subdata}"
 
-for (( nh = FHMIN_GFS; nh <= FHMAX_GFS; nh = nh + fhout_ocnice )); do
+for (( nh = FHMIN_GFS + fhout_ocnice; nh <= FHMAX_GFS; nh = nh + fhout_ocnice )); do
   fnh=$(printf "%3.3d" "${nh}")
 
   if [[ ${component_name} == "ocn" ]]; then
-    infile=${COMIN_OCEAN_NETCDF}/${datares}/${RUN}.ocean.t${cyc}z.${datares}.f${fnh}.nc
+    if [[ "${datares}" == "native" ]]; then
+      infile="${COMIN_OCEAN_HISTORY}/${RUN}.ocean.t${cyc}z.${fhout_ocnice}hr_avg.f${fnh}.nc"
+    else
+      infile="${COMIN_OCEAN_NETCDF}/${datares}/${RUN}.ocean.t${cyc}z.${datares}.f${fnh}.nc"
+    fi
     # For ocean products, add an argument to extract a subset of levels
     otherargs=(-d "${depthvar_name},""${zmin},""${zmax}")
   elif [[ ${component_name} == "ice" ]]; then
-    infile=${COMIN_ICE_NETCDF}/${datares}/${RUN}.ice.t${cyc}z.${datares}.f${fnh}.nc
+    if [[ "${datares}" == "native" ]]; then
+      infile="${COMIN_ICE_HISTORY}/${RUN}.ice.t${cyc}z.${fhout_ocnice}hr_avg.f${fnh}.nc"
+    else
+      infile="${COMIN_ICE_NETCDF}/${datares}/${RUN}.ice.t${cyc}z.${datares}.f${fnh}.nc"
+    fi
     otherargs=()
   fi
   outfile=${subdata}/${RUN}.${component_name}.t${cyc}z.${datares}.f${fnh}.nc
diff --git a/ush/parsing_model_configure_FV3.sh b/ush/parsing_model_configure_FV3.sh
index 7e8e065d26..7cf7bf8662 100755
--- a/ush/parsing_model_configure_FV3.sh
+++ b/ush/parsing_model_configure_FV3.sh
@@ -31,16 +31,20 @@ local WRITE_GROUP=${WRITE_GROUP:-1}
 local WRTTASK_PER_GROUP=${WRTTASK_PER_GROUP:-24}
 local ITASKS=1
 local OUTPUT_HISTORY=${OUTPUT_HISTORY:-".true."}
-local HISTORY_FILE_ON_NATIVE_GRID=".true."
+if [[ "${DO_JEDIATMVAR:-}" == "YES" ]]; then
+  local HISTORY_FILE_ON_NATIVE_GRID=".true."
+else
+  local HISTORY_FILE_ON_NATIVE_GRID=".false."
+fi
 local WRITE_DOPOST=${WRITE_DOPOST:-".false."}
 local WRITE_NSFLIP=${WRITE_NSFLIP:-".false."}
 local NUM_FILES=${NUM_FILES:-2}
 local FILENAME_BASE="'atm' 'sfc'"
 # OUTPUT_GRID
 local OUTPUT_FILE="'${OUTPUT_FILETYPE_ATM}' '${OUTPUT_FILETYPE_SFC}'"
-local ZSTANDARD_LEVEL=0
-local IDEFLATE=0  # netCDF zlib lossless compression (0-9); 0: no compression
-local QUANTIZE_NSD=${QUANTIZE_NSD:-0}  # netCDF compression
+local ZSTANDARD_LEVEL=${zstandard_level:-0}
+local IDEFLATE=${ideflate:-0}  # netCDF zlib lossless compression (0-9); 0: no compression
+local QUANTIZE_NSD=${quantize_nsd:-0}  # netCDF compression
 local ICHUNK2D=$((4*restile))
 local JCHUNK2D=$((2*restile))
 local ICHUNK3D=$((4*restile))
@@ -55,7 +59,7 @@ local IAU_OFFSET=${IAU_OFFSET:-0}
 if [[ "${DO_NEST:-NO}" == "YES" ]] ; then
   local NEST_IMO=${npx_nest}
   local NEST_JMO=${npy_nest}
-  template="${PARMgfs}/ufs/model_configure_nest.IN"
+  template="${PARMgfs}/ufs/input_global_nest.nml.IN"
 else
   template="${PARMgfs}/ufs/model_configure.IN"
 fi
diff --git a/ush/parsing_namelists_FV3.sh b/ush/parsing_namelists_FV3.sh
index 617ecff719..930dc8037b 100755
--- a/ush/parsing_namelists_FV3.sh
+++ b/ush/parsing_namelists_FV3.sh
@@ -710,24 +710,6 @@ EOF
 EOF
   fi
 
-  if [[ "${DO_OCN_SPPT:-NO}" == "YES" ]]; then
-    cat >> input.nml <<EOF
-  OCNSPPT=${OCNSPPT}
-  OCNSPPT_LSCALE=${OCNSPPT_LSCALE}
-  OCNSPPT_TAU=${OCNSPPT_TAU}
-  ISEED_OCNSPPT=${ISEED_OCNSPPT:-${ISEED}}
-EOF
-  fi
-
-  if [[ "${DO_OCN_PERT_EPBL:-NO}" == "YES" ]]; then
-    cat >> input.nml <<EOF
-  EPBL=${EPBL}
-  EPBL_LSCALE=${EPBL_LSCALE}
-  EPBL_TAU=${EPBL_TAU}
-  ISEED_EPBL=${ISEED_EPBL:-${ISEED}}
-EOF
-  fi
-
   cat >> input.nml << EOF
 /
 EOF
diff --git a/ush/parsing_namelists_MOM6.sh b/ush/parsing_namelists_MOM6.sh
index 9010851806..3ac2cb465e 100755
--- a/ush/parsing_namelists_MOM6.sh
+++ b/ush/parsing_namelists_MOM6.sh
@@ -41,6 +41,12 @@ cat input.nml
 # ---------
 # Prepare local variables for use in MOM_input.IN from UFSWM
 # The ones already defined are left commented as a reminder
+# == MOM options to start from coarsed grained restarts, set to off by default
+#       options only available for 05 and 1 degree grids
+#       as restarts are coarsed grained/interpolated from the 0.25 degrees grid
+local MOM6_INIT_FROM_Z=${MOM6_INIT_FROM_Z:-True}
+local MOM6_WARMSTART_FILE=${MOM6_WARMSTART_FILE:-"none"}
+local MOM6_INIT_UV=${MOM6_INIT_UV:-"zero"}
 # == MOM_domains section ==
 # NX_GLB
 # NY_GLB
diff --git a/ush/python/pygfs/__init__.py b/ush/python/pygfs/__init__.py
index b87bba0c2c..9f290fafd3 100644
--- a/ush/python/pygfs/__init__.py
+++ b/ush/python/pygfs/__init__.py
@@ -2,8 +2,10 @@
 import os
 
 from .task.analysis import Analysis
+from .task.bmatrix import BMatrix
 from .task.aero_emissions import AerosolEmissions
 from .task.aero_analysis import AerosolAnalysis
+from .task.aero_bmatrix import AerosolBMatrix
 from .task.atm_analysis import AtmAnalysis
 from .task.atmens_analysis import AtmEnsAnalysis
 from .task.marine_bmat import MarineBMat
diff --git a/ush/python/pygfs/jedi/__init__.py b/ush/python/pygfs/jedi/__init__.py
new file mode 100644
index 0000000000..5d7e85057c
--- /dev/null
+++ b/ush/python/pygfs/jedi/__init__.py
@@ -0,0 +1 @@
+from .jedi import Jedi
diff --git a/ush/python/pygfs/jedi/jedi.py b/ush/python/pygfs/jedi/jedi.py
new file mode 100644
index 0000000000..415a0a3c08
--- /dev/null
+++ b/ush/python/pygfs/jedi/jedi.py
@@ -0,0 +1,336 @@
+#!/usr/bin/env python3
+
+import os
+import tarfile
+from logging import getLogger
+from typing import List, Dict, Any, Optional
+from jcb import render
+from wxflow import (AttrDict,
+                    FileHandler,
+                    chdir, rm_p,
+                    parse_j2yaml,
+                    logit,
+                    Task,
+                    Executable,
+                    WorkflowException)
+
+logger = getLogger(__name__.split('.')[-1])
+
+
+class Jedi:
+    """
+    Class for initializing and executing JEDI applications
+    """
+    @logit(logger, name="Jedi")
+    def __init__(self, task_config: AttrDict, yaml_name: Optional[str] = None) -> None:
+        """Constructor for JEDI objects
+
+        This method will construct a Jedi object.
+        This includes:
+        - save a copy of task_config for provenance
+        - set the default JEDI YAML and executable names
+        - set an empty AttrDict for the JEDI config
+        - set the default directory for J2-YAML templates
+
+        Parameters
+        ----------
+        task_config: AttrDict
+            Attribute-dictionary of all configuration variables associated with a GDAS task.
+        yaml_name: str, optional
+            Name of YAML file for JEDI configuration
+
+        Returns
+        ----------
+        None
+        """
+
+        # For provenance, save incoming task_config as a private attribute of JEDI object
+        self._task_config = task_config
+
+        _exe_name = os.path.basename(task_config.JEDIEXE)
+
+        self.exe = os.path.join(task_config.DATA, _exe_name)
+        if yaml_name:
+            self.yaml = os.path.join(task_config.DATA, yaml_name + '.yaml')
+        else:
+            self.yaml = os.path.join(task_config.DATA, os.path.splitext(_exe_name)[0] + '.yaml')
+        self.config = AttrDict()
+        self.j2tmpl_dir = os.path.join(task_config.PARMgfs, 'gdas')
+
+    @logit(logger)
+    def set_config(self, task_config: AttrDict, algorithm: Optional[str] = None) -> AttrDict:
+        """Compile a JEDI configuration dictionary from a template file and save to a YAML file
+
+        Parameters
+        ----------
+        task_config : AttrDict
+            Dictionary of all configuration variables associated with a GDAS task.
+        algorithm (optional) : str
+            Name of the algorithm used to generate the JEDI configuration dictionary.
+            It will override the algorithm set in the task_config.JCB_<>_YAML file.
+
+        Returns
+        ----------
+        None
+        """
+
+        if 'JCB_BASE_YAML' in task_config.keys():
+            # Step 1: Fill templates of the JCB base YAML file
+            jcb_config = parse_j2yaml(task_config.JCB_BASE_YAML, task_config)
+
+            # Step 2: If algorithm is present then override the algorithm in the JEDI
+            #         config. Otherwise, if the algorithm J2-YAML is present, fill
+            #         its templates and merge.
+            if algorithm:
+                jcb_config['algorithm'] = algorithm
+            elif 'JCB_ALGO' in task_config.keys():
+                jcb_config['algorithm'] = task_config.JCB_ALGO
+            elif 'JCB_ALGO_YAML' in task_config.keys():
+                jcb_algo_config = parse_j2yaml(task_config.JCB_ALGO_YAML, task_config)
+                jcb_config.update(jcb_algo_config)
+
+            # Step 3: Generate the JEDI YAML using JCB
+            self.config = render(jcb_config)
+        elif 'JEDIYAML' in task_config.keys():
+            # Generate JEDI YAML without using JCB
+            self.config = parse_j2yaml(task_config.JEDIYAML, task_config,
+                                       searchpath=self.j2tmpl_dir)
+        else:
+            logger.exception(f"FATAL ERROR: Unable to compile JEDI configuration dictionary, ABORT!")
+            raise KeyError(f"FATAL ERROR: Task config must contain JCB_BASE_YAML or JEDIYAML")
+
+    @logit(logger)
+    def execute(self, task_config: AttrDict, aprun_cmd: str, jedi_args: Optional[List] = None) -> None:
+        """Execute JEDI application
+
+        Parameters
+        ----------
+        task_config: AttrDict
+            Attribute-dictionary of all configuration variables associated with a GDAS task.
+        aprun_cmd: str
+            String comprising the run command for the JEDI executable.
+        jedi_args (optional): List
+            List of strings comprising optional input arguments for the JEDI executable.
+
+        Returns
+        ----------
+        jedi_config: AttrDict
+            Attribute-dictionary of JEDI configuration rendered from a template.
+        """
+
+        chdir(task_config.DATA)
+
+        exec_cmd = Executable(aprun_cmd)
+        exec_cmd.add_default_arg(self.exe)
+        if jedi_args:
+            for arg in jedi_args:
+                exec_cmd.add_default_arg(arg)
+        exec_cmd.add_default_arg(self.yaml)
+
+        try:
+            exec_cmd()
+        except OSError:
+            raise OSError(f"FATAL ERROR: Failed to execute {exec_cmd}")
+        except Exception:
+            raise WorkflowException(f"FATAL ERROR: An error occurred during execution of {exec_cmd}")
+
+    @staticmethod
+    @logit(logger)
+    def link_exe(task_config: AttrDict) -> None:
+        """Link JEDI executable to run directory
+
+        Parameters
+        ----------
+        task_config: AttrDict
+            Attribute-dictionary of all configuration variables associated with a GDAS task.
+
+        Returns
+        ----------
+        None
+        """
+
+        # TODO: linking is not permitted per EE2.
+        # Needs work in JEDI to be able to copy the exec. [NOAA-EMC/GDASApp#1254]
+        logger.warn("Linking is not permitted per EE2.")
+        exe_dest = os.path.join(task_config.DATA, os.path.basename(task_config.JEDIEXE))
+        if os.path.exists(exe_dest):
+            rm_p(exe_dest)
+        os.symlink(task_config.JEDIEXE, exe_dest)
+
+    @logit(logger)
+    def get_obs_dict(self, task_config: AttrDict) -> Dict[str, Any]:
+        """Compile a dictionary of observation files to copy
+
+        This method extracts 'observers' from the JEDI yaml and from that list, extracts a list of
+        observation files that are to be copied to the run directory
+        from the observation input directory
+
+        Parameters
+        ----------
+        task_config: AttrDict
+            Attribute-dictionary of all configuration variables associated with a GDAS task.
+
+        Returns
+        ----------
+        obs_dict: Dict
+            a dictionary containing the list of observation files to copy for FileHandler
+        """
+
+        observations = find_value_in_nested_dict(self.config, 'observations')
+
+        copylist = []
+        for ob in observations['observers']:
+            obfile = ob['obs space']['obsdatain']['engine']['obsfile']
+            basename = os.path.basename(obfile)
+            copylist.append([os.path.join(task_config.COM_OBS, basename), obfile])
+        obs_dict = {
+            'mkdir': [os.path.join(task_config.DATA, 'obs')],
+            'copy': copylist
+        }
+        return obs_dict
+
+    @logit(logger)
+    def get_bias_dict(self, task_config: AttrDict, bias_file) -> Dict[str, Any]:
+        """Compile a dictionary of observation files to copy
+
+        This method extracts 'observers' from the JEDI yaml and determines from that list
+        if bias correction tar files are to be copied to the run directory
+        from the component directory.
+
+        Parameters
+        ----------
+        task_config: AttrDict
+            Attribute-dictionary of all configuration variables associated with a GDAS task.
+        bias_file
+            name of bias correction tar file
+
+        Returns
+        ----------
+        bias_dict: Dict
+            a dictionary containing the list of observation bias files to copy for FileHandler
+        """
+
+        observations = find_value_in_nested_dict(self.config, 'observations')
+
+        copylist = []
+        for ob in observations['observers']:
+            if 'obs bias' in ob.keys():
+                obfile = ob['obs bias']['input file']
+                obdir = os.path.dirname(obfile)
+                basename = os.path.basename(obfile)
+                prefix = '.'.join(basename.split('.')[:-3])
+                bfile = f"{prefix}.{bias_file}"
+                tar_file = os.path.join(obdir, bfile)
+                copylist.append([os.path.join(task_config.VarBcDir, bfile), tar_file])
+                break
+
+        bias_dict = {
+            'mkdir': [os.path.join(task_config.DATA, 'bc')],
+            'copy': copylist
+        }
+
+        return bias_dict
+
+    @staticmethod
+    @logit(logger)
+    def extract_tar(tar_file: str) -> None:
+        """Extract files from a tarball
+
+        This method extract files from a tarball
+
+        Parameters
+        ----------
+        tar_file
+            path/name of tarball
+
+        Returns
+        ----------
+        None
+        """
+
+        # extract files from tar file
+        tar_path = os.path.dirname(tar_file)
+        try:
+            with tarfile.open(tar_file, "r") as tarball:
+                tarball.extractall(path=tar_path)
+                logger.info(f"Extract {tarball.getnames()}")
+        except tarfile.ReadError as err:
+            if tarfile.is_tarfile(tar_file):
+                logger.error(f"FATAL ERROR: {tar_file} could not be read")
+                raise tarfile.ReadError(f"FATAL ERROR: unable to read {tar_file}")
+            else:
+                logger.info()
+        except tarfile.ExtractError as err:
+            logger.exception(f"FATAL ERROR: unable to extract from {tar_file}")
+            raise tarfile.ExtractError("FATAL ERROR: unable to extract from {tar_file}")
+
+
+@logit(logger)
+def find_value_in_nested_dict(nested_dict: Dict, target_key: str) -> Any:
+    """
+    Recursively search through a nested dictionary and return the value for the target key.
+    This returns the first target key it finds.  So if a key exists in a subsequent
+    nested dictionary, it will not be found.
+
+    Parameters
+    ----------
+    nested_dict : Dict
+        Dictionary to search
+    target_key : str
+        Key to search for
+
+    Returns
+    -------
+    Any
+        Value of the target key
+
+    Raises
+    ------
+    KeyError
+        If key is not found in dictionary
+
+    TODO: if this gives issues due to landing on an incorrect key in the nested
+    dictionary, we will have to implement a more concrete method to search for a key
+    given a more complete address.  See resolved conversations in PR 2387
+
+    # Example usage:
+    nested_dict = {
+        'a': {
+            'b': {
+                'c': 1,
+                'd': {
+                    'e': 2,
+                    'f': 3
+                }
+            },
+            'g': 4
+        },
+        'h': {
+            'i': 5
+        },
+        'j': {
+            'k': 6
+        }
+    }
+
+    user_key = input("Enter the key to search for: ")
+    result = find_value_in_nested_dict(nested_dict, user_key)
+    """
+
+    if not isinstance(nested_dict, dict):
+        raise TypeError(f"Input is not of type(dict)")
+
+    result = nested_dict.get(target_key)
+    if result is not None:
+        return result
+
+    for value in nested_dict.values():
+        if isinstance(value, dict):
+            try:
+                result = find_value_in_nested_dict(value, target_key)
+                if result is not None:
+                    return result
+            except KeyError:
+                pass
+
+    raise KeyError(f"Key '{target_key}' not found in the nested dictionary")
diff --git a/ush/python/pygfs/task/aero_analysis.py b/ush/python/pygfs/task/aero_analysis.py
index ccc5fb601a..0389e109a1 100644
--- a/ush/python/pygfs/task/aero_analysis.py
+++ b/ush/python/pygfs/task/aero_analysis.py
@@ -82,29 +82,18 @@ def initialize(self: Analysis) -> None:
         jedi_fix_list = parse_j2yaml(self.task_config.JEDI_FIX_YAML, self.task_config)
         FileHandler(jedi_fix_list).sync()
 
-        # stage berror files
-        # copy BUMP files, otherwise it will assume ID matrix
-        if self.task_config.get('STATICB_TYPE', 'identity') in ['bump']:
-            FileHandler(self.get_berror_dict(self.task_config)).sync()
-
-        # stage backgrounds
-        FileHandler(self.get_bkg_dict(AttrDict(self.task_config, **self.task_config))).sync()
+        # stage files from COM and create working directories
+        logger.info(f"Staging files prescribed from {self.task_config.AERO_STAGE_VARIATIONAL_TMPL}")
+        aero_var_stage_list = parse_j2yaml(self.task_config.AERO_STAGE_VARIATIONAL_TMPL, self.task_config)
+        FileHandler(aero_var_stage_list).sync()
 
         # generate variational YAML file
         logger.debug(f"Generate variational YAML file: {self.task_config.jedi_yaml}")
         save_as_yaml(self.task_config.jedi_config, self.task_config.jedi_yaml)
         logger.info(f"Wrote variational YAML to: {self.task_config.jedi_yaml}")
 
-        # need output dir for diags and anl
-        logger.debug("Create empty output [anl, diags] directories to receive output from executable")
-        newdirs = [
-            os.path.join(self.task_config['DATA'], 'anl'),
-            os.path.join(self.task_config['DATA'], 'diags'),
-        ]
-        FileHandler({'mkdir': newdirs}).sync()
-
     @logit(logger)
-    def execute(self: Analysis) -> None:
+    def variational(self: Analysis) -> None:
 
         chdir(self.task_config.DATA)
 
@@ -140,59 +129,33 @@ def finalize(self: Analysis) -> None:
         """
         # ---- tar up diags
         # path of output tar statfile
-        aerostat = os.path.join(self.task_config.COM_CHEM_ANALYSIS, f"{self.task_config['APREFIX']}aerostat")
+        logger.info('Preparing observation space diagnostics for archiving')
+        aerostat = os.path.join(self.task_config.COMOUT_CHEM_ANALYSIS, f"{self.task_config['APREFIX']}aerostat")
 
         # get list of diag files to put in tarball
         diags = glob.glob(os.path.join(self.task_config['DATA'], 'diags', 'diag*nc4'))
 
         # gzip the files first
         for diagfile in diags:
+            logger.info(f'Adding {diagfile} to tar file')
             with open(diagfile, 'rb') as f_in, gzip.open(f"{diagfile}.gz", 'wb') as f_out:
                 f_out.writelines(f_in)
 
+        # ---- add increments to RESTART files
+        logger.info('Adding increments to RESTART files')
+        self._add_fms_cube_sphere_increments()
+
+        # copy files back to COM
+        logger.info(f"Copying files to COM based on {self.task_config.AERO_FINALIZE_VARIATIONAL_TMPL}")
+        aero_var_final_list = parse_j2yaml(self.task_config.AERO_FINALIZE_VARIATIONAL_TMPL, self.task_config)
+        FileHandler(aero_var_final_list).sync()
+
         # open tar file for writing
         with tarfile.open(aerostat, "w") as archive:
             for diagfile in diags:
                 diaggzip = f"{diagfile}.gz"
                 archive.add(diaggzip, arcname=os.path.basename(diaggzip))
-
-        # copy full YAML from executable to ROTDIR
-        src = os.path.join(self.task_config['DATA'], f"{self.task_config['RUN']}.t{self.task_config['cyc']:02d}z.aerovar.yaml")
-        dest = os.path.join(self.task_config.COM_CHEM_ANALYSIS, f"{self.task_config['RUN']}.t{self.task_config['cyc']:02d}z.aerovar.yaml")
-        yaml_copy = {
-            'mkdir': [self.task_config.COM_CHEM_ANALYSIS],
-            'copy': [[src, dest]]
-        }
-        FileHandler(yaml_copy).sync()
-
-        # ---- copy RESTART fv_tracer files for future reference
-        if self.task_config.DOIAU:
-            bkgtime = self.task_config.AERO_WINDOW_BEGIN
-        else:
-            bkgtime = self.task_config.current_cycle
-        template = '{}.fv_tracer.res.tile{}.nc'.format(to_fv3time(bkgtime), '{tilenum}')
-        bkglist = []
-        for itile in range(1, self.task_config.ntiles + 1):
-            tracer = template.format(tilenum=itile)
-            src = os.path.join(self.task_config.COM_ATMOS_RESTART_PREV, tracer)
-            dest = os.path.join(self.task_config.COM_CHEM_ANALYSIS, f'aeroges.{tracer}')
-            bkglist.append([src, dest])
-        FileHandler({'copy': bkglist}).sync()
-
-        # ---- add increments to RESTART files
-        logger.info('Adding increments to RESTART files')
-        self._add_fms_cube_sphere_increments()
-
-        # ---- move increments to ROTDIR
-        logger.info('Moving increments to ROTDIR')
-        template = f'aeroinc.{to_fv3time(self.task_config.current_cycle)}.fv_tracer.res.tile{{tilenum}}.nc'
-        inclist = []
-        for itile in range(1, self.task_config.ntiles + 1):
-            tracer = template.format(tilenum=itile)
-            src = os.path.join(self.task_config.DATA, 'anl', tracer)
-            dest = os.path.join(self.task_config.COM_CHEM_ANALYSIS, tracer)
-            inclist.append([src, dest])
-        FileHandler({'copy': inclist}).sync()
+        logger.info(f'Saved diags to {aerostat}')
 
     def clean(self):
         super().clean()
@@ -209,7 +172,7 @@ def _add_fms_cube_sphere_increments(self: Analysis) -> None:
         restart_template = f'{to_fv3time(bkgtime)}.fv_tracer.res.tile{{tilenum}}.nc'
         increment_template = f'{to_fv3time(self.task_config.current_cycle)}.fv_tracer.res.tile{{tilenum}}.nc'
         inc_template = os.path.join(self.task_config.DATA, 'anl', 'aeroinc.' + increment_template)
-        bkg_template = os.path.join(self.task_config.COM_ATMOS_RESTART_PREV, restart_template)
+        bkg_template = os.path.join(self.task_config.DATA, 'anl', restart_template)
         # get list of increment vars
         incvars_list_path = os.path.join(self.task_config['PARMgfs'], 'gdas', 'aeroanl_inc_vars.yaml')
         incvars = YAMLFile(path=incvars_list_path)['incvars']
@@ -232,38 +195,7 @@ def get_bkg_dict(self, task_config: Dict[str, Any]) -> Dict[str, List[str]]:
         bkg_dict: Dict
             a dictionary containing the list of model background files to copy for FileHandler
         """
-        # NOTE for now this is FV3 RESTART files and just assumed to be fh006
-
-        # get FV3 RESTART files, this will be a lot simpler when using history files
-        rst_dir = task_config.COM_ATMOS_RESTART_PREV
-        run_dir = os.path.join(task_config['DATA'], 'bkg')
-
-        # Start accumulating list of background files to copy
-        bkglist = []
-
-        # if using IAU, we can use FGAT
-        bkgtimes = []
-        begintime = task_config.previous_cycle
-        for fcsthr in task_config.aero_bkg_fhr:
-            bkgtimes.append(add_to_datetime(begintime, to_timedelta(f"{fcsthr}H")))
-
-        # now loop over background times
-        for bkgtime in bkgtimes:
-            # aerosol DA needs coupler
-            basename = f'{to_fv3time(bkgtime)}.coupler.res'
-            bkglist.append([os.path.join(rst_dir, basename), os.path.join(run_dir, basename)])
-
-            # aerosol DA only needs core/tracer
-            for ftype in ['core', 'tracer']:
-                template = f'{to_fv3time(bkgtime)}.fv_{ftype}.res.tile{{tilenum}}.nc'
-                for itile in range(1, task_config.ntiles + 1):
-                    basename = template.format(tilenum=itile)
-                    bkglist.append([os.path.join(rst_dir, basename), os.path.join(run_dir, basename)])
-
-        bkg_dict = {
-            'mkdir': [run_dir],
-            'copy': bkglist,
-        }
+        bkg_dict = {}
         return bkg_dict
 
     @logit(logger)
@@ -285,34 +217,5 @@ def get_berror_dict(self, config: Dict[str, Any]) -> Dict[str, List[str]]:
         berror_dict: Dict
             a dictionary containing the list of background error files to copy for FileHandler
         """
-        # aerosol static-B needs nicas, cor_rh, cor_rv and stddev files.
-        b_dir = config.BERROR_DATA_DIR
-        b_datestr = to_fv3time(config.BERROR_DATE)
-        berror_list = []
-
-        for ftype in ['stddev']:
-            coupler = f'{b_datestr}.{ftype}.coupler.res'
-            berror_list.append([
-                os.path.join(b_dir, coupler), os.path.join(config.DATA, 'berror', coupler)
-            ])
-            template = f'{b_datestr}.{ftype}.fv_tracer.res.tile{{tilenum}}.nc'
-            for itile in range(1, config.ntiles + 1):
-                tracer = template.format(tilenum=itile)
-                berror_list.append([
-                    os.path.join(b_dir, tracer), os.path.join(config.DATA, 'berror', tracer)
-                ])
-        radius = 'cor_aero_universe_radius'
-        berror_list.append([
-            os.path.join(b_dir, radius), os.path.join(config.DATA, 'berror', radius)
-        ])
-        nproc = config.ntiles * config.layout_x * config.layout_y
-        for nn in range(1, nproc + 1):
-            berror_list.append([
-                os.path.join(b_dir, f'nicas_aero_nicas_local_{nproc:06}-{nn:06}.nc'),
-                os.path.join(config.DATA, 'berror', f'nicas_aero_nicas_local_{nproc:06}-{nn:06}.nc')
-            ])
-        berror_dict = {
-            'mkdir': [os.path.join(config.DATA, 'berror')],
-            'copy': berror_list,
-        }
+        berror_dict = {}
         return berror_dict
diff --git a/ush/python/pygfs/task/aero_bmatrix.py b/ush/python/pygfs/task/aero_bmatrix.py
new file mode 100644
index 0000000000..c652bad558
--- /dev/null
+++ b/ush/python/pygfs/task/aero_bmatrix.py
@@ -0,0 +1,294 @@
+#!/usr/bin/env python3
+
+import os
+from logging import getLogger
+from typing import List, Dict, Any, Union
+
+from wxflow import (AttrDict, FileHandler, rm_p,
+                    add_to_datetime, to_fv3time, to_timedelta,
+                    to_fv3time, chdir, Executable, WorkflowException,
+                    parse_j2yaml, save_as_yaml, logit)
+from pygfs.task.bmatrix import BMatrix
+
+logger = getLogger(__name__.split('.')[-1])
+
+
+class AerosolBMatrix(BMatrix):
+    """
+    Class for global aerosol BMatrix tasks
+    """
+    @logit(logger, name="AerosolBMatrix")
+    def __init__(self, config: Dict[str, Any]) -> None:
+        super().__init__(config)
+
+        _res = int(self.task_config['CASE'][1:])
+        _res_anl = int(self.task_config['CASE_ANL'][1:])
+
+        _bmat_yaml = os.path.join(self.task_config.DATA, f"{self.task_config.RUN}.t{self.task_config['cyc']:02d}z.chem_diagb.yaml")
+        _diffusion_yaml = os.path.join(self.task_config.DATA, f"{self.task_config.RUN}.t{self.task_config['cyc']:02d}z.chem_diffusion.yaml")
+        _convertstate_yaml = os.path.join(self.task_config.DATA, f"{self.task_config.RUN}.t{self.task_config['cyc']:02d}z.chem_convertstate.yaml")
+
+        # Create a local dictionary that is repeatedly used across this class
+        local_dict = AttrDict(
+            {
+                'npx_ges': _res + 1,
+                'npy_ges': _res + 1,
+                'npz_ges': self.task_config.LEVS - 1,
+                'npz': self.task_config.LEVS - 1,
+                'npx_anl': _res_anl + 1,
+                'npy_anl': _res_anl + 1,
+                'npz_anl': self.task_config['LEVS'] - 1,
+                'aero_bkg_fhr': map(int, str(self.task_config['aero_bkg_times']).split(',')),
+                'OPREFIX': f"{self.task_config.RUN}.t{self.task_config.cyc:02d}z.",
+                'APREFIX': f"{self.task_config.RUN}.t{self.task_config.cyc:02d}z.",
+                'GPREFIX': f"gdas.t{self.task_config.previous_cycle.hour:02d}z.",
+                'bmat_yaml': _bmat_yaml,
+                'diffusion_yaml': _diffusion_yaml,
+                'convertstate_yaml': _convertstate_yaml,
+            }
+        )
+
+        # task_config is everything that this task should need
+        self.task_config = AttrDict(**self.task_config, **local_dict)
+
+    @logit(logger)
+    def initialize(self: BMatrix) -> None:
+        super().initialize()
+        # stage fix files
+        logger.info(f"Staging JEDI fix files from {self.task_config.JEDI_FIX_YAML}")
+        jedi_fix_list = parse_j2yaml(self.task_config.JEDI_FIX_YAML, self.task_config)
+        FileHandler(jedi_fix_list).sync()
+
+        # stage backgrounds
+        logger.info(f"Staging backgrounds prescribed from {self.task_config.AERO_BMATRIX_STAGE_TMPL}")
+        aero_bmat_stage_list = parse_j2yaml(self.task_config.AERO_BMATRIX_STAGE_TMPL, self.task_config)
+        FileHandler(aero_bmat_stage_list).sync()
+
+        # generate convert state YAML file
+        logger.info(f"Generate convert state YAML file: {self.task_config.convertstate_yaml}")
+        self.task_config.convertstate_config = parse_j2yaml(self.task_config.INTERPYAML,
+                                                            self.task_config,
+                                                            searchpath=self.gdasapp_j2tmpl_dir)
+        save_as_yaml(self.task_config.convertstate_config, self.task_config.convertstate_yaml)
+        logger.info(f"Wrote convert state YAML to: {self.task_config.convertstate_yaml}")
+
+        # generate diagb YAML file
+        logger.info(f"Generate bmat YAML file: {self.task_config.bmat_yaml}")
+        self.task_config.bmat_config = parse_j2yaml(self.task_config.BMATYAML,
+                                                    self.task_config,
+                                                    searchpath=self.gdasapp_j2tmpl_dir)
+        save_as_yaml(self.task_config.bmat_config, self.task_config.bmat_yaml)
+        logger.info(f"Wrote bmat YAML to: {self.task_config.bmat_yaml}")
+
+        # generate diffusion parameters YAML file
+        logger.info(f"Generate diffusion YAML file: {self.task_config.diffusion_yaml}")
+        self.task_config.diffusion_config = parse_j2yaml(self.task_config.DIFFUSIONYAML,
+                                                         self.task_config,
+                                                         searchpath=self.gdasapp_j2tmpl_dir)
+        save_as_yaml(self.task_config.diffusion_config, self.task_config.diffusion_yaml)
+        logger.info(f"Wrote diffusion YAML to: {self.task_config.diffusion_yaml}")
+
+        # link executable to run directory
+        self.link_bmatexe()
+        self.link_diffusion_exe()
+        self.link_jediexe()
+
+    @logit(logger)
+    def interpBackground(self) -> None:
+        chdir(self.task_config.DATA)
+
+        exec_cmd = Executable(self.task_config.APRUN_AEROANLGENB)
+        exec_name = os.path.join(self.task_config.DATA, 'gdas.x')
+        exec_cmd.add_default_arg(exec_name)
+        exec_cmd.add_default_arg('fv3jedi')
+        exec_cmd.add_default_arg('convertstate')
+        exec_cmd.add_default_arg(self.task_config.convertstate_yaml)
+
+        try:
+            logger.debug(f"Executing {exec_cmd}")
+            exec_cmd()
+        except OSError:
+            raise OSError(f"Failed to execute {exec_cmd}")
+        except Exception:
+            raise WorkflowException(f"An error occured during execution of {exec_cmd}")
+
+        pass
+
+    @logit(logger)
+    def computeVariance(self) -> None:
+
+        chdir(self.task_config.DATA)
+
+        exec_cmd = Executable(self.task_config.APRUN_AEROANLGENB)
+        exec_name = os.path.join(self.task_config.DATA, 'gdasapp_chem_diagb.x')
+        exec_cmd.add_default_arg(exec_name)
+        exec_cmd.add_default_arg(self.task_config.bmat_yaml)
+
+        try:
+            logger.debug(f"Executing {exec_cmd}")
+            exec_cmd()
+        except OSError:
+            raise OSError(f"Failed to execute {exec_cmd}")
+        except Exception:
+            raise WorkflowException(f"An error occured during execution of {exec_cmd}")
+
+        pass
+
+    @logit(logger)
+    def computeDiffusion(self) -> None:
+
+        chdir(self.task_config.DATA)
+
+        exec_cmd_diffusion = Executable(self.task_config.APRUN_AEROANLGENB)
+        exec_name_diffusion = os.path.join(self.task_config.DATA, 'gdas_fv3jedi_error_covariance_toolbox.x')
+        exec_cmd_diffusion.add_default_arg(exec_name_diffusion)
+        exec_cmd_diffusion.add_default_arg(self.task_config.diffusion_yaml)
+
+        try:
+            logger.debug(f"Executing {exec_cmd_diffusion}")
+            exec_cmd_diffusion()
+        except OSError:
+            raise OSError(f"Failed to execute {exec_cmd_diffusion}")
+        except Exception:
+            raise WorkflowException(f"An error occured during execution of {exec_cmd_diffusion}")
+
+        pass
+
+    @logit(logger)
+    def finalize(self) -> None:
+        super().finalize()
+        # save files to COMOUT
+        logger.info(f"Saving files to COMOUT based on {self.task_config.AERO_BMATRIX_FINALIZE_TMPL}")
+        aero_bmat_finalize_list = parse_j2yaml(self.task_config.AERO_BMATRIX_FINALIZE_TMPL, self.task_config)
+        FileHandler(aero_bmat_finalize_list).sync()
+
+    @logit(logger)
+    def link_jediexe(self) -> None:
+        """
+
+        This method links a JEDI executable to the run directory
+
+        Parameters
+        ----------
+        Task: GDAS task
+
+        Returns
+        ----------
+        None
+        """
+        exe_src = self.task_config.JEDIEXE
+
+        # TODO: linking is not permitted per EE2.  Needs work in JEDI to be able to copy the exec.
+        logger.info(f"Link executable {exe_src} to DATA/")
+        logger.warn("Linking is not permitted per EE2.")
+        exe_dest = os.path.join(self.task_config.DATA, os.path.basename(exe_src))
+        if os.path.exists(exe_dest):
+            rm_p(exe_dest)
+        os.symlink(exe_src, exe_dest)
+
+        return exe_dest
+
+    @logit(logger)
+    def link_bmatexe(self) -> None:
+        """
+
+        This method links a JEDI executable to the run directory
+
+        Parameters
+        ----------
+        Task: GDAS task
+
+        Returns
+        ----------
+        None
+        """
+        exe_src = self.task_config.BMATEXE
+
+        # TODO: linking is not permitted per EE2.  Needs work in JEDI to be able to copy the exec.
+        logger.info(f"Link executable {exe_src} to DATA/")
+        logger.warn("Linking is not permitted per EE2.")
+        exe_dest = os.path.join(self.task_config.DATA, os.path.basename(exe_src))
+        if os.path.exists(exe_dest):
+            rm_p(exe_dest)
+        os.symlink(exe_src, exe_dest)
+
+        return
+
+    @logit(logger)
+    def link_diffusion_exe(self) -> None:
+        """
+
+        This method links a JEDI (fv3jedi_error_covariance_toolbox.x)
+        executable to the run directory
+
+        Parameters
+        ----------
+        Task: GDAS task
+
+        Returns
+        ----------
+        None
+        """
+
+        exe_src_diffusion = self.task_config.DIFFUSIONEXE
+
+        # TODO: linking is not permitted per EE2.  Needs work in JEDI to be able to copy the exec.
+        logger.info(f"Link executable {exe_src_diffusion} to DATA/")
+        logger.warn("Linking is not permitted per EE2.")
+        exe_dest_diffusion = os.path.join(self.task_config.DATA, os.path.basename(exe_src_diffusion))
+        if os.path.exists(exe_dest_diffusion):
+            rm_p(exe_dest_diffusion)
+        os.symlink(exe_src_diffusion, exe_dest_diffusion)
+
+        return
+
+    @logit(logger)
+    def get_bkg_dict(self, task_config: Dict[str, Any]) -> Dict[str, List[str]]:
+        """Compile a dictionary of model background files to copy
+
+        This method constructs a dictionary of FV3 RESTART files (coupler, core, tracer)
+        that are needed for global aerosol DA and returns said dictionary for use by the FileHandler class.
+
+        Parameters
+        ----------
+        task_config: Dict
+            a dictionary containing all of the configuration needed for the task
+
+        Returns
+        ----------
+        bkg_dict: Dict
+            a dictionary containing the list of model background files to copy for FileHandler
+        """
+        # NOTE for now this is FV3 RESTART files and just assumed to be fh006
+
+        # get FV3 RESTART files, this will be a lot simpler when using history files
+        rst_dir = task_config.COM_ATMOS_RESTART_PREV
+        run_dir = os.path.join(task_config['DATA'], 'bkg')
+
+        # Start accumulating list of background files to copy
+        bkglist = []
+
+        # if using IAU, we can use FGAT
+        bkgtimes = []
+        begintime = task_config.previous_cycle
+        for fcsthr in task_config.aero_bkg_fhr:
+            bkgtimes.append(add_to_datetime(begintime, to_timedelta(f"{fcsthr}H")))
+
+        # now loop over background times
+        for bkgtime in bkgtimes:
+            # aerosol DA needs coupler
+            basename = f'{to_fv3time(bkgtime)}.coupler.res'
+            bkglist.append([os.path.join(rst_dir, basename), os.path.join(run_dir, basename)])
+
+            # aerosol DA only needs core/tracer
+            for ftype in ['core', 'tracer']:
+                template = f'{to_fv3time(bkgtime)}.fv_{ftype}.res.tile{{tilenum}}.nc'
+                for itile in range(1, task_config.ntiles + 1):
+                    basename = template.format(tilenum=itile)
+                    bkglist.append([os.path.join(rst_dir, basename), os.path.join(run_dir, basename)])
+
+        bkg_dict = {
+            'mkdir': [run_dir],
+            'copy': bkglist,
+        }
+        return bkg_dict
diff --git a/ush/python/pygfs/task/analysis.py b/ush/python/pygfs/task/analysis.py
index bf47b9a950..1d8b38483b 100644
--- a/ush/python/pygfs/task/analysis.py
+++ b/ush/python/pygfs/task/analysis.py
@@ -41,10 +41,6 @@ def initialize(self) -> None:
         obs_dict = self.get_obs_dict()
         FileHandler(obs_dict).sync()
 
-        # some analyses need to stage bias corrections
-        bias_dict = self.get_bias_dict()
-        FileHandler(bias_dict).sync()
-
         # link jedi executable to run directory
         self.link_jediexe()
 
@@ -127,47 +123,6 @@ def get_obs_dict(self) -> Dict[str, Any]:
         }
         return obs_dict
 
-    @logit(logger)
-    def get_bias_dict(self) -> Dict[str, Any]:
-        """Compile a dictionary of observation files to copy
-
-        This method extracts 'observers' from the JEDI yaml and from that list, extracts a list of
-        observation bias correction files that are to be copied to the run directory
-        from the component directory.
-        TODO: COM_ATMOS_ANALYSIS_PREV is hardwired here and this method is not appropriate in
-        `analysis.py` and should be implemented in the component where this is applicable.
-
-        Parameters
-        ----------
-
-        Returns
-        ----------
-        bias_dict: Dict
-            a dictionary containing the list of observation bias files to copy for FileHandler
-        """
-
-        logger.info(f"Extracting a list of bias correction files from Jedi config file")
-        observations = find_value_in_nested_dict(self.task_config.jedi_config, 'observations')
-        logger.debug(f"observations:\n{pformat(observations)}")
-
-        copylist = []
-        for ob in observations['observers']:
-            if 'obs bias' in ob.keys():
-                obfile = ob['obs bias']['input file']
-                obdir = os.path.dirname(obfile)
-                basename = os.path.basename(obfile)
-                prefix = '.'.join(basename.split('.')[:-2])
-                for file in ['satbias.nc', 'satbias_cov.nc', 'tlapse.txt']:
-                    bfile = f"{prefix}.{file}"
-                    copylist.append([os.path.join(self.task_config.COM_ATMOS_ANALYSIS_PREV, bfile), os.path.join(obdir, bfile)])
-                    # TODO: Why is this specific to ATMOS?
-
-        bias_dict = {
-            'mkdir': [os.path.join(self.task_config.DATA, 'bc')],
-            'copy': copylist
-        }
-        return bias_dict
-
     @logit(logger)
     def add_fv3_increments(self, inc_file_tmpl: str, bkg_file_tmpl: str, incvars: List) -> None:
         """Add cubed-sphere increments to cubed-sphere backgrounds
@@ -198,7 +153,7 @@ def add_fv3_increments(self, inc_file_tmpl: str, bkg_file_tmpl: str, incvars: Li
 
     @logit(logger)
     def link_jediexe(self) -> None:
-        """Compile a dictionary of background error files to copy
+        """
 
         This method links a JEDI executable to the run directory
 
diff --git a/ush/python/pygfs/task/archive.py b/ush/python/pygfs/task/archive.py
index 953a856192..d138474e9a 100644
--- a/ush/python/pygfs/task/archive.py
+++ b/ush/python/pygfs/task/archive.py
@@ -63,9 +63,6 @@ def configure(self, arch_dict: Dict[str, Any]) -> (Dict[str, Any], List[Dict[str
         if not os.path.isdir(arch_dict.ROTDIR):
             raise FileNotFoundError(f"FATAL ERROR: The ROTDIR ({arch_dict.ROTDIR}) does not exist!")
 
-        if arch_dict.RUN == "gefs":
-            raise NotImplementedError("FATAL ERROR: Archiving is not yet set up for GEFS runs")
-
         if arch_dict.RUN in ["gdas", "gfs"]:
 
             # Copy the cyclone track files and rename the experiments
@@ -75,7 +72,7 @@ def configure(self, arch_dict: Dict[str, Any]) -> (Dict[str, Any], List[Dict[str
         archive_parm = os.path.join(arch_dict.PARMgfs, "archive")
 
         # Collect the dataset to archive locally
-        arcdir_j2yaml = os.path.join(archive_parm, "arcdir.yaml.j2")
+        arcdir_j2yaml = os.path.join(archive_parm, f"{arch_dict.NET}_arcdir.yaml.j2")
 
         # Add the glob.glob function for capturing log filenames
         # TODO remove this kludge once log filenames are explicit
diff --git a/ush/python/pygfs/task/atm_analysis.py b/ush/python/pygfs/task/atm_analysis.py
index 4e9d37335c..5f67ea9d72 100644
--- a/ush/python/pygfs/task/atm_analysis.py
+++ b/ush/python/pygfs/task/atm_analysis.py
@@ -5,33 +5,49 @@
 import gzip
 import tarfile
 from logging import getLogger
-from typing import Dict, List, Any
+from pprint import pformat
+from typing import Optional, Dict, Any
 
 from wxflow import (AttrDict,
                     FileHandler,
                     add_to_datetime, to_fv3time, to_timedelta, to_YMDH,
-                    chdir,
+                    Task,
                     parse_j2yaml, save_as_yaml,
-                    logit,
-                    Executable,
-                    WorkflowException)
-from pygfs.task.analysis import Analysis
+                    logit)
+from pygfs.jedi import Jedi
 
 logger = getLogger(__name__.split('.')[-1])
 
 
-class AtmAnalysis(Analysis):
+class AtmAnalysis(Task):
     """
-    Class for global atm analysis tasks
+    Class for JEDI-based global atm analysis tasks
     """
     @logit(logger, name="AtmAnalysis")
-    def __init__(self, config):
+    def __init__(self, config: Dict[str, Any], yaml_name: Optional[str] = None):
+        """Constructor global atm analysis task
+
+        This method will construct a global atm analysis task.
+        This includes:
+        - extending the task_config attribute AttrDict to include parameters required for this task
+        - instantiate the Jedi attribute object
+
+        Parameters
+        ----------
+        config: Dict
+            dictionary object containing task configuration
+        yaml_name: str, optional
+            name of YAML file for JEDI configuration
+
+        Returns
+        ----------
+        None
+        """
         super().__init__(config)
 
         _res = int(self.task_config.CASE[1:])
         _res_anl = int(self.task_config.CASE_ANL[1:])
         _window_begin = add_to_datetime(self.task_config.current_cycle, -to_timedelta(f"{self.task_config.assim_freq}H") / 2)
-        _jedi_yaml = os.path.join(self.task_config.DATA, f"{self.task_config.RUN}.t{self.task_config.cyc:02d}z.atmvar.yaml")
 
         # Create a local dictionary that is repeatedly used across this class
         local_dict = AttrDict(
@@ -48,7 +64,6 @@ def __init__(self, config):
                 'OPREFIX': f"{self.task_config.RUN}.t{self.task_config.cyc:02d}z.",
                 'APREFIX': f"{self.task_config.RUN}.t{self.task_config.cyc:02d}z.",
                 'GPREFIX': f"gdas.t{self.task_config.previous_cycle.hour:02d}z.",
-                'jedi_yaml': _jedi_yaml,
                 'atm_obsdatain_path': f"{self.task_config.DATA}/obs/",
                 'atm_obsdataout_path': f"{self.task_config.DATA}/diags/",
                 'BKG_TSTEP': "PT1H"  # Placeholder for 4D applications
@@ -58,30 +73,94 @@ def __init__(self, config):
         # Extend task_config with local_dict
         self.task_config = AttrDict(**self.task_config, **local_dict)
 
+        # Create JEDI object
+        self.jedi = Jedi(self.task_config, yaml_name)
+
+    @logit(logger)
+    def initialize_jedi(self):
+        """Initialize JEDI application
+
+        This method will initialize a JEDI application used in the global atm analysis.
+        This includes:
+        - generating and saving JEDI YAML config
+        - linking the JEDI executable
+
+        Parameters
+        ----------
+        None
+
+        Returns
+        ----------
+        None
+        """
+
+        # get JEDI-to-FV3 increment converter config and save to YAML file
+        logger.info(f"Generating JEDI YAML config: {self.jedi.yaml}")
+        self.jedi.set_config(self.task_config)
+        logger.debug(f"JEDI config:\n{pformat(self.jedi.config)}")
+
+        # save JEDI config to YAML file
+        logger.debug(f"Writing JEDI YAML config to: {self.jedi.yaml}")
+        save_as_yaml(self.jedi.config, self.jedi.yaml)
+
+        # link JEDI executable
+        logger.info(f"Linking JEDI executable {self.task_config.JEDIEXE} to {self.jedi.exe}")
+        self.jedi.link_exe(self.task_config)
+
     @logit(logger)
-    def initialize(self: Analysis) -> None:
+    def initialize_analysis(self) -> None:
         """Initialize a global atm analysis
 
-        This method will initialize a global atm analysis using JEDI.
+        This method will initialize a global atm analysis.
         This includes:
+        - staging observation files
+        - staging bias correction files
         - staging CRTM fix files
         - staging FV3-JEDI fix files
         - staging B error files
         - staging model backgrounds
-        - generating a YAML file for the JEDI executable
         - creating output directories
+
+        Parameters
+        ----------
+        None
+
+        Returns
+        ----------
+        None
         """
         super().initialize()
 
+        # stage observations
+        logger.info(f"Staging list of observation files generated from JEDI config")
+        obs_dict = self.jedi.get_obs_dict(self.task_config)
+        FileHandler(obs_dict).sync()
+        logger.debug(f"Observation files:\n{pformat(obs_dict)}")
+
+        # stage bias corrections
+        logger.info(f"Staging list of bias correction files generated from JEDI config")
+        self.task_config.VarBcDir = f"{self.task_config.COM_ATMOS_ANALYSIS_PREV}"
+        bias_file = f"rad_varbc_params.tar"
+        bias_dict = self.jedi.get_bias_dict(self.task_config, bias_file)
+        FileHandler(bias_dict).sync()
+        logger.debug(f"Bias correction files:\n{pformat(bias_dict)}")
+
+        # extract bias corrections
+        tar_file = os.path.join(self.task_config.DATA, 'obs', f"{self.task_config.GPREFIX}{bias_file}")
+        logger.info(f"Extract bias correction files from {tar_file}")
+        self.jedi.extract_tar(tar_file)
+
         # stage CRTM fix files
         logger.info(f"Staging CRTM fix files from {self.task_config.CRTM_FIX_YAML}")
-        crtm_fix_list = parse_j2yaml(self.task_config.CRTM_FIX_YAML, self.task_config)
-        FileHandler(crtm_fix_list).sync()
+        crtm_fix_dict = parse_j2yaml(self.task_config.CRTM_FIX_YAML, self.task_config)
+        FileHandler(crtm_fix_dict).sync()
+        logger.debug(f"CRTM fix files:\n{pformat(crtm_fix_dict)}")
 
         # stage fix files
         logger.info(f"Staging JEDI fix files from {self.task_config.JEDI_FIX_YAML}")
-        jedi_fix_list = parse_j2yaml(self.task_config.JEDI_FIX_YAML, self.task_config)
-        FileHandler(jedi_fix_list).sync()
+        jedi_fix_dict = parse_j2yaml(self.task_config.JEDI_FIX_YAML, self.task_config)
+        FileHandler(jedi_fix_dict).sync()
+        logger.debug(f"JEDI fix files:\n{pformat(jedi_fix_dict)}")
 
         # stage static background error files, otherwise it will assume ID matrix
         logger.info(f"Stage files for STATICB_TYPE {self.task_config.STATICB_TYPE}")
@@ -90,22 +169,20 @@ def initialize(self: Analysis) -> None:
         else:
             berror_staging_dict = {}
         FileHandler(berror_staging_dict).sync()
+        logger.debug(f"Background error files:\n{pformat(berror_staging_dict)}")
 
         # stage ensemble files for use in hybrid background error
         if self.task_config.DOHYBVAR:
             logger.debug(f"Stage ensemble files for DOHYBVAR {self.task_config.DOHYBVAR}")
             fv3ens_staging_dict = parse_j2yaml(self.task_config.FV3ENS_STAGING_YAML, self.task_config)
             FileHandler(fv3ens_staging_dict).sync()
+            logger.debug(f"Ensemble files:\n{pformat(fv3ens_staging_dict)}")
 
         # stage backgrounds
         logger.info(f"Staging background files from {self.task_config.VAR_BKG_STAGING_YAML}")
         bkg_staging_dict = parse_j2yaml(self.task_config.VAR_BKG_STAGING_YAML, self.task_config)
         FileHandler(bkg_staging_dict).sync()
-
-        # generate variational YAML file
-        logger.debug(f"Generate variational YAML file: {self.task_config.jedi_yaml}")
-        save_as_yaml(self.task_config.jedi_config, self.task_config.jedi_yaml)
-        logger.info(f"Wrote variational YAML to: {self.task_config.jedi_yaml}")
+        logger.debug(f"Background files:\n{pformat(bkg_staging_dict)}")
 
         # need output dir for diags and anl
         logger.debug("Create empty output [anl, diags] directories to receive output from executable")
@@ -116,54 +193,32 @@ def initialize(self: Analysis) -> None:
         FileHandler({'mkdir': newdirs}).sync()
 
     @logit(logger)
-    def variational(self: Analysis) -> None:
-
-        chdir(self.task_config.DATA)
-
-        exec_cmd = Executable(self.task_config.APRUN_ATMANLVAR)
-        exec_name = os.path.join(self.task_config.DATA, 'gdas.x')
-        exec_cmd.add_default_arg(exec_name)
-        exec_cmd.add_default_arg('fv3jedi')
-        exec_cmd.add_default_arg('variational')
-        exec_cmd.add_default_arg(self.task_config.jedi_yaml)
+    def execute(self, aprun_cmd: str, jedi_args: Optional[str] = None) -> None:
+        """Run JEDI executable
 
-        try:
-            logger.debug(f"Executing {exec_cmd}")
-            exec_cmd()
-        except OSError:
-            raise OSError(f"Failed to execute {exec_cmd}")
-        except Exception:
-            raise WorkflowException(f"An error occured during execution of {exec_cmd}")
+        This method will run JEDI executables for the global atm analysis
 
-        pass
+        Parameters
+        ----------
+        aprun_cmd : str
+           Run command for JEDI application on HPC system
+        jedi_args : List
+           List of additional optional arguments for JEDI application
 
-    @logit(logger)
-    def init_fv3_increment(self: Analysis) -> None:
-        # Setup JEDI YAML file
-        self.task_config.jedi_yaml = os.path.join(self.task_config.DATA,
-                                                  f"{self.task_config.JCB_ALGO}.yaml")
-        save_as_yaml(self.get_jedi_config(self.task_config.JCB_ALGO), self.task_config.jedi_yaml)
+        Returns
+        ----------
+        None
+        """
 
-        # Link JEDI executable to run directory
-        self.task_config.jedi_exe = self.link_jediexe()
+        if jedi_args:
+            logger.info(f"Executing {self.jedi.exe} {' '.join(jedi_args)} {self.jedi.yaml}")
+        else:
+            logger.info(f"Executing {self.jedi.exe} {self.jedi.yaml}")
 
-    @logit(logger)
-    def fv3_increment(self: Analysis) -> None:
-        # Run executable
-        exec_cmd = Executable(self.task_config.APRUN_ATMANLFV3INC)
-        exec_cmd.add_default_arg(self.task_config.jedi_exe)
-        exec_cmd.add_default_arg(self.task_config.jedi_yaml)
-
-        try:
-            logger.debug(f"Executing {exec_cmd}")
-            exec_cmd()
-        except OSError:
-            raise OSError(f"Failed to execute {exec_cmd}")
-        except Exception:
-            raise WorkflowException(f"An error occured during execution of {exec_cmd}")
+        self.jedi.execute(self.task_config, aprun_cmd, jedi_args)
 
     @logit(logger)
-    def finalize(self: Analysis) -> None:
+    def finalize(self) -> None:
         """Finalize a global atm analysis
 
         This method will finalize a global atm analysis using JEDI.
@@ -171,9 +226,16 @@ def finalize(self: Analysis) -> None:
         - tar output diag files and place in ROTDIR
         - copy the generated YAML file from initialize to the ROTDIR
         - copy the updated bias correction files to ROTDIR
-        - write UFS model readable atm incrment file
 
+        Parameters
+        ----------
+        None
+
+        Returns
+        ----------
+        None
         """
+
         # ---- tar up diags
         # path of output tar statfile
         atmstat = os.path.join(self.task_config.COM_ATMOS_ANALYSIS, f"{self.task_config.APREFIX}atmstat")
@@ -196,48 +258,48 @@ def finalize(self: Analysis) -> None:
                 diaggzip = f"{diagfile}.gz"
                 archive.add(diaggzip, arcname=os.path.basename(diaggzip))
 
+        # get list of yamls to copy to ROTDIR
+        yamls = glob.glob(os.path.join(self.task_config.DATA, '*atm*yaml'))
+
         # copy full YAML from executable to ROTDIR
-        logger.info(f"Copying {self.task_config.jedi_yaml} to {self.task_config.COM_ATMOS_ANALYSIS}")
-        src = os.path.join(self.task_config.DATA, f"{self.task_config.RUN}.t{self.task_config.cyc:02d}z.atmvar.yaml")
-        dest = os.path.join(self.task_config.COM_ATMOS_ANALYSIS, f"{self.task_config.RUN}.t{self.task_config.cyc:02d}z.atmvar.yaml")
-        logger.debug(f"Copying {src} to {dest}")
-        yaml_copy = {
-            'mkdir': [self.task_config.COM_ATMOS_ANALYSIS],
-            'copy': [[src, dest]]
-        }
-        FileHandler(yaml_copy).sync()
-
-        # copy bias correction files to ROTDIR
-        logger.info("Copy bias correction files from DATA/ to COM/")
-        biasdir = os.path.join(self.task_config.DATA, 'bc')
-        biasls = os.listdir(biasdir)
-        biaslist = []
-        for bfile in biasls:
-            src = os.path.join(biasdir, bfile)
-            dest = os.path.join(self.task_config.COM_ATMOS_ANALYSIS, bfile)
-            biaslist.append([src, dest])
-
-        gprefix = f"{self.task_config.GPREFIX}"
-        gsuffix = f"{to_YMDH(self.task_config.previous_cycle)}" + ".txt"
-        aprefix = f"{self.task_config.APREFIX}"
-        asuffix = f"{to_YMDH(self.task_config.current_cycle)}" + ".txt"
-
-        logger.info(f"Copying {gprefix}*{gsuffix} from DATA/ to COM/ as {aprefix}*{asuffix}")
-        obsdir = os.path.join(self.task_config.DATA, 'obs')
-        obsls = os.listdir(obsdir)
-        for ofile in obsls:
-            if ofile.endswith(".txt"):
-                src = os.path.join(obsdir, ofile)
-                tfile = ofile.replace(gprefix, aprefix)
-                tfile = tfile.replace(gsuffix, asuffix)
-                dest = os.path.join(self.task_config.COM_ATMOS_ANALYSIS, tfile)
-                biaslist.append([src, dest])
-
-        bias_copy = {
-            'mkdir': [self.task_config.COM_ATMOS_ANALYSIS],
-            'copy': biaslist,
+        for src in yamls:
+            yaml_base = os.path.splitext(os.path.basename(src))[0]
+            dest_yaml_name = f"{self.task_config.RUN}.t{self.task_config.cyc:02d}z.{yaml_base}.yaml"
+            dest = os.path.join(self.task_config.COM_ATMOS_ANALYSIS, dest_yaml_name)
+            logger.debug(f"Copying {src} to {dest}")
+            yaml_copy = {
+                'copy': [[src, dest]]
+            }
+            FileHandler(yaml_copy).sync()
+
+        # path of output radiance bias correction tarfile
+        bfile = f"{self.task_config.APREFIX}rad_varbc_params.tar"
+        radtar = os.path.join(self.task_config.COM_ATMOS_ANALYSIS, bfile)
+
+        # rename and copy tlapse radiance bias correction files from obs to bc
+        tlapobs = glob.glob(os.path.join(self.task_config.DATA, 'obs', '*tlapse.txt'))
+        copylist = []
+        for tlapfile in tlapobs:
+            obsfile = os.path.basename(tlapfile).split('.', 2)
+            newfile = f"{self.task_config.APREFIX}{obsfile[2]}"
+            copylist.append([tlapfile, os.path.join(self.task_config.DATA, 'bc', newfile)])
+        tlapse_dict = {
+            'copy': copylist
         }
-        FileHandler(bias_copy).sync()
+        FileHandler(tlapse_dict).sync()
+
+        # get lists of radiance bias correction files to add to tarball
+        satlist = glob.glob(os.path.join(self.task_config.DATA, 'bc', '*satbias*nc'))
+        tlaplist = glob.glob(os.path.join(self.task_config.DATA, 'bc', '*tlapse.txt'))
+
+        # tar radiance bias correction files to ROTDIR
+        logger.info(f"Creating radiance bias correction tar file {radtar}")
+        with tarfile.open(radtar, 'w') as radbcor:
+            for satfile in satlist:
+                radbcor.add(satfile, arcname=os.path.basename(satfile))
+            for tlapfile in tlaplist:
+                radbcor.add(tlapfile, arcname=os.path.basename(tlapfile))
+            logger.info(f"Add {radbcor.getnames()}")
 
         # Copy FV3 atm increment to comrot directory
         logger.info("Copy UFS model readable atm increment file")
diff --git a/ush/python/pygfs/task/atmens_analysis.py b/ush/python/pygfs/task/atmens_analysis.py
index 2e51f82d59..4b2f8ebbf4 100644
--- a/ush/python/pygfs/task/atmens_analysis.py
+++ b/ush/python/pygfs/task/atmens_analysis.py
@@ -5,34 +5,52 @@
 import gzip
 import tarfile
 from logging import getLogger
-from typing import Dict, List
+from pprint import pformat
+from typing import Optional, Dict, Any
 
 from wxflow import (AttrDict,
                     FileHandler,
                     add_to_datetime, to_fv3time, to_timedelta, to_YMDH, to_YMD,
                     chdir,
+                    Task,
                     parse_j2yaml, save_as_yaml,
                     logit,
                     Executable,
                     WorkflowException,
                     Template, TemplateConstants)
-from pygfs.task.analysis import Analysis
-from jcb import render
+from pygfs.jedi import Jedi
 
 logger = getLogger(__name__.split('.')[-1])
 
 
-class AtmEnsAnalysis(Analysis):
+class AtmEnsAnalysis(Task):
     """
-    Class for global atmens analysis tasks
+    Class for JEDI-based global atmens analysis tasks
     """
     @logit(logger, name="AtmEnsAnalysis")
-    def __init__(self, config):
+    def __init__(self, config: Dict[str, Any], yaml_name: Optional[str] = None):
+        """Constructor global atmens analysis task
+
+        This method will construct a global atmens analysis task.
+        This includes:
+        - extending the task_config attribute AttrDict to include parameters required for this task
+        - instantiate the Jedi attribute object
+
+        Parameters
+        ----------
+        config: Dict
+            dictionary object containing task configuration
+        yaml_name: str, optional
+            name of YAML file for JEDI configuration
+
+        Returns
+        ----------
+        None
+        """
         super().__init__(config)
 
         _res = int(self.task_config.CASE_ENS[1:])
         _window_begin = add_to_datetime(self.task_config.current_cycle, -to_timedelta(f"{self.task_config.assim_freq}H") / 2)
-        _jedi_yaml = os.path.join(self.task_config.DATA, f"{self.task_config.RUN}.t{self.task_config.cyc:02d}z.atmens.yaml")
 
         # Create a local dictionary that is repeatedly used across this class
         local_dict = AttrDict(
@@ -46,7 +64,6 @@ def __init__(self, config):
                 'OPREFIX': f"{self.task_config.EUPD_CYC}.t{self.task_config.cyc:02d}z.",
                 'APREFIX': f"{self.task_config.RUN}.t{self.task_config.cyc:02d}z.",
                 'GPREFIX': f"gdas.t{self.task_config.previous_cycle.hour:02d}z.",
-                'jedi_yaml': _jedi_yaml,
                 'atm_obsdatain_path': f"./obs/",
                 'atm_obsdataout_path': f"./diags/",
                 'BKG_TSTEP': "PT1H"  # Placeholder for 4D applications
@@ -56,21 +73,56 @@ def __init__(self, config):
         # Extend task_config with local_dict
         self.task_config = AttrDict(**self.task_config, **local_dict)
 
+        # Create JEDI object
+        self.jedi = Jedi(self.task_config, yaml_name)
+
     @logit(logger)
-    def initialize(self: Analysis) -> None:
+    def initialize_jedi(self):
+        """Initialize JEDI application
+
+        This method will initialize a JEDI application used in the global atmens analysis.
+        This includes:
+        - generating and saving JEDI YAML config
+        - linking the JEDI executable
+
+        Parameters
+        ----------
+        None
+
+        Returns
+        ----------
+        None
+        """
+
+        # get JEDI config and save to YAML file
+        logger.info(f"Generating JEDI config: {self.jedi.yaml}")
+        self.jedi.set_config(self.task_config)
+        logger.debug(f"JEDI config:\n{pformat(self.jedi.config)}")
+
+        # save JEDI config to YAML file
+        logger.info(f"Writing JEDI config to YAML file: {self.jedi.yaml}")
+        save_as_yaml(self.jedi.config, self.jedi.yaml)
+
+        # link JEDI-to-FV3 increment converter executable
+        logger.info(f"Linking JEDI executable {self.task_config.JEDIEXE} to {self.jedi.exe}")
+        self.jedi.link_exe(self.task_config)
+
+    @logit(logger)
+    def initialize_analysis(self) -> None:
         """Initialize a global atmens analysis
 
-        This method will initialize a global atmens analysis using JEDI.
+        This method will initialize a global atmens analysis.
         This includes:
+        - staging observation files
+        - staging bias correction files
         - staging CRTM fix files
         - staging FV3-JEDI fix files
         - staging model backgrounds
-        - generating a YAML file for the JEDI executable
         - creating output directories
 
         Parameters
         ----------
-        Analysis: parent class for GDAS task
+        None
 
         Returns
         ----------
@@ -78,26 +130,42 @@ def initialize(self: Analysis) -> None:
         """
         super().initialize()
 
+        # stage observations
+        logger.info(f"Staging list of observation files generated from JEDI config")
+        obs_dict = self.jedi.get_obs_dict(self.task_config)
+        FileHandler(obs_dict).sync()
+        logger.debug(f"Observation files:\n{pformat(obs_dict)}")
+
+        # stage bias corrections
+        logger.info(f"Staging list of bias correction files generated from JEDI config")
+        self.task_config.VarBcDir = f"{self.task_config.COM_ATMOS_ANALYSIS_PREV}"
+        bias_file = f"rad_varbc_params.tar"
+        bias_dict = self.jedi.get_bias_dict(self.task_config, bias_file)
+        FileHandler(bias_dict).sync()
+        logger.debug(f"Bias correction files:\n{pformat(bias_dict)}")
+
+        # extract bias corrections
+        tar_file = os.path.join(self.task_config.DATA, 'obs', f"{self.task_config.GPREFIX}{bias_file}")
+        logger.info(f"Extract bias correction files from {tar_file}")
+        self.jedi.extract_tar(tar_file)
+
         # stage CRTM fix files
         logger.info(f"Staging CRTM fix files from {self.task_config.CRTM_FIX_YAML}")
-        crtm_fix_list = parse_j2yaml(self.task_config.CRTM_FIX_YAML, self.task_config)
-        FileHandler(crtm_fix_list).sync()
+        crtm_fix_dict = parse_j2yaml(self.task_config.CRTM_FIX_YAML, self.task_config)
+        FileHandler(crtm_fix_dict).sync()
+        logger.debug(f"CRTM fix files:\n{pformat(crtm_fix_dict)}")
 
         # stage fix files
         logger.info(f"Staging JEDI fix files from {self.task_config.JEDI_FIX_YAML}")
-        jedi_fix_list = parse_j2yaml(self.task_config.JEDI_FIX_YAML, self.task_config)
-        FileHandler(jedi_fix_list).sync()
+        jedi_fix_dict = parse_j2yaml(self.task_config.JEDI_FIX_YAML, self.task_config)
+        FileHandler(jedi_fix_dict).sync()
+        logger.debug(f"JEDI fix files:\n{pformat(jedi_fix_dict)}")
 
         # stage backgrounds
         logger.info(f"Stage ensemble member background files")
         bkg_staging_dict = parse_j2yaml(self.task_config.LGETKF_BKG_STAGING_YAML, self.task_config)
         FileHandler(bkg_staging_dict).sync()
-
-        # generate ensemble da YAML file
-        if not self.task_config.lobsdiag_forenkf:
-            logger.debug(f"Generate ensemble da YAML file: {self.task_config.jedi_yaml}")
-            save_as_yaml(self.task_config.jedi_config, self.task_config.jedi_yaml)
-            logger.info(f"Wrote ensemble da YAML to: {self.task_config.jedi_yaml}")
+        logger.debug(f"Ensemble member background files:\n{pformat(bkg_staging_dict)}")
 
         # need output dir for diags and anl
         logger.debug("Create empty output [anl, diags] directories to receive output from executable")
@@ -108,187 +176,47 @@ def initialize(self: Analysis) -> None:
         FileHandler({'mkdir': newdirs}).sync()
 
     @logit(logger)
-    def observe(self: Analysis) -> None:
-        """Execute a global atmens analysis in observer mode
-
-        This method will execute a global atmens analysis in observer mode using JEDI.
-        This includes:
-        - changing to the run directory
-        - running the global atmens analysis executable in observer mode
-
-        Parameters
-        ----------
-        Analysis: parent class for GDAS task
-
-        Returns
-        ----------
-        None
-        """
-        chdir(self.task_config.DATA)
-
-        exec_cmd = Executable(self.task_config.APRUN_ATMENSANLOBS)
-        exec_name = os.path.join(self.task_config.DATA, 'gdas.x')
-
-        exec_cmd.add_default_arg(exec_name)
-        exec_cmd.add_default_arg('fv3jedi')
-        exec_cmd.add_default_arg('localensembleda')
-        exec_cmd.add_default_arg(self.task_config.jedi_yaml)
-
-        try:
-            logger.debug(f"Executing {exec_cmd}")
-            exec_cmd()
-        except OSError:
-            raise OSError(f"Failed to execute {exec_cmd}")
-        except Exception:
-            raise WorkflowException(f"An error occured during execution of {exec_cmd}")
-
-        pass
-
-    @logit(logger)
-    def solve(self: Analysis) -> None:
-        """Execute a global atmens analysis in solver mode
+    def execute(self, aprun_cmd: str, jedi_args: Optional[str] = None) -> None:
+        """Run JEDI executable
 
-        This method will execute a global atmens analysis in solver mode using JEDI.
-        This includes:
-        - changing to the run directory
-        - running the global atmens analysis executable in solver mode
+        This method will run JEDI executables for the global atmens analysis
 
         Parameters
         ----------
-        Analysis: parent class for GDAS task
-
+        aprun_cmd : str
+           Run command for JEDI application on HPC system
+        jedi_args : List
+           List of additional optional arguments for JEDI application
         Returns
         ----------
         None
         """
-        chdir(self.task_config.DATA)
-
-        exec_cmd = Executable(self.task_config.APRUN_ATMENSANLSOL)
-        exec_name = os.path.join(self.task_config.DATA, 'gdas.x')
-
-        exec_cmd.add_default_arg(exec_name)
-        exec_cmd.add_default_arg('fv3jedi')
-        exec_cmd.add_default_arg('localensembleda')
-        exec_cmd.add_default_arg(self.task_config.jedi_yaml)
 
-        try:
-            logger.debug(f"Executing {exec_cmd}")
-            exec_cmd()
-        except OSError:
-            raise OSError(f"Failed to execute {exec_cmd}")
-        except Exception:
-            raise WorkflowException(f"An error occured during execution of {exec_cmd}")
+        if jedi_args:
+            logger.info(f"Executing {self.jedi.exe} {' '.join(jedi_args)} {self.jedi.yaml}")
+        else:
+            logger.info(f"Executing {self.jedi.exe} {self.jedi.yaml}")
 
-        pass
+        self.jedi.execute(self.task_config, aprun_cmd, jedi_args)
 
     @logit(logger)
-    def letkf(self: Analysis) -> None:
-        """Execute a global atmens analysis
-
-        This method will execute a global atmens analysis using JEDI.
-        This includes:
-        - changing to the run directory
-        - running the global atmens analysis executable
-
-        Parameters
-        ----------
-        Analysis: parent class for GDAS task
-
-        Returns
-        ----------
-        None
-        """
-        chdir(self.task_config.DATA)
-
-        exec_cmd = Executable(self.task_config.APRUN_ATMENSANLLETKF)
-        exec_name = os.path.join(self.task_config.DATA, 'gdas.x')
-
-        exec_cmd.add_default_arg(exec_name)
-        exec_cmd.add_default_arg('fv3jedi')
-        exec_cmd.add_default_arg('localensembleda')
-        exec_cmd.add_default_arg(self.task_config.jedi_yaml)
-
-        try:
-            logger.debug(f"Executing {exec_cmd}")
-            exec_cmd()
-        except OSError:
-            raise OSError(f"Failed to execute {exec_cmd}")
-        except Exception:
-            raise WorkflowException(f"An error occured during execution of {exec_cmd}")
-
-        pass
-
-    @logit(logger)
-    def init_observer(self: Analysis) -> None:
-        # Setup JEDI YAML file
-        jcb_config = parse_j2yaml(self.task_config.JCB_BASE_YAML, self.task_config)
-        jcb_algo_config = parse_j2yaml(self.task_config.JCB_ALGO_YAML, self.task_config)
-        jcb_config.update(jcb_algo_config)
-        jedi_config = render(jcb_config)
-
-        self.task_config.jedi_yaml = os.path.join(self.task_config.DATA, f"{self.task_config.RUN}.t{self.task_config.cyc:02d}z.atmens_observer.yaml")
-
-        logger.debug(f"Generate ensemble da observer YAML file: {self.task_config.jedi_yaml}")
-        save_as_yaml(jedi_config, self.task_config.jedi_yaml)
-        logger.info(f"Wrote ensemble da observer YAML to: {self.task_config.jedi_yaml}")
-
-    @logit(logger)
-    def init_solver(self: Analysis) -> None:
-        # Setup JEDI YAML file
-        jcb_config = parse_j2yaml(self.task_config.JCB_BASE_YAML, self.task_config)
-        jcb_algo_config = parse_j2yaml(self.task_config.JCB_ALGO_YAML, self.task_config)
-        jcb_config.update(jcb_algo_config)
-        jedi_config = render(jcb_config)
-
-        self.task_config.jedi_yaml = os.path.join(self.task_config.DATA, f"{self.task_config.RUN}.t{self.task_config.cyc:02d}z.atmens_solver.yaml")
-
-        logger.debug(f"Generate ensemble da solver YAML file: {self.task_config.jedi_yaml}")
-        save_as_yaml(jedi_config, self.task_config.jedi_yaml)
-        logger.info(f"Wrote ensemble da solver YAML to: {self.task_config.jedi_yaml}")
-
-    @logit(logger)
-    def init_fv3_increment(self: Analysis) -> None:
-        # Setup JEDI YAML file
-        self.task_config.jedi_yaml = os.path.join(self.task_config.DATA,
-                                                  f"{self.task_config.JCB_ALGO}.yaml")
-        save_as_yaml(self.get_jedi_config(self.task_config.JCB_ALGO), self.task_config.jedi_yaml)
-
-        # Link JEDI executable to run directory
-        self.task_config.jedi_exe = self.link_jediexe()
-
-    @logit(logger)
-    def fv3_increment(self: Analysis) -> None:
-        # Run executable
-        exec_cmd = Executable(self.task_config.APRUN_ATMENSANLFV3INC)
-        exec_cmd.add_default_arg(self.task_config.jedi_exe)
-        exec_cmd.add_default_arg(self.task_config.jedi_yaml)
-
-        try:
-            logger.debug(f"Executing {exec_cmd}")
-            exec_cmd()
-        except OSError:
-            raise OSError(f"Failed to execute {exec_cmd}")
-        except Exception:
-            raise WorkflowException(f"An error occured during execution of {exec_cmd}")
-
-    @logit(logger)
-    def finalize(self: Analysis) -> None:
+    def finalize(self) -> None:
         """Finalize a global atmens analysis
 
         This method will finalize a global atmens analysis using JEDI.
         This includes:
         - tar output diag files and place in ROTDIR
         - copy the generated YAML file from initialize to the ROTDIR
-        - write UFS model readable atm incrment file
 
         Parameters
         ----------
-        Analysis: parent class for GDAS task
+        None
 
         Returns
         ----------
         None
         """
+
         # ---- tar up diags
         # path of output tar statfile
         atmensstat = os.path.join(self.task_config.COM_ATMOS_ANALYSIS_ENS, f"{self.task_config.APREFIX}atmensstat")
@@ -317,7 +245,9 @@ def finalize(self: Analysis) -> None:
         # copy full YAML from executable to ROTDIR
         for src in yamls:
             logger.info(f"Copying {src} to {self.task_config.COM_ATMOS_ANALYSIS_ENS}")
-            dest = os.path.join(self.task_config.COM_ATMOS_ANALYSIS_ENS, os.path.basename(src))
+            yaml_base = os.path.splitext(os.path.basename(src))[0]
+            dest_yaml_name = f"{self.task_config.RUN}.t{self.task_config.cyc:02d}z.{yaml_base}.yaml"
+            dest = os.path.join(self.task_config.COM_ATMOS_ANALYSIS_ENS, dest_yaml_name)
             logger.debug(f"Copying {src} to {dest}")
             yaml_copy = {
                 'copy': [[src, dest]]
@@ -337,6 +267,7 @@ def finalize(self: Analysis) -> None:
         logger.info("Copy UFS model readable atm increment file")
         cdate = to_fv3time(self.task_config.current_cycle)
         cdate_inc = cdate.replace('.', '_')
+
         # loop over ensemble members
         for imem in range(1, self.task_config.NMEM_ENS + 1):
             memchar = f"mem{imem:03d}"
diff --git a/ush/python/pygfs/task/bmatrix.py b/ush/python/pygfs/task/bmatrix.py
new file mode 100644
index 0000000000..d0edba2358
--- /dev/null
+++ b/ush/python/pygfs/task/bmatrix.py
@@ -0,0 +1,28 @@
+#!/usr/bin/env python3
+
+import os
+from logging import getLogger
+from typing import List, Dict, Any, Union
+
+from wxflow import (parse_j2yaml, FileHandler, logit,
+                    Task, Executable, WorkflowException)
+
+logger = getLogger(__name__.split('.')[-1])
+
+
+class BMatrix(Task):
+    """Parent class for GDAS BMatrix tasks
+
+    The BMatrix class is the parent class for all
+    Global Data Assimilation System (GDAS) BMatrix tasks
+    """
+    def __init__(self, config: Dict[str, Any]) -> None:
+        super().__init__(config)
+        # Store location of GDASApp jinja2 templates
+        self.gdasapp_j2tmpl_dir = os.path.join(self.task_config.PARMgfs, 'gdas')
+
+    def initialize(self) -> None:
+        super().initialize()
+
+    def finalize(self) -> None:
+        super().finalize()
diff --git a/ush/python/pygfs/task/marine_analysis.py b/ush/python/pygfs/task/marine_analysis.py
new file mode 100644
index 0000000000..5efa65f7d4
--- /dev/null
+++ b/ush/python/pygfs/task/marine_analysis.py
@@ -0,0 +1,483 @@
+#!/usr/bin/env python3
+
+import copy
+import os
+from logging import getLogger
+import pygfs.utils.marine_da_utils as mdau
+import glob
+import re
+import netCDF4
+import yaml
+from jcb import render
+
+from wxflow import (AttrDict,
+                    FileHandler,
+                    add_to_datetime, to_timedelta, to_YMD,
+                    parse_j2yaml,
+                    logit,
+                    Executable,
+                    Task,
+                    save_as_yaml,
+                    Template, TemplateConstants, YAMLFile)
+
+logger = getLogger(__name__.split('.')[-1])
+
+
+def parse_obs_list_file(obs_list_yaml_path):
+    # Get the list of observation types from the obs_list.yaml
+    obs_types = []
+    with open(obs_list_yaml_path, 'r') as file:
+        for line in file:
+            # Remove leading/trailing whitespace and check if the line is uncommented
+            line = line.strip()
+            if line.startswith('- !INC') and not line.startswith('#'):
+                # Extract the type using regex
+                match = re.search(r'\$\{MARINE_OBS_YAML_DIR\}/(.+)\.yaml', line)
+                if match:
+                    obs_types.append(str(match.group(1)))
+    return obs_types
+
+
+class MarineAnalysis(Task):
+    """
+    Class for global marine analysis tasks
+    """
+    @logit(logger, name="MarineAnalysis")
+    def __init__(self, config):
+        super().__init__(config)
+        _calc_scale_exec = os.path.join(self.task_config.HOMEgfs, 'ush', 'soca', 'calc_scales.py')
+        _window_begin = add_to_datetime(self.task_config.current_cycle, -to_timedelta(f"{self.task_config.assim_freq}H") / 2)
+        _window_end = add_to_datetime(self.task_config.current_cycle, to_timedelta(f"{self.task_config.assim_freq}H") / 2)
+
+        # compute the relative path from self.task_config.DATA to self.task_config.DATAenspert
+        if self.task_config.NMEM_ENS > 0:
+            _enspert_relpath = os.path.relpath(self.task_config.DATAenspert, self.task_config.DATA)
+        else:
+            _enspert_relpath = None
+
+        # Create a local dictionary that is repeatedly used across this class
+        local_dict = AttrDict(
+            {
+                'PARMsoca': os.path.join(self.task_config.PARMgfs, 'gdas', 'soca'),
+                'MARINE_WINDOW_BEGIN': _window_begin,
+                'MARINE_WINDOW_BEGIN_ISO': _window_begin.strftime('%Y-%m-%dT%H:%M:%SZ'),
+                'MARINE_WINDOW_END': _window_end,
+                'MARINE_WINDOW_LENGTH': f"PT{self.task_config['assim_freq']}H",
+                'MARINE_WINDOW_MIDDLE': self.task_config.current_cycle,
+                'MARINE_WINDOW_MIDDLE_ISO': self.task_config.current_cycle.strftime('%Y-%m-%dT%H:%M:%SZ'),
+                'ENSPERT_RELPATH': _enspert_relpath,
+                'CALC_SCALE_EXEC': _calc_scale_exec,
+                'OPREFIX': f"{self.task_config.RUN}.t{self.task_config.cyc:02d}z."
+            }
+        )
+
+        # Extend task_config with local_dict
+        self.task_config.update(local_dict)
+
+    @logit(logger)
+    def initialize(self: Task) -> None:
+        """Initialize the marine analysis
+
+        This method will initialize the marine analysis.
+        This includes:
+        - staging the deterministic backgrounds (middle of window)
+        - staging SOCA fix files
+        - staging static ensemble members (optional)
+        - staging ensemble members (optional)
+        - generating the YAML files for the JEDI and GDASApp executables
+        - creating output directories
+        """
+        super().initialize()
+
+        # prepare the directory structure to run SOCA
+        self._prep_scratch_dir()
+
+        # fetch observations from COMROOT
+        # TODO(G.V. or A.E.): Keep a copy of the obs in the scratch fs after the obs prep job
+        self._fetch_observations()
+
+        # stage the ocean and ice backgrounds for FGAT
+        bkg_list = parse_j2yaml(self.task_config.MARINE_DET_STAGE_BKG_YAML_TMPL, self.task_config)
+        FileHandler(bkg_list).sync()
+
+        # stage the soca grid
+        FileHandler({'copy': [[os.path.join(self.task_config.COMIN_OCEAN_BMATRIX, 'soca_gridspec.nc'),
+                               os.path.join(self.task_config.DATA, 'soca_gridspec.nc')]]}).sync()
+
+        # link the flow dependent static B resources from the B-matrix task of the same cycle
+        os.symlink('../staticb', 'staticb')
+
+        # hybrid EnVAR case
+        if self.task_config.DOHYBVAR == "YES" or self.task_config.NMEM_ENS > 2:
+            # stage ensemble membersfiles for use in hybrid background error
+            logger.debug(f"Stage ensemble members for the hybrid background error")
+            mdau.stage_ens_mem(self.task_config)
+
+        # prepare the yaml configuration to run the SOCA variational application
+        self._prep_variational_yaml()
+
+        # prepare the yaml configuration to run the SOCA to MOM6 IAU increment
+        self._prep_checkpoint()
+
+    @logit(logger)
+    def _fetch_observations(self: Task) -> None:
+        """Fetch observations from COMIN_OBS
+
+        This method will fetch the observations for the cycle and check the
+        list against what is available for the cycle.
+        """
+
+        # get the list of observations
+        obs_list_config = YAMLFile(self.task_config.MARINE_OBS_LIST_YAML)
+        obs_list_config = Template.substitute_structure(obs_list_config, TemplateConstants.DOLLAR_PARENTHESES, self.task_config)
+        obs_list_config = {'observations': obs_list_config}
+        logger.info(f"{obs_list_config}")
+
+        obs_files = []
+        for ob in obs_list_config['observations']['observers']:
+            logger.info(f"******** {self.task_config.OPREFIX}{ob['obs space']['name'].lower()}.{to_YMD(self.task_config.PDY)}{self.task_config.cyc}.nc4")
+            obs_files.append(f"{self.task_config.OPREFIX}{ob['obs space']['name'].lower()}.{to_YMD(self.task_config.PDY)}{self.task_config.cyc}.nc4")
+        obs_list = []
+
+        # copy obs from COM_OBS to DATA/obs
+        for obs_file in obs_files:
+            logger.info(f"******* {obs_file}")
+            obs_src = os.path.join(self.task_config.COM_OBS, obs_file)
+            obs_dst = os.path.join(self.task_config.DATA, 'obs', obs_file)
+            logger.info(f"******* {obs_src}")
+            if os.path.exists(obs_src):
+                logger.info(f"******* fetching {obs_file}")
+                obs_list.append([obs_src, obs_dst])
+            else:
+                logger.info(f"******* {obs_file} is not in the database")
+
+        FileHandler({'copy': obs_list}).sync()
+
+    @logit(logger)
+    def _prep_scratch_dir(self: Task) -> None:
+        """Create and stage all the resources needed to run SOCA/JEDI, including the necesssary
+           directory structure to run the SOCA variational application
+        """
+        logger.info(f"---------------- Setup runtime environement")
+
+        anl_dir = self.task_config.DATA
+
+        # create analysis directories
+        diags = os.path.join(anl_dir, 'diags')            # output dir for soca DA obs space
+        obs_in = os.path.join(anl_dir, 'obs')             # input      "           "
+        anl_out = os.path.join(anl_dir, 'Data')           # output dir for soca DA
+        FileHandler({'mkdir': [diags, obs_in, anl_out]}).sync()
+
+        # stage fix files
+        logger.info(f"Staging SOCA fix files from {self.task_config.SOCA_INPUT_FIX_DIR}")
+        soca_fix_list = parse_j2yaml(self.task_config.SOCA_FIX_YAML_TMPL, self.task_config)
+        FileHandler(soca_fix_list).sync()
+
+        # prepare the MOM6 input.nml
+        mdau.prep_input_nml(self.task_config)
+
+        # stage the soca utility yamls (gridgen, fields and ufo mapping yamls)
+        logger.info(f"Staging SOCA utility yaml files from {self.task_config.PARMsoca}")
+        soca_utility_list = parse_j2yaml(self.task_config.MARINE_UTILITY_YAML_TMPL, self.task_config)
+        FileHandler(soca_utility_list).sync()
+
+    @logit(logger)
+    def _prep_variational_yaml(self: Task) -> None:
+        """Create the yaml configuration to run the SOCA variational application
+        """
+
+        # prepare background list for the pseudo model, check bkg date for consistency
+        mdau.gen_bkg_list(bkg_path='./bkg',
+                          window_begin=self.task_config.MARINE_WINDOW_BEGIN,
+                          yaml_name='bkg_list.yaml')
+
+        # Make a copy of the env config before modifying to avoid breaking something else
+        envconfig_jcb = copy.deepcopy(self.task_config)
+        logger.info(f"---------------- Prepare the yaml configuration")
+        logger.info(f"{envconfig_jcb}")       # Prepare the yaml configuration
+
+        # Add the things to the envconfig in order to template JCB files
+        envconfig_jcb['PARMgfs'] = self.task_config.PARMgfs
+        envconfig_jcb['nmem_ens'] = self.task_config.NMEM_ENS
+        envconfig_jcb['berror_model'] = 'marine_background_error_static_diffusion'
+        if self.task_config.NMEM_ENS > 3:
+            envconfig_jcb['berror_model'] = 'marine_background_error_hybrid_diffusion_diffusion'
+        envconfig_jcb['DATA'] = self.task_config.DATA
+        envconfig_jcb['OPREFIX'] = self.task_config.OPREFIX
+        envconfig_jcb['PDY'] = os.getenv('PDY')
+        envconfig_jcb['cyc'] = os.getenv('cyc')
+        envconfig_jcb['SOCA_NINNER'] = self.task_config.SOCA_NINNER
+        envconfig_jcb['obs_list'] = ['adt_rads_all']
+
+        # Write obs_list_short
+        save_as_yaml(parse_obs_list_file(self.task_config.MARINE_OBS_LIST_YAML), 'obs_list_short.yaml')
+        os.environ['OBS_LIST_SHORT'] = 'obs_list_short.yaml'
+
+        # Render the JCB configuration files
+        jcb_base_yaml = os.path.join(self.task_config.PARMsoca, 'marine-jcb-base.yaml')
+        jcb_algo_yaml = os.path.join(self.task_config.PARMsoca, 'marine-jcb-3dfgat.yaml.j2')
+
+        jcb_base_config = YAMLFile(path=jcb_base_yaml)
+        jcb_base_config = Template.substitute_structure(jcb_base_config, TemplateConstants.DOUBLE_CURLY_BRACES, envconfig_jcb.get)
+        jcb_base_config = Template.substitute_structure(jcb_base_config, TemplateConstants.DOLLAR_PARENTHESES, envconfig_jcb.get)
+        jcb_algo_config = YAMLFile(path=jcb_algo_yaml)
+        jcb_algo_config = Template.substitute_structure(jcb_algo_config, TemplateConstants.DOUBLE_CURLY_BRACES, envconfig_jcb.get)
+        jcb_algo_config = Template.substitute_structure(jcb_algo_config, TemplateConstants.DOLLAR_PARENTHESES, envconfig_jcb.get)
+
+        # Override base with the application specific config
+        jcb_config = {**jcb_base_config, **jcb_algo_config}
+
+        # convert datetime to string
+        jcb_config['window_begin'] = self.task_config.MARINE_WINDOW_BEGIN.strftime('%Y-%m-%dT%H:%M:%SZ')
+        jcb_config['window_middle'] = self.task_config.MARINE_WINDOW_MIDDLE.strftime('%Y-%m-%dT%H:%M:%SZ')
+
+        # Render the full JEDI configuration file using JCB
+        jedi_config = render(jcb_config)
+
+        # Save the JEDI configuration file
+        var_yaml_jcb = 'var.yaml'
+        mdau.clean_empty_obsspaces(jedi_config, target=var_yaml_jcb, app='var')
+
+    def _prep_checkpoint(self: Task) -> None:
+        """Create the yaml configuration to run the SOCA to MOM6 IAU increment
+        """
+        # prepare the socaincr2mom6.yaml
+        logger.info("Generate the SOCA to MOM6 IAU increment YAML file")
+        data = {'marine_window_begin': self.task_config.MARINE_WINDOW_BEGIN_ISO,
+                'marine_window_middle': self.task_config.MARINE_WINDOW_MIDDLE_ISO}
+        soca2mom6inc_config = parse_j2yaml(path=os.path.join(self.task_config.MARINE_JCB_GDAS_ALGO, 'socaincr2mom6.yaml.j2'),
+                                           data=data)
+        soca2mom6inc_config.save(os.path.join(self.task_config.DATA, 'socaincr2mom6.yaml'))
+
+        # prepare the SOCA to CICE YAML file
+        logger.info("Generate the SOCA to CICE RST YAML file")
+
+        # set the restart date, dependent on the cycling type
+        if self.task_config.DOIAU:
+            # forecast initialized at the begining of the DA window
+            fcst_begin = self.task_config.MARINE_WINDOW_BEGIN_ISO
+            rst_date = self.task_config.MARINE_WINDOW_BEGIN.strftime('%Y%m%d.%H%M%S')
+        else:
+            # forecast initialized at the middle of the DA window
+            fcst_begin = self.task_config.MARINE_WINDOW_MIDDLE_ISO
+            rst_date = self.task_config.MARINE_WINDOW_MIDDLE.strftime('%Y%m%d.%H%M%S')
+
+        # make a copy of the CICE6 restart
+        ice_rst = os.path.join(self.task_config.COMIN_ICE_RESTART_PREV, f'{rst_date}.cice_model.res.nc')
+        ice_rst_ana = os.path.join(self.task_config.DATA, 'Data', rst_date + '.cice_model.res.nc')
+        FileHandler({'copy': [[ice_rst, ice_rst_ana]]}).sync()
+
+        # prepare the necessary configuration for the SOCA to CICE application
+        soca2cice_param = AttrDict({
+            "ocn_ana": f"./Data/ocn.3dvarfgat_pseudo.an.{self.task_config.MARINE_WINDOW_MIDDLE_ISO}.nc",
+            "ice_ana": f"./Data/ice.3dvarfgat_pseudo.an.{self.task_config.MARINE_WINDOW_MIDDLE_ISO}.nc",
+            "ice_rst": ice_rst_ana,
+            "fcst_begin": fcst_begin
+        })
+        logger.debug(f"{soca2cice_param}")
+
+        # render the SOCA to CICE YAML file for the Arctic and Antarctic
+        logger.info("render the SOCA to CICE YAML file for the Arctic and Antarctic")
+        varchgyamls = ['soca_2cice_arctic.yaml', 'soca_2cice_antarctic.yaml']
+        for varchgyaml in varchgyamls:
+            soca2cice_config = parse_j2yaml(path=os.path.join(self.task_config.MARINE_JCB_GDAS_ALGO, f'{varchgyaml}.j2'),
+                                            data=soca2cice_param)
+            soca2cice_config.save(os.path.join(self.task_config.DATA, varchgyaml))
+
+    @logit(logger)
+    def variational(self: Task) -> None:
+        # link gdas_soca_gridgen.x
+        mdau.link_executable(self.task_config, 'gdas.x')
+        exec_cmd = Executable(self.task_config.APRUN_MARINEANLVAR)
+        exec_name = os.path.join(self.task_config.DATA, 'gdas.x')
+        exec_cmd.add_default_arg(exec_name)
+        exec_cmd.add_default_arg('soca')
+        exec_cmd.add_default_arg('variational')
+        exec_cmd.add_default_arg('var.yaml')
+
+        mdau.run(exec_cmd)
+
+    @logit(logger)
+    def checkpoint_cice6(self: Task, soca2ciceyaml) -> None:
+        # link gdas_soca_gridgen.x
+        mdau.link_executable(self.task_config, 'gdas.x')
+        exec_cmd = Executable(self.task_config.APRUN_MARINEANLCHKPT)
+        exec_name = os.path.join(self.task_config.DATA, 'gdas.x')
+        exec_cmd.add_default_arg(exec_name)
+        exec_cmd.add_default_arg('soca')
+        exec_cmd.add_default_arg('convertstate')
+        exec_cmd.add_default_arg(soca2ciceyaml)
+
+        mdau.run(exec_cmd)
+
+    @logit(logger)
+    def checkpoint_mom6_iau(self: Task, socaincr2mom6yaml) -> None:
+        # link gdas_incr_handler.x
+        mdau.link_executable(self.task_config, 'gdas_incr_handler.x')
+        exec_cmd = Executable(self.task_config.APRUN_MARINEANLCHKPT)
+        exec_name = os.path.join(self.task_config.DATA, 'gdas_incr_handler.x')
+        exec_cmd.add_default_arg(exec_name)
+        exec_cmd.add_default_arg(socaincr2mom6yaml)
+
+        mdau.run(exec_cmd)
+
+    @logit(logger)
+    def finalize(self: Task) -> None:
+        """Finalize the marine analysis job
+           This method saves the results of the deterministic variational analysis to the COMROOT
+        """
+
+        def list_all_files(dir_in, dir_out, wc='*', fh_list=[]):
+            files = glob.glob(os.path.join(dir_in, wc))
+            for file_src in files:
+                file_dst = os.path.join(dir_out, os.path.basename(file_src))
+                fh_list.append([file_src, file_dst])
+            return fh_list
+
+        # variables of convenience
+        com_ocean_analysis = self.task_config.COMOUT_OCEAN_ANALYSIS
+        com_ice_analysis = self.task_config.COMOUT_ICE_ANALYSIS
+        com_ice_restart = self.task_config.COMOUT_ICE_RESTART
+        anl_dir = self.task_config.DATA
+        cdate = self.task_config.CDATE
+        pdy = self.task_config.PDY
+        staticsoca_dir = self.task_config.SOCA_INPUT_FIX_DIR
+        RUN = self.task_config.RUN
+        cyc = str(self.task_config.cyc).zfill(2)
+        bcyc = str(self.task_config.MARINE_WINDOW_BEGIN.hour).zfill(2)
+        bdate = self.task_config.MARINE_WINDOW_BEGIN_ISO
+        mdate = self.task_config.MARINE_WINDOW_MIDDLE_ISO
+        nmem_ens = int(self.task_config.NMEM_ENS)
+
+        logger.info(f"---------------- Copy from RUNDIR to COMOUT")
+
+        post_file_list = []
+
+        # Make a copy the IAU increment
+        post_file_list.append([os.path.join(anl_dir, 'inc.nc'),
+                               os.path.join(com_ocean_analysis, f'{RUN}.t{cyc}z.ocninc.nc')])
+
+        domains = ['ocn', 'ice']
+        for domain in domains:
+            '''
+            # Copy of the diagonal of the background error for the cycle
+            post_file_list.append([os.path.join(anl_dir, f'{domain}.bkgerr_stddev.incr.{mdate}.nc'),
+                                   os.path.join(com_ocean_analysis, f'{RUN}.t{cyc}z.{domain}.bkgerr_stddev.nc')])
+
+            # Copy the recentering error
+            if nmem_ens > 2:
+                post_file_list.append([os.path.join(anl_dir, 'static_ens', f'{domain}.ssh_recentering_error.incr.{bdate}.nc'),
+                                       os.path.join(com_ocean_analysis, f'{RUN}.t{cyc}z.{domain}.recentering_error.nc')])
+            '''
+
+            # Copy the ice and ocean increments
+            post_file_list.append([os.path.join(anl_dir, 'Data', f'{domain}.3dvarfgat_pseudo.incr.{mdate}.nc'),
+                                   os.path.join(com_ocean_analysis, f'{RUN}.t{cyc}z.{domain}.incr.nc')])
+
+            # Copy the analysis at the start of the window
+            post_file_list.append([os.path.join(anl_dir, 'Data', f'{domain}.3dvarfgat_pseudo.an.{mdate}.nc'),
+                                   os.path.join(com_ocean_analysis, f'{RUN}.t{cyc}z.{domain}ana.nc')])
+
+        # Copy of the ssh diagnostics
+        '''
+        if nmem_ens > 2:
+            for string in ['ssh_steric_stddev', 'ssh_unbal_stddev', 'ssh_total_stddev', 'steric_explained_variance']:
+                post_file_list.append([os.path.join(anl_dir, 'static_ens', f'ocn.{string}.incr.{bdate}.nc'),
+                                       os.path.join(com_ocean_analysis, f'{RUN}.t{cyc}z.ocn.{string}.nc')])
+        '''
+
+        # Copy DA grid (computed for the start of the window)
+        post_file_list.append([os.path.join(anl_dir, 'soca_gridspec.nc'),
+                               os.path.join(com_ocean_analysis, f'{RUN}.t{bcyc}z.ocngrid.nc')])
+
+        # Copy the CICE analysis restart
+        if os.getenv('DOIAU') == "YES":
+            cice_rst_date = self.task_config.MARINE_WINDOW_BEGIN.strftime('%Y%m%d.%H%M%S')
+        else:
+            cice_rst_date = cdate.strftime('%Y%m%d.%H%M%S')
+
+        post_file_list.append([os.path.join(anl_dir, 'Data', f'{cice_rst_date}.cice_model.res.nc'),
+                               os.path.join(com_ice_analysis, f'{cice_rst_date}.cice_model_anl.res.nc')])
+
+        FileHandler({'copy': post_file_list}).sync()
+
+        # create COM sub-directories
+        FileHandler({'mkdir': [os.path.join(com_ocean_analysis, 'diags'),
+                               os.path.join(com_ocean_analysis, 'bump'),
+                               os.path.join(com_ocean_analysis, 'yaml')]}).sync()
+
+        # ioda output files
+        fh_list = list_all_files(os.path.join(anl_dir, 'diags'),
+                                 os.path.join(com_ocean_analysis, 'diags'))
+
+        # yaml configurations
+        fh_list = list_all_files(os.path.join(anl_dir),
+                                 os.path.join(com_ocean_analysis, 'yaml'), wc='*.yaml', fh_list=fh_list)
+
+        FileHandler({'copy': fh_list}).sync()
+
+    @logit(logger)
+    def obs_space_stats(self: Task) -> None:
+        """Observation space statistics
+           This method computes a few basic statistics on the observation spaces
+        """
+
+        # obs space statistics
+        logger.info(f"---------------- Compute basic stats")
+        diags_list = glob.glob(os.path.join(os.path.join(self.task_config.COMOUT_OCEAN_ANALYSIS, 'diags', '*.nc4')))
+        obsstats_j2yaml = str(os.path.join(self.task_config.PARMgfs, 'gdas', 'soca', 'obs', 'obs_stats.yaml.j2'))
+
+        # function to create a minimalist ioda obs sapce
+        def create_obs_space(data):
+            os_dict = {"obs space": {
+                       "name": data["obs_space"],
+                       "obsdatain": {
+                           "engine": {"type": "H5File", "obsfile": data["obsfile"]}
+                       },
+                       "simulated variables": [data["variable"]]
+                       },
+                       "variable": data["variable"],
+                       "experiment identifier": data["pslot"],
+                       "csv output": data["csv_output"]
+                       }
+            return os_dict
+
+        # get the experiment id
+        pslot = self.task_config.PSLOT
+
+        # iterate through the obs spaces and generate the yaml for gdassoca_obsstats.x
+        obs_spaces = []
+        for obsfile in diags_list:
+
+            # define an obs space name
+            obs_space = re.sub(r'\.\d{10}\.nc4$', '', os.path.basename(obsfile))
+
+            # get the variable name, assume 1 variable per file
+            nc = netCDF4.Dataset(obsfile, 'r')
+            variable = next(iter(nc.groups["ObsValue"].variables))
+            nc.close()
+
+            # filling values for the templated yaml
+            data = {'obs_space': os.path.basename(obsfile),
+                    'obsfile': obsfile,
+                    'pslot': pslot,
+                    'variable': variable,
+                    'csv_output': os.path.join(self.task_config.COMOUT_OCEAN_ANALYSIS,
+                                               f"{self.task_config.OPREFIX}ocn.{obs_space}.stats.csv")}
+            obs_spaces.append(create_obs_space(data))
+
+        # create the yaml
+        data = {'obs_spaces': obs_spaces}
+        conf = parse_j2yaml(path=obsstats_j2yaml, data=data)
+        stats_yaml = 'diag_stats.yaml'
+        conf.save(stats_yaml)
+
+        # run the application
+        mdau.link_executable(self.task_config, 'gdassoca_obsstats.x')
+        command = f"{os.getenv('launcher')} -n 1"
+        exec_cmd = Executable(command)
+        exec_name = os.path.join(self.task_config.DATA, 'gdassoca_obsstats.x')
+        exec_cmd.add_default_arg(exec_name)
+        exec_cmd.add_default_arg(stats_yaml)
+
+        mdau.run(exec_cmd)
diff --git a/ush/python/pygfs/task/marine_bmat.py b/ush/python/pygfs/task/marine_bmat.py
index 4770583934..93329f05ac 100644
--- a/ush/python/pygfs/task/marine_bmat.py
+++ b/ush/python/pygfs/task/marine_bmat.py
@@ -26,29 +26,24 @@ def __init__(self, config):
         super().__init__(config)
         _home_gdas = os.path.join(self.task_config.HOMEgfs, 'sorc', 'gdas.cd')
         _calc_scale_exec = os.path.join(self.task_config.HOMEgfs, 'ush', 'soca', 'calc_scales.py')
-        _window_begin = add_to_datetime(self.task_config.current_cycle, -to_timedelta(f"{self.task_config.assim_freq}H") / 2)
-        _window_end = add_to_datetime(self.task_config.current_cycle, to_timedelta(f"{self.task_config.assim_freq}H") / 2)
+        _window_begin = add_to_datetime(self.task_config.current_cycle,
+                                        -to_timedelta(f"{self.task_config.assim_freq}H") / 2)
+        _window_end = add_to_datetime(self.task_config.current_cycle,
+                                      to_timedelta(f"{self.task_config.assim_freq}H") / 2)
 
         # compute the relative path from self.task_config.DATA to self.task_config.DATAenspert
-        if self.task_config.NMEM_ENS > 0:
-            _enspert_relpath = os.path.relpath(self.task_config.DATAenspert, self.task_config.DATA)
-        else:
-            _enspert_relpath = None
+        _enspert_relpath = os.path.relpath(self.task_config.DATAens, self.task_config.DATA)
 
         # Create a local dictionary that is repeatedly used across this class
         local_dict = AttrDict(
             {
-                'HOMEgdas': _home_gdas,
+                'PARMsoca': os.path.join(self.task_config.PARMgfs, 'gdas', 'soca'),
                 'MARINE_WINDOW_BEGIN': _window_begin,
                 'MARINE_WINDOW_END': _window_end,
                 'MARINE_WINDOW_MIDDLE': self.task_config.current_cycle,
-                'BERROR_YAML_DIR': os.path.join(_home_gdas, 'parm', 'soca', 'berror'),
-                'UTILITY_YAML_TMPL': os.path.join(_home_gdas, 'parm', 'soca', 'soca_utils_stage.yaml.j2'),
-                'MARINE_ENSDA_STAGE_BKG_YAML_TMPL': os.path.join(_home_gdas, 'parm', 'soca', 'ensda', 'stage_ens_mem.yaml.j2'),
-                'MARINE_DET_STAGE_BKG_YAML_TMPL': os.path.join(_home_gdas, 'parm', 'soca', 'soca_det_bkg_stage.yaml.j2'),
                 'ENSPERT_RELPATH': _enspert_relpath,
                 'CALC_SCALE_EXEC': _calc_scale_exec,
-                'APREFIX': f"{self.task_config.RUN}.t{self.task_config.cyc:02d}z.",
+                'APREFIX': f"{self.task_config.RUN}.t{self.task_config.cyc:02d}z."
             }
         )
 
@@ -61,7 +56,7 @@ def initialize(self: Task) -> None:
 
         This method will initialize a global B-Matrix.
         This includes:
-        - staging the deterministic backgrounds (middle of window)
+        - staging the deterministic backgrounds
         - staging SOCA fix files
         - staging static ensemble members (optional)
         - staging ensemble members (optional)
@@ -84,39 +79,35 @@ def initialize(self: Task) -> None:
         FileHandler(bkg_list).sync()
 
         # stage the soca utility yamls (gridgen, fields and ufo mapping yamls)
-        logger.info(f"Staging SOCA utility yaml files from {self.task_config.HOMEgfs}/parm/gdas/soca")
-        soca_utility_list = parse_j2yaml(self.task_config.UTILITY_YAML_TMPL, self.task_config)
+        logger.info(f"Staging SOCA utility yaml files")
+        soca_utility_list = parse_j2yaml(self.task_config.MARINE_UTILITY_YAML_TMPL, self.task_config)
         FileHandler(soca_utility_list).sync()
 
         # generate the variance partitioning YAML file
-        logger.debug("Generate variance partitioning YAML file")
-        diagb_config = parse_j2yaml(path=os.path.join(self.task_config.BERROR_YAML_DIR, 'soca_diagb.yaml.j2'),
-                                    data=self.task_config)
+        logger.info(f"Generate variance partitioning YAML file from {self.task_config.BERROR_DIAGB_YAML}")
+        diagb_config = parse_j2yaml(path=self.task_config.BERROR_DIAGB_YAML, data=self.task_config)
         diagb_config.save(os.path.join(self.task_config.DATA, 'soca_diagb.yaml'))
 
         # generate the vertical decorrelation scale YAML file
-        logger.debug("Generate the vertical correlation scale YAML file")
-        vtscales_config = parse_j2yaml(path=os.path.join(self.task_config.BERROR_YAML_DIR, 'soca_vtscales.yaml.j2'),
-                                       data=self.task_config)
+        logger.info(f"Generate the vertical correlation scale YAML file from {self.task_config.BERROR_VTSCALES_YAML}")
+        vtscales_config = parse_j2yaml(path=self.task_config.BERROR_VTSCALES_YAML, data=self.task_config)
         vtscales_config.save(os.path.join(self.task_config.DATA, 'soca_vtscales.yaml'))
 
         # generate vertical diffusion scale YAML file
-        logger.debug("Generate vertical diffusion YAML file")
-        diffvz_config = parse_j2yaml(path=os.path.join(self.task_config.BERROR_YAML_DIR, 'soca_parameters_diffusion_vt.yaml.j2'),
-                                     data=self.task_config)
+        logger.info(f"Generate vertical diffusion YAML file from {self.task_config.BERROR_DIFFV_YAML}")
+        diffvz_config = parse_j2yaml(path=self.task_config.BERROR_DIFFV_YAML, data=self.task_config)
         diffvz_config.save(os.path.join(self.task_config.DATA, 'soca_parameters_diffusion_vt.yaml'))
 
         # generate the horizontal diffusion YAML files
         if True:  # TODO(G): skip this section once we have optimized the scales
             # stage the correlation scale configuration
-            logger.debug("Generate correlation scale YAML file")
-            FileHandler({'copy': [[os.path.join(self.task_config.BERROR_YAML_DIR, 'soca_setcorscales.yaml'),
+            logger.info(f"Generate correlation scale YAML file from {self.task_config.BERROR_HZSCALES_YAML}")
+            FileHandler({'copy': [[self.task_config.BERROR_HZSCALES_YAML,
                                    os.path.join(self.task_config.DATA, 'soca_setcorscales.yaml')]]}).sync()
 
             # generate horizontal diffusion scale YAML file
-            logger.debug("Generate horizontal diffusion scale YAML file")
-            diffhz_config = parse_j2yaml(path=os.path.join(self.task_config.BERROR_YAML_DIR, 'soca_parameters_diffusion_hz.yaml.j2'),
-                                         data=self.task_config)
+            logger.info(f"Generate horizontal diffusion scale YAML file from {self.task_config.BERROR_DIFFH_YAML}")
+            diffhz_config = parse_j2yaml(path=self.task_config.BERROR_DIFFH_YAML, data=self.task_config)
             diffhz_config.save(os.path.join(self.task_config.DATA, 'soca_parameters_diffusion_hz.yaml'))
 
         # hybrid EnVAR case
@@ -127,19 +118,20 @@ def initialize(self: Task) -> None:
 
             # generate ensemble recentering/rebalancing YAML file
             logger.debug("Generate ensemble recentering YAML file")
-            ensrecenter_config = parse_j2yaml(path=os.path.join(self.task_config.BERROR_YAML_DIR, 'soca_ensb.yaml.j2'),
-                                              data=self.task_config)
+            ensrecenter_config = parse_j2yaml(path=self.task_config.BERROR_ENS_RECENTER_YAML, data=self.task_config)
             ensrecenter_config.save(os.path.join(self.task_config.DATA, 'soca_ensb.yaml'))
 
             # generate ensemble weights YAML file
-            logger.debug("Generate ensemble recentering YAML file: {self.task_config.abcd_yaml}")
-            hybridweights_config = parse_j2yaml(path=os.path.join(self.task_config.BERROR_YAML_DIR, 'soca_ensweights.yaml.j2'),
-                                                data=self.task_config)
+            logger.debug("Generate hybrid-weigths YAML file")
+            hybridweights_config = parse_j2yaml(path=self.task_config.BERROR_HYB_WEIGHTS_YAML, data=self.task_config)
             hybridweights_config.save(os.path.join(self.task_config.DATA, 'soca_ensweights.yaml'))
 
-        # need output dir for ensemble perturbations and static B-matrix
-        logger.debug("Create empty diagb directories to receive output from executables")
-        FileHandler({'mkdir': [os.path.join(self.task_config.DATA, 'diagb')]}).sync()
+        # create the symbolic link to the static B-matrix directory
+        link_target = os.path.join(self.task_config.DATAstaticb)
+        link_name = os.path.join(self.task_config.DATA, 'staticb')
+        if os.path.exists(link_name):
+            os.remove(link_name)
+        os.symlink(link_target, link_name)
 
     @logit(logger)
     def gridgen(self: Task) -> None:
@@ -290,12 +282,12 @@ def finalize(self: Task) -> None:
         logger.info(f"Copying the diffusion coefficient files to the ROTDIR")
         diffusion_coeff_list = []
         for diff_type in ['hz', 'vt']:
-            src = os.path.join(self.task_config.DATA, f"{diff_type}_ocean.nc")
+            src = os.path.join(self.task_config.DATAstaticb, f"{diff_type}_ocean.nc")
             dest = os.path.join(self.task_config.COMOUT_OCEAN_BMATRIX,
                                 f"{self.task_config.APREFIX}{diff_type}_ocean.nc")
             diffusion_coeff_list.append([src, dest])
 
-        src = os.path.join(self.task_config.DATA, f"hz_ice.nc")
+        src = os.path.join(self.task_config.DATAstaticb, f"hz_ice.nc")
         dest = os.path.join(self.task_config.COMOUT_ICE_BMATRIX,
                             f"{self.task_config.APREFIX}hz_ice.nc")
         diffusion_coeff_list.append([src, dest])
@@ -308,13 +300,17 @@ def finalize(self: Task) -> None:
         window_end_iso = self.task_config.MARINE_WINDOW_END.strftime('%Y-%m-%dT%H:%M:%SZ')
 
         # ocean diag B
-        src = os.path.join(self.task_config.DATA, 'diagb', f"ocn.bkgerr_stddev.incr.{window_end_iso}.nc")
+        os.rename(os.path.join(self.task_config.DATAstaticb, f"ocn.bkgerr_stddev.incr.{window_end_iso}.nc"),
+                  os.path.join(self.task_config.DATAstaticb, f"ocn.bkgerr_stddev.nc"))
+        src = os.path.join(self.task_config.DATAstaticb, f"ocn.bkgerr_stddev.nc")
         dst = os.path.join(self.task_config.COMOUT_OCEAN_BMATRIX,
                            f"{self.task_config.APREFIX}ocean.bkgerr_stddev.nc")
         diagb_list.append([src, dst])
 
         # ice diag B
-        src = os.path.join(self.task_config.DATA, 'diagb', f"ice.bkgerr_stddev.incr.{window_end_iso}.nc")
+        os.rename(os.path.join(self.task_config.DATAstaticb, f"ice.bkgerr_stddev.incr.{window_end_iso}.nc"),
+                  os.path.join(self.task_config.DATAstaticb, f"ice.bkgerr_stddev.nc"))
+        src = os.path.join(self.task_config.DATAstaticb, f"ice.bkgerr_stddev.nc")
         dst = os.path.join(self.task_config.COMOUT_ICE_BMATRIX,
                            f"{self.task_config.APREFIX}ice.bkgerr_stddev.nc")
         diagb_list.append([src, dst])
diff --git a/ush/python/pygfs/task/oceanice_products.py b/ush/python/pygfs/task/oceanice_products.py
index 98b57ae801..39ec53b100 100644
--- a/ush/python/pygfs/task/oceanice_products.py
+++ b/ush/python/pygfs/task/oceanice_products.py
@@ -58,22 +58,10 @@ def __init__(self, config: Dict[str, Any]) -> None:
 
         valid_datetime = add_to_datetime(self.task_config.current_cycle, to_timedelta(f"{self.task_config.FORECAST_HOUR}H"))
 
+        forecast_hour = self.task_config.FORECAST_HOUR
         if self.task_config.COMPONENT == 'ice':
-            offset = int(self.task_config.current_cycle.strftime("%H")) % self.task_config.FHOUT_ICE_GFS
-            # For CICE cases where offset is not 0, forecast_hour needs to be adjusted based on the offset.
-            # TODO: Consider FHMIN when calculating offset.
-            if offset != 0:
-                forecast_hour = self.task_config.FORECAST_HOUR - int(self.task_config.current_cycle.strftime("%H"))
-                # For the first forecast hour, the interval may be different from the intervals of subsequent forecast hours
-                if forecast_hour <= self.task_config.FHOUT_ICE_GFS:
-                    interval = self.task_config.FHOUT_ICE_GFS - int(self.task_config.current_cycle.strftime("%H"))
-                else:
-                    interval = self.task_config.FHOUT_ICE_GFS
-            else:
-                forecast_hour = self.task_config.FORECAST_HOUR
-                interval = self.task_config.FHOUT_ICE_GFS
+            interval = self.task_config.FHOUT_ICE_GFS
         if self.task_config.COMPONENT == 'ocean':
-            forecast_hour = self.task_config.FORECAST_HOUR
             interval = self.task_config.FHOUT_OCN_GFS
 
         # TODO: This is a bit of a hack, but it works for now
diff --git a/ush/python/pygfs/task/snow_analysis.py b/ush/python/pygfs/task/snow_analysis.py
index 9656b00a8e..4b991d2b34 100644
--- a/ush/python/pygfs/task/snow_analysis.py
+++ b/ush/python/pygfs/task/snow_analysis.py
@@ -54,83 +54,6 @@ def __init__(self, config):
         # Extend task_config with local_dict
         self.task_config = AttrDict(**self.task_config, **local_dict)
 
-    @logit(logger)
-    def prepare_GTS(self) -> None:
-        """Prepare the GTS data for a global snow analysis
-
-        This method will prepare GTS data for a global snow analysis using JEDI.
-        This includes:
-        - processing GTS bufr snow depth observation data to IODA format
-
-        Parameters
-        ----------
-        Analysis: parent class for GDAS task
-
-        Returns
-        ----------
-        None
-        """
-
-        # create a temporary dict of all keys needed in this method
-        localconf = AttrDict()
-        keys = ['HOMEgfs', 'DATA', 'current_cycle', 'COM_OBS', 'COM_ATMOS_RESTART_PREV',
-                'OPREFIX', 'CASE', 'OCNRES', 'ntiles']
-        for key in keys:
-            localconf[key] = self.task_config[key]
-
-        # Read and render the GTS_OBS_LIST yaml
-        logger.info(f"Reading {self.task_config.GTS_OBS_LIST}")
-        prep_gts_config = parse_j2yaml(self.task_config.GTS_OBS_LIST, localconf)
-        logger.debug(f"{self.task_config.GTS_OBS_LIST}:\n{pformat(prep_gts_config)}")
-
-        # copy the GTS obs files from COM_OBS to DATA/obs
-        logger.info("Copying GTS obs for bufr2ioda.x")
-        FileHandler(prep_gts_config.gtsbufr).sync()
-
-        logger.info("Link BUFR2IODAX into DATA/")
-        exe_src = self.task_config.BUFR2IODAX
-        exe_dest = os.path.join(localconf.DATA, os.path.basename(exe_src))
-        if os.path.exists(exe_dest):
-            rm_p(exe_dest)
-        os.symlink(exe_src, exe_dest)
-
-        # Create executable instance
-        exe = Executable(self.task_config.BUFR2IODAX)
-
-        def _gtsbufr2iodax(exe, yaml_file):
-            if not os.path.isfile(yaml_file):
-                logger.exception(f"FATAL ERROR: {yaml_file} not found")
-                raise FileNotFoundError(yaml_file)
-
-            logger.info(f"Executing {exe}")
-            try:
-                exe(yaml_file)
-            except OSError:
-                raise OSError(f"Failed to execute {exe} {yaml_file}")
-            except Exception:
-                raise WorkflowException(f"An error occured during execution of {exe} {yaml_file}")
-
-        # Loop over entries in prep_gts_config.bufr2ioda keys
-        # 1. generate bufr2ioda YAML files
-        # 2. execute bufr2ioda.x
-        for name in prep_gts_config.bufr2ioda.keys():
-            gts_yaml = os.path.join(self.task_config.DATA, f"bufr_{name}_snow.yaml")
-            logger.info(f"Generate BUFR2IODA YAML file: {gts_yaml}")
-            temp_yaml = parse_j2yaml(prep_gts_config.bufr2ioda[name], localconf)
-            save_as_yaml(temp_yaml, gts_yaml)
-            logger.info(f"Wrote bufr2ioda YAML to: {gts_yaml}")
-
-            # execute BUFR2IODAX to convert {name} bufr data into IODA format
-            _gtsbufr2iodax(exe, gts_yaml)
-
-        # Ensure the IODA snow depth GTS file is produced by the IODA converter
-        # If so, copy to COM_OBS/
-        try:
-            FileHandler(prep_gts_config.gtsioda).sync()
-        except OSError as err:
-            logger.exception(f"{self.task_config.BUFR2IODAX} failed to produce GTS ioda files")
-            raise OSError(err)
-
     @logit(logger)
     def prepare_IMS(self) -> None:
         """Prepare the IMS data for a global snow analysis
@@ -248,7 +171,7 @@ def initialize(self) -> None:
 
         # create a temporary dict of all keys needed in this method
         localconf = AttrDict()
-        keys = ['DATA', 'current_cycle', 'COM_OBS', 'COM_ATMOS_RESTART_PREV',
+        keys = ['PARMgfs', 'DATA', 'current_cycle', 'COM_OBS', 'COM_ATMOS_RESTART_PREV',
                 'OPREFIX', 'CASE', 'OCNRES', 'ntiles']
         for key in keys:
             localconf[key] = self.task_config[key]
@@ -268,6 +191,11 @@ def initialize(self) -> None:
         logger.info("Staging ensemble backgrounds")
         FileHandler(self.get_ens_bkg_dict(localconf)).sync()
 
+        # stage GTS bufr2ioda mapping YAML files
+        logger.info(f"Staging GTS bufr2ioda mapping YAML files from {self.task_config.GTS_SNOW_STAGE_YAML}")
+        gts_mapping_list = parse_j2yaml(self.task_config.GTS_SNOW_STAGE_YAML, localconf)
+        FileHandler(gts_mapping_list).sync()
+
         # Write out letkfoi YAML file
         save_as_yaml(self.task_config.jedi_config, self.task_config.jedi_yaml)
         logger.info(f"Wrote letkfoi YAML to: {self.task_config.jedi_yaml}")
diff --git a/ush/python/pygfs/task/stage_ic.py b/ush/python/pygfs/task/stage_ic.py
index 37cc4138f3..cc64e9f52c 100644
--- a/ush/python/pygfs/task/stage_ic.py
+++ b/ush/python/pygfs/task/stage_ic.py
@@ -6,8 +6,9 @@
 from typing import Any, Dict, List
 
 from wxflow import (AttrDict, FileHandler, Task, cast_strdict_as_dtypedict,
-                    logit, parse_j2yaml, strftime, to_YMD,
-                    add_to_datetime, to_timedelta, Template, TemplateConstants)
+                    logit, parse_j2yaml, strftime, to_YMD, to_YMDH,
+                    add_to_datetime, to_timedelta, Template, TemplateConstants,
+                    Hsi, Htar, which)
 
 logger = getLogger(__name__.split('.')[-1])
 
@@ -46,6 +47,26 @@ def execute_stage(self, stage_dict: Dict[str, Any]) -> None:
         -------
         None
         """
+        YYYYMMDDHH = to_YMDH(stage_dict.current_cycle)
+        YYYY = YYYYMMDDHH[0:4]
+        MM = YYYYMMDDHH[4:6]
+
+        if stage_dict.DO_DOWNLOAD_ICS is True:
+            # Download ICs from HPSS to ICSDIR
+            self.htar = Htar()
+            self.xvf = self.htar.xvf
+            self.xvf(stage_dict.HPSSICARCH + "/" + YYYYMMDDHH + ".tar")
+
+        if stage_dict.DO_REPAIR_REPLAY and stage_dict.DO_DOWNLOAD_ANLY is True:
+            # Download f03 replay analysis
+            aws_cmd = which("aws")
+            aws_cmd.add_default_arg("s3")
+            aws_cmd.add_default_arg("cp")
+            aws_cmd.add_default_arg("--no-sign-request")
+            aws_url = "s3://noaa-ufs-gefsv13replay-pds/"
+
+            aws_cmd(aws_url + YYYY + "/" + MM + "/" + YYYYMMDDHH + "/GFSPRS.GrbF03", "./")
+            aws_cmd(aws_url + YYYY + "/" + MM + "/" + YYYYMMDDHH + "/GFSFLX.GrbF03", "./")
 
         if not os.path.isdir(stage_dict.ROTDIR):
             raise FileNotFoundError(f"FATAL ERROR: The ROTDIR ({stage_dict.ROTDIR}) does not exist!")
diff --git a/ush/python/pygfs/task/upp.py b/ush/python/pygfs/task/upp.py
index 7e42e07c64..70955a7276 100644
--- a/ush/python/pygfs/task/upp.py
+++ b/ush/python/pygfs/task/upp.py
@@ -202,7 +202,7 @@ def index(cls, workdir: Union[str, os.PathLike], forecast_hour: int) -> None:
 
         template = f"GFS{{file_type}}.GrbF{forecast_hour:02d}"
 
-        for ftype in ['PRS', 'FLX']:
+        for ftype in ['PRS', 'FLX', 'GOES']:
             grbfile = template.format(file_type=ftype)
             grbfidx = f"{grbfile}.idx"
 
@@ -249,7 +249,7 @@ def _call_executable(exec_cmd: Executable) -> None:
     @logit(logger)
     def finalize(upp_run: Dict, upp_yaml: Dict) -> None:
         """Perform closing actions of the task.
-        Copy data back from the DATA/ directory to COM/
+        Copy data back from the DATA/ directory to COMOUT/
 
         Parameters
         ----------
@@ -259,6 +259,6 @@ def finalize(upp_run: Dict, upp_yaml: Dict) -> None:
             Fully resolved upp.yaml dictionary
         """
 
-        # Copy "upp_run" specific generated data to COM/ directory
-        logger.info(f"Copy '{upp_run}' processed data to COM/ directory")
+        # Copy "upp_run" specific generated data to COMOUT/ directory
+        logger.info(f"Copy '{upp_run}' processed data to COMOUT/ directory")
         FileHandler(upp_yaml[upp_run].data_out).sync()
diff --git a/ush/python/pygfs/utils/marine_da_utils.py b/ush/python/pygfs/utils/marine_da_utils.py
index 2be76ac028..e1b2ac2d4d 100644
--- a/ush/python/pygfs/utils/marine_da_utils.py
+++ b/ush/python/pygfs/utils/marine_da_utils.py
@@ -1,7 +1,9 @@
-import f90nml
+from datetime import datetime, timedelta
+import dateutil.parser as dparser
 import os
+from netCDF4 import Dataset
 from logging import getLogger
-import xarray as xr
+import yaml
 
 from wxflow import (FileHandler,
                     logit,
@@ -9,6 +11,7 @@
                     AttrDict,
                     parse_j2yaml,
                     Executable,
+                    save_as_yaml,
                     jinja)
 
 logger = getLogger(__name__.split('.')[-1])
@@ -23,9 +26,9 @@ def run(exec_cmd: Executable) -> None:
         logger.debug(f"Executing {exec_cmd}")
         exec_cmd()
     except OSError:
-        raise OSError(f"Failed to execute {exec_cmd}")
+        raise OSError(f"FATAL ERROR: Failed to execute {exec_cmd}")
     except Exception:
-        raise WorkflowException(f"An error occured during execution of {exec_cmd}")
+        raise WorkflowException(f"FATAL ERROR: Error occurred during execution of {exec_cmd}")
 
 
 @logit(logger)
@@ -43,22 +46,19 @@ def link_executable(task_config: AttrDict, exe_name: str) -> None:
 
 @logit(logger)
 def prep_input_nml(task_config: AttrDict) -> None:
-    """Prepare the input.nml file
-       TODO: Use jinja2 instead of f90nml
+    """Prepare the mom_input.nml file
     """
-    # stage input.nml
-    mom_input_nml_tmpl_src = os.path.join(task_config.HOMEgdas, 'parm', 'soca', 'fms', 'input.nml')
+    # stage input.nml.j2
+    mom_input_nml_tmpl_src = os.path.join(task_config.PARMsoca, 'fms', 'input.nml.j2')
     mom_input_nml_tmpl = os.path.join(task_config.DATA, 'mom_input.nml.tmpl')
     FileHandler({'copy': [[mom_input_nml_tmpl_src, mom_input_nml_tmpl]]}).sync()
 
     # swap date and stacksize
-    domain_stack_size = task_config.DOMAIN_STACK_SIZE
-    ymdhms = [int(s) for s in task_config.MARINE_WINDOW_END.strftime('%Y,%m,%d,%H,%M,%S').split(',')]
-    with open(mom_input_nml_tmpl, 'r') as nml_file:
-        nml = f90nml.read(nml_file)
-        nml['ocean_solo_nml']['date_init'] = ymdhms
-        nml['fms_nml']['domains_stack_size'] = int(domain_stack_size)
-        nml.write('mom_input.nml')
+    date_init = [int(s) for s in task_config.MARINE_WINDOW_END.strftime('%Y,%m,%d,%H,%M,%S').split(',')]
+    input_nml_config = {'domain_stack_size': task_config.DOMAIN_STACK_SIZE,
+                        'date_init': date_init}
+    jinja_input_nml = jinja.Jinja(mom_input_nml_tmpl, input_nml_config)
+    jinja_input_nml.save('mom_input.nml')
 
 
 @logit(logger)
@@ -74,3 +74,95 @@ def stage_ens_mem(task_config: AttrDict) -> None:
     letkf_stage_list = parse_j2yaml(task_config.MARINE_ENSDA_STAGE_BKG_YAML_TMPL, ensbkgconf)
     logger.info(f"{letkf_stage_list}")
     FileHandler(letkf_stage_list).sync()
+
+
+@logit(logger)
+def test_hist_date(histfile: str, ref_date: datetime) -> None:
+    """
+    Check that the date in the MOM6 history file is the expected one for the cycle.
+    TODO: Implement the same for seaice
+    """
+
+    ncf = Dataset(histfile, 'r')
+    hist_date = dparser.parse(ncf.variables['time'].units, fuzzy=True) + timedelta(hours=int(ncf.variables['time'][0]))
+    ncf.close()
+    logger.info(f"*** history file date: {hist_date} expected date: {ref_date}")
+
+    if hist_date != ref_date:
+        raise ValueError(f"FATAL ERROR: Inconsistent bkg date'")
+
+
+@logit(logger)
+def gen_bkg_list(bkg_path: str, window_begin=' ', yaml_name='bkg.yaml', ice_rst=False) -> None:
+    """
+    Generate a YAML of the list of backgrounds for the pseudo model
+    """
+
+    # Pseudo model parameters (time step, start date)
+    # TODO: make this a parameter
+    dt_pseudo = 3
+    bkg_date = window_begin
+
+    # Construct list of background file names
+    cyc = str(os.getenv('cyc')).zfill(2)
+    gcyc = str((int(cyc) - 6) % 24).zfill(2)  # previous cycle
+    fcst_hrs = list(range(6, 10, dt_pseudo))
+    files = []
+    for fcst_hr in fcst_hrs:
+        files.append(os.path.join(bkg_path, f"ocean.bkg.f{str(fcst_hr).zfill(3)}.nc"))
+
+    # Identify the ocean background that will be used for the  vertical coordinate remapping
+    ocn_filename_ic = './INPUT/MOM.res.nc'
+    test_hist_date(ocn_filename_ic, bkg_date)  # assert date of the history file is correct
+
+    # Copy/process backgrounds and generate background yaml list
+    bkg_list = []
+    for bkg in files:
+        logger.info(f"****************** bkg: {bkg}")
+        # assert validity of the ocean bkg date, remove basename
+        bkg_date = bkg_date + timedelta(hours=dt_pseudo)
+        test_hist_date(bkg, bkg_date)
+        ocn_filename = os.path.splitext(os.path.basename(bkg))[0] + '.nc'
+
+        # prepare the seaice background, aggregate if the backgrounds are CICE restarts
+        ice_filename = ocn_filename.replace("ocean", "ice")
+
+        # prepare list of ocean and ice bkg to be copied to RUNDIR
+        bkg_dict = {'date': bkg_date.strftime('%Y-%m-%dT%H:%M:%SZ'),
+                    'basename': './bkg/',
+                    'ocn_filename': ocn_filename,
+                    'ice_filename': ice_filename,
+                    'read_from_file': 1}
+
+        bkg_list.append(bkg_dict)
+
+    # save pseudo model yaml configuration
+    save_as_yaml(bkg_list, yaml_name)
+
+
+@logit(logger)
+def clean_empty_obsspaces(config, target, app='var'):
+    """
+    Remove obs spaces that point to non-existent file and save
+    """
+
+    # obs space dictionary depth is dependent on the application
+    if app == 'var':
+        obs_spaces = config['cost function']['observations']['observers']
+    else:
+        raise ValueError(f"FATAL ERROR: obs space cleaning not implemented for {app}")
+
+    # remove obs spaces that point to a non existant file
+    cleaned_obs_spaces = []
+    for obs_space in obs_spaces:
+        fname = obs_space['obs space']['obsdatain']['engine']['obsfile']
+        if os.path.isfile(fname):
+            cleaned_obs_spaces.append(obs_space)
+        else:
+            logger.info(f"WARNING: {fname} does not exist, removing obs space")
+
+    # update obs spaces
+    config['cost function']['observations']['observers'] = cleaned_obs_spaces
+
+    # save cleaned yaml
+    save_as_yaml(config, target)
diff --git a/versions/build.gaea.ver b/versions/build.gaea.ver
index b92fe8c1db..8b6e641eb6 100644
--- a/versions/build.gaea.ver
+++ b/versions/build.gaea.ver
@@ -1,6 +1,5 @@
 export stack_intel_ver=2023.1.0
 export stack_cray_mpich_ver=8.1.25
 export spack_env=gsi-addon-dev
-
-source "${HOMEgfs:-}/versions/run.spack.ver"
+source "${HOMEgfs:-}/versions/spack.ver"
 export spack_mod_path="/ncrc/proj/epic/spack-stack/spack-stack-${spack_stack_ver}/envs/${spack_env}/install/modulefiles/Core"
diff --git a/versions/build.hera.ver b/versions/build.hera.ver
index 337d5c32da..70afb90a29 100644
--- a/versions/build.hera.ver
+++ b/versions/build.hera.ver
@@ -1,5 +1,5 @@
 export stack_intel_ver=2021.5.0
 export stack_impi_ver=2021.5.1
 export spack_env=gsi-addon-dev-rocky8
-source "${HOMEgfs:-}/versions/build.spack.ver"
+source "${HOMEgfs:-}/versions/spack.ver"
 export spack_mod_path="/scratch1/NCEPDEV/nems/role.epic/spack-stack/spack-stack-${spack_stack_ver}/envs/${spack_env}/install/modulefiles/Core"
diff --git a/versions/build.hercules.ver b/versions/build.hercules.ver
index cab0c92111..2d7185d5e7 100644
--- a/versions/build.hercules.ver
+++ b/versions/build.hercules.ver
@@ -2,5 +2,5 @@ export stack_intel_ver=2021.9.0
 export stack_impi_ver=2021.9.0
 export intel_mkl_ver=2023.1.0
 export spack_env=gsi-addon-env
-source "${HOMEgfs:-}/versions/build.spack.ver"
+source "${HOMEgfs:-}/versions/spack.ver"
 export spack_mod_path="/work/noaa/epic/role-epic/spack-stack/hercules/spack-stack-${spack_stack_ver}/envs/${spack_env}/install/modulefiles/Core"
diff --git a/versions/build.jet.ver b/versions/build.jet.ver
index 55c0ea0bd1..319a8fa0a6 100644
--- a/versions/build.jet.ver
+++ b/versions/build.jet.ver
@@ -1,5 +1,5 @@
 export stack_intel_ver=2021.5.0
 export stack_impi_ver=2021.5.1
-export spack_env=gsi-addon-dev
-source "${HOMEgfs:-}/versions/build.spack.ver"
-export spack_mod_path="/lfs4/HFIP/hfv3gfs/role.epic/spack-stack/spack-stack-${spack_stack_ver}/envs/${spack_env}/install/modulefiles/Core"
+export spack_env=gsi-addon-intel
+source "${HOMEgfs:-}/versions/spack.ver"
+export spack_mod_path="/contrib/spack-stack/spack-stack-${spack_stack_ver}/envs/${spack_env}/install/modulefiles/Core"
diff --git a/versions/build.noaacloud.ver b/versions/build.noaacloud.ver
index ba47313675..fc288b76b5 100644
--- a/versions/build.noaacloud.ver
+++ b/versions/build.noaacloud.ver
@@ -1,5 +1,5 @@
 export stack_intel_ver=2021.3.0
 export stack_impi_ver=2021.3.0
 export spack_env=gsi-addon-env
-source "${HOMEgfs:-}/versions/build.spack.ver"
+source "${HOMEgfs:-}/versions/spack.ver"
 export spack_mod_path="/contrib/spack-stack/spack-stack-${spack_stack_ver}/envs/gsi-addon-env/install/modulefiles/Core"
diff --git a/versions/build.orion.ver b/versions/build.orion.ver
index 834ecfc166..29e02f0873 100644
--- a/versions/build.orion.ver
+++ b/versions/build.orion.ver
@@ -1,5 +1,5 @@
 export stack_intel_ver=2021.9.0
 export stack_impi_ver=2021.9.0
 export spack_env=gsi-addon-env-rocky9
-source "${HOMEgfs:-}/versions/build.spack.ver"
+source "${HOMEgfs:-}/versions/spack.ver"
 export spack_mod_path="/work/noaa/epic/role-epic/spack-stack/orion/spack-stack-${spack_stack_ver}/envs/${spack_env}/install/modulefiles/Core"
diff --git a/versions/build.s4.ver b/versions/build.s4.ver
index e2731ccfb3..e2641c124f 100644
--- a/versions/build.s4.ver
+++ b/versions/build.s4.ver
@@ -1,5 +1,5 @@
 export stack_intel_ver=2021.5.0
 export stack_impi_ver=2021.5.0
 export spack_env=gsi-addon-env
-source "${HOMEgfs:-}/versions/build.spack.ver"
+source "${HOMEgfs:-}/versions/spack.ver"
 export spack_mod_path="/data/prod/jedi/spack-stack/spack-stack-${spack_stack_ver}/envs/${spack_env}/install/modulefiles/Core"
diff --git a/versions/build.spack.ver b/versions/build.spack.ver
deleted file mode 100644
index 808f85dd16..0000000000
--- a/versions/build.spack.ver
+++ /dev/null
@@ -1,27 +0,0 @@
-export spack_stack_ver=1.6.0
-
-export cmake_ver=3.23.1
-
-export jasper_ver=2.0.32
-export libpng_ver=1.6.37
-export zlib_ver=1.2.13
-export esmf_ver=8.5.0
-export fms_ver=2023.02.01
-
-export hdf5_ver=1.14.0
-export netcdf_c_ver=4.9.2
-export netcdf_fortran_ver=4.6.1
-
-export bacio_ver=2.4.1
-export nemsio_ver=2.5.4
-export sigio_ver=2.3.2
-export w3emc_ver=2.10.0
-export bufr_ver=11.7.0
-export g2_ver=3.4.5
-export sp_ver=2.5.0
-export ip_ver=4.3.0
-export gsi_ncdiag_ver=1.1.2
-export g2tmpl_ver=1.10.2
-export crtm_ver=2.4.0.1
-export wgrib2_ver=2.0.8
-export grib_util_ver=1.3.0
diff --git a/versions/fix.ver b/versions/fix.ver
index 3f85a45fee..7c18bea081 100644
--- a/versions/fix.ver
+++ b/versions/fix.ver
@@ -12,6 +12,7 @@ export gdas_fv3jedi_ver=20220805
 export gdas_soca_ver=20240802
 export gdas_gsibec_ver=20240416
 export gdas_obs_ver=20240213
+export gdas_aero_ver=20240806
 export glwu_ver=20220805
 export gsi_ver=20240208
 export lut_ver=20220805
diff --git a/versions/run.gaea.ver b/versions/run.gaea.ver
index b92fe8c1db..81aa70df57 100644
--- a/versions/run.gaea.ver
+++ b/versions/run.gaea.ver
@@ -2,5 +2,7 @@ export stack_intel_ver=2023.1.0
 export stack_cray_mpich_ver=8.1.25
 export spack_env=gsi-addon-dev
 
-source "${HOMEgfs:-}/versions/run.spack.ver"
+export perl_ver=5.38.2
+
+source "${HOMEgfs:-}/versions/spack.ver"
 export spack_mod_path="/ncrc/proj/epic/spack-stack/spack-stack-${spack_stack_ver}/envs/${spack_env}/install/modulefiles/Core"
diff --git a/versions/run.hera.ver b/versions/run.hera.ver
index 34f81bfe96..6ebc64d9f2 100644
--- a/versions/run.hera.ver
+++ b/versions/run.hera.ver
@@ -9,5 +9,5 @@ export R_ver=3.6.1
 export gempak_ver=7.17.0
 export perl_ver=5.38.0
 
-source "${HOMEgfs:-}/versions/run.spack.ver"
+source "${HOMEgfs:-}/versions/spack.ver"
 export spack_mod_path="/scratch1/NCEPDEV/nems/role.epic/spack-stack/spack-stack-${spack_stack_ver}/envs/${spack_env}/install/modulefiles/Core"
diff --git a/versions/run.hercules.ver b/versions/run.hercules.ver
index ee8e4f8aea..2d7185d5e7 100644
--- a/versions/run.hercules.ver
+++ b/versions/run.hercules.ver
@@ -2,6 +2,5 @@ export stack_intel_ver=2021.9.0
 export stack_impi_ver=2021.9.0
 export intel_mkl_ver=2023.1.0
 export spack_env=gsi-addon-env
-
-source "${HOMEgfs:-}/versions/run.spack.ver"
+source "${HOMEgfs:-}/versions/spack.ver"
 export spack_mod_path="/work/noaa/epic/role-epic/spack-stack/hercules/spack-stack-${spack_stack_ver}/envs/${spack_env}/install/modulefiles/Core"
diff --git a/versions/run.jet.ver b/versions/run.jet.ver
index 3aa586ee42..90553fb277 100644
--- a/versions/run.jet.ver
+++ b/versions/run.jet.ver
@@ -1,6 +1,6 @@
 export stack_intel_ver=2021.5.0
 export stack_impi_ver=2021.5.1
-export spack_env=gsi-addon-dev-rocky8
+export spack_env=gsi-addon-intel
 
 export hpss_ver=
 export ncl_ver=6.6.2
@@ -10,5 +10,9 @@ export gempak_ver=7.4.2
 # Adding perl as a module; With Rocky8, perl packages will not be from the OS
 export perl_ver=5.38.0
 
-source "${HOMEgfs:-}/versions/run.spack.ver"
-export spack_mod_path="/lfs4/HFIP/hfv3gfs/role.epic/spack-stack/spack-stack-${spack_stack_ver}/envs/${spack_env}/install/modulefiles/Core"
+source "${HOMEgfs:-}/versions/spack.ver"
+export spack_mod_path="/contrib/spack-stack/spack-stack-${spack_stack_ver}/envs/${spack_env}/install/modulefiles/Core"
+
+# Local version of TC_tracker
+export ens_tracker_ver=v1.1.15.7
+
diff --git a/versions/run.noaacloud.ver b/versions/run.noaacloud.ver
index 4c9ac3cd42..1fc3779b2e 100644
--- a/versions/run.noaacloud.ver
+++ b/versions/run.noaacloud.ver
@@ -2,7 +2,7 @@ export stack_intel_ver=2021.3.0
 export stack_impi_ver=2021.3.0
 export spack_env=gsi-addon-env
 
-source "${HOMEgfs:-}/versions/run.spack.ver"
+source "${HOMEgfs:-}/versions/spack.ver"
 export spack_mod_path="/contrib/spack-stack/spack-stack-${spack_stack_ver}/envs/gsi-addon-env/install/modulefiles/Core"
 
 export cdo_ver=2.2.0
diff --git a/versions/run.orion.ver b/versions/run.orion.ver
index 112636fb20..29e02f0873 100644
--- a/versions/run.orion.ver
+++ b/versions/run.orion.ver
@@ -1,6 +1,5 @@
 export stack_intel_ver=2021.9.0
 export stack_impi_ver=2021.9.0
 export spack_env=gsi-addon-env-rocky9
-
-source "${HOMEgfs:-}/versions/run.spack.ver"
+source "${HOMEgfs:-}/versions/spack.ver"
 export spack_mod_path="/work/noaa/epic/role-epic/spack-stack/orion/spack-stack-${spack_stack_ver}/envs/${spack_env}/install/modulefiles/Core"
diff --git a/versions/run.s4.ver b/versions/run.s4.ver
index 6d0f4cbaca..43e690e19b 100644
--- a/versions/run.s4.ver
+++ b/versions/run.s4.ver
@@ -4,5 +4,5 @@ export spack_env=gsi-addon-env
 
 export ncl_ver=6.4.0-precompiled
 
-source "${HOMEgfs:-}/versions/run.spack.ver"
+source "${HOMEgfs:-}/versions/spack.ver"
 export spack_mod_path="/data/prod/jedi/spack-stack/spack-stack-${spack_stack_ver}/envs/${spack_env}/install/modulefiles/Core"
diff --git a/versions/run.wcoss2.ver b/versions/run.wcoss2.ver
index 7f653dd50e..af2adfb754 100644
--- a/versions/run.wcoss2.ver
+++ b/versions/run.wcoss2.ver
@@ -44,10 +44,11 @@ export metplus_ver=3.1.1
 
 # Development-only below
 
-export obsproc_run_ver=1.1.2
-export prepobs_run_ver=1.0.2
+export obsproc_run_ver=1.2.0
+export prepobs_run_ver=1.1.0
 
 export ens_tracker_ver=feature-GFSv17_com_reorg
-export fit2obs_ver=1.1.2
+export fit2obs_ver=1.1.4
 export mos_ver=5.4.3
 export mos_shared_ver=2.7.2
+export awscli_ver=2.7.35
diff --git a/versions/run.spack.ver b/versions/spack.ver
similarity index 66%
rename from versions/run.spack.ver
rename to versions/spack.ver
index 9aa5460c80..1f553134f0 100644
--- a/versions/run.spack.ver
+++ b/versions/spack.ver
@@ -1,8 +1,12 @@
 export spack_stack_ver=1.6.0
+export cmake_ver=3.23.1
 export python_ver=3.11.6
 
 export jasper_ver=2.0.32
 export libpng_ver=1.6.37
+export zlib_ver=1.2.13
+export esmf_ver=8.5.0
+export fms_ver=2023.02.01
 export cdo_ver=2.2.0
 export nco_ver=5.0.6
 
@@ -10,7 +14,14 @@ export hdf5_ver=1.14.0
 export netcdf_c_ver=4.9.2
 export netcdf_fortran_ver=4.6.1
 
+export bacio_ver=2.4.1
+export nemsio_ver=2.5.4
+export sigio_ver=2.3.2
+export w3emc_ver=2.10.0
 export bufr_ver=11.7.0
+export g2_ver=3.4.5
+export sp_ver=2.5.0
+export ip_ver=4.3.0
 export gsi_ncdiag_ver=1.1.2
 export g2tmpl_ver=1.10.2
 export crtm_ver=2.4.0.1
@@ -23,13 +34,14 @@ export py_jinja2_ver=3.1.2
 export py_pandas_ver=1.5.3
 export py_python_dateutil_ver=2.8.2
 export py_f90nml_ver=1.4.3
+export py_numpy_ver=1.23.4
 
 export met_ver=9.1.3
 export metplus_ver=3.1.1
 export py_xarray_ver=2023.7.0
 
-export obsproc_run_ver=1.1.2
-export prepobs_run_ver=1.0.2
+export obsproc_run_ver=1.2.0
+export prepobs_run_ver=1.1.0
 
 export ens_tracker_ver=feature-GFSv17_com_reorg
-export fit2obs_ver=1.1.2
+export fit2obs_ver=1.1.4
diff --git a/workflow/applications/applications.py b/workflow/applications/applications.py
index 5476a10c52..f58b043a28 100644
--- a/workflow/applications/applications.py
+++ b/workflow/applications/applications.py
@@ -3,7 +3,6 @@
 from typing import Dict, List, Any
 from datetime import timedelta
 from hosts import Host
-from pathlib import Path
 from wxflow import Configuration, to_timedelta
 from abc import ABC, ABCMeta, abstractmethod
 
@@ -32,58 +31,52 @@ def __init__(self, conf: Configuration) -> None:
 
         self.scheduler = Host().scheduler
 
-        # Save the configuration so we can source the config files when
-        # determining task resources
-        self.conf = conf
+        base = conf.parse_config('config.base')
 
-        _base = self.conf.parse_config('config.base')
-        # Define here so the child __init__ functions can use it; will
-        # be overwritten later during _init_finalize().
-        self._base = _base
-
-        self.mode = _base['MODE']
+        self.mode = base['MODE']
 
         if self.mode not in self.VALID_MODES:
-            raise NotImplementedError(f'{self.mode} is not a valid application mode.\n' +
-                                      'Valid application modes are:\n' +
-                                      f'{", ".join(self.VALID_MODES)}')
-
-        self.net = _base['NET']
-        self.model_app = _base.get('APP', 'ATM')
-        self.do_atm = _base.get('DO_ATM', True)
-        self.do_wave = _base.get('DO_WAVE', False)
-        self.do_wave_bnd = _base.get('DOBNDPNT_WAVE', False)
-        self.do_ocean = _base.get('DO_OCN', False)
-        self.do_ice = _base.get('DO_ICE', False)
-        self.do_aero = _base.get('DO_AERO', False)
-        self.do_prep_obs_aero = _base.get('DO_PREP_OBS_AERO', False)
-        self.do_bufrsnd = _base.get('DO_BUFRSND', False)
-        self.do_gempak = _base.get('DO_GEMPAK', False)
-        self.do_awips = _base.get('DO_AWIPS', False)
-        self.do_verfozn = _base.get('DO_VERFOZN', True)
-        self.do_verfrad = _base.get('DO_VERFRAD', True)
-        self.do_vminmon = _base.get('DO_VMINMON', True)
-        self.do_tracker = _base.get('DO_TRACKER', True)
-        self.do_genesis = _base.get('DO_GENESIS', True)
-        self.do_genesis_fsu = _base.get('DO_GENESIS_FSU', False)
-        self.do_metp = _base.get('DO_METP', False)
-        self.do_upp = not _base.get('WRITE_DOPOST', True)
-        self.do_goes = _base.get('DO_GOES', False)
-        self.do_mos = _base.get('DO_MOS', False)
-        self.do_extractvars = _base.get('DO_EXTRACTVARS', False)
-        self.do_repair_replay = _base.get('DO_REPAIR_REPLAY', False)
-
-        self.do_hpssarch = _base.get('HPSSARCH', False)
-
-        self.nens = _base.get('NMEM_ENS', 0)
-        self.fcst_segments = _base.get('FCST_SEGMENTS', None)
+            raise NotImplementedError(f'{self.mode} is not a valid application mode.\n'
+                                      f'Valid application modes are:\n'
+                                      f'{", ".join(self.VALID_MODES)}\n')
+
+        self.net = base['NET']
+        self.model_app = base.get('APP', 'ATM')
+        self.do_atm = base.get('DO_ATM', True)
+        self.do_wave = base.get('DO_WAVE', False)
+        self.do_wave_bnd = base.get('DOBNDPNT_WAVE', False)
+        self.do_ocean = base.get('DO_OCN', False)
+        self.do_ice = base.get('DO_ICE', False)
+        self.do_aero = base.get('DO_AERO', False)
+        self.do_prep_obs_aero = base.get('DO_PREP_OBS_AERO', False)
+        self.do_bufrsnd = base.get('DO_BUFRSND', False)
+        self.do_gempak = base.get('DO_GEMPAK', False)
+        self.do_awips = base.get('DO_AWIPS', False)
+        self.do_verfozn = base.get('DO_VERFOZN', True)
+        self.do_verfrad = base.get('DO_VERFRAD', True)
+        self.do_vminmon = base.get('DO_VMINMON', True)
+        self.do_tracker = base.get('DO_TRACKER', True)
+        self.do_genesis = base.get('DO_GENESIS', True)
+        self.do_genesis_fsu = base.get('DO_GENESIS_FSU', False)
+        self.do_metp = base.get('DO_METP', False)
+        self.do_upp = not base.get('WRITE_DOPOST', True)
+        self.do_goes = base.get('DO_GOES', False)
+        self.do_mos = base.get('DO_MOS', False)
+        self.do_extractvars = base.get('DO_EXTRACTVARS', False)
+        self.do_repair_replay = base.get('DO_REPAIR_REPLAY', False)
+
+        self.do_hpssarch = base.get('HPSSARCH', False)
+
+        self.nens = base.get('NMEM_ENS', 0)
+        self.fcst_segments = base.get('FCST_SEGMENTS', None)
+        self.interval_gfs = to_timedelta(f"{base.get('INTERVAL_GFS')}H")
 
         if not AppConfig.is_monotonic(self.fcst_segments):
             raise ValueError(f'Forecast segments do not increase monotonically: {",".join(self.fcst_segments)}')
 
         self.wave_runs = None
         if self.do_wave:
-            wave_run = _base.get('WAVE_RUN', 'BOTH').lower()
+            wave_run = base.get('WAVE_RUN', 'BOTH').lower()
             if wave_run in ['both']:
                 self.wave_runs = ['gfs', 'gdas']
             elif wave_run in ['gfs', 'gdas']:
@@ -92,45 +85,49 @@ def __init__(self, conf: Configuration) -> None:
         self.aero_anl_runs = None
         self.aero_fcst_runs = None
         if self.do_aero:
-            aero_anl_run = _base.get('AERO_ANL_RUN', 'BOTH').lower()
+            aero_anl_run = base.get('AERO_ANL_RUN', 'BOTH').lower()
             if aero_anl_run in ['both']:
                 self.aero_anl_runs = ['gfs', 'gdas']
             elif aero_anl_run in ['gfs', 'gdas']:
                 self.aero_anl_runs = [aero_anl_run]
-            aero_fcst_run = _base.get('AERO_FCST_RUN', None).lower()
+            aero_fcst_run = base.get('AERO_FCST_RUN', None).lower()
             if aero_fcst_run in ['both']:
                 self.aero_fcst_runs = ['gfs', 'gdas']
             elif aero_fcst_run in ['gfs', 'gdas']:
                 self.aero_fcst_runs = [aero_fcst_run]
 
-    def _init_finalize(self, *args):
+    def _init_finalize(self, conf: Configuration):
         print("Finalizing initialize")
 
         # Get a list of all possible config_files that would be part of the application
         self.configs_names = self._get_app_configs()
 
-        # Source the config_files for the jobs in the application
-        self.configs = self.source_configs()
+        # Source the config files for the jobs in the application without specifying a RUN
+        self.configs = {'_no_run': self._source_configs(conf)}
 
-        # Update the base config dictionary base on application
-        self.configs['base'] = self.update_base(self.configs['base'])
+        # Update the base config dictionary based on application
+        self.configs['_no_run']['base'] = self._update_base(self.configs['_no_run']['base'])
 
         # Save base in the internal state since it is often needed
-        self._base = self.configs['base']
-
-        # Get more configuration options into the class attributes
-        self.gfs_cyc = self._base.get('gfs_cyc')
+        base = self.configs['_no_run']['base']
 
-        # Finally get task names for the application
+        # Get task names for the application
         self.task_names = self.get_task_names()
 
+        # Finally, source the configuration files for each valid `RUN`
+        for run in self.task_names.keys():
+            self.configs[run] = self._source_configs(conf, run=run, log=False)
+
+            # Update the base config dictionary based on application and RUN
+            self.configs[run]['base'] = self._update_base(self.configs[run]['base'])
+
     @abstractmethod
     def _get_app_configs(self):
         pass
 
     @staticmethod
     @abstractmethod
-    def update_base(base_in: Dict[str, Any]) -> Dict[str, Any]:
+    def _update_base(base_in: Dict[str, Any]) -> Dict[str, Any]:
         '''
         Make final updates to base and return an updated copy
 
@@ -147,7 +144,7 @@ def update_base(base_in: Dict[str, Any]) -> Dict[str, Any]:
         '''
         pass
 
-    def source_configs(self, run: str = "gfs", log: bool = True) -> Dict[str, Any]:
+    def _source_configs(self, conf: Configuration, run: str = "gfs", log: bool = True) -> Dict[str, Any]:
         """
         Given the configuration object used to initialize this application,
         source the configurations for each config and return a dictionary
@@ -157,7 +154,7 @@ def source_configs(self, run: str = "gfs", log: bool = True) -> Dict[str, Any]:
         configs = dict()
 
         # Return config.base as well
-        configs['base'] = self.conf.parse_config('config.base')
+        configs['base'] = conf.parse_config('config.base', RUN=run)
 
         # Source the list of all config_files involved in the application
         for config in self.configs_names:
@@ -181,12 +178,12 @@ def source_configs(self, run: str = "gfs", log: bool = True) -> Dict[str, Any]:
                 files += [f'config.{config}']
 
             print(f'sourcing config.{config}') if log else 0
-            configs[config] = self.conf.parse_config(files, RUN=run)
+            configs[config] = conf.parse_config(files, RUN=run)
 
         return configs
 
     @abstractmethod
-    def get_task_names(self) -> Dict[str, List[str]]:
+    def get_task_names(self, run="_no_run") -> Dict[str, List[str]]:
         '''
         Create a list of task names for each RUN valid for the configuation.
 
@@ -201,19 +198,6 @@ def get_task_names(self) -> Dict[str, List[str]]:
         '''
         pass
 
-    @staticmethod
-    def get_gfs_interval(gfs_cyc: int) -> timedelta:
-        """
-        return interval in hours based on gfs_cyc
-        """
-
-        gfs_internal_map = {'1': '24H', '2': '12H', '4': '6H'}
-
-        try:
-            return to_timedelta(gfs_internal_map[str(gfs_cyc)])
-        except KeyError:
-            raise KeyError(f'Invalid gfs_cyc = {gfs_cyc}')
-
     @staticmethod
     def is_monotonic(test_list: List, check_decreasing: bool = False) -> bool:
         """
diff --git a/workflow/applications/gefs.py b/workflow/applications/gefs.py
index f20e871b9d..d6ebc47b9d 100644
--- a/workflow/applications/gefs.py
+++ b/workflow/applications/gefs.py
@@ -10,17 +10,20 @@ class GEFSAppConfig(AppConfig):
     def __init__(self, conf: Configuration):
         super().__init__(conf)
 
+        base = conf.parse_config('config.base')
+        self.run = base.get('RUN', 'gefs')
+
     def _get_app_configs(self):
         """
         Returns the config_files that are involved in gefs
         """
-        configs = ['stage_ic', 'fcst', 'repair_replay', 'atmos_products', 'arch']
+        configs = ['stage_ic', 'fcst', 'atmos_products', 'arch', 'cleanup']
 
         if self.nens > 0:
             configs += ['efcs', 'atmos_ensstat']
 
-            if self.do_repair_replay:
-                configs += ['repair_replay']
+        if self.do_repair_replay:
+            configs += ['repair_replay']
 
         if self.do_wave:
             configs += ['waveinit', 'wavepostsbs', 'wavepostpnt']
@@ -39,10 +42,9 @@ def _get_app_configs(self):
         return configs
 
     @staticmethod
-    def update_base(base_in):
+    def _update_base(base_in):
 
         base_out = base_in.copy()
-        base_out['INTERVAL_GFS'] = AppConfig.get_gfs_interval(base_in['gfs_cyc'])
         base_out['RUN'] = 'gefs'
 
         return base_out
@@ -83,8 +85,8 @@ def get_task_names(self):
             tasks += ['wavepostpnt']
 
         if self.do_extractvars:
-            tasks += ['extractvars']
+            tasks += ['extractvars', 'arch']
 
-        tasks += ['arch']
+        tasks += ['cleanup']
 
-        return {f"{self._base['RUN']}": tasks}
+        return {f"{self.run}": tasks}
diff --git a/workflow/applications/gfs_cycled.py b/workflow/applications/gfs_cycled.py
index 8c3bca0fd7..da78166ede 100644
--- a/workflow/applications/gfs_cycled.py
+++ b/workflow/applications/gfs_cycled.py
@@ -11,20 +11,21 @@ class GFSCycledAppConfig(AppConfig):
 
     def __init__(self, conf: Configuration):
         super().__init__(conf)
-        self.do_hybvar = self._base.get('DOHYBVAR', False)
-        self.do_fit2obs = self._base.get('DO_FIT2OBS', True)
-        self.do_jediatmvar = self._base.get('DO_JEDIATMVAR', False)
-        self.do_jediatmens = self._base.get('DO_JEDIATMENS', False)
-        self.do_jediocnvar = self._base.get('DO_JEDIOCNVAR', False)
-        self.do_jedisnowda = self._base.get('DO_JEDISNOWDA', False)
-        self.do_mergensst = self._base.get('DO_MERGENSST', False)
-        self.do_vrfy_oceanda = self._base.get('DO_VRFY_OCEANDA', False)
+        base = conf.parse_config('config.base')
+        self.do_hybvar = base.get('DOHYBVAR', False)
+        self.do_fit2obs = base.get('DO_FIT2OBS', True)
+        self.do_jediatmvar = base.get('DO_JEDIATMVAR', False)
+        self.do_jediatmens = base.get('DO_JEDIATMENS', False)
+        self.do_jediocnvar = base.get('DO_JEDIOCNVAR', False)
+        self.do_jedisnowda = base.get('DO_JEDISNOWDA', False)
+        self.do_mergensst = base.get('DO_MERGENSST', False)
+        self.do_vrfy_oceanda = base.get('DO_VRFY_OCEANDA', False)
 
         self.lobsdiag_forenkf = False
         self.eupd_runs = None
         if self.do_hybvar:
-            self.lobsdiag_forenkf = self._base.get('lobsdiag_forenkf', False)
-            eupd_run = self._base.get('EUPD_CYC', 'gdas').lower()
+            self.lobsdiag_forenkf = base.get('lobsdiag_forenkf', False)
+            eupd_run = base.get('EUPD_CYC', 'gdas').lower()
             if eupd_run in ['both']:
                 self.eupd_runs = ['gfs', 'gdas']
             elif eupd_run in ['gfs', 'gdas']:
@@ -43,10 +44,10 @@ def _get_app_configs(self):
             configs += ['anal', 'analdiag']
 
         if self.do_jediocnvar:
-            configs += ['prepoceanobs', 'ocnanalprep', 'marinebmat', 'ocnanalrun']
+            configs += ['prepoceanobs', 'marineanlinit', 'marinebmat', 'marineanlvar']
             if self.do_hybvar:
                 configs += ['ocnanalecen']
-            configs += ['ocnanalchkpt', 'ocnanalpost']
+            configs += ['marineanlchkpt', 'marineanlfinal']
             if self.do_vrfy_oceanda:
                 configs += ['ocnanalvrfy']
 
@@ -107,7 +108,7 @@ def _get_app_configs(self):
                 configs += ['waveawipsbulls', 'waveawipsgridded']
 
         if self.do_aero:
-            configs += ['aeroanlinit', 'aeroanlrun', 'aeroanlfinal']
+            configs += ['aeroanlgenb', 'aeroanlinit', 'aeroanlvar', 'aeroanlfinal']
             if self.do_prep_obs_aero:
                 configs += ['prepobsaero']
 
@@ -125,9 +126,9 @@ def _get_app_configs(self):
         return configs
 
     @staticmethod
-    def update_base(base_in):
+    def _update_base(base_in):
 
-        return GFSCycledAppConfig.get_gfs_cyc_dates(base_in)
+        return base_in
 
     def get_task_names(self):
         """
@@ -145,10 +146,10 @@ def get_task_names(self):
             gdas_gfs_common_tasks_before_fcst += ['anal']
 
         if self.do_jediocnvar:
-            gdas_gfs_common_tasks_before_fcst += ['prepoceanobs', 'ocnanalprep', 'marinebmat', 'ocnanalrun']
+            gdas_gfs_common_tasks_before_fcst += ['prepoceanobs', 'marineanlinit', 'marinebmat', 'marineanlvar']
             if self.do_hybvar:
                 gdas_gfs_common_tasks_before_fcst += ['ocnanalecen']
-            gdas_gfs_common_tasks_before_fcst += ['ocnanalchkpt', 'ocnanalpost']
+            gdas_gfs_common_tasks_before_fcst += ['marineanlchkpt', 'marineanlfinal']
             if self.do_vrfy_oceanda:
                 gdas_gfs_common_tasks_before_fcst += ['ocnanalvrfy']
 
@@ -184,7 +185,7 @@ def get_task_names(self):
             gdas_tasks += wave_prep_tasks
 
         if self.do_aero and 'gdas' in self.aero_anl_runs:
-            gdas_tasks += ['aeroanlinit', 'aeroanlrun', 'aeroanlfinal']
+            gdas_tasks += ['aeroanlgenb', 'aeroanlinit', 'aeroanlvar', 'aeroanlfinal']
             if self.do_prep_obs_aero:
                 gdas_tasks += ['prepobsaero']
 
@@ -223,7 +224,7 @@ def get_task_names(self):
             gfs_tasks += wave_prep_tasks
 
         if self.do_aero and 'gfs' in self.aero_anl_runs:
-            gfs_tasks += ['aeroanlinit', 'aeroanlrun', 'aeroanlfinal']
+            gfs_tasks += ['aeroanlinit', 'aeroanlvar', 'aeroanlfinal']
             if self.do_prep_obs_aero:
                 gfs_tasks += ['prepobsaero']
 
@@ -296,7 +297,7 @@ def get_task_names(self):
             tasks['enkfgdas'] = enkfgdas_tasks
 
         # Add RUN=gfs tasks if running early cycle
-        if self.gfs_cyc > 0:
+        if self.interval_gfs > to_timedelta("0H"):
             tasks['gfs'] = gfs_tasks
 
             if self.do_hybvar and 'gfs' in self.eupd_runs:
@@ -306,49 +307,3 @@ def get_task_names(self):
                 tasks['enkfgfs'] = enkfgfs_tasks
 
         return tasks
-
-    @staticmethod
-    def get_gfs_cyc_dates(base: Dict[str, Any]) -> Dict[str, Any]:
-        """
-        Generate GFS dates from experiment dates and gfs_cyc choice
-        """
-
-        base_out = base.copy()
-
-        sdate = base['SDATE']
-        edate = base['EDATE']
-        base_out['INTERVAL'] = to_timedelta(f"{base['assim_freq']}H")
-
-        # Set GFS cycling dates
-        gfs_cyc = base['gfs_cyc']
-        if gfs_cyc != 0:
-            interval_gfs = AppConfig.get_gfs_interval(gfs_cyc)
-            hrinc = 0
-            hrdet = 0
-            if gfs_cyc == 1:
-                hrinc = 24 - sdate.hour
-                hrdet = edate.hour
-            elif gfs_cyc == 2:
-                if sdate.hour in [0, 12]:
-                    hrinc = 12
-                elif sdate.hour in [6, 18]:
-                    hrinc = 6
-                if edate.hour in [6, 18]:
-                    hrdet = 6
-            elif gfs_cyc == 4:
-                hrinc = 6
-            sdate_gfs = sdate + timedelta(hours=hrinc)
-            edate_gfs = edate - timedelta(hours=hrdet)
-            if sdate_gfs > edate:
-                print('W A R N I N G!')
-                print('Starting date for GFS cycles is after Ending date of experiment')
-                print(f'SDATE = {sdate.strftime("%Y%m%d%H")},     EDATE = {edate.strftime("%Y%m%d%H")}')
-                print(f'SDATE_GFS = {sdate_gfs.strftime("%Y%m%d%H")}, EDATE_GFS = {edate_gfs.strftime("%Y%m%d%H")}')
-                gfs_cyc = 0
-
-            base_out['gfs_cyc'] = gfs_cyc
-            base_out['SDATE_GFS'] = sdate_gfs
-            base_out['EDATE_GFS'] = edate_gfs
-            base_out['INTERVAL_GFS'] = interval_gfs
-
-        return base_out
diff --git a/workflow/applications/gfs_forecast_only.py b/workflow/applications/gfs_forecast_only.py
index 680588e4ca..fb1d2cdb8f 100644
--- a/workflow/applications/gfs_forecast_only.py
+++ b/workflow/applications/gfs_forecast_only.py
@@ -10,6 +10,11 @@ class GFSForecastOnlyAppConfig(AppConfig):
     def __init__(self, conf: Configuration):
         super().__init__(conf)
 
+        base = conf.parse_config('config.base')
+        self.aero_fcst_run = base.get('AERO_FCST_RUN', 'BOTH').lower()
+        self.run = base.get('RUN', 'gfs')
+        self.exp_warm_start = base.get('EXP_WARM_START', False)
+
     def _get_app_configs(self):
         """
         Returns the config_files that are involved in the forecast-only app
@@ -25,7 +30,7 @@ def _get_app_configs(self):
             configs += ['atmos_products']
 
             if self.do_aero:
-                if not self._base['EXP_WARM_START']:
+                if not self.exp_warm_start:
                     configs += ['aerosol_init']
 
             if self.do_tracker:
@@ -70,10 +75,9 @@ def _get_app_configs(self):
         return configs
 
     @staticmethod
-    def update_base(base_in):
+    def _update_base(base_in):
 
         base_out = base_in.copy()
-        base_out['INTERVAL_GFS'] = AppConfig.get_gfs_interval(base_in['gfs_cyc'])
         base_out['RUN'] = 'gfs'
 
         return base_out
@@ -88,9 +92,9 @@ def get_task_names(self):
         tasks = ['stage_ic']
 
         if self.do_aero:
-            aero_fcst_run = self._base.get('AERO_FCST_RUN', 'BOTH').lower()
-            if self._base['RUN'] in aero_fcst_run or aero_fcst_run == "both":
-                if not self._base['EXP_WARM_START']:
+            aero_fcst_run = self.aero_fcst_run
+            if self.run in aero_fcst_run or aero_fcst_run == "both":
+                if not self.exp_warm_start:
                     tasks += ['aerosol_init']
 
         if self.do_wave:
@@ -153,4 +157,4 @@ def get_task_names(self):
 
         tasks += ['arch', 'cleanup']  # arch and cleanup **must** be the last tasks
 
-        return {f"{self._base['RUN']}": tasks}
+        return {f"{self.run}": tasks}
diff --git a/workflow/hosts.py b/workflow/hosts.py
index 34ea067ade..7bde58f95f 100644
--- a/workflow/hosts.py
+++ b/workflow/hosts.py
@@ -42,7 +42,7 @@ def detect(cls):
             machine = 'HERA'
         elif os.path.exists('/work/noaa'):
             machine = socket.gethostname().split("-", 1)[0].upper()
-        elif os.path.exists('/lfs4/HFIP'):
+        elif os.path.exists('/lfs5/HFIP'):
             machine = 'JET'
         elif os.path.exists('/lfs/f1'):
             machine = 'WCOSS2'
diff --git a/workflow/hosts/awspw.yaml b/workflow/hosts/awspw.yaml
index a9c708253e..ef17d8f2f4 100644
--- a/workflow/hosts/awspw.yaml
+++ b/workflow/hosts/awspw.yaml
@@ -18,6 +18,7 @@ CHGRP_RSTPROD: 'YES'
 CHGRP_CMD: 'chgrp rstprod' # TODO: This is not yet supported.
 HPSSARCH: 'NO'
 HPSS_PROJECT: emc-global #TODO: See `ATARDIR` below.
+BASE_DATA: '/bucket/global-workflow-shared-data'
 BASE_IC: '/bucket/global-workflow-shared-data/ICSDIR'
 LOCALARCH: 'NO'
 ATARDIR: '' # TODO: This will not yet work from AWS.
diff --git a/workflow/hosts/azurepw.yaml b/workflow/hosts/azurepw.yaml
index 2155c67dea..1769f9ee19 100644
--- a/workflow/hosts/azurepw.yaml
+++ b/workflow/hosts/azurepw.yaml
@@ -18,7 +18,8 @@ CHGRP_RSTPROD: 'YES'
 CHGRP_CMD: 'chgrp rstprod' # TODO: This is not yet supported.
 HPSSARCH: 'NO'
 HPSS_PROJECT: emc-global #TODO: See `ATARDIR` below.
-BASE_CPLIC: '/bucket/global-workflow-shared-data/ICSDIR/prototype_ICs'
+BASE_DATA: '/bucket/global-workflow-shared-data'
+BASE_IC: '/bucket/global-workflow-shared-data/ICSDIR'
 LOCALARCH: 'NO'
 ATARDIR: '' # TODO: This will not yet work from AZURE.
 MAKE_NSSTBUFR: 'NO'
diff --git a/workflow/hosts/gaea.yaml b/workflow/hosts/gaea.yaml
index 9297fed24a..5a37b5dabf 100644
--- a/workflow/hosts/gaea.yaml
+++ b/workflow/hosts/gaea.yaml
@@ -1,5 +1,6 @@
 BASE_GIT: '/gpfs/f5/ufs-ard/world-shared/global/glopara/data/git'
 DMPDIR: '/gpfs/f5/ufs-ard/world-shared/global/glopara/data/dump'
+BASE_DATA: '/gpfs/f5/ufs-ard/world-shared/global/glopara/data'
 BASE_IC: '/gpfs/f5/ufs-ard/world-shared/global/glopara/data/ICSDIR'
 PACKAGEROOT: '/gpfs/f5/ufs-ard/world-shared/global/glopara/data/nwpara'
 COMROOT: '/gpfs/f5/ufs-ard/world-shared/global/glopara/data/com'
diff --git a/workflow/hosts/googlepw.yaml b/workflow/hosts/googlepw.yaml
index 38180dd750..daf6cd1eb2 100644
--- a/workflow/hosts/googlepw.yaml
+++ b/workflow/hosts/googlepw.yaml
@@ -18,7 +18,8 @@ CHGRP_RSTPROD: 'YES'
 CHGRP_CMD: 'chgrp rstprod' # TODO: This is not yet supported.
 HPSSARCH: 'NO'
 HPSS_PROJECT: emc-global #TODO: See `ATARDIR` below.
-BASE_IC: '/bucket/global-workflow-shared-data/ICSDIR/prototype_ICs'
+BASE_DATA: '/bucket/global-workflow-shared-data'
+BASE_IC: '/bucket/global-workflow-shared-data/ICSDIR'
 LOCALARCH: 'NO'
 ATARDIR: '' # TODO: This will not yet work from GOOGLE.
 MAKE_NSSTBUFR: 'NO'
diff --git a/workflow/hosts/hera.yaml b/workflow/hosts/hera.yaml
index 4ace199470..fa2c351aa1 100644
--- a/workflow/hosts/hera.yaml
+++ b/workflow/hosts/hera.yaml
@@ -1,5 +1,6 @@
 BASE_GIT: '/scratch1/NCEPDEV/global/glopara/git'
 DMPDIR: '/scratch1/NCEPDEV/global/glopara/dump'
+BASE_DATA: '/scratch1/NCEPDEV/global/glopara/data'
 BASE_IC: '/scratch1/NCEPDEV/global/glopara/data/ICSDIR'
 PACKAGEROOT: '/scratch1/NCEPDEV/global/glopara/nwpara'
 COMINsyn: '/scratch1/NCEPDEV/global/glopara/com/gfs/prod/syndat'
diff --git a/workflow/hosts/hercules.yaml b/workflow/hosts/hercules.yaml
index 9d6339a48e..73fde6cde6 100644
--- a/workflow/hosts/hercules.yaml
+++ b/workflow/hosts/hercules.yaml
@@ -1,5 +1,6 @@
 BASE_GIT: '/work/noaa/global/glopara/git_rocky9'
 DMPDIR: '/work/noaa/rstprod/dump'
+BASE_DATA: '/work/noaa/global/glopara/data'
 BASE_IC: '/work/noaa/global/glopara/data/ICSDIR'
 PACKAGEROOT: '/work/noaa/global/glopara/nwpara'
 COMINsyn: '/work/noaa/global/glopara/com/gfs/prod/syndat'
diff --git a/workflow/hosts/jet.yaml b/workflow/hosts/jet.yaml
index 21e815c9b2..a53224fe52 100644
--- a/workflow/hosts/jet.yaml
+++ b/workflow/hosts/jet.yaml
@@ -1,11 +1,12 @@
-BASE_GIT: '/lfs4/HFIP/hfv3gfs/glopara/git'
-DMPDIR: '/lfs4/HFIP/hfv3gfs/glopara/dump'
-BASE_IC: '/mnt/lfs4/HFIP/hfv3gfs/glopara/data/ICSDIR'
-PACKAGEROOT: '/lfs4/HFIP/hfv3gfs/glopara/nwpara'
-COMINsyn: '/lfs4/HFIP/hfv3gfs/glopara/com/gfs/prod/syndat'
-HOMEDIR: '/lfs4/HFIP/hfv3gfs/${USER}'
-STMP: '/lfs4/HFIP/hfv3gfs/${USER}/stmp'
-PTMP: '/lfs4/HFIP/hfv3gfs/${USER}/ptmp'
+BASE_GIT: '/lfs5/HFIP/hfv3gfs/glopara/git'
+DMPDIR: '/lfs5/HFIP/hfv3gfs/glopara/dump'
+BASE_DATA: '/lfs5/HFIP/hfv3gfs/glopara/data'
+BASE_IC: '/mnt/lfs5/HFIP/hfv3gfs/glopara/data/ICSDIR'
+PACKAGEROOT: '/lfs5/HFIP/hfv3gfs/glopara/nwpara'
+COMINsyn: '/lfs5/HFIP/hfv3gfs/glopara/com/gfs/prod/syndat'
+HOMEDIR: '/lfs5/HFIP/hfv3gfs/${USER}'
+STMP: '/lfs5/HFIP/hfv3gfs/${USER}/stmp'
+PTMP: '/lfs5/HFIP/hfv3gfs/${USER}/ptmp'
 NOSCRUB: $HOMEDIR
 ACCOUNT: hfv3gfs
 SCHEDULER: slurm
@@ -24,6 +25,6 @@ ATARDIR: '/NCEPDEV/${HPSS_PROJECT}/1year/${USER}/${machine}/scratch/${PSLOT}'
 MAKE_NSSTBUFR: 'NO'
 MAKE_ACFTBUFR: 'NO'
 SUPPORTED_RESOLUTIONS: ['C384', 'C192', 'C96', 'C48']
-COMINecmwf: /mnt/lfs4/HFIP/hfv3gfs/glopara/data/external_gempak/ecmwf
-COMINnam: /mnt/lfs4/HFIP/hfv3gfs/glopara/data/external_gempak/nam
-COMINukmet: /mnt/lfs4/HFIP/hfv3gfs/glopara/data/external_gempak/ukmet
+COMINecmwf: /mnt/lfs5/HFIP/hfv3gfs/glopara/data/external_gempak/ecmwf
+COMINnam: /mnt/lfs5/HFIP/hfv3gfs/glopara/data/external_gempak/nam
+COMINukmet: /mnt/lfs5/HFIP/hfv3gfs/glopara/data/external_gempak/ukmet
diff --git a/workflow/hosts/orion.yaml b/workflow/hosts/orion.yaml
index 81daea6168..d47b2b2bab 100644
--- a/workflow/hosts/orion.yaml
+++ b/workflow/hosts/orion.yaml
@@ -1,5 +1,6 @@
-BASE_GIT: '/work/noaa/global/glopara/git'
+BASE_GIT: '/work/noaa/global/glopara/git_rocky9'
 DMPDIR: '/work/noaa/rstprod/dump'
+BASE_DATA: '/work/noaa/global/glopara/data'
 BASE_IC: '/work/noaa/global/glopara/data/ICSDIR'
 PACKAGEROOT: '/work/noaa/global/glopara/nwpara'
 COMINsyn: '/work/noaa/global/glopara/com/gfs/prod/syndat'
diff --git a/workflow/hosts/s4.yaml b/workflow/hosts/s4.yaml
index c2af9728f2..b93fefec39 100644
--- a/workflow/hosts/s4.yaml
+++ b/workflow/hosts/s4.yaml
@@ -1,5 +1,6 @@
 BASE_GIT: '/data/prod/glopara/git'
 DMPDIR: '/data/prod/glopara/dump'
+BASE_DATA: '/data/prod/glopara'
 BASE_IC: '/data/prod/glopara/coupled_ICs'
 PACKAGEROOT: '/data/prod/glopara/nwpara'
 COMINsyn: '/data/prod/glopara/com/gfs/prod/syndat'
diff --git a/workflow/hosts/wcoss2.yaml b/workflow/hosts/wcoss2.yaml
index bf2cc41c45..15f0705f91 100644
--- a/workflow/hosts/wcoss2.yaml
+++ b/workflow/hosts/wcoss2.yaml
@@ -1,5 +1,6 @@
 BASE_GIT: '/lfs/h2/emc/global/save/emc.global/git'
 DMPDIR: '/lfs/h2/emc/dump/noscrub/dump'
+BASE_DATA: '/lfs/h2/emc/global/noscrub/emc.global/data'
 BASE_IC: '/lfs/h2/emc/global/noscrub/emc.global/data/ICSDIR'
 PACKAGEROOT: '${PACKAGEROOT:-"/lfs/h1/ops/prod/packages"}'
 COMINsyn: '/lfs/h1/ops/prod/com/gfs/v16.3/syndat'
diff --git a/workflow/rocoto/gefs_tasks.py b/workflow/rocoto/gefs_tasks.py
index 8d02d3b97f..d03a1f266b 100644
--- a/workflow/rocoto/gefs_tasks.py
+++ b/workflow/rocoto/gefs_tasks.py
@@ -2,6 +2,7 @@
 from rocoto.tasks import Tasks
 import rocoto.rocoto as rocoto
 from datetime import datetime, timedelta
+import numpy as np
 
 
 class GEFSTasks(Tasks):
@@ -12,13 +13,13 @@ def __init__(self, app_config: AppConfig, run: str) -> None:
     def stage_ic(self):
 
         resources = self.get_resource('stage_ic')
-        task_name = f'stage_ic'
+        task_name = f'gefs_stage_ic'
         task_dict = {'task_name': task_name,
                      'resources': resources,
                      'envars': self.envars,
                      'cycledef': 'gefs',
                      'command': f'{self.HOMEgfs}/jobs/rocoto/stage_ic.sh',
-                     'job_name': f'{self.pslot}_{task_name}_@H',
+                     'job_name': f'{self.pslot}_{task_name}_@Y@m@d@H',
                      'log': f'{self.rotdir}/logs/@Y@m@d@H/{task_name}.log',
                      'maxtries': '&MAXTRIES;'
                      }
@@ -29,13 +30,13 @@ def stage_ic(self):
     def waveinit(self):
 
         resources = self.get_resource('waveinit')
-        task_name = f'wave_init'
+        task_name = f'gefs_wave_init'
         task_dict = {'task_name': task_name,
                      'resources': resources,
                      'envars': self.envars,
                      'cycledef': 'gefs',
                      'command': f'{self.HOMEgfs}/jobs/rocoto/waveinit.sh',
-                     'job_name': f'{self.pslot}_{task_name}_@H',
+                     'job_name': f'{self.pslot}_{task_name}_@Y@m@d@H',
                      'log': f'{self.rotdir}/logs/@Y@m@d@H/{task_name}.log',
                      'maxtries': '&MAXTRIES;'
                      }
@@ -45,18 +46,18 @@ def waveinit(self):
 
     def prep_emissions(self):
         deps = []
-        dep_dict = {'type': 'task', 'name': f'stage_ic'}
+        dep_dict = {'type': 'task', 'name': f'gefs_stage_ic'}
         deps.append(rocoto.add_dependency(dep_dict))
         dependencies = rocoto.create_dependency(dep=deps)
 
         resources = self.get_resource('prep_emissions')
-        task_name = 'prep_emissions'
+        task_name = 'gefs_prep_emissions'
         task_dict = {'task_name': task_name,
                      'resources': resources,
                      'envars': self.envars,
                      'cycledef': 'gefs',
                      'command': f'{self.HOMEgfs}/jobs/rocoto/prep_emissions.sh',
-                     'job_name': f'{self.pslot}_{task_name}_@H',
+                     'job_name': f'{self.pslot}_{task_name}_@Y@m@d@H',
                      'log': f'{self.rotdir}/logs/@Y@m@d@H/{task_name}.log',
                      'maxtries': '&MAXTRIES;'
                      }
@@ -66,15 +67,15 @@ def prep_emissions(self):
 
     def fcst(self):
         dependencies = []
-        dep_dict = {'type': 'task', 'name': f'stage_ic'}
+        dep_dict = {'type': 'task', 'name': f'gefs_stage_ic'}
         dependencies.append(rocoto.add_dependency(dep_dict))
 
         if self.app_config.do_wave:
-            dep_dict = {'type': 'task', 'name': f'wave_init'}
+            dep_dict = {'type': 'task', 'name': f'gefs_wave_init'}
             dependencies.append(rocoto.add_dependency(dep_dict))
 
         if self.app_config.do_aero:
-            dep_dict = {'type': 'task', 'name': f'prep_emissions'}
+            dep_dict = {'type': 'task', 'name': f'gefs_prep_emissions'}
             dependencies.append(rocoto.add_dependency(dep_dict))
 
         dependencies = rocoto.create_dependency(dep_condition='and', dep=dependencies)
@@ -87,20 +88,20 @@ def fcst(self):
             fcst_vars.append(rocoto.create_envar(name=key, value=str(value)))
 
         resources = self.get_resource('fcst')
-        task_name = f'fcst_mem000_seg#seg#'
+        task_name = f'gefs_fcst_mem000_seg#seg#'
         task_dict = {'task_name': task_name,
                      'resources': resources,
                      'dependency': dependencies,
                      'envars': fcst_vars,
                      'cycledef': 'gefs',
                      'command': f'{self.HOMEgfs}/jobs/rocoto/fcst.sh',
-                     'job_name': f'{self.pslot}_{task_name}_@H',
+                     'job_name': f'{self.pslot}_{task_name}_@Y@m@d@H',
                      'log': f'{self.rotdir}/logs/@Y@m@d@H/{task_name}.log',
                      'maxtries': '&MAXTRIES;'
                      }
 
         seg_var_dict = {'seg': ' '.join([f"{seg}" for seg in range(0, num_fcst_segments)])}
-        metatask_dict = {'task_name': f'fcst_mem000',
+        metatask_dict = {'task_name': f'gefs_fcst_mem000',
                          'is_serial': True,
                          'var_dict': seg_var_dict,
                          'task_dict': task_dict
@@ -132,20 +133,20 @@ def repair_replay(self):
             repair_replay_envars.append(rocoto.create_envar(name=key, value=str(value)))
 
         resources = self.get_resource('repair_replay')
-        task_name = f'repair_replay_mem#member#'
+        task_name = f'gefs_repair_replay_mem#member#'
         task_dict = {'task_name': task_name,
                      'resources': resources,
                      'dependency': dependencies,
                      'envars': repair_replay_envars,
                      'cycledef': 'gefs',
                      'command': f'{self.HOMEgfs}/jobs/rocoto/repair_replay.sh',
-                     'job_name': f'{self.pslot}_{task_name}_@H',
+                     'job_name': f'{self.pslot}_{task_name}_@Y@m@d@H',
                      'log': f'{self.rotdir}/logs/@Y@m@d@H/{task_name}.log',
                      'maxtries': '&MAXTRIES;'
                      }
 
         member_var_dict = {'member': ' '.join([f"{mem:03d}" for mem in range(0, self.nmem + 1)])}
-        member_metatask_dict = {'task_name': 'repair_replay',
+        member_metatask_dict = {'task_name': 'gefs_repair_replay',
                                 'task_dict': task_dict,
                                 'var_dict': member_var_dict,
                                 }
@@ -156,15 +157,15 @@ def repair_replay(self):
 
     def efcs(self):
         dependencies = []
-        dep_dict = {'type': 'task', 'name': f'stage_ic'}
+        dep_dict = {'type': 'task', 'name': f'gefs_stage_ic'}
         dependencies.append(rocoto.add_dependency(dep_dict))
 
         if self.app_config.do_wave:
-            dep_dict = {'type': 'task', 'name': f'wave_init'}
+            dep_dict = {'type': 'task', 'name': f'gefs_wave_init'}
             dependencies.append(rocoto.add_dependency(dep_dict))
 
         if self.app_config.do_aero:
-            dep_dict = {'type': 'task', 'name': f'prep_emissions'}
+            dep_dict = {'type': 'task', 'name': f'gefs_prep_emissions'}
             dependencies.append(rocoto.add_dependency(dep_dict))
 
         dependencies = rocoto.create_dependency(dep_condition='and', dep=dependencies)
@@ -188,20 +189,20 @@ def efcs(self):
             for key, value in efcsenvars_dict.items():
                 efcsenvars.append(rocoto.create_envar(name=key, value=str(value)))
 
-            task_name = f'fcst_mem{member}_seg#seg#'
+            task_name = f'gefs_fcst_mem{member}_seg#seg#'
             task_dict = {'task_name': task_name,
                          'resources': resources,
                          'dependency': dependencies,
                          'envars': efcsenvars,
                          'cycledef': 'gefs',
                          'command': f'{self.HOMEgfs}/jobs/rocoto/fcst.sh',
-                         'job_name': f'{self.pslot}_{task_name}_@H',
+                         'job_name': f'{self.pslot}_{task_name}_@Y@m@d@H',
                          'log': f'{self.rotdir}/logs/@Y@m@d@H/{task_name}.log',
                          'maxtries': '&MAXTRIES;'
                          }
 
             seg_var_dict = {'seg': ' '.join([f"{seg}" for seg in range(0, num_fcst_segments)])}
-            seg_metatask_dict = {'task_name': f'fcst_mem{member}',
+            seg_metatask_dict = {'task_name': f'gefs_fcst_mem{member}',
                                  'is_serial': True,
                                  'var_dict': seg_var_dict,
                                  'task_dict': task_dict
@@ -214,7 +215,7 @@ def efcs(self):
         # Keeping this in hopes the kludge is no longer necessary at some point
         #
         # member_var_dict = {'member': ' '.join([f"{mem:03d}" for mem in range(1, self.nmem + 1)])}
-        # mem_metatask_dict = {'task_name': 'fcst_ens',
+        # mem_metatask_dict = {'task_name': 'gefs_fcst_ens',
         #                      'is_serial': False,
         #                      'var_dict': member_var_dict,
         #                      'task_dict': seg_metatask_dict
@@ -224,6 +225,32 @@ def efcs(self):
 
         # return task
 
+    @staticmethod
+    def _get_ufs_postproc_grps(is_replay, run, config, component='atmos'):
+
+        fhrs = Tasks._get_forecast_hours(run, config, component=component)
+
+        # when replaying, atmos component does not have fhr 0, therefore remove 0 from fhrs
+        if is_replay and component in ['atmos'] and 0 in fhrs:
+            fhrs.remove(0)
+
+        # ocean/ice components do not have fhr 0 as they are averaged output
+        if component in ['ocean', 'ice'] and 0 in fhrs:
+            fhrs.remove(0)
+
+        nfhrs_per_grp = config.get('NFHRS_PER_GROUP', 1)
+        ngrps = len(fhrs) // nfhrs_per_grp if len(fhrs) % nfhrs_per_grp == 0 else len(fhrs) // nfhrs_per_grp + 1
+
+        fhrs = [f'f{fhr:03d}' for fhr in fhrs]
+        fhrs = np.array_split(fhrs, ngrps)
+        fhrs = [fhr.tolist() for fhr in fhrs]
+
+        grp = ' '.join(f'_{fhr[0]}-{fhr[-1]}' if len(fhr) > 1 else f'_{fhr[0]}' for fhr in fhrs)
+        dep = ' '.join([fhr[-1] for fhr in fhrs])
+        lst = ' '.join(['_'.join(fhr) for fhr in fhrs])
+
+        return grp, dep, lst
+
     def ocean_prod(self):
         return self._atmosoceaniceprod('ocean')
 
@@ -253,67 +280,44 @@ def _atmosoceaniceprod(self, component: str):
 
         history_path = self._template_to_rocoto_cycstring(self._base[history_path_tmpl], {'MEMDIR': 'mem#member#'})
         deps = []
-        data = f'{history_path}/{history_file_tmpl}'
-        if component in ['ocean']:
-            dep_dict = {'type': 'data', 'data': data, 'age': 120}
-            deps.append(rocoto.add_dependency(dep_dict))
-            dep_dict = {'type': 'metatask', 'name': 'fcst_mem#member#'}
-            deps.append(rocoto.add_dependency(dep_dict))
-            dependencies = rocoto.create_dependency(dep=deps, dep_condition='or')
-        elif component in ['ice']:
-            command = f"{self.HOMEgfs}/ush/check_ice_netcdf.sh @Y @m @d @H #fhr# &ROTDIR; #member# {fhout_ice_gfs}"
-            dep_dict = {'type': 'sh', 'command': command}
-            deps.append(rocoto.add_dependency(dep_dict))
-            dependencies = rocoto.create_dependency(dep=deps)
-        else:
-            dep_dict = {'type': 'data', 'data': data, 'age': 120}
+        dep_dict = {'type': 'metatask', 'name': 'gefs_fcst_mem#member#'}
+        deps.append(rocoto.add_dependency(dep_dict))
+        dependencies = rocoto.create_dependency(dep=deps, dep_condition='or')
+        if self.app_config.do_repair_replay:
+            dep_dict = {'type': 'task', 'name': 'gefs_repair_replay_mem#member#'}
             deps.append(rocoto.add_dependency(dep_dict))
-            if self.app_config.do_repair_replay:
-                dep_dict = {'type': 'task', 'name': 'repair_replay_mem#member#'}
-                deps.append(rocoto.add_dependency(dep_dict))
             dependencies = rocoto.create_dependency(dep=deps, dep_condition='and')
 
+        is_replay = self._configs[config]['REPLAY_ICS']
+        varname1, varname2, varname3 = 'grp', 'dep', 'lst'
+        varval1, varval2, varval3 = self._get_ufs_postproc_grps(is_replay, self.run, self._configs[config], component=component)
+        fhr_var_dict = {varname1: varval1, varname2: varval2, varname3: varval3}
+
         postenvars = self.envars.copy()
         postenvar_dict = {'ENSMEM': '#member#',
                           'MEMDIR': 'mem#member#',
-                          'FHR3': '#fhr#',
+                          'FHRLST': '#lst#',
                           'COMPONENT': component}
         for key, value in postenvar_dict.items():
             postenvars.append(rocoto.create_envar(name=key, value=str(value)))
 
-        task_name = f'{component}_prod_mem#member#_f#fhr#'
+        task_name = f'gefs_{component}_prod#{varname1}#_mem#member#'
         task_dict = {'task_name': task_name,
                      'resources': resources,
                      'dependency': dependencies,
                      'envars': postenvars,
                      'cycledef': 'gefs',
                      'command': f'{self.HOMEgfs}/jobs/rocoto/{config}.sh',
-                     'job_name': f'{self.pslot}_{task_name}_@H',
+                     'job_name': f'{self.pslot}_{task_name}_@Y@m@d@H',
                      'log': f'{self.rotdir}/logs/@Y@m@d@H/{task_name}.log',
                      'maxtries': '&MAXTRIES;'}
 
-        fhrs = self._get_forecast_hours('gefs', self._configs[config], component)
-
-        # when replaying, atmos component does not have fhr 0, therefore remove 0 from fhrs
-        is_replay = self._configs[config]['REPLAY_ICS']
-        if is_replay and component in ['atmos'] and 0 in fhrs:
-            fhrs.remove(0)
-
-        # ocean/ice components do not have fhr 0 as they are averaged output
-        if component in ['ocean', 'ice'] and 0 in fhrs:
-            fhrs.remove(0)
-
-        fhr_var_dict = {'fhr': ' '.join([f"{fhr:03d}" for fhr in fhrs])}
-        if component in ['ocean']:
-            fhrs_next = fhrs[1:] + [fhrs[-1] + (fhrs[-1] - fhrs[-2])]
-            fhr_var_dict['fhr_next'] = ' '.join([f"{fhr:03d}" for fhr in fhrs_next])
-
-        fhr_metatask_dict = {'task_name': f'{component}_prod_#member#',
+        fhr_metatask_dict = {'task_name': f'gefs_{component}_prod_#member#',
                              'task_dict': task_dict,
                              'var_dict': fhr_var_dict}
 
         member_var_dict = {'member': ' '.join([f"{mem:03d}" for mem in range(0, self.nmem + 1)])}
-        member_metatask_dict = {'task_name': f'{component}_prod',
+        member_metatask_dict = {'task_name': f'gefs_{component}_prod',
                                 'task_dict': fhr_metatask_dict,
                                 'var_dict': member_var_dict}
 
@@ -325,40 +329,36 @@ def atmos_ensstat(self):
 
         resources = self.get_resource('atmos_ensstat')
 
+        is_replay = self._configs['atmos_ensstat']['REPLAY_ICS']
+        varname1, varname2, varname3 = 'grp', 'dep', 'lst'
+        varval1, varval2, varval3 = self._get_ufs_postproc_grps(is_replay, self.run, self._configs['atmos_ensstat'], component='atmos')
+        fhr_var_dict = {varname1: varval1, varname2: varval2, varname3: varval3}
+
         deps = []
         for member in range(0, self.nmem + 1):
-            task = f'atmos_prod_mem{member:03d}_f#fhr#'
+            task = f'gefs_atmos_prod#{varname1}#_mem{member:03d}'
             dep_dict = {'type': 'task', 'name': task}
             deps.append(rocoto.add_dependency(dep_dict))
 
         dependencies = rocoto.create_dependency(dep_condition='and', dep=deps)
 
         postenvars = self.envars.copy()
-        postenvar_dict = {'FHR3': '#fhr#'}
+        postenvar_dict = {'FHRLST': '#lst#'}
         for key, value in postenvar_dict.items():
             postenvars.append(rocoto.create_envar(name=key, value=str(value)))
 
-        task_name = f'atmos_ensstat_f#fhr#'
+        task_name = f'gefs_atmos_ensstat#{varname1}#'
         task_dict = {'task_name': task_name,
                      'resources': resources,
                      'dependency': dependencies,
                      'envars': postenvars,
                      'cycledef': 'gefs',
                      'command': f'{self.HOMEgfs}/jobs/rocoto/atmos_ensstat.sh',
-                     'job_name': f'{self.pslot}_{task_name}_@H',
+                     'job_name': f'{self.pslot}_{task_name}_@Y@m@d@H',
                      'log': f'{self.rotdir}/logs/@Y@m@d@H/{task_name}.log',
                      'maxtries': '&MAXTRIES;'}
 
-        fhrs = self._get_forecast_hours('gefs', self._configs['atmos_ensstat'])
-
-        # when replaying, atmos component does not have fhr 0, therefore remove 0 from fhrs
-        is_replay = self._configs['atmos_ensstat']['REPLAY_ICS']
-        if is_replay and 0 in fhrs:
-            fhrs.remove(0)
-
-        fhr_var_dict = {'fhr': ' '.join([f"{fhr:03d}" for fhr in fhrs])}
-
-        fhr_metatask_dict = {'task_name': f'atmos_ensstat',
+        fhr_metatask_dict = {'task_name': f'gefs_atmos_ensstat',
                              'task_dict': task_dict,
                              'var_dict': fhr_var_dict}
 
@@ -368,12 +368,9 @@ def atmos_ensstat(self):
 
     def wavepostsbs(self):
         deps = []
-        for wave_grid in self._configs['wavepostsbs']['waveGRD'].split():
-            wave_hist_path = self._template_to_rocoto_cycstring(self._base["COM_WAVE_HISTORY_TMPL"], {'MEMDIR': 'mem#member#'})
-            data = f'{wave_hist_path}/gefswave.out_grd.{wave_grid}.@Y@m@d.@H0000'
-            dep_dict = {'type': 'data', 'data': data}
-            deps.append(rocoto.add_dependency(dep_dict))
-        dependencies = rocoto.create_dependency(dep_condition='and', dep=deps)
+        dep_dict = {'type': 'metatask', 'name': f'gefs_fcst_mem#member#'}
+        deps.append(rocoto.add_dependency(dep_dict))
+        dependencies = rocoto.create_dependency(dep=deps)
 
         wave_post_envars = self.envars.copy()
         postenvar_dict = {'ENSMEM': '#member#',
@@ -384,20 +381,20 @@ def wavepostsbs(self):
 
         resources = self.get_resource('wavepostsbs')
 
-        task_name = f'wave_post_grid_mem#member#'
+        task_name = f'gefs_wave_post_grid_mem#member#'
         task_dict = {'task_name': task_name,
                      'resources': resources,
                      'dependency': dependencies,
                      'envars': wave_post_envars,
                      'cycledef': 'gefs',
                      'command': f'{self.HOMEgfs}/jobs/rocoto/wavepostsbs.sh',
-                     'job_name': f'{self.pslot}_{task_name}_@H',
+                     'job_name': f'{self.pslot}_{task_name}_@Y@m@d@H',
                      'log': f'{self.rotdir}/logs/@Y@m@d@H/{task_name}.log',
                      'maxtries': '&MAXTRIES;'
                      }
 
         member_var_dict = {'member': ' '.join([str(mem).zfill(3) for mem in range(0, self.nmem + 1)])}
-        member_metatask_dict = {'task_name': 'wave_post_grid',
+        member_metatask_dict = {'task_name': 'gefs_wave_post_grid',
                                 'task_dict': task_dict,
                                 'var_dict': member_var_dict
                                 }
@@ -408,7 +405,7 @@ def wavepostsbs(self):
 
     def wavepostbndpnt(self):
         deps = []
-        dep_dict = {'type': 'metatask', 'name': f'fcst_mem#member#'}
+        dep_dict = {'type': 'metatask', 'name': f'gefs_fcst_mem#member#'}
         deps.append(rocoto.add_dependency(dep_dict))
         dependencies = rocoto.create_dependency(dep=deps)
 
@@ -420,20 +417,20 @@ def wavepostbndpnt(self):
             wave_post_bndpnt_envars.append(rocoto.create_envar(name=key, value=str(value)))
 
         resources = self.get_resource('wavepostbndpnt')
-        task_name = f'wave_post_bndpnt_mem#member#'
+        task_name = f'gefs_wave_post_bndpnt_mem#member#'
         task_dict = {'task_name': task_name,
                      'resources': resources,
                      'dependency': dependencies,
                      'envars': wave_post_bndpnt_envars,
                      'cycledef': 'gefs',
                      'command': f'{self.HOMEgfs}/jobs/rocoto/wavepostbndpnt.sh',
-                     'job_name': f'{self.pslot}_{task_name}_@H',
+                     'job_name': f'{self.pslot}_{task_name}_@Y@m@d@H',
                      'log': f'{self.rotdir}/logs/@Y@m@d@H/{task_name}.log',
                      'maxtries': '&MAXTRIES;'
                      }
 
         member_var_dict = {'member': ' '.join([str(mem).zfill(3) for mem in range(0, self.nmem + 1)])}
-        member_metatask_dict = {'task_name': 'wave_post_bndpnt',
+        member_metatask_dict = {'task_name': 'gefs_wave_post_bndpnt',
                                 'task_dict': task_dict,
                                 'var_dict': member_var_dict
                                 }
@@ -453,7 +450,7 @@ def wavepostbndpntbll(self):
         dep_dict = {'type': 'data', 'data': data}
         deps.append(rocoto.add_dependency(dep_dict))
 
-        dep_dict = {'type': 'metatask', 'name': f'fcst_mem#member#'}
+        dep_dict = {'type': 'metatask', 'name': f'gefs_fcst_mem#member#'}
         deps.append(rocoto.add_dependency(dep_dict))
         dependencies = rocoto.create_dependency(dep_condition='or', dep=deps)
 
@@ -465,20 +462,20 @@ def wavepostbndpntbll(self):
             wave_post_bndpnt_bull_envars.append(rocoto.create_envar(name=key, value=str(value)))
 
         resources = self.get_resource('wavepostbndpntbll')
-        task_name = f'wave_post_bndpnt_bull_mem#member#'
+        task_name = f'gefs_wave_post_bndpnt_bull_mem#member#'
         task_dict = {'task_name': task_name,
                      'resources': resources,
                      'dependency': dependencies,
                      'envars': wave_post_bndpnt_bull_envars,
                      'cycledef': 'gefs',
                      'command': f'{self.HOMEgfs}/jobs/rocoto/wavepostbndpntbll.sh',
-                     'job_name': f'{self.pslot}_{task_name}_@H',
+                     'job_name': f'{self.pslot}_{task_name}_@Y@m@d@H',
                      'log': f'{self.rotdir}/logs/@Y@m@d@H/{task_name}.log',
                      'maxtries': '&MAXTRIES;'
                      }
 
         member_var_dict = {'member': ' '.join([str(mem).zfill(3) for mem in range(0, self.nmem + 1)])}
-        member_metatask_dict = {'task_name': 'wave_post_bndpnt_bull',
+        member_metatask_dict = {'task_name': 'gefs_wave_post_bndpnt_bull',
                                 'task_dict': task_dict,
                                 'var_dict': member_var_dict
                                 }
@@ -489,10 +486,10 @@ def wavepostbndpntbll(self):
 
     def wavepostpnt(self):
         deps = []
-        dep_dict = {'type': 'metatask', 'name': f'fcst_mem#member#'}
+        dep_dict = {'type': 'metatask', 'name': f'gefs_fcst_mem#member#'}
         deps.append(rocoto.add_dependency(dep_dict))
         if self.app_config.do_wave_bnd:
-            dep_dict = {'type': 'task', 'name': f'wave_post_bndpnt_bull_mem#member#'}
+            dep_dict = {'type': 'task', 'name': f'gefs_wave_post_bndpnt_bull_mem#member#'}
             deps.append(rocoto.add_dependency(dep_dict))
         dependencies = rocoto.create_dependency(dep_condition='and', dep=deps)
 
@@ -504,20 +501,20 @@ def wavepostpnt(self):
             wave_post_pnt_envars.append(rocoto.create_envar(name=key, value=str(value)))
 
         resources = self.get_resource('wavepostpnt')
-        task_name = f'wave_post_pnt_mem#member#'
+        task_name = f'gefs_wave_post_pnt_mem#member#'
         task_dict = {'task_name': task_name,
                      'resources': resources,
                      'dependency': dependencies,
                      'envars': wave_post_pnt_envars,
                      'cycledef': 'gefs',
                      'command': f'{self.HOMEgfs}/jobs/rocoto/wavepostpnt.sh',
-                     'job_name': f'{self.pslot}_{task_name}_@H',
+                     'job_name': f'{self.pslot}_{task_name}_@Y@m@d@H',
                      'log': f'{self.rotdir}/logs/@Y@m@d@H/{task_name}.log',
                      'maxtries': '&MAXTRIES;'
                      }
 
         member_var_dict = {'member': ' '.join([str(mem).zfill(3) for mem in range(0, self.nmem + 1)])}
-        member_metatask_dict = {'task_name': 'wave_post_pnt',
+        member_metatask_dict = {'task_name': 'gefs_wave_post_pnt',
                                 'task_dict': task_dict,
                                 'var_dict': member_var_dict
                                 }
@@ -529,16 +526,16 @@ def wavepostpnt(self):
     def extractvars(self):
         deps = []
         if self.app_config.do_wave:
-            dep_dict = {'type': 'task', 'name': 'wave_post_grid_mem#member#'}
+            dep_dict = {'type': 'task', 'name': 'gefs_wave_post_grid_mem#member#'}
             deps.append(rocoto.add_dependency(dep_dict))
         if self.app_config.do_ocean:
-            dep_dict = {'type': 'metatask', 'name': 'ocean_prod_#member#'}
+            dep_dict = {'type': 'metatask', 'name': 'gefs_ocean_prod_#member#'}
             deps.append(rocoto.add_dependency(dep_dict))
         if self.app_config.do_ice:
-            dep_dict = {'type': 'metatask', 'name': 'ice_prod_#member#'}
+            dep_dict = {'type': 'metatask', 'name': 'gefs_ice_prod_#member#'}
             deps.append(rocoto.add_dependency(dep_dict))
         if self.app_config.do_atm:
-            dep_dict = {'type': 'metatask', 'name': 'atmos_prod_#member#'}
+            dep_dict = {'type': 'metatask', 'name': 'gefs_atmos_prod_#member#'}
             deps.append(rocoto.add_dependency(dep_dict))
         dependencies = rocoto.create_dependency(dep_condition='and', dep=deps)
         extractvars_envars = self.envars.copy()
@@ -549,20 +546,20 @@ def extractvars(self):
             extractvars_envars.append(rocoto.create_envar(name=key, value=str(value)))
 
         resources = self.get_resource('extractvars')
-        task_name = f'extractvars_mem#member#'
+        task_name = f'gefs_extractvars_mem#member#'
         task_dict = {'task_name': task_name,
                      'resources': resources,
                      'dependency': dependencies,
                      'envars': extractvars_envars,
                      'cycledef': 'gefs',
                      'command': f'{self.HOMEgfs}/jobs/rocoto/extractvars.sh',
-                     'job_name': f'{self.pslot}_{task_name}_@H',
+                     'job_name': f'{self.pslot}_{task_name}_@Y@m@d@H',
                      'log': f'{self.rotdir}/logs/@Y@m@d@H/{task_name}.log',
                      'maxtries': '&MAXTRIES;'
                      }
 
         member_var_dict = {'member': ' '.join([str(mem).zfill(3) for mem in range(0, self.nmem + 1)])}
-        member_metatask_dict = {'task_name': 'extractvars',
+        member_metatask_dict = {'task_name': 'gefs_extractvars',
                                 'task_dict': task_dict,
                                 'var_dict': member_var_dict
                                 }
@@ -573,26 +570,29 @@ def extractvars(self):
 
     def arch(self):
         deps = []
-        dep_dict = {'type': 'metatask', 'name': 'atmos_prod'}
+        dep_dict = {'type': 'metatask', 'name': 'gefs_atmos_prod'}
         deps.append(rocoto.add_dependency(dep_dict))
-        dep_dict = {'type': 'metatask', 'name': 'atmos_ensstat'}
+        dep_dict = {'type': 'metatask', 'name': 'gefs_atmos_ensstat'}
         deps.append(rocoto.add_dependency(dep_dict))
         if self.app_config.do_ice:
-            dep_dict = {'type': 'metatask', 'name': 'ice_prod'}
+            dep_dict = {'type': 'metatask', 'name': 'gefs_ice_prod'}
             deps.append(rocoto.add_dependency(dep_dict))
         if self.app_config.do_ocean:
-            dep_dict = {'type': 'metatask', 'name': 'ocean_prod'}
+            dep_dict = {'type': 'metatask', 'name': 'gefs_ocean_prod'}
             deps.append(rocoto.add_dependency(dep_dict))
         if self.app_config.do_wave:
-            dep_dict = {'type': 'metatask', 'name': 'wave_post_grid'}
+            dep_dict = {'type': 'metatask', 'name': 'gefs_wave_post_grid'}
             deps.append(rocoto.add_dependency(dep_dict))
-            dep_dict = {'type': 'metatask', 'name': 'wave_post_pnt'}
+            dep_dict = {'type': 'metatask', 'name': 'gefs_wave_post_pnt'}
             deps.append(rocoto.add_dependency(dep_dict))
             if self.app_config.do_wave_bnd:
-                dep_dict = {'type': 'metatask', 'name': 'wave_post_bndpnt'}
+                dep_dict = {'type': 'metatask', 'name': 'gefs_wave_post_bndpnt'}
                 deps.append(rocoto.add_dependency(dep_dict))
-                dep_dict = {'type': 'metatask', 'name': 'wave_post_bndpnt_bull'}
+                dep_dict = {'type': 'metatask', 'name': 'gefs_wave_post_bndpnt_bull'}
                 deps.append(rocoto.add_dependency(dep_dict))
+        if self.app_config.do_extractvars:
+            dep_dict = {'type': 'metatask', 'name': 'gefs_extractvars'}
+            deps.append(rocoto.add_dependency(dep_dict))
         dependencies = rocoto.create_dependency(dep=deps, dep_condition='and')
 
         resources = self.get_resource('arch')
@@ -602,8 +602,54 @@ def arch(self):
                      'envars': self.envars,
                      'cycledef': 'gefs',
                      'dependency': dependencies,
-                     'command': f'{self.HOMEgfs}/jobs/rocoto/arch_test.sh',
-                     'job_name': f'{self.pslot}_{task_name}_@H',
+                     'command': f'{self.HOMEgfs}/jobs/rocoto/arch.sh',
+                     'job_name': f'{self.pslot}_{task_name}_@Y@m@d@H',
+                     'log': f'{self.rotdir}/logs/@Y@m@d@H/{task_name}.log',
+                     'maxtries': '&MAXTRIES;'
+                     }
+
+        task = rocoto.create_task(task_dict)
+
+        return task
+
+    def cleanup(self):
+        deps = []
+        if self.app_config.do_extractvars:
+            dep_dict = {'type': 'task', 'name': 'arch'}
+            deps.append(rocoto.add_dependency(dep_dict))
+            dependencies = rocoto.create_dependency(dep=deps)
+        else:
+            dep_dict = {'type': 'metatask', 'name': 'gefs_atmos_prod'}
+            deps.append(rocoto.add_dependency(dep_dict))
+            dep_dict = {'type': 'metatask', 'name': 'gefs_atmos_ensstat'}
+            deps.append(rocoto.add_dependency(dep_dict))
+            if self.app_config.do_ice:
+                dep_dict = {'type': 'metatask', 'name': 'gefs_ice_prod'}
+                deps.append(rocoto.add_dependency(dep_dict))
+            if self.app_config.do_ocean:
+                dep_dict = {'type': 'metatask', 'name': 'gefs_ocean_prod'}
+                deps.append(rocoto.add_dependency(dep_dict))
+            if self.app_config.do_wave:
+                dep_dict = {'type': 'metatask', 'name': 'gefs_wave_post_grid'}
+                deps.append(rocoto.add_dependency(dep_dict))
+                dep_dict = {'type': 'metatask', 'name': 'gefs_wave_post_pnt'}
+                deps.append(rocoto.add_dependency(dep_dict))
+                if self.app_config.do_wave_bnd:
+                    dep_dict = {'type': 'metatask', 'name': 'gefs_wave_post_bndpnt'}
+                    deps.append(rocoto.add_dependency(dep_dict))
+                    dep_dict = {'type': 'metatask', 'name': 'gefs_wave_post_bndpnt_bull'}
+                    deps.append(rocoto.add_dependency(dep_dict))
+            dependencies = rocoto.create_dependency(dep=deps, dep_condition='and')
+
+        resources = self.get_resource('cleanup')
+        task_name = 'gefs_cleanup'
+        task_dict = {'task_name': task_name,
+                     'resources': resources,
+                     'envars': self.envars,
+                     'cycledef': 'gefs',
+                     'dependency': dependencies,
+                     'command': f'{self.HOMEgfs}/jobs/rocoto/cleanup.sh',
+                     'job_name': f'{self.pslot}_{task_name}_@Y@m@d@H',
                      'log': f'{self.rotdir}/logs/@Y@m@d@H/{task_name}.log',
                      'maxtries': '&MAXTRIES;'
                      }
diff --git a/workflow/rocoto/gefs_xml.py b/workflow/rocoto/gefs_xml.py
index b25a73fa6c..a5dfd5140e 100644
--- a/workflow/rocoto/gefs_xml.py
+++ b/workflow/rocoto/gefs_xml.py
@@ -14,19 +14,19 @@ def __init__(self, app_config: AppConfig, rocoto_config: Dict) -> None:
         super().__init__(app_config, rocoto_config)
 
     def get_cycledefs(self):
-        sdate = self._base['SDATE']
+        sdate = self._base['SDATE_GFS']
         edate = self._base['EDATE']
-        interval = self._base.get('INTERVAL_GFS', to_timedelta('24H'))
+        interval = self._app_config.interval_gfs
         sdate_str = sdate.strftime("%Y%m%d%H%M")
         edate_str = edate.strftime("%Y%m%d%H%M")
         interval_str = timedelta_to_HMS(interval)
         strings = []
         strings.append(f'\t<cycledef group="gefs">{sdate_str} {edate_str} {interval_str}</cycledef>')
 
-        sdate = sdate + interval
-        if sdate <= edate:
-            sdate_str = sdate.strftime("%Y%m%d%H%M")
-            strings.append(f'\t<cycledef group="gefs_seq">{sdate_str} {edate_str} {interval_str}</cycledef>')
+        date2 = sdate + interval
+        if date2 <= edate:
+            date2_str = date2.strftime("%Y%m%d%H%M")
+            strings.append(f'\t<cycledef group="gefs_seq">{date2_str} {edate_str} {interval_str}</cycledef>')
 
         strings.append('')
         strings.append('')
diff --git a/workflow/rocoto/gfs_cycled_xml.py b/workflow/rocoto/gfs_cycled_xml.py
index afd663c337..eef77ba7fc 100644
--- a/workflow/rocoto/gfs_cycled_xml.py
+++ b/workflow/rocoto/gfs_cycled_xml.py
@@ -24,19 +24,38 @@ def get_cycledefs(self):
         sdate_str = sdate.strftime("%Y%m%d%H%M")
         strings.append(f'\t<cycledef group="gdas">{sdate_str} {edate_str} {interval_str}</cycledef>')
 
-        if self._app_config.gfs_cyc != 0:
+        interval_gfs = self._app_config.interval_gfs
+
+        if interval_gfs > to_timedelta("0H"):
             sdate_gfs = self._base['SDATE_GFS']
-            edate_gfs = self._base['EDATE_GFS']
-            interval_gfs = self._base['INTERVAL_GFS']
+            edate_gfs = sdate_gfs + ((edate - sdate_gfs) // interval_gfs) * interval_gfs
             sdate_gfs_str = sdate_gfs.strftime("%Y%m%d%H%M")
             edate_gfs_str = edate_gfs.strftime("%Y%m%d%H%M")
             interval_gfs_str = timedelta_to_HMS(interval_gfs)
             strings.append(f'\t<cycledef group="gfs">{sdate_gfs_str} {edate_gfs_str} {interval_gfs_str}</cycledef>')
 
-            sdate_gfs = sdate_gfs + interval_gfs
-            sdate_gfs_str = sdate_gfs.strftime("%Y%m%d%H%M")
-            if sdate_gfs <= edate_gfs:
-                strings.append(f'\t<cycledef group="gfs_seq">{sdate_gfs_str} {edate_gfs_str} {interval_gfs_str}</cycledef>')
+            date2_gfs = sdate_gfs + interval_gfs
+            date2_gfs_str = date2_gfs.strftime("%Y%m%d%H%M")
+            if date2_gfs <= edate_gfs:
+                strings.append(f'\t<cycledef group="gfs_seq">{date2_gfs_str} {edate_gfs_str} {interval_gfs_str}</cycledef>')
+
+            if self._base['DO_METP']:
+                if interval_gfs < to_timedelta('24H'):
+                    # Run verification at 18z, no matter what if there is more than one gfs per day
+                    sdate_metp = sdate_gfs.replace(hour=18)
+                    edate_metp = edate_gfs.replace(hour=18)
+                    interval_metp = to_timedelta('24H')
+                    sdate_metp_str = sdate_metp.strftime("%Y%m%d%H%M")
+                    edate_metp_str = edate_metp.strftime("%Y%m%d%H%M")
+                    interval_metp_str = timedelta_to_HMS(interval_metp)
+                else:
+                    # Use same cycledef as gfs if there is no more than one per day
+                    sdate_metp_str = sdate_gfs_str
+                    edate_metp_str = edate_gfs_str
+                    interval_metp_str = interval_gfs_str
+
+                strings.append(f'\t<cycledef group="metp">{sdate_metp_str} {edate_metp_str} {interval_metp_str}</cycledef>')
+                strings.append(f'\t<cycledef group="last_gfs">{edate_gfs_str} {edate_gfs_str} 24:00:00</cycledef>')
 
         strings.append('')
         strings.append('')
diff --git a/workflow/rocoto/gfs_forecast_only_xml.py b/workflow/rocoto/gfs_forecast_only_xml.py
index cf53e685e9..a4d5b0878b 100644
--- a/workflow/rocoto/gfs_forecast_only_xml.py
+++ b/workflow/rocoto/gfs_forecast_only_xml.py
@@ -12,15 +12,36 @@ def __init__(self, app_config: AppConfig, rocoto_config: Dict) -> None:
         super().__init__(app_config, rocoto_config)
 
     def get_cycledefs(self):
-        sdate = self._base['SDATE']
-        edate = self._base['EDATE']
-        interval = self._base.get('INTERVAL_GFS', to_timedelta('24H'))
+        sdate_gfs = self._base['SDATE_GFS']
+        edate_gfs = self._base['EDATE']
+        interval_gfs = self._app_config.interval_gfs
         strings = []
-        strings.append(f'\t<cycledef group="gfs">{sdate.strftime("%Y%m%d%H%M")} {edate.strftime("%Y%m%d%H%M")} {timedelta_to_HMS(interval)}</cycledef>')
-
-        sdate = sdate + interval
-        if sdate <= edate:
-            strings.append(f'\t<cycledef group="gfs_seq">{sdate.strftime("%Y%m%d%H%M")} {edate.strftime("%Y%m%d%H%M")} {timedelta_to_HMS(interval)}</cycledef>')
+        sdate_gfs_str = sdate_gfs.strftime("%Y%m%d%H%M")
+        edate_gfs_str = edate_gfs.strftime("%Y%m%d%H%M")
+        interval_gfs_str = timedelta_to_HMS(interval_gfs)
+        strings.append(f'\t<cycledef group="gfs">{sdate_gfs_str} {edate_gfs_str} {interval_gfs_str}</cycledef>')
+
+        date2 = sdate_gfs + interval_gfs
+        if date2 <= edate_gfs:
+            date2_gfs_str = date2_gfs.strftime("%Y%m%d%H%M")
+            strings.append(f'\t<cycledef group="gfs_seq">{date2_gfs_str} {edate_gfs_str} {interval_gfs_str}</cycledef>')
+
+        if self._base['DO_METP']:
+            if interval_gfs < to_timedelta('24H'):
+                # Run verification at 18z, no matter what if there is more than one gfs per day
+                sdate_metp = sdate_gfs.replace(hour=18)
+                edate_metp = edate_gfs.replace(hour=18)
+                interval_metp = to_timedelta('24H')
+                sdate_metp_str = sdate_metp.strftime("%Y%m%d%H%M")
+                edate_metp_str = edate_metp.strftime("%Y%m%d%H%M")
+                interval_metp_str = timedelta_to_HMS(interval_metp)
+            else:
+                # Use same cycledef as gfs if there is no more than one per day
+                sdate_metp_str = sdate_gfs_str
+                edate_metp_str = edate_gfs_str
+                interval_metp_str = interval_gfs_str
+
+            strings.append(f'\t<cycledef group="metp">{sdate_metp_str} {edate_metp_str} {interval_metp_str}</cycledef>')
 
         strings.append('')
         strings.append('')
diff --git a/workflow/rocoto/gfs_tasks.py b/workflow/rocoto/gfs_tasks.py
index 23f334549a..82dfb9f1d4 100644
--- a/workflow/rocoto/gfs_tasks.py
+++ b/workflow/rocoto/gfs_tasks.py
@@ -1,6 +1,6 @@
 from applications.applications import AppConfig
 from rocoto.tasks import Tasks
-from wxflow import timedelta_to_HMS
+from wxflow import timedelta_to_HMS, to_timedelta
 import rocoto.rocoto as rocoto
 import numpy as np
 
@@ -21,7 +21,7 @@ def stage_ic(self):
         cycledef = 'gdas_half' if self.run in ['gdas', 'enkfgdas'] else self.run
 
         resources = self.get_resource('stage_ic')
-        task_name = f'{self.run}stage_ic'
+        task_name = f'{self.run}_stage_ic'
         task_dict = {'task_name': task_name,
                      'resources': resources,
                      'envars': self.envars,
@@ -39,7 +39,6 @@ def stage_ic(self):
     def prep(self):
 
         dump_suffix = self._base["DUMP_SUFFIX"]
-        gfs_cyc = self._base["gfs_cyc"]
         dmpdir = self._base["DMPDIR"]
         atm_hist_path = self._template_to_rocoto_cycstring(self._base["COM_ATMOS_HISTORY_TMPL"], {'RUN': 'gdas'})
         dump_path = self._template_to_rocoto_cycstring(self._base["COM_OBSDMP_TMPL"],
@@ -48,10 +47,10 @@ def prep(self):
         gfs_enkf = True if self.app_config.do_hybvar and 'gfs' in self.app_config.eupd_runs else False
 
         deps = []
-        dep_dict = {'type': 'metatask', 'name': 'gdasatmos_prod', 'offset': f"-{timedelta_to_HMS(self._base['cycle_interval'])}"}
+        dep_dict = {'type': 'metatask', 'name': 'gdas_atmos_prod', 'offset': f"-{timedelta_to_HMS(self._base['interval_gdas'])}"}
         deps.append(rocoto.add_dependency(dep_dict))
         data = f'{atm_hist_path}/gdas.t@Hz.atmf009.nc'
-        dep_dict = {'type': 'data', 'data': data, 'offset': f"-{timedelta_to_HMS(self._base['cycle_interval'])}"}
+        dep_dict = {'type': 'data', 'data': data, 'offset': f"-{timedelta_to_HMS(self._base['interval_gdas'])}"}
         deps.append(rocoto.add_dependency(dep_dict))
         data = f'{dump_path}/{self.run}.t@Hz.updated.status.tm00.bufr_d'
         dep_dict = {'type': 'data', 'data': data}
@@ -59,11 +58,11 @@ def prep(self):
         dependencies = rocoto.create_dependency(dep_condition='and', dep=deps)
 
         cycledef = self.run
-        if self.run in ['gfs'] and gfs_enkf and gfs_cyc != 4:
+        if self.run in ['gfs'] and gfs_enkf and self.app_config.interval_gfs != 6:
             cycledef = 'gdas'
 
         resources = self.get_resource('prep')
-        task_name = f'{self.run}prep'
+        task_name = f'{self.run}_prep'
         task_dict = {'task_name': task_name,
                      'resources': resources,
                      'dependency': dependencies,
@@ -86,14 +85,14 @@ def waveinit(self):
         cycledef = 'gdas_half,gdas' if self.run in ['gdas'] else self.run
         if self.app_config.mode in ['cycled']:
             deps = []
-            dep_dict = {'type': 'task', 'name': f'{self.run}prep'}
+            dep_dict = {'type': 'task', 'name': f'{self.run}_prep'}
             deps.append(rocoto.add_dependency(dep_dict))
             if self.run in ['gdas']:
-                dep_dict = {'type': 'cycleexist', 'condition': 'not', 'offset': f"-{timedelta_to_HMS(self._base['cycle_interval'])}"}
+                dep_dict = {'type': 'cycleexist', 'condition': 'not', 'offset': f"-{timedelta_to_HMS(self._base['interval_gdas'])}"}
                 deps.append(rocoto.add_dependency(dep_dict))
             dependencies = rocoto.create_dependency(dep_condition='or', dep=deps)
 
-        task_name = f'{self.run}waveinit'
+        task_name = f'{self.run}_waveinit'
         task_dict = {'task_name': task_name,
                      'resources': resources,
                      'dependency': dependencies,
@@ -112,12 +111,12 @@ def waveinit(self):
     def waveprep(self):
 
         deps = []
-        dep_dict = {'type': 'task', 'name': f'{self.run}waveinit'}
+        dep_dict = {'type': 'task', 'name': f'{self.run}_waveinit'}
         deps.append(rocoto.add_dependency(dep_dict))
         dependencies = rocoto.create_dependency(dep=deps)
         cycledef = 'gdas_half,gdas' if self.run in ['gdas'] else self.run
         resources = self.get_resource('waveprep')
-        task_name = f'{self.run}waveprep'
+        task_name = f'{self.run}_waveprep'
         task_dict = {'task_name': task_name,
                      'resources': resources,
                      'dependency': dependencies,
@@ -168,7 +167,7 @@ def aerosol_init(self):
 
         cycledef = 'gfs_seq'
         resources = self.get_resource('aerosol_init')
-        task_name = f'{self.run}aerosol_init'
+        task_name = f'{self.run}_aerosol_init'
         task_dict = {'task_name': task_name,
                      'resources': resources,
                      'dependency': dependencies,
@@ -186,17 +185,17 @@ def aerosol_init(self):
 
     def anal(self):
         deps = []
-        dep_dict = {'type': 'task', 'name': f'{self.run}prep'}
+        dep_dict = {'type': 'task', 'name': f'{self.run}_prep'}
         deps.append(rocoto.add_dependency(dep_dict))
         if self.app_config.do_hybvar:
-            dep_dict = {'type': 'metatask', 'name': 'enkfgdasepmn', 'offset': f"-{timedelta_to_HMS(self._base['cycle_interval'])}"}
+            dep_dict = {'type': 'metatask', 'name': 'enkfgdas_epmn', 'offset': f"-{timedelta_to_HMS(self._base['interval_gdas'])}"}
             deps.append(rocoto.add_dependency(dep_dict))
             dependencies = rocoto.create_dependency(dep_condition='and', dep=deps)
         else:
             dependencies = rocoto.create_dependency(dep=deps)
 
         resources = self.get_resource('anal')
-        task_name = f'{self.run}anal'
+        task_name = f'{self.run}_anal'
         task_dict = {'task_name': task_name,
                      'resources': resources,
                      'dependency': dependencies,
@@ -216,19 +215,19 @@ def sfcanl(self):
 
         deps = []
         if self.app_config.do_jediatmvar:
-            dep_dict = {'type': 'task', 'name': f'{self.run}atmanlfinal'}
+            dep_dict = {'type': 'task', 'name': f'{self.run}_atmanlfinal'}
         else:
-            dep_dict = {'type': 'task', 'name': f'{self.run}anal'}
+            dep_dict = {'type': 'task', 'name': f'{self.run}_anal'}
         deps.append(rocoto.add_dependency(dep_dict))
         if self.app_config.do_jedisnowda:
-            dep_dict = {'type': 'task', 'name': f'{self.run}snowanl'}
+            dep_dict = {'type': 'task', 'name': f'{self.run}_snowanl'}
             deps.append(rocoto.add_dependency(dep_dict))
             dependencies = rocoto.create_dependency(dep_condition='and', dep=deps)
         else:
             dependencies = rocoto.create_dependency(dep=deps)
 
         resources = self.get_resource('sfcanl')
-        task_name = f'{self.run}sfcanl'
+        task_name = f'{self.run}_sfcanl'
         task_dict = {'task_name': task_name,
                      'resources': resources,
                      'dependency': dependencies,
@@ -248,19 +247,19 @@ def analcalc(self):
 
         deps = []
         if self.app_config.do_jediatmvar:
-            dep_dict = {'type': 'task', 'name': f'{self.run}atmanlfinal'}
+            dep_dict = {'type': 'task', 'name': f'{self.run}_atmanlfinal'}
         else:
-            dep_dict = {'type': 'task', 'name': f'{self.run}anal'}
+            dep_dict = {'type': 'task', 'name': f'{self.run}_anal'}
         deps.append(rocoto.add_dependency(dep_dict))
-        dep_dict = {'type': 'task', 'name': f'{self.run}sfcanl'}
+        dep_dict = {'type': 'task', 'name': f'{self.run}_sfcanl'}
         deps.append(rocoto.add_dependency(dep_dict))
         if self.app_config.do_hybvar and self.run in ['gdas']:
-            dep_dict = {'type': 'task', 'name': 'enkfgdasechgres', 'offset': f"-{timedelta_to_HMS(self._base['cycle_interval'])}"}
+            dep_dict = {'type': 'task', 'name': 'enkfgdas_echgres', 'offset': f"-{timedelta_to_HMS(self._base['interval_gdas'])}"}
             deps.append(rocoto.add_dependency(dep_dict))
         dependencies = rocoto.create_dependency(dep_condition='and', dep=deps)
 
         resources = self.get_resource('analcalc')
-        task_name = f'{self.run}analcalc'
+        task_name = f'{self.run}_analcalc'
         task_dict = {'task_name': task_name,
                      'resources': resources,
                      'dependency': dependencies,
@@ -279,12 +278,12 @@ def analcalc(self):
     def analdiag(self):
 
         deps = []
-        dep_dict = {'type': 'task', 'name': f'{self.run}anal'}
+        dep_dict = {'type': 'task', 'name': f'{self.run}_anal'}
         deps.append(rocoto.add_dependency(dep_dict))
         dependencies = rocoto.create_dependency(dep_condition='and', dep=deps)
 
         resources = self.get_resource('analdiag')
-        task_name = f'{self.run}analdiag'
+        task_name = f'{self.run}_analdiag'
         task_dict = {'task_name': task_name,
                      'resources': resources,
                      'dependency': dependencies,
@@ -303,12 +302,12 @@ def analdiag(self):
     def prepatmiodaobs(self):
 
         deps = []
-        dep_dict = {'type': 'task', 'name': f'{self.run}prep'}
+        dep_dict = {'type': 'task', 'name': f'{self.run}_prep'}
         deps.append(rocoto.add_dependency(dep_dict))
         dependencies = rocoto.create_dependency(dep=deps)
 
         resources = self.get_resource('prepatmiodaobs')
-        task_name = f'{self.run}prepatmiodaobs'
+        task_name = f'{self.run}_prepatmiodaobs'
         task_dict = {'task_name': task_name,
                      'resources': resources,
                      'dependency': dependencies,
@@ -327,24 +326,24 @@ def prepatmiodaobs(self):
     def atmanlinit(self):
 
         deps = []
-        dep_dict = {'type': 'task', 'name': f'{self.run}prepatmiodaobs'}
+        dep_dict = {'type': 'task', 'name': f'{self.run}_prepatmiodaobs'}
         deps.append(rocoto.add_dependency(dep_dict))
         if self.app_config.do_hybvar:
-            dep_dict = {'type': 'metatask', 'name': 'enkfgdasepmn', 'offset': f"-{timedelta_to_HMS(self._base['cycle_interval'])}"}
+            dep_dict = {'type': 'metatask', 'name': 'enkfgdas_epmn', 'offset': f"-{timedelta_to_HMS(self._base['interval_gdas'])}"}
             deps.append(rocoto.add_dependency(dep_dict))
             dependencies = rocoto.create_dependency(dep_condition='and', dep=deps)
         else:
             dependencies = rocoto.create_dependency(dep=deps)
 
-        gfs_cyc = self._base["gfs_cyc"]
+        interval_gfs = self._base["INTERVAL_GFS"]
         gfs_enkf = True if self.app_config.do_hybvar and 'gfs' in self.app_config.eupd_runs else False
 
         cycledef = self.run
-        if self.run in ['gfs'] and gfs_enkf and gfs_cyc != 4:
+        if self.run in ['gfs'] and gfs_enkf and interval_gfs != 6:
             cycledef = 'gdas'
 
         resources = self.get_resource('atmanlinit')
-        task_name = f'{self.run}atmanlinit'
+        task_name = f'{self.run}_atmanlinit'
         task_dict = {'task_name': task_name,
                      'resources': resources,
                      'dependency': dependencies,
@@ -363,12 +362,12 @@ def atmanlinit(self):
     def atmanlvar(self):
 
         deps = []
-        dep_dict = {'type': 'task', 'name': f'{self.run}atmanlinit'}
+        dep_dict = {'type': 'task', 'name': f'{self.run}_atmanlinit'}
         deps.append(rocoto.add_dependency(dep_dict))
         dependencies = rocoto.create_dependency(dep=deps)
 
         resources = self.get_resource('atmanlvar')
-        task_name = f'{self.run}atmanlvar'
+        task_name = f'{self.run}_atmanlvar'
         task_dict = {'task_name': task_name,
                      'resources': resources,
                      'dependency': dependencies,
@@ -387,12 +386,12 @@ def atmanlvar(self):
     def atmanlfv3inc(self):
 
         deps = []
-        dep_dict = {'type': 'task', 'name': f'{self.run}atmanlvar'}
+        dep_dict = {'type': 'task', 'name': f'{self.run}_atmanlvar'}
         deps.append(rocoto.add_dependency(dep_dict))
         dependencies = rocoto.create_dependency(dep=deps)
 
         resources = self.get_resource('atmanlfv3inc')
-        task_name = f'{self.run}atmanlfv3inc'
+        task_name = f'{self.run}_atmanlfv3inc'
         task_dict = {'task_name': task_name,
                      'resources': resources,
                      'dependency': dependencies,
@@ -411,12 +410,12 @@ def atmanlfv3inc(self):
     def atmanlfinal(self):
 
         deps = []
-        dep_dict = {'type': 'task', 'name': f'{self.run}atmanlfv3inc'}
+        dep_dict = {'type': 'task', 'name': f'{self.run}_atmanlfv3inc'}
         deps.append(rocoto.add_dependency(dep_dict))
         dependencies = rocoto.create_dependency(dep_condition='and', dep=deps)
 
         resources = self.get_resource('atmanlfinal')
-        task_name = f'{self.run}atmanlfinal'
+        task_name = f'{self.run}_atmanlfinal'
         task_dict = {'task_name': task_name,
                      'resources': resources,
                      'dependency': dependencies,
@@ -434,12 +433,12 @@ def atmanlfinal(self):
 
     def prepobsaero(self):
         deps = []
-        dep_dict = {'type': 'task', 'name': f'{self.run}prep'}
+        dep_dict = {'type': 'task', 'name': f'{self.run}_prep'}
         deps.append(rocoto.add_dependency(dep_dict))
         dependencies = rocoto.create_dependency(dep_condition='and', dep=deps)
 
         resources = self.get_resource('prepobsaero')
-        task_name = f'{self.run}prepobsaero'
+        task_name = f'{self.run}_prepobsaero'
         task_dict = {'task_name': task_name,
                      'resources': resources,
                      'dependency': dependencies,
@@ -455,17 +454,45 @@ def prepobsaero(self):
 
         return task
 
+    def aeroanlgenb(self):
+
+        deps = []
+        dep_dict = {'type': 'metatask', 'name': f'{self.run}_fcst'}
+        deps.append(rocoto.add_dependency(dep_dict))
+        dependencies = rocoto.create_dependency(dep=deps)
+
+        resources = self.get_resource('aeroanlgenb')
+        task_name = f'{self.run}_aeroanlgenb'
+        task_dict = {'task_name': task_name,
+                     'resources': resources,
+                     'dependency': dependencies,
+                     'envars': self.envars,
+                     'cycledef': 'gdas_half,gdas',
+                     'command': f'{self.HOMEgfs}/jobs/rocoto/aeroanlgenb.sh',
+                     'job_name': f'{self.pslot}_{task_name}_@H',
+                     'log': f'{self.rotdir}/logs/@Y@m@d@H/{task_name}.log',
+                     'maxtries': '&MAXTRIES;'
+                     }
+
+        task = rocoto.create_task(task_dict)
+
+        return task
+
     def aeroanlinit(self):
 
         deps = []
-        dep_dict = {'type': 'task', 'name': f'{self.run}prep'}
-        if self.app_config.do_prep_obs_aero:
-            dep_dict = {'type': 'task', 'name': f'{self.run}prepobsaero'}
+        dep_dict = {'type': 'task', 'name': 'gdas_aeroanlgenb', 'offset': f"-{timedelta_to_HMS(self._base['interval_gdas'])}"}
+        deps.append(rocoto.add_dependency(dep_dict))
+        dep_dict = {'type': 'task', 'name': f'{self.run}_prep'}
         deps.append(rocoto.add_dependency(dep_dict))
+
+        if self.app_config.do_prep_obs_aero:
+            dep_dict = {'type': 'task', 'name': f'{self.run}_prepobsaero'}
+            deps.append(rocoto.add_dependency(dep_dict))
         dependencies = rocoto.create_dependency(dep_condition='and', dep=deps)
 
         resources = self.get_resource('aeroanlinit')
-        task_name = f'{self.run}aeroanlinit'
+        task_name = f'{self.run}_aeroanlinit'
         task_dict = {'task_name': task_name,
                      'resources': resources,
                      'dependency': dependencies,
@@ -481,21 +508,28 @@ def aeroanlinit(self):
 
         return task
 
-    def aeroanlrun(self):
+    def aeroanlvar(self):
 
         deps = []
-        dep_dict = {'type': 'task', 'name': f'{self.run}aeroanlinit'}
+        dep_dict = {
+            'type': 'task', 'name': f'gdas_aeroanlgenb',
+            'offset': f"-{timedelta_to_HMS(self._base['interval_gdas'])}",
+        }
         deps.append(rocoto.add_dependency(dep_dict))
-        dependencies = rocoto.create_dependency(dep=deps)
+        dep_dict = {
+            'type': 'task', 'name': f'{self.run}_aeroanlinit',
+        }
+        deps.append(rocoto.add_dependency(dep_dict))
+        dependencies = rocoto.create_dependency(dep_condition='and', dep=deps)
 
-        resources = self.get_resource('aeroanlrun')
-        task_name = f'{self.run}aeroanlrun'
+        resources = self.get_resource('aeroanlvar')
+        task_name = f'{self.run}_aeroanlvar'
         task_dict = {'task_name': task_name,
                      'resources': resources,
                      'dependency': dependencies,
                      'envars': self.envars,
                      'cycledef': self.run.replace('enkf', ''),
-                     'command': f'{self.HOMEgfs}/jobs/rocoto/aeroanlrun.sh',
+                     'command': f'{self.HOMEgfs}/jobs/rocoto/aeroanlvar.sh',
                      'job_name': f'{self.pslot}_{task_name}_@H',
                      'log': f'{self.rotdir}/logs/@Y@m@d@H/{task_name}.log',
                      'maxtries': '&MAXTRIES;'
@@ -508,12 +542,12 @@ def aeroanlrun(self):
     def aeroanlfinal(self):
 
         deps = []
-        dep_dict = {'type': 'task', 'name': f'{self.run}aeroanlrun'}
+        dep_dict = {'type': 'task', 'name': f'{self.run}_aeroanlvar'}
         deps.append(rocoto.add_dependency(dep_dict))
         dependencies = rocoto.create_dependency(dep_condition='and', dep=deps)
 
         resources = self.get_resource('aeroanlfinal')
-        task_name = f'{self.run}aeroanlfinal'
+        task_name = f'{self.run}_aeroanlfinal'
         task_dict = {'task_name': task_name,
                      'resources': resources,
                      'dependency': dependencies,
@@ -532,12 +566,12 @@ def aeroanlfinal(self):
     def prepsnowobs(self):
 
         deps = []
-        dep_dict = {'type': 'task', 'name': f'{self.run}prep'}
+        dep_dict = {'type': 'task', 'name': f'{self.run}_prep'}
         deps.append(rocoto.add_dependency(dep_dict))
         dependencies = rocoto.create_dependency(dep=deps)
 
         resources = self.get_resource('prepsnowobs')
-        task_name = f'{self.run}prepsnowobs'
+        task_name = f'{self.run}_prepsnowobs'
         task_dict = {'task_name': task_name,
                      'resources': resources,
                      'dependency': dependencies,
@@ -556,12 +590,12 @@ def prepsnowobs(self):
     def snowanl(self):
 
         deps = []
-        dep_dict = {'type': 'task', 'name': f'{self.run}prepsnowobs'}
+        dep_dict = {'type': 'task', 'name': f'{self.run}_prepsnowobs'}
         deps.append(rocoto.add_dependency(dep_dict))
         dependencies = rocoto.create_dependency(dep=deps)
 
         resources = self.get_resource('snowanl')
-        task_name = f'{self.run}snowanl'
+        task_name = f'{self.run}_snowanl'
         task_dict = {'task_name': task_name,
                      'resources': resources,
                      'dependency': dependencies,
@@ -579,16 +613,16 @@ def snowanl(self):
     def esnowrecen(self):
 
         deps = []
-        dep_dict = {'type': 'task', 'name': f'{self.run.replace("enkf","")}prepsnowobs'}
+        dep_dict = {'type': 'task', 'name': f'{self.run.replace("enkf","")}_prepsnowobs'}
         deps.append(rocoto.add_dependency(dep_dict))
-        dep_dict = {'type': 'task', 'name': f'{self.run.replace("enkf","")}snowanl'}
+        dep_dict = {'type': 'task', 'name': f'{self.run.replace("enkf","")}_snowanl'}
         deps.append(rocoto.add_dependency(dep_dict))
-        dep_dict = {'type': 'metatask', 'name': f'{self.run}epmn', 'offset': f"-{timedelta_to_HMS(self._base['cycle_interval'])}"}
+        dep_dict = {'type': 'metatask', 'name': f'{self.run}_epmn', 'offset': f"-{timedelta_to_HMS(self._base['interval_gdas'])}"}
         deps.append(rocoto.add_dependency(dep_dict))
         dependencies = rocoto.create_dependency(dep_condition='and', dep=deps)
 
         resources = self.get_resource('esnowrecen')
-        task_name = f'{self.run}esnowrecen'
+        task_name = f'{self.run}_esnowrecen'
         task_dict = {'task_name': task_name,
                      'resources': resources,
                      'dependency': dependencies,
@@ -609,12 +643,12 @@ def prepoceanobs(self):
 
         deps = []
         data = f'{ocean_hist_path}/gdas.ocean.t@Hz.inst.f009.nc'
-        dep_dict = {'type': 'data', 'data': data, 'offset': f"-{timedelta_to_HMS(self._base['cycle_interval'])}"}
+        dep_dict = {'type': 'data', 'data': data, 'offset': f"-{timedelta_to_HMS(self._base['interval_gdas'])}"}
         deps.append(rocoto.add_dependency(dep_dict))
         dependencies = rocoto.create_dependency(dep=deps)
 
         resources = self.get_resource('prepoceanobs')
-        task_name = f'{self.run}prepoceanobs'
+        task_name = f'{self.run}_prepoceanobs'
         task_dict = {'task_name': task_name,
                      'resources': resources,
                      'dependency': dependencies,
@@ -636,12 +670,12 @@ def marinebmat(self):
 
         deps = []
         data = f'{ocean_hist_path}/gdas.ocean.t@Hz.inst.f009.nc'
-        dep_dict = {'type': 'data', 'data': data, 'offset': f"-{timedelta_to_HMS(self._base['cycle_interval'])}"}
+        dep_dict = {'type': 'data', 'data': data, 'offset': f"-{timedelta_to_HMS(self._base['interval_gdas'])}"}
         deps.append(rocoto.add_dependency(dep_dict))
         dependencies = rocoto.create_dependency(dep=deps)
 
         resources = self.get_resource('marinebmat')
-        task_name = f'{self.run}marinebmat'
+        task_name = f'{self.run}_marinebmat'
         task_dict = {'task_name': task_name,
                      'resources': resources,
                      'dependency': dependencies,
@@ -657,25 +691,25 @@ def marinebmat(self):
 
         return task
 
-    def ocnanalprep(self):
+    def marineanlinit(self):
 
         deps = []
-        dep_dict = {'type': 'task', 'name': f'{self.run}prepoceanobs'}
+        dep_dict = {'type': 'task', 'name': f'{self.run}_prepoceanobs'}
         deps.append(rocoto.add_dependency(dep_dict))
-        dep_dict = {'type': 'task', 'name': f'{self.run}marinebmat'}
+        dep_dict = {'type': 'task', 'name': f'{self.run}_marinebmat'}
         deps.append(rocoto.add_dependency(dep_dict))
-        dep_dict = {'type': 'metatask', 'name': 'gdasfcst', 'offset': f"-{timedelta_to_HMS(self._base['cycle_interval'])}"}
+        dep_dict = {'type': 'metatask', 'name': 'gdas_fcst', 'offset': f"-{timedelta_to_HMS(self._base['interval_gdas'])}"}
         deps.append(rocoto.add_dependency(dep_dict))
         dependencies = rocoto.create_dependency(dep_condition='and', dep=deps)
 
-        resources = self.get_resource('ocnanalprep')
-        task_name = f'{self.run}ocnanalprep'
+        resources = self.get_resource('marineanlinit')
+        task_name = f'{self.run}_marineanlinit'
         task_dict = {'task_name': task_name,
                      'resources': resources,
                      'dependency': dependencies,
                      'envars': self.envars,
                      'cycledef': self.run.replace('enkf', ''),
-                     'command': f'{self.HOMEgfs}/jobs/rocoto/ocnanalprep.sh',
+                     'command': f'{self.HOMEgfs}/jobs/rocoto/marineanlinit.sh',
                      'job_name': f'{self.pslot}_{task_name}_@H',
                      'log': f'{self.rotdir}/logs/@Y@m@d@H/{task_name}.log',
                      'maxtries': '&MAXTRIES;'
@@ -685,21 +719,21 @@ def ocnanalprep(self):
 
         return task
 
-    def ocnanalrun(self):
+    def marineanlvar(self):
 
         deps = []
-        dep_dict = {'type': 'task', 'name': f'{self.run}ocnanalprep'}
+        dep_dict = {'type': 'task', 'name': f'{self.run}_marineanlinit'}
         deps.append(rocoto.add_dependency(dep_dict))
         dependencies = rocoto.create_dependency(dep=deps)
 
-        resources = self.get_resource('ocnanalrun')
-        task_name = f'{self.run}ocnanalrun'
+        resources = self.get_resource('marineanlvar')
+        task_name = f'{self.run}_marineanlvar'
         task_dict = {'task_name': task_name,
                      'resources': resources,
                      'dependency': dependencies,
                      'envars': self.envars,
                      'cycledef': self.run.replace('enkf', ''),
-                     'command': f'{self.HOMEgfs}/jobs/rocoto/ocnanalrun.sh',
+                     'command': f'{self.HOMEgfs}/jobs/rocoto/marineanlvar.sh',
                      'job_name': f'{self.pslot}_{task_name}_@H',
                      'log': f'{self.rotdir}/logs/@Y@m@d@H/{task_name}.log',
                      'maxtries': '&MAXTRIES;'
@@ -712,12 +746,12 @@ def ocnanalrun(self):
     def ocnanalecen(self):
 
         deps = []
-        dep_dict = {'type': 'task', 'name': f'{self.run}ocnanalrun'}
+        dep_dict = {'type': 'task', 'name': f'{self.run}_marineanlvar'}
         deps.append(rocoto.add_dependency(dep_dict))
         dependencies = rocoto.create_dependency(dep=deps)
 
         resources = self.get_resource('ocnanalecen')
-        task_name = f'{self.run}ocnanalecen'
+        task_name = f'{self.run}_ocnanalecen'
         task_dict = {'task_name': task_name,
                      'resources': resources,
                      'dependency': dependencies,
@@ -733,13 +767,13 @@ def ocnanalecen(self):
 
         return task
 
-    def ocnanalchkpt(self):
+    def marineanlchkpt(self):
 
         deps = []
         if self.app_config.do_hybvar:
-            dep_dict = {'type': 'task', 'name': f'{self.run}ocnanalecen'}
+            dep_dict = {'type': 'task', 'name': f'{self.run}_ocnanalecen'}
         else:
-            dep_dict = {'type': 'task', 'name': f'{self.run}ocnanalrun'}
+            dep_dict = {'type': 'task', 'name': f'{self.run}_marineanlvar'}
         deps.append(rocoto.add_dependency(dep_dict))
         if self.app_config.do_mergensst:
             data = f'&ROTDIR;/{self.run}.@Y@m@d/@H/atmos/{self.run}.t@Hz.sfcanl.nc'
@@ -747,14 +781,14 @@ def ocnanalchkpt(self):
             deps.append(rocoto.add_dependency(dep_dict))
         dependencies = rocoto.create_dependency(dep_condition='and', dep=deps)
 
-        resources = self.get_resource('ocnanalchkpt')
-        task_name = f'{self.run}ocnanalchkpt'
+        resources = self.get_resource('marineanlchkpt')
+        task_name = f'{self.run}_marineanlchkpt'
         task_dict = {'task_name': task_name,
                      'resources': resources,
                      'dependency': dependencies,
                      'envars': self.envars,
                      'cycledef': self.run.replace('enkf', ''),
-                     'command': f'{self.HOMEgfs}/jobs/rocoto/ocnanalchkpt.sh',
+                     'command': f'{self.HOMEgfs}/jobs/rocoto/marineanlchkpt.sh',
                      'job_name': f'{self.pslot}_{task_name}_@H',
                      'log': f'{self.rotdir}/logs/@Y@m@d@H/{task_name}.log',
                      'maxtries': '&MAXTRIES;'
@@ -764,21 +798,21 @@ def ocnanalchkpt(self):
 
         return task
 
-    def ocnanalpost(self):
+    def marineanlfinal(self):
 
         deps = []
-        dep_dict = {'type': 'task', 'name': f'{self.run}ocnanalchkpt'}
+        dep_dict = {'type': 'task', 'name': f'{self.run}_marineanlchkpt'}
         deps.append(rocoto.add_dependency(dep_dict))
         dependencies = rocoto.create_dependency(dep_condition='and', dep=deps)
 
-        resources = self.get_resource('ocnanalpost')
-        task_name = f'{self.run}ocnanalpost'
+        resources = self.get_resource('marineanlfinal')
+        task_name = f'{self.run}_marineanlfinal'
         task_dict = {'task_name': task_name,
                      'resources': resources,
                      'dependency': dependencies,
                      'envars': self.envars,
                      'cycledef': self.run.replace('enkf', ''),
-                     'command': f'{self.HOMEgfs}/jobs/rocoto/ocnanalpost.sh',
+                     'command': f'{self.HOMEgfs}/jobs/rocoto/marineanlfinal.sh',
                      'job_name': f'{self.pslot}_{task_name}_@H',
                      'log': f'{self.rotdir}/logs/@Y@m@d@H/{task_name}.log',
                      'maxtries': '&MAXTRIES;'
@@ -791,12 +825,12 @@ def ocnanalpost(self):
     def ocnanalvrfy(self):
 
         deps = []
-        dep_dict = {'type': 'task', 'name': f'{self.run}ocnanalpost'}
+        dep_dict = {'type': 'task', 'name': f'{self.run}_marineanlfinal'}
         deps.append(rocoto.add_dependency(dep_dict))
         dependencies = rocoto.create_dependency(dep_condition='and', dep=deps)
 
         resources = self.get_resource('ocnanalvrfy')
-        task_name = f'{self.run}ocnanalvrfy'
+        task_name = f'{self.run}_ocnanalvrfy'
         task_dict = {'task_name': task_name,
                      'resources': resources,
                      'dependency': dependencies,
@@ -820,8 +854,8 @@ def fcst(self):
         try:
             task = fcst_map[self.app_config.mode]()
         except KeyError:
-            raise NotImplementedError(f'{self.app_config.mode} is not a valid type.\n' +
-                                      'Currently supported forecast types are:\n' +
+            raise NotImplementedError(f'{self.app_config.mode} is not a valid type.\n'
+                                      f'Currently supported forecast types are:\n'
                                       f'{" | ".join(fcst_map.keys())}')
 
         return task
@@ -829,12 +863,12 @@ def fcst(self):
     def _fcst_forecast_only(self):
         dependencies = []
 
-        dep_dict = {'type': 'task', 'name': f'{self.run}stage_ic'}
+        dep_dict = {'type': 'task', 'name': f'{self.run}_stage_ic'}
         dependencies.append(rocoto.add_dependency(dep_dict))
 
         if self.app_config.do_wave and self.run in self.app_config.wave_runs:
             wave_job = 'waveprep' if self.app_config.model_app in ['ATMW'] else 'waveinit'
-            dep_dict = {'type': 'task', 'name': f'{self.run}{wave_job}'}
+            dep_dict = {'type': 'task', 'name': f'{self.run}_{wave_job}'}
             dependencies.append(rocoto.add_dependency(dep_dict))
 
         if self.app_config.do_aero and \
@@ -843,12 +877,12 @@ def _fcst_forecast_only(self):
             # Calculate offset based on RUN = gfs | gdas
             interval = None
             if self.run in ['gfs']:
-                interval = self._base['INTERVAL_GFS']
+                interval = to_timedelta(f"{self._base['INTERVAL_GFS']}H")
             elif self.run in ['gdas']:
-                interval = self._base['INTERVAL']
+                interval = self._base['assim_freq']
             offset = timedelta_to_HMS(-interval)
             deps = []
-            dep_dict = {'type': 'task', 'name': f'{self.run}aerosol_init'}
+            dep_dict = {'type': 'task', 'name': f'{self.run}_aerosol_init'}
             deps.append(rocoto.add_dependency(dep_dict))
             dep_dict = {'type': 'cycleexist', 'condition': 'not', 'offset': offset}
             deps.append(rocoto.add_dependency(dep_dict))
@@ -867,7 +901,7 @@ def _fcst_forecast_only(self):
             fcst_vars.append(rocoto.create_envar(name=key, value=str(value)))
 
         resources = self.get_resource('fcst')
-        task_name = f'{self.run}fcst_seg#seg#'
+        task_name = f'{self.run}_fcst_seg#seg#'
         task_dict = {'task_name': task_name,
                      'resources': resources,
                      'dependency': dependencies,
@@ -880,7 +914,7 @@ def _fcst_forecast_only(self):
                      }
 
         seg_var_dict = {'seg': ' '.join([f"{seg}" for seg in range(0, num_fcst_segments)])}
-        metatask_dict = {'task_name': f'{self.run}fcst',
+        metatask_dict = {'task_name': f'{self.run}_fcst',
                          'is_serial': True,
                          'var_dict': seg_var_dict,
                          'task_dict': task_dict
@@ -892,31 +926,31 @@ def _fcst_forecast_only(self):
 
     def _fcst_cycled(self):
 
-        dep_dict = {'type': 'task', 'name': f'{self.run}sfcanl'}
+        dep_dict = {'type': 'task', 'name': f'{self.run}_sfcanl'}
         dep = rocoto.add_dependency(dep_dict)
         dependencies = rocoto.create_dependency(dep=dep)
 
         if self.app_config.do_jediocnvar:
-            dep_dict = {'type': 'task', 'name': f'{self.run}ocnanalpost'}
+            dep_dict = {'type': 'task', 'name': f'{self.run}_marineanlfinal'}
             dependencies.append(rocoto.add_dependency(dep_dict))
 
         if self.app_config.do_aero and self.run in self.app_config.aero_anl_runs:
-            dep_dict = {'type': 'task', 'name': f'{self.run}aeroanlfinal'}
+            dep_dict = {'type': 'task', 'name': f'{self.run}_aeroanlfinal'}
             dependencies.append(rocoto.add_dependency(dep_dict))
 
         if self.app_config.do_jedisnowda:
-            dep_dict = {'type': 'task', 'name': f'{self.run}snowanl'}
+            dep_dict = {'type': 'task', 'name': f'{self.run}_snowanl'}
             dependencies.append(rocoto.add_dependency(dep_dict))
 
         dependencies = rocoto.create_dependency(dep_condition='and', dep=dependencies)
 
         if self.run in ['gdas']:
-            dep_dict = {'type': 'task', 'name': f'{self.run}stage_ic'}
+            dep_dict = {'type': 'task', 'name': f'{self.run}_stage_ic'}
             dependencies.append(rocoto.add_dependency(dep_dict))
             dependencies = rocoto.create_dependency(dep_condition='or', dep=dependencies)
 
         if self.app_config.do_wave and self.run in self.app_config.wave_runs:
-            dep_dict = {'type': 'task', 'name': f'{self.run}waveprep'}
+            dep_dict = {'type': 'task', 'name': f'{self.run}_waveprep'}
             dependencies.append(rocoto.add_dependency(dep_dict))
             dependencies = rocoto.create_dependency(dep_condition='and', dep=dependencies)
 
@@ -933,7 +967,7 @@ def _fcst_cycled(self):
             fcst_vars.append(rocoto.create_envar(name=key, value=str(value)))
 
         resources = self.get_resource('fcst')
-        task_name = f'{self.run}fcst_seg#seg#'
+        task_name = f'{self.run}_fcst_seg#seg#'
         task_dict = {'task_name': task_name,
                      'resources': resources,
                      'dependency': dependencies,
@@ -946,7 +980,7 @@ def _fcst_cycled(self):
                      }
 
         seg_var_dict = {'seg': ' '.join([f"{seg}" for seg in range(0, num_fcst_segments)])}
-        metatask_dict = {'task_name': f'{self.run}fcst',
+        metatask_dict = {'task_name': f'{self.run}_fcst',
                          'is_serial': True,
                          'var_dict': seg_var_dict,
                          'task_dict': task_dict
@@ -976,7 +1010,7 @@ def atmanlupp(self):
         deps.append(rocoto.add_dependency(dep_dict))
         dependencies = rocoto.create_dependency(dep=deps, dep_condition='and')
         resources = self.get_resource('upp')
-        task_name = f'{self.run}atmanlupp'
+        task_name = f'{self.run}_atmanlupp'
         task_dict = {'task_name': task_name,
                      'resources': resources,
                      'dependency': dependencies,
@@ -1005,7 +1039,7 @@ def atmanlprod(self):
         deps.append(rocoto.add_dependency(dep_dict))
         dependencies = rocoto.create_dependency(dep=deps)
         resources = self.get_resource('atmos_products')
-        task_name = f'{self.run}atmanlprod'
+        task_name = f'{self.run}_atmanlprod'
         task_dict = {'task_name': task_name,
                      'resources': resources,
                      'dependency': dependencies,
@@ -1054,7 +1088,7 @@ def _upptask(self, upp_run="forecast", task_id="atmupp"):
         cycledef = 'gdas_half,gdas' if self.run in ['gdas'] else self.run
         resources = self.get_resource('upp')
 
-        task_name = f'{self.run}{task_id}_f#fhr#'
+        task_name = f'{self.run}_{task_id}_f#fhr#'
         task_dict = {'task_name': task_name,
                      'resources': resources,
                      'dependency': dependencies,
@@ -1069,7 +1103,7 @@ def _upptask(self, upp_run="forecast", task_id="atmupp"):
         fhrs = self._get_forecast_hours(self.run, self._configs['upp'])
         fhr_var_dict = {'fhr': ' '.join([f"{fhr:03d}" for fhr in fhrs])}
 
-        metatask_dict = {'task_name': f'{self.run}{task_id}',
+        metatask_dict = {'task_name': f'{self.run}_{task_id}',
                          'task_dict': task_dict,
                          'var_dict': fhr_var_dict
                          }
@@ -1114,14 +1148,14 @@ def _atmosoceaniceprod(self, component: str):
         data = f'{history_path}/{history_file_tmpl}'
         dep_dict = {'type': 'data', 'data': data, 'age': 120}
         deps.append(rocoto.add_dependency(dep_dict))
-        dep_dict = {'type': 'metatask', 'name': f'{self.run}fcst'}
+        dep_dict = {'type': 'metatask', 'name': f'{self.run}_fcst'}
         deps.append(rocoto.add_dependency(dep_dict))
         dependencies = rocoto.create_dependency(dep=deps, dep_condition='or')
 
         cycledef = 'gdas_half,gdas' if self.run in ['gdas'] else self.run
         resources = self.get_resource(component_dict['config'])
 
-        task_name = f'{self.run}{component}_prod_f#fhr#'
+        task_name = f'{self.run}_{component}_prod_f#fhr#'
         task_dict = {'task_name': task_name,
                      'resources': resources,
                      'dependency': dependencies,
@@ -1143,7 +1177,7 @@ def _atmosoceaniceprod(self, component: str):
         if component in ['ocean']:
             fhrs_next = fhrs[1:] + [fhrs[-1] + (fhrs[-1] - fhrs[-2])]
             fhr_var_dict['fhr_next'] = ' '.join([f"{fhr:03d}" for fhr in fhrs_next])
-        metatask_dict = {'task_name': f'{self.run}{component}_prod',
+        metatask_dict = {'task_name': f'{self.run}_{component}_prod',
                          'task_dict': task_dict,
                          'var_dict': fhr_var_dict}
 
@@ -1153,15 +1187,12 @@ def _atmosoceaniceprod(self, component: str):
 
     def wavepostsbs(self):
         deps = []
-        for wave_grid in self._configs['wavepostsbs']['waveGRD'].split():
-            wave_hist_path = self._template_to_rocoto_cycstring(self._base["COM_WAVE_HISTORY_TMPL"])
-            data = f'{wave_hist_path}/{self.run}wave.out_grd.{wave_grid}.@Y@m@d.@H0000'
-            dep_dict = {'type': 'data', 'data': data}
-            deps.append(rocoto.add_dependency(dep_dict))
-        dependencies = rocoto.create_dependency(dep_condition='and', dep=deps)
+        dep_dict = {'type': 'metatask', 'name': f'{self.run}_fcst'}
+        deps.append(rocoto.add_dependency(dep_dict))
+        dependencies = rocoto.create_dependency(dep=deps)
 
         resources = self.get_resource('wavepostsbs')
-        task_name = f'{self.run}wavepostsbs'
+        task_name = f'{self.run}_wavepostsbs'
         task_dict = {'task_name': task_name,
                      'resources': resources,
                      'dependency': dependencies,
@@ -1179,12 +1210,12 @@ def wavepostsbs(self):
 
     def wavepostbndpnt(self):
         deps = []
-        dep_dict = {'type': 'metatask', 'name': f'{self.run}fcst'}
+        dep_dict = {'type': 'metatask', 'name': f'{self.run}_fcst'}
         deps.append(rocoto.add_dependency(dep_dict))
         dependencies = rocoto.create_dependency(dep=deps)
 
         resources = self.get_resource('wavepostbndpnt')
-        task_name = f'{self.run}wavepostbndpnt'
+        task_name = f'{self.run}_wavepostbndpnt'
         task_dict = {'task_name': task_name,
                      'resources': resources,
                      'dependency': dependencies,
@@ -1213,7 +1244,7 @@ def wavepostbndpntbll(self):
         dependencies = rocoto.create_dependency(dep=deps)
 
         resources = self.get_resource('wavepostbndpntbll')
-        task_name = f'{self.run}wavepostbndpntbll'
+        task_name = f'{self.run}_wavepostbndpntbll'
         task_dict = {'task_name': task_name,
                      'resources': resources,
                      'dependency': dependencies,
@@ -1231,15 +1262,15 @@ def wavepostbndpntbll(self):
 
     def wavepostpnt(self):
         deps = []
-        dep_dict = {'type': 'metatask', 'name': f'{self.run}fcst'}
+        dep_dict = {'type': 'metatask', 'name': f'{self.run}_fcst'}
         deps.append(rocoto.add_dependency(dep_dict))
         if self.app_config.do_wave_bnd:
-            dep_dict = {'type': 'task', 'name': f'{self.run}wavepostbndpntbll'}
+            dep_dict = {'type': 'task', 'name': f'{self.run}_wavepostbndpntbll'}
             deps.append(rocoto.add_dependency(dep_dict))
         dependencies = rocoto.create_dependency(dep_condition='and', dep=deps)
 
         resources = self.get_resource('wavepostpnt')
-        task_name = f'{self.run}wavepostpnt'
+        task_name = f'{self.run}_wavepostpnt'
         task_dict = {'task_name': task_name,
                      'resources': resources,
                      'dependency': dependencies,
@@ -1257,12 +1288,12 @@ def wavepostpnt(self):
 
     def wavegempak(self):
         deps = []
-        dep_dict = {'type': 'task', 'name': f'{self.run}wavepostsbs'}
+        dep_dict = {'type': 'task', 'name': f'{self.run}_wavepostsbs'}
         deps.append(rocoto.add_dependency(dep_dict))
         dependencies = rocoto.create_dependency(dep=deps)
 
         resources = self.get_resource('wavegempak')
-        task_name = f'{self.run}wavegempak'
+        task_name = f'{self.run}_wavegempak'
         task_dict = {'task_name': task_name,
                      'resources': resources,
                      'dependency': dependencies,
@@ -1280,14 +1311,14 @@ def wavegempak(self):
 
     def waveawipsbulls(self):
         deps = []
-        dep_dict = {'type': 'task', 'name': f'{self.run}wavepostsbs'}
+        dep_dict = {'type': 'task', 'name': f'{self.run}_wavepostsbs'}
         deps.append(rocoto.add_dependency(dep_dict))
-        dep_dict = {'type': 'task', 'name': f'{self.run}wavepostpnt'}
+        dep_dict = {'type': 'task', 'name': f'{self.run}_wavepostpnt'}
         deps.append(rocoto.add_dependency(dep_dict))
         dependencies = rocoto.create_dependency(dep_condition='and', dep=deps)
 
         resources = self.get_resource('waveawipsbulls')
-        task_name = f'{self.run}waveawipsbulls'
+        task_name = f'{self.run}_waveawipsbulls'
         task_dict = {'task_name': task_name,
                      'resources': resources,
                      'dependency': dependencies,
@@ -1305,12 +1336,12 @@ def waveawipsbulls(self):
 
     def waveawipsgridded(self):
         deps = []
-        dep_dict = {'type': 'task', 'name': f'{self.run}wavepostsbs'}
+        dep_dict = {'type': 'task', 'name': f'{self.run}_wavepostsbs'}
         deps.append(rocoto.add_dependency(dep_dict))
         dependencies = rocoto.create_dependency(dep=deps)
 
         resources = self.get_resource('waveawipsgridded')
-        task_name = f'{self.run}waveawipsgridded'
+        task_name = f'{self.run}_waveawipsgridded'
         task_dict = {'task_name': task_name,
                      'resources': resources,
                      'dependency': dependencies,
@@ -1328,12 +1359,12 @@ def waveawipsgridded(self):
 
     def postsnd(self):
         deps = []
-        dep_dict = {'type': 'metatask', 'name': f'{self.run}fcst'}
+        dep_dict = {'type': 'metatask', 'name': f'{self.run}_fcst'}
         deps.append(rocoto.add_dependency(dep_dict))
         dependencies = rocoto.create_dependency(dep=deps)
 
         resources = self.get_resource('postsnd')
-        task_name = f'{self.run}postsnd'
+        task_name = f'{self.run}_postsnd'
         task_dict = {'task_name': task_name,
                      'resources': resources,
                      'dependency': dependencies,
@@ -1370,7 +1401,7 @@ def fbwind(self):
         # prematurely starting with partial files. Unfortunately, the
         # ability to "group" post would make this more convoluted than
         # it should be and not worth the complexity.
-        task_name = f'{self.run}fbwind'
+        task_name = f'{self.run}_fbwind'
         task_dict = {'task_name': task_name,
                      'resources': resources,
                      'dependency': dependencies,
@@ -1425,7 +1456,7 @@ def _get_awipsgroups(run, config):
     def awips_20km_1p0deg(self):
 
         deps = []
-        dep_dict = {'type': 'metatask', 'name': f'{self.run}atmos_prod'}
+        dep_dict = {'type': 'metatask', 'name': f'{self.run}_atmos_prod'}
         deps.append(rocoto.add_dependency(dep_dict))
         dependencies = rocoto.create_dependency(dep=deps)
 
@@ -1442,7 +1473,7 @@ def awips_20km_1p0deg(self):
 
         resources = self.get_resource('awips')
 
-        task_name = f'{self.run}awips_20km_1p0deg#{varname1}#'
+        task_name = f'{self.run}_awips_20km_1p0deg#{varname1}#'
         task_dict = {'task_name': task_name,
                      'resources': resources,
                      'dependency': dependencies,
@@ -1454,7 +1485,7 @@ def awips_20km_1p0deg(self):
                      'maxtries': '&MAXTRIES;'
                      }
 
-        metatask_dict = {'task_name': f'{self.run}awips_20km_1p0deg',
+        metatask_dict = {'task_name': f'{self.run}_awips_20km_1p0deg',
                          'task_dict': task_dict,
                          'var_dict': var_dict
                          }
@@ -1466,7 +1497,7 @@ def awips_20km_1p0deg(self):
     def gempak(self):
 
         deps = []
-        dep_dict = {'type': 'task', 'name': f'{self.run}atmos_prod_f#fhr#'}
+        dep_dict = {'type': 'task', 'name': f'{self.run}_atmos_prod_f#fhr#'}
         deps.append(rocoto.add_dependency(dep_dict))
         dependencies = rocoto.create_dependency(dep=deps)
 
@@ -1476,7 +1507,7 @@ def gempak(self):
             gempak_vars.append(rocoto.create_envar(name=key, value=str(value)))
 
         resources = self.get_resource('gempak')
-        task_name = f'{self.run}gempak_f#fhr#'
+        task_name = f'{self.run}_gempak_f#fhr#'
         task_dict = {'task_name': task_name,
                      'resources': resources,
                      'dependency': dependencies,
@@ -1491,7 +1522,7 @@ def gempak(self):
         fhrs = self._get_forecast_hours(self.run, self._configs['gempak'])
         fhr_var_dict = {'fhr': ' '.join([f"{fhr:03d}" for fhr in fhrs])}
 
-        fhr_metatask_dict = {'task_name': f'{self.run}gempak',
+        fhr_metatask_dict = {'task_name': f'{self.run}_gempak',
                              'task_dict': task_dict,
                              'var_dict': fhr_var_dict}
 
@@ -1501,12 +1532,12 @@ def gempak(self):
 
     def gempakmeta(self):
         deps = []
-        dep_dict = {'type': 'metatask', 'name': f'{self.run}gempak'}
+        dep_dict = {'type': 'metatask', 'name': f'{self.run}_gempak'}
         deps.append(rocoto.add_dependency(dep_dict))
         dependencies = rocoto.create_dependency(dep=deps)
 
         resources = self.get_resource('gempak')
-        task_name = f'{self.run}gempakmeta'
+        task_name = f'{self.run}_gempakmeta'
         task_dict = {'task_name': task_name,
                      'resources': resources,
                      'dependency': dependencies,
@@ -1524,12 +1555,12 @@ def gempakmeta(self):
 
     def gempakmetancdc(self):
         deps = []
-        dep_dict = {'type': 'metatask', 'name': f'{self.run}gempak'}
+        dep_dict = {'type': 'metatask', 'name': f'{self.run}_gempak'}
         deps.append(rocoto.add_dependency(dep_dict))
         dependencies = rocoto.create_dependency(dep=deps)
 
         resources = self.get_resource('gempak')
-        task_name = f'{self.run}gempakmetancdc'
+        task_name = f'{self.run}_gempakmetancdc'
         task_dict = {'task_name': task_name,
                      'resources': resources,
                      'dependency': dependencies,
@@ -1547,12 +1578,12 @@ def gempakmetancdc(self):
 
     def gempakncdcupapgif(self):
         deps = []
-        dep_dict = {'type': 'metatask', 'name': f'{self.run}gempak'}
+        dep_dict = {'type': 'metatask', 'name': f'{self.run}_gempak'}
         deps.append(rocoto.add_dependency(dep_dict))
         dependencies = rocoto.create_dependency(dep=deps)
 
         resources = self.get_resource('gempak')
-        task_name = f'{self.run}gempakncdcupapgif'
+        task_name = f'{self.run}_gempakncdcupapgif'
         task_dict = {'task_name': task_name,
                      'resources': resources,
                      'dependency': dependencies,
@@ -1570,7 +1601,7 @@ def gempakncdcupapgif(self):
 
     def gempakpgrb2spec(self):
         deps = []
-        dep_dict = {'type': 'task', 'name': f'{self.run}npoess_pgrb2_0p5deg'}
+        dep_dict = {'type': 'task', 'name': f'{self.run}_npoess_pgrb2_0p5deg'}
         deps.append(rocoto.add_dependency(dep_dict))
         dependencies = rocoto.create_dependency(dep=deps)
 
@@ -1580,7 +1611,7 @@ def gempakpgrb2spec(self):
             gempak_vars.append(rocoto.create_envar(name=key, value=str(value)))
 
         resources = self.get_resource('gempak')
-        task_name = f'{self.run}gempakgrb2spec_f#fhr#'
+        task_name = f'{self.run}_gempakgrb2spec_f#fhr#'
         task_dict = {'task_name': task_name,
                      'resources': resources,
                      'dependency': dependencies,
@@ -1604,7 +1635,7 @@ def gempakpgrb2spec(self):
         fhrs = self._get_forecast_hours(self.run, local_config)
         fhr_var_dict = {'fhr': ' '.join([f"{fhr:03d}" for fhr in fhrs])}
 
-        fhr_metatask_dict = {'task_name': f'{self.run}gempakgrb2spec',
+        fhr_metatask_dict = {'task_name': f'{self.run}_gempakgrb2spec',
                              'task_dict': task_dict,
                              'var_dict': fhr_var_dict}
 
@@ -1615,14 +1646,14 @@ def gempakpgrb2spec(self):
     def npoess_pgrb2_0p5deg(self):
 
         deps = []
-        dep_dict = {'type': 'task', 'name': f'{self.run}atmanlprod'}
+        dep_dict = {'type': 'task', 'name': f'{self.run}_atmanlprod'}
         deps.append(rocoto.add_dependency(dep_dict))
-        dep_dict = {'type': 'metatask', 'name': f'{self.run}goesupp'}
+        dep_dict = {'type': 'metatask', 'name': f'{self.run}_goesupp'}
         deps.append(rocoto.add_dependency(dep_dict))
         dependencies = rocoto.create_dependency(dep=deps, dep_condition='and')
 
         resources = self.get_resource('npoess')
-        task_name = f'{self.run}npoess_pgrb2_0p5deg'
+        task_name = f'{self.run}_npoess_pgrb2_0p5deg'
         task_dict = {'task_name': task_name,
                      'resources': resources,
                      'dependency': dependencies,
@@ -1640,12 +1671,12 @@ def npoess_pgrb2_0p5deg(self):
 
     def verfozn(self):
         deps = []
-        dep_dict = {'type': 'task', 'name': f'{self.run}analdiag'}
+        dep_dict = {'type': 'task', 'name': f'{self.run}_analdiag'}
         deps.append(rocoto.add_dependency(dep_dict))
         dependencies = rocoto.create_dependency(dep=deps)
 
         resources = self.get_resource('verfozn')
-        task_name = f'{self.run}verfozn'
+        task_name = f'{self.run}_verfozn'
         task_dict = {'task_name': task_name,
                      'resources': resources,
                      'dependency': dependencies,
@@ -1663,12 +1694,12 @@ def verfozn(self):
 
     def verfrad(self):
         deps = []
-        dep_dict = {'type': 'task', 'name': f'{self.run}analdiag'}
+        dep_dict = {'type': 'task', 'name': f'{self.run}_analdiag'}
         deps.append(rocoto.add_dependency(dep_dict))
         dependencies = rocoto.create_dependency(dep=deps)
 
         resources = self.get_resource('verfrad')
-        task_name = f'{self.run}verfrad'
+        task_name = f'{self.run}_verfrad'
         task_dict = {'task_name': task_name,
                      'resources': resources,
                      'dependency': dependencies,
@@ -1686,12 +1717,12 @@ def verfrad(self):
 
     def vminmon(self):
         deps = []
-        dep_dict = {'type': 'task', 'name': f'{self.run}anal'}
+        dep_dict = {'type': 'task', 'name': f'{self.run}_anal'}
         deps.append(rocoto.add_dependency(dep_dict))
         dependencies = rocoto.create_dependency(dep=deps)
 
         resources = self.get_resource('vminmon')
-        task_name = f'{self.run}vminmon'
+        task_name = f'{self.run}_vminmon'
         task_dict = {'task_name': task_name,
                      'resources': resources,
                      'dependency': dependencies,
@@ -1709,12 +1740,12 @@ def vminmon(self):
 
     def tracker(self):
         deps = []
-        dep_dict = {'type': 'metatask', 'name': f'{self.run}atmos_prod'}
+        dep_dict = {'type': 'metatask', 'name': f'{self.run}_atmos_prod'}
         deps.append(rocoto.add_dependency(dep_dict))
         dependencies = rocoto.create_dependency(dep=deps)
 
         resources = self.get_resource('tracker')
-        task_name = f'{self.run}tracker'
+        task_name = f'{self.run}_tracker'
         task_dict = {'task_name': task_name,
                      'resources': resources,
                      'dependency': dependencies,
@@ -1732,12 +1763,12 @@ def tracker(self):
 
     def genesis(self):
         deps = []
-        dep_dict = {'type': 'metatask', 'name': f'{self.run}atmos_prod'}
+        dep_dict = {'type': 'metatask', 'name': f'{self.run}_atmos_prod'}
         deps.append(rocoto.add_dependency(dep_dict))
         dependencies = rocoto.create_dependency(dep=deps)
 
         resources = self.get_resource('genesis')
-        task_name = f'{self.run}genesis'
+        task_name = f'{self.run}_genesis'
         task_dict = {'task_name': task_name,
                      'resources': resources,
                      'dependency': dependencies,
@@ -1755,12 +1786,12 @@ def genesis(self):
 
     def genesis_fsu(self):
         deps = []
-        dep_dict = {'type': 'metatask', 'name': f'{self.run}atmos_prod'}
+        dep_dict = {'type': 'metatask', 'name': f'{self.run}_atmos_prod'}
         deps.append(rocoto.add_dependency(dep_dict))
         dependencies = rocoto.create_dependency(dep=deps)
 
         resources = self.get_resource('genesis_fsu')
-        task_name = f'{self.run}genesis_fsu'
+        task_name = f'{self.run}_genesis_fsu'
         task_dict = {'task_name': task_name,
                      'resources': resources,
                      'dependency': dependencies,
@@ -1778,12 +1809,12 @@ def genesis_fsu(self):
 
     def fit2obs(self):
         deps = []
-        dep_dict = {'type': 'metatask', 'name': f'{self.run}atmos_prod'}
+        dep_dict = {'type': 'metatask', 'name': f'{self.run}_atmos_prod'}
         deps.append(rocoto.add_dependency(dep_dict))
         dependencies = rocoto.create_dependency(dep=deps)
 
         resources = self.get_resource('fit2obs')
-        task_name = f'{self.run}fit2obs'
+        task_name = f'{self.run}_fit2obs'
         task_dict = {'task_name': task_name,
                      'resources': resources,
                      'dependency': dependencies,
@@ -1801,16 +1832,29 @@ def fit2obs(self):
 
     def metp(self):
         deps = []
-        dep_dict = {'type': 'task', 'name': f'{self.run}arch'}
+        dep_dict = {'type': 'task', 'name': f'{self.run}_arch'}
         deps.append(rocoto.add_dependency(dep_dict))
-        dependencies = rocoto.create_dependency(dep_condition='and', dep=deps)
+        if self.app_config.interval_gfs < to_timedelta('24H'):
+            n_lookback = self.app_config.interval_gfs // to_timedelta('6H')
+            for lookback in range(1, n_lookback + 1):
+                deps2 = []
+                dep_dict = {'type': 'taskvalid', 'name': f'{self.run}_arch', 'condition': 'not'}
+                deps2.append(rocoto.add_dependency(dep_dict))
+                for lookback2 in range(1, lookback):
+                    offset = timedelta_to_HMS(-to_timedelta(f'{6*lookback2}H'))
+                    dep_dict = {'type': 'cycleexist', 'condition': 'not', 'offset': offset}
+                    deps2.append(rocoto.add_dependency(dep_dict))
+
+                offset = timedelta_to_HMS(-to_timedelta(f'{6*lookback}H'))
+                dep_dict = {'type': 'task', 'name': f'{self.run}_arch', 'offset': offset}
+                deps2.append(rocoto.add_dependency(dep_dict))
+                deps.append(rocoto.create_dependency(dep_condition='and', dep=deps2))
+
+        dependencies = rocoto.create_dependency(dep_condition='or', dep=deps)
 
         metpenvars = self.envars.copy()
-        if self.app_config.mode in ['cycled']:
-            metpenvar_dict = {'SDATE_GFS': self._base.get('SDATE_GFS').strftime("%Y%m%d%H"),
-                              'EDATE_GFS': self._base.get('EDATE_GFS').strftime("%Y%m%d%H")}
-        elif self.app_config.mode in ['forecast-only']:
-            metpenvar_dict = {'SDATE_GFS': self._base.get('SDATE').strftime("%Y%m%d%H")}
+        metpenvar_dict = {'SDATE_GFS': self._base.get('SDATE_GFS').strftime("%Y%m%d%H"),
+                          'EDATE_GFS': self._base.get('EDATE').strftime("%Y%m%d%H")}
         metpenvar_dict['METPCASE'] = '#metpcase#'
         for key, value in metpenvar_dict.items():
             metpenvars.append(rocoto.create_envar(name=key, value=str(value)))
@@ -1821,19 +1865,19 @@ def metp(self):
 
         resources = self.get_resource('metp')
 
-        task_name = f'{self.run}metp#{varname1}#'
+        task_name = f'{self.run}_metp#{varname1}#'
         task_dict = {'task_name': task_name,
                      'resources': resources,
                      'dependency': dependencies,
                      'envars': metpenvars,
-                     'cycledef': self.run.replace('enkf', ''),
+                     'cycledef': 'metp,last_gfs',
                      'command': f'{self.HOMEgfs}/jobs/rocoto/metp.sh',
                      'job_name': f'{self.pslot}_{task_name}_@H',
                      'log': f'{self.rotdir}/logs/@Y@m@d@H/{task_name}.log',
                      'maxtries': '&MAXTRIES;'
                      }
 
-        metatask_dict = {'task_name': f'{self.run}metp',
+        metatask_dict = {'task_name': f'{self.run}_metp',
                          'is_serial': True,
                          'task_dict': task_dict,
                          'var_dict': var_dict,
@@ -1845,12 +1889,12 @@ def metp(self):
 
     def mos_stn_prep(self):
         deps = []
-        dep_dict = {'type': 'metatask', 'name': f'{self.run}atmos_prod'}
+        dep_dict = {'type': 'metatask', 'name': f'{self.run}_atmos_prod'}
         deps.append(rocoto.add_dependency(dep_dict))
         dependencies = rocoto.create_dependency(dep=deps)
 
         resources = self.get_resource('mos_stn_prep')
-        task_name = f'{self.run}mos_stn_prep'
+        task_name = f'{self.run}_mos_stn_prep'
         task_dict = {'task_name': task_name,
                      'resources': resources,
                      'dependency': dependencies,
@@ -1868,12 +1912,12 @@ def mos_stn_prep(self):
 
     def mos_grd_prep(self):
         deps = []
-        dep_dict = {'type': 'metatask', 'name': f'{self.run}atmos_prod'}
+        dep_dict = {'type': 'metatask', 'name': f'{self.run}_atmos_prod'}
         deps.append(rocoto.add_dependency(dep_dict))
         dependencies = rocoto.create_dependency(dep=deps)
 
         resources = self.get_resource('mos_grd_prep')
-        task_name = f'{self.run}mos_grd_prep'
+        task_name = f'{self.run}_mos_grd_prep'
         task_dict = {'task_name': task_name,
                      'resources': resources,
                      'dependency': dependencies,
@@ -1891,12 +1935,12 @@ def mos_grd_prep(self):
 
     def mos_ext_stn_prep(self):
         deps = []
-        dep_dict = {'type': 'metatask', 'name': f'{self.run}atmos_prod'}
+        dep_dict = {'type': 'metatask', 'name': f'{self.run}_atmos_prod'}
         deps.append(rocoto.add_dependency(dep_dict))
         dependencies = rocoto.create_dependency(dep=deps)
 
         resources = self.get_resource('mos_ext_stn_prep')
-        task_name = f'{self.run}mos_ext_stn_prep'
+        task_name = f'{self.run}_mos_ext_stn_prep'
         task_dict = {'task_name': task_name,
                      'resources': resources,
                      'dependency': dependencies,
@@ -1914,12 +1958,12 @@ def mos_ext_stn_prep(self):
 
     def mos_ext_grd_prep(self):
         deps = []
-        dep_dict = {'type': 'metatask', 'name': f'{self.run}atmos_prod'}
+        dep_dict = {'type': 'metatask', 'name': f'{self.run}_atmos_prod'}
         deps.append(rocoto.add_dependency(dep_dict))
         dependencies = rocoto.create_dependency(dep=deps)
 
         resources = self.get_resource('mos_ext_grd_prep')
-        task_name = f'{self.run}mos_ext_grd_prep'
+        task_name = f'{self.run}_mos_ext_grd_prep'
         task_dict = {'task_name': task_name,
                      'resources': resources,
                      'dependency': dependencies,
@@ -1937,12 +1981,12 @@ def mos_ext_grd_prep(self):
 
     def mos_stn_fcst(self):
         deps = []
-        dep_dict = {'type': 'task', 'name': f'{self.run}mos_stn_prep'}
+        dep_dict = {'type': 'task', 'name': f'{self.run}_mos_stn_prep'}
         deps.append(rocoto.add_dependency(dep_dict))
         dependencies = rocoto.create_dependency(dep=deps)
 
         resources = self.get_resource('mos_stn_fcst')
-        task_name = f'{self.run}mos_stn_fcst'
+        task_name = f'{self.run}_mos_stn_fcst'
         task_dict = {'task_name': task_name,
                      'resources': resources,
                      'dependency': dependencies,
@@ -1960,15 +2004,15 @@ def mos_stn_fcst(self):
 
     def mos_grd_fcst(self):
         deps = []
-        dep_dict = {'type': 'task', 'name': f'{self.run}mos_stn_prep'}
+        dep_dict = {'type': 'task', 'name': f'{self.run}_mos_stn_prep'}
         deps.append(rocoto.add_dependency(dep_dict))
         dependencies = rocoto.create_dependency(dep=deps)
-        dep_dict = {'type': 'task', 'name': f'{self.run}mos_grd_prep'}
+        dep_dict = {'type': 'task', 'name': f'{self.run}_mos_grd_prep'}
         deps.append(rocoto.add_dependency(dep_dict))
         dependencies = rocoto.create_dependency(dep_condition='and', dep=deps)
 
         resources = self.get_resource('mos_grd_fcst')
-        task_name = f'{self.run}mos_grd_fcst'
+        task_name = f'{self.run}_mos_grd_fcst'
         task_dict = {'task_name': task_name,
                      'resources': resources,
                      'dependency': dependencies,
@@ -1986,15 +2030,15 @@ def mos_grd_fcst(self):
 
     def mos_ext_stn_fcst(self):
         deps = []
-        dep_dict = {'type': 'task', 'name': f'{self.run}mos_ext_stn_prep'}
+        dep_dict = {'type': 'task', 'name': f'{self.run}_mos_ext_stn_prep'}
         deps.append(rocoto.add_dependency(dep_dict))
         dependencies = rocoto.create_dependency(dep=deps)
-        dep_dict = {'type': 'task', 'name': f'{self.run}mos_stn_prdgen'}
+        dep_dict = {'type': 'task', 'name': f'{self.run}_mos_stn_prdgen'}
         deps.append(rocoto.add_dependency(dep_dict))
         dependencies = rocoto.create_dependency(dep_condition='and', dep=deps)
 
         resources = self.get_resource('mos_ext_stn_fcst')
-        task_name = f'{self.run}mos_ext_stn_fcst'
+        task_name = f'{self.run}_mos_ext_stn_fcst'
         task_dict = {'task_name': task_name,
                      'resources': resources,
                      'dependency': dependencies,
@@ -2012,18 +2056,18 @@ def mos_ext_stn_fcst(self):
 
     def mos_ext_grd_fcst(self):
         deps = []
-        dep_dict = {'type': 'task', 'name': f'{self.run}mos_ext_stn_prep'}
+        dep_dict = {'type': 'task', 'name': f'{self.run}_mos_ext_stn_prep'}
         deps.append(rocoto.add_dependency(dep_dict))
         dependencies = rocoto.create_dependency(dep=deps)
-        dep_dict = {'type': 'task', 'name': f'{self.run}mos_ext_grd_prep'}
+        dep_dict = {'type': 'task', 'name': f'{self.run}_mos_ext_grd_prep'}
         deps.append(rocoto.add_dependency(dep_dict))
         dependencies = rocoto.create_dependency(dep=deps)
-        dep_dict = {'type': 'task', 'name': f'{self.run}mos_grd_fcst'}
+        dep_dict = {'type': 'task', 'name': f'{self.run}_mos_grd_fcst'}
         deps.append(rocoto.add_dependency(dep_dict))
         dependencies = rocoto.create_dependency(dep_condition='and', dep=deps)
 
         resources = self.get_resource('mos_ext_grd_fcst')
-        task_name = f'{self.run}mos_ext_grd_fcst'
+        task_name = f'{self.run}_mos_ext_grd_fcst'
         task_dict = {'task_name': task_name,
                      'resources': resources,
                      'dependency': dependencies,
@@ -2041,12 +2085,12 @@ def mos_ext_grd_fcst(self):
 
     def mos_stn_prdgen(self):
         deps = []
-        dep_dict = {'type': 'task', 'name': f'{self.run}mos_stn_fcst'}
+        dep_dict = {'type': 'task', 'name': f'{self.run}_mos_stn_fcst'}
         deps.append(rocoto.add_dependency(dep_dict))
         dependencies = rocoto.create_dependency(dep=deps)
 
         resources = self.get_resource('mos_stn_prdgen')
-        task_name = f'{self.run}mos_stn_prdgen'
+        task_name = f'{self.run}_mos_stn_prdgen'
         task_dict = {'task_name': task_name,
                      'resources': resources,
                      'dependency': dependencies,
@@ -2064,15 +2108,15 @@ def mos_stn_prdgen(self):
 
     def mos_grd_prdgen(self):
         deps = []
-        dep_dict = {'type': 'task', 'name': f'{self.run}mos_grd_fcst'}
+        dep_dict = {'type': 'task', 'name': f'{self.run}_mos_grd_fcst'}
         deps.append(rocoto.add_dependency(dep_dict))
         dependencies = rocoto.create_dependency(dep=deps)
-        dep_dict = {'type': 'task', 'name': f'{self.run}mos_stn_prdgen'}
+        dep_dict = {'type': 'task', 'name': f'{self.run}_mos_stn_prdgen'}
         deps.append(rocoto.add_dependency(dep_dict))
         dependencies = rocoto.create_dependency(dep_condition='and', dep=deps)
 
         resources = self.get_resource('mos_grd_prdgen')
-        task_name = f'{self.run}mos_grd_prdgen'
+        task_name = f'{self.run}_mos_grd_prdgen'
         task_dict = {'task_name': task_name,
                      'resources': resources,
                      'dependency': dependencies,
@@ -2090,15 +2134,15 @@ def mos_grd_prdgen(self):
 
     def mos_ext_stn_prdgen(self):
         deps = []
-        dep_dict = {'type': 'task', 'name': f'{self.run}mos_ext_stn_fcst'}
+        dep_dict = {'type': 'task', 'name': f'{self.run}_mos_ext_stn_fcst'}
         deps.append(rocoto.add_dependency(dep_dict))
         dependencies = rocoto.create_dependency(dep=deps)
-        dep_dict = {'type': 'task', 'name': f'{self.run}mos_stn_prdgen'}
+        dep_dict = {'type': 'task', 'name': f'{self.run}_mos_stn_prdgen'}
         deps.append(rocoto.add_dependency(dep_dict))
         dependencies = rocoto.create_dependency(dep_condition='and', dep=deps)
 
         resources = self.get_resource('mos_ext_stn_prdgen')
-        task_name = f'{self.run}mos_ext_stn_prdgen'
+        task_name = f'{self.run}_mos_ext_stn_prdgen'
         task_dict = {'task_name': task_name,
                      'resources': resources,
                      'dependency': dependencies,
@@ -2116,18 +2160,18 @@ def mos_ext_stn_prdgen(self):
 
     def mos_ext_grd_prdgen(self):
         deps = []
-        dep_dict = {'type': 'task', 'name': f'{self.run}mos_ext_grd_fcst'}
+        dep_dict = {'type': 'task', 'name': f'{self.run}_mos_ext_grd_fcst'}
         deps.append(rocoto.add_dependency(dep_dict))
         dependencies = rocoto.create_dependency(dep=deps)
-        dep_dict = {'type': 'task', 'name': f'{self.run}mos_grd_prdgen'}
+        dep_dict = {'type': 'task', 'name': f'{self.run}_mos_grd_prdgen'}
         deps.append(rocoto.add_dependency(dep_dict))
         dependencies = rocoto.create_dependency(dep=deps)
-        dep_dict = {'type': 'task', 'name': f'{self.run}mos_ext_stn_prdgen'}
+        dep_dict = {'type': 'task', 'name': f'{self.run}_mos_ext_stn_prdgen'}
         deps.append(rocoto.add_dependency(dep_dict))
         dependencies = rocoto.create_dependency(dep_condition='and', dep=deps)
 
         resources = self.get_resource('mos_ext_grd_prdgen')
-        task_name = f'{self.run}mos_ext_grd_prdgen'
+        task_name = f'{self.run}_mos_ext_grd_prdgen'
         task_dict = {'task_name': task_name,
                      'resources': resources,
                      'dependency': dependencies,
@@ -2145,12 +2189,12 @@ def mos_ext_grd_prdgen(self):
 
     def mos_wx_prdgen(self):
         deps = []
-        dep_dict = {'type': 'task', 'name': f'{self.run}mos_grd_prdgen'}
+        dep_dict = {'type': 'task', 'name': f'{self.run}_mos_grd_prdgen'}
         deps.append(rocoto.add_dependency(dep_dict))
         dependencies = rocoto.create_dependency(dep=deps)
 
         resources = self.get_resource('mos_wx_prdgen')
-        task_name = f'{self.run}mos_wx_prdgen'
+        task_name = f'{self.run}_mos_wx_prdgen'
         task_dict = {'task_name': task_name,
                      'resources': resources,
                      'dependency': dependencies,
@@ -2168,15 +2212,15 @@ def mos_wx_prdgen(self):
 
     def mos_wx_ext_prdgen(self):
         deps = []
-        dep_dict = {'type': 'task', 'name': f'{self.run}mos_ext_grd_prdgen'}
+        dep_dict = {'type': 'task', 'name': f'{self.run}_mos_ext_grd_prdgen'}
         deps.append(rocoto.add_dependency(dep_dict))
         dependencies = rocoto.create_dependency(dep=deps)
-        dep_dict = {'type': 'task', 'name': f'{self.run}mos_wx_prdgen'}
+        dep_dict = {'type': 'task', 'name': f'{self.run}_mos_wx_prdgen'}
         deps.append(rocoto.add_dependency(dep_dict))
         dependencies = rocoto.create_dependency(dep_condition='and', dep=deps)
 
         resources = self.get_resource('mos_wx_ext_prdgen')
-        task_name = f'{self.run}mos_wx_ext_prdgen'
+        task_name = f'{self.run}_mos_wx_ext_prdgen'
         task_dict = {'task_name': task_name,
                      'resources': resources,
                      'dependency': dependencies,
@@ -2196,53 +2240,53 @@ def arch(self):
         deps = []
         if self.app_config.mode in ['cycled']:
             if self.run in ['gfs']:
-                dep_dict = {'type': 'task', 'name': f'{self.run}atmanlprod'}
+                dep_dict = {'type': 'task', 'name': f'{self.run}_atmanlprod'}
                 deps.append(rocoto.add_dependency(dep_dict))
                 if self.app_config.do_vminmon:
-                    dep_dict = {'type': 'task', 'name': f'{self.run}vminmon'}
+                    dep_dict = {'type': 'task', 'name': f'{self.run}_vminmon'}
                     deps.append(rocoto.add_dependency(dep_dict))
             elif self.run in ['gdas']:
-                dep_dict = {'type': 'task', 'name': f'{self.run}atmanlprod'}
+                dep_dict = {'type': 'task', 'name': f'{self.run}_atmanlprod'}
                 deps.append(rocoto.add_dependency(dep_dict))
                 if self.app_config.do_fit2obs:
-                    dep_dict = {'type': 'task', 'name': f'{self.run}fit2obs'}
+                    dep_dict = {'type': 'task', 'name': f'{self.run}_fit2obs'}
                     deps.append(rocoto.add_dependency(dep_dict))
                 if self.app_config.do_verfozn:
-                    dep_dict = {'type': 'task', 'name': f'{self.run}verfozn'}
+                    dep_dict = {'type': 'task', 'name': f'{self.run}_verfozn'}
                     deps.append(rocoto.add_dependency(dep_dict))
                 if self.app_config.do_verfrad:
-                    dep_dict = {'type': 'task', 'name': f'{self.run}verfrad'}
+                    dep_dict = {'type': 'task', 'name': f'{self.run}_verfrad'}
                     deps.append(rocoto.add_dependency(dep_dict))
                 if self.app_config.do_vminmon:
-                    dep_dict = {'type': 'task', 'name': f'{self.run}vminmon'}
+                    dep_dict = {'type': 'task', 'name': f'{self.run}_vminmon'}
                     deps.append(rocoto.add_dependency(dep_dict))
         if self.run in ['gfs'] and self.app_config.do_tracker:
-            dep_dict = {'type': 'task', 'name': f'{self.run}tracker'}
+            dep_dict = {'type': 'task', 'name': f'{self.run}_tracker'}
             deps.append(rocoto.add_dependency(dep_dict))
         if self.run in ['gfs'] and self.app_config.do_genesis:
-            dep_dict = {'type': 'task', 'name': f'{self.run}genesis'}
+            dep_dict = {'type': 'task', 'name': f'{self.run}_genesis'}
             deps.append(rocoto.add_dependency(dep_dict))
         if self.run in ['gfs'] and self.app_config.do_genesis_fsu:
-            dep_dict = {'type': 'task', 'name': f'{self.run}genesis_fsu'}
+            dep_dict = {'type': 'task', 'name': f'{self.run}_genesis_fsu'}
             deps.append(rocoto.add_dependency(dep_dict))
         # Post job dependencies
-        dep_dict = {'type': 'metatask', 'name': f'{self.run}atmos_prod'}
+        dep_dict = {'type': 'metatask', 'name': f'{self.run}_atmos_prod'}
         deps.append(rocoto.add_dependency(dep_dict))
         if self.app_config.do_wave:
-            dep_dict = {'type': 'task', 'name': f'{self.run}wavepostsbs'}
+            dep_dict = {'type': 'task', 'name': f'{self.run}_wavepostsbs'}
             deps.append(rocoto.add_dependency(dep_dict))
-            dep_dict = {'type': 'task', 'name': f'{self.run}wavepostpnt'}
+            dep_dict = {'type': 'task', 'name': f'{self.run}_wavepostpnt'}
             deps.append(rocoto.add_dependency(dep_dict))
             if self.app_config.do_wave_bnd:
-                dep_dict = {'type': 'task', 'name': f'{self.run}wavepostbndpnt'}
+                dep_dict = {'type': 'task', 'name': f'{self.run}_wavepostbndpnt'}
                 deps.append(rocoto.add_dependency(dep_dict))
         if self.app_config.do_ocean:
             if self.run in ['gfs']:
-                dep_dict = {'type': 'metatask', 'name': f'{self.run}ocean_prod'}
+                dep_dict = {'type': 'metatask', 'name': f'{self.run}_ocean_prod'}
                 deps.append(rocoto.add_dependency(dep_dict))
         if self.app_config.do_ice:
             if self.run in ['gfs']:
-                dep_dict = {'type': 'metatask', 'name': f'{self.run}ice_prod'}
+                dep_dict = {'type': 'metatask', 'name': f'{self.run}_ice_prod'}
                 deps.append(rocoto.add_dependency(dep_dict))
         # MOS job dependencies
         if self.run in ['gfs'] and self.app_config.do_mos:
@@ -2251,13 +2295,13 @@ def arch(self):
                         "stn_prdgen", "grd_prdgen", "ext_stn_prdgen", "ext_grd_prdgen",
                         "wx_prdgen", "wx_ext_prdgen"]
             for job in mos_jobs:
-                dep_dict = {'type': 'task', 'name': f'{self.run}mos_{job}'}
+                dep_dict = {'type': 'task', 'name': f'{self.run}_mos_{job}'}
                 deps.append(rocoto.add_dependency(dep_dict))
 
         dependencies = rocoto.create_dependency(dep_condition='and', dep=deps)
 
         resources = self.get_resource('arch')
-        task_name = f'{self.run}arch'
+        task_name = f'{self.run}_arch'
         task_dict = {'task_name': task_name,
                      'resources': resources,
                      'dependency': dependencies,
@@ -2277,31 +2321,40 @@ def arch(self):
     def cleanup(self):
         deps = []
         if 'enkf' in self.run:
-            dep_dict = {'type': 'metatask', 'name': f'{self.run}eamn'}
+            dep_dict = {'type': 'metatask', 'name': f'{self.run}_eamn'}
             deps.append(rocoto.add_dependency(dep_dict))
         else:
-            dep_dict = {'type': 'task', 'name': f'{self.run}arch'}
+            dep_dict = {'type': 'task', 'name': f'{self.run}_arch'}
             deps.append(rocoto.add_dependency(dep_dict))
 
         if self.app_config.do_gempak:
             if self.run in ['gdas']:
-                dep_dict = {'type': 'task', 'name': f'{self.run}gempakmetancdc'}
+                dep_dict = {'type': 'task', 'name': f'{self.run}_gempakmetancdc'}
                 deps.append(rocoto.add_dependency(dep_dict))
             elif self.run in ['gfs']:
-                dep_dict = {'type': 'task', 'name': f'{self.run}gempakmeta'}
+                dep_dict = {'type': 'task', 'name': f'{self.run}_gempakmeta'}
                 deps.append(rocoto.add_dependency(dep_dict))
-                dep_dict = {'type': 'task', 'name': f'{self.run}gempakncdcupapgif'}
+                dep_dict = {'type': 'task', 'name': f'{self.run}_gempakncdcupapgif'}
                 deps.append(rocoto.add_dependency(dep_dict))
                 if self.app_config.do_goes:
-                    dep_dict = {'type': 'metatask', 'name': f'{self.run}gempakgrb2spec'}
+                    dep_dict = {'type': 'metatask', 'name': f'{self.run}_gempakgrb2spec'}
                     deps.append(rocoto.add_dependency(dep_dict))
-                    dep_dict = {'type': 'task', 'name': f'{self.run}npoess_pgrb2_0p5deg'}
+                    dep_dict = {'type': 'task', 'name': f'{self.run}_npoess_pgrb2_0p5deg'}
                     deps.append(rocoto.add_dependency(dep_dict))
 
+        if self.app_config.do_metp and self.run in ['gfs']:
+            deps2 = []
+            # taskvalid only handles regular tasks, so just check the first metp job exists
+            dep_dict = {'type': 'taskvalid', 'name': f'{self.run}_metpg2g1', 'condition': 'not'}
+            deps2.append(rocoto.add_dependency(dep_dict))
+            dep_dict = {'type': 'metatask', 'name': f'{self.run}_metp'}
+            deps2.append(rocoto.add_dependency(dep_dict))
+            deps.append(rocoto.create_dependency(dep_condition='or', dep=deps2))
+
         dependencies = rocoto.create_dependency(dep_condition='and', dep=deps)
 
         resources = self.get_resource('cleanup')
-        task_name = f'{self.run}cleanup'
+        task_name = f'{self.run}_cleanup'
         task_dict = {'task_name': task_name,
                      'resources': resources,
                      'dependency': dependencies,
@@ -2320,14 +2373,14 @@ def cleanup(self):
     # Start of ensemble tasks
     def eobs(self):
         deps = []
-        dep_dict = {'type': 'task', 'name': f'{self.run.replace("enkf","")}prep'}
+        dep_dict = {'type': 'task', 'name': f'{self.run.replace("enkf","")}_prep'}
         deps.append(rocoto.add_dependency(dep_dict))
-        dep_dict = {'type': 'metatask', 'name': 'enkfgdasepmn', 'offset': f"-{timedelta_to_HMS(self._base['cycle_interval'])}"}
+        dep_dict = {'type': 'metatask', 'name': 'enkfgdas_epmn', 'offset': f"-{timedelta_to_HMS(self._base['interval_gdas'])}"}
         deps.append(rocoto.add_dependency(dep_dict))
         dependencies = rocoto.create_dependency(dep_condition='and', dep=deps)
 
         resources = self.get_resource('eobs')
-        task_name = f'{self.run}eobs'
+        task_name = f'{self.run}_eobs'
         task_dict = {'task_name': task_name,
                      'resources': resources,
                      'dependency': dependencies,
@@ -2345,7 +2398,7 @@ def eobs(self):
 
     def eomg(self):
         deps = []
-        dep_dict = {'type': 'task', 'name': f'{self.run}eobs'}
+        dep_dict = {'type': 'task', 'name': f'{self.run}_eobs'}
         deps.append(rocoto.add_dependency(dep_dict))
         dependencies = rocoto.create_dependency(dep=deps)
 
@@ -2357,7 +2410,7 @@ def eomg(self):
             eomgenvars.append(rocoto.create_envar(name=key, value=str(value)))
 
         resources = self.get_resource('eomg')
-        task_name = f'{self.run}eomg_mem#member#'
+        task_name = f'{self.run}_eomg_mem#member#'
         task_dict = {'task_name': task_name,
                      'resources': resources,
                      'dependency': dependencies,
@@ -2370,7 +2423,7 @@ def eomg(self):
                      }
 
         member_var_dict = {'member': ' '.join([str(mem).zfill(3) for mem in range(1, self.nmem + 1)])}
-        metatask_dict = {'task_name': f'{self.run}eomg',
+        metatask_dict = {'task_name': f'{self.run}_eomg',
                          'var_dict': member_var_dict,
                          'task_dict': task_dict,
                          }
@@ -2381,12 +2434,12 @@ def eomg(self):
 
     def ediag(self):
         deps = []
-        dep_dict = {'type': 'task', 'name': f'{self.run}eobs'}
+        dep_dict = {'type': 'task', 'name': f'{self.run}_eobs'}
         deps.append(rocoto.add_dependency(dep_dict))
         dependencies = rocoto.create_dependency(dep=deps)
 
         resources = self.get_resource('ediag')
-        task_name = f'{self.run}ediag'
+        task_name = f'{self.run}_ediag'
         task_dict = {'task_name': task_name,
                      'resources': resources,
                      'dependency': dependencies,
@@ -2405,14 +2458,14 @@ def ediag(self):
     def eupd(self):
         deps = []
         if self.app_config.lobsdiag_forenkf:
-            dep_dict = {'type': 'task', 'name': f'{self.run}ediag'}
+            dep_dict = {'type': 'task', 'name': f'{self.run}_ediag'}
         else:
-            dep_dict = {'type': 'metatask', 'name': f'{self.run}eomg'}
+            dep_dict = {'type': 'metatask', 'name': f'{self.run}_eomg'}
         deps.append(rocoto.add_dependency(dep_dict))
         dependencies = rocoto.create_dependency(dep=deps)
 
         resources = self.get_resource('eupd')
-        task_name = f'{self.run}eupd'
+        task_name = f'{self.run}_eupd'
         task_dict = {'task_name': task_name,
                      'resources': resources,
                      'dependency': dependencies,
@@ -2430,15 +2483,15 @@ def eupd(self):
 
     def atmensanlinit(self):
         deps = []
-        dep_dict = {'type': 'task', 'name': f'{self.run.replace("enkf","")}prepatmiodaobs'}
+        dep_dict = {'type': 'task', 'name': f'{self.run.replace("enkf","")}_prepatmiodaobs'}
         deps.append(rocoto.add_dependency(dep_dict))
-        dep_dict = {'type': 'metatask', 'name': 'enkfgdasepmn', 'offset': f"-{timedelta_to_HMS(self._base['cycle_interval'])}"}
+        dep_dict = {'type': 'metatask', 'name': 'enkfgdas_epmn', 'offset': f"-{timedelta_to_HMS(self._base['interval_gdas'])}"}
         deps.append(rocoto.add_dependency(dep_dict))
         dependencies = rocoto.create_dependency(dep_condition='and', dep=deps)
 
         cycledef = "gdas"
         resources = self.get_resource('atmensanlinit')
-        task_name = f'{self.run}atmensanlinit'
+        task_name = f'{self.run}_atmensanlinit'
         task_dict = {'task_name': task_name,
                      'resources': resources,
                      'dependency': dependencies,
@@ -2457,14 +2510,14 @@ def atmensanlinit(self):
     def atmensanlobs(self):
 
         deps = []
-        dep_dict = {'type': 'task', 'name': f'{self.run}atmensanlinit'}
+        dep_dict = {'type': 'task', 'name': f'{self.run}_atmensanlinit'}
         deps.append(rocoto.add_dependency(dep_dict))
-        dep_dict = {'type': 'metatask', 'name': 'enkfgdasepmn', 'offset': f"-{timedelta_to_HMS(self._base['cycle_interval'])}"}
+        dep_dict = {'type': 'metatask', 'name': 'enkfgdas_epmn', 'offset': f"-{timedelta_to_HMS(self._base['interval_gdas'])}"}
         deps.append(rocoto.add_dependency(dep_dict))
         dependencies = rocoto.create_dependency(dep_condition='and', dep=deps)
 
         resources = self.get_resource('atmensanlobs')
-        task_name = f'{self.run}atmensanlobs'
+        task_name = f'{self.run}_atmensanlobs'
         task_dict = {'task_name': task_name,
                      'resources': resources,
                      'dependency': dependencies,
@@ -2483,14 +2536,14 @@ def atmensanlobs(self):
     def atmensanlsol(self):
 
         deps = []
-        dep_dict = {'type': 'task', 'name': f'{self.run}atmensanlobs'}
+        dep_dict = {'type': 'task', 'name': f'{self.run}_atmensanlobs'}
         deps.append(rocoto.add_dependency(dep_dict))
-        dep_dict = {'type': 'metatask', 'name': 'enkfgdasepmn', 'offset': f"-{timedelta_to_HMS(self._base['cycle_interval'])}"}
+        dep_dict = {'type': 'metatask', 'name': 'enkfgdas_epmn', 'offset': f"-{timedelta_to_HMS(self._base['interval_gdas'])}"}
         deps.append(rocoto.add_dependency(dep_dict))
         dependencies = rocoto.create_dependency(dep_condition='and', dep=deps)
 
         resources = self.get_resource('atmensanlsol')
-        task_name = f'{self.run}atmensanlsol'
+        task_name = f'{self.run}_atmensanlsol'
         task_dict = {'task_name': task_name,
                      'resources': resources,
                      'dependency': dependencies,
@@ -2509,14 +2562,14 @@ def atmensanlsol(self):
     def atmensanlletkf(self):
 
         deps = []
-        dep_dict = {'type': 'task', 'name': f'{self.run}atmensanlinit'}
+        dep_dict = {'type': 'task', 'name': f'{self.run}_atmensanlinit'}
         deps.append(rocoto.add_dependency(dep_dict))
-        dep_dict = {'type': 'metatask', 'name': 'enkfgdasepmn', 'offset': f"-{timedelta_to_HMS(self._base['cycle_interval'])}"}
+        dep_dict = {'type': 'metatask', 'name': 'enkfgdas_epmn', 'offset': f"-{timedelta_to_HMS(self._base['interval_gdas'])}"}
         deps.append(rocoto.add_dependency(dep_dict))
         dependencies = rocoto.create_dependency(dep_condition='and', dep=deps)
 
         resources = self.get_resource('atmensanlletkf')
-        task_name = f'{self.run}atmensanlletkf'
+        task_name = f'{self.run}_atmensanlletkf'
         task_dict = {'task_name': task_name,
                      'resources': resources,
                      'dependency': dependencies,
@@ -2536,16 +2589,16 @@ def atmensanlfv3inc(self):
 
         deps = []
         if self.app_config.lobsdiag_forenkf:
-            dep_dict = {'type': 'task', 'name': f'{self.run}atmensanlsol'}
+            dep_dict = {'type': 'task', 'name': f'{self.run}_atmensanlsol'}
         else:
-            dep_dict = {'type': 'task', 'name': f'{self.run}atmensanlletkf'}
+            dep_dict = {'type': 'task', 'name': f'{self.run}_atmensanlletkf'}
         deps.append(rocoto.add_dependency(dep_dict))
-        dep_dict = {'type': 'metatask', 'name': 'enkfgdasepmn', 'offset': f"-{timedelta_to_HMS(self._base['cycle_interval'])}"}
+        dep_dict = {'type': 'metatask', 'name': 'enkfgdas_epmn', 'offset': f"-{timedelta_to_HMS(self._base['interval_gdas'])}"}
         deps.append(rocoto.add_dependency(dep_dict))
         dependencies = rocoto.create_dependency(dep_condition='and', dep=deps)
 
         resources = self.get_resource('atmensanlfv3inc')
-        task_name = f'{self.run}atmensanlfv3inc'
+        task_name = f'{self.run}_atmensanlfv3inc'
         task_dict = {'task_name': task_name,
                      'resources': resources,
                      'dependency': dependencies,
@@ -2564,12 +2617,12 @@ def atmensanlfv3inc(self):
     def atmensanlfinal(self):
 
         deps = []
-        dep_dict = {'type': 'task', 'name': f'{self.run}atmensanlfv3inc'}
+        dep_dict = {'type': 'task', 'name': f'{self.run}_atmensanlfv3inc'}
         deps.append(rocoto.add_dependency(dep_dict))
         dependencies = rocoto.create_dependency(dep=deps)
 
         resources = self.get_resource('atmensanlfinal')
-        task_name = f'{self.run}atmensanlfinal'
+        task_name = f'{self.run}_atmensanlfinal'
         task_dict = {'task_name': task_name,
                      'resources': resources,
                      'dependency': dependencies,
@@ -2611,12 +2664,12 @@ def _get_ecengroups():
             return grp, dep, lst
 
         deps = []
-        dep_dict = {'type': 'task', 'name': f'{self.run.replace("enkf","")}analcalc'}
+        dep_dict = {'type': 'task', 'name': f'{self.run.replace("enkf","")}_analcalc'}
         deps.append(rocoto.add_dependency(dep_dict))
         if self.app_config.do_jediatmens:
-            dep_dict = {'type': 'task', 'name': f'{self.run}atmensanlfinal'}
+            dep_dict = {'type': 'task', 'name': f'{self.run}_atmensanlfinal'}
         else:
-            dep_dict = {'type': 'task', 'name': f'{self.run}eupd'}
+            dep_dict = {'type': 'task', 'name': f'{self.run}_eupd'}
         deps.append(rocoto.add_dependency(dep_dict))
         dependencies = rocoto.create_dependency(dep_condition='and', dep=deps)
 
@@ -2632,7 +2685,7 @@ def _get_ecengroups():
 
         resources = self.get_resource('ecen')
 
-        task_name = f'{self.run}ecen#{varname1}#'
+        task_name = f'{self.run}_ecen#{varname1}#'
         task_dict = {'task_name': task_name,
                      'resources': resources,
                      'dependency': dependencies,
@@ -2644,7 +2697,7 @@ def _get_ecengroups():
                      'maxtries': '&MAXTRIES;'
                      }
 
-        metatask_dict = {'task_name': f'{self.run}ecmn',
+        metatask_dict = {'task_name': f'{self.run}_ecmn',
                          'var_dict': var_dict,
                          'task_dict': task_dict
                          }
@@ -2657,20 +2710,20 @@ def esfc(self):
         # eupd_run = 'gdas' if 'gdas' in self.app_config.eupd_runs else 'gfs'
 
         deps = []
-        dep_dict = {'type': 'task', 'name': f'{self.run.replace("enkf","")}analcalc'}
+        dep_dict = {'type': 'task', 'name': f'{self.run.replace("enkf","")}_analcalc'}
         deps.append(rocoto.add_dependency(dep_dict))
         if self.app_config.do_jediatmens:
-            dep_dict = {'type': 'task', 'name': f'{self.run}atmensanlfinal'}
+            dep_dict = {'type': 'task', 'name': f'{self.run}_atmensanlfinal'}
         else:
-            dep_dict = {'type': 'task', 'name': f'{self.run}eupd'}
+            dep_dict = {'type': 'task', 'name': f'{self.run}_eupd'}
         deps.append(rocoto.add_dependency(dep_dict))
         if self.app_config.do_jedisnowda:
-            dep_dict = {'type': 'task', 'name': f'{self.run}esnowrecen'}
+            dep_dict = {'type': 'task', 'name': f'{self.run}_esnowrecen'}
             deps.append(rocoto.add_dependency(dep_dict))
         dependencies = rocoto.create_dependency(dep_condition='and', dep=deps)
 
         resources = self.get_resource('esfc')
-        task_name = f'{self.run}esfc'
+        task_name = f'{self.run}_esfc'
         task_dict = {'task_name': task_name,
                      'resources': resources,
                      'dependency': dependencies,
@@ -2689,12 +2742,12 @@ def esfc(self):
     def efcs(self):
 
         deps = []
-        dep_dict = {'type': 'metatask', 'name': f'{self.run}ecmn'}
+        dep_dict = {'type': 'metatask', 'name': f'{self.run}_ecmn'}
         deps.append(rocoto.add_dependency(dep_dict))
-        dep_dict = {'type': 'task', 'name': f'{self.run}esfc'}
+        dep_dict = {'type': 'task', 'name': f'{self.run}_esfc'}
         deps.append(rocoto.add_dependency(dep_dict))
         dependencies = rocoto.create_dependency(dep_condition='and', dep=deps)
-        dep_dict = {'type': 'task', 'name': f'{self.run}stage_ic'}
+        dep_dict = {'type': 'task', 'name': f'{self.run}_stage_ic'}
         dependencies.append(rocoto.add_dependency(dep_dict))
         dependencies = rocoto.create_dependency(dep_condition='or', dep=dependencies)
 
@@ -2708,7 +2761,7 @@ def efcs(self):
         cycledef = 'gdas_half,gdas' if self.run in ['enkfgdas'] else self.run.replace('enkf', '')
         resources = self.get_resource('efcs')
 
-        task_name = f'{self.run}fcst_mem#member#'
+        task_name = f'{self.run}_fcst_mem#member#'
         task_dict = {'task_name': task_name,
                      'resources': resources,
                      'dependency': dependencies,
@@ -2721,7 +2774,7 @@ def efcs(self):
                      }
 
         member_var_dict = {'member': ' '.join([str(mem).zfill(3) for mem in range(1, self.nmem + 1)])}
-        metatask_dict = {'task_name': f'{self.run}fcst',
+        metatask_dict = {'task_name': f'{self.run}_fcst',
                          'var_dict': member_var_dict,
                          'task_dict': task_dict
                          }
@@ -2735,16 +2788,16 @@ def echgres(self):
         self._is_this_a_gdas_task(self.run, 'echgres')
 
         deps = []
-        dep_dict = {'type': 'metatask', 'name': f'{self.run.replace("enkf","")}fcst'}
+        dep_dict = {'type': 'metatask', 'name': f'{self.run.replace("enkf","")}_fcst'}
         deps.append(rocoto.add_dependency(dep_dict))
-        dep_dict = {'type': 'task', 'name': f'{self.run}fcst_mem001'}
+        dep_dict = {'type': 'task', 'name': f'{self.run}_fcst_mem001'}
         deps.append(rocoto.add_dependency(dep_dict))
         dependencies = rocoto.create_dependency(dep_condition='and', dep=deps)
 
         cycledef = 'gdas_half,gdas' if self.run in ['enkfgdas'] else self.run
 
         resources = self.get_resource('echgres')
-        task_name = f'{self.run}echgres'
+        task_name = f'{self.run}_echgres'
         task_dict = {'task_name': task_name,
                      'resources': resources,
                      'dependency': dependencies,
@@ -2785,7 +2838,7 @@ def _get_eposgroups(epos):
             return grp, dep, lst
 
         deps = []
-        dep_dict = {'type': 'metatask', 'name': f'{self.run}fcst'}
+        dep_dict = {'type': 'metatask', 'name': f'{self.run}_fcst'}
         deps.append(rocoto.add_dependency(dep_dict))
         dependencies = rocoto.create_dependency(dep=deps)
 
@@ -2803,7 +2856,7 @@ def _get_eposgroups(epos):
 
         resources = self.get_resource('epos')
 
-        task_name = f'{self.run}epos#{varname1}#'
+        task_name = f'{self.run}_epos#{varname1}#'
         task_dict = {'task_name': task_name,
                      'resources': resources,
                      'dependency': dependencies,
@@ -2815,7 +2868,7 @@ def _get_eposgroups(epos):
                      'maxtries': '&MAXTRIES;'
                      }
 
-        metatask_dict = {'task_name': f'{self.run}epmn',
+        metatask_dict = {'task_name': f'{self.run}_epmn',
                          'var_dict': var_dict,
                          'task_dict': task_dict
                          }
@@ -2827,7 +2880,7 @@ def _get_eposgroups(epos):
     def earc(self):
 
         deps = []
-        dep_dict = {'type': 'metatask', 'name': f'{self.run}epmn'}
+        dep_dict = {'type': 'metatask', 'name': f'{self.run}_epmn'}
         deps.append(rocoto.add_dependency(dep_dict))
         dependencies = rocoto.create_dependency(dep=deps)
 
@@ -2842,7 +2895,7 @@ def earc(self):
 
         var_dict = {'grp': groups}
 
-        task_name = f'{self.run}earc#grp#'
+        task_name = f'{self.run}_earc#grp#'
         task_dict = {'task_name': task_name,
                      'resources': resources,
                      'dependency': dependencies,
@@ -2854,7 +2907,7 @@ def earc(self):
                      'maxtries': '&MAXTRIES;'
                      }
 
-        metatask_dict = {'task_name': f'{self.run}eamn',
+        metatask_dict = {'task_name': f'{self.run}_eamn',
                          'var_dict': var_dict,
                          'task_dict': task_dict
                          }
diff --git a/workflow/rocoto/rocoto.py b/workflow/rocoto/rocoto.py
index 2a20820da8..7bacf99829 100644
--- a/workflow/rocoto/rocoto.py
+++ b/workflow/rocoto/rocoto.py
@@ -183,6 +183,7 @@ def add_dependency(dep_dict: Dict[str, Any]) -> str:
                'metatask': _add_task_tag,
                'data': _add_data_tag,
                'cycleexist': _add_cycle_tag,
+               'taskvalid': _add_taskvalid_tag,
                'streq': _add_streq_tag,
                'strneq': _add_streq_tag,
                'sh': _add_sh_tag}
@@ -296,6 +297,27 @@ def _add_cycle_tag(dep_dict: Dict[str, Any]) -> str:
     return string
 
 
+def _add_taskvalid_tag(dep_dict: Dict[str, Any]) -> str:
+    """
+    create a validtask tag
+    :param dep_dict: dependency key-value parameters
+    :type dep_dict: dict
+    :return: Rocoto validtask dependency
+    :rtype: str
+    """
+
+    dep_type = dep_dict.get('type', None)
+    dep_name = dep_dict.get('name', None)
+
+    if dep_name is None:
+        msg = f'a {dep_type} name is necessary for {dep_type} dependency'
+        raise KeyError(msg)
+
+    string = f'<{dep_type} task="{dep_name}"/>'
+
+    return string
+
+
 def _add_streq_tag(dep_dict: Dict[str, Any]) -> str:
     """
     create a simple string comparison tag
diff --git a/workflow/rocoto/tasks.py b/workflow/rocoto/tasks.py
index d943cd130c..1dfc443187 100644
--- a/workflow/rocoto/tasks.py
+++ b/workflow/rocoto/tasks.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env python3
 
-import copy
 import numpy as np
 from applications.applications import AppConfig
 import rocoto.rocoto as rocoto
@@ -11,16 +10,16 @@
 
 
 class Tasks:
-    SERVICE_TASKS = ['arch', 'earc']
-    VALID_TASKS = ['aerosol_init', 'stage_ic',
+    SERVICE_TASKS = ['stage_ic', 'arch', 'earc']
+    VALID_TASKS = ['aerosol_init',
                    'prep', 'anal', 'sfcanl', 'analcalc', 'analdiag', 'arch', "cleanup",
                    'prepatmiodaobs', 'atmanlinit', 'atmanlvar', 'atmanlfv3inc', 'atmanlfinal',
                    'prepoceanobs',
-                   'ocnanalprep', 'marinebmat', 'ocnanalrun', 'ocnanalecen', 'ocnanalchkpt', 'ocnanalpost', 'ocnanalvrfy',
+                   'marineanlinit', 'marinebmat', 'marineanlvar', 'ocnanalecen', 'marineanlchkpt', 'marineanlfinal', 'ocnanalvrfy',
                    'earc', 'ecen', 'echgres', 'ediag', 'efcs',
                    'eobs', 'eomg', 'epos', 'esfc', 'eupd',
                    'atmensanlinit', 'atmensanlobs', 'atmensanlsol', 'atmensanlletkf', 'atmensanlfv3inc', 'atmensanlfinal',
-                   'aeroanlinit', 'aeroanlrun', 'aeroanlfinal',
+                   'aeroanlinit', 'aeroanlvar', 'aeroanlfinal', 'aeroanlgenb',
                    'prepsnowobs', 'snowanl', 'esnowrecen',
                    'fcst',
                    'atmanlupp', 'atmanlprod', 'atmupp', 'goesupp',
@@ -39,15 +38,16 @@ class Tasks:
 
     def __init__(self, app_config: AppConfig, run: str) -> None:
 
-        self.app_config = copy.deepcopy(app_config)
+        self.app_config = app_config
         self.run = run
-        # Re-source the configs with RUN specified
-        print(f"Source configs with RUN={run}")
-        self._configs = self.app_config.source_configs(run=run, log=False)
+
+        # Get the configs for the specified RUN
+        self._configs = self.app_config.configs[run]
 
         # Update the base config for the application
-        self._configs['base'] = self.app_config.update_base(self._configs['base'])
-        # Save dict_configs and base in the internal state (never know where it may be needed)
+        self._configs['base'] = self.app_config._update_base(self._configs['base'])
+
+        # Save base in the internal state (never know where it may be needed)
         self._base = self._configs['base']
 
         self.HOMEgfs = self._base['HOMEgfs']
@@ -57,7 +57,8 @@ def __init__(self, app_config: AppConfig, run: str) -> None:
             self.nmem = int(self._base['NMEM_ENS_GFS'])
         else:
             self.nmem = int(self._base['NMEM_ENS'])
-        self._base['cycle_interval'] = to_timedelta(f'{self._base["assim_freq"]}H')
+        self._base['interval_gdas'] = to_timedelta(f'{self._base["assim_freq"]}H')
+        self._base['interval_gfs'] = to_timedelta(f'{self._base["INTERVAL_GFS"]}H')
 
         self.n_tiles = 6  # TODO - this needs to be elsewhere
 
@@ -134,7 +135,6 @@ def _template_to_rocoto_cycstring(self, template: str, subs_dict: dict = {}) ->
     def _get_forecast_hours(run, config, component='atmos') -> List[str]:
         # Make a local copy of the config to avoid modifying the original
         local_config = config.copy()
-
         # Ocean/Ice components do not have a HF output option like the atmosphere
         if component in ['ocean', 'ice']:
             local_config['FHMAX_HF_GFS'] = 0
diff --git a/workflow/rocoto/workflow_xml.py b/workflow/rocoto/workflow_xml.py
index d9ca4fb961..3ad7c4bd91 100644
--- a/workflow/rocoto/workflow_xml.py
+++ b/workflow/rocoto/workflow_xml.py
@@ -18,7 +18,8 @@ def __init__(self, app_config: AppConfig, rocoto_config: Dict) -> None:
         self._app_config = app_config
         self.rocoto_config = rocoto_config
 
-        self._base = self._app_config.configs['base']
+        # Use the generic config.base (without RUN specified)
+        self._base = self._app_config.configs['_no_run']['base']
 
         self.preamble = self._get_preamble()
         self.definitions = self._get_definitions()
diff --git a/workflow/setup_expt.py b/workflow/setup_expt.py
index e213394e20..c6e4e59011 100755
--- a/workflow/setup_expt.py
+++ b/workflow/setup_expt.py
@@ -8,7 +8,7 @@
 import glob
 import shutil
 import warnings
-from argparse import ArgumentParser, ArgumentDefaultsHelpFormatter, SUPPRESS
+from argparse import ArgumentParser, ArgumentDefaultsHelpFormatter, SUPPRESS, ArgumentTypeError
 
 from hosts import Host
 
@@ -116,7 +116,8 @@ def edit_baseconfig(host, inputs, yaml_dict):
         "@COMROOT@": inputs.comroot,
         "@EXP_WARM_START@": is_warm_start,
         "@MODE@": inputs.mode,
-        "@gfs_cyc@": inputs.gfs_cyc,
+        "@INTERVAL_GFS@": inputs.interval,
+        "@SDATE_GFS@": datetime_to_YMDH(inputs.sdate_gfs),
         "@APP@": inputs.app,
         "@NMEM_ENS@": getattr(inputs, 'nens', 0)
     }
@@ -186,6 +187,19 @@ def input_args(*argv):
 
     ufs_apps = ['ATM', 'ATMA', 'ATMW', 'S2S', 'S2SA', 'S2SW', 'S2SWA']
 
+    def _validate_interval(interval_str):
+        err_msg = f'must be a non-negative integer multiple of 6 ({interval_str} given)'
+        try:
+            interval = int(interval_str)
+        except ValueError:
+            raise ArgumentTypeError(err_msg)
+
+        # This assumes the gdas frequency (assim_freq) is 6h
+        # If this changes, the modulus needs to as well
+        if interval < 0 or interval % 6 != 0:
+            raise ArgumentTypeError(err_msg)
+        return interval
+
     def _common_args(parser):
         parser.add_argument('--pslot', help='parallel experiment name',
                             type=str, required=False, default='test')
@@ -199,7 +213,8 @@ def _common_args(parser):
                             type=str, required=False, default=os.getenv('HOME'))
         parser.add_argument('--idate', help='starting date of experiment, initial conditions must exist!',
                             required=True, type=lambda dd: to_datetime(dd))
-        parser.add_argument('--edate', help='end date experiment', required=True, type=lambda dd: to_datetime(dd))
+        parser.add_argument('--edate', help='end date experiment', required=False, type=lambda dd: to_datetime(dd))
+        parser.add_argument('--interval', help='frequency of forecast (in hours); must be a multiple of 6', type=_validate_interval, required=False, default=6)
         parser.add_argument('--icsdir', help='full path to user initial condition directory', type=str, required=False, default='')
         parser.add_argument('--overwrite', help='overwrite previously created experiment (if it exists)',
                             action='store_true', required=False)
@@ -219,8 +234,7 @@ def _gfs_args(parser):
     def _gfs_cycled_args(parser):
         parser.add_argument('--app', help='UFS application', type=str,
                             choices=ufs_apps, required=False, default='ATM')
-        parser.add_argument('--gfs_cyc', help='cycles to run forecast', type=int,
-                            choices=[0, 1, 2, 4], default=1, required=False)
+        parser.add_argument('--sdate_gfs', help='date to start GFS', type=lambda dd: to_datetime(dd), required=False, default=None)
         return parser
 
     def _gfs_or_gefs_ensemble_args(parser):
@@ -233,8 +247,6 @@ def _gfs_or_gefs_ensemble_args(parser):
     def _gfs_or_gefs_forecast_args(parser):
         parser.add_argument('--app', help='UFS application', type=str,
                             choices=ufs_apps, required=False, default='ATM')
-        parser.add_argument('--gfs_cyc', help='Number of forecasts per day', type=int,
-                            choices=[1, 2, 4], default=1, required=False)
         return parser
 
     def _gefs_args(parser):
@@ -291,7 +303,28 @@ def _gefs_args(parser):
     for subp in [gefsforecasts]:
         subp = _gefs_args(subp)
 
-    return parser.parse_args(list(*argv) if len(argv) else None)
+    inputs = parser.parse_args(list(*argv) if len(argv) else None)
+
+    # Validate dates
+    if inputs.edate is None:
+        inputs.edate = inputs.idate
+
+    if inputs.edate < inputs.idate:
+        raise ArgumentTypeError(f'edate ({inputs.edate}) cannot be before idate ({inputs.idate})')
+
+    # For forecast-only, GFS starts in the first cycle
+    if not hasattr(inputs, 'sdate_gfs'):
+        inputs.sdate_gfs = inputs.idate
+
+    # For cycled, GFS starts after the half-cycle
+    if inputs.sdate_gfs is None:
+        inputs.sdate_gfs = inputs.idate + to_timedelta("6H")
+
+    if inputs.interval > 0:
+        if inputs.sdate_gfs < inputs.idate or inputs.sdate_gfs > inputs.edate:
+            raise ArgumentTypeError(f'sdate_gfs ({inputs.sdate_gfs}) must be between idate ({inputs.idate}) and edate ({inputs.edate})')
+
+    return inputs
 
 
 def query_and_clean(dirname, force_clean=False):