Skip to content

Commit a319913

Browse files
danholdawayDooruk
andauthored
Add workflow and tasks for performing 3DVar (tested with SOCA) (#152)
* Add shell for the new tasks (#133) * add shell for all the new tasaks * rename b clim task * update registry Co-authored-by: danholdaway <danholdaway@users.noreply.github.com> * Feature/3dvar generateb (#136) * fetch bump or execution with seg fault * Feature/3dvar standalone godas (#138) * Add the basis for running standalone 3DVar * add bclim to flow * changes in executable * 3dvar is executing now, seg fault is fixed * hofx fix * changes in eva * GODAS observations and golden period * SPECIAL case in executable and modifications for 3dvar EVA * changes in flow * changes in flow and codestyle fixes * trailing spaces Co-authored-by: danholdaway <danholdaway@users.noreply.github.com> * write logs in the executable tasks * update YAML files to ioda v3 * Feature/3dvar bump eva (#140) * Add the basis for running standalone 3DVar * add bclim to flow * changes in executable * 3dvar is executing now, seg fault is fixed * hofx fix * changes in eva * GODAS observations and golden period * SPECIAL case in executable and modifications for 3dvar EVA * changes in flow * changes in flow and codestyle fixes * trailing spaces * bump SABER update works * ioda_v3 changes * changes in eva * yaml fixes * yaml fixes --------- Co-authored-by: danholdaway <danholdaway@users.noreply.github.com> * refactor eva to allow plotting jedi log things * fixes to workflow files * add new task for generating static b by linking (#147) * add new task for generating static b by linking. * remove prints * correct py norms * yaml norms --------- Co-authored-by: danholdaway <danholdaway@users.noreply.github.com> * Feature/3dvar lowres (#151) * fixing workflow * linking changes * lowres works * hofx working * 3dvar workflow running * DA recommended changes --------- Co-authored-by: danholdaway <danholdaway@users.noreply.github.com> Co-authored-by: Doruk Ardağ <38666458+Dooruk@users.noreply.github.com>
1 parent dc971c1 commit a319913

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+2402
-128
lines changed

src/swell/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@
99
repo_directory = os.path.dirname(__file__)
1010

1111
# Set the version for swell
12-
__version__ = '1.1.3'
12+
__version__ = '1.2.0'
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
- link_files:
22
directories:
3-
- ['{{swell_static_files}}/jedi/fv3-jedi/geos_atmosphere/GEOS_CRTM_Surface/geos.crtmsrf.{{horizontal_resolution}}.nc4', '{{experiment_dir}}/stage/fv3-jedi/geos_atmosphere/bkg/']
3+
- ['{{swell_static_files}}/jedi/interfaces/geos_atmosphere/GEOS_CRTM_Surface/geos.crtmsrf.{{horizontal_resolution}}.nc4', '{{experiment_dir}}/stage/fv3-jedi/geos_atmosphere/bkg/']
44
- ['{{experiment_dir}}/jedi_bundle/source/fv3-jedi/test/Data/fieldmetadata/*', '{{experiment_dir}}/stage/fv3-jedi/geos_atmosphere/fieldmetadata/']
55
- ['{{experiment_dir}}/jedi_bundle/source/fv3-jedi/test/Data/fv3files/*', '{{experiment_dir}}/stage/fv3-jedi/geos_atmosphere/fv3files/']

src/swell/configuration/jedi/interfaces/geos_ocean/geos_ocean.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,4 @@ executables:
33
hofx3d: soca_hofx3d.x
44
hofx: soca_hofx.x
55
var: soca_var.x
6+
bump: soca_staticbinit.x
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
datadir: ./
2+
exp: {{experiment_id}}
3+
type: an
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
date: '{{local_background_time_iso}}'
22
read_from_file: 1
3-
basename: '{{cycle_dir}}/'
3+
basename: './'
44
ocn_filename: 'MOM6.res.{{local_background_time}}.nc'
5-
state variables: [socn, tocn, ssh, hocn, uocn, vocn]
5+
state variables: [socn, tocn, ssh, hocn, mld, layer_depth]
Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
covariance model: 'SocaError'
2+
analysis variables: {{analysis_variables}}
3+
date: '{{local_background_time_iso}}'
4+
bump:
5+
io:
6+
data directory: '{{cycle_dir}}/background_error_model/'
7+
drivers:
8+
multivariate strategy: 'univariate'
9+
read local nicas: true
10+
11+
correlation:
12+
- name: 'ocn'
13+
variables: {{analysis_variables}}
14+
15+
linear variable change:
16+
input variables: {{analysis_variables}}
17+
output variables: {{analysis_variables}}
18+
linear variable changes:
19+
- linear variable change name: BkgErrFILT
20+
ocean_depth_min: 1000 # [m]
21+
rescale_bkgerr: 1.0
22+
efold_z: 2500.0 # [m]
23+
24+
- linear variable change name: BkgErrGODAS
25+
sst_bgerr_file: '{{cycle_dir}}/soca/godas_sst_bgerr.nc'
26+
t_min: 0.1
27+
t_max: 2.0
28+
t_dz: 20.0
29+
t_efold: 500.0
30+
s_min: 0.0
31+
s_max: 0.25
32+
ssh_min: 0.0 # value at EQ
33+
ssh_max: 0.1 # value in Extratropics
34+
ssh_phi_ex: 20 # lat of transition from extratropics
35+
cicen_min: 0.1
36+
cicen_max: 0.5
37+
hicen_min: 10.0
38+
hicen_max: 100.0
39+
40+
- linear variable change name: VertConvSOCA
41+
Lz_min: 2.0
42+
Lz_mld: 1
43+
Lz_mld_max: 500.0
44+
scale_layer_thick: 1.5
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
covariance model: 'SocaError'
2+
analysis variables: {{analysis_variables}}
3+
date: '{{local_background_time_iso}}'
4+
bump:
5+
io:
6+
data directory: '{{cycle_dir}}/background_error_model'
7+
drivers:
8+
multivariate strategy: 'univariate'
9+
compute nicas: true
10+
write local nicas: true
11+
model:
12+
do not cross mask boundaries: true
13+
nicas:
14+
resolution: 6.0
15+
correlation:
16+
- name: 'ocn'
17+
base value: 840336.134453782
18+
rossby mult: 0.280112045
19+
variables: {{analysis_variables}}
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
mom6_input_nml: '{{experiment_dir}}/stage/soca/geos_ocean/socafiles/input.nml'
2-
fields metadata: '{{experiment_dir}}/stage/soca/geos_ocean/fieldmetadata/fields_metadata.yaml'
3-
geom_grid_file: '{{experiment_dir}}/stage/soca/geos_ocean/gridfiles/soca_gridspec.nc'
1+
mom6_input_nml: 'soca/input.nml'
2+
fields metadata: 'soca/fields_metadata.yaml'
3+
geom_grid_file: 'INPUT/soca_gridspec.nc'
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
mom6_input_nml: 'soca/input.nml'
2+
fields metadata: 'soca/fields_metadata.yaml'
3+
geom_grid_file: 'INPUT/soca_gridspec.nc'

src/swell/configuration/jedi/interfaces/geos_ocean/model/stage.yaml

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

0 commit comments

Comments
 (0)