Commit Graph

397 Commits

Author SHA1 Message Date
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
LukasFrankenQ
24c3d28b35 towards adding district heating, included spatial 2023-11-12 00:35:10 +00:00
LukasFrankenQ
11ecbf3fba Merge https://github.com/pypsa/pypsa-eur 2023-11-09 22:28:09 +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
124177b6db Add option for SMR CC 2023-10-11 14:32:47 +02: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
LukasFrankenQ
8dd5161dbb Merge branch 'master' of https://github.com/LukasFrankenQ/pypsa-eur 2023-09-26 00:06:56 +01:00
LukasFrankenQ
9a5c010c25 changed overlap indexing, general cleanup 2023-09-26 00:06:44 +01:00
pre-commit-ci[bot]
45e5ab15c2 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-09-25 14:52:53 +00:00
LukasFrankenQ
b3ce30e193 added source for FOM 2023-09-25 15:52:02 +01:00
LukasFrankenQ
e98430e3ce cleanup of saturation check 2023-09-25 15:15:51 +01:00
pre-commit-ci[bot]
de605e2b6b [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-09-05 14:06:26 +00:00
LukasFrankenQ
10dccd085f Merge branch 'master' of https://github.com/LukasFrankenQ/pypsa-eur 2023-09-05 15:05:48 +01:00
LukasFrankenQ
489cbcd880 added minor cleanup correcting local adjustment 2023-09-05 15:04:46 +01:00
pre-commit-ci[bot]
0e80244b52 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-09-05 14:01:13 +00:00
LukasFrankenQ
d7afa661a8 cleanup and renaming 2023-09-05 14:31:45 +01:00
LukasFrankenQ
77b72dcbc3 added new params to default config, and fixes 2023-09-05 14:20:49 +01:00
LukasFrankenQ
e6203f51cd pre-testrun version added to prepare_sector_network 2023-09-04 21:07:53 +01:00
lisazeyen
457a9e23e7 fixes CI perfect 2023-08-31 09:55:38 +02:00
lisazeyen
9ec7442c69 merge master 2023-08-30 12:03:49 +02:00
lisazeyen
c35391d594 move SEG aggregation later 2023-08-29 15:46:58 +02:00
lisazeyen
b362c009f5 drop nan with SEG 2023-08-25 16:44:25 +02:00
lisazeyen
c10afdc857 adjust co2_emission fct 2023-08-24 14:20:14 +02:00
lisazeyen
3679687ed7 add co2 store lifetime 2023-08-24 08:43:50 +02:00
lisazeyen
f47ce1c432 add lifetime 2023-08-23 13:24:25 +02:00
Fabian Neumann
3ccc63aae4 build_carbon_budget: parse input_co2 2023-08-22 14:49:44 +02:00
Fabian Neumann
41a35ad129 bugfix: use of n.madd with singular value prevented 2023-08-22 11:53:02 +02:00
lisazeyen
e92fc4ff4d merge master 2023-08-22 10:21:42 +02:00
pre-commit-ci[bot]
eed52d04ae [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-08-09 13:04:38 +00:00
daniel.rdt
e304efbf3c fix in co2_emissions_year function and correspondigly in plot_summary and snakemake rule. Also changes to historical_emissions in plot_summary since some countries are not in eea dataset. 2023-08-09 14:49:36 +02:00
pre-commit-ci[bot]
ac04abb98c [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-08-09 09:02:22 +00:00
Fabian Neumann
9a68730745 fix: read investment year of time-dependent config 2023-08-09 11:01:58 +02:00
pre-commit-ci[bot]
c32d5249e1 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-08-09 08:12:52 +00:00
Fabian Neumann
ade8a003c6 add coal and coke demand for integrated steelworks (closes #717) 2023-08-09 10:11:28 +02:00
Fabian
5b057575df prepare_sector_network: make use of biomass transport file optional 2023-08-02 14:39:20 +02:00
Fabian
03e3278f89 prepare_sector: add biomass transport costs for networks wo biomass network 2023-08-02 13:12:08 +02:00