Commit Graph

5012 Commits

Author SHA1 Message Date
lisazeyen
97176ac4c1
Merge pull request #1130 from millingermarkus/becc_energy_penalty
BECC energy penalty and correction of BtL and BioSNG cost
2024-08-02 15:21:30 +02:00
lisazeyen
eb81cfb714 change units from EJ->TWh and clean up 2024-08-02 15:13:47 +02:00
lisazeyen
8c5cd4be83
Merge branch 'master' into becc_energy_penalty 2024-08-02 14:35:01 +02:00
lisazeyen
ff92f14974
Merge pull request #1193 from PyPSA/ebiofuels
Ebiofuels
2024-08-02 14:32:43 +02:00
lisazeyen
39c502f29a add release note 2024-08-02 14:23:46 +02:00
lisazeyen
9c35a6716c add documentation for new config option 2024-08-02 14:23:46 +02:00
pre-commit-ci[bot]
c7a186863e [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-08-02 12:07:18 +00:00
lisazeyen
8bfca9ce69 enable electrobiofuels also without biomass spatially resolved 2024-08-02 14:05:42 +02:00
lisazeyen
8efa832f95 Merge remote-tracking branch 'origin' into ebiofuels 2024-08-02 13:39:02 +02:00
lisazeyen
648ea20ec1
Merge branch 'master' into msw_incineration 2024-08-02 13:34:31 +02:00
Fabian Neumann
baa8a827f5 change FRESNA references to PyPSA 2024-08-02 11:42:30 +02:00
lisazeyen
89d28ed06e
Merge pull request #1187 from PyPSA/nofossil
Nofossil
2024-08-02 09:17:26 +02:00
pre-commit-ci[bot]
de3f679f33 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-08-01 15:54:24 +00:00
lisazeyen
9a6505d889 add release notes 2024-08-01 17:50:22 +02:00
lisazeyen
3eb8b16304 add description for new config setting 2024-08-01 17:47:41 +02:00
lisazeyen
b2d346f02c some simplifications 2024-08-01 17:47:21 +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
AmosSchledorn
214efeb056 make test.sh executable 2024-07-31 17:30:24 +02:00
pre-commit-ci[bot]
d273de8600 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-07-31 15:01:50 +00:00
AmosSchledorn
2664e68ad9 Merge branch 'update-district-heating-cops' of https://github.com/PyPSA/pypsa-eur into update-district-heating-cops 2024-07-31 17:01:29 +02:00
AmosSchledorn
caa260fddb update class docs 2024-07-31 17:01:27 +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
Fabian Neumann
4c1ec3559d
some small adjustments to run as single node model (#1183)
* some small adjustments to run as single node model

* [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-31 11:53:20 +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
81618d4be1 Merge branch 'update-district-heating-cops' of https://github.com/PyPSA/pypsa-eur into update-district-heating-cops 2024-07-29 18:30:23 +02:00
AmosSchledorn
29479c50d0 pass heat source/system type to prepare_sector_network and add_existing_baseyear 2024-07-29 18:29:27 +02:00
pre-commit-ci[bot]
51f42b4a36 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-07-29 12:37:00 +00:00
AmosSchledorn
0edf566e3f attempt to handle heat_pump_sources dynamically 2024-07-29 14:36:30 +02:00
Fabian Neumann
e9e0a0da20
address fillna(method='{b|f}fill') deprecation (#1181)
* address fillne(method='{b|f}fill') deprecation

* [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-29 11:56:14 +02:00
Fabian Neumann
936b490303
address groupby(axis=...) deprecation (#1182) 2024-07-29 09:51:20 +00:00
AmosSchledorn
9073e49085 add link to paper in release notes 2024-07-29 11:43:53 +02:00
AmosSchledorn
ff12480713 Merge branch 'update-district-heating-cops' of https://github.com/PyPSA/pypsa-eur into update-district-heating-cops 2024-07-29 11:38:32 +02:00
AmosSchledorn
1d3e39979a remove duplicate staticmethods 2024-07-29 11:36:46 +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
160cb011cc
Update doc/configtables/sector.csv
Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>
2024-07-29 11:30:44 +02:00
Amos Schledorn
da3ad1725e
Merge branch 'master' into update-district-heating-cops 2024-07-29 10:33:39 +02:00
AmosSchledorn
9183846c6e update sector configtable 2024-07-29 10:30:23 +02:00
AmosSchledorn
6c14d20726 checkout sector configtable from master 2024-07-29 10:26:47 +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
Toni Seibold
23ea16dc14
Lifetime of Gas Pipelines (#1162)
* inf lifetime of gas pipelines avoids adding new links each planning horizon

* p_nom_extendable for existing gas pipelines is set false if retrofitting to H2 is not allowed

* [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-29 09:47:08 +02:00
pre-commit-ci[bot]
9d485a2185 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-07-26 18:12:21 +00:00
AmosSchledorn
08c30d8b2e ensure correct dimensions in forward/return temperature arayx and change naming from "generic" to "default" 2024-07-26 20:08:06 +02:00
AmosSchledorn
f096592b7f add option to make central heating forward/return temperatures country-specific 2024-07-26 19:45:45 +02:00
AmosSchledorn
3c5b11e4ea update release notes 2024-07-25 15:28:31 +02:00
AmosSchledorn
e21694473f Merge remote-tracking branch 'origin/master' into update-district-heating-cops 2024-07-25 15:12:13 +02:00
pre-commit-ci[bot]
64d0f291d5 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-07-25 13:11:08 +00:00