From 7f0c978e88a3ddb9a704ebfcd6ee9153aa5f3bc2 Mon Sep 17 00:00:00 2001 From: Thomas Gilon Date: Tue, 26 Nov 2024 16:20:06 +0100 Subject: [PATCH] Align the naming convention for the CO2 network configuration --- config/config.default.yaml | 2 +- doc/configtables/sector.csv | 2 +- doc/release_notes.rst | 2 ++ scripts/prepare_sector_network.py | 6 +++--- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/config/config.default.yaml b/config/config.default.yaml index 2ee23ef9b..c4335ec5e 100644 --- a/config/config.default.yaml +++ b/config/config.default.yaml @@ -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 diff --git a/doc/configtables/sector.csv b/doc/configtables/sector.csv index ba87e2d7d..13246b27f 100644 --- a/doc/configtables/sector.csv +++ b/doc/configtables/sector.csv @@ -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 diff --git a/doc/release_notes.rst b/doc/release_notes.rst index c62580266..daefe6854 100644 --- a/doc/release_notes.rst +++ b/doc/release_notes.rst @@ -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) ====================================== diff --git a/scripts/prepare_sector_network.py b/scripts/prepare_sector_network.py index b9d7e842a..b747e30ba 100755 --- a/scripts/prepare_sector_network.py +++ b/scripts/prepare_sector_network.py @@ -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"] @@ -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" @@ -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"]: