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

473 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
martavp
e2354c18ac 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.
 2021-06-16 17:52:42 +02:00
martavp
12257eeb3e Update .gitignore 2021-06-15 09:26:56 +02:00
martavp
228ccf611e Merge branch 'PyPSA:master' into master 2021-06-15 09:18:11 +02:00
lisazeyen
846f57fde6 add script for biomass transport costs. Converts JRC-EU-Times transport cost' 2021-06-11 14:36:56 +02:00
Tom Brown
e542efd552 README: Fix date of preprint (was too optimistic...) 2021-06-01 17:42:14 +02:00
Tom Brown
4bc5d94d42 README: Add network picture to make scope clear 2021-06-01 17:36:59 +02:00
Fabian Neumann
32365312da
retro: fix renaming u_values subsectors and btype (#127) 
by not looping the .replace() across all columns of the dataframe.

Circumvents: TypeError: Cannot compare types 'ndarray(dtype=float64)' and 'str'
 2021-05-25 15:51:38 +02:00
Fabian Neumann
bea8194b7b
prepare: add costs for biogas upgrading (#126) 
Co-authored-by: lisazeyen <lisa.zeyen@web.de>

Co-authored-by: lisazeyen <lisa.zeyen@web.de>
 2021-05-25 09:42:01 +02:00
lisazeyen
0e3d21f5a4
add EU oil bus already when adding land transport to be able to run the model without industry and avoid warning of missing bus. Add a check for scaling down total electricity demand to avoid warning of invalid value in double_scalar (#100) 2021-05-25 09:03:02 +02:00
Leon
e367f8ae11
Fix error when running without the industry sector (#96) 
Fixing that the code stops with an error if running without the industry sector, e.g. only including electricity and heat. When the industry sector is not included, balances_df.index.levels[0] does not include "process emissions". Using the XOR operator "^" does then add it instead of removing it when compared to the co2_carriers list. The XOR operator does only work as intended, i.e. excluding the three emission-related strings, when these strings are already in the original list. The proposed change fixes the issue.
 2021-05-24 22:11:24 +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
5952f7a8c7 Merge branch 'master' of github.com:PyPSA/pypsa-eur-sec 2021-05-21 12:38:28 +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
Fabian Neumann
555002a35b fixup: remove remaining instances of {network} wildcard from recent PR 2021-05-19 13:57:44 +02:00
Tom Brown
c87b45a763
Merge pull request #97 from PyPSA/retro-updated 
Retro updated
 2021-04-30 18:13:23 +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
Tom Brown
e28ddbd710 config: rename vary in vary_space_heat_exogenously to reduce 
Since the factor reduces demand with default positive sign.
 2021-04-30 17:57:16 +02:00
Fabian Neumann
3e3001455a
address FutureWarning regarding set operations on pd.Index (#103) 2021-04-29 17:11:10 +02:00
Fabian Neumann
a156d44f28
remove unused {network} wildcard (#104) 2021-04-29 16:52:35 +02:00
Fabian Neumann
184aee76ca make yaml loading safe 2021-04-27 09:54:52 +02:00
lisazeyen
b979441462
Import sys (#98) 
* import sys package and remove unnecassary imports

* add encoding when reading csv files to the old (and soon depreciated) build_retro_cost script
 2021-04-23 11:26:53 +02:00
Leon
55eb722ead
Make code more readable; remove misleading function arguments and add necessary ones (#94) 
* Make code more readable; remove misleading function arguments and add necessary ones

* Update scripts/build_energy_totals.py

Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>
 2021-04-23 11:26:38 +02:00
lisazeyen
7af2941156 rename space heat demand reduction in config.yaml and prepare_sector_network.py script, adjust exogenously assumed space heat demand reductions to more conservative assumptions 2021-04-19 17:20:52 +02:00
lisazeyen
677aee5606 add documentation to the updated modelling of building retrofitting 2021-04-19 17:19:34 +02:00
Tom Brown
3da1c0d6b7 Update data bundle to include Episcope-TABULA data 2021-04-18 18:56:29 +02:00
Tom Brown
5852e2035c config.yaml: Include switch for thermal energy storage 'tes' again 2021-04-18 18:42:27 +02:00
Tom Brown
93eb86eec8 doc: Release note on ICE emissions bugfix 2021-03-05 10:38:41 +01:00
Tom Brown
1cbef8e61f Add fictitious load to account for land transport ICE emissions 
Recently ICE vehicles were added, but the emissions were not accounted
for. Now, like aviation emissions, they are added as a negative load
to the "co2 atmosphere" bus.
 2021-03-04 18:20:23 +01:00
lisazeyen
36685bd016 update retro script to include ventilation, thermal bridges and heat gains. Add necessary input files in the Snakefile, remove no longer needed file 2021-02-24 16:51:58 +01:00
lisazeyen
088c5ab805 adjust make summary functions to work without industry sector 2021-02-23 15:42:43 +01:00
lisazeyen
8cabeb5871 update master branch 
Merge branch 'master' of https://github.com/PyPSA/pypsa-eur-sec
 2021-02-23 10:16:35 +01:00
martavp
1b205b9e4a
Merge pull request #3 from PyPSA/master 
update from master upstream
 2021-02-04 09:16:21 +01:00
martavp
b264f2947d
Merge branch 'master' into master 2021-02-04 09:15:03 +01:00
Tom Brown
31ed6ebc16 Correct heat output of central gas and solid biomass CHP with CC 
The heat output from the carbon capture (CC) was being subtracted from
the CHP rather than the heat input.

Since the heat output and heat input are the same in the DEA
technology database (but at different temperatures), this bug has no
consequence, but still better to correct it.
 2021-02-02 13:16:17 +01:00
Tom Brown
99ad066469
Merge pull request #92 from nworbmot/master 
Change name of liquid hydrocarbon bus from Fischer-Tropsch to oil
 2021-01-29 16:43:11 +01:00
Tom Brown
cd8bf1edfc doc: Include renaming of liquid hydrocarbon bus in release notes 2021-01-29 16:34:52 +01:00
Tom Brown
54a28db84f Change name of liquid hydrocarbon bus from Fischer-Tropsch to oil 
Reasoning: we can also have fossil and biomass liquid hydrocarbons, as
well as production from the Fischer-Tropsch process, particularly for
simulations before 2050.
 2021-01-26 10:55:38 +01:00
Tom Brown
4fd164f73c config.yaml: Remove battery and H2 Stores from PyPSA-Eur 
I.e. what's taken over from PyPSA-Eur in config["pypsa_eur"] from
"Store" is [].

PyPSA-Eur-Sec adds its own batteries and H2 Stores.
 2021-01-25 14:17:31 +01:00
Tom Brown
39a5134ab9 doc: Add latest EEA emissions stats UNFCCC_v23.csv to data bundle 2021-01-25 11:10:13 +01:00
Tom Brown
0dc9196b76
Merge pull request #90 from martavp/alter-cost-potential 
Add a factor to alter cost or capacity potential via the config file
 2021-01-18 18:19:24 +01:00
Tom Brown
b133cd6656
Merge pull request #89 from martavp/distribute_CO2budget 
Distribute CO2 budget among the planning horizons for the myopic option
 2021-01-18 18:17:15 +01:00
Tom Brown
5a7f0c2c05
Merge pull request #88 from martavp/fix_YearCommissioned 
Fix year commissioned
 2021-01-15 18:04:35 +01:00
martavp
1b14c5525c
correct spelling mistake 2021-01-15 12:56:21 +01:00
Fabian Neumann
c638cc98ed
add 'snakemake workflow' keyword to README 2021-01-15 12:29:52 +01:00
martavp
fd6239db5c allowing factor to alter the cost or p_nom_max 2021-01-14 13:51:10 +01:00
martavp
2555b66ba9 allowing a factor to alter the cost or p_nom_max via the config file 
This substitutes the previous way of doing it. Now, to multiply the reference p_nom_max by 3, one should include in the config file 'solar+p3' (instead of the previous solarx3)
 2021-01-14 13:49:17 +01:00
martavp
0eb69365eb Update Snakefile 
Allow white space in sector_opts, e.g. to investigate sensitivity to cost of 'H2 Electrolysis'
 2021-01-14 10:21:11 +01:00
martavp
e180931ce1 Move ploting of carbon budget distribution to plot_summary.py 2021-01-14 10:06:29 +01:00
martavp
faebbc493b Add comment to config file explaining carbon budget key 2021-01-12 12:01:55 +01:00