bjoern/pypsa-eur
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
5,245 Commits 1 Branch 0 Tags 133 MiB
42f2c37ebf
Commit Graph

5245 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Fabian Neumann
4f7f2fa67a extra_components: specify hydrogen storage *tank* 2020-10-16 14:47:13 +02:00
Fabian Neumann
8a323b7267 cost: move defaults to config and improve documentation 2020-10-16 11:38:26 +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
Fabian Neumann
bcd7f86b5c remove {networks} wildcard 2020-10-09 17:03: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
Fabian Neumann
f3b1d3d513 undo config test/tutorial without plotting, rm matplotlibrc, .licenses 2020-10-03 11:38:51 +02:00
Fabian Neumann
6deac6ced3 merge master 2020-10-03 11:15:39 +02:00
Martha Maria
52683236cd
prepare_network: fix nmo security margin (#199) 
* prepare_network: fix nmo security margin

* Update doc/release_notes.rst

Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>

* Update scripts/prepare_network.py

Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>

Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>
 2020-10-02 15:55:22 +02:00
Martha Maria
2e76b88ec8
simplify_ and cluster_network: clustermaps to csv (#198) 
* simplify and clustering: output and input from HDF format to CSV

* add release notes

* simplify and clustering: output files from Snakefile
 2020-10-02 12:53:56 +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
Fabian Neumann
4d0a860246 Merge branch 'master' of github.com:PyPSA/pypsa-eur 2020-09-26 13:16:19 +02:00
Fabian Neumann
88f1184315 travis: only build master and PRs onto master 2020-09-26 13:16:00 +02:00
Fabian Neumann
ab6dc633bf
Options for regional equity and autarky (#166) 
* solve: add option for equity constraints

* solve: scale more

* prepare: add option to limit line/link capacity

* solve: add inflow to EQ constraints

* solve: reindex inflow to match load

* update config files and references

* add autarky option

* move release notes

* add spillage to equity requirements

* prepare: fix accidental code removal

* prepare: add country autarky option

* consider snapshot_weightings for inflow

* trigger CI
 2020-09-26 13:10:50 +02:00
Fabian Neumann
b756773b9d merge master 2020-09-26 11:21:16 +02:00
Fabian Neumann
0988551896
environment: limit libgdal to 3.0.4 max (#197) 
* environment: limit libgdal to 3.0.4 max

* environment: test numpy version

* environment: lift numpy version restriction

* environment: reintroduce numpy version restriction
 2020-09-25 19:57:09 +02:00
Tom Brown
b862bb95cd Fix H2 underground potentials from TWh to MWh; simplify H2 data 2020-09-25 16:23:45 +02:00
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
1e4f6f9568 travis: add conda list for easier debugging 2020-09-25 12:45:43 +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