From 2b9ac511b57a4274d091e37872a51f9dddeda8f4 Mon Sep 17 00:00:00 2001 From: lisazeyen Date: Tue, 20 Oct 2020 09:34:45 +0200 Subject: [PATCH 01/90] update mocksnakemake for testing --- scripts/prepare_sector_network.py | 57 ++++++++++++++++++++----------- 1 file changed, 37 insertions(+), 20 deletions(-) diff --git a/scripts/prepare_sector_network.py b/scripts/prepare_sector_network.py index 6e79e897..e068fd02 100644 --- a/scripts/prepare_sector_network.py +++ b/scripts/prepare_sector_network.py @@ -1736,7 +1736,7 @@ def remove_h2_network(n): capital_cost=h2_capital_cost) - +#%% if __name__ == "__main__": # Detect running outside of snakemake and mock snakemake for testing if 'snakemake' not in globals(): @@ -1746,25 +1746,42 @@ if __name__ == "__main__": opts='', planning_horizons='2020', co2_budget_name='go', sector_opts='Co2L0-168H-T-H-B-I-solar3-dist1'), - input=dict(network='pypsa-eur/networks/{network}_s{simpl}_{clusters}_ec_lv{lv}_{opts}.nc', - timezone_mappings='pypsa-eur-sec/data/timezone_mappings.csv', - co2_budget='pypsa-eur-sec/data/co2_budget.csv', - clustered_pop_layout='pypsa-eur-sec/resources/pop_layout_{network}_s{simpl}_{clusters}.csv', - costs='technology-data/outputs/costs_{planning_horizons}.csv', - profile_offwind_ac='pypsa-eur/resources/profile_offwind-ac.nc', - profile_offwind_dc='pypsa-eur/resources/profile_offwind-dc.nc', - clustermaps="pypsa-eur/resources/clustermaps_{network}_s{simpl}_{clusters}.h5", - cop_air_total='pypsa-eur-sec/resources/cop_air_total_{network}_s{simpl}_{clusters}.nc', - cop_soil_total='pypsa-eur-sec/resources/cop_soil_total_{network}_s{simpl}_{clusters}.nc', - solar_thermal_total='pypsa-eur-sec/resources/solar_thermal_total_{network}_s{simpl}_{clusters}.nc', - energy_totals_name='pypsa-eur-sec/data/energy_totals.csv', - heat_demand_total='pypsa-eur-sec/resources/heat_demand_total_{network}_s{simpl}_{clusters}.nc', - heat_profile='pypsa-eur-sec/data/heat_load_profile_BDEW.csv', - transport_name='pypsa-eur-sec/data/transport_data.csv', - temp_air_total='pypsa-eur-sec/resources/temp_air_total_{network}_s{simpl}_{clusters}.nc', - co2_totals_name='pypsa-eur-sec/data/co2_totals.csv', - biomass_potentials='pypsa-eur-sec/data/biomass_potentials.csv', - industrial_demand='pypsa-eur-sec/resources/industrial_demand_{network}_s{simpl}_{clusters}.csv',), + input=dict( + network='../pypsa-eur/networks/{network}_s{simpl}_{clusters}_ec_lv{lv}_{opts}.nc', + energy_totals_name='resources/energy_totals.csv', + co2_totals_name='resources/co2_totals.csv', + transport_name='resources/transport_data.csv', + biomass_potentials='resources/biomass_potentials.csv', + timezone_mappings='data/timezone_mappings.csv', + heat_profile="data/heat_load_profile_BDEW.csv", + costs="../technology-data/outputs/costs_{planning_horizons}.csv", + h2_cavern = "data/hydrogen_salt_cavern_potentials.csv", + co2_budget="data/co2_budget.csv", + profile_offwind_ac="../pypsa-eur/resources/profile_offwind-ac.nc", + profile_offwind_dc="../pypsa-eur/resources/profile_offwind-dc.nc", + clustermaps='../pypsa-eur/resources/clustermaps_{network}_s{simpl}_{clusters}.h5', + clustered_pop_layout="resources/pop_layout_{network}_s{simpl}_{clusters}.csv", + simplified_pop_layout="resources/pop_layout_{network}_s{simpl}.csv", + industrial_demand="resources/industrial_energy_demand_{network}_s{simpl}_{clusters}.csv", + heat_demand_urban="resources/heat_demand_urban_{network}_s{simpl}_{clusters}.nc", + heat_demand_rural="resources/heat_demand_rural_{network}_s{simpl}_{clusters}.nc", + heat_demand_total="resources/heat_demand_total_{network}_s{simpl}_{clusters}.nc", + temp_soil_total="resources/temp_soil_total_{network}_s{simpl}_{clusters}.nc", + temp_soil_rural="resources/temp_soil_rural_{network}_s{simpl}_{clusters}.nc", + temp_soil_urban="resources/temp_soil_urban_{network}_s{simpl}_{clusters}.nc", + temp_air_total="resources/temp_air_total_{network}_s{simpl}_{clusters}.nc", + temp_air_rural="resources/temp_air_rural_{network}_s{simpl}_{clusters}.nc", + temp_air_urban="resources/temp_air_urban_{network}_s{simpl}_{clusters}.nc", + cop_soil_total="resources/cop_soil_total_{network}_s{simpl}_{clusters}.nc", + cop_soil_rural="resources/cop_soil_rural_{network}_s{simpl}_{clusters}.nc", + cop_soil_urban="resources/cop_soil_urban_{network}_s{simpl}_{clusters}.nc", + cop_air_total="resources/cop_air_total_{network}_s{simpl}_{clusters}.nc", + cop_air_rural="resources/cop_air_rural_{network}_s{simpl}_{clusters}.nc", + cop_air_urban="resources/cop_air_urban_{network}_s{simpl}_{clusters}.nc", + solar_thermal_total="resources/solar_thermal_total_{network}_s{simpl}_{clusters}.nc", + solar_thermal_urban="resources/solar_thermal_urban_{network}_s{simpl}_{clusters}.nc", + solar_thermal_rural="resources/solar_thermal_rural_{network}_s{simpl}_{clusters}.nc", + ), output=['pypsa-eur-sec/results/test/prenetworks/{network}_s{simpl}_{clusters}_lv{lv}__{sector_opts}_{co2_budget_name}_{planning_horizons}.nc'] ) import yaml From b4f1c570d62de5e60fe0689cdaa5a51113cb33aa Mon Sep 17 00:00:00 2001 From: lisazeyen Date: Tue, 20 Oct 2020 10:13:02 +0200 Subject: [PATCH 02/90] move input data path for emobility/transport data to snakemake input --- scripts/prepare_sector_network.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/scripts/prepare_sector_network.py b/scripts/prepare_sector_network.py index e068fd02..31feaa21 100644 --- a/scripts/prepare_sector_network.py +++ b/scripts/prepare_sector_network.py @@ -449,8 +449,8 @@ def prepare_data(network): ## Get overall demand curve for all vehicles - dir_name = "data/emobility/" - traffic = pd.read_csv(os.path.join(dir_name,"KFZ__count"),skiprows=2)["count"] + traffic = pd.read_csv(snakemake.input.traffic_data + "KFZ__count", + skiprows=2)["count"] #Generate profiles transport_shape = generate_periodic_profiles(dt_index=network.snapshots.tz_localize("UTC"), @@ -504,7 +504,8 @@ def prepare_data(network): ## derive plugged-in availability for PKW's (cars) - traffic = pd.read_csv(os.path.join(dir_name,"Pkw__count"),skiprows=2)["count"] + traffic = pd.read_csv(snakemake.input.traffic_data + "Pkw__count", + skiprows=2)["count"] avail_max = 0.95 @@ -1780,6 +1781,7 @@ if __name__ == "__main__": cop_air_urban="resources/cop_air_urban_{network}_s{simpl}_{clusters}.nc", solar_thermal_total="resources/solar_thermal_total_{network}_s{simpl}_{clusters}.nc", solar_thermal_urban="resources/solar_thermal_urban_{network}_s{simpl}_{clusters}.nc", + traffic_data = "data/emobility/", solar_thermal_rural="resources/solar_thermal_rural_{network}_s{simpl}_{clusters}.nc", ), output=['pypsa-eur-sec/results/test/prenetworks/{network}_s{simpl}_{clusters}_lv{lv}__{sector_opts}_{co2_budget_name}_{planning_horizons}.nc'] From cdaa4587ad8bbf2dea2c2f09bf859d4831c2c5c8 Mon Sep 17 00:00:00 2001 From: lisazeyen Date: Tue, 20 Oct 2020 12:59:19 +0200 Subject: [PATCH 03/90] Snakefile: add transport input data to rule prepare_sector_network --- Snakefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Snakefile b/Snakefile index 57792c24..7e4d6afa 100644 --- a/Snakefile +++ b/Snakefile @@ -305,6 +305,7 @@ rule prepare_sector_network: heat_demand_urban="resources/heat_demand_urban_{network}_s{simpl}_{clusters}.nc", heat_demand_rural="resources/heat_demand_rural_{network}_s{simpl}_{clusters}.nc", heat_demand_total="resources/heat_demand_total_{network}_s{simpl}_{clusters}.nc", + traffic_data = "data/emobility/", temp_soil_total="resources/temp_soil_total_{network}_s{simpl}_{clusters}.nc", temp_soil_rural="resources/temp_soil_rural_{network}_s{simpl}_{clusters}.nc", temp_soil_urban="resources/temp_soil_urban_{network}_s{simpl}_{clusters}.nc", From 50b4e822c49b09f299bad17c52295ab887c26197 Mon Sep 17 00:00:00 2001 From: lisazeyen Date: Tue, 20 Oct 2020 13:00:41 +0200 Subject: [PATCH 04/90] config: add missing color for industry electricity --- config.default.yaml | 1 + config.myopic.yaml | 1 + 2 files changed, 2 insertions(+) diff --git a/config.default.yaml b/config.default.yaml index 3498a33b..ee4bb885 100644 --- a/config.default.yaml +++ b/config.default.yaml @@ -320,6 +320,7 @@ plotting: "today" : "#D2691E" "shipping" : "#6495ED" "electricity distribution grid" : "#333333" + 'industry electricity': "black" nice_names: # OCGT: "Gas" # OCGT marginal: "Gas (marginal)" diff --git a/config.myopic.yaml b/config.myopic.yaml index 454a8525..8ad7f1b3 100644 --- a/config.myopic.yaml +++ b/config.myopic.yaml @@ -320,6 +320,7 @@ plotting: "today" : "#D2691E" "shipping" : "#6495ED" "electricity distribution grid" : "#333333" + 'industry electricity': "black" nice_names: # OCGT: "Gas" # OCGT marginal: "Gas (marginal)" From 2dd97c39edeb73a054f402e359c0c529bf122a06 Mon Sep 17 00:00:00 2001 From: lisazeyen Date: Tue, 20 Oct 2020 13:45:34 +0200 Subject: [PATCH 05/90] Snakefile: add path to biomass transport cost in rule prepare_sector_network --- Snakefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Snakefile b/Snakefile index 7e4d6afa..0b8cacb0 100644 --- a/Snakefile +++ b/Snakefile @@ -291,6 +291,7 @@ rule prepare_sector_network: co2_totals_name='resources/co2_totals.csv', transport_name='resources/transport_data.csv', biomass_potentials='resources/biomass_potentials.csv', + biomass_transport='data/biomass/biomass_transport_costs.csv', timezone_mappings='data/timezone_mappings.csv', heat_profile="data/heat_load_profile_BDEW.csv", costs=config['costs_dir'] + "costs_{planning_horizons}.csv", From 651a7ff693d864400c860adba041d90f72c3e59d Mon Sep 17 00:00:00 2001 From: lisazeyen Date: Tue, 20 Oct 2020 13:46:39 +0200 Subject: [PATCH 06/90] add biomass transport, split potential for solid biomass to nodes, add costs for upgrading biogas to gas --- scripts/prepare_sector_network.py | 97 ++++++++++++++++++++++++++----- 1 file changed, 81 insertions(+), 16 deletions(-) diff --git a/scripts/prepare_sector_network.py b/scripts/prepare_sector_network.py index 31feaa21..282465f1 100644 --- a/scripts/prepare_sector_network.py +++ b/scripts/prepare_sector_network.py @@ -51,6 +51,33 @@ def add_lifetime_wind_solar(n): n.generators.loc[[index for index in n.generators.index.to_list() if carrier in index], 'lifetime']=costs.at[carrier_name,'lifetime'] + +def create_network_topology(n, prefix): + """ + create a network topology as the electric network, + returns a pandas dataframe with bus0, bus1 and length + """ + + topo = pd.DataFrame(columns=["bus0", "bus1", "length"]) + connector = " -> " + attrs = ["bus0", "bus1", "length"] + + candidates = pd.concat([n.lines[attrs], + n.links.loc[n.links.carrier == "DC", attrs]]) + + positive_order = candidates.bus0 < candidates.bus1 + candidates_p = candidates[positive_order] + candidates_n = (candidates[~ positive_order] + .rename(columns={"bus0": "bus1", "bus1": "bus0"})) + candidates = pd.concat((candidates_p, candidates_n), sort=False) + + topo = candidates.groupby(["bus0", "bus1"], as_index=False).mean() + topo.rename(index=lambda x: prefix + topo.at[x, "bus0"] + + connector + topo.at[x, "bus1"], + inplace=True) + return topo + + def update_wind_solar_costs(n,costs): """ Update costs for wind and solar generators added with pypsa-eur to those @@ -1354,6 +1381,16 @@ def add_biomass(network): biomass_potentials = pd.read_csv(snakemake.input.biomass_potentials, index_col=0) + # costs for biomass transport + transport_costs = pd.read_csv(snakemake.input.biomass_transport, + index_col=0) + + # potential per node distributed within country by population + biomass_pot_node = (biomass_potentials.loc[pop_layout.ct] + .set_index(pop_layout.index) + .mul(pop_layout.fraction, axis="index")) + + network.add("Carrier","biogas") network.add("Carrier","solid biomass") @@ -1363,8 +1400,7 @@ def add_biomass(network): carrier="biogas") network.madd("Bus", - ["EU solid biomass"], - location="EU", + biomass_pot_node.index + " solid biomass", carrier="solid biomass") network.madd("Store", @@ -1376,12 +1412,12 @@ def add_biomass(network): e_initial=biomass_potentials.loc[cts,"biogas"].sum()) network.madd("Store", - ["EU solid biomass"], - bus="EU solid biomass", + biomass_pot_node.index + " solid biomass", + bus=biomass_pot_node.index + " solid biomass", carrier="solid biomass", - e_nom=biomass_potentials.loc[cts,"solid biomass"].sum(), - marginal_cost=costs.at['solid biomass','fuel'], - e_initial=biomass_potentials.loc[cts,"solid biomass"].sum()) + e_nom=biomass_pot_node["solid biomass"].values, + marginal_cost=costs.at['solid biomass', 'fuel'], + e_initial=biomass_pot_node["solid biomass"].values) network.madd("Link", ["biogas to gas"], @@ -1389,9 +1425,38 @@ def add_biomass(network): bus1="EU gas", bus2="co2 atmosphere", carrier="biogas to gas", + capital_cost=costs.loc["biogas upgrading", "fixed"], + marginal_cost=costs.loc["biogas upgrading", "VOM"], efficiency2=-costs.at['gas','CO2 intensity'], p_nom_extendable=True) + # add biomass transport + biomass_transport = create_network_topology(n, "Biomass transport ") + + # make transport in both directions + df = biomass_transport.copy() + df["bus1"] = biomass_transport.bus0 + df["bus0"] = biomass_transport.bus1 + df.rename(index=lambda x: "Biomass transport " + df.at[x, "bus0"] + + " -> " + df.at[x, "bus1"], inplace=True) + biomass_transport = pd.concat([biomass_transport, df]) + + # costs + bus0_costs = biomass_transport.bus0.apply(lambda x: transport_costs.loc[x[:2]]) + bus1_costs = biomass_transport.bus1.apply(lambda x: transport_costs.loc[x[:2]]) + biomass_transport["costs"] = pd.concat([bus0_costs, bus1_costs], + axis=1).mean(axis=1) + + network.madd("Link", + biomass_transport.index, + bus0=biomass_transport.bus0 + " solid biomass", + bus1=biomass_transport.bus1 + " solid biomass", + p_nom_extendable=True, + length=biomass_transport.length.values, + marginal_cost=biomass_transport.costs * biomass_transport.length.values, + capital_cost=1, + carrier="solid biomass transport") + #AC buses with district heating urban_central = network.buses.index[network.buses.carrier == "urban central heat"] @@ -1400,7 +1465,7 @@ def add_biomass(network): network.madd("Link", urban_central + " urban central solid biomass CHP electric", - bus0="EU solid biomass", + bus0=urban_central + " solid biomass", bus1=urban_central, carrier="urban central solid biomass CHP electric", p_nom_extendable=True, @@ -1415,7 +1480,7 @@ def add_biomass(network): network.madd("Link", urban_central + " urban central solid biomass CHP heat", - bus0="EU solid biomass", + bus0=urban_central + " solid biomass", bus1=urban_central + " urban central heat", carrier="urban central solid biomass CHP heat", p_nom_extendable=True, @@ -1425,7 +1490,7 @@ def add_biomass(network): network.madd("Link", urban_central + " urban central solid biomass CHP CCS electric", - bus0="EU solid biomass", + bus0=urban_central + " solid biomass", bus1=urban_central, bus2="co2 atmosphere", bus3="co2 stored", @@ -1443,7 +1508,7 @@ def add_biomass(network): network.madd("Link", urban_central + " urban central solid biomass CHP CCS heat", - bus0="EU solid biomass", + bus0=urban_central + " solid biomass", bus1=urban_central + " urban central heat", bus2="co2 atmosphere", bus3="co2 stored", @@ -1467,7 +1532,6 @@ def add_industry(network): index_col=0) solid_biomass_by_country = industrial_demand["solid biomass"].groupby(pop_layout.ct).sum() - countries = solid_biomass_by_country.index network.madd("Bus", ["solid biomass for industry"], @@ -1481,16 +1545,16 @@ def add_industry(network): p_set=solid_biomass_by_country.sum()/8760.) network.madd("Link", - ["solid biomass for industry"], - bus0="EU solid biomass", + nodes + " solid biomass for industry", + bus0=nodes + " solid biomass", bus1="solid biomass for industry", carrier="solid biomass for industry", p_nom_extendable=True, efficiency=1.) network.madd("Link", - ["solid biomass for industry CCS"], - bus0="EU solid biomass", + nodes + " solid biomass for industry CCS", + bus0=nodes + " solid biomass", bus1="solid biomass for industry", bus2="co2 atmosphere", bus3="co2 stored", @@ -1753,6 +1817,7 @@ if __name__ == "__main__": co2_totals_name='resources/co2_totals.csv', transport_name='resources/transport_data.csv', biomass_potentials='resources/biomass_potentials.csv', + biomass_transport='data/biomass/biomass_transport_costs.csv', timezone_mappings='data/timezone_mappings.csv', heat_profile="data/heat_load_profile_BDEW.csv", costs="../technology-data/outputs/costs_{planning_horizons}.csv", From 3944e19c515d84ab622291a7a41ffb4d97458ae5 Mon Sep 17 00:00:00 2001 From: lisazeyen Date: Tue, 20 Oct 2020 13:48:05 +0200 Subject: [PATCH 07/90] config.yaml: add color for biomass transport --- config.default.yaml | 1 + config.myopic.yaml | 1 + 2 files changed, 2 insertions(+) diff --git a/config.default.yaml b/config.default.yaml index ee4bb885..88697285 100644 --- a/config.default.yaml +++ b/config.default.yaml @@ -321,6 +321,7 @@ plotting: "shipping" : "#6495ED" "electricity distribution grid" : "#333333" 'industry electricity': "black" + "solid biomass transport": "green" nice_names: # OCGT: "Gas" # OCGT marginal: "Gas (marginal)" diff --git a/config.myopic.yaml b/config.myopic.yaml index 8ad7f1b3..e1a2a15f 100644 --- a/config.myopic.yaml +++ b/config.myopic.yaml @@ -321,6 +321,7 @@ plotting: "shipping" : "#6495ED" "electricity distribution grid" : "#333333" 'industry electricity': "black" + "solid biomass transport": "green" nice_names: # OCGT: "Gas" # OCGT marginal: "Gas (marginal)" From ae9c0d9530b09634579340ad7a10435b29eb1cd9 Mon Sep 17 00:00:00 2001 From: lisazeyen Date: Tue, 20 Oct 2020 14:08:17 +0200 Subject: [PATCH 08/90] prepare_sector_network: split industry demand for biomass to single nodes --- scripts/prepare_sector_network.py | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/scripts/prepare_sector_network.py b/scripts/prepare_sector_network.py index 282465f1..f75ed459 100644 --- a/scripts/prepare_sector_network.py +++ b/scripts/prepare_sector_network.py @@ -1531,31 +1531,31 @@ def add_industry(network): industrial_demand = 1e6*pd.read_csv(snakemake.input.industrial_demand, index_col=0) - solid_biomass_by_country = industrial_demand["solid biomass"].groupby(pop_layout.ct).sum() + solid_biomass_by_country = industrial_demand["solid biomass"] network.madd("Bus", - ["solid biomass for industry"], - location="EU", + industrial_demand.index + " solid biomass for industry", carrier="solid biomass for industry") + network.madd("Load", - ["solid biomass for industry"], - bus="solid biomass for industry", + industrial_demand.index + " solid biomass for industry", + bus=industrial_demand.index + " solid biomass for industry", carrier="solid biomass for industry", - p_set=solid_biomass_by_country.sum()/8760.) + p_set=industrial_demand["solid biomass"]/8760.) network.madd("Link", - nodes + " solid biomass for industry", - bus0=nodes + " solid biomass", - bus1="solid biomass for industry", + industrial_demand.index + " solid biomass for industry", + bus0=industrial_demand.index + " solid biomass", + bus1=industrial_demand.index + " solid biomass for industry", carrier="solid biomass for industry", p_nom_extendable=True, efficiency=1.) network.madd("Link", - nodes + " solid biomass for industry CCS", - bus0=nodes + " solid biomass", - bus1="solid biomass for industry", + industrial_demand.index + " solid biomass for industry CCS", + bus0=industrial_demand.index + " solid biomass", + bus1=industrial_demand.index + " solid biomass for industry", bus2="co2 atmosphere", bus3="co2 stored", carrier="solid biomass for industry CCS", From 13cae7d66f17555005c85a87f0bfafeef4fb7e4e Mon Sep 17 00:00:00 2001 From: lisazeyen Date: Tue, 20 Oct 2020 14:19:07 +0200 Subject: [PATCH 09/90] drop nan values to avoid runtime error when removing todays electricity demand --- scripts/prepare_sector_network.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/scripts/prepare_sector_network.py b/scripts/prepare_sector_network.py index f75ed459..b33cfcea 100644 --- a/scripts/prepare_sector_network.py +++ b/scripts/prepare_sector_network.py @@ -1701,7 +1701,7 @@ def add_industry(network): p_set=industrial_demand.loc[nodes,"low-temperature heat"]/8760.) #remove today's industrial electricity demand by scaling down total electricity demand - for ct in n.buses.country.unique(): + for ct in n.buses.country.dropna().unique(): loads = n.loads.index[(n.loads.index.str[:2] == ct) & (n.loads.carrier == "electricity")] factor = 1 - industrial_demand.loc[loads,"current electricity"].sum()/n.loads_t.p_set[loads].sum().sum() n.loads_t.p_set[loads] *= factor @@ -1800,6 +1800,9 @@ def remove_h2_network(n): carrier="H2 Store", capital_cost=h2_capital_cost) +# def remove_biomass_transport(n): + + #%% if __name__ == "__main__": From b4fbb47d29ab7ea1719b9f96ed1f11d94f458966 Mon Sep 17 00:00:00 2001 From: lisazeyen Date: Wed, 21 Oct 2020 07:21:09 +0200 Subject: [PATCH 10/90] fix bug when adding biomass industry demand, add option to remove biomass transport and have only single EU biomass node --- scripts/prepare_sector_network.py | 78 ++++++++++++++++++++++++++++++- 1 file changed, 76 insertions(+), 2 deletions(-) diff --git a/scripts/prepare_sector_network.py b/scripts/prepare_sector_network.py index b33cfcea..ddcdc85b 100644 --- a/scripts/prepare_sector_network.py +++ b/scripts/prepare_sector_network.py @@ -1542,7 +1542,8 @@ def add_industry(network): industrial_demand.index + " solid biomass for industry", bus=industrial_demand.index + " solid biomass for industry", carrier="solid biomass for industry", - p_set=industrial_demand["solid biomass"]/8760.) + p_set=(industrial_demand["solid biomass"] + .rename(index=lambda x: x + " solid biomass for industry"))/8760.) network.madd("Link", industrial_demand.index + " solid biomass for industry", @@ -1800,8 +1801,76 @@ def remove_h2_network(n): carrier="H2 Store", capital_cost=h2_capital_cost) -# def remove_biomass_transport(n): +def remove_biomass_transport(n): + print("no transport of solid biomass considered") + + # remove country specific biomass buses + n.buses = n.buses[~n.buses.carrier.str.contains("biomass")] + # biomass potential + biomass_pot = n.stores[n.stores.carrier=="solid biomass"].e_nom.sum() + # remove biomass store per country + n.stores = n.stores[n.stores.carrier!="solid biomass"] + # remove biomass transport links + n.links = n.links[n.links.carrier!="solid biomass transport"] + # total industry demand for biomass + biomass_demand = n.loads[n.loads.carrier=="solid biomass for industry"].p_set.sum() + # remove industry demand + n.loads = n.loads[n.loads.carrier!="solid biomass for industry"] + # drop transport and industry links + n.links = n.links[~n.links.carrier.isin(['solid biomass transport', + 'solid biomass for industry', + 'solid biomass for industry CCS'])] + + # add back EU bus + load + store + industry links + n.madd("Bus", + ["EU solid biomass"], + location="EU", + carrier="solid biomass") + + n.madd("Bus", + ["solid biomass for industry"], + location="EU", + carrier="solid biomass for industry") + + n.madd("Load", + ["solid biomass for industry"], + bus="solid biomass for industry", + carrier="solid biomass for industry", + p_set=biomass_demand) + + n.madd("Store", + ["EU solid biomass"], + bus="EU solid biomass", + carrier="solid biomass", + e_nom=biomass_pot, + marginal_cost=costs.at['solid biomass','fuel'], + e_initial=biomass_pot) + + n.madd("Link", + ["solid biomass for industry"], + bus0="EU solid biomass", + bus1="solid biomass for industry", + carrier="solid biomass for industry", + p_nom_extendable=True, + efficiency=1.) + + n.madd("Link", + ["solid biomass for industry CCS"], + bus0="EU solid biomass", + bus1="solid biomass for industry", + bus2="co2 atmosphere", + bus3="co2 stored", + carrier="solid biomass for industry CCS", + p_nom_extendable=True, + capital_cost=costs.at["industry CCS","fixed"]*costs.at['solid biomass','CO2 intensity']*8760, #8760 converts EUR/(tCO2/a) to EUR/(tCO2/h) + efficiency=0.9, + efficiency2=-costs.at['solid biomass','CO2 intensity']*options["ccs_fraction"], + efficiency3=costs.at['solid biomass','CO2 intensity']*options["ccs_fraction"], + lifetime=costs.at['industry CCS','lifetime']) + + # set CHP buses from country to single EU bus + n.links.loc[n.links.carrier.str.contains("biomass CHP"), "bus0"] = "EU solid biomass" #%% @@ -1916,6 +1985,8 @@ if __name__ == "__main__": if o[:4] == "dist": snakemake.config["sector"]['electricity_distribution_grid'] = True snakemake.config["sector"]['electricity_distribution_grid_cost_factor'] = float(o[4:].replace("p",".").replace("m","-")) + if o == "biomasstransport": + options["biomass_transport"] = True nodal_energy_totals, heat_demand, ashp_cop, gshp_cop, solar_thermal, transport, avail_profile, dsm_profile, co2_totals, nodal_transport_data = prepare_data(n) @@ -1943,6 +2014,9 @@ if __name__ == "__main__": if "noH2network" in opts: remove_h2_network(n) + if not options["biomass_transport"]: + remove_biomass_transport(n) + for o in opts: m = re.match(r'^\d+h$', o, re.IGNORECASE) if m is not None: From 4f2135a43a45e0d9d491d05167691e85cbd24efc Mon Sep 17 00:00:00 2001 From: lisazeyen Date: Wed, 21 Oct 2020 07:23:52 +0200 Subject: [PATCH 11/90] add option for solid biomass transport --- config.default.yaml | 1 + config.myopic.yaml | 1 + 2 files changed, 2 insertions(+) diff --git a/config.default.yaml b/config.default.yaml index 88697285..6d7c8998 100644 --- a/config.default.yaml +++ b/config.default.yaml @@ -104,6 +104,7 @@ sector: 'electricity_grid_connection' : True # only applies to onshore wind and utility PV 'gas_distribution_grid' : True 'gas_distribution_grid_cost_factor' : 1.0 #multiplies cost in data/costs.csv + 'biomass_transport': False # biomass potential per country + transport between countries costs: year: 2030 diff --git a/config.myopic.yaml b/config.myopic.yaml index e1a2a15f..7159607b 100644 --- a/config.myopic.yaml +++ b/config.myopic.yaml @@ -104,6 +104,7 @@ sector: 'electricity_grid_connection' : True # only applies to onshore wind and utility PV 'gas_distribution_grid' : True 'gas_distribution_grid_cost_factor' : 1.0 #multiplies cost in data/costs.csv + 'biomass_transport': False # biomass potential per country + transport between countries costs: year: 2030 From 846f57fde6433770199fae31145575c14e97358a Mon Sep 17 00:00:00 2001 From: lisazeyen Date: Fri, 11 Jun 2021 14:36:56 +0200 Subject: [PATCH 12/90] add script for biomass transport costs. Converts JRC-EU-Times transport cost' --- scripts/convert_biomass_transport_costs.py | 62 ++++++++++++++++++++++ 1 file changed, 62 insertions(+) create mode 100644 scripts/convert_biomass_transport_costs.py diff --git a/scripts/convert_biomass_transport_costs.py b/scripts/convert_biomass_transport_costs.py new file mode 100644 index 00000000..57bd455f --- /dev/null +++ b/scripts/convert_biomass_transport_costs.py @@ -0,0 +1,62 @@ +#!/usr/bin/env python3 +# -*- coding: utf-8 -*- +""" +Created on Thu Mar 12 19:11:20 2020 + +reads biomass transport costs for different countries of the JRC report + + "The JRC-EU-TIMES model. + Bioenergy potentials + for EU and neighbouring countries." + (2015) + +converts them from units 'EUR per km/ton' -> 'EUR/ (km MWh)' + +assuming as an approximation energy content of wood pellets + +@author: bw0928 +""" + +import pandas as pd +from tabula import read_pdf +import numpy as np + +# read pdf file +df_list = read_pdf("biomass potentials in europe_web rev.pdf", + pages="145-147", + multiple_tables=True) +energy_content = 4.8 # unit MWh/tonne (assuming wood pellets) +# %% +columns = ["Komponente", "Größe", "Einheit", 2020, 2025, 2030, 2035, 2040, + 2045, 2050] +countries = df_list[0][0].iloc[6:].rename(index=lambda x: x+1) + +# supply chain 1 +df = df_list[1].copy().rename(index=countries.to_dict()) +df.rename(columns= df.iloc[:6].apply(lambda col: col.str.cat(sep=" "), + axis=0).to_dict(), inplace=True) +df = df.iloc[6:] +df.loc[6]=df.loc[6].str.replace("€", "EUR") + +# supply chain 2 +df2 = df_list[2].copy().rename(index=countries.to_dict()) +df2.rename(columns= df2.iloc[:6].apply(lambda col: col.str.cat(sep=" "), + axis=0).to_dict(), inplace=True) +df2 = df2.iloc[6:] +df2.loc[6]=df2.loc[6].str.replace("€", "EUR") + +#%% +df.to_csv("biomass_transport_costs_supply_chain1.csv") +df2.to_csv("biomass_transport_costs_supply_chain2.csv") + +transport_costs = pd.concat([df['per km/ton'], df2['per km/ton']],axis=1).drop(6) +transport_costs = transport_costs.astype(float, errors="ignore").mean(axis=1) + +# convert unit to EUR/MWh +transport_costs /= energy_content +transport_costs = pd.DataFrame(transport_costs, columns=["cost [EUR/(km MWh)]"]) +# rename +transport_costs.rename({"UK": "GB", "XK": "KO", "EL": "GR"}, inplace=True) +# add missing Norway +transport_costs.loc["NO"] = transport_costs.loc["SE"] +transport_costs.to_csv("biomass_transport_final.csv") From 12257eeb3e8147ecc74c5a0345b063e75bb946d0 Mon Sep 17 00:00:00 2001 From: martavp Date: Tue, 15 Jun 2021 09:26:56 +0200 Subject: [PATCH 13/90] Update .gitignore --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index a55300e2..abfb926e 100644 --- a/.gitignore +++ b/.gitignore @@ -27,7 +27,7 @@ gurobi.log /data/.nfs* /data/Industrial_Database.csv /data/retro/tabula-calculator-calcsetbuilding.csv - +/data *.org *.nc From e2354c18ac63d327d2171721ba07ee46c75a7c4c Mon Sep 17 00:00:00 2001 From: martavp Date: Wed, 16 Jun 2021 17:52:42 +0200 Subject: [PATCH 14/90] Add fictitious load to account for non-transformed shipping emissions The share of shipping demand that is transformed is defined now for different years to be used with the myopic code. The carbon emission from the remaining share is treated as a negative load on the atmospheric carbon dioxide bus, just like aviation and land transport emissions. --- config.default.yaml | 9 +++++++++ doc/release_notes.rst | 2 +- scripts/prepare_sector_network.py | 14 +++++++++++++- 3 files changed, 23 insertions(+), 2 deletions(-) diff --git a/config.default.yaml b/config.default.yaml index 617e716a..06f4af86 100644 --- a/config.default.yaml +++ b/config.default.yaml @@ -116,6 +116,14 @@ sector: 'transport_fuel_cell_efficiency': 0.5 'transport_internal_combustion_efficiency': 0.3 'shipping_average_efficiency' : 0.4 #For conversion of fuel oil to propulsion in 2011 + 'shipping_hydrogen_share': # 1 means all hydrogen FC + 2020: 0 + 2025: 0 + 2030: 0.05 + 2035: 0.15 + 2040: 0.3 + 2045: 0.6 + 2050: 1 'time_dep_hp_cop' : True #time dependent heat pump coefficient of performance 'heat_pump_sink_T' : 55. # Celsius, based on DTU / large area radiators; used in build_cop_profiles.py # conservatively high to cover hot water and space heating in poorly-insulated buildings @@ -381,6 +389,7 @@ plotting: "solid biomass" : "#DAA520" "today" : "#D2691E" "shipping" : "#6495ED" + "shipping oil emissions" : "#6495ED" "electricity distribution grid" : "#333333" nice_names: # OCGT: "Gas" diff --git a/doc/release_notes.rst b/doc/release_notes.rst index cca25c7f..e5bd8d10 100644 --- a/doc/release_notes.rst +++ b/doc/release_notes.rst @@ -6,7 +6,7 @@ Future release ============== * Include new features here. - +The share of shipping transformed into hydrogen fuel cell can be now defined for different years in the ``config.yaml`` file. The carbon emission from the remaining share is treated as a negative load on the atmospheric carbon dioxide bus, just like aviation and land transport emissions. PyPSA-Eur-Sec 0.5.0 (21st May 2021) =================================== diff --git a/scripts/prepare_sector_network.py b/scripts/prepare_sector_network.py index 94fb5048..f3dec3e4 100644 --- a/scripts/prepare_sector_network.py +++ b/scripts/prepare_sector_network.py @@ -1682,13 +1682,25 @@ def add_industry(network): p_set=industrial_demand.loc[nodes,"hydrogen"]/8760.) + shipping_hydrogen_share = get_parameter(options['shipping_hydrogen_share']) network.madd("Load", nodes, suffix=" H2 for shipping", bus=nodes + " H2", carrier="H2 for shipping", - p_set = nodal_energy_totals.loc[nodes,["total international navigation","total domestic navigation"]].sum(axis=1)*1e6*options['shipping_average_efficiency']/costs.at["fuel cell","efficiency"]/8760.) + p_set = shipping_hydrogen_share*nodal_energy_totals.loc[nodes,["total international navigation","total domestic navigation"]].sum(axis=1)*1e6*options['shipping_average_efficiency']/costs.at["fuel cell","efficiency"]/8760.) + if shipping_hydrogen_share < 1: + shipping_oil_share= 1 - shipping_hydrogen_share + co2 = shipping_oil_share*nodal_energy_totals.loc[nodes,["total international navigation","total domestic navigation"]].sum().sum()*1e6/8760.*costs.at["oil",'CO2 intensity'] + + network.madd("Load", + ["shipping oil emissions"], + bus="co2 atmosphere", + carrier="shipping oil emissions", + p_set=-co2) + + if "EU oil" not in network.buses.index: network.madd("Bus", ["EU oil"], From a57135b086f63e0a6dfc6e84c7ecfdf56421247f Mon Sep 17 00:00:00 2001 From: martavp Date: Thu, 17 Jun 2021 15:12:10 +0200 Subject: [PATCH 15/90] Split colours for H2 in Industry and H2 in shipping when plotting balances. When plotting the balance for H2, the rename dictionary merges all the demands containing H2. This commit disables such merging and keeps different colours for H2 in shipping and H2 in industry. This is useful when one wants to look at the H2 balance and have an overview of where the H2 is consumed in the model. --- config.default.yaml | 2 ++ scripts/plot_summary.py | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/config.default.yaml b/config.default.yaml index 06f4af86..26937853 100644 --- a/config.default.yaml +++ b/config.default.yaml @@ -388,6 +388,8 @@ plotting: "biogas" : "#800000" "solid biomass" : "#DAA520" "today" : "#D2691E" + "H2 for industry" : "#222222" + "H2 for shipping" : "#6495ED" "shipping" : "#6495ED" "shipping oil emissions" : "#6495ED" "electricity distribution grid" : "#333333" diff --git a/scripts/plot_summary.py b/scripts/plot_summary.py index 9b3a81e1..276dc842 100644 --- a/scripts/plot_summary.py +++ b/scripts/plot_summary.py @@ -20,7 +20,9 @@ def rename_techs(label): rename_if_contains_dict = {"water tanks" : "hot water storage", "retrofitting" : "building retrofitting", - "H2" : "hydrogen storage", + "H2 Electrolysis" : "hydrogen storage", + "H2 Fuel Cell" : "hydrogen storage", + "H2 pipeline" : "hydrogen storage", "battery" : "battery storage", "CC" : "CC"} From 0a92d23698688ef1b6f4a5863d61537a426f9ece Mon Sep 17 00:00:00 2001 From: martavp Date: Thu, 17 Jun 2021 16:13:05 +0200 Subject: [PATCH 16/90] Make transformation of Steel and Aluminum production depends on year Previously, the transformation of the Steel and Aluminum production was assumed to occur overnight. This commit enables the definition of a transformation path via the config.yaml file. This requires adding the {planning_horizon} to the input and output file name of the following rules: build_industrial_production_per_country_tomorrow build_industrial_production_per_node build_industry_energy_demand_per_node prepare_sector_network --- Snakefile | 20 +++++++------- config.default.yaml | 26 +++++++++++++++++-- doc/release_notes.rst | 3 ++- ...ustrial_production_per_country_tomorrow.py | 21 +++++++++++---- 4 files changed, 52 insertions(+), 18 deletions(-) diff --git a/Snakefile b/Snakefile index 9ab7d2f1..9babe249 100644 --- a/Snakefile +++ b/Snakefile @@ -189,7 +189,7 @@ rule build_industrial_production_per_country_tomorrow: input: industrial_production_per_country="resources/industrial_production_per_country.csv" output: - industrial_production_per_country_tomorrow="resources/industrial_production_per_country_tomorrow.csv" + industrial_production_per_country_tomorrow="resources/industrial_production_per_country_tomorrow_{planning_horizons}.csv" threads: 1 resources: mem_mb=1000 script: 'scripts/build_industrial_production_per_country_tomorrow.py' @@ -214,9 +214,9 @@ rule build_industrial_distribution_key: rule build_industrial_production_per_node: input: industrial_distribution_key="resources/industrial_distribution_key_elec_s{simpl}_{clusters}.csv", - industrial_production_per_country_tomorrow="resources/industrial_production_per_country_tomorrow.csv" + industrial_production_per_country_tomorrow="resources/industrial_production_per_country_tomorrow_{planning_horizons}.csv" output: - industrial_production_per_node="resources/industrial_production_elec_s{simpl}_{clusters}.csv" + industrial_production_per_node="resources/industrial_production_elec_s{simpl}_{clusters}_{planning_horizons}.csv" threads: 1 resources: mem_mb=1000 script: 'scripts/build_industrial_production_per_node.py' @@ -225,10 +225,10 @@ rule build_industrial_production_per_node: rule build_industrial_energy_demand_per_node: input: industry_sector_ratios="resources/industry_sector_ratios.csv", - industrial_production_per_node="resources/industrial_production_elec_s{simpl}_{clusters}.csv", + industrial_production_per_node="resources/industrial_production_elec_s{simpl}_{clusters}_{planning_horizons}.csv", industrial_energy_demand_per_node_today="resources/industrial_energy_demand_today_elec_s{simpl}_{clusters}.csv" output: - industrial_energy_demand_per_node="resources/industrial_energy_demand_elec_s{simpl}_{clusters}.csv" + industrial_energy_demand_per_node="resources/industrial_energy_demand_elec_s{simpl}_{clusters}_{planning_horizons}.csv" threads: 1 resources: mem_mb=1000 script: 'scripts/build_industrial_energy_demand_per_node.py' @@ -260,9 +260,9 @@ rule build_industrial_energy_demand_per_node_today: rule build_industrial_energy_demand_per_country: input: industry_sector_ratios="resources/industry_sector_ratios.csv", - industrial_production_per_country="resources/industrial_production_per_country_tomorrow.csv" + industrial_production_per_country="resources/industrial_production_per_country_tomorrow_{planning_horizons}.csv" output: - industrial_energy_demand_per_country="resources/industrial_energy_demand_per_country.csv" + industrial_energy_demand_per_country="resources/industrial_energy_demand_per_country_{planning_horizons}.csv" threads: 1 resources: mem_mb=1000 script: 'scripts/build_industrial_energy_demand_per_country.py' @@ -271,9 +271,9 @@ rule build_industrial_energy_demand_per_country: rule build_industrial_demand: input: clustered_pop_layout="resources/pop_layout_elec_s{simpl}_{clusters}.csv", - industrial_demand_per_country="resources/industrial_energy_demand_per_country.csv" + industrial_demand_per_country="resources/industrial_energy_demand_per_country_{planning_horizons}.csv" output: - industrial_demand="resources/industrial_demand_elec_s{simpl}_{clusters}.csv" + industrial_demand="resources/industrial_demand_elec_s{simpl}_{clusters}_{planning_horizons}.csv" threads: 1 resources: mem_mb=1000 script: 'scripts/build_industrial_demand.py' @@ -315,7 +315,7 @@ rule prepare_sector_network: busmap=pypsaeur("resources/busmap_elec_s{simpl}_{clusters}.csv"), clustered_pop_layout="resources/pop_layout_elec_s{simpl}_{clusters}.csv", simplified_pop_layout="resources/pop_layout_elec_s{simpl}.csv", - industrial_demand="resources/industrial_energy_demand_elec_s{simpl}_{clusters}.csv", + industrial_demand="resources/industrial_energy_demand_elec_s{simpl}_{clusters}_{planning_horizons}.csv", heat_demand_urban="resources/heat_demand_urban_elec_s{simpl}_{clusters}.nc", heat_demand_rural="resources/heat_demand_rural_elec_s{simpl}_{clusters}.nc", heat_demand_total="resources/heat_demand_total_elec_s{simpl}_{clusters}.nc", diff --git a/config.default.yaml b/config.default.yaml index 26937853..70dfc009 100644 --- a/config.default.yaml +++ b/config.default.yaml @@ -230,10 +230,32 @@ solving: mem: 30000 #memory in MB; 20 GB enough for 50+B+I+H2; 100 GB for 181+B+I+H2 industry: - 'St_primary_fraction' : 0.3 # fraction of steel produced via primary route (DRI + EAF) versus secondary route (EAF); today fraction is 0.6 + 'St_primary_fraction' : # fraction of steel produced via primary route versus secondary route (scrap+EAF); today fraction is 0.6 + 2020: 0.6 + 2025: 0.55 + 2030: 0.5 + 2035: 0.45 + 2040: 0.4 + 2045: 0.35 + 2050: 0.3 + 'DRI_fraction' : # fraction of the primary route converted to DRI + EAF + 2020: 0 + 2025: 0 + 2030: 0.05 + 2035: 0.2 + 2040: 0.4 + 2045: 0.7 + 2050: 1 'H2_DRI' : 1.7 #H2 consumption in Direct Reduced Iron (DRI), MWh_H2,LHV/ton_Steel from 51kgH2/tSt in Vogl et al (2018) doi:10.1016/j.jclepro.2018.08.279 'elec_DRI' : 0.322 #electricity consumption in Direct Reduced Iron (DRI) shaft, MWh/tSt HYBRIT brochure https://ssabwebsitecdn.azureedge.net/-/media/hybrit/files/hybrit_brochure.pdf - 'Al_primary_fraction' : 0.2 # fraction of aluminium produced via the primary route versus scrap; today fraction is 0.4 + 'Al_primary_fraction' : # fraction of aluminium produced via the primary route versus scrap; today fraction is 0.4 + 2020: 0.4 + 2025: 0.375 + 2030: 0.35 + 2035: 0.325 + 2040: 0.3 + 2045: 0.25 + 2050: 0.2 'MWh_CH4_per_tNH3_SMR' : 10.8 # 2012's demand from https://ec.europa.eu/docsroom/documents/4165/attachments/1/translations/en/renditions/pdf 'MWh_elec_per_tNH3_SMR' : 0.7 # same source, assuming 94-6% split methane-elec of total energy demand 11.5 MWh/tNH3 'MWh_H2_per_tNH3_electrolysis' : 6.5 # from https://doi.org/10.1016/j.joule.2018.04.017, around 0.197 tH2/tHN3 (>3/17 since some H2 lost and used for energy) diff --git a/doc/release_notes.rst b/doc/release_notes.rst index e5bd8d10..ebdbdd7c 100644 --- a/doc/release_notes.rst +++ b/doc/release_notes.rst @@ -6,7 +6,8 @@ Future release ============== * Include new features here. -The share of shipping transformed into hydrogen fuel cell can be now defined for different years in the ``config.yaml`` file. The carbon emission from the remaining share is treated as a negative load on the atmospheric carbon dioxide bus, just like aviation and land transport emissions. +* The share of shipping transformed into hydrogen fuel cell can be now defined for different years in the ``config.yaml`` file. The carbon emission from the remaining share is treated as a negative load on the atmospheric carbon dioxide bus, just like aviation and land transport emissions. +* The transformation of the Steel and Aluminium production can be now defined for different years in the ``config.yaml`` file. PyPSA-Eur-Sec 0.5.0 (21st May 2021) =================================== diff --git a/scripts/build_industrial_production_per_country_tomorrow.py b/scripts/build_industrial_production_per_country_tomorrow.py index bc66077c..4bb9fab3 100644 --- a/scripts/build_industrial_production_per_country_tomorrow.py +++ b/scripts/build_industrial_production_per_country_tomorrow.py @@ -1,23 +1,34 @@ import pandas as pd +def get_parameter(item): + """Check whether it depends on investment year""" + if type(item) is dict: + return item[investment_year] + else: + return item +investment_year=int(snakemake.wildcards.planning_horizons[-4:]) + industrial_production = pd.read_csv(snakemake.input.industrial_production_per_country, index_col=0) total_steel = industrial_production[["Integrated steelworks","Electric arc"]].sum(axis=1) -fraction_primary_stays_primary = snakemake.config["industry"]["St_primary_fraction"]*total_steel.sum()/industrial_production["Integrated steelworks"].sum() +St_primary_fraction=get_parameter(snakemake.config["industry"]["St_primary_fraction"]) +DRI_fraction=get_parameter(snakemake.config["industry"]["DRI_fraction"]) +fraction_primary_stays_primary = St_primary_fraction*total_steel.sum()/industrial_production["Integrated steelworks"].sum() industrial_production.insert(2, "DRI + Electric arc", - fraction_primary_stays_primary*industrial_production["Integrated steelworks"]) + DRI_fraction*fraction_primary_stays_primary*industrial_production["Integrated steelworks"]) -industrial_production["Electric arc"] = total_steel - industrial_production["DRI + Electric arc"] -industrial_production["Integrated steelworks"] = 0. +industrial_production["Integrated steelworks"] = (1-DRI_fraction)*fraction_primary_stays_primary*industrial_production["Integrated steelworks"] +industrial_production["Electric arc"] = total_steel - industrial_production["DRI + Electric arc"] - industrial_production["Integrated steelworks"] +Al_primary_fraction=get_parameter(snakemake.config["industry"]["Al_primary_fraction"]) total_aluminium = industrial_production[["Aluminium - primary production","Aluminium - secondary production"]].sum(axis=1) -fraction_primary_stays_primary = snakemake.config["industry"]["Al_primary_fraction"]*total_aluminium.sum()/industrial_production["Aluminium - primary production"].sum() +fraction_primary_stays_primary = Al_primary_fraction*total_aluminium.sum()/industrial_production["Aluminium - primary production"].sum() industrial_production["Aluminium - primary production"] = fraction_primary_stays_primary*industrial_production["Aluminium - primary production"] industrial_production["Aluminium - secondary production"] = total_aluminium - industrial_production["Aluminium - primary production"] From fa8f7887f94af007d49b07a6158ece8250413a25 Mon Sep 17 00:00:00 2001 From: Fabian Neumann Date: Fri, 2 Jul 2021 09:31:41 +0200 Subject: [PATCH 17/90] Update scripts/prepare_sector_network.py --- scripts/prepare_sector_network.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/scripts/prepare_sector_network.py b/scripts/prepare_sector_network.py index ddcdc85b..c54e2a2e 100644 --- a/scripts/prepare_sector_network.py +++ b/scripts/prepare_sector_network.py @@ -72,9 +72,7 @@ def create_network_topology(n, prefix): candidates = pd.concat((candidates_p, candidates_n), sort=False) topo = candidates.groupby(["bus0", "bus1"], as_index=False).mean() - topo.rename(index=lambda x: prefix + topo.at[x, "bus0"] - + connector + topo.at[x, "bus1"], - inplace=True) + topo.index = topo.apply(lambda x: prefix + x.bus0 + connector + x.bus1, axis=1) return topo From 4ebbd294ec47d48649ae2e3f401504e4acb0b771 Mon Sep 17 00:00:00 2001 From: Fabian Neumann Date: Fri, 2 Jul 2021 09:34:24 +0200 Subject: [PATCH 18/90] apply suggestions from code review --- scripts/prepare_sector_network.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/scripts/prepare_sector_network.py b/scripts/prepare_sector_network.py index c54e2a2e..13b4751e 100644 --- a/scripts/prepare_sector_network.py +++ b/scripts/prepare_sector_network.py @@ -52,14 +52,12 @@ def add_lifetime_wind_solar(n): if carrier in index], 'lifetime']=costs.at[carrier_name,'lifetime'] -def create_network_topology(n, prefix): +def create_network_topology(n, prefix, connector=" -> "): """ create a network topology as the electric network, returns a pandas dataframe with bus0, bus1 and length """ - topo = pd.DataFrame(columns=["bus0", "bus1", "length"]) - connector = " -> " attrs = ["bus0", "bus1", "length"] candidates = pd.concat([n.lines[attrs], From fd1121af4a45f203ce97bd6c8fe1af23a9165f4e Mon Sep 17 00:00:00 2001 From: Fabian Neumann Date: Fri, 2 Jul 2021 11:07:35 +0200 Subject: [PATCH 19/90] add rule for build_biomass_transport_costs --- Snakefile | 18 +++++- scripts/build_biomass_transport_costs.py | 70 ++++++++++++++++++++++ scripts/convert_biomass_transport_costs.py | 62 ------------------- 3 files changed, 85 insertions(+), 65 deletions(-) create mode 100644 scripts/build_biomass_transport_costs.py delete mode 100644 scripts/convert_biomass_transport_costs.py diff --git a/Snakefile b/Snakefile index aba8ff71..45c33da9 100644 --- a/Snakefile +++ b/Snakefile @@ -180,6 +180,18 @@ rule build_biomass_potentials: script: 'scripts/build_biomass_potentials.py' +rule build_biomass_transport_costs: + input: "data/biomass/biomass potentials in europe_web rev.pdf" + output: + supply_chain1="resources/biomass_transport_costs_supply_chain1.csv", + supply_chain2="resources/biomass_transport_costs_supply_chain2.csv", + transport_costs="resources/biomass_transport_costs.csv", + threads: 1 + resources: mem_mb=1000 + benchmark: "benchmarks/build_biomass_transport_costs" + script: 'scripts/build_biomass_transport_costs.py' + + rule build_ammonia_production: input: usgs="data/myb1-2017-nitro.xls" @@ -321,10 +333,10 @@ rule prepare_sector_network: energy_totals_name='resources/energy_totals.csv', co2_totals_name='resources/co2_totals.csv', transport_name='resources/transport_data.csv', - traffic_data_KFZ = "data/emobility/KFZ__count", - traffic_data_Pkw = "data/emobility/Pkw__count", + traffic_data_KFZ="data/emobility/KFZ__count", + traffic_data_Pkw="data/emobility/Pkw__count", biomass_potentials='resources/biomass_potentials.csv', - biomass_transport='data/biomass/biomass_transport_costs.csv', + biomass_transport="resources/biomass_transport_costs.csv", heat_profile="data/heat_load_profile_BDEW.csv", costs=CDIR + "costs_{planning_horizons}.csv", profile_offwind_ac=pypsaeur("resources/profile_offwind-ac.nc"), diff --git a/scripts/build_biomass_transport_costs.py b/scripts/build_biomass_transport_costs.py new file mode 100644 index 00000000..ee681566 --- /dev/null +++ b/scripts/build_biomass_transport_costs.py @@ -0,0 +1,70 @@ +""" +Reads biomass transport costs for different countries of the JRC report + + "The JRC-EU-TIMES model. + Bioenergy potentials + for EU and neighbouring countries." + (2015) + +converts them from units 'EUR per km/ton' -> 'EUR/ (km MWh)' + +assuming as an approximation energy content of wood pellets + +@author: bw0928 +""" + +import pandas as pd +import tabula as tbl + +ENERGY_CONTENT = 4.8 # unit MWh/tonne (assuming wood pellets) + + +def build_biomass_transport_costs(): + + df_list = tbl.read_pdf( + snakemake.input[0], + pages="145-147", + multiple_tables=True, + ) + + countries = df_list[0][0].iloc[6:].rename(index=lambda x: x + 1) + + # supply chain 1 + df = df_list[1].copy().rename(index=countries.to_dict()) + df.rename( + columns=df.iloc[:6].apply(lambda col: col.str.cat(sep=" "), axis=0).to_dict(), + inplace=True, + ) + df = df.iloc[6:] + df.loc[6] = df.loc[6].str.replace("€", "EUR") + + # supply chain 2 + df2 = df_list[2].copy().rename(index=countries.to_dict()) + df2.rename( + columns=df2.iloc[:6].apply(lambda col: col.str.cat(sep=" "), axis=0).to_dict(), + inplace=True, + ) + df2 = df2.iloc[6:] + df2.loc[6] = df2.loc[6].str.replace("€", "EUR") + + df.to_csv(snakemake.output.supply_chain1) + df2.to_csv(snakemake.output.supply_chain1) + + transport_costs = pd.concat([df["per km/ton"], df2["per km/ton"]], axis=1).drop(6) + transport_costs = transport_costs.astype(float, errors="ignore").mean(axis=1) + + # convert unit to EUR/MWh + transport_costs /= ENERGY_CONTENT + transport_costs = pd.DataFrame(transport_costs, columns=["cost [EUR/(km MWh)]"]) + + # rename + transport_costs.rename({"UK": "GB", "XK": "KO", "EL": "GR"}, inplace=True) + + # add missing Norway + transport_costs.loc["NO"] = transport_costs.loc["SE"] + transport_costs.to_csv(snakemake.output.transport_costs) + + +if __name__ == "__main__": + + prepare_biomass_transport_costs() diff --git a/scripts/convert_biomass_transport_costs.py b/scripts/convert_biomass_transport_costs.py deleted file mode 100644 index 57bd455f..00000000 --- a/scripts/convert_biomass_transport_costs.py +++ /dev/null @@ -1,62 +0,0 @@ -#!/usr/bin/env python3 -# -*- coding: utf-8 -*- -""" -Created on Thu Mar 12 19:11:20 2020 - -reads biomass transport costs for different countries of the JRC report - - "The JRC-EU-TIMES model. - Bioenergy potentials - for EU and neighbouring countries." - (2015) - -converts them from units 'EUR per km/ton' -> 'EUR/ (km MWh)' - -assuming as an approximation energy content of wood pellets - -@author: bw0928 -""" - -import pandas as pd -from tabula import read_pdf -import numpy as np - -# read pdf file -df_list = read_pdf("biomass potentials in europe_web rev.pdf", - pages="145-147", - multiple_tables=True) -energy_content = 4.8 # unit MWh/tonne (assuming wood pellets) -# %% -columns = ["Komponente", "Größe", "Einheit", 2020, 2025, 2030, 2035, 2040, - 2045, 2050] -countries = df_list[0][0].iloc[6:].rename(index=lambda x: x+1) - -# supply chain 1 -df = df_list[1].copy().rename(index=countries.to_dict()) -df.rename(columns= df.iloc[:6].apply(lambda col: col.str.cat(sep=" "), - axis=0).to_dict(), inplace=True) -df = df.iloc[6:] -df.loc[6]=df.loc[6].str.replace("€", "EUR") - -# supply chain 2 -df2 = df_list[2].copy().rename(index=countries.to_dict()) -df2.rename(columns= df2.iloc[:6].apply(lambda col: col.str.cat(sep=" "), - axis=0).to_dict(), inplace=True) -df2 = df2.iloc[6:] -df2.loc[6]=df2.loc[6].str.replace("€", "EUR") - -#%% -df.to_csv("biomass_transport_costs_supply_chain1.csv") -df2.to_csv("biomass_transport_costs_supply_chain2.csv") - -transport_costs = pd.concat([df['per km/ton'], df2['per km/ton']],axis=1).drop(6) -transport_costs = transport_costs.astype(float, errors="ignore").mean(axis=1) - -# convert unit to EUR/MWh -transport_costs /= energy_content -transport_costs = pd.DataFrame(transport_costs, columns=["cost [EUR/(km MWh)]"]) -# rename -transport_costs.rename({"UK": "GB", "XK": "KO", "EL": "GR"}, inplace=True) -# add missing Norway -transport_costs.loc["NO"] = transport_costs.loc["SE"] -transport_costs.to_csv("biomass_transport_final.csv") From ad3da281176589958202ccd6240b9aefe106cd3d Mon Sep 17 00:00:00 2001 From: Fabian Neumann Date: Sat, 3 Jul 2021 13:03:47 +0200 Subject: [PATCH 20/90] small follow-up to merge --- config.default.yaml | 3 --- scripts/prepare_sector_network.py | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/config.default.yaml b/config.default.yaml index 715f4ce3..15b727aa 100644 --- a/config.default.yaml +++ b/config.default.yaml @@ -235,7 +235,6 @@ sector: industry: - # St_primary_fraction: 0.3 St_primary_fraction: # fraction of steel produced via primary route versus secondary route (scrap+EAF); today fraction is 0.6 2020: 0.6 2025: 0.55 @@ -254,7 +253,6 @@ industry: 2050: 1 H2_DRI: 1.7 #H2 consumption in Direct Reduced Iron (DRI), MWh_H2,LHV/ton_Steel from 51kgH2/tSt in Vogl et al (2018) doi:10.1016/j.jclepro.2018.08.279 elec_DRI: 0.322 #electricity consumption in Direct Reduced Iron (DRI) shaft, MWh/tSt HYBRIT brochure https://ssabwebsitecdn.azureedge.net/-/media/hybrit/files/hybrit_brochure.pdf - # Al_primary_fraction: 0.2 # fraction of aluminium produced via the primary route versus scrap; today fraction is 0.4 Al_primary_fraction: # fraction of aluminium produced via the primary route versus scrap; today fraction is 0.4 2020: 0.4 2025: 0.375 @@ -272,7 +270,6 @@ industry: HVC_primary_fraction: 1.0 #fraction of current non-ammonia basic chemicals produced via primary route hotmaps_locate_missing: false reference_year: 2015 - industry: costs: diff --git a/scripts/prepare_sector_network.py b/scripts/prepare_sector_network.py index 86d74656..a9482d6b 100644 --- a/scripts/prepare_sector_network.py +++ b/scripts/prepare_sector_network.py @@ -1716,7 +1716,7 @@ def add_industry(n, costs): all_navigation = ["total international navigation", "total domestic navigation"] efficiency = options['shipping_average_efficiency'] / costs.at["fuel cell", "efficiency"] - shipping_hydrogen_share = get_parameter(options['shipping_hydrogen_share']) + shipping_hydrogen_share = get(options['shipping_hydrogen_share'], investment_year) p_set = shipping_hydrogen_share * nodal_energy_totals.loc[nodes, all_navigation].sum(axis=1) * 1e6 * efficiency / 8760 n.madd("Load", From 82e9a48b74a181aaf0659e0d363f5bd17367e171 Mon Sep 17 00:00:00 2001 From: martavp Date: Mon, 5 Jul 2021 11:29:02 +0200 Subject: [PATCH 21/90] Add oil consumed in shipping as a load to EU oil bus --- config.default.yaml | 1 + scripts/prepare_sector_network.py | 9 +++++++++ 2 files changed, 10 insertions(+) diff --git a/config.default.yaml b/config.default.yaml index 15b727aa..3026a2f7 100644 --- a/config.default.yaml +++ b/config.default.yaml @@ -500,6 +500,7 @@ plotting: solid biomass: '#DAA520' today: '#D2691E' shipping: '#6495ED' + shipping oil: "#6495ED" shipping oil emissions: "#6495ED" electricity distribution grid: '#333333' H2 for industry: "#222222" diff --git a/scripts/prepare_sector_network.py b/scripts/prepare_sector_network.py index a9482d6b..17a2262f 100644 --- a/scripts/prepare_sector_network.py +++ b/scripts/prepare_sector_network.py @@ -1730,6 +1730,15 @@ def add_industry(n, costs): if shipping_hydrogen_share < 1: shipping_oil_share = 1 - shipping_hydrogen_share + + n.madd("Load", + nodes, + suffix=" shipping oil", + bus="EU oil", + carrier="shipping oil", + p_set=shipping_oil_share*nodal_energy_totals.loc[nodes,["total international navigation","total domestic navigation"]].sum(axis=1)*1e6/8760. + ) + co2 = shipping_oil_share * nodal_energy_totals.loc[nodes, all_navigation].sum().sum() * 1e6 / 8760 * costs.at["oil", "CO2 intensity"] n.add("Load", From 103ad496715661c2a603fa0b8275859c90e6ed4d Mon Sep 17 00:00:00 2001 From: martavp Date: Mon, 5 Jul 2021 12:19:43 +0200 Subject: [PATCH 22/90] Enable use of lower generators clustering than network clustering --- scripts/add_existing_baseyear.py | 66 ++++++++++++++++++++++++++++++++ scripts/solve_network.py | 35 +++++++++++++++++ 2 files changed, 101 insertions(+) diff --git a/scripts/add_existing_baseyear.py b/scripts/add_existing_baseyear.py index 47c31c0e..bb9e4ff1 100644 --- a/scripts/add_existing_baseyear.py +++ b/scripts/add_existing_baseyear.py @@ -152,9 +152,20 @@ def add_power_capacities_installed_before_baseyear(n, grouping_years, costs, bas df_agg.drop(df_agg.index[df_agg.Technology.isin(technology_to_drop)], inplace=True) df_agg.Fueltype = df_agg.Fueltype.map(rename_fuel) +<<<<<<< Updated upstream # assign clustered bus busmap_s = pd.read_csv(snakemake.input.busmap_s, index_col=0, squeeze=True) busmap = pd.read_csv(snakemake.input.busmap, index_col=0, squeeze=True) +======= + #assign clustered bus + busmap_s = pd.read_csv(snakemake.input.busmap_s, index_col=0).squeeze() + busmap = pd.read_csv(snakemake.input.busmap, index_col=0).squeeze() + + inv_busmap={} + for k,v in busmap.iteritems(): + inv_busmap[v]=inv_busmap.get(v,[]) + [k] + +>>>>>>> Stashed changes clustermaps = busmap_s.map(busmap) clustermaps.index = clustermaps.index.astype(int) @@ -192,6 +203,7 @@ def add_power_capacities_installed_before_baseyear(n, grouping_years, costs, bas capacity = capacity[capacity > snakemake.config['existing_capacities']['threshold_capacity']] if generator in ['solar', 'onwind', 'offwind']: +<<<<<<< Updated upstream rename = {"offwind": "offwind-ac"} p_max_pu=n.generators_t.p_max_pu[capacity.index + ' ' + rename.get(generator, generator) + '-' + str(baseyear)] @@ -210,6 +222,43 @@ def add_power_capacities_installed_before_baseyear(n, grouping_years, costs, bas lifetime=costs.at[generator, 'lifetime'] ) +======= + suffix='-ac' if generator=='offwind' else '' + if 'm' in snakemake.wildcards.clusters: + for ind in capacity.index: + # existing capacities are split evenly among regions in every country + inv_ind = [i for i in inv_busmap[ind]] + # for offshore the spliting only inludes coastal regions + inv_ind=[i for i in inv_ind if (i + ' ' + generator + suffix + '-' + str(baseyear)) in n.generators.index] + p_max_pu = n.generators_t.p_max_pu[[i + ' ' + generator + suffix + '-' + str(baseyear) for i in inv_ind ]] + p_max_pu.columns=[i + ' ' + generator + suffix + '-' + str(grouping_year) for i in inv_ind ] + + n.madd("Generator", + [i + ' ' + generator + suffix + '-' + str(grouping_year) for i in inv_ind ], + bus=ind, + carrier=generator, + p_nom=capacity[ind]/len(inv_ind), #split among regions in a country + marginal_cost=costs.at[generator,'VOM'], + capital_cost=costs.at[generator,'fixed'], + efficiency=costs.at[generator, 'efficiency'], + p_max_pu=p_max_pu, + build_year=grouping_year, + lifetime=costs.at[generator,'lifetime']) + else: + p_max_pu=n.generators_t.p_max_pu[capacity.index + ' ' + generator + suffix + '-' + str(baseyear)] + n.madd("Generator", + capacity.index, + suffix = ' ' + generator +"-"+ str(grouping_year), + bus=capacity.index, + carrier=generator, + p_nom=capacity, + marginal_cost=costs.at[generator,'VOM'], + capital_cost=costs.at[generator,'fixed'], + efficiency=costs.at[generator, 'efficiency'], + p_max_pu=p_max_pu.rename(columns=n.generators.bus), + build_year=grouping_year, + lifetime=costs.at[generator,'lifetime']) +>>>>>>> Stashed changes else: n.madd("Link", @@ -404,6 +453,7 @@ def add_heating_capacities_installed_before_baseyear(n, baseyear, grouping_years if __name__ == "__main__": if 'snakemake' not in globals(): +<<<<<<< Updated upstream from helper import mock_snakemake snakemake = mock_snakemake( 'add_existing_baseyear', @@ -412,6 +462,22 @@ if __name__ == "__main__": lv=1.0, sector_opts='Co2L0-168H-T-H-B-I-solar3-dist1', planning_horizons=2020, +======= + from vresutils.snakemake import MockSnakemake + snakemake = MockSnakemake( + wildcards=dict(network='elec', simpl='148', clusters='37m', lv='1.0', + sector_opts='168H-T-H-B-I-solar+p3-dist1-cb36.7ex0', + planning_horizons='2020'), + input=dict(network='pypsa-eur-sec/results/version-36.7ex0-168H/prenetworks/elec_s{simpl}_{clusters}_lv{lv}__{sector_opts}_{planning_horizons}.nc', + powerplants='pypsa-eur/resources/powerplants.csv', + busmap_s='pypsa-eur/resources/busmap_elec_s{simpl}.csv', + busmap='pypsa-eur/resources/busmap_elec_s{simpl}_{clusters}.csv', + costs='technology-data/outputs/costs_{planning_horizons}.csv', + cop_air_total="pypsa-eur-sec/resources/cop_air_total_elec_s{simpl}_{clusters}.nc", + cop_soil_total="pypsa-eur-sec/resources/cop_soil_total_elec_s{simpl}_{clusters}.nc", + clustered_pop_layout="pypsa-eur-sec/resources/pop_layout_elec_s{simpl}_{clusters}.csv",), + output=['pypsa-eur-sec/results/version-36.7ex0-168H/prenetworks_brownfield/elec_s{simpl}_{clusters}_lv{lv}__{sector_opts}_{planning_horizons}.nc'], +>>>>>>> Stashed changes ) logging.basicConfig(level=snakemake.config['logging_level']) diff --git a/scripts/solve_network.py b/scripts/solve_network.py index 8c0313f1..ce8b65f9 100644 --- a/scripts/solve_network.py +++ b/scripts/solve_network.py @@ -136,6 +136,7 @@ def add_chp_constraints(n): rhs = n.links.loc[electric_fix, "p_nom"].values +<<<<<<< Updated upstream define_constraints(n, lhs, "<=", rhs, 'chplink', 'top_iso_fuel_line_fix') if not electric.empty: @@ -148,6 +149,28 @@ def add_chp_constraints(n): link_p[electric].values)) define_constraints(n, lhs, "<=", 0, 'chplink', 'backpressure') +======= +def add_land_use_constraint(n): + if 'm' in snakemake.wildcards.clusters: + # if generators clustering is lower than network clustering, land_use + # accounting is at generators clusters + for carrier in ['solar', 'onwind', 'offwind-ac', 'offwind-dc']: + existing_capacities = n.generators.loc[n.generators.carrier==carrier,"p_nom"] + ind=list(set([i.split(sep=" ")[0] + ' ' + i.split(sep=" ")[1] for i in existing_capacities.index])) + previous_years= [str(y) for y in + snakemake.config["scenario"]["planning_horizons"] + + snakemake.config["existing_capacities"]["grouping_years"] + if y < int(snakemake.wildcards.planning_horizons)] + for p_year in previous_years: + ind2 = [i for i in ind if i + " " + carrier + "-" + p_year in existing_capacities.index] + n.generators.loc[[i + " " + carrier + "-" + snakemake.wildcards.planning_horizons for i in ind2], "p_nom_max"] -= existing_capacities.loc[[i + " " + carrier + "-" + p_year for i in ind2]].rename(lambda x: x[:-4]+snakemake.wildcards.planning_horizons) + else: + #warning: this will miss existing offwind which is not classed AC-DC and has carrier 'offwind' + for carrier in ['solar', 'onwind', 'offwind-ac', 'offwind-dc']: + existing_capacities = n.generators.loc[n.generators.carrier==carrier,"p_nom"].groupby(n.generators.bus.map(n.buses.location)).sum() + existing_capacities.index += " " + carrier + "-" + snakemake.wildcards.planning_horizons + n.generators.loc[existing_capacities.index,"p_nom_max"] -= existing_capacities +>>>>>>> Stashed changes def extra_functionality(n, snapshots): @@ -181,6 +204,7 @@ def solve_network(n, config, opts='', **kwargs): if __name__ == "__main__": if 'snakemake' not in globals(): +<<<<<<< Updated upstream from helper import mock_snakemake snakemake = mock_snakemake( 'solve_network', @@ -189,6 +213,17 @@ if __name__ == "__main__": lv=1.0, sector_opts='Co2L0-168H-T-H-B-I-solar3-dist1', planning_horizons=2050, +======= + from vresutils.snakemake import MockSnakemake, Dict + snakemake = MockSnakemake( + wildcards=dict(network='elec', simpl='148', clusters='37m', lv='1.0', + sector_opts='168H-T-H-B-I-solar+p3-dist1-cb36.7ex0', + co2_budget_name='', planning_horizons='2020'), + input=dict(network="pypsa-eur-sec/results/version-36.7ex0-168H/prenetworks_brownfield/elec_s{simpl}_{clusters}_lv{lv}__{sector_opts}_{planning_horizons}.nc"), + output=["results/networks/s{simpl}_{clusters}_lv{lv}_{sector_opts}_{co2_budget_name}_{planning_horizons}-test.nc"], + log=dict(gurobi="logs/elec_s{simpl}_{clusters}_lv{lv}_{sector_opts}_{co2_budget_name}_{planning_horizons}_gurobi-test.log", + python="logs/elec_s{simpl}_{clusters}_lv{lv}_{sector_opts}_{co2_budget_name}_{planning_horizons}_python-test.log") +>>>>>>> Stashed changes ) logging.basicConfig(filename=snakemake.log.python, From cc24859d7845e84da70b7dc011be0c424eec6c71 Mon Sep 17 00:00:00 2001 From: martavp Date: Mon, 5 Jul 2021 12:26:11 +0200 Subject: [PATCH 23/90] Update release_notes.rst --- doc/release_notes.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/release_notes.rst b/doc/release_notes.rst index bd99ce16..bac9c0c9 100644 --- a/doc/release_notes.rst +++ b/doc/release_notes.rst @@ -7,7 +7,7 @@ Future release .. note:: This unreleased version currently requires the master branches of PyPSA, PyPSA-Eur, and the technology-data repository. - +* The myopic option can now be used together with different clustering for the generators and the network. The existing renewable capacities are split evenly among the regions in every country. * Extended use of ``multiprocessing`` for much better performance (from up to 20 minutes to less than one minute). * Compatibility with ``atlite>=0.2``. Older versions of ``atlite`` will no longer work. From 195cabba0cb4b6a78890811452b57ba29f4e87bc Mon Sep 17 00:00:00 2001 From: Fabian Neumann Date: Tue, 6 Jul 2021 09:55:41 +0200 Subject: [PATCH 24/90] merge master --- scripts/add_existing_baseyear.py | 113 +++++++++++-------------------- scripts/solve_network.py | 73 +++++++++----------- 2 files changed, 74 insertions(+), 112 deletions(-) diff --git a/scripts/add_existing_baseyear.py b/scripts/add_existing_baseyear.py index bb9e4ff1..4d838f60 100644 --- a/scripts/add_existing_baseyear.py +++ b/scripts/add_existing_baseyear.py @@ -152,20 +152,14 @@ def add_power_capacities_installed_before_baseyear(n, grouping_years, costs, bas df_agg.drop(df_agg.index[df_agg.Technology.isin(technology_to_drop)], inplace=True) df_agg.Fueltype = df_agg.Fueltype.map(rename_fuel) -<<<<<<< Updated upstream # assign clustered bus busmap_s = pd.read_csv(snakemake.input.busmap_s, index_col=0, squeeze=True) busmap = pd.read_csv(snakemake.input.busmap, index_col=0, squeeze=True) -======= - #assign clustered bus - busmap_s = pd.read_csv(snakemake.input.busmap_s, index_col=0).squeeze() - busmap = pd.read_csv(snakemake.input.busmap, index_col=0).squeeze() - inv_busmap={} - for k,v in busmap.iteritems(): - inv_busmap[v]=inv_busmap.get(v,[]) + [k] + inv_busmap = {} + for k, v in busmap.iteritems(): + inv_busmap[v] = inv_busmap.get(v, []) + [k] ->>>>>>> Stashed changes clustermaps = busmap_s.map(busmap) clustermaps.index = clustermaps.index.astype(int) @@ -203,62 +197,54 @@ def add_power_capacities_installed_before_baseyear(n, grouping_years, costs, bas capacity = capacity[capacity > snakemake.config['existing_capacities']['threshold_capacity']] if generator in ['solar', 'onwind', 'offwind']: -<<<<<<< Updated upstream - - rename = {"offwind": "offwind-ac"} - p_max_pu=n.generators_t.p_max_pu[capacity.index + ' ' + rename.get(generator, generator) + '-' + str(baseyear)] - - n.madd("Generator", - capacity.index, - suffix=' ' + generator +"-"+ str(grouping_year), - bus=capacity.index, - carrier=generator, - p_nom=capacity, - marginal_cost=costs.at[generator, 'VOM'], - capital_cost=costs.at[generator, 'fixed'], - efficiency=costs.at[generator, 'efficiency'], - p_max_pu=p_max_pu.rename(columns=n.generators.bus), - build_year=grouping_year, - lifetime=costs.at[generator, 'lifetime'] - ) -======= - suffix='-ac' if generator=='offwind' else '' + suffix = '-ac' if generator == 'offwind' else '' + name_suffix = f' {generator}{suffix}-{baseyear}' + if 'm' in snakemake.wildcards.clusters: + for ind in capacity.index: + # existing capacities are split evenly among regions in every country inv_ind = [i for i in inv_busmap[ind]] + # for offshore the spliting only inludes coastal regions - inv_ind=[i for i in inv_ind if (i + ' ' + generator + suffix + '-' + str(baseyear)) in n.generators.index] - p_max_pu = n.generators_t.p_max_pu[[i + ' ' + generator + suffix + '-' + str(baseyear) for i in inv_ind ]] - p_max_pu.columns=[i + ' ' + generator + suffix + '-' + str(grouping_year) for i in inv_ind ] + inv_ind = [i for i in inv_ind if (i + name_suffix) in n.generators.index] + + p_max_pu = n.generators_t.p_max_pu[[i + name_suffix for i in inv_ind]] + p_max_pu.columns=[i + name_suffix for i in inv_ind ] n.madd("Generator", - [i + ' ' + generator + suffix + '-' + str(grouping_year) for i in inv_ind ], - bus=ind, - carrier=generator, - p_nom=capacity[ind]/len(inv_ind), #split among regions in a country - marginal_cost=costs.at[generator,'VOM'], - capital_cost=costs.at[generator,'fixed'], - efficiency=costs.at[generator, 'efficiency'], - p_max_pu=p_max_pu, - build_year=grouping_year, - lifetime=costs.at[generator,'lifetime']) + [i + name_suffix for i in inv_ind], + bus=ind, + carrier=generator, + p_nom=capacity[ind] / len(inv_ind), # split among regions in a country + marginal_cost=costs.at[generator,'VOM'], + capital_cost=costs.at[generator,'fixed'], + efficiency=costs.at[generator, 'efficiency'], + p_max_pu=p_max_pu, + build_year=grouping_year, + lifetime=costs.at[generator,'lifetime'] + ) + else: - p_max_pu=n.generators_t.p_max_pu[capacity.index + ' ' + generator + suffix + '-' + str(baseyear)] + + p_max_pu = n.generators_t.p_max_pu[capacity.index + name_suffix] + n.madd("Generator", - capacity.index, - suffix = ' ' + generator +"-"+ str(grouping_year), - bus=capacity.index, - carrier=generator, - p_nom=capacity, - marginal_cost=costs.at[generator,'VOM'], - capital_cost=costs.at[generator,'fixed'], - efficiency=costs.at[generator, 'efficiency'], - p_max_pu=p_max_pu.rename(columns=n.generators.bus), - build_year=grouping_year, - lifetime=costs.at[generator,'lifetime']) ->>>>>>> Stashed changes + capacity.index, + suffix=' ' + generator +"-"+ str(grouping_year), + bus=capacity.index, + carrier=generator, + p_nom=capacity, + marginal_cost=costs.at[generator, 'VOM'], + capital_cost=costs.at[generator, 'fixed'], + efficiency=costs.at[generator, 'efficiency'], + p_max_pu=p_max_pu.rename(columns=n.generators.bus), + build_year=grouping_year, + lifetime=costs.at[generator, 'lifetime'] + ) + else: n.madd("Link", @@ -453,7 +439,6 @@ def add_heating_capacities_installed_before_baseyear(n, baseyear, grouping_years if __name__ == "__main__": if 'snakemake' not in globals(): -<<<<<<< Updated upstream from helper import mock_snakemake snakemake = mock_snakemake( 'add_existing_baseyear', @@ -462,22 +447,6 @@ if __name__ == "__main__": lv=1.0, sector_opts='Co2L0-168H-T-H-B-I-solar3-dist1', planning_horizons=2020, -======= - from vresutils.snakemake import MockSnakemake - snakemake = MockSnakemake( - wildcards=dict(network='elec', simpl='148', clusters='37m', lv='1.0', - sector_opts='168H-T-H-B-I-solar+p3-dist1-cb36.7ex0', - planning_horizons='2020'), - input=dict(network='pypsa-eur-sec/results/version-36.7ex0-168H/prenetworks/elec_s{simpl}_{clusters}_lv{lv}__{sector_opts}_{planning_horizons}.nc', - powerplants='pypsa-eur/resources/powerplants.csv', - busmap_s='pypsa-eur/resources/busmap_elec_s{simpl}.csv', - busmap='pypsa-eur/resources/busmap_elec_s{simpl}_{clusters}.csv', - costs='technology-data/outputs/costs_{planning_horizons}.csv', - cop_air_total="pypsa-eur-sec/resources/cop_air_total_elec_s{simpl}_{clusters}.nc", - cop_soil_total="pypsa-eur-sec/resources/cop_soil_total_elec_s{simpl}_{clusters}.nc", - clustered_pop_layout="pypsa-eur-sec/resources/pop_layout_elec_s{simpl}_{clusters}.csv",), - output=['pypsa-eur-sec/results/version-36.7ex0-168H/prenetworks_brownfield/elec_s{simpl}_{clusters}_lv{lv}__{sector_opts}_{planning_horizons}.nc'], ->>>>>>> Stashed changes ) logging.basicConfig(level=snakemake.config['logging_level']) diff --git a/scripts/solve_network.py b/scripts/solve_network.py index ce8b65f9..2b916471 100644 --- a/scripts/solve_network.py +++ b/scripts/solve_network.py @@ -19,15 +19,43 @@ pypsa.pf.logger.setLevel(logging.WARNING) def add_land_use_constraint(n): - #warning: this will miss existing offwind which is not classed AC-DC and has carrier 'offwind' - for carrier in ['solar', 'onwind', 'offwind-ac', 'offwind-dc']: - existing = n.generators.loc[n.generators.carrier == carrier, "p_nom"].groupby(n.generators.bus.map(n.buses.location)).sum() - existing.index += " " + carrier + "-" + snakemake.wildcards.planning_horizons - n.generators.loc[existing.index, "p_nom_max"] -= existing + if 'm' in snakemake.wildcards.clusters: + add_land_use_constraint_m(n) + else: + #warning: this will miss existing offwind which is not classed AC-DC and has carrier 'offwind' + for carrier in ['solar', 'onwind', 'offwind-ac', 'offwind-dc']: + existing = n.generators.loc[n.generators.carrier==carrier,"p_nom"].groupby(n.generators.bus.map(n.buses.location)).sum() + existing.index += " " + carrier + "-" + snakemake.wildcards.planning_horizons + n.generators.loc[existing.index,"p_nom_max"] -= existing n.generators.p_nom_max.clip(lower=0, inplace=True) +def add_land_use_constraint_m(n): + # if generators clustering is lower than network clustering, land_use accounting is at generators clusters + + planning_horizons = snakemake.config["scenario"]["planning_horizons"] + grouping_years = snakemake.config["existing_capacities"]["grouping_years"] + current_horizon = snakemake.wildcards.planning_horizons + + for carrier in ['solar', 'onwind', 'offwind-ac', 'offwind-dc']: + + existing = n.generators.loc[n.generators.carrier==carrier,"p_nom"] + ind = list(set([i.split(sep=" ")[0] + ' ' + i.split(sep=" ")[1] for i in existing.index])) + + previous_years = [ + str(y) for y in + planning_horizons + grouping_years + if y < int(snakemake.wildcards.planning_horizons) + ] + + for p_year in previous_years: + ind2 = [i for i in ind if i + " " + carrier + "-" + p_year in existing.index] + sel_current = [i + " " + carrier + "-" + current_horizon for i in ind2] + sel_p_year = [i + " " + carrier + "-" + p_year for i in ind2] + n.generators.loc[sel_current, "p_nom_max"] -= existing.loc[sel_p_year].rename(lambda x: x[:-4] + current_horizon) + + def prepare_network(n, solve_opts=None): if 'clip_p_max_pu' in solve_opts: @@ -136,7 +164,6 @@ def add_chp_constraints(n): rhs = n.links.loc[electric_fix, "p_nom"].values -<<<<<<< Updated upstream define_constraints(n, lhs, "<=", rhs, 'chplink', 'top_iso_fuel_line_fix') if not electric.empty: @@ -149,28 +176,6 @@ def add_chp_constraints(n): link_p[electric].values)) define_constraints(n, lhs, "<=", 0, 'chplink', 'backpressure') -======= -def add_land_use_constraint(n): - if 'm' in snakemake.wildcards.clusters: - # if generators clustering is lower than network clustering, land_use - # accounting is at generators clusters - for carrier in ['solar', 'onwind', 'offwind-ac', 'offwind-dc']: - existing_capacities = n.generators.loc[n.generators.carrier==carrier,"p_nom"] - ind=list(set([i.split(sep=" ")[0] + ' ' + i.split(sep=" ")[1] for i in existing_capacities.index])) - previous_years= [str(y) for y in - snakemake.config["scenario"]["planning_horizons"] - + snakemake.config["existing_capacities"]["grouping_years"] - if y < int(snakemake.wildcards.planning_horizons)] - for p_year in previous_years: - ind2 = [i for i in ind if i + " " + carrier + "-" + p_year in existing_capacities.index] - n.generators.loc[[i + " " + carrier + "-" + snakemake.wildcards.planning_horizons for i in ind2], "p_nom_max"] -= existing_capacities.loc[[i + " " + carrier + "-" + p_year for i in ind2]].rename(lambda x: x[:-4]+snakemake.wildcards.planning_horizons) - else: - #warning: this will miss existing offwind which is not classed AC-DC and has carrier 'offwind' - for carrier in ['solar', 'onwind', 'offwind-ac', 'offwind-dc']: - existing_capacities = n.generators.loc[n.generators.carrier==carrier,"p_nom"].groupby(n.generators.bus.map(n.buses.location)).sum() - existing_capacities.index += " " + carrier + "-" + snakemake.wildcards.planning_horizons - n.generators.loc[existing_capacities.index,"p_nom_max"] -= existing_capacities ->>>>>>> Stashed changes def extra_functionality(n, snapshots): @@ -204,7 +209,6 @@ def solve_network(n, config, opts='', **kwargs): if __name__ == "__main__": if 'snakemake' not in globals(): -<<<<<<< Updated upstream from helper import mock_snakemake snakemake = mock_snakemake( 'solve_network', @@ -213,17 +217,6 @@ if __name__ == "__main__": lv=1.0, sector_opts='Co2L0-168H-T-H-B-I-solar3-dist1', planning_horizons=2050, -======= - from vresutils.snakemake import MockSnakemake, Dict - snakemake = MockSnakemake( - wildcards=dict(network='elec', simpl='148', clusters='37m', lv='1.0', - sector_opts='168H-T-H-B-I-solar+p3-dist1-cb36.7ex0', - co2_budget_name='', planning_horizons='2020'), - input=dict(network="pypsa-eur-sec/results/version-36.7ex0-168H/prenetworks_brownfield/elec_s{simpl}_{clusters}_lv{lv}__{sector_opts}_{planning_horizons}.nc"), - output=["results/networks/s{simpl}_{clusters}_lv{lv}_{sector_opts}_{co2_budget_name}_{planning_horizons}-test.nc"], - log=dict(gurobi="logs/elec_s{simpl}_{clusters}_lv{lv}_{sector_opts}_{co2_budget_name}_{planning_horizons}_gurobi-test.log", - python="logs/elec_s{simpl}_{clusters}_lv{lv}_{sector_opts}_{co2_budget_name}_{planning_horizons}_python-test.log") ->>>>>>> Stashed changes ) logging.basicConfig(filename=snakemake.log.python, From c3f554e442d8bb44e62d01a2b08631ac74625ebd Mon Sep 17 00:00:00 2001 From: Fabian Neumann Date: Tue, 6 Jul 2021 10:54:34 +0200 Subject: [PATCH 25/90] Update scripts/prepare_sector_network.py --- scripts/prepare_sector_network.py | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/scripts/prepare_sector_network.py b/scripts/prepare_sector_network.py index 17a2262f..3eafe8aa 100644 --- a/scripts/prepare_sector_network.py +++ b/scripts/prepare_sector_network.py @@ -1731,13 +1731,15 @@ def add_industry(n, costs): shipping_oil_share = 1 - shipping_hydrogen_share + p_set = shipping_oil_share * nodal_energy_totals.loc[nodes, all_navigation].sum(axis=1) * 1e6 / 8760. + n.madd("Load", - nodes, - suffix=" shipping oil", - bus="EU oil", - carrier="shipping oil", - p_set=shipping_oil_share*nodal_energy_totals.loc[nodes,["total international navigation","total domestic navigation"]].sum(axis=1)*1e6/8760. - ) + nodes, + suffix=" shipping oil", + bus="EU oil", + carrier="shipping oil", + p_set=p_set + ) co2 = shipping_oil_share * nodal_energy_totals.loc[nodes, all_navigation].sum().sum() * 1e6 / 8760 * costs.at["oil", "CO2 intensity"] From d976a8faf7af42e97ac3b35badccbd02fc269cd5 Mon Sep 17 00:00:00 2001 From: Fabian Neumann Date: Wed, 7 Jul 2021 17:58:47 +0200 Subject: [PATCH 26/90] add CO2 network [first draft] --- config.default.yaml | 1 + scripts/prepare_sector_network.py | 58 +++++++++++++++++++++++++------ 2 files changed, 49 insertions(+), 10 deletions(-) diff --git a/config.default.yaml b/config.default.yaml index 5f1fa1b8..ecadc3c0 100644 --- a/config.default.yaml +++ b/config.default.yaml @@ -214,6 +214,7 @@ sector: SMR: true co2_sequestration_potential: 200 #MtCO2/a sequestration potential for Europe co2_sequestration_cost: 20 #EUR/tCO2 for transport and sequestration of CO2 + co2_network: false cc_fraction: 0.9 # default fraction of CO2 captured with post-combustion capture hydrogen_underground_storage: true use_fischer_tropsch_waste_heat: true diff --git a/scripts/prepare_sector_network.py b/scripts/prepare_sector_network.py index fa485e6a..aca8d76f 100644 --- a/scripts/prepare_sector_network.py +++ b/scripts/prepare_sector_network.py @@ -277,6 +277,18 @@ def patch_electricity_network(n): def add_co2_tracking(n, options): + if options["co2_network"]: + nodes = pop_layout.index + co2_nodes = nodes + " co2 stored" + co2_locations = nodes + co2_vents = nodes + " co2 vent" + co2_max_sequestration = np.inf + else: + co2_nodes = "co2 stored" + co2_locations = "EU" + co2_vents = "co2 vent" + co2_max_sequestration = np.inf # TODO should be nodal sequestration potentials + # minus sign because opposite to how fossil fuels used: # CH4 burning puts CH4 down, atmosphere up n.add("Carrier", "co2", @@ -299,26 +311,33 @@ def add_co2_tracking(n, options): ) # this tracks CO2 stored, e.g. underground - n.add("Bus", - "co2 stored", - location="EU", + n.madd("Bus", + co2_nodes, + location=co2_locations, carrier="co2 stored" ) - n.add("Store", - "co2 stored", + n.madd("Store", + co2_nodes, e_nom_extendable=True, - e_nom_max=options['co2_sequestration_potential'] * 1e6, + e_nom_max=co2_max_sequestration, capital_cost=options['co2_sequestration_cost'], carrier="co2 stored", - bus="co2 stored" + bus=co2_nodes ) + # TODO if nodally resolved total allowed sequestration needs to + # be an extra_functionality constraint + # (best to implement it this way for either case) + # let e_nom_max represent geological potential + # don't forget to log duals of extra functionality! + # options['co2_sequestration_potential'] * 1e6 + if options['co2_vent']: - n.add("Link", - "co2 vent", - bus0="co2 stored", + n.madd("Link", + co2_vents, + bus0=co2_nodes, bus1="co2 atmosphere", carrier="co2 vent", efficiency=1., @@ -326,6 +345,25 @@ def add_co2_tracking(n, options): ) +def add_co2_network(n, costs): + + # TODO create co2 network topology from electricity + co2_links = pd.DataFrame() + + # assumed to be bidirectional + n.madd("Link", + co2_links.index, + bus0=co2_links.bus0.values + " co2 stored", + bus1=co2_links.bus1.values + " co2 stored", + p_min_pu=-1, + p_nom_extendable=True, + length=co2_links.length.values, + capital_cost=costs.at['CO2 pipeline', 'fixed'] * co2_links.length.values, + carrier="CO2 pipeline", + lifetime=costs.at['CO2 pipeline', 'lifetime'] + ) + + def add_dac(n, costs): heat_carriers = ["urban central heat", "services urban decentral heat"] From a98870e1597cc5cd25daa1d11cae14125960edec Mon Sep 17 00:00:00 2001 From: Fabian Neumann Date: Wed, 7 Jul 2021 18:07:57 +0200 Subject: [PATCH 27/90] correction for .madd() and call co2_network --- scripts/prepare_sector_network.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/scripts/prepare_sector_network.py b/scripts/prepare_sector_network.py index aca8d76f..c5a99fcc 100644 --- a/scripts/prepare_sector_network.py +++ b/scripts/prepare_sector_network.py @@ -284,9 +284,9 @@ def add_co2_tracking(n, options): co2_vents = nodes + " co2 vent" co2_max_sequestration = np.inf else: - co2_nodes = "co2 stored" + co2_nodes = ["co2 stored"] co2_locations = "EU" - co2_vents = "co2 vent" + co2_vents = ["co2 vent"] co2_max_sequestration = np.inf # TODO should be nodal sequestration potentials # minus sign because opposite to how fossil fuels used: @@ -2074,6 +2074,9 @@ if __name__ == "__main__": if "noH2network" in opts: remove_h2_network(n) + if options["co2_network"]: + add_co2_network(n, costs) + for o in opts: m = re.match(r'^\d+h$', o, re.IGNORECASE) if m is not None: From 2e336e5e7043976c97580471cbd6075d837bf742 Mon Sep 17 00:00:00 2001 From: lisazeyen Date: Thu, 8 Jul 2021 14:41:13 +0200 Subject: [PATCH 28/90] add missing wildcards for benchmarks, add new input data for district heating share --- Snakefile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Snakefile b/Snakefile index f52045cb..6ff7555f 100644 --- a/Snakefile +++ b/Snakefile @@ -223,7 +223,7 @@ rule build_industrial_production_per_country_tomorrow: industrial_production_per_country_tomorrow="resources/industrial_production_per_country_tomorrow_{planning_horizons}.csv" threads: 1 resources: mem_mb=1000 - benchmark: "benchmarks/build_industrial_production_per_country_tomorrow" + benchmark: "benchmarks/build_industrial_production_per_country_tomorrow_{planning_horizons}" script: 'scripts/build_industrial_production_per_country_tomorrow.py' @@ -248,7 +248,7 @@ rule build_industrial_production_per_node: industrial_production_per_node="resources/industrial_production_elec_s{simpl}_{clusters}_{planning_horizons}.csv" threads: 1 resources: mem_mb=1000 - benchmark: "benchmarks/build_industrial_production_per_node/s{simpl}_{clusters}" + benchmark: "benchmarks/build_industrial_production_per_node/s{simpl}_{clusters}_{planning_horizons}" script: 'scripts/build_industrial_production_per_node.py' @@ -261,7 +261,7 @@ rule build_industrial_energy_demand_per_node: industrial_energy_demand_per_node="resources/industrial_energy_demand_elec_s{simpl}_{clusters}_{planning_horizons}.csv" threads: 1 resources: mem_mb=1000 - benchmark: "benchmarks/build_industrial_energy_demand_per_node/s{simpl}_{clusters}" + benchmark: "benchmarks/build_industrial_energy_demand_per_node/s{simpl}_{clusters}_{planning_horizons}" script: 'scripts/build_industrial_energy_demand_per_node.py' @@ -323,6 +323,7 @@ rule prepare_sector_network: transport_name='resources/transport_data.csv', traffic_data_KFZ = "data/emobility/KFZ__count", traffic_data_Pkw = "data/emobility/Pkw__count", + dh_share = "data/district_heat_share.csv", biomass_potentials='resources/biomass_potentials.csv', heat_profile="data/heat_load_profile_BDEW.csv", costs=CDIR + "costs_{planning_horizons}.csv", From 76f36d0a1a2706f9bf2cf7fce0551f9676b133be Mon Sep 17 00:00:00 2001 From: lisazeyen Date: Thu, 8 Jul 2021 14:41:34 +0200 Subject: [PATCH 29/90] add option to take today's district heating share --- config.default.yaml | 8 +- scripts/prepare_sector_network.py | 124 +++++++++++++++++++----------- 2 files changed, 88 insertions(+), 44 deletions(-) diff --git a/config.default.yaml b/config.default.yaml index 3026a2f7..d23cc033 100644 --- a/config.default.yaml +++ b/config.default.yaml @@ -141,6 +141,12 @@ existing_capacities: sector: central: true central_fraction: 0.6 + district_heating_increase: true + dh_strength: + 2020: 0 # starting at today's share + 2030: 0.2 + 2040: 0.5 + 2050: 1 # maximum possible share defined in central fraction bev_dsm_restriction_value: 0.75 #Set to 0 for no restriction on BEV DSM bev_dsm_restriction_time: 7 #Time at which SOC of BEV has to be dsm_restriction_value transport_heating_deadband_upper: 20. @@ -332,7 +338,7 @@ solving: plotting: map: - boundaries: [-11, 30, 34, 71] + boundaries: [-11, 30, 34, 71] color_geomap: ocean: white land: whitesmoke diff --git a/scripts/prepare_sector_network.py b/scripts/prepare_sector_network.py index 3eafe8aa..92fce889 100644 --- a/scripts/prepare_sector_network.py +++ b/scripts/prepare_sector_network.py @@ -75,7 +75,7 @@ def co2_emissions_year(countries, opts, year): co2_emissions = co2_totals.loc[countries, sectors].sum().sum() # convert MtCO2 to GtCO2 - co2_emissions *= 0.001 + co2_emissions *= 0.001 return co2_emissions @@ -102,17 +102,17 @@ def build_carbon_budget(o, fn): #emissions at the beginning of the path (last year available 2018) e_0 = co2_emissions_year(countries, opts, year=2018) - + #emissions in 2019 and 2020 assumed equal to 2018 and substracted carbon_budget -= 2 * e_0 - + planning_horizons = snakemake.config['scenario']['planning_horizons'] t_0 = planning_horizons[0] if "be" in o: # final year in the path - t_f = t_0 + (2 * carbon_budget / e_0).round(0) + t_f = t_0 + (2 * carbon_budget / e_0).round(0) def beta_decay(t): cdf_term = (t - t_0) / (t_f - t_0) @@ -818,7 +818,7 @@ def insert_gas_distribution_costs(n, costs): # TODO options? f_costs = options['gas_distribution_grid_cost_factor'] - + print("Inserting gas distribution grid with investment cost factor of", f_costs) capital_cost = costs.loc['electricity distribution grid']["fixed"] * f_costs @@ -827,7 +827,7 @@ def insert_gas_distribution_costs(n, costs): gas_b = n.links.index[n.links.carrier.str.contains("gas boiler") & (~n.links.carrier.str.contains("urban central"))] n.links.loc[gas_b, "capital_cost"] += capital_cost - + # micro CHPs mchp = n.links.index[n.links.carrier.str.contains("micro gas")] n.links.loc[mchp, "capital_cost"] += capital_cost @@ -1075,7 +1075,7 @@ def add_land_transport(n, costs): suffix=" EV battery", carrier="Li ion" ) - + p_set = electric_share * (transport[nodes] + cycling_shift(transport[nodes], 1) + cycling_shift(transport[nodes], 2)) / 3 n.madd("Load", @@ -1086,8 +1086,8 @@ def add_land_transport(n, costs): p_set=p_set ) - - p_nom = nodal_transport_data["number cars"] * options.get("bev_charge_rate", 0.011) * electric_share + + p_nom = nodal_transport_data["number cars"] * options.get("bev_charge_rate", 0.011) * electric_share n.madd("Link", nodes, @@ -1119,7 +1119,7 @@ def add_land_transport(n, costs): if electric_share > 0 and options["bev_dsm"]: - e_nom = nodal_transport_data["number cars"] * options.get("bev_energy", 0.05) * options["bev_availability"] * electric_share + e_nom = nodal_transport_data["number cars"] * options.get("bev_energy", 0.05) * options["bev_availability"] * electric_share n.madd("Store", nodes, @@ -1179,12 +1179,11 @@ def add_heat(n, costs): sectors = ["residential", "services"] - nodes = create_nodes_for_heat_sector() + + nodes, dist_fraction, urban_fraction = create_nodes_for_heat_sector() #NB: must add costs of central heating afterwards (EUR 400 / kWpeak, 50a, 1% FOM from Fraunhofer ISE) - urban_fraction = options['central_fraction'] * pop_layout["urban"] / pop_layout[["urban", "rural"]].sum(axis=1) - # exogenously reduce space heat demand if options["reduce_space_heat_exogenously"]: dE = get(options["reduce_space_heat_exogenously_factor"], investment_year) @@ -1199,7 +1198,7 @@ def add_heat(n, costs): "services urban decentral", "urban central" ] - + for name in heat_systems: name_type = "central" if name == "urban central" else "decentral" @@ -1215,10 +1214,17 @@ def add_heat(n, costs): ## Add heat load for sector in sectors: + # heat demand weighting if "rural" in name: factor = 1 - urban_fraction[nodes[name]] - elif "urban" in name: - factor = urban_fraction[nodes[name]] + elif "urban central" in name: + factor = dist_fraction[nodes[name]] + elif "urban decentral" in name: + factor = urban_fraction[nodes[name]] - \ + dist_fraction[nodes[name]] + else: + factor = None + if sector in name: heat_load = heat_demand[[sector + " water",sector + " space"]].groupby(level=1,axis=1).sum()[nodes[name]].multiply(factor) @@ -1281,16 +1287,16 @@ def add_heat(n, costs): p_nom_extendable=True ) - + if isinstance(options["tes_tau"], dict): tes_time_constant_days = options["tes_tau"][name_type] else: logger.warning("Deprecated: a future version will require you to specify 'tes_tau' ", "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 + capital_cost = costs.at[name_type + ' water tank storage', 'fixed'] / 0.00117 / 40 n.madd("Store", nodes[name] + f" {name} water tanks", @@ -1503,24 +1509,55 @@ def create_nodes_for_heat_sector(): # rural are areas with low heating density and individual heating # urban are areas with high heating density # urban can be split into district heating (central) and individual heating (decentral) - + + ct_urban = pop_layout.urban.groupby(pop_layout["ct"]).sum() + pop_layout["urban_ct_fraction"] = pop_layout["urban"] / \ + pop_layout["ct"].map(ct_urban.get) + # todays district heating share per country + dist_heat_share_ct = pd.read_csv(snakemake.input.dh_share, index_col=0, + usecols=[0,1]).dropna()/100 + dist_heat_share = pop_layout.ct.map(dist_heat_share_ct["district heating share"]) + + sectors = ["residential", "services"] - + nodes = {} + urban_fraction = pop_layout["urban"] / \ + (pop_layout[["urban", "rural"]].sum(axis=1)) + for sector in sectors: nodes[sector + " rural"] = pop_layout.index + nodes[sector + " urban decentral"] = pop_layout.index - if options["central"]: - # TODO: this looks hardcoded, move to config - urban_decentral_ct = pd.Index(["ES", "GR", "PT", "IT", "BG"]) - nodes[sector + " urban decentral"] = pop_layout.index[pop_layout.ct.isin(urban_decentral_ct)] - else: - nodes[sector + " urban decentral"] = pop_layout.index - - # for central nodes, residential and services are aggregated - nodes["urban central"] = pop_layout.index.symmetric_difference(nodes["residential urban decentral"]) - - return nodes + if options["central"] and not options['district_heating_increase']: + central_fraction = options['central_fraction'] + dist_fraction = central_fraction * urban_fraction + nodes["urban central"] = dist_fraction.index + + if options['district_heating_increase']: # take current district heating share + dist_fraction = dist_heat_share * \ + pop_layout["urban_ct_fraction"] / pop_layout["fraction"] + nodes["urban central"] = dist_fraction.index + # if district heating share larger than urban fraction -> set urban + # fraction to district heating share + urban_fraction = pd.concat([urban_fraction, dist_fraction], + axis=1).max(axis=1) + diff = urban_fraction - dist_fraction + dist_fraction += diff * get(options["dh_strength"], investment_year) + print("************************************") + print( + "the current DH share compared to the maximum possible is increased \ + \n by a factor of ", + get(options["dh_strength"], investment_year), + "resulting DH share: ", + dist_fraction) + print("**********************************") + + else: + dist_fraction = urban_fraction * 0 + nodes["urban central"] = dist_fraction.index + + return nodes, dist_fraction, urban_fraction def add_biomass(n, costs): @@ -1730,9 +1767,9 @@ def add_industry(n, costs): if shipping_hydrogen_share < 1: shipping_oil_share = 1 - shipping_hydrogen_share - + p_set = shipping_oil_share * nodal_energy_totals.loc[nodes, all_navigation].sum(axis=1) * 1e6 / 8760. - + n.madd("Load", nodes, suffix=" shipping oil", @@ -1740,7 +1777,7 @@ def add_industry(n, costs): carrier="shipping oil", p_set=p_set ) - + co2 = shipping_oil_share * nodal_energy_totals.loc[nodes, all_navigation].sum().sum() * 1e6 / 8760 * costs.at["oil", "CO2 intensity"] n.add("Load", @@ -1759,7 +1796,7 @@ def add_industry(n, costs): ) if "EU oil Store" not in n.stores.index: - + #could correct to e.g. 0.001 EUR/kWh * annuity and O&M n.add("Store", "EU oil Store", @@ -1781,7 +1818,7 @@ def add_industry(n, costs): if options["oil_boilers"]: - nodes_heat = create_nodes_for_heat_sector() + nodes_heat = create_nodes_for_heat_sector()[0] for name in ["residential rural", "services rural", "residential urban decentral", "services urban decentral"]: @@ -1926,7 +1963,7 @@ def add_waste_heat(n): def decentral(n): - """Removes the electricity transmission system.""" + """Removes the electricity transmission system.""" n.lines.drop(n.lines.index, inplace=True) n.links.drop(n.links.index[n.links.carrier.isin(["DC", "B2B"])], inplace=True) @@ -1973,17 +2010,18 @@ def limit_individual_line_extension(n, maxext): hvdc = n.links.index[n.links.carrier == 'DC'] n.links.loc[hvdc, 'p_nom_max'] = n.links.loc[hvdc, 'p_nom'] + maxext - +#%% if __name__ == "__main__": if 'snakemake' not in globals(): from helper import mock_snakemake snakemake = mock_snakemake( 'prepare_sector_network', simpl='', - clusters=48, + opts="", + clusters="37", lv=1.0, sector_opts='Co2L0-168H-T-H-B-I-solar3-dist1', - planning_horizons=2020, + planning_horizons="2020", ) logging.basicConfig(level=snakemake.config['logging_level']) @@ -1998,7 +2036,7 @@ if __name__ == "__main__": n = pypsa.Network(snakemake.input.network, override_component_attrs=overrides) pop_layout = pd.read_csv(snakemake.input.clustered_pop_layout, index_col=0) - Nyears = n.snapshot_weightings.generators.sum() / 8760 + Nyears = n.snapshot_weightings.sum() / 8760 costs = prepare_costs(snakemake.input.costs, snakemake.config['costs']['USD2013_to_EUR2013'], @@ -2009,7 +2047,7 @@ if __name__ == "__main__": patch_electricity_network(n) if snakemake.config["foresight"] == 'myopic': - + add_lifetime_wind_solar(n, costs) conventional = snakemake.config['existing_capacities']['conventional_carriers'] From 56bdeafacbff5c731aa4859cec96917f3ed38ed1 Mon Sep 17 00:00:00 2001 From: Fabian Neumann Date: Fri, 9 Jul 2021 10:42:16 +0200 Subject: [PATCH 30/90] add co2 network topology --- scripts/prepare_sector_network.py | 37 ++++++++++++++++++++++++++++--- 1 file changed, 34 insertions(+), 3 deletions(-) diff --git a/scripts/prepare_sector_network.py b/scripts/prepare_sector_network.py index c5a99fcc..bff2d840 100644 --- a/scripts/prepare_sector_network.py +++ b/scripts/prepare_sector_network.py @@ -54,6 +54,39 @@ def get(item, investment_year=None): return item +def create_network_topology(n, prefix, connector=" -> "): + """ + Create a network topology like the power transmission network. + + Parameters + ---------- + n : pypsa.Network + prefix : str + connector : str + + Returns + ------- + pd.DataFrame with columns bus0, bus1 and length + """ + + attrs = ["bus0", "bus1", "length"] + + candidates = pd.concat([ + n.lines[attrs], + n.links.loc[n.links.carrier == "DC", attrs] + ]) + + positive_order = candidates.bus0 < candidates.bus1 + candidates_p = candidates[positive_order] + swap_buses = {"bus0": "bus1", "bus1": "bus0"} + candidates_n = candidates[~positive_order].rename(columns=swap_buses) + candidates = pd.concat([candidates_p, candidates_n]) + + topo = candidates.groupby(["bus0", "bus1"], as_index=False).mean() + topo.index = topo.apply(lambda c: prefix + c.bus0 + connector + c.bus1, axis=1) + return topo + + def co2_emissions_year(countries, opts, year): """ Calculate CO2 emissions in one specific year (e.g. 1990 or 2018). @@ -347,10 +380,8 @@ def add_co2_tracking(n, options): def add_co2_network(n, costs): - # TODO create co2 network topology from electricity - co2_links = pd.DataFrame() + co2_links = create_network_topology(n, "CO2 pipeline ") - # assumed to be bidirectional n.madd("Link", co2_links.index, bus0=co2_links.bus0.values + " co2 stored", From 62bba87cda517f253dce0ab6bb41d76b4831271a Mon Sep 17 00:00:00 2001 From: Fabian Neumann Date: Fri, 9 Jul 2021 10:42:16 +0200 Subject: [PATCH 31/90] add co2 network topology Co-authored-by: lisazeyen --- scripts/prepare_sector_network.py | 37 ++++++++++++++++++++++++++++--- 1 file changed, 34 insertions(+), 3 deletions(-) diff --git a/scripts/prepare_sector_network.py b/scripts/prepare_sector_network.py index c5a99fcc..bff2d840 100644 --- a/scripts/prepare_sector_network.py +++ b/scripts/prepare_sector_network.py @@ -54,6 +54,39 @@ def get(item, investment_year=None): return item +def create_network_topology(n, prefix, connector=" -> "): + """ + Create a network topology like the power transmission network. + + Parameters + ---------- + n : pypsa.Network + prefix : str + connector : str + + Returns + ------- + pd.DataFrame with columns bus0, bus1 and length + """ + + attrs = ["bus0", "bus1", "length"] + + candidates = pd.concat([ + n.lines[attrs], + n.links.loc[n.links.carrier == "DC", attrs] + ]) + + positive_order = candidates.bus0 < candidates.bus1 + candidates_p = candidates[positive_order] + swap_buses = {"bus0": "bus1", "bus1": "bus0"} + candidates_n = candidates[~positive_order].rename(columns=swap_buses) + candidates = pd.concat([candidates_p, candidates_n]) + + topo = candidates.groupby(["bus0", "bus1"], as_index=False).mean() + topo.index = topo.apply(lambda c: prefix + c.bus0 + connector + c.bus1, axis=1) + return topo + + def co2_emissions_year(countries, opts, year): """ Calculate CO2 emissions in one specific year (e.g. 1990 or 2018). @@ -347,10 +380,8 @@ def add_co2_tracking(n, options): def add_co2_network(n, costs): - # TODO create co2 network topology from electricity - co2_links = pd.DataFrame() + co2_links = create_network_topology(n, "CO2 pipeline ") - # assumed to be bidirectional n.madd("Link", co2_links.index, bus0=co2_links.bus0.values + " co2 stored", From 4f9d2f9d5f91286e334168a9ec8638d1d2141cd0 Mon Sep 17 00:00:00 2001 From: Fabian Neumann Date: Fri, 9 Jul 2021 12:50:40 +0200 Subject: [PATCH 32/90] add concept for management of spatial resolutions --- scripts/prepare_sector_network.py | 86 +++++++++++++++++++------------ 1 file changed, 54 insertions(+), 32 deletions(-) diff --git a/scripts/prepare_sector_network.py b/scripts/prepare_sector_network.py index bff2d840..0ef06a00 100644 --- a/scripts/prepare_sector_network.py +++ b/scripts/prepare_sector_network.py @@ -19,6 +19,37 @@ from helper import override_component_attrs import logging logger = logging.getLogger(__name__) +from types import SimpleNamespace +spatial = SimpleNamespace() + + +def define_spatial(nodes): + """ + Namespace for spatial + + Parameters + ---------- + nodes : list-like + """ + + global spatial + global options + + spatial.nodes = nodes + + spatial.co2 = SimpleNamespace() + + if options["co2_network"]: + spatial.co2.nodes = nodes + " co2 stored" + spatial.co2.locations = nodes + spatial.co2.vents = nodes + " co2 vent" + else: + spatial.co2.nodes = ["co2 stored"] + spatial.co2.locations = "EU" + spatial.co2.vents = ["co2 vent"] + + spatial.co2.df = pd.DataFrame(vars(spatial.co2), index=nodes) + def emission_sectors_from_opts(opts): @@ -310,18 +341,6 @@ def patch_electricity_network(n): def add_co2_tracking(n, options): - if options["co2_network"]: - nodes = pop_layout.index - co2_nodes = nodes + " co2 stored" - co2_locations = nodes - co2_vents = nodes + " co2 vent" - co2_max_sequestration = np.inf - else: - co2_nodes = ["co2 stored"] - co2_locations = "EU" - co2_vents = ["co2 vent"] - co2_max_sequestration = np.inf # TODO should be nodal sequestration potentials - # minus sign because opposite to how fossil fuels used: # CH4 burning puts CH4 down, atmosphere up n.add("Carrier", "co2", @@ -345,18 +364,18 @@ def add_co2_tracking(n, options): # this tracks CO2 stored, e.g. underground n.madd("Bus", - co2_nodes, - location=co2_locations, + spatial.co2.nodes, + location=spatial.co2.locations, carrier="co2 stored" ) n.madd("Store", - co2_nodes, + spatial.co2.nodes, e_nom_extendable=True, - e_nom_max=co2_max_sequestration, + e_nom_max=np.inf, capital_cost=options['co2_sequestration_cost'], carrier="co2 stored", - bus=co2_nodes + bus=spatial.co2.nodes ) # TODO if nodally resolved total allowed sequestration needs to @@ -369,8 +388,8 @@ def add_co2_tracking(n, options): if options['co2_vent']: n.madd("Link", - co2_vents, - bus0=co2_nodes, + spatial.co2.vents, + bus0=spatial.co2.nodes, bus1="co2 atmosphere", carrier="co2 vent", efficiency=1., @@ -408,7 +427,7 @@ def add_dac(n, costs): locations, suffix=" DAC", bus0="co2 atmosphere", - bus1="co2 stored", + bus1=spatial.co2.df.loc[locations, "nodes"].values, bus2=locations.values, bus3=heat_buses, carrier="DAC", @@ -1058,10 +1077,11 @@ def add_storage(n, costs): if options['methanation']: n.madd("Link", - nodes + " Sabatier", + spatial.nodes, + suffix=" Sabatier", bus0=nodes + " H2", bus1="EU gas", - bus2="co2 stored", + bus2=spatial.co2.nodes, p_nom_extendable=True, carrier="Sabatier", efficiency=costs.at["methanation", "efficiency"], @@ -1073,10 +1093,11 @@ def add_storage(n, costs): if options['helmeth']: n.madd("Link", - nodes + " helmeth", + spatial.nodes, + suffix=" helmeth", bus0=nodes, bus1="EU gas", - bus2="co2 stored", + bus2=spatial.co2.nodes, carrier="helmeth", p_nom_extendable=True, efficiency=costs.at["helmeth", "efficiency"], @@ -1089,11 +1110,12 @@ def add_storage(n, costs): if options['SMR']: n.madd("Link", - nodes + " SMR CC", + spatial.nodes, + suffix=" SMR CC", bus0="EU gas", bus1=nodes + " H2", bus2="co2 atmosphere", - bus3="co2 stored", + bus3=spatial.co2.nodes, p_nom_extendable=True, carrier="SMR CC", efficiency=costs.at["SMR CC", "efficiency"], @@ -1442,7 +1464,7 @@ def add_heat(n, costs): bus1=nodes[name], bus2=nodes[name] + " urban central heat", bus3="co2 atmosphere", - bus4="co2 stored", + bus4=spatial.co2.df.loc[nodes[name], "nodes"].values, carrier="urban central gas CHP CC", p_nom_extendable=True, capital_cost=costs.at['central gas CHP', 'fixed']*costs.at['central gas CHP', 'efficiency'] + costs.at['biomass CHP capture', 'fixed']*costs.at['gas', 'CO2 intensity'], @@ -1675,7 +1697,7 @@ def add_biomass(n, costs): bus1=urban_central, bus2=urban_central + " urban central heat", bus3="co2 atmosphere", - bus4="co2 stored", + bus4=spatial.co2.df.loc[urban_central, "nodes"].values, carrier="urban central solid biomass CHP CC", p_nom_extendable=True, capital_cost=costs.at[key, 'fixed'] * costs.at[key, 'efficiency'] + costs.at['biomass CHP capture', 'fixed'] * costs.at['solid biomass', 'CO2 intensity'], @@ -1726,7 +1748,7 @@ def add_industry(n, costs): bus0="EU solid biomass", bus1="solid biomass for industry", bus2="co2 atmosphere", - bus3="co2 stored", + bus3="co2 stored", # TODO co2: where to allocate if co2 is spatially resolved? carrier="solid biomass for industry CC", p_nom_extendable=True, capital_cost=costs.at["cement capture", "fixed"] * costs.at['solid biomass', 'CO2 intensity'], @@ -1764,7 +1786,7 @@ def add_industry(n, costs): bus0="EU gas", bus1="gas for industry", bus2="co2 atmosphere", - bus3="co2 stored", + bus3="co2 stored", # TODO co2: where to allocate if co2 is spatially resolved? carrier="gas for industry CC", p_nom_extendable=True, capital_cost=costs.at["cement capture", "fixed"] * costs.at['gas', 'CO2 intensity'], @@ -1847,7 +1869,7 @@ def add_industry(n, costs): nodes + " Fischer-Tropsch", bus0=nodes + " H2", bus1="EU oil", - bus2="co2 stored", + bus2=spatial.co2.nodes, carrier="Fischer-Tropsch", efficiency=costs.at["Fischer-Tropsch", 'efficiency'], capital_cost=costs.at["Fischer-Tropsch", 'fixed'], @@ -1940,7 +1962,7 @@ def add_industry(n, costs): "process emissions CC", bus0="process emissions", bus1="co2 atmosphere", - bus2="co2 stored", + bus2="co2 stored", # TODO co2: where to allocate if co2 is spatially resolved? carrier="process emissions CC", p_nom_extendable=True, capital_cost=costs.at["cement capture", "fixed"], From 2b204c45e421b8459371a46f79e0bb4e24c50851 Mon Sep 17 00:00:00 2001 From: Fabian Neumann Date: Fri, 9 Jul 2021 12:51:48 +0200 Subject: [PATCH 33/90] run define_spatial in __main__ --- scripts/prepare_sector_network.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/prepare_sector_network.py b/scripts/prepare_sector_network.py index 0ef06a00..0552790a 100644 --- a/scripts/prepare_sector_network.py +++ b/scripts/prepare_sector_network.py @@ -2075,6 +2075,8 @@ if __name__ == "__main__": patch_electricity_network(n) + define_spatial(pop_layout.index) + if snakemake.config["foresight"] == 'myopic': add_lifetime_wind_solar(n, costs) From cd99089628ea3c54925ddef7fa190a2d9e3bb729 Mon Sep 17 00:00:00 2001 From: Fabian Neumann Date: Fri, 9 Jul 2021 13:10:43 +0200 Subject: [PATCH 34/90] account for underwater fraction --- scripts/prepare_sector_network.py | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/scripts/prepare_sector_network.py b/scripts/prepare_sector_network.py index 0552790a..aced4719 100644 --- a/scripts/prepare_sector_network.py +++ b/scripts/prepare_sector_network.py @@ -100,12 +100,13 @@ def create_network_topology(n, prefix, connector=" -> "): pd.DataFrame with columns bus0, bus1 and length """ - attrs = ["bus0", "bus1", "length"] + ln_attrs = ["bus0", "bus1", "length"] + lk_attrs = ["bus0", "bus1", "length", "underwater_fraction"] candidates = pd.concat([ - n.lines[attrs], - n.links.loc[n.links.carrier == "DC", attrs] - ]) + n.lines[ln_attrs], + n.links.loc[n.links.carrier == "DC", lk_attrs] + ]).fillna(0) positive_order = candidates.bus0 < candidates.bus1 candidates_p = candidates[positive_order] @@ -400,6 +401,10 @@ def add_co2_tracking(n, options): def add_co2_network(n, costs): co2_links = create_network_topology(n, "CO2 pipeline ") + + cost_onshore = (1 - co2_links.underwater_fraction) * costs.at['CO2 pipeline', 'fixed'] * co2_links.length + cost_submarine = co2_links.underwater_fraction * costs.at['CO2 pipeline submarine', 'fixed'] * co2_links.length + capital_cost = cost_onshore + cost_submarine n.madd("Link", co2_links.index, @@ -408,7 +413,7 @@ def add_co2_network(n, costs): p_min_pu=-1, p_nom_extendable=True, length=co2_links.length.values, - capital_cost=costs.at['CO2 pipeline', 'fixed'] * co2_links.length.values, + capital_cost=capital_cost.values, carrier="CO2 pipeline", lifetime=costs.at['CO2 pipeline', 'lifetime'] ) From d58a7f86a45c4825c843d1a35f64715f7cd7c376 Mon Sep 17 00:00:00 2001 From: Fabian Neumann Date: Fri, 9 Jul 2021 13:22:00 +0200 Subject: [PATCH 35/90] allow copperplated carbon capture to be distributed freely to co2 stores --- scripts/prepare_sector_network.py | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/scripts/prepare_sector_network.py b/scripts/prepare_sector_network.py index aced4719..16eb12f6 100644 --- a/scripts/prepare_sector_network.py +++ b/scripts/prepare_sector_network.py @@ -1748,12 +1748,13 @@ def add_industry(n, costs): efficiency=1. ) - n.add("Link", - "solid biomass for industry CC", + n.madd("Link", + spatial.co2.locations, + suffix=" solid biomass for industry CC", bus0="EU solid biomass", bus1="solid biomass for industry", bus2="co2 atmosphere", - bus3="co2 stored", # TODO co2: where to allocate if co2 is spatially resolved? + bus3=spatial.co2.nodes, carrier="solid biomass for industry CC", p_nom_extendable=True, capital_cost=costs.at["cement capture", "fixed"] * costs.at['solid biomass', 'CO2 intensity'], @@ -1786,12 +1787,13 @@ def add_industry(n, costs): efficiency2=costs.at['gas', 'CO2 intensity'] ) - n.add("Link", - "gas for industry CC", + n.madd("Link", + spatial.co2.locations, + suffix=" gas for industry CC", bus0="EU gas", bus1="gas for industry", bus2="co2 atmosphere", - bus3="co2 stored", # TODO co2: where to allocate if co2 is spatially resolved? + bus3=spatial.co2.nodes, carrier="gas for industry CC", p_nom_extendable=True, capital_cost=costs.at["cement capture", "fixed"] * costs.at['gas', 'CO2 intensity'], @@ -1963,11 +1965,12 @@ def add_industry(n, costs): ) #assume enough local waste heat for CC - n.add("Link", - "process emissions CC", + n.madd("Link", + spatial.co2.locations, + suffix=" process emissions CC", bus0="process emissions", bus1="co2 atmosphere", - bus2="co2 stored", # TODO co2: where to allocate if co2 is spatially resolved? + bus2=spatial.co2.nodes, carrier="process emissions CC", p_nom_extendable=True, capital_cost=costs.at["cement capture", "fixed"], From 0127c47035e6b80133dcb1f210dc0316dc942e4a Mon Sep 17 00:00:00 2001 From: lisazeyen <35347358+lisazeyen@users.noreply.github.com> Date: Fri, 9 Jul 2021 13:56:44 +0200 Subject: [PATCH 36/90] Update prepare_sector_network.py bug fix when calculating urban central heat demand --- 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 92fce889..61a5c896 100644 --- a/scripts/prepare_sector_network.py +++ b/scripts/prepare_sector_network.py @@ -1229,7 +1229,7 @@ def add_heat(n, costs): heat_load = heat_demand[[sector + " water",sector + " space"]].groupby(level=1,axis=1).sum()[nodes[name]].multiply(factor) if name == "urban central": - heat_load = heat_demand.groupby(level=1,axis=1).sum()[nodes[name]].multiply(urban_fraction[nodes[name]] * (1 + options['district_heating_loss'])) + heat_load = heat_demand.groupby(level=1,axis=1).sum()[nodes[name]].multiply(factor * (1 + options['district_heating_loss'])) n.madd("Load", nodes[name], From 36fdde788760e0f7fc943975ff57b64cfb10d83e Mon Sep 17 00:00:00 2001 From: Fabian Neumann Date: Fri, 9 Jul 2021 14:36:13 +0200 Subject: [PATCH 37/90] correctly name co2 submarine pipeline! --- 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 16eb12f6..ca956e44 100644 --- a/scripts/prepare_sector_network.py +++ b/scripts/prepare_sector_network.py @@ -403,7 +403,7 @@ def add_co2_network(n, costs): co2_links = create_network_topology(n, "CO2 pipeline ") cost_onshore = (1 - co2_links.underwater_fraction) * costs.at['CO2 pipeline', 'fixed'] * co2_links.length - cost_submarine = co2_links.underwater_fraction * costs.at['CO2 pipeline submarine', 'fixed'] * co2_links.length + cost_submarine = co2_links.underwater_fraction * costs.at['CO2 submarine pipeline', 'fixed'] * co2_links.length capital_cost = cost_onshore + cost_submarine n.madd("Link", From 9039b130fa1dde78898fd4ceee9a5489d57c165c Mon Sep 17 00:00:00 2001 From: lisazeyen <35347358+lisazeyen@users.noreply.github.com> Date: Fri, 9 Jul 2021 15:30:21 +0200 Subject: [PATCH 38/90] bug fix to avoid same link names for DAX --- 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 61a5c896..54f1bab9 100644 --- a/scripts/prepare_sector_network.py +++ b/scripts/prepare_sector_network.py @@ -328,7 +328,7 @@ def add_co2_tracking(n, options): def add_dac(n, costs): - heat_carriers = ["urban central heat", "services urban decentral heat"] + heat_carriers = ["urban central heat"] heat_buses = n.buses.index[n.buses.carrier.isin(heat_carriers)] locations = n.buses.location[heat_buses] From 2563d1277a5daff685b50df9f1a7957f8f78f9e7 Mon Sep 17 00:00:00 2001 From: Fabian Neumann Date: Sun, 11 Jul 2021 17:52:32 +0200 Subject: [PATCH 39/90] spatially-explicit biomass potentials from ENSPRESO (NUTS2) --- Snakefile | 19 ++- config.default.yaml | 34 ++--- scripts/build_biomass_potentials.py | 193 ++++++++++++++++++++++------ scripts/prepare_sector_network.py | 11 +- 4 files changed, 186 insertions(+), 71 deletions(-) diff --git a/Snakefile b/Snakefile index b91785d9..286df421 100644 --- a/Snakefile +++ b/Snakefile @@ -1,4 +1,7 @@ +from snakemake.remote.HTTP import RemoteProvider as HTTPRemoteProvider +HTTP = HTTPRemoteProvider() + configfile: "config.yaml" @@ -170,13 +173,19 @@ rule build_energy_totals: rule build_biomass_potentials: input: - jrc_potentials="data/biomass/JRC Biomass Potentials.xlsx" + enspreso_biomass=HTTP.remote("https://cidportal.jrc.ec.europa.eu/ftp/jrc-opendata/ENSPRESO/ENSPRESO_BIOMASS.xlsx", keep_local=True), + nuts2="data/nuts/NUTS_RG_10M_2013_4326_LEVL_2.geojson", # https://gisco-services.ec.europa.eu/distribution/v2/nuts/download/#nuts21 + regions_onshore=pypsaeur("resources/regions_onshore_elec_s{simpl}_{clusters}.geojson"), + nuts3_population=pypsaeur("data/bundle/nama_10r_3popgdp.tsv.gz"), + swiss_cantons=pypsaeur("data/bundle/ch_cantons.csv"), + swiss_population=pypsaeur("data/bundle/je-e-21.03.02.xls"), + country_shapes=pypsaeur('resources/country_shapes.geojson') output: - biomass_potentials_all='resources/biomass_potentials_all.csv', - biomass_potentials='resources/biomass_potentials.csv' + biomass_potentials_all='resources/biomass_potentials_all_s{simpl}_{clusters}.csv', + biomass_potentials='resources/biomass_potentials_s{simpl}_{clusters}.csv' threads: 1 resources: mem_mb=1000 - benchmark: "benchmarks/build_biomass_potentials" + benchmark: "benchmarks/build_biomass_potentials_s{simpl}_{clusters}" script: 'scripts/build_biomass_potentials.py' @@ -323,7 +332,7 @@ rule prepare_sector_network: transport_name='resources/transport_data.csv', traffic_data_KFZ = "data/emobility/KFZ__count", traffic_data_Pkw = "data/emobility/Pkw__count", - biomass_potentials='resources/biomass_potentials.csv', + biomass_potentials='resources/biomass_potentials_s{simpl}_{clusters}.csv', heat_profile="data/heat_load_profile_BDEW.csv", costs=CDIR + "costs_{planning_horizons}.csv", profile_offwind_ac=pypsaeur("resources/profile_offwind-ac.nc"), diff --git a/config.default.yaml b/config.default.yaml index 457c3660..4161470e 100644 --- a/config.default.yaml +++ b/config.default.yaml @@ -99,28 +99,28 @@ energy: biomass: year: 2030 - scenario: Med + scenario: ENS_Med classes: solid biomass: - - Primary agricultural residues - - Forestry energy residue - - Secondary forestry residues - - Secondary Forestry residues sawdust - - Forestry residues from landscape care biomass + - Argicultural waste - Municipal waste + - Residues from landscape care + - Sawdust + - Secondary Forestry residues - woodchips not included: - - Bioethanol sugar beet biomass - - Rapeseeds for biodiesel - - sunflower and soya for Biodiesel - - Starchy crops biomass - - Grassy crops biomass - - Willow biomass - - Poplar biomass potential - - Roundwood fuelwood - - Roundwood Chips & Pellets + - Bioethanol barley, wheat, grain maize, oats, other cereals and rye + - Fuelwood residues + - C&P_RW + - FuelwoodRW + - Rape seed + - Sugar from sugar beet + - Miscanthus, switchgrass, RCG + - "Sunflower, soya seed " + - Poplar + - Willow biogas: - - Manure biomass potential - - Sludge biomass + - Manure solid, liquid + - Sludge solar_thermal: diff --git a/scripts/build_biomass_potentials.py b/scripts/build_biomass_potentials.py index f02c9093..59eb0051 100644 --- a/scripts/build_biomass_potentials.py +++ b/scripts/build_biomass_potentials.py @@ -1,55 +1,148 @@ import pandas as pd - -rename = {"UK" : "GB", "BH" : "BA"} +import geopandas as gpd -def build_biomass_potentials(): +def build_nuts_population_data(year=2013): - config = snakemake.config['biomass'] - year = config["year"] - scenario = config["scenario"] + pop = pd.read_csv( + snakemake.input.nuts3_population, + sep=r'\,| \t|\t', + engine='python', + na_values=[":"], + index_col=1 + )[str(year)] + + # only countries + pop.drop("EU28", inplace=True) - df = pd.read_excel(snakemake.input.jrc_potentials, - "Potentials (PJ)", - index_col=[0,1]) + # mapping from Cantons to NUTS3 + cantons = pd.read_csv(snakemake.input.swiss_cantons) + cantons = cantons.set_index(cantons.HASC.str[3:]).NUTS + cantons = cantons.str.pad(5, side='right', fillchar='0') - df.rename(columns={"Unnamed: 18": "Municipal waste"}, inplace=True) - df.drop(columns="Total", inplace=True) - df.replace("-", 0., inplace=True) + # get population by NUTS3 + swiss = pd.read_excel(snakemake.input.swiss_population, skiprows=3, index_col=0).loc["Residents in 1000"] + swiss = swiss.rename(cantons).filter(like="CH") - column = df.iloc[:,0] - countries = column.where(column.str.isalpha()).pad() - countries = [rename.get(ct, ct) for ct in countries] - countries_i = pd.Index(countries, name='country') - df.set_index(countries_i, append=True, inplace=True) + # aggregate also to higher order NUTS levels + swiss = [swiss.groupby(swiss.index.str[:i]).sum() for i in range(2, 6)] - df.drop(index='MS', level=0, inplace=True) + # merge Europe + Switzerland + pop = pd.DataFrame(pop.append(swiss), columns=["total"]) + + # add missing manually + pop["AL"] = 2893 + pop["BA"] = 3871 + pop["RS"] = 7210 + + pop["ct"] = pop.index.str[:2] + + return pop - # convert from PJ to MWh - df = df / 3.6 * 1e6 - df.to_csv(snakemake.output.biomass_potentials_all) +def enspreso_biomass_potentials(year=2020, scenario="ENS_Low"): + + glossary = pd.read_excel( + snakemake.input.enspreso_biomass, + sheet_name="Glossary", + usecols="B:D", + skiprows=1, + index_col=0 + ) + + df = pd.read_excel( + snakemake.input.enspreso_biomass, + sheet_name="ENER - NUTS2 BioCom E", + usecols="A:H" + ) - # solid biomass includes: - # Primary agricultural residues (MINBIOAGRW1), - # Forestry energy residue (MINBIOFRSF1), - # Secondary forestry residues (MINBIOWOOW1), - # Secondary Forestry residues – sawdust (MINBIOWOO1a)', - # Forestry residues from landscape care biomass (MINBIOFRSF1a), - # Municipal waste (MINBIOMUN1)', + df["group"] = df["E-Comm"].map(glossary.group) + df["commodity"] = df["E-Comm"].map(glossary.description) - # biogas includes: - # Manure biomass potential (MINBIOGAS1), - # Sludge biomass (MINBIOSLU1), + to_rename = { + "NUTS2 Potential available by Bio Commodity": "potential", + "NUST2": "NUTS2", + } + df.rename(columns=to_rename, inplace=True) + + # fill up with NUTS0 if NUTS2 is not given + df.NUTS2 = df.apply(lambda x: x.NUTS0 if x.NUTS2 == '-' else x.NUTS2, axis=1) - df = df.loc[year, scenario, :] + # convert PJ to TWh + df.potential /= 3.6 + df.Unit = "TWh/a" - grouper = {v: k for k, vv in config["classes"].items() for v in vv} - df = df.groupby(grouper, axis=1).sum() + dff = df.query("Year == @year and Scenario == @scenario") - df.index.name = "MWh/a" + bio = dff.groupby(["NUTS2", "commodity"]).potential.sum().unstack() + + # currently Serbia and Kosovo not split, so aggregate + bio.loc["RS"] += bio.loc["XK"] + bio.drop("XK", inplace=True) + + return bio - df.to_csv(snakemake.output.biomass_potentials) + +def disaggregate_nuts0(bio): + + pop = build_nuts_population_data() + + # get population in nuts2 + pop_nuts2 = pop.loc[pop.index.str.len() == 4] + by_country = pop_nuts2.total.groupby(pop_nuts2.ct).sum() + pop_nuts2["fraction"] = pop_nuts2.total / pop_nuts2.ct.map(by_country) + + # distribute nuts0 data to nuts2 by population + bio_nodal = bio.loc[pop_nuts2.ct] + bio_nodal.index = pop_nuts2.index + bio_nodal = bio_nodal.mul(pop_nuts2.fraction, axis=0) + + # update inplace + bio.update(bio_nodal) + + return bio + + +def build_nuts2_shapes(): + """ + - load NUTS2 geometries + - add RS, AL, BA country shapes (not covered in NUTS 2013) + - consistently name ME, MK + """ + + nuts2 = gpd.GeoDataFrame(gpd.read_file(snakemake.input.nuts2).set_index('id').geometry) + + countries = gpd.read_file(snakemake.input.country_shapes).set_index('name') + missing = countries.loc[["AL", "RS", "BA"]] + nuts2.rename(index={"ME00": "ME", "MK00": "MK"}, inplace=True) + + return nuts2.append(missing) + + +def area(gdf): + """Returns area of GeoDataFrame geometries in square kilometers.""" + return gdf.to_crs(epsg=3035).area.div(1e6) + + +def convert_nuts2_to_regions(bio_nuts2, regions): + + # calculate area of nuts2 regions + bio_nuts2["area_nuts2"] = area(bio_nuts2) + + overlay = gpd.overlay(regions, bio_nuts2) + + # calculate share of nuts2 area inside region + overlay["share"] = area(overlay) / overlay["area_nuts2"] + + # multiply all nuts2-level values with share of nuts2 inside region + adjust_cols = overlay.columns.difference({"name", "area_nuts2", "geometry", "share"}) + overlay[adjust_cols] = overlay[adjust_cols].multiply(overlay["share"], axis=0) + + bio_regions = overlay.groupby("name").sum() + + bio_regions.drop(["area_nuts2", "share"], axis=1, inplace=True) + + return bio_regions if __name__ == "__main__": @@ -57,12 +150,28 @@ if __name__ == "__main__": from helper import mock_snakemake snakemake = mock_snakemake('build_biomass_potentials') + config = snakemake.config['biomass'] + year = config["year"] + scenario = config["scenario"] - # This is a hack, to be replaced once snakemake is unicode-conform + enspreso = enspreso_biomass_potentials(year, scenario) - solid_biomass = snakemake.config['biomass']['classes']['solid biomass'] - if 'Secondary Forestry residues sawdust' in solid_biomass: - solid_biomass.remove('Secondary Forestry residues sawdust') - solid_biomass.append('Secondary Forestry residues – sawdust') + enspreso = disaggregate_nuts0(enspreso) - build_biomass_potentials() + nuts2 = build_nuts2_shapes() + + df_nuts2 = gpd.GeoDataFrame(nuts2.geometry).join(enspreso) + + regions = gpd.read_file(snakemake.input.regions_onshore) + + df = convert_nuts2_to_regions(df_nuts2, regions) + + df.to_csv(snakemake.output.biomass_potentials_all) + + grouper = {v: k for k, vv in config["classes"].items() for v in vv} + df = df.groupby(grouper, axis=1).sum() + + df *= 1e6 # TWh/a to MWh/a + df.index.name = "MWh/a" + + df.to_csv(snakemake.output.biomass_potentials) diff --git a/scripts/prepare_sector_network.py b/scripts/prepare_sector_network.py index 82e15e60..ebf2ee71 100644 --- a/scripts/prepare_sector_network.py +++ b/scripts/prepare_sector_network.py @@ -1527,9 +1527,6 @@ def add_biomass(n, costs): print("adding biomass") - # biomass distributed at country level - i.e. transport within country allowed - countries = n.buses.country.dropna().unique() - biomass_potentials = pd.read_csv(snakemake.input.biomass_potentials, index_col=0) n.add("Carrier", "biogas") @@ -1552,18 +1549,18 @@ def add_biomass(n, costs): "EU biogas", bus="EU biogas", carrier="biogas", - e_nom=biomass_potentials.loc[countries, "biogas"].sum(), + e_nom=biomass_potentials["biogas"].sum(), marginal_cost=costs.at['biogas', 'fuel'], - e_initial=biomass_potentials.loc[countries, "biogas"].sum() + e_initial=biomass_potentials["biogas"].sum() ) n.add("Store", "EU solid biomass", bus="EU solid biomass", carrier="solid biomass", - e_nom=biomass_potentials.loc[countries, "solid biomass"].sum(), + e_nom=biomass_potentials["solid biomass"].sum(), marginal_cost=costs.at['solid biomass', 'fuel'], - e_initial=biomass_potentials.loc[countries, "solid biomass"].sum() + e_initial=biomass_potentials["solid biomass"].sum() ) n.add("Link", From d1298fa93d20f103de3c8a0d81d45f8e149d4df6 Mon Sep 17 00:00:00 2001 From: Fabian Neumann Date: Mon, 12 Jul 2021 12:31:18 +0200 Subject: [PATCH 40/90] use spatial namespace to manage biomass transport resolution --- scripts/build_biomass_transport_costs.py | 2 +- scripts/prepare_sector_network.py | 254 ++++++++++------------- 2 files changed, 109 insertions(+), 147 deletions(-) diff --git a/scripts/build_biomass_transport_costs.py b/scripts/build_biomass_transport_costs.py index ee681566..703d81ae 100644 --- a/scripts/build_biomass_transport_costs.py +++ b/scripts/build_biomass_transport_costs.py @@ -67,4 +67,4 @@ def build_biomass_transport_costs(): if __name__ == "__main__": - prepare_biomass_transport_costs() + build_biomass_transport_costs() diff --git a/scripts/prepare_sector_network.py b/scripts/prepare_sector_network.py index e77dac56..91bcc2e9 100644 --- a/scripts/prepare_sector_network.py +++ b/scripts/prepare_sector_network.py @@ -19,10 +19,43 @@ from helper import override_component_attrs import logging logger = logging.getLogger(__name__) +from types import SimpleNamespace +spatial = SimpleNamespace() + + +def define_spatial(nodes): + """ + Namespace for spatial + + Parameters + ---------- + nodes : list-like + """ + + global spatial + global options + + spatial.nodes = nodes + + spatial.biomass = SimpleNamespace() + + if options["biomass_transport"]: + spatial.biomass.nodes = nodes + " solid biomass" + spatial.biomass.locations = nodes + spatial.biomass.industry = nodes + " solid biomass for industry" + spatial.biomass.industry_cc = nodes + " solid biomass for industry CC" + else: + spatial.biomass.nodes = ["EU solid biomass"] + spatial.biomass.locations = "EU" + spatial.biomass.industry = ["solid biomass for industry"] + spatial.biomass.industry_cc = ["solid biomass for industry CC"] + + spatial.biomass.df = pd.DataFrame(vars(spatial.biomass), index=nodes) + def emission_sectors_from_opts(opts): - sectors = ["electricity"] + sectors = ["electricity"] if "T" in opts: sectors += [ "rail non-elec", @@ -144,25 +177,50 @@ def add_lifetime_wind_solar(n, costs): n.generators.loc[gen_i, "lifetime"] = costs.at[carrier, 'lifetime'] -def create_network_topology(n, prefix, connector=" -> "): +def create_network_topology(n, prefix, connector=" -> ", bidirectional=True): """ - create a network topology as the electric network, - returns a pandas dataframe with bus0, bus1 and length + Create a network topology like the power transmission network. + + Parameters + ---------- + n : pypsa.Network + prefix : str + connector : str + bidirectional : bool, default True + True: one link for each connection + False: one link for each connection and direction (back and forth) + + Returns + ------- + pd.DataFrame with columns bus0, bus1 and length """ - attrs = ["bus0", "bus1", "length"] + ln_attrs = ["bus0", "bus1", "length"] + lk_attrs = ["bus0", "bus1", "length", "underwater_fraction"] - candidates = pd.concat([n.lines[attrs], - n.links.loc[n.links.carrier == "DC", attrs]]) + candidates = pd.concat([ + n.lines[ln_attrs], + n.links.loc[n.links.carrier == "DC", lk_attrs] + ]).fillna(0) positive_order = candidates.bus0 < candidates.bus1 candidates_p = candidates[positive_order] - candidates_n = (candidates[~ positive_order] - .rename(columns={"bus0": "bus1", "bus1": "bus0"})) - candidates = pd.concat((candidates_p, candidates_n), sort=False) + swap_buses = {"bus0": "bus1", "bus1": "bus0"} + candidates_n = candidates[~positive_order].rename(columns=swap_buses) + candidates = pd.concat([candidates_p, candidates_n]) + + def make_index(c): + return prefix + c.bus0 + connector + c.bus1 topo = candidates.groupby(["bus0", "bus1"], as_index=False).mean() - topo.index = topo.apply(lambda x: prefix + x.bus0 + connector + x.bus1, axis=1) + topo.index = topo.apply(make_index, axis=1) + + if not bidirectional: + topo_reverse = topo.copy() + topo_reverse.rename(columns=swap_buses, inplace=True) + topo_reverse.index = topo_reverse.apply(make_index, axis=1) + topo = topo.append(topo_reverse) + return topo @@ -1554,8 +1612,11 @@ def add_biomass(n, costs): biomass_potentials = pd.read_csv(snakemake.input.biomass_potentials, index_col=0) - transport_costs = pd.read_csv(snakemake.input.biomass_transport, - index_col=0) + transport_costs = pd.read_csv( + snakemake.input.biomass_transport, + index_col=0, + squeeze=True + ) # potential per node distributed within country by population biomass_pot_node = (biomass_potentials.loc[pop_layout.ct] @@ -1572,7 +1633,8 @@ def add_biomass(n, costs): ) n.madd("Bus", - biomass_pot_node.index + " solid biomass", + spatial.biomass.nodes, + location=spatial.biomass.locations, carrier="solid biomass" ) @@ -1586,8 +1648,8 @@ def add_biomass(n, costs): ) n.madd("Store", - biomass_pot_node.index + " solid biomass", - bus=biomass_pot_node.index + " solid biomass", + spatial.biomass.nodes, + bus=spatial.biomass.nodes, carrier="solid biomass", e_nom=biomass_pot_node["solid biomass"].values, marginal_cost=costs.at['solid biomass', 'fuel'], @@ -1606,34 +1668,26 @@ def add_biomass(n, costs): p_nom_extendable=True ) - # add biomass transport - biomass_transport = create_network_topology(n, "Biomass transport ") + if options["biomass_transport"]: + + # add biomass transport + biomass_transport = create_network_topology(n, "biomass transport ", bidirectional=False) - # make transport in both directions - df = biomass_transport.copy() - df["bus1"] = biomass_transport.bus0 - df["bus0"] = biomass_transport.bus1 - df.rename(index=lambda x: "Biomass transport " + df.at[x, "bus0"] - + " -> " + df.at[x, "bus1"], inplace=True) - biomass_transport = pd.concat([biomass_transport, df]) - - # costs - bus0_costs = biomass_transport.bus0.apply(lambda x: transport_costs.loc[x[:2]]) - bus1_costs = biomass_transport.bus1.apply(lambda x: transport_costs.loc[x[:2]]) - biomass_transport["costs"] = pd.concat([bus0_costs, bus1_costs], - axis=1).mean(axis=1) - - n.madd("Link", - biomass_transport.index, - bus0=biomass_transport.bus0 + " solid biomass", - bus1=biomass_transport.bus1 + " solid biomass", - p_nom_extendable=True, - length=biomass_transport.length.values, - marginal_cost=biomass_transport.costs * biomass_transport.length.values, - capital_cost=1, - carrier="solid biomass transport" - ) + # costs + bus0_costs = biomass_transport.bus0.apply(lambda x: transport_costs[x[:2]]) + bus1_costs = biomass_transport.bus1.apply(lambda x: transport_costs[x[:2]]) + biomass_transport["costs"] = pd.concat([bus0_costs, bus1_costs], axis=1).mean(axis=1) + n.madd("Link", + biomass_transport.index, + bus0=biomass_transport.bus0 + " solid biomass", + bus1=biomass_transport.bus1 + " solid biomass", + p_nom_extendable=True, + length=biomass_transport.length.values, + marginal_cost=biomass_transport.costs * biomass_transport.length.values, + capital_cost=1, + carrier="solid biomass transport" + ) #AC buses with district heating urban_central = n.buses.index[n.buses.carrier == "urban central heat"] @@ -1644,7 +1698,7 @@ def add_biomass(n, costs): n.madd("Link", urban_central + " urban central solid biomass CHP", - bus0=urban_central + " solid biomass", + bus0=spatial.biomass.df.loc[urban_central, "nodes"].values, bus1=urban_central, bus2=urban_central + " urban central heat", carrier="urban central solid biomass CHP", @@ -1658,7 +1712,7 @@ def add_biomass(n, costs): n.madd("Link", urban_central + " urban central solid biomass CHP CC", - bus0=urban_central + " solid biomass", + bus0=spatial.biomass.df.loc[urban_central, "nodes"].values, bus1=urban_central, bus2=urban_central + " urban central heat", bus3="co2 atmosphere", @@ -1684,36 +1738,34 @@ def add_industry(n, costs): # 1e6 to convert TWh to MWh industrial_demand = pd.read_csv(snakemake.input.industrial_demand, index_col=0) * 1e6 - solid_biomass_by_country = industrial_demand["solid biomass"] - n.madd("Bus", - industrial_demand.index + " solid biomass for industry", - location="EU", + spatial.biomass.df.loc[industrial_demand.index, "industry"].values, + location=spatial.biomass.df.loc[industrial_demand.index, "locations"].values, carrier="solid biomass for industry" ) p_set = industrial_demand["solid biomass"].rename(index=lambda x: x + " solid biomass for industry") / 8760 n.madd("Load", - industrial_demand.index + " solid biomass for industry", - bus=industrial_demand.index + " solid biomass for industry", + spatial.biomass.df.loc[industrial_demand.index, "industry"].values, + bus=spatial.biomass.df.loc[industrial_demand.index, "industry"].values, carrier="solid biomass for industry", p_set=p_set ) n.madd("Link", - industrial_demand.index + " solid biomass for industry", - bus0=industrial_demand.index + " solid biomass", - bus1=industrial_demand.index + " solid biomass for industry", + spatial.biomass.df.loc[industrial_demand.index, "industry"].values, + bus0=spatial.biomass.df.loc[industrial_demand.index, "nodes"].values, + bus1=spatial.biomass.df.loc[industrial_demand.index, "industry"].values, carrier="solid biomass for industry", p_nom_extendable=True, efficiency=1. ) n.madd("Link", - industrial_demand.index + " solid biomass for industry CC", - bus0=industrial_demand.index + " solid biomass", - bus1=industrial_demand.index + " solid biomass for industry", + spatial.biomass.df.loc[industrial_demand.index, "industry_cc"].values, + bus0=spatial.biomass.df.loc[industrial_demand.index, "nodes"].values, + bus1=spatial.biomass.df.loc[industrial_demand.index, "industry_cc"].values, bus2="co2 atmosphere", bus3="co2 stored", carrier="solid biomass for industry CC", @@ -2000,93 +2052,6 @@ def maybe_adjust_costs_and_potentials(n, opts): print("changing", attr , "for", carrier, "by factor", factor) -def remove_biomass_transport(n): - - print("no transport of solid biomass considered") - - # remove country specific biomass buses - n.buses = n.buses[~n.buses.carrier.str.contains("biomass")] - - # biomass potential - biomass_pot = n.stores[n.stores.carrier=="solid biomass"].e_nom.sum() - - # remove biomass store per country - n.stores = n.stores[n.stores.carrier!="solid biomass"] - - # remove biomass transport links - n.links = n.links[n.links.carrier!="solid biomass transport"] - - # total industry demand for biomass - biomass_demand = n.loads[n.loads.carrier=="solid biomass for industry"].p_set.sum() - - # remove industry demand - n.loads = n.loads[n.loads.carrier!="solid biomass for industry"] - - # drop transport and industry links - sel = [ - 'solid biomass transport', - 'solid biomass for industry', - 'solid biomass for industry CC' - ] - n.links = n.links[~n.links.carrier.isin(sel)] - - # add back EU bus + load + store + industry links - n.add("Bus", - "EU solid biomass", - location="EU", - carrier="solid biomass" - ) - - n.add("Bus", - "solid biomass for industry", - location="EU", - carrier="solid biomass for industry" - ) - - n.add("Load", - "solid biomass for industry", - bus="solid biomass for industry", - carrier="solid biomass for industry", - p_set=biomass_demand - ) - - n.add("Store", - "EU solid biomass", - bus="EU solid biomass", - carrier="solid biomass", - e_nom=biomass_pot, - marginal_cost=costs.at['solid biomass','fuel'], - e_initial=biomass_pot - ) - - n.add("Link", - "solid biomass for industry", - bus0="EU solid biomass", - bus1="solid biomass for industry", - carrier="solid biomass for industry", - p_nom_extendable=True, - efficiency=1. - ) - - n.add("Link", - "solid biomass for industry CC", - bus0="EU solid biomass", - bus1="solid biomass for industry", - bus2="co2 atmosphere", - bus3="co2 stored", - carrier="solid biomass for industry CC", - p_nom_extendable=True, - capital_cost=costs.at["cement capture", "fixed"] * costs.at['solid biomass', 'CO2 intensity'], - efficiency=0.9, - efficiency2=-costs.at['solid biomass', 'CO2 intensity'] * costs.at["cement capture", "capture_rate"], - efficiency3=costs.at['solid biomass', 'CO2 intensity'] * costs.at["cement capture", "capture_rate"], - lifetime=costs.at['cement capture', 'lifetime'] - ) - - # set CHP buses from country to single EU bus - n.links.loc[n.links.carrier.str.contains("biomass CHP"), "bus0"] = "EU solid biomass" - - # TODO this should rather be a config no wildcard def limit_individual_line_extension(n, maxext): print(f"limiting new HVAC and HVDC extensions to {maxext} MW") @@ -2183,9 +2148,6 @@ if __name__ == "__main__": if "noH2network" in opts: remove_h2_network(n) - if not options["biomass_transport"]: - remove_biomass_transport(n) - for o in opts: m = re.match(r'^\d+h$', o, re.IGNORECASE) if m is not None: From 3f43656a92c64d2ad0887c80943ad9480252e564 Mon Sep 17 00:00:00 2001 From: Fabian Neumann Date: Mon, 12 Jul 2021 12:37:37 +0200 Subject: [PATCH 41/90] call define_spatial --- scripts/prepare_sector_network.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/prepare_sector_network.py b/scripts/prepare_sector_network.py index 91bcc2e9..0ddafb37 100644 --- a/scripts/prepare_sector_network.py +++ b/scripts/prepare_sector_network.py @@ -2094,6 +2094,8 @@ if __name__ == "__main__": patch_electricity_network(n) + define_spatial(pop_layout.index) + if snakemake.config["foresight"] == 'myopic': add_lifetime_wind_solar(n, costs) From ba9be74265d758b963382bd000dca1e50ae9088c Mon Sep 17 00:00:00 2001 From: Fabian Neumann Date: Wed, 4 Aug 2021 15:05:37 +0200 Subject: [PATCH 42/90] make build_biomass_transport_costs fully optional --- Snakefile | 27 ++++++++++++++---------- scripts/build_biomass_transport_costs.py | 2 +- 2 files changed, 17 insertions(+), 12 deletions(-) diff --git a/Snakefile b/Snakefile index 45c33da9..caed1f42 100644 --- a/Snakefile +++ b/Snakefile @@ -180,16 +180,21 @@ rule build_biomass_potentials: script: 'scripts/build_biomass_potentials.py' -rule build_biomass_transport_costs: - input: "data/biomass/biomass potentials in europe_web rev.pdf" - output: - supply_chain1="resources/biomass_transport_costs_supply_chain1.csv", - supply_chain2="resources/biomass_transport_costs_supply_chain2.csv", - transport_costs="resources/biomass_transport_costs.csv", - threads: 1 - resources: mem_mb=1000 - benchmark: "benchmarks/build_biomass_transport_costs" - script: 'scripts/build_biomass_transport_costs.py' +if config["sector"]["biomass_transport"]: + rule build_biomass_transport_costs: + input: + transport_cost_data="data/biomass/biomass potentials in europe_web rev.pdf" + output: + supply_chain1="resources/biomass_transport_costs_supply_chain1.csv", + supply_chain2="resources/biomass_transport_costs_supply_chain2.csv", + transport_costs="resources/biomass_transport_costs.csv", + threads: 1 + resources: mem_mb=1000 + benchmark: "benchmarks/build_biomass_transport_costs" + script: 'scripts/build_biomass_transport_costs.py' + build_biomass_transport_costs_output = rules.build_biomass_transport_costs.output +else: + build_biomass_transport_costs_output = {} rule build_ammonia_production: @@ -336,7 +341,6 @@ rule prepare_sector_network: traffic_data_KFZ="data/emobility/KFZ__count", traffic_data_Pkw="data/emobility/Pkw__count", biomass_potentials='resources/biomass_potentials.csv', - biomass_transport="resources/biomass_transport_costs.csv", heat_profile="data/heat_load_profile_BDEW.csv", costs=CDIR + "costs_{planning_horizons}.csv", profile_offwind_ac=pypsaeur("resources/profile_offwind-ac.nc"), @@ -366,6 +370,7 @@ rule prepare_sector_network: solar_thermal_urban="resources/solar_thermal_urban_elec_s{simpl}_{clusters}.nc", solar_thermal_rural="resources/solar_thermal_rural_elec_s{simpl}_{clusters}.nc", **build_retro_cost_output + **build_biomass_transport_costs_output output: RDIR + '/prenetworks/elec_s{simpl}_{clusters}_lv{lv}_{opts}_{sector_opts}_{planning_horizons}.nc' threads: 1 resources: mem_mb=2000 diff --git a/scripts/build_biomass_transport_costs.py b/scripts/build_biomass_transport_costs.py index 703d81ae..b17c97fd 100644 --- a/scripts/build_biomass_transport_costs.py +++ b/scripts/build_biomass_transport_costs.py @@ -22,7 +22,7 @@ ENERGY_CONTENT = 4.8 # unit MWh/tonne (assuming wood pellets) def build_biomass_transport_costs(): df_list = tbl.read_pdf( - snakemake.input[0], + snakemake.input.transport_cost_data, pages="145-147", multiple_tables=True, ) From 3754643e8192c57452c84d7a8a3639abd17a49a3 Mon Sep 17 00:00:00 2001 From: Fabian Neumann Date: Fri, 6 Aug 2021 12:46:03 +0200 Subject: [PATCH 43/90] add co2 sequestration potential global constraint --- scripts/prepare_sector_network.py | 9 +-------- scripts/solve_network.py | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/scripts/prepare_sector_network.py b/scripts/prepare_sector_network.py index ca956e44..659fbf37 100644 --- a/scripts/prepare_sector_network.py +++ b/scripts/prepare_sector_network.py @@ -45,7 +45,7 @@ def define_spatial(nodes): spatial.co2.vents = nodes + " co2 vent" else: spatial.co2.nodes = ["co2 stored"] - spatial.co2.locations = "EU" + spatial.co2.locations = ["EU"] spatial.co2.vents = ["co2 vent"] spatial.co2.df = pd.DataFrame(vars(spatial.co2), index=nodes) @@ -379,13 +379,6 @@ def add_co2_tracking(n, options): bus=spatial.co2.nodes ) - # TODO if nodally resolved total allowed sequestration needs to - # be an extra_functionality constraint - # (best to implement it this way for either case) - # let e_nom_max represent geological potential - # don't forget to log duals of extra functionality! - # options['co2_sequestration_potential'] * 1e6 - if options['co2_vent']: n.madd("Link", diff --git a/scripts/solve_network.py b/scripts/solve_network.py index 8c0313f1..3796bc4d 100644 --- a/scripts/solve_network.py +++ b/scripts/solve_network.py @@ -3,6 +3,7 @@ import pypsa import numpy as np +import pandas as pd from pypsa.linopt import get_var, linexpr, define_constraints @@ -150,9 +151,27 @@ def add_chp_constraints(n): define_constraints(n, lhs, "<=", 0, 'chplink', 'backpressure') +def add_co2_sequestration_limit(n, sns): + + co2_stores = n.stores.loc[n.stores.carrier=='co2 stored'].index + + if co2_stores.empty or ('Store', 'e') not in n.variables.index: + return + + vars_final_co2_stored = get_var(n, 'Store', 'e').loc[sns[-1], co2_stores] + + lhs = linexpr((1, vars_final_co2_stored)).sum() + rhs = n.config["sector"].get("co2_sequestration_potential", 200) * 1e6 + + name = 'co2_sequestration_limit' + define_constraints(n, lhs, "<=", rhs, 'GlobalConstraint', + 'mu', axes=pd.Index([name]), spec=name) + + def extra_functionality(n, snapshots): add_chp_constraints(n) add_battery_constraints(n) + add_co2_sequestration_limit(n, snapshots) def solve_network(n, config, opts='', **kwargs): From d7a290df31737f3127e05868c83ff7cb36ddd7f2 Mon Sep 17 00:00:00 2001 From: Fabian Neumann Date: Fri, 6 Aug 2021 15:51:07 +0200 Subject: [PATCH 44/90] add release note --- doc/release_notes.rst | 8 ++++++++ doc/spatial_resolution.rst | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/doc/release_notes.rst b/doc/release_notes.rst index bd99ce16..a24ccb7c 100644 --- a/doc/release_notes.rst +++ b/doc/release_notes.rst @@ -60,6 +60,14 @@ Future release These are included in the environment specifications of PyPSA-Eur. * Consistent use of ``__main__`` block and further unspecific code cleaning. * Distinguish costs for home battery storage and inverter from utility-scale battery costs. +* Add option to regionally resolve CO2 storage and add CO2 pipeline transport because geological storage potential, + CO2 utilisation sites and CO2 capture sites may be separated. + The CO2 network is built from zero based on the topology of the electricity grid (greenfield). + Pipelines are assumed to be bidirectional and lossless. + Furthermore, neither retrofitting of natural gas pipelines (required pressures are too high, 80-160 bar vs <80 bar) + nor other modes of CO2 transport (by ship, road or rail) are considered. + The regional representation of CO2 is activated with the config setting ``sector: co2_network: true`` but is deactivated by default. + The global limit for CO2 sequestration now applies to the sum of all CO2 stores via an ``extra_functionality`` constraint. diff --git a/doc/spatial_resolution.rst b/doc/spatial_resolution.rst index 1be9f3ad..13e94543 100644 --- a/doc/spatial_resolution.rst +++ b/doc/spatial_resolution.rst @@ -48,7 +48,7 @@ Solid biomass: single node for Europe, until transport costs can be incorporated. CO2: single node for Europe, but a transport and storage cost is added for -sequestered CO2. +sequestered CO2. Optionally: nodal, with CO2 transport via pipelines. Liquid hydrocarbons: single node for Europe, since transport costs for liquids are low. From d428c1b77d7e8cd420f7caf5da2e77f73bb3ae26 Mon Sep 17 00:00:00 2001 From: Fabian Neumann Date: Mon, 9 Aug 2021 14:43:51 +0200 Subject: [PATCH 45/90] fix syntax and auto-retrieve biomass transport cost --- Snakefile | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Snakefile b/Snakefile index d100c22a..e768bc90 100644 --- a/Snakefile +++ b/Snakefile @@ -1,4 +1,7 @@ +from snakemake.remote.HTTP import RemoteProvider as HTTPRemoteProvider +HTTP = HTTPRemoteProvider() + configfile: "config.yaml" @@ -183,7 +186,7 @@ rule build_biomass_potentials: if config["sector"]["biomass_transport"]: rule build_biomass_transport_costs: input: - transport_cost_data="data/biomass/biomass potentials in europe_web rev.pdf" + transport_cost_data=HTTP.remote("https://publications.jrc.ec.europa.eu/repository/bitstream/JRC98626/biomass%20potentials%20in%20europe_web%20rev.pdf", keep_local=True) output: supply_chain1="resources/biomass_transport_costs_supply_chain1.csv", supply_chain2="resources/biomass_transport_costs_supply_chain2.csv", @@ -369,7 +372,7 @@ rule prepare_sector_network: solar_thermal_total="resources/solar_thermal_total_elec_s{simpl}_{clusters}.nc", solar_thermal_urban="resources/solar_thermal_urban_elec_s{simpl}_{clusters}.nc", solar_thermal_rural="resources/solar_thermal_rural_elec_s{simpl}_{clusters}.nc", - **build_retro_cost_output + **build_retro_cost_output, **build_biomass_transport_costs_output output: RDIR + '/prenetworks/elec_s{simpl}_{clusters}_lv{lv}_{opts}_{sector_opts}_{planning_horizons}.nc' threads: 1 From 6711d721b9f83719e8871ddf66b2627c25b45ef4 Mon Sep 17 00:00:00 2001 From: Fabian Neumann Date: Mon, 9 Aug 2021 16:30:38 +0200 Subject: [PATCH 46/90] biomass_transport: fix cost calculation and get from remote --- Snakefile | 4 +- scripts/build_biomass_transport_costs.py | 93 +++++++++++++++--------- scripts/prepare_sector_network.py | 2 +- 3 files changed, 61 insertions(+), 38 deletions(-) diff --git a/Snakefile b/Snakefile index e768bc90..1ef55c86 100644 --- a/Snakefile +++ b/Snakefile @@ -186,11 +186,11 @@ rule build_biomass_potentials: if config["sector"]["biomass_transport"]: rule build_biomass_transport_costs: input: - transport_cost_data=HTTP.remote("https://publications.jrc.ec.europa.eu/repository/bitstream/JRC98626/biomass%20potentials%20in%20europe_web%20rev.pdf", keep_local=True) + transport_cost_data=HTTP.remote("publications.jrc.ec.europa.eu/repository/bitstream/JRC98626/biomass potentials in europe_web rev.pdf", keep_local=True) output: supply_chain1="resources/biomass_transport_costs_supply_chain1.csv", supply_chain2="resources/biomass_transport_costs_supply_chain2.csv", - transport_costs="resources/biomass_transport_costs.csv", + biomass_transport_costs="resources/biomass_transport_costs.csv", threads: 1 resources: mem_mb=1000 benchmark: "benchmarks/build_biomass_transport_costs" diff --git a/scripts/build_biomass_transport_costs.py b/scripts/build_biomass_transport_costs.py index b17c97fd..dc1137ca 100644 --- a/scripts/build_biomass_transport_costs.py +++ b/scripts/build_biomass_transport_costs.py @@ -16,52 +16,75 @@ assuming as an approximation energy content of wood pellets import pandas as pd import tabula as tbl -ENERGY_CONTENT = 4.8 # unit MWh/tonne (assuming wood pellets) +ENERGY_CONTENT = 4.8 # unit MWh/t (wood pellets) + +def get_countries(): + + pandas_options = dict( + skiprows=list(range(6)), + header=None, + index_col=0 + ) + + return tbl.read_pdf( + str(snakemake.input.transport_cost_data), + pages="145", + multiple_tables=False, + pandas_options=pandas_options + )[0].index + + +def get_cost_per_tkm(page, countries): + + pandas_options = dict( + skiprows=range(6), + header=0, + sep=' |,', + engine='python', + index_col=False, + ) + + sc = tbl.read_pdf( + str(snakemake.input.transport_cost_data), + pages=page, + multiple_tables=False, + pandas_options=pandas_options + )[0] + sc.index = countries + sc.columns = sc.columns.str.replace("€", "EUR") + + return sc def build_biomass_transport_costs(): - df_list = tbl.read_pdf( - snakemake.input.transport_cost_data, - pages="145-147", - multiple_tables=True, - ) - - countries = df_list[0][0].iloc[6:].rename(index=lambda x: x + 1) + countries = get_countries() - # supply chain 1 - df = df_list[1].copy().rename(index=countries.to_dict()) - df.rename( - columns=df.iloc[:6].apply(lambda col: col.str.cat(sep=" "), axis=0).to_dict(), - inplace=True, - ) - df = df.iloc[6:] - df.loc[6] = df.loc[6].str.replace("€", "EUR") + sc1 = get_cost_per_tkm(146, countries) + sc2 = get_cost_per_tkm(147, countries) - # supply chain 2 - df2 = df_list[2].copy().rename(index=countries.to_dict()) - df2.rename( - columns=df2.iloc[:6].apply(lambda col: col.str.cat(sep=" "), axis=0).to_dict(), - inplace=True, - ) - df2 = df2.iloc[6:] - df2.loc[6] = df2.loc[6].str.replace("€", "EUR") + sc1.to_csv(snakemake.output.supply_chain1) + sc2.to_csv(snakemake.output.supply_chain2) - df.to_csv(snakemake.output.supply_chain1) - df2.to_csv(snakemake.output.supply_chain1) + # take mean of both supply chains + to_concat = [sc1["EUR/km/ton"], sc2["EUR/km/ton"]] + transport_costs = pd.concat(to_concat, axis=1).mean(axis=1) - transport_costs = pd.concat([df["per km/ton"], df2["per km/ton"]], axis=1).drop(6) - transport_costs = transport_costs.astype(float, errors="ignore").mean(axis=1) - - # convert unit to EUR/MWh + # convert tonnes to MWh transport_costs /= ENERGY_CONTENT - transport_costs = pd.DataFrame(transport_costs, columns=["cost [EUR/(km MWh)]"]) + transport_costs.name = "EUR/km/MWh" - # rename - transport_costs.rename({"UK": "GB", "XK": "KO", "EL": "GR"}, inplace=True) + # rename country names + to_rename = { + "UK": "GB", + "XK": "KO", + "EL": "GR" + } + transport_costs.rename(to_rename, inplace=True) + + # add missing Norway with data from Sweden + transport_costs["NO"] = transport_costs["SE"] - # add missing Norway - transport_costs.loc["NO"] = transport_costs.loc["SE"] transport_costs.to_csv(snakemake.output.transport_costs) diff --git a/scripts/prepare_sector_network.py b/scripts/prepare_sector_network.py index 0749a8c3..1dd92b28 100644 --- a/scripts/prepare_sector_network.py +++ b/scripts/prepare_sector_network.py @@ -1613,7 +1613,7 @@ def add_biomass(n, costs): biomass_potentials = pd.read_csv(snakemake.input.biomass_potentials, index_col=0) transport_costs = pd.read_csv( - snakemake.input.biomass_transport, + snakemake.input.biomass_transport_costs, index_col=0, squeeze=True ) From 3eb404ff680706537727a2c2689c0a12e07be50a Mon Sep 17 00:00:00 2001 From: Fabian Neumann Date: Mon, 9 Aug 2021 17:51:37 +0200 Subject: [PATCH 47/90] biomass_transport: correct and simplify spatial management --- scripts/prepare_sector_network.py | 54 +++++++++++++++++-------------- 1 file changed, 30 insertions(+), 24 deletions(-) diff --git a/scripts/prepare_sector_network.py b/scripts/prepare_sector_network.py index 1dd92b28..baddcc81 100644 --- a/scripts/prepare_sector_network.py +++ b/scripts/prepare_sector_network.py @@ -46,7 +46,7 @@ def define_spatial(nodes): spatial.biomass.industry_cc = nodes + " solid biomass for industry CC" else: spatial.biomass.nodes = ["EU solid biomass"] - spatial.biomass.locations = "EU" + spatial.biomass.locations = ["EU"] spatial.biomass.industry = ["solid biomass for industry"] spatial.biomass.industry_cc = ["solid biomass for industry CC"] @@ -1612,16 +1612,13 @@ def add_biomass(n, costs): biomass_potentials = pd.read_csv(snakemake.input.biomass_potentials, index_col=0) - transport_costs = pd.read_csv( - snakemake.input.biomass_transport_costs, - index_col=0, - squeeze=True - ) - - # potential per node distributed within country by population - biomass_pot_node = (biomass_potentials.loc[pop_layout.ct] - .set_index(pop_layout.index) - .mul(pop_layout.fraction, axis="index")) + if options["biomass_transport"]: + # potential per node distributed within country by population + biomass_potentials_spatial = (biomass_potentials.loc[pop_layout.ct] + .set_index(pop_layout.index) + .mul(pop_layout.fraction, axis="index")) + else: + biomass_potentials_spatial = pd.DataFrame(biomass_potentials.sum()).T n.add("Carrier", "biogas") n.add("Carrier", "solid biomass") @@ -1651,9 +1648,9 @@ def add_biomass(n, costs): spatial.biomass.nodes, bus=spatial.biomass.nodes, carrier="solid biomass", - e_nom=biomass_pot_node["solid biomass"].values, + e_nom=biomass_potentials_spatial["solid biomass"].values, marginal_cost=costs.at['solid biomass', 'fuel'], - e_initial=biomass_pot_node["solid biomass"].values + e_initial=biomass_potentials_spatial["solid biomass"].values ) n.add("Link", @@ -1669,6 +1666,12 @@ def add_biomass(n, costs): ) if options["biomass_transport"]: + + transport_costs = pd.read_csv( + snakemake.input.biomass_transport_costs, + index_col=0, + squeeze=True + ) # add biomass transport biomass_transport = create_network_topology(n, "biomass transport ", bidirectional=False) @@ -1739,33 +1742,36 @@ def add_industry(n, costs): industrial_demand = pd.read_csv(snakemake.input.industrial_demand, index_col=0) * 1e6 n.madd("Bus", - spatial.biomass.df.loc[industrial_demand.index, "industry"].values, - location=spatial.biomass.df.loc[industrial_demand.index, "locations"].values, + spatial.biomass.industry, + location=spatial.biomass.locations, carrier="solid biomass for industry" ) - p_set = industrial_demand["solid biomass"].rename(index=lambda x: x + " solid biomass for industry") / 8760 + if options["biomass_transport"]: + p_set = industrial_demand.loc[spatial.biomass.locations, "solid biomass"].rename(index=lambda x: x + " solid biomass for industry") / 8760 + else: + p_set = industrial_demand["solid biomass"].sum() / 8760 n.madd("Load", - spatial.biomass.df.loc[industrial_demand.index, "industry"].values, - bus=spatial.biomass.df.loc[industrial_demand.index, "industry"].values, + spatial.biomass.industry, + bus=spatial.biomass.industry, carrier="solid biomass for industry", p_set=p_set ) n.madd("Link", - spatial.biomass.df.loc[industrial_demand.index, "industry"].values, - bus0=spatial.biomass.df.loc[industrial_demand.index, "nodes"].values, - bus1=spatial.biomass.df.loc[industrial_demand.index, "industry"].values, + spatial.biomass.industry, + bus0=spatial.biomass.nodes, + bus1=spatial.biomass.industry, carrier="solid biomass for industry", p_nom_extendable=True, efficiency=1. ) n.madd("Link", - spatial.biomass.df.loc[industrial_demand.index, "industry_cc"].values, - bus0=spatial.biomass.df.loc[industrial_demand.index, "nodes"].values, - bus1=spatial.biomass.df.loc[industrial_demand.index, "industry_cc"].values, + spatial.biomass.industry_cc, + bus0=spatial.biomass.nodes, + bus1=spatial.biomass.industry, bus2="co2 atmosphere", bus3="co2 stored", carrier="solid biomass for industry CC", From 7ca4f04611c23e63d49cc42505df8af4cdbadaed Mon Sep 17 00:00:00 2001 From: Fabian Neumann Date: Mon, 9 Aug 2021 17:53:14 +0200 Subject: [PATCH 48/90] biomass_transport: reduce output files --- Snakefile | 2 -- scripts/build_biomass_transport_costs.py | 3 --- 2 files changed, 5 deletions(-) diff --git a/Snakefile b/Snakefile index 1ef55c86..d747b8fe 100644 --- a/Snakefile +++ b/Snakefile @@ -188,8 +188,6 @@ if config["sector"]["biomass_transport"]: input: transport_cost_data=HTTP.remote("publications.jrc.ec.europa.eu/repository/bitstream/JRC98626/biomass potentials in europe_web rev.pdf", keep_local=True) output: - supply_chain1="resources/biomass_transport_costs_supply_chain1.csv", - supply_chain2="resources/biomass_transport_costs_supply_chain2.csv", biomass_transport_costs="resources/biomass_transport_costs.csv", threads: 1 resources: mem_mb=1000 diff --git a/scripts/build_biomass_transport_costs.py b/scripts/build_biomass_transport_costs.py index dc1137ca..972ff9f8 100644 --- a/scripts/build_biomass_transport_costs.py +++ b/scripts/build_biomass_transport_costs.py @@ -63,9 +63,6 @@ def build_biomass_transport_costs(): sc1 = get_cost_per_tkm(146, countries) sc2 = get_cost_per_tkm(147, countries) - sc1.to_csv(snakemake.output.supply_chain1) - sc2.to_csv(snakemake.output.supply_chain2) - # take mean of both supply chains to_concat = [sc1["EUR/km/ton"], sc2["EUR/km/ton"]] transport_costs = pd.concat(to_concat, axis=1).mean(axis=1) From edf3a5f5fed6ff15f846910e98dbd9993c3f2d69 Mon Sep 17 00:00:00 2001 From: Fabian Neumann Date: Mon, 9 Aug 2021 17:55:43 +0200 Subject: [PATCH 49/90] biomass_transport: clarify meaning in config --- config.default.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.default.yaml b/config.default.yaml index 73e7f964..6671bbe9 100644 --- a/config.default.yaml +++ b/config.default.yaml @@ -233,7 +233,7 @@ sector: electricity_grid_connection: true # only applies to onshore wind and utility PV gas_distribution_grid: true gas_distribution_grid_cost_factor: 1.0 #multiplies cost in data/costs.csv - biomass_transport: false # biomass potential per country + transport between countries + biomass_transport: false # biomass transport between nodes conventional_generation: # generator : carrier OCGT: gas From 928d1f23edf3d21a9ee943188fd00ee06ad862b1 Mon Sep 17 00:00:00 2001 From: Fabian Neumann Date: Mon, 9 Aug 2021 18:03:20 +0200 Subject: [PATCH 50/90] biomass_transport: improve spatial biomass potential handling --- scripts/prepare_sector_network.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/scripts/prepare_sector_network.py b/scripts/prepare_sector_network.py index baddcc81..c2fec14f 100644 --- a/scripts/prepare_sector_network.py +++ b/scripts/prepare_sector_network.py @@ -1616,9 +1616,10 @@ def add_biomass(n, costs): # potential per node distributed within country by population biomass_potentials_spatial = (biomass_potentials.loc[pop_layout.ct] .set_index(pop_layout.index) - .mul(pop_layout.fraction, axis="index")) + .mul(pop_layout.fraction, axis="index") + .rename(index=lambda x: x + " solid biomass")) else: - biomass_potentials_spatial = pd.DataFrame(biomass_potentials.sum()).T + biomass_potentials_spatial = biomass_potentials.sum() n.add("Carrier", "biogas") n.add("Carrier", "solid biomass") @@ -1648,9 +1649,9 @@ def add_biomass(n, costs): spatial.biomass.nodes, bus=spatial.biomass.nodes, carrier="solid biomass", - e_nom=biomass_potentials_spatial["solid biomass"].values, + e_nom=biomass_potentials_spatial["solid biomass"], marginal_cost=costs.at['solid biomass', 'fuel'], - e_initial=biomass_potentials_spatial["solid biomass"].values + e_initial=biomass_potentials_spatial["solid biomass"] ) n.add("Link", From 12f385ef3f58aa76dc4606b1a6de7e46135a2ab1 Mon Sep 17 00:00:00 2001 From: Fabian Neumann Date: Mon, 9 Aug 2021 18:06:24 +0200 Subject: [PATCH 51/90] biomass_transport: simplify read-in --- scripts/build_biomass_transport_costs.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/build_biomass_transport_costs.py b/scripts/build_biomass_transport_costs.py index 972ff9f8..fc29853b 100644 --- a/scripts/build_biomass_transport_costs.py +++ b/scripts/build_biomass_transport_costs.py @@ -21,7 +21,7 @@ ENERGY_CONTENT = 4.8 # unit MWh/t (wood pellets) def get_countries(): pandas_options = dict( - skiprows=list(range(6)), + skiprows=range(6), header=None, index_col=0 ) From 2e2a66ef3ce2bc5253249c2110c938e9faad86ec Mon Sep 17 00:00:00 2001 From: Fabian Neumann Date: Mon, 9 Aug 2021 18:20:07 +0200 Subject: [PATCH 52/90] biomass_transport: add release notes and documentation --- doc/release_notes.rst | 6 ++++++ doc/spatial_resolution.rst | 6 ++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/doc/release_notes.rst b/doc/release_notes.rst index 15419438..5e92c897 100644 --- a/doc/release_notes.rst +++ b/doc/release_notes.rst @@ -66,6 +66,12 @@ Future release * The share of shipping transformed into hydrogen fuel cell can be now defined for different years in the ``config.yaml`` file. The carbon emission from the remaining share is treated as a negative load on the atmospheric carbon dioxide bus, just like aviation and land transport emissions. * The transformation of the Steel and Aluminium production can be now defined for different years in the ``config.yaml`` file. * Include the option to alter the maximum energy capacity of a store via the ``carrier+factor`` in the ``{sector_opts}`` wildcard. This can be useful for sensitivity analyses. Example: ``co2 stored+e2`` multiplies the ``e_nom_max`` by factor 2. In this example, ``e_nom_max`` represents the CO2 sequestration potential in Europe. +* Add option to regionally disaggregate biomass potential to individual nodes + (currently given per country, then distributed by population density within) + and allow the transport of solid biomass. + The transport costs are determined based on the `JRC-EU-Times Bioenergy report `_ + in the new optional rule ``build_biomass_transport_costs``. + Biomass transport can be activated with the setting ``sector: biomass_transport: true``. PyPSA-Eur-Sec 0.5.0 (21st May 2021) =================================== diff --git a/doc/spatial_resolution.rst b/doc/spatial_resolution.rst index 1be9f3ad..b4e65417 100644 --- a/doc/spatial_resolution.rst +++ b/doc/spatial_resolution.rst @@ -44,8 +44,10 @@ Hydrogen network: nodal. Methane network: single node for Europe, since future demand is so low and no bottlenecks are expected. -Solid biomass: single node for Europe, until transport costs can be -incorporated. +Solid biomass: choice between single node for Europe and nodal where biomass +potential is regionally disaggregated (currently given per country, +then distributed by population density within) +and transport of solid biomass is possible. CO2: single node for Europe, but a transport and storage cost is added for sequestered CO2. From ed3fec46641f2b4253bf1c40785321fda45c6cf8 Mon Sep 17 00:00:00 2001 From: Fabian Neumann Date: Tue, 10 Aug 2021 10:27:40 +0200 Subject: [PATCH 53/90] add data/nuts to .gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 1401c0ad..10243def 100644 --- a/.gitignore +++ b/.gitignore @@ -28,6 +28,7 @@ gurobi.log /data/.nfs* /data/Industrial_Database.csv /data/retro/tabula-calculator-calcsetbuilding.csv +/data/nuts* *.org From 05c233242025971d7bc57a49c49d5296d6097da6 Mon Sep 17 00:00:00 2001 From: Fabian Neumann Date: Tue, 10 Aug 2021 10:27:54 +0200 Subject: [PATCH 54/90] fix syntax error in master --- 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 ebf2ee71..2a92b670 100644 --- a/scripts/prepare_sector_network.py +++ b/scripts/prepare_sector_network.py @@ -1931,7 +1931,7 @@ def maybe_adjust_costs_and_potentials(n, opts): else: if attr == 'p_nom_max': comps = {"Generator", "Link", "StorageUnit"} - elif attr = 'e_nom_max': + elif attr == 'e_nom_max': comps = {"Store"} else: comps = {"Generator", "Link", "StorageUnit", "Store"} From bab51b0f54697c22c973ab0c5ee22b9edb05c63a Mon Sep 17 00:00:00 2001 From: Fabian Neumann Date: Tue, 10 Aug 2021 10:28:22 +0200 Subject: [PATCH 55/90] fix read-in of pypsa-eur data --- Snakefile | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Snakefile b/Snakefile index 286df421..498cc7c9 100644 --- a/Snakefile +++ b/Snakefile @@ -24,7 +24,6 @@ subworkflow pypsaeur: snakefile: "../pypsa-eur/Snakefile" configfile: "../pypsa-eur/config.yaml" - rule all: input: SDIR + '/graphs/costs.pdf' @@ -176,9 +175,9 @@ rule build_biomass_potentials: enspreso_biomass=HTTP.remote("https://cidportal.jrc.ec.europa.eu/ftp/jrc-opendata/ENSPRESO/ENSPRESO_BIOMASS.xlsx", keep_local=True), nuts2="data/nuts/NUTS_RG_10M_2013_4326_LEVL_2.geojson", # https://gisco-services.ec.europa.eu/distribution/v2/nuts/download/#nuts21 regions_onshore=pypsaeur("resources/regions_onshore_elec_s{simpl}_{clusters}.geojson"), - nuts3_population=pypsaeur("data/bundle/nama_10r_3popgdp.tsv.gz"), - swiss_cantons=pypsaeur("data/bundle/ch_cantons.csv"), - swiss_population=pypsaeur("data/bundle/je-e-21.03.02.xls"), + nuts3_population="../pypsa-eur/data/bundle/nama_10r_3popgdp.tsv.gz", + swiss_cantons="../pypsa-eur/data/bundle/ch_cantons.csv", + swiss_population="../pypsa-eur/data/bundle/je-e-21.03.02.xls", country_shapes=pypsaeur('resources/country_shapes.geojson') output: biomass_potentials_all='resources/biomass_potentials_all_s{simpl}_{clusters}.csv', From 782323bee447338ef94053cd65f5aee3f9131aa6 Mon Sep 17 00:00:00 2001 From: Fabian Neumann Date: Tue, 10 Aug 2021 10:28:50 +0200 Subject: [PATCH 56/90] handle spaces in remote files --- scripts/build_biomass_potentials.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/build_biomass_potentials.py b/scripts/build_biomass_potentials.py index 59eb0051..cf5b0e6d 100644 --- a/scripts/build_biomass_potentials.py +++ b/scripts/build_biomass_potentials.py @@ -43,7 +43,7 @@ def build_nuts_population_data(year=2013): def enspreso_biomass_potentials(year=2020, scenario="ENS_Low"): glossary = pd.read_excel( - snakemake.input.enspreso_biomass, + str(snakemake.input.enspreso_biomass), sheet_name="Glossary", usecols="B:D", skiprows=1, @@ -51,7 +51,7 @@ def enspreso_biomass_potentials(year=2020, scenario="ENS_Low"): ) df = pd.read_excel( - snakemake.input.enspreso_biomass, + str(snakemake.input.enspreso_biomass), sheet_name="ENER - NUTS2 BioCom E", usecols="A:H" ) From e1a0a7d5fd45c83a2f4eeee371e47952f1c3972c Mon Sep 17 00:00:00 2001 From: Fabian Neumann Date: Tue, 10 Aug 2021 10:31:06 +0200 Subject: [PATCH 57/90] set co2 sequestration cost to 10 EUR/t excl. transport --- config.default.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.default.yaml b/config.default.yaml index b2de9bf9..66a9f299 100644 --- a/config.default.yaml +++ b/config.default.yaml @@ -223,7 +223,7 @@ sector: co2_vent: true SMR: true co2_sequestration_potential: 200 #MtCO2/a sequestration potential for Europe - co2_sequestration_cost: 20 #EUR/tCO2 for transport and sequestration of CO2 + co2_sequestration_cost: 10 #EUR/tCO2 for sequestration of CO2 co2_network: false cc_fraction: 0.9 # default fraction of CO2 captured with post-combustion capture hydrogen_underground_storage: true From e40461b1c046f1722fff4df81454c54c38d936a1 Mon Sep 17 00:00:00 2001 From: Fabian Neumann Date: Mon, 16 Aug 2021 13:19:20 +0200 Subject: [PATCH 58/90] fix typo in biomass config --- config.default.yaml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/config.default.yaml b/config.default.yaml index 71613d9c..71c6b1e2 100644 --- a/config.default.yaml +++ b/config.default.yaml @@ -102,22 +102,22 @@ biomass: scenario: ENS_Med classes: solid biomass: - - Argicultural waste - - Municipal waste - - Residues from landscape care - - Sawdust - - Secondary Forestry residues - woodchips - not included: - - Bioethanol barley, wheat, grain maize, oats, other cereals and rye + - Agricultural waste - Fuelwood residues - - C&P_RW - - FuelwoodRW - - Rape seed + - Secondary Forestry residues - woodchips + - Sawdust + - Residues from landscape care + - Municipal waste + not included: - Sugar from sugar beet - - Miscanthus, switchgrass, RCG + - Rape seed - "Sunflower, soya seed " - - Poplar + - Bioethanol barley, wheat, grain maize, oats, other cereals and rye + - Miscanthus, switchgrass, RCG - Willow + - Poplar + - FuelwoodRW + - C&P_RW biogas: - Manure solid, liquid - Sludge From 99e602f7b25ea667b76ab0560c68c544840871de Mon Sep 17 00:00:00 2001 From: Fabian Neumann Date: Mon, 16 Aug 2021 14:00:30 +0200 Subject: [PATCH 59/90] add ENSPRESO release notes and doc --- doc/data.csv | 1 + doc/release_notes.rst | 3 +++ doc/supply_demand.rst | 2 +- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/doc/data.csv b/doc/data.csv index 8e316281..26a5bea0 100644 --- a/doc/data.csv +++ b/doc/data.csv @@ -2,6 +2,7 @@ description,file/folder,licence,source JRC IDEES database,jrc-idees-2015/,CC BY 4.0,https://ec.europa.eu/jrc/en/potencia/jrc-idees urban/rural fraction,urban_percent.csv,unknown,unknown JRC biomass potentials,biomass/,unknown,https://doi.org/10.2790/39014 +JRC ENSPRESO biomass potentials,remote,CC BY 4.0,https://data.jrc.ec.europa.eu/dataset/74ed5a04-7d74-4807-9eab-b94774309d9f EEA emission statistics,eea/UNFCCC_v23.csv,EEA standard re-use policy,https://www.eea.europa.eu/data-and-maps/data/national-emissions-reported-to-the-unfccc-and-to-the-eu-greenhouse-gas-monitoring-mechanism-16 Eurostat Energy Balances,eurostat-energy_balances-*/,Eurostat,https://ec.europa.eu/eurostat/web/energy/data/energy-balances Swiss energy statistics from Swiss Federal Office of Energy,switzerland-sfoe/,unknown,http://www.bfe.admin.ch/themen/00526/00541/00542/02167/index.html?dossier_id=02169 diff --git a/doc/release_notes.rst b/doc/release_notes.rst index 15419438..eb57dce9 100644 --- a/doc/release_notes.rst +++ b/doc/release_notes.rst @@ -66,6 +66,9 @@ Future release * The share of shipping transformed into hydrogen fuel cell can be now defined for different years in the ``config.yaml`` file. The carbon emission from the remaining share is treated as a negative load on the atmospheric carbon dioxide bus, just like aviation and land transport emissions. * The transformation of the Steel and Aluminium production can be now defined for different years in the ``config.yaml`` file. * Include the option to alter the maximum energy capacity of a store via the ``carrier+factor`` in the ``{sector_opts}`` wildcard. This can be useful for sensitivity analyses. Example: ``co2 stored+e2`` multiplies the ``e_nom_max`` by factor 2. In this example, ``e_nom_max`` represents the CO2 sequestration potential in Europe. +* Use `JRC ENSPRESO database `_ to + spatially disaggregate biomass potentials to PyPSA-Eur regions based on overlaps with NUTS2 regions from ENSPRESO + (proportional to area) (`#151 `_). PyPSA-Eur-Sec 0.5.0 (21st May 2021) =================================== diff --git a/doc/supply_demand.rst b/doc/supply_demand.rst index 77317094..8e4f2130 100644 --- a/doc/supply_demand.rst +++ b/doc/supply_demand.rst @@ -183,7 +183,7 @@ Solid biomass provides process heat up to 500 Celsius in industry, as well as fe Solid biomass supply ===================== -Only wastes and residues from the JRC biomass dataset. +Only wastes and residues from the JRC ENSPRESO biomass dataset. Oil product demand From 0a16ca3b35435afa4cca4daa59fe481da6f54b32 Mon Sep 17 00:00:00 2001 From: Fabian Neumann Date: Mon, 16 Aug 2021 14:14:05 +0200 Subject: [PATCH 60/90] add biomass potentials docstrings --- scripts/build_biomass_potentials.py | 46 +++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/scripts/build_biomass_potentials.py b/scripts/build_biomass_potentials.py index cf5b0e6d..68d87808 100644 --- a/scripts/build_biomass_potentials.py +++ b/scripts/build_biomass_potentials.py @@ -41,7 +41,24 @@ def build_nuts_population_data(year=2013): def enspreso_biomass_potentials(year=2020, scenario="ENS_Low"): + """ + Loads the JRC ENSPRESO biomass potentials. + Parameters + ---------- + year : int + The year for which potentials are to be taken. + Can be {2010, 2020, 2030, 2040, 2050}. + scenario : str + The scenario. Can be {"ENS_Low", "ENS_Med", "ENS_High"}. + + Returns + ------- + pd.DataFrame + Biomass potentials for given year and scenario + in TWh/a by commodity and NUTS2 region. + """ + glossary = pd.read_excel( str(snakemake.input.enspreso_biomass), sheet_name="Glossary", @@ -84,6 +101,20 @@ def enspreso_biomass_potentials(year=2020, scenario="ENS_Low"): def disaggregate_nuts0(bio): + """ + Some commodities are only given on NUTS0 level. + These are disaggregated here using the NUTS2 + population as distribution key. + + Parameters + ---------- + bio : pd.DataFrame + from enspreso_biomass_potentials() + + Returns + ------- + pd.DataFrame + """ pop = build_nuts_population_data() @@ -125,6 +156,21 @@ def area(gdf): def convert_nuts2_to_regions(bio_nuts2, regions): + """ + Converts biomass potentials given in NUTS2 to PyPSA-Eur regions based on the + overlay of both GeoDataFrames in proportion to the area. + + Parameters + ---------- + bio_nuts2 : gpd.GeoDataFrame + JRC ENSPRESO biomass potentials indexed by NUTS2 shapes. + regions : gpd.GeoDataFrame + PyPSA-Eur clustered onshore regions + + Returns + ------- + gpd.GeoDataFrame + """ # calculate area of nuts2 regions bio_nuts2["area_nuts2"] = area(bio_nuts2) From aa8cefeb5b1b18da3317e28cdb608eeac4935d9f Mon Sep 17 00:00:00 2001 From: Fabian Neumann Date: Thu, 19 Aug 2021 10:07:51 +0200 Subject: [PATCH 61/90] add district_heat_share.csv --- .gitignore | 2 +- data/district_heat_share.csv | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 data/district_heat_share.csv diff --git a/.gitignore b/.gitignore index ac252a84..4677557b 100644 --- a/.gitignore +++ b/.gitignore @@ -28,7 +28,7 @@ gurobi.log /data/.nfs* /data/Industrial_Database.csv /data/retro/tabula-calculator-calcsetbuilding.csv -/data +/data/nuts* *.org *.nc diff --git a/data/district_heat_share.csv b/data/district_heat_share.csv new file mode 100644 index 00000000..5afd65c8 --- /dev/null +++ b/data/district_heat_share.csv @@ -0,0 +1,34 @@ +country,share to satisfy heat demand (residential) in percent,capacity[MWth] +AT,14,11200 +BG,16,6162 +BA,8, +HR,6.3,2221 +CZ,40, +DK,65, +FI,38,23390 +FR,5, +DE,13.8, +HU,7.92875588637399,8549 +IS,90,8079000 +IE,0.8, +IT,3,8727 +LV,73,2254 +LT,56, +MK,23.7745607009008,636 +NO,4,3400 +PL,42,54912 +PT,0.070754716981132,34 +RS,25,5821 +SI,8.86,1739 +ES,0.251589260787732,1273 +SE,50.4, +UK,2, +BY,70, +EE,52,5406 +KO,3,207 +RO,23,9962 +SK,54,15000 +NL,4,9800 +CH,4,2792 +AL,0, +ME,0, From 8d22df6482593275e02829ab368e93589c025f37 Mon Sep 17 00:00:00 2001 From: martavp <30744159+martavp@users.noreply.github.com> Date: Tue, 24 Aug 2021 18:38:24 +0200 Subject: [PATCH 62/90] Update plot_network.py Some links producing heat have more than 2 ports (e.g. Fischer-Tropsch). This enables capturing them when plotting heat time series. --- scripts/plot_network.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/plot_network.py b/scripts/plot_network.py index cd74d3ea..c97956a0 100644 --- a/scripts/plot_network.py +++ b/scripts/plot_network.py @@ -398,7 +398,8 @@ def plot_series(network, carrier="AC", name="test"): supply = pd.DataFrame(index=n.snapshots) for c in n.iterate_components(n.branch_components): - for i in range(2): + 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, From 919c9d8b8dfa6f19ca4db19d30435f29e2c4d0ff Mon Sep 17 00:00:00 2001 From: martavp <30744159+martavp@users.noreply.github.com> Date: Tue, 24 Aug 2021 18:48:20 +0200 Subject: [PATCH 63/90] Update prepare_sector_network.py update build_carbon_budget to use budget estimation from 2020 onwards --- scripts/prepare_sector_network.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/scripts/prepare_sector_network.py b/scripts/prepare_sector_network.py index a5bc0d14..3de7154f 100644 --- a/scripts/prepare_sector_network.py +++ b/scripts/prepare_sector_network.py @@ -103,9 +103,6 @@ def build_carbon_budget(o, fn): #emissions at the beginning of the path (last year available 2018) e_0 = co2_emissions_year(countries, opts, year=2018) - #emissions in 2019 and 2020 assumed equal to 2018 and substracted - carbon_budget -= 2 * e_0 - planning_horizons = snakemake.config['scenario']['planning_horizons'] t_0 = planning_horizons[0] From 203a7f3df212ef7bb6a536c4f05d6830cd7e8807 Mon Sep 17 00:00:00 2001 From: martavp <30744159+martavp@users.noreply.github.com> Date: Tue, 24 Aug 2021 18:58:42 +0200 Subject: [PATCH 64/90] Add lifetime to solar-rooftop Rooftop-solar generators are missing the lifetime attribute when they are added. This avoids that they are saved as brownfield capacities installed in a previous timestep when running myopic optimization. I.e, they are not captured in the following line https://github.com/PyPSA/pypsa-eur-sec/blob/5b9f64354fb8cb6a8d9bfca361b5397347309ab3/scripts/add_existing_baseyear.py#L31 --- scripts/prepare_sector_network.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/prepare_sector_network.py b/scripts/prepare_sector_network.py index a5bc0d14..b93a0fc3 100644 --- a/scripts/prepare_sector_network.py +++ b/scripts/prepare_sector_network.py @@ -770,7 +770,8 @@ def insert_electricity_distribution_grid(n, costs): marginal_cost=n.generators.loc[solar, 'marginal_cost'], capital_cost=costs.at['solar-rooftop', 'fixed'], efficiency=n.generators.loc[solar, 'efficiency'], - p_max_pu=n.generators_t.p_max_pu[solar] + p_max_pu=n.generators_t.p_max_pu[solar], + lifetime=costs.at['solar-rooftop', 'lifetime'] ) n.add("Carrier", "home battery") From b4af3f3fa3dbd36f13ff1cd4dd0f2a90fc5075f2 Mon Sep 17 00:00:00 2001 From: Fabian Neumann Date: Wed, 22 Sep 2021 18:03:25 +0200 Subject: [PATCH 65/90] change license --- LICENSE.txt | 694 ++---------------------------------------- README.md | 2 +- doc/index.rst | 4 +- doc/release_notes.rst | 2 + 4 files changed, 25 insertions(+), 677 deletions(-) diff --git a/LICENSE.txt b/LICENSE.txt index 9cecc1d4..dc10fd32 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,674 +1,20 @@ - GNU GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The GNU General Public License is a free, copyleft license for -software and other kinds of works. - - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -the GNU General Public License is intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. We, the Free Software Foundation, use the -GNU General Public License for most of our software; it applies also to -any other work released this way by its authors. You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -them if you wish), that you receive source code or can get it if you -want it, that you can change the software or use pieces of it in new -free programs, and that you know you can do these things. - - To protect your rights, we need to prevent others from denying you -these rights or asking you to surrender the rights. Therefore, you have -certain responsibilities if you distribute copies of the software, or if -you modify it: responsibilities to respect the freedom of others. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must pass on to the recipients the same -freedoms that you received. You must make sure that they, too, receive -or can get the source code. And you must show them these terms so they -know their rights. - - Developers that use the GNU GPL protect your rights with two steps: -(1) assert copyright on the software, and (2) offer you this License -giving you legal permission to copy, distribute and/or modify it. - - For the developers' and authors' protection, the GPL clearly explains -that there is no warranty for this free software. For both users' and -authors' sake, the GPL requires that modified versions be marked as -changed, so that their problems will not be attributed erroneously to -authors of previous versions. - - Some devices are designed to deny users access to install or run -modified versions of the software inside them, although the manufacturer -can do so. This is fundamentally incompatible with the aim of -protecting users' freedom to change the software. The systematic -pattern of such abuse occurs in the area of products for individuals to -use, which is precisely where it is most unacceptable. Therefore, we -have designed this version of the GPL to prohibit the practice for those -products. If such problems arise substantially in other domains, we -stand ready to extend this provision to those domains in future versions -of the GPL, as needed to protect the freedom of users. - - Finally, every program is threatened constantly by software patents. -States should not allow patents to restrict development and use of -software on general-purpose computers, but in those that do, we wish to -avoid the special danger that patents applied to a free program could -make it effectively proprietary. To prevent this, the GPL assures that -patents cannot be used to render the program non-free. - - The precise terms and conditions for copying, distribution and -modification follow. - - TERMS AND CONDITIONS - - 0. Definitions. - - "This License" refers to version 3 of the GNU General Public License. - - "Copyright" also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. - - "The Program" refers to any copyrightable work licensed under this -License. Each licensee is addressed as "you". "Licensees" and -"recipients" may be individuals or organizations. - - To "modify" a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a "modified version" of the -earlier work or a work "based on" the earlier work. - - A "covered work" means either the unmodified Program or a work based -on the Program. - - To "propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well. - - To "convey" a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. - - An interactive user interface displays "Appropriate Legal Notices" -to the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. - - 1. Source Code. - - The "source code" for a work means the preferred form of the work -for making modifications to it. "Object code" means any non-source -form of a work. - - A "Standard Interface" means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language. - - The "System Libraries" of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -"Major Component", in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it. - - The "Corresponding Source" for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work. - - The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source. - - The Corresponding Source for a work in source code form is that -same work. - - 2. Basic Permissions. - - All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law. - - You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you. - - Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary. - - 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - - No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures. - - When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures. - - 4. Conveying Verbatim Copies. - - You may convey verbatim copies of the Program's source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program. - - You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee. - - 5. Conveying Modified Source Versions. - - You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions: - - a) The work must carry prominent notices stating that you modified - it, and giving a relevant date. - - b) The work must carry prominent notices stating that it is - released under this License and any conditions added under section - 7. This requirement modifies the requirement in section 4 to - "keep intact all notices". - - c) You must license the entire work, as a whole, under this - License to anyone who comes into possession of a copy. This - License will therefore apply, along with any applicable section 7 - additional terms, to the whole of the work, and all its parts, - regardless of how they are packaged. This License gives no - permission to license the work in any other way, but it does not - invalidate such permission if you have separately received it. - - d) If the work has interactive user interfaces, each must display - Appropriate Legal Notices; however, if the Program has interactive - interfaces that do not display Appropriate Legal Notices, your - work need not make them do so. - - A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -"aggregate" if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate. - - 6. Conveying Non-Source Forms. - - You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways: - - a) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by the - Corresponding Source fixed on a durable physical medium - customarily used for software interchange. - - b) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by a - written offer, valid for at least three years and valid for as - long as you offer spare parts or customer support for that product - model, to give anyone who possesses the object code either (1) a - copy of the Corresponding Source for all the software in the - product that is covered by this License, on a durable physical - medium customarily used for software interchange, for a price no - more than your reasonable cost of physically performing this - conveying of source, or (2) access to copy the - Corresponding Source from a network server at no charge. - - c) Convey individual copies of the object code with a copy of the - written offer to provide the Corresponding Source. This - alternative is allowed only occasionally and noncommercially, and - only if you received the object code with such an offer, in accord - with subsection 6b. - - d) Convey the object code by offering access from a designated - place (gratis or for a charge), and offer equivalent access to the - Corresponding Source in the same way through the same place at no - further charge. You need not require recipients to copy the - Corresponding Source along with the object code. If the place to - copy the object code is a network server, the Corresponding Source - may be on a different server (operated by you or a third party) - that supports equivalent copying facilities, provided you maintain - clear directions next to the object code saying where to find the - Corresponding Source. Regardless of what server hosts the - Corresponding Source, you remain obligated to ensure that it is - available for as long as needed to satisfy these requirements. - - e) Convey the object code using peer-to-peer transmission, provided - you inform other peers where the object code and Corresponding - Source of the work are being offered to the general public at no - charge under subsection 6d. - - A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work. - - A "User Product" is either (1) a "consumer product", which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, "normally used" refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. - - "Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made. - - If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM). - - The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. - - Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying. - - 7. Additional Terms. - - "Additional permissions" are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - - When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission. - - Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms: - - a) Disclaiming warranty or limiting liability differently from the - terms of sections 15 and 16 of this License; or - - b) Requiring preservation of specified reasonable legal notices or - author attributions in that material or in the Appropriate Legal - Notices displayed by works containing it; or - - c) Prohibiting misrepresentation of the origin of that material, or - requiring that modified versions of such material be marked in - reasonable ways as different from the original version; or - - d) Limiting the use for publicity purposes of names of licensors or - authors of the material; or - - e) Declining to grant rights under trademark law for use of some - trade names, trademarks, or service marks; or - - f) Requiring indemnification of licensors and authors of that - material by anyone who conveys the material (or modified versions of - it) with contractual assumptions of liability to the recipient, for - any liability that these contractual assumptions directly impose on - those licensors and authors. - - All other non-permissive additional terms are considered "further -restrictions" within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying. - - If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms. - - Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way. - - 8. Termination. - - You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - - However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated (a) -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and (b) permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation. - - Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - - Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10. - - 9. Acceptance Not Required for Having Copies. - - You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so. - - 10. Automatic Licensing of Downstream Recipients. - - Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - - An "entity transaction" is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts. - - You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it. - - 11. Patents. - - A "contributor" is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's "contributor version". - - A contributor's "essential patent claims" are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, "control" includes the right to grant -patent sublicenses in a manner consistent with the requirements of -this License. - - Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - - In the following three paragraphs, a "patent license" is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To "grant" such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - - If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - - If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it. - - A patent license is "discriminatory" if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license (a) in connection with copies of the covered work -conveyed by you (or copies made from those copies), or (b) primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007. - - Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law. - - 12. No Surrender of Others' Freedom. - - If conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program. - - 13. Use with the GNU Affero General Public License. - - Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU Affero General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the special requirements of the GNU Affero General Public License, -section 13, concerning interaction through a network will apply to the -combination as such. - - 14. Revised Versions of this License. - - The Free Software Foundation may publish revised and/or new versions of -the GNU General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - - Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU General -Public License "or any later version" applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU General Public License, you may choose any version ever published -by the Free Software Foundation. - - If the Program specifies that a proxy can decide which future -versions of the GNU General Public License can be used, that proxy's -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program. - - Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. - - 15. Disclaimer of Warranty. - - THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. Limitation of Liability. - - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES. - - 17. Interpretation of Sections 15 and 16. - - If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -state the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - {one line to give the program's name and a brief idea of what it does.} - Copyright (C) {year} {name of author} - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . - -Also add information on how to contact you by electronic and paper mail. - - If the program does terminal interaction, make it output a short -notice like this when it starts in an interactive mode: - - {project} Copyright (C) {year} {fullname} - This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, your program's commands -might be different; for a GUI interface, you would use an "about box". - - You should also get your employer (if you work as a programmer) or school, -if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU GPL, see -. - - The GNU General Public License does not permit incorporating your program -into proprietary programs. If your program is a subroutine library, you -may consider it more useful to permit linking proprietary applications with -the library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. But first, please read -. +MIT License + +Copyright 2017-2021 The PyPSA-Eur Authors + +Permission is hereby granted, free of charge, to any person obtaining a copy of +this software and associated documentation files (the "Software"), to deal in +the Software without restriction, including without limitation the rights to +use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of +the Software, and to permit persons to whom the Software is furnished to do so, +subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS +FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR +COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER +IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. \ No newline at end of file diff --git a/README.md b/README.md index fe81519b..83ebbbe7 100644 --- a/README.md +++ b/README.md @@ -65,6 +65,6 @@ the additional sectors. # Licence The code in PyPSA-Eur-Sec is released as free software under the -[GPLv3](http://www.gnu.org/licenses/gpl-3.0.en.html), see LICENSE.txt. +[MIT License](https://opensource.org/licenses/MIT), see `LICENSE.txt`. However, different licenses and terms of use may apply to the various input data. diff --git a/doc/index.rst b/doc/index.rst index 1bf307f5..0c6f929d 100644 --- a/doc/index.rst +++ b/doc/index.rst @@ -134,7 +134,7 @@ it. Licence ======= -The code in PyPSA-Eur-Sec is released as free software under the `GPLv3 -`_, see +The code in PyPSA-Eur-Sec is released as free software under the +`MIT license `_, see `LICENSE `_. However, different licenses and terms of use may apply to the various input data. diff --git a/doc/release_notes.rst b/doc/release_notes.rst index 016e19dc..4de40f06 100644 --- a/doc/release_notes.rst +++ b/doc/release_notes.rst @@ -8,6 +8,8 @@ Future release .. note:: This unreleased version currently requires the master branches of PyPSA, PyPSA-Eur, and the technology-data repository. +* With this release, we change the license from copyleft GPLv3 to the more + liberal MIT license with the consent of all contributors. * Extended use of ``multiprocessing`` for much better performance (from up to 20 minutes to less than one minute). * Compatibility with ``atlite>=0.2``. Older versions of ``atlite`` will no longer work. From fbccd5fbc085017c4326d04032fb3f636a929173 Mon Sep 17 00:00:00 2001 From: Tom Brown Date: Fri, 24 Sep 2021 13:00:58 +0200 Subject: [PATCH 66/90] industry: separate HVC, methanol and chlorine from basic chemicals --- config.default.yaml | 16 ++++-- ...ustrial_energy_demand_per_country_today.py | 5 ++ ...build_industrial_production_per_country.py | 19 +++++-- ...ustrial_production_per_country_tomorrow.py | 4 +- .../build_industrial_production_per_node.py | 8 +-- scripts/build_industry_sector_ratios.py | 52 +++++++++++++------ 6 files changed, 74 insertions(+), 30 deletions(-) diff --git a/config.default.yaml b/config.default.yaml index dfc888c4..e13fdc85 100644 --- a/config.default.yaml +++ b/config.default.yaml @@ -72,7 +72,7 @@ electricity: # regulate what components with which carriers are kept from PyPSA-Eur; # some technologies are removed because they are implemented differently -# (e.g. battery or H2 storage) or have different year-dependent costs +# (e.g. battery or H2 storage) or have different year-dependent costs # in PyPSA-Eur-Sec pypsa_eur: Bus: @@ -270,10 +270,18 @@ industry: MWh_elec_per_tNH3_electrolysis: 1.17 # from https://doi.org/10.1016/j.joule.2018.04.017 Table 13 (air separation and HB) NH3_process_emissions: 24.5 # in MtCO2/a from SMR for H2 production for NH3 from UNFCCC for 2015 for EU28 petrochemical_process_emissions: 25.5 # in MtCO2/a for petrochemical and other from UNFCCC for 2015 for EU28 - HVC_primary_fraction: 1.0 #fraction of current non-ammonia basic chemicals produced via primary route + HVC_primary_fraction: 1. # fraction of today's HVC produced via primary route + HVC_production_today: 52. # MtHVC/a from DECHEMA (2017), Figure 16, page 107; includes ethylene, propylene and BTX + chlorine_production_today: 9.58 # MtCl/a from DECHEMA (2017), Table 7, page 43 + MWh_elec_per_tCl: 3.6 # DECHEMA (2017), Table 6, page 43 + MWh_H2_per_tCl: -0.9372 # DECHEMA (2017), page 43; negative since hydrogen produced in chloralkali process + methanol_production_today: 1.5 # MtMeOH/a from DECHEMA (2017), page 62 + MWh_elec_per_tMeOH: 0.167 # DECHEMA (2017), Table 14, page 65 + MWh_CH4_per_tMeOH: 10.25 # DECHEMA (2017), Table 14, page 65 hotmaps_locate_missing: false reference_year: 2015 - + # references: + # DECHEMA (2017): https://dechema.de/dechema_media/Downloads/Positionspapiere/Technology_study_Low_carbon_energy_and_feedstock_for_the_European_chemical_industry-p-20002750.pdf costs: lifetime: 25 #default lifetime @@ -335,7 +343,7 @@ solving: plotting: map: - boundaries: [-11, 30, 34, 71] + boundaries: [-11, 30, 34, 71] color_geomap: ocean: white land: whitesmoke diff --git a/scripts/build_industrial_energy_demand_per_country_today.py b/scripts/build_industrial_energy_demand_per_country_today.py index 1d906b24..af30553e 100644 --- a/scripts/build_industrial_energy_demand_per_country_today.py +++ b/scripts/build_industrial_energy_demand_per_country_today.py @@ -114,6 +114,11 @@ def add_non_eu28_industrial_energy_demand(demand): fn = snakemake.input.industrial_production_per_country production = pd.read_csv(fn, index_col=0) / 1e3 + #recombine HVC, Chlorine and Methanol to Basic chemicals (without ammonia) + chemicals = ["HVC", "Chlorine", "Methanol"] + production["Basic chemicals (without ammonia)"] = production[chemicals].sum(axis=1) + production.drop(columns=chemicals, inplace=True) + eu28_production = production.loc[eu28].sum() eu28_energy = demand.groupby(level=1).sum() eu28_averages = eu28_energy / eu28_production diff --git a/scripts/build_industrial_production_per_country.py b/scripts/build_industrial_production_per_country.py index 1754752a..c7973751 100644 --- a/scripts/build_industrial_production_per_country.py +++ b/scripts/build_industrial_production_per_country.py @@ -179,8 +179,8 @@ def industry_production(countries): return demand -def add_ammonia_demand_separately(demand): - """Include ammonia demand separately and remove ammonia from basic chemicals.""" +def separate_basic_chemicals(demand): + """Remove ammonia, chlorine and methanol from basic chemicals to get HVC.""" ammonia = pd.read_csv(snakemake.input.ammonia_production, index_col=0) @@ -198,9 +198,16 @@ def add_ammonia_demand_separately(demand): # EE, HR and LT got negative demand through subtraction - poor data demand['Basic chemicals'].clip(lower=0., inplace=True) - to_rename = {"Basic chemicals": "Basic chemicals (without ammonia)"} - demand.rename(columns=to_rename, inplace=True) + demand.insert(2, "HVC", 0.) + demand.insert(3, "Chlorine", 0.) + demand.insert(4, "Methanol", 0.) + # assume HVC, methanol, chlorine production proportional to non-ammonia basic chemicals + demand["HVC"] = config["HVC_production_today"]*1e3/demand["Basic chemicals"].sum()*demand["Basic chemicals"] + demand["Chlorine"] = config["chlorine_production_today"]*1e3/demand["Basic chemicals"].sum()*demand["Basic chemicals"] + demand["Methanol"] = config["methanol_production_today"]*1e3/demand["Basic chemicals"].sum()*demand["Basic chemicals"] + + demand.drop(columns=["Basic chemicals"], inplace=True) if __name__ == '__main__': if 'snakemake' not in globals(): @@ -211,12 +218,14 @@ if __name__ == '__main__': year = snakemake.config['industry']['reference_year'] + config = snakemake.config["industry"] + jrc_dir = snakemake.input.jrc eurostat_dir = snakemake.input.eurostat demand = industry_production(countries) - add_ammonia_demand_separately(demand) + separate_basic_chemicals(demand) fn = snakemake.output.industrial_production_per_country demand.to_csv(fn, float_format='%.2f') diff --git a/scripts/build_industrial_production_per_country_tomorrow.py b/scripts/build_industrial_production_per_country_tomorrow.py index ba69e0a6..3372a88a 100644 --- a/scripts/build_industrial_production_per_country_tomorrow.py +++ b/scripts/build_industrial_production_per_country_tomorrow.py @@ -39,11 +39,11 @@ if __name__ == '__main__': al_primary_fraction = get(config["Al_primary_fraction"], investment_year) fraction_persistent_primary = al_primary_fraction * total_aluminium.sum() / production[key_pri].sum() - + production[key_pri] = fraction_persistent_primary * production[key_pri] production[key_sec] = total_aluminium - production[key_pri] - production["Basic chemicals (without ammonia)"] *= config['HVC_primary_fraction'] + production["HVC"] *= config['HVC_primary_fraction'] fn = snakemake.output.industrial_production_per_country_tomorrow production.to_csv(fn, float_format='%.2f') diff --git a/scripts/build_industrial_production_per_node.py b/scripts/build_industrial_production_per_node.py index b5361e6b..88f36eec 100644 --- a/scripts/build_industrial_production_per_node.py +++ b/scripts/build_industrial_production_per_node.py @@ -9,7 +9,9 @@ sector_mapping = { 'Integrated steelworks': 'Iron and steel', 'DRI + Electric arc': 'Iron and steel', 'Ammonia': 'Chemical industry', - 'Basic chemicals (without ammonia)': 'Chemical industry', + 'HVC': 'Chemical industry', + 'Methanol': 'Chemical industry', + 'Chlorine': 'Chemical industry', 'Other chemicals': 'Chemical industry', 'Pharmaceutical products etc.': 'Chemical industry', 'Cement': 'Cement', @@ -40,12 +42,12 @@ def build_nodal_industrial_production(): countries = keys.country.unique() sectors = industrial_production.columns - + for country, sector in product(countries, sectors): buses = keys.index[keys.country == country] mapping = sector_mapping.get(sector, "population") - + key = keys.loc[buses, mapping] nodal_production.loc[buses, sector] = industrial_production.at[country, sector] * key diff --git a/scripts/build_industry_sector_ratios.py b/scripts/build_industry_sector_ratios.py index adfb1d3c..738b500e 100644 --- a/scripts/build_industry_sector_ratios.py +++ b/scripts/build_industry_sector_ratios.py @@ -279,7 +279,7 @@ def chemicals_industry(): df = pd.DataFrame(index=index) - # Basid chemicals + # Basic chemicals sector = "Basic chemicals" @@ -374,52 +374,72 @@ def chemicals_industry(): # putting in ammonia demand for H2 and electricity separately s_emi = idees["emi"][3:57] - s_out = idees["out"][8:9] assert s_emi.index[0] == sector - assert sector in str(s_out.index) - ammonia = pd.read_csv(snakemake.input.ammonia_production, index_col=0) - - # ktNH3/a - ammonia_total = ammonia.loc[ammonia.index.intersection(eu28), str(year)].sum() - - s_out -= ammonia_total + # convert from MtHVC/a to ktHVC/a + s_out = config["HVC_production_today"]*1e3 # tCO2/t material df.loc["process emission", sector] += ( s_emi["Process emissions"] - config["petrochemical_process_emissions"] * 1e3 - config["NH3_process_emissions"] * 1e3 - ) / s_out.values + ) / s_out # emissions originating from feedstock, could be non-fossil origin # tCO2/t material df.loc["process emission from feedstock", sector] += ( config["petrochemical_process_emissions"] * 1e3 - ) / s_out.values + ) / s_out # convert from ktoe/a to GWh/a sources = ["elec", "biomass", "methane", "hydrogen", "heat", "naphtha"] df.loc[sources, sector] *= toe_to_MWh + # subtract ammonia energy demand + ammonia = pd.read_csv(snakemake.input.ammonia_production, index_col=0) + # ktNH3/a + ammonia_total = ammonia.loc[ammonia.index.intersection(eu28), str(year)].sum() df.loc["methane", sector] -= ammonia_total * config["MWh_CH4_per_tNH3_SMR"] df.loc["elec", sector] -= ammonia_total * config["MWh_elec_per_tNH3_SMR"] - # MWh/t material - df.loc[sources, sector] = df.loc[sources, sector] / s_out.values + # subtract chlorine demand + chlorine_total = config["chlorine_production_today"] + df.loc["hydrogen", sector] -= chlorine_total * config["MWh_H2_per_tCl"] + df.loc["elec", sector] -= chlorine_total * config["MWh_elec_per_tCl"] - to_rename = {sector: f"{sector} (without ammonia)"} + # subtract methanol demand + methanol_total = config["methanol_production_today"] + df.loc["methane", sector] -= methanol_total * config["MWh_CH4_per_tMeOH"] + df.loc["elec", sector] -= methanol_total * config["MWh_elec_per_tMeOH"] + + # MWh/t material + df.loc[sources, sector] = df.loc[sources, sector] / s_out + + to_rename = {sector: "HVC"} df.rename(columns=to_rename, inplace=True) # Ammonia sector = "Ammonia" - df[sector] = 0.0 - df.loc["hydrogen", sector] = config["MWh_H2_per_tNH3_electrolysis"] df.loc["elec", sector] = config["MWh_elec_per_tNH3_electrolysis"] + # Chlorine + + sector = "Chlorine" + df[sector] = 0.0 + df.loc["hydrogen", sector] = config["MWh_H2_per_tCl"] + df.loc["elec", sector] = config["MWh_elec_per_tCl"] + + # Methanol + + sector = "Methanol" + df[sector] = 0.0 + df.loc["methane", sector] = config["MWh_CH4_per_tMeOH"] + df.loc["elec", sector] = config["MWh_elec_per_tMeOH"] + # Other chemicals sector = "Other chemicals" From 93d4eae1ea74d696088fc99a2d6494625e3b0332 Mon Sep 17 00:00:00 2001 From: Tom Brown Date: Fri, 24 Sep 2021 13:19:48 +0200 Subject: [PATCH 67/90] industry: for HVC, add mechanical and chemical recycling --- config.default.yaml | 5 +++++ ...ild_industrial_production_per_country_tomorrow.py | 3 +++ scripts/build_industrial_production_per_node.py | 2 ++ scripts/build_industry_sector_ratios.py | 12 ++++++++++++ 4 files changed, 22 insertions(+) diff --git a/config.default.yaml b/config.default.yaml index e13fdc85..0ed52c0d 100644 --- a/config.default.yaml +++ b/config.default.yaml @@ -271,7 +271,11 @@ industry: NH3_process_emissions: 24.5 # in MtCO2/a from SMR for H2 production for NH3 from UNFCCC for 2015 for EU28 petrochemical_process_emissions: 25.5 # in MtCO2/a for petrochemical and other from UNFCCC for 2015 for EU28 HVC_primary_fraction: 1. # fraction of today's HVC produced via primary route + HVC_mechanical_recycling_fraction: 0. # fraction of today's HVC produced via mechanical recycling + HVC_chemical_recycling_fraction: 0. # fraction of today's HVC produced via chemical recycling HVC_production_today: 52. # MtHVC/a from DECHEMA (2017), Figure 16, page 107; includes ethylene, propylene and BTX + MWh_elec_per_tHVC_mechanical_recycling: 3. # estimate + MWh_elec_per_tHVC_chemical_recycling: 6.9 # Material Economics (2019), page 125; based on pyrolysis and steam cracking chlorine_production_today: 9.58 # MtCl/a from DECHEMA (2017), Table 7, page 43 MWh_elec_per_tCl: 3.6 # DECHEMA (2017), Table 6, page 43 MWh_H2_per_tCl: -0.9372 # DECHEMA (2017), page 43; negative since hydrogen produced in chloralkali process @@ -282,6 +286,7 @@ industry: reference_year: 2015 # references: # DECHEMA (2017): https://dechema.de/dechema_media/Downloads/Positionspapiere/Technology_study_Low_carbon_energy_and_feedstock_for_the_European_chemical_industry-p-20002750.pdf + # Material Economics (2019): https://materialeconomics.com/latest-updates/industrial-transformation-2050 costs: lifetime: 25 #default lifetime diff --git a/scripts/build_industrial_production_per_country_tomorrow.py b/scripts/build_industrial_production_per_country_tomorrow.py index 3372a88a..17367bbc 100644 --- a/scripts/build_industrial_production_per_country_tomorrow.py +++ b/scripts/build_industrial_production_per_country_tomorrow.py @@ -43,6 +43,9 @@ if __name__ == '__main__': production[key_pri] = fraction_persistent_primary * production[key_pri] production[key_sec] = total_aluminium - production[key_pri] + production.insert(4, "HVC (mechanical recycling)", config["HVC_mechanical_recycling_fraction"]*production["HVC"]) + production.insert(5, "HVC (chemical recycling)", config["HVC_chemical_recycling_fraction"]*production["HVC"]) + production["HVC"] *= config['HVC_primary_fraction'] fn = snakemake.output.industrial_production_per_country_tomorrow diff --git a/scripts/build_industrial_production_per_node.py b/scripts/build_industrial_production_per_node.py index 88f36eec..4ceffee9 100644 --- a/scripts/build_industrial_production_per_node.py +++ b/scripts/build_industrial_production_per_node.py @@ -10,6 +10,8 @@ sector_mapping = { 'DRI + Electric arc': 'Iron and steel', 'Ammonia': 'Chemical industry', 'HVC': 'Chemical industry', + 'HVC (mechanical recycling)': 'Chemical industry', + 'HVC (chemical recycling)': 'Chemical industry', 'Methanol': 'Chemical industry', 'Chlorine': 'Chemical industry', 'Other chemicals': 'Chemical industry', diff --git a/scripts/build_industry_sector_ratios.py b/scripts/build_industry_sector_ratios.py index 738b500e..a6c53720 100644 --- a/scripts/build_industry_sector_ratios.py +++ b/scripts/build_industry_sector_ratios.py @@ -419,6 +419,18 @@ def chemicals_industry(): to_rename = {sector: "HVC"} df.rename(columns=to_rename, inplace=True) + # HVC mechanical recycling + + sector = "HVC (mechanical recycling)" + df[sector] = 0.0 + df.loc["elec", sector] = config["MWh_elec_per_tHVC_mechanical_recycling"] + + # HVC chemical recycling + + sector = "HVC (chemical recycling)" + df[sector] = 0.0 + df.loc["elec", sector] = config["MWh_elec_per_tHVC_chemical_recycling"] + # Ammonia sector = "Ammonia" From b391aa6475c9be664efe47b5c60828698af4f782 Mon Sep 17 00:00:00 2001 From: lisazeyen <35347358+lisazeyen@users.noreply.github.com> Date: Fri, 24 Sep 2021 14:59:53 +0200 Subject: [PATCH 68/90] Update build_biomass_transport_costs.py change snakemake output file format --- scripts/build_biomass_transport_costs.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/build_biomass_transport_costs.py b/scripts/build_biomass_transport_costs.py index fc29853b..aaec215b 100644 --- a/scripts/build_biomass_transport_costs.py +++ b/scripts/build_biomass_transport_costs.py @@ -82,7 +82,7 @@ def build_biomass_transport_costs(): # add missing Norway with data from Sweden transport_costs["NO"] = transport_costs["SE"] - transport_costs.to_csv(snakemake.output.transport_costs) + transport_costs.to_csv(snakemake.output[0]) if __name__ == "__main__": From 960d857d0bdf5d290878f7530e60902ed2909ca5 Mon Sep 17 00:00:00 2001 From: lisazeyen <35347358+lisazeyen@users.noreply.github.com> Date: Fri, 24 Sep 2021 15:29:04 +0200 Subject: [PATCH 69/90] Update config.default.yaml add color for CO2 pipelines --- config.default.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/config.default.yaml b/config.default.yaml index 66a9f299..14a6cc0a 100644 --- a/config.default.yaml +++ b/config.default.yaml @@ -467,6 +467,7 @@ plotting: hot water storage: '#BBBBBB' hot water charging: '#BBBBBB' hot water discharging: '#999999' + CO2 pipeline: '#999999' CHP: r CHP heat: r CHP electric: r From 7ed20aba7a06d02f5a3895b24857b6f3841f715d Mon Sep 17 00:00:00 2001 From: lisazeyen <35347358+lisazeyen@users.noreply.github.com> Date: Fri, 24 Sep 2021 15:30:43 +0200 Subject: [PATCH 70/90] Update prepare_sector_network.py add logger info if CO2 network is added --- scripts/prepare_sector_network.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/prepare_sector_network.py b/scripts/prepare_sector_network.py index 33f9c4b6..b3fb0426 100644 --- a/scripts/prepare_sector_network.py +++ b/scripts/prepare_sector_network.py @@ -392,7 +392,8 @@ def add_co2_tracking(n, options): def add_co2_network(n, costs): - + + logger.info("Adding CO2 network.") co2_links = create_network_topology(n, "CO2 pipeline ") cost_onshore = (1 - co2_links.underwater_fraction) * costs.at['CO2 pipeline', 'fixed'] * co2_links.length From 28264aa1140e5b6d834d2866a6217d42cd885784 Mon Sep 17 00:00:00 2001 From: lisazeyen <35347358+lisazeyen@users.noreply.github.com> Date: Mon, 27 Sep 2021 11:16:12 +0200 Subject: [PATCH 71/90] Small fixes (#167) * update mocksnakemake for testing * remove trailing whitespace in n.loads index * add missing color for H2 liquification * adjust to default lifetime 0 instead of NaN --- config.default.yaml | 5 +-- scripts/add_existing_baseyear.py | 19 +++++----- scripts/plot_network.py | 11 +++--- scripts/prepare_sector_network.py | 58 +++++++++++++++++-------------- 4 files changed, 50 insertions(+), 43 deletions(-) diff --git a/config.default.yaml b/config.default.yaml index dfc888c4..ec7dc399 100644 --- a/config.default.yaml +++ b/config.default.yaml @@ -72,7 +72,7 @@ electricity: # regulate what components with which carriers are kept from PyPSA-Eur; # some technologies are removed because they are implemented differently -# (e.g. battery or H2 storage) or have different year-dependent costs +# (e.g. battery or H2 storage) or have different year-dependent costs # in PyPSA-Eur-Sec pypsa_eur: Bus: @@ -335,7 +335,7 @@ solving: plotting: map: - boundaries: [-11, 30, 34, 71] + boundaries: [-11, 30, 34, 71] color_geomap: ocean: white land: whitesmoke @@ -420,6 +420,7 @@ plotting: lines: k transmission lines: k H2: m + H2 liquefaction: m hydrogen storage: m battery: slategray battery storage: slategray diff --git a/scripts/add_existing_baseyear.py b/scripts/add_existing_baseyear.py index 47c31c0e..2faa50f5 100644 --- a/scripts/add_existing_baseyear.py +++ b/scripts/add_existing_baseyear.py @@ -28,7 +28,7 @@ def add_build_year_to_new_assets(n, baseyear): # Give assets with lifetimes and no build year the build year baseyear for c in n.iterate_components(["Link", "Generator", "Store"]): - assets = c.df.index[~c.df.lifetime.isna() & c.df.build_year.isna()] + assets = c.df.index[~c.df.lifetime.isna() & c.df.build_year==0] c.df.loc[assets, "build_year"] = baseyear # add -baseyear to name @@ -60,7 +60,7 @@ def add_existing_renewables(df_agg): } for tech in ['solar', 'onwind', 'offwind']: - + carrier = carriers[tech] df = pd.read_csv(snakemake.input[f"existing_{tech}"], index_col=0).fillna(0.) @@ -112,9 +112,9 @@ def add_power_capacities_installed_before_baseyear(n, grouping_years, costs, bas Parameters ---------- n : pypsa.Network - grouping_years : + grouping_years : intervals to group existing capacities - costs : + costs : to read lifetime to estimate YearDecomissioning baseyear : int """ @@ -209,7 +209,7 @@ def add_power_capacities_installed_before_baseyear(n, grouping_years, costs, bas build_year=grouping_year, lifetime=costs.at[generator, 'lifetime'] ) - + else: n.madd("Link", @@ -268,7 +268,7 @@ def add_heating_capacities_installed_before_baseyear(n, baseyear, grouping_years df.fillna(0., inplace=True) # convert GW to MW - df *= 1e3 + df *= 1e3 cc = pd.read_csv(snakemake.input.country_codes, index_col=0) @@ -327,7 +327,7 @@ def add_heating_capacities_installed_before_baseyear(n, baseyear, grouping_years efficiency = cop[heat_pump_type][nodes[name]] else: efficiency = costs.at[costs_name, 'efficiency'] - + for i, grouping_year in enumerate(grouping_years): if int(grouping_year) + default_lifetime <= int(baseyear): @@ -378,7 +378,7 @@ def add_heating_capacities_installed_before_baseyear(n, baseyear, grouping_years build_year=int(grouping_year), lifetime=costs.at[name_type + ' gas boiler', 'lifetime'] ) - + n.madd("Link", nodes[name], suffix=f" {name} oil boiler-{grouping_year}", @@ -410,7 +410,8 @@ if __name__ == "__main__": simpl='', clusters=45, lv=1.0, - sector_opts='Co2L0-168H-T-H-B-I-solar3-dist1', + opts='', + sector_opts='Co2L0-168H-T-H-B-I-solar+p3-dist1', planning_horizons=2020, ) diff --git a/scripts/plot_network.py b/scripts/plot_network.py index c97956a0..5182123b 100644 --- a/scripts/plot_network.py +++ b/scripts/plot_network.py @@ -289,7 +289,7 @@ def plot_h2_map(network): title='Electrolyzer capacity', handler_map=make_handler_map_to_scale_circles_as_in(ax) ) - + ax.add_artist(l2) handles = [] @@ -523,10 +523,11 @@ if __name__ == "__main__": snakemake = mock_snakemake( 'plot_network', simpl='', - clusters=48, - lv=1.0, - sector_opts='Co2L0-168H-T-H-B-I-solar3-dist1', - planning_horizons=2050, + clusters=45, + lv=1.5, + opts='', + sector_opts='Co2L0-168H-T-H-B-I-solar+p3-dist1', + planning_horizons=2030, ) overrides = override_component_attrs(snakemake.input.overrides) diff --git a/scripts/prepare_sector_network.py b/scripts/prepare_sector_network.py index be6bf4e7..ef6845fc 100644 --- a/scripts/prepare_sector_network.py +++ b/scripts/prepare_sector_network.py @@ -75,7 +75,7 @@ def co2_emissions_year(countries, opts, year): co2_emissions = co2_totals.loc[countries, sectors].sum().sum() # convert MtCO2 to GtCO2 - co2_emissions *= 0.001 + co2_emissions *= 0.001 return co2_emissions @@ -102,14 +102,14 @@ def build_carbon_budget(o, fn): #emissions at the beginning of the path (last year available 2018) e_0 = co2_emissions_year(countries, opts, year=2018) - + planning_horizons = snakemake.config['scenario']['planning_horizons'] t_0 = planning_horizons[0] if "be" in o: # final year in the path - t_f = t_0 + (2 * carbon_budget / e_0).round(0) + t_f = t_0 + (2 * carbon_budget / e_0).round(0) def beta_decay(t): cdf_term = (t - t_0) / (t_f - t_0) @@ -270,6 +270,9 @@ def patch_electricity_network(n): update_wind_solar_costs(n, costs) n.loads["carrier"] = "electricity" n.buses["location"] = n.buses.index + # 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) def add_co2_tracking(n, options): @@ -768,7 +771,7 @@ def insert_electricity_distribution_grid(n, costs): capital_cost=costs.at['solar-rooftop', 'fixed'], efficiency=n.generators.loc[solar, 'efficiency'], p_max_pu=n.generators_t.p_max_pu[solar], - lifetime=costs.at['solar-rooftop', 'lifetime'] + lifetime=costs.at['solar-rooftop', 'lifetime'] ) n.add("Carrier", "home battery") @@ -816,7 +819,7 @@ def insert_gas_distribution_costs(n, costs): # TODO options? f_costs = options['gas_distribution_grid_cost_factor'] - + print("Inserting gas distribution grid with investment cost factor of", f_costs) capital_cost = costs.loc['electricity distribution grid']["fixed"] * f_costs @@ -825,7 +828,7 @@ def insert_gas_distribution_costs(n, costs): gas_b = n.links.index[n.links.carrier.str.contains("gas boiler") & (~n.links.carrier.str.contains("urban central"))] n.links.loc[gas_b, "capital_cost"] += capital_cost - + # micro CHPs mchp = n.links.index[n.links.carrier.str.contains("micro gas")] n.links.loc[mchp, "capital_cost"] += capital_cost @@ -1073,7 +1076,7 @@ def add_land_transport(n, costs): suffix=" EV battery", carrier="Li ion" ) - + p_set = electric_share * (transport[nodes] + cycling_shift(transport[nodes], 1) + cycling_shift(transport[nodes], 2)) / 3 n.madd("Load", @@ -1084,8 +1087,8 @@ def add_land_transport(n, costs): p_set=p_set ) - - p_nom = nodal_transport_data["number cars"] * options.get("bev_charge_rate", 0.011) * electric_share + + p_nom = nodal_transport_data["number cars"] * options.get("bev_charge_rate", 0.011) * electric_share n.madd("Link", nodes, @@ -1117,7 +1120,7 @@ def add_land_transport(n, costs): if electric_share > 0 and options["bev_dsm"]: - e_nom = nodal_transport_data["number cars"] * options.get("bev_energy", 0.05) * options["bev_availability"] * electric_share + e_nom = nodal_transport_data["number cars"] * options.get("bev_energy", 0.05) * options["bev_availability"] * electric_share n.madd("Store", nodes, @@ -1197,7 +1200,7 @@ def add_heat(n, costs): "services urban decentral", "urban central" ] - + for name in heat_systems: name_type = "central" if name == "urban central" else "decentral" @@ -1279,16 +1282,16 @@ def add_heat(n, costs): p_nom_extendable=True ) - + if isinstance(options["tes_tau"], dict): tes_time_constant_days = options["tes_tau"][name_type] else: logger.warning("Deprecated: a future version will require you to specify 'tes_tau' ", "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 + capital_cost = costs.at[name_type + ' water tank storage', 'fixed'] / 0.00117 / 40 n.madd("Store", nodes[name] + f" {name} water tanks", @@ -1501,9 +1504,9 @@ def create_nodes_for_heat_sector(): # rural are areas with low heating density and individual heating # urban are areas with high heating density # urban can be split into district heating (central) and individual heating (decentral) - + sectors = ["residential", "services"] - + nodes = {} for sector in sectors: nodes[sector + " rural"] = pop_layout.index @@ -1514,10 +1517,10 @@ def create_nodes_for_heat_sector(): nodes[sector + " urban decentral"] = pop_layout.index[pop_layout.ct.isin(urban_decentral_ct)] else: nodes[sector + " urban decentral"] = pop_layout.index - + # for central nodes, residential and services are aggregated nodes["urban central"] = pop_layout.index.symmetric_difference(nodes["residential urban decentral"]) - + return nodes @@ -1752,9 +1755,9 @@ def add_industry(n, costs): if shipping_hydrogen_share < 1: shipping_oil_share = 1 - shipping_hydrogen_share - + p_set = shipping_oil_share * nodal_energy_totals.loc[nodes, all_navigation].sum(axis=1) * 1e6 / 8760. - + n.madd("Load", nodes, suffix=" shipping oil", @@ -1762,7 +1765,7 @@ def add_industry(n, costs): carrier="shipping oil", p_set=p_set ) - + co2 = shipping_oil_share * nodal_energy_totals.loc[nodes, all_navigation].sum().sum() * 1e6 / 8760 * costs.at["oil", "CO2 intensity"] n.add("Load", @@ -1781,7 +1784,7 @@ def add_industry(n, costs): ) if "EU oil Store" not in n.stores.index: - + #could correct to e.g. 0.001 EUR/kWh * annuity and O&M n.add("Store", "EU oil Store", @@ -1948,7 +1951,7 @@ def add_waste_heat(n): def decentral(n): - """Removes the electricity transmission system.""" + """Removes the electricity transmission system.""" n.lines.drop(n.lines.index, inplace=True) n.links.drop(n.links.index[n.links.carrier.isin(["DC", "B2B"])], inplace=True) @@ -1981,7 +1984,7 @@ def maybe_adjust_costs_and_potentials(n, opts): if attr == 'p_nom_max': comps = {"Generator", "Link", "StorageUnit"} elif attr == 'e_nom_max': - comps = {"Store"} + comps = {"Store"} else: comps = {"Generator", "Link", "StorageUnit", "Store"} for c in n.iterate_components(comps): @@ -2007,10 +2010,11 @@ if __name__ == "__main__": snakemake = mock_snakemake( 'prepare_sector_network', simpl='', - clusters=48, + clusters=45, lv=1.0, + opts='', sector_opts='Co2L0-168H-T-H-B-I-solar3-dist1', - planning_horizons=2020, + planning_horizons=2030, ) logging.basicConfig(level=snakemake.config['logging_level']) @@ -2036,7 +2040,7 @@ if __name__ == "__main__": patch_electricity_network(n) if snakemake.config["foresight"] == 'myopic': - + add_lifetime_wind_solar(n, costs) conventional = snakemake.config['existing_capacities']['conventional_carriers'] From 561d86c223a39f80881bb67c897d7f4a54a6d27b Mon Sep 17 00:00:00 2001 From: Fabian Neumann Date: Mon, 27 Sep 2021 12:06:15 +0200 Subject: [PATCH 72/90] add mechanical recycling energy demand from literature Assuming energy demand for recycling of HPTE, PET, PS, PP as LDPE is more difficult to recycle. https://doi.org/10.1016/j.resconrec.2020.105010 https://www.generalkinematics.com/blog/different-types-plastics-recycled/ --- config.default.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.default.yaml b/config.default.yaml index 0ed52c0d..b0c8e60c 100644 --- a/config.default.yaml +++ b/config.default.yaml @@ -274,7 +274,7 @@ industry: HVC_mechanical_recycling_fraction: 0. # fraction of today's HVC produced via mechanical recycling HVC_chemical_recycling_fraction: 0. # fraction of today's HVC produced via chemical recycling HVC_production_today: 52. # MtHVC/a from DECHEMA (2017), Figure 16, page 107; includes ethylene, propylene and BTX - MWh_elec_per_tHVC_mechanical_recycling: 3. # estimate + MWh_elec_per_tHVC_mechanical_recycling: 0.547 # from SI of https://doi.org/10.1016/j.resconrec.2020.105010, Table S5, for HDPE, PP, PS, PET. LDPE would be 0.756. MWh_elec_per_tHVC_chemical_recycling: 6.9 # Material Economics (2019), page 125; based on pyrolysis and steam cracking chlorine_production_today: 9.58 # MtCl/a from DECHEMA (2017), Table 7, page 43 MWh_elec_per_tCl: 3.6 # DECHEMA (2017), Table 6, page 43 From 9f4e1f2176e87e208bf957d038df1aa7597df4cd Mon Sep 17 00:00:00 2001 From: Fabian Neumann Date: Tue, 28 Sep 2021 17:08:03 +0200 Subject: [PATCH 73/90] make HVC recycling ready for pathway, minor edits --- config.default.yaml | 2 +- doc/release_notes.rst | 1 + ..._industrial_energy_demand_per_country_today.py | 1 + .../build_industrial_production_per_country.py | 15 ++++++--------- ..._industrial_production_per_country_tomorrow.py | 6 +++--- scripts/build_industry_sector_ratios.py | 8 +++----- 6 files changed, 15 insertions(+), 18 deletions(-) diff --git a/config.default.yaml b/config.default.yaml index b0c8e60c..7e8a4664 100644 --- a/config.default.yaml +++ b/config.default.yaml @@ -275,7 +275,7 @@ industry: HVC_chemical_recycling_fraction: 0. # fraction of today's HVC produced via chemical recycling HVC_production_today: 52. # MtHVC/a from DECHEMA (2017), Figure 16, page 107; includes ethylene, propylene and BTX MWh_elec_per_tHVC_mechanical_recycling: 0.547 # from SI of https://doi.org/10.1016/j.resconrec.2020.105010, Table S5, for HDPE, PP, PS, PET. LDPE would be 0.756. - MWh_elec_per_tHVC_chemical_recycling: 6.9 # Material Economics (2019), page 125; based on pyrolysis and steam cracking + MWh_elec_per_tHVC_chemical_recycling: 6.9 # Material Economics (2019), page 125; based on pyrolysis and electric steam cracking chlorine_production_today: 9.58 # MtCl/a from DECHEMA (2017), Table 7, page 43 MWh_elec_per_tCl: 3.6 # DECHEMA (2017), Table 6, page 43 MWh_H2_per_tCl: -0.9372 # DECHEMA (2017), page 43; negative since hydrogen produced in chloralkali process diff --git a/doc/release_notes.rst b/doc/release_notes.rst index 4de40f06..c90e98f5 100644 --- a/doc/release_notes.rst +++ b/doc/release_notes.rst @@ -69,6 +69,7 @@ Future release * The transformation of the Steel and Aluminium production can be now defined for different years in the ``config.yaml`` file. * Include the option to alter the maximum energy capacity of a store via the ``carrier+factor`` in the ``{sector_opts}`` wildcard. This can be useful for sensitivity analyses. Example: ``co2 stored+e2`` multiplies the ``e_nom_max`` by factor 2. In this example, ``e_nom_max`` represents the CO2 sequestration potential in Europe. * Compatibility with ``xarray`` version 0.19. +* Separate basic chemicals into HVC, chlorine, methanol and ammonia [`#166 `_]. PyPSA-Eur-Sec 0.5.0 (21st May 2021) =================================== diff --git a/scripts/build_industrial_energy_demand_per_country_today.py b/scripts/build_industrial_energy_demand_per_country_today.py index af30553e..0adf84e7 100644 --- a/scripts/build_industrial_energy_demand_per_country_today.py +++ b/scripts/build_industrial_energy_demand_per_country_today.py @@ -103,6 +103,7 @@ def add_ammonia_energy_demand(demand): demand['Basic chemicals (without ammonia)'] = demand["Basic chemicals"] - demand["Ammonia"] demand['Basic chemicals (without ammonia)'].clip(lower=0, inplace=True) + demand.drop(columns='Basic chemicals', inplace=True) return demand diff --git a/scripts/build_industrial_production_per_country.py b/scripts/build_industrial_production_per_country.py index c7973751..eadfb224 100644 --- a/scripts/build_industrial_production_per_country.py +++ b/scripts/build_industrial_production_per_country.py @@ -180,7 +180,7 @@ def industry_production(countries): def separate_basic_chemicals(demand): - """Remove ammonia, chlorine and methanol from basic chemicals to get HVC.""" + """Separate basic chemicals into ammonia, chlorine, methanol and HVC.""" ammonia = pd.read_csv(snakemake.input.ammonia_production, index_col=0) @@ -189,7 +189,7 @@ def separate_basic_chemicals(demand): print("Following countries have no ammonia demand:", missing) - demand.insert(2, "Ammonia", 0.) + demand["Ammonia"] = 0. demand.loc[there, "Ammonia"] = ammonia.loc[there, str(year)] @@ -198,14 +198,11 @@ def separate_basic_chemicals(demand): # EE, HR and LT got negative demand through subtraction - poor data demand['Basic chemicals'].clip(lower=0., inplace=True) - demand.insert(2, "HVC", 0.) - demand.insert(3, "Chlorine", 0.) - demand.insert(4, "Methanol", 0.) - # assume HVC, methanol, chlorine production proportional to non-ammonia basic chemicals - demand["HVC"] = config["HVC_production_today"]*1e3/demand["Basic chemicals"].sum()*demand["Basic chemicals"] - demand["Chlorine"] = config["chlorine_production_today"]*1e3/demand["Basic chemicals"].sum()*demand["Basic chemicals"] - demand["Methanol"] = config["methanol_production_today"]*1e3/demand["Basic chemicals"].sum()*demand["Basic chemicals"] + distribution_key = demand["Basic chemicals"] / demand["Basic chemicals"].sum() + demand["HVC"] = config["HVC_production_today"] * 1e3 * distribution_key + demand["Chlorine"] = config["chlorine_production_today"] * 1e3 * distribution_key + demand["Methanol"] = config["methanol_production_today"] * 1e3 * distribution_key demand.drop(columns=["Basic chemicals"], inplace=True) diff --git a/scripts/build_industrial_production_per_country_tomorrow.py b/scripts/build_industrial_production_per_country_tomorrow.py index 17367bbc..ccf31839 100644 --- a/scripts/build_industrial_production_per_country_tomorrow.py +++ b/scripts/build_industrial_production_per_country_tomorrow.py @@ -43,10 +43,10 @@ if __name__ == '__main__': production[key_pri] = fraction_persistent_primary * production[key_pri] production[key_sec] = total_aluminium - production[key_pri] - production.insert(4, "HVC (mechanical recycling)", config["HVC_mechanical_recycling_fraction"]*production["HVC"]) - production.insert(5, "HVC (chemical recycling)", config["HVC_chemical_recycling_fraction"]*production["HVC"]) + production["HVC (mechanical recycling)"] = get(config["HVC_mechanical_recycling_fraction"], investment_year) * production["HVC"] + production["HVC (chemical recycling)"] = get(config["HVC_chemical_recycling_fraction"], investment_year) * production["HVC"] - production["HVC"] *= config['HVC_primary_fraction'] + production["HVC"] *= get(config['HVC_primary_fraction'], investment_year) fn = snakemake.output.industrial_production_per_country_tomorrow production.to_csv(fn, float_format='%.2f') diff --git a/scripts/build_industry_sector_ratios.py b/scripts/build_industry_sector_ratios.py index a6c53720..49c82138 100644 --- a/scripts/build_industry_sector_ratios.py +++ b/scripts/build_industry_sector_ratios.py @@ -377,7 +377,7 @@ def chemicals_industry(): assert s_emi.index[0] == sector # convert from MtHVC/a to ktHVC/a - s_out = config["HVC_production_today"]*1e3 + s_out = config["HVC_production_today"] * 1e3 # tCO2/t material df.loc["process emission", sector] += ( @@ -396,9 +396,8 @@ def chemicals_industry(): sources = ["elec", "biomass", "methane", "hydrogen", "heat", "naphtha"] df.loc[sources, sector] *= toe_to_MWh - # subtract ammonia energy demand + # subtract ammonia energy demand (in ktNH3/a) ammonia = pd.read_csv(snakemake.input.ammonia_production, index_col=0) - # ktNH3/a ammonia_total = ammonia.loc[ammonia.index.intersection(eu28), str(year)].sum() df.loc["methane", sector] -= ammonia_total * config["MWh_CH4_per_tNH3_SMR"] df.loc["elec", sector] -= ammonia_total * config["MWh_elec_per_tNH3_SMR"] @@ -416,8 +415,7 @@ def chemicals_industry(): # MWh/t material df.loc[sources, sector] = df.loc[sources, sector] / s_out - to_rename = {sector: "HVC"} - df.rename(columns=to_rename, inplace=True) + df.rename(columns={sector: "HVC"}, inplace=True) # HVC mechanical recycling From 488b93a079a9fe428707e67fd12f0edb34acf76b Mon Sep 17 00:00:00 2001 From: Fabian Neumann Date: Tue, 28 Sep 2021 17:24:00 +0200 Subject: [PATCH 74/90] extend release notes on plastics recycling --- doc/release_notes.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/release_notes.rst b/doc/release_notes.rst index c90e98f5..da1f5c1d 100644 --- a/doc/release_notes.rst +++ b/doc/release_notes.rst @@ -70,6 +70,7 @@ Future release * Include the option to alter the maximum energy capacity of a store via the ``carrier+factor`` in the ``{sector_opts}`` wildcard. This can be useful for sensitivity analyses. Example: ``co2 stored+e2`` multiplies the ``e_nom_max`` by factor 2. In this example, ``e_nom_max`` represents the CO2 sequestration potential in Europe. * Compatibility with ``xarray`` version 0.19. * Separate basic chemicals into HVC, chlorine, methanol and ammonia [`#166 `_]. +* Add option to specify reuse, primary production, and mechanical and chemical recycling fraction of platics [`#166 `_]. PyPSA-Eur-Sec 0.5.0 (21st May 2021) =================================== From 53eab1ead24aac20fe0e23653b2a54fd089dd0fb Mon Sep 17 00:00:00 2001 From: lisazeyen Date: Tue, 28 Sep 2021 17:25:04 +0200 Subject: [PATCH 75/90] slice biomass potentials with the pop_layout index instead of the country if biomass transport = True --- scripts/prepare_sector_network.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/scripts/prepare_sector_network.py b/scripts/prepare_sector_network.py index 0b8518d4..81a60870 100644 --- a/scripts/prepare_sector_network.py +++ b/scripts/prepare_sector_network.py @@ -1688,8 +1688,7 @@ def add_biomass(n, costs): if options["biomass_transport"]: # potential per node distributed within country by population - biomass_potentials_spatial = (biomass_potentials.loc[pop_layout.ct] - .set_index(pop_layout.index) + biomass_potentials_spatial = (biomass_potentials.loc[pop_layout.index] .mul(pop_layout.fraction, axis="index") .rename(index=lambda x: x + " solid biomass")) else: @@ -2206,7 +2205,7 @@ if __name__ == "__main__": lv=1.0, opts='', sector_opts='Co2L0-168H-T-H-B-I-solar3-dist1', - planning_horizons=2030, + planning_horizons="2030", ) logging.basicConfig(level=snakemake.config['logging_level']) From 5c247425263054d3bda83277855395e279e7b59a Mon Sep 17 00:00:00 2001 From: Fabian Neumann Date: Tue, 28 Sep 2021 17:34:47 +0200 Subject: [PATCH 76/90] temporarily disable h2 liquefaction in shipping by default --- config.default.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.default.yaml b/config.default.yaml index d928fb86..3c5238c5 100644 --- a/config.default.yaml +++ b/config.default.yaml @@ -175,7 +175,7 @@ sector: transport_fuel_cell_efficiency: 0.5 transport_internal_combustion_efficiency: 0.3 shipping_average_efficiency: 0.4 #For conversion of fuel oil to propulsion in 2011 - shipping_hydrogen_liquefaction: true # whether to consider liquefaction costs for shipping H2 demands + shipping_hydrogen_liquefaction: false # whether to consider liquefaction costs for shipping H2 demands shipping_hydrogen_share: # 1 means all hydrogen FC 2020: 0 2025: 0 From 234a32c504b893dc3c0c4a7af76f0f40448a834d Mon Sep 17 00:00:00 2001 From: lisazeyen Date: Fri, 9 Jul 2021 13:33:26 +0200 Subject: [PATCH 77/90] bug fix --- 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 0282b5eb..6e992f03 100644 --- a/scripts/prepare_sector_network.py +++ b/scripts/prepare_sector_network.py @@ -2246,7 +2246,7 @@ if __name__ == "__main__": lv=1.0, opts='', sector_opts='Co2L0-168H-T-H-B-I-solar3-dist1', - planning_horizons="2020", + planning_horizons="2030", ) logging.basicConfig(level=snakemake.config['logging_level']) From e27ec46878f3327d43a04570e1da11d23ed0ced4 Mon Sep 17 00:00:00 2001 From: lisazeyen Date: Thu, 23 Sep 2021 14:10:56 +0200 Subject: [PATCH 78/90] add further comments --- 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 6e992f03..f669e309 100644 --- a/scripts/prepare_sector_network.py +++ b/scripts/prepare_sector_network.py @@ -1668,6 +1668,7 @@ def create_nodes_for_heat_sector(): # urban can be split into district heating (central) and individual heating (decentral) ct_urban = pop_layout.urban.groupby(pop_layout["ct"]).sum() + # distribution of urban population within a country pop_layout["urban_ct_fraction"] = pop_layout["urban"] / \ pop_layout["ct"].map(ct_urban.get) # todays district heating share per country @@ -1690,7 +1691,8 @@ def create_nodes_for_heat_sector(): dist_fraction = central_fraction * urban_fraction nodes["urban central"] = dist_fraction.index - if options['district_heating_increase']: # take current district heating share + # take current district heating share + if options['district_heating_increase']: dist_fraction = dist_heat_share * \ pop_layout["urban_ct_fraction"] / pop_layout["fraction"] nodes["urban central"] = dist_fraction.index From 8322350feea47bc5de2bfb4d65247ca3d8236540 Mon Sep 17 00:00:00 2001 From: lisazeyen Date: Wed, 29 Sep 2021 14:36:56 +0200 Subject: [PATCH 79/90] move calculation of district heating share to build_energy_totals --- Snakefile | 2 +- scripts/build_energy_totals.py | 30 +++++++++++++++++++++++++++++- 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/Snakefile b/Snakefile index 9400d301..a16e60f0 100644 --- a/Snakefile +++ b/Snakefile @@ -160,6 +160,7 @@ rule build_energy_totals: co2="data/eea/UNFCCC_v23.csv", swiss="data/switzerland-sfoe/switzerland-new_format.csv", idees="data/jrc-idees-2015", + district_heat_share='data/district_heat_share.csv', eurostat=input_eurostat output: energy_name='resources/energy_totals.csv', @@ -339,7 +340,6 @@ rule prepare_sector_network: energy_totals_name='resources/energy_totals.csv', co2_totals_name='resources/co2_totals.csv', transport_name='resources/transport_data.csv', - dh_share = "data/district_heat_share.csv", traffic_data_KFZ="data/emobility/KFZ__count", traffic_data_Pkw="data/emobility/Pkw__count", biomass_potentials='resources/biomass_potentials.csv', diff --git a/scripts/build_energy_totals.py b/scripts/build_energy_totals.py index aec1c61b..751f23bf 100644 --- a/scripts/build_energy_totals.py +++ b/scripts/build_energy_totals.py @@ -212,6 +212,12 @@ def idees_per_country(ct, year): assert df.index[47] == "Electricity" ct_totals["electricity residential"] = df[47] + assert df.index[46] == "Derived heat" + ct_totals["Derived heat residential"] = df[46] + + assert df.index[50] == 'Thermal uses' + ct_totals["Thermal uses residential"] = df[50] + # services df = pd.read_excel(fn_services, "SER_hh_fec", index_col=0)[year] @@ -239,6 +245,12 @@ def idees_per_country(ct, year): assert df.index[50] == "Electricity" ct_totals["electricity services"] = df[50] + assert df.index[49] == "Derived heat" + ct_totals["Derived heat services"] = df[49] + + assert df.index[53] == 'Thermal uses' + ct_totals["Thermal uses services"] = df[53] + # transport df = pd.read_excel(fn_transport, "TrRoad_ene", index_col=0)[year] @@ -342,6 +354,7 @@ def build_idees(countries, year): with mp.Pool(processes=nprocesses) as pool: totals_list = list(tqdm(pool.imap(func, countries), **tqdm_kwargs)) + totals = pd.concat(totals_list, axis=1) # convert ktoe to TWh @@ -351,6 +364,13 @@ def build_idees(countries, year): # convert TWh/100km to kWh/km totals.loc["passenger car efficiency"] *= 10 + # district heating share + district_heat = totals.loc[["Derived heat residential", + "Derived heat services"]].sum() + total_heat = totals.loc[["Thermal uses residential", + "Thermal uses services"]].sum() + totals.loc["district heat share"] = district_heat.div(total_heat) + return totals.T @@ -493,7 +513,7 @@ def build_energy_totals(countries, eurostat, swiss, idees): for purpose in ["passenger", "freight"]: attrs = [f"total domestic aviation {purpose}", f"total international aviation {purpose}"] - df.loc[missing, f"total aviation {purpose}"] = df.loc[missing, attrs].sum(axis=1) + df.loc[missing, f"total aviation {purpose}"] = df.loc[missing, attrs].sum(axis=1) if "BA" in df.index: # fill missing data for BA (services and road energy data) @@ -502,6 +522,14 @@ def build_energy_totals(countries, eurostat, swiss, idees): ratio = df.at["BA", "total residential"] / df.at["RS", "total residential"] df.loc['BA', missing] = ratio * df.loc["RS", missing] + # Missing district heating share + dh_share = pd.read_csv(snakemake.input.district_heat_share, + index_col=0, usecols=[0, 1]) + # make conservative assumption and take minimum from both data sets + df["district heat share"] = (pd.concat([df["district heat share"], + dh_share.reindex(index=df.index)/100], + axis=1).min(axis=1)) + return df From 854bd80818e81b80003c661eb214be4eb19e8f25 Mon Sep 17 00:00:00 2001 From: lisazeyen Date: Wed, 29 Sep 2021 14:37:36 +0200 Subject: [PATCH 80/90] rename central_fraction->district heating potential, restructure district heating share implementation --- scripts/prepare_sector_network.py | 99 ++++++++++++++----------------- 1 file changed, 45 insertions(+), 54 deletions(-) diff --git a/scripts/prepare_sector_network.py b/scripts/prepare_sector_network.py index f669e309..fea03d69 100644 --- a/scripts/prepare_sector_network.py +++ b/scripts/prepare_sector_network.py @@ -26,7 +26,7 @@ spatial = SimpleNamespace() def define_spatial(nodes): """ Namespace for spatial - + Parameters ---------- nodes : list-like @@ -36,7 +36,7 @@ def define_spatial(nodes): global options spatial.nodes = nodes - + # biomass spatial.biomass = SimpleNamespace() @@ -53,11 +53,11 @@ def define_spatial(nodes): spatial.biomass.industry_cc = ["solid biomass for industry CC"] spatial.biomass.df = pd.DataFrame(vars(spatial.biomass), index=nodes) - + # co2 spatial.co2 = SimpleNamespace() - + if options["co2_network"]: spatial.co2.nodes = nodes + " co2 stored" spatial.co2.locations = nodes @@ -72,7 +72,7 @@ def define_spatial(nodes): def emission_sectors_from_opts(opts): - sectors = ["electricity"] + sectors = ["electricity"] if "T" in opts: sectors += [ "rail non-elec", @@ -107,13 +107,13 @@ def get(item, investment_year=None): def create_network_topology(n, prefix, connector=" -> "): """ Create a network topology like the power transmission network. - + Parameters ---------- n : pypsa.Network prefix : str connector : str - + Returns ------- pd.DataFrame with columns bus0, bus1 and length @@ -228,7 +228,7 @@ def add_lifetime_wind_solar(n, costs): def create_network_topology(n, prefix, connector=" -> ", bidirectional=True): """ Create a network topology like the power transmission network. - + Parameters ---------- n : pypsa.Network @@ -237,7 +237,7 @@ def create_network_topology(n, prefix, connector=" -> ", bidirectional=True): bidirectional : bool, default True True: one link for each connection False: one link for each connection and direction (back and forth) - + Returns ------- pd.DataFrame with columns bus0, bus1 and length @@ -256,19 +256,19 @@ def create_network_topology(n, prefix, connector=" -> ", bidirectional=True): swap_buses = {"bus0": "bus1", "bus1": "bus0"} candidates_n = candidates[~positive_order].rename(columns=swap_buses) candidates = pd.concat([candidates_p, candidates_n]) - + def make_index(c): return prefix + c.bus0 + connector + c.bus1 topo = candidates.groupby(["bus0", "bus1"], as_index=False).mean() topo.index = topo.apply(make_index, axis=1) - + if not bidirectional: topo_reverse = topo.copy() topo_reverse.rename(columns=swap_buses, inplace=True) topo_reverse.index = topo_reverse.apply(make_index, axis=1) topo = topo.append(topo_reverse) - + return topo @@ -439,7 +439,7 @@ def add_co2_tracking(n, options): n.madd("Store", spatial.co2.nodes, e_nom_extendable=True, - e_nom_max=np.inf, + e_nom_max=np.inf, capital_cost=options['co2_sequestration_cost'], carrier="co2 stored", bus=spatial.co2.nodes @@ -458,14 +458,14 @@ def add_co2_tracking(n, options): def add_co2_network(n, costs): - + logger.info("Adding CO2 network.") co2_links = create_network_topology(n, "CO2 pipeline ") cost_onshore = (1 - co2_links.underwater_fraction) * costs.at['CO2 pipeline', 'fixed'] * co2_links.length cost_submarine = co2_links.underwater_fraction * costs.at['CO2 submarine pipeline', 'fixed'] * co2_links.length capital_cost = cost_onshore + cost_submarine - + n.madd("Link", co2_links.index, bus0=co2_links.bus0.values + " co2 stored", @@ -636,6 +636,9 @@ def prepare_data(n): nodal_energy_totals = energy_totals.loc[pop_layout.ct].fillna(0.) nodal_energy_totals.index = pop_layout.index + # district heat share not weighted by population + district_heat_share = round(nodal_energy_totals["district heat share"], + ndigits=2) nodal_energy_totals = nodal_energy_totals.multiply(pop_layout.fraction, axis=0) # copy forward the daily average heat demand into each hour, so it can be multipled by the intraday profile @@ -758,7 +761,7 @@ def prepare_data(n): ) - return nodal_energy_totals, heat_demand, ashp_cop, gshp_cop, solar_thermal, transport, avail_profile, dsm_profile, nodal_transport_data + return nodal_energy_totals, heat_demand, ashp_cop, gshp_cop, solar_thermal, transport, avail_profile, dsm_profile, nodal_transport_data, district_heat_share # TODO checkout PyPSA-Eur script @@ -1386,7 +1389,7 @@ def add_heat(n, costs): heat_load = heat_demand[[sector + " water",sector + " space"]].groupby(level=1,axis=1).sum()[nodes[name]].multiply(factor) if name == "urban central": - heat_load = heat_demand.groupby(level=1,axis=1).sum()[nodes[name]].multiply(factor * (1 + options['district_heating_loss'])) + heat_load = heat_demand.groupby(level=1,axis=1).sum()[nodes[name]].multiply(factor * (1 + options['district_heating']['district_heating_loss'])) n.madd("Load", nodes[name], @@ -1671,10 +1674,6 @@ def create_nodes_for_heat_sector(): # distribution of urban population within a country pop_layout["urban_ct_fraction"] = pop_layout["urban"] / \ pop_layout["ct"].map(ct_urban.get) - # todays district heating share per country - dist_heat_share_ct = pd.read_csv(snakemake.input.dh_share, index_col=0, - usecols=[0,1]).dropna()/100 - dist_heat_share = pop_layout.ct.map(dist_heat_share_ct["district heating share"]) sectors = ["residential", "services"] @@ -1686,36 +1685,29 @@ def create_nodes_for_heat_sector(): nodes[sector + " rural"] = pop_layout.index nodes[sector + " urban decentral"] = pop_layout.index - if options["central"] and not options['district_heating_increase']: - central_fraction = options['central_fraction'] - dist_fraction = central_fraction * urban_fraction - nodes["urban central"] = dist_fraction.index + # maximum potential of urban demand covered by district heating + central_fraction = options['district_heating']["potential"] + # district heating share at each node + dist_fraction_node = district_heat_share * pop_layout["urban_ct_fraction"] / pop_layout["fraction"] + nodes["urban central"] = dist_fraction_node.index + # if district heating share larger than urban fraction -> set urban + # fraction to district heating share + urban_fraction = pd.concat([urban_fraction, dist_fraction_node], + axis=1).max(axis=1) + # difference of max potential and today's share of district heating + diff = (urban_fraction * central_fraction) - dist_fraction_node + progress = get(options["district_heating"]["potential"], investment_year) + dist_fraction_node += diff * progress + print("************************************") + print( + "the current DH share compared to the maximum possible is increased \ + \n by a progress factor of ", + progress, + "resulting DH share: ", + dist_fraction_node) + print("**********************************") - # take current district heating share - if options['district_heating_increase']: - dist_fraction = dist_heat_share * \ - pop_layout["urban_ct_fraction"] / pop_layout["fraction"] - nodes["urban central"] = dist_fraction.index - # if district heating share larger than urban fraction -> set urban - # fraction to district heating share - urban_fraction = pd.concat([urban_fraction, dist_fraction], - axis=1).max(axis=1) - diff = urban_fraction - dist_fraction - dist_fraction += diff * get(options["dh_strength"], investment_year) - print("************************************") - print( - "the current DH share compared to the maximum possible is increased \ - \n by a factor of ", - get(options["dh_strength"], investment_year), - "resulting DH share: ", - dist_fraction) - print("**********************************") - - else: - dist_fraction = urban_fraction * 0 - nodes["urban central"] = dist_fraction.index - - return nodes, dist_fraction, urban_fraction + return nodes, dist_fraction_node, urban_fraction def add_biomass(n, costs): @@ -1788,7 +1780,7 @@ def add_biomass(n, costs): index_col=0, squeeze=True ) - + # add biomass transport biomass_transport = create_network_topology(n, "biomass transport ", bidirectional=False) @@ -2246,7 +2238,6 @@ if __name__ == "__main__": opts="", clusters="37", lv=1.0, - opts='', sector_opts='Co2L0-168H-T-H-B-I-solar3-dist1', planning_horizons="2030", ) @@ -2300,10 +2291,10 @@ if __name__ == "__main__": if o == "biomasstransport": options["biomass_transport"] = True - nodal_energy_totals, heat_demand, ashp_cop, gshp_cop, solar_thermal, transport, avail_profile, dsm_profile, nodal_transport_data = prepare_data(n) + nodal_energy_totals, heat_demand, ashp_cop, gshp_cop, solar_thermal, transport, avail_profile, dsm_profile, nodal_transport_data, district_heat_share = prepare_data(n) if "nodistrict" in opts: - options["central"] = False + options["district_heating"]["progress"] = 0.0 if "T" in opts: add_land_transport(n, costs) From 1e248b314dcc481e4a668265e36d410704224d17 Mon Sep 17 00:00:00 2001 From: Fabian Neumann Date: Wed, 29 Sep 2021 15:45:14 +0200 Subject: [PATCH 81/90] compatibility with biomass transport --- 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 81a60870..5f4b680e 100644 --- a/scripts/prepare_sector_network.py +++ b/scripts/prepare_sector_network.py @@ -1687,10 +1687,7 @@ def add_biomass(n, costs): biomass_potentials = pd.read_csv(snakemake.input.biomass_potentials, index_col=0) if options["biomass_transport"]: - # potential per node distributed within country by population - biomass_potentials_spatial = (biomass_potentials.loc[pop_layout.index] - .mul(pop_layout.fraction, axis="index") - .rename(index=lambda x: x + " solid biomass")) + biomass_potentials_spatial = biomass_potentials.rename(index=lambda x: x + " solid biomass") else: biomass_potentials_spatial = biomass_potentials.sum() From f6bb49873028b5c99b97621f6599504180e23af8 Mon Sep 17 00:00:00 2001 From: lisazeyen Date: Wed, 29 Sep 2021 16:13:23 +0200 Subject: [PATCH 82/90] include PR review --- doc/data.csv | 54 ++++++++++++++++--------------- scripts/prepare_sector_network.py | 19 +++++------ 2 files changed, 36 insertions(+), 37 deletions(-) diff --git a/doc/data.csv b/doc/data.csv index 8e316281..75bdc10e 100644 --- a/doc/data.csv +++ b/doc/data.csv @@ -1,26 +1,28 @@ -description,file/folder,licence,source -JRC IDEES database,jrc-idees-2015/,CC BY 4.0,https://ec.europa.eu/jrc/en/potencia/jrc-idees -urban/rural fraction,urban_percent.csv,unknown,unknown -JRC biomass potentials,biomass/,unknown,https://doi.org/10.2790/39014 -EEA emission statistics,eea/UNFCCC_v23.csv,EEA standard re-use policy,https://www.eea.europa.eu/data-and-maps/data/national-emissions-reported-to-the-unfccc-and-to-the-eu-greenhouse-gas-monitoring-mechanism-16 -Eurostat Energy Balances,eurostat-energy_balances-*/,Eurostat,https://ec.europa.eu/eurostat/web/energy/data/energy-balances -Swiss energy statistics from Swiss Federal Office of Energy,switzerland-sfoe/,unknown,http://www.bfe.admin.ch/themen/00526/00541/00542/02167/index.html?dossier_id=02169 -BASt emobility statistics,emobility/,unknown,http://www.bast.de/DE/Verkehrstechnik/Fachthemen/v2-verkehrszaehlung/Stundenwerte.html?nn=626916 -timezone mappings,timezone_mappings.csv,CC BY 4.0,Tom Brown -BDEW heating profile,heat_load_profile_BDEW.csv,unknown,https://github.com/oemof/demandlib -heating profiles for Aarhus,heat_load_profile_DK_AdamJensen.csv,unknown,Adam Jensen MA thesis at Aarhus University -George Lavidas wind/wave costs,WindWaveWEC_GLTB.xlsx,unknown,George Lavidas -country codes,Country_codes.csv,CC BY 4.0,Marta Victoria -co2 budgets,co2_budget.csv,CC BY 4.0,https://arxiv.org/abs/2004.11009 -existing heating potentials,existing_infrastructure/existing_heating_raw.csv,unknown,https://ec.europa.eu/energy/studies/mapping-and-analyses-current-and-future-2020-2030-heatingcooling-fuel-deployment_en?redir=1 -IRENA existing VRE capacities,existing_infrastructure/{solar|onwind|offwind}_capcity_IRENA.csv,unknown,https://www.irena.org/Statistics/Download-Data -USGS ammonia production,myb1-2017-nitro.xls,unknown,https://www.usgs.gov/centers/nmic/nitrogen-statistics-and-information -hydrogen salt cavern potentials,hydrogen_salt_cavern_potentials.csv,CC BY 4.0,https://doi.org/10.1016/j.ijhydene.2019.12.161 -hotmaps industrial site database,Industrial_Database.csv,CC BY 4.0,https://gitlab.com/hotmaps/industrial_sites/industrial_sites_Industrial_Database -Hotmaps building stock data,data_building_stock.csv,CC BY 4.0,https://gitlab.com/hotmaps/building-stock -U-values Poland,u_values_poland.csv,unknown,https://data.europa.eu/euodp/de/data/dataset/building-stock-observatory -Floor area missing in hotmaps building stock data,floor_area_missing.csv,unknown,https://data.europa.eu/euodp/de/data/dataset/building-stock-observatory -Comparative level investment,comparative_level_investment.csv,Eurostat,https://ec.europa.eu/eurostat/statistics-explained/index.php?title=Comparative_price_levels_for_investment -Electricity taxes,electricity_taxes_eu.csv,Eurostat,https://appsso.eurostat.ec.europa.eu/nui/show.do?dataset=nrg_pc_204&lang=en -Building topologies and corresponding standard values,tabula-calculator-calcsetbuilding.csv,unknown,https://episcope.eu/fileadmin/tabula/public/calc/tabula-calculator.xlsx -Retrofitting thermal envelope costs for Germany,retro_cost_germany.csv,unkown,https://www.iwu.de/forschung/handlungslogiken/kosten-energierelevanter-bau-und-anlagenteile-bei-modernisierung/ +description,file/folder,licence,source,, +JRC IDEES database,jrc-idees-2015/,CC BY 4.0,https://ec.europa.eu/jrc/en/potencia/jrc-idees,, +urban/rural fraction,urban_percent.csv,unknown,unknown,, +JRC biomass potentials,biomass/,unknown,https://doi.org/10.2790/39014,, +EEA emission statistics,eea/UNFCCC_v23.csv,EEA standard re-use policy,https://www.eea.europa.eu/data-and-maps/data/national-emissions-reported-to-the-unfccc-and-to-the-eu-greenhouse-gas-monitoring-mechanism-16,, +Eurostat Energy Balances,eurostat-energy_balances-*/,Eurostat,https://ec.europa.eu/eurostat/web/energy/data/energy-balances,, +Swiss energy statistics from Swiss Federal Office of Energy,switzerland-sfoe/,unknown,http://www.bfe.admin.ch/themen/00526/00541/00542/02167/index.html?dossier_id=02169,, +BASt emobility statistics,emobility/,unknown,http://www.bast.de/DE/Verkehrstechnik/Fachthemen/v2-verkehrszaehlung/Stundenwerte.html?nn=626916,, +timezone mappings,timezone_mappings.csv,CC BY 4.0,Tom Brown,, +BDEW heating profile,heat_load_profile_BDEW.csv,unknown,https://github.com/oemof/demandlib,, +heating profiles for Aarhus,heat_load_profile_DK_AdamJensen.csv,unknown,Adam Jensen MA thesis at Aarhus University,, +George Lavidas wind/wave costs,WindWaveWEC_GLTB.xlsx,unknown,George Lavidas,, +country codes,Country_codes.csv,CC BY 4.0,Marta Victoria,, +co2 budgets,co2_budget.csv,CC BY 4.0,https://arxiv.org/abs/2004.11009,, +existing heating potentials,existing_infrastructure/existing_heating_raw.csv,unknown,https://ec.europa.eu/energy/studies/mapping-and-analyses-current-and-future-2020-2030-heatingcooling-fuel-deployment_en?redir=1,, +IRENA existing VRE capacities,existing_infrastructure/{solar,onwind,offwind}_capcity_IRENA.csv,unknown,https://www.irena.org/Statistics/Download-Data +USGS ammonia production,myb1-2017-nitro.xls,unknown,https://www.usgs.gov/centers/nmic/nitrogen-statistics-and-information,, +hydrogen salt cavern potentials,hydrogen_salt_cavern_potentials.csv,CC BY 4.0,https://doi.org/10.1016/j.ijhydene.2019.12.161,, +hotmaps industrial site database,Industrial_Database.csv,CC BY 4.0,https://gitlab.com/hotmaps/industrial_sites/industrial_sites_Industrial_Database,, +Hotmaps building stock data,data_building_stock.csv,CC BY 4.0,https://gitlab.com/hotmaps/building-stock,, +U-values Poland,u_values_poland.csv,unknown,https://data.europa.eu/euodp/de/data/dataset/building-stock-observatory,, +Floor area missing in hotmaps building stock data,floor_area_missing.csv,unknown,https://data.europa.eu/euodp/de/data/dataset/building-stock-observatory,, +Comparative level investment,comparative_level_investment.csv,Eurostat,https://ec.europa.eu/eurostat/statistics-explained/index.php?title=Comparative_price_levels_for_investment,, +Electricity taxes,electricity_taxes_eu.csv,Eurostat,https://appsso.eurostat.ec.europa.eu/nui/show.do?dataset=nrg_pc_204&lang=en,, +Building topologies and corresponding standard values,tabula-calculator-calcsetbuilding.csv,unknown,https://episcope.eu/fileadmin/tabula/public/calc/tabula-calculator.xlsx,, +Retrofitting thermal envelope costs for Germany,retro_cost_germany.csv,unkown,https://www.iwu.de/forschung/handlungslogiken/kosten-energierelevanter-bau-und-anlagenteile-bei-modernisierung/,, +District heating most countries,jrc-idees-2015/,CC BY 4.0,https://ec.europa.eu/jrc/en/potencia/jrc-idees,, +District heating missing countries,district_heat_share.csv,unkown,https://www.euroheat.org/knowledge-hub/country-profiles,, diff --git a/scripts/prepare_sector_network.py b/scripts/prepare_sector_network.py index fea03d69..89ccbebb 100644 --- a/scripts/prepare_sector_network.py +++ b/scripts/prepare_sector_network.py @@ -481,7 +481,7 @@ def add_co2_network(n, costs): def add_dac(n, costs): - heat_carriers = ["urban central heat"] + heat_carriers = ["urban central heat", "services urban decentral heat"] heat_buses = n.buses.index[n.buses.carrier.isin(heat_carriers)] locations = n.buses.location[heat_buses] @@ -489,8 +489,7 @@ def add_dac(n, costs): efficiency3 = -(costs.at['direct air capture', 'heat-input'] - costs.at['direct air capture', 'compression-heat-output']) n.madd("Link", - locations, - suffix=" DAC", + heat_buses.str.replace(" heat", " DAC"), bus0="co2 atmosphere", bus1=spatial.co2.df.loc[locations, "nodes"].values, bus2=locations.values, @@ -1383,7 +1382,7 @@ def add_heat(n, costs): factor = urban_fraction[nodes[name]] - \ dist_fraction[nodes[name]] else: - factor = None + raise NotImplementedError(f" {name} not in " f"heat systems: {heat_systems}") if sector in name: heat_load = heat_demand[[sector + " water",sector + " space"]].groupby(level=1,axis=1).sum()[nodes[name]].multiply(factor) @@ -1670,16 +1669,14 @@ def create_nodes_for_heat_sector(): # urban are areas with high heating density # urban can be split into district heating (central) and individual heating (decentral) - ct_urban = pop_layout.urban.groupby(pop_layout["ct"]).sum() + ct_urban = pop_layout.urban.groupby(pop_layout.ct).sum() # distribution of urban population within a country - pop_layout["urban_ct_fraction"] = pop_layout["urban"] / \ - pop_layout["ct"].map(ct_urban.get) + pop_layout["urban_ct_fraction"] = pop_layout.urban / pop_layout.ct.map(ct_urban.get) sectors = ["residential", "services"] nodes = {} - urban_fraction = pop_layout["urban"] / \ - (pop_layout[["urban", "rural"]].sum(axis=1)) + urban_fraction = pop_layout.urban / pop_layout[["rural", "urban"]].sum(axis=1) for sector in sectors: nodes[sector + " rural"] = pop_layout.index @@ -2239,7 +2236,7 @@ if __name__ == "__main__": clusters="37", lv=1.0, sector_opts='Co2L0-168H-T-H-B-I-solar3-dist1', - planning_horizons="2030", + planning_horizons="2020", ) logging.basicConfig(level=snakemake.config['logging_level']) @@ -2254,7 +2251,7 @@ if __name__ == "__main__": n = pypsa.Network(snakemake.input.network, override_component_attrs=overrides) pop_layout = pd.read_csv(snakemake.input.clustered_pop_layout, index_col=0) - Nyears = n.snapshot_weightings.sum() / 8760 + Nyears = n.snapshot_weightings.generators.sum() / 8760 costs = prepare_costs(snakemake.input.costs, snakemake.config['costs']['USD2013_to_EUR2013'], From 339187c1f1344a90ee5fbd13fe7d956aa39cbe74 Mon Sep 17 00:00:00 2001 From: lisazeyen Date: Wed, 29 Sep 2021 16:23:38 +0200 Subject: [PATCH 83/90] update config --- config.default.yaml | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/config.default.yaml b/config.default.yaml index f8d8082b..e1ddd60d 100644 --- a/config.default.yaml +++ b/config.default.yaml @@ -141,14 +141,16 @@ existing_capacities: sector: - central: true - central_fraction: 0.6 - district_heating_increase: true - dh_strength: - 2020: 0 # starting at today's share - 2030: 0.2 - 2040: 0.5 - 2050: 1 # maximum possible share defined in central fraction + district_heating: + potential: 0.6 # maximum fraction of urban demand which can be supplied by district heating + # increase of today's district heating demand to potential maximum district heating share + # progress = 0 means today's district heating share, progress = 1 means maximum fraction of urban demand is supplied by district heating + progress: + 2020: 0.0 + 2030: 0.3 + 2040: 0.6 + 2050: 1.0 + district_heating_loss: 0.15 bev_dsm_restriction_value: 0.75 #Set to 0 for no restriction on BEV DSM bev_dsm_restriction_time: 7 #Time at which SOC of BEV has to be dsm_restriction_value transport_heating_deadband_upper: 20. @@ -157,7 +159,6 @@ sector: ICE_upper_degree_factor: 1.6 EV_lower_degree_factor: 0.98 EV_upper_degree_factor: 0.63 - district_heating_loss: 0.15 bev_dsm: true #turns on EV battery bev_availability: 0.5 #How many cars do smart charging bev_energy: 0.05 #average battery size in MWh From 18fabd930e0b7e736a845755a0d228db5873bbc2 Mon Sep 17 00:00:00 2001 From: Fabian Neumann Date: Thu, 30 Sep 2021 17:46:26 +0200 Subject: [PATCH 84/90] Apply suggestions from code review --- scripts/prepare_sector_network.py | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/scripts/prepare_sector_network.py b/scripts/prepare_sector_network.py index 320c4726..727b2de8 100644 --- a/scripts/prepare_sector_network.py +++ b/scripts/prepare_sector_network.py @@ -1695,14 +1695,13 @@ def create_nodes_for_heat_sector(): diff = (urban_fraction * central_fraction) - dist_fraction_node progress = get(options["district_heating"]["potential"], investment_year) dist_fraction_node += diff * progress - print("************************************") - print( - "the current DH share compared to the maximum possible is increased \ - \n by a progress factor of ", + logger.info( + "The current district heating share compared to the maximum", + "possible is increased by a progress factor of ", progress, - "resulting DH share: ", - dist_fraction_node) - print("**********************************") + "resulting in a district heating share of ", + dist_fraction_node + ) return nodes, dist_fraction_node, urban_fraction @@ -2230,7 +2229,6 @@ if __name__ == "__main__": lv=1.0, sector_opts='Co2L0-168H-T-H-B-I-solar3-dist1', planning_horizons="2020", - planning_horizons="2030", ) logging.basicConfig(level=snakemake.config['logging_level']) From 0d999a49912429d151fceb5735bad7d888753922 Mon Sep 17 00:00:00 2001 From: lisazeyen <35347358+lisazeyen@users.noreply.github.com> Date: Fri, 1 Oct 2021 17:10:42 +0200 Subject: [PATCH 85/90] prepare_sector_network: code formatting Co-authored-by: Fabian Neumann --- scripts/prepare_sector_network.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/scripts/prepare_sector_network.py b/scripts/prepare_sector_network.py index 727b2de8..1bb5caf9 100644 --- a/scripts/prepare_sector_network.py +++ b/scripts/prepare_sector_network.py @@ -636,8 +636,7 @@ def prepare_data(n): nodal_energy_totals = energy_totals.loc[pop_layout.ct].fillna(0.) nodal_energy_totals.index = pop_layout.index # district heat share not weighted by population - district_heat_share = round(nodal_energy_totals["district heat share"], - ndigits=2) + district_heat_share = nodal_energy_totals["district heat share"].round(2) nodal_energy_totals = nodal_energy_totals.multiply(pop_layout.fraction, axis=0) # copy forward the daily average heat demand into each hour, so it can be multipled by the intraday profile From c0adb51454622f07ee44151bd87cad101e042f2b Mon Sep 17 00:00:00 2001 From: Fabian Neumann Date: Sat, 2 Oct 2021 10:03:40 +0200 Subject: [PATCH 86/90] decapitalize columns in build_energy_totals --- scripts/build_energy_totals.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/scripts/build_energy_totals.py b/scripts/build_energy_totals.py index 751f23bf..efb5d6da 100644 --- a/scripts/build_energy_totals.py +++ b/scripts/build_energy_totals.py @@ -216,7 +216,7 @@ def idees_per_country(ct, year): ct_totals["Derived heat residential"] = df[46] assert df.index[50] == 'Thermal uses' - ct_totals["Thermal uses residential"] = df[50] + ct_totals["thermal uses residential"] = df[50] # services @@ -246,10 +246,10 @@ def idees_per_country(ct, year): ct_totals["electricity services"] = df[50] assert df.index[49] == "Derived heat" - ct_totals["Derived heat services"] = df[49] + ct_totals["derived heat services"] = df[49] assert df.index[53] == 'Thermal uses' - ct_totals["Thermal uses services"] = df[53] + ct_totals["thermal uses services"] = df[53] # transport @@ -365,10 +365,10 @@ def build_idees(countries, year): totals.loc["passenger car efficiency"] *= 10 # district heating share - district_heat = totals.loc[["Derived heat residential", - "Derived heat services"]].sum() - total_heat = totals.loc[["Thermal uses residential", - "Thermal uses services"]].sum() + district_heat = totals.loc[["derived heat residential", + "derived heat services"]].sum() + total_heat = totals.loc[["thermal uses residential", + "thermal uses services"]].sum() totals.loc["district heat share"] = district_heat.div(total_heat) return totals.T From a60f180f613a9678b2c28c330c9075a5f451bc24 Mon Sep 17 00:00:00 2001 From: Fabian Neumann Date: Sat, 2 Oct 2021 10:23:27 +0200 Subject: [PATCH 87/90] fix logging --- scripts/prepare_sector_network.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/scripts/prepare_sector_network.py b/scripts/prepare_sector_network.py index 1bb5caf9..5fc4a6e3 100644 --- a/scripts/prepare_sector_network.py +++ b/scripts/prepare_sector_network.py @@ -1694,12 +1694,10 @@ def create_nodes_for_heat_sector(): diff = (urban_fraction * central_fraction) - dist_fraction_node progress = get(options["district_heating"]["potential"], investment_year) dist_fraction_node += diff * progress - logger.info( + print( "The current district heating share compared to the maximum", - "possible is increased by a progress factor of ", - progress, - "resulting in a district heating share of ", - dist_fraction_node + f"possible is increased by a progress factor of\n{progress}", + f"resulting in a district heating share of\n{dist_fraction_node}" ) return nodes, dist_fraction_node, urban_fraction From 7987fd23cfa00cc5b53e46fab73c630520c7ab43 Mon Sep 17 00:00:00 2001 From: Fabian Neumann Date: Sat, 2 Oct 2021 10:33:56 +0200 Subject: [PATCH 88/90] add release note --- doc/release_notes.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/release_notes.rst b/doc/release_notes.rst index 16889268..eb3f7a18 100644 --- a/doc/release_notes.rst +++ b/doc/release_notes.rst @@ -88,6 +88,7 @@ Future release * Compatibility with ``xarray`` version 0.19. * Separate basic chemicals into HVC, chlorine, methanol and ammonia [`#166 `_]. * Add option to specify reuse, primary production, and mechanical and chemical recycling fraction of platics [`#166 `_]. +* Include today's district heating shares in myopic optimisation and add option to specify exogenous path for district heating share increase under ``sector: district_heating:`` [`#149 `_]. PyPSA-Eur-Sec 0.5.0 (21st May 2021) =================================== From 4400658099523686a240fa6505535e49077e5ecc Mon Sep 17 00:00:00 2001 From: Fabian Neumann Date: Sat, 2 Oct 2021 10:40:01 +0200 Subject: [PATCH 89/90] edit release note --- doc/release_notes.rst | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/release_notes.rst b/doc/release_notes.rst index f0bf3caa..efc6ca1a 100644 --- a/doc/release_notes.rst +++ b/doc/release_notes.rst @@ -7,7 +7,7 @@ Future release .. note:: This unreleased version currently requires the master branches of PyPSA, PyPSA-Eur, and the technology-data repository. -* The myopic option can now be used together with different clustering for the generators and the network. The existing renewable capacities are split evenly among the regions in every country. + * With this release, we change the license from copyleft GPLv3 to the more liberal MIT license with the consent of all contributors. * Extended use of ``multiprocessing`` for much better performance @@ -88,6 +88,7 @@ Future release * Compatibility with ``xarray`` version 0.19. * Separate basic chemicals into HVC, chlorine, methanol and ammonia [`#166 `_]. * Add option to specify reuse, primary production, and mechanical and chemical recycling fraction of platics [`#166 `_]. +* The myopic option can now be used together with different clustering for the generators and the network. The existing renewable capacities are split evenly among the regions in every country [`#144 `_]. PyPSA-Eur-Sec 0.5.0 (21st May 2021) =================================== From 437508383875bcec72fe39f102ce7673d43a7155 Mon Sep 17 00:00:00 2001 From: Fabian Neumann Date: Sat, 2 Oct 2021 10:40:49 +0200 Subject: [PATCH 90/90] create parallel structures for land-use constraints w/wo m --- scripts/solve_network.py | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/scripts/solve_network.py b/scripts/solve_network.py index 673b7797..eac1f581 100644 --- a/scripts/solve_network.py +++ b/scripts/solve_network.py @@ -21,18 +21,23 @@ pypsa.pf.logger.setLevel(logging.WARNING) def add_land_use_constraint(n): if 'm' in snakemake.wildcards.clusters: - add_land_use_constraint_m(n) + _add_land_use_constraint_m(n) else: - #warning: this will miss existing offwind which is not classed AC-DC and has carrier 'offwind' - for carrier in ['solar', 'onwind', 'offwind-ac', 'offwind-dc']: - existing = n.generators.loc[n.generators.carrier==carrier,"p_nom"].groupby(n.generators.bus.map(n.buses.location)).sum() - existing.index += " " + carrier + "-" + snakemake.wildcards.planning_horizons - n.generators.loc[existing.index,"p_nom_max"] -= existing + _add_land_use_constraint(n) + +def _add_land_use_constraint(n): + #warning: this will miss existing offwind which is not classed AC-DC and has carrier 'offwind' + + for carrier in ['solar', 'onwind', 'offwind-ac', 'offwind-dc']: + existing = n.generators.loc[n.generators.carrier==carrier,"p_nom"].groupby(n.generators.bus.map(n.buses.location)).sum() + existing.index += " " + carrier + "-" + snakemake.wildcards.planning_horizons + n.generators.loc[existing.index,"p_nom_max"] -= existing + n.generators.p_nom_max.clip(lower=0, inplace=True) -def add_land_use_constraint_m(n): +def _add_land_use_constraint_m(n): # if generators clustering is lower than network clustering, land_use accounting is at generators clusters planning_horizons = snakemake.config["scenario"]["planning_horizons"] @@ -55,6 +60,8 @@ def add_land_use_constraint_m(n): sel_current = [i + " " + carrier + "-" + current_horizon for i in ind2] sel_p_year = [i + " " + carrier + "-" + p_year for i in ind2] n.generators.loc[sel_current, "p_nom_max"] -= existing.loc[sel_p_year].rename(lambda x: x[:-4] + current_horizon) + + n.generators.p_nom_max.clip(lower=0, inplace=True) def prepare_network(n, solve_opts=None):