Add other waste heat technologies, and adjust share
This commit is contained in:
parent
e932466b05
commit
f19279e7e0
@ -571,12 +571,13 @@ sector:
|
|||||||
min_part_load_fischer_tropsch: 0.5
|
min_part_load_fischer_tropsch: 0.5
|
||||||
min_part_load_methanolisation: 0.3
|
min_part_load_methanolisation: 0.3
|
||||||
min_part_load_methanation: 0.3
|
min_part_load_methanation: 0.3
|
||||||
use_fischer_tropsch_waste_heat: 0.2
|
use_waste_heat:
|
||||||
use_haber_bosch_waste_heat: true
|
fischer_tropsch: 0.25
|
||||||
use_methanolisation_waste_heat: true
|
haber_bosch: 0.25
|
||||||
use_methanation_waste_heat: true
|
methanolisation: 0.25
|
||||||
use_fuel_cell_waste_heat: true
|
methanation: 0.25
|
||||||
use_electrolysis_waste_heat: 0.2
|
fuel_cell: 0.25
|
||||||
|
electrolysis: 0.25
|
||||||
electricity_transmission_grid: true
|
electricity_transmission_grid: true
|
||||||
electricity_distribution_grid: true
|
electricity_distribution_grid: true
|
||||||
electricity_distribution_grid_cost_factor: 1.0
|
electricity_distribution_grid_cost_factor: 1.0
|
||||||
|
@ -3342,7 +3342,7 @@ def add_waste_heat(n):
|
|||||||
|
|
||||||
# TODO what is the 0.95 and should it be a config option?
|
# TODO what is the 0.95 and should it be a config option?
|
||||||
if (
|
if (
|
||||||
options["use_fischer_tropsch_waste_heat"]
|
options["use_waste_heat"].get("fischer_tropsch", 1)
|
||||||
and "Fischer-Tropsch" in link_carriers
|
and "Fischer-Tropsch" in link_carriers
|
||||||
):
|
):
|
||||||
n.links.loc[urban_central + " Fischer-Tropsch", "bus3"] = (
|
n.links.loc[urban_central + " Fischer-Tropsch", "bus3"] = (
|
||||||
@ -3350,18 +3350,18 @@ def add_waste_heat(n):
|
|||||||
)
|
)
|
||||||
n.links.loc[urban_central + " Fischer-Tropsch", "efficiency3"] = (
|
n.links.loc[urban_central + " Fischer-Tropsch", "efficiency3"] = (
|
||||||
0.95 - n.links.loc[urban_central + " Fischer-Tropsch", "efficiency"]
|
0.95 - n.links.loc[urban_central + " Fischer-Tropsch", "efficiency"]
|
||||||
) * options["use_fischer_tropsch_waste_heat"]
|
) * options["use_waste_heat"].get("fischer_tropsch", 1)
|
||||||
|
|
||||||
if options["use_methanation_waste_heat"] and "Sabatier" in link_carriers:
|
if options["use_waste_heat"].get("methanation", 1) and "Sabatier" in link_carriers:
|
||||||
n.links.loc[urban_central + " Sabatier", "bus3"] = (
|
n.links.loc[urban_central + " Sabatier", "bus3"] = (
|
||||||
urban_central + " urban central heat"
|
urban_central + " urban central heat"
|
||||||
)
|
)
|
||||||
n.links.loc[urban_central + " Sabatier", "efficiency3"] = (
|
n.links.loc[urban_central + " Sabatier", "efficiency3"] = (
|
||||||
0.95 - n.links.loc[urban_central + " Sabatier", "efficiency"]
|
0.95 - n.links.loc[urban_central + " Sabatier", "efficiency"]
|
||||||
)
|
)* options["use_waste_heat"].get("methanation", 1)
|
||||||
|
|
||||||
# DEA quotes 15% of total input (11% of which are high-value heat)
|
# DEA quotes 15% of total input (11% of which are high-value heat)
|
||||||
if options["use_haber_bosch_waste_heat"] and "Haber-Bosch" in link_carriers:
|
if options["use_waste_heat"].get("haber_bosch", 1) and "Haber-Bosch" in link_carriers:
|
||||||
n.links.loc[urban_central + " Haber-Bosch", "bus3"] = (
|
n.links.loc[urban_central + " Haber-Bosch", "bus3"] = (
|
||||||
urban_central + " urban central heat"
|
urban_central + " urban central heat"
|
||||||
)
|
)
|
||||||
@ -3375,10 +3375,10 @@ def add_waste_heat(n):
|
|||||||
)
|
)
|
||||||
n.links.loc[urban_central + " Haber-Bosch", "efficiency3"] = (
|
n.links.loc[urban_central + " Haber-Bosch", "efficiency3"] = (
|
||||||
0.15 * total_energy_input / electricity_input
|
0.15 * total_energy_input / electricity_input
|
||||||
)
|
)* options["use_waste_heat"].get("haber_bosch", 1)
|
||||||
|
|
||||||
if (
|
if (
|
||||||
options["use_methanolisation_waste_heat"]
|
options["use_waste_heat"].get("methanolisation", 1)
|
||||||
and "methanolisation" in link_carriers
|
and "methanolisation" in link_carriers
|
||||||
):
|
):
|
||||||
n.links.loc[urban_central + " methanolisation", "bus4"] = (
|
n.links.loc[urban_central + " methanolisation", "bus4"] = (
|
||||||
@ -3387,11 +3387,11 @@ def add_waste_heat(n):
|
|||||||
n.links.loc[urban_central + " methanolisation", "efficiency4"] = (
|
n.links.loc[urban_central + " methanolisation", "efficiency4"] = (
|
||||||
costs.at["methanolisation", "heat-output"]
|
costs.at["methanolisation", "heat-output"]
|
||||||
/ costs.at["methanolisation", "hydrogen-input"]
|
/ costs.at["methanolisation", "hydrogen-input"]
|
||||||
)
|
)* options["use_waste_heat"].get("methanolisation", 1)
|
||||||
|
|
||||||
# TODO integrate usable waste heat efficiency into technology-data from DEA
|
# TODO integrate usable waste heat efficiency into technology-data from DEA
|
||||||
if (
|
if (
|
||||||
options.get("use_electrolysis_waste_heat", False)
|
options["use_waste_heat"].get("electrolysis", 1)
|
||||||
and "H2 Electrolysis" in link_carriers
|
and "H2 Electrolysis" in link_carriers
|
||||||
):
|
):
|
||||||
n.links.loc[urban_central + " H2 Electrolysis", "bus2"] = (
|
n.links.loc[urban_central + " H2 Electrolysis", "bus2"] = (
|
||||||
@ -3399,15 +3399,15 @@ def add_waste_heat(n):
|
|||||||
)
|
)
|
||||||
n.links.loc[urban_central + " H2 Electrolysis", "efficiency2"] = (
|
n.links.loc[urban_central + " H2 Electrolysis", "efficiency2"] = (
|
||||||
0.84 - n.links.loc[urban_central + " H2 Electrolysis", "efficiency"]
|
0.84 - n.links.loc[urban_central + " H2 Electrolysis", "efficiency"]
|
||||||
) * options["use_electrolysis_waste_heat"]
|
) * options["use_waste_heat"].get("electrolysis", 1)
|
||||||
|
|
||||||
if options["use_fuel_cell_waste_heat"] and "H2 Fuel Cell" in link_carriers:
|
if options["use_waste_heat"].get("fuel_cell", 1) and "H2 Fuel Cell" in link_carriers:
|
||||||
n.links.loc[urban_central + " H2 Fuel Cell", "bus2"] = (
|
n.links.loc[urban_central + " H2 Fuel Cell", "bus2"] = (
|
||||||
urban_central + " urban central heat"
|
urban_central + " urban central heat"
|
||||||
)
|
)
|
||||||
n.links.loc[urban_central + " H2 Fuel Cell", "efficiency2"] = (
|
n.links.loc[urban_central + " H2 Fuel Cell", "efficiency2"] = (
|
||||||
0.95 - n.links.loc[urban_central + " H2 Fuel Cell", "efficiency"]
|
0.95 - n.links.loc[urban_central + " H2 Fuel Cell", "efficiency"]
|
||||||
)
|
)* options["use_waste_heat"].get("fuel_cell", 1)
|
||||||
|
|
||||||
|
|
||||||
def add_agriculture(n, costs):
|
def add_agriculture(n, costs):
|
||||||
|
Loading…
Reference in New Issue
Block a user