Fabian Neumann
e16fa286ec
merge master
2023-04-29 12:41:37 +02:00
Fabian Neumann
30beee0959
Merge branch 'master' into multiyear
2023-04-29 12:40:55 +02:00
Fabian
1f6f7a2039
replace config.yaml by config/config.yaml in doc and docstrings
2023-04-21 10:41:44 +02:00
Fabian Neumann
55395c5465
enhance documentation, with instructions for sector-coupled / electricity-only studies
2023-03-15 17:00:06 +01:00
Fabian Neumann
9c1182fe96
prepare release 0.7
2023-02-16 11:50:55 +01: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
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
31bc87adba
Merge branch 'master' into meta
2022-07-26 14:02:26 +02:00
Fabian Neumann
f52c8cd974
merge master
2022-07-22 18:30:16 +02:00
Fabian Hofmann
3ba7e2ab90
Merge branch 'master' into technology-data
2022-07-21 15:36:12 +02:00
Fabian Neumann
b04a55a248
merge former countries hydro profiles
2022-07-20 15:03:48 +02:00
Fabian Neumann
217780263d
store config and wildcards in n.meta
2022-06-30 08:39:03 +02:00
Fabian Neumann
520f7e440e
Merge branch 'master' into technology-data
2022-06-25 11:05:41 +02:00
Fabian Neumann
ec4a45b46b
add weather_year wildcard to mock_snakemake objects
2022-06-15 15:03:17 +02:00
Fabian Neumann
9a37fe6572
merge master
2022-06-15 09:22:51 +02:00
Fabian Neumann
2403650be2
prepare: allow varying emission prices in opts wc: e.g. Ep80.5
2022-04-08 10:27:55 +02:00
Fabian Neumann
02c06017d3
prepare: add gas consumption limit through wildcard: CH4L
2022-04-08 10:27:23 +02:00
Fabian Neumann
bd75953674
add logging to co2limit2
2022-04-08 10:26:38 +02:00
Fabian Neumann
f9ede37a02
allow varying marginal cost of carrier in opts wc: CCGT+m2.0
2022-04-08 10:26:16 +02:00
Fabian Neumann
51dffbefa3
add gas usage limit constraint
2022-04-05 16:59:51 +02:00
Fabian Neumann
c54ddab4a3
remove unused simple_hvdc_costs
2022-03-24 14:47:00 +01:00
Fabian Neumann
52b0d29fae
merge master
2022-02-18 10:24:26 +01:00
martacki
6cdf3a2879
use snakemake keywords directly without extracting them beforehand
2022-01-24 19:48:26 +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
martacki
505f093141
fix ordering of kwargs in add_co2limit
2022-01-13 18:00:22 +01:00
Fabian Hofmann
2c318a247e
Update scripts/prepare_network.py
...
Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>
2022-01-11 09:55:22 +01:00
Fabian Neumann
646c5011af
Merge branch 'master' into snakemake_dependencies_in_functions
2021-11-10 09:46:57 +01:00
Fabian Neumann
2e02af8b4b
change license
2021-09-14 16:37:41 +02:00
martacki
dfb929f2cf
remove snakemake dependencies in functions, use as kwarg instead
2021-09-14 16:34:02 +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
11af828c39
remove six dependency ( #245 )
2021-05-25 11:29:47 +02:00
Fabian Neumann
70078d03b2
add unresolved merge conflict to be addressed
2021-04-27 16:14:52 +02:00
Fabian Neumann
4ec06f54bc
merge master
2021-04-27 14:47:15 +02:00
Chiara Anselmetti
ed4fdc9150
Keep links to store components when using ATK wildcard ( #214 )
...
* Update prepare_network.py
The new ATK wildcard removes all lines + links without further distinction; however, since storage options are now modeled as store components, the links to and from the the storage units for (dis)charge are eliminated as well. Thus, the storage options drop out of the optimisation.
Especially when only allowing renewables as generation sources, optimisation may become infeasible for a high temporal resolution (capacity factors = 0 for certain hours; no further options to serve the load).
This issue does not arise with the ATKc wildcard, since bus0 and bus1 of the (dis)charge links share the same country code.
The proposed change is a very quick fix in the enforce_autarky function, solely removing DC links.
* Update scripts/prepare_network.py
Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>
* Update prepare_network.py
Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>
2021-01-11 10:27:27 +01:00
Fabian Neumann
2fc1ea0255
some refactoring and code cleaning ( #190 )
...
* some refactoring and code cleaning
* execute pre-commit
* pre-commit: limit large files
* add license to .pre-commit
* add pre-commit to env
* solve: tidy memory logger
* travis: add conda list for easier debugging
* undo config test/tutorial without plotting, rm matplotlibrc, .licenses
* remove {networks} wildcard
* unadd pre-commit config
* add release notes
* restore REUSE compliance
* fix docs environment python version
* env: remove gurobi from dependencies
* fix unclean merge block
* fix elif to if
* lighter rtd style
* lighter rtd style II
2020-12-03 19:50:53 +01:00
Fabian Neumann
84edde8f63
add time series segmentation with tsam package ( #186 )
...
* add time segmentation with tsam
* cut off SEG
* Snakefile: adjust memory function
* untangle memory reservation calculation
* prepare: document segmentation option
* correct typo
2020-12-03 16:02:21 +01:00
Fabian Neumann
03170f4aaf
add option for p_nom_max factors in {opts} wildcard ( #207 )
...
* prepare: add option for potential reduction sweeps
* prepare: fix attr lookup for potential/cost reduction sweeps
* prepare: fix attr naming cost -> capital_cost
* add release notes
2020-11-26 17:25:14 +01:00
Fabian Neumann
2e70e8d15b
prepare: fix transmission limit when no HVDC links in network ( #209 )
2020-11-12 17:37:43 +01:00
Fabian Neumann
ca0ad08438
reflect filename changes in documentation
2020-10-18 14:47:46 +02:00
Fabian Neumann
8a323b7267
cost: move defaults to config and improve documentation
2020-10-16 11:38:26 +02:00
Fabian Neumann
bcd7f86b5c
remove {networks} wildcard
2020-10-09 17:03:49 +02:00
Fabian Neumann
6deac6ced3
merge master
2020-10-03 11:15:39 +02:00
Martha Maria
52683236cd
prepare_network: fix nmo security margin ( #199 )
...
* prepare_network: fix nmo security margin
* Update doc/release_notes.rst
Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>
* Update scripts/prepare_network.py
Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>
Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>
2020-10-02 15:55:22 +02:00
Fabian Neumann
ab6dc633bf
Options for regional equity and autarky ( #166 )
...
* solve: add option for equity constraints
* solve: scale more
* prepare: add option to limit line/link capacity
* solve: add inflow to EQ constraints
* solve: reindex inflow to match load
* update config files and references
* add autarky option
* move release notes
* add spillage to equity requirements
* prepare: fix accidental code removal
* prepare: add country autarky option
* consider snapshot_weightings for inflow
* trigger CI
2020-09-26 13:10:50 +02:00
Fabian Neumann
b756773b9d
merge master
2020-09-26 11:21:16 +02:00
Fabian Neumann
ec803a372e
add cost uncertainty opts for suptechs ( #189 )
2020-09-24 10:09:11 +02:00
Fabian Neumann
cbd22c2efd
execute pre-commit
2020-09-11 15:26:43 +02:00
Fabian Neumann
f6dd2e12f3
some refactoring and code cleaning
2020-09-11 12:40:53 +02:00
