NOAA-EMC · DavidNew-NOAA · Nov 6, 2024 · Sep 27, 2024 · Oct 7, 2024 · Oct 7, 2024
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/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"]