Commit Graph

3277 Commits

Author SHA1 Message Date
LukasFrankenQ
31b1ffb8d6 adjusted egs storage parameters 2023-11-17 11:42:11 +00: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]
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
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
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
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