Skip to content

oeds: update mastr to english table names from open-mastr #839

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

Open
maurerle wants to merge 11 commits into
base: main
Choose a base branch
from
Open

oeds: update mastr to english table names from open-mastr #839

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
014a62d
oeds: oeds switched to open_mastr - adjust queries accordingly
maurerle Feb 27, 2026
d3d4db8
oeds: improve interface for new open-mastr
maurerle Mar 3, 2026
20003ec
oeds: update some identifiers
maurerle Mar 8, 2026
cdf4c82
oeds: apply time filtering and fix availability in loader
maurerle Jul 9, 2026
7f09b2e
oeds: fix postcode leading zero bug (Zone 0 exclusion)
maurerle Jul 9, 2026
e98c030
oeds: change solar EEG join to LEFT JOIN to include non-EEG systems
maurerle Jul 9, 2026
619a89d
oeds: remove redundant ::int casts on Postleitzahl columns
maurerle Jul 9, 2026
a532db4
oeds: generalize ownConsumption parsing across all solar types
maurerle Jul 9, 2026
8e3762a
oeds: query plzCode and fix azimuthCode default value in get_solar_sy…
maurerle Jul 13, 2026
eb6828e
Improve coordinate fallback to use localized postcode centroids
maurerle Jul 13, 2026
dff9853
Fix solar storage coordinates fallback and wind hub-height bugs
maurerle Jul 13, 2026
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
78 changes: 47 additions & 31 deletions assume/scenario/loader_oeds.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,11 @@ def load_oeds(
),
)

biomass = infra_interface.get_biomass_systems_in_area(area=area)
biomass = infra_interface.get_biomass_systems_in_area(
area=area,
created_before=end,
stopped_after=start,
)
# somehow the maximum water power matches half of the entsoe much better
biomass["maxPower"] /= 2

Expand Down Expand Up @@ -275,7 +279,11 @@ def load_oeds(
fuel_prices={"others": fuel_prices["biomass"] + randomness},
),
)
water = infra_interface.get_run_river_systems_in_area(area=area)
water = infra_interface.get_run_river_systems_in_area(
area=area,
created_before=end,
stopped_after=start,
)
# somehow the maximum water power matches half of the entsoe much better
water["maxPower"] /= 2

Expand All @@ -299,39 +307,44 @@ def load_oeds(
),
)

if True:
storages = infra_interface.get_water_storage_systems(area)
world.add_unit_operator(f"storage{area}")
for storage in storages:
world.add_unit(
f"storage{area}_{storage['unitID']}",
"storage",
f"storage{area}",
# the unit_params have no hints
{
"max_power_charge": storage["max_power_charge"] / 1e3,
"max_power_discharge": storage["max_power_discharge"] / 1e3,
"capacity": storage["capacity"] / 1e3,
"max_soc": storage["max_soc"],
"min_soc": storage["min_soc"],
"efficiency_charge": storage["efficiency_charge"],
"efficiency_discharge": storage["efficiency_discharge"],
"bidding_strategies": bidding_strategies["storage"],
"technology": "hydro_storage",
"location": (lat, lon),
"node": area,
},
PowerplantForecaster(
index, availability=1, fuel_prices={"others": 0.2}
),
)
storages = infra_interface.get_water_storage_systems(
area,
created_before=end,
stopped_after=start,
)
world.add_unit_operator(f"storage{area}")
for storage in storages:
world.add_unit(
f"storage{area}_{storage['unitID']}",
"storage",
f"storage{area}",
# the unit_params have no hints
{
"max_power_charge": storage["max_power_charge"] / 1e3,
"max_power_discharge": storage["max_power_discharge"] / 1e3,
"capacity": storage["capacity"] / 1e3,
"max_soc": storage["max_soc"],
"min_soc": storage["min_soc"],
"efficiency_charge": storage["efficiency_charge"],
"efficiency_discharge": storage["efficiency_discharge"],
"bidding_strategies": bidding_strategies["storage"],
"technology": "hydro_storage",
"location": (lat, lon),
"node": area,
},
PowerplantForecaster(
index, availability=1, fuel_prices={"others": 0.2}
),
)

world.add_unit_operator(f"conventional{area}")

for fuel_type in ["nuclear", "lignite", "hard coal", "oil", "gas"]:
plants = infra_interface.get_power_plant_in_area(
area,
fuel_type,
created_before=end,
stopped_after=start,
)
plants = list(plants.T.to_dict().values())
i = 0
Expand All @@ -343,9 +356,12 @@ def load_oeds(
randomness = 0

availability = 1
if plant["endDate"] < end:
availability = pd.Series(index=index, data=1)
availability[availability.index > end] = 0
if plant["startDate"] > start or plant["endDate"] < end:
availability = pd.Series(index=index, data=1.0)
if plant["startDate"] > start:
availability[availability.index < plant["startDate"]] = 0.0
if plant["endDate"] < end:
availability[availability.index > plant["endDate"]] = 0.0

world.add_unit(
f"conventional{area}_{fuel_type}_{i}",
Expand Down
Loading
Loading