Skip to content

Correct parametric and ensemble background error statistics filenames in marine DA #4120

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 9 commits into from
Oct 7, 2025
Merged

Correct parametric and ensemble background error statistics filenames in marine DA #4120

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
9d43638
break out ens and parametric bkgerr stats
AndrewEichmann-NOAA Oct 1, 2025
25fa1e0
archiving
AndrewEichmann-NOAA Oct 1, 2025
29320fb
Merge branch 'develop' into bugfix/update-marine-da-output
AndrewEichmann-NOAA Oct 1, 2025
1f30a62
update gdasapp hash
AndrewEichmann-NOAA Oct 2, 2025
516911c
change comment
AndrewEichmann-NOAA Oct 2, 2025
59bd32d
update gdasapp hash
AndrewEichmann-NOAA Oct 2, 2025
1782240
jinjafy renaming
AndrewEichmann-NOAA Oct 3, 2025
a1fe0db
changed ens to parametric
AndrewEichmann-NOAA Oct 3, 2025
33fee72
updating gdasapp hash
AndrewEichmann-NOAA Oct 3, 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
1 change: 1 addition & 0 deletions dev/parm/config/gfs/config.marinebmat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,6 @@ source "${EXPDIR}/config.resources" marinebmat

export JEDI_CONFIG_YAML="${PARMgfs}/gdas/marine/marine_bmat_jedi_config.yaml.j2"
export SAVE_YAML="${PARMgfs}/gdas/marine/marine_bmat_save.yaml.j2"
export COPY_BMAT_BKGERR_YAML="${PARMgfs}/gdas/marine/marine_bmat_copy_bkgerr.yaml.j2"

echo "END: config.marinebmat"
6 changes: 4 additions & 2 deletions parm/archive/gdasocean_analysis.yaml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,17 @@ gdasocean_analysis:
{% endfor %}

# static background error
- '{{ COMIN_OCEAN_BMATRIX | relpath(ROTDIR) }}/{{ head }}ocean.bkgerr_ens_stddev.nc'
- '{{ COMIN_ICE_BMATRIX | relpath(ROTDIR) }}/{{ head }}ice.bkgerr_ens_stddev.nc'
- '{{ COMIN_OCEAN_BMATRIX | relpath(ROTDIR) }}/{{ head }}ocean.bkgerr_parametric_stddev.nc'
- '{{ COMIN_ICE_BMATRIX | relpath(ROTDIR) }}/{{ head }}ice.bkgerr_parametric_stddev.nc'

# ensemble background error
{% if NMEM_ENS > 2 %}
- '{{ COMIN_ICE_BMATRIX | relpath(ROTDIR) }}/{{ head }}ice.ens_weights.nc'
- '{{ COMIN_OCEAN_BMATRIX | relpath(ROTDIR) }}/{{ head }}ocean.ens_weights.nc'
- '{{ COMIN_OCEAN_BMATRIX | relpath(ROTDIR) }}/{{ head }}ocean.recentering_error.nc'
- '{{ COMIN_ICE_BMATRIX | relpath(ROTDIR) }}/{{ head }}ice.recentering_error.nc'
- '{{ COMIN_OCEAN_BMATRIX | relpath(ROTDIR) }}/{{ head }}ocean.bkgerr_ens_stddev.nc'
- '{{ COMIN_ICE_BMATRIX | relpath(ROTDIR) }}/{{ head }}ice.bkgerr_ens_stddev.nc'
{% for diag_type in ["ssh_steric_stddev", "ssh_unbal_stddev", "ssh_total_stddev", "steric_explained_variance"] %}
- '{{ COMIN_OCEAN_BMATRIX | relpath(ROTDIR) }}/{{ head }}ocean.{{ diag_type }}.nc'
{% endfor %}
Expand Down
4 changes: 2 additions & 2 deletions parm/archive/gfsocean_analysis.yaml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ gfsocean_analysis:
{% endfor %}

# static background error
- '{{ COMIN_OCEAN_BMATRIX | relpath(ROTDIR) }}/{{ head }}ocean.bkgerr_ens_stddev.nc'
- '{{ COMIN_ICE_BMATRIX | relpath(ROTDIR) }}/{{ head }}ice.bkgerr_ens_stddev.nc'
- '{{ COMIN_OCEAN_BMATRIX | relpath(ROTDIR) }}/{{ head }}ocean.bkgerr_parametric_stddev.nc'
- '{{ COMIN_ICE_BMATRIX | relpath(ROTDIR) }}/{{ head }}ice.bkgerr_parametric_stddev.nc'

# runtime configs
- '{{ COMIN_CONF | relpath(ROTDIR) }}/*.yaml'
Expand Down
2 changes: 1 addition & 1 deletion sorc/gdas.cd
Open in desktop
Submodule gdas.cd updated 12 files
+1 −1 parm/jcb-gdas
+8 −0 parm/marine/marine_bmat_copy_bkgerr.yaml.j2
+4 −2 parm/marine/marine_bmat_save.yaml.j2
+64 −0 parm/marine/marine_prepobs_dummyobs.cdl
+1 −1 sorc/ioda
+1 −1 sorc/oops
+1 −1 sorc/saber
+1 −1 sorc/ufo
+1 −2 test/snow/test_imsproc.sh
+23 −2 ush/soca/prep_ocean_obs.py
+8 −19 utils/soca/gdassoca_obsstats.h
+1 −1 utils/soca/test/CMakeLists.txt
9 changes: 3 additions & 6 deletions ush/python/pygfs/task/marine_bmat.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,12 +212,9 @@ def finalize(self: Task) -> None:
None
"""

# TODO(AFE) the two renames are to accomodate yaml settings in var task, which should changed
# ocean diag B
os.rename(os.path.join(self.task_config.DATAstaticb, f"ocn.bkgerr_stddev.incr.{self.task_config.MARINE_WINDOW_END_ISO}.nc"),
os.path.join(self.task_config.DATAstaticb, f"ocn.bkgerr_stddev.nc"))
os.rename(os.path.join(self.task_config.DATAstaticb, f"ice.bkgerr_stddev.incr.{self.task_config.MARINE_WINDOW_END_ISO}.nc"),
os.path.join(self.task_config.DATAstaticb, f"ice.bkgerr_stddev.nc"))
logger.info(f"Copying background error files to new filenames")
bkgerr_list = parse_j2yaml(self.task_config.COPY_BMAT_BKGERR_YAML, self.task_config)
FileHandler(bkgerr_list).sync()

# Save output files to COM
logger.info(f"Copy files to ROTDIR")
Expand Down