Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixes/#776 missing egon100 re power plants and reservoir run of river #808

Closed
wants to merge 4 commits into from
Closed

Fixes/#776 missing egon100 re power plants and reservoir run of river #808

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
29e2b25
assign 0 to unknown capital_costs and group also eGon100RE
CarlosEpia Jun 13, 2022
bf189f3
Use next_etrago_id
CarlosEpia Jun 14, 2022
36c4ff0
Update Changelog
CarlosEpia Jun 14, 2022
b4857e1
using Black
CarlosEpia Jun 23, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions CHANGELOG.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -516,6 +516,11 @@ Bug Fixes
`#766 <https://github.com/openego/eGon-data/issues/766>`_
* Use db.next_etrago_id in dsm and pv_rooftop dataset
`#748 <https://github.com/openego/eGon-data/issues/748>`_
* Fix missing reservoir and run_of_river power plants in eTraGo tables,
Modify fill_etrago_gen to also group generators from eGon100RE,
Use db.next_etrago_id in fill_etrago_gen
`#798 <https://github.com/openego/eGon-data/issues/798>`_
`#776 <https://github.com/openego/eGon-data/issues/776>`_

.. _PR #692: https://github.com/openego/eGon-data/pull/692
.. _#343: https://github.com/openego/eGon-data/issues/343
Expand Down
60 changes: 32 additions & 28 deletions src/egon/data/datasets/fill_etrago_gen.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ class Egon_etrago_gen(Dataset):
def __init__(self, dependencies):
super().__init__(
name="etrago_generators",
version="0.0.6",
version="0.0.7",
dependencies=dependencies,
tasks=(fill_etrago_generators,),
)
Expand Down Expand Up @@ -69,26 +69,19 @@ def group_power_plants(power_plants, renew_feedin, etrago_gen_orig, cfg):
# group power plants by bus and carrier

agg_func = {
"sources": numpy_nan,
"source_id": numpy_nan,
"carrier": consistency,
"el_capacity": np.sum,
"bus_id": consistency,
"voltage_level": numpy_nan,
"weather_cell_id": power_timeser,
"scenario": consistency,
"geom": numpy_nan,
}

etrago_pp = power_plants.groupby(by=["bus_id", "carrier"]).agg(
etrago_pp = power_plants.groupby(by=["bus_id", "carrier", "scenario"]).agg(
func=agg_func
)
etrago_pp = etrago_pp.reset_index(drop=True)

if np.isnan(etrago_gen_orig["generator_id"].max()):
max_id = 0
else:
max_id = etrago_gen_orig["generator_id"].max() + 1

max_id = db.next_etrago_id("generator")
etrago_pp["generator_id"] = list(range(max_id, max_id + len(etrago_pp)))
etrago_pp.set_index("generator_id", inplace=True)

Expand All @@ -97,18 +90,32 @@ def group_power_plants(power_plants, renew_feedin, etrago_gen_orig, cfg):

def add_marginal_costs(power_plants):

# Read marginal costs from scenario capacities

marginal_costs = pd.DataFrame.from_dict(
get_sector_parameters("electricity", "eGon2035")["marginal_cost"],
orient="index",
).rename(columns={0: "marginal_cost"})

power_plants = power_plants.merge(
right=marginal_costs, left_on="carrier", right_index=True
)

return power_plants
scenarios = power_plants.scenario.unique()
pp = pd.DataFrame()

for scenario in scenarios:
pp_scn = power_plants[power_plants["scenario"] == scenario].copy()
# Read marginal costs from scenario capacities
marginal_costs = pd.DataFrame.from_dict(
get_sector_parameters("electricity", scenario)["marginal_cost"],
orient="index",
).rename(columns={0: "marginal_cost"})

# Set marginal costs = 0 for technologies without values
warning = []
for carrier in pp_scn.carrier.unique():
if carrier not in (marginal_costs.index):
warning.append(carrier)
marginal_costs = marginal_costs.append(
pd.Series(name= carrier, data= {"marginal_cost": 0}))
if warning:
print(f"""There are not marginal_cost values for: \n{warning}
in the scenario {scenario}. Missing values set to 0""")
pp = pp.append(pp_scn.merge(
right=marginal_costs, left_on="carrier", right_index=True
))

return pp


def fill_etrago_gen_table(etrago_pp2, etrago_gen_orig, cfg, con):
Expand Down Expand Up @@ -150,7 +157,7 @@ def fill_etrago_gen_time_table(
cal_timeseries = set_timeseries(
power_plants=power_plants, renew_feedin=renew_feedin
)

CarlosEpia marked this conversation as resolved.
Show resolved Hide resolved
etrago_pp_time["p_max_pu"] = 0
etrago_pp_time["p_max_pu"] = etrago_pp_time.apply(cal_timeseries, axis=1)

Expand All @@ -170,12 +177,11 @@ def fill_etrago_gen_time_table(
return etrago_pp_time


def load_tables(con, cfg, scenario="eGon2035"):
def load_tables(con, cfg):
sql = f"""
SELECT * FROM
{cfg['sources']['power_plants']['schema']}.
{cfg['sources']['power_plants']['table']}
WHERE scenario = '{scenario}'
"""
power_plants = gpd.GeoDataFrame.from_postgis(
sql, con, crs="EPSG:4326", index_col="id"
Expand All @@ -199,15 +205,13 @@ def load_tables(con, cfg, scenario="eGon2035"):
SELECT * FROM
{cfg['targets']['etrago_generators']['schema']}.
{cfg['targets']['etrago_generators']['table']}
WHERE scn_name = '{scenario}'
"""
etrago_gen_orig = pd.read_sql(sql, con)

sql = f"""
SELECT * FROM
{cfg['targets']['etrago_gen_time']['schema']}.
{cfg['targets']['etrago_gen_time']['table']}
WHERE scn_name = '{scenario}'
"""
pp_time = pd.read_sql(sql, con)

Expand Down