bjoern/pypsa-eur
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
2,553 Commits 1 Branch 0 Tags 133 MiB
df38edab0a
Commit Graph

2553 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Fabian Neumann
561d86c223 add mechanical recycling energy demand from literature 
Assuming energy demand for recycling of HPTE, PET, PS, PP as LDPE is more difficult to recycle.

https://doi.org/10.1016/j.resconrec.2020.105010

https://www.generalkinematics.com/blog/different-types-plastics-recycled/
 2021-09-27 12:06:15 +02:00
Fabian Neumann
c22cc0801c Merge branch 'master' of https://github.com/nworbmot/pypsa-eur-sec into nworbmot-master 2021-09-27 11:43:06 +02:00
lisazeyen
28264aa114
Small fixes (#167) 
* update mocksnakemake for testing

* remove trailing whitespace in n.loads index

* add missing color for H2 liquification

* adjust to default lifetime 0 instead of NaN
 2021-09-27 11:16:12 +02:00
Fabian Neumann
71be53af4f
Merge pull request #164 from PyPSA/mit-license 
Change PyPSA-Eur-Sec licence from copyleft GPLv3 to more liberal MIT
 2021-09-27 09:31:59 +02:00
lisazeyen
7ed20aba7a
Update prepare_sector_network.py 
add logger info if CO2 network is added
 2021-09-24 15:30:43 +02:00
lisazeyen
960d857d0b
Update config.default.yaml 
add color for CO2 pipelines
 2021-09-24 15:29:04 +02:00
lisazeyen
b391aa6475
Update build_biomass_transport_costs.py 
change snakemake output file format
 2021-09-24 14:59:53 +02:00
Tom Brown
93d4eae1ea industry: for HVC, add mechanical and chemical recycling 2021-09-24 13:19:48 +02:00
Tom Brown
fbccd5fbc0 industry: separate HVC, methanol and chlorine from basic chemicals 2021-09-24 13:00:58 +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
54e35a3c86 update environment.fixed.yaml 2021-09-22 16:49:30 +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
77023d370b
Merge pull request #276 from PyPSA/mit-license 
Change PyPSA-Eur licence from copyleft GPLv3 to more liberal MIT
 2021-09-20 11:36:09 +02:00
Fabian Neumann
785caecdb5 no proj 8 2021-09-20 11:18:47 +02:00
Fabian Neumann
da883b1283 limit pyproj to 3.1.0 2021-09-20 11:12:26 +02:00
Fabian Neumann
ede9146735 limit pyproj 2021-09-20 11:02:57 +02:00
Fabian Neumann
8996e09dc2
Merge branch 'master' into mit-license 2021-09-20 09:28:32 +02:00
Fabian Neumann
4e91d157b6
Merge pull request #277 from koen-vg/static-retrieve 
Mark datasets from Zenodo as static
 2021-09-15 13:28:30 +02:00
Koen van Greevenbroek
6485b98973 Mark datasets from Zenodo as static 
When retrieving a remote file over HTTP, Snakemake uses the
"last-modified" property in HTTP header as a proxy for `mtime` of the
remote file. If this time is more recent than the `mtime` of the
output of the retrieve rule, the rule is triggered and the remote file
is retrieved again (since it was apparently updated).

However, Zenodo periodically updates the "last-modified" property of
records retrieved over HTTP even if those records have not been
updated. This causes Snakemake to false assume that the records have
to downloaded again.

By setting `static=True` for datasets we know don't actually change,
we avoid this problem.
 2021-09-15 11:44:49 +02:00
Martha Frysztacki
251f0adb7e
Merge branch 'master' into snakemake_dependencies_in_functions 2021-09-14 16:50:48 +02:00
Fabian Neumann
3eea2a8e84 add missing, remove unused license 2021-09-14 16:40:10 +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
martacki
d551a3b5f1 delete config.yaml 2021-09-14 16:36:13 +02:00
martacki
dfb929f2cf remove snakemake dependencies in functions, use as kwarg instead 2021-09-14 16:34:02 +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 Neumann
1d68a300e5
update environment.yaml for pypsa 0.18.0 (#268) 
* update environment.yaml

* test pandas<1.3

Co-authored-by: Fabian Hofmann <hofmann@fias.uni-frankfurt.de>
 2021-09-14 14:14:31 +02:00
Fabian Neumann
c4d4e88ba2
Merge pull request #161 from PyPSA/fix-build_carbon_budget 
fix-build_carbon_budget
 2021-09-09 16:07:11 +02:00
Fabian Neumann
2252ee2118
Merge pull request #273 from PyPSA/citation 
add citation.cff
 2021-09-08 11:45:11 +02:00
Fabian Neumann
547080420e add citation.cff 2021-09-08 11:12:41 +02:00
Fabian Neumann
118f06f7e9
Merge pull request #160 from PyPSA/fix-plot-heat-time-series 
Update plot_network.py
 2021-09-08 09:32:28 +02:00
Fabian Neumann
fc378b8bea
Merge pull request #162 from PyPSA/add-lifetime-to-solar-rooftop 
Add lifetime to solar-rooftop
 2021-09-08 09:31:31 +02:00
Martha Frysztacki
8bec0cc423
simplify: drop incorrect cols if they exist (avoid error) (#272) 2021-09-07 16:28:01 +02:00
Fabian Hofmann
4117e19897
Merge pull request #271 from PyPSA/doc-fixes 
doc: fix build warnings
 2021-08-27 13:12:47 +02:00
Fabian
ea50abab6d doc: fix build warnings 2021-08-27 12:30:29 +02:00
Fabian Hofmann
f7d76659c5
Merge pull request #243 from martacki/simplify_to_substations 
Simplify to substations
 2021-08-27 11:16:44 +02:00
Fabian Hofmann
b9bbefa09f
simplify_network.py fix dict getting 2021-08-27 10:34:27 +02:00
Martha Frysztacki
a6d2a0a99d
style 
Co-authored-by: Fabian Hofmann <hofmann@fias.uni-frankfurt.de>
 2021-08-26 16:00:08 +02:00
Martha Frysztacki
f30ca8a18a
Merge branch 'master' into simplify_to_substations 2021-08-26 15:22:02 +02:00
martavp
203a7f3df2
Add lifetime to solar-rooftop 
Rooftop-solar generators are missing the lifetime attribute when they are added.

This avoids that they are saved as brownfield capacities installed in a previous timestep when running myopic optimization. 
I.e, they are not captured in the following line
5b9f64354f/scripts/add_existing_baseyear.py (L31)
 2021-08-24 18:58:42 +02:00
martavp
919c9d8b8d
Update prepare_sector_network.py 
update build_carbon_budget to use budget estimation from 2020 onwards
 2021-08-24 18:48:20 +02:00
martavp
8d22df6482
Update plot_network.py 
Some links producing heat have more than 2 ports (e.g. Fischer-Tropsch). This enables capturing them when plotting heat time series.
 2021-08-24 18:38:24 +02:00
Fabian Neumann
aa8cefeb5b add district_heat_share.csv 2021-08-19 10:07:51 +02:00
Fabian Neumann
624e5a1853 Merge branch 'master' into dh-share 2021-08-19 10:07:06 +02:00
Fabian Neumann
148450e496 adjust documentation and add release notes 2021-08-18 16:38:34 +02:00
Fabian Neumann
13251d33cc no machinery electric share, fix add to madd 2021-08-18 16:17:59 +02:00
Fabian Neumann
a9196f001b fix 2 typos 2021-08-18 14:17:21 +02:00
Fabian Neumann
3a218c826e Merge branch 'master' into agriculture-energy-co2 2021-08-18 12:56:49 +02:00