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

687 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tom Brown
2c49b8e3c3 config: Move heat pump sink temp from script to config.yaml 2020-12-02 11:51:27 +01:00
Tom Brown
1ea31f0e57 Redo investment-year-dependent exogenous retrofitting parameter 
Specify as dictionary, use get_parameter to get correct value.

Also remove old parameter "space_heating_fraction" since this is
superceded by the new exogenous retro code.
 2020-12-01 14:41:11 +01:00
Tom Brown
2b72aeb43c
Merge pull request #74 from PyPSA/retro 
Retro
 2020-11-30 17:11:48 +01:00
Tom Brown
974155bd46 Merge branch 'master' into retro 2020-11-30 17:07:43 +01:00
Tom Brown
17bf0dfbb1 prepare_costs: use default lifetime from config.yaml 
Rather than hard-coding 25 years.
 2020-11-30 17:01:14 +01:00
Tom Brown
7cfce2e324
Merge pull request #76 from PyPSA/country-subsets 
energy_totals: only fix 'BA' if in list of countries
 2020-11-30 16:43:15 +01:00
Tom Brown
90e1d75df6 land transport: allow share of fossil-FCEV-EV to change over time 
Allow share of land transport to be set exogenously in config.yaml.
 2020-11-30 16:20:26 +01:00
Tom Brown
801f0a403d Remove config.myopic.yaml to avoid many duplicated parameters 
It is identical to config.default.yaml except for two parameters
(foresight and planning_horizons) so I decided to consolidate the
example configs. Instructions for how to use the myopic foresight can
be found in the documentation (now updated).
 2020-11-30 16:10:11 +01:00
Tom Brown
abbaa0d098 Move CO2 budgets from data/co2_budget.csv to dict in config.yaml 
Strategy is too keep as much of configuration in config.yaml as
possible.

We also aim to allow exogenous investment-year-dependent
configurations to be done in a similar manner (e.g. share of district
heating or FCEV transport).
 2020-11-30 13:21:38 +01:00
Fabian Neumann
a143ab7122 energy_totals: only fix 'BA' if in list of countries 2020-11-24 13:44:02 +01:00
lisazeyen
e511dac148 fix bug for urban_fraction factor, rewrite pattern for defining country, location and temporal resolution, add more comments for endogenously retrofitting 2020-11-11 18:18:56 +01:00
Tom Brown
5b4f8837db doc: Update information on spatial distribution of industry demand 2020-10-28 18:54:30 +01:00
Tom Brown
65944e20ca plot_network: Fix bugs in plotting of today's network 2020-10-28 18:47:28 +01:00
Tom Brown
a613da6031 make_summary: Don't add back line costs for LV for PyPSA-Eur > 0.2.0 
PyPSA-Eur now includes HVAC and HVDC line costs with LV option.

So don't add them back to costs afterwards.
 2020-10-28 18:24:54 +01:00
Tom Brown
9721dccc0f Make micro CHP optional, option to reduce non-NH3 basic chemicals 
Also add option to limit extension of HVAC and HVDC transmission
lines.

Also fix bug that option to limit solar & wind potential was bypassed.
 2020-10-28 18:21:28 +01:00
lisazeyen
63f1e99c8b remove unnecessary variables when adding endogenously retrofitting 2020-10-21 19:19:38 +02:00
lisazeyen
1e2895023b add script for building retro costs per country and sector, add retrofitting parameters to config.yaml 2020-10-21 16:04:27 +02:00
lisazeyen
d1282ba315 add option for endogenously retrofitting 2020-10-21 15:21:26 +02:00
Tom Brown
989495ce79 prepare_sector_network: Type of new busmap index and values to str 
Otherwise they're read in as integers and the mapping fails.
 2020-10-21 14:31:37 +02:00
lisazeyen
301d74f059 add option for exogenously retrofitting, space heat demand is reduced before adding losses in DH 2020-10-21 14:30:26 +02:00
lisazeyen
75ff2d19ee move transport data input path to Snakefile 2020-10-21 13:45:49 +02:00
lisazeyen
0563c986a2 modify mocksnakemake for testing 2020-10-21 13:35:34 +02:00
Tom Brown
f0ef0e1136
Merge pull request #70 from eb5194/master 
compatibility with pypsa-eur PR: clustermaps to csv
 2020-10-21 13:01:17 +02:00
