Skip to content
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.

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

Configuration for the low res marine B #66

Draft
wants to merge 3 commits into
base: develop
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
33 changes: 33 additions & 0 deletions algorithm/marine/soca_chgres.yaml.j2
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
input geometry:
mom6_input_nml: mom_input.nml
fields metadata: ./fields_metadata.yaml

output geometry:
geom_grid_file: ./anl_geom/soca_gridspec.nc
mom6_input_nml: ./anl_geom/mom_input.nml
fields metadata: ./fields_metadata.yaml

states:
- input:
date: '{{ marine_window_end_iso }}'
basename: ./bkg/
ocn_filename: 'ocean.bkg.f009.nc'
ice_filename: 'ice.bkg.f009.nc'
read_from_file: 1

state variables:
- sea_surface_height_above_geoid
- sea_water_potential_temperature
- sea_water_salinity
- sea_water_cell_thickness
- sea_water_depth
- mom6_mld
- sea_ice_area_fraction
- sea_ice_thickness
- sea_ice_snow_thickness

output:
datadir: anl_geom/
exp: f009_anl_geom
type: fc
date: '{{ marine_window_end_iso }}'
5 changes: 5 additions & 0 deletions algorithm/marine/soca_diagb.yaml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@ geometry:
mom6_input_nml: mom_input.nml
fields metadata: ./fields_metadata.yaml

output geometry:
geom_grid_file: ./anl_geom/soca_gridspec.nc
mom6_input_nml: ./anl_geom/mom_input.nml
fields metadata: ./fields_metadata.yaml

date: '{{ marine_window_end_iso }}'

background:
Expand Down
7 changes: 6 additions & 1 deletion algorithm/marine/soca_ensb.yaml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,11 @@ geometry:
mom6_input_nml: mom_input.nml
fields metadata: ./fields_metadata.yaml

output geometry:
geom_grid_file: ./anl_geom/soca_gridspec.nc
mom6_input_nml: ./anl_geom/mom_input.nml
fields metadata: ./fields_metadata.yaml

date: '{{ marine_window_begin_iso }}'

layers variable: [sea_water_cell_thickness]
Expand Down Expand Up @@ -113,5 +118,5 @@ output increment:
date: '{{ marine_window_begin_iso }}'
exp: trash
type: incr
output file: 'ocn.pert.steric.%mem%.nc'
output file: 'pert.%mem%.nc'
pattern: '%mem%'
24 changes: 15 additions & 9 deletions algorithm/marine/soca_ensweights.yaml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@ geometry:
mom6_input_nml: mom_input.nml
fields metadata: ./fields_metadata.yaml

output geometry:
geom_grid_file: ./anl_geom/soca_gridspec.nc
mom6_input_nml: ./anl_geom/mom_input.nml
fields metadata: ./fields_metadata.yaml

date: '{{ marine_window_middle_iso }}'

variables:
Expand Down Expand Up @@ -29,15 +34,16 @@ weights:
ice: 0.0025 # 5% of original variance
ocean: 0.0625 # 25% " "
# Apply localized weights to the ocean ens. B
ocean local weights:
- lon: -172.0
lat: 11.0
amplitude: -1.0
length scale: 700.0
- lon: -160.0
lat: 12.0
amplitude: -1.0
length scale: 700.0
# Example below was for old ens. from Xiao
# ocean local weights:
# - lon: -172.0
# lat: 11.0
# amplitude: -1.0
# length scale: 700.0
# - lon: -160.0
# lat: 12.0
# amplitude: -1.0
# length scale: 700.0

output:
datadir: ./
Expand Down
11 changes: 7 additions & 4 deletions algorithm/marine/soca_parameters_diffusion_hz.yaml.j2
Original file line number Diff line number Diff line change
@@ -1,12 +1,15 @@
# Analysis/B-mat resolution
geometry: &geom
mom6_input_nml: mom_input.nml
geom_grid_file: ./anl_geom/soca_gridspec.nc
mom6_input_nml: ./anl_geom/mom_input.nml
fields metadata: ./fields_metadata.yaml

# Background interpolated at the analysis resolution
background:
read_from_file: 1
basename: ./INPUT/
ocn_filename: MOM.res.nc
ice_filename: cice.res.nc
basename: ./anl_geom/
ocn_filename: 'ocn.f009_anl_geom.fc.{{ marine_window_end_iso }}.PT0S.nc'
ice_filename: 'ice.f009_anl_geom.fc.{{ marine_window_end_iso }}.PT0S.nc'
date: '{{ marine_window_end_iso }}'
state variables: [sea_surface_height_above_geoid]

Expand Down
12 changes: 7 additions & 5 deletions algorithm/marine/soca_parameters_diffusion_vt.yaml.j2
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
# Analysis/B-mat resolution
geometry: &geom
mom6_input_nml: mom_input.nml
geom_grid_file: ./anl_geom/soca_gridspec.nc
mom6_input_nml: ./anl_geom/mom_input.nml
fields metadata: ./fields_metadata.yaml

# Background interpolated at the analysis resolution
background:
read_from_file: 1
basename: ./INPUT/
ocn_filename: MOM.res.nc
ice_filename: cice.res.nc
date: '{{ marine_window_middle_iso }}'
basename: ./anl_geom/
ocn_filename: 'ocn.f009_anl_geom.fc.{{ marine_window_end_iso }}.PT0S.nc'
date: '{{ marine_window_end_iso }}'
state variables: [sea_water_potential_temperature]

