Skip to content

Updates archiving to reflect current naming of marine anl output #3541

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 14 commits into from
Apr 8, 2025
Merged

Updates archiving to reflect current naming of marine anl output #3541

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
3693251
case to test
AndrewEichmann-NOAA Apr 2, 2025
ce9228a
fix archiving to reflect current marineanlfinal
AndrewEichmann-NOAA Apr 3, 2025
9051698
reverting experiment settings to develop
AndrewEichmann-NOAA Apr 3, 2025
ddb203c
Merge branch 'develop' into feature/marine-da-arch
AndrewEichmann-NOAA Apr 3, 2025
45062f6
Merge branch 'develop' into feature/marine-da-arch
AndrewEichmann-NOAA Apr 3, 2025
c663e5a
Merge branch 'develop' into feature/marine-da-arch
AndrewEichmann-NOAA Apr 3, 2025
8de0515
Merge branch 'develop' into feature/marine-da-arch
AndrewEichmann-NOAA Apr 3, 2025
26089aa
cleanup, addition of bmat diags
AndrewEichmann-NOAA Apr 4, 2025
cf99f5d
fixed the fix
AndrewEichmann-NOAA Apr 7, 2025
a324f15
style points
AndrewEichmann-NOAA Apr 7, 2025
af9aef9
Merge branch 'develop' into feature/marine-da-arch
AndrewEichmann-NOAA Apr 7, 2025
6d0c994
moving recentering to if-ens block
AndrewEichmann-NOAA Apr 7, 2025
7ffa8fa
Merge branch 'develop' into feature/marine-da-arch
AndrewEichmann-NOAA Apr 8, 2025
30bb249
Merge branch 'develop' into feature/marine-da-arch
DavidHuber-NOAA Apr 8, 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
5 changes: 3 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 @@ -11,14 +11,15 @@ gdasocean_analysis:
{% endfor %}

