Commit Graph

641 Commits

Author SHA1 Message Date
lisazeyen
447c2119a6 add constraint for retrofitting existing gas pipes to H2 pipes 2021-06-21 12:34:47 +02:00
lisazeyen
17a1153648 comment functions, remove not used input 2021-06-21 12:34:08 +02:00
lisazeyen
e4dad6429d update for atlite version 0.2.4 2021-06-21 07:59:57 +02:00
lisazeyen
c5b3551687 fix spelling mistake 2021-06-18 09:45:51 +02:00
lisazeyen
4d913c9a93 split EU gas, EU biogas and EU gas for industry into gas bus for each cluster 2021-06-18 09:45:29 +02:00
lisazeyen
dbec103593 add mock_snakemake from pypsa-eur 2021-06-18 09:41:18 +02:00
martavp
0a92d23698 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
2021-06-17 16:13:05 +02:00
martavp
a57135b086 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.
2021-06-17 15:12:10 +02:00
lisazeyen
6cde3c2b57 add mock_snakemake function to pypsa-eur-sec 2021-06-17 09:36:36 +02:00
lisazeyen
feefaa3d41 Merge branch 'master' into retrofit-gas-pipelines 2021-06-17 06:38:47 +02:00
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
lisazeyen
33f7f5026e Merge branch 'master' into retrofit-gas-pipelines 2021-05-12 15:20:49 +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
lisazeyen
fca6cb0284 add gas network data from ENTSOG and SciGRID 2021-04-15 14:22:33 +02:00
lisazeyen
50f02f64e8 build_gas_network: first steps to map current gas infrastructure to PyPSA-Eur-Sec 2021-04-15 14:21:48 +02:00
lisazeyen
04244ac8ce Snakefile: add rule for building current gas network 2021-04-15 14:20:39 +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