Better filtering of D and revert obs QC

parm/soca/berror/soca_diagb.yaml.j2

@@ -26,35 +26,12 @@ max ssh: 0.0    # Limits the amplitude of the unbalanced bkg err
 min depth: 500.0 # zero out the bkg. error. at less than min depth
 number of halo points: 4
 number of neighbors: 16
+
 simple smoothing:
   horizontal iterations: 10
   vertical iterations: 1
 
-# TODO(G): Start using when the normalization is optional
+# TODO(G): Too slow for the below scale
 #diffusion:
-#   saber block name: EXPLICIT_DIFFUSION
-#   active variables: [tocn, socn, ssh, cicen, hicen, hsnon]
-#   geometry:
-#     mom6_input_nml: mom_input.nml
-#     fields metadata: ./fields_metadata.yaml
-#   group mapping:
-#   - name: ocean
-#     variables:
-#     - tocn
-#     - socn
-#     - ssh
-#   - name: ice
-#     variables:
-#     - cicen
-#     - hicen
-#     - hsnon
-#   read:
-#     groups:
-#     - name: ocean
-#       horizontal:
-#         filename: hz_ocean.nc
-#       vertical:
-#         filename: vt_ocean.nc
-#     - name: ice
-#       horizontal:
-#         filename: hz_ice.nc
+#  horizontal: 500.0e3
+#  vertical: 3.0

parm/soca/fields_metadata.yaml

@@ -75,21 +75,21 @@
 - name: hicen
   getval name: sea_ice_category_thickness
   io file: ice
-  io name: hicen
+  io name: hi_h
   property: positive_definite
   fill value: 0.0
 
 - name: cicen
   getval name: sea_ice_category_area_fraction
   getval name surface: sea_ice_area_fraction     # note: not accurate, should be "sum" not "surface"
   io file: ice
-  io name: aicen
+  io name: aice_h
   fill value: 0.0
 
 - name: hsnon
   getval name: sea_ice_category_snow_thickness
   io file: ice
-  io name: hsnon
+  io name: hs_h
   property: positive_definite
   fill value: 0.0