From 89f1e9be3de538aec6ef1cbff8a8233c6d5f36c7 Mon Sep 17 00:00:00 2001
From: CoryMartin-NOAA <cory.r.martin@noaa.gov>
Date: Fri, 19 Aug 2022 16:53:06 +0000
Subject: [PATCH 01/13] Modify env files for aero da jobs

---
 env/HERA.env  | 11 +++++++++++
 env/ORION.env | 11 +++++++++++
 2 files changed, 22 insertions(+)

diff --git a/env/HERA.env b/env/HERA.env
index 124b3e8b9a2..51a7c85a330 100755
--- a/env/HERA.env
+++ b/env/HERA.env
@@ -5,6 +5,7 @@ if [ $# -ne 1 ]; then
     echo "Must specify an input argument to set runtime environment variables!"
     echo "argument can be any one of the following:"
     echo "atmanalrun atmensanalrun"
+    echo "aeroanlrun"
     echo "anal sfcanl fcst post vrfy metp"
     echo "eobs eupd ecen efcs epos"
     echo "postsnd awips gempak"
@@ -75,6 +76,16 @@ elif [ $step = "atmensanalrun" ]; then
     [[ $NTHREADS_ATMENSANAL -gt $nth_max ]] && export NTHREADS_ATMENSANAL=$nth_max
     export APRUN_ATMENSANAL="$launcher -n $npe_atmensanalrun"
 
+elif [ $step = "aeroanlrun" ]; then
+
+    export APRUNCFP="$launcher -n \$ncmd --multi-prog"
+
+    nth_max=$(($npe_node_max / $npe_node_aeroanlrun))
+
+    export NTHREADS_AEROANL=${nth_aeroanlrun:-$nth_max}
+    [[ $NTHREADS_AEROANL -gt $nth_max ]] && export NTHREADS_AEROANL=$nth_max
+    export APRUN_AEROANL="$launcher -n $npe_aeroanlrun"
+
 elif [ $step = "anal" ]; then
 
     export MKL_NUM_THREADS=4
diff --git a/env/ORION.env b/env/ORION.env
index bef0661f476..8dc267631fe 100755
--- a/env/ORION.env
+++ b/env/ORION.env
@@ -5,6 +5,7 @@ if [ $# -ne 1 ]; then
     echo "Must specify an input argument to set runtime environment variables!"
     echo "argument can be any one of the following:"
     echo "atmanalrun atmensanalrun"
+    echo "aeroanlrun"
     echo "anal sfcanl fcst post vrfy metp"
     echo "eobs eupd ecen efcs epos"
     echo "postsnd awips gempak"
@@ -74,6 +75,16 @@ elif [ $step = "atmensanalrun" ]; then
     [[ $NTHREADS_ATMENSANAL -gt $nth_max ]] && export NTHREADS_ATMENSANAL=$nth_max
     export APRUN_ATMENSANAL="$launcher -n $npe_atmensanalrun"
 
+elif [ $step = "aeroanlrun" ]; then
+
+    export APRUNCFP="$launcher -n \$ncmd --multi-prog"
+
+    nth_max=$(($npe_node_max / $npe_node_aeroanlrun))
+
+    export NTHREADS_AEROANL=${nth_aeroanlrun:-$nth_max}
+    [[ $NTHREADS_AEROANL -gt $nth_max ]] && export NTHREADS_AEROANL=$nth_max
+    export APRUN_AEROANL="$launcher -n $npe_aeroanlrun"
+
 elif [ $step = "anal" ]; then
 
     export MKL_NUM_THREADS=4

From f447cc68ed7b3919d59034ea719e53b36c677350 Mon Sep 17 00:00:00 2001
From: CoryMartin-NOAA <cory.r.martin@noaa.gov>
Date: Fri, 19 Aug 2022 16:53:36 +0000
Subject: [PATCH 02/13] Changes to/new config files for aerosol da

---
 parm/config/config.aeroanl      | 17 +++++++++++++++
 parm/config/config.aeroanlfinal | 10 +++++++++
 parm/config/config.aeroanlinit  | 10 +++++++++
 parm/config/config.aeroanlrun   | 14 ++++++++++++
 parm/config/config.resources    | 38 +++++++++++++++++++++++++++++++++
 5 files changed, 89 insertions(+)
 create mode 100755 parm/config/config.aeroanl
 create mode 100755 parm/config/config.aeroanlfinal
 create mode 100755 parm/config/config.aeroanlinit
 create mode 100755 parm/config/config.aeroanlrun

diff --git a/parm/config/config.aeroanl b/parm/config/config.aeroanl
new file mode 100755
index 00000000000..d1c28a3e10d
--- /dev/null
+++ b/parm/config/config.aeroanl
@@ -0,0 +1,17 @@
+#!/bin/bash -x
+
+########## config.aeroanl ##########
+# configuration common to all aero analysis tasks
+
+echo "BEGIN: config.aeroanl"
+
+export OBS_YAML_DIR=$HOMEgfs/sorc/gdas.cd/parm/aero/obs/config/
+export OBS_LIST=$HOMEgfs/sorc/gdas.cd/parm/aero/obs/lists/aero_prototype.yaml
+export AEROVARYAML=$HOMEgfs/sorc/gdas.cd/parm/aero/variational/3dvar_dripcg.yaml
+export BERROR_YAML=$HOMEgfs/sorc/gdas.cd/parm/aero/berror/static_bump.yaml
+export FV3JEDI_FIX=$HOMEgfs/fix/fix_jedi
+
+export io_layout_x=1
+export io_layout_y=1
+
+echo "END: config.aeroanl"
diff --git a/parm/config/config.aeroanlfinal b/parm/config/config.aeroanlfinal
new file mode 100755
index 00000000000..230ec5205a9
--- /dev/null
+++ b/parm/config/config.aeroanlfinal
@@ -0,0 +1,10 @@
+#!/bin/bash -x
+
+########## config.aeroanlfinal ##########
+# Post Aero Analysis specific
+
+echo "BEGIN: config.aeroanlfinal"
+
+# Get task specific resources
+. $EXPDIR/config.resources aeroanlfinal
+echo "END: config.aeroanlfinal"
diff --git a/parm/config/config.aeroanlinit b/parm/config/config.aeroanlinit
new file mode 100755
index 00000000000..72175b8d0cc
--- /dev/null
+++ b/parm/config/config.aeroanlinit
@@ -0,0 +1,10 @@
+#!/bin/bash -x
+
+########## config.aeroanlinit ##########
+# Pre Aero Analysis specific
+
+echo "BEGIN: config.aeroanlinit"
+
+# Get task specific resources
+. $EXPDIR/config.resources aeroanlinit
+echo "END: config.aeroanlinit"
diff --git a/parm/config/config.aeroanlrun b/parm/config/config.aeroanlrun
new file mode 100755
index 00000000000..537f33081f0
--- /dev/null
+++ b/parm/config/config.aeroanlrun
@@ -0,0 +1,14 @@
+#!/bin/bash -x
+
+########## config.aeroanlrun ##########
+# Aerosol Analysis specific
+
+echo "BEGIN: config.aeroanlrun"
+
+# Get task specific resources
+. $EXPDIR/config.resources aeroanlrun
+
+# Task specific variables
+export JEDIVAREXE=$HOMEgfs/exec/fv3jedi_var.x
+
+echo "END: config.aeroanlrun"
diff --git a/parm/config/config.resources b/parm/config/config.resources
index b2390970ae4..7b2cf3b5f4f 100755
--- a/parm/config/config.resources
+++ b/parm/config/config.resources
@@ -11,6 +11,7 @@ if [ $# -ne 1 ]; then
     echo "getic init coupled_ic aerosol_init"
     echo "atmanalprep atmanalrun atmanalpost"
     echo "atmensanalprep atmensanalrun atmensanalpost"
+    echo "aeroanlinit aeroanlrun aeroanlfinal"
     echo "anal sfcanl analcalc analdiag gldas fcst post vrfy metp arch echgres"
     echo "eobs ediag eomg eupd ecen esfc efcs epos earc"
     echo "init_chem mom6ic ocnpost"
@@ -156,6 +157,43 @@ elif [ $step = "atmanalpost" ]; then
     export nth_atmanalpost=1
     export npe_node_atmanalpost=$(echo "$npe_node_max / $nth_atmanalpost" | bc)
 
+elif [ $step = "aeroanlinit" ]; then
+
+    export wtime_aeroanlinit="00:10:00"
+    export npe_aeroanlinit=1
+    export nth_aeroanlinit=1
+    export npe_node_aeroanlinit=$(echo "$npe_node_max / $nth_aeroanlinit" | bc)
+    export memory_aeroanlinit="3072M"
+
+elif [ $step = "aeroanlrun" ]; then
+
+    if [ $CASE = "C768" ]; then
+      layout_x=6
+      layout_y=6
+    fi
+    if [ $CASE = "C384" ]; then
+      layout_x=5
+      layout_y=5
+    fi
+    if [ $CASE = "C192" -o $CASE = "C96" -o $CASE = "C48" ]; then
+      layout_x=3
+      layout_y=3
+    fi
+
+    export wtime_aeroanlrun="00:30:00"
+    export npe_aeroanlrun=$(echo "$layout_x * $layout_y * 6" | bc)
+    export nth_aeroanlrun=1
+    export native_aeroanlrun="--exclusive"
+    export npe_node_aeroanlrun=$(echo "$npe_node_max / $nth_aeroanlrun" | bc)
+
+elif [ $step = "aeroanlfinal" ]; then
+
+    export wtime_aeroanlfinal="00:10:00"
+    export npe_aeroanlfinal=1
+    export nth_aeroanlfinal=1
+    export npe_node_aeroanlfinal=$(echo "$npe_node_max / $nth_aeroanlfinal" | bc)
+    export memory_aeroanlfinal="3072M"
+
 elif [ $step = "anal" ]; then
 
     export wtime_anal="01:00:00"

From 0a121a195dcf7511e89b6c2dddde5a81374761b5 Mon Sep 17 00:00:00 2001
From: CoryMartin-NOAA <cory.r.martin@noaa.gov>
Date: Fri, 19 Aug 2022 17:26:42 +0000
Subject: [PATCH 03/13] Save to change branch

---
 workflow/applications.py          | 6 ++++++
 workflow/rocoto/workflow_tasks.py | 1 +
 2 files changed, 7 insertions(+)

diff --git a/workflow/applications.py b/workflow/applications.py
index 1766c4071fe..713c68727c7 100644
--- a/workflow/applications.py
+++ b/workflow/applications.py
@@ -217,6 +217,9 @@ def _cycled_configs(self):
         if self.do_wafs:
             configs += ['wafs', 'wafsgrib2', 'wafsblending', 'wafsgcip', 'wafsgrib20p25', 'wafsblending0p25']
 
+        if self.do_aero:
+            configs += ['aeroanlinit', 'aeroanlrun', 'aeroanlfinal']
+
         return configs
 
     @property
@@ -348,6 +351,9 @@ def _get_cycled_task_names(self):
 
         gdas_gfs_common_tasks_before_fcst += ['sfcanl', 'analcalc']
 
+        if self.do_aero:
+            gdas_gfs_common_tasks_before_fcst += ['aeroanlinit', 'aeroanlrun', 'aeroanlfinal']
+
         gldas_tasks = ['gldas']
         wave_prep_tasks = ['waveinit', 'waveprep']
         wave_bndpnt_tasks = ['wavepostbndpnt', 'wavepostbndpntbll']
diff --git a/workflow/rocoto/workflow_tasks.py b/workflow/rocoto/workflow_tasks.py
index c34605b52a8..c5a0d43758a 100644
--- a/workflow/rocoto/workflow_tasks.py
+++ b/workflow/rocoto/workflow_tasks.py
@@ -16,6 +16,7 @@ class Tasks:
                    'earc', 'ecen', 'echgres', 'ediag', 'efcs',
                    'eobs', 'eomg', 'epos', 'esfc', 'eupd',
                    'atmensanalprep', 'atmensanalrun', 'atmensanalpost',
+                   'aeroanlinit', 'aeroanlrun', 'aeroanlfinal',
                    'fcst', 'post', 'ocnpost', 'vrfy', 'metp',
                    'postsnd', 'awips', 'gempak',
                    'wafs', 'wafsblending', 'wafsblending0p25',

From 4fc371691a7f3bc4b392b2c3d22a6017277950c7 Mon Sep 17 00:00:00 2001
From: Cory Martin <cory.r.martin@noaa.gov>
Date: Fri, 19 Aug 2022 17:27:13 +0000
Subject: [PATCH 04/13] Update parm/config/config.resources based on suggestion

Co-authored-by: Rahul Mahajan <aerorahul@users.noreply.github.com>
---
 parm/config/config.resources | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/parm/config/config.resources b/parm/config/config.resources
index 7b2cf3b5f4f..f85d18d29a5 100755
--- a/parm/config/config.resources
+++ b/parm/config/config.resources
@@ -167,18 +167,20 @@ elif [ $step = "aeroanlinit" ]; then
 
 elif [ $step = "aeroanlrun" ]; then
 
-    if [ $CASE = "C768" ]; then
-      layout_x=6
-      layout_y=6
-    fi
-    if [ $CASE = "C384" ]; then
-      layout_x=5
-      layout_y=5
-    fi
-    if [ $CASE = "C192" -o $CASE = "C96" -o $CASE = "C48" ]; then
-      layout_x=3
-      layout_y=3
-    fi
+   case $CASE in
+     C768)    
+        layout_x=6
+        layout_y=6
+        ;;
+      C384)    
+        layout_x=5
+        layout_y=5
+        ;;
+     C192 | C96 | C48)    
+        layout_x=3
+        layout_y=3
+        ;;
+    esac
 
     export wtime_aeroanlrun="00:30:00"
     export npe_aeroanlrun=$(echo "$layout_x * $layout_y * 6" | bc)

