Skip to content

Revamp obs staging and analysis stats job #4306

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
DavidHuber-NOAA merged 73 commits into from
Dec 19, 2025
Merged

Revamp obs staging and analysis stats job #4306

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
73 commits
Select commit Hold shift + click to select a range
78a0279
Initial commit
DavidNew-NOAA Nov 5, 2025
8fdd557
Update gdas hash
DavidNew-NOAA Nov 5, 2025
d5c4519
Save changes
DavidNew-NOAA Nov 6, 2025
f32e97f
Debug
DavidNew-NOAA Nov 6, 2025
0b62b7e
mkdir obs, diags, and bc in stage_obs()
DavidNew-NOAA Nov 6, 2025
a8fc75a
Attempt to fix weird pynorms
DavidNew-NOAA Nov 7, 2025
b061def
pynorms?
DavidNew-NOAA Nov 7, 2025
a771101
Tinkering
DavidNew-NOAA Nov 7, 2025
f623e6d
Update
DavidNew-NOAA Nov 13, 2025
ce8a749
Clean up
DavidNew-NOAA Nov 13, 2025
2524219
Slight name change
DavidNew-NOAA Nov 13, 2025
a690382
Debug
DavidNew-NOAA Nov 14, 2025
0185dc6
Debug
DavidNew-NOAA Nov 21, 2025
df6a972
Merge branch 'develop' into feature/stage-obs
DavidNew-NOAA Nov 21, 2025
9c83b2f
pynorms
DavidNew-NOAA Nov 21, 2025
a425b44
Update
DavidNew-NOAA Nov 21, 2025
619bb93
Update
DavidNew-NOAA Dec 1, 2025
68f4390
debug
DavidNew-NOAA Dec 1, 2025
cb40af6
Merge remote-tracking branch 'origin/develop' into feature/stage-obs
DavidNew-NOAA Dec 1, 2025
b19b8d3
Debug and new features
DavidNew-NOAA Dec 3, 2025
e62a3f9
Missed files in last commit
DavidNew-NOAA Dec 3, 2025
39c4e46
Move diag files and bias corrections to come with JEDI class methods
DavidNew-NOAA Dec 4, 2025
f305ccc
Some logs, etc
DavidNew-NOAA Dec 4, 2025
37e8d0e
Minor change
DavidNew-NOAA Dec 4, 2025
e46c347
Debug
DavidNew-NOAA Dec 8, 2025
f8486f9
Missing files
DavidNew-NOAA Dec 8, 2025
cc8f48e
Merge branch 'develop' into feature/stage-obs
DavidNew-NOAA Dec 8, 2025
8f42352
Revamp somethings
DavidNew-NOAA Dec 8, 2025
6289e2b
Merge branch 'develop' into feature/stage-obs
DavidNew-NOAA Dec 8, 2025
35b2088
debug
DavidNew-NOAA Dec 9, 2025
cd8e70e
Merge branch 'develop' into feature/stage-obs
DavidNew-NOAA Dec 9, 2025
0a845f9
Debug
DavidNew-NOAA Dec 10, 2025
ec82ecb
Merge branch 'develop' into feature/stage-obs
DavidNew-NOAA Dec 10, 2025
443dc99
pynorms
DavidNew-NOAA Dec 10, 2025
9b9e4f1
pynorms
DavidNew-NOAA Dec 10, 2025
5f9c885
pynorms
DavidNew-NOAA Dec 10, 2025
39e92d0
Fully move obs handling to Jedi class from Analysis class
DavidNew-NOAA Dec 10, 2025
b915344
Commit clean up jedi.py
DavidNew-NOAA Dec 10, 2025
7a560df
Update gdas hash
DavidNew-NOAA Dec 10, 2025
fd8ad60
Updates
DavidNew-NOAA Dec 11, 2025
ac0d1f9
Mistake
DavidNew-NOAA Dec 11, 2025
cb1dff1
Mistake
DavidNew-NOAA Dec 11, 2025
f26d230
Polishing up
DavidNew-NOAA Dec 11, 2025
0481d79
Merge branch 'develop' into feature/stage-obs
DavidNew-NOAA Dec 11, 2025
245641a
pynorms
DavidNew-NOAA Dec 11, 2025
cb4f2bb
pynorms
DavidNew-NOAA Dec 11, 2025
08f9b39
Debug
DavidNew-NOAA Dec 12, 2025
c3223bb
Debug
DavidNew-NOAA Dec 12, 2025
82fc2bb
pynorms
DavidNew-NOAA Dec 12, 2025
e6313eb
Deal with some recent file naming changes in GSI
DavidNew-NOAA Dec 12, 2025
d2c91c4
Merge branch 'develop' into feature/stage-obs
DavidNew-NOAA Dec 12, 2025
86af11c
Address reviewer comment
DavidNew-NOAA Dec 15, 2025
5c4d2ee
Merge branch 'develop' into feature/stage-obs
DavidNew-NOAA Dec 15, 2025
d2bf1df
Remove vestigal lines from config files
DavidNew-NOAA Dec 15, 2025
d134064
Changes to get around JCB client integration testing issues
DavidNew-NOAA Dec 15, 2025
c90a6fb
Merge branch 'develop' into feature/stage-obs
DavidNew-NOAA Dec 15, 2025
cfdedae
pynorms
DavidNew-NOAA Dec 15, 2025
9e4c8d3
Update gdas hash
DavidNew-NOAA Dec 16, 2025
e5aa578
Merge branch 'develop' into feature/stage-obs
DavidNew-NOAA Dec 16, 2025
24cad90
Address reviewer comment
DavidNew-NOAA Dec 16, 2025
c13b20b
pynorms
DavidNew-NOAA Dec 16, 2025
eea3d77
Missed change on previous commit
DavidNew-NOAA Dec 16, 2025
372efbf
Merge branch 'develop' into feature/stage-obs
DavidNew-NOAA Dec 16, 2025
870d796
Update gdas hash
DavidNew-NOAA Dec 17, 2025
d1c57c6
Update gdas hash
DavidNew-NOAA Dec 17, 2025
ed527cd
Update gdas hash
DavidNew-NOAA Dec 18, 2025
4d99ad1
Merge branch 'develop' into feature/stage-obs
DavidNew-NOAA Dec 18, 2025
0445fdd
Update gdas hash
DavidNew-NOAA Dec 18, 2025
8c8aa9d
Update gdas hash
DavidNew-NOAA Dec 19, 2025
d006c61
Merge branch 'develop' into feature/stage-obs
DavidNew-NOAA Dec 19, 2025
e7cdc2e
Update GDAS hash to develop
DavidNew-NOAA Dec 19, 2025
8b3191a
Merge branch 'develop' into feature/stage-obs
DavidHuber-NOAA Dec 19, 2025
92cc7ef
Merge branch 'develop' into feature/stage-obs
DavidHuber-NOAA Dec 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 26 additions & 12 deletions dev/jobs/JGLOBAL_ANALYSIS_STATS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,20 +11,34 @@ source "${HOMEgfs}/ush/jjob_header.sh" -e "anlstat" -c "base anlstat"
##############################################

