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
pre-commit-ci[bot]
89906cfdb4
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2024-08-02 07:55:00 +00:00
Fabian Neumann
311c82d65e
naturalearth: automatically download and remove from data bundle
2024-08-02 09:53:34 +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
lisazeyen
5cea20456f
correct hyperlink in release notes
2024-07-31 18:59:57 +02:00
lisazeyen
c9557a5988
remove breakpoint
2024-07-31 18:50:41 +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
lisazeyen
4499fa4e73
fix typo
2024-07-31 16:19:51 +02:00
pre-commit-ci[bot]
e37824336e
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2024-07-31 14:10:11 +00:00
lisazeyen
52c8037a3e
merge master
2024-07-31 16:09:33 +02:00
lisazeyen
d48500fc3b
use ffill and bfill
2024-07-31 16:06:16 +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
lisazeyen
c52737db72
small fixes in docstrings
2024-07-30 15:28:08 +02:00
lisazeyen
b92f0d0c30
update industry sector ratios to new JRC data
2024-07-30 15:26:28 +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
lisazeyen
b0e00249aa
adjust mapping energy demand per ct
2024-07-29 17:37:06 +02:00
lisazeyen
2f3fde26d0
update ammonia demand data to 2022
2024-07-29 16:09:38 +02:00
lisazeyen
aa820fa046
change industry reference year to 2019
2024-07-29 16:00:37 +02:00
lisazeyen
314f6c6f0f
retrieve ammonia demand data
2024-07-29 16:00:13 +02:00
lisazeyen
fb2ab4c50b
update ammonia data
2024-07-29 15:44:30 +02:00
lisazeyen
201889424c
update industry to new JRC-idees
2024-07-29 15:39:01 +02:00
Philipp Glaum
5c1d8178f1
Merge branch 'methanol_to_master' into bio_methanol
2024-07-29 14:51:50 +02:00
Philipp Glaum
d142717563
add methanol techs for master to branch
2024-07-29 14:49:57 +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
lisazeyen
c99cd72727
include Tonis Feedback
2024-07-29 13:36:06 +02:00
