From 985aecb0c4629c66337b86f3b31fd711099f3a72 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 13 May 2024 19:38:59 +0000 Subject: [PATCH] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- rules/build_electricity.smk | 10 +++++----- rules/retrieve.smk | 4 ++-- scripts/add_brownfield.py | 12 ++++-------- 3 files changed, 11 insertions(+), 15 deletions(-) diff --git a/rules/build_electricity.smk b/rules/build_electricity.smk index 8b06f915..b415d2d9 100644 --- a/rules/build_electricity.smk +++ b/rules/build_electricity.smk @@ -396,7 +396,7 @@ rule add_electricity: else resources("networks/base.nc") ), tech_costs=lambda w: resources( - f"costs_{config_provider('costs', 'year') (w)}.csv" + f"costs_{config_provider('costs', 'year')(w)}.csv" ), regions=resources("regions_onshore.geojson"), powerplants=resources("powerplants.csv"), @@ -441,7 +441,7 @@ rule simplify_network: input: network=resources("networks/elec.nc"), tech_costs=lambda w: resources( - f"costs_{config_provider('costs', 'year') (w)}.csv" + f"costs_{config_provider('costs', 'year')(w)}.csv" ), regions_onshore=resources("regions_onshore.geojson"), regions_offshore=resources("regions_offshore.geojson"), @@ -489,7 +489,7 @@ rule cluster_network: else [] ), tech_costs=lambda w: resources( - f"costs_{config_provider('costs', 'year') (w)}.csv" + f"costs_{config_provider('costs', 'year')(w)}.csv" ), output: network=resources("networks/elec_s{simpl}_{clusters}.nc"), @@ -518,7 +518,7 @@ rule add_extra_components: input: network=resources("networks/elec_s{simpl}_{clusters}.nc"), tech_costs=lambda w: resources( - f"costs_{config_provider('costs', 'year') (w)}.csv" + f"costs_{config_provider('costs', 'year')(w)}.csv" ), output: resources("networks/elec_s{simpl}_{clusters}_ec.nc"), @@ -553,7 +553,7 @@ rule prepare_network: input: resources("networks/elec_s{simpl}_{clusters}_ec.nc"), tech_costs=lambda w: resources( - f"costs_{config_provider('costs', 'year') (w)}.csv" + f"costs_{config_provider('costs', 'year')(w)}.csv" ), co2_price=lambda w: resources("co2_price.csv") if "Ept" in w.opts else [], output: diff --git a/rules/retrieve.smk b/rules/retrieve.smk index 64afdc13..d9ba58e2 100644 --- a/rules/retrieve.smk +++ b/rules/retrieve.smk @@ -249,7 +249,7 @@ if config["enable"]["retrieve"]: layer_path = ( f"/vsizip/{params.folder}/WDPA_{bYYYY}_Public_shp_{i}.zip" ) - print(f"Adding layer {i + 1} of 3 to combined output file.") + print(f"Adding layer {i+1} of 3 to combined output file.") shell("ogr2ogr -f gpkg -update -append {output.gpkg} {layer_path}") rule download_wdpa_marine: @@ -272,7 +272,7 @@ if config["enable"]["retrieve"]: for i in range(3): # vsizip is special driver for directly working with zipped shapefiles in ogr2ogr layer_path = f"/vsizip/{params.folder}/WDPA_WDOECM_{bYYYY}_Public_marine_shp_{i}.zip" - print(f"Adding layer {i + 1} of 3 to combined output file.") + print(f"Adding layer {i+1} of 3 to combined output file.") shell("ogr2ogr -f gpkg -update -append {output.gpkg} {layer_path}") diff --git a/scripts/add_brownfield.py b/scripts/add_brownfield.py index 6999cafe..76e16716 100644 --- a/scripts/add_brownfield.py +++ b/scripts/add_brownfield.py @@ -111,16 +111,12 @@ def add_brownfield(n, n_p, year): .groupby(level=0) .sum() ) - remaining_capacity = ( - pipe_capacity - - CH4_per_H2 - * already_retrofitted.reindex(index=pipe_capacity.index).fillna(0) - ) + remaining_capacity = pipe_capacity - CH4_per_H2 * already_retrofitted.reindex( + index=pipe_capacity.index + ).fillna(0) n.links.loc[gas_pipes_i, "p_nom"] = remaining_capacity else: - new_pipes = n.links.carrier.isin(pipe_carrier) & ( - n.links.build_year == year - ) + new_pipes = n.links.carrier.isin(pipe_carrier) & (n.links.build_year == year) n.links.loc[new_pipes, "p_nom"] = 0.0 n.links.loc[new_pipes, "p_nom_min"] = 0.0