From 392f1b5fb41631c53952cefd71319a51dcbb9154 Mon Sep 17 00:00:00 2001 From: Fabian Date: Wed, 2 Aug 2023 13:58:30 +0200 Subject: [PATCH 1/5] solving: add walltime --- rules/postprocess.smk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/postprocess.smk b/rules/postprocess.smk index 2618680e..dbc2fc21 100644 --- a/rules/postprocess.smk +++ b/rules/postprocess.smk @@ -47,8 +47,8 @@ rule copy_config: BENCHMARKS + "copy_config" conda: "../envs/environment.yaml" - script: - "../scripts/copy_config.py" + shell: + "cp {configfile} {output}" rule make_summary: From 28c238eaa4642e25009518ee8420e6f71bd9eb38 Mon Sep 17 00:00:00 2001 From: Fabian Date: Wed, 2 Aug 2023 14:58:10 +0200 Subject: [PATCH 2/5] follow up --- rules/postprocess.smk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/postprocess.smk b/rules/postprocess.smk index dbc2fc21..2618680e 100644 --- a/rules/postprocess.smk +++ b/rules/postprocess.smk @@ -47,8 +47,8 @@ rule copy_config: BENCHMARKS + "copy_config" conda: "../envs/environment.yaml" - shell: - "cp {configfile} {output}" + script: + "../scripts/copy_config.py" rule make_summary: From def61ae769e4b099544005b60b6bfbb9cbb6e257 Mon Sep 17 00:00:00 2001 From: Fabian Neumann Date: Mon, 14 Aug 2023 12:39:33 +0200 Subject: [PATCH 3/5] industry distribution: use EPRTR as fallback if ETS missing --- doc/release_notes.rst | 2 ++ scripts/build_industrial_distribution_key.py | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/doc/release_notes.rst b/doc/release_notes.rst index 70a73e2f..b6db1b90 100644 --- a/doc/release_notes.rst +++ b/doc/release_notes.rst @@ -12,6 +12,8 @@ Upcoming Release * Updated Global Energy Monitor LNG terminal data to March 2023 version. +* For industry distribution, use EPRTR as fallback if ETS data is not available. + PyPSA-Eur 0.8.1 (27th July 2023) ================================ diff --git a/scripts/build_industrial_distribution_key.py b/scripts/build_industrial_distribution_key.py index e93e43c2..65ed8da9 100644 --- a/scripts/build_industrial_distribution_key.py +++ b/scripts/build_industrial_distribution_key.py @@ -115,7 +115,7 @@ def build_nodal_distribution_key(hotmaps, regions, countries): facilities = hotmaps.query("country == @country and Subsector == @sector") if not facilities.empty: - emissions = facilities["Emissions_ETS_2014"] + emissions = facilities["Emissions_ETS_2014"].fillna(hotmaps["Emissions_EPRTR_2014"]) if emissions.sum() == 0: key = pd.Series(1 / len(facilities), facilities.index) else: From 0d096d7388e90c3fe4fb931d3a2d9147169e010e Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 14 Aug 2023 10:40:04 +0000 Subject: [PATCH 4/5] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- scripts/build_industrial_distribution_key.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/build_industrial_distribution_key.py b/scripts/build_industrial_distribution_key.py index 65ed8da9..979a1493 100644 --- a/scripts/build_industrial_distribution_key.py +++ b/scripts/build_industrial_distribution_key.py @@ -115,7 +115,9 @@ def build_nodal_distribution_key(hotmaps, regions, countries): facilities = hotmaps.query("country == @country and Subsector == @sector") if not facilities.empty: - emissions = facilities["Emissions_ETS_2014"].fillna(hotmaps["Emissions_EPRTR_2014"]) + emissions = facilities["Emissions_ETS_2014"].fillna( + hotmaps["Emissions_EPRTR_2014"] + ) if emissions.sum() == 0: key = pd.Series(1 / len(facilities), facilities.index) else: From fc64649089226af1c180c5fb112936d2593a7900 Mon Sep 17 00:00:00 2001 From: Fabian Date: Mon, 14 Aug 2023 14:39:51 +0200 Subject: [PATCH 5/5] build_sequestration: switch to geopandas dissolve rather than groupby --- scripts/build_sequestration_potentials.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/scripts/build_sequestration_potentials.py b/scripts/build_sequestration_potentials.py index e19a96da..f6ad3526 100644 --- a/scripts/build_sequestration_potentials.py +++ b/scripts/build_sequestration_potentials.py @@ -28,9 +28,7 @@ def allocate_sequestration_potential( overlay["share"] = area(overlay) / overlay["area_sqkm"] adjust_cols = overlay.columns.difference({"name", "area_sqkm", "geometry", "share"}) overlay[adjust_cols] = overlay[adjust_cols].multiply(overlay["share"], axis=0) - gdf_regions = overlay.groupby("name").sum() - gdf_regions.drop(["area_sqkm", "share"], axis=1, inplace=True) - return gdf_regions.squeeze() + return overlay.dissolve("name", aggfunc="sum")[attr] if __name__ == "__main__":