Commit Graph

4976 Commits

Author SHA1 Message Date
pre-commit-ci[bot]
6a51a1d94e [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-08-07 09:59:09 +00:00
lisazeyen
95903eeca7
Merge branch 'master' into jrc-idees-2020 2024-08-07 11:58:22 +02:00
lisazeyen
5bf36c218c add ch data as csv 2024-08-07 11:49:33 +02:00
lisazeyen
7e75aab295 directly read in nan values 2024-08-07 10:47:22 +02:00
lisazeyen
7848e08bc7 create previous idees split for aviation 2024-08-07 10:40:23 +02:00
lisazeyen
6b3fc18386 include review fneum build_industrial_production_per_country 2024-08-07 10:33:47 +02:00
Fabian Neumann
59574211a4 retrieve.smk: consistently use conda directive 2024-08-07 10:15:35 +02:00
lisazeyen
8794f53050 rename eurostat_2015 2024-08-07 10:11:07 +02:00
lisazeyen
682d53d1b5 remove /bundle 2024-08-07 10:07:52 +02:00
lisazeyen
24f05f51d2
fix intersphinx mapping 2024-08-07 09:56:26 +02:00
pre-commit-ci[bot]
3c528b7b0a [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-08-06 15:52:01 +00:00
lisazeyen
a9d991f547 fix release notes 2024-08-06 17:51:10 +02:00
lisazeyen
5725e8bf22 remove comment about uk flights 2024-08-06 17:47:35 +02:00
lisazeyen
2c7e30bb17 remove ammonia demand script 2024-08-06 17:46:23 +02:00
lisazeyen
0ec367ed7a
save idees directly in data not in bundle
Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>
2024-08-06 17:37:36 +02:00
Bobby Xiong
813e54555a
Corrected Moyle Interconnector capacity in links_p_nom.csv to 500 MW (#1199) 2024-08-05 11:18:02 +02:00
lisazeyen
bad875a432
Merge pull request #1195 from PyPSA/msw_incineration
Msw incineration
2024-08-05 10:56:22 +02:00
pre-commit-ci[bot]
e0b5fe9048 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-08-05 08:46:30 +00:00
lisazeyen
69f51ec7d6 add release notes and doc for new config settings 2024-08-05 10:45:57 +02:00
lisazeyen
7447a3d0c9 Merge remote-tracking branch 'origin' into msw_incineration 2024-08-05 10:38:25 +02:00
lisazeyen
a56834e51e add switch for msw waste 2024-08-05 10:38:11 +02:00
Fabian Neumann
ddf0da2687
base_network: bugfix - bring voronoi cells in correct order 2024-08-04 16:01:51 +02:00
pre-commit-ci[bot]
f58322c3e5 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-08-02 15:02:11 +00:00
lisazeyen
b62db80435 fix bug with e_max_pu 2024-08-02 17:01:22 +02:00
pre-commit-ci[bot]
3149bfd926 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-08-02 14:47:24 +00:00
lisazeyen
69c6a4dca4 set e_max_pu to force municipal waste to be used 2024-08-02 16:45:57 +02:00
lisazeyen
68e9593b01 merge master 2024-08-02 15:58:01 +02:00
lisazeyen
7a16dd2aa4
Merge pull request #1194 from PyPSA/biomass_import
Biomass import
2024-08-02 15:36:02 +02:00
pre-commit-ci[bot]
e28c66e43c [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-08-02 13:27:42 +00:00
lisazeyen
440f3e4a7f add release notes 2024-08-02 15:26:32 +02:00
lisazeyen
2d79673d5e merge master 2024-08-02 15:23:35 +02:00
lisazeyen
4d9ba02e18 add doc for new config 2024-08-02 15:22:39 +02:00
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
lisazeyen
5cea20456f correct hyperlink in release notes 2024-07-31 18:59:57 +02:00