Skip to content

Commit

Permalink
Temporary remove everything related to individual heating
Browse files Browse the repository at this point in the history
  • Loading branch information
ClaraBuettner committed Sep 28, 2022
1 parent bb23d5a commit 517ab19
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 14 deletions.
14 changes: 8 additions & 6 deletions src/egon/data/datasets/heat_etrago/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,8 @@ def insert_store(scenario, carrier):

def store():
insert_store("eGon2035", "central_heat")
insert_store("eGon2035", "rural_heat")
# Temporary drop everything related to rural heat
# insert_store("eGon2035", "rural_heat")


def insert_central_direct_heat(scenario="eGon2035"):
Expand Down Expand Up @@ -572,9 +573,9 @@ def buses():
"""

insert_buses("central_heat", scenario="eGon2035")
insert_buses("rural_heat", scenario="eGon2035")
# insert_buses("rural_heat", scenario="eGon2035")
insert_buses("central_heat", scenario="eGon100RE")
insert_buses("rural_heat", scenario="eGon100RE")
# insert_buses("rural_heat", scenario="eGon100RE")


def supply():
Expand All @@ -591,17 +592,18 @@ def supply():

insert_central_direct_heat(scenario="eGon2035")
insert_central_power_to_heat(scenario="eGon2035")
insert_individual_power_to_heat(scenario="eGon2035")
# Temporary drop everything related to rural heat
# insert_individual_power_to_heat(scenario="eGon2035")

insert_rural_gas_boilers(scenario="eGon2035")
# insert_rural_gas_boilers(scenario="eGon2035")
insert_central_gas_boilers(scenario="eGon2035")


class HeatEtrago(Dataset):
def __init__(self, dependencies):
super().__init__(
name="HeatEtrago",
version="0.0.9",
version="0.0.10",
dependencies=dependencies,
tasks=(buses, supply, store),
)
15 changes: 9 additions & 6 deletions src/egon/data/datasets/heat_etrago/hts_etrago.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ def hts_to_etrago():
targets = config.datasets()["etrago_heat"]["targets"]
scenario = "eGon2035"
carriers = ["central_heat", "rural_heat"]
# Temporary drop everything related to rural heat
carriers = ["central_heat"]

for carrier in carriers:
if carrier == "central_heat":
Expand Down Expand Up @@ -150,14 +152,15 @@ class HtsEtragoTable(Dataset):
def __init__(self, dependencies):
super().__init__(
name="HtsEtragoTable",
version="0.0.4",
version="0.0.5",
dependencies=dependencies,
tasks=(
individual_heating_per_mv_grid_tables,
{
individual_heating_per_mv_grid_2035,
individual_heating_per_mv_grid_100,
},
# Temporary drop everything related to rural heat
# individual_heating_per_mv_grid_tables,
# {
# individual_heating_per_mv_grid_2035,
# individual_heating_per_mv_grid_100,
# },
hts_to_etrago,
),
)
9 changes: 7 additions & 2 deletions src/egon/data/datasets/heat_supply/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -170,10 +170,15 @@ class HeatSupply(Dataset):
def __init__(self, dependencies):
super().__init__(
name="HeatSupply",
version="0.0.6",
version="0.0.7",
dependencies=dependencies,
tasks=(
create_tables,
{district_heating, individual_heating, potential_germany},
{
district_heating,
# Temporary drop everything related to rural heat
# individual_heating,
potential_germany,
},
),
)

0 comments on commit 517ab19

Please sign in to comment.