Skip to content

Update to the marine yamls #1309

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
guillaumevernieres merged 2 commits into from
Oct 3, 2024
Merged

Update to the marine yamls #1309

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c599c44
updated yamls
guillaumevernieres Oct 2, 2024
2437829
update jcb-gdas
guillaumevernieres Oct 3, 2024
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
2 changes: 1 addition & 1 deletion parm/jcb-gdas
Open in desktop
Submodule jcb-gdas updated 1 files
+7 −19 model/marine/marine_background_error_static_diffusion.yaml.j2
20 changes: 10 additions & 10 deletions parm/soca/berror/soca_parameters_diffusion_hz.yaml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ background:
ocn_filename: MOM.res.nc
ice_filename: cice.res.nc
date: '{{ MARINE_WINDOW_END | to_isotime }}'
state variables: [cicen, hicen, hsnon, socn, tocn, uocn, vocn, ssh]
state variables: [ssh]

background error:
covariance model: SABER
Expand All @@ -21,17 +21,17 @@ background error:
iterations: 10000

groups:
- name: ocean
horizontal:
from file:
filename: ocn.cor_rh.incr.0001-01-01T00:00:00Z.nc
variable name: ave_ssh
- horizontal:
model file:
date: '{{ MARINE_WINDOW_END | to_isotime }}'
basename: ./
ocn_filename: ocn.cor_rh.incr.0001-01-01T00:00:00Z.nc
model variable: ssh
write:
filename: ./staticb/hz_ocean.nc
filepath: ./staticb/hz_ocean

- name: ice
horizontal:
- horizontal:
as gaussian: true
fixed value: 50000.0
write:
filename: ./staticb/hz_ice.nc
filepath: ./staticb/hz_ice
15 changes: 8 additions & 7 deletions parm/soca/berror/soca_parameters_diffusion_vt.yaml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ background:
ocn_filename: MOM.res.nc
ice_filename: cice.res.nc
date: '{{ MARINE_WINDOW_MIDDLE | to_isotime }}'
state variables: [cicen, hicen, hsnon, socn, tocn, uocn, vocn, ssh]
state variables: [tocn]

background error:
covariance model: SABER
Expand All @@ -22,11 +22,12 @@ background error:
iterations: 1000 #< in the real world you'll want to use 1e4 or so

groups:
- name: vt_ocean
vertical:
- vertical:
as gaussian: true
from file:
filename: vt_scales.nc
variable name: vt
model file:
date: '{{ MARINE_WINDOW_MIDDLE | to_isotime }}'
basename: ./
ocn_filename: vt_scales.nc
model variable: tocn
write:
filename: ./staticb/vt_ocean.nc
filepath: ./staticb/vt_ocean
42 changes: 0 additions & 42 deletions parm/soca/berror/soca_static_bmat.yaml
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions parm/soca/berror/soca_vtscales.yaml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ gridspec_filename: soca_gridspec.nc
restart_filename: ./INPUT/MOM.res.nc
mld_filename: './staticb/ocn.bkgerr_stddev.incr.{{ MARINE_WINDOW_END | to_isotime }}.nc'
output_filename: ./vt_scales.nc
output_variable_vt: vt
output_variable_hz: hz
output_variable_vt: Temp
output_variable_hz: ave_ssh

VT_MIN: 5
VT_MAX: 15
Expand Down
1 change: 1 addition & 0 deletions parm/soca/marine-jcb-base.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ marine_window_middle: '{{MARINE_WINDOW_MIDDLE}}'

# Geometry
marine_soca_files_path: .
marine_vt_levels: '{{MOM6_LEVS}}'

# Initial conditions
marine_background_path: ./INPUT/
Expand Down