# Generate COM variables from templates
YMD=${PDY} HH=${cyc} declare_from_tmpl -rx COMIN_OBS:COM_OBS_TMPL \

YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \
COMIN_OBS:COM_OBS_TMPL \
COMOUT_CONF:COM_CONF_TMPL \
COMIN_ATMOS_ANALYSIS:COM_ATMOS_ANALYSIS_TMPL \
COMIN_OCEAN_ANALYSIS:COM_OCEAN_ANALYSIS_TMPL \
COMIN_AERO_ANALYSIS:COM_CHEM_ANALYSIS_TMPL \
COMIN_SNOW_ANALYSIS:COM_SNOW_ANALYSIS_TMPL \
COMOUT_ATMOS_ANALYSIS:COM_ATMOS_ANALYSIS_TMPL \
COMOUT_OCEAN_ANALYSIS:COM_OCEAN_ANALYSIS_TMPL \
COMOUT_AERO_ANALYSIS:COM_CHEM_ANALYSIS_TMPL \
COMOUT_SNOW_ANALYSIS:COM_SNOW_ANALYSIS_TMPL \
COMOUT_CONF:COM_CONF_TMPL \
COMOUT_ATMOS_ANLMON:COM_ATMOS_ANLMON_TMPL \
COMOUT_OCEAN_ANLMON:COM_OCEAN_ANLMON_TMPL \
COMOUT_AERO_ANLMON:COM_CHEM_ANLMON_TMPL \
COMOUT_SNOW_ANLMON:COM_SNOW_ANLMON_TMPL
COMOUT_ATMOS_ANLMON:COM_ATMOS_ANLMON_TMPL
mkdir -m 755 -p "${COMOUT_ATMOS_ANALYSIS}"
mkdir -m 755 -p "${COMOUT_ATMOS_ANLMON}"
mkdir -m 755 -p "${COMOUT_CONF}"

