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

Resolve waste heat and resistive heaters (issue1 and issue2) #813

Merged
merged 6 commits into from
Dec 28, 2023
Merged

Resolve waste heat and resistive heaters (issue1 and issue2) #813

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
25cfcaf
fix add_waste_heat
yerbol-akhmetov Dec 21, 2023
17e9b4d
make resistive heaters separate of boilers
yerbol-akhmetov Dec 21, 2023
a3688a7
add resistive_heaters option to config.default
yerbol-akhmetov Dec 23, 2023
12096d1
update configtable by adding resistive_heaters
yerbol-akhmetov Dec 23, 2023
640a4b1
update boilers description in confitables
yerbol-akhmetov Dec 28, 2023
0f41ff7
update configtable for resistive_heaters
yerbol-akhmetov Dec 28, 2023
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 config/config.default.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -440,6 +440,7 @@ sector:
decentral: 3
central: 180
boilers: true
resistive_heaters: true
oil_boilers: false
biomass_boiler: true
chp: true
Expand Down
1 change: 1 addition & 0 deletions doc/configtables/sector.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ tes_tau,,,The time constant used to calculate the decay of thermal energy in the
-- decentral,days,float,The time constant in decentralized thermal energy storage (TES)
-- central,days,float,The time constant in centralized thermal energy storage (TES)
boilers,--,"{true, false}",Add option for transforming electricity into heat using resistive heater
resistive_heaters,--,"{true, false}",Add option for using resistive heaters separately from boilers
oil_boilers,--,"{true, false}",Add option for transforming oil into heat using boilers
biomass_boiler,--,"{true, false}",Add option for transforming biomass into heat using boilers
chp,--,"{true, false}",Add option for using Combined Heat and Power (CHP)
Expand Down
5 changes: 3 additions & 2 deletions scripts/prepare_sector_network.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1827,7 +1827,7 @@ def add_heat(n, costs):
lifetime=costs.at[name_type + " water tank storage", "lifetime"],
)

if options["boilers"]:
if options["resistive_heaters"]:
key = f"{name_type} resistive heater"

n.madd(
Expand All @@ -1842,6 +1842,7 @@ def add_heat(n, costs):
lifetime=costs.at[key, "lifetime"],
)

if options["boilers"]:
key = f"{name_type} gas boiler"

n.madd(
Expand Down Expand Up @@ -3415,7 +3416,7 @@ def set_temporal_aggregation(n, opts, solver_name):
if "I" in opts:
add_industry(n, costs)

if "I" in opts and "H" in opts:
if "H" in opts:
add_waste_heat(n)

if "A" in opts: # requires H and I
Expand Down