Merge branch 'develop' into bugfix/b2iemptyfile

NOAA-EMC · Nov 6, 2024 · 50c8e94 · 50c8e94
2 parents 7104eba + e9607fc
commit 50c8e94
Show file tree

Hide file tree

Showing 12 changed files with 7 additions and 290 deletions.
diff --git a/parm/jcb-gdas b/parm/jcb-gdas
diff --git a/parm/soca/berror/soca_diagb.yaml.j2 b/parm/soca/berror/soca_diagb.yaml.j2
diff --git a/parm/soca/berror/soca_ensb.yaml.j2 b/parm/soca/berror/soca_ensb.yaml.j2
diff --git a/parm/soca/berror/soca_ensweights.yaml.j2 b/parm/soca/berror/soca_ensweights.yaml.j2
diff --git a/parm/soca/berror/soca_parameters_diffusion_hz.yaml.j2 b/parm/soca/berror/soca_parameters_diffusion_hz.yaml.j2
diff --git a/parm/soca/berror/soca_parameters_diffusion_vt.yaml.j2 b/parm/soca/berror/soca_parameters_diffusion_vt.yaml.j2
diff --git a/parm/soca/berror/soca_setcorscales.yaml b/parm/soca/berror/soca_setcorscales.yaml
diff --git a/parm/soca/berror/soca_vtscales.yaml.j2 b/parm/soca/berror/soca_vtscales.yaml.j2
diff --git a/parm/soca/gridgen/gridgen.yaml b/parm/soca/gridgen/gridgen.yaml
diff --git a/parm/soca/marine-jcb-base.yaml b/parm/soca/marine-jcb-base.yaml
@@ -17,7 +17,7 @@ final_increment_file: marine_final_increment
 
 # Assimilation standard things (not prepended with model choice)
 # ----------------------------
-window_begin: '{{MARINE_WINDOW_BEGIN}}'
+window_begin: '{{ MARINE_WINDOW_BEGIN | to_isotime }}'
 window_length: '{{MARINE_WINDOW_LENGTH}}'
 bound_to_include: begin
 minimizer: RPCG
@@ -31,6 +31,10 @@ analysis_variables: [cicen, hicen, hsnon, socn, tocn, uocn, vocn, ssh]
 # ------------
 marine_window_begin: '{{MARINE_WINDOW_BEGIN}}'
 marine_window_middle: '{{MARINE_WINDOW_MIDDLE}}'
+marine_window_begin_iso: '{{ MARINE_WINDOW_BEGIN | to_isotime }}'
+marine_window_middle_iso: '{{ MARINE_WINDOW_MIDDLE | to_isotime }}'
+marine_window_end_iso: '{{ MARINE_WINDOW_END | to_isotime }}'
+enspert_relpath: '{{ ENSPERT_RELPATH }}'
 
 # Geometry
 marine_soca_files_path: .
@@ -42,11 +46,10 @@ marine_background_time: '{{MARINE_WINDOW_BEGIN_ISO}}'
 
 # Pseudo model
 marine_forecast_timestep: PT3H
-marine_pseudo_model_states: !INC 'bkg_list.yaml'
 
 # Background error model
 background_error_file: '{{berror_model}}'
-marine_number_ensemble_members: '{{nmem_ens}}'
+marine_number_ensemble_members: '{{NMEM_ENS}}'
 marine_stddev_time: '{{MARINE_WINDOW_MIDDLE}}'
 
 # Observations

diff --git a/parm/soca/soca_fix_stage_500.yaml.j2 b/parm/soca/soca_fix_stage_500.yaml.j2
@@ -9,8 +9,6 @@ copy:
 - ["{{ SOCA_INPUT_FIX_DIR }}/field_table", "{{ DATA }}/field_table"]
 - ["{{ SOCA_INPUT_FIX_DIR }}/diag_table", "{{ DATA }}/diag_table"]
 - ["{{ SOCA_INPUT_FIX_DIR }}/MOM_input", "{{ DATA }}/MOM_input"]
