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
4375083838
create parallel structures for land-use constraints w/wo m
2021-10-02 10:40:49 +02:00
Fabian Neumann
4400658099
edit release note
2021-10-02 10:40:01 +02:00
Fabian Neumann
fb601cc051
Merge pull request #149 from PyPSA/dh-share
...
Include today's district heating share for myopic optimisation
2021-10-02 10:34:07 +02:00
Fabian Neumann
7987fd23cf
add release note
2021-10-02 10:33:56 +02:00
Fabian Neumann
a60f180f61
fix logging
2021-10-02 10:23:27 +02:00
Fabian Neumann
c0adb51454
decapitalize columns in build_energy_totals
2021-10-02 10:03:40 +02:00
lisazeyen
0d999a4991
prepare_sector_network: code formatting
...
Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>
2021-10-01 17:10:42 +02:00
Fabian Neumann
18fabd930e
Apply suggestions from code review
2021-09-30 17:46:26 +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
339187c1f1
update config
2021-09-29 16:23:38 +02:00
lisazeyen
f6bb498730
include PR review
2021-09-29 16:13:23 +02:00
Fabian Neumann
de48b4656f
Merge pull request #151 from PyPSA/enspreso-biomass
...
spatially-explicit biomass potentials from ENSPRESO
2021-09-29 15:46:51 +02:00
Fabian Neumann
5fb169c31f
Merge branch 'master' into enspreso-biomass
2021-09-29 15:46:11 +02:00
Fabian Neumann
1e248b314d
compatibility with biomass transport
2021-09-29 15:45:14 +02:00
lisazeyen
9d8827bf59
Merge remote-tracking branch 'origin/master' into dh-share
2021-09-29 15:03:45 +02:00
lisazeyen
854bd80818
rename central_fraction->district heating potential, restructure district heating share implementation
2021-09-29 14:37:36 +02:00
lisazeyen
8322350fee
move calculation of district heating share to build_energy_totals
2021-09-29 14:36:56 +02:00
lisazeyen
e27ec46878
add further comments
2021-09-29 09:23:39 +02:00
lisazeyen
234a32c504
bug fix
2021-09-29 09:23:39 +02:00
Fabian Neumann
5c24742526
temporarily disable h2 liquefaction in shipping by default
2021-09-28 17:34:47 +02:00
Fabian Neumann
8ecc54fbe6
Merge branch 'master' into dh-share
2021-09-28 17:29:29 +02:00
lisazeyen
53eab1ead2
slice biomass potentials with the pop_layout index instead of the country if biomass transport = True
2021-09-28 17:25:04 +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
2f19814786
Merge branch 'nworbmot-master'
2021-09-28 17:13:30 +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
7d0ff39b1a
Merge pull request #73 from PyPSA/biomass-transport
...
Biomass transport
2021-09-28 11:34:35 +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
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
