Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Create config per zone #4435

Merged
merged 44 commits into from
Oct 10, 2022
Merged
Show file tree
Hide file tree
Changes from 20 commits
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
fb130ce
Create prototype for feasability study
pierresegonne Aug 9, 2022
0879288
Generate zone config for js
pierresegonne Aug 9, 2022
413a7eb
Add imports from yaml based config
pierresegonne Aug 9, 2022
f0668bf
Add all individual configs
pierresegonne Aug 9, 2022
c1a9307
Remove script that generates config files
pierresegonne Aug 9, 2022
ee25578
Add fs to web/
pierresegonne Aug 9, 2022
b7ff361
Run prettier on all yaml config
pierresegonne Aug 10, 2022
4e7db78
Merge branch 'master' into ps/move_config_per_zone
pierresegonne Aug 10, 2022
f2d7796
Move generate zones config to src
pierresegonne Aug 10, 2022
23c8c49
Update Prettier to also check and fix config files2
pierresegonne Aug 11, 2022
7e58bb2
Extract generate-zone-config to script
pierresegonne Aug 11, 2022
94f5806
Use newly generated json file within src/
pierresegonne Aug 11, 2022
25c3fe8
Update exchange names to unicode arrow
pierresegonne Aug 11, 2022
dedb382
Update exchange names to unicode arrow, filenames
pierresegonne Aug 11, 2022
2709be5
Update generated json config in web
pierresegonne Aug 11, 2022
2716c0b
Update generate-zones-config to handle unicode arrow
pierresegonne Aug 11, 2022
a7cf709
Remove generate-yaml script
pierresegonne Aug 11, 2022
60bee06
Finalised parse_yaml script in python to verify exact matching of pre…
pierresegonne Aug 11, 2022
672310c
Adopt new parsed objects as default config
pierresegonne Aug 11, 2022
295aa5e
Temporal test for equality between old config object and new
pierresegonne Aug 11, 2022
d7262ff
Make generation of zones config automatic
pierresegonne Aug 12, 2022
22ee5d6
Add generate zones config where appropriate in scripts
pierresegonne Aug 12, 2022
8d8407a
Merge branch 'master' into ps/move_config_per_zone
VIKTORVAV99 Aug 12, 2022
399bc9b
Make scripts use post*
pierresegonne Aug 12, 2022
09dbd63
Add generate-zones-config.js to build
pierresegonne Aug 12, 2022
2ee0e41
Fix signatures in builds
pierresegonne Aug 12, 2022
2a44e06
Provide inputs for web/BUILD.yaml
pierresegonne Aug 12, 2022
7827932
Fix builds
pierresegonne Aug 12, 2022
a8f7dd9
Merge branch 'master' into ps/move_config_per_zone
pierresegonne Oct 4, 2022
6604f90
Merge branch 'master' into ps/move_config_per_zone
pierresegonne Oct 4, 2022
8654c35
Format test_config
pierresegonne Oct 4, 2022
3f9b234
Update locks2
pierresegonne Oct 4, 2022
8415a25
Update all config
pierresegonne Oct 4, 2022
4fe4fe9
Regenerate exchanges config files
pierresegonne Oct 4, 2022
9d20b36
Update error message for generate-zones-config.js
pierresegonne Oct 4, 2022
eb8b7e6
Add script used for splitting .json files into yaml
pierresegonne Oct 4, 2022
f96409c
Remove script used for splitting .json files into yaml
pierresegonne Oct 4, 2022
dd8a2fa
Prettify all yaml files
pierresegonne Oct 4, 2022
12bd613
Update generate-zone-bounding-boxes script
pierresegonne Oct 10, 2022
725504a
Merge branch 'master' into ps/move_config_per_zone
pierresegonne Oct 10, 2022
693a757
Remove js-sha256
pierresegonne Oct 10, 2022
32b70c4
Merge branch 'ps/move_config_per_zone' of https://github.com/electric…
pierresegonne Oct 10, 2022
4efa42a
Update config files
pierresegonne Oct 10, 2022
359681b
Remove generate config file
pierresegonne Oct 10, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
502 changes: 0 additions & 502 deletions config/co2eq_parameters_lifecycle.json

Large diffs are not rendered by default.

