Skip to content

Commit d6fd3e3

Browse files
dnerinidnerini
committed
Merge branch 'main' into plot-time-series
2 parents d018591 + 608f2c3 commit d6fd3e3

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+3174
-1833
lines changed

‎config/forecasters-co1e.yaml‎

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,21 @@ description: |
44
(KENDA-1) at 1km resolution.
55
66
dates:
7-
start: 2020-08-01T12:00
8-
end: 2020-08-10T00:00
7+
start: 2024-01-01T12:00
8+
end: 2024-01-10T00:00
99
frequency: 54h
1010

1111
runs:
1212
- forecaster:
1313
mlflow_id: 2174c939c8844555a52843b71219d425
1414
label: Cosmo 1km + era5 N320, finetuned on cerra checkpoint, lam resolution 11
15-
config: resources/inference/configs/forecaster_no_trimedge_fromtraining.yaml
15+
config: resources/inference/configs/forecaster_no_trimedge_with_global.yaml
1616
steps: 0/120/6
1717
inference_resources:
1818
gpu: 4
1919
tasks: 4
20+
extra_dependencies:
21+
- git+https://github.com/ecmwf/anemoi-inference.git@main
2022

2123
baselines:
2224
- baseline:
@@ -29,6 +31,16 @@ analysis:
2931
label: COSMO KENDA
3032
analysis_zarr: /scratch/mch/fzanetta/data/anemoi/datasets/mch-co1e-an-archive-0p01-2019-2024-1h-v1-pl13.zarr
3133

34+
stratification:
35+
regions:
36+
- jura
37+
- mittelland
38+
- voralpen
39+
- alpennordhang
40+
- innerealpentaeler
41+
- alpensuedseite
42+
root: /scratch/mch/bhendj/regions/Prognoseregionen_LV95_20220517
43+
3244
locations:
3345
output_root: output/
3446
mlflow_uri:

‎config/forecasters.yaml‎

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,18 @@ description: |
33
Evaluate skill of COSMO-E emulator (M-1 forecaster).
44
55
dates:
6-
start: 2020-01-01T12:00
7-
end: 2020-01-10T00:00
8-
frequency: 60h
6+
- 2020-02-03T00:00 # Storm Petra
7+
- 2020-02-07T00:00 # Storm Sabine
8+
- 2020-10-01T00:00 # Storm Brigitte
99

1010
runs:
1111
- forecaster:
1212
mlflow_id: d0846032fc7248a58b089cbe8fa4c511
1313
label: M-1 forecaster
1414
steps: 0/120/6
15+
config: resources/inference/configs/forecaster_with_global.yaml
16+
extra_dependencies:
17+
- git+https://github.com/ecmwf/anemoi-inference.git@main
1518

1619
baselines:
1720
- baseline:
@@ -24,6 +27,16 @@ analysis:
2427
label: COSMO KENDA
2528
analysis_zarr: /scratch/mch/fzanetta/data/anemoi/datasets/mch-co2-an-archive-0p02-2015-2020-6h-v3-pl13.zarr
2629

30+
stratification:
31+
regions:
32+
- jura
33+
- mittelland
34+
- voralpen
35+
- alpennordhang
36+
- innerealpentaeler
37+
- alpensuedseite
38+
root: /scratch/mch/bhendj/regions/Prognoseregionen_LV95_20220517
39+
2740
locations:
2841
output_root: output/
2942
mlflow_uri:

