NOAA-EMC · ShunLiu-NOAA · Nov 7, 2024 · Oct 31, 2024 · Nov 4, 2024 · Nov 4, 2024
diff --git a/fix/jcsda/ioda-data b/fix/jcsda/ioda-data
@@ -1 +1 @@
-../.agent/jcsda/ioda-data_20241011
+../.agent/jcsda/ioda-data_25afc2c_20241101
diff --git a/fix/jcsda/ufo-data b/fix/jcsda/ufo-data
@@ -1 +1 @@
-../.agent/jcsda/ufo-data_20240909
+../.agent/jcsda/ufo-data_b45d99e_20241101
diff --git a/fix/rrfs-test-data b/fix/rrfs-test-data
diff --git a/fix/rrfs-test-data/rrfs-data_fv3jedi_2022052619 b/fix/rrfs-test-data/rrfs-data_fv3jedi_2022052619
@@ -0,0 +1 @@
+../.agent/rrfs-test-data/rrfs-data_fv3jedi_2022052619_update20241101
diff --git a/fix/rrfs-test-data/rrfs-data_mpasjedi_2022052619 b/fix/rrfs-test-data/rrfs-data_mpasjedi_2022052619
@@ -0,0 +1 @@
+../.agent/rrfs-test-data/rrfs-data_mpasjedi_2022052619
diff --git a/rrfs-test/testinput/rrfs_fv3jedi_hyb_2022052619.yaml b/rrfs-test/testinput/rrfs_fv3jedi_hyb_2022052619.yaml
@@ -3,7 +3,7 @@ cost function:
   time window:
       begin: 2022-05-26T18:00:00Z
       length: PT2H
-  analysis variables: &3dvars [eastward_wind,northward_wind,air_temperature,air_pressure_thickness,specific_humidity,cloud_liquid_ice,cloud_liquid_water,ozone_mass_mixing_ratio]
+  analysis variables: &3dvars [eastward_wind,northward_wind,air_temperature,air_pressure_thickness,water_vapor_mixing_ratio_wrt_moist_air,cloud_liquid_ice,cloud_liquid_water,ozone_mass_mixing_ratio]
 
   geometry:
     fms initialization:
@@ -28,7 +28,7 @@ cost function:
     filename_sfcd: fv3_sfcdata.nc
     filename_sfcw: fv3_srf_wnd.nc
     filename_cplr: coupler.res
-    state variables: [eastward_wind,northward_wind,u_component_of_native_D_grid_wind,v_component_of_native_D_grid_wind,air_temperature,air_pressure_thickness,specific_humidity,cloud_liquid_ice,cloud_liquid_water,ozone_mass_mixing_ratio]
+    state variables: [eastward_wind,northward_wind,u_component_of_native_D_grid_wind,v_component_of_native_D_grid_wind,air_temperature,air_pressure_thickness,water_vapor_mixing_ratio_wrt_moist_air,cloud_liquid_ice,cloud_liquid_water,ozone_mass_mixing_ratio]
   background error:
     covariance model: hybrid
     components:

diff --git a/rrfs-test/testinput/rrfs_fv3jedi_letkf_2022052619.yaml b/rrfs-test/testinput/rrfs_fv3jedi_letkf_2022052619.yaml
@@ -1,7 +1,7 @@
 time window:
        begin: 2022-05-26T18:00:00Z
        length: PT2H
-increment variables: [eastward_wind,northward_wind,air_temperature,air_pressure_thickness,specific_humidity,cloud_liquid_ice,cloud_liquid_water,ozone_mass_mixing_ratio]
+increment variables: [eastward_wind,northward_wind,air_temperature,air_pressure_thickness,water_vapor_mixing_ratio_wrt_moist_air,cloud_liquid_ice,cloud_liquid_water,ozone_mass_mixing_ratio]
 geometry:
   fms initialization:
     namelist filename: DataFix/fmsmpp.nml
@@ -25,7 +25,7 @@ background:
       template:
         datetime: 2022-05-26T19:00:00Z
         filetype: fms restart
-        state variables: [eastward_wind,northward_wind,air_temperature,air_pressure_thickness,specific_humidity,cloud_liquid_ice,cloud_liquid_water,ozone_mass_mixing_ratio]
+        state variables: [eastward_wind,northward_wind,air_temperature,air_pressure_thickness,water_vapor_mixing_ratio_wrt_moist_air,cloud_liquid_ice,cloud_liquid_water,ozone_mass_mixing_ratio]
         datapath: Data/inputs/mem%mem%/
         filename_core: 20220526.190000.fv_core.res.tile1.nc
         filename_trcr: 20220526.190000.fv_tracer.res.tile1.nc

