Commit Graph

3381 Commits

Author SHA1 Message Date
Fabian Neumann
bbc31f42d9 Merge branch 'master' of github.com:PyPSA/pypsa-eur 2023-11-30 11:50:27 +01:00
Fabian Neumann
86bfdcf20c temporarily limit linopy version 2023-11-30 11:50:20 +01:00
Fabian Neumann
98797e2e30 follow-up to 7ca769bc 2023-11-29 13:46:28 +01:00
Fabian Neumann
803b860923 move load_raw.csv to resources since it's config file dependent 2023-11-29 13:41:26 +01:00
Fabian Neumann
7ca769bcf0 option to skip ship_raster download if not added as exclusion zone 2023-11-29 12:09:39 +01:00
Fabian Neumann
b1d999f35d
Merge pull request #784 from PyPSA/load_shedding_all_carriers
add load shedding for all carriers
2023-11-24 09:55:51 +01:00
lisazeyen
afcf5e7d2e
add load shedding for all carriers 2023-11-24 09:53:22 +01:00
pre-commit-ci[bot]
4c66908b74 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-11-23 11:11:49 +00:00
Fabian Neumann
5d6d01f8c0 make CC in blast furnaces optional 2023-11-23 12:11:12 +01:00
Fabian Neumann
f3832521c4
Merge pull request #781 from PyPSA/doc/focus_weights
add focus_weights to documentation
2023-11-23 12:02:38 +01:00
Fabian Neumann
9470ad8ec1
Merge pull request #783 from lumbric/patch-1
Fix link to licenses.rst in README
2023-11-23 12:01:44 +01:00
lumbric
a8568eb64e
Fix link to licenses.rst in README
LICENSES.txt was never part of this repository, might have been copied accidentally from the README file in the main PyPSA repository.
2023-11-22 15:54:46 +01:00
Fabian Neumann
867b743f38
Merge pull request #782 from Tomkourou/update-tutorial-docs
docs: 📝 update config.electricity path
2023-11-22 12:59:27 +01:00
Thomas Kouroughli
8778691f9d docs: 📝 update config.electricity path 2023-11-22 11:05:32 +00:00
Fabian Neumann
dfecf35bae add focus_weights to documentation 2023-11-20 19:45:10 +01:00
Irieo
75f8a1b313 scripts: remove redundant rule reference 2023-11-16 17:47:48 +01:00
Fabian Neumann
54afa891cc
Merge pull request #779 from PyPSA/pre-commit-ci-update-config
[pre-commit.ci] pre-commit autoupdate
2023-11-16 09:38:22 +01:00
pre-commit-ci[bot]
fb7c209eb5
[pre-commit.ci] pre-commit autoupdate
updates:
- [github.com/psf/black: 23.10.1 → 23.11.0](https://github.com/psf/black/compare/23.10.1...23.11.0)
2023-11-13 18:40:27 +00:00
Fabian Neumann
065a49c2d7
Merge pull request #772 from PyPSA/land-transport-oil
madd oil generator to bus EU oil
2023-11-12 18:23:07 +01:00
Fabian Neumann
c7a4ff7a4d use existing add_carrier_buses function 2023-11-12 18:22:22 +01:00
Fabian Neumann
86358afd17
Merge pull request #775 from PyPSA/doi-fix
fix doi in hydrogen network article
2023-11-08 07:55:16 +01:00
Fabian Neumann
bbc7eb0282
Merge pull request #774 from PyPSA/pre-commit-ci-update-config
[pre-commit.ci] pre-commit autoupdate
2023-11-08 07:54:55 +01:00
martacki
4a5c100047 fix doi in hydrogen network article 2023-11-07 12:38:16 -06:00
pre-commit-ci[bot]
26f5d12d5a
[pre-commit.ci] pre-commit autoupdate
updates:
- [github.com/keewis/blackdoc: v0.3.8 → v0.3.9](https://github.com/keewis/blackdoc/compare/v0.3.8...v0.3.9)
2023-11-06 18:24:50 +00:00
pre-commit-ci[bot]
4779d076dc [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-11-03 13:16:13 +00:00
Irieo
d2c1f9ec32 data: solve floating url problem for WDPA data retrieval 2023-11-03 14:14:01 +01:00
Irieo
6a8165c740 licenses: add reuse compatibility for new files 2023-11-03 12:55:29 +01:00
Irieo
cb2c782dba scripts: annotate selected functions 2023-11-03 12:51:44 +01:00
Irieo
e61da8618e bug fix: add_electricity breaks in specific cases 2023-11-03 12:36:40 +01:00
Fabian Neumann
f5b0f2a7a0
Merge pull request #770 from PyPSA/pre-commit-ci-update-config
[pre-commit.ci] pre-commit autoupdate
2023-11-02 08:18:19 +01:00
Fabian Neumann
f75e18596d
Merge pull request #771 from PyPSA/mock_snakemake_root_dir
helpers: adjust mock_snakemake to be callable with different root directory
2023-11-02 08:18:04 +01:00
pre-commit-ci[bot]
b9128002bb [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-10-31 16:14:33 +00:00
martacki
5b45fa303c madd oil generator to bus EU oil 2023-10-31 17:11:06 +01:00
Fabian
71f88fd063 update release notes 2023-10-31 12:14:02 +01:00
Fabian
75e66be571 helpers: adjust mock_snakemake to be callable with different root dirs 2023-10-31 12:09:39 +01:00
pre-commit-ci[bot]
46df3d7d00
[pre-commit.ci] pre-commit autoupdate
updates:
- [github.com/psf/black: 23.10.0 → 23.10.1](https://github.com/psf/black/compare/23.10.0...23.10.1)
2023-10-30 18:29:25 +00:00
Fabian Neumann
f35ecbe4a0
Merge pull request #767 from ekatef/retrofit_data_fixes
Minor fixes for retrofit calculations
2023-10-26 10:10:36 +02:00
pre-commit-ci[bot]
a31b421c12 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-10-25 17:35:12 +00:00
ekatef
c1150dfab3 Merge remote-tracking branch 'origin/retrofit_data_fixes' into retrofit_data_fixes 2023-10-25 20:34:43 +03:00
ekatef
8ec0664253 Move column fix for u-values for Poland 2023-10-25 20:33:59 +03:00
martacki
55807898a0 update solar global radiation according to TABULA project 2023-10-25 16:23:41 +02:00
pre-commit-ci[bot]
f24bd46173 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-10-25 14:11:51 +00:00
ekatef
2952d99dfa Fix column with total values 2023-10-25 16:42:05 +03:00
ekatef
1ad7035ec4 Fix a column for Poland 2023-10-25 16:28:38 +03:00
Fabian Neumann
9ce125bd44
Merge pull request #765 from PyPSA/pre-commit-ci-update-config
[pre-commit.ci] pre-commit autoupdate
2023-10-24 08:49:56 +02:00
pre-commit-ci[bot]
a1276b3964
[pre-commit.ci] pre-commit autoupdate
updates:
- [github.com/psf/black: 23.9.1 → 23.10.0](https://github.com/psf/black/compare/23.9.1...23.10.0)
2023-10-23 18:37:54 +00:00
Fabian Neumann
f63129e63e
Merge pull request #763 from PyPSA/add-tech-color-coal-for-industry
Add tech_color for 'coal for industry' in config
2023-10-18 17:41:30 +02:00
chrstphtrs
c81b707113 Add tech_color for 'coal for industry' in config 2023-10-18 16:44:52 +02:00
Fabian Neumann
7884392326
Merge pull request #748 from PyPSA/follow-up-637
follow-up to #637: remove duplicate code and update tsam version
2023-10-18 10:27:29 +02:00
Fabian Neumann
df5b9e9943
Merge pull request #759 from ekatef/fix_retrofit
Update calculations of retrofit costs
2023-10-18 10:26:32 +02:00