merge dev into main - #52

Merged

energyLS merged 235 commits into

mainfrom

Jul 18, 2026

Commits on Mar 13, 2026

feat: new pixi env setup file
JanTautorus
committed
e57ab5c
feat: Add pre-commit config with ruff + hygiene hooks
JanTautorus
committed
f2a0410
fix: correct pixi.toml feature/environment configuration
JanTautorus
committed
d509aa5
feat: add pre-commit configuration
JanTautorus
committed
fa09028
chore: lint Python scripts with ruff
JanTautorus
committed
d5f892f
chore: notebook linting adjustments
JanTautorus
committed
365993c
chore: add nbqa to pixi dev dependencies
JanTautorus
committed
4468e90
chore: add nbqa to pixi dev dependencies
JanTautorus
committed
9220a56
chore: add GitHub Actions CI for Pixi env setup
JanTautorus
committed
5dbe7af

Commits on Mar 16, 2026

Merge branch '21-minimum-viable-run' of https://github.com/energyLS/shift into 21-minimum-viable-run
JanTautorus
committed
9571048

Commits on Mar 20, 2026

feat: add new streamlined readme
JanTautorus
committed
8d79c36
feat: add detailed workflow plan
JanTautorus
committed
b8ec17a

Commits on Mar 24, 2026

Commits on Mar 25, 2026

Commits on Mar 26, 2026

feat: implement supply chain of steel based on technology data base
JanTautorus
committed
1985acf
chore: add missing snakemake import
JanTautorus
committed
10fca00

Commits on Mar 27, 2026

Commits on Mar 30, 2026

wip: dont look, still refactoring step1
JanTautorus
committed
63446dc

Commits on Apr 1, 2026

Commits on Apr 2, 2026

Commits on Apr 3, 2026

Commits on Apr 7, 2026

chore: implement better markdown style - each sentence in a new line
JanTautorus
committed
396d4fa

Commits on Apr 8, 2026

feat: add comprehensive renewable potential processing
JanTautorus
committed
31d401c

Commits on Apr 10, 2026

fix: cleanup data structre of renewable profiles and speed up processing
JanTautorus
committed
563eb99

Commits on Apr 13, 2026

chore: update readme formatting
JanTautorus
committed
ed6bbcd

Commits on Apr 14, 2026

chore: add ipykernel to dev env
JanTautorus
committed
4f7359f

Commits on Apr 15, 2026

feat: add complete workflow for processing and plotting pypsa_earth data
JanTautorus
committed
e661727

Commits on Apr 16, 2026

fix: validated full workflow for potential extraction and analysis from pypsa-earth
JanTautorus
committed
afb739c

Commits on Apr 17, 2026

Commits on Apr 20, 2026

fix: improve grid reconiliation to catch edgecases
JanTautorus
committed
a7eef4e

Commits on Apr 22, 2026

Commits on Apr 27, 2026

fix: change carrier naming to include technology as commented in PR

JanTautorus
and
Copilot
committed
a1c7712
chore: change renewable profile input to new structure
JanTautorus
committed
8fdb0da
chore:update readme to better align with workflow
JanTautorus
committed
35381be
chore: change config file to real data case
JanTautorus
committed
9292832
feat: add simple tests to verify the workflow based on a easy to understand mock case
JanTautorus
committed
a344f7b

Commits on Apr 28, 2026

Commits on May 6, 2026

feat: process just trace renewables for easier workflow
JanTautorus
committed
df750de
feat: add blocs for trace regions
JanTautorus
committed
60c4e46
feat: consolidate snakemake workflow

JanTautorus
and
Copilot
committed
fab7e2c

Commits on May 7, 2026

chore: improve snakemake workflow and split thematical tasks

JanTautorus
and
Copilot
committed
db22d7f
fix: configure independent snakemake workflow path
JanTautorus
committed
627d632

Commits on May 11, 2026

chore: order pixi dependencies
JanTautorus
committed
207f8c0
feat: clean up and improve domestic reservation for renewable generators
JanTautorus
committed
eb985f2

Commits on May 12, 2026

