From 6553b39ba984bc7a416935aaf313431bb3c97152 Mon Sep 17 00:00:00 2001 From: Eddy-JV Date: Wed, 12 Jun 2024 18:25:50 +0200 Subject: [PATCH 1/2] Add Params to build_population_layout --- Snakefile | 2 ++ scripts/build_population_layouts.py | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Snakefile b/Snakefile index 1e3a7423..bdc9d18e 100644 --- a/Snakefile +++ b/Snakefile @@ -360,6 +360,8 @@ rule build_solar_thermal_profiles: rule build_population_layouts: + params: + planning_horizons= config["scenario"]["planning_horizons"][0], input: nuts3_shapes=pypsaearth("resources/shapes/gadm_shapes.geojson"), urban_percent="data/urban_percent.csv", diff --git a/scripts/build_population_layouts.py b/scripts/build_population_layouts.py index 7bf63c77..9428214f 100644 --- a/scripts/build_population_layouts.py +++ b/scripts/build_population_layouts.py @@ -51,7 +51,7 @@ urban_percent_df = urban_percent_df.loc[ ( urban_percent_df["Year"] - == snakemake.config["scenario"]["planning_horizons"][0] + == snakemake.params.planning_horizons ) ] From 55e555921e4c4213cb4a34dc7a139d63727bf543 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Wed, 12 Jun 2024 16:28:54 +0000 Subject: [PATCH 2/2] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- Snakefile | 2 +- scripts/build_population_layouts.py | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/Snakefile b/Snakefile index bdc9d18e..205cc61b 100644 --- a/Snakefile +++ b/Snakefile @@ -361,7 +361,7 @@ rule build_solar_thermal_profiles: rule build_population_layouts: params: - planning_horizons= config["scenario"]["planning_horizons"][0], + planning_horizons=config["scenario"]["planning_horizons"][0], input: nuts3_shapes=pypsaearth("resources/shapes/gadm_shapes.geojson"), urban_percent="data/urban_percent.csv", diff --git a/scripts/build_population_layouts.py b/scripts/build_population_layouts.py index 9428214f..7929458d 100644 --- a/scripts/build_population_layouts.py +++ b/scripts/build_population_layouts.py @@ -49,10 +49,7 @@ # Filter for the year used in the workflow urban_percent_df = urban_percent_df.loc[ - ( - urban_percent_df["Year"] - == snakemake.params.planning_horizons - ) + (urban_percent_df["Year"] == snakemake.params.planning_horizons) ] # Filter for urban percent column