Merge branch 'feat/boundary_dataloader' into boundary_forcing

mllam · Dec 5, 2024 · c482a4d · c482a4d
2 parents 29063c8 + f8613da
commit c482a4d
Show file tree

Hide file tree

Showing 2 changed files with 44 additions and 2 deletions.
diff --git a/tests/datastore_examples/mdp/era5_1000hPa_danra_100m_winds/era5.datastore.yaml b/tests/datastore_examples/mdp/era5_1000hPa_danra_100m_winds/era5.datastore.yaml
@@ -3,6 +3,7 @@ dataset_version: v1.0.0
 
 output:
   variables:
+    static: [grid_index, static_feature]
     forcing: [time, grid_index, forcing_feature]
   coord_ranges:
     time:
@@ -59,7 +60,7 @@ inputs:
     path: 'gs://weatherbench2/datasets/era5/1959-2023_01_10-6h-64x32_equiangular_conservative.zarr'
     dims: [time, longitude, latitude, level]
     variables:
-      - mean_surface_net_short_wave_radiation_flux
+      - mean_sea_level_pressure
     dim_mapping:
       time:
         method: rename
@@ -78,6 +79,26 @@ inputs:
         dims: [x, y]
     target_output_variable: forcing
 
+  era5_static:
+    path: 'gs://weatherbench2/datasets/era5/1959-2023_01_10-6h-64x32_equiangular_conservative.zarr'
+    dims: [time, longitude, latitude, level]
+    variables:
+      - land_sea_mask
+    dim_mapping:
+      x:
+        method: rename
+        dim: longitude
+      y:
+        method: rename
+        dim: latitude
+      static_feature:
+        method: stack_variables_by_var_name
+        name_format: "{var_name}"
+      grid_index:
+        method: stack
+        dims: [x, y]
+    target_output_variable: static
+
 extra:
   projection:
     class_name: PlateCarree

diff --git a/...atastore_examples/npyfilesmeps/era5_1000hPa_temp_meps_example_reduced/era5.datastore.yaml b/...atastore_examples/npyfilesmeps/era5_1000hPa_temp_meps_example_reduced/era5.datastore.yaml
@@ -3,6 +3,7 @@ dataset_version: v1.0.0
 
 output:
   variables:
+    static: [grid_index, static_feature]
     forcing: [time, grid_index, forcing_feature]
   coord_ranges:
     time:
@@ -59,7 +60,7 @@ inputs:
     path: 'gs://weatherbench2/datasets/era5/1959-2023_01_10-6h-64x32_equiangular_conservative.zarr'
     dims: [time, longitude, latitude, level]
     variables:
-      - mean_surface_net_short_wave_radiation_flux
+      - mean_sea_level_pressure
     dim_mapping:
       time:
         method: rename
@@ -78,6 +79,26 @@ inputs:
         dims: [x, y]
     target_output_variable: forcing
 
+  era5_static:
+    path: 'gs://weatherbench2/datasets/era5/1959-2023_01_10-6h-64x32_equiangular_conservative.zarr'
+    dims: [time, longitude, latitude, level]
+    variables:
+      - land_sea_mask
+    dim_mapping:
+      x:
+        method: rename
+        dim: longitude
+      y:
+        method: rename
+        dim: latitude
+      static_feature:
+        method: stack_variables_by_var_name
+        name_format: "{var_name}"
+      grid_index:
+        method: stack
+        dims: [x, y]
+    target_output_variable: static
+
 extra:
   projection:
     class_name: PlateCarree