feat: enable modular, unambiguous slicing of supply chain in stages
JanTautorus
committed
9daac47

Commits on May 18, 2026

feat: implement stage seperated, modular and dynamic calculation of lcox
JanTautorus
committed
b824e0c
chore: remove stale env
JanTautorus
committed
3d8aaff

Commits on May 19, 2026

feat: add trade chain utils
energyLS
committed
dee5d40
fix: adjust path for mock snakemake
energyLS
committed
5259312
fix: add trade chain utils in alternative path to be recognized by snakefile
energyLS
committed
83f077a
feat: get all new wildcards and adjust color position to config
energyLS
committed
108bec7
feat: simplify country map based on new iso3 from config and apply cost penalty only when specified
energyLS
committed
35bbe34
feat: add trade model smk and adjust
energyLS
committed
b0c1508
feat: successfull trade model run on updated config and snakefile
energyLS
committed
9ca3aff
feat: build trade model from trade_chains
energyLS
committed
fc5edf3
chore: consolidate logging
JanTautorus
committed
1aa0131
fix: adjust to new supply chain naming of files
energyLS
committed
700398f
feat: adjust to new file content of supply curves
energyLS
committed
6ce28f5
feat: improve modular PyPSA supply chain creation
JanTautorus
committed
d31e2e4
chore: cleanup old trade scenarios
JanTautorus
committed
c91f3df
chore: add incomplete inspection notebooks
JanTautorus
committed
5017fce
feat: adjust hydrogen and wacc in config
energyLS
committed
5dfbbe6
feat: adjust where to get the trade scenarios from in snakefile
energyLS
committed
f9e6194
feat: implement scenario management for trade scenarios
energyLS
committed
f7f4f0e
Merge remote-tracking branch 'origin/dev' into 21-minimum-viable-run
JanTautorus
committed
21db114
feat: add reporting smk
energyLS
committed
90edfef
fix: move snakefile and trade_chain_utils to correct path
energyLS
committed
207b923
fix: revert change of script path
energyLS
committed
9da97d1
feat: add preparation smk for notebooks
energyLS
committed
8743326
fix: adjust preparation notebooks to new region definition
energyLS
committed
232747c

Commits on May 20, 2026

Commits on May 21, 2026

Merge branch 'dev' into 21-minimum-viable-run
energyLS
authored
9f0f526
chore: delete stale test
JanTautorus
committed
ba16e3b
chore: delete trade_singlestage script
JanTautorus
committed
b03be97
chore: remove duplicated dir creation
JanTautorus
committed
15236ff
chore: move additonal tech parameters into config
JanTautorus
committed
8cbe97e
chore: write proper elif
JanTautorus
committed
02fc08b
Merge pull request #34 from energyLS/21-minimum-viable-run
energyLS
authored
3288b6a
fix: adjust wacc paths and update steel demand input in supply curve
energyLS
committed
aa034fa
feat: add eur usd exchange rate and energy ratios necessary for notebooks
energyLS
committed
7407004
chore: remove depreciated notebook for steel production preparation
energyLS
committed
d57c447
chore: bring back notebook on conceptional model which was deleted in merge
energyLS
committed
6b3d053
fix: have separate helper file for notebooks
energyLS
committed
93d41dd
fix: hardcode first product hbi in trade model rule
energyLS
committed
0e81927
chore: remove legacy wacc code in trade model
energyLS
committed
7cb32a7
feat: proposed workflow structure of wacc integration
energyLS
committed
5701a36
feat: proposed integration of wacc in regional network (incomplete)
energyLS
committed
e36770b
fix: repair lco steel calculation
JanTautorus
committed
d44c855
fix: add gurobi channel back in
JanTautorus
committed
e3402d7

Commits on May 22, 2026

