Merge pull request #836 from PyPSA/remove-helmeth
remove helmeth option
This commit is contained in:
commit
6242675c27
@ -447,7 +447,6 @@ sector:
|
|||||||
solar_cf_correction: 0.788457 # = >>> 1/1.2683
|
solar_cf_correction: 0.788457 # = >>> 1/1.2683
|
||||||
marginal_cost_storage: 0. #1e-4
|
marginal_cost_storage: 0. #1e-4
|
||||||
methanation: true
|
methanation: true
|
||||||
helmeth: false
|
|
||||||
coal_cc: false
|
coal_cc: false
|
||||||
dac: true
|
dac: true
|
||||||
co2_vent: false
|
co2_vent: false
|
||||||
@ -951,7 +950,6 @@ plotting:
|
|||||||
Sabatier: '#9850ad'
|
Sabatier: '#9850ad'
|
||||||
methanation: '#c44ce6'
|
methanation: '#c44ce6'
|
||||||
methane: '#c44ce6'
|
methane: '#c44ce6'
|
||||||
helmeth: '#e899ff'
|
|
||||||
# synfuels
|
# synfuels
|
||||||
Fischer-Tropsch: '#25c49a'
|
Fischer-Tropsch: '#25c49a'
|
||||||
liquid: '#25c49a'
|
liquid: '#25c49a'
|
||||||
|
@ -71,7 +71,6 @@ solar_thermal,--,"{true, false}",Add option for using solar thermal to generate
|
|||||||
solar_cf_correction,--,float,The correction factor for the value provided by the solar thermal profile calculations
|
solar_cf_correction,--,float,The correction factor for the value provided by the solar thermal profile calculations
|
||||||
marginal_cost_storage,currency/MWh ,float,The marginal cost of discharging batteries in distributed grids
|
marginal_cost_storage,currency/MWh ,float,The marginal cost of discharging batteries in distributed grids
|
||||||
methanation,--,"{true, false}",Add option for transforming hydrogen and CO2 into methane using methanation.
|
methanation,--,"{true, false}",Add option for transforming hydrogen and CO2 into methane using methanation.
|
||||||
helmeth,--,"{true, false}",Add option for transforming power into gas using HELMETH (Integrated High-Temperature ELectrolysis and METHanation for Effective Power to Gas Conversion)
|
|
||||||
coal_cc,--,"{true, false}",Add option for coal CHPs with carbon capture
|
coal_cc,--,"{true, false}",Add option for coal CHPs with carbon capture
|
||||||
dac,--,"{true, false}",Add option for Direct Air Capture (DAC)
|
dac,--,"{true, false}",Add option for Direct Air Capture (DAC)
|
||||||
co2_vent,--,"{true, false}",Add option for vent out CO2 from storages to the atmosphere.
|
co2_vent,--,"{true, false}",Add option for vent out CO2 from storages to the atmosphere.
|
||||||
|
|
@ -79,6 +79,8 @@ Upcoming Release
|
|||||||
Energy Monitor's `Europe Gas Tracker
|
Energy Monitor's `Europe Gas Tracker
|
||||||
<https://globalenergymonitor.org/projects/europe-gas-tracker>`_.
|
<https://globalenergymonitor.org/projects/europe-gas-tracker>`_.
|
||||||
|
|
||||||
|
* Remove HELMETH option.
|
||||||
|
|
||||||
**Bugs and Compatibility**
|
**Bugs and Compatibility**
|
||||||
|
|
||||||
* A bug preventing custom powerplants specified in ``data/custom_powerplants.csv`` was fixed. (https://github.com/PyPSA/pypsa-eur/pull/732)
|
* A bug preventing custom powerplants specified in ``data/custom_powerplants.csv`` was fixed. (https://github.com/PyPSA/pypsa-eur/pull/732)
|
||||||
|
@ -31,7 +31,7 @@ def rename_techs_tyndp(tech):
|
|||||||
tech = rename_techs(tech)
|
tech = rename_techs(tech)
|
||||||
if "heat pump" in tech or "resistive heater" in tech:
|
if "heat pump" in tech or "resistive heater" in tech:
|
||||||
return "power-to-heat"
|
return "power-to-heat"
|
||||||
elif tech in ["H2 Electrolysis", "methanation", "helmeth", "H2 liquefaction"]:
|
elif tech in ["H2 Electrolysis", "methanation", "H2 liquefaction"]:
|
||||||
return "power-to-gas"
|
return "power-to-gas"
|
||||||
elif tech == "H2":
|
elif tech == "H2":
|
||||||
return "H2 storage"
|
return "H2 storage"
|
||||||
@ -495,7 +495,7 @@ def plot_ch4_map(network):
|
|||||||
# make a fake MultiIndex so that area is correct for legend
|
# make a fake MultiIndex so that area is correct for legend
|
||||||
fossil_gas.index = pd.MultiIndex.from_product([fossil_gas.index, ["fossil gas"]])
|
fossil_gas.index = pd.MultiIndex.from_product([fossil_gas.index, ["fossil gas"]])
|
||||||
|
|
||||||
methanation_i = n.links[n.links.carrier.isin(["helmeth", "Sabatier"])].index
|
methanation_i = n.links.query("carrier == 'Sabatier'").index
|
||||||
methanation = (
|
methanation = (
|
||||||
abs(
|
abs(
|
||||||
n.links_t.p1.loc[:, methanation_i].mul(
|
n.links_t.p1.loc[:, methanation_i].mul(
|
||||||
|
@ -121,7 +121,6 @@ preferred_order = pd.Index(
|
|||||||
"gas boiler",
|
"gas boiler",
|
||||||
"gas",
|
"gas",
|
||||||
"natural gas",
|
"natural gas",
|
||||||
"helmeth",
|
|
||||||
"methanation",
|
"methanation",
|
||||||
"ammonia",
|
"ammonia",
|
||||||
"hydrogen storage",
|
"hydrogen storage",
|
||||||
|
@ -1369,23 +1369,6 @@ def add_storage_and_grids(n, costs):
|
|||||||
lifetime=costs.at["methanation", "lifetime"],
|
lifetime=costs.at["methanation", "lifetime"],
|
||||||
)
|
)
|
||||||
|
|
||||||
if options["helmeth"]:
|
|
||||||
n.madd(
|
|
||||||
"Link",
|
|
||||||
spatial.nodes,
|
|
||||||
suffix=" helmeth",
|
|
||||||
bus0=nodes,
|
|
||||||
bus1=spatial.gas.nodes,
|
|
||||||
bus2=spatial.co2.nodes,
|
|
||||||
carrier="helmeth",
|
|
||||||
p_nom_extendable=True,
|
|
||||||
efficiency=costs.at["helmeth", "efficiency"],
|
|
||||||
efficiency2=-costs.at["helmeth", "efficiency"]
|
|
||||||
* costs.at["gas", "CO2 intensity"],
|
|
||||||
capital_cost=costs.at["helmeth", "fixed"],
|
|
||||||
lifetime=costs.at["helmeth", "lifetime"],
|
|
||||||
)
|
|
||||||
|
|
||||||
if options.get("coal_cc"):
|
if options.get("coal_cc"):
|
||||||
n.madd(
|
n.madd(
|
||||||
"Link",
|
"Link",
|
||||||
|
Loading…
Reference in New Issue
Block a user