Skip to content

Commit f9fc96a

Browse files
authored
Add offline tool to compute delp increments (NOAA-EMC#520)
This PR adds an offline python tool to produce delp increments from increments of ps. It also adds the infrastructure to add delp as an analysis variable to the fv3-jedi ctests, but that is currently turned off since we want to use an offline tool to do this. There are also various other consistency and formatting changes. It was previously found that using ps as control variable and analysis variable did not diagnostically update delp. Delp increments are needed for model restart.
1 parent 33813fd commit f9fc96a

17 files changed

Lines changed: 193 additions & 55 deletions

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,12 @@ members from template:
1919
soilm: {{soilm}}
2020
eastward_wind_at_surface: {{eastward_wind_at_surface}}
2121
northward_wind_at_surface: {{northward_wind_at_surface}}
22-
equivalent_reflectivity_factor: {{equivalent_reflectivity_factor}}
2322
rain_water: {{rain_water}}
2423
snow_water: {{snow_water}}
2524
graupel: {{graupel}}
2625
upward_air_velocity: {{upward_air_velocity}}
26+
equivalent_reflectivity_factor: {{equivalent_reflectivity_factor}}
2727
datapath: {{ atmosphere_background_ensemble_path }}
28-
#filename is datetime templated: true
2928
filename_core: {{atmosphere_background_time_prefix}}{{filename_core}}
3029
filename_trcr: {{atmosphere_background_time_prefix}}{{filename_trcr}}
3130
filename_phys: {{atmosphere_background_time_prefix}}{{filename_phys}}

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
covariance model: SABER
22
saber central block:
33
saber block name: gsi static covariance
4+
active variables: {{control_variables}}
45
read:
56
gsi akbk: fv3_akbk
67
gsi error covariance file: berror_stats

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ components:
44
covariance model: SABER
55
saber central block:
66
saber block name: gsi static covariance
7+
active variables: {{control_variables}}
78
read:
89
gsi akbk: fv3_akbk
910
gsi error covariance file: berror_stats
@@ -54,6 +55,7 @@ components:
5455
northward_wind: {{northward_wind}}
5556
air_temperature: {{air_temperature}}
5657
air_pressure_thickness: {{air_pressure_thickness}}
58+
air_pressure_at_surface: {{air_pressure_at_surface}}
5759
water_vapor_mixing_ratio_wrt_moist_air: {{water_vapor_mixing_ratio_wrt_moist_air}}
5860
cloud_liquid_ice: {{cloud_liquid_ice}}
5961
cloud_liquid_water: {{cloud_liquid_water}}
@@ -77,7 +79,7 @@ components:
7779
filename_sfcw: {{atmosphere_background_time_prefix}}{{filename_sfcw}}
7880
filename_cplr: {{atmosphere_background_time_prefix}}{{filename_cplr}}
7981
pattern: "%mem%"
80-
nmembers: 30
82+
nmembers: {{atmosphere_number_ensemble_members}}
8183
zero padding: 3
8284
localization:
8385
localization method: SABER

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ components:
44
covariance model: SABER
55
saber central block:
66
saber block name: gsi static covariance
7+
active variables: {{control_variables}}
78
read:
89
gsi akbk: fv3_akbk
910
gsi error covariance file: berror_stats
@@ -54,6 +55,7 @@ components:
5455
northward_wind: {{northward_wind}}
5556
air_temperature: {{air_temperature}}
5657
air_pressure_thickness: {{air_pressure_thickness}}
58+
air_pressure_at_surface: {{air_pressure_at_surface}}
5759
water_vapor_mixing_ratio_wrt_moist_air: {{water_vapor_mixing_ratio_wrt_moist_air}}
5860
cloud_liquid_ice: {{cloud_liquid_ice}}
5961
cloud_liquid_water: {{cloud_liquid_water}}
@@ -77,7 +79,7 @@ components:
7779
filename_sfcw: {{atmosphere_background_time_prefix}}{{filename_sfcw}}
7880
filename_cplr: {{atmosphere_background_time_prefix}}{{filename_cplr}}
7981
pattern: "%mem%"
80-
nmembers: 30
82+
nmembers: {{atmosphere_number_ensemble_members}}
8183
zero padding: 3
8284
localization:
8385
localization method: SABER
@@ -106,6 +108,6 @@ components:
106108
forward interpolator:
107109
local interpolator type: oops unstructured grid interpolator
108110
inverse interpolator:
109-
local nterpolator type: oops unstructured grid interpolator
111+
local interpolator type: oops unstructured grid interpolator
110112
weight:
111113
value: 0.85

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,15 +35,16 @@ analysis_variables:
3535
- northward_wind
3636
- air_temperature
3737
- water_vapor_mixing_ratio_wrt_moist_air
38-
- air_pressure_at_surface
3938
- ozone_mass_mixing_ratio
39+
#- air_pressure_thickness
4040
#- cloud_liquid_water
4141
#- cloud_liquid_ice
4242
#- rain_water
4343
#- snow_water
4444
#- graupel
4545
#- upward_air_velocity
4646
#- equivalent_reflectivity_factor
47+
- air_pressure_at_surface
4748

4849
# Testing
4950
# -------

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,15 +35,16 @@ analysis_variables:
3535
- northward_wind
3636
- air_temperature
3737
- water_vapor_mixing_ratio_wrt_moist_air
38-
- air_pressure_at_surface
3938
- ozone_mass_mixing_ratio
39+
#- air_pressure_thickness
4040
#- cloud_liquid_water
4141
#- cloud_liquid_ice
4242
#- rain_water
4343
#- snow_water
4444
#- graupel
4545
#- upward_air_velocity
4646
#- equivalent_reflectivity_factor
47+
- air_pressure_at_surface
4748

4849
# Testing
4950
# -------
@@ -191,7 +192,7 @@ observations:
191192
- aircar_airTemperature_133
192193
- aircar_specificHumidity_133
193194
- aircar_winds_233
194-
#
195+
195196
#- aircft_airTemperature_130
196197
#- aircft_airTemperature_131
197198
#- aircft_airTemperature_134

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,15 +35,16 @@ analysis_variables:
3535
- northward_wind
3636
- air_temperature
3737
- water_vapor_mixing_ratio_wrt_moist_air
38-
- air_pressure_at_surface
3938
- ozone_mass_mixing_ratio
39+
#- air_pressure_thickness
4040
- cloud_liquid_water
4141
- cloud_liquid_ice
4242
- rain_water
4343
- snow_water
4444
- graupel
4545
- upward_air_velocity
4646
- equivalent_reflectivity_factor
47+
- air_pressure_at_surface
4748

4849
# Testing
4950
# -------
@@ -190,7 +191,7 @@ observations:
190191
#- aircar_airTemperature_133
191192
#- aircar_specificHumidity_133
192193
#- aircar_winds_233
193-
#
194+
194195
#- aircft_airTemperature_130
195196
#- aircft_airTemperature_131
196197
#- aircft_airTemperature_134

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

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,22 +35,22 @@ analysis_variables:
3535
- northward_wind
3636
- air_temperature
3737
- water_vapor_mixing_ratio_wrt_moist_air
38-
- air_pressure_at_surface
3938
- ozone_mass_mixing_ratio
39+
#- air_pressure_thickness
4040
#- cloud_liquid_water
4141
#- cloud_liquid_ice
4242
#- rain_water
4343
#- snow_water
4444
#- graupel
4545
#- upward_air_velocity
4646
#- equivalent_reflectivity_factor
47+
- air_pressure_at_surface
4748

4849
control_variables:
4950
- eastward_wind
5051
- northward_wind
5152
- virtual_temperature
5253
- water_vapor_mixing_ratio_wrt_moist_air
53-
- air_pressure_at_surface
5454
- ozone_mass_mixing_ratio
5555
#- cloud_liquid_water
5656
#- cloud_liquid_ice
@@ -59,16 +59,17 @@ control_variables:
5959
#- graupel
6060
#- upward_air_velocity
6161
#- equivalent_reflectivity_factor
62+
- air_pressure_at_surface
6263

6364
state_variables_to_inverse:
6465
- eastward_wind
6566
- northward_wind
6667
- air_temperature
6768
- water_vapor_mixing_ratio_wrt_moist_air
68-
- air_pressure_at_surface
69-
- air_pressure_thickness
70-
- geopotential_height_times_gravity_at_surface
7169
- ozone_mass_mixing_ratio
70+
- geopotential_height_times_gravity_at_surface
71+
- air_pressure_thickness
72+
- air_pressure_at_surface
7273

7374
# Testing
7475
# -------

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

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,22 +35,22 @@ analysis_variables:
3535
- northward_wind
3636
- air_temperature
3737
- water_vapor_mixing_ratio_wrt_moist_air
38-
- air_pressure_at_surface
3938
- ozone_mass_mixing_ratio
39+
#- air_pressure_thickness
4040
#- cloud_liquid_water
4141
#- cloud_liquid_ice
4242
#- rain_water
4343
#- snow_water
4444
#- graupel
4545
#- upward_air_velocity
4646
#- equivalent_reflectivity_factor
47+
- air_pressure_at_surface
4748

4849
control_variables:
4950
- eastward_wind
5051
- northward_wind
5152
- virtual_temperature
5253
- water_vapor_mixing_ratio_wrt_moist_air
53-
- air_pressure_at_surface
5454
- ozone_mass_mixing_ratio
5555
#- cloud_liquid_water
5656
#- cloud_liquid_ice
@@ -59,16 +59,17 @@ control_variables:
5959
#- graupel
6060
#- upward_air_velocity
6161
#- equivalent_reflectivity_factor
62+
- air_pressure_at_surface
6263

6364
state_variables_to_inverse:
6465
- eastward_wind
6566
- northward_wind
6667
- air_temperature
6768
- water_vapor_mixing_ratio_wrt_moist_air
68-
- air_pressure_at_surface
69-
- air_pressure_thickness
70-
- geopotential_height_times_gravity_at_surface
7169
- ozone_mass_mixing_ratio
70+
- geopotential_height_times_gravity_at_surface
71+
- air_pressure_thickness
72+
- air_pressure_at_surface
7273

7374
# Testing
7475
# -------

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

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,22 +35,22 @@ analysis_variables:
3535
- northward_wind
3636
- air_temperature
3737
- water_vapor_mixing_ratio_wrt_moist_air
38-
- air_pressure_at_surface
3938
- ozone_mass_mixing_ratio
39+
#- air_pressure_thickness
4040
#- cloud_liquid_water
4141
#- cloud_liquid_ice
4242
#- rain_water
4343
#- snow_water
4444
#- graupel
4545
#- upward_air_velocity
4646
#- equivalent_reflectivity_factor
47+
- air_pressure_at_surface
4748

4849
control_variables:
4950
- eastward_wind
5051
- northward_wind
5152
- virtual_temperature
5253
- water_vapor_mixing_ratio_wrt_moist_air
53-
- air_pressure_at_surface
5454
- ozone_mass_mixing_ratio
5555
#- cloud_liquid_water
5656
#- cloud_liquid_ice
@@ -59,16 +59,17 @@ control_variables:
5959
#- graupel
6060
#- upward_air_velocity
6161
#- equivalent_reflectivity_factor
62+
- air_pressure_at_surface
6263

6364
state_variables_to_inverse:
6465
- eastward_wind
6566
- northward_wind
6667
- air_temperature
6768
- water_vapor_mixing_ratio_wrt_moist_air
68-
- air_pressure_at_surface
69-
- air_pressure_thickness
70-
- geopotential_height_times_gravity_at_surface
7169
- ozone_mass_mixing_ratio
70+
- geopotential_height_times_gravity_at_surface
71+
- air_pressure_thickness
72+
- air_pressure_at_surface
7273

7374
# Testing
7475
# -------

0 commit comments

Comments
 (0)