Merge branch 'develop' into feature/snow_missing_file_action

NOAA-EMC · Feb 26, 2025 · 2247125 · 2247125
2 parents 43d8237 + bfcff02
commit 2247125
Show file tree

Hide file tree

Showing 13 changed files with 62 additions and 470 deletions.
diff --git a/algorithm/marine/soca_diagb.yaml.j2 b/algorithm/marine/soca_diagb.yaml.j2
@@ -36,10 +36,11 @@ variables:
   - mom6_mld
 
 vertical e-folding scale: 500.0
+min efold depth ratio: 3.0  # keep the e-folding scale at most
+                            # 1/(min efold depth ratio) of the local depth
 rescale: 1.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
-min depth: 500.0 # zero out the bkg. error. at less than min depth
+min depth: 50.0 # zero out the bkg. error. at less than min depth
 number of halo points: 4
 number of neighbors: 16
 

diff --git a/algorithm/obstats/aero/viirs_n20_template.yaml.j2 b/algorithm/obstats/aero/viirs_n20_template.yaml.j2
@@ -3,7 +3,7 @@
     obsdatain:
       engine:
         type: H5File
-        obsfile: {{ aero_obsdatain_path }}/aero/diag_{{ obspace }}_{{ stat_current_cycle_YMDH }}.nc4
+        obsfile: {{ aero_obsdatain_path }}/aero/diag_{{ obspace }}_aod_{{ stat_current_cycle_YMDH }}.nc
     simulated variables: ['aerosolOpticalDepth']
     observed variables: ['aerosolOpticalDepth']
   variables: ['aerosolOpticalDepth']

diff --git a/algorithm/obstats/aero/viirs_npp_template.yaml.j2 b/algorithm/obstats/aero/viirs_npp_template.yaml.j2
@@ -3,7 +3,7 @@
     obsdatain:
       engine:
         type: H5File
-        obsfile: {{ aero_obsdatain_path }}/aero/diag_{{ obspace }}_{{ stat_current_cycle_YMDH }}.nc4
+        obsfile: {{ aero_obsdatain_path }}/aero/diag_{{ obspace }}_aod_{{ stat_current_cycle_YMDH }}.nc
     simulated variables: ['aerosolOpticalDepth']
     observed variables: ['aerosolOpticalDepth']
   variables: ['aerosolOpticalDepth']

diff --git a/model/marine/marine_background_error_hybrid_diffusion_diffusion.yaml.j2 b/model/marine/marine_background_error_hybrid_diffusion_diffusion.yaml.j2
@@ -57,6 +57,7 @@ components:
   weight:
     value: 1.00
 
+{% if marine_ensemble_b | default(false) %}
 - covariance:
     covariance model: SABER
     ensemble:
@@ -102,3 +103,5 @@ components:
     ocn_filename: 'ocean.ens_weights.nc'
     ice_filename: 'ice.ens_weights.nc'
     date: '{{marine_stddev_time}}'
+{% endif %}
+
diff --git a/observations/marine/sst_abi_g16_l3c.yaml.j2 b/observations/marine/sst_abi_g16_l3c.yaml.j2
diff --git a/observations/marine/sst_abi_g16_l3c.yaml.j2 b/observations/marine/sst_abi_g16_l3c.yaml.j2
@@ -0,0 +1 @@
+sst_generic.yaml.j2
diff --git a/observations/marine/sst_abi_g17_l3c.yaml.j2 b/observations/marine/sst_abi_g17_l3c.yaml.j2
diff --git a/observations/marine/sst_abi_g17_l3c.yaml.j2 b/observations/marine/sst_abi_g17_l3c.yaml.j2
@@ -0,0 +1 @@
+sst_generic.yaml.j2
diff --git a/observations/marine/sst_ahi_h08_l3c.yaml.j2 b/observations/marine/sst_ahi_h08_l3c.yaml.j2
diff --git a/observations/marine/sst_ahi_h08_l3c.yaml.j2 b/observations/marine/sst_ahi_h08_l3c.yaml.j2
@@ -0,0 +1 @@
+sst_generic.yaml.j2
diff --git a/observations/marine/sst_avhrr_ma_l3u.yaml.j2 b/observations/marine/sst_avhrr_ma_l3u.yaml.j2
diff --git a/observations/marine/sst_avhrr_ma_l3u.yaml.j2 b/observations/marine/sst_avhrr_ma_l3u.yaml.j2
@@ -0,0 +1 @@
+sst_generic.yaml.j2
diff --git a/observations/marine/sst_avhrr_mb_l3u.yaml.j2 b/observations/marine/sst_avhrr_mb_l3u.yaml.j2
diff --git a/observations/marine/sst_avhrr_mb_l3u.yaml.j2 b/observations/marine/sst_avhrr_mb_l3u.yaml.j2
@@ -0,0 +1 @@
+sst_generic.yaml.j2