Commit Graph

Select branches

Hide Pull Requests

master

Mono Color

• 6cde3e902b own databundle (#96) JanFrederickUnnewehr 2019-11-19 09:56:44 -0500
• 9517eda1d7
  add option for nuclear expansion at current locations (#98) Fabian Neumann 2019-11-19 12:26:01 +0100
• e59d2c4162 scripts/* revise imports Fabian 2019-11-14 17:50:24 +0100
• bb9bbf295a Merge branch 'master' of github.com:PyPSA/pypsa-eur Fabian 2019-11-14 16:32:24 +0100
• af22261c10 prepare_network: revise imports, add line_break Fabian 2019-11-14 16:21:00 +0100
• 3ca488798c
  Emission price option `Ep reactivated (#100) Fabian Neumann 2019-11-14 16:15:42 +0100
• 3370bd3b92 doc: update documentation on Ep option Fabian Neumann 2019-11-14 15:50:03 +0100
• 6a6bae41db prepare_network: reactivate Ep option (closes #63) Fabian Neumann 2019-11-14 15:41:09 +0100
• 61be125bd8 doc: fix line references in tutorial Fabian Neumann 2019-11-14 14:51:19 +0100
• c857f4ce95 retrieve_cutout: execute retrieve cutout only once Fabian Neumann 2019-11-11 16:51:25 +0100
• a35dbc067c build_natura: add cutouts as input (closes #95) Fabian Neumann 2019-11-11 16:29:27 +0100
• 7cd3b8a42b solve: undo update line parameter Fabian Neumann 2019-11-09 13:23:01 +0100
• 998b13dc3a
  solve: update line parameters if not iterating Fabian Neumann 2019-11-09 13:16:31 +0100
• 3fd5c5d0e1 cluster: add tolerance to country weight sum L Fabian Neumann 2019-11-09 12:58:04 +0100
• 0ea5a5c28f Powerplants (#94) FabianHofmann 2019-11-09 09:08:25 +0100
• 7141ce9e5c environment: update to pypsa v0.15 Fabian Neumann 2019-11-08 17:02:42 +0100
• ecf8448826
  environment_docs vresutils master [skip travis] Fabian Neumann 2019-11-08 16:51:01 +0100
• 4010e9450d
  Complete test pipeline for windows with vresutils memorylogger fixed (#93) Fabian Neumann 2019-11-08 16:47:39 +0100
• d32f2105cd fix deprecation: logger.warn -> logger.warning Fabian Neumann 2019-11-08 16:46:29 +0100
• 27efd78784 doc-config: fix line references [skip travis] Fabian Neumann 2019-11-07 18:14:50 +0100
• a71cb6fc26 build_hydro: fix logger (closes #91) Fabian Neumann 2019-11-07 17:38:08 +0100
• 7df2b76f9d
  cluster_network: fix focus_weights for mult sync Fabian Neumann 2019-11-07 16:54:09 +0100
• 47d4882593
  Testing on multiple operating systems with travis (#90) Fabian Neumann 2019-11-07 15:39:23 +0100
• e54119d878
  cluster: add focus weights (in favor of #26) (#87) Fabian Neumann 2019-11-07 15:38:25 +0100
• be32e92dbb doc-tutorial: add alternative for windows users Fabian Neumann 2019-11-07 14:41:52 +0100
• 59a39bc00c doc: update release notes [skip travis] Fabian Neumann 2019-11-06 17:53:38 +0100
• 4f2c1c3080 doc: update workflow chart [skip travis] Fabian Neumann 2019-11-06 17:51:18 +0100
• fd4e43c085 Snakefile: fix inputs for retrieve_databundle Fabian Neumann 2019-11-06 17:50:57 +0100
• 99cb4a4354
  Merge pull request #86 from PyPSA/workflow Fabian Neumann 2019-11-06 16:06:11 +0100
• 64916a1179 test: add solving rule [skip travis] Fabian Neumann 2019-11-06 16:05:35 +0100
• 0fb57601bf doc: document powerplantmatching changes from #84 Fabian Neumann 2019-11-06 15:59:34 +0100
• cabe2e2a3f doc: fix typo co2base and agg_p_nom_limits [skip travis] Fabian Neumann 2019-11-06 15:22:27 +0100
• 7406ceb50e doc: add co2base and agg_p_nom_limits [skip travis] Fabian Neumann 2019-11-06 15:19:22 +0100
• 2ace4f2e94 retrieve*: add documentation Fabian Neumann 2019-11-06 14:50:59 +0100
• 0c537f159f retrieve*: clean retrieve rules Fabian Neumann 2019-11-06 12:04:01 +0100
• bf12d25879
  Merge pull request #51 from fneum/solve_network Fabian Neumann 2019-11-06 11:38:15 +0100
• 4d9b02ea12
  solve_network: add snapshots as required argument Fabian Neumann 2019-11-06 11:33:57 +0100
• 8be2c4c254 results: remove folder Fabian Neumann 2019-11-06 11:25:09 +0100
• bbfc5bde0b Merge branch 'fneum-co2limit' Fabian Neumann 2019-11-06 11:21:37 +0100
• 82392c6c07 Merge branch 'co2limit' of https://github.com/fneum/pypsa-eur into fneum-co2limit Fabian Neumann 2019-11-06 11:19:41 +0100
• 3597f931cf Snakefile remove space Fabian 2019-11-05 14:57:59 +0100
• 594489ef22 snakefile: remove commented files Fabian 2019-11-05 14:55:51 +0100
• b1a38229f4 ignore sort warning Fabian 2019-11-05 14:29:15 +0100
• f6e44d2805 include data retrieving in workflow Fabian 2019-11-05 12:53:21 +0100
• 67390cc2a9
  Update scripts/prepare_network.py Fabian Neumann 2019-11-05 11:21:33 +0100
• eb14486e29 config add tiny description for powerplantfilter and custom_powerplants Fabian 2019-11-04 16:45:41 +0100
• 3b83985436
  Merge pull request #84 from PyPSA/powerplants FabianHofmann 2019-11-04 16:26:54 +0100
• d0e2fed4d7 incorporate suggestions FabianHofmann 2019-11-01 13:27:42 +0100
• 8f5415f69c test: add electricity changes to config FabianHofmann 2019-10-31 18:35:18 +0100
• b947c7893b travis mkdir resources if not existent FabianHofmann 2019-10-31 18:21:11 +0100
• 9ffc334001 travis manage buffer when curling FabianHofmann 2019-10-31 18:11:40 +0100
• bf26ac9445 build_powerplants update docstring FabianHofmann 2019-10-31 18:01:33 +0100
• 5cd7a46339 fully enable powerplantmatching FabianHofmann 2019-10-31 16:45:13 +0100
• 22ddf92143 checkout powerplants.csv of master (for travis testing) FabianHofmann 2019-10-31 15:45:38 +0100
• 324ededa66 fix typo FabianHofmann 2019-10-31 14:59:51 +0100
• 4ee18ea9fa incorporate suggestions of #69 Fabian Hofmann 2019-10-31 14:48:10 +0100
• 0d778eaf42 Merge branch 'eb5193-add_own_carriers' into powerplants Fabian Hofmann 2019-10-31 14:30:05 +0100
• 65700000f7 Merge branch 'add_own_carriers' of https://github.com/eb5194/pypsa-eur into eb5194-add_own_carriers Fabian Hofmann 2019-10-31 14:23:43 +0100
• dee544f56b fix typo Fabian Hofmann 2019-10-31 13:01:08 +0100
• 296840bac5 Merge branch 'master' into powerplants Fabian Hofmann 2019-10-31 12:16:56 +0100
• 0c777fc431
  Merge pull request #71 from PyPSA/update_link_length FabianHofmann 2019-10-31 11:27:58 +0100
• 142434b529 incorporate suggestions Fabian Hofmann 2019-10-31 10:37:49 +0100
• 7a9842eba7 update build and add powerplant with new ppm version Fabian Hofmann 2019-10-30 23:09:41 +0100
• b5f6a94687 added release notes v0.1.0 Fabian Neumann 2019-10-29 16:48:15 +0100
• c37e8dc799
  doc/index.rst: fix type Fabian Neumann 2019-10-28 18:11:19 +0100
• b711517bd9
  Update index.rst Fabian Neumann 2019-10-28 18:09:17 +0100
• a7915eeae5
  README: add version badge Fabian Neumann 2019-10-28 18:08:37 +0100
• 28fcd5ca3a
  doc/index: add build status Fabian Neumann 2019-10-28 18:04:44 +0100
• 6c78485853
  README: add build status Fabian Neumann 2019-10-28 18:03:34 +0100
• 1b3f52c2c2 merge continuous integration Fabian Neumann 2019-10-28 17:49:18 +0100
• 76ab01a1a1
  Merge pull request #81 from PyPSA/update_environment Fabian Neumann 2019-10-28 17:34:17 +0100
• 036a90ff6d
  Merge pull request #83 from PyPSA/powerplants Fabian Neumann 2019-10-28 17:33:47 +0100
• 570e3fc5ab build_powerplants: download from ppm Fabian Neumann 2019-10-28 17:12:49 +0100
• 293d0ba643 update powerplants.csv Fabian Neumann 2019-10-28 16:17:22 +0100
• 05e15de60b
  Rename "Macedonia" to "North Macedonia" Fabian Neumann 2019-10-28 16:15:06 +0100
• 979ff3de72 revert to pyproj<=1.9.6 Fabian Neumann 2019-10-28 15:08:53 +0100
• 777e5e97ff
  fix typo in doc/tutorial.rst Fabian Neumann 2019-10-28 14:07:27 +0100
• 7663d71219 update conda environment files Fabian Neumann 2019-10-28 12:02:33 +0100
• 7e3ea94a53
  Merge pull request #76 from euronion/patch-1 FabianHofmann 2019-10-25 15:41:29 +0200
• da0107478e
  Refractor make_summary.py multiindex creation. euronion 2019-10-25 14:29:38 +0200
• ad61968dac use pypsa master branch Fabian Neumann 2019-10-25 12:33:39 +0200
• 2a05124c80 correct config.default.yaml line references Fabian Neumann 2019-10-24 16:45:49 +0200
• ca51c172f0
  Merge pull request #65 from PyPSA/documentation Fabian Neumann 2019-10-24 16:26:53 +0200
• 0fef13ee86 resolve merge conflicts Fabian Neumann 2019-10-24 16:22:57 +0200
• 9aaa26cbbe add zenodo files (closes #60) Fabian Neumann 2019-10-24 15:54:12 +0200
• a401d80300
  Fix more pandas Index issues in make_summary. euronion 2019-10-24 10:53:07 +0200
• dfc0242a2d
  Update make_summary for pandas-0.25 compatability. euronion 2019-10-24 09:54:50 +0200
• a3b703fb08
  Merge pull request #41 from nworbmot/industry_constants_to_yaml Tom Brown 2019-10-21 17:53:58 +0200
• c18d00a9ef Closes #73 Fabian 2019-10-17 09:56:24 +0200
• 26453a27bb build_bus_regions fix index column name to 'name' Fabian Hofmann 2019-10-15 09:58:55 +0200
• 67f8f6e24e add packages yaml and ppm for docs Fabian Neumann 2019-10-14 13:19:41 -0600
• 245ce357f1 fix pyproj version to 1.9.5.1 (closes #72) Fabian Neumann 2019-10-14 10:06:11 -0400
• 886e6234ce reverse environment update Fabian Neumann 2019-10-09 10:47:24 -0400
• 5251ee5e56
  Add files via upload martavp 2019-10-07 16:21:14 +0200
• cfdd5e599b
  Add files via upload martavp 2019-10-07 16:20:07 +0200
• 531497f1f8 leave docker for later Fabian Neumann 2019-10-03 17:09:25 +0200
• c24e60a624 update environment.yaml Fabian Neumann 2019-10-03 16:54:22 +0200
• d3ac8bc57e update README 2 Fabian Neumann 2019-10-03 16:54:09 +0200
• 0416c0405b update README Fabian Neumann 2019-10-03 16:53:53 +0200
• 9158670db0 fix type: default to tutorial Fabian Neumann 2019-10-03 16:26:11 +0200