Commit Graph

2350 Commits

Author SHA1 Message Date
lisazeyen
8dd10dfd23
add explanation for capacity_per_sqkm 2022-09-21 17:15:31 +02:00
Ebbe Kyhl
ffb5a5a10d
Update myopic and extend carbon budget description 2022-09-21 09:08:39 +02:00
Fabian Neumann
f139025100 update test configs to include recent biomass additions 2022-09-21 07:41:31 +02:00
Fabian Neumann
d53f1fe031 update test configs to inclode cost year 2022-09-21 07:36:06 +02:00
Fabian Neumann
28181a4176
Merge pull request #424 from PyPSA/release-v0.6.1
bump version to 0.6.1
2022-09-20 18:37:05 +02:00
Fabian Neumann
291270c080 do not rename run-name of tutorial 2022-09-20 18:36:42 +02:00
Fabian Neumann
fcb80190c4 bump version to 0.6.1 2022-09-20 18:33:21 +02:00
Fabian Neumann
73032241ff
Merge branch 'master' into exclude_carrier_clustering 2022-09-20 17:09:10 +02:00
Fabian Neumann
5277a39242
Merge pull request #423 from PyPSA/reuse-compliant
fix reuse compliance and add reuse pre-commit
2022-09-20 13:41:00 +02:00
Fabian
1c7ddc9a03 fix reuse compliance and add reuse pre-commit 2022-09-20 13:36:46 +02:00
Fabian Neumann
763a090846
Merge pull request #420 from PyPSA/update-readme-figure
Update readme figure
2022-09-20 13:21:50 +02:00
Fabian Neumann
90f1bc5797
Merge branch 'master' into update-readme-figure 2022-09-20 13:21:22 +02:00
Fabian Hofmann
925e750b75
Merge pull request #422 from PyPSA/git-blame-ignore
add .git-blame-ignore-revs
2022-09-20 10:17:05 +02:00
Fabian
6e6f52fb05 add .git-blame-ignore-revs 2022-09-20 09:48:18 +02:00
Fabian Hofmann
7a65206c57
Merge pull request #421 from PyPSA/pre-commit-ci-update-config
[pre-commit.ci] pre-commit autoupdate
2022-09-20 09:16:49 +02:00
Philipp Glaum
04dae75779 Merge branch 'exclude_carrier_clustering' of github.com:p-glaum/pypsa-eur into exclude_carrier_clustering 2022-09-20 08:43:00 +02:00
Philipp Glaum
d532424e5d update release_notes 2022-09-20 08:42:45 +02:00
pre-commit-ci[bot]
3546043a3e
[pre-commit.ci] pre-commit autoupdate
updates:
- https://github.com/myint/docformatterhttps://github.com/PyCQA/docformatter
- [github.com/keewis/blackdoc: v0.3.5 → v0.3.7](https://github.com/keewis/blackdoc/compare/v0.3.5...v0.3.7)
- [github.com/snakemake/snakefmt: 0.4.4 → v0.6.1](https://github.com/snakemake/snakefmt/compare/0.4.4...v0.6.1)
2022-09-19 19:59:45 +00:00
pre-commit-ci[bot]
85d01bceb0 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2022-09-19 14:34:48 +00:00
Philipp Glaum
c8b67776fa Merge branch 'master' into exclude_carrier_clustering 2022-09-19 16:34:21 +02:00
Parisra
8fae517881
Update supply_demand.rst 2022-09-19 16:17:30 +02:00
Fabian
2629582357 update readme figure 2022-09-19 16:15:58 +02:00
Parisra
ac35725423
Update supply_demand.rst 2022-09-19 15:30:36 +02:00
Parisra
b535a3f405
Update supply_demand.rst 2022-09-19 15:23:48 +02:00
Parisra
af99cd63cc
Update supply_demand.rst 2022-09-19 15:11:44 +02:00
Parisra
98d94a21fe
Update supply_demand.rst 2022-09-19 15:10:02 +02:00
Parisra
ac2747e25c
Update supply_demand.rst 2022-09-19 15:06:12 +02:00
Parisra
1d8e964e12
Update supply_demand.rst 2022-09-19 15:02:42 +02:00
Parisra
b3f66561c8
Update supply_demand.rst 2022-09-19 14:51:46 +02:00
Parisra
77e2e53aa5
Update supply_demand.rst 2022-09-19 14:46:38 +02:00
Parisra
5eb20ebdd5
Update supply_demand.rst 2022-09-19 14:40:56 +02:00
Fabian Hofmann
9027ffdbf8
Merge pull request #418 from PyPSA/default-res-installations
Config: enable res installations per default
2022-09-19 14:16:50 +02:00
Fabian Hofmann
9d46cf7659
Merge branch 'master' into default-res-installations 2022-09-19 13:50:34 +02:00
Fabian Hofmann
4361bcdd9d
Merge pull request #419 from PyPSA/efficiency-based-marginal-costs
add_electricity: calculate marginal costs from plant efficiency
2022-09-19 13:50:14 +02:00
Fabian
e2a4140663 add_electricity: calculate marginal costs from plant efficiency 2022-09-19 13:08:03 +02:00
Fabian
54f602ed94 config: enable res installations per default 2022-09-19 13:00:12 +02:00
Fabian Hofmann
85b1f964e1
Merge pull request #417 from PyPSA/rasterio-1.3
lift rasterio restriction to allow atlite 0.2.9
2022-09-19 12:57:26 +02:00
Parisra
5efb0abe02
Create supply_demand.rst 2022-09-19 12:50:09 +02:00
Fabian Hofmann
10b564fc57
Merge branch 'master' into rasterio-1.3 2022-09-19 12:40:58 +02:00
Fabian Hofmann
378d1ef82b
Merge pull request #416 from PyPSA/misc/precommit-ci-2
Add pre-commit CI
2022-09-19 12:37:30 +02:00
Fabian
be4dbd58f1 ci: explicit ipopt version for windows 2022-09-19 12:15:05 +02:00
pre-commit-ci[bot]
92080b1cd2 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2022-09-19 10:06:40 +00:00
Fabian Hofmann
5833556ea1
Merge branch 'master' into misc/precommit-ci-2 2022-09-19 12:06:23 +02:00
Philipp Glaum
d51ca8695b update Fabians comments 2022-09-19 11:46:58 +02:00
Parisra
c668ce3c0c
Update supply_demand.rst 2022-09-19 09:46:07 +02:00
Parisra
cc325b73af
Update supply_demand.rst 2022-09-19 09:27:50 +02:00
Parisra
ffb296c06d
Update conf.py 2022-09-18 11:02:52 +02:00
Fabian Neumann
e024ba68c9 build_hydro: fix cutout input 2022-09-17 10:29:35 +02:00
Fabian Neumann
9597f821bd adjust CI to new environment.yaml indentation 2022-09-16 16:38:26 +02:00
Fabian Neumann
a9c8d8b037 lift ipopt env restriciton 2022-09-16 16:20:03 +02:00