Minor updates to JCB files to prepare for JEDI-based EnKF in rrfs-workflow

parm/jcb-rdas/model/fv3/atmosphere/atmosphere_background_ensemble.yaml.j2

@@ -3,52 +3,38 @@ members from template:
   template:
     datetime: '{{ atmosphere_background_time_iso }}'
     filetype: fms restart
-    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
-    - geopotential_height_times_gravity_at_surface
-    - f10m
-    - slmsk
-    - sheleg
-    - skin_temperature_at_surface
-    - vtype
-    - stype
-    - vfrac
-    - tslb
-    - smois
-    - eastward_wind_at_surface
-    - northward_wind_at_surface
-    - air_pressure_at_surface
-    - equivalent_reflectivity_factor
+    state variables: {{state_variables}}
     field io names:
-      eastward_wind: ua
-      northward_wind: va
-      air_temperature: T
-      air_pressure_thickness: DELP
-      water_vapor_mixing_ratio_wrt_moist_air: sphum
-      cloud_liquid_ice: ice_wat
-      cloud_liquid_water: liq_wat
-      ozone_mass_mixing_ratio: o3mr
-      geopotential_height_times_gravity_at_surface: phis
-      skin_temperature_at_surface: tsfc
-      tslb: tslb
-      smois: smois
-      eastward_wind_at_surface: u_srf
-      northward_wind_at_surface: v_srf
-      equivalent_reflectivity_factor: ref_f3d
+      eastward_wind: {{eastward_wind}}
+      northward_wind: {{northward_wind}}
+      air_temperature: {{air_temperature}}
+      air_pressure_thickness: {{air_pressure_thickness}}
+      air_pressure_at_surface: {{air_pressure_at_surface}}
+      water_vapor_mixing_ratio_wrt_moist_air: {{water_vapor_mixing_ratio_wrt_moist_air}}
+      cloud_liquid_ice: {{cloud_liquid_ice}}
+      cloud_liquid_water: {{cloud_liquid_water}}
+      ozone_mass_mixing_ratio: {{ozone_mass_mixing_ratio}}
+      geopotential_height_times_gravity_at_surface: {{geopotential_height_times_gravity_at_surface}}
+      skin_temperature_at_surface: {{skin_temperature_at_surface}}
+      tslb: {{tslb}}
+      smois: {{smois}}
+      eastward_wind_at_surface: {{eastward_wind_at_surface}}
+      northward_wind_at_surface: {{northward_wind_at_surface}}
+      rain_water: {{rain_water}}
+      snow_water: {{snow_water}}
+      graupel: {{graupel}}
+      cloud_droplet_number_concentration: {{cloud_droplet_number_concentration}}
+      cloud_ice_number_concentration: {{cloud_ice_number_concentration}}
+      rain_number_concentration: {{rain_number_concentration}}
+      upward_air_velocity: {{upward_air_velocity}}
+      equivalent_reflectivity_factor: {{equivalent_reflectivity_factor}}
     datapath: {{ atmosphere_background_ensemble_path }}
-    filename_core: 20240527.000000.fv_core.res.tile1.nc
-    filename_trcr: 20240527.000000.fv_tracer.res.tile1.nc
-    filename_phys: 20240527.000000.phy_data_prepdbz.nc
-    filename_sfcd: 20240527.000000.sfc_data.nc
-    filename_sfcw: 20240527.000000.fv_srf_wnd.res.tile1.nc
-    filename_cplr: 20240527.000000.coupler.res
+    filename_core: {{filename_core}}
+    filename_trcr: {{filename_trcr}}
+    filename_phys: {{filename_phys}}
+    filename_sfcd: {{filename_sfcd}}
+    filename_sfcw: {{filename_sfcw}}
+    filename_cplr: {{filename_cplr}}
   pattern: "{{ atmosphere_ensemble_pattern | default("%mem%", true) }}"
   nmembers: {{ atmosphere_number_ensemble_members }}
   zero padding: 3

parm/jcb-rdas/model/fv3/atmosphere/atmosphere_output_ensemble_increments.yaml.j2

@@ -0,0 +1,29 @@
+  filetype: fms restart
+  datapath: ./mem%{member}%
+  prepend files with date: false
+  prefix: inc_jedi
+  frequency: {{atmosphere_forecast_timestep}}
+  field io names:
+    eastward_wind: {{eastward_wind}}
+    northward_wind: {{northward_wind}}
+    air_temperature: {{air_temperature}}
+    air_pressure_thickness: {{air_pressure_thickness}}
+    air_pressure_at_surface: {{air_pressure_at_surface}}
+    water_vapor_mixing_ratio_wrt_moist_air: {{water_vapor_mixing_ratio_wrt_moist_air}}
+    cloud_liquid_ice: {{cloud_liquid_ice}}
+    cloud_liquid_water: {{cloud_liquid_water}}
+    ozone_mass_mixing_ratio: {{ozone_mass_mixing_ratio}}
+    geopotential_height_times_gravity_at_surface: {{geopotential_height_times_gravity_at_surface}}
+    skin_temperature_at_surface: {{skin_temperature_at_surface}}
+    tslb: {{tslb}}
+    smois: {{smois}}
+    eastward_wind_at_surface: {{eastward_wind_at_surface}}
+    northward_wind_at_surface: {{northward_wind_at_surface}}
+    rain_water: {{rain_water}}
+    snow_water: {{snow_water}}
+    graupel: {{graupel}}
+    cloud_droplet_number_concentration: {{cloud_droplet_number_concentration}}
+    cloud_ice_number_concentration: {{cloud_ice_number_concentration}}
+    rain_number_concentration: {{rain_number_concentration}}
+    upward_air_velocity: {{upward_air_velocity}}
+    equivalent_reflectivity_factor: {{equivalent_reflectivity_factor}}

parm/jcb-rdas/test/ci/jcb-rrfs_fv3jedi_2024052700_getkf_observer.yaml

@@ -139,6 +139,7 @@ state_variables:
 - cloud_ice_number_concentration
 - rain_number_concentration
 - upward_air_velocity
+- equivalent_reflectivity_factor
 
 eastward_wind: ua
 northward_wind: va

parm/jcb-rdas/test/ci/jcb-rrfs_fv3jedi_2024052700_getkf_solver.yaml

@@ -139,6 +139,7 @@ state_variables:
 - cloud_ice_number_concentration
 - rain_number_concentration
 - upward_air_velocity
+- equivalent_reflectivity_factor
 
 eastward_wind: ua
 northward_wind: va