Commit Graph

4891 Commits

Author SHA1 Message Date
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
chrstphtrs
d9ec127f99 Add process emissions to country emissions constraint, fix snapshot weighting 2023-11-21 14:55:32 +01:00
Fabian Neumann
dfecf35bae add focus_weights to documentation 2023-11-20 19:45:10 +01:00
LukasFrankenQ
025890fc59 Merging with upstream updates 2023-11-20 10:10:00 +00:00
LukasFrankenQ
31b1ffb8d6 adjusted egs storage parameters 2023-11-17 11:42:11 +00: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
LukasFrankenQ
52041fc656 reverted unintended change in thermal rule 2023-11-15 14:00:26 +00:00
LukasFrankenQ
38cc709fe3 Merge branch 'master' of https://github.com/LukasFrankenQ/pypsa-eur 2023-11-14 10:50:55 +00:00
LukasFrankenQ
7555fa0d2d switched enhanced geothermal off by default 2023-11-14 10:50:36 +00:00
Lukas Franken
06d435d217
Merge branch 'master' into master 2023-11-14 09:41:37 +00:00
pre-commit-ci[bot]
649e0a2a78 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-11-14 03:21:57 +00:00
LukasFrankenQ
4a7852cba8 Merge branch 'master' of https://github.com/LukasFrankenQ/pypsa-eur 2023-11-14 03:21:28 +00:00
LukasFrankenQ
4569af2647 fixed cost calculation for EGS 2023-11-14 03:20:58 +00:00
pre-commit-ci[bot]
5b2efe313f [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-11-14 01:37:38 +00:00
LukasFrankenQ
c1f44ea86f Merge branch 'master' of https://github.com/LukasFrankenQ/pypsa-eur 2023-11-14 01:37:00 +00:00
LukasFrankenQ
928c73138f fixed bug, first functional version 2023-11-14 01:35:37 +00: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
pre-commit-ci[bot]
a892f0c0ec [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-11-12 20:15:06 +00:00
LukasFrankenQ
0205d3efbf Merge branch 'master' of https://github.com/LukasFrankenQ/pypsa-eur 2023-11-12 20:14:25 +00:00
LukasFrankenQ
bf79b4a817 added flexible operation 2023-11-12 20:14:04 +00:00
pre-commit-ci[bot]
6b100d4b88 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-11-12 19:32:53 +00:00
LukasFrankenQ
52c6ce922c merged 2023-11-12 19:32:27 +00:00
LukasFrankenQ
468177cfda added chp operation to geothermal 2023-11-12 19:31:06 +00:00
Fabian Neumann
014a4cd62e fix for losses with multi-period investment 2023-11-12 18:42:53 +01: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
pre-commit-ci[bot]
a8dde158cb [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-11-12 00:36:04 +00:00
LukasFrankenQ
d1243daf4b Merge branch 'master' of https://github.com/LukasFrankenQ/pypsa-eur 2023-11-12 00:35:30 +00:00
LukasFrankenQ
24c3d28b35 towards adding district heating, included spatial 2023-11-12 00:35:10 +00:00
pre-commit-ci[bot]
ff209bbd76 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-11-11 23:16:04 +00:00
LukasFrankenQ
6cd46bf261 added option for hourly egs capacity factors 2023-11-11 23:15:41 +00:00
LukasFrankenQ
11ecbf3fba Merge https://github.com/pypsa/pypsa-eur 2023-11-09 22:28:09 +00:00
chrstphtrs
82ac430fd9 fix spatial resolution for solid biomass links and naphtha oil loads under 'co2_spatial: true' flag 2023-11-08 09:58:02 +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
Philipp Glaum
a78137852f default config: change technology data reference 2023-11-07 16:54:44 +01: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
Philipp Glaum
816e7b0238 do not consider floating wind min depth for CI testing 2023-11-06 16:47:05 +01:00
pre-commit-ci[bot]
4f28dfd4fd [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-11-06 15:38:05 +00:00
Philipp Glaum
7241efd3a4 add release note 2023-11-06 16:31:06 +01:00
Philipp Glaum
520c3fbe98 update doc 2023-11-06 16:23:00 +01:00
Philipp Glaum
728d74caa8 update floating wind settings 2023-11-06 15:46:46 +01:00
Philipp Glaum
786a2461e2 Merge commit '1bade22' into implement-floating 2023-11-06 14:08:53 +01: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