-- ["{{ SOCA_INPUT_FIX_DIR }}/fields_metadata.yaml", "{{ DATA }}/fields_metadata.yaml"]
-- ["{{ SOCA_INPUT_FIX_DIR }}/obsop_name_map.yaml", "{{ DATA }}/obsop_name_map.yaml"]
 - ["{{ SOCA_INPUT_FIX_DIR }}/INPUT/grid_spec.nc", "{{ DATA }}/INPUT/grid_spec.nc"]
 - ["{{ SOCA_INPUT_FIX_DIR }}/INPUT/hycom1_25.nc", "{{ DATA }}/INPUT/hycom1_25.nc"]
 - ["{{ SOCA_INPUT_FIX_DIR }}/INPUT/layer_coord25.nc", "{{ DATA }}/INPUT/layer_coord25.nc"]

diff --git a/parm/soca/soca_utils_stage.yaml.j2 b/parm/soca/soca_utils_stage.yaml.j2
@@ -4,4 +4,3 @@
 copy:
 - ["{{ HOMEgfs }}/parm/gdas/soca/fields_metadata.yaml", "{{ DATA }}/fields_metadata.yaml"]
 - ["{{ HOMEgfs }}/parm/gdas/soca/obsop_name_map.yaml", "{{ DATA }}/obsop_name_map.yaml"]
-- ["{{ HOMEgfs }}/parm/gdas/soca/gridgen/gridgen.yaml", "{{ DATA }}/gridgen.yaml"]
+33 −0		.github/workflows/run_jcb_basic_testing.yaml
+48 −0		algorithm/aero/aero_convert_background.yaml.j2
+81 −0		algorithm/aero/aero_gen_bmatrix_diagb.yaml.j2
+48 −0		algorithm/aero/aero_gen_bmatrix_diffusion.yaml.j2
+37 −0		algorithm/marine/soca_diagb.yaml.j2
+98 −0		algorithm/marine/soca_ensb.yaml.j2
+37 −0		algorithm/marine/soca_ensweights.yaml.j2
+5 −0		algorithm/marine/soca_gridgen.yaml.j2
+37 −0		algorithm/marine/soca_parameters_diffusion_hz.yaml.j2
+34 −0		algorithm/marine/soca_parameters_diffusion_vt.yaml.j2
+23 −0		algorithm/marine/soca_setcorscales.yaml.j2
+13 −0		algorithm/marine/soca_vtscales.yaml.j2
+1 −0		model/aero/aero_3dfgat_outer_loop_1.yaml.j2
+1 −0		model/aero/aero_3dfgat_outer_loop_2.yaml.j2
+17 −0		model/aero/aero_3dvar_outer_loop_1.yaml.j2
+17 −0		model/aero/aero_3dvar_outer_loop_2.yaml.j2
+10 −0		model/aero/aero_background.yaml.j2
+33 −0		model/aero/aero_background_error_static_diffusion.yaml.j2
+23 −0		model/aero/aero_final_increment_cubed_sphere.yaml.j2
+18 −0		model/aero/aero_final_increment_gaussian.yaml.j2
+0 −0		model/aero/aero_geometry.yaml.j2
+11 −0		model/aero/aero_geometry_background.yaml.j2
+13 −0		model/aero/aero_model_pseudo.yaml.j2
+22 −45		model/marine/marine_background_error_hybrid_diffusion_diffusion.yaml.j2
+29 −0		observation_chronicle/atmosphere/abi_g16.yaml
+29 −0		observation_chronicle/atmosphere/abi_g17.yaml
+0 −0		observation_chronicle/atmosphere/iasi_metop-a.yaml
+0 −0		observation_chronicle/atmosphere/iasi_metop-b.yaml
+63 −0		observations/aero/viirs_n20_aod.yaml.j2
+63 −0		observations/aero/viirs_n21_aod.yaml.j2
+63 −0		observations/aero/viirs_npp_aod.yaml.j2
+31 −89		observations/atmosphere-lgetkf/iasi_metop-a.yaml.j2
+31 −89		observations/atmosphere-lgetkf/iasi_metop-b.yaml.j2
+474 −0		observations/atmosphere/abi_g16.yaml.j2
+474 −0		observations/atmosphere/abi_g17.yaml.j2
+31 −90		observations/atmosphere/iasi_metop-a.yaml.j2
+31 −90		observations/atmosphere/iasi_metop-b.yaml.j2
+0 −542		observations/marine/insitu_profile_argo.yaml.j2
+136 −0		test/client_integration/gdas-atmosphere-templates.yaml
+113 −0		test/client_integration/gdas-marine-templates.yaml