fix: update snakemake path for full workflow
energyLS
committed
8a0a4fb
feat: integrate wacc in prepare_regional_network fully
energyLS
committed
23e9a45
chore: remove config wacc regional values
energyLS
committed
f2aa6f4
chore: remove _wacc_for_region depreciated function
energyLS
committed
89ff4a7
feat: add rule to download labour data
energyLS
committed
43ffab6
feat: add rule to prepare labour cost
energyLS
committed
6831f40
fix: repair incorrect PyPSA network generator addition
JanTautorus
committed
cced87f
Merge branch 'dev' into wacc-in-new-supply-chain
energyLS
committed
6cacd6d
Merge branch 'dev' into labour-cost-in-new-supply-chain
energyLS
committed
071e8ab
feat: add labour cost feature
energyLS
committed
9e4d121
feat: add labour cost toggle to config
energyLS
committed
74bf4e2
fix: add missing pixi dependencies for notebook execution
JanTautorus
committed
3cba678
Merge pull request #42 from energyLS/wacc-in-new-supply-chain
JanTautorus
authored
29ecfda

Commits on May 26, 2026

Commits on May 27, 2026

Commits on May 29, 2026

feat: finish clustering and add plotting
JanTautorus
committed
cf88446
feat: improve preservation of distinct cf buckets when clustering
JanTautorus
committed
07f8a64

Commits on Jun 1, 2026

Commits on Jun 2, 2026

fix: drop rows with NaN supply curve values
energyLS
committed
42412f2
fix: interpretation of supply curve as independent row values
energyLS
committed
e2bae2f
Merge pull request #45 from energyLS/fix-supply-curve-interpretation
JanTautorus
authored
53e6d09
Merge remote-tracking branch 'origin/dev' into new-renewable-profiles
JanTautorus
committed
e90cd1a
chore: rename ormuz and babalmandeb
energyLS
committed
381ab69
chore: adjust arrow and legend position of unstable country case
energyLS
committed
193d2d1
chore: switch bloc trade entries in legend
energyLS
committed
6c3f781
feat: manually adjust political stability via config
energyLS
committed
36e1e4f
feat: reduce middle east stability by -0.6 points
energyLS
committed
339702b
chore: adjust scenario inputs for mga plots
energyLS
committed
180dab5
fix: adjust matching to get Frances iso3 code correctly
energyLS
committed
3623f3d
chore: remove outputs from notebook
energyLS
committed
4271f49
Merge pull request #46 from energyLS:figure-improvements
JanTautorus
authored
5f2efdb
Merge remote-tracking branch 'origin/dev' into new-renewable-profiles
JanTautorus
committed
467d0b9

Commits on Jun 3, 2026

feat: improve clustering by stratyfying
JanTautorus
committed
13de3fe
feat: finish clustering and clustering config
JanTautorus
committed
c7dba41
chore: switch PyPSA input to clusters instead of TRACE
JanTautorus
committed
7bddd18

Commits on Jun 5, 2026

feat: create rule and improve comparison between scenarios
energyLS
committed
3b034f6

Commits on Jun 8, 2026

fix: point to correct cluster path
JanTautorus
committed
6078601

Commits on Jun 9, 2026

feat: add rule plotting lcox
energyLS
committed
11bb7a3
chore: avoid nan in addition and implement colors
energyLS
committed
25edf78
feat: add second region to plot
energyLS
committed
9875c96
feat: group regions in plot
energyLS
committed
68337c6
feat: improve stratyfied clustering
JanTautorus
committed
dcc7712
feat: allocate share of renewables to supply chain based on configurable factor
JanTautorus
committed
380a60e

Commits on Jun 10, 2026

feat: streamline global supply curve rule
energyLS
committed
42b2f75
chore: adjust global supply curve and lcox plotting, update notebook paths
energyLS
committed
3e15a2c
feat: add new colors for plots
energyLS
committed
a6e02d2
feat: figure updates on lcox
energyLS
committed
7cf7558
chore: adjust results path for plot
energyLS
committed
be1b403
chore: minor notebook cleaning
energyLS
committed
fb73663
fix: add scenarios to plot
energyLS
committed
4dab7be
feat: include new assumptions in config
energyLS
committed
f27ba49
chore: remove depreciated dataset
energyLS
committed
4b61f47
feat: revise transport methodology
energyLS
committed
d5ed536
feat: add notebook to analyse transport cost
energyLS
committed
97f59a5
Merge pull request #48 from energyLS/revise-transport
JanTautorus
authored
071571b