‎config/interpolators.yaml‎

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ runs:
1515
config: resources/inference/configs/interpolator_from_test_data_stretched.yaml
1616
forecaster: null
1717
extra_dependencies:
18-
- git+https://github.com/ecmwf/anemoi-inference@14189907b4f4e3b204b7994f828831b8aa51e9b6
18+
- git+https://github.com/ecmwf/anemoi-inference.git@main
1919
- torch-geometric==2.6.1
2020
- anemoi-graphs==0.5.2
2121
- interpolator:
@@ -28,14 +28,16 @@ runs:
2828
config: resources/inference/configs/forecaster_with_global.yaml
2929
steps: 0/120/6
3030
extra_dependencies:
31-
- git+https://github.com/ecmwf/anemoi-inference@14189907b4f4e3b204b7994f828831b8aa51e9b6
31+
- git+https://github.com/ecmwf/anemoi-inference.git@main
3232
- torch-geometric==2.6.1
3333
- anemoi-graphs==0.5.2
3434
- forecaster:
3535
mlflow_id: d0846032fc7248a58b089cbe8fa4c511
3636
label: M-1 forecaster
3737
config: resources/inference/configs/forecaster_with_global.yaml
3838
steps: 0/120/6
39+
extra_dependencies:
40+
- git+https://github.com/ecmwf/anemoi-inference.git@main
3941

4042
baselines:
4143
- baseline:
@@ -48,6 +50,16 @@ analysis:
4850
label: COSMO KENDA
4951
analysis_zarr: /scratch/mch/fzanetta/data/anemoi/datasets/mch-co2-an-archive-0p02-2015-2020-1h-v3-pl13.zarr
5052

53+
stratification:
54+
regions:
55+
- jura
56+
- mittelland
57+
- voralpen
58+
- alpennordhang
59+
- innerealpentaeler
60+
- alpensuedseite
61+
root: /scratch/mch/bhendj/regions/Prognoseregionen_LV95_20220517
62+
5163
locations:
5264
output_root: output/
5365
mlflow_uri:

‎config/showcase.yaml‎

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# yaml-language-server: $schema=../workflow/tools/config.schema.json
22
description: |
3-
Basic config for showcasing M-1 forecaster.
3+
Basic config for showcasing M-2 interpolator on M-1 forecaster.
44
55
dates:
66
- 2020-02-03T00:00 # Storm Petra
@@ -17,8 +17,10 @@ runs:
1717
mlflow_id: d0846032fc7248a58b089cbe8fa4c511
1818
config: resources/inference/configs/forecaster_with_global.yaml
1919
steps: 0/120/6
20+
extra_dependencies:
21+
- git+https://github.com/ecmwf/anemoi-inference.git@main
2022
extra_dependencies:
21-
- git+https://github.com/ecmwf/anemoi-inference@14189907b4f4e3b204b7994f828831b8aa51e9b6
23+
- git+https://github.com/ecmwf/anemoi-inference.git@main
2224
- torch-geometric==2.6.1
2325
- anemoi-graphs==0.5.2
2426

@@ -29,9 +31,19 @@ baselines:
2931
root: /store_new/mch/msopr/ml/COSMO-E
3032
steps: 0/120/6
3133

34+
stratification:
35+
regions:
36+
- jura
37+
- mittelland
38+
- voralpen
39+
- alpennordhang
40+
- innerealpentaeler
41+
- alpensuedseite
42+
root: /scratch/mch/bhendj/regions/Prognoseregionen_LV95_20220517
43+
3244
analysis:
3345
label: COSMO KENDA
34-
analysis_zarr: /scratch/mch/fzanetta/data/anemoi/datasets/mch-co2-an-archive-0p02-2015-2020-1h-v3-pl13.zarr
46+
analysis_zarr: /scratch/mch/fzanetta/data/anemoi/datasets/mch-co2-an-archive-0p02-2015-2020-6h-v3-pl13.zarr
3547

3648
locations:
3749
output_root: output/

‎pyproject.toml‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,12 @@ dependencies = [
1818
"pydantic>=2.11.7",
1919
"toml>=0.10.2",
2020
"netcdf4>=1.7.2",
21-
"cartopy",
21+
"shapely>=2.1.2",
22+
"cartopy>=0.25.0",
23+
"pyproj>=3.7.2",
2224
"earthkit-plots",
2325
"marimo>=0.16.5",
26+
"geopandas>=0.14.0",
2427
]
2528

