Skip to content

Commit

Permalink
feat(zone-config): update discharge emission factors for all zones (#…
Browse files Browse the repository at this point in the history
…7237)

* update discharge emission factors for all zones

* test: update test to match new discharge numbers

* test: update test to match new discharge numbers
  • Loading branch information
silkeholmebonnen authored Sep 30, 2024
1 parent 70e9a28 commit ba31788
Show file tree
Hide file tree
Showing 396 changed files with 25,629 additions and 10,034 deletions.
4 changes: 2 additions & 2 deletions config/zones/AD.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@ capacity:
contributors:
- Manu1400
- autipial
timezone: Europe/Andorra
region: Europe
country: AD
region: Europe
timezone: Europe/Andorra
203 changes: 178 additions & 25 deletions config/zones/AE.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,29 @@ capacity:
- datetime: '2023-01-01'
source: Climatescope
value: 39451.8
nuclear:
- datetime: '2020-08-19'
source: IAEA PRIS
value: 1310
- datetime: '2021-09-14'
source: IAEA PRIS
value: 2620
- datetime: '2022-10-08'
source: IAEA PRIS
value: 3930
- datetime: '2024-03-24'
source: IAEA PRIS
value: 5240
oil:
- datetime: '2016-01-01'
source: Climatescope
value: 219.9
- datetime: '2017-01-01'
source: Climatescope
value: 218.6
- datetime: '2018-01-01'
source: Climatescope
value: 71.4
solar:
- datetime: '2016-01-01'
source: Climatescope
Expand All @@ -54,40 +77,170 @@ capacity:
- datetime: '2022-01-01'
source: Climatescope
value: 5414
nuclear:
- datetime: '2020-08-19'
source: IAEA PRIS
value: 1310
- datetime: '2021-09-14'
source: IAEA PRIS
value: 2620
- datetime: '2022-10-08'
source: IAEA PRIS
value: 3930
- datetime: '2024-03-24'
source: IAEA PRIS
value: 5240
oil:
- datetime: '2016-01-01'
source: Climatescope
value: 219.9
- datetime: '2017-01-01'
source: Climatescope
value: 218.6
- datetime: '2018-01-01'
source: Climatescope
value: 71.4
contributors:
- q--
- florianscheidl
- MisterClean
country: AE
emissionFactors:
lifecycle:
battery discharge:
- datetime: '2017-01-01'
source: Electricity Maps, 2017 average
value: 14.75293563004043
- datetime: '2018-01-01'
source: Electricity Maps, 2018 average
value: 15.75041742126386
- datetime: '2019-01-01'
source: Electricity Maps, 2019 average
value: 16.93125713773701
- datetime: '2020-01-01'
source: Electricity Maps, 2020 average
value: 22.225083366014076
- datetime: '2021-01-01'
source: Electricity Maps, 2021 average
value: 23.18452952950505
- datetime: '2022-01-01'
source: Electricity Maps, 2022 average
value: 378.7598234832692
- datetime: '2023-01-01'
source: Electricity Maps, 2023 average
value: 405.38414726061814
hydro discharge:
- datetime: '2017-01-01'
source: Electricity Maps, 2017 average
value: 14.75293563004043
- datetime: '2018-01-01'
source: Electricity Maps, 2018 average
value: 15.75041742126386
- datetime: '2019-01-01'
source: Electricity Maps, 2019 average
value: 16.93125713773701
- datetime: '2020-01-01'
source: Electricity Maps, 2020 average
value: 22.225083366014076
- datetime: '2021-01-01'
source: Electricity Maps, 2021 average
value: 23.18452952950505
- datetime: '2022-01-01'
source: Electricity Maps, 2022 average
value: 378.7598234832692
- datetime: '2023-01-01'
source: Electricity Maps, 2023 average
value: 405.38414726061814
fallbackZoneMixes:
powerOriginRatios:
- _source: Electricity Maps, 2017 average
datetime: '2017-01-01'
value:
battery discharge: 0.0
biomass: 0.0
coal: 0.0
gas: 0.0
geothermal: 0.0
hydro: 0.0
hydro discharge: 0.0
nuclear: 0.9165772938962896
oil: 0.0
solar: 0.08342250113831973
unknown: 0.0
wind: 0.0
- _source: Electricity Maps, 2018 average
datetime: '2018-01-01'
value:
battery discharge: 0.0
biomass: 0.0
coal: 0.0
gas: 0.0
geothermal: 0.0
hydro: 0.0
hydro discharge: 0.0
nuclear: 0.8863500292177069
oil: 0.0
solar: 0.11364977696142337
unknown: 0.0
wind: 0.0
- _source: Electricity Maps, 2019 average
datetime: '2019-01-01'
value:
battery discharge: 0.0
biomass: 0.0
coal: 0.0
gas: 0.0
geothermal: 0.0
hydro: 0.0
hydro discharge: 0.0
nuclear: 0.8505684350838207
oil: 0.0
solar: 0.1494313519881746
unknown: 0.0
wind: 0.0
- _source: Electricity Maps, 2020 average
datetime: '2020-01-01'
value:
battery discharge: 0.0
biomass: 0.0
coal: 0.0
gas: 0.0
geothermal: 0.0
hydro: 0.0
hydro discharge: 0.0
nuclear: 0.6901492026034546
oil: 0.0
solar: 0.30985062714236705
unknown: 0.0
wind: 0.0
- _source: Electricity Maps, 2021 average
datetime: '2021-01-01'
value:
battery discharge: 0.0
biomass: 0.0
coal: 0.0
gas: 0.0
geothermal: 0.0
hydro: 0.0
hydro discharge: 0.0
nuclear: 0.661075717739947
oil: 0.0
solar: 0.3389241285429934
unknown: 0.0
wind: 0.0
- _source: Electricity Maps, 2022 average
datetime: '2022-01-01'
value:
battery discharge: 0.0
biomass: 0.0
coal: 0.0
gas: 0.7562092605001034
geothermal: 0.0
hydro: 0.0
hydro discharge: 0.0
nuclear: 0.11953953089562969
oil: 0.0
solar: 0.12243188555451628
unknown: 0.001819264618995967
wind: 0.0
- _source: Electricity Maps, 2023 average
datetime: '2023-01-01'
value:
battery discharge: 0.0
biomass: 0.0
coal: 0.0
gas: 0.8158952402448857
geothermal: 0.0
hydro: 0.0
hydro discharge: 0.0
nuclear: 0.12045141132235843
oil: 0.0
solar: 0.061690443986865844
unknown: 0.001962850634693522
wind: 0.0
parsers:
consumption: GCCIA.fetch_consumption
region: Asia
sources:
Climatescope:
link: https://www.global-climatescope.org/markets/ae/
IAEA PRIS:
link: https://pris.iaea.org/PRIS/CountryStatistics/CountryDetails.aspx?current=AE
timezone: Asia/Dubai
region: Asia
country: AE
4 changes: 2 additions & 2 deletions config/zones/AF.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
timezone: Asia/Kabul
region: Asia
country: AF
region: Asia
timezone: Asia/Kabul
4 changes: 2 additions & 2 deletions config/zones/AG.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
timezone: America/Antigua
region: Americas
country: AG
region: Americas
timezone: America/Antigua
12 changes: 6 additions & 6 deletions config/zones/AL.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,11 @@ capacity:
- datetime: '2024-01-01'
source: entsoe.eu
value: 0.0
contributors:
- corradio
- nessie2013
- autipial
country: AL
emissionFactors:
lifecycle:
hydro:
Expand All @@ -61,10 +66,6 @@ emissionFactors:
datetime: '2020-01-01'
source: UNECE 2022
value: 5.13
contributors:
- corradio
- nessie2013
- autipial
parsers:
consumption: ENTSOE.fetch_consumption
consumptionForecast: ENTSOE.fetch_consumption_forecast
Expand All @@ -73,9 +74,8 @@ parsers:
production: ENTSOE.fetch_production
productionCapacity: ENTSOE.fetch_production_capacity
productionPerModeForecast: ENTSOE.fetch_wind_solar_forecasts
timezone: Europe/Tirane
region: Europe
sources:
UNECE 2022:
link: https://unece.org/sites/default/files/2022-04/LCA_3_FINAL%20March%202022.pdf
country: AL
timezone: Europe/Tirane
34 changes: 17 additions & 17 deletions config/zones/AM.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ contributors:
- systemcatch
- alixunderplatz
- nessie2013
country: AM
emissionFactors:
direct:
battery discharge:
Expand All @@ -35,14 +36,14 @@ emissionFactors:
battery discharge:
- datetime: '2019-01-01'
source: Electricity Maps, 2019 average
value: 230.2839924469498
value: 230.28340825401284
- datetime: '2020-01-01'
source: Electricity Maps, 2020 average
value: 235.97485082659796
hydro discharge:
- datetime: '2019-01-01'
source: Electricity Maps, 2019 average
value: 230.2839924469498
value: 230.28340825401284
- datetime: '2020-01-01'
source: Electricity Maps, 2020 average
value: 235.97485082659796
Expand All @@ -53,32 +54,31 @@ fallbackZoneMixes:
value:
battery discharge: 0.0
biomass: 0.0
coal: 5.269446440699319e-07
gas: 0.44802996436622095
coal: 5.250073475843808e-07
gas: 0.4486470475411705
geothermal: 0.0
hydro: 0.33765433172171194
hydro: 0.33631244393803006
hydro discharge: 0.0
nuclear: 0.21408260839892573
oil: 4.663653829667453e-05
solar: 1.3754805047413668e-07
unknown: 8.436538735278456e-05
wind: 5.5352435185169484e-05
nuclear: 0.21485408635458791
oil: 4.6467993502431576e-05
solar: 1.3561075398858545e-07
unknown: 8.439057220709672e-05
wind: 5.4428344761561545e-05
- _source: Electricity Maps, 2020 average
datetime: '2020-01-01'
value:
battery discharge: 0.0
biomass: 0.0
coal: 0.0
gas: 0.46377516996269275
gas: 0.46389459701538915
geothermal: 0.0
hydro: 0.19084097045703635
hydro: 0.19046400663928753
hydro discharge: 0.0
nuclear: 0.3454011583392152
oil: 1.8951088677709353e-05
nuclear: 0.3456206557298584
oil: 1.8968983945582545e-05
solar: 0.0
unknown: 4.115911610833948e-07
wind: 1.592678840714006e-06
wind: 1.300389465451885e-06
parsers: {}
timezone: Asia/Yerevan
region: Asia
country: AM
timezone: Asia/Yerevan
4 changes: 2 additions & 2 deletions config/zones/AO.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
timezone: Africa/Luanda
region: Africa
country: AO
region: Africa
timezone: Africa/Luanda
Loading

0 comments on commit ba31788

Please sign in to comment.