New ocean/ice B diag

parm/soca/berror/saber_blocks.yaml

@@ -1,101 +1,42 @@
-covariance model: hybrid
-components:
-- covariance:
-    # This will setup B = K D C_v C_h C_h^{T} C_v^{T} D K^{T}
-    covariance model: SABER
-    saber central block:
-      saber block name: EXPLICIT_DIFFUSION
-      active variables: [tocn, socn, ssh, cicen]
-      geometry:
-        mom6_input_nml: mom_input.nml
-        fields metadata: ./fields_metadata.yaml
-      group mapping:
-      - name: ocean
-        variables: [tocn, socn, ssh]
-      - name: ice
-        variables: [cicen]
-      read:
-        groups:
-        - name: ocean
-          horizontal:
-            filename: hz_ocean.nc
-          vertical:
-            filename: vt_ocean.nc
-        - name: ice
-          horizontal:
-            filename: hz_ice.nc
+covariance model: SABER
+saber central block:
+  saber block name: EXPLICIT_DIFFUSION
+  active variables: [tocn, socn, ssh, cicen]
+  geometry:
+    mom6_input_nml: mom_input.nml
+    fields metadata: ./fields_metadata.yaml
+  group mapping:
+  - name: ocean
+    variables:
+    - tocn
+    - socn
+    - ssh
+  - name: ice
+    variables:
+    - cicen
+  read:
+    groups:
+    - name: ocean
+      horizontal:
+        filename: hz_ocean.nc
+      vertical:
+        filename: vt_ocean.nc
+    - name: ice
+      horizontal:
+        filename: hz_ice.nc
 
-    linear variable change:
-      input variables: [cicen, hicen, hsnon, socn, tocn, uocn, vocn, ssh]
-      output variables: [cicen, hicen, hsnon, socn, tocn, uocn, vocn, ssh]
-      linear variable changes:
+saber outer blocks:
+- saber block name: StdDev
+  read:
+    model file:
+      date: '{{ATM_WINDOW_MIDDLE}}'
+      basename: ./
+      ocn_filename: 'ocn.bkgerr_stddev.incr.{{ATM_WINDOW_MIDDLE}}.nc'
+      ice_filename: 'ice.bkgerr_stddev.incr.{{ATM_WINDOW_MIDDLE}}.nc'
+      read_from_file: 3
 
-      - linear variable change name: BkgErrFILT
-        ocean_depth_min: 500 # [m]
-        rescale_bkgerr: 1.0
-        efold_z: 1500.0       # [m]
-
-      - linear variable change name: BkgErrSOCA
-        read_from_file: 3
-        basename: ./static_ens/
-        ocn_filename: 'ocn.bkgerr_stddev.incr.{{ATM_WINDOW_BEGIN}}.nc'
-        ice_filename: 'ice.bkgerr_stddev.incr.{{ATM_WINDOW_BEGIN}}.nc'
-        date: '{{ATM_WINDOW_MIDDLE}}'
-        t_min: 0.1
-        t_max: 5.0
-        s_min: 0.1
-        s_max: 1.0
-        ssh_min: 0.0 # std ssh=0 => ssh balance applied as
-        ssh_max: 1.0 #              strong constraint
-        cicen_min: 0.1
-        cicen_max: 0.5
-        hicen_min: 0.0
-        hicen_max: 0.0
-        standard deviation: true
-
-      - linear variable change name: BalanceSOCA
-        ksshts:
-          nlayers: 10
-
-  weight:
-    value: 0.25
-#- covariance:
-#    covariance model: ensemble
-#    members from template:
-#      template:
-#        read_from_file: 1
-#        date: '{{ATM_WINDOW_MIDDLE}}'
-#        basename: ./static_ens/
-#        ocn_filename: 'ocn.pert.steric.%mem%.nc'
-#        ice_filename: 'ice.%mem%.nc'
-#        state variables: [tocn, socn, ssh, uocn, vocn, cicen, hicen, hsnon]
-#      pattern: '%mem%'
-#      nmembers: ${ENS_SIZE}
-#    localization:
-#      localization method: SABER
-#      saber central block:
-#        saber block name: EXPLICIT_DIFFUSION
-#        active variables: [tocn, socn, ssh]
-#        geometry:
-#          mom6_input_nml: mom_input.nml
-#          fields metadata: ./fields_metadata.yaml
-#        group mapping:
-#        - name: ocean
-#          variables: [tocn, socn, ssh, uocn, vocn]
-#        - name: ice
-#          variables: [cicen, hicen, hsnon]
-#        read:
-#          groups:
-#          - name: ocean
-#            horizontal:
-#              filename: hz_ocean.nc
-#          - name: ice
-#            horizontal:
-#              filename: hz_ice.nc
-#
-#  weight:
-#    read_from_file: 3
-#    basename: ./
-#    ocn_filename: 'ocn.ens_weights.incr.{{ATM_WINDOW_MIDDLE}}.nc'
-#    ice_filename: 'ice.ens_weights.incr.{{ATM_WINDOW_MIDDLE}}.nc'
-#    date: '{{ATM_WINDOW_MIDDLE}}'
+linear variable change:
+  input variables: [cicen, hicen, hsnon, socn, tocn, uocn, vocn, ssh]
+  output variables: [cicen, hicen, hsnon, socn, tocn, uocn, vocn, ssh]
+  linear variable changes:
+  - linear variable change name: BalanceSOCA