2629
[project.optional-dependencies]

‎resources/inference/configs/forecaster.yaml‎

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,17 @@ allow_nans: true
77
output:
88
tee:
99
outputs:
10-
- extract_lam:
11-
output:
12-
assign_mask:
13-
mask: "source0/trimedge_mask"
14-
output:
15-
grib:
16-
path: grib/{dateTime}_{step:03}.grib
17-
encoding:
18-
typeOfGeneratingProcess: 2
19-
templates:
20-
samples: _resources/templates_index_cosmo.yaml
21-
- printer
22-
- raw: raw/
10+
- extract_lam:
11+
output:
12+
assign_mask:
13+
mask: "source0/trimedge_mask"
14+
output:
15+
grib:
16+
path: grib/{dateTime}_{step:03}.grib
17+
encoding:
18+
typeOfGeneratingProcess: 2
19+
templates:
20+
samples: resources/templates_index_cosmo.yaml
21+
- printer
2322

2423
write_initial_state: true

‎resources/inference/configs/forecaster_no_trimedge.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ output:
1515
encoding:
1616
typeOfGeneratingProcess: 2
1717
templates:
18-
samples: _resources/templates_index_cosmo.yaml
18+
samples: resources/templates_index_cosmo.yaml
1919
- printer
2020

2121
write_initial_state: true

‎resources/inference/configs/forecaster_no_trimedge_fromtraining.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ output:
1515
encoding:
1616
typeOfGeneratingProcess: 2
1717
templates:
18-
samples: _resources/templates_index_cosmo.yaml
18+
samples: resources/templates_index_cosmo.yaml
1919
- printer
2020

2121
write_initial_state: true

‎resources/inference/configs/forecaster_no_trimedge_with_global.yaml‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,19 @@ output:
1414
encoding:
1515
typeOfGeneratingProcess: 2
1616
templates:
17-
samples: _resources/templates_index_cosmo.yaml
17+
samples: resources/templates_index_cosmo.yaml
1818
- grib:
1919
path: grib/ifs-{dateTime}_{step:03}.grib
2020
encoding:
2121
typeOfGeneratingProcess: 2
2222
templates:
23-
samples: _resources/templates_index_ifs.yaml
23+
samples: resources/templates_index_ifs.yaml
2424
post_processors:
25-
- extract_slice: [919619, -1]
26-
- assign_mask: "global/cutout_mask"
25+
- extract_mask:
26+
mask: "lam_0/cutout_mask"
27+
as_slice: true
28+
inverse: true # removes lam points
29+
- assign_mask:
30+
mask: "global/cutout_mask" # fill local/global overlapping points with nan
2731

2832
write_initial_state: true

‎resources/inference/configs/forecaster_with_global.yaml‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,18 +17,22 @@ output:
1717
encoding:
1818
typeOfGeneratingProcess: 2
1919
templates:
20-
samples: _resources/templates_index_cosmo.yaml
20+
samples: resources/templates_index_cosmo.yaml
2121
- grib:
2222
path: grib/ifs-{dateTime}_{step:03}.grib
2323
encoding:
2424
typeOfGeneratingProcess: 2
2525
templates:
26-
samples: _resources/templates_index_ifs.yaml
26+
samples: resources/templates_index_ifs.yaml
2727
post_processors:
28-
- extract_slice: [189699, -1]
29-
- assign_mask: "global/cutout_mask"
28+
- extract_mask:
29+
mask: "lam_0/cutout_mask"
30+
as_slice: true
31+
inverse: true # removes lam points
32+
- assign_mask:
33+
mask: "global/cutout_mask" # fill local/global overlapping points with nan
3034

31-
forcings:
35+
constant_forcings:
3236
test:
3337
use_original_paths: true
3438

0 commit comments

Comments
 (0)