lisazeyen
314f6c6f0f
retrieve ammonia demand data
2024-07-29 16:00:13 +02:00
lisazeyen
fb2ab4c50b
update ammonia data
2024-07-29 15:44:30 +02:00
lisazeyen
201889424c
update industry to new JRC-idees
2024-07-29 15:39:01 +02:00
lisazeyen
c99cd72727
include Tonis Feedback
2024-07-29 13:36:06 +02:00
lisazeyen
7451349fed
take eurostat year for transport demand
2024-07-23 15:10:05 +02:00
lisazeyen
d964c46a18
Merge branch 'master' into jrc-idees-2020
2024-07-22 21:53:44 +02:00
lisazeyen
3c62a3b4cb
add release notes
2024-07-22 21:53:11 +02:00
Fabian Neumann
f11f8d8613
solver settings: add copt-gpu setings for pdlp solver
2024-07-22 21:51:52 +02:00
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
Fabian Neumann
b8b92ace64
common.smk: make solver_threads also look for capitalised 'Threads'
2024-07-22 17:35:50 +02:00
lisazeyen
877ca3eb44
change sign sequestration store marginal cost ( #1174 )
2024-07-22 16:44:26 +02:00
Fabian Neumann
745df4d2c1
fix typo
2024-07-22 15:22:32 +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
Fabian Hofmann
71efc8f12a
draft bot for automated fixed env yaml ( #1049 )
...
* draft bot for automated fixed env yaml
* Update .github/workflows/update-fixed-env.yaml
Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>
---------
Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>
2024-07-19 17:49:41 +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
pre-commit-ci[bot]
3fba8dae3e
[pre-commit.ci] pre-commit autoupdate ( #1157 )
...
updates:
- [github.com/macisamuele/language-formatters-pre-commit-hooks: v2.13.0 → v2.14.0](https://github.com/macisamuele/language-formatters-pre-commit-hooks/compare/v2.13.0...v2.14.0 )
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
2024-07-16 08:08:46 +02:00
Micha
4c05928766
add marginal cost to preven model degeneracy ( #1155 )
2024-07-15 16:41:32 +02:00
Lukas Trippe
98a9d2795f
chore: ignore all pre-commit commits in blame ( #1151 )
2024-07-12 16:24:19 +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
Micha
c50a3770ea
Merge pull request #1144 from PyPSA/restrict_waste_heat
...
Follow-up: Adjusted release note of #1141
2024-07-11 13:25:57 +02:00
pre-commit-ci[bot]
c8021704b6
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2024-07-11 10:08:56 +00:00
cpschau
7411ae145c
adjusted release note
2024-07-11 11:56:48 +02:00
Micha
4dd0bb8f3a
Merge pull request #1141 from PyPSA/restrict_waste_heat
...
FT and electrolysis waste heat for DH as float
2024-07-11 11:25:41 +02:00
cpschau
530671ec07
add release note
2024-07-09 14:25:33 +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
pre-commit-ci[bot]
31753143f5
[pre-commit.ci] pre-commit autoupdate ( #1140 )
...
updates:
- [github.com/fsfe/reuse-tool: v3.1.0a1 → v4.0.3](https://github.com/fsfe/reuse-tool/compare/v3.1.0a1...v4.0.3 )
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
2024-07-09 09:17:17 +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
Fabian Neumann
43c0c3871f
Merge pull request #1120 from fhg-isi/patch-1
...
suggestion to fill missing section in sentence
2024-07-06 12:18:28 +02:00
Martha Frysztacki
02abc99c60
Merge pull request #1127 from PyPSA/fix_env
...
restrict geopandas until conflicts are resolved
2024-07-03 11:17:47 +02:00
Martha Frysztacki
358561a619
Update envs/environment.yaml
...
Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>
2024-07-03 08:33:03 +02:00
