Merge branch 'develop' into feature/update-ci

NOAA-EMC · Dec 11, 2024 · b2dbe29 · b2dbe29
2 parents 21bc13e + 547b82d
commit b2dbe29
Show file tree

Hide file tree

Showing 3 changed files with 112 additions and 112 deletions.
diff --git a/parm/soca/obsprep/obsprep_config.yaml b/parm/soca/obsprep/obsprep_config.yaml
@@ -67,47 +67,47 @@ observations:
     provider: MIRS
     dmpdir subdir: ocean/icec
     type: nc
-    dmpdir regex: 'NPR-MIRS-IMG_v11r9_ma1_s*.nc'
+    dmpdir regex: 'NPR-MIRS-IMG_v11r?_ma1_s*.nc'
     ocean basin: RECCAP2_region_masks_all_v20221025.nc
 
 - obs space:
     name: icec_atms_n20_l2
     provider: MIRS
     dmpdir subdir: ocean/icec
     type: nc
-    dmpdir regex: 'NPR-MIRS-IMG_v11r9_n20_s*.nc'
+    dmpdir regex: 'NPR-MIRS-IMG_v11r?_n20_s*.nc'
     ocean basin: RECCAP2_region_masks_all_v20221025.nc
 
 - obs space:
     name: icec_atms_n21_l2
     provider: MIRS
     dmpdir subdir: ocean/icec
     type: nc
-    dmpdir regex: 'NPR-MIRS-IMG_v11r9_n21_s*.nc'
+    dmpdir regex: 'NPR-MIRS-IMG_v11r?_n21_s*.nc'
     ocean basin: RECCAP2_region_masks_all_v20221025.nc
 
 - obs space:
     name: icec_atms_npp_l2
     provider: MIRS
     dmpdir subdir: ocean/icec
     type: nc
-    dmpdir regex: 'NPR-MIRS-IMG_v11r4_npp_s*.nc'
+    dmpdir regex: 'NPR-MIRS-IMG_v11r?_npp_s*.nc'
     ocean basin: RECCAP2_region_masks_all_v20221025.nc
 
 - obs space:
     name: icec_gmi_gpm_l2
     provider: MIRS
     dmpdir subdir: ocean/icec
     type: nc
-    dmpdir regex: 'NPR-MIRS-IMG_v11r9_gpm_s*.nc'
+    dmpdir regex: 'NPR-MIRS-IMG_v11r?_gpm_s*.nc'
     ocean basin: RECCAP2_region_masks_all_v20221025.nc
 
 - obs space:
     name: icec_ssmis_f17_l2
     provider: MIRS
     dmpdir subdir: ocean/icec
     type: nc
-    dmpdir regex: 'NPR-MIRS-IMG_v11r4_f17_s*.nc'
+    dmpdir regex: 'NPR-MIRS-IMG_v11r?_f17_s*.nc'
     ocean basin: RECCAP2_region_masks_all_v20221025.nc
 
 # SST

diff --git a/test/testreference/C96C48_ufs_hybatmDA_3dvar-fv3inc.ref b/test/testreference/C96C48_ufs_hybatmDA_3dvar-fv3inc.ref
@@ -2,40 +2,40 @@ Background State:
 
 ----------------------------------------------------------------------------------------------------
 State print | number of fields = 9 | cube sphere face size: C96
