Commit Graph

501 Commits

Author SHA1 Message Date
Fabian Neumann
7760c30d3c
Merge pull request #195 from PyPSA/solve-threads
solve_network: take threads from solver setting
2021-11-24 15:08:38 +01:00
Fabian Neumann
42784030e7
Merge pull request #192 from leonsn/patch-1
Remove a wrong connection on the diagram
2021-11-24 15:07:44 +01:00
Fabian Neumann
6a92eb9d74
Merge pull request #196 from PyPSA/fix-cp-config
fix copying pypsa-eur config
2021-11-24 15:07:17 +01:00
Fabian Neumann
bb9f437855 fix copying pypsa-eur config 2021-11-24 10:54:39 +01:00
Fabian Neumann
5be6c24fe7 solve_network: take threads from solver setting 2021-11-24 10:33:46 +01:00
Fabian Neumann
306170fe09
Merge pull request #194 from koen-vg/copy-default-config
Create config file from default if not found
2021-11-22 15:43:02 +01:00
Koen van Greevenbroek
04e62fd52e Create config file from default if not found
Similarly to pypsa-eur, the config file is not found, we create it as
a copy of `config.default.yaml`. This also makes it easier to include
pypsa-eur-sec as a subworkflow in a snakemake workflow.
2021-11-22 15:00:42 +01:00
Fabian Neumann
f93ec5a381
Merge pull request #193 from koen-vg/fix-non-ascii
Remove non-ascii character from source file
2021-11-22 14:18:37 +01:00
Koen van Greevenbroek
977dbfe933 Remove non-ascii character from source file
Unfortunately Snakemake for now reads files using the default OS file
encoding, which may not be UTF-8. Therefore, it is best to be
conservative and only use ascii in source files for now.
2021-11-22 14:02:57 +01:00
Leon
42c17b2693
Add files via upload 2021-11-22 12:25:16 +01:00
Leon
ddd9bb74e3
Replacing does apparently not work on the github webinterface. 2021-11-22 12:24:31 +01:00
Leon
773c1df573
Remove connection between "methane" and "liquid hydrocarbons"
This connection should not have been there to start with.
2021-11-22 12:21:20 +01:00
Fabian Neumann
8cb78f90d4
Merge pull request #190 from fwitte/master
Add missing code directive and hyphon in tar operation
2021-11-19 08:00:18 +01:00
Francesco Witte
bac7e54d23 Add missing code directive and hyphon in tar 2021-11-16 13:36:46 +01:00
Fabian Neumann
ba4bea250f
Merge pull request #184 from PyPSA/plotting-adjustments
plot: correct h2 map legend overlap, change aggregation of techs
2021-11-02 08:31:40 +01:00
Fabian Neumann
8b39cbf155
Merge branch 'master' into plotting-adjustments 2021-11-02 08:31:34 +01:00
Fabian Neumann
0e1bf531cb
Merge pull request #179 from PyPSA/new-colors
add new color scheme for more distinguishing colors
2021-11-02 08:30:38 +01:00
Fabian Neumann
e6f4479544 doc: add EMP-E presentation and speed preprint 2021-10-28 09:58:45 +02:00
Fabian Neumann
04a6685e07 add additional aliases and colors 2021-10-23 21:23:34 +02:00
Fabian Neumann
2a0855915c add review suggestion for p2h technologies 2021-10-23 21:23:01 +02:00
Fabian Neumann
d26dbcb7fd plot: correct h2 map legend overlap, change aggregation of techs 2021-10-23 21:16:05 +02:00
Fabian Neumann
a6ccfc8af9
Merge pull request #180 from PyPSA/rsync
add basic setup of rsync with files to ignore
2021-10-23 21:07:39 +02:00
Fabian Neumann
2840257732
Merge pull request #181 from PyPSA/copy-pypsa-eur-config
copy pypsa-eur config.yaml into results folder
2021-10-23 21:05:55 +02:00
Fabian Neumann
0a9210ed44 copy pypsa-eur config.yaml into results folder 2021-10-07 14:36:34 +02:00
Fabian Neumann
ca3b30e63c add basic setup of rsync with files to ignore 2021-10-07 12:15:33 +02:00
Fabian Neumann
c095c3aa10 review with lisazeyen 2021-10-06 18:33:54 +02:00
Fabian Neumann
7592624ef2 add new color scheme for more distinguishing colors 2021-10-06 16:41:10 +02:00
Fabian Neumann
23a167c308 config: co2_budget is currently compulsory. Add back in. 2021-10-04 18:12:19 +02:00
Fabian Neumann
e872595c79 release_notes: correct version 2021-10-04 18:02:05 +02:00
Fabian Neumann
47e6badd58 doc: fix typo in conf.py 2021-10-04 17:57:18 +02:00
Fabian Neumann
056ee67c61
Merge pull request #174 from PyPSA/release-v0.6
Preparation of release v0.6
2021-10-04 17:47:06 +02:00
Fabian Neumann
c5452d9882 release_notes: opener 2021-10-04 17:45:54 +02:00
Fabian Neumann
b915f08ac2 installation: update to new databundle location 2021-10-04 17:44:17 +02:00
Fabian Neumann
2597d980e0 config: optimise default for overnight scenario for consistency planning/cost year 2021-10-04 14:29:53 +02:00
Fabian Neumann
19d128aafd bugfix: take district heating progress not potential 2021-10-04 14:28:59 +02:00
Fabian Neumann
1f8c1678b8 add fneum 2021-10-04 14:28:27 +02:00
Fabian Neumann
692f4705c4 merge master 2021-10-04 13:21:33 +02:00
Fabian Neumann
c168fd60d3 add release note for agriculture, forestry and fishing 2021-10-04 11:19:15 +02:00
Fabian Neumann
cecee2c9c7
Merge pull request #147 from PyPSA/agriculture-energy-co2
Add agriculture, forestry and fishing
2021-10-04 11:10:46 +02:00
Fabian Neumann
7f0ed1372c organise release notes 2021-10-04 10:02:47 +02:00
lisazeyen
4135718e37 use agriculture sector as default, add missing colors 2021-10-04 09:23:54 +02:00
lisazeyen
017c188518 fix typo for district heating with capital D 2021-10-04 09:23:23 +02:00
Fabian Neumann
274eadd085 correct derived heat residential capitalisation 2021-10-03 12:51:03 +02:00
Fabian Neumann
aca1023c3d bump version to 0.6.0 2021-10-02 11:17:29 +02:00
Fabian Neumann
2bfc091f8b update data bundle 2021-10-02 11:12:45 +02:00
Fabian Neumann
2e6e9c6802
Merge branch 'master' into agriculture-energy-co2 2021-10-02 10:51:28 +02:00
Fabian Neumann
b560d95b6a merge master 2021-10-02 10:41:56 +02:00
Fabian Neumann
4375083838 create parallel structures for land-use constraints w/wo m 2021-10-02 10:40:49 +02:00
Fabian Neumann
4400658099 edit release note 2021-10-02 10:40:01 +02:00
Fabian Neumann
fb601cc051
Merge pull request #149 from PyPSA/dh-share
Include today's district heating share for myopic optimisation
2021-10-02 10:34:07 +02:00