Fabian Neumann
f263862455
use lower resolution EEZ shapes to reduce excessive RAM use ( #1210 )
2024-08-13 21:03:07 +02:00
Fabian Neumann
6ca8e80095
add option to use atlite to smooth wind turbine power curves ( #1209 )
2024-08-13 18:13:32 +02:00
pre-commit-ci[bot]
9243567872
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2024-08-13 15:08:49 +00:00
AmosSchledorn
a017802976
Merge remote-tracking branch 'origin/master' into country-specific-dh-forward-temperatures
2024-08-13 17:07:29 +02:00
AmosSchledorn
7542d57820
style: move get_country_from_node_name function from _helpers tu run
2024-08-13 17:07:20 +02:00
pre-commit-ci[bot]
d58a848f97
[pre-commit.ci] pre-commit autoupdate ( #1208 )
...
updates:
- [github.com/psf/black-pre-commit-mirror: 24.4.2 → 24.8.0](https://github.com/psf/black-pre-commit-mirror/compare/24.4.2...24.8.0 )
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
2024-08-13 16:46:34 +02:00
Bobby Xiong
c79a9faa2c
Updated under_construction status of links that are commissioned by now ( #1205 )
...
* Updated links 14802, 14801, 12931, 14803, 14848, 14804: under_construction=False
* Updated links 14802, 14801, 14803, 14848, 14804: under_construction=False
* Updated link 8394 and parameter_corrections: Continuation of North-Sea-Link.
2024-08-12 16:56:10 +02:00
lisazeyen
07fe3ca9e2
Merge pull request #1167 from PyPSA/jrc-idees-2020
...
Jrc idees 2021
2024-08-12 15:39:52 +02:00
lisazeyen
6686e6e196
Update doc/release_notes.rst
...
Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>
2024-08-12 15:27:24 +02:00
pre-commit-ci[bot]
156eccefb7
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2024-08-09 12:24:39 +00:00
lisazeyen
9b8139abbe
add docstring
2024-08-09 14:24:12 +02:00
lisazeyen
c5256c1f37
add coke oven transformation output
2024-08-09 14:24:12 +02:00
lisazeyen
fe9185ef3f
Merge branch 'master' into jrc-idees-2020
2024-08-09 14:17:25 +02:00
lisazeyen
70db93fd32
correct sheet name chemical feedstocks
2024-08-09 13:14:47 +02:00
AmosSchledorn
6c9bcae6f0
Merge remote-tracking branch 'origin/master' into country-specific-dh-forward-temperatures
2024-08-08 17:20:23 +02:00
AmosSchledorn
f20c56db60
Merge branch 'country-specific-dh-forward-temperatures' of https://github.com/PyPSA/pypsa-eur into country-specific-dh-forward-temperatures
2024-08-08 17:18:55 +02:00
AmosSchledorn
166895ac43
update release notes
2024-08-08 17:18:48 +02:00
AmosSchledorn
9a0930419e
update configtables
2024-08-08 17:17:33 +02:00
pre-commit-ci[bot]
5ee5a43be3
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2024-08-08 15:16:05 +00:00
AmosSchledorn
35286cd0fc
Merge branch 'country-specific-dh-forward-temperatures' of https://github.com/PyPSA/pypsa-eur into country-specific-dh-forward-temperatures
2024-08-08 17:15:03 +02:00
AmosSchledorn
023cc7529e
set lower supply temperatures for Scandinavia
2024-08-08 17:15:01 +02:00
pre-commit-ci[bot]
a914366391
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2024-08-08 15:13:34 +00:00
AmosSchledorn
b31767cb20
Merge branch 'country-specific-dh-forward-temperatures' of https://github.com/PyPSA/pypsa-eur into country-specific-dh-forward-temperatures
2024-08-08 17:00:09 +02:00
AmosSchledorn
130ee49dbd
add option to make central heating forward/return temperatures country-specific
2024-08-08 16:57:41 +02:00
pre-commit-ci[bot]
cfed67f794
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2024-08-08 14:46:09 +00:00
AmosSchledorn
69c6ea0e12
use relative imports of scripts.definitions where possible
2024-08-07 17:55:29 +02:00
cpschau
f8d0efbe99
Addition of unsustainable biomass potentials ( #1139 )
...
* add columns to potential df defined by difference to eurostat
* add network components
* add unsustainable bioliquids
* replaced stores by generators, still infeasible
* remove municipal waste
* remove separate treatment of waste from biomass potential calculation
* phase out unsustainble biomass potentials
* [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
* phase-out unsustainable bioliquids
* remove waste_incineration from build_sector rule
* multiple potential calculation for different planning horizons
* raised costs of unsustainable solid biomass
* [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
* stores instead of generators
* change snakemake inputs
* add phas-eout to config
* add techcolor for unsustainable bioliquids
* add config parameter to disable inclusion of unsustainable bioenergy potentials
* [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
* add biomass to params
* remove call of snakemake object in define_spatial
* Quick resolve of review part 1 (config parameters, if-clause-reduction, bioliquid spatial, fix bioliquid link capacity
* Quick resolve of review part 2 (config table, helper function, fixed build_eurostat, removed dir-change, forced unsustainable usage, reverted overnight distinction in Snakefile)
* Cast of planning_horizon parameter to int type after test run
* added JRC fuel costs for solid and liquid biofuels, BtL VOM
* [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
* clean-up after master merge
* adressed review (increase threads for build_eurostat, fixed e_max_pu of Stores, changed version of technology-data); added release note
---------
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: lisazeyen <35347358+lisazeyen@users.noreply.github.com>
2024-08-07 15:52:00 +00:00
Fabian Neumann
fb41016c60
EEZ: Update EEZ to v12, auto-download and remove from databundle ( #1188 )
...
* eez: update to version 12, autodownload, remove pycountry
* eez: do not simplify as it distorts topology
* remove missed merge conflicts
2024-08-07 15:28:55 +02:00
Fabian Neumann
c907d59253
remove unused rule prepare_links_p_nom ( #1203 )
...
* remove rule
* [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-08-07 15:20:08 +02:00
lisazeyen
6d75e86fe4
Merge pull request #1190 from PyPSA/auto-dl-countries
...
naturalearth: automatically download and remove from data bundle
2024-08-07 14:58:31 +02:00
AmosSchledorn
ab6415bdc3
re-add default supply temperature
2024-08-07 14:54:28 +02:00
lisazeyen
842d4b36e6
Merge branch 'master' into auto-dl-countries
2024-08-07 14:47:45 +02:00
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
