Skip to content

Commit

Permalink
Merge branch 'fixes/#375-Missed-run_of_river-generators' into run-sta…
Browse files Browse the repository at this point in the history
…tus2019-and-egon100re-DE
  • Loading branch information
CarlosEpia committed Jan 24, 2025
2 parents 7b87c06 + f43fc73 commit a5dcfb3
Showing 1 changed file with 11 additions and 1 deletion.
12 changes: 11 additions & 1 deletion src/egon/data/datasets/power_plants/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -324,7 +324,16 @@ def insert_hydro_plants(scenario):

for carrier in map_carrier.keys():
# import target values
target = select_target(carrier, scenario)
if scenario == "eGon100RE":
target = pd.read_sql(
f"""SELECT capacity FROM supply.egon_scenario_capacities
WHERE scenario_name = '{scenario}'
AND carrier = '{carrier}'
""",
con=db.engine(),
).capacity[0]
elif scenario == "eGon2035":
target = select_target(carrier, scenario)

# import data for MaStR
mastr = pd.read_csv(
Expand Down Expand Up @@ -577,6 +586,7 @@ def insert_hydro_biomass():
f"""
DELETE FROM {cfg['target']['schema']}.{cfg['target']['table']}
WHERE carrier IN ('biomass', 'reservoir', 'run_of_river')
AND scenario IN ('eGon2035', 'eGon100RE')
"""
)

Expand Down

0 comments on commit a5dcfb3

Please sign in to comment.