333 changes: 333 additions & 0 deletions config/defaults.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,333 @@
fallbackZoneMixes:
powerOriginRatios:
_comment: https://www.bp.com/en/global/corporate/energy-economics/statistical-review-of-world-energy.html, https://www.irena.org/-/media/Files/IRENA/Agency/Publication/2018/Jul/IRENA_Renewable_Energy_Statistics_2018.pdf
_source: BP Statistical Review of World Energy 2019, values from 2018, and electricityMap Avg for average carbon intensity, and IRENA report for Biomass and geothermal
value:
battery charge: 0
battery discharge: 0
biomass: 0.017509
coal: 0.38
gas: 0.232
geothermal: 0.003081
hydro: 0.158
hydro charge: 0
hydro discharge: 0
nuclear: 0.102
oil: 0.03
solar: 0.021966
unknown: 0.007728
wind: 0.047716
isLowCarbon:
battery charge:
_comment: Battery charge does not contribute to the production/consumption mix
source: electricityMap
value: 0
battery discharge:
_comment: Battery discharge is assumed to be powered by low-carbon. Ideally this should be overriden per zone.
source: electricityMap
value: 1
biomass:
_comment: biomass is considered low-carbon.
source: electricityMap
value: 1
coal:
_comment: coal is a fossil fuel.
source: electricityMap
value: 0
gas:
_comment: gas is a fossil fuel.
source: electricityMap
value: 0
geothermal:
_comment: geothermal is considered low-carbon.
source: electricityMap
value: 1
hydro:
_comment: hydro is considered low-carbon.
source: electricityMap
value: 1
hydro charge:
_comment: Battery charge does not contribute to the production/consumption mix
source: electricityMap
value: 0
hydro discharge:
_comment: Hydro discharge is assumed to be powered by low-carbon. Ideally this should be overriden per zone.
source: electricityMap
value: 1
nuclear:
_comment: nuclear is considered low-carbon.
source: electricityMap
value: 1
oil:
_comment: oil is a fossil fuel.
source: electricityMap
value: 0
solar:
_comment: solar is considered low-carbon.
source: electricityMap
value: 1
unknown:
_comment: By default unknown is assumed to be made up of fossil fuel based modes.
datetime: '2020-01-01'
source: electricityMap
value: 0
wind:
_comment: wind is considered low-carbon.
source: electricityMap
value: 1
isRenewable:
battery charge:
_comment: Battery charge does not contribute to the production/consumption mix
source: electricityMap
value: 0
battery discharge:
_comment: Battery discharge is assumed to be powered by renewables. Ideally this should be overriden per zone.
source: electricityMap
value: 1
biomass:
_comment: biomass is considered renewable.
source: electricityMap
value: 1
coal:
_comment: coal is a fossil fuel.
source: electricityMap
value: 0
gas:
_comment: gas is a fossil fuel.
source: electricityMap
value: 0
geothermal:
_comment: geothermal is considered renewable.
source: electricityMap
value: 1
hydro:
_comment: hydro is considered renewable.
source: electricityMap
value: 1
hydro charge:
_comment: Battery charge does not contribute to the production/consumption mix
source: electricityMap
value: 0
hydro discharge:
_comment: Hydro discharge is assumed to be powered by renewables. Ideally this should be overriden per zone.
source: electricityMap
value: 1
nuclear:
_comment: nuclear is a not renewable.
source: electricityMap
value: 0
oil:
_comment: oil is a fossil fuel.
source: electricityMap
value: 0
solar:
_comment: solar is considered renewable.
source: electricityMap
value: 1
unknown:
_comment: By default unknown is assumed to be made up of fossil fuel based modes.
source: electricityMap
value: 0
wind:
_comment: wind is considered renewable.
source: electricityMap
value: 1
emissionFactors:
direct:
battery charge:
_comment: Emissions are counted at discharge
source: electricityMap
value: 0
battery discharge:
- _comment: As a default fallback, we use the annual mean carbon intensity of all electricityMap zones
datetime: '2015-01-01'
source: 2015 annual mean carbon intensity by electricityMap
value: 307.04
- _comment: As a default fallback, we use the annual mean carbon intensity of all electricityMap zones
datetime: '2016-01-01'
source: 2016 annual mean carbon intensity by electricityMap
value: 295.25
- _comment: As a default fallback, we use the annual mean carbon intensity of all electricityMap zones
datetime: '2017-01-01'
source: 2017 annual mean carbon intensity by electricityMap
value: 311.04
- _comment: As a default fallback, we use the annual mean carbon intensity of all electricityMap zones
datetime: '2018-01-01'
source: 2018 annual mean carbon intensity by electricityMap
value: 331.14
- _comment: As a default fallback, we use the annual mean carbon intensity of all electricityMap zones
datetime: '2019-01-01'
source: 2019 annual mean carbon intensity by electricityMap
value: 326.32
- _comment: As a default fallback, we use the annual mean carbon intensity of all electricityMap zones
datetime: '2020-01-01'
source: 2020 annual mean carbon intensity by electricityMap
value: 310.58
- _comment: As a default fallback, we use the annual mean carbon intensity of all electricityMap zones
datetime: '2021-01-01'
source: 2021 annual mean carbon intensity by electricityMap
value: 324.69
biomass:
source: BEIS 2021
value: 0
coal:
source: IPCC 2014
value: 760
gas:
source: IPCC 2014
value: 370
geothermal:
source: IPCC 2014
value: 0
hydro:
source: IPCC 2014
value: 0
hydro charge:
_comment: Emissions are counted at discharge
source: electricityMap
value: 0
hydro discharge:
- _comment: As a default fallback, we use the annual mean carbon intensity of all electricityMap zones
datetime: '2015-01-01'
source: 2015 annual mean carbon intensity by electricityMap
value: 307.04
- _comment: As a default fallback, we use the annual mean carbon intensity of all electricityMap zones
datetime: '2016-01-01'
source: 2016 annual mean carbon intensity by electricityMap
value: 295.25
- _comment: As a default fallback, we use the annual mean carbon intensity of all electricityMap zones
datetime: '2017-01-01'
source: 2017 annual mean carbon intensity by electricityMap
value: 311.04
- _comment: As a default fallback, we use the annual mean carbon intensity of all electricityMap zones
datetime: '2018-01-01'
source: 2018 annual mean carbon intensity by electricityMap
value: 331.14
- _comment: As a default fallback, we use the annual mean carbon intensity of all electricityMap zones
datetime: '2019-01-01'
source: 2019 annual mean carbon intensity by electricityMap
value: 326.32
- _comment: As a default fallback, we use the annual mean carbon intensity of all electricityMap zones
datetime: '2020-01-01'
source: 2020 annual mean carbon intensity by electricityMap
value: 310.58
- _comment: As a default fallback, we use the annual mean carbon intensity of all electricityMap zones
datetime: '2021-01-01'
source: 2021 annual mean carbon intensity by electricityMap
value: 324.69
nuclear:
source: IPCC 2014
value: 0
oil:
_comment: A blended average of US and UK direct emission factor figures
source: EIA 2020/BEIS 2021
value: 406
solar:
source: IPCC 2014
value: 0
unknown:
_comment: assume conventional
source: assumes thermal (coal, gas, or oil)
value: 575
wind:
source: IPCC 2014
value: 0
lifecycle:
battery charge:
_comment: Emissions are counted at discharge
source: electricityMap
value: 0
battery discharge:
- _comment: As a default fallback, we use the annual mean carbon intensity of all electricityMap zones
datetime: '2015-01-01'
source: 2015 annual mean carbon intensity by electricityMap
value: 363.85
- _comment: As a default fallback, we use the annual mean carbon intensity of all electricityMap zones
datetime: '2016-01-01'
source: 2016 annual mean carbon intensity by electricityMap
value: 354.12
- _comment: As a default fallback, we use the annual mean carbon intensity of all electricityMap zones
datetime: '2017-01-01'
source: 2017 annual mean carbon intensity by electricityMap
value: 370.7
- _comment: As a default fallback, we use the annual mean carbon intensity of all electricityMap zones
datetime: '2018-01-01'
source: 2018 annual mean carbon intensity by electricityMap
value: 407.34
- _comment: As a default fallback, we use the annual mean carbon intensity of all electricityMap zones
datetime: '2019-01-01'
source: 2019 annual mean carbon intensity by electricityMap
value: 391.46
- _comment: As a default fallback, we use the annual mean carbon intensity of all electricityMap zones
datetime: '2020-01-01'
source: 2020 annual mean carbon intensity by electricityMap
value: 375.63
- _comment: As a default fallback, we use the annual mean carbon intensity of all electricityMap zones
datetime: '2021-01-01'
source: 2021 annual mean carbon intensity by electricityMap
value: 391.33
biomass:
source: IPCC 2014
value: 230
coal:
source: IPCC 2014
value: 820
gas:
source: IPCC 2014
value: 490
geothermal:
source: IPCC 2014
value: 38
hydro:
source: IPCC 2014
value: 24
hydro charge:
_comment: Emissions are counted at discharge
source: electricityMap
value: 0
hydro discharge:
- _comment: As a default fallback, we use the annual mean carbon intensity of all electricityMap zones
datetime: '2015-01-01'
source: 2015 annual mean carbon intensity by electricityMap
value: 363.85
- _comment: As a default fallback, we use the annual mean carbon intensity of all electricityMap zones
datetime: '2016-01-01'
source: 2016 annual mean carbon intensity by electricityMap
value: 354.12
- _comment: As a default fallback, we use the annual mean carbon intensity of all electricityMap zones
datetime: '2017-01-01'
source: 2017 annual mean carbon intensity by electricityMap
value: 370.7
- _comment: As a default fallback, we use the annual mean carbon intensity of all electricityMap zones
datetime: '2018-01-01'
source: 2018 annual mean carbon intensity by electricityMap
value: 407.34
- _comment: As a default fallback, we use the annual mean carbon intensity of all electricityMap zones
datetime: '2019-01-01'
source: 2019 annual mean carbon intensity by electricityMap
value: 391.46
- _comment: As a default fallback, we use the annual mean carbon intensity of all electricityMap zones
datetime: '2020-01-01'
source: 2020 annual mean carbon intensity by electricityMap
value: 375.63
- _comment: As a default fallback, we use the annual mean carbon intensity of all electricityMap zones
datetime: '2021-01-01'
source: 2021 annual mean carbon intensity by electricityMap
value: 391.33
nuclear:
source: IPCC 2014
value: 12
oil:
_comment: UK Parliamentary Office of Science and Technology (2006) 'Carbon footprint of electricity generation'
source: UK POST 2014
value: 650
solar:
source: IPCC 2014
value: 45
unknown:
_comment: assume conventional
source: assumes thermal (coal, gas, oil or biomass)
value: 700
wind:
source: IPCC 2014
value: 11
9 changes: 9 additions & 0 deletions config/exchanges/AL→GR.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
capacity:
- -533
- 533
lonlat:
- 20.689872
- 40.198219
parsers:
exchange: ENTSOE.fetch_exchange
rotation: 135
6 changes: 6 additions & 0 deletions config/exchanges/AL→ME.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
lonlat:
- 19.500384
- 42.428871
parsers:
exchange: ENTSOE.fetch_exchange
rotation: -45
6 changes: 6 additions & 0 deletions config/exchanges/AL→RS.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
lonlat:
- 20.486292
- 42.323472
parsers:
exchange: ENTSOE.fetch_exchange
rotation: 45
6 changes: 6 additions & 0 deletions config/exchanges/AL→XK.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
lonlat:
- 20.212
- 42.408
parsers:
exchange: ENTSOE.fetch_exchange
rotation: 45
7 changes: 7 additions & 0 deletions config/exchanges/AM→GE.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
lonlat:
- 44.313
- 41.205
parsers:
exchange: GE.fetch_exchange
exchangeForecast: ENTSOE.fetch_exchange_forecast
rotation: 0
5 changes: 5 additions & 0 deletions config/exchanges/AM→IR.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
lonlat:
- 46.3
- 38.9
parsers: {}
rotation: 180
5 changes: 5 additions & 0 deletions config/exchanges/AM→NKR.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
lonlat:
- 46.0
- 39.75
parsers: {}
rotation: 90
6 changes: 6 additions & 0 deletions config/exchanges/AR→BR-S.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
lonlat:
- -56.407453
- -28.880006
parsers:
exchange: BR.fetch_exchange
rotation: 110
6 changes: 6 additions & 0 deletions config/exchanges/AR→CL-SEN.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
lonlat:
- -68.291
- -24.547
parsers:
exchange: AR.fetch_exchange
rotation: -45
Loading