# static background error
- '{{ COMIN_OCEAN_BMATRIX | relpath(ROTDIR) }}/{{ head }}ocean.bkgerr_stddev.nc'
- '{{ COMIN_ICE_BMATRIX | relpath(ROTDIR) }}/{{ head }}ice.bkgerr_stddev.nc'
- '{{ COMIN_OCEAN_BMATRIX | relpath(ROTDIR) }}/{{ head }}ocean.bkgerr_ens_stddev.nc'
- '{{ COMIN_ICE_BMATRIX | relpath(ROTDIR) }}/{{ head }}ice.bkgerr_ens_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'
{% 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
37 changes: 26 additions & 11 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 @@ -214,6 +214,12 @@ def finalize(self: Task) -> None:
----------
None
"""

APREFIX = self.task_config.APREFIX
window_begin_iso = self.task_config.MARINE_WINDOW_BEGIN.strftime('%Y-%m-%dT%H:%M:%SZ')
window_middle_iso = self.task_config.MARINE_WINDOW_MIDDLE.strftime('%Y-%m-%dT%H:%M:%SZ')
window_end_iso = self.task_config.MARINE_WINDOW_END.strftime('%Y-%m-%dT%H:%M:%SZ')

# Copy the soca grid if it was created
grid_file = os.path.join(self.task_config.DATA, 'soca_gridspec.nc')
if os.path.exists(grid_file):
Expand All @@ -227,49 +233,58 @@ def finalize(self: Task) -> None:
for diff_type in ['hz', 'vt']:
src = os.path.join(self.task_config.DATAstaticb, f"{diff_type}_ocean.nc")
dest = os.path.join(self.task_config.COMOUT_OCEAN_BMATRIX,
f"{self.task_config.APREFIX}{diff_type}_ocean.nc")
f"{APREFIX}{diff_type}_ocean.nc")
diffusion_coeff_list.append([src, dest])

FileHandler({'copy': diffusion_coeff_list}).sync()

# Copy diag B files to ROTDIR
logger.info(f"Copying diag B files to the ROTDIR")
diagb_list = []
window_end_iso = self.task_config.MARINE_WINDOW_END.strftime('%Y-%m-%dT%H:%M:%SZ')

# 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.{window_end_iso}.nc"),
os.path.join(self.task_config.DATAstaticb, f"ocn.bkgerr_stddev.nc"))
src = os.path.join(self.task_config.DATAstaticb, f"ocn.bkgerr_stddev.nc")
dst = os.path.join(self.task_config.COMOUT_OCEAN_BMATRIX,
f"{self.task_config.APREFIX}ocean.bkgerr_stddev.nc")
dst = os.path.join(self.task_config.COMOUT_OCEAN_BMATRIX, f"{APREFIX}ocean.bkgerr_ens_stddev.nc")
diagb_list.append([src, dst])

# ice diag B
os.rename(os.path.join(self.task_config.DATAstaticb, f"ice.bkgerr_stddev.incr.{window_end_iso}.nc"),
os.path.join(self.task_config.DATAstaticb, f"ice.bkgerr_stddev.nc"))
src = os.path.join(self.task_config.DATAstaticb, f"ice.bkgerr_stddev.nc")
dst = os.path.join(self.task_config.COMOUT_ICE_BMATRIX,
f"{self.task_config.APREFIX}ice.bkgerr_stddev.nc")
dst = os.path.join(self.task_config.COMOUT_ICE_BMATRIX, f"{APREFIX}ice.bkgerr_ens_stddev.nc")
diagb_list.append([src, dst])

if self.task_config.DOHYBVAR_OCN == "YES" or self.task_config.NMEM_ENS >= 2:
src = os.path.join(self.task_config.DATAstaticb, f"ocn.ssh_recentering_error.incr.{window_begin_iso}.nc")
dst = os.path.join(self.task_config.COMOUT_OCEAN_BMATRIX, f"{APREFIX}ocean.recentering_error.nc")
diagb_list.append([src, dst])

src = os.path.join(self.task_config.DATAstaticb, f"ice.ssh_recentering_error.incr.{window_begin_iso}.nc")
dst = os.path.join(self.task_config.COMOUT_ICE_BMATRIX, f"{APREFIX}ice.recentering_error.nc")
diagb_list.append([src, dst])

FileHandler({'copy': diagb_list}).sync()

# Copy the ensemble perturbation diagnostics to the ROTDIR
if self.task_config.DOHYBVAR_OCN == "YES" or self.task_config.NMEM_ENS >= 2:
window_middle_iso = self.task_config.MARINE_WINDOW_MIDDLE.strftime('%Y-%m-%dT%H:%M:%SZ')
weight_list = []
src = os.path.join(self.task_config.DATA, f"ocn.ens_weights.incr.{window_middle_iso}.nc")
dst = os.path.join(self.task_config.COMOUT_OCEAN_BMATRIX,
f"{self.task_config.APREFIX}ocean.ens_weights.nc")
f"{APREFIX}ocean.ens_weights.nc")
weight_list.append([src, dst])

src = os.path.join(self.task_config.DATA, f"ice.ens_weights.incr.{window_middle_iso}.nc")
dst = os.path.join(self.task_config.COMOUT_ICE_BMATRIX,
f"{self.task_config.APREFIX}ice.ens_weights.nc")
f"{APREFIX}ice.ens_weights.nc")
weight_list.append([src, dst])

# TODO(G): missing ssh_steric_stddev, ssh_unbal_stddev, ssh_total_stddev and steric_explained_variance
# Copy the ssh diagnostics
for string in ['ssh_steric_stddev', 'ssh_unbal_stddev', 'ssh_total_stddev', 'steric_explained_variance']:
weight_list.append([os.path.join(self.task_config.DATA, 'staticb', f'ocn.{string}.incr.{window_begin_iso}.nc'),
os.path.join(self.task_config.COMOUT_OCEAN_BMATRIX, f'{APREFIX}ocean.{string}.nc')])

FileHandler({'copy': weight_list}).sync()

Expand All @@ -278,6 +293,6 @@ def finalize(self: Task) -> None:
yaml_list = []
for yaml_file in yamls:
dest = os.path.join(self.task_config.COMOUT_OCEAN_BMATRIX,
f"{self.task_config.APREFIX}{os.path.basename(yaml_file)}")
f"{APREFIX}{os.path.basename(yaml_file)}")
yaml_list.append([yaml_file, dest])
FileHandler({'copy': yaml_list}).sync()