From 665ee01295a85f0bbfc7aaa47269ea48e58e1118 Mon Sep 17 00:00:00 2001
From: CoryMartin-NOAA <cory.r.martin@noaa.gov>
Date: Fri, 19 Aug 2022 17:29:37 +0000
Subject: [PATCH 05/13] Add _gfs

---
 parm/config/config.resources | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/parm/config/config.resources b/parm/config/config.resources
index 7b2cf3b5f4f..ca0a180128a 100755
--- a/parm/config/config.resources
+++ b/parm/config/config.resources
@@ -182,7 +182,9 @@ elif [ $step = "aeroanlrun" ]; then
 
     export wtime_aeroanlrun="00:30:00"
     export npe_aeroanlrun=$(echo "$layout_x * $layout_y * 6" | bc)
+    export npe_aeroanlrun_gfs=$(echo "$layout_x * $layout_y * 6" | bc)
     export nth_aeroanlrun=1
+    export nth_aeroanlrun_gfs=1
     export native_aeroanlrun="--exclusive"
     export npe_node_aeroanlrun=$(echo "$npe_node_max / $nth_aeroanlrun" | bc)
 

From e1c71dc361d2701c0ca32a08e76c58be968d6943 Mon Sep 17 00:00:00 2001
From: CoryMartin-NOAA <cory.r.martin@noaa.gov>
Date: Fri, 19 Aug 2022 17:46:16 +0000
Subject: [PATCH 06/13] Commit to test on orion

