-
Notifications
You must be signed in to change notification settings - Fork 23
Representation of German district heating systems as subnodes #58
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 all commits
Commits
Show all changes
807 commits
Select commit
Hold shift + click to select a range
99c9d54
Merge pull request #97 from PyPSA/even-more-exports
97721a7
change V2G and offwind assumptions
lindnemi 96f754c
taking config[industry][DRI_fraction] from FORECAST to sort out coal …
toniseibold 0bb044b
change key for ariadne 1 DB
lindnemi f73317f
reading steam_fractions from FORECAST Final Energy excl Non-Energy Use
toniseibold 7ae9612
exclude industry_sector_ratios.csv from shared resources
toniseibold 446d44d
remove steam_fraction config from config.yaml
toniseibold 93cf951
update submodule
lindnemi a51d075
PyPSA-Ariadne specific steam fractions independent from FORECAST
toniseibold 905275b
bug fix not initializing industry since it's already in the scenarios…
toniseibold 7febe6e
improve numerical stability
lindnemi 5db9f6f
improve numerical stability
lindnemi 94385a2
Merge branch 'main' into fix_industry_sector
ffa89fb
Merge pull request #133 from PyPSA/fix_industry_sector
a099f37
update submodule
lindnemi dfbe97e
exclude the "co2 sequestered" store from accounting
lindnemi cbab80d
get "link" dont drop "store" to avoid errors
lindnemi bc33283
minor improvements for exports
lindnemi cb034cf
Merge branch 'main' into database-pypsa-de
d8dd908
Merge pull request #129 from PyPSA/database-pypsa-de
05ea328
checkout corresponding branch in pypsa-eur
lindnemi 58353d2
add config prefix
lindnemi 4d6f5c0
correct year for renewable estimation
lindnemi 4ef47da
limit offshore expansion in 2030
lindnemi 5805e4e
new cutout from Fabian
lindnemi 506ef1e
additional keys
lindnemi 2738d71
update submodule
lindnemi 5e2bb1c
use the modded n.statistics to get investments
lindnemi 10823ab
add offwind transmission investment
lindnemi 5c99468
minor fixes
lindnemi b50b441
add endpoints to investment averages
lindnemi ce826c3
adapt to pypsa upstream changes
lindnemi 8452faf
minor fix
lindnemi 3136f71
explicitly report offwind investments
lindnemi 463b899
update submodule
lindnemi 1e0bff9
update submodule
lindnemi 59333db
reduce DH buildout potential, especially for CurPol and WorstCase
lindnemi d8f0d65
changes to update submodule to master
lindnemi 16f1df8
Merge branch 'main' into cutout-2019
lindnemi 42d1ca1
update to upstream changes
lindnemi ec3fa2d
adapt to pypsa changes
lindnemi 4583111
Merge branch 'main' into investment-exports
lindnemi 7c58bf8
rename investment -> overnight_cost
lindnemi a14c4a5
more investment -> overnight_cost renaming
lindnemi bfe6e73
final touches for the renaming
lindnemi 083e6ab
added new script for DH modifications
6a9286c
function for update of urban heat loads
dbc2c37
Preserve aggregate DH demand
aa12459
Merge pull request #143 from PyPSA/investment-exports
1559e74
update submodule
lindnemi 2eb035d
quickfix for pypsa version until new release
lindnemi 8f3d743
add subnodes and loads
11bf8cf
adjust snapshots
lindnemi d40cd9f
update submodule
lindnemi 0ed85d1
Merge branch 'main' into high-spatial
lindnemi 1154cbc
ignore errors when dropping stores
lindnemi 547782a
Merge pull request #107 from PyPSA/high-spatial
8449ab8
Update pypsa version
276542b
use NEP DC costs
lindnemi 64ee6f6
make unravelling of oil bus consistent with new refineries
nworbmot d231363
upstream fix for connection_overnight_cost
lindnemi c5bd066
fix renwable: config key
lindnemi 4df0915
Merge branch 'main' into cutout-2019
lindnemi dd0e396
Merge pull request #142 from PyPSA/cutout-2019
e381c93
rename cutout
lindnemi ca52fef
Merge branch 'main' into refineries
lindnemi 986bfee
update exporter
lindnemi b71842a
update DC stations costs
lindnemi 02815cd
Merge branch 'main' into update-offwind-connection-cost
2d295ca
Merge pull request #149 from PyPSA/update-offwind-connection-cost
ab563e6
Create Changelog.md
e2e4149
Create PULL_REQUEST_TEMPLATE.md
7e06505
ci: add validator
lkstrp 15efdb1
select images and add repo owner path
lkstrp 1778dc1
load chps, change function header
f9096c2
Merge pull request #111 from PyPSA/ci-config
048c46d
Merge branch 'main' into refineries
8435176
Merge pull request #150 from PyPSA/refineries
1d12751
Update PULL_REQUEST_TEMPLATE.md
c15fdb3
Update Changelog.md
d7c98c2
update submodule
lindnemi 009f660
Update .pre-commit-config.yaml
lkstrp ceb7ce8
remove reuse check
lkstrp ca1f43c
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] 63c83f9
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] 98a2acb
Merge pull request #156 from PyPSA/lkstrp-patch-1
fc8bf80
Using config_provider for additional functionality exclusively (#154)
toniseibold 0324120
Create .git-blame-ignore-revs (#158)
lkstrp f807830
minor changes for running single node network (#160)
JulianGeis d90aca1
Fix hydrogen import boundary condition (#159)
toniseibold 0a060dc
Accounting renewable CH4 without spatially resolved CH4 network (#146)
toniseibold d21a5c2
Hydrogen Gas Turbines and Retrofitting of Gas Turbines (#151)
toniseibold db914f6
minor fixes
lindnemi 4aab9c8
Include spain (#163)
1fef55b
[pre-commit.ci] pre-commit autoupdate (#165)
pre-commit-ci[bot] 8dd49cb
Update post-discretization size for H2 (#167)
004f4bc
ci: adjust ci to new validator (#164)
lkstrp 0bd5246
Modify dh systems (#113)
cpschau d87f4af
Limit German CO2 sequestration in each investment year (#170)
nworbmot 2e10863
fix (#169)
lkstrp 33916de
update submodule
lindnemi 0e53799
ci: add dependabot (#172)
lkstrp b69cd06
merge main
77f0bdd
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] 1eef9c6
Bump lkstrp/pypsa-validator in the github-actions group (#173)
dependabot[bot] 4df060c
Merge branch 'main' into add_subnodes
lkstrp 7bc5749
changed data source to Fernwärmeatlas; changed script structure; incl…
9944878
fixed nodal EB with gas boiler; fixed snakemake issues
c7ec368
changed input for add_brownfield
1fbecbc
geolocations from file instead of geocoding
c97e56e
added links and stores except from heat pumps; adapted snakemake inpu…
fe47933
add ASHP
c081ff4
fix bugs for heat pump integration
039aaad
Bump lkstrp/pypsa-validator to `v0.1.4` (#178)
lkstrp 0f6e528
Merging master into Ariadne 2 (#177)
1dcc6ea
Biogas (#184)
cb041ab
Adding Italy (#183)
toniseibold d79ae3d
Updating cost horizon data (#182)
toniseibold 6293d3b
Adding overnight costs in `modify_prenetwork` (#181)
toniseibold 055aca6
update submodule
lindnemi bcd73c1
bump prefix
lindnemi a4c3104
Implement rising hub heights for wind; profile smoothing for offshore…
nworbmot 70d9739
update submodule
lindnemi c69e83b
Bump lkstrp/pypsa-validator to v0.2.0 (#185)
lkstrp 8b67210
improve exporter stability
lindnemi f6013f0
importve numerical stability of exporter
lindnemi 68318ae
update snakemake
lindnemi b7acb59
update submodule
lindnemi 9595f7c
update submodule
lindnemi ddeeae1
downgrade submodule
lindnemi e5f56de
update pypsa and submodule
lindnemi 7e36af1
Bump lkstrp/pypsa-validator from 0.2.0 to 0.2.1 in the github-actions…
dependabot[bot] a5ce933
make exporter more robust
lindnemi 07c1edd
add gas trade to exporter
lindnemi 01871cc
Update Germany specific costs (NEP, onwind, pellets) (#193)
abf8fc1
Merge remote-tracking branch 'origin/main' into add_subnodes
e7ec95e
add marginal_cost for international trade links
lindnemi ebdddd0
round exported data to 5 significant decimals
lindnemi e799e12
Merge remote-tracking branch 'origin/main' into add_subnodes
f5e8d2b
adjustments to cop netcdf and existing heating distribution
cd75664
fix extension of existing_heating df
5b9ed82
fix snakemake issue for existing heating
2d6949e
dirty fix for workflow and optional output
1a2ed80
match CHP by LAU shapes
913da0b
added industry heat load
8dbb0cd
make workflow run after merge
ade4e85
add heat vent and remove load shedder
ce3d85b
fix workflow
1901d24
uncomment get_data
e76741b
add type hints and docstrings; clean-up unused code snippets; simplif…
f5d4363
change variable name row to subnode
892ead0
add fernwaermeatlas data
11b3ec9
change docstring to numpy
c1aaae8
add comments
57aa50c
another docstring conversion to numpy format
af60c52
one more numpy docstring
fa36e00
Pre-merge: remapped directory structure
189a7c6
Merge branch 'add_subnodes_remapped' into add_subnodes
c5def7c
Adjust add_existing_baseyear to allow for subnodes
d2f2721
fix snakefile
7bee646
Add geothermal-sourced central heat pumps (#1359)
amos-schledorn e072a5c
fix workflow
b37c040
cleaned up unnecessary code
TomKae00 da66842
EEM paper setup
a988333
replace corine with osm land cover data
330884d
mv ptes land eligibility to prepare_subnodes; fix ptes initialization…
092e3ed
update prepare_sector_network
de4fe8a
increase eem resolution
d7496e6
update TTES efficiencies
ae7ad2e
fix land eligibility
b9c106f
adjust snakemake mem requirements
c656cd5
fix eem config
37e98f4
fix ptes query
4caf3e3
multithreaded potential calculation
8677562
use raster data from census to refine district heating areas
2a723b5
add resolution for exclusion container as parameter
7fae6de
Merge branch 'main' into refine_dh_areas
980d468
preliminary fixes after merge
d3d9f3a
Add PTES and introduce PTES/TES energy-to-power ratios (#1546)
TomKae00 9087994
adjustments to new geothermal potentials and heat_stores
d8ee5ef
hot fix for missing geothermal potentials in GB
b73bdb5
adjust reference of df with subnodes to correctly handle demand(subno…
df75573
CHP plants in buffered dh area based on census instead of LAU
e77bb20
fix COP revision of predecessing network
a416e5b
single execution of build_existing_chp_de
3c56fb6
adjust path in snakefile to networks subdirectory
72e7c5d
convert chps to eops if no urban central heat bus is available
eb33bfa
reference cities as bus locations
8c40e95
adjust docstring
3c85e7f
adjust query of chp input path to removal of wildcards
594ee66
updating mean cost data
toniseibold 979f565
rename sysgf scenario file
d0944a1
adjust chp path in add_existing_baseyear inputs
eba68fe
rename referenced sysgf scenario file
e76d4fd
Revert "CHP plants in buffered dh area based on census instead of LAU"
4242bd4
remove outdated heat source rules
54e5146
adjust subnode loads
0bab6d5
remove if-clause from snakefile
fb91229
skip adjustments in prepare_sector_network if subnodes activated
b3cc8d1
Merge remote-tracking branch 'origin/main' into refine_dh_areas
e874752
aligned mean costs files
5224f7b
clean-up prepare_sector_network
1106d9f
clean-up heating files
04f2ae9
Fix: wildcards of build_renewable_profiles for scenario management 'b…
lindnemi df93666
rename prefix
lindnemi 03e343d
use absolute imports
lindnemi 4ed9713
switch back to get from _helpers
lindnemi 4ef92fc
remove duplicate aviation sector
lindnemi 07b8b3f
get correct investments year for aviation
lindnemi 9e17e5c
load_costs instead of prepare_costs
lindnemi 89f9ecc
simplify nep_costs
lindnemi d6aca0b
adjust to new naming of wind generators with resource classes
lindnemi 306e989
some more conforming with upstream changes
lindnemi 0ef0b64
add another color for 2050
lindnemi ac429e1
Merge remote-tracking branch 'origin/main' into refine_dh_areas
a846eec
Merge remote-tracking branch 'origin/merge-master-april' into refine_…
c7a7038
complement datafiles
62e1016
start by making Mix the default scenario
lindnemi 4589583
make script more robust
lindnemi d9c35d1
- change syntax of national co2_budget
lindnemi fafaf90
simplify scenario definitions, fallback to defaults more often
lindnemi 94941cd
change prefix
lindnemi ac8456f
ariadne_template is data not resources
lindnemi 653fd49
fix rounding error
lindnemi 396fa62
Merge branch 'main' into simplify-scenarios
e4a22b1
disable interactive mode in final plotting script
lindnemi aae794b
Merge branch 'simplify-scenarios' of github.com:PyPSA/pypsa-de into s…
lindnemi 891eb9f
decouple ariadne DB pre-workflow from scenario management
lindnemi 014c222
fix key error
lindnemi 1f7ce92
review: addition, removal and renaming of config parameters; removed …
7b86796
Merge remote-tracking branch 'origin/main' into refine_dh_areas
c3f2f80
Merge remote-tracking branch 'origin/simplify-scenarios' into refine_…
486ac2b
adjust configs
643ea21
allow for dynamic ptes capacity and remove cases for ptes as storage …
e506603
revert restriction of mother node ptes potentials
98d094e
Merge remote-tracking branch 'origin/main' into refine_dh_areas
9f8f909
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] a3f9a04
Modularize and refactor add_subnodes
e5abe49
doc: extended docstring of add_subnodes
da685c3
Merge remote-tracking branch 'origin/main' into refine_dh_areas
5bb701a
fix disabling of feature
77c16eb
get baseyear using config_provider
0101967
remove duplicated marginal cost for pit chargers
02f4740
declared variable for transmission bus
8dc7f10
added overnight costs for TES
bd40639
used min_dh_share from config, removed obsolete function for encoding…
11a0fff
remove commented lines with neglected CHP techs
946e6f1
fix config provider usage
3b64f8e
add check for load preservation
bf23f04
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,97 @@ | ||
| # SPDX-FileCopyrightText: : 2017-2024 The PyPSA-Eur Authors | ||
| # | ||
| # SPDX-License-Identifier: CC0-1.0 | ||
|
|
||
| run: | ||
| prefix: 20250514_dhsubnodes | ||
| name: | ||
| - Baseline | ||
| # - No_PTES | ||
| # - LowPTESCAPEX | ||
| # - HighPTESCAPEX | ||
| # - LowStandingLosses | ||
| # - HighStandingLosses | ||
| # - LowGroundWaterDepth | ||
| # - HighGroundWaterDepth | ||
| # - LowEtPRatio | ||
| # - HighEtPRatio | ||
| scenarios: | ||
| enable: true | ||
| manual_file: config/scenarios.sysgf.yaml | ||
| file: config/scenarios.automated.yaml | ||
| shared_resources: | ||
| policy: base #stops recalculating | ||
| exclude: | ||
| - existing_heating.csv # specify files which should not be shared between scenarios | ||
| - costs | ||
| - retrieve_cost # This is necessary to save retrieve_cost_data_{year}.log in the correct folder | ||
| - industry_sector_ratios | ||
| - build_industry_sector_ratios # This is necessary to save build_industry_sector_ratios_data.log in the correct folder | ||
| - modify_existing_heating | ||
|
|
||
| foresight: myopic | ||
|
|
||
| scenario: | ||
| ll: | ||
| - vopt | ||
| clusters: | ||
| - 27 #current options: 27, 49 | ||
| opts: | ||
| - '' | ||
| sector_opts: | ||
| - none | ||
| planning_horizons: | ||
| # - 2020 | ||
| # - 2025 | ||
| # - 2030 | ||
| # - 2035 | ||
| # - 2040 | ||
| - 2045 | ||
|
|
||
| clustering: | ||
| temporal: | ||
| resolution_sector: 365H | ||
|
|
||
| adjustments: | ||
| electricity: false | ||
| sector: | ||
| absolute: | ||
| StorageUnit: | ||
| urban central water pits: | ||
| standing_loss: 0.00012121 | ||
| urban central water tanks: | ||
| standing_loss: 0.00015476 | ||
|
|
||
| wasserstoff_kernnetz: | ||
| enable: false | ||
|
|
||
| sector: | ||
| district_heating: | ||
| potential: 0.5 | ||
| subnodes: | ||
| enable: true | ||
| limited_heat_sources: | ||
| geothermal: | ||
| ignore_missing_regions: true | ||
| heat_pump_sources: | ||
| urban central: | ||
| - air | ||
| - geothermal | ||
| urban decentral: | ||
| - air | ||
| rural: | ||
| - air | ||
| - ground | ||
|
|
||
| solving: | ||
| constraints: | ||
| CCL: false | ||
| EQ: false | ||
| BAU: false | ||
| SAFE: false | ||
| efuel_export_ban: false | ||
| limits_capacity_max: {} | ||
| limits_capacity_min: {} | ||
| limits_volume_max: {} | ||
| limits_volume_min: {} | ||
| limits_power_max: {} | ||
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,99 @@ | ||
| # -*- coding: utf-8 -*- | ||
| # SPDX-FileCopyrightText: : 2017-2023 The PyPSA-Eur Authors | ||
| # | ||
| # SPDX-License-Identifier: MIT | ||
|
|
||
| Baseline: | ||
| foresight: myopic | ||
| iiasa_database: | ||
| reference_scenario: KN2045_Mix | ||
| co2_budget_DE_source: UBA | ||
|
|
||
| No_PTES: | ||
| adjustments: | ||
| electricity: false | ||
| sector: | ||
| absolute: | ||
| Store: | ||
| urban central water pits: | ||
| e_nom_max: 0 | ||
|
|
||
| LowPTESCAPEX: | ||
| adjustments: | ||
| electricity: false | ||
| sector: | ||
| factor: | ||
| Store: | ||
| urban central water pits: | ||
| capital_cost: 0.5 | ||
| absolute: | ||
| Store: | ||
| urban central water pits: | ||
| standing_loss: 0.00012121 | ||
| urban central water tanks: | ||
| standing_loss: 0.00015476 | ||
|
|
||
| HighPTESCAPEX: | ||
| adjustments: | ||
| electricity: false | ||
| sector: | ||
| factor: | ||
| Store: | ||
| urban central water pits: | ||
| capital_cost: 2 | ||
| absolute: | ||
| Store: | ||
| urban central water pits: | ||
| standing_loss: 0.00012121 | ||
| urban central water tanks: | ||
| standing_loss: 0.00015476 | ||
|
|
||
| LowStandingLosses: | ||
| adjustments: | ||
| electricity: false | ||
| sector: | ||
| absolute: | ||
| Store: | ||
| urban central water pits: | ||
| standing_loss: 0 | ||
|
|
||
| HighStandingLosses: | ||
| adjustments: | ||
| electricity: false | ||
| sector: | ||
| absolute: | ||
| Store: | ||
| urban central water pits: | ||
| standing_loss: 0.0012121 | ||
|
|
||
| LowGroundWaterDepth: | ||
| sector: | ||
| district_heating: | ||
| subnodes: | ||
| limit_ptes_potential: | ||
| max_groundwater_depth: -25 | ||
|
|
||
| HighGroundWaterDepth: | ||
| sector: | ||
| district_heating: | ||
| subnodes: | ||
| limit_ptes_potential: | ||
| max_groundwater_depth: 0 | ||
|
|
||
| LowEtPRatio: | ||
| adjustments: | ||
| electricity: false | ||
| sector: | ||
| factor: | ||
| Link: | ||
| urban central water pits charger: | ||
| energy to power ratio: 0.5 | ||
|
|
||
| HighEtPRatio: | ||
| adjustments: | ||
| electricity: false | ||
| sector: | ||
| factor: | ||
| Link: | ||
| urban central water pits charger: | ||
| energy to power ratio: 2 |
Oops, something went wrong.
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.