Commit Graph

602 Commits

Author SHA1 Message Date
Adam-Dvorak1
35c2e5354e
Equation edits 2022-08-24 10:13:01 +02:00
Adam-Dvorak1
1727fc7999
Equation edits 2022-08-24 10:12:23 +02:00
Adam-Dvorak1
66a465aad7
Eq insert in iron and steel 2022-08-24 10:08:59 +02:00
Adam-Dvorak1
efc7304f4b
Merge branch 'martavp:improve-doc' into improve-doc 2022-08-24 09:46:25 +02:00
Adam-Dvorak1
d859738b7d
Incorporating Marta changes 2022-08-24 09:45:34 +02:00
Adam-Dvorak1
18c31495a8
Remove test 2022-08-24 09:43:22 +02:00
martavp
bbc4e78587
Merge pull request #16 from GormBruunAndresen/improve-doc
Added land transport
2022-08-19 18:03:02 +02:00
Gorm Bruun Andresen
79ed33aa0a Small change to land transport
Very minor change
2022-08-19 16:10:36 +02:00
Gorm Bruun Andresen
aa3b1f957c Description of land transport
The description of land transport is added. It needs a review since that has not been done yet.
2022-08-19 16:10:02 +02:00
martavp
ef35190804
Merge pull request #12 from Parisra/Spatial_res_doc
Spatial res doc
2022-08-19 14:24:43 +02:00
martavp
b0d06c0031
Merge pull request #13 from GormBruunAndresen/improve-doc
Updated the aviation section
2022-08-19 14:24:29 +02:00
martavp
544625e6d7
Merge pull request #14 from Parisra/Carbon-capture
Carbon capture
2022-08-19 14:24:18 +02:00
Adam-Dvorak1
5d5ecd73b6
Update supply_demand.rst 2022-08-19 14:06:18 +02:00
Adam-Dvorak1
44db7bc233
Update supply_demand.rst 2022-08-19 14:02:27 +02:00
Parisra
8789f2c26b
Update technology_assumptions.rst 2022-08-19 14:02:04 +02:00
Adam-Dvorak1
e68105584c
Update supply_demand.rst 2022-08-19 14:00:10 +02:00
Adam-Dvorak1
fbb6acdc7c
Update supply_demand.rst 2022-08-19 13:58:59 +02:00
Parisra
b2026c6448
Update supply_demand.rst 2022-08-19 13:57:22 +02:00
Parisra
0477a84e33
Update supply_demand.rst 2022-08-19 13:56:33 +02:00
Adam-Dvorak1
44248986c2
Testing 2022-08-19 13:55:00 +02:00
Adam-Dvorak1
0a7c3bbb86
Testing 2022-08-19 13:54:38 +02:00
Adam-Dvorak1
8c738437df
Test of link to other section 2022-08-19 13:53:52 +02:00
Gorm Bruun Andresen
f229a5c374 Updated the aviation section
Very minor update of the aviation section.
2022-08-19 13:52:34 +02:00
martavp
cc4e39db1b Merge branch 'improve-doc' of https://github.com/martavp/pypsa-eur-sec into improve-doc 2022-08-19 13:49:28 +02:00
martavp
9518d35381 add file to describe technology assumptions 2022-08-19 13:49:25 +02:00
Parisra
817a0894bb
Update spatial_resolution.rst 2022-08-19 13:43:06 +02:00
Gorm Bruun Andresen
d5d7b65b7c
Merge branch 'improve-doc' into improve-doc 2022-08-19 13:41:54 +02:00
Adam-Dvorak1
6e2a6c8a5e
Small edit to heating 2022-08-19 13:37:51 +02:00
Gorm Bruun Andresen
1050394170 Merge branch 'improve-doc' of https://github.com/GormBruunAndresen/pypsa-eur-sec-mvp into improve-doc 2022-08-19 13:36:05 +02:00
Gorm Bruun Andresen
d8a6e2134e Updated the Shipping section
Updated the Shipping section to the most recent version. The (small) changes include the review comments.
2022-08-19 13:35:50 +02:00
Parisra
0bfab39a4e
Update spatial_resolution.rst 2022-08-19 13:35:49 +02:00
Adam-Dvorak1
59d213b4c0
Biomass with Marta edits 2022-08-19 13:33:49 +02:00
Parisra
c0c8d92a0b
Update spatial_resolution.rst 2022-08-19 13:31:55 +02:00
Adam-Dvorak1
86bc60fd28
Merge branch 'martavp:improve-doc' into improve-doc 2022-08-19 11:48:53 +02:00
Adam-Dvorak1
3e884ed58b
parentheses 2022-08-19 11:48:25 +02:00
Adam-Dvorak1
9457704c18
editing eq 2022-08-19 11:47:17 +02:00
martavp
f217c31974 add perfect 2022-08-19 11:46:28 +02:00
Adam-Dvorak1
0c4d948d5b
Editing eq 2022-08-19 11:45:40 +02:00
Adam-Dvorak1
8fef2f0940
Editing eq in chemicals 2022-08-19 11:44:22 +02:00
Adam-Dvorak1
3416a1a5b3
Industry sector--chemicals 2022-08-19 11:43:35 +02:00
Adam-Dvorak1
c6413c84f5
Edit of space heating subsection title 2022-08-19 11:27:50 +02:00
Adam-Dvorak1
69c140a8b3
Editing subsection headings 2022-08-19 11:26:37 +02:00
Adam-Dvorak1
7bb6197bdf
Updating subsection headings in heating 2022-08-19 11:23:18 +02:00
martavp
fbda00e399 Update limitations.rst 2022-08-19 11:17:08 +02:00
Adam-Dvorak1
b565730617
Industry section overview--including figures 2022-08-19 11:11:31 +02:00
Parisra
1554dae40b
Update supply_demand.rst 2022-08-19 10:54:14 +02:00
martavp
f11d9d5129
Merge branch 'improve-doc' into improve-doc 2022-08-19 09:28:22 +02:00
martavp
d6265ed81b Update index.rst 2022-08-19 09:20:55 +02:00
martavp
eb882a0d02
Merge pull request #4 from Adam-Dvorak1/improve-doc
Adding hydrogen and oil-based products sections. Add one figure
2022-08-11 15:00:35 +02:00
Gorm Bruun Andresen
aefef9b091 Update supply_demand.rst
Description of aviation. It is pretty simple.
2022-08-11 14:55:25 +02:00
Gorm Bruun Andresen
c17061be96 Update supply_demand.rst
General comment on transport.
2022-08-11 14:53:51 +02:00
Adam-Dvorak1
02ee751a37
Adding oil-based products section 2022-08-11 14:46:33 +02:00
Ebbe Kyhl
495b6eab2c
add section on methane 2022-08-11 14:45:06 +02:00
Adam-Dvorak1
8b29e36b01
Update supply_demand.rst 2022-08-11 14:26:26 +02:00
Gorm Bruun Andresen
78b91b55a7 Update supply_demand.rst
Adding text for shipping. Internal links needs to be updated.
2022-08-11 14:17:47 +02:00
Gorm Bruun Andresen
b9a47b34ab Update supply_demand.rst
Adding some headlines for transportation.
2022-08-11 14:17:00 +02:00
Adam-Dvorak1
ed2ca5ec3c
Edit format of headings 2022-08-11 14:06:26 +02:00
Adam-Dvorak1
c6b7f05c73
Add hydrogen to supply and demand 2022-08-11 14:05:24 +02:00
Gorm Bruun Andresen
8d41534109 Update supply_demand.rst
Updated version of the biomass description. Links to other parts of the documentation still needs to be added.
2022-08-11 13:54:42 +02:00
martavp
c4f639edef Revert "Add one extra line to supply_demand as example"
This reverts commit 1627e36c02.
2022-08-11 13:50:11 +02:00
martavp
8a3fc0813a Revert "Revert "Add one extra line to supply_demand as example""
This reverts commit 06d592281d.
2022-08-11 13:50:06 +02:00
martavp
00c05668f8 Revert "Merge pull request #1 from GormBruunAndresen/improve-doc"
This reverts commit c3e1a55049, reversing
changes made to 06d592281d.
2022-08-11 13:49:57 +02:00
martavp
9e698eede0 Revert "Merge pull request #2 from Parisra/improve-doc"
This reverts commit a978f78a96, reversing
changes made to c3e1a55049.
2022-08-11 13:49:35 +02:00
martavp
56a154fd6e Revert "Revert "Merge pull request #2 from Parisra/improve-doc""
This reverts commit 1ef8416307.
2022-08-11 13:49:17 +02:00
martavp
1ef8416307 Revert "Merge pull request #2 from Parisra/improve-doc"
This reverts commit a978f78a96, reversing
changes made to c3e1a55049.
2022-08-11 13:48:59 +02:00
martavp
a978f78a96
Merge pull request #2 from Parisra/improve-doc
Improve doc
2022-08-11 13:46:14 +02:00
Parisra
71a94d5ef6
Update heat demand 2022-08-11 13:41:13 +02:00
martavp
c3e1a55049
Merge pull request #1 from GormBruunAndresen/improve-doc
Test commit
2022-08-11 13:32:33 +02:00
Gorm Bruun Andresen
3f78c83cf2 Update supply_demand.rst
Test number two. Let's hope for the best.
2022-08-11 13:30:16 +02:00
martavp
06d592281d Revert "Add one extra line to supply_demand as example"
This reverts commit 1627e36c02.
2022-08-11 13:26:49 +02:00
martavp
1627e36c02 Add one extra line to supply_demand as example 2022-08-11 13:02:33 +02:00
martavp
f129547b9d include agriculture in covered sectors 2022-08-10 07:24:18 +02:00
lisazeyen
4accfff1bb update release notes 2022-08-08 08:53:16 +02:00
lisazeyen
9752b4b4e6
Merge branch 'master' into pellet-boiler 2022-08-05 12:25:01 +02:00
lisazeyen
8f92f08579 update relase notes 2022-08-05 12:21:32 +02:00
lisazeyen
274e7df5af update release notes 2022-08-04 16:03:32 +02:00
Philipp Glaum
16ab4703da add release note 2022-07-29 15:12:19 +02:00
Philipp Glaum
ebf54a7c9d update configtables in the documentation 2022-07-29 12:11:46 +02:00
Fabian Neumann
df6d74a087 add release docs where to change versions 2022-07-27 13:12:52 +02:00
Fabian Neumann
885316002c release_notes: markdown to rst syntax 2022-07-27 11:58:23 +02:00
Fabian Neumann
3c64ecf057 doc: fix syntax of electricity.csv 2022-07-27 11:55:37 +02:00
Fabian Neumann
c9c1910699 doc: remove gitter 2022-07-27 11:50:42 +02:00
Fabian Neumann
4dcb47f74b release notes: update date 2022-07-27 11:49:30 +02:00
Fabian Neumann
8d132464bd
Merge branch 'release-v0.5' into introduce_modularity_clustering 2022-07-27 09:04:39 +02:00
Fabian Neumann
87388d4b4a update author affiliations 2022-07-26 15:32:48 +02:00
Fabian Neumann
6027ade0ed prepare release notes 2022-07-26 15:30:07 +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 Neumann
239dcfdd1e
Merge branch 'master' into introduce_modularity_clustering 2022-07-26 14:04:56 +02:00
Fabian Neumann
5bb432141d hydro: add documentation for eia approximation/correction options 2022-07-22 18:34:16 +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
Tom Brown
ec1aa1b76b README, doc: add reference to hydrogen network paper as showcase of model 2022-07-18 20:40:21 +02:00
martacki
90ffc35f05 documentation 2022-07-13 15:39:46 +02:00
Fabian Neumann
27e5dec4e6 documentation fixes 2022-06-30 09:01:49 +02:00
lisazeyen
187c9cbaa3 add release notes 2022-06-29 08:49:29 +02:00
martacki
e9e00291c5 update configtables/opts to include CH4L option 2022-06-28 13:40:14 +02:00
Fabian Neumann
74f8ca1c7f
Merge branch 'master' into eu-energy-security 2022-06-28 08:09:39 +02:00
Fabian Neumann
971e970250
Merge branch 'master' into landlock-fix-alterative 2022-06-28 07:47:13 +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
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 Hofmann
8349e85252
Apply suggestions from code review
Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>
2022-06-27 11:48:45 +02:00
Fabian Neumann
9c6c6d243f
Adaptations to match current PyPSA-Eur version 2022-06-27 10:21:08 +02:00
Fabian Neumann
8e57d68b73
Merge branch 'master' into landlock-fix-alterative 2022-06-27 09:44:42 +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
Fabian Neumann
4c5ec8e5f1
Merge branch 'master' into introduce_hac_clustering 2022-06-24 20:22:47 +02:00
Fabian Neumann
d321b2b762 resolve merge conflicts 2022-06-24 20:15:32 +02:00
Fabian
b37c1d98d3 update release notes 2022-06-24 18:44:03 +02:00
Fabian Hofmann
17d7403f20
build_powerplants: apply suggestions from code review
Co-authored-by: Martha Frysztacki <martha.frysztacki@kit.edu>
2022-06-24 15:34:26 +02:00
Fabian
c42d2bd97d refactor save to geojson file functionality to allow import/export of empty geodfs 2022-06-24 15:11:21 +02:00
Fabian Neumann
e1a6e13f75 add release note [no ci] 2022-06-23 15:28:00 +02:00
martacki
8dba48c412 clustering strats to configurables: documentation and testing 2022-06-21 19:08:22 +02:00
Fabian Neumann
5cc6e9e18a doc: add reference to new config settings 2022-06-15 14:07:48 +02:00
Fabian Neumann
9a37fe6572 merge master 2022-06-15 09:22:51 +02:00
Fabian
8cbe4e4f9d update release notes and doc 2022-06-10 00:33:09 +02:00
Fabian
76cd0751b4 Merge branch 'eu-energy-security' of github.com:PyPSA/pypsa-eur into eu-energy-security 2022-06-09 20:36:35 +02:00
Fabian
26a56d1836 update release notes 2022-06-09 20:33:13 +02:00
Fabian Hofmann
619b471f72
Merge branch 'master' into eu-energy-security 2022-06-07 10:05:11 +02:00
Max Parzen
e974a30fd3 add release note 2022-06-03 17:14:30 +01:00
Tom Brown
292d713817 README,doc: soften warnings, add limitations section to doc 2022-06-03 12:33:33 +02:00
Max Parzen
edb81a9e6a add release note 2022-05-28 14:50:44 +01:00
Fabian Neumann
3acc4a2236 update country reference from Germany to Belgium in tutorial 2022-04-12 14:52: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
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
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
70640cc336 doc: fix tutorial config line references 2022-04-03 09:42:07 +02:00
Fabian Neumann
7fee2944d8
Merge branch 'master' into rm-raster-natura 2022-03-28 12:07:33 +02:00
Fabian Neumann
03e6764a9d
Merge branch 'master' into issue-301 2022-03-25 13:46:46 +01:00
Fabian Neumann
85387bded2
Merge branch 'master' into skip-if-no-lv 2022-03-25 13:46:04 +01:00
Fabian Neumann
d94719a33d fix tutorial and add release notes 2022-03-24 15:53:02 +01:00
Fabian Neumann
c54ddab4a3 remove unused simple_hvdc_costs 2022-03-24 14:47:00 +01:00
Fabian Neumann
62e7653d7e add release notes 2022-03-24 14:37:18 +01:00
Fabian Neumann
12a5a5f86a add release notes 2022-03-24 14:34:08 +01:00
Martha Frysztacki
24e103c53e
Merge branch 'master' into introduce_hac_clustering 2022-03-24 13:17:28 +01:00
Fabian Neumann
5a7c0d7967 remove build/retrieve natura raster, directly use shapefile 2022-03-20 10:03:17 +01:00
Fabian Neumann
c4423d43a8 add synchronisation release, release notes 2022-03-17 18:19:06 +01:00
Martha Frysztacki
69c0341145
Merge branch 'master' into introduce_hac_clustering 2022-03-17 17:40:46 +01:00
Seth
323fdc651a
update toplevel.csv to include quotation marks in focus_weights
fixes #328
2022-03-11 15:52:34 +01:00
Martha Frysztacki
3e07fdfd54
Merge branch 'master' into introduce_hac_clustering 2022-03-07 11:44:29 +01:00
martacki
f02d5fe821 fix clustering setup for hac according to fneum suggestions 2022-03-07 11:43:04 +01:00
euronion
c729d0dd74 Update release_notes.rst 2022-03-04 21:21:49 +01:00
euronion
519c7a4700 Update snapshots.csv 2022-03-04 21:21:44 +01:00
euronion
76ee8c617a Update release_notes.rst 2022-03-04 21:15:35 +01:00
martacki
b63271f12f release_notes, old format of base_network with updated docstrings 2022-03-03 17:16:23 +01:00
Fabian Neumann
52b0d29fae merge master 2022-02-18 10:24:26 +01:00
Koen van Greevenbroek
a2d3edd82b Document the k-means random state fix 2022-02-10 16:07:31 +01:00
Martha Frysztacki
25b3245923
Merge branch 'master' into introduce_hac_clustering 2022-02-04 14:35:14 +01:00
Fabian Neumann
090b4908a4 Snakefile: use standard resource mem_mb rather than mem 2022-01-27 21:04:50 +01:00
Fabian Neumann
598b75358d
Update installation.rst 2022-01-24 12:42:53 +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
7535a0d385
update data bundle (#216) 2022-01-06 10:29:59 +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
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
Francesco Witte
bac7e54d23 Add missing code directive and hyphon in tar 2021-11-16 13:36:46 +01:00
Fabian Neumann
1ff5d76a0c gas_network: add release notes 2021-11-13 18:16:10 +01:00
Francesco Witte
9379c135fd Fix link appearence and missing parentheses 2021-11-09 15:56:59 +01:00
Fabian Neumann
e6f4479544 doc: add EMP-E presentation and speed preprint 2021-10-28 09:58:45 +02:00
Fabian Hofmann
0425817a7b
Merge branch 'master' into doc-fix-css-theme 2021-10-06 14:09:00 +02:00
Fabian Neumann
a431bbd5a7
Merge branch 'master' into master 2021-10-06 12:23:14 +02:00
Fabian
fccf5323d2 doc: fix css theme 2021-10-06 12:16:12 +02:00
Fabian Neumann
1b2c6e17c5 add release note for offshore density reduction 2021-10-05 12:21:45 +02:00
Koen van Greevenbroek
66524bf797 Update obsolete link to CPLEX documentation 2021-10-05 11:21:17 +02:00
Fabian Neumann
e872595c79 release_notes: correct version 2021-10-04 18:02:05 +02:00
Fabian Neumann
47e6badd58 doc: fix typo in conf.py 2021-10-04 17:57:18 +02:00
Fabian Neumann
c5452d9882 release_notes: opener 2021-10-04 17:45:54 +02:00
Fabian Neumann
b915f08ac2 installation: update to new databundle location 2021-10-04 17:44:17 +02:00
Fabian Neumann
1f8c1678b8 add fneum 2021-10-04 14:28:27 +02:00
Fabian Neumann
692f4705c4 merge master 2021-10-04 13:21:33 +02:00
Fabian Neumann
c168fd60d3 add release note for agriculture, forestry and fishing 2021-10-04 11:19:15 +02:00
Fabian Neumann
7f0ed1372c organise release notes 2021-10-04 10:02:47 +02:00
Fabian Neumann
aca1023c3d bump version to 0.6.0 2021-10-02 11:17:29 +02:00
Fabian Neumann
2bfc091f8b update data bundle 2021-10-02 11:12:45 +02:00
Fabian Neumann
2e6e9c6802
Merge branch 'master' into agriculture-energy-co2 2021-10-02 10:51:28 +02:00
Fabian Neumann
b560d95b6a merge master 2021-10-02 10:41:56 +02:00
Fabian Neumann
4400658099 edit release note 2021-10-02 10:40:01 +02:00
Fabian Neumann
7987fd23cf add release note 2021-10-02 10:33:56 +02:00
Fabian Neumann
ff6d736a89
Merge branch 'master' into myopic-low-clustering-gens 2021-09-30 14:51:45 +02:00
Fabian Neumann
90079248a3
Merge branch 'master' into dh-share 2021-09-30 14:48:26 +02:00
lisazeyen
f6bb498730 include PR review 2021-09-29 16:13:23 +02:00
Fabian Neumann
5fb169c31f
Merge branch 'master' into enspreso-biomass 2021-09-29 15:46:11 +02:00
Fabian Neumann
8cf8a49b48 Merge branch 'master' of github.com:nworbmot/PyPSA-Eur-Sec 2021-09-28 17:24:09 +02:00
Fabian Neumann
488b93a079 extend release notes on plastics recycling 2021-09-28 17:24:00 +02:00
Fabian Neumann
fcc10aa950
Merge branch 'master' into master 2021-09-28 17:15:26 +02:00
Fabian Neumann
9f4e1f2176 make HVC recycling ready for pathway, minor edits 2021-09-28 17:08:03 +02:00
lisazeyen
dadfa8691b update mocksnakemake for testing 2021-09-28 16:36:40 +02:00
Fabian Neumann
385779fbbf
Merge branch 'master' into biomass-transport 2021-09-28 11:33:21 +02:00
Fabian Neumann
ec04d7909a
Merge pull request #148 from PyPSA/co2-network
Add CO2 network
2021-09-28 11:29:20 +02:00
Fabian Neumann
04c8d1fd02 add correction factor to offshore wind for wake losses 2021-09-23 08:57:18 +02:00
Fabian Neumann
b4af3f3fa3 change license 2021-09-22 18:03:25 +02:00
Fabian Neumann
089fc5b747 final tweaks of release notes 2021-09-22 16:46:23 +02:00
Fabian Neumann
2f2ac89c87 update main affiliation 2021-09-20 11:43:04 +02:00
Fabian Neumann
780b60cc46 add release note 2021-09-14 16:38:48 +02:00
Fabian Neumann
2e02af8b4b change license 2021-09-14 16:37:41 +02:00
Fabian Neumann
b88322587f
Release 0.4 (#274)
* update release notes [skip ci]

* update fixed versions environment.yaml

* format release notes
2021-09-14 16:15:25 +02:00
Fabian
ea50abab6d doc: fix build warnings 2021-08-27 12:30:29 +02:00
Martha Frysztacki
f30ca8a18a
Merge branch 'master' into simplify_to_substations 2021-08-26 15:22:02 +02:00
Fabian Neumann
148450e496 adjust documentation and add release notes 2021-08-18 16:38:34 +02:00
Fabian Neumann
5b9f64354f
xarray 0.19 compatibility (#158) 2021-08-18 12:17:31 +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
99e602f7b2 add ENSPRESO release notes and doc 2021-08-16 14:00:30 +02:00
Fabian Neumann
0fa3888b0e restore REUSE compliance [skip ci] 2021-08-13 10:15:06 +02:00
Fabian Neumann
b82c55543b
Readthedocs documentation with pip (#267)
* Use pip with requirements.txt file for setting up doc environment

* Try w/o cartopy

* Try w/o cartopy take 2

* Try w/o cartopy take 3

* try pip

* try pip ii

* python 3.8

* fix links

* remove conda docs and fix line references

* remove conda on .readthedocs.yml

* correct ambiguous line reference

Co-authored-by: Jonas Hoersch <coroa@posteo.de>
2021-08-13 10:11:35 +02:00
Fabian Neumann
2e2a66ef3c biomass_transport: add release notes and documentation 2021-08-09 18:20:07 +02:00
Fabian Neumann
54a509f3dd
Merge branch 'master' into co2-network 2021-08-06 15:51:40 +02:00
Fabian Neumann
d7a290df31 add release note 2021-08-06 15:51:07 +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
87596dd015
add H2 liquefaction cost to H2 shipping demand (#145)
* add H2 liquefaction cost to H2 shipping demand

* rename bus to 'H2 liquid'

* add release note

* make consideration of liquefaction costs for shipping optional

* update release notes
2021-08-04 18:28:18 +02:00
martavp
fab31e6524
Exogenous transition path for shipping, Steel, and Aluminum production (#136)
* Update .gitignore

* Add fictitious load to account for non-transformed shipping emissions

The share of shipping demand that is transformed is defined now for different years to be used with the myopic code.
The carbon emission from the remaining share is treated as a negative load on the atmospheric carbon dioxide bus, just like aviation and land transport emissions.

* Split colours for H2 in Industry and H2 in shipping when plotting balances.

When plotting the balance for H2, the rename dictionary merges all the demands containing H2.
This commit disables such merging and keeps different colours for H2 in shipping and H2 in industry. This is useful when one wants to look at the H2 balance and have an overview of where the H2 is consumed in the model.

* Make transformation of Steel and Aluminum production depends on year

Previously, the transformation of the Steel and Aluminum production was assumed to occur overnight.
This commit enables the definition of a transformation path via the config.yaml file.
This requires adding the {planning_horizon} to the input and output file name of the following rules:
build_industrial_production_per_country_tomorrow
build_industrial_production_per_node
build_industry_energy_demand_per_node
prepare_sector_network

* small follow-up to merge

* Add oil consumed in shipping as a load to EU oil bus

* Update scripts/prepare_sector_network.py

* add planning_horizons wildcard to benchmark paths

* fixup: double fraction_primary for steel

Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>
2021-08-04 18:19:02 +02:00
Fabian Neumann
ac3ce07d67
Merge branch 'master' into simplify_to_substations 2021-08-03 15:53:49 +02:00
martavp
3a6a1f90ab
Sensitivity e nom max (#143)
* Update .gitignore

* include e_nom_max sensitivity

* remove change in gitignore

* Update doc/release_notes.rst

Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>
2021-07-06 17:12:39 +02:00
martavp
cc24859d78 Update release_notes.rst 2021-07-05 12:26:11 +02:00
Fabian Neumann
b2872cc6b0
Cherry-pick from #137 (#142)
* Update config.default.yaml

Some people find it counterintuitive that battery and H2 storage are not kept from PyPSA-Eur. An explicit mention can help here.

* Update installation.rst

We only use one config.yaml file

* Add an arrow from biomass to carbon dioxide.

This signals that we also have BECCS in the model.

Co-authored-by: martavp <martavictoriaperez@gmail.com>
2021-07-03 12:59:09 +02:00
martacki
15ebe63b38 release_notes: style 2021-07-02 10:43:32 +02:00
martacki
6983be337a release_notes: add PR reference 2021-07-02 10:26:46 +02:00
martacki
34578bf16b update release_notes 2021-07-02 10:24:30 +02:00
Fabian Neumann
de46177e1a Merge branch 'master' of github.com:PyPSA/pypsa-eur-sec 2021-07-01 20:22:20 +02:00
Fabian Neumann
a967faf0f9 doc: release notes format 2021-07-01 20:22:08 +02:00
lisazeyen
ca685a10af
add home battery storage and inverter costs (#99)
* add home battery storage and inverter costs

* Update prepare_sector_network.py

* add release note

Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>
2021-07-01 20:16:12 +02:00
Fabian Neumann
1fc1d2a17d
Revision complete (#139)
* ammonia_production: minor cleaning and move into __main__ (#106)

* biomass_potentials: code cleaning and automatic country index inferral (#107)

* Revision: build energy totals (#111)

* blacken

* energy_totals: preliminaries

* energy_totals: update build_swiss

* energy_totals: update build_eurostat

* energy_totals: update build_idees

* energy_totals: update build_energy_totals

* energy_totals: update build_eea_co2

* energy_totals: update build_eurostat_co2

* energy_totals: update build_co2_totals

* energy_totals: update build_transport_data

* energy_totals: add tqdm progressbar to idees

* energy_totals: adjust __main__ section

* energy_totals: handle inputs via Snakefile and config

* energy_totals: handle data and emissions year via config

* energy_totals: fix reading in eurostat for different years

* energy_totals: fix erroneous drop duplicates
This caused problems for waste management in HU and SI

* energy_totals: make scope selection of CO2 or GHG a config option

* Revision: build industrial production per country (#114)

* industry-ppc: format

* industry-ppc: rewrite for performance

* industry-ppc: move reference year to config

* industry-ppct: tidy up and format (#115)

* remove stale industry demand rules (#116)

* industry-epc: rewrite for performance (#117)

* Revision: industrial distribution key (#118)

* industry-distribution: first tidying

* industry-distribution: first tidying

* industry-distribution: fix syntax

* Revision: industrial energy demand per node today (#119)

* industry-epn: minor code cleaning

* industry-epn: remove accidental artifact

* industry-epn: remove accidental artifact II

* industry-ppn: code cleaning (#120)

* minor code cleaning (#121)

* Revision: industry sector ratios (#122)

* sector-ratios: basic reformatting

* sector-ratios: add new read_excel function that filters year already

* sector-ratios: rename jrc to idees

* sector-ratios: rename conv_factor to toe_to_MWh

* sector-ratios: modularise into functions

* Move overriding of component attributes to function and into data (#123)

* move overriding of component attributes to central function and store in separate folder

* fix return of helper.override_component_attrs

* prepare: fix accidental syntax error

* override_component_attrs: bugfix that aligns with pypsa components

* Revision: build population layout (#108)

* population_layouts: move inside __main__ and blacken

* population_layouts: misc code cleaning and multiprocessing

* population_layouts: fix fill_values assignment of urban fractions

* population_layouts: bugfig for UK-GB naming ambiguity

* population_layouts: sort countries alphabetically for better overview

* config: change path to atlite cutout

* Revision: build clustered population layouts (#112)

* population_layouts: move inside __main__ and blacken

* population_layouts: misc code cleaning and multiprocessing

* population_layouts: fix fill_values assignment of urban fractions

* population_layouts: bugfig for UK-GB naming ambiguity

* population_layouts: sort countries alphabetically for better overview

* cl_pop_layout: blacken

* cl_pop_layout: turn GeoDataFrame into GeoSeries + code cleaning

* cl_pop_layout: add fraction column which is repeatedly calculated downstream

* Revision: build various heating-related time series (#113)

* population_layouts: move inside __main__ and blacken

* population_layouts: misc code cleaning and multiprocessing

* population_layouts: fix fill_values assignment of urban fractions

* population_layouts: bugfig for UK-GB naming ambiguity

* population_layouts: sort countries alphabetically for better overview

* cl_pop_layout: blacken

* cl_pop_layout: turn GeoDataFrame into GeoSeries + code cleaning

* gitignore: add .vscode

* heating_profiles: update to new atlite and move into __main__

* heating_profiles: remove extra cutout

* heating_profiles: load regions with .buffer(0) and remove clean_invalid_geometries

* heating_profiles: load regions with .buffer(0) before squeeze()

* heating_profiles: account for transpose of dataarray

* heating_profiles: account for transpose of dataarray in add_exiting_baseyear

* Reduce verbosity of Snakefile (2) (#128)

* tidy Snakefile light

* Snakefile: fix indents

* Snakefile: add missing RDIR

* tidy config by removing quotes and expanding lists (#109)

* bugfix: reorder squeeze() and buffer()

* plot/summary: cosmetic changes including: (#131)

- matplotlibrc for default style and backend
- remove unused config options
- option to configure geomap colors
- option to configure geomap bounds

* solve: align with pypsa-eur using ilopf (#129)

* tidy myopic code scripts (#132)

* use mock_snakemake from pypsa-eur (#133)

* Snakefile: add benchmark files to each rule

* Snakefile: only run build_retro_cost if endogenously optimised

* Snakefile: remove old {network} wildcard constraints

* WIP: Revision: prepare_sector_network (#124)

* population_layouts: move inside __main__ and blacken

* population_layouts: misc code cleaning and multiprocessing

* population_layouts: fix fill_values assignment of urban fractions

* population_layouts: bugfig for UK-GB naming ambiguity

* population_layouts: sort countries alphabetically for better overview

* cl_pop_layout: blacken

* cl_pop_layout: turn GeoDataFrame into GeoSeries + code cleaning

* move overriding of component attributes to central function and store in separate folder

* prepare: sort imports and remove six dependency

* prepare: remove add_emission_prices

* prepare: remove unused set_line_s_max_pu
This is a function from prepare_network

* prepare: remove unused set_line_volume_limit
This is a PyPSA-Eur function from prepare_network

* prepare: tidy add_co2limit

* remove six dependency

* prepare: tidy code first batch

* prepare: extend override_component_attrs to avoid hacky madd

* prepare: remove hacky madd() for individual components

* prepare: tidy shift function

* prepare: nodes and countries from n.buses not pop_layout

* prepare: tidy loading of pop_layout

* prepare: fix prepare_costs function

* prepare: optimise loading of traffic data

* prepare: move localizer into generate_periodic profiles

* prepare: some formatting of transport data

* prepare: eliminate some code duplication

* prepare: fix remove_h2_network
- only try to remove EU H2 store if it exists
- remove readding nodal Stores because they are never removed

* prepare: move cost adjustment to own function

* prepare: fix a syntax error

* prepare: add investment_year to get() assuming global variable

* prepare: move co2_totals out of prepare_data()

* Snakefile: remove unused prepare_sector_network inputs

* prepare: move limit p/s_nom of lines/links into function

* prepare: tidy add_co2limit file handling

* Snakefile: fix tabs

* override_component_attrs: add n/a defaults

* README: Add network picture to make scope clear

* README: Fix date of preprint (was too optimistic...)

* prepare: move some more config options to config.yaml

* prepare: runtime bugfixes

* fix benchmark path

* adjust plot ylims

* add unit attribute to bus, correct cement capture efficiency

* bugfix: land usage constrained missed inplace operation

Co-authored-by: Tom Brown <tom@nworbmot.org>

* add release notes

* remove old fix_branches() function

* deps: make geopy optional, remove unused imports

* increase default BarConvTol

* get ready for upcoming PyPSA release

* re-remove ** bug

* amend release notes

Co-authored-by: Tom Brown <tom@nworbmot.org>
2021-07-01 20:09:04 +02:00
Fabian Neumann
c5e59dab2f
Merge branch 'master' into simplify_to_substations 2021-06-30 10:34:44 +02:00
euronion
8654077519
Fix creation of renewable profiles for offshore wind. (#255)
* Update build_renewable_profiles.py

* Update release_notes.rst

* Update release_notes.rst

* Update release_notes.rst

* Update scripts/build_renewable_profiles.py

Co-authored-by: FabianHofmann <hofmann@fias.uni-frankfurt.de>

* Adjust doc string

Co-authored-by: FabianHofmann <hofmann@fias.uni-frankfurt.de>
Co-authored-by: Fabian <fab.hof@gmx.de>
2021-06-28 16:20:29 +02:00
Tom Brown
96711aab39
doc: Create 0.0.x versions for old PyPSA-Eur-Sec-30(-Path)
This is for easier identification of models in the IPCC AR6 model
registration.
2021-06-27 14:42:44 +02:00
Fabian Neumann
7b68e8be0c
GitHub actions CI (#252)
* add github action ci

* only one environment update call

* line break in echo did not work

* fix syntax

* fix version syntax

* switch to glpk

* reduce time from month to week

* list environment

* use new ipopt version
https://github.com/conda-forge/ipopt-feedstock/issues/55

* remove accidental additions

* request ipopt lower than 3.13.3
https://github.com/conda-forge/ipopt-feedstock/issues/64

* add badges and release notes

* add badge to readme and make ci.yaml cc-0
2021-06-22 11:01:33 +02:00
martacki
0f5934f534 release notes 2021-06-01 12:06:56 +02:00
martacki
cec9dcc41c adapt configuration options 2021-06-01 12:02:43 +02:00
Fabian Neumann
bfeb429c27
base: add escape if all TYNDP links already in network (#246) 2021-05-25 15:55:39 +02:00
Martha Frysztacki [frɨʂtat͡skʲ]
f5a0d566d9
solve_operations_network: integrate all extendable links, not only DC (#244)
* add_electricity.py Resolve FutureWarning 771 Index.__or__ operating as set operation is deprecated

* solve_operations_network: bug fix

* release notes

* Update doc/release_notes.rst

Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>
2021-05-21 15:31:50 +02:00
Chiara Anselmetti
11c29ac6cc
Adding focus_weights to pre-clustering (#241)
* Add focus_weights to pre-clustering

Hey guys,
another quick fix since I noticed it wasn't implemented yet: When pre-clustering the network, the focus_weights have not yet been considered. This may distort clustering results when pre-clustering to a low resolution.

* Update release_notes.rst
2021-05-21 15:27:34 +02:00
Tom Brown
1ede513990 doc: Fix badge link for doc and clarifications in release notes 2021-05-21 13:40:22 +02:00
Tom Brown
e4848d603d PyPSA-Eur-Sec Version 0.5.0
See the release notes:

https://pypsa-eur-sec.readthedocs.io/en/latest/release_notes.html#pypsa-eur-sec-0-5-0-21st-may-2021
2021-05-21 12:37:02 +02:00
lisazeyen
42a78262d8 Merge branch 'master' into technology-data 2021-05-10 16:05:48 +02:00
Tom Brown
8bfb1490c1
Merge branch 'master' into retro-updated 2021-04-30 18:12:20 +02:00
Tom Brown
3a5c47b2e5 doc: Link new retrofitting section from the release notes 2021-04-30 18:05:17 +02:00
FabianHofmann
b8a7685931
Atlite availability (#224)
* adjust buil_cutout.py and Snakefile

* try adjusting build_renewable_profiles, currently crashing due to weird pyproj error

* build_renewable_profiles: -remove printing gid

* build_renewable_profiles: use dask for paralellization, use dense functions

* build_renewable_profiles:
	- revise imports
	- add logging for long calculation
	- revise explaining comment
	- revise distance calculation

* build profiles: adjust to cutout.grid

* * fix area to square km
* rename potmatrix -> capacity_potential
* rename available to availibility

* config.default update cutout params
build_renewable_potentials: major refactoring and simplification
hydro_profiles: update code

* build profiles: fix weight output dimensions

* build profiles: fix typo, fix selection of buses

* build profiles: reinsert paths variable

* follow up

* build profiles: move to dask calculation only

* CI: set build cutout to true (add CDSAPI)

* build profiles: use pyproj, test with gleas and geokit upstream

* environment.yaml fix atlite version

* build profiles: use dask 'processes' for more than 25 regions

* build profiles: specify dask scheduler according to number of regions

* backpedal a bit, only allow scheduler='processes'

* follow up, code style and fixup

* build profiles: add logger info for underwater fraction calc

* config adjust cutout parameters
Snakefile fixup

* config.default.yaml: adjust resolution

* config: use one cutout in total
build_cutout: automatic detetection of geographical boundaries

* env: add python>=3.8 requirement
build_cutout: fixup for region bound

* config: allow base cutout

* folllow up, fix up

* follow up II

* clean up

* clean up II

* build profiles: move back to multiprocessing due to performance issues

* small code style corrections

* move in pool context

* swqitch to ratsterio

* switch to rasterio for availibility calculation

* tiny fixup

* * build continental raster for offshore distance calculation
* adjust Snakefile to new script build_raster

* rename continental raster to onshore raster
add projected_mask function (not yet tested)
add docstrings, modularize

* Snakefile: remove build_onhore_raster rule, build mask directly from geometry instead
build_natura_raster: adjust code, add function for exporting
build_profiles:
	* add buffer to shore distance to init_globals function
	* update docstrings
	* improve handling of nodata grid codes
	* add geometry mask if natura raster not activated
	(the 255 value is an 'eligible' value for the corine data base,
	do this for excluding data outside the shape)

* build_profiles: adjust docstrings

* update environment

* build profiles: fixup reproject woth padding

* follow up, small fixups

* fix resampling method

checkpoint: reproduces solar profile in tut data

* reintegrate plot map
code style

* config: rename cutout into "base"

* build profiles: adjust to new atlite code

* natura raster: small fixup

* build natura raster: compress tiff file

* config: adjust cutout names

* build profiles: cover case if no or partial overlap between natura raster and cutout

* config-tutorial: adjust cutout params

* buid-profifiles: fixup in gebco filter

* follow up

* update config files

* build profiles: select layoutmatrix != 0

* build profiles: speed up average_distance and underwaterfraction

* build profiles: fix typo

* update release notes
build_cutout: only build needed features

* update envs

* config: add temperature to sarah features

* temporary fix for atlite v0.2.1 and new xarray version release

* env: remove xarray specification

* * remove rule build_country_flh
* build profiles: remove sneaked in line

* doc: update configuration.rst (section atlite) and corresponding csv table

* release notes: fix quotes

* build profiles: use 3035 for area calculation

* Update envs/environment.docs.yaml

* Update scripts/build_cutout.py

* Update doc/release_notes.rst

Co-authored-by: euronion <42553970+euronion@users.noreply.github.com>

* Update doc/configuration.rst

Co-authored-by: euronion <42553970+euronion@users.noreply.github.com>

* Update scripts/build_cutout.py

Co-authored-by: euronion <42553970+euronion@users.noreply.github.com>

* update release notes

* release notes: add deprecation of 'keep_all_available_areas'
build profiles: remove warning for 'keep_all_available_areas'

* build cutout: rearrage code, set buffer correctly

* Rename tutorial cutout to remove name clash with real cutout.

* Update release_notes.rst: Rename tutorial cutout.

* retrieve: update cutouts and downloads (alternative) (#237)

* retrieve: update cutouts and downloads

* retrieve: remove unnecessary import

* use snakemake remote file functionality

* Snakefile: update zenodo link

* update natura remote link (closes #234)

* env: update atlite version to 0.2.2

* env: fix dask version due to memory issues

* test: retrieve cutout instead of build

* test: use tutorial cutout for CI

Co-authored-by: euronion <42553970+euronion@users.noreply.github.com>
Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>
2021-04-27 17:58:31 +02:00
Fabian Neumann
70078d03b2 add unresolved merge conflict to be addressed 2021-04-27 16:14:52 +02:00
Fabian Neumann
175b14e248 merge master follow-up 2021-04-27 14:49:27 +02:00
Fabian Neumann
4ec06f54bc merge master 2021-04-27 14:47:15 +02:00
Fabian Neumann
164c168a30 minor revisions on pz-max's PR 2021-04-27 14:36:34 +02:00