From 392f1b5fb41631c53952cefd71319a51dcbb9154 Mon Sep 17 00:00:00 2001 From: Fabian Date: Wed, 2 Aug 2023 13:58:30 +0200 Subject: [PATCH 1/3] 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 2618680e7..dbc2fc219 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/3] follow up --- rules/postprocess.smk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/postprocess.smk b/rules/postprocess.smk index dbc2fc219..2618680e7 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 fc64649089226af1c180c5fb112936d2593a7900 Mon Sep 17 00:00:00 2001 From: Fabian Date: Mon, 14 Aug 2023 14:39:51 +0200 Subject: [PATCH 3/3] 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 e19a96da6..f6ad35267 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__":