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

4991 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Fabian Neumann
f11f8d8613 solver settings: add copt-gpu setings for pdlp solver 2024-07-22 21:51:52 +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
pre-commit-ci[bot]
5361facbb7 [pre-commit.ci] auto fixes from pre-commit.com hooks 
for more information, see https://pre-commit.ci
 2024-07-22 13:39:06 +00:00
Fabian Neumann
745df4d2c1 fix typo 2024-07-22 15:22:32 +02:00
AmosSchledorn
46f9c7b520 Merge remote-tracking branch 'origin/master' into update-district-heating-cops 2024-07-22 14:45:38 +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
AmosSchledorn
560373a864 add DH cops to network 2024-07-19 18:54:30 +02:00
AmosSchledorn
0c7e7cb46b fix naming, udpate docs 2024-07-19 18:54:19 +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
AmosSchledorn
052394fa88 change naming from individual/district heating to denctral/central heating 2024-07-19 15:57:53 +02:00
AmosSchledorn
f3c898f43d build district heating heat pump COPs using approximation from Jensen et al. and values from Pieper et al. 2024-07-19 15:39:16 +02:00
AmosSchledorn
167b056def remove obsolete rural/urban COPs and rename cop_..._total to cop_..._individual_heating 2024-07-19 15:22:50 +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]
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
pre-commit-ci[bot]
e42b36e83d [pre-commit.ci] auto fixes from pre-commit.com hooks 
for more information, see https://pre-commit.ci
 2024-07-04 11:40:21 +00:00
millingermarkus
fbacb76e9c Minor edits to MSW 2024-07-04 13:34:05 +02:00
millingermarkus
c81d208da2 Remove redundant Waste CHP addition 2024-07-04 11:59:32 +02:00
Markus Millinger
521cf0e753
Merge branch 'PyPSA:master' into msw_incineration 2024-07-04 11:53:00 +02:00
pre-commit-ci[bot]
5ca27837f3 [pre-commit.ci] auto fixes from pre-commit.com hooks 
for more information, see https://pre-commit.ci
 2024-07-04 09:21:00 +00:00
millingermarkus
5c7bb2bf51 Add option to exclude fossil fuels 2024-07-04 11:16:00 +02:00
pre-commit-ci[bot]
ee6d8b1e42 [pre-commit.ci] auto fixes from pre-commit.com hooks 
for more information, see https://pre-commit.ci
 2024-07-04 08:22:24 +00:00
millingermarkus
c71fa78bfa Added biomass imports to prepare sector network 2024-07-04 10:18:19 +02:00
Markus Millinger
821eb07e98
Correct costs of BtL and BioSNG 2024-07-04 09:59:45 +02:00
pre-commit-ci[bot]
192a8eb14b [pre-commit.ci] auto fixes from pre-commit.com hooks 
for more information, see https://pre-commit.ci
 2024-07-04 07:30:52 +00:00
Markus Millinger
270ce82b9f
Cost correction 2024-07-04 09:30:22 +02:00
pre-commit-ci[bot]
b934653b65 [pre-commit.ci] auto fixes from pre-commit.com hooks 
for more information, see https://pre-commit.ci
 2024-07-03 10:42:07 +00:00
millingermarkus
84ddfea91e Added electrobiofuels 2024-07-03 12:38:16 +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
pre-commit-ci[bot]
53328e89f2 [pre-commit.ci] auto fixes from pre-commit.com hooks 
for more information, see https://pre-commit.ci
 2024-07-03 08:07:32 +00:00
millingermarkus
76e15d6862 Carbon capture capital cost for waste CHP 2024-07-03 09:42:15 +02:00
millingermarkus
b5ff1e8f9c Added note on carbon capture for BioSNG and BtL 2024-07-03 09:38:08 +02:00