Commit Graph

50 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
0df54bc370 Squashed commit of the following:
commit a2b82195b872bae11a9e247c53756ca3ae512362
Author: Fabian Neumann <fabian.neumann@outlook.de>
Date:   Fri Aug 30 16:13:36 2024 +0200

    minor adjustments

commit 4f9eb04fec4534abbef10fedd4d9b5c34f064670
Merge: 7b525a51 bf2d82a3
Author: Fabian Neumann <fabian.neumann@outlook.de>
Date:   Fri Aug 30 16:08:58 2024 +0200

    Merge branch 'master' into master

commit 7b525a515a36a4ebb248280546583ac843f6b277
Merge: d9033374 a357ba11
Author: danielelerede-oet <daniele.lerede@openenergytransition.org>
Date:   Mon Aug 26 13:21:06 2024 +0200

    Merge branch 'master' into master

commit d9033374e4bf0bb70df0828743b9aab69c0cbb27
Author: danielelerede-oet <daniele.lerede@openenergytransition.org>
Date:   Mon Aug 26 10:34:27 2024 +0200

    Update scripts/solve_network.py

    Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>

commit 98e6c5b0f152ca7e064b3c80be26f50040628388
Author: danielelerede-oet <daniele.lerede@openenergytransition.org>
Date:   Mon Aug 26 10:34:21 2024 +0200

    Update scripts/solve_network.py

    Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>

commit be19a2ba2401a2815c09e74d2add24461b3fe2aa
Author: danielelerede-oet <daniele.lerede@openenergytransition.org>
Date:   Mon Aug 26 10:34:15 2024 +0200

    Update scripts/solve_operations_network.py

    Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>

commit 8093eaa399cfea62d1ef93ec4ed5ed46bf5dcc6d
Author: danielelerede-oet <daniele.lerede@openenergytransition.org>
Date:   Mon Aug 26 10:34:08 2024 +0200

    Update scripts/solve_network.py

    Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>

commit 746d1761accbe44d3a851430b94844fe3ab43d72
Author: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date:   Wed Aug 21 15:29:12 2024 +0000

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

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

commit f46fdee7f7ceeb9040ee73123fa4a3bd1aa14a56
Author: Daniele Lerede <daniele.lerede@openenergytransition.org>
Date:   Wed Aug 21 17:11:32 2024 +0200

    fix solve_operations_network
