Commit Graph

602 Commits

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
b4af3f3fa3 change license 2021-09-22 18:03:25 +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
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
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
Fabian Neumann
5b9f64354f
xarray 0.19 compatibility (#158) 2021-08-18 12:17:31 +02:00
Fabian Neumann
351964b1e7 add logger.info for agriculture 2021-08-18 09:42:05 +02:00
Fabian Neumann
48e30bacad add doc for A sector_opts setting 2021-08-16 16:34:15 +02:00
Fabian Neumann
8e3ef7f86b remove unused sector wildcard constraints 2021-08-16 16:29:05 +02:00
Fabian Neumann
17c96edf72 agriculture: correctly convert units, fix efficiency gain, ICE aggregation for oil 2021-08-16 16:27:25 +02:00
Fabian Neumann
538c7ce0ff clarify agriculture machinery fuel efficiency 2021-08-16 16:26:50 +02:00
Fabian Neumann
dd177df19f fix NL hardcode typo 2021-08-16 16:26:20 +02:00
Fabian Neumann
38352927fc Merge branch 'master' into agriculture-energy-co2 2021-08-16 14:30:15 +02:00
Fabian Neumann
0a16ca3b35 add biomass potentials docstrings 2021-08-16 14:14:05 +02:00
Fabian Neumann
99e602f7b2 add ENSPRESO release notes and doc 2021-08-16 14:00:30 +02:00
Fabian Neumann
e40461b1c0 fix typo in biomass config 2021-08-16 13:19:20 +02:00
Fabian Neumann
ad23a648c4
Merge branch 'master' into enspreso-biomass 2021-08-10 10:43:52 +02:00
Fabian Neumann
e1a0a7d5fd set co2 sequestration cost to 10 EUR/t excl. transport 2021-08-10 10:31:06 +02:00
Fabian Neumann
782323bee4 handle spaces in remote files 2021-08-10 10:28:50 +02:00
Fabian Neumann
bab51b0f54 fix read-in of pypsa-eur data 2021-08-10 10:28:22 +02:00
Fabian Neumann
05c2332420 fix syntax error in master 2021-08-10 10:27:54 +02:00
Fabian Neumann
ed3fec4664 add data/nuts to .gitignore 2021-08-10 10:27:40 +02:00
Fabian Neumann
2e2a66ef3c biomass_transport: add release notes and documentation 2021-08-09 18:20:07 +02:00
Fabian Neumann
12f385ef3f biomass_transport: simplify read-in 2021-08-09 18:06:24 +02:00
Fabian Neumann
928d1f23ed biomass_transport: improve spatial biomass potential handling 2021-08-09 18:03:20 +02:00
Fabian Neumann
edf3a5f5fe biomass_transport: clarify meaning in config 2021-08-09 17:55:43 +02:00
Fabian Neumann
7ca4f04611 biomass_transport: reduce output files 2021-08-09 17:53:14 +02:00
Fabian Neumann
3eb404ff68 biomass_transport: correct and simplify spatial management 2021-08-09 17:51:37 +02:00
Fabian Neumann
6711d721b9 biomass_transport: fix cost calculation and get from remote 2021-08-09 16:30:38 +02:00
Fabian Neumann
d428c1b77d fix syntax and auto-retrieve biomass transport cost 2021-08-09 14:43:51 +02:00
Fabian Neumann
0da8f8f80e
Merge branch 'master' into biomass-transport 2021-08-06 15:58:23 +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