Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ dependencies = [
"pulp<2.8.0",
"psycopg2",
"pyaml",
"pyarrow",
"pypsa==0.20.1",
"pydantic<2.0",
"rasterio",
Expand Down
7 changes: 4 additions & 3 deletions src/egon/data/cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -101,12 +101,13 @@
)
@click.option(
"--household-electrical-demand-source",
type=click.Choice(["bottom-up-profiles", "slp"]),
type=click.Choice(["bottom-up-profiles", "slp", "lpg"]),
default="slp",
help=(
"Choose the source to calculate and allocate household electrical"
"demands. There are currently two options:"
"'bottom-up-profiles' and 'slp' (Standard Load Profiles)"
"demands. There are currently three options:"
"'bottom-up-profiles' (IEE profiles), 'slp' (Standard Load Profiles),"
" and 'lpg' (Load Profile Generator profiles)"
),
show_default=True,
)
Expand Down
4 changes: 4 additions & 0 deletions src/egon/data/datasets.yml
Original file line number Diff line number Diff line change
Expand Up @@ -511,6 +511,10 @@ hh_demand_profiles:
path_testmode: "hh_el_load_profiles_2511.hdf"
path: "hh_el_load_profiles_100k.hdf"

lpg_household_electricity_demand_profiles:
path_testmode: "hh_el_load_profiles_lpg_testmode.parquet"
path: "hh_el_load_profiles_lpg_10k.parquet"

zensus_household_types:
path: "Zensus2011_Personen.csv"

Expand Down
11 changes: 10 additions & 1 deletion src/egon/data/datasets/electricity_demand/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@
HouseholdElectricityProfilesOfBuildings,
get_iee_hh_demand_profiles_raw,
)
from egon.data.datasets.electricity_demand_timeseries.lpg_hh_profiles import (
get_lpg_hh_demand_profiles_raw,
)
from egon.data.datasets.electricity_demand_timeseries.hh_profiles import (
HouseholdElectricityProfilesInCensusCells,
)
Expand Down Expand Up @@ -191,7 +194,13 @@ def get_annual_household_el_demand_cells():
)

# Read demand profiles from egon-data-bundle
df_profiles = get_iee_hh_demand_profiles_raw()
source = egon.data.config.settings()["egon-data"][
"--household-electrical-demand-source"
]
if source == "lpg":
df_profiles = get_lpg_hh_demand_profiles_raw()
else:
df_profiles = get_iee_hh_demand_profiles_raw()

def ve(s):
raise (ValueError(s))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -730,7 +730,16 @@ def get_building_peak_loads():
df_buildings_and_profiles = df_buildings_and_profiles.fillna(np.nan)

# Read demand profiles from egon-data-bundle
df_profiles = get_iee_hh_demand_profiles_raw()
source = egon.data.config.settings()["egon-data"][
"--household-electrical-demand-source"
]
if source == "lpg":
from egon.data.datasets.electricity_demand_timeseries.lpg_hh_profiles import (
get_lpg_hh_demand_profiles_raw,
)
df_profiles = get_lpg_hh_demand_profiles_raw()
else:
df_profiles = get_iee_hh_demand_profiles_raw()

def ve(s):
raise (ValueError(s))
Expand Down
Loading
Loading