Commit Graph

616 Commits

Author SHA1 Message Date
Koen van Greevenbroek
2a6dcc4c12 Minor bugfixes for new time aggregation implementation 2024-05-21 18:09:09 +02:00
Fabian Neumann
d32feb3aae mark downloaded files as ancient rather than protected 2024-05-20 22:37:16 +02:00
Fabian Neumann
00efffcc13 move up methanol for industry, to before shipping 2024-05-20 22:06:31 +02:00
Fabian Neumann
0ad3489d3a Merge branch 'feature/methanol-production' of github.com:Climact/pypsa-eur-climact into Climact-feature/methanol-production 2024-05-20 22:06:15 +02:00
Fabian Neumann
60a26a67a0 simplify check for coal/coke industry demand 2024-05-20 21:08:44 +02:00
Fabian Neumann
476349292c Merge branch 'feature/fix-non-steel-coal-demand' of github.com:Climact/pypsa-eur-climact into Climact-feature/fix-non-steel-coal-demand 2024-05-20 21:01:16 +02:00
Fabian Neumann
a2012d8937 pre-commit formatting [no ci] 2024-05-20 15:49:40 +02:00
Fabian Neumann
7ce15931e5 add simplified power distribution grid losses 2024-05-20 12:41:54 +02:00
Fabian Neumann
9527f4cf77 Merge branch 'split-out-time-agg' of github.com:koen-vg/pypsa-eur into koen-vg-split-out-time-agg 2024-05-20 11:38:02 +02:00
Thomas Gilon
c3dcff8a35 Define methanol energy demand for industry 2024-05-17 16:04:48 +02:00
Fabian Neumann
27009f5060 double solar rooftop PV potentials (closes #935) 2024-05-15 18:18:15 +02:00
Fabian Neumann
e8779fa5a4 small follow-up to #1066 solar-hsat 2024-05-15 18:02:15 +02:00
Fabian Neumann
44fb8cad1f
Merge pull request #957 from PyPSA/land-transport-fix
Land transport fix
2024-05-15 17:13:56 +02:00
Fabian Neumann
1aa4f12c5e remove adjust_transport_temporal_agg 2024-05-15 16:51:17 +02:00
Fabian Neumann
5b5be71341 use loads instead of links where possible 2024-05-15 16:41:49 +02:00
lisazeyen
2223e011a0 merge master 2024-05-15 16:14:25 +02:00
Fabian Neumann
ff603f2c14 Merge branch 'master' into land-transport-fix 2024-05-15 15:25:56 +02:00
lisazeyen
e8de4f308f rename solar-hsat in config 2024-05-15 15:08:52 +02:00
lisazeyen
541e267a83 replace print with logger.info 2024-05-15 15:00:42 +02:00
Koen van Greevenbroek
354fffe6f0 Split time agg into own rule; same agg for all planning horizons 2024-05-15 13:26:03 +02:00
Fabian Neumann
a9333458b3 handle potentially diverging spatial resolutions of HVC 2024-05-13 17:40:10 +02:00
pre-commit-ci[bot]
b529ab1d3c [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-05-13 15:14:35 +00:00
Fabian Neumann
649e277c7d make waste-to-energy work without regional_oil_demand 2024-05-13 17:13:16 +02:00
Michael Lindner
afa5cc5014 add heating output, correct bus ordering 2024-05-13 15:39:48 +02:00
pre-commit-ci[bot]
1d709913ed [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-05-13 15:39:37 +02:00
Tom Brown
2055fe68ef add extra bus for HVC, which can either go to air or waste CHP
Here we explicitly add the option to generate energy and/or capture
the CO2 from HVC (i.e. plastics). NB: Since waste CHP is expensive,
it's not built.
2024-05-13 15:39:01 +02:00
pre-commit-ci[bot]
f7dc8a7f22 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-05-13 15:36:43 +02:00
Tom Brown
ac0d52e1c3 Allow some plastics sequestered in landfill or built environment
I.e. assume some fraction of plastics don't end up being burned or
decaying into air.
2024-05-13 15:36:14 +02:00
Fabian Neumann
e023872d44 stop using wildcard by default 2024-05-13 10:50:24 +02:00
Thomas Gilon
02e434c8b0 Fix non steel related coal demand during transition (using sector_ratios) 2024-05-02 17:29:07 +02:00
Thomas Gilon
54e3d2bb1b Fix typo 2024-05-02 14:19:58 +02:00
pre-commit-ci[bot]
3e93c14dd4 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-04-29 11:32:24 +00:00
Parisra
be876761f2
Add remove option for solar-hsat
Add function to remove solar-hsat if the config option is 'False'
2024-04-25 11:37:53 +02:00
Parisra
692d837b14
Update add_electricity_grid_connection
Add solar-hsat as technology with a grid connection cost
2024-04-25 11:35:29 +02:00
lisazeyen
245ba5c20b rename efficiencies in script 2024-04-12 14:38:56 +02:00
lisazeyen
53a6b91b06 clear up units 2024-04-12 14:28:52 +02:00
pre-commit-ci[bot]
435350e07b [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-03-26 15:25:49 +00:00
lisazeyen
d7fedc6235
Merge branch 'master' into land-transport-fix 2024-03-26 16:25:27 +01:00
Fabian Neumann
a2f97ad1b3 make build_eurostat independent of snakemake object to be imported 2024-03-14 19:24:37 +01:00
Fabian Neumann
8d85acc61a remove unused keyword argument in temporal aggregation [no ci] 2024-03-14 18:19:25 +01:00
Fabian Neumann
4fbb3c81c4 fix build_district_heat_share and build_transport_demand for multiyear 2024-03-14 16:48:32 +01:00
Fabian Neumann
57b487f163 handle leap days in temporal clustering 2024-03-14 15:38:36 +01:00
Fabian Neumann
0d6ba9fbd1 move leap year handling into helper function 2024-03-14 15:15:56 +01:00
Fabian Neumann
579cd0c756 Merge branch 'master' into multiyear 2024-03-06 16:34:53 +01:00
lisazeyen
5046289c5f
add lifetime V2G 2024-03-06 14:00:38 +01:00
lisazeyen
5bfc64a658
Merge branch 'master' into land-transport-fix 2024-03-06 09:25:08 +01:00
lisazeyen
74504a0ff3
add lifetime to BEV 2024-03-06 09:04:30 +01:00
pre-commit-ci[bot]
ca91c02bf7 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-03-05 17:56:41 +00:00
Fabian Neumann
c13e0b83cf remove remaining references of eurostat report year 2024-03-05 18:55:59 +01:00
Fabian Neumann
96f71d7e9c outsource drop_leap_day in temporal aggregation 2024-03-04 19:37:02 +01:00