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

Refining scenarios #35

Merged
merged 23 commits into from
Jan 25, 2025
Merged
Changes from 1 commit
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
d78fcf7
restrict RES buildout
lindnemi Jan 23, 2025
14df88b
decrease FT efficiency
lindnemi Jan 23, 2025
c978b43
forbid net export of H2 and Efuels
lindnemi Jan 23, 2025
35b4598
allow BEV DSM only after 2025
lindnemi Jan 23, 2025
1159f39
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jan 23, 2025
9e590a9
consider SMR CC as fossil hydrogen
lindnemi Jan 23, 2025
350b0fe
increase offwind-connection FOM
lindnemi Jan 23, 2025
d4b6071
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jan 23, 2025
e5a3281
Merge branch 'main' into refining-scenarios
lindnemi Jan 23, 2025
308bbcb
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jan 23, 2025
def78e5
fix imports paths
lindnemi Jan 23, 2025
72c3f73
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jan 23, 2025
9804b6f
further refine offwind buildout
lindnemi Jan 24, 2025
e82cd22
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jan 24, 2025
8a6e002
add to previous commit (further refine offwind buildout)
lindnemi Jan 24, 2025
31ec853
Merge branch 'refining-scenarios' of github.com:PyPSA/pypsa-de into r…
lindnemi Jan 24, 2025
9844486
improve the bev_dsm config option
lindnemi Jan 24, 2025
15d3320
generalize mock_snakemake
lindnemi Jan 24, 2025
125037f
hotfix mock_snakemake for this script
lindnemi Jan 24, 2025
f20236d
add description to modified costs.csv
lindnemi Jan 24, 2025
e96f6f9
split efuel export bans by carrier
lindnemi Jan 24, 2025
603a3cd
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jan 24, 2025
ccac88c
Merge branch 'main' into refining-scenarios
lindnemi Jan 25, 2025
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
Prev Previous commit
Next Next commit
add description to modified costs.csv
lindnemi committed Jan 24, 2025

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
commit f20236d5f99c7a3d926a0bc9f876b102d4adaf2d
1 change: 1 addition & 0 deletions scripts/pypsa-de/modify_cost_data.py
Original file line number Diff line number Diff line change
@@ -154,6 +154,7 @@ def carbon_component_fossils(costs, co2_price):
costs.at[("Fischer-Tropsch", "efficiency"), "value"] = (
lindnemi marked this conversation as resolved.
Show resolved Hide resolved
1 / costs.at[("Fischer-Tropsch", "hydrogen-input"), "value"]
)
costs.at[("Fischer-Tropsch", "efficiency"), "source"] = "inverse of hydrogen-input"

# increase FOM of offshore wind connection (fix for costs.csv)
costs.loc[("offwind-dc-connection-submarine", "FOM"), "value"] = 0.35