-eastward_wind                                | Min:-8.7593299865722656e+01 Max:+1.1421906280517578e+02 RMS:+1.7446423933066384e+01
-northward_wind                               | Min:-9.0978759765625000e+01 Max:+8.9302459716796875e+01 RMS:+9.8048456519148388e+00
-air_temperature                              | Min:+1.7290483093261719e+02 Max:+3.1017132568359375e+02 RMS:+2.5022377762999352e+02
-air_pressure_at_surface                      | Min:+5.1309082031250000e+04 Max:+1.0433011718750000e+05 RMS:+9.8914626690611054e+04
-water_vapor_mixing_ratio_wrt_moist_air       | Min:+9.9999986069576607e-10 Max:+2.1381899714469910e-02 RMS:+5.0230919069545812e-03
-cloud_liquid_ice                             | Min:+0.0000000000000000e+00 Max:+5.7223520707339048e-04 RMS:+9.4296924830407741e-06
-cloud_liquid_water                           | Min:+0.0000000000000000e+00 Max:+1.6279185656458139e-03 RMS:+3.7809568286336720e-05
-ozone_mass_mixing_ratio                      | Min:+3.6120087476554374e-10 Max:+1.7313132048002444e-05 RMS:+4.4655432291945023e-06
+eastward_wind                                | Min:-8.7592788696289062e+01 Max:+1.1420372772216797e+02 RMS:+1.7446404472691281e+01
+northward_wind                               | Min:-9.0942382812500000e+01 Max:+8.9295417785644531e+01 RMS:+9.8048421589139405e+00
+air_temperature                              | Min:+1.7290422058105469e+02 Max:+3.1315420532226562e+02 RMS:+2.5022388437472281e+02
+air_pressure_at_surface                      | Min:+5.1310074218750000e+04 Max:+1.0433036718750000e+05 RMS:+9.8914635448501256e+04
+water_vapor_mixing_ratio_wrt_moist_air       | Min:+9.9999986069576607e-10 Max:+2.1415401250123978e-02 RMS:+5.0229746689082278e-03
+cloud_liquid_ice                             | Min:+0.0000000000000000e+00 Max:+5.6551990564912558e-04 RMS:+9.4433791173374609e-06
+cloud_liquid_water                           | Min:+0.0000000000000000e+00 Max:+1.6047930112108588e-03 RMS:+3.7857742029092217e-05
+ozone_mass_mixing_ratio                      | Min:+3.6144315318509257e-10 Max:+1.7313457647105679e-05 RMS:+4.4655429944475609e-06
 geopotential_height_at_surface               | Min:-2.9894643783569336e+01 Max:+5.3870561523437500e+03 RMS:+6.4442219321892003e+02
 ----------------------------------------------------------------------------------------------------
 JEDI Increment:
 
 ----------------------------------------------------------------------------------------------------
 Increment print | number of fields = 8 | cube sphere face size: C48
-eastward_wind                                | Min:-2.1115621251510674e-07 Max:+1.1444664416160322e-07 RMS:+1.8401316033983295e-09
-northward_wind                               | Min:-1.0219621415785696e-07 Max:+2.6249988138715707e-07 RMS:+1.8295902505163720e-09
-air_temperature                              | Min:-5.2000757477799198e-08 Max:+6.6504355800134363e-08 RMS:+7.1626194815483433e-10
-air_pressure_at_surface                      | Min:-2.0445149857550859e-06 Max:+9.8957389127463102e-07 RMS:+4.2160438885855514e-08
-water_vapor_mixing_ratio_wrt_moist_air       | Min:-3.5212104499554586e-11 Max:+2.4915642032191654e-11 RMS:+2.7352479311235747e-13
-cloud_liquid_ice                             | Min:-5.2622388732733935e-13 Max:+3.8117236092690345e-13 RMS:+3.4198803820164734e-15
-cloud_liquid_water                           | Min:-1.1565164516162685e-11 Max:+3.1649457890922744e-12 RMS:+1.5995494806702646e-14
-ozone_mass_mixing_ratio                      | Min:-1.0346794247831136e-06 Max:+1.3451623930433847e-06 RMS:+3.6858146749007146e-08
+eastward_wind                                | Min:-2.1104214908973518e-07 Max:+1.1736051952482285e-07 RMS:+1.8431594710970867e-09
+northward_wind                               | Min:-1.0221288349043789e-07 Max:+2.6263771957246718e-07 RMS:+1.8329393452740470e-09
+air_temperature                              | Min:-5.2004679673700593e-08 Max:+6.6517316099634627e-08 RMS:+7.1801194123089184e-10
+air_pressure_at_surface                      | Min:-2.0490406313911080e-06 Max:+1.0001531336456537e-06 RMS:+4.2327499728681351e-08
+water_vapor_mixing_ratio_wrt_moist_air       | Min:-3.5231274061325868e-11 Max:+2.4874782355438496e-11 RMS:+2.7330286562520457e-13
+cloud_liquid_ice                             | Min:-5.3419200757732349e-13 Max:+3.8042151577058992e-13 RMS:+3.4015518165043927e-15
+cloud_liquid_water                           | Min:-1.1765328593099297e-11 Max:+3.1901271699210487e-12 RMS:+1.6320182492361654e-14
+ozone_mass_mixing_ratio                      | Min:-1.0347438083764173e-06 Max:+1.3451924489686076e-06 RMS:+3.6862408690065606e-08
 ----------------------------------------------------------------------------------------------------
 FV3 Increment:
 
 ----------------------------------------------------------------------------------------------------
 Increment print | number of fields = 9 | cube sphere face size: C48
