Commit Graph

  • 11585429b0 small spelling corrections martavp 2022-10-25 09:28:18 +0200
  • 9bc0e2afb7 update description of mechanical and chemical recycling of plastics martavp 2022-10-25 09:23:35 +0200
  • 0b53e34f58
    Merge pull request #22 from Adam-Dvorak1/improve-doc martavp 2022-10-25 09:04:07 +0200
  • 776596ab9a
    Merge pull request #270 from nnhjy/master Fabian Neumann 2022-10-18 13:55:57 +0200
  • 041abadf3c
    Merge pull request #431 from PyPSA/pre-commit-ci-update-config Fabian Neumann 2022-10-17 22:27:59 +0200
  • 26fa33b414
    [pre-commit.ci] pre-commit autoupdate pre-commit-ci[bot] 2022-10-17 20:01:25 +0000
  • d2f757eff4
    Merge pull request #430 from PyPSA/pre-commit-ci-update-config Fabian Neumann 2022-10-11 06:43:53 +0200
  • 721c8f9235
    [pre-commit.ci] pre-commit autoupdate pre-commit-ci[bot] 2022-10-10 20:31:00 +0000
  • e9ffaac223 Small edits Adam-Dvorak1 2022-10-07 19:10:05 +0200
  • a3268604c2 config file. Adam-Dvorak1 2022-10-07 19:02:12 +0200
  • b4457a75e3 latex formatting Adam-Dvorak1 2022-10-07 18:49:37 +0200
  • 87c444c898 formatting latex math Adam-Dvorak1 2022-10-07 18:46:39 +0200
  • c3d2213402 Typos Adam-Dvorak1 2022-10-07 18:39:07 +0200
  • 0f86d52c03 Typos and formatting Adam-Dvorak1 2022-10-07 18:37:43 +0200
  • 5ca89f8955 Typos and modeled to modelled (UK version) Adam-Dvorak1 2022-10-07 18:31:36 +0200
  • c2cf870876 Minor edits Adam-Dvorak1 2022-10-07 18:24:52 +0200
  • 6bc99291c9 Other industry subsectors Adam-Dvorak1 2022-10-07 18:10:58 +0200
  • dfd0d080ed Update supply_demand.rst Adam-Dvorak1 2022-10-07 17:05:34 +0200
  • 59027615c8 Replacing CO2 Adam-Dvorak1 2022-10-07 16:54:57 +0200
  • 9e40a0f5f2
    Add non-metallic mineral products title Adam-Dvorak1 2022-10-07 16:42:43 +0200
  • 9cd701496c
    Adding chemistry section Adam-Dvorak1 2022-10-07 16:38:50 +0200
  • f3f08340af
    Update supply_demand.rst Adam-Dvorak1 2022-10-07 16:23:39 +0200
  • e13292da71
    Update supply_demand.rst Adam-Dvorak1 2022-10-07 16:22:09 +0200
  • 374a7900f3
    Linking test Adam-Dvorak1 2022-10-07 16:17:54 +0200
  • 4f7b2b9868 untrack *.json nnhjy 2022-10-06 18:43:41 +0200
  • c6b997547a
    Merge pull request #21 from ebbekyhl/patch-2 martavp 2022-10-03 10:28:21 +0200
  • 9eea4a8fba
    Merge pull request #20 from Parisra/Improve-Doc-final-edit martavp 2022-10-03 10:27:36 +0200
  • 5c6ff44e13
    Merge pull request #242 from PyPSA/nh3 Fabian Neumann 2022-10-01 16:01:45 +0200
  • 1611d63a8a
    Merge branch 'master' into nh3 Fabian Neumann 2022-10-01 16:01:39 +0200
  • 7ed88d5ff1
    Merge pull request #268 from PyPSA/co2seq_sector_opt Fabian Neumann 2022-10-01 15:58:47 +0200
  • 9a74e3d699 set co2seq to limit of sequestration potential lisazeyen 2022-09-29 09:12:36 +0200
  • faba4f1833
    Merge pull request #429 from nnhjy/master Fabian Hofmann 2022-09-29 08:57:39 +0200
  • d29441d871 update deprecated syntax nnhjy 2022-09-28 20:33:50 +0200
  • 7606562449 update sector opt for co2 seq potential lisazeyen 2022-09-28 16:09:53 +0200
  • ee8f502d5b
    Merge pull request #427 from PyPSA/pre-commit-ci-update-config Fabian Neumann 2022-09-27 06:13:39 +0200
  • 2fa4c25240
    [pre-commit.ci] pre-commit autoupdate pre-commit-ci[bot] 2022-09-26 20:05:58 +0000
  • 62ca32b274
    Merge branch 'master' into fix/deprecation-warning-pandas-1.4 Fabian Hofmann 2022-09-26 12:33:13 +0200
  • 6a31548d64
    Merge pull request #425 from PyPSA/clarify_config Fabian Hofmann 2022-09-22 13:32:44 +0200
  • 3350463b13
    Merge branch 'master' into clarify_config Fabian Hofmann 2022-09-22 13:16:20 +0200
  • 899acb38da
    Merge pull request #415 from p-glaum/exclude_carrier_clustering Fabian Neumann 2022-09-22 12:52:34 +0200
  • 9d1a0e2c13
    Merge branch 'master' into exclude_carrier_clustering Fabian Hofmann 2022-09-22 12:33:19 +0200
  • 108e3c0ff5
    fix typo lisazeyen 2022-09-21 17:19:01 +0200
  • 8dd10dfd23
    add explanation for capacity_per_sqkm lisazeyen 2022-09-21 17:15:31 +0200
  • ffb5a5a10d
    Update myopic and extend carbon budget description Ebbe Kyhl 2022-09-21 09:08:39 +0200
  • f139025100 update test configs to include recent biomass additions Fabian Neumann 2022-09-21 07:41:31 +0200
  • d53f1fe031 update test configs to inclode cost year Fabian Neumann 2022-09-21 07:36:06 +0200
  • 28181a4176
    Merge pull request #424 from PyPSA/release-v0.6.1 Fabian Neumann 2022-09-20 18:37:05 +0200
  • 291270c080 do not rename run-name of tutorial Fabian Neumann 2022-09-20 18:36:42 +0200
  • fcb80190c4 bump version to 0.6.1 Fabian Neumann 2022-09-20 18:33:21 +0200
  • 73032241ff
    Merge branch 'master' into exclude_carrier_clustering Fabian Neumann 2022-09-20 17:09:10 +0200
  • 5277a39242
    Merge pull request #423 from PyPSA/reuse-compliant Fabian Neumann 2022-09-20 13:41:00 +0200
  • 1c7ddc9a03 fix reuse compliance and add reuse pre-commit Fabian 2022-09-20 13:36:46 +0200
  • 763a090846
    Merge pull request #420 from PyPSA/update-readme-figure Fabian Neumann 2022-09-20 13:21:50 +0200
  • 90f1bc5797
    Merge branch 'master' into update-readme-figure Fabian Neumann 2022-09-20 13:21:22 +0200
  • 925e750b75
    Merge pull request #422 from PyPSA/git-blame-ignore Fabian Hofmann 2022-09-20 10:17:05 +0200
  • 6e6f52fb05 add .git-blame-ignore-revs Fabian 2022-09-20 09:48:18 +0200
  • 7a65206c57
    Merge pull request #421 from PyPSA/pre-commit-ci-update-config Fabian Hofmann 2022-09-20 09:16:49 +0200
  • 04dae75779 Merge branch 'exclude_carrier_clustering' of github.com:p-glaum/pypsa-eur into exclude_carrier_clustering Philipp Glaum 2022-09-20 08:43:00 +0200
  • d532424e5d update release_notes Philipp Glaum 2022-09-20 08:42:45 +0200
  • 3546043a3e
    [pre-commit.ci] pre-commit autoupdate pre-commit-ci[bot] 2022-09-19 19:59:45 +0000
  • 85d01bceb0 [pre-commit.ci] auto fixes from pre-commit.com hooks pre-commit-ci[bot] 2022-09-19 14:34:47 +0000
  • c8b67776fa Merge branch 'master' into exclude_carrier_clustering Philipp Glaum 2022-09-19 16:34:21 +0200
  • 8fae517881
    Update supply_demand.rst Parisra 2022-09-19 16:17:30 +0200
  • 2629582357 update readme figure Fabian 2022-09-19 16:15:58 +0200
  • ac35725423
    Update supply_demand.rst Parisra 2022-09-19 15:30:36 +0200
  • b535a3f405
    Update supply_demand.rst Parisra 2022-09-19 15:23:48 +0200
  • af99cd63cc
    Update supply_demand.rst Parisra 2022-09-19 15:11:44 +0200
  • 98d94a21fe
    Update supply_demand.rst Parisra 2022-09-19 15:10:02 +0200
  • ac2747e25c
    Update supply_demand.rst Parisra 2022-09-19 15:06:12 +0200
  • 1d8e964e12
    Update supply_demand.rst Parisra 2022-09-19 15:02:42 +0200
  • b3f66561c8
    Update supply_demand.rst Parisra 2022-09-19 14:51:46 +0200
  • 77e2e53aa5
    Update supply_demand.rst Parisra 2022-09-19 14:46:38 +0200
  • 5eb20ebdd5
    Update supply_demand.rst Parisra 2022-09-19 14:40:56 +0200
  • 9027ffdbf8
    Merge pull request #418 from PyPSA/default-res-installations Fabian Hofmann 2022-09-19 14:16:50 +0200
  • 9d46cf7659
    Merge branch 'master' into default-res-installations Fabian Hofmann 2022-09-19 13:50:34 +0200
  • 4361bcdd9d
    Merge pull request #419 from PyPSA/efficiency-based-marginal-costs Fabian Hofmann 2022-09-19 13:50:14 +0200
  • e2a4140663 add_electricity: calculate marginal costs from plant efficiency Fabian 2022-09-19 13:08:03 +0200
  • 54f602ed94 config: enable res installations per default Fabian 2022-09-19 12:55:40 +0200
  • 85b1f964e1
    Merge pull request #417 from PyPSA/rasterio-1.3 Fabian Hofmann 2022-09-19 12:57:26 +0200
  • 5efb0abe02
    Create supply_demand.rst Parisra 2022-09-19 12:50:09 +0200
  • 10b564fc57
    Merge branch 'master' into rasterio-1.3 Fabian Hofmann 2022-09-19 12:40:58 +0200
  • 378d1ef82b
    Merge pull request #416 from PyPSA/misc/precommit-ci-2 Fabian Hofmann 2022-09-19 12:37:30 +0200
  • be4dbd58f1 ci: explicit ipopt version for windows Fabian 2022-09-19 12:15:05 +0200
  • 92080b1cd2 [pre-commit.ci] auto fixes from pre-commit.com hooks pre-commit-ci[bot] 2022-09-19 10:06:38 +0000
  • 5833556ea1
    Merge branch 'master' into misc/precommit-ci-2 Fabian Hofmann 2022-09-19 12:06:23 +0200
  • d51ca8695b update Fabians comments Philipp Glaum 2022-09-19 11:46:58 +0200
  • c668ce3c0c
    Update supply_demand.rst Parisra 2022-09-19 09:46:07 +0200
  • cc325b73af
    Update supply_demand.rst Parisra 2022-09-19 09:27:50 +0200
  • ffb296c06d
    Update conf.py Parisra 2022-09-18 11:02:52 +0200
  • e024ba68c9 build_hydro: fix cutout input Fabian Neumann 2022-09-17 10:29:35 +0200
  • 9597f821bd adjust CI to new environment.yaml indentation Fabian Neumann 2022-09-16 16:38:26 +0200
  • a9c8d8b037 lift ipopt env restriciton Fabian Neumann 2022-09-16 16:20:03 +0200
  • b5b88c6554 lift rasterio restriction to allow atlite 0.2.9 Fabian Neumann 2022-09-16 16:14:30 +0200
  • 9b570a53b4 tiny doc formatting fixes Fabian 2022-09-16 15:20:10 +0200
  • 5d1ef8a640 [pre-commit.ci] auto fixes from pre-commit.com hooks pre-commit-ci[bot] 2022-09-16 13:04:04 +0000
  • e9ea4c5e53 update release notes Fabian 2022-09-16 15:03:22 +0200
  • affa1c2b88
    Merge branch 'master' into misc/precommit-ci-2 Fabian Hofmann 2022-09-16 14:38:49 +0200
  • 1536cc2787 codespell: fix typos Snakefile: fix unformattable parst pre-commit: fix codespell ignore Fabian 2022-09-16 13:33:38 +0200
  • 24e008a98e add feature: aggregate carrier exclusion Philipp Glaum 2022-09-16 14:25:15 +0200
  • 413254e241
    Merge pull request #267 from PyPSA/split_planning_horizons_into_investmentyear_and_costyear Fabian Neumann 2022-09-14 21:30:02 +0200