Commit Graph

5267 Commits

Author SHA1 Message Date
AmosSchledorn
ac3d797fc1 Merge remote-tracking branch 'origin/master' into country-specific-dh-forward-temperatures 2024-08-07 14:44:26 +02:00
pre-commit-ci[bot]
7f76bf8e84 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-08-07 12:37:46 +00:00
lisazeyen
d7436a6405
Merge pull request #1175 from PyPSA/update-district-heating-cops
Approximate district heating COPs via Jensen et al. 2018
2024-08-07 14:29:58 +02:00
lisazeyen
bab392f378
remove not needed function 2024-08-07 14:14:19 +02:00
AmosSchledorn
80603fda6e update config and script 2024-08-07 13:33:59 +02:00
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
pre-commit-ci[bot]
9c32932eee [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-08-07 08:18:40 +00:00
Fabian Neumann
6e8ea1b329
Merge branch 'master' into update-district-heating-cops 2024-08-07 10:17:27 +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
AmosSchledorn
d903f4ace9 Merge branch 'update-district-heating-cops' into country-specific-dh-forward-temperatures 2024-08-06 15:51:22 +02:00
AmosSchledorn
0e8fb80bc4 clean up, improve docs 2024-08-05 16:11:18 +02:00
AmosSchledorn
2e35bef480 rename "enums" to "definitions" and write modules in snake case 2024-08-05 15:08:05 +02:00
AmosSchledorn
4fe8eeeffa rename "enums" to "definitions" and write modules in snake case 2024-08-05 15:07:46 +02:00
Philipp Glaum
280e8d6d01 use correct colorcode for biomass-to-methanol 2024-08-05 13:40:05 +02:00
Philipp Glaum
b298d58d61 fix missing biomass-to-methanol due to wrong if statement 2024-08-05 13:27:43 +02:00
AmosSchledorn
93d60a2927 remove obsolote cop inputs from solve_perfect.add_existing_baseyear 2024-08-05 12:26:26 +02:00
AmosSchledorn
ea7fc92546 update solve_perfect.add_existing_baseyear input/params 2024-08-05 12:19:43 +02:00
AmosSchledorn
268ff93783 fix boiler buses for existing heating 2024-08-05 12:07:24 +02:00
Philipp Glaum
975716250a add bus0 for methanol-to-kerosene process 2024-08-05 12:00:15 +02:00
AmosSchledorn
d40ff8e963 Merge branch 'update-district-heating-cops' of https://github.com/PyPSA/pypsa-eur into update-district-heating-cops 2024-08-05 11:45:23 +02:00
AmosSchledorn
f593983ea0 update copyright notic in heatSector 2024-08-05 11:45:12 +02:00
pre-commit-ci[bot]
61bb225a34 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-08-05 09:42:45 +00:00
AmosSchledorn
7bd0c16ddd Merge remote-tracking branch 'origin/master' into update-district-heating-cops 2024-08-05 11:42:18 +02:00
AmosSchledorn
390085aaad update add_existing_baseyear 2024-08-05 11:35:34 +02:00
AmosSchledorn
5773877f64 Merge branch 'update-district-heating-cops' of https://github.com/PyPSA/pypsa-eur into update-district-heating-cops 2024-08-05 11:35:11 +02:00
AmosSchledorn
5362c37696 update myopic mode to heat system declarations 2024-08-05 11:27:52 +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
Philipp Glaum
8579689f2a Merge remote-tracking branch 'upstream/master' into bio_methanol 2024-08-05 10:11:55 +02:00
Philipp Glaum
acb0a8d7af get methanol to kerosene cost form technology data 2024-08-05 10:08:04 +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]
0259e066e4 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-08-02 15:28:14 +00:00
AmosSchledorn
10e0b30a40 Merge branch 'update-district-heating-cops' of https://github.com/PyPSA/pypsa-eur into update-district-heating-cops 2024-08-02 17:27:18 +02:00