-eastward_wind                                | Min:-2.1115621251510674e-07 Max:+1.1444664416160322e-07 RMS:+1.8401316033983295e-09
-northward_wind                               | Min:-1.0219621415785696e-07 Max:+2.6249988138715707e-07 RMS:+1.8295902505163720e-09
-air_temperature                              | Min:-5.2000757477799198e-08 Max:+6.6504355800134363e-08 RMS:+7.1626194815483433e-10
-water_vapor_mixing_ratio_wrt_moist_air       | Min:-3.5212104499554586e-11 Max:+2.4915642032191654e-11 RMS:+2.7352479311235747e-13
-cloud_liquid_ice                             | Min:-5.2622388732733935e-13 Max:+3.8117236092690345e-13 RMS:+3.4198803820164734e-15
-cloud_liquid_water                           | Min:-1.1565164516162685e-11 Max:+3.1649457890922744e-12 RMS:+1.5995494806702646e-14
-ozone_mass_mixing_ratio                      | Min:-1.0346794247831136e-06 Max:+1.3451623930433847e-06 RMS:+3.6858146749007146e-08
-air_pressure_thickness                       | Min:-3.8906364352442324e-08 Max:+1.7884758563013747e-08 RMS:+4.2747856122164087e-10
-layer_thickness                              | Min:-1.9763365344260819e-07 Max:+1.8311084204469807e-07 RMS:+3.6402384455212584e-09
+eastward_wind                                | Min:-2.1104214908973518e-07 Max:+1.1736051952482285e-07 RMS:+1.8431594710970867e-09
+northward_wind                               | Min:-1.0221288349043789e-07 Max:+2.6263771957246718e-07 RMS:+1.8329393452740470e-09
+air_temperature                              | Min:-5.2004679673700593e-08 Max:+6.6517316099634627e-08 RMS:+7.1801194123089184e-10
+water_vapor_mixing_ratio_wrt_moist_air       | Min:-3.5231274061325868e-11 Max:+2.4874782355438496e-11 RMS:+2.7330286562520457e-13
+cloud_liquid_ice                             | Min:-5.3419200757732349e-13 Max:+3.8042151577058992e-13 RMS:+3.4015518165043927e-15
+cloud_liquid_water                           | Min:-1.1765328593099297e-11 Max:+3.1901271699210487e-12 RMS:+1.6320182492361654e-14
+ozone_mass_mixing_ratio                      | Min:-1.0347438083764173e-06 Max:+1.3451924489686076e-06 RMS:+3.6862408690065606e-08
+air_pressure_thickness                       | Min:-3.9065980672603473e-08 Max:+1.8055516193271615e-08 RMS:+4.2929160742721524e-10
+layer_thickness                              | Min:-1.9778599380515516e-07 Max:+1.8311129679204896e-07 RMS:+3.6422980752322292e-09
 ----------------------------------------------------------------------------------------------------