Commits on Jun 12, 2026

feat: add notebook to analyze lcox networks
energyLS
committed
f37f5de
fix: make iron and steel storage cyclic
JanTautorus
committed
de539a2
fix: prevent battery buses from being removed
JanTautorus
committed
0708d28
chore: change NumericFocus back to default
JanTautorus
committed
1eeb6d8
chore: add up-to-date lock file
JanTautorus
committed
1ed8f85
feat: improve comparison by including new components
energyLS
committed
f904593
chore: use allocated share data for comparison
energyLS
committed
dc3e4ed

Commits on Jun 13, 2026

Commits on Jun 15, 2026

Commits on Jun 16, 2026

fix: adjust quotation marks for mga blocs
energyLS
committed
331fa91
feat: adjust model_trade and mga plot to 3 blocs configuration
energyLS
committed
41fc6ca
feat: add iron ore cost to plot lcox
energyLS
committed
d672696
feat: update workflow for plotting rules
energyLS
committed
300faef
chore: visual improvements in global supply curve plot
energyLS
committed
8f024b6
chore: minor visual improvements for supply curve plots and lcox
energyLS
committed
9427398

Commits on Jun 18, 2026

Commits on Jun 19, 2026

feat: solve supply constraint pareto style flexibliy in model trade
energyLS
committed
660b456
feat: add input network for plot_mga
energyLS
committed
7897006

Commits on Jun 20, 2026

feat: update inputs for plot lcox rule
energyLS
committed
0043acf
fix: read correct input for mga and pareto plot
energyLS
committed
6dec7c2
feat: add mga plot that visualizes simple pareto front of supplier constraint
energyLS
committed
af49fb4
feat: add sensible values for supplier constraint
energyLS
committed
d201f98
feat: make lcox function region flexible
energyLS
committed
7ed14f9
chore: remove nb outputs
energyLS
committed
3e649e9

Commits on Jun 22, 2026

feat: minor lcox figure updates and introduction of cases
energyLS
committed
6e43a0b
feat: adjust plot countries to iso3, create rule and figure updates
energyLS
committed
3ac06b2
chore: visual improvements in plot mga
energyLS
committed
fbbc77d

Commits on Jun 30, 2026

chore: supply curve figure updates
energyLS
committed
2693801

Commits on Jul 1, 2026

feat: add new color palette tests
energyLS
committed
cb9d04a

Commits on Jul 2, 2026

chore: adjust alpha in global map and curves
energyLS
committed
f63235b
chore: adjust slack and add new region colors
energyLS
committed
153bd0c
feat: add okabeito color tests
energyLS
committed
37679f7
feat: add rule to collect figures and diversify outputs in lcox plots
energyLS
committed
b453d96
fix: readd region index name for correct application in subsequent rules
energyLS
committed
4ee6847
feat: introduce nice naming of regions
energyLS
committed
7cfbfce

Commits on Jul 3, 2026

chore: revise color palette of regions
energyLS
committed
a73a411
chore: adjust alpha in region colors
energyLS
committed
675befb
feat: merge battery components into one for plotting
energyLS
committed
fbbcc05
chore: adjust alpha in global plot
energyLS
committed
3080913
chore: change colors of global plot
energyLS
committed
30ded3c
feat: create rule which collects all main figures
energyLS
committed
51d621e
fix: mock snakemake only when called from inside
energyLS
committed
14673cb

Commits on Jul 4, 2026

chore: limit iron ore potential to 120% of today
energyLS
committed
77112a7
fix: use max constraint from config for plot
energyLS
committed
1a99088

Commits on Jul 14, 2026

chore: clean config file
energyLS
committed
013821f

Commits on Jul 15, 2026

Commits on Jul 18, 2026

feat: plot market share in pareto figures
energyLS
committed
666c1e1
Merge branch 'marketshare-plot' into dev
energyLS
committed
759d515
chore: clean config
energyLS
committed
739f0b6
chore: adjust package acknowedgements
energyLS
committed
d9662c8
chore: clean and delete notebooks
energyLS
committed
25842f5