bjoern/pypsa-eur
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
4,880 Commits 1 Branch 0 Tags 133 MiB
8f2cea4d93
Commit Graph

2638 Commits

Author SHA1 Message Date
lisazeyen
8f2cea4d93
Merge branch 'master' into jrc-idees-2020 2024-07-22 21:43:03 +02:00
pre-commit-ci[bot]
fb26aaf38d [pre-commit.ci] auto fixes from pre-commit.com hooks 
for more information, see https://pre-commit.ci
 2024-07-22 19:42:54 +00:00
lisazeyen
b957f88645 fix bugs and clean up 2024-07-22 21:40:47 +02:00
lisazeyen
53bbc28908 add eurostat data for GB agriculture 2024-07-22 21:15:40 +02:00
lisazeyen
877ca3eb44
change sign sequestration store marginal cost (#1174) 2024-07-22 16:44:26 +02:00
Fabian Neumann
b49895a041
determine_availability_matrix_MD_UA: enable parallelism & remove plots (#1170) 
* determine_availability_matrix_MD_UA: enable parallelism through temp files and remove plots

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
 2024-07-19 17:43:11 +00:00
Iegor Riepin
ba55971c23
Compatibility of data processing for Ukraine (#1146) 
* data: retrieve gdp and pop raw data for UA,MD

* Updated retrieval code.

* add_electricity script for UA and MD using updated, endogenised GDP and PPP data.

* Outsourced building of gdp and ppp. Only called when UA and/or MD are in country list.

* Accepted suggestion by @fneum in retrieve rule.

* Cleaned determine_availability_matrix_MD_UA.py, removed redundant code

* Updated build_gdp_pop_non_nuts3 script to use the mean to distribute GDP p.c. Added release notes. Bug fixes.

* Bug fixes --> 'ppp' to 'pop'

* Bug fix: only distribute load to buses with substation.

* Updated to download GDP and population raster via PyPSA-Eur zenodo databundle. Removal of dedicated retrieve function. Updated release notes.

* Updated release notes.

* correct input file paths

* update zenodo url for databundle release v0.3.0

* doc: update release_notes

* minor adjustments: benchmark, increase mem_mb, remove plots, handling of optional inputs

---------

Co-authored-by: bobbyxng <bobbyxng@gmail.com>
Co-authored-by: Bobby Xiong <36541459+bobbyxng@users.noreply.github.com>
Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>
 2024-07-19 19:23:35 +02:00
pre-commit-ci[bot]
0e1e509006 [pre-commit.ci] auto fixes from pre-commit.com hooks 
for more information, see https://pre-commit.ci
 2024-07-19 13:43:16 +00:00
lisazeyen
39e853e2b3 make sure not to divide by zero 2024-07-19 15:42:44 +02:00
pre-commit-ci[bot]
028d0d6e7a [pre-commit.ci] auto fixes from pre-commit.com hooks 
for more information, see https://pre-commit.ci
 2024-07-19 13:15:38 +00:00
lisazeyen
dea48c965a correct indexing of DH share 2024-07-19 15:15:12 +02:00
lisazeyen
104fa73119 remove rescale to Eurostat 2024-07-19 15:15:12 +02:00
Amos Schledorn
8fe5921e44
Fix negative district heating progress (#1168) 
* impose minimum district heating progress of 0

* update release_notes

* update configtables
 2024-07-19 12:30:26 +02:00
pre-commit-ci[bot]
086d46cdb4 [pre-commit.ci] auto fixes from pre-commit.com hooks 
for more information, see https://pre-commit.ci
 2024-07-19 08:21:09 +00:00
lisazeyen
4c46c57fec avoid double download of JRC idees 2024-07-19 10:20:19 +02:00
lisazeyen
5f009590f5 remove todos 2024-07-18 15:48:52 +02:00
pre-commit-ci[bot]
8cc23945b5 [pre-commit.ci] auto fixes from pre-commit.com hooks 
for more information, see https://pre-commit.ci
 2024-07-18 13:43:40 +00:00
lisazeyen
957176a20d adjustment to build_energy_totals 2024-07-18 15:39:52 +02:00
lisazeyen
ecccc1429f add rule to retrieve JRC IDEES 2021 2024-07-18 15:39:27 +02:00
Micha
4c05928766
add marginal cost to preven model degeneracy (#1155) 2024-07-15 16:41:32 +02:00
Micha
d3b24face6
revert to old config keys (#1152) 
* revert to old config keys

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
 2024-07-12 16:22:53 +02:00
Fabian Neumann
2bf59e6aaf
drop-in mirror for broken eurostat energy balance link (#1147) 2024-07-12 09:34:49 +02:00
pre-commit-ci[bot]
1de4db5f9c [pre-commit.ci] auto fixes from pre-commit.com hooks 
for more information, see https://pre-commit.ci
 2024-07-09 12:08:57 +00:00
cpschau
fe5487e277 adjust parameters in config update from wildcards 2024-07-09 14:05:43 +02:00
cpschau
f19279e7e0 Add other waste heat technologies, and adjust share 2024-07-09 14:02:45 +02:00
cpschau
e932466b05 FT and electrolyis waste heat for DH as float 2024-07-09 12:05:50 +02:00
Fabian Neumann
b6d11bba6f
build_shapes: default to no tolerance in polygon simplification (#1137) 2024-07-09 11:07:15 +02:00
Fabian Neumann
c3151902f6
Compatibility with geopandas version 1 (#1136) 
* address geopandas and pandas deprecations/warnings

* compatibility with geopandas v1

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
 2024-07-08 08:29:16 +02:00
bobbyxng
6962ba0cfb Fixed mock_snakemake for snakemake v.8.14: All snakemake settings moved to snakemake.settings.types. 2024-06-20 15:46:14 +02:00
Fabian Neumann
14b8de8348 compatibility with snakemake 8.14 closes #1108 2024-06-20 14:38:04 +02:00
Fabian Neumann
6348c904bd
Merge pull request #1103 from PyPSA/methanol-store-capital-cost 
non-zero capital_cost for methanol stores
 2024-06-17 18:57:35 +02:00
Fabian Neumann
0ead0dc6a4
Merge pull request #1105 from PyPSA/document-heat-rules 
Document heating rules
 2024-06-17 18:56:52 +02:00
Philipp Glaum
ad38016f6d prepare_sector_network: add floating wind to update cost function 2024-06-17 15:22:33 +02:00
AmosSchledorn
c787437350 correct typos in heating rule docs 2024-06-17 11:47:55 +02:00
pre-commit-ci[bot]
4a1933f49a [pre-commit.ci] auto fixes from pre-commit.com hooks 
for more information, see https://pre-commit.ci
 2024-06-17 09:44:05 +00:00
AmosSchledorn
d2018e1088 Document heating rules 2024-06-17 11:38:23 +02:00
Michael Lindner
b174a53480 non-zero capital_cost for methanol stores 2024-06-14 11:29:59 +02:00
Micha
37bbbc6225 Fix grouping logic again 2024-06-13 15:03:08 +02:00
Bobby Xiong
0db78a93e6 Fixed bug which generated empty pdfs when calling plot_summary from CI or snakemake. Using .svg exports instead. 2024-06-11 15:10:12 +02:00
Micha
b052a5e54a
Merge branch 'master' into fix-p_nom-existing-renewables 2024-06-10 10:59:49 +02:00
pre-commit-ci[bot]
5168b3fe0b [pre-commit.ci] auto fixes from pre-commit.com hooks 
for more information, see https://pre-commit.ci
 2024-06-07 16:02:02 +00:00
Michael Lindner
c24b7f657b set generator baseyear p_nom to p_nom_min 2024-06-07 17:59:43 +02:00
pre-commit-ci[bot]
47889d728f [pre-commit.ci] auto fixes from pre-commit.com hooks 
for more information, see https://pre-commit.ci
 2024-06-07 12:34:51 +00:00
Michael Lindner
136442b87c revert hotfix for #1016 2024-06-07 14:20:58 +02:00
Toni Seibold
180d93951d
documentation for industry rules (#1086) 
* documentation for industry rules

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
 2024-06-05 15:02:44 +02:00
Toni Seibold
d62e959c85
Fix offshore wind capacity by adding it as offwind-AC (#1089) 
* Fix existing offshore wind capacity by adding it as offwind-ac
---------

Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>
 2024-06-04 17:02:56 +02:00
Fabian Neumann
4ceb397de0
skip MD for synthetic load data 2024-06-04 13:56:54 +02:00
LukasFrankenQ
b0d7a45ea7 changed EGS paper link to doi-containing version 2024-06-01 18:21:49 +01:00
LukasFrankenQ
4752840009 improved docs on EGS cost scaling 2024-06-01 00:32:44 +01:00
LukasFrankenQ
2f1d6d20b1 final corrections, improved docs 2024-06-01 00:20:31 +01:00