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

611 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Tom Brown
a1904886ac
Merge branch 'master' into distribution 2020-09-22 20:18:21 +02:00
Tom Brown
98435d7fc6
Merge pull request #68 from PyPSA/yaml_loader 
read config.yaml for testing with yaml.safe_load()
 2020-09-22 20:17:32 +02:00
Tom Brown
df4c675f58
Merge pull request #67 from leonsn/patch-1 
Update installation notes
 2020-09-22 20:15:10 +02:00
lisazeyen
d26da9971f add data for hydrogen underground potential 2020-09-22 10:15:04 +02:00
lisazeyen
7972637334 add upper energy capacity limit for hydrogen storage per country, caution: for multiple nodes in one country storage potential is distributed by population 2020-09-22 09:54:52 +02:00
lisazeyen
27e2584ae8 split hydrogen storage into underground storage in salt cavern for countries with potential, others overground hydrogen storage, switch costs from gas storage to corresponding hydrogen storage 2020-09-22 09:52:53 +02:00
lisazeyen
7fe7dc381f read config.yaml for testing with yaml.safe_load() 2020-09-22 09:32:24 +02:00
lisazeyen
e1babafa35 remove taken the minimum of old solar p_nom_max and solar rooftop because no overlap between the potentials 2020-09-22 09:24:30 +02:00
lisazeyen
736c7166ac add missing multiplication with gas distribution grid cost factor 2020-09-22 09:18:28 +02:00
Leon
0ebad1a2e9
Remove the reminder to activate the conda environment 2020-09-21 20:07:48 +02:00
Tom Brown
791a58fc6b Make selection of biomass classes (solid, biogas) more explicit 
List classes in config.yaml, rather than integer selection in
build_biomass_potentials.py.

Also output potentials for all years and scenarios for analysis.
 2020-09-21 18:35:45 +02:00
Tom Brown
83aa24cf17 Merge branch 'master' of github.com:PyPSA/pypsa-eur-sec 2020-09-21 17:07:43 +02:00
Tom Brown
44ee205820 Fix recalculation of offshore connection costs 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-21 17:04:45 +02:00
Tom Brown
c922620905
Merge pull request #65 from nworbmot/master 
Calculate industrial production in Mt/a before calculating corresponding energy demand
 2020-09-21 13:18:33 +02:00
Tom Brown
d727a981a2 Update data bundle to include USGS ammonia production by country 2020-09-21 13:12:03 +02:00
Tom Brown
1652cdc09e Move all intermediately-generated files from data to resources 
Now data only contains external input data.

Now resources only contains intermediary files.
 2020-09-21 13:06:58 +02:00
Tom Brown
ac4100922a Include also industry new electricity load at low voltage bus 
For consistency with the existing industry electricity load already
there.

This only applies when the electricity distribution grid is inserted.
 2020-09-21 12:06:20 +02:00
Leon
82d7c8719e
Update installation notes: PyPSA-Eur datafiles are part of the snakemake flow 2020-09-17 16:37:47 +02:00
lisazeyen
6d440499d5 add option to add costs for gas distribution. Caution, currently assuming same costs for gas distribution as the ones for electricity distribution 2020-09-15 18:03:33 +02:00
lisazeyen
b2789960fc add missing resistive heater and micro CHP to electricity distribution, add new electricity demand for industry to electricity distribution, restrict solar rooftop potential, change for testing mocksnakemake input for the costs to technology database 2020-09-15 17:48:57 +02:00
Tom Brown
06a3b029d8 When changing prim/secondary production, take account of existing 
Don't fix uniform ratios e.g. of 0.3:0.7 primary:secondary for steel
and aluminium, but convert the necessary amount of existing primary in
each country so that the overall ratio applies at European level.

This stops sudden swings from primary to secondary in countries
dominated by primary production.
 2020-09-07 19:15:40 +02:00
Tom Brown
c58f18667d Add non-EU28 energy demand per country and sector for today 
Use the industrial production per sector and multiply with EU28
averages for energy per sector.
 2020-09-07 19:12:47 +02:00
Tom Brown
783e026ebf Separate ammonia from basic chemicals in today's industry energy 2020-09-07 18:41:07 +02:00
Tom Brown
04629b5113 For DRI+EAF route for primary steel, add electricity for DRI shaft 2020-09-07 17:23:31 +02:00
Tom Brown
916aa5e0d9 Generate today's industry demand per ct and per sector 
Only covers EU28 at the moment.

Uses the energy balances sheets from JRC-IDEES.
 2020-09-07 16:48:06 +02:00
Tom Brown
aa3ffb9ac2 Remove biomass from chemicals, cement; increase in PPA, FBT 
Remove non-existing biomass from chemicals and cement, since these
need higher temperatures than achievable with residues and waste.

Increase biomass in pulp and paper (since already used extensively
here and T < 500), and replace methane with biomass in food, beverages
and tobacco, since temperatures needed are low (T < 500).
 2020-09-07 14:49:20 +02:00