From 535aaa46590cc1724e2b16b4babf904dec68f667 Mon Sep 17 00:00:00 2001 From: SimonS898 Date: Mon, 21 Aug 2023 17:38:02 +0200 Subject: [PATCH 01/15] - add jrc-idees url to config file - get jrc_idees_zipped and jrc_idees_unzipped to run if called specifically: include jrc-idees.smk into Snakefile --- config/default.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/config/default.yaml b/config/default.yaml index 2b13bd7d..8256e9fb 100644 --- a/config/default.yaml +++ b/config/default.yaml @@ -13,6 +13,7 @@ data-sources: potentials: https://zenodo.org/record/5112963/files/possibility-for-electricity-autarky.zip entsoe-tyndp: https://2020.entsos-tyndp-scenarios.eu/wp-content/uploads/2020/06/TYNDP-2020-Scenario-Datafile.xlsx.zip jrc-ppdb: https://zenodo.org/record/3574566/files/JRC-PPDB-OPEN.ver1.0.zip + jrc-idees: https://jeodpp.jrc.ec.europa.eu/ftp/jrc-opendata/JRC-IDEES/JRC-IDEES-2015_v1/JRC-IDEES-2015_All_xlsx_{country_code}.zip root-directory: . cluster-sync: url: euler.ethz.ch From a1d4281ff6a3126e2e1989b9adc30ddbef2e7336 Mon Sep 17 00:00:00 2001 From: brynpickering Date: Tue, 22 Aug 2023 14:12:31 +0200 Subject: [PATCH 02/15] copy eurostat_data_tsv rule from feature-sector-coupling into feature-road-transport-v2: - create eurstat.smk file that only contains eurostat_data_tsv rule - adjust config file to contain eurostat-base-url TODO: move eurostat data files into develop data-repository on git! and then adjust config file accordingly --- config/default.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/config/default.yaml b/config/default.yaml index 8256e9fb..80a042d7 100644 --- a/config/default.yaml +++ b/config/default.yaml @@ -14,6 +14,7 @@ data-sources: entsoe-tyndp: https://2020.entsos-tyndp-scenarios.eu/wp-content/uploads/2020/06/TYNDP-2020-Scenario-Datafile.xlsx.zip jrc-ppdb: https://zenodo.org/record/3574566/files/JRC-PPDB-OPEN.ver1.0.zip jrc-idees: https://jeodpp.jrc.ec.europa.eu/ftp/jrc-opendata/JRC-IDEES/JRC-IDEES-2015_v1/JRC-IDEES-2015_All_xlsx_{country_code}.zip + eurostat-base-url: https://raw.githubusercontent.com/calliope-project/euro-calliope-datasets/feature-sector-coupling/eurostat/{dataset}.tsv.gz root-directory: . cluster-sync: url: euler.ethz.ch From 4a8bc6e9f6f17773402ef1640d775caf425c97b7 Mon Sep 17 00:00:00 2001 From: SimonS898 Date: Tue, 22 Aug 2023 15:15:34 +0200 Subject: [PATCH 03/15] transfer ch_data_xlsx rule from feature-sector-coupling into feature-road-transport-v2: - create ch-stats.smk and add rule: ch_data_xlsx to it - adjust config file to contain all ch-stats urls - include newly added ch-stats.smk into snakefile --- config/default.yaml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/config/default.yaml b/config/default.yaml index 80a042d7..4e34afac 100644 --- a/config/default.yaml +++ b/config/default.yaml @@ -13,8 +13,15 @@ data-sources: potentials: https://zenodo.org/record/5112963/files/possibility-for-electricity-autarky.zip entsoe-tyndp: https://2020.entsos-tyndp-scenarios.eu/wp-content/uploads/2020/06/TYNDP-2020-Scenario-Datafile.xlsx.zip jrc-ppdb: https://zenodo.org/record/3574566/files/JRC-PPDB-OPEN.ver1.0.zip + + # from here on newly added config values for road transport jrc-idees: https://jeodpp.jrc.ec.europa.eu/ftp/jrc-opendata/JRC-IDEES/JRC-IDEES-2015_v1/JRC-IDEES-2015_All_xlsx_{country_code}.zip eurostat-base-url: https://raw.githubusercontent.com/calliope-project/euro-calliope-datasets/feature-sector-coupling/eurostat/{dataset}.tsv.gz + swiss-stat: + end-use: https://www.bfe.admin.ch/bfe/en/home/versorgung/statistik-und-geodaten/energiestatistiken/energieverbrauch-nach-verwendungszweck.exturl.html/aHR0cHM6Ly9wdWJkYi5iZmUuYWRtaW4uY2gvZGUvcHVibGljYX/Rpb24vZG93bmxvYWQvOTg1NA==.html + energy-balance: https://www.bfe.admin.ch/bfe/en/home/versorgung/statistik-und-geodaten/energiestatistiken/gesamtenergiestatistik.exturl.html/aHR0cHM6Ly9wdWJkYi5iZmUuYWRtaW4uY2gvZGUvcHVibGljYX/Rpb24vZG93bmxvYWQvNzUxOQ==.html + industry-energy-balance: https://www.bfe.admin.ch/bfe/en/home/versorgung/statistik-und-geodaten/energiestatistiken/teilstatistiken.exturl.html/aHR0cHM6Ly9wdWJkYi5iZmUuYWRtaW4uY2gvZGUvcHVibGljYX/Rpb24vZG93bmxvYWQvODc4OA==.html + gva: https://www.bfs.admin.ch/bfsstatic/dam/assets/10647597/master root-directory: . cluster-sync: url: euler.ethz.ch From d72d59ddeb056a0682e4fcb85111628c8a304206 Mon Sep 17 00:00:00 2001 From: SimonS898 Date: Tue, 22 Aug 2023 15:21:15 +0200 Subject: [PATCH 04/15] adjust default.yaml, configfile from feature-sector-coupling: - remove all ch-stats download links not needed for transport demand: namely only leave for ch-energy-balance.xlsx in - left the wildcard.dataset syntax in for future downloads of futher ch-stats --- config/default.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/config/default.yaml b/config/default.yaml index 4e34afac..a124b57c 100644 --- a/config/default.yaml +++ b/config/default.yaml @@ -18,10 +18,7 @@ data-sources: jrc-idees: https://jeodpp.jrc.ec.europa.eu/ftp/jrc-opendata/JRC-IDEES/JRC-IDEES-2015_v1/JRC-IDEES-2015_All_xlsx_{country_code}.zip eurostat-base-url: https://raw.githubusercontent.com/calliope-project/euro-calliope-datasets/feature-sector-coupling/eurostat/{dataset}.tsv.gz swiss-stat: - end-use: https://www.bfe.admin.ch/bfe/en/home/versorgung/statistik-und-geodaten/energiestatistiken/energieverbrauch-nach-verwendungszweck.exturl.html/aHR0cHM6Ly9wdWJkYi5iZmUuYWRtaW4uY2gvZGUvcHVibGljYX/Rpb24vZG93bmxvYWQvOTg1NA==.html energy-balance: https://www.bfe.admin.ch/bfe/en/home/versorgung/statistik-und-geodaten/energiestatistiken/gesamtenergiestatistik.exturl.html/aHR0cHM6Ly9wdWJkYi5iZmUuYWRtaW4uY2gvZGUvcHVibGljYX/Rpb24vZG93bmxvYWQvNzUxOQ==.html - industry-energy-balance: https://www.bfe.admin.ch/bfe/en/home/versorgung/statistik-und-geodaten/energiestatistiken/teilstatistiken.exturl.html/aHR0cHM6Ly9wdWJkYi5iZmUuYWRtaW4uY2gvZGUvcHVibGljYX/Rpb24vZG93bmxvYWQvODc4OA==.html - gva: https://www.bfs.admin.ch/bfsstatic/dam/assets/10647597/master root-directory: . cluster-sync: url: euler.ethz.ch From 41d5bf4cb9ccc4deb7b9f811098fb4f0d26c262c Mon Sep 17 00:00:00 2001 From: brynpickering Date: Tue, 22 Aug 2023 15:57:52 +0200 Subject: [PATCH 05/15] transfer sectoral_annual_energy_balances rule and transport_subsector_annual_energy_balances rule from feature-sector-coupling into feature-road-transport-v2: - transfered blend_and_rename_per_sector.py - adjusted utils by adding merge_da, which is needed by blend_and_rename_per_sector.py - adjusted config to contain eurostat mappings - added carrier-names.csv which is also a mapping for eurostat data --- config/default.yaml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/config/default.yaml b/config/default.yaml index a124b57c..592f2358 100644 --- a/config/default.yaml +++ b/config/default.yaml @@ -39,6 +39,19 @@ capacity-factors: offshore: 0.4223 # median of average 2016 factors for ~2800 points in Europe ror: 0.536781 # median of average 2016 factors for 1889 hydro stations in Europe trim-ninja-timeseries: True +statistical-code-mapping: + eurostat-to-sectoral-carrier-names: config/eurostat/carrier-names.csv + eurostat-to-sectors: + household: [ FC_OTH_HH_E ] + commercial: [ FC_OTH_CP_E ] + other-commercial: [ FC_OTH_AF_E, FC_OTH_FISH_E, FC_OTH_NSP_E ] # ASSUME: 'not elsewhere specified', agriculture, and fisheries non-oil use goes to commercial buildings + aviation: [ FC_TRA_DAVI_E, INTAVI ] + other-aviation: [ FC_OTH_NSP_E ] # ASSUME: 'not elsewhere specified' (military) kerosene/jet-fuel use goes to aviation demand + marine: [ INTMARB, FC_TRA_DNAVI_E ] + other-marine: [ FC_OTH_FISH_E ] # ASSUME: fisheries oil use goes to marine demand + road-transport: [ FC_TRA_ROAD_E ] + other-road-transport: [ FC_OTH_AF_E, FC_OTH_NSP_E ] # ASSUME: agriculture oil use and most 'not elsewhere specified' (military) oil use goes to 'road' transport demand + rail: [ FC_TRA_RAIL_E ] crs: "EPSG:4326" parameters: maximum-installable-power-density: From ad16a5c0d5a21a27f3115a09069ea9ca54a9fb10 Mon Sep 17 00:00:00 2001 From: SimonS898 Date: Tue, 22 Aug 2023 16:20:08 +0200 Subject: [PATCH 06/15] created transport_subsector_annual_energy_balances as its own rule, not one using sectoral_annual_energy_balances: - deleted the old two rules and wrote the sectoral_annual_energy_balances, to only create the data for the road-transport sector -started adjusting the blend_and_rename_per_sector.py script (removing the industry sector case) - TODO: could remove all cases except the first one conatining the other-road-transport, should we do that would also cause the helper functions to fall out, but they could potentially be used later -TODO: Same question for eurostat-to-sectors in config file, would only need road-transport and other-road-transport --- config/default.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/config/default.yaml b/config/default.yaml index 592f2358..a81e60df 100644 --- a/config/default.yaml +++ b/config/default.yaml @@ -39,6 +39,8 @@ capacity-factors: offshore: 0.4223 # median of average 2016 factors for ~2800 points in Europe ror: 0.536781 # median of average 2016 factors for 1889 hydro stations in Europe trim-ninja-timeseries: True + +# added for road-transport statistical-code-mapping: eurostat-to-sectoral-carrier-names: config/eurostat/carrier-names.csv eurostat-to-sectors: From d3e319a27de98d561d012b7e6a6647138d637548 Mon Sep 17 00:00:00 2001 From: brynpickering Date: Tue, 22 Aug 2023 17:23:25 +0200 Subject: [PATCH 07/15] transfer annual_road_transport_demand rule from feature-sector-coupling into feature-road-transport-v2: - added annual_road_rail_transport_demand.py script to transport scripts - adjusted config to contain future-vehicle-efficiency-percentile --- config/default.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/config/default.yaml b/config/default.yaml index a81e60df..2d33f6e4 100644 --- a/config/default.yaml +++ b/config/default.yaml @@ -142,6 +142,8 @@ parameters: proxy: population biofuel-efficiency: 0.45 wind-and-solar-potential-scenario: technical-potential + transport: + future-vehicle-efficiency-percentile: 0.25 entsoe-tyndp: scenario: National Trends grid: Reference From 5102c265fc554e2f1b78e14ad0dc724a7c0e01ab Mon Sep 17 00:00:00 2001 From: SimonS898 Date: Mon, 11 Sep 2023 18:20:00 +0200 Subject: [PATCH 08/15] transfer annual_energy_balances: rule from sector-coupled-euro-calliope into feature-road-transport-v2: --by bryn pickering! - get annual_energy_balances rule + annual_energy_balance.py - copy mappings into code - adjust default.yaml to download also ch industry sector data, and adjust eurostat-energy-balances link to include only needed data --- config/default.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/config/default.yaml b/config/default.yaml index 2d33f6e4..f6a99f55 100644 --- a/config/default.yaml +++ b/config/default.yaml @@ -16,9 +16,10 @@ data-sources: # from here on newly added config values for road transport jrc-idees: https://jeodpp.jrc.ec.europa.eu/ftp/jrc-opendata/JRC-IDEES/JRC-IDEES-2015_v1/JRC-IDEES-2015_All_xlsx_{country_code}.zip - eurostat-base-url: https://raw.githubusercontent.com/calliope-project/euro-calliope-datasets/feature-sector-coupling/eurostat/{dataset}.tsv.gz + eurostat-energy-balance: https://raw.githubusercontent.com/calliope-project/euro-calliope-datasets/feature-sector-coupling/eurostat/nrg_bal_c.tsv.gz swiss-stat: energy-balance: https://www.bfe.admin.ch/bfe/en/home/versorgung/statistik-und-geodaten/energiestatistiken/gesamtenergiestatistik.exturl.html/aHR0cHM6Ly9wdWJkYi5iZmUuYWRtaW4uY2gvZGUvcHVibGljYX/Rpb24vZG93bmxvYWQvNzUxOQ==.html + industry-energy-balance: https://www.bfe.admin.ch/bfe/en/home/versorgung/statistik-und-geodaten/energiestatistiken/teilstatistiken.exturl.html/aHR0cHM6Ly9wdWJkYi5iZmUuYWRtaW4uY2gvZGUvcHVibGljYX/Rpb24vZG93bmxvYWQvODc4OA==.html root-directory: . cluster-sync: url: euler.ethz.ch From a62472f15c4dbd2196737e3562c890d81e6a27d7 Mon Sep 17 00:00:00 2001 From: SimonS898 Date: Mon, 25 Sep 2023 14:31:26 +0200 Subject: [PATCH 09/15] adjust implementation for road transport demand timeseries: - creates timeseries for each vehicle_type for the temporal scope defined in the config - uses the scaling factor out of config and temporary conversion factors for mio km to Mw(h) out of config - creates the bau timeseries for the 3 respective vehicle types: passenger cars, coaches and buses, ldv - make bau positive and other road transport demand negative --- config/default.yaml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/config/default.yaml b/config/default.yaml index f6a99f55..fecdfed3 100644 --- a/config/default.yaml +++ b/config/default.yaml @@ -55,6 +55,13 @@ statistical-code-mapping: road-transport: [ FC_TRA_ROAD_E ] other-road-transport: [ FC_OTH_AF_E, FC_OTH_NSP_E ] # ASSUME: agriculture oil use and most 'not elsewhere specified' (military) oil use goes to 'road' transport demand rail: [ FC_TRA_RAIL_E ] +# TODO: add right conversion factors, assumption right now: 200 MW(h) per million kilometers +road_transport_conversion_factors: + ldv_conversion_factor: 200 # from mio-km to MW(h): 200 MW(h) per million kilometers + hdv_conversion_factor: 200 + coaches_and_buses_conversion_factor: 200 + passenger_cars_conversion_factor: 200 + powered_2_wheelers_conversion_factor: 200 crs: "EPSG:4326" parameters: maximum-installable-power-density: From cedf9c586bbff2633d0d4fbd74e5ef4cb0f72c88 Mon Sep 17 00:00:00 2001 From: SimonS898 Date: Mon, 25 Sep 2023 16:12:04 +0200 Subject: [PATCH 10/15] config clean up: - remove mapping used for eurostat data creation before in blend and rename - remove unnecessary comments - use conversion factors out of sector-coupled branch --- config/default.yaml | 29 ++++++----------------------- 1 file changed, 6 insertions(+), 23 deletions(-) diff --git a/config/default.yaml b/config/default.yaml index fecdfed3..b1b0e3de 100644 --- a/config/default.yaml +++ b/config/default.yaml @@ -13,8 +13,6 @@ data-sources: potentials: https://zenodo.org/record/5112963/files/possibility-for-electricity-autarky.zip entsoe-tyndp: https://2020.entsos-tyndp-scenarios.eu/wp-content/uploads/2020/06/TYNDP-2020-Scenario-Datafile.xlsx.zip jrc-ppdb: https://zenodo.org/record/3574566/files/JRC-PPDB-OPEN.ver1.0.zip - - # from here on newly added config values for road transport jrc-idees: https://jeodpp.jrc.ec.europa.eu/ftp/jrc-opendata/JRC-IDEES/JRC-IDEES-2015_v1/JRC-IDEES-2015_All_xlsx_{country_code}.zip eurostat-energy-balance: https://raw.githubusercontent.com/calliope-project/euro-calliope-datasets/feature-sector-coupling/eurostat/nrg_bal_c.tsv.gz swiss-stat: @@ -40,28 +38,13 @@ capacity-factors: offshore: 0.4223 # median of average 2016 factors for ~2800 points in Europe ror: 0.536781 # median of average 2016 factors for 1889 hydro stations in Europe trim-ninja-timeseries: True - -# added for road-transport -statistical-code-mapping: - eurostat-to-sectoral-carrier-names: config/eurostat/carrier-names.csv - eurostat-to-sectors: - household: [ FC_OTH_HH_E ] - commercial: [ FC_OTH_CP_E ] - other-commercial: [ FC_OTH_AF_E, FC_OTH_FISH_E, FC_OTH_NSP_E ] # ASSUME: 'not elsewhere specified', agriculture, and fisheries non-oil use goes to commercial buildings - aviation: [ FC_TRA_DAVI_E, INTAVI ] - other-aviation: [ FC_OTH_NSP_E ] # ASSUME: 'not elsewhere specified' (military) kerosene/jet-fuel use goes to aviation demand - marine: [ INTMARB, FC_TRA_DNAVI_E ] - other-marine: [ FC_OTH_FISH_E ] # ASSUME: fisheries oil use goes to marine demand - road-transport: [ FC_TRA_ROAD_E ] - other-road-transport: [ FC_OTH_AF_E, FC_OTH_NSP_E ] # ASSUME: agriculture oil use and most 'not elsewhere specified' (military) oil use goes to 'road' transport demand - rail: [ FC_TRA_RAIL_E ] -# TODO: add right conversion factors, assumption right now: 200 MW(h) per million kilometers +# conversion factors out of sector-coupled, from mio km to MW(h) road_transport_conversion_factors: - ldv_conversion_factor: 200 # from mio-km to MW(h): 200 MW(h) per million kilometers - hdv_conversion_factor: 200 - coaches_and_buses_conversion_factor: 200 - passenger_cars_conversion_factor: 200 - powered_2_wheelers_conversion_factor: 200 + ldv_conversion_factor: 480 + hdv_conversion_factor: 3248 # based on buses + coaches_and_buses_conversion_factor: 3248 + passenger_cars_conversion_factor: 324 + powered_2_wheelers_conversion_factor: 200 # based on passenger car electrical efficiency scaled by relative diesel efficiency crs: "EPSG:4326" parameters: maximum-installable-power-density: From fae049282715fa76fbc583e0bd1bdf759d011662 Mon Sep 17 00:00:00 2001 From: SimonS898 Date: Wed, 27 Sep 2023 10:54:30 +0200 Subject: [PATCH 11/15] clean up adjust config to match its style --- config/default.yaml | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/config/default.yaml b/config/default.yaml index b1b0e3de..cddb77bf 100644 --- a/config/default.yaml +++ b/config/default.yaml @@ -38,13 +38,12 @@ capacity-factors: offshore: 0.4223 # median of average 2016 factors for ~2800 points in Europe ror: 0.536781 # median of average 2016 factors for 1889 hydro stations in Europe trim-ninja-timeseries: True -# conversion factors out of sector-coupled, from mio km to MW(h) -road_transport_conversion_factors: - ldv_conversion_factor: 480 - hdv_conversion_factor: 3248 # based on buses - coaches_and_buses_conversion_factor: 3248 - passenger_cars_conversion_factor: 324 - powered_2_wheelers_conversion_factor: 200 # based on passenger car electrical efficiency scaled by relative diesel efficiency +road_transport_conversion_factors: # conversion factors out of sector-coupled, from mio km to MW(h) + ldv: 480 + hdv: 3248 # based on buses + coaches-and-buses-conversion-factor: 3248 + passenger-cars-conversion-factor: 324 + powered-2-wheelers-conversion-factor: 200 # based on passenger car electrical efficiency scaled by relative diesel efficiency crs: "EPSG:4326" parameters: maximum-installable-power-density: From 325f5d7f2ca6e58764264cd05f2f56234eb24d37 Mon Sep 17 00:00:00 2001 From: SimonS898 Date: Wed, 4 Oct 2023 11:30:36 +0200 Subject: [PATCH 12/15] adjust fill missing countries and years function: - Old: Used to expand data for all countries hard coded into the function no matter the config. - New: expands data based on fill-missing-values, which is set in the config --- config/default.yaml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/config/default.yaml b/config/default.yaml index cddb77bf..b90cc4e4 100644 --- a/config/default.yaml +++ b/config/default.yaml @@ -44,6 +44,13 @@ road_transport_conversion_factors: # conversion factors out of sector-coupled, f coaches-and-buses-conversion-factor: 3248 passenger-cars-conversion-factor: 324 powered-2-wheelers-conversion-factor: 200 # based on passenger car electrical efficiency scaled by relative diesel efficiency +fill-missing-values: + AL: ['BG', 'HR', 'HU', 'RO', 'EL'] + BA: ['BG', 'HR', 'HU', 'RO', 'EL'] + ME: ['BG', 'HR', 'HU', 'RO', 'EL'] + RS: ['BG', 'HR', 'HU', 'RO', 'EL'] + "NO": ['SE', 'DK'] + CH: ['DE', 'AT', 'FR', 'IT'] crs: "EPSG:4326" parameters: maximum-installable-power-density: From dc7e719a27bc480d2e17886d2a7963246ca5ab25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim=20Tr=C3=B6ndle?= Date: Thu, 7 Mar 2024 18:01:32 +0100 Subject: [PATCH 13/15] Add changes from review --- config/default.yaml | 39 ++++++++++++++++++++++----------------- 1 file changed, 22 insertions(+), 17 deletions(-) diff --git a/config/default.yaml b/config/default.yaml index b90cc4e4..cc12879a 100644 --- a/config/default.yaml +++ b/config/default.yaml @@ -14,10 +14,9 @@ data-sources: entsoe-tyndp: https://2020.entsos-tyndp-scenarios.eu/wp-content/uploads/2020/06/TYNDP-2020-Scenario-Datafile.xlsx.zip jrc-ppdb: https://zenodo.org/record/3574566/files/JRC-PPDB-OPEN.ver1.0.zip jrc-idees: https://jeodpp.jrc.ec.europa.eu/ftp/jrc-opendata/JRC-IDEES/JRC-IDEES-2015_v1/JRC-IDEES-2015_All_xlsx_{country_code}.zip - eurostat-energy-balance: https://raw.githubusercontent.com/calliope-project/euro-calliope-datasets/feature-sector-coupling/eurostat/nrg_bal_c.tsv.gz - swiss-stat: - energy-balance: https://www.bfe.admin.ch/bfe/en/home/versorgung/statistik-und-geodaten/energiestatistiken/gesamtenergiestatistik.exturl.html/aHR0cHM6Ly9wdWJkYi5iZmUuYWRtaW4uY2gvZGUvcHVibGljYX/Rpb24vZG93bmxvYWQvNzUxOQ==.html - industry-energy-balance: https://www.bfe.admin.ch/bfe/en/home/versorgung/statistik-und-geodaten/energiestatistiken/teilstatistiken.exturl.html/aHR0cHM6Ly9wdWJkYi5iZmUuYWRtaW4uY2gvZGUvcHVibGljYX/Rpb24vZG93bmxvYWQvODc4OA==.html + eurostat-energy-balance: https://raw.githubusercontent.com/calliope-project/euro-calliope-datasets/feature-sector-coupling/eurostat/nrg_bal_c.tsv.gz # FIXME do not use cached data + swiss-energy-balance: https://www.bfe.admin.ch/bfe/en/home/versorgung/statistik-und-geodaten/energiestatistiken/gesamtenergiestatistik.exturl.html/aHR0cHM6Ly9wdWJkYi5iZmUuYWRtaW4uY2gvZGUvcHVibGljYX/Rpb24vZG93bmxvYWQvNzUxOQ==.html + swiss-industry-energy-balance: https://www.bfe.admin.ch/bfe/en/home/versorgung/statistik-und-geodaten/energiestatistiken/teilstatistiken.exturl.html/aHR0cHM6Ly9wdWJkYi5iZmUuYWRtaW4uY2gvZGUvcHVibGljYX/Rpb24vZG93bmxvYWQvODc4OA==.html root-directory: . cluster-sync: url: euler.ethz.ch @@ -38,19 +37,6 @@ capacity-factors: offshore: 0.4223 # median of average 2016 factors for ~2800 points in Europe ror: 0.536781 # median of average 2016 factors for 1889 hydro stations in Europe trim-ninja-timeseries: True -road_transport_conversion_factors: # conversion factors out of sector-coupled, from mio km to MW(h) - ldv: 480 - hdv: 3248 # based on buses - coaches-and-buses-conversion-factor: 3248 - passenger-cars-conversion-factor: 324 - powered-2-wheelers-conversion-factor: 200 # based on passenger car electrical efficiency scaled by relative diesel efficiency -fill-missing-values: - AL: ['BG', 'HR', 'HU', 'RO', 'EL'] - BA: ['BG', 'HR', 'HU', 'RO', 'EL'] - ME: ['BG', 'HR', 'HU', 'RO', 'EL'] - RS: ['BG', 'HR', 'HU', 'RO', 'EL'] - "NO": ['SE', 'DK'] - CH: ['DE', 'AT', 'FR', 'IT'] crs: "EPSG:4326" parameters: maximum-installable-power-density: @@ -141,6 +127,25 @@ parameters: wind-and-solar-potential-scenario: technical-potential transport: future-vehicle-efficiency-percentile: 0.25 + road-transport-conversion-factors: # MWh / mio km 25th percentile efficiency of all countries in 2015 [@Mantzos:2017] + light-duty-vehicles: 480 + heavy-duty-vehicles: 3248 # based on buses + coaches-and-buses: 3248 + passenger-cars: 324 + motorcycles: 200 # based on passenger car electrical efficiency scaled by relative diesel efficiency + names: + light-duty-vehicles: Light duty vehicles + heavy-duty-vehicles: Heavy duty vehicles + coaches-and-buses: Motor coaches, buses and trolley buses + passenger-cars: Passenger cars + motorcycles: Powered 2-wheelers + fill-missing-values: + AL: ['BG', 'HR', 'HU', 'RO', 'EL'] + BA: ['BG', 'HR', 'HU', 'RO', 'EL'] + ME: ['BG', 'HR', 'HU', 'RO', 'EL'] + RS: ['BG', 'HR', 'HU', 'RO', 'EL'] + 'NO': ['SE', 'DK'] # '' necessary as NO is understood as boolean False + CH: ['DE', 'AT', 'FR', 'IT'] entsoe-tyndp: scenario: National Trends grid: Reference From 6090783d3979faff0a0a900e64ce47b5f5716e68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim=20Tr=C3=B6ndle?= Date: Thu, 7 Mar 2024 19:54:01 +0100 Subject: [PATCH 14/15] Fix names of administrative units in road transport --- config/default.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/config/default.yaml b/config/default.yaml index cc12879a..d92f454e 100644 --- a/config/default.yaml +++ b/config/default.yaml @@ -140,12 +140,12 @@ parameters: passenger-cars: Passenger cars motorcycles: Powered 2-wheelers fill-missing-values: - AL: ['BG', 'HR', 'HU', 'RO', 'EL'] - BA: ['BG', 'HR', 'HU', 'RO', 'EL'] - ME: ['BG', 'HR', 'HU', 'RO', 'EL'] - RS: ['BG', 'HR', 'HU', 'RO', 'EL'] - 'NO': ['SE', 'DK'] # '' necessary as NO is understood as boolean False - CH: ['DE', 'AT', 'FR', 'IT'] + ALB: ['BGR', 'HRV', 'HUN', 'ROU', 'GRC'] + BIH: ['BGR', 'HRV', 'HUN', 'ROU', 'GRC'] + MNE: ['BGR', 'HRV', 'HUN', 'ROU', 'GRC'] + SRB: ['BGR', 'HRV', 'HUN', 'ROU', 'GRC'] + NOR: ['SWE', 'DNK'] + CHE: ['DEU', 'AUT', 'FRA', 'ITA'] entsoe-tyndp: scenario: National Trends grid: Reference From 9cb8d87fbada05622f3abc91da8d947b6db6c6db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim=20Tr=C3=B6ndle?= Date: Fri, 8 Mar 2024 10:21:04 +0100 Subject: [PATCH 15/15] Fix schema --- config/default.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/config/default.yaml b/config/default.yaml index d92f454e..c4001502 100644 --- a/config/default.yaml +++ b/config/default.yaml @@ -126,8 +126,9 @@ parameters: biofuel-efficiency: 0.45 wind-and-solar-potential-scenario: technical-potential transport: - future-vehicle-efficiency-percentile: 0.25 - road-transport-conversion-factors: # MWh / mio km 25th percentile efficiency of all countries in 2015 [@Mantzos:2017] + future-vehicle-efficiency-percentile: 0.25 # FIXME Why so low? Why not 0.5? + # FIXME road-transport-conversion-factors are redundant, as they are derived using future-vehicle-efficiency-percentile + road-transport-conversion-factors: # MWh / mio km 25th percentile efficiency of all countries in 2015 [@Mantzos:2017] light-duty-vehicles: 480 heavy-duty-vehicles: 3248 # based on buses coaches-and-buses: 3248