Skip to content

update electricity/storage preprocessing #615

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.

Sign up for GitHub

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

Merged
judith-tettenborn merged 40 commits into from
May 29, 2026
Merged

update electricity/storage preprocessing #615

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
76dcf46
add file and notebook for testing storage calculations
judith-tettenborn Mar 26, 2026
9e98f53
added knowledge graph for IMAGE regions<->countries
judith-tettenborn Apr 9, 2026
224e8d8
added IHA PHS data; added script for handling those data
judith-tettenborn Apr 9, 2026
6c3c1ce
adapting aggregate_sum(); corrections on knowledgegraph IMAGE regions
judith-tettenborn Apr 13, 2026
056c3f7
aggregate IHA data to IMAGE regions and calc. shares per decade
judith-tettenborn Apr 13, 2026
faf7bed
minor correction; added colour dict. for image regions
judith-tettenborn Apr 13, 2026
1783601
added IHA-country dataset
judith-tettenborn Apr 16, 2026
9a9a389
added categories to power generation knowledge graph
judith-tettenborn Apr 20, 2026
357efed
calculate phs starting year per region; draft for region specific ext…
judith-tettenborn Apr 20, 2026
d5e633a
adapted interpolate_xr() to extrapolate (lin., exp., log.) region spe…
judith-tettenborn Apr 21, 2026
49fff04
fixed error in interpolate_xr()
judith-tettenborn Apr 21, 2026
87c6f1c
added test file for behind-the-meter storage (btm_test.py)
judith-tettenborn Apr 21, 2026
81b2d39
implemented first version of behind-the-meter calculation
judith-tettenborn Apr 22, 2026
5cb1a43
extended PHS projections until 2060 using IHA data
judith-tettenborn May 1, 2026
ab56d67
added TIMER energy storage projections; BTM in MWh
judith-tettenborn May 1, 2026
13b0664
tested extrapolation by assuming same growth rate as storage_energy
judith-tettenborn May 3, 2026
6e2273b
transferred phs calc. to function
judith-tettenborn May 5, 2026
ec4ce89
added IRENA numbers for comparison to validation plot
judith-tettenborn May 5, 2026
c41a67e
added docstrings to phs function
judith-tettenborn May 7, 2026
1d834bb
added new PHS data read in statements to storage.py
judith-tettenborn May 7, 2026
f2ed446
changed phs file names; temporarily convert storage preproocessing fc…
judith-tettenborn May 7, 2026
fa8858e
converted btm capacity calc. into function
judith-tettenborn May 7, 2026
13d7ed1
not sure anymore what was done
judith-tettenborn May 19, 2026
a29289b
added first version market shares; extract Sebastiaans MI in kg/kWh
judith-tettenborn May 21, 2026
61eb9f5
calculate remaining storage; added files for market shares, lifetimes…
judith-tettenborn May 22, 2026
526e459
updated version of storage preprocessing is working
judith-tettenborn May 22, 2026
0065736
resolved some errors, but still not working
judith-tettenborn May 22, 2026
b62b7db
got rid of scenario, year_start etc as input for preprocessing (now m…
judith-tettenborn May 22, 2026
1c4fa06
adjusted storage knowledge graph
judith-tettenborn May 25, 2026
f8a8111
fixed minor error; cleaning up files
judith-tettenborn May 25, 2026
88aa5b1
solved merge conflict in example/electricity.ipynb
judith-tettenborn May 25, 2026
1bbdb69
deleted outcommented function
judith-tettenborn May 28, 2026
8c104a7
move image_region_knowledge_graph to .json file
judith-tettenborn May 28, 2026
341276b
removed unnecessary import in init file
judith-tettenborn May 28, 2026
8cc014a
merge development into storage_dev
judith-tettenborn May 28, 2026
a9ea611
improved formatting after checking w/ ruff
judith-tettenborn May 28, 2026
aab8448
added names to storage dataarrays (MI, shares, lifetimes)
judith-tettenborn May 28, 2026
e148275
changed set to list in knowledge graph as it caused a test to fail
judith-tettenborn May 29, 2026
ab96c6d
updated test summaries
judith-tettenborn May 29, 2026
76cbed5
moved kg.json into package; deleted outcommented kg in concepts.py
judith-tettenborn May 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 0 additions & 39 deletions data/raw/electricity/SSP2_baseline/kilometrage.csv
View file
Open in desktop

This file was deleted.

39 changes: 0 additions & 39 deletions data/raw/electricity/SSP2_climate_policy_overshoot/kilometrage.csv
View file
Open in desktop

This file was deleted.

Loading
Loading