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.

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

Jump to bottom

Add energy import options #620

Closed
wants to merge 431 commits into from
Closed

Add energy import options #620

wants to merge 431 commits into from

Conversation

fneum
Copy link
Member

@fneum fneum commented Mar 8, 2023 •
edited
Loading

@fneum fneum mentioned this pull request Mar 8, 2023
Merged
7 tasks
Base automatically changed from merge-pypsa-eur-sec to master March 18, 2023 12:12
fneum and others added 28 commits August 14, 2023 18:27
@fneum
plot resources: powerplants
a4c368a
@fneum
plot resources: salt caverns unclustered
1906be9
@fneum
plot resources: salt caverns clustered
7a1c84b
@fneum
plot resources: biomass potentials
f2d2440
@fneum
plot resources: add collection rule
1432703
@pre-commit-ci
[pre-commit.ci] auto fixes from pre-commit.com hooks
ba44b81 
for more information, see https://pre-commit.ci
@fneum
merge master
fb2c381
@fneum
bugfix: safe aggregation of cluster heat buses (cf. pandas-dev/pandas…
8595f78 
…#54161)
@fneum
separate configs for methanol_reforming w/wo CC
e049563
@fneum
endogenous_hvdc_imports: align calculation of efficiencies
4f6c58b
@fneum
prepare_sector_network: skip unnecessary geocoding
60c618e
@pre-commit-ci
[pre-commit.ci] auto fixes from pre-commit.com hooks
e0eae24 
for more information, see https://pre-commit.ci
@fneum
methanol-to-kerosene: add carrier
d65501d
@fneum
cluster_heat_buses: avoid error with duplicate index
b0dd551
@pre-commit-ci
[pre-commit.ci] auto fixes from pre-commit.com hooks
270a012 
for more information, see https://pre-commit.ci
@fneum
tsam: improve logging of segmentation clustering
41fb6a3
@fneum
prepare_sector_network: remove duplicate methanol steam reforming
310f09c
@fneum
bugfix: cluster heat buses, pd.Series.sum can cause problems with tim…
7c0b6ff 
…e-dependent data
@fneum
Merge branch 'import-trial' of github.com:pypsa/pypsa-eur into import…
f9e1da9 
…-trial
@fneum
increase memory requirements of prepare_sector_network due to segment…
b8d8127 
…ation clustering
@fneum
env: update dependency versions
603e9a4
@fneum
Merge remote-tracking branch 'origin/master' into import-trial
fa74ddb
@pre-commit-ci
[pre-commit.ci] auto fixes from pre-commit.com hooks
2fddbff 
for more information, see https://pre-commit.ci
@fneum
consider grid connection costs for endogenous hvdc import
232ac83
@fneum
add future links for import data
bec727f
@fneum
add option to set maximum capacity of HVDC import links
2580aaa
@fneum
consider maximum RES potential in exporting countries
590eea0
@fneum
add option to set maximum capacity of import links/generators
474415d
lindnemi and others added 22 commits May 13, 2024 16:45
@lindnemi
Merge branch 'ariadne2' into de_chp
65826d4
@toniseibold
rebasing to current master
477f0c6
@toniseibold
Merge branch 'import-trial' of https://github.com/PyPSA/pypsa-eur int…
ee4cc08 
…o import-trial
@lindnemi
Merge branch 'ariadne2' into de_chp
6c95595
@fneum
Merge branch 'ariadne2' into plot-statistics-fix
1e4aa63
@fneum
Merge pull request #1032 from PyPSA/plot-statistics-fix
02bd53f 
patch for statistics plotting from @p-glaum
@toniseibold
Merge remote-tracking branch 'origin/ariadne2' into import-trial
1c0df98
@lindnemi
Merge branch 'master' into ariadne2
cb8ee0d
@toniseibold
renaming only power generating biomass plants and moving the chps to …
c11b17a 
…electricity function
@pre-commit-ci
[pre-commit.ci] auto fixes from pre-commit.com hooks
568b16e 
for more information, see https://pre-commit.ci
@lindnemi
improve ordering of RuntimeErrors
dfb27b8
@lindnemi
Merge branch 'master' into ariadne2
5d36ed7
@toniseibold
deleting acient code
3ac586e
@lindnemi
Merge remote-tracking branch 'origin/ariadne2' into de_chp
051bf57
@pre-commit-ci
[pre-commit.ci] auto fixes from pre-commit.com hooks
65153f5 
for more information, see https://pre-commit.ci
@lindnemi
Merge pull request #907 from PyPSA/de_chp
0a227e5 
Adding CHPs to the existing heating baseyear
@lindnemi
Merge branch 'master' into ariadne2
962e5d4
@toniseibold
adding hbi and making it work in ariadne workflow
469be05
@toniseibold
merging latest ariadne2 branch into import-trial
749f5f7
@pre-commit-ci
[pre-commit.ci] auto fixes from pre-commit.com hooks
81ea082 
for more information, see https://pre-commit.ci
@toniseibold
Merge remote-tracking branch 'origin/master' into import-trial
69f4204
@pre-commit-ci
[pre-commit.ci] auto fixes from pre-commit.com hooks
dfdcfc8 
for more information, see https://pre-commit.ci
@toniseibold toniseibold closed this Jun 6, 2024
@toniseibold toniseibold deleted the import-trial branch June 6, 2024 07:02
@fneum fneum restored the import-trial branch July 11, 2024 09:09
@fneum fneum reopened this Jul 11, 2024
@fneum
Copy link
Member Author

fneum commented Jul 11, 2024

TODO - remove ariadne2-specific stuff

@fneum fneum mentioned this pull request Aug 14, 2024
Draft
@fneum
Copy link
Member Author

fneum commented Aug 14, 2024

superseded by #1217

@fneum fneum closed this Aug 14, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Separate process emissions from methanol production from HVC production.
9 participants
@fneum @nworbmot @lisazeyen @toniseibold @lindnemi @p-glaum @koen-vg @FabianHofmann @cpschau