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

2730 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Fabian Neumann
e8897cdb4c http remote to retrieve technology-data 2021-04-27 14:54:54 +02:00
Fabian Neumann
175b14e248 merge master follow-up 2021-04-27 14:49:27 +02:00
Fabian Neumann
4ec06f54bc merge master 2021-04-27 14:47:15 +02:00
Fabian Neumann
c29d59b97f Merge branch 'pz-max-fix-marginal-costs' 2021-04-27 14:36:39 +02:00
Fabian Neumann
164c168a30 minor revisions on pz-max's PR 2021-04-27 14:36:34 +02:00
Fabian Neumann
e3863084cd Merge branch 'fix-marginal-costs' of https://github.com/pz-max/pypsa-eur into pz-max-fix-marginal-costs 2021-04-27 14:32:49 +02:00
Fabian Neumann
184aee76ca make yaml loading safe 2021-04-27 09:54:52 +02:00
Fabian Neumann
efdfad97a3
address FutureWarning re set operations on pd.Index (#238) 2021-04-27 07:51:46 +02:00
euronion
d3dc2e924a
Correct co2base in config.default.yaml . (#233) 
* Correct co2base in config.default.yaml .

Based on PyPSA-EUR-SEC data.

* Update release_notes.rst

* Fix .rst .
 2021-04-23 11:41:55 +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
Fabian Neumann
6765ffda8f fix electricity.csv 2021-04-06 13:27:21 +02:00
martacki
bd57548788 merge 2021-03-24 12:00:45 +01:00
Max Parzen
184b060903
syntax correction 2021-03-23 20:27:13 +00:00
Max Parzen
f9e73690e1
Update add_extra_components 2021-03-23 19:34:13 +00:00
Max Parzen
b4a992c4db
update config.yaml 
adding to marginal costs:
- electroysis
- fuel cell
- battery inverter
 2021-03-23 19:30:06 +00:00
Max Parzen
165148d26c
Update scripts/add_extra_components.py 
Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>
 2021-03-23 19:22:39 +00:00
pz-max
2f9e9075e8 adding marginal cost for storage 2021-03-23 17:29:59 +00:00
Koen van Greevenbroek
9048af482f
Add a check to fix KeyError (#220) (#228) 
In some cases, in networks with DC links, a non-existing column would
be referenced in an empty Dataframe. This commit adds a check for this
case.

Co-authored-by: Koen van Greevenbroek <koen@vesoldo.com>
 2021-03-10 18:16:09 +01: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
eb5194
b9fdacad4d simplify: delete columns with incorrect/accurate entries 2021-01-20 20:39:22 +01:00
eb5194
ea8e643dc4 add_electricity.py Resolve FutureWarning 771 Index.__or__ operating as set operation is deprecated 2021-01-19 15:20:58 +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
Fabian Neumann
df2425d4a0
Update README.md 2021-01-14 21:22:34 +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