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

2695 Commits

Author SHA1 Message Date
Fabian Neumann
d142d5a50b
aggregate curtailment into single curtailment generator per bus (#1177) 
* add curtailment generator mode

* add documentation
 2024-07-24 10:54:15 +02:00
AmosSchledorn
de10492e10 Merge remote-tracking branch 'origin/master' into update-district-heating-cops 2024-07-23 17:30:51 +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
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
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
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
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
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
millingermarkus
c7ce47dffd Energy penalty for solid biomass CHP 2024-07-03 09:22:09 +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
LukasFrankenQ
2801b00100 Merge https://github.com/pypsa/pypsa-eur 2024-05-26 22:38:03 +01:00
Fabian Neumann
7ad930ee2e bug: add_electricity only add carriers in powerplant dataset for country subset 2024-05-25 21:13:47 +02:00
Fabian Neumann
a60e6fca55 bugfix: ensure separately calculated sums are entered (follow-up to #990) 2024-05-25 18:02:56 +02:00
Fabian Neumann
fd9e93b4b0 transport demand: clarify units in code comments 2024-05-25 17:16:47 +02:00
Fabian Neumann
422c37827c time_aggregation: handle case without any temporal aggregation 2024-05-25 15:48:48 +02:00
Fabian Neumann
5397f3fe85 avoid duplicate existing RES capacities (closes #1016) 2024-05-24 09:47:23 +02:00
Fabian Neumann
703b206e1f tidy up update_residential_from_eurostat 2024-05-21 20:16:57 +02:00
Fabian Neumann
4e85ddc5c9 Merge branch 'update_households_energy' of github.com:yerbol-akhmetov/pypsa-eur into yerbol-akhmetov-update_households_energy 2024-05-21 19:02:18 +02:00
Fabian Neumann
c600d327b0 Merge branch 'master' of github.com:PyPSA/pypsa-eur into eurostat-march2024 2024-05-21 18:49:41 +02:00
Fabian Neumann
fd7dcb2e8a
Merge pull request #1075 from koen-vg/time-agg-fix 
Minor bugfixes for new time aggregation implementation
 2024-05-21 18:29:18 +02:00
Koen van Greevenbroek
b6fa0043bf Fix disabling transmission limit for volume limit type 2024-05-21 18:14:31 +02:00
Koen van Greevenbroek
2a6dcc4c12 Minor bugfixes for new time aggregation implementation 2024-05-21 18:09:09 +02:00
pre-commit-ci[bot]
288ccbd513 [pre-commit.ci] auto fixes from pre-commit.com hooks 
for more information, see https://pre-commit.ci
 2024-05-21 14:00:43 +00:00
Fabian Neumann
eb4381be4d update energy balances April 2023 link 2024-05-21 15:59:46 +02:00
Fabian Neumann
0370deebca apply pre-commit 2024-05-21 15:30:56 +02:00
Fabian Neumann
da10374158 apply ruff linting 2024-05-21 15:28:24 +02:00
Fabian Neumann
9545b757b0 correctly trigger add_solar_potential_constraints 2024-05-21 15:28:03 +02:00
Fabian Neumann
ca451fe9d5 ruff: safe fixes 2024-05-21 14:55:58 +02:00
Fabian Neumann
d19a3bcb64 time_aggregation: handle case where resolution is bool false 2024-05-21 14:22:21 +02:00
pre-commit-ci[bot]
b29b9e6c5d [pre-commit.ci] auto fixes from pre-commit.com hooks 
for more information, see https://pre-commit.ci
 2024-05-20 20:25:43 +00:00
Fabian Neumann
3f01938eee
Merge branch 'master' into fix_biomass_transport 2024-05-20 22:24:59 +02:00
Fabian Neumann
00efffcc13 move up methanol for industry, to before shipping 2024-05-20 22:06:31 +02:00
Fabian Neumann
0ad3489d3a Merge branch 'feature/methanol-production' of github.com:Climact/pypsa-eur-climact into Climact-feature/methanol-production 2024-05-20 22:06:15 +02:00
Fabian Neumann
eeb548c03f Merge branch 'feature/fix-industry-intermediate' of github.com:Climact/pypsa-eur-climact into Climact-feature/fix-industry-intermediate 2024-05-20 21:44:19 +02:00
Fabian Neumann
60a26a67a0 simplify check for coal/coke industry demand 2024-05-20 21:08:44 +02:00
Fabian Neumann
476349292c Merge branch 'feature/fix-non-steel-coal-demand' of github.com:Climact/pypsa-eur-climact into Climact-feature/fix-non-steel-coal-demand 2024-05-20 21:01:16 +02:00
Fabian Neumann
a8cd1186b8 clarify differences between Co2L in {sector_opts} and {opts} wildcard (closes #865) 2024-05-20 17:18:55 +02:00
Fabian Neumann
c7d8af998c only apply rolling horizon setting in (closes #864) 2024-05-20 17:00:56 +02:00
Fabian Neumann
a2012d8937 pre-commit formatting [no ci] 2024-05-20 15:49:40 +02:00
Fabian Neumann
65b05e92a1 Merge branch 'feature/enhance-agg-p-nom-limits' of github.com:Climact/pypsa-eur-climact into Climact-feature/enhance-agg-p-nom-limits 2024-05-20 15:49:14 +02:00
Fabian Neumann
f76f7879f0 Merge branch 'fix_energy_totals' 2024-05-20 15:38:09 +02:00
Fabian Neumann
f25c594a07 bugfix: include total heavy-duty road freight; do not treat total transport as other but including electricity 2024-05-20 15:37:54 +02:00
Fabian Neumann
408e24de80 Merge branch 'master' of github.com:PyPSA/pypsa-eur 2024-05-20 15:01:05 +02:00
Fabian Neumann
c89ce9f045 bugfix: correctly distinguish existing OCGT and CCGT 2024-05-20 15:00:46 +02:00
Fabian Neumann
d2c48b6603
Merge pull request #1071 from SermishaNarayana/master 
Modification to function "add_operational_reserve_margin" in solve_ne…
 2024-05-20 12:45:10 +02:00
Fabian Neumann
7ce15931e5 add simplified power distribution grid losses 2024-05-20 12:41:54 +02:00
pre-commit-ci[bot]
6722e584ba [pre-commit.ci] auto fixes from pre-commit.com hooks 
for more information, see https://pre-commit.ci
 2024-05-20 10:03:44 +00:00
Sermisha
d7435b6214 Modification to function "add_operational_reserve_margin" in solve_network.py 
Typecasted pandas dataframes to xarray datasets to allow for multiplication with pypsa variables
 2024-05-20 15:30:38 +05:30
Fabian Neumann
6c9fc50a1c Merge branch 'master' of github.com:PyPSA/pypsa-eur 2024-05-20 11:54:20 +02:00
Fabian Neumann
60441ddfdd pre-commit formatting [no ci] 2024-05-20 11:52:23 +02:00
Fabian Neumann
bf33518135 time_aggregation: add missing logger object 2024-05-20 11:51:45 +02:00
Fabian Neumann
9152425936 remove handling of tsam as optional dependency 2024-05-20 11:51:24 +02:00
Fabian Neumann
9527f4cf77 Merge branch 'split-out-time-agg' of github.com:koen-vg/pypsa-eur into koen-vg-split-out-time-agg 2024-05-20 11:38:02 +02:00