Commit Graph

5012 Commits

Author SHA1 Message Date
cpschau
f8d0efbe99
Addition of unsustainable biomass potentials (#1139)
* add columns to potential df defined by difference to eurostat

* add network components

* add unsustainable bioliquids

* replaced stores by generators, still infeasible

* remove municipal waste

* remove separate treatment of waste from biomass potential calculation

* phase out unsustainble biomass potentials

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

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

* phase-out unsustainable bioliquids

* remove waste_incineration from build_sector rule

* multiple potential calculation for different planning horizons

* raised costs of unsustainable solid biomass

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

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

* stores instead of generators

* change snakemake inputs

* add phas-eout to config

* add techcolor for unsustainable bioliquids

* add config parameter to disable inclusion of unsustainable bioenergy potentials

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

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

* add biomass to params

* remove call of snakemake object in define_spatial

* Quick resolve of review part 1 (config parameters, if-clause-reduction, bioliquid spatial, fix bioliquid link capacity

* Quick resolve of review part 2 (config table, helper function, fixed build_eurostat, removed dir-change, forced unsustainable usage, reverted overnight distinction in Snakefile)

* Cast of planning_horizon parameter to int type after test run

* added JRC fuel costs for solid and liquid biofuels, BtL VOM

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

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

* clean-up after master merge

* adressed review (increase threads for build_eurostat, fixed e_max_pu of Stores, changed version of technology-data); added release note

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: lisazeyen <35347358+lisazeyen@users.noreply.github.com>
2024-08-07 15:52:00 +00:00
Fabian Neumann
fb41016c60
EEZ: Update EEZ to v12, auto-download and remove from databundle (#1188)
* eez: update to version 12, autodownload, remove pycountry

* eez: do not simplify as it distorts topology

* remove missed merge conflicts
2024-08-07 15:28:55 +02:00
Fabian Neumann
c907d59253
remove unused rule prepare_links_p_nom (#1203)
* remove rule

* [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-08-07 15:20:08 +02:00
lisazeyen
6d75e86fe4
Merge pull request #1190 from PyPSA/auto-dl-countries
naturalearth: automatically download and remove from data bundle
2024-08-07 14:58:31 +02:00
lisazeyen
842d4b36e6
Merge branch 'master' into auto-dl-countries 2024-08-07 14:47:45 +02:00
lisazeyen
d7436a6405
Merge pull request #1175 from PyPSA/update-district-heating-cops
Approximate district heating COPs via Jensen et al. 2018
2024-08-07 14:29:58 +02:00
lisazeyen
bab392f378
remove not needed function 2024-08-07 14:14:19 +02:00
pre-commit-ci[bot]
9c32932eee [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-08-07 08:18:40 +00:00
Fabian Neumann
6e8ea1b329
Merge branch 'master' into update-district-heating-cops 2024-08-07 10:17:27 +02:00
Fabian Neumann
59574211a4 retrieve.smk: consistently use conda directive 2024-08-07 10:15:35 +02:00
lisazeyen
24f05f51d2
fix intersphinx mapping 2024-08-07 09:56:26 +02:00
AmosSchledorn
0e8fb80bc4 clean up, improve docs 2024-08-05 16:11:18 +02:00
AmosSchledorn
2e35bef480 rename "enums" to "definitions" and write modules in snake case 2024-08-05 15:08:05 +02:00
AmosSchledorn
4fe8eeeffa rename "enums" to "definitions" and write modules in snake case 2024-08-05 15:07:46 +02:00
AmosSchledorn
93d60a2927 remove obsolote cop inputs from solve_perfect.add_existing_baseyear 2024-08-05 12:26:26 +02:00
AmosSchledorn
ea7fc92546 update solve_perfect.add_existing_baseyear input/params 2024-08-05 12:19:43 +02:00
AmosSchledorn
268ff93783 fix boiler buses for existing heating 2024-08-05 12:07:24 +02:00
AmosSchledorn
d40ff8e963 Merge branch 'update-district-heating-cops' of https://github.com/PyPSA/pypsa-eur into update-district-heating-cops 2024-08-05 11:45:23 +02:00
AmosSchledorn
f593983ea0 update copyright notic in heatSector 2024-08-05 11:45:12 +02:00
pre-commit-ci[bot]
61bb225a34 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-08-05 09:42:45 +00:00
AmosSchledorn
7bd0c16ddd Merge remote-tracking branch 'origin/master' into update-district-heating-cops 2024-08-05 11:42:18 +02:00
AmosSchledorn
390085aaad update add_existing_baseyear 2024-08-05 11:35:34 +02:00
AmosSchledorn
5773877f64 Merge branch 'update-district-heating-cops' of https://github.com/PyPSA/pypsa-eur into update-district-heating-cops 2024-08-05 11:35:11 +02:00
AmosSchledorn
5362c37696 update myopic mode to heat system declarations 2024-08-05 11:27:52 +02:00
Bobby Xiong
813e54555a
Corrected Moyle Interconnector capacity in links_p_nom.csv to 500 MW (#1199) 2024-08-05 11:18:02 +02:00
lisazeyen
bad875a432
Merge pull request #1195 from PyPSA/msw_incineration
Msw incineration
2024-08-05 10:56:22 +02:00
pre-commit-ci[bot]
e0b5fe9048 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-08-05 08:46:30 +00:00
lisazeyen
69f51ec7d6 add release notes and doc for new config settings 2024-08-05 10:45:57 +02:00
lisazeyen
7447a3d0c9 Merge remote-tracking branch 'origin' into msw_incineration 2024-08-05 10:38:25 +02:00
lisazeyen
a56834e51e add switch for msw waste 2024-08-05 10:38:11 +02:00
Fabian Neumann
ddf0da2687
base_network: bugfix - bring voronoi cells in correct order 2024-08-04 16:01:51 +02:00
pre-commit-ci[bot]
0259e066e4 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-08-02 15:28:14 +00:00
AmosSchledorn
10e0b30a40 Merge branch 'update-district-heating-cops' of https://github.com/PyPSA/pypsa-eur into update-district-heating-cops 2024-08-02 17:27:18 +02:00
AmosSchledorn
a990a898ef update naming in add_existing_baseyear 2024-08-02 17:27:16 +02:00
pre-commit-ci[bot]
6b924ecfb0 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-08-02 15:15:11 +00:00
AmosSchledorn
3ccdde3467 Merge remote-tracking branch 'origin/master' into update-district-heating-cops 2024-08-02 17:14:31 +02:00
AmosSchledorn
e5152897e1 Merge remote-tracking branch 'origin/master' into update-district-heating-cops 2024-08-02 17:03:51 +02:00
AmosSchledorn
bbf64a2fde Refactor module structure 2024-08-02 17:03:34 +02:00
AmosSchledorn
76b377b2d1 udpate docs 2024-08-02 17:02:16 +02:00
pre-commit-ci[bot]
f58322c3e5 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-08-02 15:02:11 +00:00
lisazeyen
b62db80435 fix bug with e_max_pu 2024-08-02 17:01:22 +02:00
pre-commit-ci[bot]
3149bfd926 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-08-02 14:47:24 +00:00
lisazeyen
69c6a4dca4 set e_max_pu to force municipal waste to be used 2024-08-02 16:45:57 +02:00
AmosSchledorn
318e05c9fb refactor naming 2024-08-02 16:29:54 +02:00
lisazeyen
68e9593b01 merge master 2024-08-02 15:58:01 +02:00
AmosSchledorn
4a6dd2fe33 fix naming bugs 2024-08-02 15:56:37 +02:00
lisazeyen
7a16dd2aa4
Merge pull request #1194 from PyPSA/biomass_import
Biomass import
2024-08-02 15:36:02 +02:00
pre-commit-ci[bot]
e28c66e43c [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-08-02 13:27:42 +00:00
lisazeyen
440f3e4a7f add release notes 2024-08-02 15:26:32 +02:00
lisazeyen
2d79673d5e merge master 2024-08-02 15:23:35 +02:00