Commit Graph

5073 Commits

Author SHA1 Message Date
Philipp Glaum
a9f67b313f
handle new and upgraded TYNDP&NEP lines/links in base network (OSM compatible) (#1085)
* add general implementation to add tyndp and nep. TODO: Remove duplicate?

* pre_osm_merge

* clean and update base_network.py
update default config settings

* clean and update base_network.py
update default config settings

* base_network.py:remove adding of transmission projects
add_transmission_project.py: add new script for creating lines and link csv from transmission projects
add_electricity.py: add new projects from created csv files

* cluster_network.py: do not allow to group lines with different build years together-> requires pypsa update
simplify_network.py: fix bug of simplify links

* remove legacies of removing transmission projects from base_network

* restructure folders:new folder for tranmission project csv
add_transmission_projects: improve logging, cleanup

* update lines csvs and add default line type for upgraded and new lines

* remove duplicate lines which were already in gridkit

* allow to connect ac lines only to ac buses

* add manual links csv (adjusted links_tyndp.csv) and update default config

* add realease note

* remove links_tyndp.csv file, references in build_elec.smk and function in base_network.py to add them

* add configuration options for transmission projects to documentation and add template folder for transmission projects

* update pypsa version in environments

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

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

* integrate Fabian's review comments 2

* add electricity:add import pathlib and duplicate printing out of adding line projects

* update NEP line csv

* address Fabian's comments

* build_transmission_projects: address Fabian's final comments
simplify_network: use modus to get line type which appears most often

* build_transmission_project: change from .geometry to ["geometry"]

* build_transmission_projects: remove redundanty line

* build_transmission_projects: remove buffer for europe shape because of higher resolution
default config: fix wrong key for skip argument in transmission_projects

* update configtables and default config

* update manual links csv and delete undetected duplicate links in tyndp2020

* final adjustments

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>
2024-08-15 11:42:21 +02:00
Fabian Neumann
f72afe7d10 bugfix: make sure to include Ukraine offshore shapes with new EEZ files 2024-08-14 16:27:06 +02:00
Bobby Xiong
1cf85b0be8
Fix for Corsica in simplify_network: Include local substation (#1215)
* Fixed simplify_network.py to handle more complex topologies, i.e. if two links are connected to nearby AC buses separated by an AC line.

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

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

* Added fix for Corsica node: If region containing Corsica is modelled, include substation on Corsica as supernode (end point).

* [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-14 14:22:03 +02:00
Bobby Xiong
3ef6d519d7
Fix simplify_network.py to handle more complex topologies (#1211)
* Fixed simplify_network.py to handle more complex topologies, i.e. if two links are connected to nearby AC buses separated by an AC line.

* [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-14 10:24:38 +02:00
Fabian Neumann
f263862455
use lower resolution EEZ shapes to reduce excessive RAM use (#1210) 2024-08-13 21:03:07 +02:00
Fabian Neumann
6ca8e80095
add option to use atlite to smooth wind turbine power curves (#1209) 2024-08-13 18:13:32 +02:00
pre-commit-ci[bot]
d58a848f97
[pre-commit.ci] pre-commit autoupdate (#1208)
updates:
- [github.com/psf/black-pre-commit-mirror: 24.4.2 → 24.8.0](https://github.com/psf/black-pre-commit-mirror/compare/24.4.2...24.8.0)

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
2024-08-13 16:46:34 +02:00
Bobby Xiong
c79a9faa2c
Updated under_construction status of links that are commissioned by now (#1205)
* Updated links 14802, 14801, 12931, 14803, 14848, 14804: under_construction=False

* Updated links 14802, 14801, 14803, 14848, 14804: under_construction=False

* Updated link 8394 and parameter_corrections: Continuation of North-Sea-Link.
2024-08-12 16:56:10 +02:00
lisazeyen
07fe3ca9e2
Merge pull request #1167 from PyPSA/jrc-idees-2020
Jrc idees 2021
2024-08-12 15:39:52 +02:00
lisazeyen
6686e6e196
Update doc/release_notes.rst
Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>
2024-08-12 15:27:24 +02:00
pre-commit-ci[bot]
156eccefb7 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-08-09 12:24:39 +00:00
lisazeyen
9b8139abbe add docstring 2024-08-09 14:24:12 +02:00
lisazeyen
c5256c1f37 add coke oven transformation output 2024-08-09 14:24:12 +02:00
lisazeyen
fe9185ef3f
Merge branch 'master' into jrc-idees-2020 2024-08-09 14:17:25 +02:00
lisazeyen
70db93fd32 correct sheet name chemical feedstocks 2024-08-09 13:14:47 +02:00
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]
6a51a1d94e [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-08-07 09:59:09 +00:00
lisazeyen
95903eeca7
Merge branch 'master' into jrc-idees-2020 2024-08-07 11:58:22 +02:00
lisazeyen
5bf36c218c add ch data as csv 2024-08-07 11:49:33 +02:00
lisazeyen
7e75aab295 directly read in nan values 2024-08-07 10:47:22 +02:00
lisazeyen
7848e08bc7 create previous idees split for aviation 2024-08-07 10:40:23 +02:00
lisazeyen
6b3fc18386 include review fneum build_industrial_production_per_country 2024-08-07 10:33:47 +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
8794f53050 rename eurostat_2015 2024-08-07 10:11:07 +02:00
lisazeyen
682d53d1b5 remove /bundle 2024-08-07 10:07:52 +02:00
lisazeyen
24f05f51d2
fix intersphinx mapping 2024-08-07 09:56:26 +02:00
pre-commit-ci[bot]
3c528b7b0a [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-08-06 15:52:01 +00:00
lisazeyen
a9d991f547 fix release notes 2024-08-06 17:51:10 +02:00
lisazeyen
5725e8bf22 remove comment about uk flights 2024-08-06 17:47:35 +02:00
lisazeyen
2c7e30bb17 remove ammonia demand script 2024-08-06 17:46:23 +02:00
lisazeyen
0ec367ed7a
save idees directly in data not in bundle
Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>
2024-08-06 17:37:36 +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