Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
214 commits
Select commit Hold shift + click to select a range
e7b971e
simplify indexing
lindnemi Jul 7, 2025
76d967d
determine charger capacities like in prepare_sector_network; remove l…
lindnemi Jul 7, 2025
bbc4d41
add PHEV to number of electric cars because they provide charging cap…
lindnemi Jul 7, 2025
c311dc7
syntax fixes
lindnemi Jul 7, 2025
1ef1704
rename branch
lindnemi Jul 7, 2025
1e0587e
add option to specify AGEB(+KBA) as source for transport demand in 20…
lindnemi Jul 8, 2025
0f6764e
add warning
lindnemi Jul 8, 2025
952c72d
set transport shares to dummy values
lindnemi Jul 8, 2025
6af37e4
Merge branch 'main' into improve-transport-sector
Jul 8, 2025
243ba97
add changelog
lindnemi Jul 8, 2025
7df96ce
Merge branch 'improve-transport-sector' of github.com:PyPSA/pypsa-de …
lindnemi Jul 8, 2025
f9c13bb
use mobility demand from uba projektionsbericht
lindnemi Jul 11, 2025
0cb4015
have separate option for the 2020 data
lindnemi Jul 14, 2025
0ab4ed0
renaming
lindnemi Jul 14, 2025
5b36544
rename script and changelog
lindnemi Jul 14, 2025
c85efb4
rename scripts
lindnemi Jul 14, 2025
81d5130
first stab at industry demand modification
lindnemi Jul 14, 2025
921505d
modify industry demand should be working now
lindnemi Jul 16, 2025
eca7802
rename scenario, fix comment
lindnemi Jul 16, 2025
bb978a9
add index name
lindnemi Jul 16, 2025
1f36395
add error if using uba data after 2040
lindnemi Jul 16, 2025
adcbc17
add to changelog
lindnemi Jul 16, 2025
c0bce54
transporte_shares matter outside of Germany!
lindnemi Jul 16, 2025
451f59b
rename mobility_demand -> mobility_data
lindnemi Jul 16, 2025
00ce274
more renaming
lindnemi Jul 16, 2025
ec5a998
rename and refactor
lindnemi Jul 17, 2025
b73654a
Merge branch 'main' into improve-transport-sector
Jul 17, 2025
40a8357
small adjustments
lindnemi Jul 17, 2025
5030e3e
Merge branch 'improve-transport-sector' into uba_industry_demand
lindnemi Jul 17, 2025
4b78729
improve export; disable uba_for _industry by default
lindnemi Jul 18, 2025
46a53f7
define low demand scenario with heat pump limits from UBA MWMS
lindnemi Jul 18, 2025
0d82914
simplify workflow temporariliy
lindnemi Jul 18, 2025
91db254
two more grouping years
lindnemi Jul 18, 2025
be534e9
refine scenarios
lindnemi Jul 18, 2025
7d6af4c
fix minor
lindnemi Jul 18, 2025
09a00eb
very minor
lindnemi Jul 18, 2025
19e1b91
define regret workflow
lindnemi Jul 22, 2025
a7d22a4
define extra_functionality within solve_network to capture snakemake …
lindnemi Jul 22, 2025
4aa5867
more robustness for networks with fixed capacities
lindnemi Jul 22, 2025
bd09d35
rename
lindnemi Jul 23, 2025
ded2fc0
add scenario comparison plots to regret workflow
lindnemi Jul 23, 2025
5179615
allow for use in regret workflow
lindnemi Jul 23, 2025
b7781c1
allow some components to be extended to fix infeasibilities
lindnemi Jul 23, 2025
1d8f2d9
fix p_nom_min to avoid less fossil imports
lindnemi Jul 23, 2025
0c89fc2
Correct Total System Costs Calculation (#40)
toniseibold Jul 23, 2025
d4a8282
more care with which assets are free, allow methanolisation buildout …
lindnemi Jul 23, 2025
1c4762b
reduce resolution for faster plotting
lindnemi Jul 24, 2025
b9005a8
free co2 atmosphere store and restructure code
lindnemi Jul 24, 2025
1171473
rewrite fix capacities
lindnemi Jul 24, 2025
a996f16
cleaner comparison plots
lindnemi Jul 25, 2025
fb2408d
rename scenario and limit transmission expansion
lindnemi Jul 25, 2025
34da124
catch output from linopy
lindnemi Jul 25, 2025
3a03f05
use output dir
lindnemi Jul 25, 2025
3517699
fighting with ifeasibilities -> currently a problem with co2 limit
lindnemi Jul 25, 2025
6e718cf
exclude DC projects from adjustements
lindnemi Jul 31, 2025
9992e7e
make plotting script more flexible
lindnemi Aug 1, 2025
8ee4a91
fix heat pump limit
lindnemi Aug 1, 2025
5e15e01
allow line expansion again
lindnemi Aug 1, 2025
ef8afdb
add constraints from additional_functionality and prepare_network, do…
lindnemi Aug 1, 2025
d3c29be
fix heat pump constraint
lindnemi Aug 7, 2025
40dedb7
don't write some constraints in regret runs
lindnemi Aug 7, 2025
f8f3a77
turn off line losses, line expansion and noisy costs for better repro…
lindnemi Aug 7, 2025
9fef0c6
big refactor
lindnemi Aug 7, 2025
a603769
swap sign of some load shedding generators
lindnemi Aug 13, 2025
fb5a980
add functionality for setting a co2 price wvia a co2 generator
lindnemi Aug 13, 2025
74a5471
large refactor
lindnemi Aug 13, 2025
b7aa4fb
allow transmission expansion in EU, in DE fix to NEP expansion until …
lindnemi Aug 13, 2025
4fb516b
correctly access the co2 constraint
lindnemi Aug 13, 2025
ed5d813
unfix co2 sequestered because of capital_cost usage of that store
lindnemi Aug 13, 2025
edb5a4f
major refactor
lindnemi Aug 15, 2025
2e2068b
allow to fix either DE or CO2Price&EU
lindnemi Aug 15, 2025
f54450f
minor
lindnemi Aug 15, 2025
db23995
add congestion rent and fix typo in trade carriers
lindnemi Aug 15, 2025
d42428c
Merge branch 'main' into regret-matrix-draft
Aug 15, 2025
5668e22
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Aug 15, 2025
5cffc7a
distinguish components of link opex
lindnemi Aug 15, 2025
644e18d
Merge branch 'regret-matrix-draft' of github.com:PyPSA/pypsa-de into …
lindnemi Aug 15, 2025
9e288e7
improve code structure
lindnemi Aug 15, 2025
eda4c99
fix minor error
lindnemi Aug 15, 2025
7ce649c
first plot ideas
JulianGeis Aug 26, 2025
1490f47
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Aug 26, 2025
cfa2743
fix bug on directory creation
JulianGeis Aug 27, 2025
d795386
increase plotting memory for 3H runs
JulianGeis Aug 28, 2025
898d608
change diff order in plot
JulianGeis Aug 28, 2025
fd203ed
increase marginal cost to avoid simultaneous in and export
lindnemi Aug 29, 2025
3d8eee3
more info on constraint mus
lindnemi Aug 29, 2025
6182a99
fix double counting of methnaol
lindnemi Sep 1, 2025
d214f6d
strengthen import limit for h2 derivatives
lindnemi Sep 1, 2025
d1e2720
allow a small amount of derivatives to be imported (mostly MeOH)
lindnemi Sep 1, 2025
9e40685
fix capacities in all of EU
lindnemi Sep 1, 2025
7b52ba8
allow more elec trade
lindnemi Sep 1, 2025
bcb4ec8
streamline regret_runs; use only one co2 price in ST model
lindnemi Sep 1, 2025
1cbe0f6
improve plots by swapping colors
lindnemi Sep 1, 2025
a0f174a
simplify dropping of constraints
lindnemi Sep 1, 2025
89e13d4
Merge branch 'main' into regret-matrix-draft
Sep 1, 2025
bead072
cheaper h2vent
lindnemi Sep 1, 2025
88f7776
revert some of the pypsa-eur config changes
lindnemi Sep 1, 2025
e6372f2
Merge branch 'regret-matrix-draft' of github.com:PyPSA/pypsa-de into …
lindnemi Sep 1, 2025
2f36357
activate power import limits in regret runs
lindnemi Sep 2, 2025
9846934
split solve_regret and export a prenetwork
lindnemi Sep 2, 2025
72402ac
define no flex sensitivity rules
lindnemi Sep 3, 2025
bc2b4eb
avoid code duplication with a wildcard
lindnemi Sep 3, 2025
e9e8e95
streamline plotting rules
lindnemi Sep 3, 2025
071b436
further improvements to snakemake rules
lindnemi Sep 3, 2025
e87cdfd
revert to default pypsa-de electricity imports
lindnemi Sep 3, 2025
4aaa57e
delay offwind expansion by two years to match onwind targets (which a…
lindnemi Sep 3, 2025
869bede
update prefix
lindnemi Sep 3, 2025
fd19750
more RES capacities in HighDemand; AriadneDemand -> HighDemand rename
lindnemi Sep 4, 2025
e74e691
minor
lindnemi Sep 4, 2025
482d6e5
add a config for triggering short-term no_flex runs
lindnemi Sep 8, 2025
194e918
default to UBA projection data for 2025
lindnemi Sep 8, 2025
4caf484
preliminary long term no flex scenario setup
lindnemi Sep 8, 2025
d453386
plotting fixes
JulianGeis Sep 9, 2025
94dbc09
fix type of year
lindnemi Sep 10, 2025
24f9180
limit urban central water tanks/pits expansion in 2025
lindnemi Sep 11, 2025
fbe22d7
define a noflex lowdemand lt run
lindnemi Sep 11, 2025
ea7c3a7
small fix
lindnemi Sep 11, 2025
c5ec0c2
clip extreme scarcity prices for electricity
lindnemi Sep 12, 2025
9b76a38
access scenario config via n.meta
lindnemi Sep 16, 2025
7817706
rename config for short term runs without no flexibility
lindnemi Sep 16, 2025
4e20492
import function for removing flexibility in st runs
lindnemi Sep 16, 2025
89904ed
improve workflwo for st sensitivites; add gas_price sensitivity
lindnemi Sep 17, 2025
c9c0de8
fix lt plots
JulianGeis Sep 17, 2025
c9fdd0d
simplify directories further
lindnemi Sep 17, 2025
70e729c
add VRE market values to exporter
lindnemi Sep 17, 2025
21ba40a
add more market values
lindnemi Sep 17, 2025
9e154be
prevent memory issues with too many ST scenarios
lindnemi Sep 17, 2025
375b53f
add unit commitment
JulianGeis Sep 17, 2025
f6447f2
harmonize co2 emissions across scenario and with UBA projektionsbericht
lindnemi Sep 18, 2025
7b40c40
update prefix
lindnemi Sep 18, 2025
37e6e1a
improve unit commitment representation
JulianGeis Sep 19, 2025
ad631bf
copy loads_t from realization network; deactivate PTES via first_occu…
lindnemi Sep 19, 2025
44376d6
Merge branch 'regret-matrix-draft' of github.com:PyPSA/pypsa-de into …
lindnemi Sep 19, 2025
c332ca8
Merge branch 'main' into regret-matrix-draft
Sep 19, 2025
2a082a8
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Sep 19, 2025
9c503ba
re-activate transmission losses (because we optimize iteratively now)
lindnemi Sep 19, 2025
be35dec
fix biomass trade variable
lindnemi Sep 19, 2025
4109c86
first attempts at fixing the cluster runs
lindnemi Sep 22, 2025
345695a
Limiting interrconnectors: no transmission losses, no line expanion -…
lindnemi Sep 23, 2025
29daaf8
unit commitment and scaling of cross border elec capa
JulianGeis Sep 23, 2025
cc5ef35
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Sep 23, 2025
8e277b4
export hypothetical subsidy for limiting electricity price to 4000
lindnemi Sep 23, 2025
d65819e
Merge branch 'regret-matrix-draft' of github.com:PyPSA/pypsa-de into …
lindnemi Sep 23, 2025
4679b1c
restrict cross border flows of ac lines
JulianGeis Sep 23, 2025
15e3876
splot power limit for elec trade into import and export constraint
JulianGeis Sep 23, 2025
a32e38d
fix regret ST plots
JulianGeis Sep 23, 2025
1f18c4d
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Sep 23, 2025
7e47c0e
refactor trade accounting
lindnemi Sep 25, 2025
c02a556
less sensitivities, more robust workflow
lindnemi Sep 25, 2025
c8e483d
Merge branch 'regret-matrix-draft' of github.com:PyPSA/pypsa-de into …
lindnemi Sep 25, 2025
df3b238
revert splitting of power_limits constraint; add restriction of cross…
JulianGeis Sep 25, 2025
71dbec8
apply power limit to gross imports/exports
lindnemi Sep 26, 2025
4231795
simplify indexing
lindnemi Sep 26, 2025
546a718
define an decidedly LOW RES scenario
lindnemi Sep 26, 2025
d1ecf23
regret_runs only for those scens that will be analysed
lindnemi Sep 26, 2025
f680e7e
fix RAM bottlenack
lindnemi Sep 26, 2025
0e68848
update solar-hsat costs in myopic optimization and small refactor
lindnemi Sep 29, 2025
c3bb8cb
fix chatgpt garbage
lindnemi Sep 29, 2025
5b680a3
change the correct cost attributes
lindnemi Sep 29, 2025
ee5069d
add variables for decentral boilers
lindnemi Sep 30, 2025
e84d49b
expand HVC to air instead of waste CHP in regret runs
lindnemi Sep 30, 2025
7db3e85
latest gas price is somewhat lower in EUR2020
lindnemi Sep 30, 2025
059f052
export decentral heat capacities
lindnemi Oct 1, 2025
9fc0af7
adjust upper solar limit for 2025 slightly upward
lindnemi Oct 1, 2025
cab999d
transmission losses, stricter upper limit for EE, new LowRES scenario
lindnemi Oct 1, 2025
69d6134
setup LowRES run
lindnemi Oct 1, 2025
50b43a5
allow OCGT as a last resort in ST runs
lindnemi Oct 1, 2025
0150144
restrict OCGT expansion in ST models to DE
lindnemi Oct 1, 2025
23c4240
move demand_baselines from snakefile to config
lindnemi Oct 1, 2025
5df46bb
redefine capacities in the LowDemand Scenario
lindnemi Oct 1, 2025
793b7b7
use query to hopefully avoid fragmentation
lindnemi Oct 1, 2025
de2e86c
fix query
lindnemi Oct 2, 2025
ce45713
basic setup for st_runs with lowered RES
lindnemi Oct 2, 2025
82f4fb9
first version of st variations should work now
lindnemi Oct 2, 2025
f126ab9
fix no_flex_lt_runs
lindnemi Oct 5, 2025
a14504b
improve linopy syntax
lindnemi Oct 7, 2025
b2c303c
fix decentral oil boiler export
lindnemi Oct 8, 2025
adf6ea2
set up workflow for LT EEG sweeps
lindnemi Oct 8, 2025
eafef43
add Eu wide TSC
lindnemi Oct 9, 2025
0743625
add cfd calculation to exporter
lindnemi Oct 9, 2025
dd82783
improve auxiliary variables, solve fragmentation issue
lindnemi Oct 10, 2025
958dcd4
more conservative assumptions regarding cross border trade
lindnemi Oct 10, 2025
846c348
Use UBA instead of REMIND for non-CO2 GHG in 2020 and 2025
lindnemi Oct 13, 2025
0fecfe2
add domestic aviation (bugfix) and subtract international navigation …
lindnemi Oct 13, 2025
1884d52
export the emissions according to the country constraint for analysis
lindnemi Oct 13, 2025
c7f64cf
rename and changelog
lindnemi Oct 13, 2025
f2bed55
minor config changes
lindnemi Oct 13, 2025
25dce1a
no limits on electricity imports for now
lindnemi Oct 13, 2025
00e45f2
adjust Jahresemissionsmenge 2030
lindnemi Oct 15, 2025
11cc8cd
activate resource_classes
lindnemi Oct 15, 2025
539d1d1
more details on emissions in the energy sector
lindnemi Oct 16, 2025
cf3bb1b
change weather year
lindnemi Oct 16, 2025
5254cc8
add agriculture machinery electric to exporter
lindnemi Oct 31, 2025
079fa6f
restrict corss border flows more
lindnemi Oct 31, 2025
b773458
Fix the co2 price to 200 for this run
lindnemi Oct 31, 2025
0ef6a76
Assume that no more than 25 GW can be reached for offshore wind
lindnemi Oct 31, 2025
64a6ee1
assume no more than 24 gw can be reached for offshore wind
lindnemi Oct 31, 2025
4b4bc8f
fix curtailment calculation
lindnemi Nov 10, 2025
aedf738
add transmission losses
lindnemi Nov 10, 2025
9321b28
adjust rescom electricity to UBA and industry H2 back to pypsa
lindnemi Nov 12, 2025
a3ee1ef
use correct unit
lindnemi Nov 12, 2025
1134cec
allow the 2025 batteries in NoFlex
lindnemi Nov 17, 2025
832fcff
avoid config being underspecified
lindnemi Nov 17, 2025
1da3c4a
allow 2025 batteries in NoFlex scenario
lindnemi Nov 18, 2025
2ccec72
minor fix for rescom elec scaling
lindnemi Nov 21, 2025
dfe20c7
improve decentral heat budgets
lindnemi Nov 21, 2025
9edaa6b
fix whitespace
lindnemi Nov 21, 2025
e3b9c1b
add producer rents to exporter
lindnemi Nov 26, 2025
85df67c
add variable for electricity from biomethane
lindnemi Nov 26, 2025
27d0a95
Actually export producer rent -.-
lindnemi Nov 26, 2025
ea1bcc6
add elec system cost
lindnemi Nov 27, 2025
58e811a
fix: restrict elec system cost to elec system
lindnemi Nov 27, 2025
e188984
compute TESC via loads
lindnemi Nov 28, 2025
6c8d93c
config for final run
lindnemi Jan 8, 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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@ cutouts

# custom local files
local
figures
# private dev folder
dev/*

Expand Down
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
# Changelog
- Minor improvements to the DE CO2 constraint
- Added an option to source industry energy demand from UBA MWMS (Projektionsbericht 2025) for the years 2025-2035
- renamed some scripts
- Bugfix: Enforce stricter power import limit to avoid that import from one country compensate from exports to another
- Bugfix: Enforce stricter H2 derivative import limit to avoid that exports of one type of derivative compensate for imports of another
- Added an option to source mobility demand from UBA MWMS (Projektionsbericht 2025) for the years 2025-2035
- Renamed functions and script for exogenous mobility demand
Expand Down
Loading