2024-08-30 16:15:34 +02:00
Philipp Glaum
8d9afb0eb0 solve_electricity.smk:replace "minimal" by "shallow" 2024-03-19 08:28:27 +01:00
Fabian Neumann
cb4013812e
Merge branch 'master' into multiyear 2024-03-15 14:28:42 +01:00
Fabian Neumann
7fa6811760 Merge branch 'master' into multiyear 2024-03-13 09:13:31 +01:00
Fabian Neumann
06fa9c92da remove copy_config rule and write config for each solved network 2024-03-13 08:57:57 +01:00
Fabian Neumann
ed71978b92 use humanfriendly walltime specifications 2024-03-09 14:47:01 +01:00
pre-commit-ci[bot]
f4f4c1bf37 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-03-04 17:26:41 +00:00
Fabian Neumann
c2011bce49 remove {weather_year} wildcard 2024-03-04 17:48:56 +01:00
Koen van Greevenbroek
c2e7c125c7 Automatic formatting of snakemake rules 2024-03-01 13:24:02 +01:00
Koen van Greevenbroek
de0c0cd1f4 Merge remote-tracking branch 'upstream/master' into multiyear 2024-03-01 11:45:31 +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
Fabian Neumann
945180f153 allow_missing in collection rules, fixes for myopic, wildcard constraints without function 2024-02-17 23:37:03 +01:00
Fabian Neumann
89d0fa24b6 further adjustments to latest master branch commits 2024-02-17 17:38:46 +01:00
Fabian Neumann
16e42c8fe6 further progress and bugfixes 2024-02-16 11:17:00 +01:00
pre-commit-ci[bot]
4ff06046fc [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-02-10 17:09:49 +00:00
Fabian Neumann
a9dad3f34e add new resources(), logs(), benchmarks(), config_providers() 2024-02-10 18:09:23 +01:00
Fabian Neumann
6de08bd523 Merge branch 'master' into scenario-management 2024-02-10 17:22:01 +01:00
Fabian Neumann
eeb3d0789b correctly read number of solver threads in rule definition 2024-01-23 18:03:14 +01:00
Fabian Neumann
d145758fb7 gracefully handle absent extra_functionality file; add file to path 2024-01-04 09:00:31 +01:00
Fabian Neumann
f28e9b47d2 add custom_extra_functionality param to solve_electricity rule 2024-01-02 16:00:41 +01:00
Fabian Neumann
b8fee80919 Merge branch 'master' into multiyear 2023-10-08 11:55:11 +02:00
Fabian
f96c2d0589 update solve smk files to properly consider scenanrios 2023-09-22 13:58:08 +02:00
Fabian
62c6143863 scenario-management: reenable shared resources, make shared resources wildcards dependent 2023-08-23 17:14:57 +02:00
Fabian
ad6322bcb3 address review commments 2023-08-04 12:58:31 +02:00
Fabian Hofmann
6e7bbe1e08
Merge branch 'master' into validation 2023-08-03 18:28:10 +02:00
Fabian
1bf6ea1532 only copy active configuration to results folder
use copy config for all solve rules
remove copying of environment
2023-08-02 14:49:32 +02:00
Fabian Neumann
ddd1840981 Merge remote-tracking branch 'origin/master' into multiyear 2023-07-26 10:23:32 +02:00
Fabian
c7f67f0641 make fuel prices flexible over years
fix marginal cost issue (on pypsa)
minor fixes
2023-07-06 19:14:01 +02:00
Fabian
9958425a44 complete structure for plotting electricity production 2023-07-05 11:07:36 +02:00
Fabian
519a4f2a2a move uc assigment to add_electricity
make code backwards-compatible
2023-06-29 14:50:41 +02:00
Fabian Hofmann
07224751e5
Merge branch 'master' into validation 2023-06-29 08:10:52 +02:00
pre-commit-ci[bot]
0f5bb8b893 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-06-02 10:53:11 +00:00
virio-andreyana
83ff639ad5 amend solve_network 2023-06-02 12:52:49 +02:00
virio-andreyana
e581ca930c made params more specific 2023-05-27 15:50:37 +02:00
pre-commit-ci[bot]
ead87afce1 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-05-27 10:23:30 +00:00
virio-andreyana
1c73bb0342 add params for solve_network 2023-05-27 12:22:53 +02:00
virio-andreyana
28d39680c6
Merge branch 'master' into post-merge-param 2023-05-19 16:19:58 +02:00
virio-andreyana
1fc48d8753
using python algorithm to edit rules and script 2023-05-15 10:33:17 +02:00
Fabian Neumann
e29571535b remove references to memory logfile in *.smk, add release note 2023-05-12 07:11:41 +02:00
pre-commit-ci[bot]
e8772c3340 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-04-30 08:54:50 +00:00
Fabian Neumann
6acd5da4d4 Merge branch 'multiyear-sec' into multiyear 2023-04-29 18:49:49 +02:00
Fabian
c2095ec897 fix uc input file name 2023-04-26 15:42:21 +02:00
Fabian
e2119d6229 fix unit_commitment function and file, add it to config.validation 2023-04-26 15:37:46 +02:00
Fabian
2baf8f5ba4 harmonive solve_network across workflow 2023-03-09 23:56:12 +01:00
Fabian Neumann
bf895de7cc add logfiles to all rules 2023-03-08 19:22:00 +01:00
Fabian Neumann
4b3372b53b apply snakefmt to rules/ 2023-03-08 17:46:14 +01:00
Fabian Neumann
8eb37bc263 add conda directive to all rules for use with --use-conda 2023-03-08 17:44:25 +01:00
Fabian Neumann
6bae022d44 modularise Snakefile using rules/*.smk files 2023-03-08 17:29:01 +01:00