From e4dad6429d3cd5464e628e874370262eb55840c8 Mon Sep 17 00:00:00 2001 From: lisazeyen Date: Mon, 21 Jun 2021 07:58:10 +0200 Subject: [PATCH] update for atlite version 0.2.4 --- scripts/build_clustered_population_layouts.py | 4 ++-- scripts/build_heat_demand.py | 4 ++-- scripts/build_population_layouts.py | 5 ++--- scripts/build_retro_cost.py | 4 ++-- scripts/build_solar_thermal_profiles.py | 5 ++--- scripts/build_temperature_profiles.py | 5 ++--- 6 files changed, 12 insertions(+), 15 deletions(-) diff --git a/scripts/build_clustered_population_layouts.py b/scripts/build_clustered_population_layouts.py index 94cbd133..a929058a 100644 --- a/scripts/build_clustered_population_layouts.py +++ b/scripts/build_clustered_population_layouts.py @@ -5,9 +5,9 @@ import pandas as pd import atlite import helper +cutout_path = snakemake.config['atlite']['cutout_dir'] + "/" + snakemake.config['atlite']['cutout_name']+ ".nc" -cutout = atlite.Cutout(snakemake.config['atlite']['cutout_name'], - cutout_dir=snakemake.config['atlite']['cutout_dir']) +cutout = atlite.Cutout(path=cutout_path) clustered_busregions_as_geopd = gpd.read_file(snakemake.input.regions_onshore).set_index('name', drop=True) diff --git a/scripts/build_heat_demand.py b/scripts/build_heat_demand.py index 169e81f4..74d0016f 100644 --- a/scripts/build_heat_demand.py +++ b/scripts/build_heat_demand.py @@ -18,8 +18,8 @@ if 'snakemake' not in globals(): time = pd.date_range(freq='m', **snakemake.config['snapshots']) params = dict(years=slice(*time.year[[0, -1]]), months=slice(*time.month[[0, -1]])) -cutout = atlite.Cutout(snakemake.config['atlite']['cutout_name'], - cutout_dir=snakemake.config['atlite']['cutout_dir'], +cutout_path = snakemake.config['atlite']['cutout_dir'] + "/" + snakemake.config['atlite']['cutout_name']+ ".nc" +cutout = atlite.Cutout(path=cutout_path, **params) clustered_busregions_as_geopd = gpd.read_file(snakemake.input.regions_onshore).set_index('name', drop=True) diff --git a/scripts/build_population_layouts.py b/scripts/build_population_layouts.py index 497e399a..f379ad46 100644 --- a/scripts/build_population_layouts.py +++ b/scripts/build_population_layouts.py @@ -18,11 +18,10 @@ if 'snakemake' not in globals(): snakemake.config = yaml.safe_load(f) snakemake.input = Dict() snakemake.output = Dict() - snakemake.input["urban_percent"] = "data/urban_percent.csv" -cutout = atlite.Cutout(snakemake.config['atlite']['cutout_name'], - cutout_dir=snakemake.config['atlite']['cutout_dir']) +cutout_path = snakemake.config['atlite']['cutout_dir'] + "/" + snakemake.config['atlite']['cutout_name']+ ".nc" +cutout = atlite.Cutout(path=cutout_path) grid_cells = cutout.grid_cells() diff --git a/scripts/build_retro_cost.py b/scripts/build_retro_cost.py index 985c530f..22005d9c 100644 --- a/scripts/build_retro_cost.py +++ b/scripts/build_retro_cost.py @@ -441,7 +441,7 @@ def prepare_temperature_data(): temperature_factor = (t_threshold - temperature_average_d_heat) * d_heat * 1/365 """ - temperature = xr.open_dataarray(snakemake.input.air_temperature).T.to_pandas() + temperature = xr.open_dataarray(snakemake.input.air_temperature).to_pandas() d_heat = (temperature.groupby(temperature.columns.str[:2], axis=1).mean() .resample("1D").mean()