lisazeyen
4f2135a43a add option for solid biomass transport 2020-10-21 07:23:52 +02:00
lisazeyen
b4fbb47d29 fix bug when adding biomass industry demand, add option to remove biomass transport and have only single EU biomass node 2020-10-21 07:21:09 +02:00
lisazeyen
13cae7d66f drop nan values to avoid runtime error when removing todays electricity demand 2020-10-20 14:19:07 +02:00
lisazeyen
ae9c0d9530 prepare_sector_network: split industry demand for biomass to single nodes 2020-10-20 14:08:17 +02:00
lisazeyen
3944e19c51 config.yaml: add color for biomass transport 2020-10-20 13:48:05 +02:00
lisazeyen
651a7ff693 add biomass transport, split potential for solid biomass to nodes, add costs for upgrading biogas to gas 2020-10-20 13:46:39 +02:00
lisazeyen
2dd97c39ed Snakefile: add path to biomass transport cost in rule prepare_sector_network 2020-10-20 13:45:34 +02:00
lisazeyen
50b4e822c4 config: add missing color for industry electricity 2020-10-20 13:00:41 +02:00
lisazeyen
cdaa4587ad Snakefile: add transport input data to rule prepare_sector_network 2020-10-20 12:59:19 +02:00
lisazeyen
b4f1c570d6 move input data path for emobility/transport data to snakemake input 2020-10-20 10:13:02 +02:00
lisazeyen
2b9ac511b5 update mocksnakemake for testing 2020-10-20 09:34:45 +02:00
Tom Brown
4e6c323ac3
Merge pull request #71 from nworbmot/master 
Use hotmaps industrial database for distribution of industry in each country
 2020-10-12 15:44:08 +02:00
Tom Brown
9e91d2c1f0 doc: Document sources for input data 2020-10-12 15:37:47 +02:00
Tom Brown
8f6b551efb Update data bundle to include hotmaps industrial site database 2020-10-12 14:59:15 +02:00
Tom Brown
e8b923e076 industry: subtract today's ind elec demand, add back new demand 
Since today's industrial electricity demand is distributed by
population and GDP, subtract this from the regular electricity demand
(which already has space/water heating subtracted).

Now regular electricity demand is only non-heating electricity demand
in residential and tertiary sectors.

Add back new industry electricity demand at the correct locations, as
determined using the hotmaps database.
 2020-10-12 14:56:41 +02:00
Tom Brown
80cbe98630 industry: add current nodal electricity demand to subtract later 2020-10-12 13:26:21 +02:00
Tom Brown
f2b347334d industry: build nodal energy demand from nodal production 2020-10-12 12:20:04 +02:00
Tom Brown
f0937e203b industry: separate code for distribution key from nodal production 
This allows us to reuse the key for today's nodal energy demand from
industry.
 2020-10-12 12:07:49 +02:00
Tom Brown
90f5349b7d Use hotmaps industrial database for distribution in each country 
I.e. per sector geographical distribution of industrial facilities
within each country.

Drop facilities outside Europe and with no geocoordinates.

Use ETS emissions as a distribution key; where emissions data is
missing, substitute with an average for that sector and that country
(strong assumption).
 2020-10-05 20:04:04 +02:00
eb5194
30adabbcaa Snakefile: input files in pypsa-eur became .csv 2020-10-02 12:22:25 +02:00
eb5194
5dabdac288 add_existing_baseyear: read input file as .csv 2020-10-02 12:21:31 +02:00
eb5194
9fac6f5392 prepare_sector_network: read input file as .csv 2020-10-02 12:20:55 +02:00
Tom Brown
72653c3a42 PyPSA-Eur-Sec Version 0.3.0 
Please see the release notes:

https://pypsa-eur-sec.readthedocs.io/en/latest/release_notes.html#pypsa-eur-sec-0-3-0-27th-september-2020

for more information.
 2020-09-27 18:01:52 +02:00
Tom Brown
b862bb95cd Fix H2 underground potentials from TWh to MWh; simplify H2 data 2020-09-25 16:23:45 +02:00
Tom Brown
de52711700 Fix calculation of solar rooftop potentials for "m" clusters 
I.e. when the generators are clustered to the "simplified" network
resolution, but the grid is clustered further, e.g. by using the
clusters = 37m "m" option.
 2020-09-25 15:25:41 +02:00
Tom Brown
6b964865e7
Merge pull request #69 from PyPSA/salt_cavern_potential 
Salt cavern potential
 2020-09-22 20:19:29 +02:00
Tom Brown
a15186576b
Merge pull request #66 from PyPSA/distribution 
Distribution
 2020-09-22 20:18:46 +02:00