Merge branch 'master' into multiyear
This commit is contained in:
commit
4bc6a3af4d
@ -477,6 +477,8 @@ sector:
|
|||||||
dac: true
|
dac: true
|
||||||
co2_vent: false
|
co2_vent: false
|
||||||
allam_cycle: false
|
allam_cycle: false
|
||||||
|
hydrogen_fuel_cell: true
|
||||||
|
hydrogen_turbine: false
|
||||||
SMR: true
|
SMR: true
|
||||||
regional_co2_sequestration_potential:
|
regional_co2_sequestration_potential:
|
||||||
enable: false # enable regionally resolved geological co2 storage potential
|
enable: false # enable regionally resolved geological co2 storage potential
|
||||||
@ -925,6 +927,7 @@ plotting:
|
|||||||
H2 pipeline: '#f081dc'
|
H2 pipeline: '#f081dc'
|
||||||
H2 pipeline retrofitted: '#ba99b5'
|
H2 pipeline retrofitted: '#ba99b5'
|
||||||
H2 Fuel Cell: '#c251ae'
|
H2 Fuel Cell: '#c251ae'
|
||||||
|
H2 turbine: '#991f83'
|
||||||
H2 Electrolysis: '#ff29d9'
|
H2 Electrolysis: '#ff29d9'
|
||||||
# ammonia
|
# ammonia
|
||||||
NH3: '#46caf0'
|
NH3: '#46caf0'
|
||||||
|
@ -19,6 +19,10 @@ Upcoming Release
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
* Add plain hydrogen turbine as additional re-electrification option besides
|
||||||
|
hydrogen fuel cell. Add switches for both re-electrification options under
|
||||||
|
``sector: hydrogen_turbine:`` and ``sector: hydrogen_fuel_cell:``.
|
||||||
|
|
||||||
PyPSA-Eur 0.8.0 (18th March 2023)
|
PyPSA-Eur 0.8.0 (18th March 2023)
|
||||||
=================================
|
=================================
|
||||||
|
|
||||||
|
@ -1071,6 +1071,9 @@ def add_storage_and_grids(n, costs):
|
|||||||
lifetime=costs.at["electrolysis", "lifetime"],
|
lifetime=costs.at["electrolysis", "lifetime"],
|
||||||
)
|
)
|
||||||
|
|
||||||
|
if options["hydrogen_fuel_cell"]:
|
||||||
|
logger.info("Adding hydrogen fuel cell for re-electrification.")
|
||||||
|
|
||||||
n.madd(
|
n.madd(
|
||||||
"Link",
|
"Link",
|
||||||
nodes + " H2 Fuel Cell",
|
nodes + " H2 Fuel Cell",
|
||||||
@ -1084,6 +1087,25 @@ def add_storage_and_grids(n, costs):
|
|||||||
lifetime=costs.at["fuel cell", "lifetime"],
|
lifetime=costs.at["fuel cell", "lifetime"],
|
||||||
)
|
)
|
||||||
|
|
||||||
|
if options["hydrogen_turbine"]:
|
||||||
|
logger.info(
|
||||||
|
"Adding hydrogen turbine for re-electrification. Assuming OCGT technology costs."
|
||||||
|
)
|
||||||
|
# TODO: perhaps replace with hydrogen-specific technology assumptions.
|
||||||
|
|
||||||
|
n.madd(
|
||||||
|
"Link",
|
||||||
|
nodes + " H2 turbine",
|
||||||
|
bus0=nodes + " H2",
|
||||||
|
bus1=nodes,
|
||||||
|
p_nom_extendable=True,
|
||||||
|
carrier="H2 turbine",
|
||||||
|
efficiency=costs.at["OCGT", "efficiency"],
|
||||||
|
capital_cost=costs.at["OCGT", "fixed"]
|
||||||
|
* costs.at["OCGT", "efficiency"], # NB: fixed cost is per MWel
|
||||||
|
lifetime=costs.at["OCGT", "lifetime"],
|
||||||
|
)
|
||||||
|
|
||||||
cavern_types = snakemake.config["sector"]["hydrogen_underground_storage_locations"]
|
cavern_types = snakemake.config["sector"]["hydrogen_underground_storage_locations"]
|
||||||
h2_caverns = pd.read_csv(snakemake.input.h2_cavern, index_col=0)
|
h2_caverns = pd.read_csv(snakemake.input.h2_cavern, index_col=0)
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user