bjoern/pypsa-eur
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
3,273 Commits 1 Branch 0 Tags 133 MiB
06d435d217
Commit Graph

1690 Commits

Author SHA1 Message Date
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
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
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
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
75e66be571 helpers: adjust mock_snakemake to be callable with different root dirs 2023-10-31 12:09:39 +01: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
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
pre-commit-ci[bot]
21148e3cc5 [pre-commit.ci] auto fixes from pre-commit.com hooks 
for more information, see https://pre-commit.ci
 2023-10-13 10:36:50 +00:00
Ekaterina
b0a95aefaa
Merge branch 'PyPSA:master' into fix_retrofit 2023-10-13 13:30:04 +03:00
ekatef
460fa00b28 Fix file name 2023-10-11 21:43:51 +03:00
Thomas Gilon
4c5ea9e207
Specify input files required to retrieve irena data 
Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>
 2023-10-11 16:27:08 +02:00
Fabian Neumann
97a5be1e84
Merge branch 'master' into feature/retrieve-irena 2023-10-11 16:17:15 +02:00
Thomas Gilon
124177b6db Add option for SMR CC 2023-10-11 14:32:47 +02:00
pre-commit-ci[bot]
230c1a327c [pre-commit.ci] auto fixes from pre-commit.com hooks 
for more information, see https://pre-commit.ci
 2023-10-11 12:27:29 +00:00
Thomas Gilon
43e20a26e6 Add rule to update IRENA data for existing infrastructure 2023-10-11 14:26:04 +02:00
ekatef
fcef194566 Reference to a multiindex level by number instead of name 2023-10-11 12:29:38 +03:00
ekatef
7ad60cb7f9 Fix calculation of averages 2023-10-11 12:28:34 +03:00
ekatef
5ee9df000b Make an argument of pd.concat to a list 2023-10-11 12:28:08 +03:00
ekatef
b51d908bfa Fix computation of the mean 2023-10-11 12:27:31 +03:00
ekatef
5ec00c5d9d Fix type definition for a call of difference function 2023-10-11 12:27:10 +03:00
ekatef
f825544c3b Remove duplication in column names 2023-10-11 12:26:30 +03:00
ekatef
4294248518 Re-map country codes to account for "GB" 2023-10-11 12:26:10 +03:00
Fabian Neumann
7cb4742c75
Merge pull request #750 from PyPSA/sourcery/master 
Sourcery refactored master branch
 2023-10-08 17:52:45 +02:00
Fabian Neumann
2bab27e2f3
Merge pull request #718 from PyPSA/coke 
add coal and coke demand for integrated steelworks
 2023-10-08 11:58:48 +02:00
pre-commit-ci[bot]
f054180a62 [pre-commit.ci] auto fixes from pre-commit.com hooks 
for more information, see https://pre-commit.ci
 2023-10-08 09:20:59 +00:00
Sourcery AI
3c36c60bdd 'Refactored by Sourcery' 2023-10-08 09:20:36 +00:00