Skip to content

Commit 692e3fc

Browse files
Add in stubs for aerosol DA tasks + bugfix for setup_expt where cycled and ATMA are used (#990)
This PR adds in stubs for aerosol DA tasks (jobs/rocoto shell scripts), the ability for setup_expt and setup_xml to include three aerosol DA related tasks, and in the process of adding this capability, fixes a bug in which the combination of ATMA and cycled revealed that @Property was being used incorrectly. Fixes #981
1 parent da164f8 commit 692e3fc

File tree

13 files changed

+112
-11
lines changed

13 files changed

+112
-11
lines changed

jobs/rocoto/aeroanlfinal.sh

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
#! /usr/bin/env bash
2+
3+
source "$HOMEgfs/ush/preamble.sh"
4+
5+
###############################################################
6+
# Source FV3GFS workflow modules
7+
. $HOMEgfs/ush/load_fv3gfs_modules.sh
8+
status=$?
9+
[[ $status -ne 0 ]] && exit $status
10+
11+
###############################################################
12+
echo "Do nothing for now"

jobs/rocoto/aeroanlinit.sh

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
#! /usr/bin/env bash
2+
3+
source "$HOMEgfs/ush/preamble.sh"
4+
5+
###############################################################
6+
# Source FV3GFS workflow modules
7+
. $HOMEgfs/ush/load_fv3gfs_modules.sh
8+
status=$?
9+
[[ $status -ne 0 ]] && exit $status
10+
11+
###############################################################
12+
echo "Do nothing for now"

jobs/rocoto/aeroanlrun.sh

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
#! /usr/bin/env bash
2+
3+
source "$HOMEgfs/ush/preamble.sh"
4+
5+
###############################################################
6+
# Source FV3GFS workflow modules
7+
. $HOMEgfs/ush/load_fv3gfs_modules.sh
8+
status=$?
9+
[[ $status -ne 0 ]] && exit $status
10+
11+
###############################################################
12+
echo "Do nothing for now"

jobs/rocoto/atmanalpost.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
#!/bin/bash -x
1+
#! /usr/bin/env bash
2+
3+
source "$HOMEgfs/ush/preamble.sh"
24

35
###############################################################
46
# Source FV3GFS workflow modules

jobs/rocoto/atmanalprep.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
#!/bin/bash -x
1+
#! /usr/bin/env bash
2+
3+
source "$HOMEgfs/ush/preamble.sh"
24

35
###############################################################
46
# Source FV3GFS workflow modules

jobs/rocoto/atmanalrun.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
#!/bin/bash -x
1+
#! /usr/bin/env bash
2+
3+
source "$HOMEgfs/ush/preamble.sh"
24

35
###############################################################
46
# Source FV3GFS workflow modules

jobs/rocoto/atmensanalpost.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
#!/bin/bash -x
1+
#! /usr/bin/env bash
2+
3+
source "$HOMEgfs/ush/preamble.sh"
24

35
###############################################################
46
# Source FV3GFS workflow modules

jobs/rocoto/atmensanalprep.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
#!/bin/bash -x
1+
#! /usr/bin/env bash
2+
3+
source "$HOMEgfs/ush/preamble.sh"
24

35
###############################################################
46
# Source FV3GFS workflow modules

jobs/rocoto/atmensanalrun.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
#!/bin/bash -x
1+
#! /usr/bin/env bash
2+
3+
source "$HOMEgfs/ush/preamble.sh"
24

35
###############################################################
46
# Source FV3GFS workflow modules

workflow/applications.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -217,6 +217,9 @@ def _cycled_configs(self):
217217
if self.do_wafs:
218218
configs += ['wafs', 'wafsgrib2', 'wafsblending', 'wafsgcip', 'wafsgrib20p25', 'wafsblending0p25']
219219

220+
if self.do_aero:
221+
configs += ['aeroanlinit', 'aeroanlrun', 'aeroanlfinal']
222+
220223
return configs
221224

222225
@property
@@ -348,6 +351,9 @@ def _get_cycled_task_names(self):
348351

349352
gdas_gfs_common_tasks_before_fcst += ['sfcanl', 'analcalc']
350353

354+
if self.do_aero:
355+
gdas_gfs_common_tasks_before_fcst += ['aeroanlinit', 'aeroanlrun', 'aeroanlfinal']
356+
351357
gldas_tasks = ['gldas']
352358
wave_prep_tasks = ['waveinit', 'waveprep']
353359
wave_bndpnt_tasks = ['wavepostbndpnt', 'wavepostbndpntbll']

0 commit comments

Comments
 (0)