forked from open-energy-transition/pypsa-eur
-
Notifications
You must be signed in to change notification settings - Fork 19
feat: introduce offshore wind hubs topology #54
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
Merged
Merged
Changes from 5 commits
Commits
Show all changes
181 commits
Select commit
Hold shift + click to select a range
1cf34a9
feat: skip tyndp_renewable_profile technologies in workflow and build…
daniel-rdt 3be60a1
feat: clean pecd data for years 2030, 2040, 2050 and build_renewable_…
daniel-rdt 9f0b674
feat: add pecd profiles as input to prepare_sector_network and add_br…
daniel-rdt c0ce59f
fix: add hotfix for add_existing_baseyear existing renewable capaciti…
daniel-rdt cabc766
fix: fix pylint
daniel-rdt 686df43
fix: fix pylint better
daniel-rdt 542668d
feat: introduce clean_tyndp_offshore_hubs
tgilon 66d69d6
doc: document newly added functions
tgilon 85dabff
feat: improve configuration based on master
tgilon eaefe8c
feat: define outputs
tgilon 8491dd2
feat: enable offshore hubs by default for tyndp configurations
tgilon 4162538
fix: add electricity param for add_existing_baseyear rule in perfect …
daniel-rdt 79526a7
feat: improve workflow implementation for more efficient execution of…
daniel-rdt ba5458d
fix: hotfix for add_brownfield p_max_pu until tyndp generators are ad…
daniel-rdt 81402fe
doc: add description of new configuration option to configtables
daniel-rdt c1fbe13
doc: add release note
daniel-rdt b684567
feat: add retrieval rule for PECD data from google drive until data o…
daniel-rdt c33f5a3
fix: fix ruleorder statement
daniel-rdt 16f9c16
fix: remove unneeded inputs to build_renewable_profiles_pecd and upda…
daniel-rdt df8e194
fix: set file outputs for retrieve_tyndp_bundle
tgilon 361e801
feat: assume non extendable links for missing data
tgilon f2d5aa3
fix: integrate new config for rule
tgilon 5328939
refactor: rename clean_tyndp_offshore_hubs to build_tyndp_offshore_hu…
tgilon d5bc7ea
doc: update license identifier
daniel-rdt 500082c
feat: update pecd retrieval to use gcp storage
daniel-rdt 1432a36
feat: WIP introduce offshore reference grid in the network (assuming …
tgilon 40b9f46
feat: switch to relative costs (EUR/kW and EUR/kW/a) and define a spe…
tgilon b140dce
feat: map AC nodes to H2 Z2 nodes for H2 offshore grid
tgilon 77defb1
doc: add basic release note
tgilon 1ac7f27
refactor: rename function to be tyndp specific
tgilon aea4eda
Merge remote-tracking branch 'origin/feat/49-pecd-offshore' into feat…
tgilon 540609e
Merge branch 'master' into feat/49-pecd-offshore
tgilon a9e1c1b
Merge remote-tracking branch 'origin/feat/49-pecd-offshore' into feat…
tgilon b474845
revert: revert change in default config
tgilon 24bb684
feat: build electrolysers data
tgilon c5297b1
feat: attach offshore electrolysers
tgilon d690318
refactor: switch functions
tgilon d9bc203
feat: build generators data
tgilon d3457ce
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] 48dcfba
feat: overwrite default lifetime assumptions with tyndp specific values
tgilon 2a94652
feat: generalize more make_index
tgilon 24d3a63
fix: adjust offshore radial locations
tgilon b0fd9a4
doc: update units info
tgilon 1847f21
feat: add offshore generators to the network (without potentials and …
tgilon 4ed7dcf
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] 80859e4
doc: detail GENERATOR approach
tgilon 8b68c3a
WIP feat: extend GENERATOR processing to take discrepancies into account
tgilon 65bdca5
WIP feat: refactor everything
tgilon 175d275
feat: extract both existing and potentials from layer and trajectorie…
tgilon 40f288f
doc: improve documentation of load_offshore_generators
tgilon e1582e4
feat: resolve discrepancy in DEOH002
tgilon 14f5615
feat: filter for selected countries
tgilon 08b497f
fix: take efficiency into account for h2-generating wind farms
tgilon 127af80
feat: attach PECD profiles to offwind generators
tgilon 4cdfe9d
refactor: use tyndp specific renewable carriers and differentiate bet…
daniel-rdt 4244dd3
Merge remote-tracking branch 'origin/feat/49-pecd-offshore' into feat…
daniel-rdt f2af81b
bugfix: include missing offshore node PECD data as empty columns and …
daniel-rdt 58f8040
feat: improve myopic approach, removing previous assets
tgilon cf11da3
bugfix: fix pylint and remove hydro from test config
daniel-rdt d84159f
bugfix: add existing res dependent on renewable carriers list
daniel-rdt e0635cb
feature: add 2050 pecd renewable profiles explicitly and filter for s…
daniel-rdt 1142216
feat: introduce a constraint to limit expansion of collocated technol…
tgilon 7b297a3
bugfix: fix params for add_existing_baseyear solve_perfect
daniel-rdt 7512f30
feat: add zone potential constraint
tgilon 8ef4449
Merge branch 'feat/49-pecd-offshore' into feat/48-offshore-hubs
tgilon fe8cb52
bugfix: change year in renewable profile pecd back to integer
daniel-rdt da90127
Merge branch 'feat/49-pecd-offshore' into feat/48-offshore-hubs
tgilon 96aef78
fix: address patches used to develop parallel features
tgilon ef313b3
fix: avoid adding an empty constraint
tgilon 1ff4a94
doc: adjust license identifier
tgilon 078afaf
fix: address pecd profiles mapping in add_brownfield
tgilon 1f540fd
refactor: refactor myopic approach for offshore assets
tgilon 8525b12
refactor: adjust nomenclature of offshore grid capacity
tgilon adaeb4c
refactor: filter radial nodes out of buses
tgilon ac94dfa
refactor: assign radially connected electrolysers to home market nodes
tgilon 396b363
fix: use tyndp data for electrolysers capital cost
tgilon 97e9970
refactor: improve radial nodes exclusions
tgilon 42bf3e3
fix: prevent filtering of grid data from expansion candidates
tgilon f552bd7
refactor: remove location from electrolysers
tgilon ae82b6b
refactor: change approach for nodes and locations in generators
tgilon cbb6c3c
Merge remote-tracking branch 'origin/master' into feat/48-offshore-hubs
tgilon cbba44a
feat: read pecd data using location
tgilon 7d6eb62
refactor: use bus instead of bus0 for generators
tgilon 41f0d86
fix: correct typo in h2 offshore grid
tgilon 3f3305d
fix: add country to rename for electrolysers
tgilon af67918
feat: improve constraint formulation to account for refactoring
tgilon 67c84ce
bugfix: fix year dimension for 2035 an 2045 steps
daniel-rdt cda01db
fix: adjust layer constraint to account for existing capacities
tgilon 02c784c
Merge branch 'feat/49-pecd-offshore' into feat/48-offshore-hubs
tgilon 3bf3eb7
Merge remote-tracking branch 'origin/master' into feat/49-pecd-offshore
tgilon 755a427
Merge remote-tracking branch 'origin/feat/49-pecd-offshore' into feat…
tgilon 27a698d
refactor: rename variables to align with the constraints standards
tgilon 74c8ef9
feat: introduce bin in index for compatibility with add_brownfield
tgilon 4df0c51
feat: add colors for new carriers
tgilon 061fec5
fix: remove OH nodes from the list used for distribution
tgilon 22d7834
Apply suggestions from code review
tgilon cd94850
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] da80a61
Apply suggestions from code review
tgilon fe4e9ed
feat: update the set of colors for the new technologies
tgilon 85f5220
refactor: change config name for offshore hubs (apply suggestion)
tgilon 0c7f022
doc: improve release note
tgilon 3c764a1
refactor: use unpack to define offshore inputs in prepare_sector_network
tgilon b5e19b2
refactor: make filter more explicit to exclude offshore grid in add_b…
tgilon 02ecdd9
fix: account for the shared potential of hydrogen- and electricity-ge…
tgilon e07e3df
fix: remove double counting of existing capacities
tgilon 9549604
fix: account for efficiency in existing for zonal constraint
tgilon 5862c1c
feat: resolve DEOH002 capacity mismatch in existing capacities
tgilon 1d09b5e
ci: revert temporary CO2 budget increase - tests now pass with origin…
tgilon b4b433b
doc: refine documentation of discrepancy in DEOH002
tgilon 7ae7e5e
doc: remove outdated documention from load_offshore_hubs
tgilon 7b6d619
refactor: replace generic RuntimeError with ValueError for invalid input
tgilon 35680ca
refactor: assign nyears before use
tgilon f821d60
fix: set offshore_zone_trajectories across all foresight scripts
tgilon b5fa722
doc: change position of comment in add_brownfield
tgilon 3441768
feat: remove reference to config/config.yaml, as it is not used
tgilon 7509ff1
fix: set offshore_zone_trajectories across all foresight scripts
tgilon a89a67f
refactor: add empty input for offshore files in prepare_sector_network
tgilon 5ccdcc7
fix: set offshore_zone_trajectories across all foresight scripts
tgilon 50b0bf5
fix: add empty input for offshore files in prepare_sector_network
tgilon ea90340
refactor: refactor existing plotting routines to align conventions
tgilon 07771f4
feat: introduce offshore plotting routines
tgilon f97d360
refactor: match new naming convention for plots
tgilon ca4eb66
refactor: remove the default reference to base network for offshore p…
tgilon 71d758a
refactor: split offshore plotting routine using a carrier wildcard
tgilon 2eca460
fix: attach h2 piplines to the correct buses
tgilon 394f4e4
fix: remove previous build year from efficiency calculations
tgilon 09fb046
Merge branch 'master' into feat/48-offshore-hubs
tgilon 0f174c9
fix: group links in plot_offshore_network
tgilon 39151ab
feat: add a offshore transmission capacity limits
tgilon 5c2de44
ci: fix run name keyword
tgilon 225de71
Apply suggestions from code review
daniel-rdt faf71b5
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] 8136121
fix: import chain from itertools
daniel-rdt a67fb07
refactor: generalize get tyndp renewable carriers
daniel-rdt 5313264
ci: fix run name keyword
tgilon dbccb1b
Merge branch 'master' into feat/49-pecd-offshore
tgilon 2659f16
Merge branch 'feat/49-pecd-offshore' into feat/48-offshore-hubs
tgilon 8da9d7d
Revert "ci: fix run name keyword"
tgilon c77af19
fix: fix merge conflict in add_brownfield regarding tyndp_renewable_c…
tgilon c09708a
feat: make legend optional in plot_offshore_network
tgilon 1d51a96
feat: modularize link width plotting functionality
tgilon dac58ef
feat: add hubs_only parameter to filter offshore hub in visualization
tgilon b193122
fix: remove placeholder for renewable technology max capacities in bu…
daniel-rdt fed98dd
doc: add information about PECD Version 3.1 to documentation
daniel-rdt 0a36daa
fix: remove unnecessary params from pecd rules
daniel-rdt b98eccc
feat: change fn_pecd to dir_pecd and add comment on skiprows
daniel-rdt 580eaaa
refactor: change to if not continue style to reduce diff
daniel-rdt a55cfbf
feat: improve pecd profile configuration by making profile names expl…
daniel-rdt decd186
refactor: simplify tyndp_renewable_carriers also in smk files
daniel-rdt d79623c
Merge branch 'feat/49-pecd-offshore' into feat/48-offshore-hubs
daniel-rdt 55e9600
feat: improve mapping from tyndp techs to PECD profile names
daniel-rdt 38266f6
Apply suggestions from code review
tgilon 39f1968
Merge branch 'master' into feat/48-offshore-hubs
tgilon 93f371b
fix: fix merge conflicts
tgilon 1fd7378
refactor: remove logger as argument
tgilon 138600c
feat: make the retrieve outputs more explicit
tgilon 05c6523
fix: fix outputs in retrieve_tyndp_bundle
tgilon 9926a23
refactor: use explicit list of tyndp carriers in constraint
tgilon 53b0547
refactor: apply code suggestion
tgilon 982071f
refactor: improve code
tgilon 5306440
doc: adjust licensing
tgilon a6bf6e1
doc: make README more explicit about make tyndp
tgilon 89b255e
refactor: define a specific tyndp all function
tgilon 199dbca
refactor: prefer branch over lambda formulation
tgilon d12c611
refactor: apply code suggestions
tgilon 88d5622
Merge branch 'master' into feat/48-offshore-hubs
tgilon 07a78a4
fix: fix file name in all rule
tgilon d4493fe
refactor: remove unused function arguments
tgilon aa7036e
refactor: update carrier naming to explicitly separate offshore hubs …
tgilon e67bc51
fix: fix: restrict max_capacity condition to inter-hubs connections a…
tgilon e44df09
fix: fix dimension issue in add_brownfield
tgilon f13b818
refactor: convert to explicit hydrogen buses sooner
tgilon a603ea2
feat: add plotting threshold for plot_offshore_network
tgilon 35a6789
fix: use mainland GB coordinates instead of Northern Ireland
tgilon 0d1183e
fix: remove Offshore Hubs from hydrogen plots
tgilon 7dc553d
feat: introduce time-varying efficiencies for offwind generators (#68)
tgilon 4e29fb8
refactor: move if outside of extend in Snakefile
tgilon 99ead1b
refactor: remove redundant formulation in add_brownfield
tgilon f489dfa
refactor: move input_offshore_hubs in file
tgilon 0ae5268
refactor: test before using input_offshore_hubs
tgilon a6eb875
refactor: improve minor code inconsistencies
tgilon File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.