background error:
Expand Down
3 changes: 2 additions & 1 deletion algorithm/marine/soca_setcorscales.yaml.j2
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
resolution:
mom6_input_nml: mom_input.nml
geom_grid_file: ./anl_geom/soca_gridspec.nc
mom6_input_nml: ./anl_geom/mom_input.nml
fields metadata: ./fields_metadata.yaml

date: "0001-01-01T00:00:00Z"
Expand Down
6 changes: 3 additions & 3 deletions algorithm/marine/soca_vtscales.yaml.j2
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
gridspec_filename: soca_gridspec.nc
restart_filename: ./INPUT/MOM.res.nc
mld_filename: './staticb/ocn.bkgerr_stddev.incr.{{ marine_window_end_iso }}.nc'
gridspec_filename: ./anl_geom/soca_gridspec.nc
restart_filename: './anl_geom/ocn.f009_anl_geom.fc.{{ marine_window_end_iso }}.PT0S.nc'
mld_filename: './anl_geom/ocn.f009_anl_geom.fc.{{ marine_window_end_iso }}.PT0S.nc'
output_filename: ./vt_scales.nc
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

for my education: what does this change mean?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

To prepare the vertical localization scales at low res. I'm also not sure why the mld was stored in the bkg err file, this was a mistake. Does that answer your question?

output_variable_vt: Temp
output_variable_hz: ave_ssh
Expand Down
2 changes: 2 additions & 0 deletions algorithm/marine/socaincr2mom6.yaml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ date: '{{ marine_window_begin }}'

layers variable: [sea_water_cell_thickness]

domains: [ocn]

increment variables:
- sea_water_potential_temperature
- sea_water_salinity
Expand Down
3 changes: 2 additions & 1 deletion model/marine/marine_3dfgat_outer_loop_1.yaml.j2
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
- ninner: {{marine_ninner_1}}
gradient norm reduction: {{marine_grad_red_1}}
geometry:
mom6_input_nml: mom_input.nml
geom_grid_file: ./anl_geom/soca_gridspec.nc
mom6_input_nml: ./anl_geom/mom_input.nml
fields metadata: {{marine_soca_files_path}}/fields_metadata.yaml
diagnostics:
departures: ombg
7 changes: 0 additions & 7 deletions model/marine/marine_3dvar_outer_loop_1.yaml.j2

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ covariance model: hybrid
components:
- covariance:
covariance model: SABER
change background resolution: true
saber central block:
saber block name: diffusion
read:
Expand Down Expand Up @@ -57,41 +58,44 @@ components:
value: 1.00

- covariance:
covariance model: ensemble
members from template:
template:
read_from_file: 1
date: '{{marine_stddev_time}}'
basename: ../ensdata/
ocn_filename: 'ocn.pert.steric.%mem%.nc'
ice_filename: 'ens/ice.%mem%.nc'
state variables:
- sea_ice_area_fraction
- sea_ice_thickness
- sea_ice_snow_thickness
- sea_water_salinity
- sea_water_potential_temperature
#- eastward_sea_water_velocity
#- northward_sea_water_velocity
- sea_surface_height_above_geoid
pattern: '%mem%'
nmembers: '{{marine_number_ensemble_members}}'
localization:
localization method: SABER
saber central block:
saber block name: diffusion
read:
groups:
- variables:
- sea_water_potential_temperature
- sea_water_salinity
- sea_surface_height_above_geoid
- sea_ice_area_fraction
horizontal:
filepath: ./staticb/hz_ocean
vertical:
levels: {{marine_vt_levels}}
filepath: ./staticb/vt_ocean
covariance model: SABER
ensemble:
members from template:
template:
read_from_file: 1
date: '{{marine_stddev_time}}'
basename: ../ensdata/
ocn_filename: ocn.pert.%mem%.nc
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I see steric got dropped from the ocean name, and ice_filename is different too, is that intended?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes

ice_filename: ice.pert.%mem%.nc
state variables:
- sea_water_potential_temperature
- sea_water_salinity
#- eastward_sea_water_velocity
#- northward_sea_water_velocity
- sea_surface_height_above_geoid
- sea_ice_area_fraction
- sea_ice_thickness
- sea_ice_snow_thickness
pattern: '%mem%'
nmembers: '{{marine_number_ensemble_members}}'
saber central block:
saber block name: Ensemble
localization:
saber central block:
saber block name: diffusion
read:
groups:
- variables:
- sea_water_potential_temperature
- sea_water_salinity
- sea_surface_height_above_geoid
- sea_ice_area_fraction
multivariate strategy: duplicated
horizontal:
filepath: ./staticb/hz_ocean
vertical:
strategy: duplicated
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

vertical localization changed here compared to previous configuration, is that intentional?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes, we don't want vertical localization.


weight:
read_from_file: 3
basename: ./
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
covariance model: SABER
change background resolution: true
saber central block:
saber block name: diffusion
read:
Expand Down
1 change: 0 additions & 1 deletion test/client_integration/gdas-marine-templates.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
# This part is for testing only. Normally this would just show algorithm: <algorithm>
# -----------------------------------------------------------------------------------
supported_algorithms:
- 3dvar
- hofx3d
- hofx4d
- 3dfgat
Expand Down
Loading