Skip to content

Commit

Permalink
Align the naming convention for the CO2 network configuration (#1437)
Browse files Browse the repository at this point in the history
  • Loading branch information
tgilon authored Nov 26, 2024
1 parent d61f2cd commit 728eacf
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 5 deletions.
2 changes: 1 addition & 1 deletion config/config.default.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -641,7 +641,7 @@ sector:
co2_sequestration_cost: 10
co2_sequestration_lifetime: 50
co2_spatial: false
co2network: false
co2_network: false
co2_network_cost_factor: 1
cc_fraction: 0.9
hydrogen_underground_storage: true
Expand Down
2 changes: 1 addition & 1 deletion doc/configtables/sector.csv
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ co2_sequestration_cost,currency/tCO2,float,The cost of sequestering a ton of CO2
co2_sequestration_lifetime,years,int,The lifetime of a CO2 sequestration site
co2_spatial,--,"{true, false}","Add option to spatially resolve carrier representing stored carbon dioxide. This allows for more detailed modelling of CCUTS, e.g. regarding the capturing of industrial process emissions, usage as feedstock for electrofuels, transport of carbon dioxide, and geological sequestration sites."
,,,
co2network,--,"{true, false}",Add option for planning a new carbon dioxide transmission network
co2_network,--,"{true, false}",Add option for planning a new carbon dioxide transmission network
co2_network_cost_factor,p.u.,float,The cost factor for the capital cost of the carbon dioxide transmission network
,,,
cc_fraction,--,float,The default fraction of CO2 captured with post-combustion capture
Expand Down
2 changes: 2 additions & 0 deletions doc/release_notes.rst
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,8 @@ Upcoming Release

* Bugfix: vehicle-to-grid dispatch capacity is now limited by the fraction of vehicles participating in demand-side-management, halving the dispatch capacity under the default demand-side management participation rate of 0.5.

* Bugfix: Align the naming convention for the CO2 network configuration (from `co2network` to `co2_network`). This may be a small breaking change.


PyPSA-Eur 0.13.0 (13th September 2024)
======================================
Expand Down
6 changes: 3 additions & 3 deletions scripts/prepare_sector_network.py
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ def define_spatial(nodes, options):
spatial.gas.biogas_to_gas_cc = nodes + " biogas to gas CC"
else:
spatial.gas.biogas_to_gas_cc = ["EU biogas to gas CC"]
if options.get("co2_spatial", options["co2network"]):
if options.get("co2_spatial", options["co2_network"]):
spatial.gas.industry_cc = nodes + " gas for industry CC"
else:
spatial.gas.industry_cc = ["gas for industry CC"]
Expand Down Expand Up @@ -3796,7 +3796,7 @@ def add_industry(n, costs):
unit="t_co2",
)

if options["co2_spatial"] or options["co2network"]:
if options["co2_spatial"] or options["co2_network"]:
p_set = (
-industrial_demand.loc[nodes, "process emission"].rename(
index=lambda x: x + " process emissions"
Expand Down Expand Up @@ -4612,7 +4612,7 @@ def add_enhanced_geothermal(n, egs_potentials, egs_overlap, costs):
if not options["H2_network"]:
remove_h2_network(n)

if options["co2network"]:
if options["co2_network"]:
add_co2_network(n, costs)

if options["allam_cycle_gas"]:
Expand Down

0 comments on commit 728eacf

Please sign in to comment.