Commit Graph

5208 Commits

Author SHA1 Message Date
Fabian Neumann
d32feb3aae mark downloaded files as ancient rather than protected 2024-05-20 22:37:16 +02:00
pre-commit-ci[bot]
b29b9e6c5d [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-05-20 20:25:43 +00:00
Fabian Neumann
3f01938eee
Merge branch 'master' into fix_biomass_transport 2024-05-20 22:24:59 +02:00
Fabian Neumann
0c33a55bc5 Merge branch 'Climact-feature/methanol-production' 2024-05-20 22:20:27 +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
8e029d7ccb Merge branch 'Climact-feature/fix-industry-intermediate' 2024-05-20 21:44:25 +02:00
Fabian Neumann
eeb548c03f Merge branch 'feature/fix-industry-intermediate' of github.com:Climact/pypsa-eur-climact into Climact-feature/fix-industry-intermediate 2024-05-20 21:44:19 +02:00
Fabian Neumann
47cda0a9c0 Merge branch 'Climact-feature/fix-non-steel-coal-demand' 2024-05-20 21:08:59 +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
a8cd1186b8 clarify differences between Co2L in {sector_opts} and {opts} wildcard (closes #865) 2024-05-20 17:18:55 +02:00
Fabian Neumann
c7d8af998c only apply rolling horizon setting in (closes #864) 2024-05-20 17:00:56 +02:00
Fabian Neumann
e1ebf91b67 Merge branch 'Climact-feature/enhance-agg-p-nom-limits' 2024-05-20 15:49:48 +02:00
Fabian Neumann
a2012d8937 pre-commit formatting [no ci] 2024-05-20 15:49:40 +02:00
Fabian Neumann
65b05e92a1 Merge branch 'feature/enhance-agg-p-nom-limits' of github.com:Climact/pypsa-eur-climact into Climact-feature/enhance-agg-p-nom-limits 2024-05-20 15:49:14 +02:00
Fabian Neumann
f76f7879f0 Merge branch 'fix_energy_totals' 2024-05-20 15:38:09 +02:00
Fabian Neumann
f25c594a07 bugfix: include total heavy-duty road freight; do not treat total transport as other but including electricity 2024-05-20 15:37:54 +02:00
Fabian Neumann
408e24de80 Merge branch 'master' of github.com:PyPSA/pypsa-eur 2024-05-20 15:01:05 +02:00
Fabian Neumann
c89ce9f045 bugfix: correctly distinguish existing OCGT and CCGT 2024-05-20 15:00:46 +02:00
Fabian Neumann
d2c48b6603
Merge pull request #1071 from SermishaNarayana/master
Modification to function "add_operational_reserve_margin" in solve_ne…
2024-05-20 12:45:10 +02:00
Fabian Neumann
7ce15931e5 add simplified power distribution grid losses 2024-05-20 12:41:54 +02:00
pre-commit-ci[bot]
6722e584ba [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-05-20 10:03:44 +00:00
Sermisha
d7435b6214 Modification to function "add_operational_reserve_margin" in solve_network.py
Typecasted pandas dataframes to xarray datasets to allow for multiplication with pypsa variables
2024-05-20 15:30:38 +05:30
Fabian Neumann
6c9fc50a1c Merge branch 'master' of github.com:PyPSA/pypsa-eur 2024-05-20 11:54:20 +02:00
Fabian Neumann
a56996323b Merge branch 'koen-vg-split-out-time-agg' 2024-05-20 11:54:07 +02:00
Fabian Neumann
60441ddfdd pre-commit formatting [no ci] 2024-05-20 11:52:23 +02:00
Fabian Neumann
bf33518135 time_aggregation: add missing logger object 2024-05-20 11:51:45 +02:00
Fabian Neumann
9152425936 remove handling of tsam as optional dependency 2024-05-20 11:51:24 +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
Fabian Neumann
cf8ee69f94
Merge pull request #1067 from PyPSA/fix_DC_cluster_issue
fix_DC_cluster_issue
2024-05-19 20:19:31 +02:00
Fabian Neumann
9051d221fa
Merge pull request #1070 from Parisra/master
Enhance Carbon budget distribution plot
2024-05-19 20:15:16 +02:00
pre-commit-ci[bot]
b890149d39 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-05-18 12:22:30 +00:00
Thomas Gilon
c3dcff8a35 Define methanol energy demand for industry 2024-05-17 16:04:48 +02:00
Philipp Glaum
ac48fdaaf4 base_network.py: connect new tyndp links only to closest AC bus 2024-05-17 14:46:20 +02:00
Parisra
ce14cd6647
Update plot_summary.py
-Add 2022 emissions to plot carbon budget
-Add UK emissions to the previous numbers
2024-05-16 17:06:28 +02:00
Fabian Neumann
27009f5060 double solar rooftop PV potentials (closes #935) 2024-05-15 18:18:15 +02:00
Fabian Neumann
e4d70fdf4a remove exogenous rooftop_share 2024-05-15 18:13:49 +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
438f651ea0 amend release note [no ci] 2024-05-15 17:13:37 +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
be28996a68
Merge pull request #1066 from PyPSA/adding_solar_tracking_single_axis
Adding solar tracking single axis
2024-05-15 16:27:39 +02:00
pre-commit-ci[bot]
a352cc346b [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-05-15 14:18:18 +00:00
lisazeyen
96118ab1f4
Merge branch 'master' into adding_solar_tracking_single_axis 2024-05-15 16:18:13 +02:00
lisazeyen
6a4e49d5cb add release notes 2024-05-15 16:14:40 +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
Fabian Neumann
c81b3f1300
Merge pull request #1064 from PyPSA/post-disc-master
post-discretization of lines and links
2024-05-15 15:15:55 +02:00