Commit Graph

382 Commits

Author SHA1 Message Date
AmosSchledorn
3ccdde3467 Merge remote-tracking branch 'origin/master' into update-district-heating-cops 2024-08-02 17:14:31 +02:00
AmosSchledorn
4a6dd2fe33 fix naming bugs 2024-08-02 15:56:37 +02:00
lisazeyen
2d79673d5e merge master 2024-08-02 15:23:35 +02:00
lisazeyen
eb81cfb714 change units from EJ->TWh and clean up 2024-08-02 15:13:47 +02:00
lisazeyen
8efa832f95 Merge remote-tracking branch 'origin' into ebiofuels 2024-08-02 13:39:02 +02:00
lisazeyen
dcde6a9f58 Merge remote-tracking branch 'origin' into nofossil 2024-08-01 17:38:57 +02:00
AmosSchledorn
b0150bd65d refactor prepare_sector_network.add_heat using Enums 2024-08-01 11:59:26 +02:00
pre-commit-ci[bot]
4cfca27e4f [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-07-31 14:55:11 +00:00
AmosSchledorn
4362300dce update configtables and docs 2024-07-31 16:54:46 +02:00
pre-commit-ci[bot]
a2c0311ae7 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-07-30 16:24:00 +00:00
AmosSchledorn
5e73dae3a7 add heat_pump_sources to config and docs 2024-07-30 18:21:10 +02:00
pre-commit-ci[bot]
1fe54513cd [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-07-29 16:33:52 +00:00
AmosSchledorn
29479c50d0 pass heat source/system type to prepare_sector_network and add_existing_baseyear 2024-07-29 18:29:27 +02:00
AmosSchledorn
0edf566e3f attempt to handle heat_pump_sources dynamically 2024-07-29 14:36:30 +02:00
Amos Schledorn
69b01e670f
Update config/config.default.yaml
Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>
2024-07-29 11:33:28 +02:00
Amos Schledorn
da3ad1725e
Merge branch 'master' into update-district-heating-cops 2024-07-29 10:33:39 +02:00
Micha
f5fe0d062c
Rename ev battery master (#1116)
* rename EV battery

* add release note

* adjust tech colors

* fix for battery renaming in plot_summary

---------

Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>
2024-07-29 09:50:02 +02:00
AmosSchledorn
b720bd9eca Merge remote-tracking branch 'origin/master' into update-district-heating-cops 2024-07-24 15:43:34 +02:00
AmosSchledorn
a9f4c6375d change default DH return temperature to 50C 2024-07-24 15:04:14 +02:00
Fabian Neumann
8b1b1144d5
cutouts: update zenodo repository version (#1176) 2024-07-24 11:01:00 +02:00
Fabian Neumann
d142d5a50b
aggregate curtailment into single curtailment generator per bus (#1177)
* add curtailment generator mode

* add documentation
2024-07-24 10:54:15 +02:00
AmosSchledorn
de10492e10 Merge remote-tracking branch 'origin/master' into update-district-heating-cops 2024-07-23 17:30:51 +02:00
Fabian Neumann
f11f8d8613 solver settings: add copt-gpu setings for pdlp solver 2024-07-22 21:51:52 +02:00
AmosSchledorn
f3c898f43d build district heating heat pump COPs using approximation from Jensen et al. and values from Pieper et al. 2024-07-19 15:39:16 +02:00
Micha
d3b24face6
revert to old config keys (#1152)
* revert to old config keys

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
2024-07-12 16:22:53 +02:00
cpschau
f19279e7e0 Add other waste heat technologies, and adjust share 2024-07-09 14:02:45 +02:00
cpschau
e932466b05 FT and electrolyis waste heat for DH as float 2024-07-09 12:05:50 +02:00
millingermarkus
5c7bb2bf51 Add option to exclude fossil fuels 2024-07-04 11:16:00 +02:00
millingermarkus
c71fa78bfa Added biomass imports to prepare sector network 2024-07-04 10:18:19 +02:00
millingermarkus
84ddfea91e Added electrobiofuels 2024-07-03 12:38:16 +02:00
Micha
37bbbc6225 Fix grouping logic again 2024-06-13 15:03:08 +02:00
LukasFrankenQ
7eba0ba36d adjusted and added colours for EGS 2024-06-02 13:14:31 +01:00
LukasFrankenQ
2801b00100 Merge https://github.com/pypsa/pypsa-eur 2024-05-26 22:38:03 +01:00
Fabian Neumann
1da76dd1ae
prepare release v0.11.0 (#1081)
* prepare release notes v0.11.0

* streamline release notes

* update envs/environment.fixed.yaml

* doc: update workflow DAGs

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* pre-commit formatting [no ci]

* update envs/environment.fixed.yaml

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
2024-05-25 22:47:04 +02:00
Fabian Neumann
8b0600b02c disable everywhere_powerplants by default (closes #1072) 2024-05-24 10:40:57 +02:00
Fabian Neumann
c9a0b9c1ae move example configuration files to config/examples 2024-05-24 10:09:34 +02:00
Fabian Neumann
a0e968e573 test myopic: do not estimate renewable capacities before add_existing_baseyear 2024-05-24 09:14:48 +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
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
c89ce9f045 bugfix: correctly distinguish existing OCGT and CCGT 2024-05-20 15:00:46 +02:00
Fabian Neumann
7ce15931e5 add simplified power distribution grid losses 2024-05-20 12:41:54 +02:00
Thomas Gilon
c3dcff8a35 Define methanol energy demand for industry 2024-05-17 16:04:48 +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
5b5be71341 use loads instead of links where possible 2024-05-15 16:41:49 +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
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