Clean up gsibec staticb yaml (#166)

parm/atm/berror/staticb_gsibec.yaml

@@ -1,39 +1,29 @@
-background error:
-  covariance model: hybrid
-  components:
-  - covariance:
-      covariance model: SABER
-      saber blocks:
-      - saber block name: gsi covariance
-        saber central block: true
-        input variables: &control_vars [eastward_wind,northward_wind,air_temperature,surface_pressure,
-                                 specific_humidity,cloud_liquid_ice,cloud_liquid_water,
-                                 mole_fraction_of_ozone_in_air]
-        output variables: *control_vars
-        gsi akbk: &akbk $(fv3jedi_fix_dir)/akbk.nc4
-        gsi error covariance file: &gsiberr $(fv3jedi_staticb_dir)/gsi-coeffs-gfs-global-l127x192y96.nc4
-        gsi berror namelist file: &gsibnml $(fv3jedi_staticb_dir)/gfs_gsi_global.nml
-        processor layout x direction: 3
-        processor layout y direction: 2
-        debugging mode: false
-      - saber block name: gsi interpolation to model grid
-        input variables: *control_vars
-        output variables: *control_vars
-        gsi akbk: *akbk
-        gsi error covariance file: *gsiberr
-        gsi berror namelist file: *gsibnml
-        processor layout x direction: 3
-        processor layout y direction: 2
-        debugging mode: false
-      linear variable change:
-        linear variable change name: Control2Analysis
-        input variables: *control_vars
-        output variables: &3dvars_anal [ua,va,t,ps,sphum,ice_wat,liq_wat,o3mr]
-    weight:
-      value: 1.00
-  - covariance:
-      covariance model: FV3JEDI-ID
-      date: $(window_begin)
-    weight:
-      value: 0.0
-
+covariance model: SABER
+full inverse: true
+saber blocks:
+- saber block name: gsi covariance
+  saber central block: true
+  input variables: &control_vars [eastward_wind,northward_wind,air_temperature,surface_pressure,
+                           specific_humidity,cloud_liquid_ice,cloud_liquid_water,
+                           mole_fraction_of_ozone_in_air]
+  output variables: *control_vars
+  gsi akbk: &akbk $(fv3jedi_fix_dir)/akbk.nc4
+  gsi error covariance file: &gsiberr $(fv3jedi_staticb_dir)/gsi-coeffs-gfs-global.nc4
+# gsi error covariance file: &gsiberr $(fv3jedi_staticb_dir)/global_berror.f77
+  gsi berror namelist file: &gsibnml $(fv3jedi_staticb_dir)/gfs_gsi_global.nml
+  processor layout x direction: &layout_gsib_x 3
+  processor layout y direction: &layout_gsib_y 2
+  debugging mode: false
+- saber block name: gsi interpolation to model grid
+  input variables: *control_vars
+  output variables: *control_vars
+  gsi akbk: *akbk
+  gsi error covariance file: *gsiberr
+  gsi berror namelist file: *gsibnml
+  processor layout x direction: *layout_gsib_x
+  processor layout y direction: *layout_gsib_y
+  debugging mode: false
+linear variable change:
+  linear variable change name: Control2Analysis
+  input variables: *control_vars
+  output variables: &3dvars_anal [ua,va,t,ps,sphum,ice_wat,liq_wat,o3mr]