parm/soca/berror/soca_diagb.yaml.j2

@@ -0,0 +1,59 @@
+geometry:
+  mom6_input_nml: mom_input.nml
+  fields metadata: ./fields_metadata.yaml
+
+date: '{{ ATM_WINDOW_MIDDLE }}'
+
+background:
+  date: '{{ ATM_WINDOW_MIDDLE }}'
+  basename: ./bkg/
+  ocn_filename: '{{ RUN }}.ocean.t{{ gcyc }}z.inst.f009.nc'
+  ice_filename: '{{ RUN }}.agg_ice.t{{ gcyc }}z.inst.f009.nc'
+  read_from_file: 1
+
+background error:
+  datadir: ./
+  date: '{{ ATM_WINDOW_MIDDLE }}'
+  exp: bkgerr_stddev
+  type: incr
+
+variables:
+  name: [tocn, socn, uocn, vocn, hocn, ssh, cicen, hicen, hsnon, mom6_mld]
+
+rescale: 2.0    # rescales the filtered std. dev. by "rescale"
+min sst: 0.0    # Added to sst bkg. err.
+max ssh: 0.0    # Limits the amplitude of the unbalanced bkg err
+number of halo points: 4
+number of neighbors: 16
+simple smoothing:
+  horizontal iterations: 2
+  vertical iterations: 1
+
+# TODO(G): Start using when the normalization is optional
+#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

parm/soca/berror/soca_parameters_diffusion_vt.yaml

@@ -25,6 +25,8 @@ background error:
       - name: vt_ocean
         vertical:
           as gaussian: true
-          fixed value: 5.0
+          from file:
+            filename: vt_scales.nc
+            variable name: vt
         write:
           filename: vt_ocean.nc

parm/soca/berror/soca_vtscales.yaml.j2

@@ -0,0 +1,13 @@
+gridspec_filename: soca_gridspec.nc
+restart_filename: ./INPUT/MOM.res.nc
+mld_filename: 'ocn.bkgerr_stddev.incr.{{ ATM_WINDOW_MIDDLE }}.nc'
+output_filename: ./vt_scales.nc
+output_variable_vt: vt
+output_variable_hz: hz
+
+VT_MIN: 5
+VT_MAX: 15
+
+HZ_ROSSBY_MULT: 1.0
+HZ_MAX: 200e3
+HZ_MIN_GRID_MULT: 2.0