Refactoring of the marine B-matrix job (#1211)

## Description It needs more cleanup, and the norms are failing, so it's a draft for now. This PR moves most of the B-matrix generation into the g-w. It introduces a new jjob, `JGLOBAL_MARINE_BMAT`, that replaces the old one that I have yet to remove. ## What is not addressed yet - I need to revisit the `post` job/script - We lost the functionality to point to offline ensemble members, for now ... - ## Companion PR global-workflow companion PR ## Issues addressed - fixes #1210 --------- Co-authored-by: Cory Martin <[email protected]> Co-authored-by: Guillaume Vernieres <[email protected]>
NOAA-EMC · Jul 22, 2024 · 52f41a2 · 52f41a2
1 parent e9252e1
commit 52f41a2
Show file tree

Hide file tree

Showing 33 changed files with 422 additions and 615 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/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