Commit Graph

307 Commits

Author SHA1 Message Date
Philipp Glaum
d51ca8695b update Fabians comments 2022-09-19 11:46:58 +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
Philipp Glaum
24e008a98e add feature: aggregate carrier exclusion 2022-09-16 14:25:15 +02:00
lisazeyen
77dfca76e0 uncommented annual dictionaries, set reference year to 2050 2022-09-14 16:44:53 +02:00
Fabian
b694337541 scenario management: use "shared_cutouts" instead of "dedicated_cutouts" 2022-09-13 14:54:58 +02:00
Fabian Hofmann
863dbf0417
Merge branch 'master' into scenario-management 2022-09-12 15:45:51 +02:00
Fabian Neumann
5f08dca2fd prepare release 0.6.0 2022-09-10 15:31:43 +02:00
Fabian
71ba743e46 enable scneario management for different configs 2022-09-08 10:28:07 +02:00
Ebbe Kyhl Gøtske ekg@mpe.au.dk
e34bd9b7fb Change costs year in snakefile and config file 2022-08-31 13:07:43 +02:00
lisazeyen
3daff49c99
Merge pull request #256 from PyPSA/fix-bug-myopic-co2
Fix bug myopic co2
2022-08-09 21:33:31 +02:00
lisazeyen
b42e76040d small clean up 2022-08-09 21:30:45 +02:00
lisazeyen
9752b4b4e6
Merge branch 'master' into pellet-boiler 2022-08-05 12:25:01 +02:00
lisazeyen
cfd8759684 small clean up 2022-08-05 11:27:14 +02:00
lisazeyen
8c62fb1b56
Merge branch 'master' into btl 2022-08-04 16:13:09 +02:00
lisazeyen
23539ee219
Update config.default.yaml
set default of biosng to false
2022-08-04 15:34:20 +02:00
Fabian Neumann
ca183ba89e add zenodo dataset for download 2022-08-02 15:56:47 +02:00
Fabian Neumann
09d126706e
Merge branch 'master' into shipping_raster 2022-08-02 15:01:05 +02:00
lisazeyen
7c3b4b6664 split grouping years for power and heat techs 2022-08-02 09:18:06 +02:00
lisazeyen
6c13974643 add option to cluster heat buses 2022-08-01 18:02:55 +02:00
millingermarkus
65aaa3d188 Added tech color for biomass boiler and minor adaptations to biomass boiler process 2022-08-01 15:28:53 +02:00
millingermarkus
6211823514 Added color for BioSNG and minor adaptations 2022-08-01 15:13:59 +02:00
millingermarkus
4d1dc2db8b Added tech color for biomass to liquid 2022-08-01 15:04:45 +02:00
Markus Millinger
082d655a6c
Added pellet_boiler toggle option in yaml 2022-08-01 13:38:47 +02:00
Markus Millinger
603d1597c4
Added BioSNG toggle to yaml 2022-08-01 13:24:04 +02:00
Markus Millinger
2d06d207be
Added biomass_to_liquid option toggle in yaml 2022-08-01 13:12:27 +02:00
Philipp Glaum
6d070a19e0 initial ship raster implementation 2022-07-28 10:38:24 +02:00
Fabian Neumann
bfcc08665d make resolution of exclusion calculation a configurable option 2022-07-27 13:40:41 +02:00
Fabian Neumann
de83a4987b disable co2 vent by default 2022-07-26 15:47:17 +02:00
Fabian Neumann
8fc0c57ed6 update copyright years 2022-07-26 15:05:59 +02:00
Fabian Neumann
e523cb4cb5 doc: minor updates 2022-07-26 15:01:21 +02:00
Fabian Hofmann
b5308fa72b
Merge branch 'master' into technology-data 2022-07-21 17:03:36 +02:00
Max Parzen
3210bbf8f9 clean config, add H2 pipeline comment 2022-07-21 14:43:28 +01:00
Fabian Hofmann
3ba7e2ab90
Merge branch 'master' into technology-data 2022-07-21 15:36:12 +02:00
Fabian Neumann
3986856282 merge master 2022-07-01 10:13:33 +02:00
Fabian Neumann
27e5dec4e6 documentation fixes 2022-06-30 09:01:49 +02:00
Fabian Neumann
74f8ca1c7f
Merge branch 'master' into eu-energy-security 2022-06-28 08:09:39 +02:00
martacki
f1dedd9429 hierarchical clustering: release notes & revert to old default clustering algorithm (kmeans) 2022-06-27 21:11:49 +02:00
Martha Frysztacki
50a518a155
Merge branch 'master' into introduce_hac_clustering 2022-06-27 20:45:40 +02:00
Fabian Neumann
51de606aab
Revert "remove build/retrieve natura raster, directly use shapefile" 2022-06-27 19:00:41 +02:00
Ebbe Kyhl
5ae56cca7c
Apply suggestions from code review
Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>
2022-06-27 18:06:59 +02:00
Fabian
b56d1f6f4d conventional config section: update to more general attribute assignment scheme 2022-06-27 17:35:19 +02:00
Martha Frysztacki
5587327be3
Merge branch 'master' into harmonize_clustering_strategies 2022-06-27 14:02:45 +02:00
Fabian Neumann
5ca231824e
Merge branch 'master' into eu-energy-security 2022-06-27 08:58:37 +02:00
Fabian Neumann
520f7e440e
Merge branch 'master' into technology-data 2022-06-25 11:05:41 +02:00
martacki
c9c738e96b clustering strats to configurables: set defaults for yaml-incompatible strats + include in stubaggregation 2022-06-24 20:57:53 +02:00
Fabian
441d7d56f9 fix eafs and conventional setttings 2022-06-23 16:04:49 +02:00
Fabian Neumann
d69efe3d1f add ammonia color to config.default.yaml 2022-06-23 15:22:21 +02:00
martacki
b4d8dd8ecb add changes from PR #379 2022-06-20 19:21:08 +02:00
martacki
bef4967e84 clustering strategies moved to configurables 2022-06-20 18:58:23 +02:00
Ebbe Kyhl
2a3b576cbd Add coal with carbon capture 2022-06-14 15:00:53 +02:00
Fabian Neumann
27ac40d2ea use spatial namespace to manage ammonia resolution 2022-06-10 16:56:00 +02:00
Fabian Neumann
a2a4cf7c02 use config to manage conversion efficiencies 2022-06-10 16:43:29 +02:00
Fabian Neumann
2d562c1349 add coloring for ammonia 2022-06-10 14:57:03 +02:00
Fabian Neumann
6cfee1f98a add ammonia as carrier: with Haber-Bosch, crackers, store, load 2022-06-10 14:46:39 +02:00
Fabian
0ec3a8638b add_electricity & config:
- refactor attachment of conventional carriers
  - refactor scaling of renewable carriers
