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
Fabian Neumann
7663d71219
update conda environment files
2019-10-28 12:02:33 +01:00
FabianHofmann
7e3ea94a53
Merge pull request #76 from euronion/patch-1
...
Update make_summary for pandas-0.25 compatability.
2019-10-25 15:41:29 +02:00
euronion
da0107478e
Refractor make_summary.py multiindex creation.
...
Outsource the pd.MultiIndex and pd.Index union into dedicated function and remove C&P code snippets.
2019-10-25 14:29:38 +02:00
Fabian Neumann
ad61968dac
use pypsa master branch
2019-10-25 12:33:39 +02:00
Fabian Neumann
2a05124c80
correct config.default.yaml line references
2019-10-24 16:45:49 +02:00
Fabian Neumann
ca51c172f0
Merge pull request #65 from PyPSA/documentation
...
Documentation
2019-10-24 16:26:53 +02:00
Fabian Neumann
0fef13ee86
resolve merge conflicts
2019-10-24 16:22:57 +02:00
Fabian Neumann
9aaa26cbbe
add zenodo files ( closes #60 )
2019-10-24 15:54:12 +02:00
euronion
a401d80300
Fix more pandas Index issues in make_summary.
2019-10-24 10:53:07 +02:00
euronion
dfc0242a2d
Update make_summary for pandas-0.25 compatability.
...
The pandas Index union operation does no longer produce a MultiIndex but a Index tuple in pandas-0.25.2.
This causes the script to fail. (The problem does not exist with pandas-0.24.0.)
Fix by explicitly checking for this case (only the first loop iteration).
2019-10-24 09:54:50 +02:00
Fabian
c18d00a9ef
Closes #73
2019-10-17 09:56:24 +02:00
Fabian Hofmann
26453a27bb
build_bus_regions fix index column name to 'name'
2019-10-15 09:58:55 +02:00
Fabian Neumann
67f8f6e24e
add packages yaml and ppm for docs
2019-10-14 13:19:41 -06:00
Fabian Neumann
245ce357f1
fix pyproj version to 1.9.5.1 ( closes #72 )
2019-10-14 10:06:11 -04:00
Fabian Neumann
886e6234ce
reverse environment update
2019-10-09 10:47:24 -04:00
Fabian Neumann
531497f1f8
leave docker for later
2019-10-03 17:09:25 +02:00
Fabian Neumann
c24e60a624
update environment.yaml
2019-10-03 16:54:22 +02:00
