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

revert to old config keys #1152

Merged
merged 2 commits into from
Jul 12, 2024
Merged

revert to old config keys #1152

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4b0d9e7
revert to old config keys
lindnemi Jul 12, 2024
b819f11
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jul 12, 2024
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
13 changes: 6 additions & 7 deletions config/config.default.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -571,13 +571,12 @@ sector:
min_part_load_fischer_tropsch: 0.5
min_part_load_methanolisation: 0.3
min_part_load_methanation: 0.3
use_waste_heat:
fischer_tropsch: 0.25
haber_bosch: 0.25
methanolisation: 0.25
methanation: 0.25
fuel_cell: 0.25
electrolysis: 0.25
use_fischer_tropsch_waste_heat: 0.25
use_haber_bosch_waste_heat: 0.25
use_methanolisation_waste_heat: 0.25
use_methanation_waste_heat: 0.25
use_fuel_cell_waste_heat: 0.25
use_electrolysis_waste_heat: 0.25
electricity_transmission_grid: true
electricity_distribution_grid: true
electricity_distribution_grid_cost_factor: 1.0
Expand Down
2 changes: 1 addition & 1 deletion doc/release_notes.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Upcoming Release

* Changed default assumptions about waste heat usage from PtX and fuel cells in district heating.
The default value for the link efficiency scaling factor was changed from 100% to 25%.
It can be set to other values in the configuration ``sector: use_waste_heat:``.
It can be set to other values in the configuration ``sector: use_TECHNOLOGY_waste_heat``.

* In simplifying polygons in :mod:`build_shapes` default to no tolerance.

Expand Down
12 changes: 6 additions & 6 deletions scripts/_helpers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -644,12 +644,12 @@ def update_config_from_wildcards(config, w, inplace=True):
config["sector"]["H2_network"] = False

if "nowasteheat" in opts:
config["sector"]["use_waste_heat"]["fischer_tropsch"] = False
config["sector"]["use_waste_heat"]["methanolisation"] = False
config["sector"]["use_waste_heat"]["haber_bosch"] = False
config["sector"]["use_waste_heat"]["methanation"] = False
config["sector"]["use_waste_heat"]["fuel_cell"] = False
config["sector"]["use_waste_heat"]["electrolysis"] = False
config["sector"]["use_fischer_tropsch_waste_heat"] = False
config["sector"]["use_methanolisation_waste_heat"] = False
config["sector"]["use_haber_bosch_waste_heat"] = False
config["sector"]["use_methanation_waste_heat"] = False
config["sector"]["use_fuel_cell_waste_heat"] = False
config["sector"]["use_electrolysis_waste_heat"] = False

if "nodistrict" in opts:
config["sector"]["district_heating"]["progress"] = 0.0
Expand Down
33 changes: 12 additions & 21 deletions scripts/prepare_sector_network.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3342,32 +3342,26 @@ def add_waste_heat(n):

# TODO what is the 0.95 and should it be a config option?
if (
options["use_waste_heat"].get("fischer_tropsch", 1)
options["use_fischer_tropsch_waste_heat"]
and "Fischer-Tropsch" in link_carriers
):
n.links.loc[urban_central + " Fischer-Tropsch", "bus3"] = (
urban_central + " urban central heat"
)
n.links.loc[urban_central + " Fischer-Tropsch", "efficiency3"] = (
0.95 - n.links.loc[urban_central + " Fischer-Tropsch", "efficiency"]
) * options["use_waste_heat"].get("fischer_tropsch", 1)
) * options["use_fischer_tropsch_waste_heat"]

if (
options["use_waste_heat"].get("methanation", 1)
and "Sabatier" in link_carriers
):
if options["use_methanation_waste_heat"] and "Sabatier" in link_carriers:
n.links.loc[urban_central + " Sabatier", "bus3"] = (
urban_central + " urban central heat"
)
n.links.loc[urban_central + " Sabatier", "efficiency3"] = (
0.95 - n.links.loc[urban_central + " Sabatier", "efficiency"]
) * options["use_waste_heat"].get("methanation", 1)
) * options["use_methanation_waste_heat"]

# DEA quotes 15% of total input (11% of which are high-value heat)
if (
options["use_waste_heat"].get("haber_bosch", 1)
and "Haber-Bosch" in link_carriers
):
if options["use_haber_bosch_waste_heat"] and "Haber-Bosch" in link_carriers:
n.links.loc[urban_central + " Haber-Bosch", "bus3"] = (
urban_central + " urban central heat"
)
Expand All @@ -3381,10 +3375,10 @@ def add_waste_heat(n):
)
n.links.loc[urban_central + " Haber-Bosch", "efficiency3"] = (
0.15 * total_energy_input / electricity_input
) * options["use_waste_heat"].get("haber_bosch", 1)
) * options["use_haber_bosch_waste_heat"]

if (
options["use_waste_heat"].get("methanolisation", 1)
options["use_methanolisation_waste_heat"]
and "methanolisation" in link_carriers
):
n.links.loc[urban_central + " methanolisation", "bus4"] = (
Expand All @@ -3393,30 +3387,27 @@ def add_waste_heat(n):
n.links.loc[urban_central + " methanolisation", "efficiency4"] = (
costs.at["methanolisation", "heat-output"]
/ costs.at["methanolisation", "hydrogen-input"]
) * options["use_waste_heat"].get("methanolisation", 1)
) * options["use_methanolisation_waste_heat"]

# TODO integrate usable waste heat efficiency into technology-data from DEA
if (
options["use_waste_heat"].get("electrolysis", 1)
options["use_electrolysis_waste_heat"]
and "H2 Electrolysis" in link_carriers
):
n.links.loc[urban_central + " H2 Electrolysis", "bus2"] = (
urban_central + " urban central heat"
)
n.links.loc[urban_central + " H2 Electrolysis", "efficiency2"] = (
0.84 - n.links.loc[urban_central + " H2 Electrolysis", "efficiency"]
) * options["use_waste_heat"].get("electrolysis", 1)
) * options["use_electrolysis_waste_heat"]

if (
options["use_waste_heat"].get("fuel_cell", 1)
and "H2 Fuel Cell" in link_carriers
):
if options["use_fuel_cell_waste_heat"] and "H2 Fuel Cell" in link_carriers:
n.links.loc[urban_central + " H2 Fuel Cell", "bus2"] = (
urban_central + " urban central heat"
)
n.links.loc[urban_central + " H2 Fuel Cell", "efficiency2"] = (
0.95 - n.links.loc[urban_central + " H2 Fuel Cell", "efficiency"]
) * options["use_waste_heat"].get("fuel_cell", 1)
) * options["use_fuel_cell_waste_heat"]


def add_agriculture(n, costs):
Expand Down
Loading