2022-06-09 20:31:50 +02:00
Irieo
aa2820c9b1 fix grouping years list issue caused by newer powerplant database 2022-05-31 16:16:40 +02:00
Fabian Neumann
cdd56288ff fix EU bus location with new config setting 2022-04-12 16:21:09 +02:00
Fabian Neumann
8af21f3355 Merge remote-tracking branch 'origin/eu-energy-security' into results-dir 2022-04-08 15:46:37 +02:00
euronion
c412a61013
Add country-specific EAF restriction for NPPs. (#361)
* Add country-specific EAF restriction for NPPs.

Based on historic figures from IAEA.

* Update release_notes.rst
2022-04-08 15:41:23 +02:00
Fabian Neumann
4a18d59789 Merge branch 'eu-energy-security' into results-dir 2022-04-08 12:34:11 +02:00
Fabian
e37a3f57ab adjust biomass capacities 2022-04-08 12:23:24 +02:00
Fabian Neumann
64424ed208 add results dir to simplify multiple configs (like PyPSA-Eur-Sec) 2022-04-07 21:13:48 +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
c4bb470b93 add release note and instructions on global gas limit 2022-04-05 17:05:50 +02:00
Fabian Neumann
51dffbefa3 add gas usage limit constraint 2022-04-05 16:59:51 +02:00
Fabian
1fd6a685ab powerplants: filter out powerplants with shut down date < 2021 2022-04-05 15:12:01 +02:00
Fabian Neumann
ade22bf4f0 add existing wind and solar capacities based on IRENASTATS 2022-04-04 19:03:09 +02:00
Fabian Neumann
5a7c0d7967 remove build/retrieve natura raster, directly use shapefile 2022-03-20 10:03:17 +01:00
euronion
2e84bd484d Replace "closed" with "inclusive" in config. 2022-03-04 21:16:19 +01:00
Fabian Neumann
c754f253bc plotting adjustments for pypsa 0.19.1 2022-02-20 16:13:11 +01:00
Martha Frysztacki
25b3245923
Merge branch 'master' into introduce_hac_clustering 2022-02-04 14:35:14 +01:00
Fabian Neumann
dbf0f65ab5
Update config.default.yaml 2022-01-24 11:16:23 +01:00
Fabian Neumann
a747c88d08 disable solar PV CF correction factor for default satellite data (closes #285) 2022-01-13 15:42:48 +01:00
Fabian Neumann
510ef20937 allow H2 cavern storage in nearshore area for ecological brine disposal 2021-12-18 16:17:31 +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
e2e069fe2d default: disable gas network, enable distribution grid 2021-12-03 17:59:17 +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
d04f6c02a7
Merge branch 'master' into retrofit-gas-pipelines 2021-11-29 09:13:51 +01:00
Fabian Neumann
263628fa22
add option to automatically download and extract sector databundle (#198) 2021-11-29 09:12:55 +01:00
Fabian Neumann
3ecb761b57
add regionalised hydrogen salt cavern storage potentials (#191)
* add regionalised hydrogen salt cavern storage potentials

* fix reading in salt-cavern potentials and typo in imports

* by default disable nearshore and offshore salt cavern potentials

Co-authored-by: lisazeyen <lisa.zeyen@web.de>
2021-11-29 09:12:07 +01:00
martacki
299e71e2b3 introduce hierarchical agglomeratice clustering (hac) 2021-11-17 13:46:33 +01:00
Fabian Neumann
c0d1656091 build_load_data: separate retrieving and processing load data 2021-11-10 10:37:09 +01:00
Fabian Neumann
985705403e revision gas infrastructure representation 2 2021-11-04 21:48:54 +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
04a6685e07 add additional aliases and colors 2021-10-23 21:23:34 +02:00
Fabian Neumann
2a0855915c add review suggestion for p2h technologies 2021-10-23 21:23:01 +02:00
Fabian Neumann
c095c3aa10 review with lisazeyen 2021-10-06 18:33:54 +02:00
Fabian Neumann
7592624ef2 add new color scheme for more distinguishing colors 2021-10-06 16:41:10 +02:00
Fabian Neumann
a431bbd5a7
Merge branch 'master' into master 2021-10-06 12:23:14 +02:00
Fabian Neumann
af625d7379 config: reduce default deployment density for offshore wind 2021-10-05 12:18:10 +02:00
Koen van Greevenbroek
5ee280b96f Update default CPLEX options following PyPSA update
For more recent versions of CPLEX and PyPSA, using dotted options
works while the current default crashes a CPLEX solve with
"AttributeError: 'RootParameterGroup' object has no attribute
'barrier_convergetol'". See https://github.com/PyPSA/PyPSA/pull/168.
2021-10-05 11:00:30 +02:00
Fabian Neumann
23a167c308 config: co2_budget is currently compulsory. Add back in. 2021-10-04 18:12:19 +02:00
Fabian Neumann
2597d980e0 config: optimise default for overnight scenario for consistency planning/cost year 2021-10-04 14:29:53 +02:00
Fabian Neumann
692f4705c4 merge master 2021-10-04 13:21:33 +02:00
lisazeyen
4135718e37 use agriculture sector as default, add missing colors 2021-10-04 09:23:54 +02:00
Fabian Neumann
aca1023c3d bump version to 0.6.0 2021-10-02 11:17:29 +02:00
Fabian Neumann
2e6e9c6802
Merge branch 'master' into agriculture-energy-co2 2021-10-02 10:51:28 +02:00
Fabian Neumann
90079248a3
Merge branch 'master' into dh-share 2021-09-30 14:48:26 +02:00