Merge branch 'develop' into feature/bufr-query

NOAA-EMC · Jul 22, 2024 · 929e8e6 · 929e8e6
2 parents 09a2fb9 + 52f41a2
commit 929e8e6
Show file tree

Hide file tree

Showing 36 changed files with 425 additions and 618 deletions.
diff --git a/modulefiles/GDAS/hercules.intel.lua b/modulefiles/GDAS/hercules.intel.lua
@@ -61,7 +61,7 @@ load("py-pybind11/2.11.0")
 --load("crtm/v2.4_jedi")
 load("contrib/0.1")
 load("noaatools/3.1")
-load("rocoto/1.3.5")
+load("rocoto/1.3.7")
 
 load("hpc/1.2.0")
 unload("python/3.10.13")

diff --git a/modulefiles/GDAS/orion.intel.lua b/modulefiles/GDAS/orion.intel.lua
@@ -61,7 +61,7 @@ load("py-pybind11/2.11.0")
 --load("crtm/v2.4_jedi")
 load("contrib/0.1")
 load("noaatools/3.1")
-load("rocoto/1.3.5")
+load("rocoto/1.3.7")
 
 load("hpc/1.2.0")
 unload("python/3.10.13")

diff --git a/parm/snow/obs/lists/gdas_snow.yaml.j2 b/parm/snow/obs/lists/gdas_snow.yaml.j2
@@ -3,7 +3,7 @@ observers:
 {% include 'snow/obs/config/adpsfc_snow.yaml.j2' %}
 {% include 'snow/obs/config/snocvr_snow.yaml.j2' %}
 {% set cycle = current_cycle | strftime("t%Hz") %}
-{% if cycle in ['t18z'] %}
+{% if cycle in ['t00z'] %}
 {% include 'snow/obs/config/ims_snow.yaml.j2' %}
 {% endif %}
 {% endfilter %}
diff --git a/parm/snow/prep/fims.nml.j2 b/parm/snow/prep/fims.nml.j2
@@ -4,7 +4,7 @@
   otype = "{{ CASE }}_oro_data",
   jdate = "{{ current_cycle | to_julian }}",
   yyyymmddhh = "{{ current_cycle | to_YMD }}.{{ current_cycle.strftime('%H') }}",
-  imsformat = 2,
+  imsformat = 1,
   imsversion = "1.3",
   fcst_path = "{{ DATA }}/bkg/"
   IMS_OBS_PATH = "{{ DATA }}/obs/",

diff --git a/parm/snow/prep/prep_ims.yaml.j2 b/parm/snow/prep/prep_ims.yaml.j2
@@ -2,7 +2,7 @@ calcfims:
   mkdir:
     - '{{ DATA }}/obs'
   copy:
-    - ['{{ COM_OBS }}/{{ OPREFIX }}ims{{ current_cycle | to_julian }}_4km_v1.3.nc', '{{ DATA }}/obs/ims{{ current_cycle | to_julian }}_4km_v1.3.nc']
+    - ['{{ COM_OBS }}/{{ OPREFIX }}imssnow96.asc', '{{ DATA }}/obs/ims{{ current_cycle | to_julian }}_4km_v1.3.asc']
     - ['{{ FIXgfs }}/gdas/obs/ims/IMS_4km_to_{{ CASE }}.mx{{ OCNRES }}.nc', '{{ DATA }}/obs/IMS4km_to_FV3_mapping.{{ CASE }}_oro_data.nc']
 ims2ioda:
   copy:

diff --git a/parm/soca/berror/soca_bump_loc.yaml → parm/soca/berror/obsolete/soca_bump_loc.yaml b/parm/soca/berror/soca_bump_loc.yaml → parm/soca/berror/obsolete/soca_bump_loc.yaml
diff --git a/parm/soca/berror/soca_ensweights.yaml → ...soca/berror/obsolete/soca_ensweights.yaml b/parm/soca/berror/soca_ensweights.yaml → ...soca/berror/obsolete/soca_ensweights.yaml
diff --git a/.../berror/soca_parameters_diffusion_hz.yaml → ...bsolete/soca_parameters_diffusion_hz.yaml b/.../berror/soca_parameters_diffusion_hz.yaml → ...bsolete/soca_parameters_diffusion_hz.yaml
diff --git a/.../berror/soca_parameters_diffusion_vt.yaml → ...bsolete/soca_parameters_diffusion_vt.yaml b/.../berror/soca_parameters_diffusion_vt.yaml → ...bsolete/soca_parameters_diffusion_vt.yaml
diff --git a/parm/soca/berror/soca_setlocscales.yaml → ...ca/berror/obsolete/soca_setlocscales.yaml b/parm/soca/berror/soca_setlocscales.yaml → ...ca/berror/obsolete/soca_setlocscales.yaml
diff --git a/parm/soca/berror/old/parametric_stddev_b.yaml b/parm/soca/berror/old/parametric_stddev_b.yaml
diff --git a/parm/soca/berror/old/soca_apply_steric.yaml b/parm/soca/berror/old/soca_apply_steric.yaml
diff --git a/parm/soca/berror/old/soca_bump2d.yaml b/parm/soca/berror/old/soca_bump2d.yaml
diff --git a/parm/soca/berror/old/soca_bump_split.yaml b/parm/soca/berror/old/soca_bump_split.yaml
diff --git a/parm/soca/berror/old/soca_clim_ens_moments.yaml b/parm/soca/berror/old/soca_clim_ens_moments.yaml
diff --git a/parm/soca/berror/old/soca_clim_ens_perts.yaml b/parm/soca/berror/old/soca_clim_ens_perts.yaml
diff --git a/parm/soca/berror/old/soca_postproc_stddev.yaml b/parm/soca/berror/old/soca_postproc_stddev.yaml
diff --git a/parm/soca/berror/soca_diagb.yaml.j2 b/parm/soca/berror/soca_diagb.yaml.j2
@@ -2,18 +2,18 @@ geometry:
   mom6_input_nml: mom_input.nml
   fields metadata: ./fields_metadata.yaml
 
-date: '{{ ATM_WINDOW_MIDDLE }}'
+date: '{{ MARINE_WINDOW_END  | to_isotime }}'
 
 background:
-  date: '{{ ATM_WINDOW_MIDDLE }}'
+  date: '{{ MARINE_WINDOW_END  | to_isotime }}'
   basename: ./bkg/
-  ocn_filename: 'gdas.ocean.t{{ gcyc }}z.inst.f009.nc'
-  ice_filename: 'gdas.agg_ice.t{{ gcyc }}z.inst.f009.nc'
+  ocn_filename: 'ocean.bkg.f009.nc'
+  ice_filename: 'ice.bkg.f009.nc'
   read_from_file: 1
 
 background error:
-  datadir: ./
-  date: '{{ ATM_WINDOW_MIDDLE }}'
+  datadir: ./diagb/
+  date: '{{ MARINE_WINDOW_MIDDLE | to_isotime }}'
   exp: bkgerr_stddev
   type: incr