From 973d3372eaaa6e68aa0946069dd7a6b9c5acee63 Mon Sep 17 00:00:00 2001
From: CoryMartin-NOAA <cory.r.martin@noaa.gov>
Date: Mon, 17 Mar 2025 19:56:16 +0000
Subject: [PATCH 01/17] add a bunch of stuff

---
 jobs/JOBSFORGE_GLOBAL_AOD_DUMP        |  45 +++++++++
 scripts/exobsforge_global_aod_dump.py |   4 +
 ush/bash_utils.sh                     | 126 ++++++++++++++++++++++++++
 ush/cron_driver.sh                    |   3 +
 ush/jjob_header.sh                    | 114 +++++++++++++++++++++++
 ush/preamble.sh                       | 114 +++++++++++++++++++++++
 6 files changed, 406 insertions(+)
 create mode 100755 jobs/JOBSFORGE_GLOBAL_AOD_DUMP
 create mode 100755 scripts/exobsforge_global_aod_dump.py
 create mode 100755 ush/bash_utils.sh
 create mode 100755 ush/cron_driver.sh
 create mode 100755 ush/jjob_header.sh
 create mode 100755 ush/preamble.sh

diff --git a/jobs/JOBSFORGE_GLOBAL_AOD_DUMP b/jobs/JOBSFORGE_GLOBAL_AOD_DUMP
new file mode 100755
index 00000000..21a73789
--- /dev/null
+++ b/jobs/JOBSFORGE_GLOBAL_AOD_DUMP
@@ -0,0 +1,45 @@
+#! /usr/bin/env bash
+
+source "${HOMEobsforge}/ush/preamble.sh"
+#source "${HOMEobsforge}/ush/jjob_header.sh"
+
+##############################################
+# Set variables used in the script
+##############################################
+
+
+##############################################
+# Begin JOB SPECIFIC work
+##############################################
+
+###############################################################
+# Run relevant script
+
+EXSCRIPT=${DUMPAODPY:-${SCRobsforge}/exobsforge_global_aod_dump.py}
+${EXSCRIPT}
+status=$?
+if [[ ${status} -ne 0 ]]; then
+    exit "${status}"
+fi
+
+
+##############################################
+# End JOB SPECIFIC work
+##############################################
+
+##############################################
+# Final processing
+##############################################
+if [[ -e "${pgmout}" ]] ; then
+  cat "${pgmout}"
+fi
+
+##########################################
+# Remove the Temporary working directory
+##########################################
+cd "${DATAROOT}" || exit
+if [[ "${KEEPDATA}" == "NO" ]]; then
+    rm -rf "${DATA}"
+fi
+
+exit 0
\ No newline at end of file
diff --git a/scripts/exobsforge_global_aod_dump.py b/scripts/exobsforge_global_aod_dump.py
new file mode 100755
index 00000000..f82b26ec
--- /dev/null
+++ b/scripts/exobsforge_global_aod_dump.py
@@ -0,0 +1,4 @@
+#!/usr/bin/env python3
+
+if __name__ == '__main__':
+    print('hello')
\ No newline at end of file
diff --git a/ush/bash_utils.sh b/ush/bash_utils.sh
new file mode 100755
index 00000000..b8ce729c
--- /dev/null
+++ b/ush/bash_utils.sh
@@ -0,0 +1,126 @@
+#! /usr/bin/env bash
+
+function declare_from_tmpl() {
+    #
+    # Define variables from corresponding templates by substituting in env variables.
+    #
+    # Each template must already be defined. Any variables in the template are replaced
+    #   with their values. Undefined variables are just removed WITHOUT raising an error.
+    #
+    # Accepts as options `-r` and `-x`, which do the same thing as the same options in
+    #   `declare`. Variables are automatically marked as `-g` so the variable is visible
+    #   in the calling script.
+    #
+    # Syntax:
+    #   declare_from_tmpl [-rx] $var1[:$tmpl1] [$var2[:$tmpl2]] [...]]
+    #
+    #   options:
+    #       -r: Make variable read-only (same as `declare -r`)
+    #       -x: Mark variable for export (same as `declare -x`)
+    #   var1, var2, etc: Variable names whose values will be generated from a template
+    #                    and declared
+    #   tmpl1, tmpl2, etc: Specify the template to use (default is "${var}_TMPL")
+    #
+    #   Examples:
+    #       # Current cycle and RUN, implicitly using template COM_ATMOS_ANALYSIS_TMPL
+    #       YMD=${PDY} HH=${cyc} declare_from_tmpl -rx COM_ATMOS_ANALYSIS
+    #
+    #       # Previous cycle and gdas using an explicit template
+    #       RUN=${GDUMP} YMD=${gPDY} HH=${gcyc} declare_from_tmpl -rx \
+    #           COM_ATMOS_HISTORY_PREV:COM_ATMOS_HISTORY_TMPL
+    #
+    #       # Current cycle and COM for first member
+    #       MEMDIR='mem001' YMD=${PDY} HH=${cyc} declare_from_tmpl -rx COM_ATMOS_HISTORY
+    #
+    if [[ ${DEBUG_WORKFLOW:-"NO"} == "NO" ]]; then set +x; fi
+    local opts="-g"
+    local OPTIND=1
+    while getopts "rx" option; do
+        opts="${opts}${option}"
+    done
+    shift $((OPTIND-1))
+
+    for input in "$@"; do
+        IFS=':' read -ra args <<< "${input}"
+        local com_var="${args[0]}"
+        local template
+        local value
+        if (( ${#args[@]} > 1 )); then
+            template="${args[1]}"
+        else
+            template="${com_var}_TMPL"
+        fi
+        if [[ ! -v "${template}" ]]; then
+            echo "FATAL ERROR in declare_from_tmpl: Requested template ${template} not defined!"
+            exit 2
+        fi
+        value=$(echo "${!template}" | envsubst)
+        # shellcheck disable=SC2086
+        declare ${opts} "${com_var}"="${value}"
+        # shellcheck disable=
+        echo "declare_from_tmpl :: ${com_var}=${value}"
+    done
+    set_trace
+}
+
+function wait_for_file() {
+    #
+    # Wait for a file to exist and return the status.
+    #
+    # Checks if a file exists periodically up to a maximum number of attempts. When the file
+    #   exists or the limit is reached, the status is returned (0 if the file exists,1 if it
+    #   does not). This allows it to be used as a conditional to handle missing files.
+    #
+    # Syntax:
+    #   wait_for_file file_name [sleep_interval [max_tries]]
+    #
+    #     file_name:      File to check the existence of (must be readable)
+    #     sleep_interval: Time to wait between each check (in seconds) [default: 60]
+    #     max_tries:      The maximum number of checks to make [default: 100]
+    #
+    # Example:
+    #     ```
+    #     file_name=/path/to/foo
+    #     sleep_interval=60
+    #     max_tries=30
+    #     if wait_for_file; then
+    #       echo "FATAL ERROR: ${file_name} still does not exist after waiting one-half hour."
+    #       exit 1
+    #     fi
+    #     # Code that depends on file existing
+    #     ```
+    #
+    set +x
+    local file_name=${1:?"wait_for_file() requires a file name"}
+    local sleep_interval=${2:-60}
+    local max_tries=${3:-100}
+
+    for (( iter=0; iter<max_tries; iter++ )); do
+        if [[ -r ${file_name} ]]; then
+            set_trace
+            return 0
+        fi
+        sleep "${sleep_interval}"
+    done
+    set_trace
+    return 1
+}
+
+function detect_py_ver() {
+    # 
+    # Returns the major.minor version of the currently active python executable
+    #
+    regex="[0-9]+\.[0-9]+"
+    # shellcheck disable=SC2312
+    if [[ $(python --version) =~ ${regex} ]]; then
+	    echo "${BASH_REMATCH[0]}"
+    else
+	    echo "FATAL ERROR: Could not detect the python version"
+	    exit 1
+    fi
+}
+# shellcheck disable=
+
+declare -xf declare_from_tmpl
+declare -xf wait_for_file
+declare -xf detect_py
diff --git a/ush/cron_driver.sh b/ush/cron_driver.sh
new file mode 100755
index 00000000..90f0af9b
--- /dev/null
+++ b/ush/cron_driver.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+# cron_driver.sh
+# script to be executed by cron to run all j-jobs
\ No newline at end of file
diff --git a/ush/jjob_header.sh b/ush/jjob_header.sh
new file mode 100755
index 00000000..01e245cc
--- /dev/null
+++ b/ush/jjob_header.sh
@@ -0,0 +1,114 @@
+#! /usr/bin/env bash
+#
+# Universal header for global j-jobs
+#
+# Sets up and completes actions common to all j-jobs:
+# - Creates and moves to $DATA after removing any
+#     existing one unless $WIPE_DATA is set to "NO"
+# - Runs `setpdy.sh`
+# - Sources configs provided as arguments
+# - Sources machine environment script
+# - Defines a few other variables
+#
+# The job name for the environment files should be passed
+#   in using the `-e` option (required). Any config files
+#   to be sourced should be passed in as an argument to
+#   the `-c` option. For example:
+#   ```
+#   jjob_header.sh -e "fcst" -c "base fcst"
+#   ```
+#   Will source `config.base` and `config.fcst`, then pass
+#   `fcst` to the ${machine}.env script.
+#
+# Script requires the following variables to already be
+#   defined in the environment:
+#   - $HOMEgfs
+#   - $DATAROOT (unless $DATA is overriden)
+#   - $jobid
+#   - $PDY
+#   - $cyc
+#   - $machine
+#
+# Additionally, there are a couple of optional settings that
+#   can be set before calling the script:
+#   - $EXPDIR       : Override the default $EXPDIR
+#                     [default: ${HOMEgfs}/parm/config]
+#   - $DATA         : Override the default $DATA location
+#                     [default: ${DATAROOT}/${jobid}]
+#   - $WIPE_DATA    : Set whether to delete any existing $DATA
+#                     [default: "YES"]
+#   - $pid          : Override the default process id
+#                     [default: $$]
+
+# OPTIND=1
+# while getopts "c:e:" option; do
+#     case "${option}" in
+#         c)  read -ra configs <<< "${OPTARG}" ;;
+#         e)  env_job=${OPTARG} ;;
+#         :)
+#             echo "FATAL [${BASH_SOURCE[0]}]: ${option} requires an argument"
+#             exit 1
+#             ;;
+#         *)
+#             echo "FATAL [${BASH_SOURCE[0]}]: Unrecognized option: ${option}"
+#             exit 1
+#             ;;
+#     esac
+# done
+# shift $((OPTIND-1))
+
+# if [[ -z ${env_job} ]]; then
+#     echo "FATAL [${BASH_SOURCE[0]}]: Must specify a job name with -e"
+#     exit 1
+# fi
+
+##############################################
+# make temp directory
+##############################################
+export DATA=${DATA:-"${DATAROOT}/${jobid}"}
+if [[ ${WIPE_DATA:-YES} == "YES" ]]; then
+    rm -rf "${DATA}"
+fi
+mkdir -p "${DATA}"
+cd "${DATA}" || ( echo "FATAL [${BASH_SOURCE[0]}]: ${DATA} does not exist"; exit 1 )
+
+
+##############################################
+# Run setpdy and initialize PDY variables
+##############################################
+export cycle="t${cyc}z"
+setpdy.sh
+source ./PDY
+
+
+##############################################
+# Determine Job Output Name on System
+##############################################
+export pid="${pid:-$$}"
+export pgmout="OUTPUT.${pid}"
+export pgmerr=errfile
+
+
+#############################
+# Source relevant config files
+#############################
+# export EXPDIR="${EXPDIR:-${HOMEgfs}/parm/config}"
+# for config in "${configs[@]:-''}"; do
+#     source "${EXPDIR}/config.${config}"
+#     status=$?
+#     if (( status != 0 )); then
+#         echo "FATAL [${BASH_SOURCE[0]}]: Unable to load config config.${config}"
+#         exit "${status}"
+#     fi
+# done
+
+
+##########################################
+# Source machine runtime environment
+##########################################
+# source "${HOMEgfs}/env/${machine}.env" "${env_job}"
+# status=$?
+# if (( status != 0 )); then
+#     echo "FATAL [${BASH_SOURCE[0]}]: Error while sourcing machine environment ${machine}.env for job ${env_job}"
+#     exit "${status}"
+# fi
diff --git a/ush/preamble.sh b/ush/preamble.sh
new file mode 100755
index 00000000..322731d3
--- /dev/null
+++ b/ush/preamble.sh
@@ -0,0 +1,114 @@
+#! /usr/bin/env bash
+
+#######
+# Preamble script to be SOURCED at the beginning of every script. Sets 
+#   useful PS4 and optionally turns on set -x and set -eu. Also sets up 
+#   crude script timing and provides a postamble that runs on exit.
+#
+# Syntax:
+#   preamble.sh [id]
+#   
+#   Aruguments:
+#     id: Optional identifier string. Use when running the same script 
+#           multiple times in the same job (e.g. MPMD)
+#
+# Input environment variables:
+#   TRACE (YES/NO): Whether to echo every command (set -x) [default: "YES"]
+#   STRICT (YES/NO): Whether to exit immediately on error or undefined variable
+#     (set -eu) [default: "YES"]
+#   POSTAMBLE_CMD (empty/set): A command to run at the end of the job
+#     [default: empty]
+#
+#######
+set +x
+if (( $# > 0 )); then
+    id="(${1})"
+else
+    id=""
+fi
+
+# Record the start time so we can calculate the elapsed time later
+start_time=$(date +%s)
+
+# Get the base name of the calling script
+_calling_script=$(basename "${BASH_SOURCE[1]}")
+
+# Announce the script has begun
+start_time_human=$(date -d"@${start_time}" -u)
+echo "Begin ${_calling_script} at ${start_time_human}"
+
+declare -rx PS4='+ $(basename ${BASH_SOURCE[0]:-${FUNCNAME[0]:-"Unknown"}})[${LINENO}]'"${id}: "
+
+set_strict() {
+    if [[ ${STRICT:-"YES"} == "YES" ]]; then
+        # Exit on error and undefined variable
+        set -eu
+    fi
+}
+
+set_trace() {
+    # Print the script name and line number of each command as it is 
+    #   executed when using trace. 
+    if [[ ${TRACE:-"YES"} == "YES" ]]; then
+        set -x
+    fi
+}
+
+postamble() {
+    #
+    # Commands to execute when a script ends. 
+    #
+    # Syntax:
+    #   postamble script start_time rc
+    #
+    #   Arguments:
+    #     script: name of the script ending
+    #     start_time: start time of script (in seconds)
+    #     rc: the exit code of the script
+    #
+
+    set +x
+    script="${1}"
+    start_time="${2}"
+    rc="${3}"
+
+    # Execute postamble command
+    #
+    # Commands can be added to the postamble by appending them to $POSTAMBLE_CMD:
+    #    POSTAMBLE_CMD="new_thing; ${POSTAMBLE_CMD:-}" # (before existing commands)
+    #    POSTAMBLE_CMD="${POSTAMBLE_CMD:-}; new_thing" # (after existing commands)
+    #
+    # Always use this form so previous POSTAMBLE_CMD are not overwritten. This should
+    #   only be used for commands that execute conditionally (i.e. on certain machines
+    #   or jobs). Global changes should just be added to this function.
+    # These commands will be called when EACH SCRIPT terminates, so be mindful. Please
+    #   consult with global-workflow CMs about permanent changes to $POSTAMBLE_CMD or
+    #   this postamble function.
+    #
+
+    if [[ -v 'POSTAMBLE_CMD' ]]; then
+      ${POSTAMBLE_CMD}
+    fi
+
+    # Calculate the elapsed time
+    end_time=$(date +%s)
+    end_time_human=$(date -d@"${end_time}" -u +%H:%M:%S)
+    elapsed_sec=$((end_time - start_time))
+    elapsed=$(date -d@"${elapsed_sec}" -u +%H:%M:%S)
+
+    # Announce the script has ended, then pass the error code up
+    echo "End ${script} at ${end_time_human} with error code ${rc:-0} (time elapsed: ${elapsed})"
+    exit "${rc}"
+}
+
+# Place the postamble in a trap so it is always called no matter how the script exits
+# Shellcheck: Turn off warning about substitions at runtime instead of signal time
+# shellcheck disable=SC2064
+trap "postamble ${_calling_script} ${start_time} \$?" EXIT
+# shellcheck disable=
+
+source "${HOMEobsforge}/ush/bash_utils.sh"
+
+# Turn on our settings
+set_strict
+set_trace

From 8a7fc32105edcf9db1acdc1c7a04bed4aaf5869f Mon Sep 17 00:00:00 2001
From: CoryMartin-NOAA <cory.r.martin@noaa.gov>
Date: Mon, 17 Mar 2025 20:36:25 +0000
Subject: [PATCH 02/17] add sample XML

---
 parm/obsforge_test_hera.xml | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 parm/obsforge_test_hera.xml

diff --git a/parm/obsforge_test_hera.xml b/parm/obsforge_test_hera.xml
new file mode 100644
index 00000000..68764ff5
--- /dev/null
+++ b/parm/obsforge_test_hera.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0"?>
+<!DOCTYPE workflow
+[
+	<!--
+	PROGRAM
+		Main workflow manager for ObsForge
+
+	-->
+	<!ENTITY PSLOT "stat_wcda">
+	<!ENTITY ROTDIR "/scratch2/NCEPDEV/stmp1/Cory.R.Martin/mar2025/stat_workflow//COMROOT/stat_wcda">
+	<!ENTITY JOBS_DIR "/scratch2/NCEPDEV/stmp1/Cory.R.Martin/mar2025/stat_workflow/global-workflow/jobs/rocoto">
+	<!ENTITY MAXTRIES "2">
+]>
+
+<workflow realtime="F" scheduler="slurm" cyclethrottle="3" taskthrottle="25">
+
+	<log verbosity="10"><cyclestr>/scratch2/NCEPDEV/stmp1/Cory.R.Martin/mar2025/stat_workflow//EXPDIR/stat_wcda/logs/@Y@m@d@H.log</cyclestr></log>
+
+	<!-- Define the cycles -->
+	<cycledef group="gdas">202103250000 202103250000 06:00:00</cycledef>
+	<cycledef group="gfs">202103250000 202103250000 06:00:00</cycledef>
+
+</workflow>

From 731413b3d741149decf8e0b7eba408db435911a3 Mon Sep 17 00:00:00 2001
From: CoryMartin-NOAA <cory.r.martin@noaa.gov>
Date: Tue, 18 Mar 2025 16:38:47 +0000
Subject: [PATCH 03/17] save before some testing

---
 jobs/rocoto/aoddump.sh       | 20 ++++++++++
 parm/obsforge_test_hera.xml  | 76 +++++++++++++++++++++++++++++++++---
 ush/load_obsforge_modules.sh | 56 ++++++++++++++++++++++++++
 3 files changed, 146 insertions(+), 6 deletions(-)
 create mode 100644 jobs/rocoto/aoddump.sh
 create mode 100644 ush/load_obsforge_modules.sh

diff --git a/jobs/rocoto/aoddump.sh b/jobs/rocoto/aoddump.sh
new file mode 100644
index 00000000..2ca29702
--- /dev/null
+++ b/jobs/rocoto/aoddump.sh
@@ -0,0 +1,20 @@
+#! /usr/bin/env bash
+
+source "${HOMEobsforge}/ush/preamble.sh"
+
+###############################################################
+# Source UFSDA workflow modules
+. "${HOMEobsforge}/ush/load_obsforge_modules.sh"
+status=$?
+if [[ ${status} -ne 0 ]]; then
+    exit "${status}"
+fi
+
+export job="aoddump"
+export jobid="${job}.$$"
+
+###############################################################
+# Execute the JJOB
+"${HOMEobsforge}/jobs/JOBSFORGE_GLOBAL_AOD_DUMP"
+status=$?
+exit "${status}"
\ No newline at end of file
diff --git a/parm/obsforge_test_hera.xml b/parm/obsforge_test_hera.xml
index 68764ff5..0c4c3a73 100644
--- a/parm/obsforge_test_hera.xml
+++ b/parm/obsforge_test_hera.xml
@@ -6,18 +6,82 @@
 		Main workflow manager for ObsForge
 
 	-->
-	<!ENTITY PSLOT "stat_wcda">
-	<!ENTITY ROTDIR "/scratch2/NCEPDEV/stmp1/Cory.R.Martin/mar2025/stat_workflow//COMROOT/stat_wcda">
-	<!ENTITY JOBS_DIR "/scratch2/NCEPDEV/stmp1/Cory.R.Martin/mar2025/stat_workflow/global-workflow/jobs/rocoto">
+	<!ENTITY PSLOT "obsforge">
+	<!ENTITY ROTDIR "/scratch2/NCEPDEV/stmp1/Cory.R.Martin/obsforge/COMROOT/obsforge">
+	<!ENTITY JOBS_DIR "/scratch2/NCEPDEV/stmp1/Cory.R.Martin/mar2025/obsforge/jobs/rocoto">
 	<!ENTITY MAXTRIES "2">
 ]>
 
 <workflow realtime="F" scheduler="slurm" cyclethrottle="3" taskthrottle="25">
 
-	<log verbosity="10"><cyclestr>/scratch2/NCEPDEV/stmp1/Cory.R.Martin/mar2025/stat_workflow//EXPDIR/stat_wcda/logs/@Y@m@d@H.log</cyclestr></log>
+	<log verbosity="10"><cyclestr>/scratch2/NCEPDEV/stmp1/Cory.R.Martin/obsforge/COMROOT/obsforge/logs/@Y@m@d@H.log</cyclestr></log>
 
 	<!-- Define the cycles -->
-	<cycledef group="gdas">202103250000 202103250000 06:00:00</cycledef>
-	<cycledef group="gfs">202103250000 202103250000 06:00:00</cycledef>
+	<cycledef group="gdas">202503160000 202503170000 06:00:00</cycledef>
+	<cycledef group="gfs">202503160000 202503170000 06:00:00</cycledef>
+
+<task name="gfs_aod_dump" cycledefs="gfs" maxtries="&MAXTRIES;">
+
+	<command>/scratch2/NCEPDEV/stmp1/Cory.R.Martin/mar2025/obsforge/jobs/rocoto/aoddump.sh</command>
+
+	<jobname><cyclestr>obsforge_gfs_aod_dump_@H</cyclestr></jobname>
+	<account>da-cpu</account>
+	<queue>batch</queue>
+	<partition>hera</partition>
+	<walltime>00:30:00</walltime>
+	<nodes>1:ppn=1:tpp=1</nodes>
+	<memory>96GB</memory>
+	<native>--export=NONE</native>
+
+	<join><cyclestr>/scratch2/NCEPDEV/stmp1/Cory.R.Martin/obsforge/COMROOT/obsforge/logs/@Y@m@d@H/gfs_aod_dump_prep.log</cyclestr></join>
+
+	<envar><name>RUN_ENVIR</name><value>emc</value></envar>
+	<envar><name>HOMEobsforge</name><value>/scratch2/NCEPDEV/stmp1/Cory.R.Martin/mar2025/obsforge/</value></envar>
+	<envar><name>NET</name><value>gfs</value></envar>
+	<envar><name>RUN</name><value>gfs</value></envar>
+	<envar><name>CDATE</name><value><cyclestr>@Y@m@d@H</cyclestr></value></envar>
+	<envar><name>PDY</name><value><cyclestr>@Y@m@d</cyclestr></value></envar>
+	<envar><name>cyc</name><value><cyclestr>@H</cyclestr></value></envar>
+	<envar><name>COMROOT</name><value>/scratch2/NCEPDEV/stmp1/Cory.R.Martin/obsforge/COMROOT/obsforge/</value></envar>
+	<envar><name>DATAROOT</name><value>/scratch1/NCEPDEV/stmp2/Cory.R.Martin/RUNDIRS/obsforge/gfs.<cyclestr>@Y@m@d@H</cyclestr></value></envar>
+
+	<!--<dependency>
+		<datadep><cyclestr>/scratch2/NCEPDEV/stmp1/Cory.R.Martin/obsforge/gfs.@Y@m@d/@H/atmos/gfs.t@Hz.updated.status.tm00.bufr_d</cyclestr></datadep>
+	</dependency>
+	-->
+
+</task>
+
+<task name="gdas_aod_dump" cycledefs="gdas" maxtries="&MAXTRIES;">
+
+	<command>/scratch2/NCEPDEV/stmp1/Cory.R.Martin/mar2025/obsforge/jobs/rocoto/aoddump.sh</command>
+
+	<jobname><cyclestr>obsforge_gdas_aod_dump_@H</cyclestr></jobname>
+	<account>da-cpu</account>
+	<queue>batch</queue>
+	<partition>hera</partition>
+	<walltime>00:30:00</walltime>
+	<nodes>1:ppn=1:tpp=1</nodes>
+	<memory>96GB</memory>
+	<native>--export=NONE</native>
+
+	<join><cyclestr>/scratch2/NCEPDEV/stmp1/Cory.R.Martin/obsforge/COMROOT/obsforge/logs/@Y@m@d@H/gdas_aod_dump_prep.log</cyclestr></join>
+
+	<envar><name>RUN_ENVIR</name><value>emc</value></envar>
+	<envar><name>HOMEobsforge</name><value>/scratch2/NCEPDEV/stmp1/Cory.R.Martin/mar2025/obsforge/</value></envar>
+	<envar><name>NET</name><value>gfs</value></envar>
+	<envar><name>RUN</name><value>gdas</value></envar>
+	<envar><name>CDATE</name><value><cyclestr>@Y@m@d@H</cyclestr></value></envar>
+	<envar><name>PDY</name><value><cyclestr>@Y@m@d</cyclestr></value></envar>
+	<envar><name>cyc</name><value><cyclestr>@H</cyclestr></value></envar>
+	<envar><name>COMROOT</name><value>/scratch2/NCEPDEV/stmp1/Cory.R.Martin/obsforge/COMROOT/obsforge/</value></envar>
+	<envar><name>DATAROOT</name><value>/scratch1/NCEPDEV/stmp2/Cory.R.Martin/RUNDIRS/obsforge/gdas.<cyclestr>@Y@m@d@H</cyclestr></value></envar>
+
+	<!--<dependency>
+		<datadep><cyclestr>/scratch2/NCEPDEV/stmp1/Cory.R.Martin/obsforge/gdas.@Y@m@d/@H/atmos/gdas.t@Hz.updated.status.tm00.bufr_d</cyclestr></datadep>
+	</dependency>
+	-->
+
+</task>
 
 </workflow>
diff --git a/ush/load_obsforge_modules.sh b/ush/load_obsforge_modules.sh
new file mode 100644
index 00000000..41a0d9b2
--- /dev/null
+++ b/ush/load_obsforge_modules.sh
@@ -0,0 +1,56 @@
+#! /usr/bin/env bash
+
+###############################################################
+if [[ "${DEBUG_WORKFLOW:-NO}" == "NO" ]]; then
+    echo "Loading modules quietly..."
+    set +x
+fi
+
+MODS="obsforge"
+
+# Setup runtime environment by loading modules
+ulimit_s=$( ulimit -S -s )
+
+# Find module command and purge:
+source "${HOMEobsforge}/ush/detect_machine.sh"
+source "${HOMEobsforge}/ush/module-setup.sh"
+
+# Load our modules:
+module use "${HOMEobsforge}/modulefiles"
+
+case "${MACHINE_ID}" in
+  ("hera" | "orion" | "hercules" | "wcoss2" | "gaeac5" | "gaeac6")
+    #TODO: Remove LMOD_TMOD_FIND_FIRST line when spack-stack on WCOSS2
+    if [[ "${MACHINE_ID}" == "wcoss2" ]]; then
+      export LMOD_TMOD_FIND_FIRST=yes
+      # TODO: Add path to ObsForge libraries and cray-mpich as temporary patches
+      # TODO: Remove LD_LIBRARY_PATH lines as soon as permanent solutions are available	
+      export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${HOMEobsforge}/build/lib"
+      export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:/opt/cray/pe/mpich/8.1.19/ofi/intel/19.0/lib"
+    fi
+    module load "${MODS}/${MACHINE_ID}"
+    ncdump=$( command -v ncdump )
+    NETCDF=$( echo "${ncdump}" | cut -d " " -f 3 )
+    export NETCDF
+    ;;
+  ("jet" | "s4" | "acorn")
+    echo WARNING: OBSFORGE NOT SUPPORTED ON THIS PLATFORM
+    ;;  
+  *)
+    echo "WARNING: UNKNOWN PLATFORM"
+    ;;
+esac
+
+module list
+pip list
+
+# Add wxflow to PYTHONPATH
+wxflowPATH="${HOMEobsforge}/ush/python"
+PYTHONPATH="${PYTHONPATH:+${PYTHONPATH}:}${HOMEobsforge}/ush:${wxflowPATH}"
+export PYTHONPATH
+
+# Restore stack soft limit:
+ulimit -S -s "${ulimit_s}"
+unset ulimit_s
+
+set_trace
\ No newline at end of file

From f7fa5dde29d83531c760abf4aad5f60acf23ba0b Mon Sep 17 00:00:00 2001
From: CoryMartin-NOAA <cory.r.martin@noaa.gov>
Date: Tue, 18 Mar 2025 17:00:50 +0000
Subject: [PATCH 04/17] working with dummy hello script

---
 .gitignore                     | 3 +++
 jobs/JOBSFORGE_GLOBAL_AOD_DUMP | 4 ++--
 jobs/rocoto/aoddump.sh         | 0
 parm/obsforge_test_hera.xml    | 4 +++-
 4 files changed, 8 insertions(+), 3 deletions(-)
 mode change 100644 => 100755 jobs/rocoto/aoddump.sh

diff --git a/.gitignore b/.gitignore
index 595f5168..df6c6f2c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -49,3 +49,6 @@ install*/
 /sorc/obsforge-utils
 !/bundle/CMakeLists.txt
 /bundle/*
+
+# rocoto
+*.db
diff --git a/jobs/JOBSFORGE_GLOBAL_AOD_DUMP b/jobs/JOBSFORGE_GLOBAL_AOD_DUMP
index 21a73789..c66713f8 100755
--- a/jobs/JOBSFORGE_GLOBAL_AOD_DUMP
+++ b/jobs/JOBSFORGE_GLOBAL_AOD_DUMP
@@ -1,7 +1,7 @@
 #! /usr/bin/env bash
 
 source "${HOMEobsforge}/ush/preamble.sh"
-#source "${HOMEobsforge}/ush/jjob_header.sh"
+source "${HOMEobsforge}/ush/jjob_header.sh"
 
 ##############################################
 # Set variables used in the script
@@ -15,7 +15,7 @@ source "${HOMEobsforge}/ush/preamble.sh"
 ###############################################################
 # Run relevant script
 
-EXSCRIPT=${DUMPAODPY:-${SCRobsforge}/exobsforge_global_aod_dump.py}
+EXSCRIPT=${DUMPAODPY:-${HOMEobsforge}/scripts/exobsforge_global_aod_dump.py}
 ${EXSCRIPT}
 status=$?
 if [[ ${status} -ne 0 ]]; then
diff --git a/jobs/rocoto/aoddump.sh b/jobs/rocoto/aoddump.sh
old mode 100644
new mode 100755
diff --git a/parm/obsforge_test_hera.xml b/parm/obsforge_test_hera.xml
index 0c4c3a73..3ed02f74 100644
--- a/parm/obsforge_test_hera.xml
+++ b/parm/obsforge_test_hera.xml
@@ -12,7 +12,7 @@
 	<!ENTITY MAXTRIES "2">
 ]>
 
-<workflow realtime="F" scheduler="slurm" cyclethrottle="3" taskthrottle="25">
+<workflow realtime="F" scheduler="slurm" cyclethrottle="1" taskthrottle="25">
 
 	<log verbosity="10"><cyclestr>/scratch2/NCEPDEV/stmp1/Cory.R.Martin/obsforge/COMROOT/obsforge/logs/@Y@m@d@H.log</cyclestr></log>
 
@@ -42,6 +42,7 @@
 	<envar><name>CDATE</name><value><cyclestr>@Y@m@d@H</cyclestr></value></envar>
 	<envar><name>PDY</name><value><cyclestr>@Y@m@d</cyclestr></value></envar>
 	<envar><name>cyc</name><value><cyclestr>@H</cyclestr></value></envar>
+	<envar><name>KEEPDATA</name><value>NO</value></envar>
 	<envar><name>COMROOT</name><value>/scratch2/NCEPDEV/stmp1/Cory.R.Martin/obsforge/COMROOT/obsforge/</value></envar>
 	<envar><name>DATAROOT</name><value>/scratch1/NCEPDEV/stmp2/Cory.R.Martin/RUNDIRS/obsforge/gfs.<cyclestr>@Y@m@d@H</cyclestr></value></envar>
 
@@ -74,6 +75,7 @@
 	<envar><name>CDATE</name><value><cyclestr>@Y@m@d@H</cyclestr></value></envar>
 	<envar><name>PDY</name><value><cyclestr>@Y@m@d</cyclestr></value></envar>
 	<envar><name>cyc</name><value><cyclestr>@H</cyclestr></value></envar>
+	<envar><name>KEEPDATA</name><value>NO</value></envar>
 	<envar><name>COMROOT</name><value>/scratch2/NCEPDEV/stmp1/Cory.R.Martin/obsforge/COMROOT/obsforge/</value></envar>
 	<envar><name>DATAROOT</name><value>/scratch1/NCEPDEV/stmp2/Cory.R.Martin/RUNDIRS/obsforge/gdas.<cyclestr>@Y@m@d@H</cyclestr></value></envar>
 

From b4b51856eb0eca98adbff7043c19a7af6cbce91f Mon Sep 17 00:00:00 2001
From: CoryMartin-NOAA <cory.r.martin@noaa.gov>
Date: Tue, 18 Mar 2025 18:26:42 +0000
Subject: [PATCH 05/17] move COMROOT

---
 parm/obsforge_test_hera.xml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/parm/obsforge_test_hera.xml b/parm/obsforge_test_hera.xml
index 3ed02f74..dc59281f 100644
--- a/parm/obsforge_test_hera.xml
+++ b/parm/obsforge_test_hera.xml
@@ -43,7 +43,8 @@
 	<envar><name>PDY</name><value><cyclestr>@Y@m@d</cyclestr></value></envar>
 	<envar><name>cyc</name><value><cyclestr>@H</cyclestr></value></envar>
 	<envar><name>KEEPDATA</name><value>NO</value></envar>
-	<envar><name>COMROOT</name><value>/scratch2/NCEPDEV/stmp1/Cory.R.Martin/obsforge/COMROOT/obsforge/</value></envar>
+	<envar><name>COMROOT</name><value>/scratch2/NCEPDEV/stmp1/Cory.R.Martin/com</value></envar>
+	<envar><name>DCOMROOT</name><value>/scratch2/NCEPDEV/stmp1/Cory.R.Martin/dcom</value></envar>
 	<envar><name>DATAROOT</name><value>/scratch1/NCEPDEV/stmp2/Cory.R.Martin/RUNDIRS/obsforge/gfs.<cyclestr>@Y@m@d@H</cyclestr></value></envar>
 
 	<!--<dependency>
@@ -76,7 +77,8 @@
 	<envar><name>PDY</name><value><cyclestr>@Y@m@d</cyclestr></value></envar>
 	<envar><name>cyc</name><value><cyclestr>@H</cyclestr></value></envar>
 	<envar><name>KEEPDATA</name><value>NO</value></envar>
-	<envar><name>COMROOT</name><value>/scratch2/NCEPDEV/stmp1/Cory.R.Martin/obsforge/COMROOT/obsforge/</value></envar>
+	<envar><name>COMROOT</name><value>/scratch2/NCEPDEV/stmp1/Cory.R.Martin/com</value></envar>
+	<envar><name>DCOMROOT</name><value>/scratch2/NCEPDEV/stmp1/Cory.R.Martin/dcom</value></envar>
 	<envar><name>DATAROOT</name><value>/scratch1/NCEPDEV/stmp2/Cory.R.Martin/RUNDIRS/obsforge/gdas.<cyclestr>@Y@m@d@H</cyclestr></value></envar>
 
 	<!--<dependency>

From 63fea13819ed35fbf4587fc4c479e6c91e0c1718 Mon Sep 17 00:00:00 2001
From: CoryMartin-NOAA <cory.r.martin@noaa.gov>
Date: Wed, 19 Mar 2025 18:02:20 +0000
Subject: [PATCH 06/17] make downloading test data an option

---
 bundle/CMakeLists.txt |  1 +
 test/CMakeLists.txt   | 80 ++++++++++++++++++++++---------------------
 2 files changed, 42 insertions(+), 39 deletions(-)

diff --git a/bundle/CMakeLists.txt b/bundle/CMakeLists.txt
index 0cc0803c..4545a63e 100644
--- a/bundle/CMakeLists.txt
+++ b/bundle/CMakeLists.txt
@@ -44,6 +44,7 @@ option( ENABLE_LORENZ95_MODEL "Build LORENZ95 toy model" OFF )
 option( ENABLE_QG_MODEL "Build QG toy model" OFF )
 
 # EMC BUFR-query library
+set( SKIP_DOWNLOAD_TEST_DATA OFF )
 ecbuild_bundle( PROJECT bufr-query SOURCE "../sorc/bufr-query" )
 
 # Core JEDI repositories
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index d7a58b28..d8c44707 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -301,44 +301,46 @@ foreach(file ${test_aux_files})
         ${CMAKE_CURRENT_BINARY_DIR}/${file} )
 endforeach(file)
 
-# ===================================================================
-# Download the test data ./build/obsForge/test/ if we don't have it
-# ===================================================================
-
-set(DOWNLOAD_URL "https://ftp.emc.ncep.noaa.gov/static_files/public/obsforge")
-set(FILE_COLLECTION "obsforge-0.0.0.tgz")
-#set(FILE_COLLECTION "obsforge-0.0.1.tgz")
-
-# Get the test data if we don't have it.
-if(NOT EXISTS "${CMAKE_CURRENT_BINARY_DIR}/${FILE_COLLECTION}")
-    message(STATUS "Downloading: ${CMAKE_CURRENT_BINARY_DIR}/${FILE_COLLECTION}")
-    file(DOWNLOAD
-        ${DOWNLOAD_URL}/${FILE_COLLECTION}
-        ${CMAKE_CURRENT_BINARY_DIR}/${FILE_COLLECTION}
-        SHOW_PROGRESS
-        STATUS download_status
-        INACTIVITY_TIMEOUT 30
-    )
-
-  list(GET download_status 0 download_status_num)
+if(NOT SKIP_DOWNLOAD_TEST_DATA)
+  # ===================================================================
+  # Download the test data ./build/obsForge/test/ if we don't have it
+  # ===================================================================
+
+  set(DOWNLOAD_URL "https://ftp.emc.ncep.noaa.gov/static_files/public/obsforge")
+  set(FILE_COLLECTION "obsforge-0.0.0.tgz")
+  #set(FILE_COLLECTION "obsforge-0.0.1.tgz")
+
+  # Get the test data if we don't have it.
+  if(NOT EXISTS "${CMAKE_CURRENT_BINARY_DIR}/${FILE_COLLECTION}")
+      message(STATUS "Downloading: ${CMAKE_CURRENT_BINARY_DIR}/${FILE_COLLECTION}")
+      file(DOWNLOAD
+          ${DOWNLOAD_URL}/${FILE_COLLECTION}
+          ${CMAKE_CURRENT_BINARY_DIR}/${FILE_COLLECTION}
+          SHOW_PROGRESS
+          STATUS download_status
+          INACTIVITY_TIMEOUT 30
+      )
+
+    list(GET download_status 0 download_status_num)
+
+    if(NOT download_status_num EQUAL 0 OR NOT EXISTS ${CMAKE_CURRENT_BINARY_DIR}/${FILE_COLLECTION})
+      # Remove empty file if download doesn't complete
+      file(REMOVE ${CMAKE_CURRENT_BINARY_DIR}/${BUFR_TAR})
+      message(STATUS "Could not download test files, not building tests")
+      return()
+    endif()
 
-  if(NOT download_status_num EQUAL 0 OR NOT EXISTS ${CMAKE_CURRENT_BINARY_DIR}/${FILE_COLLECTION})
-    # Remove empty file if download doesn't complete
-    file(REMOVE ${CMAKE_CURRENT_BINARY_DIR}/${BUFR_TAR})
-    message(STATUS "Could not download test files, not building tests")
-    return()
+    # file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/${FILE_COLLECTION} DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
+
+    add_custom_target(get_obsforge_test_data ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${FILE_COLLECTION})
+    add_custom_command(
+      TARGET get_obsforge_test_data
+      POST_BUILD
+      COMMAND ${CMAKE_COMMAND} -E chdir ${CMAKE_CURRENT_BINARY_DIR} tar xzf ${FILE_COLLECTION}
+      COMMAND ${CMAKE_COMMAND} -E chdir ${CMAKE_CURRENT_BINARY_DIR} rm -rf testdata
+      COMMAND ${CMAKE_COMMAND} -E chdir ${CMAKE_CURRENT_BINARY_DIR} rm -rf testoutput
+      COMMAND ${CMAKE_COMMAND} -E chdir ${CMAKE_CURRENT_BINARY_DIR} mv remote_data/testdata testdata
+      COMMAND ${CMAKE_COMMAND} -E chdir ${CMAKE_CURRENT_BINARY_DIR} mv remote_data/testoutput testoutput
+      COMMAND ${CMAKE_COMMAND} -E chdir ${CMAKE_CURRENT_BINARY_DIR} rm -rf remote_data)
   endif()
-
-  # file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/${FILE_COLLECTION} DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
-
-  add_custom_target(get_obsforge_test_data ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${FILE_COLLECTION})
-  add_custom_command(
-    TARGET get_obsforge_test_data
-    POST_BUILD
-    COMMAND ${CMAKE_COMMAND} -E chdir ${CMAKE_CURRENT_BINARY_DIR} tar xzf ${FILE_COLLECTION}
-    COMMAND ${CMAKE_COMMAND} -E chdir ${CMAKE_CURRENT_BINARY_DIR} rm -rf testdata
-    COMMAND ${CMAKE_COMMAND} -E chdir ${CMAKE_CURRENT_BINARY_DIR} rm -rf testoutput
-    COMMAND ${CMAKE_COMMAND} -E chdir ${CMAKE_CURRENT_BINARY_DIR} mv remote_data/testdata testdata
-    COMMAND ${CMAKE_COMMAND} -E chdir ${CMAKE_CURRENT_BINARY_DIR} mv remote_data/testoutput testoutput
-    COMMAND ${CMAKE_COMMAND} -E chdir ${CMAKE_CURRENT_BINARY_DIR} rm -rf remote_data)
-endif()
+endif()
\ No newline at end of file

From 70e7005be4bdd6a8ed2539a42f1410f6a1a6504d Mon Sep 17 00:00:00 2001
From: CoryMartin-NOAA <cory.r.martin@noaa.gov>
Date: Thu, 20 Mar 2025 14:57:48 +0000
Subject: [PATCH 07/17] update bufr-query hash

---
 sorc/bufr-query | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sorc/bufr-query b/sorc/bufr-query
index 8bc28860..cdf5330f 160000
--- a/sorc/bufr-query
+++ b/sorc/bufr-query
@@ -1 +1 @@
-Subproject commit 8bc28860d562f9a53ffa86e7c5c5ae05c2c4e09f
+Subproject commit cdf5330fcaa8a91be3b72749c7538aa984f7eba7

From c1f082c651c141b15bda7823d7a984fae14e3ec4 Mon Sep 17 00:00:00 2001
From: CoryMartin-NOAA <cory.r.martin@noaa.gov>
Date: Thu, 20 Mar 2025 15:25:46 +0000
Subject: [PATCH 08/17] add symlink

---
 ush/python/wxflow | 1 +
 1 file changed, 1 insertion(+)
 create mode 120000 ush/python/wxflow

diff --git a/ush/python/wxflow b/ush/python/wxflow
new file mode 120000
index 00000000..bbeb8077
--- /dev/null
+++ b/ush/python/wxflow
@@ -0,0 +1 @@
+../../sorc/wxflow/
\ No newline at end of file

From 55a3822cb4b070636c3060b3cca1347799b3b75c Mon Sep 17 00:00:00 2001
From: CoryMartin-NOAA <cory.r.martin@noaa.gov>
Date: Thu, 20 Mar 2025 19:34:04 +0000
Subject: [PATCH 09/17] add in dunder inits

---
 ush/python/pyobsforge/__init__.py      | 5 +++++
 ush/python/pyobsforge/task/__init__.py | 0
 2 files changed, 5 insertions(+)
 create mode 100644 ush/python/pyobsforge/__init__.py
 create mode 100644 ush/python/pyobsforge/task/__init__.py

diff --git a/ush/python/pyobsforge/__init__.py b/ush/python/pyobsforge/__init__.py
new file mode 100644
index 00000000..1d2b3fbf
--- /dev/null
+++ b/ush/python/pyobsforge/__init__.py
@@ -0,0 +1,5 @@
+import os
+
+__docformat__ = "restructuredtext"
+__version__ = "0.1.0"
+pyobsforge_directory = os.path.dirname(__file__)
\ No newline at end of file
diff --git a/ush/python/pyobsforge/task/__init__.py b/ush/python/pyobsforge/task/__init__.py
new file mode 100644
index 00000000..e69de29b

From bf96feaa9fcbcb0c7e46f5a1d1c1e38ee6c668b4 Mon Sep 17 00:00:00 2001
From: CoryMartin-NOAA <cory.r.martin@noaa.gov>
Date: Mon, 24 Mar 2025 14:01:28 +0000
Subject: [PATCH 10/17] commit copied stuff from g-w

---
 scripts/exobsforge_global_aod_dump.py      |  21 +-
 ush/python/pyobsforge/task/aero_prepobs.py | 236 +++++++++++++++++++++
 2 files changed, 256 insertions(+), 1 deletion(-)
 create mode 100644 ush/python/pyobsforge/task/aero_prepobs.py

diff --git a/scripts/exobsforge_global_aod_dump.py b/scripts/exobsforge_global_aod_dump.py
index f82b26ec..d72ec3f8 100755
--- a/scripts/exobsforge_global_aod_dump.py
+++ b/scripts/exobsforge_global_aod_dump.py
@@ -1,4 +1,23 @@
 #!/usr/bin/env python3
+# exobsforge_global_aod_dump.py
+# This script will collect and preprocess
+# aerosol optical depth observations for
+# global aerosol assimilation 
+import os
+
+from wxflow import Logger, cast_strdict_as_dtypedict
+from pyobsforge.task.aero_prepobs import AerosolObsPrep
+
+# Initialize root logger
+logger = Logger(level='DEBUG', colored_log=True)
+
 
 if __name__ == '__main__':
-    print('hello')
\ No newline at end of file
+
+    # Take configuration from environment and cast it as python dictionary
+    config = cast_strdict_as_dtypedict(os.environ)
+
+    AeroObs = AerosolObsPrep(config)
+    AeroObs.initialize()
+    AeroObs.runConverter()
+    AeroObs.finalize()
diff --git a/ush/python/pyobsforge/task/aero_prepobs.py b/ush/python/pyobsforge/task/aero_prepobs.py
new file mode 100644
index 00000000..be58fa43
--- /dev/null
+++ b/ush/python/pyobsforge/task/aero_prepobs.py
@@ -0,0 +1,236 @@
+#!/usr/bin/env python3
+
+import os
+import glob
+import gzip
+import tarfile
+import re
+from logging import getLogger
+from typing import List, Dict, Any, Union
+
+from wxflow import (AttrDict, FileHandler, rm_p, rmdir,
+                    Task, add_to_datetime, to_timedelta, to_datetime,
+                    datetime_to_YMD,
+                    chdir, Executable, WorkflowException,
+                    parse_j2yaml, save_as_yaml, logit)
+
+logger = getLogger(__name__.split('.')[-1])
+
+
+class AerosolObsPrep(Task):
+    """
+    Class for preparing and managing aerosol observations
+    """
+    def __init__(self, config: Dict[str, Any]) -> None:
+        super().__init__(config)
+
+        _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)
+
+        local_dict = AttrDict(
+            {
+                'window_begin': _window_begin,
+                'window_end': _window_end,
+                'sensors': self.task_config['SENSORS'],
+                'data_dir': self.task_config['VIIRS_DATA_DIR'],
+                'input_files': '',
+                '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."
+            }
+        )
+
+        # task_config is everything that this task should need
+        self.task_config = AttrDict(**self.task_config, **local_dict)
+
+    @logit(logger)
+    def initialize(self) -> None:
+        """
+        List needed raw obs files.
+        Copy the raw obs files to $DATA/obs.
+        Link over the needed executable.
+        Generate corresponding YAML file.
+        Run IODA converter.
+        """
+        self.task_config.DATA_OBS = os.path.join(self.task_config.DATA, 'obs')
+        if os.path.exists(self.task_config.DATA_OBS):
+            rmdir(self.task_config.DATA_OBS)
+        FileHandler({'mkdir': [self.task_config.DATA_OBS]}).sync()
+
+        self.task_config.prepaero_yaml = []
+        for sensor in self.task_config.sensors:
+            raw_files = self.list_raw_files(sensor)
+            self.task_config.input_files = self.copy_obs(raw_files)
+            self.link_obsconvexe()
+            self.task_config.prepaero_config = self.get_obsproc_config(sensor)
+
+            # generate converter YAML file
+            template = f"{self.task_config.RUN}.t{self.task_config['cyc']:02d}z.prepaero_viirs_{sensor}.yaml"
+            _prepaero_yaml = os.path.join(self.task_config.DATA, template)
+            self.task_config.prepaero_yaml.append(_prepaero_yaml)
+            logger.debug(f"Generate PrepAeroObs YAML file: {_prepaero_yaml}")
+            save_as_yaml(self.task_config.prepaero_config, _prepaero_yaml)
+            logger.info(f"Wrote PrepAeroObs YAML to: {_prepaero_yaml}")
+
+    @logit(logger)
+    def list_raw_files(self, sensor) -> List[str]:
+        """
+        List all files in the predefined directory that match the predefined sensor and within the time window.
+        """
+        if sensor == 'n20':
+            sensor = 'j01'
+        dir1 = os.path.join(self.task_config.data_dir, datetime_to_YMD(self.task_config.window_begin))
+        dir2 = os.path.join(self.task_config.data_dir, datetime_to_YMD(self.task_config.window_end))
+
+        if dir1 == dir2:
+            files = os.listdir(dir1)
+            allfiles = [os.path.join(dir1, file) for file in files]
+            allfiles.sort()
+        else:
+            files_1 = os.listdir(dir1)
+            allfiles_1 = [os.path.join(dir1, file) for file in files_1]
+            files_2 = os.listdir(dir2)
+            allfiles_2 = [os.path.join(dir2, file) for file in files_2]
+            allfiles = sorted(allfiles_1, allfiles_2)
+        matching_files = []
+        try:
+            for file in allfiles:
+                basename = os.path.basename(file)
+                pattern = r"s(\d{4})(\d{2})(\d{2})(\d{2})(\d{2})(\d{3})"
+                match = re.match(pattern, basename.split('_')[3])
+                yyyy, mm, dd, HH, MM = match.group(1), match.group(2), match.group(3), match.group(4), match.group(5)
+                fstart = to_datetime(f'{yyyy}-{mm}-{dd}T{HH}:{MM}Z')
+                if sensor == basename.split('_')[2]:
+                    # temporally select obs files based on time stamp in the filename.
+                    if (fstart > self.task_config.window_begin) and (fstart < self.task_config.window_end):
+                        matching_files.append(os.path.join(self.task_config.data_dir, file))
+            logger.info("Found %d matching files.", len(matching_files))
+        except FileNotFoundError:
+            logger.error("The specified file/directory does not exist.")
+            raise
+        return matching_files
+
+    @logit(logger)
+    def copy_obs(self, inputfiles) -> Dict[str, Any]:
+        """
+        Copy the raw obs files to $DATA/obs.
+        """
+        copylist = []
+        destlist = []
+        for filename in inputfiles:
+            basename = os.path.basename(filename)
+            dest = os.path.join(self.task_config.DATA_OBS, basename)
+            copylist.append([filename, dest])
+            destlist.append(dest)
+        FileHandler({'copy': copylist}).sync()
+
+        return destlist
+
+    @logit(logger)
+    def get_obsproc_config(self, sensor) -> Dict[str, Any]:
+        """
+        Compile a dictionary of obs proc configuration from OBSPROCYAML template file
+        Parameters
+        ----------
+        Returns
+        ----------
+        obsproc_config : Dict
+            a dictionary containing the fully rendered obs proc yaml configuration
+        """
+        self.task_config.sensor = sensor
+        # generate JEDI YAML file
+        logger.info(f"Generate gdas_obsprovider2ioda YAML config: {self.task_config.OBSPROCYAML}")
+        prepaero_config = parse_j2yaml(self.task_config.OBSPROCYAML, self.task_config)
+
+        return prepaero_config
+
+    @logit(logger)
+    def link_obsconvexe(self) -> None:
+        """
+        This method links the gdas executable to the run directory
+        Parameters
+        ----------
+        Task: GDAS task
+        Returns
+        ----------
+        None
+        """
+        exe_src = self.task_config.OBSPROCEXE
+
+        logger.info(f"Link executable {exe_src} to DATA/")
+        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 runConverter(self) -> None:
+        """
+        Run the IODA converter gdas_obsprovider2ioda.x
+        """
+        chdir(self.task_config.DATA)
+        exec_cmd = Executable(self.task_config.APRUN_PREPOBSAERO)
+        exec_name = os.path.join(self.task_config.DATA, 'gdas_obsprovider2ioda.x')
+        exec_cmd.add_default_arg(exec_name)
+
+        for prepaero_yaml in self.task_config.prepaero_yaml:
+            try:
+                logger.debug(f"Executing {exec_cmd} on {prepaero_yaml}")
+                exec_cmd(f"{prepaero_yaml}")
+            except OSError:
+                raise OSError(f"Failed to execute {exec_cmd} on {prepaero_yaml}")
+            except Exception:
+                raise WorkflowException(f"An error occured during execution of {exec_cmd} on {prepaero_yaml}")
+
+        pass
+
+    @logit(logger)
+    def finalize(self) -> None:
+        """
+        Copy the output viirs files to COMIN_OBS.
+        Tar and archive the output files.
+        Tar and archive the raw obs files.
+        """
+        # get list of viirs files
+        obsfiles = glob.glob(os.path.join(self.task_config['DATA'], '*viirs*nc4'))
+        copylist = []
+        for obsfile in obsfiles:
+            basename = os.path.basename(obsfile)
+            src = os.path.join(self.task_config['DATA'], basename)
+            dest = os.path.join(self.task_config.COMOUT_OBS, basename)
+            copylist.append([src, dest])
+        FileHandler({'copy': copylist}).sync()
+
+        # gzip the files first
+        for obsfile in obsfiles:
+            with open(obsfile, 'rb') as f_in, gzip.open(f"{obsfile}.gz", 'wb') as f_out:
+                f_out.writelines(f_in)
+
+        aeroobs = os.path.join(self.task_config.COMOUT_OBS, f"{self.task_config['APREFIX']}aeroobs")
+        # open tar file for writing
+        with tarfile.open(aeroobs, "w") as archive:
+            for obsfile in obsfiles:
+                aeroobsgzip = f"{obsfile}.gz"
+                archive.add(aeroobsgzip, arcname=os.path.basename(aeroobsgzip))
+        # get list of raw viirs L2 files
+        rawfiles = glob.glob(os.path.join(self.task_config.DATA_OBS, 'JRR-AOD*'))
+        # gzip the raw L2 files first
+        for rawfile in rawfiles:
+            with open(rawfile, 'rb') as f_in, gzip.open(f"{rawfile}.gz", 'wb') as f_out:
+                f_out.writelines(f_in)
+
+        aerorawobs = os.path.join(self.task_config.COMOUT_OBS, f"{self.task_config['APREFIX']}aerorawobs")
+        # open tar file for writing
+        with tarfile.open(aerorawobs, "w") as archive:
+            for rawfile in rawfiles:
+                aerorawobsgzip = f"{rawfile}.gz"
+                archive.add(aerorawobsgzip, arcname=os.path.basename(aerorawobsgzip))
+        copylist = []
+        for prepaero_yaml in self.task_config.prepaero_yaml:
+            basename = os.path.basename(prepaero_yaml)
+            dest = os.path.join(self.task_config.COMOUT_OBS, basename)
+            copylist.append([prepaero_yaml, dest])
+        FileHandler({'copy': copylist}).sync()
+
+        pass

From 6f6833220edd7826dd39dae825f3197d89ce39fa Mon Sep 17 00:00:00 2001
From: CoryMartin-NOAA <cory.r.martin@noaa.gov>
Date: Mon, 24 Mar 2025 14:20:28 +0000
Subject: [PATCH 11/17] change symlink

---
 ush/python/wxflow | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ush/python/wxflow b/ush/python/wxflow
index bbeb8077..f2360088 120000
--- a/ush/python/wxflow
+++ b/ush/python/wxflow
@@ -1 +1 @@
-../../sorc/wxflow/
\ No newline at end of file
+../../sorc/wxflow/src/wxflow/
\ No newline at end of file

From 03684aaa7da72efa6458695c5c8966ac30c10071 Mon Sep 17 00:00:00 2001
From: CoryMartin-NOAA <cory.r.martin@noaa.gov>
Date: Mon, 24 Mar 2025 14:33:57 +0000
Subject: [PATCH 12/17] commit before testing/switching task

---
 .gitignore                            | 1 +
 parm/config.yaml                      | 4 ++++
 scripts/exobsforge_global_aod_dump.py | 8 ++++++--
 3 files changed, 11 insertions(+), 2 deletions(-)
 create mode 100644 parm/config.yaml

diff --git a/.gitignore b/.gitignore
index df6c6f2c..af1f1e0a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -35,6 +35,7 @@
 bin/
 build*/
 install*/
+__pycache__*/
 
 # Ignore the following bundle repositories
 /ecbuild
diff --git a/parm/config.yaml b/parm/config.yaml
new file mode 100644
index 00000000..3f5aff68
--- /dev/null
+++ b/parm/config.yaml
@@ -0,0 +1,4 @@
+obsforge:
+  assim_freq: 6
+aoddump:
+  platforms: ['npp', 'j01', 'j02']
\ No newline at end of file
diff --git a/scripts/exobsforge_global_aod_dump.py b/scripts/exobsforge_global_aod_dump.py
index d72ec3f8..a8067a88 100755
--- a/scripts/exobsforge_global_aod_dump.py
+++ b/scripts/exobsforge_global_aod_dump.py
@@ -5,7 +5,7 @@
 # global aerosol assimilation 
 import os
 
-from wxflow import Logger, cast_strdict_as_dtypedict
+from wxflow import AttrDict, Logger, cast_strdict_as_dtypedict, parse_j2yaml
 from pyobsforge.task.aero_prepobs import AerosolObsPrep
 
 # Initialize root logger
@@ -15,7 +15,11 @@
 if __name__ == '__main__':
 
     # Take configuration from environment and cast it as python dictionary
-    config = cast_strdict_as_dtypedict(os.environ)
+    config_env = cast_strdict_as_dtypedict(os.environ)
+    # Take configuration from YAML file to augment/append config dict
+    config_yaml = parse_j2yaml(os.path.join(config_env['HOMEobsforge'], 'parm', 'config.yaml'), config_env)
+    # Combine configs together
+    config = AttrDict(**config_env, **config_yaml)
 
     AeroObs = AerosolObsPrep(config)
     AeroObs.initialize()

From 2660cc255db15ca07b2c6f2a825c9b3393b6dc74 Mon Sep 17 00:00:00 2001
From: CoryMartin-NOAA <cory.r.martin@noaa.gov>
Date: Mon, 24 Mar 2025 14:38:17 +0000
Subject: [PATCH 13/17] one more save before done for the AM

---
 scripts/exobsforge_global_aod_dump.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/scripts/exobsforge_global_aod_dump.py b/scripts/exobsforge_global_aod_dump.py
index a8067a88..d027508d 100755
--- a/scripts/exobsforge_global_aod_dump.py
+++ b/scripts/exobsforge_global_aod_dump.py
@@ -19,7 +19,8 @@
     # Take configuration from YAML file to augment/append config dict
     config_yaml = parse_j2yaml(os.path.join(config_env['HOMEobsforge'], 'parm', 'config.yaml'), config_env)
     # Combine configs together
-    config = AttrDict(**config_env, **config_yaml)
+    config = AttrDict(**config_env, **config_yaml['obsforge'])
+    config = AttrDict(**config, **config_yaml['aoddump'])
 
     AeroObs = AerosolObsPrep(config)
     AeroObs.initialize()

From a4b573f4ae8562f8b91fe8f9987e6dc8ee2867e0 Mon Sep 17 00:00:00 2001
From: CoryMartin-NOAA <cory.r.martin@noaa.gov>
Date: Mon, 24 Mar 2025 18:33:04 +0000
Subject: [PATCH 14/17] placeholders

---
 parm/config.yaml                           |   2 +-
 scripts/exobsforge_global_aod_dump.py      |   2 +-
 ush/python/pyobsforge/task/aero_prepobs.py | 187 +--------------------
 3 files changed, 7 insertions(+), 184 deletions(-)

diff --git a/parm/config.yaml b/parm/config.yaml
index 3f5aff68..5a31ed06 100644
--- a/parm/config.yaml
+++ b/parm/config.yaml
@@ -1,4 +1,4 @@
 obsforge:
   assim_freq: 6
 aoddump:
-  platforms: ['npp', 'j01', 'j02']
\ No newline at end of file
+  platforms: ['npp', 'n20', 'n21']
\ No newline at end of file
diff --git a/scripts/exobsforge_global_aod_dump.py b/scripts/exobsforge_global_aod_dump.py
index d027508d..fa3d6582 100755
--- a/scripts/exobsforge_global_aod_dump.py
+++ b/scripts/exobsforge_global_aod_dump.py
@@ -24,5 +24,5 @@
 
     AeroObs = AerosolObsPrep(config)
     AeroObs.initialize()
-    AeroObs.runConverter()
+    AeroObs.execute()
     AeroObs.finalize()
diff --git a/ush/python/pyobsforge/task/aero_prepobs.py b/ush/python/pyobsforge/task/aero_prepobs.py
index be58fa43..7f05c6b7 100644
--- a/ush/python/pyobsforge/task/aero_prepobs.py
+++ b/ush/python/pyobsforge/task/aero_prepobs.py
@@ -31,9 +31,7 @@ def __init__(self, config: Dict[str, Any]) -> None:
             {
                 'window_begin': _window_begin,
                 'window_end': _window_end,
-                'sensors': self.task_config['SENSORS'],
-                'data_dir': self.task_config['VIIRS_DATA_DIR'],
-                'input_files': '',
+                'platforms': self.task_config['platforms'],
                 '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."
             }
@@ -45,192 +43,17 @@ def __init__(self, config: Dict[str, Any]) -> None:
     @logit(logger)
     def initialize(self) -> None:
         """
-        List needed raw obs files.
-        Copy the raw obs files to $DATA/obs.
-        Link over the needed executable.
-        Generate corresponding YAML file.
-        Run IODA converter.
         """
-        self.task_config.DATA_OBS = os.path.join(self.task_config.DATA, 'obs')
-        if os.path.exists(self.task_config.DATA_OBS):
-            rmdir(self.task_config.DATA_OBS)
-        FileHandler({'mkdir': [self.task_config.DATA_OBS]}).sync()
-
-        self.task_config.prepaero_yaml = []
-        for sensor in self.task_config.sensors:
-            raw_files = self.list_raw_files(sensor)
-            self.task_config.input_files = self.copy_obs(raw_files)
-            self.link_obsconvexe()
-            self.task_config.prepaero_config = self.get_obsproc_config(sensor)
-
-            # generate converter YAML file
-            template = f"{self.task_config.RUN}.t{self.task_config['cyc']:02d}z.prepaero_viirs_{sensor}.yaml"
-            _prepaero_yaml = os.path.join(self.task_config.DATA, template)
-            self.task_config.prepaero_yaml.append(_prepaero_yaml)
-            logger.debug(f"Generate PrepAeroObs YAML file: {_prepaero_yaml}")
-            save_as_yaml(self.task_config.prepaero_config, _prepaero_yaml)
-            logger.info(f"Wrote PrepAeroObs YAML to: {_prepaero_yaml}")
-
-    @logit(logger)
-    def list_raw_files(self, sensor) -> List[str]:
-        """
-        List all files in the predefined directory that match the predefined sensor and within the time window.
-        """
-        if sensor == 'n20':
-            sensor = 'j01'
-        dir1 = os.path.join(self.task_config.data_dir, datetime_to_YMD(self.task_config.window_begin))
-        dir2 = os.path.join(self.task_config.data_dir, datetime_to_YMD(self.task_config.window_end))
-
-        if dir1 == dir2:
-            files = os.listdir(dir1)
-            allfiles = [os.path.join(dir1, file) for file in files]
-            allfiles.sort()
-        else:
-            files_1 = os.listdir(dir1)
-            allfiles_1 = [os.path.join(dir1, file) for file in files_1]
-            files_2 = os.listdir(dir2)
-            allfiles_2 = [os.path.join(dir2, file) for file in files_2]
-            allfiles = sorted(allfiles_1, allfiles_2)
-        matching_files = []
-        try:
-            for file in allfiles:
-                basename = os.path.basename(file)
-                pattern = r"s(\d{4})(\d{2})(\d{2})(\d{2})(\d{2})(\d{3})"
-                match = re.match(pattern, basename.split('_')[3])
-                yyyy, mm, dd, HH, MM = match.group(1), match.group(2), match.group(3), match.group(4), match.group(5)
-                fstart = to_datetime(f'{yyyy}-{mm}-{dd}T{HH}:{MM}Z')
-                if sensor == basename.split('_')[2]:
-                    # temporally select obs files based on time stamp in the filename.
-                    if (fstart > self.task_config.window_begin) and (fstart < self.task_config.window_end):
-                        matching_files.append(os.path.join(self.task_config.data_dir, file))
-            logger.info("Found %d matching files.", len(matching_files))
-        except FileNotFoundError:
-            logger.error("The specified file/directory does not exist.")
-            raise
-        return matching_files
+        print("initialize")
 
     @logit(logger)
-    def copy_obs(self, inputfiles) -> Dict[str, Any]:
+    def execute(self) -> None:
         """
-        Copy the raw obs files to $DATA/obs.
         """
-        copylist = []
-        destlist = []
-        for filename in inputfiles:
-            basename = os.path.basename(filename)
-            dest = os.path.join(self.task_config.DATA_OBS, basename)
-            copylist.append([filename, dest])
-            destlist.append(dest)
-        FileHandler({'copy': copylist}).sync()
-
-        return destlist
-
-    @logit(logger)
-    def get_obsproc_config(self, sensor) -> Dict[str, Any]:
-        """
-        Compile a dictionary of obs proc configuration from OBSPROCYAML template file
-        Parameters
-        ----------
-        Returns
-        ----------
-        obsproc_config : Dict
-            a dictionary containing the fully rendered obs proc yaml configuration
-        """
-        self.task_config.sensor = sensor
-        # generate JEDI YAML file
-        logger.info(f"Generate gdas_obsprovider2ioda YAML config: {self.task_config.OBSPROCYAML}")
-        prepaero_config = parse_j2yaml(self.task_config.OBSPROCYAML, self.task_config)
-
-        return prepaero_config
-
-    @logit(logger)
-    def link_obsconvexe(self) -> None:
-        """
-        This method links the gdas executable to the run directory
-        Parameters
-        ----------
-        Task: GDAS task
-        Returns
-        ----------
-        None
-        """
-        exe_src = self.task_config.OBSPROCEXE
-
-        logger.info(f"Link executable {exe_src} to DATA/")
-        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 runConverter(self) -> None:
-        """
-        Run the IODA converter gdas_obsprovider2ioda.x
-        """
-        chdir(self.task_config.DATA)
-        exec_cmd = Executable(self.task_config.APRUN_PREPOBSAERO)
-        exec_name = os.path.join(self.task_config.DATA, 'gdas_obsprovider2ioda.x')
-        exec_cmd.add_default_arg(exec_name)
-
-        for prepaero_yaml in self.task_config.prepaero_yaml:
-            try:
-                logger.debug(f"Executing {exec_cmd} on {prepaero_yaml}")
-                exec_cmd(f"{prepaero_yaml}")
-            except OSError:
-                raise OSError(f"Failed to execute {exec_cmd} on {prepaero_yaml}")
-            except Exception:
-                raise WorkflowException(f"An error occured during execution of {exec_cmd} on {prepaero_yaml}")
-
-        pass
+        print("execute")
 
     @logit(logger)
     def finalize(self) -> None:
         """
-        Copy the output viirs files to COMIN_OBS.
-        Tar and archive the output files.
-        Tar and archive the raw obs files.
         """
-        # get list of viirs files
-        obsfiles = glob.glob(os.path.join(self.task_config['DATA'], '*viirs*nc4'))
-        copylist = []
-        for obsfile in obsfiles:
-            basename = os.path.basename(obsfile)
-            src = os.path.join(self.task_config['DATA'], basename)
-            dest = os.path.join(self.task_config.COMOUT_OBS, basename)
-            copylist.append([src, dest])
-        FileHandler({'copy': copylist}).sync()
-
-        # gzip the files first
-        for obsfile in obsfiles:
-            with open(obsfile, 'rb') as f_in, gzip.open(f"{obsfile}.gz", 'wb') as f_out:
-                f_out.writelines(f_in)
-
-        aeroobs = os.path.join(self.task_config.COMOUT_OBS, f"{self.task_config['APREFIX']}aeroobs")
-        # open tar file for writing
-        with tarfile.open(aeroobs, "w") as archive:
-            for obsfile in obsfiles:
-                aeroobsgzip = f"{obsfile}.gz"
-                archive.add(aeroobsgzip, arcname=os.path.basename(aeroobsgzip))
-        # get list of raw viirs L2 files
-        rawfiles = glob.glob(os.path.join(self.task_config.DATA_OBS, 'JRR-AOD*'))
-        # gzip the raw L2 files first
-        for rawfile in rawfiles:
-            with open(rawfile, 'rb') as f_in, gzip.open(f"{rawfile}.gz", 'wb') as f_out:
-                f_out.writelines(f_in)
-
-        aerorawobs = os.path.join(self.task_config.COMOUT_OBS, f"{self.task_config['APREFIX']}aerorawobs")
-        # open tar file for writing
-        with tarfile.open(aerorawobs, "w") as archive:
-            for rawfile in rawfiles:
-                aerorawobsgzip = f"{rawfile}.gz"
-                archive.add(aerorawobsgzip, arcname=os.path.basename(aerorawobsgzip))
-        copylist = []
-        for prepaero_yaml in self.task_config.prepaero_yaml:
-            basename = os.path.basename(prepaero_yaml)
-            dest = os.path.join(self.task_config.COMOUT_OBS, basename)
-            copylist.append([prepaero_yaml, dest])
-        FileHandler({'copy': copylist}).sync()
-
-        pass
+        print("finalize")

From 6a8ab2ba6fe814536f7c174fc322f51ad9ad986d Mon Sep 17 00:00:00 2001
From: CoryMartin-NOAA <cory.r.martin@noaa.gov>
Date: Mon, 24 Mar 2025 19:03:12 +0000
Subject: [PATCH 15/17] push for draft PR

---
 ush/python/pyobsforge/task/aero_prepobs.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ush/python/pyobsforge/task/aero_prepobs.py b/ush/python/pyobsforge/task/aero_prepobs.py
index 7f05c6b7..7f7c5402 100644
--- a/ush/python/pyobsforge/task/aero_prepobs.py
+++ b/ush/python/pyobsforge/task/aero_prepobs.py
@@ -31,7 +31,6 @@ def __init__(self, config: Dict[str, Any]) -> None:
             {
                 'window_begin': _window_begin,
                 'window_end': _window_end,
-                'platforms': self.task_config['platforms'],
                 '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."
             }

From 1d8e5e2c94d267fcf64d1f4c68cf93630a0a6155 Mon Sep 17 00:00:00 2001
From: CoryMartin-NOAA <cory.r.martin@noaa.gov>
Date: Mon, 24 Mar 2025 19:09:36 +0000
Subject: [PATCH 16/17] Fix EOLs and remove dummy useless cron script

---
 parm/config.yaml                  | 2 +-
 test/CMakeLists.txt               | 2 +-
 ush/cron_driver.sh                | 3 ---
 ush/load_obsforge_modules.sh      | 2 +-
 ush/python/pyobsforge/__init__.py | 2 +-
 5 files changed, 4 insertions(+), 7 deletions(-)
 delete mode 100755 ush/cron_driver.sh

diff --git a/parm/config.yaml b/parm/config.yaml
index 5a31ed06..e499688f 100644
--- a/parm/config.yaml
+++ b/parm/config.yaml
@@ -1,4 +1,4 @@
 obsforge:
   assim_freq: 6
 aoddump:
-  platforms: ['npp', 'n20', 'n21']
\ No newline at end of file
+  platforms: ['npp', 'n20', 'n21']
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index c7ce9d92..8e14f347 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -343,4 +343,4 @@ if(NOT SKIP_DOWNLOAD_TEST_DATA)
       COMMAND ${CMAKE_COMMAND} -E chdir ${CMAKE_CURRENT_BINARY_DIR} mv remote_data/testoutput testoutput
       COMMAND ${CMAKE_COMMAND} -E chdir ${CMAKE_CURRENT_BINARY_DIR} rm -rf remote_data)
   endif()
-endif()
\ No newline at end of file
+endif()
diff --git a/ush/cron_driver.sh b/ush/cron_driver.sh
deleted file mode 100755
index 90f0af9b..00000000
--- a/ush/cron_driver.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-# cron_driver.sh
-# script to be executed by cron to run all j-jobs
\ No newline at end of file
diff --git a/ush/load_obsforge_modules.sh b/ush/load_obsforge_modules.sh
index 41a0d9b2..e341fabb 100644
--- a/ush/load_obsforge_modules.sh
+++ b/ush/load_obsforge_modules.sh
@@ -53,4 +53,4 @@ export PYTHONPATH
 ulimit -S -s "${ulimit_s}"
 unset ulimit_s
 
-set_trace
\ No newline at end of file
+set_trace
diff --git a/ush/python/pyobsforge/__init__.py b/ush/python/pyobsforge/__init__.py
index 1d2b3fbf..57f3d08e 100644
--- a/ush/python/pyobsforge/__init__.py
+++ b/ush/python/pyobsforge/__init__.py
@@ -2,4 +2,4 @@
 
 __docformat__ = "restructuredtext"
 __version__ = "0.1.0"
-pyobsforge_directory = os.path.dirname(__file__)
\ No newline at end of file
+pyobsforge_directory = os.path.dirname(__file__)

From e742dc0cf1a7d9283bcf17e7a092d4da33ff6f7d Mon Sep 17 00:00:00 2001
From: CoryMartin-NOAA <cory.r.martin@noaa.gov>
Date: Mon, 24 Mar 2025 19:11:33 +0000
Subject: [PATCH 17/17] update more EOLs

---
 jobs/JOBSFORGE_GLOBAL_AOD_DUMP | 2 +-
 jobs/rocoto/aoddump.sh         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/jobs/JOBSFORGE_GLOBAL_AOD_DUMP b/jobs/JOBSFORGE_GLOBAL_AOD_DUMP
index c66713f8..05a20b12 100755
--- a/jobs/JOBSFORGE_GLOBAL_AOD_DUMP
+++ b/jobs/JOBSFORGE_GLOBAL_AOD_DUMP
@@ -42,4 +42,4 @@ if [[ "${KEEPDATA}" == "NO" ]]; then
     rm -rf "${DATA}"
 fi
 
-exit 0
\ No newline at end of file
+exit 0
diff --git a/jobs/rocoto/aoddump.sh b/jobs/rocoto/aoddump.sh
index 2ca29702..dd8bec25 100755
--- a/jobs/rocoto/aoddump.sh
+++ b/jobs/rocoto/aoddump.sh
@@ -17,4 +17,4 @@ export jobid="${job}.$$"
 # Execute the JJOB
 "${HOMEobsforge}/jobs/JOBSFORGE_GLOBAL_AOD_DUMP"
 status=$?
-exit "${status}"
\ No newline at end of file
+exit "${status}"