---
 workflow/rocoto/workflow_tasks.py | 51 +++++++++++++++++++++++++++++++
 1 file changed, 51 insertions(+)

diff --git a/workflow/rocoto/workflow_tasks.py b/workflow/rocoto/workflow_tasks.py
index c5a0d43758a..7d84658d682 100644
--- a/workflow/rocoto/workflow_tasks.py
+++ b/workflow/rocoto/workflow_tasks.py
@@ -451,6 +451,57 @@ def atmanalpost(self):
 
         return task
 
+    def aeroanlinit(self):
+
+        suffix = self._base["SUFFIX"]
+        dump_suffix = self._base["DUMP_SUFFIX"]
+        gfs_cyc = self._base["gfs_cyc"]
+        dmpdir = self._base["DMPDIR"]
+
+        deps = []
+        dep_dict = {'type': 'metatask', 'name': 'gdaspost', 'offset': '-06:00:00'}
+        deps.append(rocoto.add_dependency(dep_dict))
+        data = f'&ROTDIR;/gdas.@Y@m@d/@H/atmos/gdas.t@Hz.atmf009{suffix}'
+        dep_dict = {'type': 'data', 'data': data, 'offset': '-06:00:00'}
+        deps.append(rocoto.add_dependency(dep_dict))
+        data = f'{dmpdir}/{self.cdump}{dump_suffix}.@Y@m@d/@H/{self.cdump}.t@Hz.updated.status.tm00.bufr_d'
+        dep_dict = {'type': 'data', 'data': data}
+        deps.append(rocoto.add_dependency(dep_dict))
+        dependencies = rocoto.create_dependency(dep_condition='and', dep=deps)
+
+        cycledef = self.cdump
+
+        resources = self.get_resource('aeroanlinit')
+        task = create_wf_task('aeroanlinit', resources, cdump=self.cdump, envar=self.envars, dependency=dependencies,
+                              cycledef=cycledef)
+        return task
+
+    def aeroanlrun(self):
+
+        deps = []
+        dep_dict = {'type': 'task', 'name': f'{self.cdump}aeroanlinit'}
+        deps.append(rocoto.add_dependency(dep_dict))
+        dependencies = rocoto.create_dependency(dep=deps)
+
+        resources = self.get_resource('aeroanlrun')
+        task = create_wf_task('aeroanlrun', resources, cdump=self.cdump, envar=self.envars, dependency=dependencies)
+
+        return task
+
+    def aeroanlfinal(self):
+
+        deps = []
+        dep_dict = {'type': 'task', 'name': f'{self.cdump}aeroanlrun'}
+        deps.append(rocoto.add_dependency(dep_dict))
+        dep_dict = {'type': 'cycleexist', 'offset': '-06:00:00'}
+        deps.append(rocoto.add_dependency(dep_dict))
+        dependencies = rocoto.create_dependency(dep_condition='and', dep=deps)
+
+        resources = self.get_resource('aeroanlfinal')
+        task = create_wf_task('aeroanlfinal', resources, cdump=self.cdump, envar=self.envars, dependency=dependencies)
+
+        return task
+
     def gldas(self):
 
         deps = []

