Skip to content

Commit

Permalink
Move the variational scripts to the g-w (#1282)
Browse files Browse the repository at this point in the history
This PR needs to be merged before
-
[NOAA-EMC/global-workflow#2920
 
It depends on 
-
[NOAA-EMC/jcb-gdas#26

and will require an update to the `jcb-gdas` submodules.

It will break the GDASApp marine CI until the `g-w` pr is merged.
  • Loading branch information
guillaumevernieres committed Sep 18, 2024
1 parent 7c1c181 commit 55e895f
Show file tree
Hide file tree
Showing 95 changed files with 181 additions and 173,926 deletions.
2 changes: 1 addition & 1 deletion parm/soca/berror/soca_diagb.yaml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ background:
read_from_file: 1

background error:
datadir: ./diagb/
datadir: ./staticb/
date: '{{ MARINE_WINDOW_MIDDLE | to_isotime }}'
exp: bkgerr_stddev
type: incr
Expand Down
16 changes: 8 additions & 8 deletions parm/soca/berror/soca_ensb.yaml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -34,44 +34,44 @@ steric height:
- linear variable change name: BalanceSOCA # Only the steric balance is applied

ensemble mean output:
datadir: ./diagb/
datadir: ./staticb/
date: '{{ MARINE_WINDOW_BEGIN | to_isotime }}'
exp: ens_mean
type: incr

ssh output:
unbalanced:
datadir: ./diagb/
datadir: ./staticb/
date: '{{ MARINE_WINDOW_BEGIN | to_isotime }}'
exp: ssh_unbal_stddev
type: incr

steric:
datadir: ./diagb/
datadir: ./staticb/
date: '{{ MARINE_WINDOW_BEGIN | to_isotime }}'
exp: ssh_steric_stddev
type: incr

total:
datadir: ./diagb/
datadir: ./staticb/
date: '{{ MARINE_WINDOW_BEGIN | to_isotime }}'
exp: ssh_total_stddev
type: incr

explained variance:
datadir: ./diagb/
datadir: ./staticb/
date: '{{ MARINE_WINDOW_BEGIN | to_isotime }}'
exp: steric_explained_variance
type: incr

recentering error:
datadir: ./diagb/
datadir: ./staticb/
date: '{{ MARINE_WINDOW_BEGIN | to_isotime }}'
exp: ssh_recentering_error
type: incr

background error output:
datadir: ./diagb/
datadir: ./staticb/
date: '{{ MARINE_WINDOW_BEGIN | to_isotime }}'
exp: bkgerr_stddev
type: incr
Expand All @@ -90,7 +90,7 @@ trajectory:

output increment:
# TODO: Revert this when fms can take more than 128 charactres file names
datadir: '{{ ENSPERT_RELPATH }}/ens/'
datadir: '{{ ENSPERT_RELPATH }}/enspert/'
date: '{{ MARINE_WINDOW_BEGIN | to_isotime }}'
exp: trash
type: incr
Expand Down
4 changes: 2 additions & 2 deletions parm/soca/berror/soca_parameters_diffusion_hz.yaml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,11 @@ background error:
filename: ocn.cor_rh.incr.0001-01-01T00:00:00Z.nc
variable name: ave_ssh
write:
filename: hz_ocean.nc
filename: ./staticb/hz_ocean.nc

- name: ice
horizontal:
as gaussian: true
fixed value: 50000.0
write:
filename: hz_ice.nc
filename: ./staticb/hz_ice.nc
2 changes: 1 addition & 1 deletion parm/soca/berror/soca_parameters_diffusion_vt.yaml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,4 @@ background error:
filename: vt_scales.nc
variable name: vt
write:
filename: vt_ocean.nc
filename: ./staticb/vt_ocean.nc
2 changes: 1 addition & 1 deletion parm/soca/berror/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: './diagb/ocn.bkgerr_stddev.incr.{{ MARINE_WINDOW_END | to_isotime }}.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
Expand Down
28 changes: 28 additions & 0 deletions parm/soca/fms/input.nml.j2
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
&MOM_input_nml
output_directory = './',
input_filename = 'r'
restart_input_dir = 'INPUT/',
restart_output_dir = 'RESTART/',
parameter_filename = 'MOM_input' /

&diag_manager_nml
/

&ocean_solo_nml
months = 0
days = 1
date_init = {{ date_init }},
hours = 0
minutes = 0
seconds = 0
calendar = 'NOLEAP' /

&fms_io_nml
max_files_w=100
checksum_required=.false.
/

&fms_nml
clock_grain='MODULE'
domains_stack_size = {{ domain_stack_size }}
clock_flags='SYNC' /
16 changes: 8 additions & 8 deletions parm/soca/marine-jcb-base.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ final_increment_file: marine_final_increment

# Assimilation standard things (not prepended with model choice)
# ----------------------------
window_begin: '{{ATM_WINDOW_BEGIN}}'
window_length: '{{ATM_WINDOW_LENGTH}}'
window_begin: '{{MARINE_WINDOW_BEGIN}}'
window_length: '{{MARINE_WINDOW_LENGTH}}'
bound_to_include: begin
minimizer: RPCG
final_diagnostics_departures: oman
Expand All @@ -29,24 +29,24 @@ analysis_variables: [cicen, hicen, hsnon, socn, tocn, uocn, vocn, ssh]

# Model things
# ------------
marine_window_begin: '{{ATM_WINDOW_BEGIN}}'
marine_window_middle: '{{ATM_WINDOW_MIDDLE}}'
marine_window_begin: '{{MARINE_WINDOW_BEGIN}}'
marine_window_middle: '{{MARINE_WINDOW_MIDDLE}}'

# Geometry
marine_soca_files_path: .

# Background
# Initial conditions
marine_background_path: ./INPUT/
marine_background_time: '{{ATM_WINDOW_BEGIN}}'
marine_background_time: '{{MARINE_WINDOW_BEGIN_ISO}}'

# Pseudo model
marine_forecast_timestep: PT3H
marine_pseudo_model_states: !INC ${BKG_LIST}
marine_pseudo_model_states: !INC 'bkg_list.yaml'

# Background error model
background_error_file: '{{berror_model}}'
marine_number_ensemble_members: '{{nmem_ens}}'
marine_stddev_time: '{{ATM_WINDOW_MIDDLE}}'
marine_stddev_time: '{{MARINE_WINDOW_MIDDLE}}'

# Observations
observations: all_observations
Expand Down
4 changes: 2 additions & 2 deletions parm/soca/obs/config/adt_rads_all.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ obs space:
obsdatain:
engine:
type: H5File
obsfile: !ENV ${DATA}/obs/${OPREFIX}adt_rads_all.${PDY}${cyc}.nc4
obsfile: ${DATA}/obs/${OPREFIX}adt_rads_all.${PDY}${cyc}.nc4
obsdataout:
engine:
type: H5File
obsfile: !ENV ${DATA}/diags/adt_rads_all.${PDY}${cyc}.nc4
obsfile: ${DATA}/diags/adt_rads_all.${PDY}${cyc}.nc4
simulated variables: [absoluteDynamicTopography]
io pool:
max pool size: 1
Expand Down
4 changes: 2 additions & 2 deletions parm/soca/obs/config/icec_amsr2_north.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ obs space:
obsdatain:
engine:
type: H5File
obsfile: !ENV ${DATA}/obs/${OPREFIX}icec_amsr2_north.${PDY}${cyc}.nc4
obsfile: ${DATA}/obs/${OPREFIX}icec_amsr2_north.${PDY}${cyc}.nc4
obsdataout:
engine:
type: H5File
obsfile: !ENV ${DATA}/diags/icec_amsr2_north.${PDY}${cyc}.nc4
obsfile: ${DATA}/diags/icec_amsr2_north.${PDY}${cyc}.nc4
simulated variables: [seaIceFraction]
io pool:
max pool size: 1
Expand Down
4 changes: 2 additions & 2 deletions parm/soca/obs/config/icec_amsr2_south.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ obs space:
obsdatain:
engine:
type: H5File
obsfile: !ENV ${DATA}/obs/${OPREFIX}icec_amsr2_south.${PDY}${cyc}.nc4
obsfile: ${DATA}/obs/${OPREFIX}icec_amsr2_south.${PDY}${cyc}.nc4
obsdataout:
engine:
type: H5File
obsfile: !ENV ${DATA}/diags/icec_amsr2_south.${PDY}${cyc}.nc4
obsfile: ${DATA}/diags/icec_amsr2_south.${PDY}${cyc}.nc4
simulated variables: [seaIceFraction]
io pool:
max pool size: 1
Expand Down
4 changes: 2 additions & 2 deletions parm/soca/obs/config/insitu_profile_argo.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ obs space:
obsdatain:
engine:
type: H5File
obsfile: !ENV ${DATA}/obs/${OPREFIX}insitu_profile_argo.${PDY}${cyc}.nc4
obsfile: ${DATA}/obs/${OPREFIX}insitu_profile_argo.${PDY}${cyc}.nc4
obsgrouping:
group variables: [latitude, longitude, dateTime]
sort variable: depth
Expand All @@ -12,7 +12,7 @@ obs space:
obsdataout:
engine:
type: H5File
obsfile: !ENV ${DATA}/diags/insitu_profile_argo.${PDY}${cyc}.nc4
obsfile: ${DATA}/diags/insitu_profile_argo.${PDY}${cyc}.nc4
simulated variables: [waterTemperature, salinity]
observed variables: [waterTemperature, salinity]
# derived variables: [waterPressure]
Expand Down
4 changes: 2 additions & 2 deletions parm/soca/obs/config/insitu_profile_bathy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ obs space:
obsdatain:
engine:
type: H5File
obsfile: !ENV ${DATA}/obs/${OPREFIX}insitu_profile_bathy.${PDY}${cyc}.nc4
obsfile: ${DATA}/obs/${OPREFIX}insitu_profile_bathy.${PDY}${cyc}.nc4
obsdataout:
engine:
type: H5File
obsfile: !ENV ${DATA}/diags/insitu_profile_bathy.${PDY}${cyc}.nc4
obsfile: ${DATA}/diags/insitu_profile_bathy.${PDY}${cyc}.nc4
simulated variables: [waterTemperature]
io pool:
max pool size: 1
Expand Down
4 changes: 2 additions & 2 deletions parm/soca/obs/config/insitu_profile_dbuoy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ obs space:
obsdatain:
engine:
type: H5File
obsfile: !ENV ${DATA}/obs/${OPREFIX}insitu_profile_dbuoy.${PDY}${cyc}.nc4
obsfile: ${DATA}/obs/${OPREFIX}insitu_profile_dbuoy.${PDY}${cyc}.nc4
obsdataout:
engine:
type: H5File
obsfile: !ENV ${DATA}/diags/insitu_profile_dbuoy.${PDY}${cyc}.nc4
obsfile: ${DATA}/diags/insitu_profile_dbuoy.${PDY}${cyc}.nc4
simulated variables: [waterTemperature]
observed variables: [waterTemperature]
io pool:
Expand Down
4 changes: 2 additions & 2 deletions parm/soca/obs/config/insitu_profile_dbuoyb.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ obs space:
obsdatain:
engine:
type: H5File
obsfile: !ENV ${DATA}/obs/${OPREFIX}insitu_profile_dbuoyb.${PDY}${cyc}.nc4
obsfile: ${DATA}/obs/${OPREFIX}insitu_profile_dbuoyb.${PDY}${cyc}.nc4
obsdataout:
engine:
type: H5File
obsfile: !ENV ${DATA}/diags/insitu_profile_dbuoyb.${PDY}${cyc}.nc4
obsfile: ${DATA}/diags/insitu_profile_dbuoyb.${PDY}${cyc}.nc4
simulated variables: [waterTemperature]
observed variables: [waterTemperature]
io pool:
Expand Down
4 changes: 2 additions & 2 deletions parm/soca/obs/config/insitu_profile_glider.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ obs space:
obsdatain:
engine:
type: H5File
obsfile: !ENV ${DATA}/obs/${OPREFIX}insitu_profile_glider.${PDY}${cyc}.nc4
obsfile: ${DATA}/obs/${OPREFIX}insitu_profile_glider.${PDY}${cyc}.nc4
obsdataout:
engine:
type: H5File
obsfile: !ENV ${DATA}/diags/insitu_profile_glider.${PDY}${cyc}.nc4
obsfile: ${DATA}/diags/insitu_profile_glider.${PDY}${cyc}.nc4
simulated variables: [waterTemperature]
observed variables: [waterTemperature]
io pool:
Expand Down
4 changes: 2 additions & 2 deletions parm/soca/obs/config/insitu_profile_marinemammal.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ obs space:
obsdatain:
engine:
type: H5File
obsfile: !ENV ${DATA}/obs/${OPREFIX}insitu_profile_marinemammal.${PDY}${cyc}.nc4
obsfile: ${DATA}/obs/${OPREFIX}insitu_profile_marinemammal.${PDY}${cyc}.nc4
obsdataout:
engine:
type: H5File
obsfile: !ENV ${DATA}/diags/insitu_profile_marinemammal.${PDY}${cyc}.nc4
obsfile: ${DATA}/diags/insitu_profile_marinemammal.${PDY}${cyc}.nc4
simulated variables: [waterTemperature]
observed variables: [waterTemperature]
io pool:
Expand Down
4 changes: 2 additions & 2 deletions parm/soca/obs/config/insitu_profile_mbuoy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ obs space:
obsdatain:
engine:
type: H5File
obsfile: !ENV ${DATA}/obs/${OPREFIX}insitu_profile_mbuoy.${PDY}${cyc}.nc4
obsfile: ${DATA}/obs/${OPREFIX}insitu_profile_mbuoy.${PDY}${cyc}.nc4
obsdataout:
engine:
type: H5File
obsfile: !ENV ${DATA}/diags/insitu_profile_mbuoy.${PDY}${cyc}.nc4
obsfile: ${DATA}/diags/insitu_profile_mbuoy.${PDY}${cyc}.nc4
simulated variables: [waterTemperature]
observed variables: [waterTemperature]
io pool:
Expand Down
4 changes: 2 additions & 2 deletions parm/soca/obs/config/insitu_profile_mbuoyb.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ obs space:
obsdatain:
engine:
type: H5File
obsfile: !ENV ${DATA}/obs/${OPREFIX}insitu_profile_mbuoyb.${PDY}${cyc}.nc4
obsfile: ${DATA}/obs/${OPREFIX}insitu_profile_mbuoyb.${PDY}${cyc}.nc4
obsdataout:
engine:
type: H5File
obsfile: !ENV ${DATA}/diags/insitu_profile_mbuoyb.${PDY}${cyc}.nc4
obsfile: ${DATA}/diags/insitu_profile_mbuoyb.${PDY}${cyc}.nc4
simulated variables: [waterTemperature]
observed variables: [waterTemperature]
io pool:
Expand Down
4 changes: 2 additions & 2 deletions parm/soca/obs/config/insitu_profile_tesac.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ obs space:
obsdatain:
engine:
type: H5File
obsfile: !ENV ${DATA}/obs/${OPREFIX}insitu_profile_tesac.${PDY}${cyc}.nc4
obsfile: ${DATA}/obs/${OPREFIX}insitu_profile_tesac.${PDY}${cyc}.nc4
obsdataout:
engine:
type: H5File
obsfile: !ENV ${DATA}/diags/insitu_profile_tesac.${PDY}${cyc}.nc4
obsfile: ${DATA}/diags/insitu_profile_tesac.${PDY}${cyc}.nc4
simulated variables: [waterTemperature]
observed variables: [waterTemperature]
io pool:
Expand Down
4 changes: 2 additions & 2 deletions parm/soca/obs/config/insitu_profile_tesac_salinity.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ obs space:
obsdatain:
engine:
type: H5File
obsfile: !ENV ${DATA}/obs/${OPREFIX}insitu_profile_tesac.${PDY}${cyc}.nc4
obsfile: ${DATA}/obs/${OPREFIX}insitu_profile_tesac.${PDY}${cyc}.nc4
obsdataout:
engine:
type: H5File
obsfile: !ENV ${DATA}/diags/insitu_profile_tesac_salinity.${PDY}${cyc}.nc4
obsfile: ${DATA}/diags/insitu_profile_tesac_salinity.${PDY}${cyc}.nc4
simulated variables: [salinity]
observed variables: [salinity]
io pool:
Expand Down
4 changes: 2 additions & 2 deletions parm/soca/obs/config/insitu_profile_xbtctd.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ obs space:
obsdatain:
engine:
type: H5File
obsfile: !ENV ${DATA}/obs/${OPREFIX}insitu_profile_xbtctd.${PDY}${cyc}.nc4
obsfile: ${DATA}/obs/${OPREFIX}insitu_profile_xbtctd.${PDY}${cyc}.nc4
obsdataout:
engine:
type: H5File
obsfile: !ENV ${DATA}/diags/insitu_profile_xbtctd.${PDY}${cyc}.nc4
obsfile: ${DATA}/diags/insitu_profile_xbtctd.${PDY}${cyc}.nc4
simulated variables: [waterTemperature]
observed variables: [waterTemperature]
io pool:
Expand Down
4 changes: 2 additions & 2 deletions parm/soca/obs/config/insitu_surface_altkob.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ obs space:
obsdatain:
engine:
type: H5File
obsfile: !ENV ${DATA}/obs/${OPREFIX}insitu_surface_altkob.${PDY}${cyc}.nc4
obsfile: ${DATA}/obs/${OPREFIX}insitu_surface_altkob.${PDY}${cyc}.nc4
obsdataout:
engine:
type: H5File
obsfile: !ENV ${DATA}/diags/insitu_surface_altkob.${PDY}${cyc}.nc4
obsfile: ${DATA}/diags/insitu_surface_altkob.${PDY}${cyc}.nc4
simulated variables: [seaSurfaceTemperature]
io pool:
max pool size: 1
Expand Down
4 changes: 2 additions & 2 deletions parm/soca/obs/config/insitu_surface_trkob.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ obs space:
obsdatain:
engine:
type: H5File
obsfile: !ENV ${DATA}/obs/${OPREFIX}insitu_surface_trkob.${PDY}${cyc}.nc4
obsfile: ${DATA}/obs/${OPREFIX}insitu_surface_trkob.${PDY}${cyc}.nc4
obsdataout:
engine:
type: H5File
obsfile: !ENV ${DATA}/diags/insitu_surface_trkob.${PDY}${cyc}.nc4
obsfile: ${DATA}/diags/insitu_surface_trkob.${PDY}${cyc}.nc4
simulated variables: [seaSurfaceTemperature]
io pool:
max pool size: 1
Expand Down
Loading

0 comments on commit 55e895f

Please sign in to comment.