Commit Graph

3403 Commits

Author SHA1 Message Date
Fabian Neumann
fd4e43c085 Snakefile: fix inputs for retrieve_databundle 2019-11-06 17:50:57 +01:00
Fabian Neumann
99cb4a4354
Merge pull request #86 from PyPSA/workflow
Integrate data retrieving into snakemake workflow
2019-11-06 16:06:11 +01:00
Fabian Neumann
64916a1179 test: add solving rule [skip travis] 2019-11-06 16:05:35 +01:00
Fabian Neumann
0fb57601bf doc: document powerplantmatching changes from #84 2019-11-06 15:59:34 +01:00
Fabian Neumann
cabe2e2a3f doc: fix typo co2base and agg_p_nom_limits [skip travis] 2019-11-06 15:22:27 +01:00
Fabian Neumann
7406ceb50e doc: add co2base and agg_p_nom_limits [skip travis] 2019-11-06 15:19:22 +01:00
Fabian Neumann
2ace4f2e94 retrieve*: add documentation 2019-11-06 14:50:59 +01:00
Fabian Neumann
0c537f159f retrieve*: clean retrieve rules 2019-11-06 12:04:01 +01:00
Fabian Neumann
bf12d25879
Merge pull request #51 from fneum/solve_network
Add `extra_functionality` and `extra_postprocessing` to solve_network()
2019-11-06 11:38:15 +01:00
Fabian Neumann
4d9b02ea12
solve_network: add snapshots as required argument 2019-11-06 11:33:57 +01:00
Fabian Neumann
8be2c4c254 results: remove folder 2019-11-06 11:25:09 +01:00
Fabian Neumann
bbfc5bde0b Merge branch 'fneum-co2limit' 2019-11-06 11:21:37 +01:00
Fabian Neumann
82392c6c07 Merge branch 'co2limit' of https://github.com/fneum/pypsa-eur into fneum-co2limit 2019-11-06 11:19:41 +01:00
Fabian
3597f931cf Snakefile remove space 2019-11-05 14:57:59 +01:00
Fabian
594489ef22 snakefile: remove commented files 2019-11-05 14:55:51 +01:00
Fabian
b1a38229f4 ignore sort warning 2019-11-05 14:29:15 +01:00
Fabian
f6e44d2805 include data retrieving in workflow 2019-11-05 12:53:21 +01:00
Fabian Neumann
67390cc2a9
Update scripts/prepare_network.py 2019-11-05 11:21:33 +01:00
Fabian
eb14486e29 config add tiny description for powerplantfilter and custom_powerplants 2019-11-04 16:45:41 +01:00
FabianHofmann
3b83985436
Merge pull request #84 from PyPSA/powerplants
Update powerplants according to new powerplantmatching version
2019-11-04 16:26:54 +01:00
FabianHofmann
d0e2fed4d7 incorporate suggestions 2019-11-01 13:27:42 +01:00
FabianHofmann
8f5415f69c test: add electricity changes to config 2019-10-31 18:35:18 +01:00
FabianHofmann
b947c7893b travis mkdir resources if not existent 2019-10-31 18:21:11 +01:00
FabianHofmann
9ffc334001 travis manage buffer when curling 2019-10-31 18:11:40 +01:00
FabianHofmann
bf26ac9445 build_powerplants update docstring 2019-10-31 18:01:33 +01:00
FabianHofmann
5cd7a46339 fully enable powerplantmatching 2019-10-31 16:45:13 +01:00
FabianHofmann
22ddf92143 checkout powerplants.csv of master (for travis testing) 2019-10-31 15:45:38 +01:00
FabianHofmann
324ededa66 fix typo 2019-10-31 14:59:51 +01:00
Fabian Hofmann
4ee18ea9fa incorporate suggestions of #69 2019-10-31 14:48:10 +01:00
Fabian Hofmann
0d778eaf42 Merge branch 'eb5193-add_own_carriers' into powerplants 2019-10-31 14:30:05 +01:00
Fabian Hofmann
65700000f7 Merge branch 'add_own_carriers' of https://github.com/eb5194/pypsa-eur into eb5194-add_own_carriers 2019-10-31 14:23:43 +01:00
Fabian Hofmann
dee544f56b fix typo 2019-10-31 13:01:08 +01:00
Fabian Hofmann
296840bac5 Merge branch 'master' into powerplants 2019-10-31 12:16:56 +01:00
FabianHofmann
0c777fc431
Merge pull request #71 from PyPSA/update_link_length
[WIP] capital cost and underwater fraction update in clustering
2019-10-31 11:27:58 +01:00
Fabian Hofmann
142434b529 incorporate suggestions 2019-10-31 10:37:49 +01:00
Fabian Hofmann
7a9842eba7 update build and add powerplant with new ppm version 2019-10-30 23:09:41 +01:00
Fabian Neumann
b5f6a94687 added release notes v0.1.0 2019-10-29 16:48:15 +01:00
Fabian Neumann
c37e8dc799
doc/index.rst: fix type 2019-10-28 18:11:19 +01:00
Fabian Neumann
b711517bd9
Update index.rst 2019-10-28 18:09:17 +01:00
Fabian Neumann
a7915eeae5
README: add version badge 2019-10-28 18:08:37 +01:00
Fabian Neumann
28fcd5ca3a
doc/index: add build status 2019-10-28 18:04:44 +01:00
Fabian Neumann
6c78485853
README: add build status 2019-10-28 18:03:34 +01:00
Fabian Neumann
1b3f52c2c2 merge continuous integration 2019-10-28 17:49:18 +01:00
Fabian Neumann
76ab01a1a1
Merge pull request #81 from PyPSA/update_environment
Update of conda environment files
2019-10-28 17:34:17 +01:00
Fabian Neumann
036a90ff6d
Merge pull request #83 from PyPSA/powerplants
update powerplants.csv
2019-10-28 17:33:47 +01:00
Fabian Neumann
570e3fc5ab build_powerplants: download from ppm 2019-10-28 17:12:49 +01:00
Fabian Neumann
293d0ba643 update powerplants.csv 2019-10-28 16:17:22 +01:00
Fabian Neumann
05e15de60b
Rename "Macedonia" to "North Macedonia"
https://en.wikipedia.org/wiki/Macedonia_naming_dispute
2019-10-28 16:15:06 +01:00
Fabian Neumann
979ff3de72 revert to pyproj<=1.9.6 2019-10-28 15:08:53 +01:00
Fabian Neumann
777e5e97ff
fix typo in doc/tutorial.rst 2019-10-28 14:07:27 +01:00