Skip to content

Commit

Permalink
Weather code tree update (metoppv#1635)
Browse files Browse the repository at this point in the history
* Updates checksums following addition of mosg__model_configuration to wxcode-modal gridded test data

* Updates weather code acceptance tests with new parameters following update to decision trees in the IMPROVER suite.

- Now includes hail on UK
- lightning as an accumulation and now present on global as well as UK grid

* Updates checksums to only include changes applicable to this branch
  • Loading branch information
MoseleyS authored Jan 6, 2022
1 parent eda2555 commit d52b4d4
Show file tree
Hide file tree
Showing 2 changed files with 44 additions and 37 deletions.
73 changes: 39 additions & 34 deletions improver_tests/acceptance/SHA256SUMS
Original file line number Diff line number Diff line change
Expand Up @@ -700,37 +700,42 @@ c798e3530eac9a45305711d5e91daa56d5005b826ce85bb48e2889e328ea965c ./wxcode-modal
a6698b2aae8bc223a2d362ccb3047dd9882e6c0df21962e55c577e1ad5850e29 ./wxcode-modal/spot_ties/20201209T1700Z-weather_symbols-PT01H.nc
9290b2899eedfca038226c6707e100025ce68b0798972a60360845ccf36858d2 ./wxcode-modal/spot_ties/20201209T1800Z-weather_symbols-PT01H.nc
ceb7106e5b8919590327a75d4a8b740fb1a2c7cb5a271a5bf980f0c1396c7d22 ./wxcode-modal/spot_ties/kgo.nc
a10668de8e2e0f506f4001eff6290adb3bc98eef49fd4a3eb304b166a60fe0ce ./wxcode/basic/kgo.nc
a10668de8e2e0f506f4001eff6290adb3bc98eef49fd4a3eb304b166a60fe0ce ./wxcode/basic/kgo_no_lightning.nc
59f399b9944948af2f4da472756ec91ca281fa19f28ec616aa50e429cabd760b ./wxcode/basic/probability_of_lightning_flashes_per_unit_area_in_vicinity_above_threshold.nc
a9bf67edcc91d6e75af07a24ca5b779ea5d4014ce66a3406aa5a89a1ab7c6865 ./wxcode/basic/probability_of_low_and_medium_type_cloud_area_fraction_above_threshold.nc
cb5c16a5fd656ee157b40659187a4742f36872622b21b729ed893679cba889b4 ./wxcode/basic/probability_of_low_type_cloud_area_fraction_above_threshold.nc
68e5c9eab759d62cf399e5263245f49f5ce4c03958a626bba8d53ff0238e2c56 ./wxcode/basic/probability_of_lwe_thickness_of_precipitation_amount_above_threshold.nc
67f6d523920eb7ee108bff4f2c24a3b6dc188f3d5ede2943679e465b4b3f7cd4 ./wxcode/basic/probability_of_lwe_thickness_of_precipitation_amount_in_vicinity_above_threshold.nc
ad0095181a6131c7ff7dc068fea0f283573c1187c483d196f08bcb0c392b8e2a ./wxcode/basic/probability_of_lwe_thickness_of_sleetfall_amount_above_threshold.nc
c23b1c16af249c542f30509b8eefa8ccdf4e0b51e5d07936650c35ccc8bf53d6 ./wxcode/basic/probability_of_lwe_thickness_of_snowfall_amount_above_threshold.nc
a5e061dd1d1b476f4e9bf2d959a7ee267ceaeb41bc0ddb4f95e0208b2c267a37 ./wxcode/basic/probability_of_shower_condition_above_threshold.nc
65cf0f9c19d672a98cabf7f206faace697e506350fcb575ae56ee53a59b66f56 ./wxcode/basic/probability_of_thickness_of_rainfall_amount_above_threshold.nc
548ae40f3b027c819de1dfa791f859211b69c6cc57d7c8c17d9a9d2f24f96864 ./wxcode/basic/probability_of_visibility_in_air_below_threshold.nc
84a83c52fbb0e214c00f2f7936c245e4d44ce8d32a68a82a0138b1b50accbc8d ./wxcode/global/kgo.nc
bacfc882bb31c3c3f399dac4334818cce364c3488398593e07b0f3fe3f8818b0 ./wxcode/global/probability_of_low_and_medium_type_cloud_area_fraction_above_threshold.nc
24173fc8c9ddde1854e4a90c068e038ad1e8e3579bef1cda5bc6c5fd24f30062 ./wxcode/global/probability_of_low_type_cloud_area_fraction_above_threshold.nc
79d05a619d981811398bf6dd3a3bc235f21d9a30b998000ad7f45617a0bb30dc ./wxcode/global/probability_of_lwe_thickness_of_precipitation_amount_above_threshold.nc
9a4dbc8c6f1958efde70f618cf0aa6be858ce9f8b88ff445e7ef98905b13ee34 ./wxcode/global/probability_of_lwe_thickness_of_precipitation_amount_in_vicinity_above_threshold.nc
356d1469e500c19a7465fc1c4305ba394b27843557ae21fa653fc8d29091c7c8 ./wxcode/global/probability_of_lwe_thickness_of_sleetfall_amount_above_threshold.nc
cf2cebc9740adf7b3754bb6fc19ec6b92dfa0f0d0a266da752bb0c28eb44f440 ./wxcode/global/probability_of_lwe_thickness_of_snowfall_amount_above_threshold.nc
0d541cc310787f23979c3d9b43fd66d5188adc8bb62fc84dc40c04b2ee030a36 ./wxcode/global/probability_of_shower_condition_above_threshold.nc
70544bcbc20a173c990a91cad94c0f70d83906bfe8b9b6bd7e65cd79d8374ac5 ./wxcode/global/probability_of_thickness_of_rainfall_amount_above_threshold.nc
6bc02d671b45d3f56deee2fe6002c7c642115e5f481ec0d51c28ed7a9cef6b8a ./wxcode/global/probability_of_visibility_in_air_below_threshold.nc
59f399b9944948af2f4da472756ec91ca281fa19f28ec616aa50e429cabd760b ./wxcode/native_units/probability_of_lightning_flashes_per_unit_area_in_vicinity_above_threshold.nc
a9bf67edcc91d6e75af07a24ca5b779ea5d4014ce66a3406aa5a89a1ab7c6865 ./wxcode/native_units/probability_of_low_and_medium_type_cloud_area_fraction_above_threshold.nc
cb5c16a5fd656ee157b40659187a4742f36872622b21b729ed893679cba889b4 ./wxcode/native_units/probability_of_low_type_cloud_area_fraction_above_threshold.nc
8121978e021117a08acae6782914f36329ac4d7cb956fc3a4a83f7572345c4ab ./wxcode/native_units/probability_of_lwe_thickness_of_precipitation_amount_above_threshold.nc
bf1f7b63fb5abf66375f162b371acf49f9ab7b327b4315bbaacb8d9ef95590f7 ./wxcode/native_units/probability_of_lwe_thickness_of_precipitation_amount_in_vicinity_above_threshold.nc
4daea2d64e5b55507b7d0cda37642a08e265e89e5f72584845182e45ffa37eab ./wxcode/native_units/probability_of_lwe_thickness_of_sleetfall_amount_above_threshold.nc
8699b5267ecfdba1259d4b3d0a9a7ef33b75838d5ded75d041d48938a556a5fa ./wxcode/native_units/probability_of_lwe_thickness_of_snowfall_amount_above_threshold.nc
a5e061dd1d1b476f4e9bf2d959a7ee267ceaeb41bc0ddb4f95e0208b2c267a37 ./wxcode/native_units/probability_of_shower_condition_above_threshold.nc
0ebf269ce0bd8bdb87322589163ec266c7e3b4fa62133e6db840910d942ad41e ./wxcode/native_units/probability_of_thickness_of_rainfall_amount_above_threshold.nc
9831c847f94f68b1a4917e9d68f123d54fc9f87447ff6d34fddf71bfa4737117 ./wxcode/native_units/probability_of_visibility_in_air_below_threshold.nc
10a3502534d286f0abb732bc4a4bb0b9e494a073b2d572693e080d5e4633d66d ./wxcode/wx_decision_tree_1h.json
f2b140ab62972b5fe5e52ddef4550a9fde440da825070999c0a51d08f10d060f ./wxcode/wx_decision_tree_3h.json
5a3a808f0cc7952e6cc4225d09136276f685c5fdd6798a795c0430aa65ca71fa ./wxcode/basic/kgo.nc
3b86d135373b44989c22bdfbc6cb0798e974ff1d77c4c6b6a83fce650863e59c ./wxcode/basic/kgo_no_lightning.nc
5c1950ac1e5f96a5eb1495369271b667bcc89b2deced21d3a51c70303ef2b4d8 ./wxcode/basic/probability_of_low_and_medium_type_cloud_area_fraction_above_threshold.nc
146d0f003cf6d9b41f87761cb18f52958a41050af716718568cdb2d09d33fdd5 ./wxcode/basic/probability_of_low_type_cloud_area_fraction_above_threshold.nc
97f5fa2e0517d6302fd4fe01d9669f40685a180e3a27506754e3c815319e0511 ./wxcode/basic/probability_of_lwe_graupel_and_hail_fall_rate_in_vicinity_above_threshold.nc
b76fff0f96958ba74f7b76167d16855223c737f464072287a7ce7e08566c0e30 ./wxcode/basic/probability_of_lwe_thickness_of_graupel_and_hail_fall_amount_above_threshold.nc
531927b4de9b8c2b2328811d6cfa6b221a9343bcb9defbe3b0f9eae0c798faa7 ./wxcode/basic/probability_of_lwe_thickness_of_precipitation_amount_above_threshold.nc
86a2bd791b84133d3bb41e08f4932362425d89708f34bb8983ed3860e7343312 ./wxcode/basic/probability_of_lwe_thickness_of_precipitation_amount_in_vicinity_above_threshold.nc
f4eb47c2a3f03ac9ca3c98e0072644df495055e369336947cd8e9a839c4ad7be ./wxcode/basic/probability_of_lwe_thickness_of_sleetfall_amount_above_threshold.nc
f20a9eabe867ea00e9570eb1177c01841b7606e2969287432d4a50ae888062a3 ./wxcode/basic/probability_of_lwe_thickness_of_snowfall_amount_above_threshold.nc
1768a398493741439fec057bb32a6b15f64ae237a251a7e8d7fafe78a1fb7e6a ./wxcode/basic/probability_of_number_of_lightning_flashes_per_unit_area_in_vicinity_above_threshold.nc
ec818f319f2c137ab356f97a3980788357254f17c0761908b4e656170c0e5d37 ./wxcode/basic/probability_of_shower_condition_above_threshold.nc
1b8de3a02ac7dcf18ec9208a5e0b583b37c420093781b861b67eb5c8eaa37cd9 ./wxcode/basic/probability_of_thickness_of_rainfall_amount_above_threshold.nc
4fd37534bef88083d5097c443bf72209dc05a787b35a9319683e37fe994779e6 ./wxcode/basic/probability_of_visibility_in_air_below_threshold.nc
e497447b5440ef6c48bc435d0afc9c5c8b1571e77488545a31ac6122867e6ccc ./wxcode/global/kgo.nc
b34a701c91e44e7cc551e7aa4d42d94ad615cf8b0041113c166209a0c854e8ec ./wxcode/global/probability_of_low_and_medium_type_cloud_area_fraction_above_threshold.nc
d2266d931dab331b263e2f1d5f82e4c771f7ce6eaa87979ee0782b766e2aa598 ./wxcode/global/probability_of_low_type_cloud_area_fraction_above_threshold.nc
ea820a4650ec8fc5986fcaba2ce72651ee86da0ca774dc0501d9c6273072aa8d ./wxcode/global/probability_of_lwe_thickness_of_precipitation_amount_above_threshold.nc
4c39bdf6273648b2f8860420c8eda72955390c063b8a62ca3eeb48747a23a000 ./wxcode/global/probability_of_lwe_thickness_of_precipitation_amount_in_vicinity_above_threshold.nc
18e37334458f668e222683cb638a8d98989ce312db7a00167a3b04f2b71b9e23 ./wxcode/global/probability_of_lwe_thickness_of_sleetfall_amount_above_threshold.nc
005d5e870454e723102956d2993592f778b2058b076f4231b53283d9f5fd9d83 ./wxcode/global/probability_of_lwe_thickness_of_snowfall_amount_above_threshold.nc
efdb4a96e6dbd640677ac844bc34f8f38b63fd82608cf553ed5459eed384e27e ./wxcode/global/probability_of_number_of_lightning_flashes_per_unit_area_in_vicinity_above_threshold.nc
8193d616a57b78ff43da1307d5ed6f4ea81a86f0bfa4c54b0dfc1757452e1a20 ./wxcode/global/probability_of_shower_condition_above_threshold.nc
4d12a52983136ecc7c9a38d32738eb7dfb445f0b1e0fd0568f34fd3d999d8d9f ./wxcode/global/probability_of_thickness_of_rainfall_amount_above_threshold.nc
8b81175391b5f32e15e00d447310cda5b5c53b2c3c5d39db12d1d56524606f0a ./wxcode/global/probability_of_visibility_in_air_below_threshold.nc
5c1950ac1e5f96a5eb1495369271b667bcc89b2deced21d3a51c70303ef2b4d8 ./wxcode/native_units/probability_of_low_and_medium_type_cloud_area_fraction_above_threshold.nc
146d0f003cf6d9b41f87761cb18f52958a41050af716718568cdb2d09d33fdd5 ./wxcode/native_units/probability_of_low_type_cloud_area_fraction_above_threshold.nc
ad0b750abc146e114ff828cacd56ddf409d4605953467f4d1cae4ac5b9df4e1a ./wxcode/native_units/probability_of_lwe_graupel_and_hail_fall_rate_in_vicinity_above_threshold.nc
b76fff0f96958ba74f7b76167d16855223c737f464072287a7ce7e08566c0e30 ./wxcode/native_units/probability_of_lwe_thickness_of_graupel_and_hail_fall_amount_above_threshold.nc
531927b4de9b8c2b2328811d6cfa6b221a9343bcb9defbe3b0f9eae0c798faa7 ./wxcode/native_units/probability_of_lwe_thickness_of_precipitation_amount_above_threshold.nc
86a2bd791b84133d3bb41e08f4932362425d89708f34bb8983ed3860e7343312 ./wxcode/native_units/probability_of_lwe_thickness_of_precipitation_amount_in_vicinity_above_threshold.nc
f4eb47c2a3f03ac9ca3c98e0072644df495055e369336947cd8e9a839c4ad7be ./wxcode/native_units/probability_of_lwe_thickness_of_sleetfall_amount_above_threshold.nc
f20a9eabe867ea00e9570eb1177c01841b7606e2969287432d4a50ae888062a3 ./wxcode/native_units/probability_of_lwe_thickness_of_snowfall_amount_above_threshold.nc
1768a398493741439fec057bb32a6b15f64ae237a251a7e8d7fafe78a1fb7e6a ./wxcode/native_units/probability_of_number_of_lightning_flashes_per_unit_area_in_vicinity_above_threshold.nc
ec818f319f2c137ab356f97a3980788357254f17c0761908b4e656170c0e5d37 ./wxcode/native_units/probability_of_shower_condition_above_threshold.nc
1b8de3a02ac7dcf18ec9208a5e0b583b37c420093781b861b67eb5c8eaa37cd9 ./wxcode/native_units/probability_of_thickness_of_rainfall_amount_above_threshold.nc
554f9ed54f1092f31013b0e85de20e13932ca9533d50ac6316f170641901a209 ./wxcode/native_units/probability_of_visibility_in_air_below_threshold.nc
3de7bd3e25d9d5b9eafbef91ead03f1ebfa6202b9f90826dbe81ad99fdc74277 ./wxcode/wx_decision_tree_1h.json
80a0dc027f33a9f209d8304a92eb60fd204620492bea5bb9c0fe5c4d8a285edb ./wxcode/wx_decision_tree_3h.json
8 changes: 5 additions & 3 deletions improver_tests/acceptance/test_wxcode.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,15 +39,17 @@
run_cli = acc.run_cli(CLI)

ALL_PARAMS = [
"lightning_flashes_per_unit_area_in_vicinity_above",
"low_and_medium_type_cloud_area_fraction_above",
"low_type_cloud_area_fraction_above",
"lwe_graupel_and_hail_fall_rate_in_vicinity_above",
"lwe_thickness_of_graupel_and_hail_fall_amount_above",
"lwe_thickness_of_precipitation_amount_above",
"lwe_thickness_of_precipitation_amount_in_vicinity_above",
"lwe_thickness_of_sleetfall_amount_above",
"lwe_thickness_of_snowfall_amount_above",
"thickness_of_rainfall_amount_above",
"number_of_lightning_flashes_per_unit_area_in_vicinity_above",
"shower_condition_above",
"thickness_of_rainfall_amount_above",
"visibility_in_air_below",
]

Expand Down Expand Up @@ -106,7 +108,7 @@ def test_global(tmp_path):
"""Test global wxcode processing"""
kgo_dir = acc.kgo_root() / "wxcode"
kgo_path = kgo_dir / "global" / "kgo.nc"
params = [param for param in ALL_PARAMS if "lightning" not in param]
params = [param for param in ALL_PARAMS if "hail" not in param]
param_paths = [
kgo_dir / "global" / f"probability_of_{p}_threshold.nc" for p in params
]
Expand Down

0 comments on commit d52b4d4

Please sign in to comment.