diff --git a/rrfs-test/testinput/rrfs_mpasjedi_2024052700_Ens3Dvar.yaml b/rrfs-test/testinput/rrfs_mpasjedi_2024052700_Ens3Dvar.yaml
@@ -2588,7 +2588,7 @@ cost function:
        obs operator:
          name: SfcPCorrected
          da_psfc_scheme: GSI
-         geovar_sfc_geomz: surface_geopotential_height
+         geovar_sfc_geomz: geopotential_height_at_surface
          geovar_geomz: geopotential_height
        linear obs operator:
          name: Identity

diff --git a/rrfs-test/testinput/rrfs_mpasjedi_2024052700_getkf_observer.yaml b/rrfs-test/testinput/rrfs_mpasjedi_2024052700_getkf_observer.yaml
@@ -2538,7 +2538,7 @@ observations:
        obs operator:
          name: SfcPCorrected
          da_psfc_scheme: GSI
-         geovar_sfc_geomz: surface_geopotential_height
+         geovar_sfc_geomz: geopotential_height_at_surface
          geovar_geomz: geopotential_height
        linear obs operator:
          name: Identity

diff --git a/rrfs-test/testinput/rrfs_mpasjedi_2024052700_getkf_solver.yaml b/rrfs-test/testinput/rrfs_mpasjedi_2024052700_getkf_solver.yaml
@@ -2538,7 +2538,7 @@ observations:
        obs operator:
          name: SfcPCorrected
          da_psfc_scheme: GSI
-         geovar_sfc_geomz: surface_geopotential_height
+         geovar_sfc_geomz: geopotential_height_at_surface
          geovar_geomz: geopotential_height
        linear obs operator:
          name: Identity

diff --git a/rrfs-test/testoutput/rrfs-mpasjedi-ens3dvar.ref b/rrfs-test/testoutput/rrfs-mpasjedi-ens3dvar.ref
diff --git a/rrfs-test/validated_yamls/templates/basic_config/fv3jedi_hyb3denvar.yaml b/rrfs-test/validated_yamls/templates/basic_config/fv3jedi_hyb3denvar.yaml
@@ -3,7 +3,7 @@ cost function:
   time window:
       begin: 2022-05-26T18:00:00Z
       length: PT2H
-  analysis variables: &3dvars [eastward_wind,northward_wind,air_temperature,air_pressure_thickness,specific_humidity,cloud_liquid_ice,cloud_liquid_water,ozone_mass_mixing_ratio]
+  analysis variables: &3dvars [eastward_wind,northward_wind,air_temperature,air_pressure_thickness,water_vapor_mixing_ratio_wrt_moist_air,cloud_liquid_ice,cloud_liquid_water,ozone_mass_mixing_ratio]
 
   geometry:
     fms initialization:
@@ -27,7 +27,7 @@ cost function:
     filename_sfcd: fv3_sfcdata.nc
     filename_sfcw: fv3_srf_wnd.nc
     filename_cplr: coupler.res
-    state variables: [eastward_wind,northward_wind,u_component_of_native_D_grid_wind,v_component_of_native_D_grid_wind,air_temperature,air_pressure_thickness,specific_humidity,cloud_liquid_ice,cloud_liquid_water,ozone_mass_mixing_ratio,phis,f10m]
+    state variables: [eastward_wind,northward_wind,u_component_of_native_D_grid_wind,v_component_of_native_D_grid_wind,air_temperature,air_pressure_thickness,water_vapor_mixing_ratio_wrt_moist_air,cloud_liquid_ice,cloud_liquid_water,ozone_mass_mixing_ratio,phis,f10m]
   background error:
     covariance model: hybrid
     components:

diff --git a/rrfs-test/validated_yamls/templates/obtype_config/msonet_stationPressure_188.yaml b/rrfs-test/validated_yamls/templates/obtype_config/msonet_stationPressure_188.yaml
@@ -20,7 +20,7 @@
        obs operator:
          name: SfcPCorrected
          da_psfc_scheme: GSI
-         geovar_sfc_geomz: surface_geopotential_height
+         geovar_sfc_geomz: geopotential_height_at_surface
          geovar_geomz: geopotential_height
        linear obs operator:
          name: Identity

diff --git a/sorc/fv3-jedi b/sorc/fv3-jedi
diff --git a/sorc/fv3-jedi-lm b/sorc/fv3-jedi-lm
diff --git a/sorc/ioda b/sorc/ioda
diff --git a/sorc/iodaconv b/sorc/iodaconv
diff --git a/sorc/mpas-jedi b/sorc/mpas-jedi
diff --git a/sorc/oops b/sorc/oops
diff --git a/sorc/saber b/sorc/saber
diff --git a/sorc/ufo b/sorc/ufo
diff --git a/sorc/vader b/sorc/vader