From 67ee6cb86e316d62ae66385a3f643986ed8cd7ba Mon Sep 17 00:00:00 2001 From: Fabian Neumann Date: Tue, 6 Jul 2021 18:32:35 +0200 Subject: [PATCH 01/13] first step towards agriculture, forestry and fishing --- config.default.yaml | 3 ++ scripts/build_energy_totals.py | 42 ++++++++++++++-- scripts/prepare_sector_network.py | 79 +++++++++++++++++++++++++++++-- 3 files changed, 115 insertions(+), 9 deletions(-) diff --git a/config.default.yaml b/config.default.yaml index 5f1fa1b8..bb60509a 100644 --- a/config.default.yaml +++ b/config.default.yaml @@ -173,6 +173,9 @@ sector: 2050: 0.85 transport_fuel_cell_efficiency: 0.5 transport_internal_combustion_efficiency: 0.3 + agriculture_machinery_electric_share: 0.12 # approximately as today + agriculture_machinery_fuel_efficiency: 0.7 # for conversion of fuel oil to use + agriculture_machinery_electric_efficiency: 0.3 # for conversion of electricity to use shipping_average_efficiency: 0.4 #For conversion of fuel oil to propulsion in 2011 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 diff --git a/scripts/build_energy_totals.py b/scripts/build_energy_totals.py index aec1c61b..7fdd305a 100644 --- a/scripts/build_energy_totals.py +++ b/scripts/build_energy_totals.py @@ -117,6 +117,7 @@ to_ipcc = { "total energy": "1 - Energy", "industrial processes": "2 - Industrial Processes and Product Use", "agriculture": "3 - Agriculture", + "agriculture, forestry and fishing": '1.A.4.c - Agriculture/Forestry/Fishing', "LULUCF": "4 - Land Use, Land-Use Change and Forestry", "waste management": "5 - Waste management", "other": "6 - Other Sector", @@ -182,7 +183,7 @@ def idees_per_country(ct, year): ct_idees = idees_rename.get(ct, ct) fn_residential = f"{base_dir}/JRC-IDEES-2015_Residential_{ct_idees}.xlsx" - fn_services = f"{base_dir}/JRC-IDEES-2015_Tertiary_{ct_idees}.xlsx" + fn_tertiary = f"{base_dir}/JRC-IDEES-2015_Tertiary_{ct_idees}.xlsx" fn_transport = f"{base_dir}/JRC-IDEES-2015_Transport_{ct_idees}.xlsx" # residential @@ -214,7 +215,7 @@ def idees_per_country(ct, year): # services - df = pd.read_excel(fn_services, "SER_hh_fec", index_col=0)[year] + df = pd.read_excel(fn_tertiary, "SER_hh_fec", index_col=0)[year] ct_totals["total services space"] = df["Space heating"] @@ -231,7 +232,7 @@ def idees_per_country(ct, year): assert df.index[31] == "Electricity" ct_totals["electricity services cooking"] = df[31] - df = pd.read_excel(fn_services, "SER_summary", index_col=0)[year] + df = pd.read_excel(fn_tertiary, "SER_summary", index_col=0)[year] row = "Energy consumption by fuel - Eurostat structure (ktoe)" ct_totals["total services"] = df[row] @@ -239,6 +240,34 @@ def idees_per_country(ct, year): assert df.index[50] == "Electricity" ct_totals["electricity services"] = df[50] + # agriculture, forestry and fishing + + start = "Detailed split of energy consumption (ktoe)" + end = "Market shares of energy uses (%)" + + df = pd.read_excel(fn_tertiary, "AGR_fec", index_col=0).loc[start:end, year] + + rows = [ + "Lighting", + "Ventilation", + "Specific electricity uses", + "Pumping devices (electric)" + ] + ct_totals["total agriculture electricity"] = df[rows].sum() + + rows = ["Specific heat uses", "Low enthalpy heat"] + ct_totals["total agriculture heat"] = df[rows].sum() + + rows = [ + "Motor drives", + "Farming machine drives (diesel oil incl. biofuels)", + "Pumping devices (diesel oil incl. biofuels)", + ] + ct_totals["total agriculture machinery"] = df[rows].sum() + + row = ["Agriculture, forestry and fishing"] + ct_totals["total agriculture"] = df[row] + # transport df = pd.read_excel(fn_transport, "TrRoad_ene", index_col=0)[year] @@ -540,10 +569,13 @@ def build_eea_co2(year=1990): "international aviation", "domestic navigation", "international navigation", + "agriculture, forstry and fishing" ] emissions["industrial non-elec"] = emissions["total energy"] - emissions[to_subtract].sum(axis=1) - to_drop = ["total energy", "total wL", "total woL"] + emissions["agriculture"] += emissions["agriculture, forestry and fishing"] + + to_drop = ["total energy", "total wL", "total woL", "agriculture, forestry and fishing"] emissions.drop(columns=to_drop, inplace=True) # convert from Gg to Mt @@ -588,7 +620,7 @@ def build_co2_totals(countries, eea_co2, eurostat_co2): # does not include industrial process emissions or fuel processing/refining "industrial non-elec": (ct, "+", "Industry"), # does not include non-energy emissions - "agriculture": (ct, "+", "+", "Agriculture / Forestry"), + "agriculture": (eurostat_co2.index.get_level_values(0) == 'NL') & eurostat_co2.index.isin(["Agriculture / Forestry", "Fishing"], level=3), } for i, mi in mappings.items(): diff --git a/scripts/prepare_sector_network.py b/scripts/prepare_sector_network.py index fa485e6a..315b9980 100644 --- a/scripts/prepare_sector_network.py +++ b/scripts/prepare_sector_network.py @@ -42,6 +42,10 @@ def emission_sectors_from_opts(opts): "domestic navigation", "international navigation" ] + if "A" in opts: + sectors += [ + "agriulture" + ] return sectors @@ -728,8 +732,9 @@ def insert_electricity_distribution_grid(n, costs): capital_cost=costs.at['electricity distribution grid', 'fixed'] * cost_factor ) - # this catches regular electricity load and "industry electricity" - loads = n.loads.index[n.loads.carrier.str.contains("electricity")] + # this catches regular electricity load and "industry electricity" and + # "agriculture machinery electric" and "agriculture electricity" + loads = n.loads.index[n.loads.carrier.str.contains("electric")] n.loads.loc[loads, "bus"] += " low voltage" bevs = n.links.index[n.links.carrier == "BEV charger"] @@ -1163,8 +1168,8 @@ def add_land_transport(n, costs): co2 = ice_share / ice_efficiency * transport[nodes].sum().sum() / 8760 * costs.at["oil", 'CO2 intensity'] - n.madd("Load", - ["land transport oil emissions"], + n.add("Load", + "land transport oil emissions", bus="co2 atmosphere", carrier="land transport oil emissions", p_set=-co2 @@ -1901,6 +1906,69 @@ def add_waste_heat(n): n.links.loc[urban_central + " H2 Fuel Cell", "efficiency2"] = 0.95 - n.links.loc[urban_central + " H2 Fuel Cell", "efficiency"] +def add_agriculture(n, costs): + + nodes = pop_layout.index + + # electricity + + n.madd("Load", + nodes, + suffix=" agriculture electricity", + bus=nodes, + carrier='agriculture electricity', + p_set=nodal_energy_totals.loc[nodes, "total agriculture electricity"] / 8760 + ) + + # heat + + n.madd("Load", + nodes, + suffix=" agriculture heat", + bus=nodes + " services rural heat", + carrier="agriculture heat", + p_set=nodal_energy_totals.loc[nodes, "total agriculture heat"] / 8760 + ) + + # machinery + + electric_share = get(options["agriculture_machinery_electric_share"], investment_year) + assert electric_share <= 1. + ice_share = 1 - electric_share + + machinery_nodal_energy = nodal_energy_totals.loc[nodes, "total agriculture machinery"] + + if electric_share > 0: + + efficiency_gain = options["agriculture_machinery_fuel_efficiency"] / options["agriculture_machinery_electric_efficiency"] + + n.add("Load", + nodes, + suffix=" agriculture machinery electric", + bus=nodes, + carrier="agriculture machinery electric", + p_set=electric_share * efficiency_gain * machinery_nodal_energy / 8760, + ) + + if ice_share > 0: + + n.add("Load", + "agriculture machinery oil", + bus="EU oil", + carrier="agriculture machinery oil", + p_set=ice_share * machinery_nodal_energy / 8760 + ) + + co2 = ice_share * machinery_nodal_energy / 8760 * costs.at["oil", 'CO2 intensity'] + + n.add("Load", + "agriculture machinery oil emissions", + bus="co2 atmosphere", + carrier="agriculture machinery oil emissions", + p_set=-co2 + ) + + def decentral(n): """Removes the electricity transmission system.""" n.lines.drop(n.lines.index, inplace=True) @@ -2027,6 +2095,9 @@ if __name__ == "__main__": if "I" in opts and "H" in opts: add_waste_heat(n) + if "A" in opts: # requires H and I + add_agriculture(n, costs) + if options['dac']: add_dac(n, costs) From 2bd9a3993b99b0ed50ec6d21af070b10ba1b90e8 Mon Sep 17 00:00:00 2001 From: Fabian Neumann Date: Tue, 6 Jul 2021 18:36:04 +0200 Subject: [PATCH 02/13] fix typo --- 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 315b9980..e90a0e91 100644 --- a/scripts/prepare_sector_network.py +++ b/scripts/prepare_sector_network.py @@ -44,7 +44,7 @@ def emission_sectors_from_opts(opts): ] if "A" in opts: sectors += [ - "agriulture" + "agriculture" ] return sectors From dd177df19fd2dad912d9822c936e70c903d556eb Mon Sep 17 00:00:00 2001 From: Fabian Neumann Date: Mon, 16 Aug 2021 16:26:20 +0200 Subject: [PATCH 03/13] fix NL hardcode typo --- scripts/build_energy_totals.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/build_energy_totals.py b/scripts/build_energy_totals.py index 7fdd305a..84e599e7 100644 --- a/scripts/build_energy_totals.py +++ b/scripts/build_energy_totals.py @@ -620,7 +620,7 @@ def build_co2_totals(countries, eea_co2, eurostat_co2): # does not include industrial process emissions or fuel processing/refining "industrial non-elec": (ct, "+", "Industry"), # does not include non-energy emissions - "agriculture": (eurostat_co2.index.get_level_values(0) == 'NL') & eurostat_co2.index.isin(["Agriculture / Forestry", "Fishing"], level=3), + "agriculture": (eurostat_co2.index.get_level_values(0) == ct) & eurostat_co2.index.isin(["Agriculture / Forestry", "Fishing"], level=3), } for i, mi in mappings.items(): From 538c7ce0ff4da68acd8caf3862bcf4d13156d079 Mon Sep 17 00:00:00 2001 From: Fabian Neumann Date: Mon, 16 Aug 2021 16:26:50 +0200 Subject: [PATCH 04/13] clarify agriculture machinery fuel efficiency --- config.default.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config.default.yaml b/config.default.yaml index 35e6ad81..cc7653fc 100644 --- a/config.default.yaml +++ b/config.default.yaml @@ -175,8 +175,8 @@ sector: transport_fuel_cell_efficiency: 0.5 transport_internal_combustion_efficiency: 0.3 agriculture_machinery_electric_share: 0.12 # approximately as today - agriculture_machinery_fuel_efficiency: 0.7 # for conversion of fuel oil to use - agriculture_machinery_electric_efficiency: 0.3 # for conversion of electricity to use + agriculture_machinery_fuel_efficiency: 0.7 # fuel oil per use + agriculture_machinery_electric_efficiency: 0.3 # electricity per use 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_share: # 1 means all hydrogen FC From 17c96edf7239429d7c27deafe88ce47dd65c048d Mon Sep 17 00:00:00 2001 From: Fabian Neumann Date: Mon, 16 Aug 2021 16:27:25 +0200 Subject: [PATCH 05/13] agriculture: correctly convert units, fix efficiency gain, ICE aggregation for oil --- scripts/prepare_sector_network.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/prepare_sector_network.py b/scripts/prepare_sector_network.py index 374da7de..9cac9f38 100644 --- a/scripts/prepare_sector_network.py +++ b/scripts/prepare_sector_network.py @@ -1965,7 +1965,7 @@ def add_agriculture(n, costs): suffix=" agriculture electricity", bus=nodes, carrier='agriculture electricity', - p_set=nodal_energy_totals.loc[nodes, "total agriculture electricity"] / 8760 + p_set=nodal_energy_totals.loc[nodes, "total agriculture electricity"] * 1e6 / 8760 ) # heat @@ -1975,7 +1975,7 @@ def add_agriculture(n, costs): suffix=" agriculture heat", bus=nodes + " services rural heat", carrier="agriculture heat", - p_set=nodal_energy_totals.loc[nodes, "total agriculture heat"] / 8760 + p_set=nodal_energy_totals.loc[nodes, "total agriculture heat"] * 1e6 / 8760 ) # machinery @@ -1995,7 +1995,7 @@ def add_agriculture(n, costs): suffix=" agriculture machinery electric", bus=nodes, carrier="agriculture machinery electric", - p_set=electric_share * efficiency_gain * machinery_nodal_energy / 8760, + p_set=electric_share / efficiency_gain * machinery_nodal_energy * 1e6 / 8760, ) if ice_share > 0: @@ -2004,10 +2004,10 @@ def add_agriculture(n, costs): "agriculture machinery oil", bus="EU oil", carrier="agriculture machinery oil", - p_set=ice_share * machinery_nodal_energy / 8760 + p_set=ice_share * machinery_nodal_energy.sum() * 1e6 / 8760 ) - co2 = ice_share * machinery_nodal_energy / 8760 * costs.at["oil", 'CO2 intensity'] + co2 = ice_share * machinery_nodal_energy.sum() * 1e6 / 8760 * costs.at["oil", 'CO2 intensity'] n.add("Load", "agriculture machinery oil emissions", From 8e3ef7f86b0ada0d3fd7a43d468e361f475eb7b8 Mon Sep 17 00:00:00 2001 From: Fabian Neumann Date: Mon, 16 Aug 2021 16:29:05 +0200 Subject: [PATCH 06/13] remove unused sector wildcard constraints --- Snakefile | 1 - 1 file changed, 1 deletion(-) diff --git a/Snakefile b/Snakefile index de34f386..db53f7c8 100644 --- a/Snakefile +++ b/Snakefile @@ -6,7 +6,6 @@ wildcard_constraints: lv="[a-z0-9\.]+", simpl="[a-zA-Z0-9]*", clusters="[0-9]+m?", - sectors="[+a-zA-Z0-9]+", opts="[-+a-zA-Z0-9]*", sector_opts="[-+a-zA-Z0-9\.\s]*" From 48e30bacadd8297f7df10dfab9e31f8a2ece0992 Mon Sep 17 00:00:00 2001 From: Fabian Neumann Date: Mon, 16 Aug 2021 16:34:15 +0200 Subject: [PATCH 07/13] add doc for A sector_opts setting --- config.default.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/config.default.yaml b/config.default.yaml index cc7653fc..da86682a 100644 --- a/config.default.yaml +++ b/config.default.yaml @@ -27,7 +27,8 @@ scenario: # Co2L0p25 will give 25% CO2 emissions; Co2Lm0p05 will give 5% negative emissions # xH is the temporal resolution; 3H is 3-hourly, i.e. one snapshot every 3 hours # single letters are sectors: T for land transport, H for building heating, - # B for biomass supply, I for industry, shipping and aviation + # B for biomass supply, I for industry, shipping and aviation, + # A for agriculture, forestry and fishing # solar+c0.5 reduces the capital cost of solar to 50\% of reference value # solar+p3 multiplies the available installable potential by factor 3 # co2 stored+e2 multiplies the potential of CO2 sequestration by a factor 2 From 351964b1e776a6155de337bcc04ad5da1e5a6e07 Mon Sep 17 00:00:00 2001 From: Fabian Neumann Date: Wed, 18 Aug 2021 09:42:05 +0200 Subject: [PATCH 08/13] add logger.info for agriculture --- 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 9cac9f38..7961c213 100644 --- a/scripts/prepare_sector_network.py +++ b/scripts/prepare_sector_network.py @@ -1956,6 +1956,8 @@ def add_waste_heat(n): def add_agriculture(n, costs): + logger.info('Add agriculture, forestry and fishing sector.') + nodes = pop_layout.index # electricity From a9196f001b986ef1dc7582f86d78aa423bbfa752 Mon Sep 17 00:00:00 2001 From: Fabian Neumann Date: Wed, 18 Aug 2021 14:17:21 +0200 Subject: [PATCH 09/13] fix 2 typos --- scripts/build_energy_totals.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/build_energy_totals.py b/scripts/build_energy_totals.py index 84e599e7..4b4dc2bc 100644 --- a/scripts/build_energy_totals.py +++ b/scripts/build_energy_totals.py @@ -265,7 +265,7 @@ def idees_per_country(ct, year): ] ct_totals["total agriculture machinery"] = df[rows].sum() - row = ["Agriculture, forestry and fishing"] + row = "Agriculture, forestry and fishing" ct_totals["total agriculture"] = df[row] # transport @@ -569,7 +569,7 @@ def build_eea_co2(year=1990): "international aviation", "domestic navigation", "international navigation", - "agriculture, forstry and fishing" + "agriculture, forestry and fishing" ] emissions["industrial non-elec"] = emissions["total energy"] - emissions[to_subtract].sum(axis=1) From 13251d33cc4c6ca6e97d191ba314667e836b899b Mon Sep 17 00:00:00 2001 From: Fabian Neumann Date: Wed, 18 Aug 2021 16:17:59 +0200 Subject: [PATCH 10/13] no machinery electric share, fix add to madd --- config.default.yaml | 2 +- scripts/prepare_sector_network.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/config.default.yaml b/config.default.yaml index da86682a..05a4a751 100644 --- a/config.default.yaml +++ b/config.default.yaml @@ -175,7 +175,7 @@ sector: 2050: 0.85 transport_fuel_cell_efficiency: 0.5 transport_internal_combustion_efficiency: 0.3 - agriculture_machinery_electric_share: 0.12 # approximately as today + agriculture_machinery_electric_share: 0 agriculture_machinery_fuel_efficiency: 0.7 # fuel oil per use agriculture_machinery_electric_efficiency: 0.3 # electricity per use shipping_average_efficiency: 0.4 #For conversion of fuel oil to propulsion in 2011 diff --git a/scripts/prepare_sector_network.py b/scripts/prepare_sector_network.py index 7961c213..c256c251 100644 --- a/scripts/prepare_sector_network.py +++ b/scripts/prepare_sector_network.py @@ -1992,7 +1992,7 @@ def add_agriculture(n, costs): efficiency_gain = options["agriculture_machinery_fuel_efficiency"] / options["agriculture_machinery_electric_efficiency"] - n.add("Load", + n.madd("Load", nodes, suffix=" agriculture machinery electric", bus=nodes, From 148450e496669139232325b3522c059fcda88865 Mon Sep 17 00:00:00 2001 From: Fabian Neumann Date: Wed, 18 Aug 2021 16:38:34 +0200 Subject: [PATCH 11/13] adjust documentation and add release notes --- README.md | 6 +++--- doc/release_notes.rst | 4 ++++ doc/supply_demand.rst | 4 ++-- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index fe81519b..31aaa0ef 100644 --- a/README.md +++ b/README.md @@ -21,9 +21,9 @@ it. PyPSA-Eur-Sec builds on the electricity generation and transmission model [PyPSA-Eur](https://github.com/PyPSA/pypsa-eur) to add demand and supply for the following sectors: transport, space and water -heating, biomass, industry and industrial feedstocks. This completes -the energy system and includes all greenhouse gas emitters except -waste management, agriculture, forestry and land use. +heating, biomass, industry and industrial feedstocks, agriculture, +forestry and fishing. This completes the energy system and includes +all greenhouse gas emitters except waste management and land use. Please see the [documentation](https://pypsa-eur-sec.readthedocs.io/) for installation instructions and other useful information about the snakemake workflow. diff --git a/doc/release_notes.rst b/doc/release_notes.rst index 016e19dc..0c65c8c2 100644 --- a/doc/release_notes.rst +++ b/doc/release_notes.rst @@ -67,6 +67,10 @@ 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. +* Added option to include emissions and energy demands of agriculture, forestry and fishing sector via the letter ``A`` in the ``{sector_opts}`` wildcard. + Demands are separated into electricity, heat and oil for machinery. + Fuel-switching for machinery from oil to electricity can be set exogenously in the ``config.yaml`` + `#147 `_. PyPSA-Eur-Sec 0.5.0 (21st May 2021) =================================== diff --git a/doc/supply_demand.rst b/doc/supply_demand.rst index 77317094..31563c43 100644 --- a/doc/supply_demand.rst +++ b/doc/supply_demand.rst @@ -43,7 +43,7 @@ Heat demand is split into: * ``urban central``: large-scale district heating networks in urban areas with dense heat demand * ``residential/services urban decentral``: heating for individual buildings in urban areas -* ``residential/services rural``: heating for individual buildings in rural areas +* ``residential/services rural``: heating for individual buildings in rural areas, agriculture heat uses Heat supply @@ -189,7 +189,7 @@ Only wastes and residues from the JRC biomass dataset. Oil product demand ===================== -Transport fuels and naphtha as a feedstock for the chemicals industry. +Transport fuels, agriculture machinery and naphtha as a feedstock for the chemicals industry. Oil product supply ====================== From 017c1885189eee308e5c451b31e3e1de87023d0e Mon Sep 17 00:00:00 2001 From: lisazeyen Date: Mon, 4 Oct 2021 09:23:23 +0200 Subject: [PATCH 12/13] fix typo for district heating with capital D --- scripts/build_energy_totals.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/build_energy_totals.py b/scripts/build_energy_totals.py index b21200b5..3f376b0c 100644 --- a/scripts/build_energy_totals.py +++ b/scripts/build_energy_totals.py @@ -214,7 +214,7 @@ def idees_per_country(ct, year): ct_totals["electricity residential"] = df[47] assert df.index[46] == "Derived heat" - ct_totals["Derived heat residential"] = df[46] + ct_totals["derived heat residential"] = df[46] assert df.index[50] == 'Thermal uses' ct_totals["thermal uses residential"] = df[50] @@ -251,13 +251,13 @@ def idees_per_country(ct, year): assert df.index[53] == 'Thermal uses' ct_totals["thermal uses services"] = df[53] - - + + # agriculture, forestry and fishing start = "Detailed split of energy consumption (ktoe)" end = "Market shares of energy uses (%)" - + df = pd.read_excel(fn_tertiary, "AGR_fec", index_col=0).loc[start:end, year] rows = [ From 4135718e375b788c8bc3351e07188660e79532af Mon Sep 17 00:00:00 2001 From: lisazeyen Date: Mon, 4 Oct 2021 09:23:54 +0200 Subject: [PATCH 13/13] use agriculture sector as default, add missing colors --- config.default.yaml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/config.default.yaml b/config.default.yaml index fc53e4a0..b5560133 100644 --- a/config.default.yaml +++ b/config.default.yaml @@ -21,7 +21,7 @@ scenario: opts: # only relevant for PyPSA-Eur - '' sector_opts: # this is where the main scenario settings are - - Co2L0-3H-T-H-B-I-solar+p3-dist1 + - Co2L0-3H-T-H-B-I-A-solar+p3-dist1 # to really understand the options here, look in scripts/prepare_sector_network.py # Co2Lx specifies the CO2 target in x% of the 1990 values; default will give default (5%); # Co2L0p25 will give 25% CO2 emissions; Co2Lm0p05 will give 5% negative emissions @@ -481,6 +481,10 @@ plotting: CC: k co2: '#123456' co2 vent: '#654321' + agriculture heat: '#D07A7A' + agriculture machinery oil: '#1e1e1e' + agriculture machinery oil emissions: '#111111' + agriculture electricity: '#222222' solid biomass for industry co2 from atmosphere: '#654321' solid biomass for industry co2 to stored: '#654321' gas for industry co2 to atmosphere: '#654321'