Commit Graph

  • 08349d7897 Also update the default CPLEX configuration in test config Koen van Greevenbroek 2021-10-05 11:08:32 +0200
  • 5ee280b96f Update default CPLEX options following PyPSA update Koen van Greevenbroek 2021-10-05 11:00:30 +0200
  • 23a167c308 config: co2_budget is currently compulsory. Add back in. Fabian Neumann 2021-10-04 18:12:19 +0200
  • e872595c79 release_notes: correct version Fabian Neumann 2021-10-04 18:02:05 +0200
  • 47e6badd58 doc: fix typo in conf.py Fabian Neumann 2021-10-04 17:57:18 +0200
  • 056ee67c61
    Merge pull request #174 from PyPSA/release-v0.6 Fabian Neumann 2021-10-04 17:47:06 +0200
  • c5452d9882 release_notes: opener Fabian Neumann 2021-10-04 17:45:54 +0200
  • b915f08ac2 installation: update to new databundle location Fabian Neumann 2021-10-04 17:44:17 +0200
  • 2597d980e0 config: optimise default for overnight scenario for consistency planning/cost year Fabian Neumann 2021-10-04 14:29:53 +0200
  • 19d128aafd bugfix: take district heating progress not potential Fabian Neumann 2021-10-04 14:28:59 +0200
  • 1f8c1678b8 add fneum Fabian Neumann 2021-10-04 14:28:27 +0200
  • 692f4705c4 merge master Fabian Neumann 2021-10-04 13:21:33 +0200
  • c168fd60d3 add release note for agriculture, forestry and fishing Fabian Neumann 2021-10-04 11:19:15 +0200
  • cecee2c9c7
    Merge pull request #147 from PyPSA/agriculture-energy-co2 Fabian Neumann 2021-10-04 11:10:46 +0200
  • 7f0ed1372c organise release notes Fabian Neumann 2021-10-04 10:02:47 +0200
  • 4135718e37 use agriculture sector as default, add missing colors lisazeyen 2021-10-04 09:23:54 +0200
  • 017c188518 fix typo for district heating with capital D lisazeyen 2021-10-04 09:23:23 +0200
  • 274eadd085 correct derived heat residential capitalisation Fabian Neumann 2021-10-03 12:51:03 +0200
  • aca1023c3d bump version to 0.6.0 Fabian Neumann 2021-10-02 11:17:29 +0200
  • 2bfc091f8b update data bundle Fabian Neumann 2021-10-02 11:12:45 +0200
  • 2e6e9c6802
    Merge branch 'master' into agriculture-energy-co2 Fabian Neumann 2021-10-02 10:51:28 +0200
  • b560d95b6a merge master Fabian Neumann 2021-10-02 10:41:56 +0200
  • 4375083838 create parallel structures for land-use constraints w/wo m Fabian Neumann 2021-10-02 10:40:49 +0200
  • 4400658099 edit release note Fabian Neumann 2021-10-02 10:40:01 +0200
  • fb601cc051
    Merge pull request #149 from PyPSA/dh-share Fabian Neumann 2021-10-02 10:34:07 +0200
  • 7987fd23cf add release note Fabian Neumann 2021-10-02 10:33:56 +0200
  • a60f180f61 fix logging Fabian Neumann 2021-10-02 10:23:27 +0200
  • c0adb51454 decapitalize columns in build_energy_totals Fabian Neumann 2021-10-02 10:03:40 +0200
  • 0d999a4991
    prepare_sector_network: code formatting lisazeyen 2021-10-01 17:10:42 +0200
  • 18fabd930e
    Apply suggestions from code review Fabian Neumann 2021-09-30 17:46:26 +0200
  • ff6d736a89
    Merge branch 'master' into myopic-low-clustering-gens Fabian Neumann 2021-09-30 14:51:45 +0200
  • 90079248a3
    Merge branch 'master' into dh-share Fabian Neumann 2021-09-30 14:48:26 +0200
  • 339187c1f1 update config lisazeyen 2021-09-29 16:23:38 +0200
  • f6bb498730 include PR review lisazeyen 2021-09-29 16:13:23 +0200
  • de48b4656f
    Merge pull request #151 from PyPSA/enspreso-biomass Fabian Neumann 2021-09-29 15:46:51 +0200
  • 5fb169c31f
    Merge branch 'master' into enspreso-biomass Fabian Neumann 2021-09-29 15:46:11 +0200
  • 1e248b314d compatibility with biomass transport Fabian Neumann 2021-09-29 15:45:14 +0200
  • 9d8827bf59 Merge remote-tracking branch 'origin/master' into dh-share lisazeyen 2021-09-29 15:03:45 +0200
  • 854bd80818 rename central_fraction->district heating potential, restructure district heating share implementation lisazeyen 2021-09-29 14:37:36 +0200
  • 8322350fee move calculation of district heating share to build_energy_totals lisazeyen 2021-09-29 14:36:56 +0200
  • e27ec46878 add further comments lisazeyen 2021-09-23 14:10:56 +0200
  • 234a32c504 bug fix lisazeyen 2021-07-09 13:33:26 +0200
  • 5c24742526 temporarily disable h2 liquefaction in shipping by default Fabian Neumann 2021-09-28 17:34:47 +0200
  • 8ecc54fbe6
    Merge branch 'master' into dh-share Fabian Neumann 2021-09-28 17:29:29 +0200
  • 53eab1ead2 slice biomass potentials with the pop_layout index instead of the country if biomass transport = True lisazeyen 2021-09-28 17:25:04 +0200
  • 8cf8a49b48 Merge branch 'master' of github.com:nworbmot/PyPSA-Eur-Sec Fabian Neumann 2021-09-28 17:24:09 +0200
  • 488b93a079 extend release notes on plastics recycling Fabian Neumann 2021-09-28 17:24:00 +0200
  • fcc10aa950
    Merge branch 'master' into master Fabian Neumann 2021-09-28 17:15:26 +0200
  • 2f19814786 Merge branch 'nworbmot-master' Fabian Neumann 2021-09-28 17:13:30 +0200
  • 9f4e1f2176 make HVC recycling ready for pathway, minor edits Fabian Neumann 2021-09-28 17:08:03 +0200
  • dadfa8691b update mocksnakemake for testing lisazeyen 2021-09-28 16:36:40 +0200
  • 7d0ff39b1a
    Merge pull request #73 from PyPSA/biomass-transport Fabian Neumann 2021-09-28 11:34:35 +0200
  • 385779fbbf
    Merge branch 'master' into biomass-transport Fabian Neumann 2021-09-28 11:33:21 +0200
  • ec04d7909a
    Merge pull request #148 from PyPSA/co2-network Fabian Neumann 2021-09-28 11:29:20 +0200
  • a54f66a686
    Merge pull request #278 from PyPSA/wake-simpl Fabian Neumann 2021-09-27 14:04:03 +0200
  • 561d86c223 add mechanical recycling energy demand from literature Fabian Neumann 2021-09-27 12:06:15 +0200
  • c22cc0801c Merge branch 'master' of https://github.com/nworbmot/pypsa-eur-sec into nworbmot-master Fabian Neumann 2021-09-27 11:43:06 +0200
  • 28264aa114
    Small fixes (#167) lisazeyen 2021-09-27 11:16:12 +0200
  • 71be53af4f
    Merge pull request #164 from PyPSA/mit-license Fabian Neumann 2021-09-27 09:31:59 +0200
  • 7ed20aba7a
    Update prepare_sector_network.py lisazeyen 2021-09-24 15:30:43 +0200
  • 960d857d0b
    Update config.default.yaml lisazeyen 2021-09-24 15:29:04 +0200
  • b391aa6475
    Update build_biomass_transport_costs.py lisazeyen 2021-09-24 14:59:53 +0200
  • 93d4eae1ea industry: for HVC, add mechanical and chemical recycling Tom Brown 2021-09-24 13:19:48 +0200
  • fbccd5fbc0 industry: separate HVC, methanol and chlorine from basic chemicals Tom Brown 2021-09-24 13:00:58 +0200
  • 04c8d1fd02 add correction factor to offshore wind for wake losses Fabian Neumann 2021-09-23 08:57:18 +0200
  • b4af3f3fa3 change license Fabian Neumann 2021-09-22 18:03:25 +0200
  • 54e35a3c86 update environment.fixed.yaml Fabian Neumann 2021-09-22 16:49:30 +0200
  • 089fc5b747 final tweaks of release notes Fabian Neumann 2021-09-22 16:46:23 +0200
  • 2f2ac89c87 update main affiliation Fabian Neumann 2021-09-20 11:43:04 +0200
  • 77023d370b
    Merge pull request #276 from PyPSA/mit-license Fabian Neumann 2021-09-20 11:36:09 +0200
  • 785caecdb5 no proj 8 Fabian Neumann 2021-09-20 11:18:47 +0200
  • da883b1283 limit pyproj to 3.1.0 Fabian Neumann 2021-09-20 11:12:26 +0200
  • ede9146735 limit pyproj Fabian Neumann 2021-09-20 11:02:57 +0200
  • 8996e09dc2
    Merge branch 'master' into mit-license Fabian Neumann 2021-09-20 09:28:32 +0200
  • 4e91d157b6
    Merge pull request #277 from koen-vg/static-retrieve Fabian Neumann 2021-09-15 13:28:30 +0200
  • 6485b98973 Mark datasets from Zenodo as static Koen van Greevenbroek 2021-09-15 11:44:49 +0200
  • 251f0adb7e
    Merge branch 'master' into snakemake_dependencies_in_functions Martha Frysztacki 2021-09-14 16:50:48 +0200
  • 3eea2a8e84 add missing, remove unused license Fabian Neumann 2021-09-14 16:40:10 +0200
  • 780b60cc46 add release note Fabian Neumann 2021-09-14 16:38:48 +0200
  • 2e02af8b4b change license Fabian Neumann 2021-09-14 16:37:41 +0200
  • d551a3b5f1 delete config.yaml martacki 2021-09-14 16:36:13 +0200
  • dfb929f2cf remove snakemake dependencies in functions, use as kwarg instead martacki 2021-09-14 16:34:02 +0200
  • b88322587f
    Release 0.4 (#274) Fabian Neumann 2021-09-14 16:15:25 +0200
  • 1d68a300e5
    update environment.yaml for pypsa 0.18.0 (#268) Fabian Neumann 2021-09-14 14:14:31 +0200
  • c4d4e88ba2
    Merge pull request #161 from PyPSA/fix-build_carbon_budget Fabian Neumann 2021-09-09 16:07:11 +0200
  • 2252ee2118
    Merge pull request #273 from PyPSA/citation Fabian Neumann 2021-09-08 11:45:11 +0200
  • 547080420e add citation.cff Fabian Neumann 2021-09-08 11:12:41 +0200
  • 118f06f7e9
    Merge pull request #160 from PyPSA/fix-plot-heat-time-series Fabian Neumann 2021-09-08 09:32:28 +0200
  • fc378b8bea
    Merge pull request #162 from PyPSA/add-lifetime-to-solar-rooftop Fabian Neumann 2021-09-08 09:31:31 +0200
  • 8bec0cc423
    simplify: drop incorrect cols if they exist (avoid error) (#272) Martha Frysztacki 2021-09-07 16:28:01 +0200
  • 4117e19897
    Merge pull request #271 from PyPSA/doc-fixes Fabian Hofmann 2021-08-27 13:12:47 +0200
  • ea50abab6d doc: fix build warnings Fabian 2021-08-27 12:30:29 +0200
  • f7d76659c5
    Merge pull request #243 from martacki/simplify_to_substations Fabian Hofmann 2021-08-27 11:16:44 +0200
  • b9bbefa09f
    simplify_network.py fix dict getting Fabian Hofmann 2021-08-27 10:34:27 +0200
  • a6d2a0a99d
    style Martha Frysztacki 2021-08-26 16:00:08 +0200
  • f30ca8a18a
    Merge branch 'master' into simplify_to_substations Martha Frysztacki 2021-08-26 15:22:02 +0200
  • 203a7f3df2
    Add lifetime to solar-rooftop martavp 2021-08-24 18:58:42 +0200
  • 919c9d8b8d
    Update prepare_sector_network.py martavp 2021-08-24 18:48:20 +0200
  • 8d22df6482
    Update plot_network.py martavp 2021-08-24 18:38:24 +0200
  • aa8cefeb5b add district_heat_share.csv Fabian Neumann 2021-08-19 10:07:51 +0200