removed u/v, fixed hyb b-mat

NOAA-EMC · Dec 16, 2024 · 32abcd4 · 32abcd4
1 parent 682f925
commit 32abcd4
Show file tree

Hide file tree

Showing 4 changed files with 92 additions and 20 deletions.
diff --git a/algorithm/marine/socaincr2mom6.yaml.j2 b/algorithm/marine/socaincr2mom6.yaml.j2
@@ -6,7 +6,16 @@ date: '{{ marine_window_begin }}'
 
 layers variable: [sea_water_cell_thickness]
 
-increment variables: [sea_water_potential_temperature, sea_water_salinity, eastward_sea_water_velocity, northward_sea_water_velocity, sea_surface_height_above_geoid]
+increment variables:
+- sea_water_potential_temperature
+- sea_water_salinity
+#- eastward_sea_water_velocity
+#- northward_sea_water_velocity
+- sea_surface_height_above_geoid  # Not used in MOM6 iau
+
+set increment variables to zero:
+- eastward_sea_water_velocity
+- northward_sea_water_velocity
 
 vertical geometry:
   date: '{{ marine_window_begin }}'

diff --git a/model/marine/marine_background.yaml.j2 b/model/marine/marine_background.yaml.j2
@@ -3,4 +3,18 @@ basename: {{ marine_background_path}}
 ocn_filename: MOM.res.nc
 ice_filename: cice.res.nc
 date: "{{ marine_background_time }}"
-state variables: [sea_ice_area_fraction, sea_ice_thickness, sea_ice_snow_thickness, sea_water_salinity, sea_water_potential_temperature, eastward_sea_water_velocity, northward_sea_water_velocity, sea_surface_height_above_geoid, sea_water_cell_thickness, ocean_mixed_layer_thickness, sea_water_depth]
+state variables:
+- sea_ice_area_fraction
+- sea_ice_thickness
+- sea_ice_snow_thickness
+- snow_ice_surface_temperature
+- air_temperature
+- bulk_ice_salinity
+- sea_water_salinity
+- sea_water_potential_temperature
+#- eastward_sea_water_velocity
+#- northward_sea_water_velocity
+- sea_surface_height_above_geoid
+- sea_water_cell_thickness
+- ocean_mixed_layer_thickness
+- sea_water_depth
diff --git a/model/marine/marine_background_error_hybrid_diffusion_diffusion.yaml.j2 b/model/marine/marine_background_error_hybrid_diffusion_diffusion.yaml.j2
@@ -6,15 +6,22 @@ components:
       saber block name: diffusion
       read:
         groups:
-        - variables: [tocn, socn, ssh]
+        - variables:
+          - sea_water_potential_temperature
+          - sea_water_salinity
+          - sea_surface_height_above_geoid
+          - sea_ice_area_fraction
           horizontal:
             filepath: ./staticb/hz_ocean
           vertical:
             levels: {{marine_vt_levels}}
             filepath: ./staticb/vt_ocean
-        - variables: [cicen]
-          horizontal:
-            filepath: ./staticb/hz_ice
+    # TODO(G): OK to not use what's below but it will need
+    #          to be fixed when we add ice thickness and
+    #          snow depth
+    #    - variables: [sea_ice_area_fraction]
+    #      horizontal:
+    #        filepath: ./staticb/hz_ice
 
     saber outer blocks:
     - saber block name: StdDev
@@ -25,10 +32,25 @@ components:
           ocn_filename: 'ocn.bkgerr_stddev.nc'
           ice_filename: 'ice.bkgerr_stddev.nc'
           read_from_file: 3
-
     linear variable change:
