forked from PyPSA/pypsa-eur
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add geothermal-sourced central heat pumps (PyPSA#1359)
* feat: add utilisation potential retrieval * feat: add build_heat_source_potentials module * feat: update config * feat: extend retrieve.smk * feat: pass potential to update prepare_sector_network * feat: update cop profile module * feat: update build_sector.smk accordingly * fix: use generator + links for heat source * clean up run.py * feat: generalise 'geothermal' to any heat source in Fraunhofer data * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * chor: simplify indexing * style: rename potentials var * fix: return 0 for COP calculation when source inlet temperature exceeds sink outlet temperature * refactor: remove unused function and clean up code in build_cop_profiles.run.py * style: clean-up comments in OnshoreRegionData.py and prepare_sector_network.py * feat: add direct heat source utilisation when source temp > forward temp * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * feat: add costs for geothermal heat source * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * style: pre-commit, add dev to gitignore * feat: replace access to config with unpack where possible Note: unpack() doesn't work in snakemake output, so geothermal is specified explicitly as only heat source! * feat: replace dict access to config in snakemake * doc: add docstrings, clean up code * docs: update release notes * doc: update configtables * doc: update data sourcs * update docs * Update config/config.default.yaml Co-authored-by: Lukas Trippe <lkstrp@pm.me> * docs: fix data-retrieval docs * feat: turn off geothermal DH heat by default * style: remove "fraunhofer_" in naming * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * style: use snakemake.wildcards.heat_sources rather than additional param * Update doc/configtables/sector.csv Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de> * Update doc/configtables/sector.csv Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de> * docs: update sector.csv * refactor: refactor scaling factor calculation in run.py * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * docs: add direct_utilisation_heat_sources to configtables * udpate release_notes --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: Lukas Trippe <lkstrp@pm.me> Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>
- Loading branch information
Showing
15 changed files
with
661 additions
and
37 deletions.
There are no files selected for viewing
This file contains 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 |
---|---|---|
|
@@ -76,3 +76,5 @@ d1gam3xoknrgr2.cloudfront.net/ | |
merger-todos.md | ||
|
||
*.html | ||
# private dev folder | ||
dev/* |
This file contains 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 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 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 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 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 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 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 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.