if [[ "${DO_AERO_ANL:-NO}" == "YES" ]]; then
YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \
COMIN_AERO_ANALYSIS:COM_CHEM_ANALYSIS_TMPL \
COMOUT_AERO_ANALYSIS:COM_CHEM_ANALYSIS_TMPL \
COMOUT_AERO_ANLMON:COM_CHEM_ANLMON_TMPL
mkdir -m 755 -p "${COMOUT_AERO_ANALYSIS}"
mkdir -m 755 -p "${COMOUT_AERO_ANLMON}"
fi

if [[ "${DO_JEDISNOWDA:-NO}" == "YES" ]]; then
YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \
COMIN_SNOW_ANALYSIS:COM_SNOW_ANALYSIS_TMPL \
COMOUT_SNOW_ANALYSIS:COM_SNOW_ANALYSIS_TMPL \
COMOUT_SNOW_ANLMON:COM_SNOW_ANLMON_TMPL
mkdir -m 755 -p "${COMOUT_SNOW_ANALYSIS}"
mkdir -m 755 -p "${COMOUT_SNOW_ANLMON}"
fi

###############################################################
# Run relevant script
Expand Down
1 change: 0 additions & 1 deletion dev/parm/config/gcafs/config.aeroanl.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ export STATICB_TYPE='diffusion'

export TASK_CONFIG_YAML="${PARMgfs}/gdas/aero/aero_det_config.yaml.j2"
export OBS_LIST_YAML="${PARMgfs}/gdas/aero/aero_obs_list.yaml.j2"
export BIAS_FILES_YAML="${PARMgfs}/gdas/aero/aero_bias_files.yaml.j2"

export io_layout_x="{{ IO_LAYOUT_X }}"
export io_layout_y="{{ IO_LAYOUT_Y }}"
Expand Down
1 change: 0 additions & 1 deletion dev/parm/config/gcafs/config.aeroanlgenb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ source "${EXPDIR}/config.resources" aeroanlgenb

export TASK_CONFIG_YAML="${PARMgfs}/gdas/aero/aero_bmat_config.yaml.j2"
export OBS_LIST_YAML="${PARMgfs}/gdas/aero/aero_obs_list.yaml.j2"
export BIAS_FILES_YAML="${PARMgfs}/gdas/aero/aero_bias_files.yaml.j2"

export aero_diffusion_iter=200
export aero_diffusion_horiz_len=300e3
Expand Down
3 changes: 1 addition & 2 deletions dev/parm/config/gcafs/config.anlstat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ echo "BEGIN: config.anlstat"
# Get task specific resources
source "${EXPDIR}/config.resources" anlstat

export JEDI_CONFIG_YAML="${PARMgfs}/gdas/anlstat/anlstat_jedi_config.yaml.j2"
export BASE_CONFIG_YAML="${PARMgfs}/gdas/anlstat/anlstat_base_config.yaml.j2"
export TASK_CONFIG_YAML="${PARMgfs}/gdas/anlstat/anlstat_config.yaml.j2"

echo "END: config.anlstat"
1 change: 0 additions & 1 deletion dev/parm/config/gfs/config.aeroanl.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ export STATICB_TYPE='diffusion'

export TASK_CONFIG_YAML="${PARMgfs}/gdas/aero/aero_det_config.yaml.j2"
export OBS_LIST_YAML="${PARMgfs}/gdas/aero/aero_obs_list.yaml.j2"
export BIAS_FILES_YAML="${PARMgfs}/gdas/aero/aero_bias_files.yaml.j2"

