Commit Graph

197 Commits

Author SHA1 Message Date
Fabian Neumann
013b705ee4
Clustering: build renewable profiles and add all assets after clustering (#1201)
* Cluster first: build renewable profiles and add all assets after clustering

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

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

* correction: pass landfall_lengths through functions

* assign landfall_lenghts correctly

* remove parameter add_land_use_constraint

* fix network_dict

* calculate distance to shoreline, remove underwater_fraction

* adjust simplification parameter to exclude Crete from offshore wind connections

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

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

* remove unused geth2015 hydro capacities

* removing remaining traces of {simpl} wildcard

* add release notes and update workflow graphics

* [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>
Co-authored-by: lisazeyen <lisa.zeyen@web.de>
2024-09-13 15:37:01 +02:00
Fabian Neumann
bbff4297f9
temporarily disable n.shapes until memory issues resolved (#1238) 2024-08-26 15:16:06 +00:00
Bobby Xiong
ef0bbd5f37
Custom busmap (#1231)
* Added functionality to set custom_busmaps for different base_networks.

* Updated configtables and location for busmaps.

* Added release nots.

* removed run parameter in mock_snakemake (only used for debugging).

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

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

---------

Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
2024-08-23 17:35:46 +02:00
Fabian Neumann
73d1353608 cluster_network: fix if no clustering required 2024-08-23 09:17:21 +02:00
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
ca451fe9d5 ruff: safe fixes 2024-05-21 14:55:58 +02:00
Koen van Greevenbroek
76c201ef7d Integrate build_bus_regions into base_network
Fixes a problem with the `build_bus_regions` writing to base.nc
without declaring base.nc as an output.
2024-05-03 14:53:18 +02:00
Fabian
f1b33992f7 move append_bus_shapes to build_bus_regions, apply it where possible 2024-04-11 13:27:52 +02:00
Fabian
219847012d build_bus_regions: fix shapes index for correct alignment in madd
cluster_regions: further modularize functions, fix index alignment
2024-04-11 12:56:49 +02:00
Fabian
590d363579 clustering: add docstring to cluster_regions function, fix network reference 2024-04-11 12:13:07 +02:00
Fabian
47134a88d8 regions to n.shapes: smooth out remaining issues 2024-04-10 18:35:50 +02:00
Fabian
9686407756 cluster_network: add regions to n.shapes 2024-04-10 18:19:46 +02:00
Thomas Gilon
b673b947ea Fix custom busmap read in cluster network 2024-04-09 17:30:38 +02:00
Fabian
585f9a32a7 cluster_network: ensure correct indexing of weights 2024-03-25 14:16:20 +01:00
Thomas Gilon
fd01cb0a75 Fix type error in cluster_network with "m" configuration 2024-03-22 16:01:42 +01:00
Fabian Neumann
d0951abded cluster_network: allow more solvers that can handle quadratic problems 2024-03-21 12:02:02 +01:00
Fabian Neumann
9d913bcb38 smaller fixes and reduction of diff 2024-03-04 19:36:41 +01:00
pre-commit-ci[bot]
7b584f16bb [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-03-04 16:56:00 +00:00
Fabian Neumann
c2011bce49 remove {weather_year} wildcard 2024-03-04 17:48:56 +01:00
Koen van Greevenbroek
de0c0cd1f4 Merge remote-tracking branch 'upstream/master' into multiyear 2024-03-01 11:45:31 +01:00
Fabian Hofmann
58bcef4625
cluster_network: update solver_name if clause style 2024-02-27 11:39:26 +01:00
Adrian Odenweller
1db30ae63b Allow CPELX for MIQP in cluster_network 2024-02-24 12:10:08 +01:00
Fabian Neumann
719d4dad23 Merge branch 'master' into scenario-management 2024-02-20 12:08:54 +01:00
Fabian Neumann
16e2286188 update copyright years to 2024 2024-02-19 16:21:48 +01:00
pre-commit-ci[bot]
e838b63ded [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-02-10 16:22:38 +00:00
Fabian Neumann
6de08bd523 Merge branch 'master' into scenario-management 2024-02-10 17:22:01 +01:00
Fabian Neumann
3691f9f4c1 update version compatibility handling 2024-02-09 13:59:15 +01:00
Fabian
46d8ce8f1f address deprecation warnings 2024-01-31 17:10:08 +01:00
Fabian Hofmann
9c558a3e46
Update scripts/cluster_network.py
Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>
2024-01-30 17:37:44 +01:00
Fabian
56b22a3b4e env: correct pyscipopt dependency
cluster_network: address deprecation warning
2024-01-30 10:29:08 +01:00
Fabian
ca1628a585 cluster_network: tidy up 2024-01-29 12:22:42 +01:00
Fabian
81e7c4eb67 remove pyomo dependency in cluster network, use scip as OS solver 2024-01-29 12:08:56 +01:00
Fabian
025688bf70 refactor and fix remaining linting problems 2024-01-19 12:17:45 +01:00
Fabian Neumann
c3bb41c900 Merge branch 'master' into multiyear 2024-01-03 15:14:27 +01:00
pre-commit-ci[bot]
ea3fdb6c15 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-12-18 08:58:15 +00:00
Fabian Neumann
c304738ea5 fix to restore compatibility with PyPSA v0.26.0 2023-12-12 18:18:03 +01:00
Fabian Neumann
ea7a66b873
Merge pull request #794 from PyPSA/mv-focus-weights
move focus_weights into clustering configuration segment
2023-12-11 20:10:46 +01:00
Fabian Neumann
a59eb821ff for clustering fall back to ipopt when highs is solver 2023-12-06 11:07:04 +01:00
Fabian Neumann
e5bdb4796a move focus_weights into clustering configuration segment (backward compatible) 2023-12-06 10:09:17 +01:00
Fabian Neumann
dfecf35bae add focus_weights to documentation 2023-11-20 19:45:10 +01:00
Fabian Neumann
b8fee80919 Merge branch 'master' into multiyear 2023-10-08 11:55:11 +02:00
pre-commit-ci[bot]
f054180a62 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-10-08 09:20:59 +00:00
Sourcery AI
3c36c60bdd 'Refactored by Sourcery' 2023-10-08 09:20:36 +00:00
Fabian
e28ae59375 introduce scenario-management 2023-08-15 15:06:59 +02:00
Fabian
62cb6fbdd8 validation: download input data files instead 2023-08-04 17:38:21 +02:00
Fabian Neumann
ddd1840981 Merge remote-tracking branch 'origin/master' into multiyear 2023-07-26 10:23:32 +02:00
Fabian
01aaeb730d cluster_network: introduce efficiency classes for clustering 2023-07-25 12:29:39 +02:00
Fabian
d22c87419b update enviromnent yaml to install pypsa from master
cluster: allow custom strategies for all components
2023-07-17 14:03:16 +02:00
Fabian
8e568cee03 cluster network: remove bus strategies as already handled internally 2023-07-14 16:00:21 +02:00
Fabian
f566142d38 cluster network: update to new clustering module (pypsa v0.25) 2023-07-14 15:47:41 +02:00