Commit Graph

  • 907382e83a Merge branch 'fneum/line-rating' of github.com:PyPSA/pypsa-eur into fneum/line-rating Fabian Neumann 2023-06-29 11:42:15 +0200
  • c5c30bcc32 Merge branch 'master' into fneum/line-rating Fabian Neumann 2023-06-29 11:42:07 +0200
  • c0088b7923 [pre-commit.ci] auto fixes from pre-commit.com hooks pre-commit-ci[bot] 2023-06-29 09:42:01 +0000
  • 43c47be2ec fix syntax errors Fabian Neumann 2023-06-29 11:41:38 +0200
  • cc6bae282f [pre-commit.ci] auto fixes from pre-commit.com hooks pre-commit-ci[bot] 2023-06-29 06:11:11 +0000
  • 07224751e5
    Merge branch 'master' into validation Fabian Hofmann 2023-06-29 08:10:52 +0200
  • a36b5c51c7 fixed bug in monthly gas prices LukasFrankenQ 2023-06-28 17:42:17 +0100
  • febd293374 [pre-commit.ci] auto fixes from pre-commit.com hooks pre-commit-ci[bot] 2023-06-28 08:05:16 +0000
  • d943e3bb68 add sector and industry table. In progress virio-andreyana 2023-06-27 23:16:15 +0200
  • 329349d794
    Merge pull request #684 from PyPSA/pre-commit-ci-update-config Fabian Neumann 2023-06-27 10:15:03 +0200
  • cec407e656
    [pre-commit.ci] pre-commit autoupdate pre-commit-ci[bot] 2023-06-26 22:19:08 +0000
  • 678792009a preparing sector config data virio-andreyana 2023-06-22 10:23:54 +0200
  • ab0963540f
    Merge branch 'master' into complete-carrier-set Fabian Hofmann 2023-06-21 09:53:19 +0200
  • 86e5f08fbf
    Merge branch 'master' into linemaxext-config Fabian Neumann 2023-06-20 13:33:18 +0200
  • cfa99cb327
    Merge pull request #683 from PyPSA/pre-commit-ci-update-config Fabian Neumann 2023-06-20 13:31:04 +0200
  • 284e3f8e70
    [pre-commit.ci] pre-commit autoupdate pre-commit-ci[bot] 2023-06-19 22:43:01 +0000
  • 0bf693c585 general update of .rst files virio-andreyana 2023-06-16 01:31:59 +0200
  • bdb5381730
    Merge pull request #663 from PyPSA/post-merge-param Fabian Hofmann 2023-06-15 22:00:15 +0200
  • a17647a07e add_electricity: fix cost ref Fabian 2023-06-15 19:35:41 +0200
  • 27eea273bd harmonize params names Fabian 2023-06-15 19:12:30 +0200
  • 1d10073514 review params implementation; reproduce objective values in CI Fabian 2023-06-15 18:52:25 +0200
  • 45cac01ea3 adjust param accessing in cluster, simplify and build_elec script Fabian 2023-06-14 13:28:20 +0200
  • 12b9356245 add info to release_notes virio-andreyana 2023-06-14 11:03:07 +0200
  • 862e54770f
    Merge branch 'master' into post-merge-param Fabian Hofmann 2023-06-14 10:11:26 +0200
  • e137045380
    Merge pull request #680 from PyPSA/pre-commit-ci-update-config Max Parzen 2023-06-13 15:06:17 +0100
  • e44f8d66cd
    [pre-commit.ci] pre-commit autoupdate pre-commit-ci[bot] 2023-06-12 22:22:08 +0000
  • b7aa122fda Fixed issue (most likely) introduced when merging PyPSA-Eur with PyPSA-Eur-Sec Ricardo 2023-06-12 20:40:51 +0200
  • 778f850a9e
    Merge pull request #678 from davide-f/fix_clustering_LT Fabian Neumann 2023-06-09 17:54:23 +0200
  • 176bebdef0
    Update cluster_network to avoid adding deleted links in clustered network Davide Fioriti 2023-06-09 17:18:25 +0200
  • d6057cb92b [pre-commit.ci] auto fixes from pre-commit.com hooks pre-commit-ci[bot] 2023-06-03 10:10:06 +0000
  • 8dbcca560c
    minor fixes in solve_network.py virio-andreyana 2023-06-03 12:09:51 +0200
  • 391f821d6e resolve remaining merge conflicts Fabian Neumann 2023-06-02 17:28:23 +0200
  • 546d9b0610 adjust new rules to merged format Fabian Neumann 2023-06-02 17:27:24 +0200
  • 286b836c3f [pre-commit.ci] auto fixes from pre-commit.com hooks pre-commit-ci[bot] 2023-06-02 15:18:46 +0000
  • 2072aa4a99 add dynamic line rating to CI Fabian Neumann 2023-06-02 17:16:38 +0200
  • 8a6b2667b5 fix unresolved merge conflict in config.default.yaml Fabian Neumann 2023-06-02 17:13:12 +0200
  • ff6f3a1b7e resolve remaining merge conflicts Fabian Neumann 2023-06-02 17:12:05 +0200
  • 59f24122e2 cherry-pick line rating code Fabian Neumann 2023-06-02 17:08:40 +0200
  • ef5320e1b8 merge master Fabian Neumann 2023-06-02 16:59:06 +0200
  • 0f5bb8b893 [pre-commit.ci] auto fixes from pre-commit.com hooks pre-commit-ci[bot] 2023-06-02 10:53:09 +0000
  • 83ff639ad5 amend solve_network virio-andreyana 2023-06-02 12:52:49 +0200
  • b67a00903a
    using higher keys for industries virio-andreyana 2023-05-31 10:54:27 +0200
  • f3e8fe2312 [pre-commit.ci] auto fixes from pre-commit.com hooks pre-commit-ci[bot] 2023-05-27 13:50:58 +0000
  • e581ca930c made params more specific virio-andreyana 2023-05-27 15:50:37 +0200
  • ead87afce1 [pre-commit.ci] auto fixes from pre-commit.com hooks pre-commit-ci[bot] 2023-05-27 10:23:28 +0000
  • 1c73bb0342 add params for solve_network virio-andreyana 2023-05-27 12:22:53 +0200
  • 80eadcf24a
    Merge pull request #674 from LucieRC/master Max Parzen 2023-05-25 14:39:25 +0100
  • dc043d8aef
    Update Discord link README.md lucie_rc 2023-05-24 15:46:53 +0300
  • 015a6a19f3
    Merge pull request #672 from koen-vg/fix-h2-underground-storage Fabian Neumann 2023-05-24 11:39:32 +0200
  • 312dd81f21 Fix bug with underground H2 storage creation Koen van Greevenbroek 2023-05-24 11:13:37 +0200
  • ab8ee639f9
    update average annual prices lisazeyen 2023-05-24 10:53:40 +0200
  • 6e358097c9
    change natural gas index to import price lisazeyen 2023-05-24 10:51:16 +0200
  • b2730a6d47
    fix wrong input path lisazeyen 2023-05-24 10:26:31 +0200
  • 0c95b5a840
    Merge pull request #671 from PyPSA/pre-commit-ci-update-config Fabian Neumann 2023-05-23 08:50:19 +0200
  • 0f09545d96 [pre-commit.ci] auto fixes from pre-commit.com hooks pre-commit-ci[bot] 2023-05-22 21:56:29 +0000
  • d2f6138ca5
    [pre-commit.ci] pre-commit autoupdate pre-commit-ci[bot] 2023-05-22 21:56:04 +0000
  • 28d39680c6
    Merge branch 'master' into post-merge-param virio-andreyana 2023-05-19 16:19:58 +0200
  • 216a02fba1 [pre-commit.ci] auto fixes from pre-commit.com hooks pre-commit-ci[bot] 2023-05-19 13:42:43 +0000
  • c043100ada
    add more params in simplify_network.py virio-andreyana 2023-05-19 15:42:07 +0200
  • d97a543463
    missing a coma in build_electricity.smk virio-andreyana 2023-05-17 19:37:47 +0200
  • 6366dc4c55 [pre-commit.ci] auto fixes from pre-commit.com hooks pre-commit-ci[bot] 2023-05-17 17:26:00 +0000
  • 8af1fe5649
    replace the word "config" to "params" in functions virio-andreyana 2023-05-17 19:25:45 +0200
  • 8208ac033b
    convert param back to config for "logging" and "run", made "enable" more specific virio-andreyana 2023-05-17 18:43:30 +0200
  • d6d2088360 adjust config lisazeyen 2023-05-17 13:07:03 +0200
  • 4854d8b4dc add data for monthly prices lisazeyen 2023-05-17 12:56:40 +0200
  • 747bf5d815 add time dependent co2 price lisazeyen 2023-05-17 12:55:17 +0200
  • e9348b8e23 uncomment ship raster, since otherwise not computing lisazeyen 2023-05-17 12:48:45 +0200
  • 6b10bfa9a6 not cluster conventional, temporal dependent co2price lisazeyen 2023-05-17 12:47:26 +0200
  • 859e32ff9c
    Merge pull request #668 from PyPSA/0523-deprecations Fabian Neumann 2023-05-17 09:18:00 +0200
  • c1bc7c0f62
    Merge pull request #670 from PyPSA/pz-max-patch-1 Max Parzen 2023-05-16 21:05:00 +0100
  • 8d6d661071
    Update support.rst Max Parzen 2023-05-16 20:44:22 +0100
  • 024da02f8a add monthly prices to network lisazeyen 2023-05-16 16:15:51 +0200
  • dfdd116206 add rule to build monthly prices lisazeyen 2023-05-16 13:49:03 +0200
  • 2b62c015aa
    Merge pull request #669 from lilanger/patch-1 Fabian Neumann 2023-05-16 15:03:35 +0200
  • 7fad9e2635
    Update supply_demand.rst Lissy Langer 2023-05-16 14:57:45 +0200
  • dabce64bc7
    Merge pull request #667 from PyPSA/pre-commit-ci-update-config Fabian Neumann 2023-05-16 13:43:45 +0200
  • 7d4dacf8bd [pre-commit.ci] auto fixes from pre-commit.com hooks pre-commit-ci[bot] 2023-05-16 11:34:58 +0000
  • 875fcdd0e2 address geopandas future warning Fabian Neumann 2023-05-16 13:34:23 +0200
  • 748cfaec65
    [pre-commit.ci] pre-commit autoupdate pre-commit-ci[bot] 2023-05-15 22:01:44 +0000
  • e431a9675c [pre-commit.ci] auto fixes from pre-commit.com hooks pre-commit-ci[bot] 2023-05-15 13:02:39 +0000
  • 824e6bb18c
    Merge branch 'master' into complete-carrier-set Fabian Hofmann 2023-05-15 15:01:57 +0200
  • 61893c3c9b
    fixing build_electricity.smk and retrieve.smk virio-andreyana 2023-05-15 11:26:36 +0200
  • 1fc48d8753
    using python algorithm to edit rules and script virio-andreyana 2023-05-15 10:33:17 +0200
  • 14a34697aa
    Merge pull request #666 from PyPSA/fit-for-module Fabian Neumann 2023-05-15 08:41:13 +0200
  • 3487482c72
    Merge pull request #664 from PyPSA/add-loss-approximation Fabian Neumann 2023-05-15 08:40:39 +0200
  • 38bae672da [pre-commit.ci] auto fixes from pre-commit.com hooks pre-commit-ci[bot] 2023-05-12 12:51:39 +0000
  • 8f91963e76 properly reference p_max_pu files Fabian Neumann 2023-05-12 14:50:58 +0200
  • b2216355f1 retrieve_sector_data: add another .parent Fabian Neumann 2023-05-12 14:10:04 +0200
  • 67ef38b35e retrieve*: handle extraction path via snakemake.output Fabian Neumann 2023-05-12 13:59:41 +0200
  • e88b57f422 prepare_network: fix typo Fabian Neumann 2023-05-12 10:42:06 +0200
  • 3343394c65 [pre-commit.ci] auto fixes from pre-commit.com hooks pre-commit-ci[bot] 2023-05-12 07:30:10 +0000
  • 99963edaaf add option to limit maximum extension per line/link; linemaxext Fabian Neumann 2023-05-12 09:29:38 +0200
  • 5be21dfc5a add option for piecewise linear transmission loss approximation Fabian Neumann 2023-05-12 09:07:16 +0200
  • 9012ef07e1
    Merge pull request #662 from PyPSA/remove-vresutils Fabian Neumann 2023-05-12 07:53:04 +0200
  • e29571535b remove references to memory logfile in *.smk, add release note Fabian Neumann 2023-05-12 07:11:41 +0200
  • aa50ea44cc
    fix add_electricity mistake virio-andreyana 2023-05-11 20:59:37 +0200
  • 1758076815
    test param in add_electricity virio-andreyana 2023-05-11 20:34:11 +0200
  • 7d6d6d2805 [pre-commit.ci] auto fixes from pre-commit.com hooks pre-commit-ci[bot] 2023-05-11 14:59:10 +0000
  • 654f46f868
    alpha testing complete vresutils removal virio-andreyana 2023-05-11 16:58:35 +0200
  • b21965a986 [pre-commit.ci] auto fixes from pre-commit.com hooks pre-commit-ci[bot] 2023-05-10 08:09:43 +0000