From 10a27b719e0fcc64a624d839f28e2f9d1921a9b7 Mon Sep 17 00:00:00 2001
From: CoryMartin-NOAA <cory.r.martin@noaa.gov>
Date: Fri, 19 Aug 2022 17:53:49 +0000
Subject: [PATCH 07/13] Add ATMA to setup_expt

---
 workflow/setup_expt.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/workflow/setup_expt.py b/workflow/setup_expt.py
index 566e936d24c..85145f64720 100755
--- a/workflow/setup_expt.py
+++ b/workflow/setup_expt.py
@@ -228,7 +228,7 @@ def input_args():
     cycled.add_argument('--nens', help='number of ensemble members',
                         type=int, required=False, default=20)
     cycled.add_argument('--app', help='UFS application', type=str,
-                        choices=['ATM', 'ATMW'], required=False, default='ATM')
+                        choices=['ATM', 'ATMW', 'ATMA'], required=False, default='ATM')
 
     # forecast only mode additional arguments
     forecasts.add_argument('--app', help='UFS application', type=str, choices=[

From c1b7863a646189b361842f9a264144c41d1c8f47 Mon Sep 17 00:00:00 2001
From: Cory Martin <cory.r.martin@noaa.gov>
Date: Fri, 19 Aug 2022 14:07:34 -0500
Subject: [PATCH 08/13] bugfix for property

---
 workflow/rocoto/workflow_tasks.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/workflow/rocoto/workflow_tasks.py b/workflow/rocoto/workflow_tasks.py
index 7d84658d682..36d21f820a5 100644
--- a/workflow/rocoto/workflow_tasks.py
+++ b/workflow/rocoto/workflow_tasks.py
@@ -522,7 +522,7 @@ def fcst(self):
                     'cycled': self._fcst_cycled}
 
         try:
-            task = fcst_map[self.app_config.mode]
+            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' +
@@ -530,7 +530,6 @@ def fcst(self):
 
         return task
 
-    @property
     def _fcst_forecast_only(self):
         dependencies = []
 
@@ -583,7 +582,6 @@ def _fcst_forecast_only(self):
 
         return task
 
-    @property
     def _fcst_cycled(self):
 
         dep_dict = {'type': 'task', 'name': f'{self.cdump}sfcanl'}

From 781e2151de8abd8ffecd72ea6cffddf83b28fa6e Mon Sep 17 00:00:00 2001
From: Cory Martin <cory.r.martin@noaa.gov>
Date: Fri, 19 Aug 2022 14:27:32 -0500
Subject: [PATCH 09/13] Add newline for cycledef

---
 workflow/rocoto/workflow_xml.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/workflow/rocoto/workflow_xml.py b/workflow/rocoto/workflow_xml.py
index e0786964f99..440ff93db53 100644
--- a/workflow/rocoto/workflow_xml.py
+++ b/workflow/rocoto/workflow_xml.py
@@ -113,7 +113,7 @@ def _get_cycledefs_cycled(self):
         sdate = self._base['SDATE'].strftime('%Y%m%d%H%M')
         edate = self._base['EDATE'].strftime('%Y%m%d%H%M')
         interval = self._base.get('INTERVAL', '06:00:00')
-        strings = [f'\t<cycledef group="gdas" >{sdate} {edate} {interval}</cycledef>']
+        strings = [f'\t<cycledef group="gdas" >{sdate} {edate} {interval}</cycledef>\n']
 
         if self._app_config.gfs_cyc != 0:
             sdate_gfs = self._base['SDATE_GFS'].strftime('%Y%m%d%H%M')

From 91fac1a026c75d4dd24ff7fe7ef0bc83872af7dd Mon Sep 17 00:00:00 2001
From: Cory Martin <cory.r.martin@noaa.gov>
Date: Fri, 19 Aug 2022 14:27:44 -0500
Subject: [PATCH 10/13] Dummy rocoto jobs

---
 jobs/rocoto/aeroanlfinal.sh | 10 ++++++++++
 jobs/rocoto/aeroanlinit.sh  | 10 ++++++++++
 jobs/rocoto/aeroanlrun.sh   | 10 ++++++++++
 3 files changed, 30 insertions(+)
 create mode 100755 jobs/rocoto/aeroanlfinal.sh
 create mode 100755 jobs/rocoto/aeroanlinit.sh
 create mode 100755 jobs/rocoto/aeroanlrun.sh

diff --git a/jobs/rocoto/aeroanlfinal.sh b/jobs/rocoto/aeroanlfinal.sh
new file mode 100755
index 00000000000..bf3772bfaf1
--- /dev/null
+++ b/jobs/rocoto/aeroanlfinal.sh
@@ -0,0 +1,10 @@
+#!/bin/bash -x
+
+###############################################################
+# Source FV3GFS workflow modules
+. $HOMEgfs/ush/load_fv3gfs_modules.sh
+status=$?
+[[ $status -ne 0 ]] && exit $status
+
+###############################################################
+echo "Do nothing for now"
diff --git a/jobs/rocoto/aeroanlinit.sh b/jobs/rocoto/aeroanlinit.sh
new file mode 100755
index 00000000000..bf3772bfaf1
--- /dev/null
+++ b/jobs/rocoto/aeroanlinit.sh
@@ -0,0 +1,10 @@
+#!/bin/bash -x
+
+###############################################################
+# Source FV3GFS workflow modules
+. $HOMEgfs/ush/load_fv3gfs_modules.sh
+status=$?
+[[ $status -ne 0 ]] && exit $status
+
+###############################################################
+echo "Do nothing for now"
diff --git a/jobs/rocoto/aeroanlrun.sh b/jobs/rocoto/aeroanlrun.sh
new file mode 100755
index 00000000000..bf3772bfaf1
--- /dev/null
+++ b/jobs/rocoto/aeroanlrun.sh
@@ -0,0 +1,10 @@
+#!/bin/bash -x
+
+###############################################################
+# Source FV3GFS workflow modules
+. $HOMEgfs/ush/load_fv3gfs_modules.sh
+status=$?
+[[ $status -ne 0 ]] && exit $status
+
+###############################################################
+echo "Do nothing for now"

From bf0d60ca973f2273673c649ced23d0ac77f032cd Mon Sep 17 00:00:00 2001
From: Cory Martin <cory.r.martin@noaa.gov>
Date: Mon, 22 Aug 2022 18:30:06 +0000
Subject: [PATCH 11/13] Apply suggestions from code review

Co-authored-by: Rahul Mahajan <aerorahul@users.noreply.github.com>
---
 workflow/rocoto/workflow_tasks.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/workflow/rocoto/workflow_tasks.py b/workflow/rocoto/workflow_tasks.py
index 36d21f820a5..47ff2ae461a 100644
--- a/workflow/rocoto/workflow_tasks.py
+++ b/workflow/rocoto/workflow_tasks.py
@@ -469,11 +469,9 @@ def aeroanlinit(self):
         deps.append(rocoto.add_dependency(dep_dict))
         dependencies = rocoto.create_dependency(dep_condition='and', dep=deps)
 
-        cycledef = self.cdump
 
         resources = self.get_resource('aeroanlinit')
-        task = create_wf_task('aeroanlinit', resources, cdump=self.cdump, envar=self.envars, dependency=dependencies,
-                              cycledef=cycledef)
+        task = create_wf_task('aeroanlinit', resources, cdump=self.cdump, envar=self.envars, dependency=dependencies)
         return task
 
     def aeroanlrun(self):

From 62857f47d0df6d510daa5f677900be8d71e4a5a4 Mon Sep 17 00:00:00 2001
From: Rahul Mahajan <aerorahul@users.noreply.github.com>
Date: Mon, 22 Aug 2022 17:29:13 -0400
Subject: [PATCH 12/13] Update workflow/rocoto/workflow_tasks.py

---
 workflow/rocoto/workflow_tasks.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/workflow/rocoto/workflow_tasks.py b/workflow/rocoto/workflow_tasks.py
index 47ff2ae461a..06321c3d7eb 100644
--- a/workflow/rocoto/workflow_tasks.py
+++ b/workflow/rocoto/workflow_tasks.py
@@ -469,7 +469,6 @@ def aeroanlinit(self):
         deps.append(rocoto.add_dependency(dep_dict))
         dependencies = rocoto.create_dependency(dep_condition='and', dep=deps)
 
-
         resources = self.get_resource('aeroanlinit')
         task = create_wf_task('aeroanlinit', resources, cdump=self.cdump, envar=self.envars, dependency=dependencies)
         return task

From 926f13aed132fdb5aff18ff39c1bab05b536ef75 Mon Sep 17 00:00:00 2001
From: Cory Martin <cory.r.martin@noaa.gov>
Date: Tue, 23 Aug 2022 11:14:24 -0500
Subject: [PATCH 13/13] Fix headers of rocoto job scripts

---
 jobs/rocoto/aeroanlfinal.sh   | 4 +++-
 jobs/rocoto/aeroanlinit.sh    | 4 +++-
 jobs/rocoto/aeroanlrun.sh     | 4 +++-
 jobs/rocoto/atmanalpost.sh    | 4 +++-
 jobs/rocoto/atmanalprep.sh    | 4 +++-
 jobs/rocoto/atmanalrun.sh     | 4 +++-
 jobs/rocoto/atmensanalpost.sh | 4 +++-
 jobs/rocoto/atmensanalprep.sh | 4 +++-
 jobs/rocoto/atmensanalrun.sh  | 4 +++-
 9 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/jobs/rocoto/aeroanlfinal.sh b/jobs/rocoto/aeroanlfinal.sh
index bf3772bfaf1..1906cc1e7fb 100755
--- a/jobs/rocoto/aeroanlfinal.sh
+++ b/jobs/rocoto/aeroanlfinal.sh
@@ -1,4 +1,6 @@
-#!/bin/bash -x
+#! /usr/bin/env bash
+
+source "$HOMEgfs/ush/preamble.sh"
 
 ###############################################################
 # Source FV3GFS workflow modules
diff --git a/jobs/rocoto/aeroanlinit.sh b/jobs/rocoto/aeroanlinit.sh
index bf3772bfaf1..1906cc1e7fb 100755
--- a/jobs/rocoto/aeroanlinit.sh
+++ b/jobs/rocoto/aeroanlinit.sh
@@ -1,4 +1,6 @@
-#!/bin/bash -x
+#! /usr/bin/env bash
+
+source "$HOMEgfs/ush/preamble.sh"
 
 ###############################################################
 # Source FV3GFS workflow modules
diff --git a/jobs/rocoto/aeroanlrun.sh b/jobs/rocoto/aeroanlrun.sh
index bf3772bfaf1..1906cc1e7fb 100755
--- a/jobs/rocoto/aeroanlrun.sh
+++ b/jobs/rocoto/aeroanlrun.sh
@@ -1,4 +1,6 @@
-#!/bin/bash -x
+#! /usr/bin/env bash
+
+source "$HOMEgfs/ush/preamble.sh"
 
 ###############################################################
 # Source FV3GFS workflow modules
diff --git a/jobs/rocoto/atmanalpost.sh b/jobs/rocoto/atmanalpost.sh
index 90a9b9bacef..a54b7d5a7d7 100755
--- a/jobs/rocoto/atmanalpost.sh
+++ b/jobs/rocoto/atmanalpost.sh
@@ -1,4 +1,6 @@
-#!/bin/bash -x
+#! /usr/bin/env bash
+
+source "$HOMEgfs/ush/preamble.sh"
 
 ###############################################################
 # Source FV3GFS workflow modules
diff --git a/jobs/rocoto/atmanalprep.sh b/jobs/rocoto/atmanalprep.sh
index e4b76c84071..c6df5287d7b 100755
--- a/jobs/rocoto/atmanalprep.sh
+++ b/jobs/rocoto/atmanalprep.sh
@@ -1,4 +1,6 @@
-#!/bin/bash -x
+#! /usr/bin/env bash
+
+source "$HOMEgfs/ush/preamble.sh"
 
 ###############################################################
 # Source FV3GFS workflow modules
diff --git a/jobs/rocoto/atmanalrun.sh b/jobs/rocoto/atmanalrun.sh
index cebe478b7e8..0768f2f55dd 100755
--- a/jobs/rocoto/atmanalrun.sh
+++ b/jobs/rocoto/atmanalrun.sh
@@ -1,4 +1,6 @@
-#!/bin/bash -x
+#! /usr/bin/env bash
+
+source "$HOMEgfs/ush/preamble.sh"
 
 ###############################################################
 # Source FV3GFS workflow modules
diff --git a/jobs/rocoto/atmensanalpost.sh b/jobs/rocoto/atmensanalpost.sh
index ea6e490f20d..f06f5aa01cf 100755
--- a/jobs/rocoto/atmensanalpost.sh
+++ b/jobs/rocoto/atmensanalpost.sh
@@ -1,4 +1,6 @@
-#!/bin/bash -x
+#! /usr/bin/env bash
+
+source "$HOMEgfs/ush/preamble.sh"
 
 ###############################################################
 # Source FV3GFS workflow modules
diff --git a/jobs/rocoto/atmensanalprep.sh b/jobs/rocoto/atmensanalprep.sh
index 5ed434c6bfe..19ec88f87ce 100755
--- a/jobs/rocoto/atmensanalprep.sh
+++ b/jobs/rocoto/atmensanalprep.sh
@@ -1,4 +1,6 @@
-#!/bin/bash -x
+#! /usr/bin/env bash
+
+source "$HOMEgfs/ush/preamble.sh"
 
 ###############################################################
 # Source FV3GFS workflow modules
diff --git a/jobs/rocoto/atmensanalrun.sh b/jobs/rocoto/atmensanalrun.sh
index ddb3bb14322..5899eeaf403 100755
--- a/jobs/rocoto/atmensanalrun.sh
+++ b/jobs/rocoto/atmensanalrun.sh
@@ -1,4 +1,6 @@
-#!/bin/bash -x
+#! /usr/bin/env bash
+
+source "$HOMEgfs/ush/preamble.sh"
 
 ###############################################################
 # Source FV3GFS workflow modules