export io_layout_x="{{ IO_LAYOUT_X }}"
export io_layout_y="{{ IO_LAYOUT_Y }}"
Expand Down
1 change: 0 additions & 1 deletion dev/parm/config/gfs/config.aeroanlgenb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ source "${EXPDIR}/config.resources" aeroanlgenb

export TASK_CONFIG_YAML="${PARMgfs}/gdas/aero/aero_bmat_config.yaml.j2"
export OBS_LIST_YAML="${PARMgfs}/gdas/aero/aero_obs_list.yaml.j2"
export BIAS_FILES_YAML="${PARMgfs}/gdas/aero/aero_bias_files.yaml.j2"

export aero_diffusion_iter=200
export aero_diffusion_horiz_len=300e3
Expand Down
3 changes: 1 addition & 2 deletions dev/parm/config/gfs/config.anlstat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ echo "BEGIN: config.anlstat"
# Get task specific resources
source "${EXPDIR}/config.resources" anlstat

export JEDI_CONFIG_YAML="${PARMgfs}/gdas/anlstat/anlstat_jedi_config.yaml.j2"
export BASE_CONFIG_YAML="${PARMgfs}/gdas/anlstat/anlstat_base_config.yaml.j2"
export TASK_CONFIG_YAML="${PARMgfs}/gdas/anlstat/anlstat_config.yaml.j2"

echo "END: config.anlstat"
1 change: 0 additions & 1 deletion dev/parm/config/gfs/config.atmanl.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ export io_layout_x="{{ IO_LAYOUT_X }}"
export io_layout_y="{{ IO_LAYOUT_Y }}"

export TASK_CONFIG_YAML="${PARMgfs}/gdas/atm/atm_det_config.yaml.j2"
export BIAS_FILES_YAML="${PARMgfs}/gdas/atm/atm_bias_files.yaml.j2"

export LOCALIZATION_TYPE="bump"

Expand Down
1 change: 0 additions & 1 deletion dev/parm/config/gfs/config.atmensanl.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,5 @@ export io_layout_x="{{ IO_LAYOUT_X }}"
export io_layout_y="{{ IO_LAYOUT_Y }}"

export TASK_CONFIG_YAML="${PARMgfs}/gdas/atm/atm_ens_config.yaml.j2"
export BIAS_FILES_YAML="${PARMgfs}/gdas/atm/atm_bias_files.yaml.j2"

echo "END: config.atmensanl"
27 changes: 14 additions & 13 deletions dev/scripts/exglobal_analysis_stats.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,23 +20,24 @@
# Take configuration from environment and cast it as python dictionary
config = cast_strdict_as_dtypedict(os.environ)

# Instantiate the atm analysis task
AnlStats = AnalysisStats(config)

# Create list based on DA components
AnlStats.task_config['STAT_ANALYSES'] = []
if AnlStats.task_config.DO_AERO_ANL:
AnlStats.task_config['STAT_ANALYSES'].append('aero')
if AnlStats.task_config.DO_JEDISNOWDA:
AnlStats.task_config['STAT_ANALYSES'].append('snow')
if AnlStats.task_config.DO_JEDIATMVAR:
AnlStats.task_config['STAT_ANALYSES'].append('atmos')
config.STAT_ANALYSES = []
if config.DO_AERO_ANL:
config.STAT_ANALYSES.append('aero')
if config.DO_JEDISNOWDA:
config.STAT_ANALYSES.append('snow')
if config.DO_JEDIATMVAR:
config.STAT_ANALYSES.append('atmos')
else:
AnlStats.task_config['STAT_ANALYSES'].append('atmos_gsi')
AnlStats.convert_gsi_diags()
config.STAT_ANALYSES.append('atmos_gsi')

# Instantiate the analysis stats task
AnlStats = AnalysisStats(config)