-      input variables: [cicen, hicen, hsnon, socn, tocn, uocn, vocn, ssh]
-      output variables: [cicen, hicen, hsnon, socn, tocn, uocn, vocn, ssh]
+      input variables:
+      - sea_ice_area_fraction
+      - sea_ice_thickness
+      - sea_ice_snow_thickness
+      - sea_water_salinity
+      - sea_water_potential_temperature
+      #- eastward_sea_water_velocity
+      #- northward_sea_water_velocity
+      - sea_surface_height_above_geoid
+      output variables:
+      - sea_ice_area_fraction
+      - sea_ice_thickness
+      - sea_ice_snow_thickness
+      - sea_water_salinity
+      - sea_water_potential_temperature
+      #- eastward_sea_water_velocity
+      #- northward_sea_water_velocity
+      - sea_surface_height_above_geoid
       linear variable changes:
       - linear variable change name: BalanceSOCA
   weight:
@@ -43,7 +65,15 @@ components:
         basename: ../ensdata/
         ocn_filename: 'ocn.pert.steric.%mem%.nc'
         ice_filename: 'ens/ice.%mem%.nc'
-        state variables: [tocn, socn, ssh, uocn, vocn, cicen, hicen, hsnon]
+        state variables:
+        - sea_ice_area_fraction
+        - sea_ice_thickness
+        - sea_ice_snow_thickness
+        - sea_water_salinity
+        - sea_water_potential_temperature
+        #- eastward_sea_water_velocity
+        #- northward_sea_water_velocity
+        - sea_surface_height_above_geoid
       pattern: '%mem%'
       nmembers: '{{marine_number_ensemble_members}}'
     localization:
@@ -52,15 +82,16 @@ components:
         saber block name: diffusion
         read:
           groups:
-          - variables: [tocn, socn, ssh]
-            multivariate strategy: duplicated
+          - variables:
+            - sea_water_potential_temperature
+            - sea_water_salinity
+            - sea_surface_height_above_geoid
+            - sea_ice_area_fraction
             horizontal:
               filepath: ./staticb/hz_ocean
             vertical:
-              strategy: duplicated
-          - variables: [cicen]
-            horizontal:
-              filepath: ./staticb/hz_ice
+              levels: {{marine_vt_levels}}
+              filepath: ./staticb/vt_ocean
   weight:
     read_from_file: 3
     basename: ./

diff --git a/model/marine/marine_background_error_static_diffusion.yaml.j2 b/model/marine/marine_background_error_static_diffusion.yaml.j2
@@ -30,24 +30,42 @@ saber outer blocks:
       ice_filename: 'ice.bkgerr_stddev.nc'
       read_from_file: 3
 
+#- saber block name: MLBalance
+#  geometry:
+#    mom6_input_nml: mom_input.nml
+#    fields metadata: ./fields_metadata.yaml
+#  ML Balances:
+#    arctic:
+#      ffnn:
+#        inputSize: 7
+#        outputSize: 1
+#        hiddenSize: 2
+#        load model: /work/noaa/da/gvernier/ai/runs/arctic.pt
+#    antarctic:
+#      ffnn:
+#        inputSize: 7
+#        outputSize: 1
+#        hiddenSize: 2
+#        load model: /work/noaa/da/gvernier/ai/runs/antarctic.pt
+
 linear variable change:
   input variables:
   - sea_ice_area_fraction
   - sea_ice_thickness
   - sea_ice_snow_thickness
   - sea_water_salinity
   - sea_water_potential_temperature
-  - eastward_sea_water_velocity
-  - northward_sea_water_velocity
+  #- eastward_sea_water_velocity
+  #- northward_sea_water_velocity
   - sea_surface_height_above_geoid
   output variables:
   - sea_ice_area_fraction
   - sea_ice_thickness
   - sea_ice_snow_thickness
   - sea_water_salinity
   - sea_water_potential_temperature
-  - eastward_sea_water_velocity
-  - northward_sea_water_velocity
+  #- eastward_sea_water_velocity
+  #- northward_sea_water_velocity
   - sea_surface_height_above_geoid
   linear variable changes:
   - linear variable change name: BalanceSOCA