From c54b4f992023dfb7f28edc9cea7930a15a99044e Mon Sep 17 00:00:00 2001 From: Fabian Neumann Date: Tue, 12 Apr 2022 15:16:05 +0200 Subject: [PATCH 01/64] copy_config: copy actual snakemake.config --- scripts/copy_config.py | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/scripts/copy_config.py b/scripts/copy_config.py index ee1ca3f5..6eaf6e66 100644 --- a/scripts/copy_config.py +++ b/scripts/copy_config.py @@ -1,5 +1,6 @@ from shutil import copy +import yaml files = { "config.yaml": "config.yaml", @@ -14,5 +15,16 @@ if __name__ == '__main__': from helper import mock_snakemake snakemake = mock_snakemake('copy_config') + basepath = snakemake.config['summary_dir'] + '/' + snakemake.config['run'] + '/configs/' + for f, name in files.items(): - copy(f,snakemake.config['summary_dir'] + '/' + snakemake.config['run'] + '/configs/' + name) + copy(f, basepath + name) + + with open(basepath + 'config.snakemake.yaml', 'w') as yaml_file: + yaml.dump( + snakemake.config, + yaml_file, + default_flow_style=False, + allow_unicode=True, + sort_keys=False + ) \ No newline at end of file From ae28839cca3a1f83499a3798ed9a6ccb0a1853c6 Mon Sep 17 00:00:00 2001 From: Fabian Neumann Date: Tue, 12 Apr 2022 15:23:48 +0200 Subject: [PATCH 02/64] CI: include summary and plotting rules --- .github/workflows/ci.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 7d54bd18..f528c28d 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -104,6 +104,6 @@ jobs: conda activate pypsa-eur conda list cp test/config.overnight.yaml config.yaml - snakemake -call solve_all_networks + snakemake -call cp test/config.myopic.yaml config.yaml - snakemake -call solve_all_networks + snakemake -call From 2a3b576cbd9723880d39116b949fe5bcd02dc99d Mon Sep 17 00:00:00 2001 From: Ebbe Kyhl Date: Tue, 14 Jun 2022 15:00:53 +0200 Subject: [PATCH 03/64] Add coal with carbon capture --- config.default.yaml | 1 + scripts/prepare_sector_network.py | 17 +++++++++++++++++ 2 files changed, 18 insertions(+) diff --git a/config.default.yaml b/config.default.yaml index d48879c6..b56553ec 100644 --- a/config.default.yaml +++ b/config.default.yaml @@ -232,6 +232,7 @@ sector: marginal_cost_storage: 0. #1e-4 methanation: true helmeth: true + coal_cc: true dac: true co2_vent: true SMR: true diff --git a/scripts/prepare_sector_network.py b/scripts/prepare_sector_network.py index f0f60934..66be98de 100644 --- a/scripts/prepare_sector_network.py +++ b/scripts/prepare_sector_network.py @@ -1118,6 +1118,23 @@ def add_storage_and_grids(n, costs): lifetime=costs.at['helmeth', 'lifetime'] ) + if options['coal_cc']: + + for generator,carrier in [("coal CC","coal")]: + n.madd("Link", + nodes + " " + generator, + bus0=["EU " + carrier]*len(nodes), + bus1=nodes, + bus2="co2 atmosphere", + bus3="co2 stored", + marginal_cost=costs.at['coal','efficiency']*costs.at['coal','VOM'], #NB: VOM is per MWel + capital_cost=costs.at['coal','efficiency']*costs.at['coal','fixed']+ costs.at['biomass CHP capture','fixed']*costs.at[carrier,'CO2 intensity'], #NB: fixed cost is per MWel + p_nom_extendable=True, + carrier=generator, + efficiency=costs.at['coal','efficiency'], + efficiency2=costs.at[carrier,'CO2 intensity']*(1-costs.at['biomass CHP capture','capture_rate']), + efficiency3=costs.at[carrier,'CO2 intensity']*costs.at['biomass CHP capture','capture_rate'], + lifetime=costs.at['coal','lifetime']) if options['SMR']: From 5ae56cca7c056646a42cb16161ac56fcf3dce1b7 Mon Sep 17 00:00:00 2001 From: Ebbe Kyhl <69363603+ebbekyhl@users.noreply.github.com> Date: Mon, 27 Jun 2022 18:06:59 +0200 Subject: [PATCH 04/64] Apply suggestions from code review Co-authored-by: Fabian Neumann --- config.default.yaml | 2 +- scripts/prepare_sector_network.py | 33 ++++++++++++++++--------------- 2 files changed, 18 insertions(+), 17 deletions(-) diff --git a/config.default.yaml b/config.default.yaml index b56553ec..45e431ac 100644 --- a/config.default.yaml +++ b/config.default.yaml @@ -232,7 +232,7 @@ sector: marginal_cost_storage: 0. #1e-4 methanation: true helmeth: true - coal_cc: true + coal_cc: false dac: true co2_vent: true SMR: true diff --git a/scripts/prepare_sector_network.py b/scripts/prepare_sector_network.py index 66be98de..3e076886 100644 --- a/scripts/prepare_sector_network.py +++ b/scripts/prepare_sector_network.py @@ -1118,23 +1118,24 @@ def add_storage_and_grids(n, costs): lifetime=costs.at['helmeth', 'lifetime'] ) - if options['coal_cc']: + if options.get('coal_cc'): - for generator,carrier in [("coal CC","coal")]: - n.madd("Link", - nodes + " " + generator, - bus0=["EU " + carrier]*len(nodes), - bus1=nodes, - bus2="co2 atmosphere", - bus3="co2 stored", - marginal_cost=costs.at['coal','efficiency']*costs.at['coal','VOM'], #NB: VOM is per MWel - capital_cost=costs.at['coal','efficiency']*costs.at['coal','fixed']+ costs.at['biomass CHP capture','fixed']*costs.at[carrier,'CO2 intensity'], #NB: fixed cost is per MWel - p_nom_extendable=True, - carrier=generator, - efficiency=costs.at['coal','efficiency'], - efficiency2=costs.at[carrier,'CO2 intensity']*(1-costs.at['biomass CHP capture','capture_rate']), - efficiency3=costs.at[carrier,'CO2 intensity']*costs.at['biomass CHP capture','capture_rate'], - lifetime=costs.at['coal','lifetime']) +n.madd("Link", + spatial.nodes, + suffix=" coal CC", + bus0=spatial.coal.nodes, + bus1=spatial.nodes, + bus2="co2 atmosphere", + bus3="co2 stored", + marginal_cost=costs.at['coal', 'efficiency'] * costs.at['coal', 'VOM'], #NB: VOM is per MWel + capital_cost=costs.at['coal', 'efficiency'] * costs.at['coal', 'fixed'] + costs.at['biomass CHP capture', 'fixed'] * costs.at['coal', 'CO2 intensity'], #NB: fixed cost is per MWel + p_nom_extendable=True, + carrier="coal", + efficiency=costs.at['coal', 'efficiency'], + efficiency2=costs.at['coal', 'CO2 intensity'] * (1 - costs.at['biomass CHP capture','capture_rate']), + efficiency3=costs.at['coal', 'CO2 intensity'] * costs.at['biomass CHP capture','capture_rate'], + lifetime=costs.at['coal','lifetime'] +) if options['SMR']: From e9f2d65cda8332b8217115003340bd4450f83ab0 Mon Sep 17 00:00:00 2001 From: Ebbe Kyhl <69363603+ebbekyhl@users.noreply.github.com> Date: Tue, 28 Jun 2022 13:35:44 +0200 Subject: [PATCH 05/64] Indent by two layers --- scripts/prepare_sector_network.py | 32 +++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/scripts/prepare_sector_network.py b/scripts/prepare_sector_network.py index 3e076886..5f75b1db 100644 --- a/scripts/prepare_sector_network.py +++ b/scripts/prepare_sector_network.py @@ -1120,22 +1120,22 @@ def add_storage_and_grids(n, costs): if options.get('coal_cc'): -n.madd("Link", - spatial.nodes, - suffix=" coal CC", - bus0=spatial.coal.nodes, - bus1=spatial.nodes, - bus2="co2 atmosphere", - bus3="co2 stored", - marginal_cost=costs.at['coal', 'efficiency'] * costs.at['coal', 'VOM'], #NB: VOM is per MWel - capital_cost=costs.at['coal', 'efficiency'] * costs.at['coal', 'fixed'] + costs.at['biomass CHP capture', 'fixed'] * costs.at['coal', 'CO2 intensity'], #NB: fixed cost is per MWel - p_nom_extendable=True, - carrier="coal", - efficiency=costs.at['coal', 'efficiency'], - efficiency2=costs.at['coal', 'CO2 intensity'] * (1 - costs.at['biomass CHP capture','capture_rate']), - efficiency3=costs.at['coal', 'CO2 intensity'] * costs.at['biomass CHP capture','capture_rate'], - lifetime=costs.at['coal','lifetime'] -) + n.madd("Link", + spatial.nodes, + suffix=" coal CC", + bus0=spatial.coal.nodes, + bus1=spatial.nodes, + bus2="co2 atmosphere", + bus3="co2 stored", + marginal_cost=costs.at['coal', 'efficiency'] * costs.at['coal', 'VOM'], #NB: VOM is per MWel + capital_cost=costs.at['coal', 'efficiency'] * costs.at['coal', 'fixed'] + costs.at['biomass CHP capture', 'fixed'] * costs.at['coal', 'CO2 intensity'], #NB: fixed cost is per MWel + p_nom_extendable=True, + carrier="coal", + efficiency=costs.at['coal', 'efficiency'], + efficiency2=costs.at['coal', 'CO2 intensity'] * (1 - costs.at['biomass CHP capture','capture_rate']), + efficiency3=costs.at['coal', 'CO2 intensity'] * costs.at['biomass CHP capture','capture_rate'], + lifetime=costs.at['coal','lifetime'] + ) if options['SMR']: From 20e1fb40fbe6c7bf06daaed44313e59d26b4a4b3 Mon Sep 17 00:00:00 2001 From: Fabian Neumann Date: Tue, 28 Jun 2022 17:18:09 +0200 Subject: [PATCH 06/64] update mock_snakemake for new snakemake versions --- scripts/helper.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/helper.py b/scripts/helper.py index bd55a829..7144171c 100644 --- a/scripts/helper.py +++ b/scripts/helper.py @@ -58,6 +58,7 @@ def mock_snakemake(rulename, **wildcards): import os from pypsa.descriptors import Dict from snakemake.script import Snakemake + from packaging.version import Version, parse script_dir = Path(__file__).parent.resolve() assert Path.cwd().resolve() == script_dir, \ @@ -67,7 +68,8 @@ def mock_snakemake(rulename, **wildcards): if os.path.exists(p): snakefile = p break - workflow = sm.Workflow(snakefile, overwrite_configfiles=[]) + kwargs = dict(rerun_triggers=[]) if parse(sm.__version__) > Version("7.7.0") else {} + workflow = sm.Workflow(snakefile, overwrite_configfiles=[], **kwargs) workflow.include(snakefile) workflow.global_resources = {} rule = workflow.get_rule(rulename) From 7604bb1654917adab91539b4acc4aaeeeca9b754 Mon Sep 17 00:00:00 2001 From: Irieo Date: Tue, 28 Jun 2022 18:31:45 +0200 Subject: [PATCH 07/64] Document units of bus carriers --- scripts/prepare_sector_network.py | 59 +++++++++++++++++++++---------- 1 file changed, 40 insertions(+), 19 deletions(-) diff --git a/scripts/prepare_sector_network.py b/scripts/prepare_sector_network.py index 5f75b1db..6cfaa833 100644 --- a/scripts/prepare_sector_network.py +++ b/scripts/prepare_sector_network.py @@ -388,7 +388,8 @@ def add_carrier_buses(n, carrier, nodes=None): n.madd("Bus", nodes, location=location, - carrier=carrier + carrier=carrier, + unit='MWh_th' ) #capital cost could be corrected to e.g. 0.2 EUR/kWh * annuity and O&M @@ -439,6 +440,7 @@ def patch_electricity_network(n): update_wind_solar_costs(n, costs) n.loads["carrier"] = "electricity" n.buses["location"] = n.buses.index + n.buses["unit"] = "MWh_el" # remove trailing white space of load index until new PyPSA version after v0.18. n.loads.rename(lambda x: x.strip(), inplace=True) n.loads_t.p_set.rename(lambda x: x.strip(), axis=1, inplace=True) @@ -455,7 +457,8 @@ def add_co2_tracking(n, options): n.add("Bus", "co2 atmosphere", location="EU", - carrier="co2" + carrier="co2", + unit="t_co2" ) # can also be negative @@ -471,7 +474,8 @@ def add_co2_tracking(n, options): n.madd("Bus", spatial.co2.nodes, location=spatial.co2.locations, - carrier="co2 stored" + carrier="co2 stored", + unit="t_co2" ) n.madd("Store", @@ -703,7 +707,8 @@ def insert_electricity_distribution_grid(n, costs): n.madd("Bus", nodes + " low voltage", location=nodes, - carrier="low voltage" + carrier="low voltage", + unit="MWh_el" ) n.madd("Link", @@ -770,7 +775,8 @@ def insert_electricity_distribution_grid(n, costs): n.madd("Bus", nodes + " home battery", location=nodes, - carrier="home battery" + carrier="home battery", + unit="MWh_el" ) n.madd("Store", @@ -845,7 +851,8 @@ def add_storage_and_grids(n, costs): n.madd("Bus", nodes + " H2", location=nodes, - carrier="H2" + carrier="H2", + unit="MWh_LHV" ) n.madd("Link", @@ -1051,7 +1058,8 @@ def add_storage_and_grids(n, costs): n.madd("Bus", nodes + " battery", location=nodes, - carrier="battery" + carrier="battery", + unit="MWh_el" ) n.madd("Store", @@ -1199,7 +1207,8 @@ def add_land_transport(n, costs): nodes, location=nodes, suffix=" EV battery", - carrier="Li ion" + carrier="Li ion", + unit="MWh_el" ) p_set = electric_share * (transport[nodes] + cycling_shift(transport[nodes], 1) + cycling_shift(transport[nodes], 2)) / 3 @@ -1273,7 +1282,8 @@ def add_land_transport(n, costs): n.madd("Bus", spatial.oil.nodes, location=spatial.oil.locations, - carrier="oil" + carrier="oil", + unit="MWh_th" ) ice_efficiency = options['transport_internal_combustion_efficiency'] @@ -1381,7 +1391,8 @@ def add_heat(n, costs): n.madd("Bus", nodes[name] + f" {name} heat", location=nodes[name], - carrier=name + " heat" + carrier=name + " heat", + unit="MWh_th" ) ## Add heat load @@ -1438,7 +1449,8 @@ def add_heat(n, costs): n.madd("Bus", nodes[name] + f" {name} water tanks", location=nodes[name], - carrier=name + " water tanks" + carrier=name + " water tanks", + unit="MWh_th" ) n.madd("Link", @@ -1743,13 +1755,15 @@ def add_biomass(n, costs): n.madd("Bus", spatial.gas.biogas, location=spatial.gas.locations, - carrier="biogas" + carrier="biogas", + unit="MWh_th" ) n.madd("Bus", spatial.biomass.nodes, location=spatial.biomass.locations, - carrier="solid biomass" + carrier="solid biomass", + unit="MWh_th" ) n.madd("Store", @@ -1860,7 +1874,8 @@ def add_industry(n, costs): n.madd("Bus", spatial.biomass.industry, location=spatial.biomass.locations, - carrier="solid biomass for industry" + carrier="solid biomass for industry", + unit="MWh_th" ) if options["biomass_transport"]: @@ -1902,7 +1917,8 @@ def add_industry(n, costs): n.madd("Bus", spatial.gas.industry, location=spatial.gas.locations, - carrier="gas for industry") + carrier="gas for industry", + unit="MWh_LHV") gas_demand = industrial_demand.loc[nodes, "methane"] / 8760. @@ -1958,7 +1974,8 @@ def add_industry(n, costs): nodes, suffix=" H2 liquid", carrier="H2 liquid", - location=nodes + location=nodes, + unit="MWh_LHV" ) n.madd("Link", @@ -2016,7 +2033,8 @@ def add_industry(n, costs): n.madd("Bus", spatial.oil.nodes, location=spatial.oil.locations, - carrier="oil" + carrier="oil", + unit="MWh_th" ) if "oil" not in n.stores.carrier.unique(): @@ -2130,7 +2148,8 @@ def add_industry(n, costs): n.add("Bus", "process emissions", location="EU", - carrier="process emissions" + carrier="process emissions", + unit="t_co2" ) # this should be process emissions fossil+feedstock @@ -2314,7 +2333,7 @@ if __name__ == "__main__": simpl='', opts="", clusters="37", - lv=1.0, + lv=1.5, sector_opts='Co2L0-168H-T-H-B-I-solar3-dist1', planning_horizons="2020", ) @@ -2448,3 +2467,5 @@ if __name__ == "__main__": add_electricity_grid_connection(n, costs) n.export_to_netcdf(snakemake.output[0]) + +# %% From 187c9cbaa3e0ffb3f691b882f17aa1fcec852649 Mon Sep 17 00:00:00 2001 From: lisazeyen Date: Wed, 29 Jun 2022 08:49:29 +0200 Subject: [PATCH 08/64] add release notes --- doc/release_notes.rst | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/doc/release_notes.rst b/doc/release_notes.rst index 7808d2ba..f1fb12fe 100644 --- a/doc/release_notes.rst +++ b/doc/release_notes.rst @@ -24,7 +24,7 @@ incorporates retrofitting options to hydrogen. * New rule ``build_gas_input_locations`` compiles the LNG import capacities (including planned projects from gem.wiki), pipeline entry capacities and local production capacities for each region of the model. These are the - regions where fossil gas can eventually enter the model. + regions where fossil gas can eventually enter the model. * New rule ``cluster_gas_network`` that clusters the gas transmission network data to the model resolution. Cross-regional pipeline capacities are aggregated @@ -47,8 +47,8 @@ incorporates retrofitting options to hydrogen. H2_retrofit_capacity_per_CH4`` units are made available as hydrogen pipeline capacity in the corresponding corridor. These repurposed hydrogen pipelines have lower costs than new hydrogen pipelines. Both new and repurposed pipelines - can be built simultaneously. The retrofitting option ``sector: H2_retrofit:`` also works - with a copperplated methane infrastructure, i.e. when ``sector: gas_network: false``. + can be built simultaneously. The retrofitting option ``sector: H2_retrofit:`` also works + with a copperplated methane infrastructure, i.e. when ``sector: gas_network: false``. * New hydrogen pipelines can now be built where there are already power or gas transmission routes. Previously, only the electricity transmission routes were @@ -56,6 +56,8 @@ incorporates retrofitting options to hydrogen. **New features and functionality** +* Units are assigned to the buses. These only provide a better understanding. The specifications of the units are not taken into account in the optimisation, which means that no automatic conversion of units takes place. + * Option ``retrieve_sector_databundle`` to automatically retrieve and extract data bundle. * Add regionalised hydrogen salt cavern storage potentials from `Technical Potential of Salt Caverns for Hydrogen Storage in Europe `_. @@ -84,7 +86,7 @@ besides many performance improvements. This release is known to work with `PyPSA-Eur `_ Version 0.4.0, `Technology Data -`_ Version 0.3.0 and +`_ Version 0.3.0 and `PyPSA `_ Version 0.18.0. Please note that the data bundle has also been updated. @@ -202,19 +204,19 @@ Please note that the data bundle has also been updated. A function ``helper.override_component_attrs`` was added that loads this data and can pass the overridden component attributes into ``pypsa.Network()``. -* Add various parameters to ``config.default.yaml`` which were previously hardcoded inside the scripts +* Add various parameters to ``config.default.yaml`` which were previously hardcoded inside the scripts (e.g. energy reference years, BEV settings, solar thermal collector models, geomap colours). * Removed stale industry demand rules ``build_industrial_energy_demand_per_country`` and ``build_industrial_demand``. These are superseded with more regionally resolved rules. * Use simpler and shorter ``gdf.sjoin()`` function to allocate industrial sites - from the Hotmaps database to onshore regions. + from the Hotmaps database to onshore regions. This change also fixes a bug: The previous version allocated sites to the closest bus, but at country borders (where Voronoi cells are distorted by the borders), this had resulted in e.g. a Spanish site close to the French border - being wrongly allocated to the French bus if the bus center was closer. + being wrongly allocated to the French bus if the bus center was closer. * Retrofitting rule is now only triggered if endogeneously optimised. @@ -225,7 +227,7 @@ Please note that the data bundle has also been updated. * Improve legibility of ``config.default.yaml`` and remove unused options. * Use the country-specific time zone mappings from ``pytz`` rather than a manual mapping. - + * A function ``add_carrier_buses()`` was added to the ``prepare_network`` rule to reduce code duplication. * In the ``prepare_network`` rule the cost and potential adjustment was moved into an From b4d0a8404cdfe6fc5be5bcc9857a92e5e2463632 Mon Sep 17 00:00:00 2001 From: lisazeyen Date: Wed, 29 Jun 2022 08:57:08 +0200 Subject: [PATCH 09/64] change unit from carrier gas from MWh_th -> MWh_LHV --- scripts/prepare_sector_network.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/prepare_sector_network.py b/scripts/prepare_sector_network.py index 6cfaa833..7baffc83 100644 --- a/scripts/prepare_sector_network.py +++ b/scripts/prepare_sector_network.py @@ -385,11 +385,13 @@ def add_carrier_buses(n, carrier, nodes=None): n.add("Carrier", carrier) + unit="MWh_LHV" if carrier=="gas" else "MWH_th" + n.madd("Bus", nodes, location=location, carrier=carrier, - unit='MWh_th' + unit=unit ) #capital cost could be corrected to e.g. 0.2 EUR/kWh * annuity and O&M From b96207c73e900f235eb8df5db7f89928057a1034 Mon Sep 17 00:00:00 2001 From: Fabian Neumann Date: Thu, 30 Jun 2022 08:42:18 +0200 Subject: [PATCH 10/64] store config and wildcards in n.meta --- scripts/add_brownfield.py | 1 + scripts/add_existing_baseyear.py | 1 + scripts/matplotlibrc | 4 + scripts/plot_network.py.bak | 737 ++++++++++++++++++++++++++++++ scripts/prepare_sector_network.py | 1 + scripts/solve_network.py | 1 + 6 files changed, 745 insertions(+) create mode 100644 scripts/matplotlibrc create mode 100644 scripts/plot_network.py.bak diff --git a/scripts/add_brownfield.py b/scripts/add_brownfield.py index d7418a79..9f13da1f 100644 --- a/scripts/add_brownfield.py +++ b/scripts/add_brownfield.py @@ -137,4 +137,5 @@ if __name__ == "__main__": add_brownfield(n, n_p, year) + n.meta = dict(snakemake.config, **dict(wildcards=dict(snakemake.wildcards))) n.export_to_netcdf(snakemake.output[0]) diff --git a/scripts/add_existing_baseyear.py b/scripts/add_existing_baseyear.py index 7bb88a00..b4f9dc6e 100644 --- a/scripts/add_existing_baseyear.py +++ b/scripts/add_existing_baseyear.py @@ -493,4 +493,5 @@ if __name__ == "__main__": default_lifetime = snakemake.config['costs']['lifetime'] add_heating_capacities_installed_before_baseyear(n, baseyear, grouping_years, ashp_cop, gshp_cop, time_dep_hp_cop, costs, default_lifetime) + n.meta = dict(snakemake.config, **dict(wildcards=dict(snakemake.wildcards))) n.export_to_netcdf(snakemake.output[0]) diff --git a/scripts/matplotlibrc b/scripts/matplotlibrc new file mode 100644 index 00000000..db5e7ce8 --- /dev/null +++ b/scripts/matplotlibrc @@ -0,0 +1,4 @@ +backend: Agg +font.family: sans-serif +font.sans-serif: Ubuntu, DejaVu Sans +image.cmap: viridis \ No newline at end of file diff --git a/scripts/plot_network.py.bak b/scripts/plot_network.py.bak new file mode 100644 index 00000000..4a1bc6d0 --- /dev/null +++ b/scripts/plot_network.py.bak @@ -0,0 +1,737 @@ +import pypsa + +import numpy as np +import pandas as pd +import matplotlib.pyplot as plt +import cartopy.crs as ccrs + +from matplotlib.legend_handler import HandlerPatch +from matplotlib.patches import Circle, Ellipse + +from make_summary import assign_carriers +from plot_summary import rename_techs, preferred_order +from helper import override_component_attrs + +plt.style.use('ggplot') + + +def rename_techs_tyndp(tech): + tech = rename_techs(tech) + if "heat pump" in tech or "resistive heater" in tech: + return "power-to-heat" + elif tech in ["H2 Electrolysis", "methanation", "helmeth", "H2 liquefaction"]: + return "power-to-gas" + elif tech == "H2": + return "H2 storage" + elif tech in ["OCGT", "CHP", "gas boiler", "H2 Fuel Cell"]: + return "gas-to-power/heat" + elif "solar" in tech: + return "solar" + elif tech == "Fischer-Tropsch": + return "power-to-liquid" + elif "offshore wind" in tech: + return "offshore wind" + elif "CC" in tech or "sequestration" in tech: + return "CCS" + else: + return tech + + +def make_handler_map_to_scale_circles_as_in(ax, dont_resize_actively=False): + fig = ax.get_figure() + + def axes2pt(): + return np.diff(ax.transData.transform([(0, 0), (1, 1)]), axis=0)[0] * (72. / fig.dpi) + + ellipses = [] + if not dont_resize_actively: + def update_width_height(event): + dist = axes2pt() + for e, radius in ellipses: + e.width, e.height = 2. * radius * dist + fig.canvas.mpl_connect('resize_event', update_width_height) + ax.callbacks.connect('xlim_changed', update_width_height) + ax.callbacks.connect('ylim_changed', update_width_height) + + def legend_circle_handler(legend, orig_handle, xdescent, ydescent, + width, height, fontsize): + w, h = 2. * orig_handle.get_radius() * axes2pt() + e = Ellipse(xy=(0.5 * width - 0.5 * xdescent, 0.5 * + height - 0.5 * ydescent), width=w, height=w) + ellipses.append((e, orig_handle.get_radius())) + return e + return {Circle: HandlerPatch(patch_func=legend_circle_handler)} + + +def make_legend_circles_for(sizes, scale=1.0, **kw): + return [Circle((0, 0), radius=(s / scale)**0.5, **kw) for s in sizes] + + +def assign_location(n): + for c in n.iterate_components(n.one_port_components | n.branch_components): + ifind = pd.Series(c.df.index.str.find(" ", start=4), c.df.index) + for i in ifind.value_counts().index: + # these have already been assigned defaults + if i == -1: continue + names = ifind.index[ifind == i] + c.df.loc[names, 'location'] = names.str[:i] + + +def plot_map(network, components=["links", "stores", "storage_units", "generators"], + bus_size_factor=1.7e10, transmission=False): + + n = network.copy() + assign_location(n) + # Drop non-electric buses so they don't clutter the plot + n.buses.drop(n.buses.index[n.buses.carrier != "AC"], inplace=True) + + costs = pd.DataFrame(index=n.buses.index) + + for comp in components: + df_c = getattr(n, comp) + df_c["nice_group"] = df_c.carrier.map(rename_techs_tyndp) + + attr = "e_nom_opt" if comp == "stores" else "p_nom_opt" + + costs_c = ((df_c.capital_cost * df_c[attr]) + .groupby([df_c.location, df_c.nice_group]).sum() + .unstack().fillna(0.)) + costs = pd.concat([costs, costs_c], axis=1) + + print(comp, costs) + + costs = costs.groupby(costs.columns, axis=1).sum() + + costs.drop(list(costs.columns[(costs == 0.).all()]), axis=1, inplace=True) + + new_columns = (preferred_order.intersection(costs.columns) + .append(costs.columns.difference(preferred_order))) + costs = costs[new_columns] + + for item in new_columns: + if item not in snakemake.config['plotting']['tech_colors']: + print("Warning!",item,"not in config/plotting/tech_colors") + + costs = costs.stack() # .sort_index() + + # hack because impossible to drop buses... + eu_location = snakemake.config["plotting"].get("eu_node_location", dict(x=-5.5, y=46)) + n.buses.loc["EU gas", "x"] = eu_location["x"] + n.buses.loc["EU gas", "y"] = eu_location["y"] + + n.links.drop(n.links.index[(n.links.carrier != "DC") & ( + n.links.carrier != "B2B")], inplace=True) + + # drop non-bus + to_drop = costs.index.levels[0].symmetric_difference(n.buses.index) + if len(to_drop) != 0: + print("dropping non-buses", to_drop) + costs.drop(to_drop, level=0, inplace=True, axis=0, errors="ignore") + + # make sure they are removed from index + costs.index = pd.MultiIndex.from_tuples(costs.index.values) + + # PDF has minimum width, so set these to zero + line_lower_threshold = 500. + line_upper_threshold = 1e4 + linewidth_factor = 2e3 + ac_color = "gray" + dc_color = "m" + + if snakemake.wildcards["lv"] == "1.0": + # should be zero + line_widths = n.lines.s_nom_opt - n.lines.s_nom + link_widths = n.links.p_nom_opt - n.links.p_nom + title = "Transmission reinforcement" + + if transmission: + line_widths = n.lines.s_nom_opt + link_widths = n.links.p_nom_opt + linewidth_factor = 2e3 + line_lower_threshold = 0. + title = "Today's transmission" + else: + line_widths = n.lines.s_nom_opt - n.lines.s_nom_min + link_widths = n.links.p_nom_opt - n.links.p_nom_min + title = "Transmission reinforcement" + + if transmission: + line_widths = n.lines.s_nom_opt + link_widths = n.links.p_nom_opt + title = "Total transmission" + + line_widths[line_widths < line_lower_threshold] = 0. + link_widths[link_widths < line_lower_threshold] = 0. + + line_widths[line_widths > line_upper_threshold] = line_upper_threshold + link_widths[link_widths > line_upper_threshold] = line_upper_threshold + + fig, ax = plt.subplots(subplot_kw={"projection": ccrs.PlateCarree()}) + fig.set_size_inches(7, 6) + + n.plot( + bus_sizes=costs / bus_size_factor, + bus_colors=snakemake.config['plotting']['tech_colors'], + line_colors=ac_color, + link_colors=dc_color, + line_widths=line_widths / linewidth_factor, + link_widths=link_widths / linewidth_factor, + ax=ax, **map_opts + ) + + handles = make_legend_circles_for( + [5e9, 1e9], + scale=bus_size_factor, + facecolor="gray" + ) + + labels = ["{} bEUR/a".format(s) for s in (5, 1)] + + l2 = ax.legend( + handles, labels, + loc="upper left", + bbox_to_anchor=(0.01, 1.01), + labelspacing=1.0, + frameon=False, + title='System cost', + handler_map=make_handler_map_to_scale_circles_as_in(ax) + ) + + ax.add_artist(l2) + + handles = [] + labels = [] + + for s in (10, 5): + handles.append(plt.Line2D([0], [0], color=ac_color, + linewidth=s * 1e3 / linewidth_factor)) + labels.append("{} GW".format(s)) + + l1_1 = ax.legend( + handles, labels, + loc="upper left", + bbox_to_anchor=(0.22, 1.01), + frameon=False, + labelspacing=0.8, + handletextpad=1.5, + title=title + ) + + ax.add_artist(l1_1) + + fig.savefig( + snakemake.output.map, + transparent=True, + bbox_inches="tight" + ) + +def group_pipes(df, drop_direction=False): + """Group pipes which connect same buses and return overall capacity. + """ + if drop_direction: + positive_order = df.bus0 < df.bus1 + df_p = df[positive_order] + swap_buses = {"bus0": "bus1", "bus1": "bus0"} + df_n = df[~positive_order].rename(columns=swap_buses) + df = pd.concat([df_p, df_n]) + + # there are pipes for each investment period rename to AC buses name for plotting + df.index = df.apply( + lambda x: f"H2 pipeline {x.bus0.replace(' H2', '')} -> {x.bus1.replace(' H2', '')}", + axis=1 + ) + # group pipe lines connecting the same buses and rename them for plotting + pipe_capacity = df["p_nom_opt"].groupby(level=0).sum() + + return pipe_capacity + + +def plot_h2_map(network): + + n = network.copy() + if "H2 pipeline" not in n.links.carrier.unique(): + return + + assign_location(n) + + bus_size_factor = 1e5 + linewidth_factor = 1e4 + # MW below which not drawn + line_lower_threshold = 1e2 + + # Drop non-electric buses so they don't clutter the plot + n.buses.drop(n.buses.index[n.buses.carrier != "AC"], inplace=True) + + elec = n.links[n.links.carrier.isin(["H2 Electrolysis", "H2 Fuel Cell"])].index + + bus_sizes = n.links.loc[elec,"p_nom_opt"].groupby([n.links["bus0"], n.links.carrier]).sum() / bus_size_factor + + # make a fake MultiIndex so that area is correct for legend + bus_sizes.rename(index=lambda x: x.replace(" H2", ""), level=0, inplace=True) + # drop all links which are not H2 pipelines + n.links.drop(n.links.index[~n.links.carrier.str.contains("H2 pipeline")], inplace=True) + + h2_new = n.links.loc[n.links.carrier=="H2 pipeline"] + h2_retro = n.links.loc[n.links.carrier=='H2 pipeline retrofitted'] + # sum capacitiy for pipelines from different investment periods + h2_new = group_pipes(h2_new) + h2_retro = group_pipes(h2_retro, drop_direction=True).reindex(h2_new.index).fillna(0) + + + n.links.rename(index=lambda x: x.split("-2")[0], inplace=True) + n.links = n.links.groupby(level=0).first() + link_widths_total = (h2_new + h2_retro) / linewidth_factor + link_widths_total = link_widths_total.reindex(n.links.index).fillna(0.) + link_widths_total[n.links.p_nom_opt < line_lower_threshold] = 0. + + retro = n.links.p_nom_opt.where(n.links.carrier=='H2 pipeline retrofitted', other=0.) + link_widths_retro = retro / linewidth_factor + link_widths_retro[n.links.p_nom_opt < line_lower_threshold] = 0. + + n.links.bus0 = n.links.bus0.str.replace(" H2", "") + n.links.bus1 = n.links.bus1.str.replace(" H2", "") + + fig, ax = plt.subplots( + figsize=(7, 6), + subplot_kw={"projection": ccrs.PlateCarree()} + ) + + n.plot( + bus_sizes=bus_sizes, + bus_colors=snakemake.config['plotting']['tech_colors'], + link_colors='#a2f0f2', + link_widths=link_widths_total, + branch_components=["Link"], + ax=ax, + **map_opts + ) + + n.plot( + geomap=False, + bus_sizes=0, + link_colors='#72d3d6', + link_widths=link_widths_retro, + branch_components=["Link"], + ax=ax, + **map_opts + ) + + handles = make_legend_circles_for( + [50000, 10000], + scale=bus_size_factor, + facecolor='grey' + ) + + labels = ["{} GW".format(s) for s in (50, 10)] + + l2 = ax.legend( + handles, labels, + loc="upper left", + bbox_to_anchor=(-0.03, 1.01), + labelspacing=1.0, + frameon=False, + title='Electrolyzer capacity', + handler_map=make_handler_map_to_scale_circles_as_in(ax) + ) + + ax.add_artist(l2) + + handles = [] + labels = [] + + for s in (50, 10): + handles.append(plt.Line2D([0], [0], color="grey", + linewidth=s * 1e3 / linewidth_factor)) + labels.append("{} GW".format(s)) + + l1_1 = ax.legend( + handles, labels, + loc="upper left", + bbox_to_anchor=(0.28, 1.01), + frameon=False, + labelspacing=0.8, + handletextpad=1.5, + title='H2 pipeline capacity' + ) + + ax.add_artist(l1_1) + + fig.savefig( + snakemake.output.map.replace("-costs-all","-h2_network"), + bbox_inches="tight" + ) + + +def plot_ch4_map(network): + + n = network.copy() + + if "gas pipeline" not in n.links.carrier.unique(): + return + + assign_location(n) + + bus_size_factor = 8e7 + linewidth_factor = 1e4 + # MW below which not drawn + line_lower_threshold = 500 + + # Drop non-electric buses so they don't clutter the plot + n.buses.drop(n.buses.index[n.buses.carrier != "AC"], inplace=True) + + fossil_gas_i = n.generators[n.generators.carrier=="gas"].index + fossil_gas = n.generators_t.p.loc[:,fossil_gas_i].mul(n.snapshot_weightings.generators, axis=0).sum().groupby(n.generators.loc[fossil_gas_i,"bus"]).sum() / bus_size_factor + fossil_gas.rename(index=lambda x: x.replace(" gas", ""), inplace=True) + fossil_gas = fossil_gas.reindex(n.buses.index).fillna(0) + # make a fake MultiIndex so that area is correct for legend + fossil_gas.index = pd.MultiIndex.from_product([fossil_gas.index, ["fossil gas"]]) + + methanation_i = n.links[n.links.carrier.isin(["helmeth", "Sabatier"])].index + methanation = abs(n.links_t.p1.loc[:,methanation_i].mul(n.snapshot_weightings.generators, axis=0)).sum().groupby(n.links.loc[methanation_i,"bus1"]).sum() / bus_size_factor + methanation = methanation.groupby(methanation.index).sum().rename(index=lambda x: x.replace(" gas", "")) + # make a fake MultiIndex so that area is correct for legend + methanation.index = pd.MultiIndex.from_product([methanation.index, ["methanation"]]) + + biogas_i = n.stores[n.stores.carrier=="biogas"].index + biogas = n.stores_t.p.loc[:,biogas_i].mul(n.snapshot_weightings.generators, axis=0).sum().groupby(n.stores.loc[biogas_i,"bus"]).sum() / bus_size_factor + biogas = biogas.groupby(biogas.index).sum().rename(index=lambda x: x.replace(" biogas", "")) + # make a fake MultiIndex so that area is correct for legend + biogas.index = pd.MultiIndex.from_product([biogas.index, ["biogas"]]) + + bus_sizes = pd.concat([fossil_gas, methanation, biogas]) + bus_sizes.sort_index(inplace=True) + + to_remove = n.links.index[~n.links.carrier.str.contains("gas pipeline")] + n.links.drop(to_remove, inplace=True) + + link_widths_rem = n.links.p_nom_opt / linewidth_factor + link_widths_rem[n.links.p_nom_opt < line_lower_threshold] = 0. + + link_widths_orig = n.links.p_nom / linewidth_factor + link_widths_orig[n.links.p_nom < line_lower_threshold] = 0. + + max_usage = n.links_t.p0.abs().max(axis=0) + link_widths_used = max_usage / linewidth_factor + link_widths_used[max_usage < line_lower_threshold] = 0. + + link_color_used = n.links.carrier.map({"gas pipeline": "#f08080", + "gas pipeline new": "#c46868"}) + + n.links.bus0 = n.links.bus0.str.replace(" gas", "") + n.links.bus1 = n.links.bus1.str.replace(" gas", "") + + tech_colors = snakemake.config['plotting']['tech_colors'] + + bus_colors = { + "fossil gas": tech_colors["fossil gas"], + "methanation": tech_colors["methanation"], + "biogas": "seagreen" + } + + fig, ax = plt.subplots(figsize=(7,6), subplot_kw={"projection": ccrs.PlateCarree()}) + + n.plot( + bus_sizes=bus_sizes, + bus_colors=bus_colors, + link_colors='lightgrey', + link_widths=link_widths_orig, + branch_components=["Link"], + ax=ax, + **map_opts + ) + + n.plot( + geomap=False, + ax=ax, + bus_sizes=0., + link_colors='#e8d1d1', + link_widths=link_widths_rem, + branch_components=["Link"], + **map_opts + ) + + n.plot( + geomap=False, + ax=ax, + bus_sizes=0., + link_colors=link_color_used, + link_widths=link_widths_used, + branch_components=["Link"], + **map_opts + ) + + handles = make_legend_circles_for( + [10e6, 100e6], + scale=bus_size_factor, + facecolor='grey' + ) + labels = ["{} TWh".format(s) for s in (10, 100)] + + l2 = ax.legend( + handles, labels, + loc="upper left", + bbox_to_anchor=(-0.03, 1.01), + labelspacing=1.0, + frameon=False, + title='gas generation', + handler_map=make_handler_map_to_scale_circles_as_in(ax) + ) + + ax.add_artist(l2) + + handles = [] + labels = [] + + for s in (50, 10): + handles.append(plt.Line2D([0], [0], color="grey", linewidth=s * 1e3 / linewidth_factor)) + labels.append("{} GW".format(s)) + + l1_1 = ax.legend( + handles, labels, + loc="upper left", + bbox_to_anchor=(0.28, 1.01), + frameon=False, + labelspacing=0.8, + handletextpad=1.5, + title='gas pipeline used capacity' + ) + + ax.add_artist(l1_1) + + fig.savefig( + snakemake.output.map.replace("-costs-all","-ch4_network"), + bbox_inches="tight" + ) + + +def plot_map_without(network): + + n = network.copy() + assign_location(n) + + # Drop non-electric buses so they don't clutter the plot + n.buses.drop(n.buses.index[n.buses.carrier != "AC"], inplace=True) + + fig, ax = plt.subplots( + figsize=(7, 6), + subplot_kw={"projection": ccrs.PlateCarree()} + ) + + # PDF has minimum width, so set these to zero + line_lower_threshold = 200. + line_upper_threshold = 1e4 + linewidth_factor = 2e3 + ac_color = "gray" + dc_color = "m" + + # hack because impossible to drop buses... + if "EU gas" in n.buses.index: + eu_location = snakemake.config["plotting"].get("eu_node_location", dict(x=-5.5, y=46)) + n.buses.loc["EU gas", "x"] = eu_location["x"] + n.buses.loc["EU gas", "y"] = eu_location["y"] + + to_drop = n.links.index[(n.links.carrier != "DC") & (n.links.carrier != "B2B")] + n.links.drop(to_drop, inplace=True) + + if snakemake.wildcards["lv"] == "1.0": + line_widths = n.lines.s_nom + link_widths = n.links.p_nom + else: + line_widths = n.lines.s_nom_min + link_widths = n.links.p_nom_min + + line_widths[line_widths < line_lower_threshold] = 0. + link_widths[link_widths < line_lower_threshold] = 0. + + line_widths[line_widths > line_upper_threshold] = line_upper_threshold + link_widths[link_widths > line_upper_threshold] = line_upper_threshold + + n.plot( + bus_colors="k", + line_colors=ac_color, + link_colors=dc_color, + line_widths=line_widths / linewidth_factor, + link_widths=link_widths / linewidth_factor, + ax=ax, **map_opts + ) + + handles = [] + labels = [] + + for s in (10, 5): + handles.append(plt.Line2D([0], [0], color=ac_color, + linewidth=s * 1e3 / linewidth_factor)) + labels.append("{} GW".format(s)) + l1_1 = ax.legend(handles, labels, + loc="upper left", bbox_to_anchor=(0.05, 1.01), + frameon=False, + labelspacing=0.8, handletextpad=1.5, + title='Today\'s transmission') + ax.add_artist(l1_1) + + fig.savefig( + snakemake.output.today, + transparent=True, + bbox_inches="tight" + ) + + +def plot_series(network, carrier="AC", name="test"): + + n = network.copy() + assign_location(n) + assign_carriers(n) + + buses = n.buses.index[n.buses.carrier.str.contains(carrier)] + + supply = pd.DataFrame(index=n.snapshots) + for c in n.iterate_components(n.branch_components): + n_port = 4 if c.name=='Link' else 2 + for i in range(n_port): + supply = pd.concat((supply, + (-1) * c.pnl["p" + str(i)].loc[:, + c.df.index[c.df["bus" + str(i)].isin(buses)]].groupby(c.df.carrier, + axis=1).sum()), + axis=1) + + for c in n.iterate_components(n.one_port_components): + comps = c.df.index[c.df.bus.isin(buses)] + supply = pd.concat((supply, ((c.pnl["p"].loc[:, comps]).multiply( + c.df.loc[comps, "sign"])).groupby(c.df.carrier, axis=1).sum()), axis=1) + + supply = supply.groupby(rename_techs_tyndp, axis=1).sum() + + both = supply.columns[(supply < 0.).any() & (supply > 0.).any()] + + positive_supply = supply[both] + negative_supply = supply[both] + + positive_supply[positive_supply < 0.] = 0. + negative_supply[negative_supply > 0.] = 0. + + supply[both] = positive_supply + + suffix = " charging" + + negative_supply.columns = negative_supply.columns + suffix + + supply = pd.concat((supply, negative_supply), axis=1) + + # 14-21.2 for flaute + # 19-26.1 for flaute + + start = "2013-02-19" + stop = "2013-02-26" + + threshold = 10e3 + + to_drop = supply.columns[(abs(supply) < threshold).all()] + + if len(to_drop) != 0: + print("dropping", to_drop) + supply.drop(columns=to_drop, inplace=True) + + supply.index.name = None + + supply = supply / 1e3 + + supply.rename(columns={"electricity": "electric demand", + "heat": "heat demand"}, + inplace=True) + supply.columns = supply.columns.str.replace("residential ", "") + supply.columns = supply.columns.str.replace("services ", "") + supply.columns = supply.columns.str.replace("urban decentral ", "decentral ") + + preferred_order = pd.Index(["electric demand", + "transmission lines", + "hydroelectricity", + "hydro reservoir", + "run of river", + "pumped hydro storage", + "CHP", + "onshore wind", + "offshore wind", + "solar PV", + "solar thermal", + "building retrofitting", + "ground heat pump", + "air heat pump", + "resistive heater", + "OCGT", + "gas boiler", + "gas", + "natural gas", + "methanation", + "hydrogen storage", + "battery storage", + "hot water storage"]) + + new_columns = (preferred_order.intersection(supply.columns) + .append(supply.columns.difference(preferred_order))) + + supply = supply.groupby(supply.columns, axis=1).sum() + fig, ax = plt.subplots() + fig.set_size_inches((8, 5)) + + (supply.loc[start:stop, new_columns] + .plot(ax=ax, kind="area", stacked=True, linewidth=0., + color=[snakemake.config['plotting']['tech_colors'][i.replace(suffix, "")] + for i in new_columns])) + + handles, labels = ax.get_legend_handles_labels() + + handles.reverse() + labels.reverse() + + new_handles = [] + new_labels = [] + + for i, item in enumerate(labels): + if "charging" not in item: + new_handles.append(handles[i]) + new_labels.append(labels[i]) + + ax.legend(new_handles, new_labels, ncol=3, loc="upper left", frameon=False) + ax.set_xlim([start, stop]) + ax.set_ylim([-1300, 1900]) + ax.grid(True) + ax.set_ylabel("Power [GW]") + fig.tight_layout() + + fig.savefig("{}{}/maps/series-{}-{}-{}-{}-{}.pdf".format( + snakemake.config['results_dir'], snakemake.config['run'], + snakemake.wildcards["lv"], + carrier, start, stop, name), + transparent=True) + + +if __name__ == "__main__": + if 'snakemake' not in globals(): + from helper import mock_snakemake + snakemake = mock_snakemake( + 'plot_network', + simpl='', + clusters="45", + lv=1.0, + opts='', + sector_opts='168H-T-H-B-I-A-solar+p3-dist1', + planning_horizons="2050", + ) + + overrides = override_component_attrs(snakemake.input.overrides) + n = pypsa.Network(snakemake.input.network, override_component_attrs=overrides) + + map_opts = snakemake.config['plotting']['map'] + + plot_map(n, + components=["generators", "links", "stores", "storage_units"], + bus_size_factor=1.5e10, + transmission=False + ) + + plot_h2_map(n) + plot_ch4_map(n) + plot_map_without(n) + + #plot_series(n, carrier="AC", name=suffix) + #plot_series(n, carrier="heat", name=suffix) diff --git a/scripts/prepare_sector_network.py b/scripts/prepare_sector_network.py index 5f75b1db..a1916c05 100644 --- a/scripts/prepare_sector_network.py +++ b/scripts/prepare_sector_network.py @@ -2447,4 +2447,5 @@ if __name__ == "__main__": if options['electricity_grid_connection']: add_electricity_grid_connection(n, costs) + n.meta = dict(snakemake.config, **dict(wildcards=dict(snakemake.wildcards))) n.export_to_netcdf(snakemake.output[0]) diff --git a/scripts/solve_network.py b/scripts/solve_network.py index 4f6cc2c4..3c815e12 100644 --- a/scripts/solve_network.py +++ b/scripts/solve_network.py @@ -313,6 +313,7 @@ if __name__ == "__main__": n.line_volume_limit = n.global_constraints.at["lv_limit", "constant"] n.line_volume_limit_dual = n.global_constraints.at["lv_limit", "mu"] + n.meta = dict(snakemake.config, **dict(wildcards=dict(snakemake.wildcards))) n.export_to_netcdf(snakemake.output[0]) logger.info("Maximum memory usage: {}".format(mem.mem_usage)) From 3134bbb5c5da97b43b3e1039846c669ed76b7a97 Mon Sep 17 00:00:00 2001 From: Fabian Neumann Date: Thu, 30 Jun 2022 08:43:46 +0200 Subject: [PATCH 11/64] remove accidental file additions --- scripts/matplotlibrc | 4 - scripts/plot_network.py.bak | 737 ------------------------------------ 2 files changed, 741 deletions(-) delete mode 100644 scripts/matplotlibrc delete mode 100644 scripts/plot_network.py.bak diff --git a/scripts/matplotlibrc b/scripts/matplotlibrc deleted file mode 100644 index db5e7ce8..00000000 --- a/scripts/matplotlibrc +++ /dev/null @@ -1,4 +0,0 @@ -backend: Agg -font.family: sans-serif -font.sans-serif: Ubuntu, DejaVu Sans -image.cmap: viridis \ No newline at end of file diff --git a/scripts/plot_network.py.bak b/scripts/plot_network.py.bak deleted file mode 100644 index 4a1bc6d0..00000000 --- a/scripts/plot_network.py.bak +++ /dev/null @@ -1,737 +0,0 @@ -import pypsa - -import numpy as np -import pandas as pd -import matplotlib.pyplot as plt -import cartopy.crs as ccrs - -from matplotlib.legend_handler import HandlerPatch -from matplotlib.patches import Circle, Ellipse - -from make_summary import assign_carriers -from plot_summary import rename_techs, preferred_order -from helper import override_component_attrs - -plt.style.use('ggplot') - - -def rename_techs_tyndp(tech): - tech = rename_techs(tech) - if "heat pump" in tech or "resistive heater" in tech: - return "power-to-heat" - elif tech in ["H2 Electrolysis", "methanation", "helmeth", "H2 liquefaction"]: - return "power-to-gas" - elif tech == "H2": - return "H2 storage" - elif tech in ["OCGT", "CHP", "gas boiler", "H2 Fuel Cell"]: - return "gas-to-power/heat" - elif "solar" in tech: - return "solar" - elif tech == "Fischer-Tropsch": - return "power-to-liquid" - elif "offshore wind" in tech: - return "offshore wind" - elif "CC" in tech or "sequestration" in tech: - return "CCS" - else: - return tech - - -def make_handler_map_to_scale_circles_as_in(ax, dont_resize_actively=False): - fig = ax.get_figure() - - def axes2pt(): - return np.diff(ax.transData.transform([(0, 0), (1, 1)]), axis=0)[0] * (72. / fig.dpi) - - ellipses = [] - if not dont_resize_actively: - def update_width_height(event): - dist = axes2pt() - for e, radius in ellipses: - e.width, e.height = 2. * radius * dist - fig.canvas.mpl_connect('resize_event', update_width_height) - ax.callbacks.connect('xlim_changed', update_width_height) - ax.callbacks.connect('ylim_changed', update_width_height) - - def legend_circle_handler(legend, orig_handle, xdescent, ydescent, - width, height, fontsize): - w, h = 2. * orig_handle.get_radius() * axes2pt() - e = Ellipse(xy=(0.5 * width - 0.5 * xdescent, 0.5 * - height - 0.5 * ydescent), width=w, height=w) - ellipses.append((e, orig_handle.get_radius())) - return e - return {Circle: HandlerPatch(patch_func=legend_circle_handler)} - - -def make_legend_circles_for(sizes, scale=1.0, **kw): - return [Circle((0, 0), radius=(s / scale)**0.5, **kw) for s in sizes] - - -def assign_location(n): - for c in n.iterate_components(n.one_port_components | n.branch_components): - ifind = pd.Series(c.df.index.str.find(" ", start=4), c.df.index) - for i in ifind.value_counts().index: - # these have already been assigned defaults - if i == -1: continue - names = ifind.index[ifind == i] - c.df.loc[names, 'location'] = names.str[:i] - - -def plot_map(network, components=["links", "stores", "storage_units", "generators"], - bus_size_factor=1.7e10, transmission=False): - - n = network.copy() - assign_location(n) - # Drop non-electric buses so they don't clutter the plot - n.buses.drop(n.buses.index[n.buses.carrier != "AC"], inplace=True) - - costs = pd.DataFrame(index=n.buses.index) - - for comp in components: - df_c = getattr(n, comp) - df_c["nice_group"] = df_c.carrier.map(rename_techs_tyndp) - - attr = "e_nom_opt" if comp == "stores" else "p_nom_opt" - - costs_c = ((df_c.capital_cost * df_c[attr]) - .groupby([df_c.location, df_c.nice_group]).sum() - .unstack().fillna(0.)) - costs = pd.concat([costs, costs_c], axis=1) - - print(comp, costs) - - costs = costs.groupby(costs.columns, axis=1).sum() - - costs.drop(list(costs.columns[(costs == 0.).all()]), axis=1, inplace=True) - - new_columns = (preferred_order.intersection(costs.columns) - .append(costs.columns.difference(preferred_order))) - costs = costs[new_columns] - - for item in new_columns: - if item not in snakemake.config['plotting']['tech_colors']: - print("Warning!",item,"not in config/plotting/tech_colors") - - costs = costs.stack() # .sort_index() - - # hack because impossible to drop buses... - eu_location = snakemake.config["plotting"].get("eu_node_location", dict(x=-5.5, y=46)) - n.buses.loc["EU gas", "x"] = eu_location["x"] - n.buses.loc["EU gas", "y"] = eu_location["y"] - - n.links.drop(n.links.index[(n.links.carrier != "DC") & ( - n.links.carrier != "B2B")], inplace=True) - - # drop non-bus - to_drop = costs.index.levels[0].symmetric_difference(n.buses.index) - if len(to_drop) != 0: - print("dropping non-buses", to_drop) - costs.drop(to_drop, level=0, inplace=True, axis=0, errors="ignore") - - # make sure they are removed from index - costs.index = pd.MultiIndex.from_tuples(costs.index.values) - - # PDF has minimum width, so set these to zero - line_lower_threshold = 500. - line_upper_threshold = 1e4 - linewidth_factor = 2e3 - ac_color = "gray" - dc_color = "m" - - if snakemake.wildcards["lv"] == "1.0": - # should be zero - line_widths = n.lines.s_nom_opt - n.lines.s_nom - link_widths = n.links.p_nom_opt - n.links.p_nom - title = "Transmission reinforcement" - - if transmission: - line_widths = n.lines.s_nom_opt - link_widths = n.links.p_nom_opt - linewidth_factor = 2e3 - line_lower_threshold = 0. - title = "Today's transmission" - else: - line_widths = n.lines.s_nom_opt - n.lines.s_nom_min - link_widths = n.links.p_nom_opt - n.links.p_nom_min - title = "Transmission reinforcement" - - if transmission: - line_widths = n.lines.s_nom_opt - link_widths = n.links.p_nom_opt - title = "Total transmission" - - line_widths[line_widths < line_lower_threshold] = 0. - link_widths[link_widths < line_lower_threshold] = 0. - - line_widths[line_widths > line_upper_threshold] = line_upper_threshold - link_widths[link_widths > line_upper_threshold] = line_upper_threshold - - fig, ax = plt.subplots(subplot_kw={"projection": ccrs.PlateCarree()}) - fig.set_size_inches(7, 6) - - n.plot( - bus_sizes=costs / bus_size_factor, - bus_colors=snakemake.config['plotting']['tech_colors'], - line_colors=ac_color, - link_colors=dc_color, - line_widths=line_widths / linewidth_factor, - link_widths=link_widths / linewidth_factor, - ax=ax, **map_opts - ) - - handles = make_legend_circles_for( - [5e9, 1e9], - scale=bus_size_factor, - facecolor="gray" - ) - - labels = ["{} bEUR/a".format(s) for s in (5, 1)] - - l2 = ax.legend( - handles, labels, - loc="upper left", - bbox_to_anchor=(0.01, 1.01), - labelspacing=1.0, - frameon=False, - title='System cost', - handler_map=make_handler_map_to_scale_circles_as_in(ax) - ) - - ax.add_artist(l2) - - handles = [] - labels = [] - - for s in (10, 5): - handles.append(plt.Line2D([0], [0], color=ac_color, - linewidth=s * 1e3 / linewidth_factor)) - labels.append("{} GW".format(s)) - - l1_1 = ax.legend( - handles, labels, - loc="upper left", - bbox_to_anchor=(0.22, 1.01), - frameon=False, - labelspacing=0.8, - handletextpad=1.5, - title=title - ) - - ax.add_artist(l1_1) - - fig.savefig( - snakemake.output.map, - transparent=True, - bbox_inches="tight" - ) - -def group_pipes(df, drop_direction=False): - """Group pipes which connect same buses and return overall capacity. - """ - if drop_direction: - positive_order = df.bus0 < df.bus1 - df_p = df[positive_order] - swap_buses = {"bus0": "bus1", "bus1": "bus0"} - df_n = df[~positive_order].rename(columns=swap_buses) - df = pd.concat([df_p, df_n]) - - # there are pipes for each investment period rename to AC buses name for plotting - df.index = df.apply( - lambda x: f"H2 pipeline {x.bus0.replace(' H2', '')} -> {x.bus1.replace(' H2', '')}", - axis=1 - ) - # group pipe lines connecting the same buses and rename them for plotting - pipe_capacity = df["p_nom_opt"].groupby(level=0).sum() - - return pipe_capacity - - -def plot_h2_map(network): - - n = network.copy() - if "H2 pipeline" not in n.links.carrier.unique(): - return - - assign_location(n) - - bus_size_factor = 1e5 - linewidth_factor = 1e4 - # MW below which not drawn - line_lower_threshold = 1e2 - - # Drop non-electric buses so they don't clutter the plot - n.buses.drop(n.buses.index[n.buses.carrier != "AC"], inplace=True) - - elec = n.links[n.links.carrier.isin(["H2 Electrolysis", "H2 Fuel Cell"])].index - - bus_sizes = n.links.loc[elec,"p_nom_opt"].groupby([n.links["bus0"], n.links.carrier]).sum() / bus_size_factor - - # make a fake MultiIndex so that area is correct for legend - bus_sizes.rename(index=lambda x: x.replace(" H2", ""), level=0, inplace=True) - # drop all links which are not H2 pipelines - n.links.drop(n.links.index[~n.links.carrier.str.contains("H2 pipeline")], inplace=True) - - h2_new = n.links.loc[n.links.carrier=="H2 pipeline"] - h2_retro = n.links.loc[n.links.carrier=='H2 pipeline retrofitted'] - # sum capacitiy for pipelines from different investment periods - h2_new = group_pipes(h2_new) - h2_retro = group_pipes(h2_retro, drop_direction=True).reindex(h2_new.index).fillna(0) - - - n.links.rename(index=lambda x: x.split("-2")[0], inplace=True) - n.links = n.links.groupby(level=0).first() - link_widths_total = (h2_new + h2_retro) / linewidth_factor - link_widths_total = link_widths_total.reindex(n.links.index).fillna(0.) - link_widths_total[n.links.p_nom_opt < line_lower_threshold] = 0. - - retro = n.links.p_nom_opt.where(n.links.carrier=='H2 pipeline retrofitted', other=0.) - link_widths_retro = retro / linewidth_factor - link_widths_retro[n.links.p_nom_opt < line_lower_threshold] = 0. - - n.links.bus0 = n.links.bus0.str.replace(" H2", "") - n.links.bus1 = n.links.bus1.str.replace(" H2", "") - - fig, ax = plt.subplots( - figsize=(7, 6), - subplot_kw={"projection": ccrs.PlateCarree()} - ) - - n.plot( - bus_sizes=bus_sizes, - bus_colors=snakemake.config['plotting']['tech_colors'], - link_colors='#a2f0f2', - link_widths=link_widths_total, - branch_components=["Link"], - ax=ax, - **map_opts - ) - - n.plot( - geomap=False, - bus_sizes=0, - link_colors='#72d3d6', - link_widths=link_widths_retro, - branch_components=["Link"], - ax=ax, - **map_opts - ) - - handles = make_legend_circles_for( - [50000, 10000], - scale=bus_size_factor, - facecolor='grey' - ) - - labels = ["{} GW".format(s) for s in (50, 10)] - - l2 = ax.legend( - handles, labels, - loc="upper left", - bbox_to_anchor=(-0.03, 1.01), - labelspacing=1.0, - frameon=False, - title='Electrolyzer capacity', - handler_map=make_handler_map_to_scale_circles_as_in(ax) - ) - - ax.add_artist(l2) - - handles = [] - labels = [] - - for s in (50, 10): - handles.append(plt.Line2D([0], [0], color="grey", - linewidth=s * 1e3 / linewidth_factor)) - labels.append("{} GW".format(s)) - - l1_1 = ax.legend( - handles, labels, - loc="upper left", - bbox_to_anchor=(0.28, 1.01), - frameon=False, - labelspacing=0.8, - handletextpad=1.5, - title='H2 pipeline capacity' - ) - - ax.add_artist(l1_1) - - fig.savefig( - snakemake.output.map.replace("-costs-all","-h2_network"), - bbox_inches="tight" - ) - - -def plot_ch4_map(network): - - n = network.copy() - - if "gas pipeline" not in n.links.carrier.unique(): - return - - assign_location(n) - - bus_size_factor = 8e7 - linewidth_factor = 1e4 - # MW below which not drawn - line_lower_threshold = 500 - - # Drop non-electric buses so they don't clutter the plot - n.buses.drop(n.buses.index[n.buses.carrier != "AC"], inplace=True) - - fossil_gas_i = n.generators[n.generators.carrier=="gas"].index - fossil_gas = n.generators_t.p.loc[:,fossil_gas_i].mul(n.snapshot_weightings.generators, axis=0).sum().groupby(n.generators.loc[fossil_gas_i,"bus"]).sum() / bus_size_factor - fossil_gas.rename(index=lambda x: x.replace(" gas", ""), inplace=True) - fossil_gas = fossil_gas.reindex(n.buses.index).fillna(0) - # make a fake MultiIndex so that area is correct for legend - fossil_gas.index = pd.MultiIndex.from_product([fossil_gas.index, ["fossil gas"]]) - - methanation_i = n.links[n.links.carrier.isin(["helmeth", "Sabatier"])].index - methanation = abs(n.links_t.p1.loc[:,methanation_i].mul(n.snapshot_weightings.generators, axis=0)).sum().groupby(n.links.loc[methanation_i,"bus1"]).sum() / bus_size_factor - methanation = methanation.groupby(methanation.index).sum().rename(index=lambda x: x.replace(" gas", "")) - # make a fake MultiIndex so that area is correct for legend - methanation.index = pd.MultiIndex.from_product([methanation.index, ["methanation"]]) - - biogas_i = n.stores[n.stores.carrier=="biogas"].index - biogas = n.stores_t.p.loc[:,biogas_i].mul(n.snapshot_weightings.generators, axis=0).sum().groupby(n.stores.loc[biogas_i,"bus"]).sum() / bus_size_factor - biogas = biogas.groupby(biogas.index).sum().rename(index=lambda x: x.replace(" biogas", "")) - # make a fake MultiIndex so that area is correct for legend - biogas.index = pd.MultiIndex.from_product([biogas.index, ["biogas"]]) - - bus_sizes = pd.concat([fossil_gas, methanation, biogas]) - bus_sizes.sort_index(inplace=True) - - to_remove = n.links.index[~n.links.carrier.str.contains("gas pipeline")] - n.links.drop(to_remove, inplace=True) - - link_widths_rem = n.links.p_nom_opt / linewidth_factor - link_widths_rem[n.links.p_nom_opt < line_lower_threshold] = 0. - - link_widths_orig = n.links.p_nom / linewidth_factor - link_widths_orig[n.links.p_nom < line_lower_threshold] = 0. - - max_usage = n.links_t.p0.abs().max(axis=0) - link_widths_used = max_usage / linewidth_factor - link_widths_used[max_usage < line_lower_threshold] = 0. - - link_color_used = n.links.carrier.map({"gas pipeline": "#f08080", - "gas pipeline new": "#c46868"}) - - n.links.bus0 = n.links.bus0.str.replace(" gas", "") - n.links.bus1 = n.links.bus1.str.replace(" gas", "") - - tech_colors = snakemake.config['plotting']['tech_colors'] - - bus_colors = { - "fossil gas": tech_colors["fossil gas"], - "methanation": tech_colors["methanation"], - "biogas": "seagreen" - } - - fig, ax = plt.subplots(figsize=(7,6), subplot_kw={"projection": ccrs.PlateCarree()}) - - n.plot( - bus_sizes=bus_sizes, - bus_colors=bus_colors, - link_colors='lightgrey', - link_widths=link_widths_orig, - branch_components=["Link"], - ax=ax, - **map_opts - ) - - n.plot( - geomap=False, - ax=ax, - bus_sizes=0., - link_colors='#e8d1d1', - link_widths=link_widths_rem, - branch_components=["Link"], - **map_opts - ) - - n.plot( - geomap=False, - ax=ax, - bus_sizes=0., - link_colors=link_color_used, - link_widths=link_widths_used, - branch_components=["Link"], - **map_opts - ) - - handles = make_legend_circles_for( - [10e6, 100e6], - scale=bus_size_factor, - facecolor='grey' - ) - labels = ["{} TWh".format(s) for s in (10, 100)] - - l2 = ax.legend( - handles, labels, - loc="upper left", - bbox_to_anchor=(-0.03, 1.01), - labelspacing=1.0, - frameon=False, - title='gas generation', - handler_map=make_handler_map_to_scale_circles_as_in(ax) - ) - - ax.add_artist(l2) - - handles = [] - labels = [] - - for s in (50, 10): - handles.append(plt.Line2D([0], [0], color="grey", linewidth=s * 1e3 / linewidth_factor)) - labels.append("{} GW".format(s)) - - l1_1 = ax.legend( - handles, labels, - loc="upper left", - bbox_to_anchor=(0.28, 1.01), - frameon=False, - labelspacing=0.8, - handletextpad=1.5, - title='gas pipeline used capacity' - ) - - ax.add_artist(l1_1) - - fig.savefig( - snakemake.output.map.replace("-costs-all","-ch4_network"), - bbox_inches="tight" - ) - - -def plot_map_without(network): - - n = network.copy() - assign_location(n) - - # Drop non-electric buses so they don't clutter the plot - n.buses.drop(n.buses.index[n.buses.carrier != "AC"], inplace=True) - - fig, ax = plt.subplots( - figsize=(7, 6), - subplot_kw={"projection": ccrs.PlateCarree()} - ) - - # PDF has minimum width, so set these to zero - line_lower_threshold = 200. - line_upper_threshold = 1e4 - linewidth_factor = 2e3 - ac_color = "gray" - dc_color = "m" - - # hack because impossible to drop buses... - if "EU gas" in n.buses.index: - eu_location = snakemake.config["plotting"].get("eu_node_location", dict(x=-5.5, y=46)) - n.buses.loc["EU gas", "x"] = eu_location["x"] - n.buses.loc["EU gas", "y"] = eu_location["y"] - - to_drop = n.links.index[(n.links.carrier != "DC") & (n.links.carrier != "B2B")] - n.links.drop(to_drop, inplace=True) - - if snakemake.wildcards["lv"] == "1.0": - line_widths = n.lines.s_nom - link_widths = n.links.p_nom - else: - line_widths = n.lines.s_nom_min - link_widths = n.links.p_nom_min - - line_widths[line_widths < line_lower_threshold] = 0. - link_widths[link_widths < line_lower_threshold] = 0. - - line_widths[line_widths > line_upper_threshold] = line_upper_threshold - link_widths[link_widths > line_upper_threshold] = line_upper_threshold - - n.plot( - bus_colors="k", - line_colors=ac_color, - link_colors=dc_color, - line_widths=line_widths / linewidth_factor, - link_widths=link_widths / linewidth_factor, - ax=ax, **map_opts - ) - - handles = [] - labels = [] - - for s in (10, 5): - handles.append(plt.Line2D([0], [0], color=ac_color, - linewidth=s * 1e3 / linewidth_factor)) - labels.append("{} GW".format(s)) - l1_1 = ax.legend(handles, labels, - loc="upper left", bbox_to_anchor=(0.05, 1.01), - frameon=False, - labelspacing=0.8, handletextpad=1.5, - title='Today\'s transmission') - ax.add_artist(l1_1) - - fig.savefig( - snakemake.output.today, - transparent=True, - bbox_inches="tight" - ) - - -def plot_series(network, carrier="AC", name="test"): - - n = network.copy() - assign_location(n) - assign_carriers(n) - - buses = n.buses.index[n.buses.carrier.str.contains(carrier)] - - supply = pd.DataFrame(index=n.snapshots) - for c in n.iterate_components(n.branch_components): - n_port = 4 if c.name=='Link' else 2 - for i in range(n_port): - supply = pd.concat((supply, - (-1) * c.pnl["p" + str(i)].loc[:, - c.df.index[c.df["bus" + str(i)].isin(buses)]].groupby(c.df.carrier, - axis=1).sum()), - axis=1) - - for c in n.iterate_components(n.one_port_components): - comps = c.df.index[c.df.bus.isin(buses)] - supply = pd.concat((supply, ((c.pnl["p"].loc[:, comps]).multiply( - c.df.loc[comps, "sign"])).groupby(c.df.carrier, axis=1).sum()), axis=1) - - supply = supply.groupby(rename_techs_tyndp, axis=1).sum() - - both = supply.columns[(supply < 0.).any() & (supply > 0.).any()] - - positive_supply = supply[both] - negative_supply = supply[both] - - positive_supply[positive_supply < 0.] = 0. - negative_supply[negative_supply > 0.] = 0. - - supply[both] = positive_supply - - suffix = " charging" - - negative_supply.columns = negative_supply.columns + suffix - - supply = pd.concat((supply, negative_supply), axis=1) - - # 14-21.2 for flaute - # 19-26.1 for flaute - - start = "2013-02-19" - stop = "2013-02-26" - - threshold = 10e3 - - to_drop = supply.columns[(abs(supply) < threshold).all()] - - if len(to_drop) != 0: - print("dropping", to_drop) - supply.drop(columns=to_drop, inplace=True) - - supply.index.name = None - - supply = supply / 1e3 - - supply.rename(columns={"electricity": "electric demand", - "heat": "heat demand"}, - inplace=True) - supply.columns = supply.columns.str.replace("residential ", "") - supply.columns = supply.columns.str.replace("services ", "") - supply.columns = supply.columns.str.replace("urban decentral ", "decentral ") - - preferred_order = pd.Index(["electric demand", - "transmission lines", - "hydroelectricity", - "hydro reservoir", - "run of river", - "pumped hydro storage", - "CHP", - "onshore wind", - "offshore wind", - "solar PV", - "solar thermal", - "building retrofitting", - "ground heat pump", - "air heat pump", - "resistive heater", - "OCGT", - "gas boiler", - "gas", - "natural gas", - "methanation", - "hydrogen storage", - "battery storage", - "hot water storage"]) - - new_columns = (preferred_order.intersection(supply.columns) - .append(supply.columns.difference(preferred_order))) - - supply = supply.groupby(supply.columns, axis=1).sum() - fig, ax = plt.subplots() - fig.set_size_inches((8, 5)) - - (supply.loc[start:stop, new_columns] - .plot(ax=ax, kind="area", stacked=True, linewidth=0., - color=[snakemake.config['plotting']['tech_colors'][i.replace(suffix, "")] - for i in new_columns])) - - handles, labels = ax.get_legend_handles_labels() - - handles.reverse() - labels.reverse() - - new_handles = [] - new_labels = [] - - for i, item in enumerate(labels): - if "charging" not in item: - new_handles.append(handles[i]) - new_labels.append(labels[i]) - - ax.legend(new_handles, new_labels, ncol=3, loc="upper left", frameon=False) - ax.set_xlim([start, stop]) - ax.set_ylim([-1300, 1900]) - ax.grid(True) - ax.set_ylabel("Power [GW]") - fig.tight_layout() - - fig.savefig("{}{}/maps/series-{}-{}-{}-{}-{}.pdf".format( - snakemake.config['results_dir'], snakemake.config['run'], - snakemake.wildcards["lv"], - carrier, start, stop, name), - transparent=True) - - -if __name__ == "__main__": - if 'snakemake' not in globals(): - from helper import mock_snakemake - snakemake = mock_snakemake( - 'plot_network', - simpl='', - clusters="45", - lv=1.0, - opts='', - sector_opts='168H-T-H-B-I-A-solar+p3-dist1', - planning_horizons="2050", - ) - - overrides = override_component_attrs(snakemake.input.overrides) - n = pypsa.Network(snakemake.input.network, override_component_attrs=overrides) - - map_opts = snakemake.config['plotting']['map'] - - plot_map(n, - components=["generators", "links", "stores", "storage_units"], - bus_size_factor=1.5e10, - transmission=False - ) - - plot_h2_map(n) - plot_ch4_map(n) - plot_map_without(n) - - #plot_series(n, carrier="AC", name=suffix) - #plot_series(n, carrier="heat", name=suffix) From eddeb227a7e86a45285ac444ca6750ac00ccad60 Mon Sep 17 00:00:00 2001 From: Iegor Riepin Date: Thu, 30 Jun 2022 17:15:41 +0200 Subject: [PATCH 12/64] Update scripts/prepare_sector_network.py code style update Co-authored-by: Fabian Neumann --- scripts/prepare_sector_network.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/prepare_sector_network.py b/scripts/prepare_sector_network.py index 7baffc83..7903921c 100644 --- a/scripts/prepare_sector_network.py +++ b/scripts/prepare_sector_network.py @@ -385,7 +385,7 @@ def add_carrier_buses(n, carrier, nodes=None): n.add("Carrier", carrier) - unit="MWh_LHV" if carrier=="gas" else "MWH_th" + unit = "MWh_LHV" if carrier == "gas" else "MWh_th" n.madd("Bus", nodes, From 53ad90095ab1f5d62d2ad61d57a7c9cd94cafe31 Mon Sep 17 00:00:00 2001 From: Iegor Riepin Date: Thu, 30 Jun 2022 17:17:12 +0200 Subject: [PATCH 13/64] Update scripts/prepare_sector_network.py sync it up to Fabian's feeling of useful things Co-authored-by: Fabian Neumann --- scripts/prepare_sector_network.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/scripts/prepare_sector_network.py b/scripts/prepare_sector_network.py index 7903921c..03ffa4fa 100644 --- a/scripts/prepare_sector_network.py +++ b/scripts/prepare_sector_network.py @@ -2469,5 +2469,3 @@ if __name__ == "__main__": add_electricity_grid_connection(n, costs) n.export_to_netcdf(snakemake.output[0]) - -# %% From 5d60e8c6e6790a3ed6ce492b03bab3a5792ef54b Mon Sep 17 00:00:00 2001 From: Irieo Date: Thu, 30 Jun 2022 17:37:40 +0200 Subject: [PATCH 14/64] Label oil and biomass buses also as MWh_LHV --- scripts/prepare_sector_network.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/prepare_sector_network.py b/scripts/prepare_sector_network.py index 03ffa4fa..bcf9cf6b 100644 --- a/scripts/prepare_sector_network.py +++ b/scripts/prepare_sector_network.py @@ -1285,7 +1285,7 @@ def add_land_transport(n, costs): spatial.oil.nodes, location=spatial.oil.locations, carrier="oil", - unit="MWh_th" + unit="MWh_LHV" ) ice_efficiency = options['transport_internal_combustion_efficiency'] @@ -1758,14 +1758,14 @@ def add_biomass(n, costs): spatial.gas.biogas, location=spatial.gas.locations, carrier="biogas", - unit="MWh_th" + unit="MWh_LHV" ) n.madd("Bus", spatial.biomass.nodes, location=spatial.biomass.locations, carrier="solid biomass", - unit="MWh_th" + unit="MWh_LHV" ) n.madd("Store", @@ -1877,7 +1877,7 @@ def add_industry(n, costs): spatial.biomass.industry, location=spatial.biomass.locations, carrier="solid biomass for industry", - unit="MWh_th" + unit="MWh_LHV" ) if options["biomass_transport"]: @@ -2036,7 +2036,7 @@ def add_industry(n, costs): spatial.oil.nodes, location=spatial.oil.locations, carrier="oil", - unit="MWh_th" + unit="MWh_LHV" ) if "oil" not in n.stores.carrier.unique(): From adc0dd1e0c67c84a1a99145a51914e0c3a21fed0 Mon Sep 17 00:00:00 2001 From: Fabian Neumann Date: Mon, 11 Jul 2022 15:46:21 +0200 Subject: [PATCH 15/64] fix unit conversion for thermal energy storage (closes #247) --- scripts/prepare_sector_network.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/scripts/prepare_sector_network.py b/scripts/prepare_sector_network.py index bcf9cf6b..49eef826 100644 --- a/scripts/prepare_sector_network.py +++ b/scripts/prepare_sector_network.py @@ -1481,9 +1481,6 @@ def add_heat(n, costs): "for 'decentral' and 'central' separately.") tes_time_constant_days = options["tes_tau"] if name_type == "decentral" else 180. - # conversion from EUR/m^3 to EUR/MWh for 40 K diff and 1.17 kWh/m^3/K - capital_cost = costs.at[name_type + ' water tank storage', 'fixed'] / 0.00117 / 40 - n.madd("Store", nodes[name] + f" {name} water tanks", bus=nodes[name] + f" {name} water tanks", @@ -1491,7 +1488,7 @@ def add_heat(n, costs): e_nom_extendable=True, carrier=name + " water tanks", standing_loss=1 - np.exp(- 1 / 24 / tes_time_constant_days), - capital_cost=capital_cost, + capital_cost=costs.at[name_type + ' water tank storage', 'fixed'], lifetime=costs.at[name_type + ' water tank storage', 'lifetime'] ) From ec1aa1b76bc9b822d7d2b88cbcbf7da980b5424d Mon Sep 17 00:00:00 2001 From: Tom Brown Date: Mon, 18 Jul 2022 20:40:21 +0200 Subject: [PATCH 16/64] README, doc: add reference to hydrogen network paper as showcase of model --- README.md | 18 ++++++++++-------- doc/index.rst | 21 ++++++++++++--------- 2 files changed, 22 insertions(+), 17 deletions(-) diff --git a/README.md b/README.md index 5af6f3e4..b1f62d77 100644 --- a/README.md +++ b/README.md @@ -20,14 +20,16 @@ all greenhouse gas emitters except waste management and land use. **WARNING**: PyPSA-Eur-Sec is under active development and has several [limitations](https://pypsa-eur-sec.readthedocs.io/en/latest/limitations.html) which you should understand before using the model. The github repository -[issues](https://github.com/PyPSA/pypsa-eur-sec/issues) collects known -topics we are working on (please feel free to help or make suggestions). There is neither a full -documentation nor a paper yet, but we hope to have a preprint out by mid-2022. -You can find out more about the model capabilities in [a recent -presentation at EMP-E](https://nworbmot.org/energy/brown-empe.pdf) or the -following [paper in Joule with a description of the industry -sector](https://arxiv.org/abs/2109.09563). We cannot support this model if you -choose to use it. +[issues](https://github.com/PyPSA/pypsa-eur-sec/issues) collect known +topics we are working on (please feel free to help or make suggestions). +The [documentation](https://pypsa-eur-sec.readthedocs.io/) remains somewhat +patchy. +You can find showcases of the model's capabilities in the preprint +[Benefits of a Hydrogen Network in Europe](https://arxiv.org/abs/2207.05816), +a [paper in Joule with a description of the industry +sector](https://arxiv.org/abs/2109.09563), or in [a 2021 +presentation at EMP-E](https://nworbmot.org/energy/brown-empe.pdf). +We cannot support this model if you choose to use it. Please see the [documentation](https://pypsa-eur-sec.readthedocs.io/) for installation instructions and other useful information about the snakemake workflow. diff --git a/doc/index.rst b/doc/index.rst index ad43c66b..fb5f6895 100644 --- a/doc/index.rst +++ b/doc/index.rst @@ -33,17 +33,20 @@ waste management, agriculture, forestry and land use. **WARNING**: PyPSA-Eur-Sec is under active development and has several `limitations `_ which you should understand before using the model. The github repository -`issues `_ collects known -topics we are working on (please feel free to help or make suggestions). There is neither a full -documentation nor a paper yet, but we hope to have a preprint out by mid-2022. -We cannot support this model if you -choose to use it. - +`issues `_ collect known +topics we are working on (please feel free to help or make suggestions). +The `documentation `_ remains somewhat +patchy. +We cannot support this model if you choose to use it. .. note:: - More about the current model capabilities and preliminary results - can be found in `a recent presentation at EMP-E `_ - and the following `paper in Joule with a description of the industry sector `_. + You can find showcases of the model's capabilities in the + preprint `Benefits of a Hydrogen Network in Europe + `_, a `paper in Joule with a + description of the industry sector + `_, or in `a 2021 presentation + at EMP-E `_. + This diagram gives an overview of the sectors and the links between them: From cb00ba58ceb2241ff6a12ea7d623d6fb781c9c57 Mon Sep 17 00:00:00 2001 From: Fabian Neumann Date: Wed, 20 Jul 2022 11:35:12 +0200 Subject: [PATCH 17/64] add option to specify any config through sector opts with CF: