Skip to content

Commit e9607fc

Browse files
Marine B-matrix refactor companion PR (#1346)
This PR is a companion to Global Workflow PR [#2992](NOAA-EMC/global-workflow#2992) and JCB-GDAS PR [#36](NOAA-EMC/jcb-gdas#36). It makes a few necessary changes to the marine JCB base YAML required to have JCB working in the B-matrix task in the Global Workflow.
1 parent ffbdd80 commit e9607fc

12 files changed

+7
-290
lines changed

parm/jcb-gdas

Submodule jcb-gdas updated 40 files

parm/soca/berror/soca_diagb.yaml.j2

Lines changed: 0 additions & 37 deletions
This file was deleted.

parm/soca/berror/soca_ensb.yaml.j2

Lines changed: 0 additions & 98 deletions
This file was deleted.

parm/soca/berror/soca_ensweights.yaml.j2

Lines changed: 0 additions & 37 deletions
This file was deleted.

parm/soca/berror/soca_parameters_diffusion_hz.yaml.j2

Lines changed: 0 additions & 37 deletions
This file was deleted.

parm/soca/berror/soca_parameters_diffusion_vt.yaml.j2

Lines changed: 0 additions & 33 deletions
This file was deleted.

parm/soca/berror/soca_setcorscales.yaml

Lines changed: 0 additions & 23 deletions
This file was deleted.

parm/soca/berror/soca_vtscales.yaml.j2

Lines changed: 0 additions & 13 deletions
This file was deleted.

parm/soca/gridgen/gridgen.yaml

Lines changed: 0 additions & 5 deletions
This file was deleted.

parm/soca/marine-jcb-base.yaml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ final_increment_file: marine_final_increment
1717

1818
# Assimilation standard things (not prepended with model choice)
1919
# ----------------------------
20-
window_begin: '{{MARINE_WINDOW_BEGIN}}'
20+
window_begin: '{{ MARINE_WINDOW_BEGIN | to_isotime }}'
2121
window_length: '{{MARINE_WINDOW_LENGTH}}'
2222
bound_to_include: begin
2323
minimizer: RPCG
@@ -31,6 +31,10 @@ analysis_variables: [cicen, hicen, hsnon, socn, tocn, uocn, vocn, ssh]
3131
# ------------
3232
marine_window_begin: '{{MARINE_WINDOW_BEGIN}}'
3333
marine_window_middle: '{{MARINE_WINDOW_MIDDLE}}'
34+
marine_window_begin_iso: '{{ MARINE_WINDOW_BEGIN | to_isotime }}'
35+
marine_window_middle_iso: '{{ MARINE_WINDOW_MIDDLE | to_isotime }}'
36+
marine_window_end_iso: '{{ MARINE_WINDOW_END | to_isotime }}'
37+
enspert_relpath: '{{ ENSPERT_RELPATH }}'
3438

3539
# Geometry
3640
marine_soca_files_path: .
@@ -42,11 +46,10 @@ marine_background_time: '{{MARINE_WINDOW_BEGIN_ISO}}'
4246

4347
# Pseudo model
4448
marine_forecast_timestep: PT3H
45-
marine_pseudo_model_states: !INC 'bkg_list.yaml'
4649

4750
# Background error model
4851
background_error_file: '{{berror_model}}'
49-
marine_number_ensemble_members: '{{nmem_ens}}'
52+
marine_number_ensemble_members: '{{NMEM_ENS}}'
5053
marine_stddev_time: '{{MARINE_WINDOW_MIDDLE}}'
5154

5255
# Observations

0 commit comments

Comments
 (0)