diff --git a/config.default.yaml b/config.default.yaml index cd5e16f2..0b03b9fb 100755 --- a/config.default.yaml +++ b/config.default.yaml @@ -582,8 +582,6 @@ costs: lifetime: 25 #default lifetime # From a Lion Hirth paper, also reflects average of Noothout et al 2016 discountrate: 0.07 - # [EUR/USD] ECB: https://www.ecb.europa.eu/stats/exchange/eurofxref/html/eurofxref-graph-usd.en.html # noqa: E501 - USD2013_to_EUR2013: 0.7532 # Marginal and capital costs can be overwritten # capital_cost: # onwind: 500 diff --git a/scripts/add_existing_baseyear.py b/scripts/add_existing_baseyear.py index 52f412ec..9eecaadc 100644 --- a/scripts/add_existing_baseyear.py +++ b/scripts/add_existing_baseyear.py @@ -630,7 +630,6 @@ if __name__ == "__main__": Nyears = n.snapshot_weightings.generators.sum() / 8760.0 costs = prepare_costs( snakemake.input.costs, - snakemake.config["costs"]["USD2013_to_EUR2013"], snakemake.config["costs"]["discountrate"], Nyears, snakemake.config["costs"]["lifetime"], diff --git a/scripts/make_summary.py b/scripts/make_summary.py index 840af9ba..cf258544 100644 --- a/scripts/make_summary.py +++ b/scripts/make_summary.py @@ -693,7 +693,6 @@ if __name__ == "__main__": costs_db = prepare_costs( snakemake.input.costs, - snakemake.config["costs"]["USD2013_to_EUR2013"], snakemake.config["costs"]["discountrate"], Nyears, snakemake.config["costs"]["lifetime"], diff --git a/scripts/prepare_sector_network.py b/scripts/prepare_sector_network.py index dd25ec38..6f8afd7f 100644 --- a/scripts/prepare_sector_network.py +++ b/scripts/prepare_sector_network.py @@ -725,13 +725,12 @@ def cycling_shift(df, steps=1): # TODO checkout PyPSA-Eur script -def prepare_costs(cost_file, USD_to_EUR, discount_rate, Nyears, lifetime): +def prepare_costs(cost_file, discount_rate, Nyears, lifetime): # set all asset costs and other parameters costs = pd.read_csv(cost_file, index_col=[0, 1]).sort_index() # correct units to MW and EUR costs.loc[costs.unit.str.contains("/kW"), "value"] *= 1e3 - costs.loc[costs.unit.str.contains("USD"), "value"] *= USD_to_EUR # min_count=1 is important to generate NaNs which are then filled by fillna costs = ( @@ -3266,7 +3265,6 @@ if __name__ == "__main__": costs = prepare_costs( snakemake.input.costs, - snakemake.config["costs"]["USD2013_to_EUR2013"], snakemake.config["costs"]["discountrate"], Nyears, snakemake.config["costs"]["lifetime"],