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

2613 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Fabian Neumann
9966038837 environment: limit libgdal to 3.0.2 (2nd try) 2020-09-25 15:47:44 +02:00
Fabian Neumann
b81dfcaada environment: limit libgdal to 3.0.2 2020-09-25 15:34:35 +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
Fabian Neumann
db3a0e8e5c travis: all via mamba 2020-09-25 15:18:59 +02:00
Fabian Neumann
06b8fe1e98 environment: add mamba 2020-09-25 15:06:39 +02:00
Fabian Neumann
fc7f04d1d8 travis: switch solver installation back to conda 2020-09-25 14:53:17 +02:00
Fabian Neumann
336392fcf8 travis: debug which solver causes problem 2020-09-25 14:44:31 +02:00
Fabian Neumann
c7dd302262 travis: fix path to environment file 2020-09-25 14:16:04 +02:00
Fabian Neumann
baff295721 travis: remove unnecessary env create via conda 2020-09-25 14:13:55 +02:00
Fabian Neumann
456daa6260
travis: use mamba for faster builds (#196) 
* travis: use mamba for faster builds

* doc: add release notes [skip travis]
 2020-09-25 14:08:46 +02:00
Fabian Neumann
fcb895a098
environment: limit snakemake to 5.24.2 (#195) 
until https://github.com/snakemake/snakemake/issues/635 resolved
 2020-09-25 14:01:00 +02:00
Fabian Neumann
c543fb39c6
cluster: fix removing deprec squeeze=True in groupby (#194) 2020-09-25 12:34:34 +02:00
martha.frysztacki
9331f1ec46 cluster_network: The 'squeeze' parameter is deprecated and will be removed in a future release; works just fine without it 2020-09-24 17:46:20 +02:00
Martha Maria
047276b2dc
Fix clustering sites (#191) 
* fix clustering of offwind-ac and offwind-dc in sites option

* add release nodes

Co-authored-by: martha.frysztacki <eb5194@iai-esm003.iai.kit.edu>
 2020-09-24 10:13:13 +02:00
Fabian Neumann
ec803a372e
add cost uncertainty opts for suptechs (#189) 2020-09-24 10:09:11 +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
Tom Brown
f3dcda9179 Include integrated steelworks in industry_sector_ratio 
Also switch it from sep=";" to ","
 2020-09-07 11:04:50 +02:00
Fabian
fee8ef92d4 fixup (follow up to #183) correct transmission constraint name 2020-08-28 22:28:23 +02:00
Tom Brown
f45b9a37ae Separate ammonia from other "Basic chemicals" 
This allows us to control the substitution of natural gas for hydrogen
in NH3 production.

Remaining basic chemicals are olefins, BTX and chlorine.

For 2015 NH3 production, we use the USGS data source.
 2020-08-28 19:13:18 +02:00
FabianHofmann
cfd815aa42
Don't remove capital cost for lines and links when setting lv, lc limit (#183) 
* solve #175

* adjust wildcards explanation

* allow lv and lc limits below 1
 2020-08-28 17:59:51 +02:00
Tom Brown
b761281b3d Move changes to primary/secondary routes for Al/St to new script 
This was handled before in industry_sector_ratios.csv which was
confusing.

Now industry_sector_ratios.csv represents the genuine energy
consumption per tonne of material for each industrial route
(MWh/tMaterial).

An new file is created with ktMaterial/a in
industrial_production_per_country_tomorrow.csv which contains changes
to the fraction of primary/secondary routes compared to today's
production in industrial_production_per_country.csv.

This is less confusing I think.
 2020-08-26 16:13:01 +02:00
Tom Brown
851142fe0f Separate script for industrial production per ct from energy demand 2020-08-26 13:12:16 +02:00
Tom Brown
37f36047ca Industry demand: Also record material production per industry 2020-08-26 12:06:01 +02:00