Commit Graph

343 Commits

Author SHA1 Message Date
lisazeyen
8c5ca05eb4 add carbon constraint to perfect 2023-08-24 08:42:24 +02:00
martavp
46cdf2bf3a Merge branch 'fix-min-capacity-myopic' of https://github.com/PyPSA/pypsa-eur into fix-min-capacity-myopic 2023-08-22 11:08:57 +02:00
martavp
9cee4384bb revert commented lines 2023-08-22 11:08:51 +02:00
lisazeyen
e92fc4ff4d merge master 2023-08-22 10:21:42 +02:00
pre-commit-ci[bot]
69132bd6e2 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-08-22 06:41:43 +00:00
martavp
2391a5c4e9 fix p_nom_min of renewable generators for myopic approach
as described in https://github.com/PyPSA/pypsa-eur/issues/727
2023-08-22 08:31:46 +02:00
Fabian
e28ae59375 introduce scenario-management 2023-08-15 15:06:59 +02:00
Fabian Hofmann
1ea8cf47d8
Merge branch 'master' into validation 2023-07-31 11:20:11 +02:00
Fabian Neumann
8e6a70b468 prepare release 0.8.1 2023-07-27 11:23:02 +02:00
Fabian
d60be3fece Merge branch 'master' into validation 2023-07-26 13:01:34 +02:00
Fabian Hofmann
269a08006f
Merge branch 'master' into validation 2023-07-25 12:30:32 +02:00
Fabian Hofmann
3eac0c1127
Merge branch 'master' into multilinks-default 2023-07-24 13:42:50 +02:00
lisazeyen
5c90083e9b merge master 2023-07-21 16:32:11 +02:00
Fabian
c7ef8e8c64 solve network: update mock snakemake 2023-07-20 14:36:22 +02:00
Fabian Neumann
268391e204
Merge branch 'master' into master 2023-07-18 14:07:27 +02:00
Fabian Neumann
a0366fb2bc
Merge branch 'master' into multilinks-default 2023-07-18 14:05:57 +02:00
Fabian Hofmann
40b87cac04
Merge branch 'master' into validation 2023-07-17 19:24:13 +02:00
Fabian Hofmann
9f4c227def
Merge branch 'master' into describe-config 2023-07-14 13:34:20 +02:00
pre-commit-ci[bot]
fc36efaebe [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-07-13 20:35:05 +00:00
Fabian Neumann
b110810669 no more override_component_attrs for multilinks 2023-07-13 22:31:55 +02:00
Fabian Hofmann
f90ef3bb73
Merge branch 'master' into validation 2023-07-12 12:32:35 +02:00
Fabian
723350c8ef solve_network: enable rolling horizon 2023-07-11 17:48:35 +02:00
pre-commit-ci[bot]
6492b1a195 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-07-10 23:02:57 +00:00
lisazeyen
26156943cf
remove TODO comment
the clipping of the p_min_pu value cannot be removed since it is used for the retrofitting generators which have to follow the heat demand profile. Otherwise the network becomes infeasibe.
2023-07-10 16:15:27 +02:00
Fabian
9c6e5e0ed0 config: remove unneeded plotting entries 2023-07-05 11:34:07 +02:00
Fabian Hofmann
ebe6c1f1e1
Merge branch 'master' into validation 2023-06-29 17:49:02 +02:00
Fabian
0dd1933057 solve_network: fix argument for linopy groupby 2023-06-29 16:21:45 +02:00
pre-commit-ci[bot]
a8f69821dc [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-06-29 12:51:43 +00:00
Fabian
519a4f2a2a move uc assigment to add_electricity
make code backwards-compatible
2023-06-29 14:50:41 +02:00
pre-commit-ci[bot]
cc6bae282f [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-06-29 06:11:13 +00:00
Fabian Hofmann
07224751e5
Merge branch 'master' into validation 2023-06-29 08:10:52 +02:00
Fabian
1d10073514 review params implementation; reproduce objective values in CI 2023-06-15 18:52:25 +02:00
Ricardo
b7aa122fda Fixed issue (most likely) introduced when merging PyPSA-Eur with PyPSA-Eur-Sec 2023-06-12 20:40:51 +02:00
pre-commit-ci[bot]
d6057cb92b [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-06-03 10:10:08 +00:00
virio-andreyana
8dbcca560c
minor fixes in solve_network.py 2023-06-03 12:09:51 +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
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
5be21dfc5a add option for piecewise linear transmission loss approximation 2023-05-12 09:07:16 +02:00
pre-commit-ci[bot]
7d6d6d2805 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-05-11 14:59:12 +00:00
virio-andreyana
654f46f868
alpha testing complete vresutils removal 2023-05-11 16:58:35 +02:00
Fabian
2ea394b681 solve_network: disable mem logger 2023-04-27 13:59:15 +02:00
Fabian
9913522e09 reinsert co2 price 2023-04-27 12:11:12 +02:00
Fabian
a6ae03d133 fixup non-clustering of conventional generators 2023-04-27 10:11:35 +02:00
pre-commit-ci[bot]
9ae7a93ccb [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-04-26 16:07:28 +00:00
lisazeyen
e6f0d8a990 fix bug load shedding constraint 2023-04-26 18:07:02 +02:00
lisazeyen
a2e3e91630
fix bug in load shedding constraint 2023-04-26 18:05:56 +02:00
Fabian
d962969519 solve_network: solve network fix kwargs 2023-04-26 17:47:49 +02:00
Fabian
dcc7b4cebb solve_network: fix UC 2023-04-26 17:19:32 +02:00
lisazeyen
956079765c bug fix uc constraint 2023-04-26 16:19:16 +02:00
Fabian
1a42b0c928 update uc attributes 2023-04-26 15:44:45 +02:00
Fabian
e2119d6229 fix unit_commitment function and file, add it to config.validation 2023-04-26 15:37:46 +02:00
pre-commit-ci[bot]
2433c00dcb [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-04-25 13:52:57 +00:00
lisazeyen
9fc9476c6b add UC function 2023-04-25 14:57:56 +02:00
Fabian Neumann
e20e7bf844 fix addition of load shedding 2023-04-24 12:33:55 +02:00
Fabian
5c8e0080c8 pre-commit: update docformatter version 2023-04-21 10:11:44 +02:00
lisazeyen
1cd658c03f
rename constraint
rename constraint to fit to other syntax

Co-authored-by: Fabian Hofmann <fab.hof@gmx.de>
2023-04-20 09:55:50 +02:00
pre-commit-ci[bot]
51785524a3 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-04-20 07:39:18 +00:00
lisazeyen
27dc9cedfd fix bugs in reserve constraint 2023-04-20 09:35:53 +02:00
pre-commit-ci[bot]
5f554ab28f [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-04-06 13:57:30 +00:00
lisazeyen
f0d6d2be07 add multi-deacde 2023-04-05 15:47:03 +02:00
lisazeyen
d836970004 always add load shedding with 1e2 2023-04-05 10:39:16 +02:00
Fabian Neumann
55395c5465 enhance documentation, with instructions for sector-coupled / electricity-only studies 2023-03-15 17:00:06 +01:00
Fabian
8ff4685531 follow up 2023-03-10 17:30:51 +01:00
Fabian
373c64a592 solve_network: check if sector_opts is in wildcard 2023-03-10 17:14:01 +01:00
Fabian
ebc5a99338 follow up: fix img path 2023-03-10 16:12:02 +01:00
Fabian
e9bf639f2d solve_network: add line breaks in docstring 2023-03-10 16:10:01 +01:00
Fabian
5fe4032e47 solve_network: reinsert docstring 2023-03-10 16:07:21 +01:00
Fabian Hofmann
30b8bb3c94
Update scripts/solve_network.py
Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>
2023-03-10 16:00:52 +01:00
Fabian
99a9ea8beb adress review comments 2023-03-10 15:58:53 +01:00
Fabian
4f0ddf2e95 fix Nyears scaling 2023-03-10 14:12:22 +01:00
Fabian
2baf8f5ba4 harmonive solve_network across workflow 2023-03-09 23:56:12 +01:00
pre-commit-ci[bot]
a9b09e4ae4 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-03-09 13:27:08 +00:00
Max Parzen
4cb21f05ec add Linopy to PyPSA 2023-03-09 13:24:25 +00:00
Fabian Neumann
91ea0a3f55 docs: rearrange sections 2023-03-09 13:28:42 +01:00
Fabian Neumann
43f226b2a3 split solve network rules, take summary scripts from Sec 2023-03-06 12:10:23 +01:00
Fabian Neumann
97bbafdd70 Merge remote-tracking branch 'pypsa-eur-sec/master' into merge-pypsa-eur-sec 2023-03-06 11:54:08 +01:00
pre-commit-ci[bot]
5ab10eae37 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-03-06 08:40:21 +00:00
Fabian
3bbd321b82 config: separate solver_options
solve_network: adjust code to new solver_options config
2023-03-06 09:35:11 +01:00
pre-commit-ci[bot]
13769f90af [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-03-06 08:27:46 +00:00
lisazeyen
332936bcec adjust p_nom_max if existing larger 2023-02-22 17:44:05 +01:00
Fabian
7e87044424 solve_network: warn if network is not optimal 2023-02-21 21:58:42 +01:00
Fabian Neumann
9c1182fe96 prepare release 0.7 2023-02-16 11:50:55 +01:00
Fabian
7d5d48ac26 solve network: fix sequestration constraint 2023-02-10 18:58:30 +01:00
Fabian
98e3c7ab2c solve_network: fix kwargs in solve_network 2023-02-08 22:59:36 +01:00
Fabian
f4d0415cf0 solve_network: activate co2 seq constraint
Snakefile: retrieve data bundle from pypsaeur function
2023-02-08 18:19:31 +01:00
Fabian Hofmann
d144547d87
Merge branch 'ci-review' into linopy-integration 2023-02-08 15:37:00 +01:00
Fabian
faa95c500c config: modularize solver_options 2023-02-08 15:24:17 +01:00
Fabian
69dabc367f ci: fix test configs 2023-02-08 15:24:17 +01:00
Fabian
6c57b81a4a config: move solver options in dedicated section
test configs: reduce to relative changes
CI: use snakemake --configfile options
2023-02-08 15:24:17 +01:00
Fabian
c25091ce34 solve_network.py: switch to linopy interface 2023-02-08 15:19:32 +01:00
Fabian
c8f601edf8 solve.py: start converting extra_funcionalities 2023-02-08 15:19:32 +01:00
Fabian Neumann
27e6039379
Merge branch 'master' into pz-max-patch-2 2023-01-28 08:26:28 +01:00
pre-commit-ci[bot]
8bdba5653a [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-01-23 21:27:20 +00:00
Max Parzen
545a734b7b
Merge branch 'master' into pz-max-patch-2 2022-12-16 12:20:58 +00:00
Max Parzen
9e61e30ff4
Fix EQ constraint in case no hydro exist 2022-12-16 11:00:39 +00:00
Max Parzen
b7899787cf
Fix load variable in reserve constraint 2022-12-16 10:50:20 +00:00
pre-commit-ci[bot]
94e5f160b0 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2022-11-25 10:16:23 +00:00
martacki
643a62049b solve_network: move extra_functionality to args 2022-11-25 11:08:35 +01:00
lisazeyen
9a74e3d699 set co2seq to limit of sequestration potential 2022-09-29 09:12:36 +02:00
lisazeyen
7606562449 update sector opt for co2 seq potential 2022-09-28 16:09:53 +02:00
pre-commit-ci[bot]
5d1ef8a640 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2022-09-16 13:04:06 +00:00
Fabian Neumann
9cf5be84fd bugfix: solve_network should look for wildcard sector_opts 2022-08-03 17:07:19 +02:00
Fabian Neumann
2857691367
Merge pull request #246 from PyPSA/meta
store config and wildcards in n.meta
2022-08-01 21:01:06 +02:00
Fabian Neumann
a1507124f6 Merge branch 'release-v0.5' into meta 2022-07-27 09:43:36 +02:00
Fabian Neumann
8fc0c57ed6 update copyright years 2022-07-26 15:05:59 +02:00
Fabian Neumann
cb00ba58ce add option to specify any config through sector opts with CF:<label>:...:value 2022-07-20 11:35:12 +02:00
Fabian Neumann
b96207c73e store config and wildcards in n.meta 2022-06-30 08:42:18 +02:00
Fabian Neumann
217780263d store config and wildcards in n.meta 2022-06-30 08:39:03 +02:00
Fabian Hofmann
3294ad92eb
Update scripts/solve_network.py
Co-authored-by: Martha Frysztacki <martha.frysztacki@kit.edu>
2022-06-28 13:14:47 +02:00
Fabian Neumann
5ca231824e
Merge branch 'master' into eu-energy-security 2022-06-27 08:58:37 +02:00
Fabian Neumann
2a55ad2162
Merge branch 'master' into load-shedding-carrier 2022-06-24 20:19:37 +02:00
Fabian
441d7d56f9 fix eafs and conventional setttings 2022-06-23 16:04:49 +02:00
lisazeyen
cfdec7e56d simplify pipe retrofitting constraint 2022-04-12 10:04:27 +02:00
Fabian Neumann
a4dab4306b merge master 2022-04-11 17:10:17 +02:00
Fabian Neumann
40c882f0e9 solve: allow to parse load shedding cost in config 2022-04-08 13:19:25 +02:00
Fabian Neumann
630fb9783f fix to operational reserve margin to work without any extendable gens 2022-04-07 17:20:56 +02:00
Fabian Neumann
84e146834c Apply suggestion from code review to add switch 2022-04-07 15:22:10 +02:00
Fabian Neumann
3678e5c523 Add operational reserve margin constraint analogous to GenX
Co-authored-by: FabianHofmann <hofmann@fias.uni-frankfurt.de>
2022-04-07 14:39:34 +02:00
Fabian Neumann
1a82b87587 skip iterations if no lines are expandable 2022-03-24 14:30:28 +01:00
lisazeyen
03fca360ff style improvement 2022-03-21 09:14:15 +01:00
lisazeyen
08cef37e7e improve code style 2022-03-18 10:22:00 +01:00
lisazeyen
5502943301
scripts/solve_network.py: Style improvement
Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>
2022-03-17 18:15:59 +01:00
Fabian
d16f24fc07 follow up 2022-03-03 23:08:29 +01:00
Fabian
8700f63cdb solve_network: fix load shedding attributes 2022-03-03 18:13:54 +01:00
martacki
6cdf3a2879 use snakemake keywords directly without extracting them beforehand 2022-01-24 19:48:26 +01:00
Tim Pedersen
0d7ad643bc
Resolved error whith /tmp (#224) 2022-01-24 14:34:54 +01:00
martacki
f28a088ea3 arguments in function calls instead of kwarg-style 2022-01-14 11:30:15 +01:00
martacki
deac9f32e7 move snakemake keys (input, output, config, ...) to own variables 2022-01-14 11:05:15 +01:00
lisazeyen
9f8b54a3ce adjust pipe retrofitting constraint to work with myopic 2022-01-07 16:59:14 +01:00
Fabian Neumann
d1762919c5
add option 'seqXXX' to sweep global co2 sequestration potentials (#208)
* add option 'seqXXX' to sweep global co2 sequestration potentials

* add release notes
2021-12-10 12:05:38 +01:00
Fabian Neumann
82096f92e8
fix for GlobalConstraints mu with "co2_sequestration_limit" (#211)
* fix for GlobalConstraints mu with co2_sequestration_limit

* add release notes
2021-12-06 11:31:48 +01:00
Fabian Neumann
a2459881ef
allow H2 retrofitting from CH4 pipelines without endogenous CH4 grid (#204)
* allow H2 retrofitting from CH4 pipelines without endogenous CH4 grid

* add small capital cost to gas pipelines to incentivise decommissioning

* add release notes
2021-11-29 12:42:10 +01:00
Fabian Neumann
6a00d5bfca revision gas infrastructure representation 2021-11-03 20:34:43 +01:00
Fabian Neumann
37e2e53486
Merge branch 'master' into retrofit-gas-pipelines 2021-11-02 19:03:26 +01:00
Fabian Neumann
4375083838 create parallel structures for land-use constraints w/wo m 2021-10-02 10:40:49 +02:00
Fabian Neumann
ff6d736a89
Merge branch 'master' into myopic-low-clustering-gens 2021-09-30 14:51:45 +02:00
Fabian Neumann
2e02af8b4b change license 2021-09-14 16:37:41 +02:00
Martha Frysztacki
1c173567b5
solve_operations_network: include optimized stores to operation (#269)
* remove stores-buses from load generators

* include optimized stores to operation network

* add release notes

* Update doc/release_notes.rst

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

* Update doc/release_notes.rst

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

* Update release_notes.rst

* Update scripts/solve_network.py

Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>
2021-08-18 10:38:51 +02:00
Fabian Neumann
54a509f3dd
Merge branch 'master' into co2-network 2021-08-06 15:51:40 +02:00
Fabian Neumann
4cc5e49ca8
Adapt to new snapshot weightings (#259)
* for now use n.snapshot_weightings.generators

* require pypsa master; use .objective for Nyears

* implement suggestions from code review

* add release note
2021-08-06 13:43:12 +00:00
Fabian Neumann
3754643e81 add co2 sequestration potential global constraint 2021-08-06 12:46:03 +02:00
Fabian Neumann
e1f1d71b8d apply option for retrofitted pipe capacity per CH4 capacity in solve_network 2021-08-04 10:49:06 +02:00
Leon
85111e2ae3
Omitting unnecessary constraints on the CHP units (#155)
* Omitting unnecessary constraints on the CHP units

All CHPs in pypsa-eur-sec are operating on the backpressure line and this set of extra constraints to ensure working in the operational space of the CHPs is hence not necessary at the moment.

* remove chp constraints function call
2021-08-04 09:20:09 +02:00
lisazeyen
554b55ff3d
Update solve_network.py
fix bug in pipe retroftting constraint
2021-07-13 08:50:15 +02:00
Fabian Neumann
195cabba0c merge master 2021-07-06 09:55:41 +02:00
martavp
103ad49671 Enable use of lower generators clustering than network clustering 2021-07-05 12:19:43 +02:00