From b3753d73d75eedaddb8da9f6dcfc4bcf8793831a Mon Sep 17 00:00:00 2001 From: Tom Brown Date: Wed, 20 Dec 2023 09:22:40 +0100 Subject: [PATCH] undo addition of script to allow cost modifications This undoes commit 830019a6e5d5ced3403bd4d5d9e28e2d66fe621b. Reason: this was introduced for the PyPSA-Ariadne derivative, but can be handled more elegantly within the derivative repository. --- rules/build_sector.smk | 4 ++-- rules/retrieve.smk | 14 -------------- scripts/modify_cost_data.py | 12 ------------ 3 files changed, 2 insertions(+), 28 deletions(-) delete mode 100644 scripts/modify_cost_data.py diff --git a/rules/build_sector.smk b/rules/build_sector.smk index 596c0305..5a9e8646 100644 --- a/rules/build_sector.smk +++ b/rules/build_sector.smk @@ -743,9 +743,9 @@ rule prepare_sector_network: else RESOURCES + "biomass_potentials_s{simpl}_{clusters}_{planning_horizons}.csv", heat_profile="data/heat_load_profile_BDEW.csv", - costs="data/costs_{}-modified.csv".format(config["costs"]["year"]) + costs="data/costs_{}.csv".format(config["costs"]["year"]) if config["foresight"] == "overnight" - else "data/costs_{planning_horizons}-modified.csv", + else "data/costs_{planning_horizons}.csv", profile_offwind_ac=RESOURCES + "profile_offwind-ac.nc", profile_offwind_dc=RESOURCES + "profile_offwind-dc.nc", h2_cavern=RESOURCES + "salt_cavern_potentials_s{simpl}_{clusters}.csv", diff --git a/rules/retrieve.smk b/rules/retrieve.smk index 18b424ff..b830be25 100644 --- a/rules/retrieve.smk +++ b/rules/retrieve.smk @@ -259,17 +259,3 @@ if config["enable"]["retrieve"]: "../envs/environment.yaml" script: "../scripts/retrieve_monthly_fuel_prices.py" - - -rule modify_cost_data: - input: - costs="data/costs_{year}.csv", - output: - "data/costs_{year}-modified.csv" - log: - LOGS + "modify_cost_data_{year}.log", - resources: - mem_mb=1000, - retries: 2 - script: - "../scripts/modify_cost_data.py" diff --git a/scripts/modify_cost_data.py b/scripts/modify_cost_data.py deleted file mode 100644 index 3e1f12f4..00000000 --- a/scripts/modify_cost_data.py +++ /dev/null @@ -1,12 +0,0 @@ - -import pandas as pd - -costs = pd.read_csv(snakemake.input.costs, index_col=[0, 1]).sort_index() - -if "modifications" in snakemake.input.keys(): - modifications = pd.read_csv(snakemake.input.modifications, index_col=[0, 1]).sort_index() - costs.loc[modifications.index] = modifications - print(modifications) - print( costs.loc[modifications.index]) - -costs.to_csv(snakemake.output[0])