# Initialize JEDI variational analysis
if not config.DO_JEDIATMVAR:
AnlStats.convert_gsi_diags()
AnlStats.initialize()
for anl in AnlStats.task_config.STAT_ANALYSES:
for anl in config.STAT_ANALYSES:
AnlStats.execute(anl)
AnlStats.finalize(anl)
4 changes: 2 additions & 2 deletions parm/archive/enkf.yaml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ enkf:
"correction_increment.yaml",
"ensemble_recenter.yaml"] %}
{% else %}
{% set da_stat_files = ["stat.atm.tar"]%}
{% set da_stat_files = ["atmos_analysis.ioda_hofx.ens_mean.tar.gz"]%}
{% set da_conf_files = ["atmensanlletkf.yaml",
"atmensanlfv3inc.yaml",
"correction_increment.yaml",
Expand All @@ -98,7 +98,7 @@ enkf:
{% endfor %}

{% if DO_JEDISNOWDA %}
- "{{ COMIN_SNOW_ANALYSIS_ENSSTAT | relpath(ROTDIR) }}/{{ head }}snow_analysis.ioda_hofx.ensmean.tar"
- "{{ COMIN_SNOW_ANALYSIS_ENSSTAT | relpath(ROTDIR) }}/{{ head }}snow_analysis.ioda_hofx.ensmean.tar.gz"
{% for itile in range(1,7) %}
# Snow analysis is 3dvar
- "{{ COMIN_SNOW_ANALYSIS_ENSSTAT | relpath(ROTDIR) }}/{{ cycle_YMD }}.{{ cycle_HH }}0000.snow_increment.sfc_data.tile{{ itile }}.nc"
Expand Down
2 changes: 1 addition & 1 deletion parm/archive/gcafs_arcdir.yaml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ copy_req:
{% if MODE == "cycled" %}
# Deterministic analysis files (cycled mode only) - REQUIRED
{% if DO_AERO_ANL %}
- ["{{ COMIN_CHEM_ANALYSIS }}/{{ head }}aerostat.tgz",
- ["{{ COMIN_CHEM_ANALYSIS }}/{{ head }}aero_analysis.ioda_hofx.tar.gz",
"{{ ARCDIR }}/aerostat.{{ RUN }}.{{ cycle_YMDH }}.tgz"]
{% endif %}

Expand Down
10 changes: 7 additions & 3 deletions parm/archive/gdas.yaml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ gdas:
{% if DO_JEDIATMVAR %}
- "{{ COMIN_CONF | relpath(ROTDIR) }}/{{ head }}anlvar.atm.yaml"
- "{{ COMIN_CONF | relpath(ROTDIR) }}/{{ head }}anlvar.fv3.atm.yaml"
- "{{ COMIN_ATMOS_ANALYSIS | relpath(ROTDIR) }}/{{ head }}stat.atm.tar"
- "{{ COMIN_ATMOS_ANALYSIS | relpath(ROTDIR) }}/{{ head }}atmos_analysis.ioda_hofx.tar.gz"
- "{{ COMIN_ATMOS_ANLMON | relpath(ROTDIR) }}/{{ head }}atmos_analysis.ioda_hofx_stats.tar.gz"
{% else %}
- "{{ COMIN_ATMOS_ANALYSIS | relpath(ROTDIR) }}/{{ head }}gsistat.txt"
Expand All @@ -96,7 +96,8 @@ gdas:
- "{{ COMIN_ATMOS_ANALYSIS | relpath(ROTDIR) }}/{{ head }}abias_int.txt"
{% endif %}
{% if DO_AERO_ANL %}
- "{{ COMIN_CHEM_ANALYSIS | relpath(ROTDIR) }}/{{ head }}aerostat.tgz"
- "{{ COMIN_CHEM_ANALYSIS | relpath(ROTDIR) }}/{{ head }}aero_analysis.ioda_hofx.tar.gz"
- "{{ COMIN_CHEM_ANLMON | relpath(ROTDIR) }}/{{ head }}aero_analysis.ioda_hofx_stats.tar.gz"
- "{{ COMIN_CONF | relpath(ROTDIR) }}/{{ head }}aerovar.yaml"
{% for itile in range(1,7) %}
- "{{ COMIN_CHEM_ANALYSIS | relpath(ROTDIR) }}/aeroinc.{{ cycle_YMD }}.{{ cycle_HH }}0000.fv_tracer.res.tile{{ itile }}.nc"
Expand All @@ -106,13 +107,16 @@ gdas:
- "{{ COMIN_OBS | relpath(ROTDIR) }}/{{ head }}aeroobs"
- "{{ COMIN_OBS | relpath(ROTDIR) }}/{{ head }}aerorawobs"
{% endif %}
{% if DO_JEDIOCNVAR %}
- "{{ COMIN_OCEAN_ANALYSIS | relpath(ROTDIR) }}/{{ head }}marine_analysis.ioda_hofx.tar.gz"
{% endif %}

# Snow analysis data
{% if DO_JEDISNOWDA %}
{% for itile in range(1,7) %}
- "{{ COMIN_SNOW_ANALYSIS | relpath(ROTDIR) }}/{{ current_cycle | to_fv3time }}.snow_increment.sfc_data.tile{{ itile }}.nc"
{% endfor %}
- "{{ COMIN_SNOW_ANALYSIS | relpath(ROTDIR) }}/{{ head }}snow_analysis.ioda_hofx.tar"
- "{{ COMIN_SNOW_ANALYSIS | relpath(ROTDIR) }}/{{ head }}snow_analysis.ioda_hofx.tar.gz"
- "{{ COMIN_CONF | relpath(ROTDIR) }}/{{ head }}snowanlvar.yaml"
- "{{ COMIN_SNOW_ANLMON | relpath(ROTDIR) }}/{{ head }}snow_analysis.ioda_hofx_stats.tar.gz"
{% endif %}
Expand Down
9 changes: 7 additions & 2 deletions parm/archive/gfs_arcdir.yaml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ copy_opt:
"{{ ARCDIR }}/pgbanl.{{ RUN }}.{{ cycle_YMDH }}.grib2"]

{% if DO_JEDIATMVAR == True %}
- ["{{ COMIN_ATMOS_ANALYSIS }}/{{ head }}stat.atm.tar",
- ["{{ COMIN_ATMOS_ANALYSIS }}/{{ head }}atmos_analysis.ioda_hofx.tar.gz",
"{{ ARCDIR }}/atmstat.{{ RUN }}.{{ cycle_YMDH }}"]
{% else %}
- ["{{ COMIN_ATMOS_ANALYSIS }}/{{ head }}gsistat.txt",
Expand All @@ -47,10 +47,15 @@ copy_opt:
{% endif %}

{% if DO_AERO_ANL %}
- ["{{ COMIN_CHEM_ANALYSIS }}/{{ head }}aerostat.tgz",
- ["{{ COMIN_CHEM_ANALYSIS }}/{{ head }}aero_analysis.ioda_hofx.tar.gz",
"{{ ARCDIR }}/aerostat.{{ RUN }}.{{ cycle_YMDH }}.tgz"]
{% endif %}

{% if DO_JEDIOCNVAR %}
- ["{{ COMIN_OCEAN_ANALYSIS }}/{{ head }}marine_analysis.ioda_hofx.tar.gz",
"{{ ARCDIR }}/marinestat.{{ RUN }}.{{ cycle_YMDH }}.tgz"]
{% endif %}

{% if DO_PREP_OBS_AERO == True %}
- ["{{ COMIN_OBS }}/{{ head }}aeroobs",
"{{ ARCDIR }}/aeroobs.{{ RUN }}.{{ cycle_YMDH }}"]
Expand Down
9 changes: 6 additions & 3 deletions parm/archive/gfsa.yaml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,15 @@ gfsa:
{% if DO_JEDIATMVAR %}
- "{{ COMIN_CONF | relpath(ROTDIR) }}/{{ head }}anlvar.atm.yaml"
- "{{ COMIN_CONF | relpath(ROTDIR) }}/{{ head }}anlvar.fv3.atm.yaml"
- "{{ COMIN_ATMOS_ANALYSIS | relpath(ROTDIR) }}/{{ head }}stat.atm.tar"
- "{{ COMIN_ATMOS_ANALYSIS | relpath(ROTDIR) }}/{{ head }}atmos_analysis.ioda_hofx.tar.gz"
{% else %}
- "{{ COMIN_ATMOS_ANALYSIS | relpath(ROTDIR) }}/{{ head }}gsistat.txt"
{% endif %}
{% if DO_AERO_ANL %}
- "{{ COMIN_CHEM_ANALYSIS | relpath(ROTDIR) }}/{{ head }}aerostat.tgz"
- "{{ COMIN_CHEM_ANALYSIS | relpath(ROTDIR) }}/{{ head }}aero_analysis.ioda_hofx.tar.gz"
{% endif %}
{% if DO_JEDIOCNVAR %}
- "{{ COMIN_OCEAN_ANALYSIS | relpath(ROTDIR) }}/{{ head }}marine_analysis.ioda_hofx.tar.gz"
{% endif %}
{% if DO_PREP_OBS_AERO %}
- "{{ COMIN_OBS | relpath(ROTDIR) }}/{{ head }}aeroobs"
Expand All @@ -54,7 +57,7 @@ gfsa:
{% for itile in range(1,7) %}
- "{{ COMIN_SNOW_ANALYSIS | relpath(ROTDIR) }}/{{ current_cycle | to_fv3time }}.snow_increment.sfc_data.tile{{ itile }}.nc"
{% endfor %}
- "{{ COMIN_SNOW_ANALYSIS | relpath(ROTDIR) }}/{{ head }}snow_analysis.ioda_hofx.tar"
- "{{ COMIN_SNOW_ANALYSIS | relpath(ROTDIR) }}/{{ head }}snow_analysis.ioda_hofx.tar.gz"
- "{{ COMIN_CONF | relpath(ROTDIR) }}/{{ head }}snowanlvar.yaml"
{% endif %}

Expand Down
2 changes: 1 addition & 1 deletion parm/archive/master_gcdas.yaml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ datasets:
- "logs/{{ cycle_YMDH }}/{{ RUN }}_aeroanlinit.log"
- "logs/{{ cycle_YMDH }}/{{ RUN }}_aeroanlvar.log"
- "logs/{{ cycle_YMDH }}/{{ RUN }}_aeroanlfinal.log"
- "{{ COMIN_CHEM_ANALYSIS | relpath(ROTDIR) }}/{{ head }}aerostat.tgz"
- "{{ COMIN_CHEM_ANALYSIS | relpath(ROTDIR) }}/{{ head }}aero_analysis.ioda_hofx.tar.gz"
- "{{ COMIN_CONF | relpath(ROTDIR) }}/{{ head }}aerovar.yaml"
{% for itile in range(1,7) %}
- "{{ COMIN_CHEM_ANALYSIS | relpath(ROTDIR) }}/aeroinc.{{ cycle_YMD }}.{{ cycle_HH }}0000.fv_tracer.res.tile{{ itile }}.nc"
Expand Down
2 changes: 1 addition & 1 deletion sorc/gdas.cd
Open in desktop
Submodule gdas.cd updated 82 files
+1 −1 .github/pull_request_template.md
+1 −0 ci/ci_tests.sh
+10 −6 ci/driver.sh
+10 −0 ci/gaeac6.sh
+1 −1 ci/hera.sh
+8 −1 ci/run_ci.sh
+1 −1 ci/stable_driver.sh
+1 −1 ci/ursa.sh
+0 −2 mains/gdas.cc
+3 −3 modulefiles/GDAS/noaacloud.intel.lua
+0 −4 parm/aero/aero_bias_files.yaml.j2
+2 −2 parm/aero/aero_bmat_config.yaml.j2
+4 −11 parm/aero/aero_det_config.yaml.j2
+1 −1 parm/aero/aero_det_inc_vars.yaml
+0 −6 parm/aero/aero_stage_obs.yaml.j2
+4 −6 parm/aero/jcb-base.yaml.j2
+0 −7 parm/aero/jcb-prototype_3dvar.yaml.j2
+2 −2 parm/analcalc/analcalc_config.yaml.j2
+4 −0 parm/anlstat/aero/aero_obs_list.yaml.j2
+15 −12 parm/anlstat/aero/jcb-base.yaml.j2
+0 −60 parm/anlstat/anlstat_base_config.yaml.j2
+48 −0 parm/anlstat/anlstat_config.yaml.j2
+0 −28 parm/anlstat/anlstat_jedi_config.yaml.j2
+5 −0 parm/anlstat/atmos/atmos_obs_list.yaml.j2
+14 −12 parm/anlstat/atmos/jcb-base.yaml.j2
+2 −0 parm/anlstat/atmos_gsi/atmos_gsi_obs_list.yaml.j2
+14 −12 parm/anlstat/atmos_gsi/jcb-base.yaml.j2
+14 −12 parm/anlstat/snow/jcb-base.yaml.j2
+7 −0 parm/anlstat/snow/snow_obs_list.yaml.j2
+0 −10 parm/atm/atm_bias_files.yaml.j2
+5 −12 parm/atm/atm_det_config.yaml.j2
+2 −2 parm/atm/atm_ecen_config.yaml.j2
+7 −12 parm/atm/atm_ens_config.yaml.j2
+1 −1 parm/atm/atm_obs_list.yaml.j2
+0 −6 parm/atm/atm_stage_obs.yaml.j2
+13 −4 parm/atm/jcb-base.yaml.j2
+0 −9 parm/atm/jcb-prototype_3dvar-fv3inc.yaml.j2
+0 −13 parm/atm/jcb-prototype_3dvar.yaml.j2
+0 −7 parm/atm/jcb-prototype_4d.yaml.j2
+0 −9 parm/atm/jcb-prototype_lgetkf-fv3inc.yaml.j2
+1 −1 parm/jcb-algorithms
+1 −1 parm/jcb-gdas
+1 −0 parm/marine/fms/input.nml
+1 −0 parm/marine/fms/input.nml.j2
+0 −5 parm/marine/jcb-prototype_3dfgat.yaml.j2
+0 −5 parm/marine/jcb-prototype_letkf.yaml.j2
+3 −3 parm/marine/marine_bmat_config.yaml.j2
+5 −11 parm/marine/marine_det_config.yaml.j2
+1 −1 parm/marine/marine_ecen_config.yaml.j2
+2 −8 parm/marine/marine_ens_config.yaml.j2
+22 −0 parm/marine/mom_input.nml.j2
+20 −0 parm/marine/mom_input_anlgeom.nml.j2
+0 −1 parm/snow/jcb-base.yaml.j2
+0 −7 parm/snow/jcb-fv3jedi_land_ensrecenter.yaml.j2
+0 −7 parm/snow/jcb-prototype_2dvar.yaml.j2
+2 −3 parm/snow/prep/prep_ims.yaml.j2
+5 −7 parm/snow/snow_det_config.yaml.j2
+7 −9 parm/snow/snow_ens_config.yaml.j2
+1 −1 sorc/da-utils
+1 −1 sorc/fv3-jedi
+1 −1 sorc/ioda
+1 −1 sorc/jcb
+1 −1 sorc/oops
+1 −1 sorc/saber
+1 −1 sorc/soca
+1 −1 sorc/ufo
+2 −2 test/aero/global-workflow/jjob_var_final.sh
+2 −2 test/aero/global-workflow/jjob_var_init.sh
+2 −2 test/aero/global-workflow/jjob_var_run.sh
+2 −2 test/atm/global-workflow/jjob_ens_final.sh
+2 −2 test/atm/global-workflow/jjob_ens_inc.sh
+2 −2 test/atm/global-workflow/jjob_ens_init.sh
+2 −2 test/atm/global-workflow/jjob_ens_init_split.sh
+2 −2 test/atm/global-workflow/jjob_ens_letkf.sh
+2 −2 test/atm/global-workflow/jjob_ens_obs.sh
+2 −2 test/atm/global-workflow/jjob_ens_sol.sh
+2 −2 test/atm/global-workflow/jjob_var_final.sh
+2 −2 test/atm/global-workflow/jjob_var_inc.sh
+2 −2 test/atm/global-workflow/jjob_var_init.sh
+2 −2 test/atm/global-workflow/jjob_var_run.sh
+23 −14 test/testreference/atm_jjob_3dvar-fv3inc.ref
+111 −84 test/testreference/atm_jjob_lgetkf-fv3inc.ref
Loading
Loading