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

Ariadne2 #1223

Draft
wants to merge 259 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
259 commits
Select commit Hold shift + click to select a range
2807811
correctly source the existing heating technologies for buildings
nworbmot Jan 29, 2024
720b0e7
Merge branch 'ariadne2' of github.com:PyPSA/pypsa-eur into ariadne2
nworbmot Jan 29, 2024
8db5603
for existing heating use new default_heating_lifetime
nworbmot Jan 29, 2024
879e94c
add new default to overdimension heating in individual buildings
nworbmot Jan 29, 2024
29e0978
separate domestic and international aviation
nworbmot Jan 29, 2024
b1ba64a
add colours for domestic and international aviation
nworbmot Jan 29, 2024
e9be203
fix whitespace
lindnemi Jan 30, 2024
16ff6c5
changes to allow german chp plants to be added as custom powerplant .csv
toniseibold Jan 31, 2024
87f3152
merge with ariadne2 branch
toniseibold Jan 31, 2024
8ed9981
mock snakemake for pypsa-eur as submodule
toniseibold Jan 31, 2024
9bd9135
minor revert
toniseibold Jan 31, 2024
07430b0
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jan 31, 2024
276a79c
Revert "add colours for domestic and international aviation"
nworbmot Feb 1, 2024
dcae9e1
Revert "separate domestic and international aviation"
nworbmot Feb 1, 2024
cc299f9
pre-commit formatting [no ci]
fneum Feb 2, 2024
7c0c843
update git-blame-ignore-revs to exclude autoformat
fneum Feb 2, 2024
2c67142
add KWKs with the corresponding efficiencies from Triebs et al.
toniseibold Feb 1, 2024
747dd52
cluster_gas_network: generalise so it can be used elsewhere
fneum Jan 22, 2024
5880642
allow mock_snakemake to run in submodule setup
fneum Feb 5, 2024
f1420e6
lossy_bidirectional_links: allow to specify subset of links
fneum Feb 5, 2024
19e9867
minor change to use the custom_powerplants parameters
toniseibold Feb 6, 2024
c00390e
Merge branch 'master' into ariadne2
fneum Feb 7, 2024
f124520
add logs to plot_*_network rules
fneum Feb 7, 2024
70f4f1d
fix wrong merge decision - code block was removed on purpose
fneum Feb 7, 2024
e2bd392
implement statistics post processing for csv creation and plotting.
p-glaum Feb 9, 2024
5718877
Merge branch 'master' of github.com:PyPSA/pypsa-eur into improve-plot…
p-glaum Feb 9, 2024
9c19451
Merge branch 'ariadne2' into de_chp
fneum Feb 9, 2024
1d77dc0
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Feb 9, 2024
b67b025
bugfix: coal emissions for industry weren't tracked
nworbmot Feb 9, 2024
df1e273
limit changes to add_existing_baseyear
fneum Feb 9, 2024
53a0cc8
Merge branch 'de_chp' of github.com:PyPSA/pypsa-eur into de_chp
fneum Feb 9, 2024
6dbb395
bugfix: make sure coal demand is there with regional demand
nworbmot Feb 9, 2024
03e82d8
MaStR CHP revision
fneum Feb 10, 2024
53e52ba
Merge branch 'ariadne2' into de_chp
fneum Feb 10, 2024
3553685
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Feb 10, 2024
ba11c2b
add release note and documentation
p-glaum Feb 12, 2024
5b2cbcd
change statistics script name
p-glaum Feb 12, 2024
4702f69
simplify statistics plotting
p-glaum Feb 12, 2024
0e734fd
improve and clean-up statistic plots
p-glaum Feb 12, 2024
d537f67
Merge remote-tracking branch 'upstream/master' into improve-plotting-…
p-glaum Feb 12, 2024
b3ab9bb
revert changes in STATISTICS_BARPLOTS
p-glaum Feb 12, 2024
b300681
bugfix: include all countries in ammonia production resource
nworbmot Feb 12, 2024
882d52f
bugfix: correct units of subtracted chlorine and methanol
nworbmot Feb 12, 2024
cdbe0f5
cluster nice names as well
lindnemi Feb 13, 2024
0baeaaa
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Feb 13, 2024
13cff1e
for today's industry energy demand, separate MeOH, Cl and HVC
nworbmot Feb 14, 2024
13412fd
industrial prod: use EU28 total for denominator for distribution key
nworbmot Feb 14, 2024
958dacb
use production to determine today's energy demand for basic chemicals
nworbmot Feb 14, 2024
51a7589
including oil and waste CHPs
toniseibold Feb 14, 2024
6a65cf9
new script to interpolate industry sector ratios today to tomorrow
nworbmot Feb 14, 2024
bca2700
Oil CHPs are now also added to heating sector
toniseibold Feb 15, 2024
11bac2e
Merge pull request #928 from PyPSA/fix_nice_name
lindnemi Feb 15, 2024
bf0c1ec
Merge branch 'improve-plotting-routine' of github.com:p-glaum/pypsa-e…
nworbmot Feb 15, 2024
e7b5a0b
plot_statistics_single: fix read csv file when file had only single e…
p-glaum Feb 15, 2024
e7fdd8e
Merge branch 'improve-plotting-routine' of github.com:p-glaum/pypsa-e…
nworbmot Feb 16, 2024
2dfca6e
Merge branch 'ariadne2' of github.com:PyPSA/pypsa-eur into ariadne2
nworbmot Feb 16, 2024
9ae6463
filter for German industry CHP moved to add_existing_baseyear.py
toniseibold Feb 16, 2024
6c34be0
Merge branch 'scenario-management' of github.com:PyPSA/pypsa-eur into…
nworbmot Feb 19, 2024
c86d2ea
update build_existing_heating_distribution for scenario management
nworbmot Feb 19, 2024
10c0e16
bug fixing
toniseibold Feb 20, 2024
a460ea5
bug fix chp DateOut query
toniseibold Feb 20, 2024
51f394e
improvement of DateOut query for chps
toniseibold Feb 20, 2024
655bc85
adding biomass boilers to existing base network
toniseibold Feb 27, 2024
73dcadf
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Feb 27, 2024
d9116c8
Update scripts/add_existing_baseyear.py
fneum Mar 5, 2024
9203081
Merge pull request #951 from PyPSA/biomass_boilers
fneum Mar 5, 2024
fb85891
change technology data version to 0.8.1
lisazeyen Feb 28, 2024
d4c3e6e
compute lifetime after grouping DateIn
lindnemi Mar 5, 2024
179ff06
add grouping years 1960-1975
lindnemi Mar 5, 2024
1a3181d
merge master
fneum Mar 11, 2024
72ef2d0
Merge branch 'ariadne2' into de_chp
toniseibold Mar 14, 2024
dd0176d
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Mar 14, 2024
572ce18
Update scripts/add_existing_baseyear.py
fneum Mar 14, 2024
b7cec1b
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Mar 14, 2024
d50e713
group existing capacities to the earlier grouping_year for consistenc…
lindnemi Mar 14, 2024
ed4416c
add more grouping years to avoid errors
lindnemi Mar 14, 2024
7ff3b87
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Mar 14, 2024
b1dc976
provide Path object as input to ConfigSettings
lindnemi Mar 26, 2024
4c9243d
Fill in missing eurostat data on domestic aviation energy demand
koen-vg Mar 18, 2024
321075e
fail early on warning
lindnemi Apr 3, 2024
3a736ba
more memory for simplify_network
lindnemi Apr 3, 2024
9c62755
remove name to fix key error
lindnemi Apr 3, 2024
a93fbcd
Revert "Fill in missing eurostat data on domestic aviation energy dem…
lindnemi Apr 3, 2024
b87d9bf
snakefile: move copy_default_files and process_run_config to helpers
FabianHofmann Mar 19, 2024
49b28ee
snakefile + helpers: separate scenario and rdir getter
FabianHofmann Mar 19, 2024
61831e3
Snakefile: reinsert shutil and os functions
FabianHofmann Mar 19, 2024
fbd5852
initial implementation
p-glaum Apr 10, 2024
48929e8
move prefix from Snakefile to get_dir function
p-glaum Apr 10, 2024
6459d8d
add check if minimum grouping year< min build year
lisazeyen Apr 11, 2024
0bfd44a
adjust valid_grouping_years
lisazeyen Apr 11, 2024
13245c3
Add release note for serendipitous bugfix
lindnemi Apr 11, 2024
797e812
rename _intervals to _years, shorten definition
lisazeyen Apr 11, 2024
b0d9828
define active assets consitently
lisazeyen Apr 11, 2024
9968ad9
Merge branch 'ariadne2' into reform-existing-grouping-year-logic
lisazeyen Apr 11, 2024
ca47b3e
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Apr 11, 2024
6334f3f
Merge pull request #967 from PyPSA/reform-existing-grouping-year-logic
lisazeyen Apr 11, 2024
8ed006a
allow different aviation growth factors for each investment year
toniseibold Apr 15, 2024
de93326
scaling of land transport
toniseibold Apr 15, 2024
de60ac2
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Apr 15, 2024
006730e
raise Exception if scenario file is empty
lindnemi Apr 15, 2024
bef81a2
fill nan for case of industry exclusion; adapt bus names to handle ga…
cpschau Apr 15, 2024
25b03fc
Warning instead of Exception
lindnemi Apr 15, 2024
9219cb9
no gas boiler expansion before 2024
cpschau Apr 15, 2024
c9e1dff
writing documentation and release notes
toniseibold Apr 16, 2024
bab4555
Merge branch 'transport_growth' of https://github.com/PyPSA/pypsa-eur…
toniseibold Apr 16, 2024
4a136d5
Merge branch 'master' of https://github.com/PyPSA/pypsa-eur into tran…
toniseibold Apr 16, 2024
df6707d
adjusted CHP indices to avoid NaN efficiencies; removed gas boiler re…
cpschau Apr 17, 2024
d90f395
patch from @pglaum
lindnemi Apr 17, 2024
77ff7df
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Apr 17, 2024
ad40779
Merge branch 'master' into ariadne2
lindnemi Apr 17, 2024
7fd9014
fix biogas and biomass
lindnemi Apr 17, 2024
69ecf05
Merge branch 'ariadne2' into transport_growth
lindnemi Apr 19, 2024
3367963
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Apr 19, 2024
3d49935
Merge branch 'ariadne2' into transport_growth
lindnemi Apr 19, 2024
ae7948a
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Apr 19, 2024
bb4ebed
Merge pull request #1026 from PyPSA/transport_growth
lindnemi Apr 19, 2024
a4dc874
allow excluding files from shared_resources
toniseibold May 3, 2024
911f75e
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] May 3, 2024
8439d59
documentation
toniseibold May 3, 2024
ccbefe2
rearrange config settings under 'run: shared_resources:'
fneum May 13, 2024
01eba77
extend release notes [no ci]
fneum May 13, 2024
8a45e66
Merge pull request #1050 from PyPSA/exclude_shared_resources
fneum May 13, 2024
16b3175
fix missed renaming of mode to policy
fneum May 13, 2024
65826d4
Merge branch 'ariadne2' into de_chp
lindnemi May 13, 2024
6c95595
Merge branch 'ariadne2' into de_chp
lindnemi May 13, 2024
1e4aa63
Merge branch 'ariadne2' into plot-statistics-fix
fneum May 13, 2024
02bd53f
Merge pull request #1032 from PyPSA/plot-statistics-fix
fneum May 13, 2024
cb8ee0d
Merge branch 'master' into ariadne2
lindnemi May 23, 2024
c11b17a
renaming only power generating biomass plants and moving the chps to …
toniseibold May 23, 2024
568b16e
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] May 23, 2024
dfb27b8
improve ordering of RuntimeErrors
lindnemi May 24, 2024
5d36ed7
Merge branch 'master' into ariadne2
lindnemi May 24, 2024
3ac586e
deleting acient code
toniseibold May 24, 2024
051bf57
Merge remote-tracking branch 'origin/ariadne2' into de_chp
lindnemi May 24, 2024
65153f5
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] May 24, 2024
0a227e5
Merge pull request #907 from PyPSA/de_chp
lindnemi May 24, 2024
962e5d4
Merge branch 'master' into ariadne2
lindnemi May 27, 2024
e922db4
resolve cherry-pick conflict
toniseibold Jun 4, 2024
4c97952
return to correct grouping year logic
lindnemi Jun 6, 2024
3331aca
fix chp lifetime
lindnemi Jun 6, 2024
12c6cfb
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jun 6, 2024
64ae378
fix infeasibility
lindnemi Jun 6, 2024
aacd736
revert hotfix for #1016
lindnemi Jun 7, 2024
71a0ab4
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jun 7, 2024
816b0c6
change warning
lindnemi Jun 7, 2024
6bceddb
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jun 7, 2024
b6dffc5
adjust comment
lindnemi Jun 7, 2024
6a9e929
set generator baseyear p_nom to p_nom_min
lindnemi Jun 7, 2024
f4f627c
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jun 7, 2024
1300dba
remove duplicated solid biomass
lisazeyen Jun 10, 2024
7fe2597
Merge pull request #1091 from PyPSA/fix-grouping-logic-again
lindnemi Jun 13, 2024
b6802a6
non-zero capital_cost for methanol stores
lindnemi Jun 14, 2024
f39f503
bugfix: correctly read threshold capacity in add_brownfield
fneum Jun 19, 2024
7de9aab
prepare_sector_network: add floating wind to update cost function
p-glaum Jun 17, 2024
7569ab5
make statistic plots ariadne compatible
p-glaum Jun 20, 2024
04f292c
Merge pull request #1113 from PyPSA/ariadne_2_statistic_plots
lindnemi Jun 24, 2024
115cc4f
rename EV battery
lindnemi Jun 25, 2024
7f30e98
add release note
lindnemi Jun 25, 2024
33ab85e
adjust tech colors
lindnemi Jun 26, 2024
11b42ea
fix for battery renaming in plot_summary
lindnemi Jun 27, 2024
f8c40ef
add steam generation config to source industry steam from biomass, hy…
toniseibold Jul 10, 2024
b479270
FT and electrolyis waste heat for DH as float
cpschau Jul 9, 2024
605069c
Add other waste heat technologies, and adjust share
cpschau Jul 9, 2024
8bc6e65
adjust parameters in config update from wildcards
cpschau Jul 9, 2024
13979e1
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jul 9, 2024
5f20c1e
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jul 10, 2024
a595308
cherry-pick waste heat
cpschau Jul 9, 2024
504105f
changing warning to error so demand in industry sector stays untouched
toniseibold Jul 11, 2024
0bd5959
Merge branch 'ariadne2' into fix_industry_sector
toniseibold Jul 11, 2024
aa29f3c
Merge pull request #1143 from PyPSA/fix_industry_sector
lindnemi Jul 12, 2024
5d12a3a
quick fix to allow optimization to run through
toniseibold Jul 17, 2024
15864a3
incorporating changes needed in pypsa-eur + bugfixing
toniseibold Jul 19, 2024
d6aaee8
Fix negative district heating progress (#1168)
amos-schledorn Jul 19, 2024
16bf5af
cutouts: update zenodo repository version
fneum Jul 22, 2024
2ccb580
Excluding Emissions from Sector Ratios Development (#1154)
toniseibold Jul 24, 2024
7df224a
Merge remote-tracking branch 'origin/master' into ariadne2
lindnemi Jul 26, 2024
42e980e
Merge branch 'ariadne2' into unravel_ch4
lindnemi Jul 26, 2024
d6fe119
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jul 26, 2024
b482efb
Merge pull request #1159 from PyPSA/unravel_ch4
lindnemi Jul 29, 2024
53e52a6
Add investment cost (#1156)
lindnemi Jul 30, 2024
ef5ded9
Future industry steam efficiencies (#1169)
toniseibold Jul 30, 2024
9a48545
only add oil buses with add_carrier_buses
nworbmot Aug 2, 2024
ae185dd
fix connection_overnight_cost computation
lindnemi Aug 2, 2024
6c75e34
add option to add energy losses and emissions for fuel refining
nworbmot Aug 2, 2024
fccf203
add release_note
lindnemi Aug 6, 2024
ad144ba
Merge pull request #1192 from PyPSA/refineries
lindnemi Aug 6, 2024
0d48005
adding regional gas demand (#1185)
toniseibold Aug 7, 2024
4e62419
retrieve: remove cutout protection (#1220)
FabianHofmann Aug 15, 2024
ae22717
modified environments to include tabula-py update and fixed PDF econd…
cpschau Aug 15, 2024
d1c5fc6
Master into ariadne2 august (#1245)
lindnemi Sep 3, 2024
9be0420
heuristically split existing biogas and solid biomass power plants
lindnemi Sep 4, 2024
a90249c
remove potential distinction for overnight; additional global constra…
cpschau Sep 3, 2024
c6349c1
prepare_sector_networks: account correctely for msw co2
p-glaum Sep 3, 2024
d52abb8
fix if condition to add msw
p-glaum Sep 3, 2024
7f6dc5e
add unsustainable generator suffix
cpschau Sep 4, 2024
d6dc33f
correct overnight_cost
lindnemi Sep 4, 2024
b81e1c2
bugfix: determine bus_carrier locally instead of overwriting n.stores
lindnemi Sep 5, 2024
854873e
added unsustainable solid biomass bus; changed global constraints to …
cpschau Sep 5, 2024
d1f55a8
restored equality constraint for sustainable solid biomass; restored …
cpschau Sep 5, 2024
ac2da05
remove directory change for debugger
cpschau Sep 5, 2024
4f51552
add color for unsustainable solid biomass
lindnemi Sep 6, 2024
85de8cc
reduce potential of gas network that can be retrofitted to H2 when ga…
toniseibold Sep 4, 2024
c22e9e7
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Sep 4, 2024
40e6a4b
adding comment
toniseibold Sep 5, 2024
9b4db60
chore: make overdim_factor heat-system-specific
amos-schledorn Sep 5, 2024
3c43aaa
update nep links to include "Startnetz" ("start network") links
p-glaum Sep 6, 2024
deb693b
mirror global energy monitor datasets (temporary)
fneum Sep 8, 2024
42f52ee
add read_excel engine for z1 cluster debugging
lindnemi Sep 10, 2024
f62ba1f
Follow-Up: Unsustainable Biomass (#1254)
cpschau Sep 8, 2024
651320e
Hot fix: Rename reindex transport costs for unsustainable biomass (#1…
cpschau Sep 10, 2024
29daa83
remove extra bus and link; remove redundant addition of oil carrier_bus
cpschau Sep 11, 2024
17041c5
Merge tag 'v0.13.0' into merge-0.13-into-ariadne2-september
lindnemi Sep 17, 2024
55cae27
fix merge mistake
lindnemi Sep 17, 2024
b731763
include uranium to carriers for which EU generator is created (#1303)
JulianGeis Sep 17, 2024
078c0be
updated build_year and project_status of transmission_projects
lindnemi Sep 17, 2024
620b507
fix escape sequence warning
lindnemi Sep 19, 2024
a52fe93
options: biosng_cc, biomass_to_liquid_cc, 98% capture rate Allam gas,…
fneum Sep 16, 2024
a02f283
follow-up to #1298
fneum Sep 16, 2024
8213a5b
remove unnecessary [-4:] from snakemake.wildcards.planning
fneum Sep 17, 2024
eed390a
add additional overnight_costs
lindnemi Sep 19, 2024
2d8a05d
myopic: ensure all links with capital costs have lifetime
fneum Sep 23, 2024
cfe425b
tech color for BTL CC
lindnemi Sep 23, 2024
8b6df9b
change btl cc and electrobiofuels colors
lindnemi Sep 23, 2024
1d91698
add accidentally deleted msw code back in
lindnemi Sep 25, 2024
749c88c
Remove sector_opts and duplicated CHP plants (#1328)
cpschau Sep 26, 2024
e2fdefb
remove duplicat code
lindnemi Sep 27, 2024
139dd0b
add NEP Netzverstärkung (#1332)
JulianGeis Sep 27, 2024
b6c024c
Ensure constraint is still correct with post discretization (#1342)
toniseibold Oct 2, 2024
c1f895b
merge
lindnemi Oct 7, 2024
c1c548c
remove simpl wildcard
lindnemi Oct 7, 2024
58a3879
no more cluster_bus
lindnemi Oct 7, 2024
c9edc58
aggregation of investment strategy
lindnemi Oct 7, 2024
0a6a20d
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Oct 7, 2024
3ab5e19
remove duplicate code
lindnemi Oct 9, 2024
3e3f36d
fix index of unsustainable bioliquids
lindnemi Oct 10, 2024
f608adb
update information of some TYNDP links
lindnemi Oct 14, 2024
7f9fb10
overwrite p_nom, s_nom for power lines with *nom_opt from previous pe…
lindnemi Oct 15, 2024
79a055a
build_transmission_project: fix bug which lead to duplicate links or …
p-glaum Oct 14, 2024
146ef6a
restore hack for inactive transmission projects
lindnemi Oct 15, 2024
9715e88
change precedence order of transmission projects
lindnemi Oct 17, 2024
d43ce53
Ariadne2 pypsa=0.31.0 (#1370)
lindnemi Oct 17, 2024
3a24836
Add heat buses and vents for all CHP locations (#1369)
cpschau Oct 21, 2024
466fc43
change linetype from Al/St 490/64 4-bundle 380.0 to HTLS 4-bundle 380…
JulianGeis Oct 23, 2024
fbb7c0c
add compression losses for gas transport (#1391)
JulianGeis Oct 24, 2024
879befb
tech-colors for gas primary and compressing
lindnemi Oct 24, 2024
facc631
Osm ariadne2 update (#1394)
lindnemi Oct 24, 2024
9630bb7
some more madd -> add
lindnemi Oct 30, 2024
06b1d77
Addressing edge case of already existing chp capacities (#1401)
toniseibold Oct 31, 2024
778b60f
bugfix: correct co2 intensity of unsustainable bioliquids
lindnemi Nov 6, 2024
8a59781
bugfix: correct historical boiler efficiencies
lindnemi Nov 18, 2024
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
18 changes: 10 additions & 8 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ exclude: "^LICENSES"

repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.6.0
rev: v5.0.0
hooks:
- id: check-merge-conflict
- id: end-of-file-fixer
Expand Down Expand Up @@ -37,12 +37,14 @@ repos:
types_or: [python, rst, markdown]
files: ^(scripts|doc)/

# Make docstrings PEP 257 compliant
- repo: https://github.com/PyCQA/docformatter
rev: v1.7.5
hooks:
- id: docformatter
args: ["--in-place", "--make-summary-multi-line", "--pre-summary-newline"]
# Make docstrings PEP 257 compliant
# Broken for pre-commit<=4.0.0
# See https://github.com/PyCQA/docformatter/issues/293
# - repo: https://github.com/PyCQA/docformatter
# rev: v1.7.5
# hooks:
# - id: docformatter
# args: ["--in-place", "--make-summary-multi-line", "--pre-summary-newline"]

- repo: https://github.com/keewis/blackdoc
rev: v0.3.9
Expand All @@ -51,7 +53,7 @@ repos:

# Formatting with "black" coding style
- repo: https://github.com/psf/black-pre-commit-mirror
rev: 24.8.0
rev: 24.10.0
hooks:
# Format Python files
- id: black
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ SPDX-License-Identifier: CC-BY-4.0
![Size](https://img.shields.io/github/repo-size/pypsa/pypsa-eur)
[![Zenodo PyPSA-Eur](https://zenodo.org/badge/DOI/10.5281/zenodo.3520874.svg)](https://doi.org/10.5281/zenodo.3520874)
[![Zenodo PyPSA-Eur-Sec](https://zenodo.org/badge/DOI/10.5281/zenodo.3938042.svg)](https://doi.org/10.5281/zenodo.3938042)
[![Snakemake](https://img.shields.io/badge/snakemake-≥7.7.0-brightgreen.svg?style=flat)](https://snakemake.readthedocs.io)
[![Snakemake](https://img.shields.io/badge/snakemake-≥8.14.0-brightgreen.svg?style=flat)](https://snakemake.readthedocs.io)
[![REUSE status](https://api.reuse.software/badge/github.com/pypsa/pypsa-eur)](https://api.reuse.software/info/github.com/pypsa/pypsa-eur)
[![Stack Exchange questions](https://img.shields.io/stackexchange/stackoverflow/t/pypsa)](https://stackoverflow.com/questions/tagged/pypsa)

Expand Down
50 changes: 39 additions & 11 deletions config/config.default.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -84,9 +84,9 @@ co2_budget:

# docs in https://pypsa-eur.readthedocs.io/en/latest/configuration.html#electricity
electricity:
voltages: [200., 220., 300., 380., 500., 750.]
voltages: [220., 300., 330., 380., 400., 500., 750.]
base_network: osm-prebuilt
osm-prebuilt-version: 0.4
osm-prebuilt-version: 0.5
gaslimit_enable: false
gaslimit: false
co2limit_enable: false
Expand Down Expand Up @@ -278,10 +278,11 @@ conventional:
# docs in https://pypsa-eur.readthedocs.io/en/latest/configuration.html#lines
lines:
types:
200.: "Al/St 240/40 2-bundle 200.0"
220.: "Al/St 240/40 2-bundle 220.0"
300.: "Al/St 240/40 3-bundle 300.0"
330.: "Al/St 240/40 3-bundle 300.0"
380.: "Al/St 240/40 4-bundle 380.0"
400.: "Al/St 240/40 4-bundle 380.0"
500.: "Al/St 240/40 4-bundle 380.0"
750.: "Al/St 560/50 4-bundle 750.0"
s_max_pu: 0.7
Expand Down Expand Up @@ -309,9 +310,9 @@ links:
transmission_projects:
enable: true
include:
tyndp2020: true
nep: true
manual: true
tyndp2020: true
skip:
- upgraded_lines
- upgraded_links
Expand Down Expand Up @@ -456,7 +457,7 @@ sector:
2050: 1.0
district_heating_loss: 0.15
supply_temperature_approximation:
max_forward_temperature:
max_forward_temperature_baseyear:
FR: 110
DK: 75
DE: 109
Expand All @@ -465,13 +466,14 @@ sector:
PL: 130
SE: 102
IT: 90
min_forward_temperature:
min_forward_temperature_baseyear:
DE: 82
return_temperature:
return_temperature_baseyear:
DE: 58
lower_threshold_ambient_temperature: 0
upper_threshold_ambient_temperature: 10
rolling_window_ambient_temperature: 72
relative_annual_temperature_reduction: 0.01
heat_source_cooling: 6 #K
heat_pump_cop_approximation:
refrigerant: ammonia
Expand Down Expand Up @@ -566,6 +568,7 @@ sector:
shipping_methanol_efficiency: 0.46
shipping_oil_efficiency: 0.40
aviation_demand_factor: 1.
land_transport_demand_factor: 1.
HVC_demand_factor: 1.
time_dep_hp_cop: true
heat_pump_sink_T_individual_heating: 55.
Expand Down Expand Up @@ -682,6 +685,7 @@ sector:
efficiency_static: 0.97
H2_network: true
gas_network: false
regional_gas_demand: false
H2_retrofit: false
H2_retrofit_capacity_per_CH4: 0.6
gas_network_connectivity_upgrade: 1
Expand Down Expand Up @@ -767,6 +771,9 @@ industry:
#2020 recycling rates based on Agora https://static.agora-energiewende.de/fileadmin/Projekte/2021/2021_02_EU_CEAP/A-EW_254_Mobilising-circular-economy_study_WEB.pdf
#fractions refer to the total primary HVC production in 2020
#assumes 6.7 Mtplastics produced from recycling in 2020
steam_biomass_fraction: 1.0
steam_hydrogen_fraction: 0
steam_electricity_fraction: 0
HVC_primary_fraction:
2020: 1.0
2025: 0.9
Expand Down Expand Up @@ -816,7 +823,7 @@ industry:
hotmaps_locate_missing: false
reference_year: 2019
oil_refining_emissions: 0.013

gas_compression_losses: 0.04

# docs in https://pypsa-eur.readthedocs.io/en/latest/configuration.html#costs
costs:
Expand All @@ -832,7 +839,7 @@ costs:
lifetime: 25
"CO2 intensity": 0
"discount rate": 0.07
# Marginal and capital costs can be overwritten
# Marginal and capital costs, as well as investments can be overwritten
# capital_cost:
# onwind: 500
marginal_cost:
Expand Down Expand Up @@ -869,6 +876,14 @@ clustering:
committable: any
ramp_limit_up: max
ramp_limit_down: max
investment: mean
overnight_cost: mean
connection_overnight_cost: mean
lines:
overnight_cost: mean
one_ports:
overnight_cost: mean

temporal:
resolution_elec: false
resolution_sector: false
Expand Down Expand Up @@ -1020,6 +1035,13 @@ plotting:
energy_max: 20000
energy_min: -20000
energy_threshold: 50.
countries:
- all
carriers:
- electricity
- heat
carrier_groups:
electricity: [AC, low_voltage]

nice_names:
OCGT: "Open-Cycle Gas"
Expand Down Expand Up @@ -1086,6 +1108,8 @@ plotting:
services urban decentral gas boiler: '#ba8947'
urban central gas boiler: '#b0904f'
gas: '#e05b09'
gas primary: '#e05b09'
gas compressing: '#e05b09'
fossil gas: '#e05b09'
natural gas: '#e05b09'
biogas to gas: '#e36311'
Expand All @@ -1102,7 +1126,7 @@ plotting:
# oil
oil: '#c9c9c9'
oil primary: '#d2d2d2'
oil refining: '#e6e6e6'
oil refining: '#a6a6a6'
imported oil: '#a3a3a3'
oil boiler: '#adadad'
residential rural oil boiler: '#a9a9a9'
Expand Down Expand Up @@ -1139,16 +1163,18 @@ plotting:
solid biomass for industry co2 from atmosphere: '#736412'
solid biomass for industry co2 to stored: '#47411c'
urban central solid biomass CHP: '#9d9042'
solid biomass OP: '#9d9042'
urban central solid biomass CHP CC: '#6c5d28'
biomass boiler: '#8A9A5B'
residential rural biomass boiler: '#a1a066'
residential urban decentral biomass boiler: '#b0b87b'
services rural biomass boiler: '#c6cf98'
services urban decentral biomass boiler: '#dde5b5'
biomass to liquid: '#32CD32'
biomass to liquid CC: '#32DDD2'
unsustainable solid biomass: '#998622'
unsustainable bioliquids: '#32CD32'
electrobiofuels: 'red'
electrobiofuels: '#de4060'
BioSNG: '#123456'
solid biomass to hydrogen: '#654321'
# power transmission
Expand Down Expand Up @@ -1229,6 +1255,8 @@ plotting:
Ambient: '#98eb9d'
CHP: '#8a5751'
urban central gas CHP: '#8d5e56'
urban central lignite CHP: '#8d5e56'
urban central coal CHP: '#8d5e56'
CHP CC: '#634643'
urban central gas CHP CC: '#6e4e4c'
CHP heat: '#8a5751'
Expand Down
41 changes: 20 additions & 21 deletions data/transmission_projects/manual/new_links.csv
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,21 +1,20 @@
,bus0,bus1,length,p_nom,project_status,tags,x0,y0,x1,y1
TYNDP2018_154,Exeter (UK),Menuel (FR),220,1400,in_permitting,"{name:France-Alderney-Britain, url:https://tyndp.entsoe.eu/tyndp2018/projects/projects/153}",-3.533899,50.718412,-1.469216,49.509594
TYNDP2018_25,Tourbe (FR),Chilling (GB),247.2,1000,under_construction,"{name:IFA2, url:https://tyndp.entsoe.eu/tyndp2018/projects/projects/25]",-0.172042,49.083593,-1.277269,50.839338
TYNDP2018_285,Kingsnorth (UK),Warande (FR),160,1400,in_permitting,"{name:Gridlink, url:https://tyndp.entsoe.eu/tyndp2018/projects/projects/285}",0.596111111111111,51.41972,2.376776,51.034368
TYNDP2018_190,Simadalen (NO),Peterhead (UK),650,1400,in_permitting,"{name:NorthConnect, url:https://tyndp.entsoe.eu/tyndp2018/projects/projects/190}",7.16027,60.500527,-1.784066,57.508123
TYNDP2018_16,Gatica (ES),Cubnezais (FR),370,2200,in_permitting,"{name:Biscay Gulf, url:https://tyndp.entsoe.eu/tyndp2018/projects/projects/16}",-2.867,43.367,-0.408943,45.074191
TYNDP2018_21,Piossasco (IT),Grand Ile (FR),190,1000,under_construction,"{name:Italy-France, url:https://tyndp.entsoe.eu/tyndp2018/projects/projects/21}",7.468,44.9898,6.045,45.472
TYNDP2022_286,Waterford (IE),Pembroke (UK),180,500,under_construction,"{name:Greenlink,url:{name:TYNDP2022_286,url:https://tyndp2022-project-platform.azurewebsites.net/projectsheets/transmission/286}}",-6.987,52.26,-4.986,51.686
TYNDP2024_1134,Bordeaux (FR),Nantes (FR),312,640,under_consideration,"{name:GiLA,url:{name:TYNDP2024_1134,url:https://eepublicdownloads.blob.core.windows.net/public-cdn-container/tyndp-documents/TYNDP2024/240220_TYNDP2024_project_portfolio.xlsx}}",-1.209,46.901,-0.576,44.96
TYNDP2024_1157,Milan (IT),Viterbo (IT),500,2000,in_permitting,"{name:HG North Tyrrhenian Corridor,url:{name:TYNDP2024_1157,url:https://eepublicdownloads.blob.core.windows.net/public-cdn-container/tyndp-documents/TYNDP2024/240220_TYNDP2024_project_portfolio.xlsx}}",9.409,45.553,12.015,42.244
TYNDP2024_1166,Ferrara (IT),Foggia (IT),582,2000,in_permitting,"{name:HG Adriatic Corridor,url:{name:TYNDP2024_1166,url:https://eepublicdownloads.blob.core.windows.net/public-cdn-container/tyndp-documents/TYNDP2024/240220_TYNDP2024_project_portfolio.xlsx}}",11.661,44.855,15.55,41.513
TYNDP2024_1169,Fioumesanto (IT),Montalto (IT),390,1000,in_permitting,"{name:SAPEI 2,url:{name:TYNDP2024_1169,url:https://eepublicdownloads.blob.core.windows.net/public-cdn-container/tyndp-documents/TYNDP2024/240220_TYNDP2024_project_portfolio.xlsx}}",8.283,40.79,11.602,42.331
TYNDP2024_1168,Rossano (IT),Latina (IT),496,2000,in_permitting,"{name:HG Ionian-Tyrrhenian Corridor,url:{name:TYNDP2024_1168,url:https://eepublicdownloads.blob.core.windows.net/public-cdn-container/tyndp-documents/TYNDP2024/240220_TYNDP2024_project_portfolio.xlsx}}",16.629,39.568,12.779,41.43
TYNDP2024_1168_1,Rossano (IT),Catania (IT),330,2000,in_permitting,"{name:HG Ionian-Tyrrhenian Corridor 2,url:{name:TYNDP2024_1168_1,url:https://eepublicdownloads.blob.core.windows.net/public-cdn-container/tyndp-documents/TYNDP2024/240220_TYNDP2024_project_portfolio.xlsx}}",16.629,39.568,15.049,37.408
TYNDP2024_1192,Fetteresso (UK),Emden (DE),800,2000,under_consideration,"{name:Germany-UK Hybrid Interconnector,url:{name:TYNDP2024_1192,url:https://eepublicdownloads.blob.core.windows.net/public-cdn-container/tyndp-documents/TYNDP2024/240220_TYNDP2024_project_portfolio.xlsx}}",-2.383,56.991,7.207,53.376
TYNDP2024_1197,Hornsea (UK),Moerdijk (NL),460,1200,under_consideration,"{name:NU-Link Interconnector,url:{name:TYNDP2024_1197,url:https://eepublicdownloads.blob.core.windows.net/public-cdn-container/tyndp-documents/TYNDP2024/240220_TYNDP2024_project_portfolio.xlsx}}",-0.261,53.655,4.586,51.661
TYNDP2024_1210,La Farga (ES),La Spezia (IT),725,2091,under_consideration,"{name:APOLLO-LINK,url:{name:TYNDP2024_1210,url:https://eepublicdownloads.blob.core.windows.net/public-cdn-container/tyndp-documents/TYNDP2024/240220_TYNDP2024_project_portfolio.xlsx}}",2.883,42.062,9.884,44.107
TYNDP2024_1211,Lubmin (DE),Sindi (EE),960,2000,under_consideration,"{name:Baltic WindConnector (BWC),url:{name:TYNDP2024_1211,url:https://eepublicdownloads.blob.core.windows.net/public-cdn-container/tyndp-documents/TYNDP2024/240220_TYNDP2024_project_portfolio.xlsx}}",13.686,54.139,24.671903,58.429161
TYNDP2024_1216,Constanta (RO),Albertirsa (HU),930,2500,under_consideration,"{name:High-Voltage Direct Current Interconnector Project Romania-Hungary,url:{name:TYNDP2024_1216,url:https://eepublicdownloads.blob.core.windows.net/public-cdn-container/tyndp-documents/TYNDP2024/240220_TYNDP2024_project_portfolio.xlsx}}",28.588,44.201,19.584,47.224
TYNDP2024_1229,Ovelgönne (DE),Marxheim (DE),433,4000,in_permitting,"{name:Rhine-Main-Link,url:{name:TYNDP2024_1229,url:https://eepublicdownloads.blob.core.windows.net/public-cdn-container/tyndp-documents/TYNDP2024/240220_TYNDP2024_project_portfolio.xlsx}}",8.379,53.315,8.435,50.078
TYNDP2024_1231,Arachthos (GR),Ottenhofen (DE),600,3000,under_consideration,"{name:Green Aegean Interconnector,url:{name:TYNDP2024_1231,url:https://eepublicdownloads.blob.core.windows.net/public-cdn-container/tyndp-documents/TYNDP2024/240220_TYNDP2024_project_portfolio.xlsx}}",20.967,39.185,11.868,48.207
,bus0,bus1,length,p_nom,project_status,build_year,tags,x0,y0,x1,y1
TYNDP2024_153,Exeter (UK),Menuel (FR),220,1250,in_permitting,2031,"{name:France-Alderney-Britain,url:https://eepublicdownloads.blob.core.windows.net/public-cdn-container/tyndp-documents/TYNDP2024/240220_TYNDP2024_project_portfolio.xlsx}",-3.533899,50.718412,-1.469216,49.509594
TYNDP2018_25,Tourbe (FR),Chilling (GB),247.2,1000,completed,2021,"{name:IFA2, url:https://en.wikipedia.org/wiki/IFA-2]",-0.172042,49.083593,-1.277269,50.839338
TYNDP2024_285,Kingsnorth (UK),Warande (FR),158,1250,in_permitting,2030,"{name:Gridlink, url:https://eepublicdownloads.blob.core.windows.net/public-cdn-container/tyndp-documents/TYNDP2024/240220_TYNDP2024_project_portfolio.xlsx}",0.596111111111111,51.41972,2.376776,51.034368
TYNDP2024_16,Gatica (ES),Cubnezais (FR),370,2000,under_construction,2028,"{name:Biscay Gulf, url:https://eepublicdownloads.blob.core.windows.net/public-cdn-container/tyndp-documents/TYNDP2024/240220_TYNDP2024_project_portfolio.xlsx}",-2.867,43.367,-0.408943,45.074191
TYNDP2018_21,Piossasco (IT),Grand Ile (FR),190,1000,completed,2023,"{name:Italy-France, url:https://www.terna.it/en/projects/projects-common-interest/italy-france-electrical-interconnection}",7.468,44.9898,6.045,45.472
TYNDP2022_286,Waterford (IE),Pembroke (UK),180,500,under_construction,2025,"{name:Greenlink,url:https://www.greenlink.ie/faqs}",-6.987,52.26,-4.986,51.686
TYNDP2024_1134,Bordeaux (FR),Nantes (FR),312,640,under_consideration,2032,"{name:GiLA,url:{name:TYNDP2024_1134,url:https://eepublicdownloads.blob.core.windows.net/public-cdn-container/tyndp-documents/TYNDP2024/240220_TYNDP2024_project_portfolio.xlsx}}",-1.209,46.901,-0.576,44.96
TYNDP2024_1157,Milan (IT),Viterbo (IT),500,2000,in_permitting,2030,"{name:HG North Tyrrhenian Corridor,url:{name:TYNDP2024_1157,url:https://eepublicdownloads.blob.core.windows.net/public-cdn-container/tyndp-documents/TYNDP2024/240220_TYNDP2024_project_portfolio.xlsx}}",9.409,45.553,12.015,42.244
TYNDP2024_1166,Ferrara (IT),Foggia (IT),582,2000,in_permitting,2036,"{name:HG Adriatic Corridor,url:{name:TYNDP2024_1166,url:https://eepublicdownloads.blob.core.windows.net/public-cdn-container/tyndp-documents/TYNDP2024/240220_TYNDP2024_project_portfolio.xlsx}}",11.661,44.855,15.55,41.513
TYNDP2024_1169,Fioumesanto (IT),Montalto (IT),390,1000,in_permitting,2040,"{name:SAPEI 2,url:{name:TYNDP2024_1169,url:https://eepublicdownloads.blob.core.windows.net/public-cdn-container/tyndp-documents/TYNDP2024/240220_TYNDP2024_project_portfolio.xlsx}}",8.283,40.79,11.602,42.331
TYNDP2024_1168,Rossano (IT),Latina (IT),496,2000,in_permitting,2035,"{name:HG Ionian-Tyrrhenian Corridor,url:{name:TYNDP2024_1168,url:https://eepublicdownloads.blob.core.windows.net/public-cdn-container/tyndp-documents/TYNDP2024/240220_TYNDP2024_project_portfolio.xlsx}}",16.629,39.568,12.779,41.43
TYNDP2024_1168_1,Rossano (IT),Catania (IT),330,2000,in_permitting,2035,"{name:HG Ionian-Tyrrhenian Corridor 2,url:{name:TYNDP2024_1168_1,url:https://eepublicdownloads.blob.core.windows.net/public-cdn-container/tyndp-documents/TYNDP2024/240220_TYNDP2024_project_portfolio.xlsx}}",16.629,39.568,15.049,37.408
TYNDP2024_1192,Fetteresso (UK),Emden (DE),800,2000,under_consideration,2033,"{name:Germany-UK Hybrid Interconnector,url:{name:TYNDP2024_1192,url:https://eepublicdownloads.blob.core.windows.net/public-cdn-container/tyndp-documents/TYNDP2024/240220_TYNDP2024_project_portfolio.xlsx}}",-2.383,56.991,7.207,53.376
TYNDP2024_1197,Hornsea (UK),Moerdijk (NL),460,1200,under_consideration,2031,"{name:NU-Link Interconnector,url:{name:TYNDP2024_1197,url:https://eepublicdownloads.blob.core.windows.net/public-cdn-container/tyndp-documents/TYNDP2024/240220_TYNDP2024_project_portfolio.xlsx}}",-0.261,53.655,4.586,51.661
TYNDP2024_1210,La Farga (ES),La Spezia (IT),725,2091,under_consideration,2032,"{name:APOLLO-LINK,url:{name:TYNDP2024_1210,url:https://eepublicdownloads.blob.core.windows.net/public-cdn-container/tyndp-documents/TYNDP2024/240220_TYNDP2024_project_portfolio.xlsx}}",2.883,42.062,9.884,44.107
TYNDP2024_1211,Lubmin (DE),Sindi (EE),960,2000,under_consideration,2037,"{name:Baltic WindConnector (BWC),url:{name:TYNDP2024_1211,url:https://eepublicdownloads.blob.core.windows.net/public-cdn-container/tyndp-documents/TYNDP2024/240220_TYNDP2024_project_portfolio.xlsx}}",13.686,54.139,24.671903,58.429161
TYNDP2024_1216,Constanta (RO),Albertirsa (HU),930,2500,under_consideration,2030,"{name:High-Voltage Direct Current Interconnector Project Romania-Hungary,url:{name:TYNDP2024_1216,url:https://eepublicdownloads.blob.core.windows.net/public-cdn-container/tyndp-documents/TYNDP2024/240220_TYNDP2024_project_portfolio.xlsx}}",28.588,44.201,19.584,47.224
TYNDP2024_1229,Ovelgönne (DE),Marxheim (DE),433,4000,in_permitting,2035,"{name:Rhine-Main-Link,url:{name:TYNDP2024_1229,url:https://eepublicdownloads.blob.core.windows.net/public-cdn-container/tyndp-documents/TYNDP2024/240220_TYNDP2024_project_portfolio.xlsx}}",8.379,53.315,8.435,50.078
TYNDP2024_1231,Arachthos (GR),Ottenhofen (DE),600,3000,under_consideration,2035,"{name:Green Aegean Interconnector,url:{name:TYNDP2024_1231,url:https://eepublicdownloads.blob.core.windows.net/public-cdn-container/tyndp-documents/TYNDP2024/240220_TYNDP2024_project_portfolio.xlsx}}",20.967,39.185,11.868,48.207
Loading