Skip to content

Commit 69cacd8

Browse files
committed
get rid of db_name where no longer needed
1 parent 4a0350e commit 69cacd8

File tree

2 files changed

+15
-19
lines changed

2 files changed

+15
-19
lines changed

Snakefile

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -311,7 +311,6 @@ if config["enable"]["retrieve"] and config["enable"].get("retrieve_cost_data", T
311311

312312
rule build_mobility_demand:
313313
params:
314-
db_name=config_provider("iiasa_database", "db_name"),
315314
reference_scenario=config_provider("iiasa_database", "reference_scenario"),
316315
planning_horizons=config_provider("scenario", "planning_horizons"),
317316
leitmodelle=config_provider("iiasa_database", "leitmodelle"),
@@ -500,7 +499,6 @@ rule build_existing_chp_de:
500499

501500
rule modify_industry_demand:
502501
params:
503-
db_name=config_provider("iiasa_database", "db_name"),
504502
reference_scenario=config_provider("iiasa_database", "reference_scenario"),
505503
input:
506504
ariadne=resources("ariadne_database.csv"),
@@ -706,7 +704,6 @@ rule ariadne_all:
706704
rule build_scenarios:
707705
params:
708706
scenarios=config_provider("run", "name"),
709-
db_name=config_provider("iiasa_database", "db_name"),
710707
leitmodelle=config_provider("iiasa_database", "leitmodelle"),
711708
input:
712709
ariadne_database=resources("ariadne_database.csv"),

scripts/pypsa-de/build_scenarios.py

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -171,24 +171,23 @@ def write_to_scenario_yaml(input, output, scenarios, df):
171171
aviation_demand_factor.loc[year].item(), 4
172172
)
173173

174-
if not snakemake.params.db_name == "ariadne":
175-
st_primary_fraction = get_primary_steel_share(
176-
df.loc[:, reference_scenario, :], planning_horizons
177-
)
174+
st_primary_fraction = get_primary_steel_share(
175+
df.loc[:, reference_scenario, :], planning_horizons
176+
)
178177

179-
dri_fraction = get_DRI_share(
180-
df.loc[:, reference_scenario, :], planning_horizons
181-
)
178+
dri_fraction = get_DRI_share(
179+
df.loc[:, reference_scenario, :], planning_horizons
180+
)
182181

183-
config[scenario]["industry"]["St_primary_fraction"] = {}
184-
config[scenario]["industry"]["DRI_fraction"] = {}
185-
for year in st_primary_fraction.columns:
186-
config[scenario]["industry"]["St_primary_fraction"][year] = round(
187-
st_primary_fraction.loc["Primary_Steel_Share", year].item(), 4
188-
)
189-
config[scenario]["industry"]["DRI_fraction"][year] = round(
190-
dri_fraction.loc["DRI_Steel_Share", year].item(), 4
191-
)
182+
config[scenario]["industry"]["St_primary_fraction"] = {}
183+
config[scenario]["industry"]["DRI_fraction"] = {}
184+
for year in st_primary_fraction.columns:
185+
config[scenario]["industry"]["St_primary_fraction"][year] = round(
186+
st_primary_fraction.loc["Primary_Steel_Share", year].item(), 4
187+
)
188+
config[scenario]["industry"]["DRI_fraction"][year] = round(
189+
dri_fraction.loc["DRI_Steel_Share", year].item(), 4
190+
)
192191

193192
config[scenario]["solving"]["constraints"]["co2_budget_national"] = {}
194193
for year, target in co2_budget_fractions.items():

0 commit comments

Comments
 (0)