Merge pull request #12 from ihmeuw/feature/new-era5-extractions

Feature/new era5 extractions

Author: collijk

poetry.lock

@@ -37,12 +37,12 @@ pandas = "^2.2.2"
 rasterra = "^0.6.0"
 shapely = "^2.0.4"
 geopandas = "^1.0.1"
-xarray = "^2024.3.0"
-cdsapi = "^0.7.0"
+xarray = "^2024.11.0"
+cdsapi = "^0.7.5"
 matplotlib = "^3.8.4"
 scikit-learn = "^1.4.2"
 rra-tools = "^1.0.10"
-netcdf4 = "^1.6.5"
+netcdf4 = "^1.7.2"
 pyarrow = "^16.0.0"
 types-requests = "^2.31.0.20240406"
 types-tqdm = "^4.66.0.20240417"

pyproject.toml

@@ -18,7 +18,7 @@
 _P = ParamSpec("_P")
 
 
-VALID_HISTORY_YEARS = [str(y) for y in range(1990, 2024)]
+VALID_HISTORY_YEARS = [str(y) for y in range(1950, 2024)]
 VALID_REFERENCE_YEARS = VALID_HISTORY_YEARS[-5:]
 VALID_FORECAST_YEARS = [str(y) for y in range(2024, 2101)]
 

src/climate_data/cli_options.py

@@ -37,10 +37,7 @@ def extracted_era5(self) -> Path:
     def extracted_era5_path(
         self, dataset: str, variable: str, year: int | str, month: str
     ) -> Path:
-        return (
-            self.extracted_era5
-            / f"reanalysis-era5-{dataset}_{variable}_{year}_{month}.nc"
-        )
+        return self.extracted_era5 / f"{dataset}_{variable}_{year}_{month}.nc"
 
     @property
     def extracted_cmip6(self) -> Path: