Commit Graph

2899 Commits

Author SHA1 Message Date
lisazeyen
02fec080ee
Merge branch 'master' into country-specific-dh-forward-temperatures 2024-08-16 13:40:59 +02:00
Markus Millinger
ebbb75491b
Solid biomass to hydrogen process (#1213)
* Added solid biomass to hydrogen, bioH2, process

* Add doc for new config

* add release notes

* enable bioH2 also without biomass spatially resolved

* Update doc/release_notes.rst

Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>

* Added overnight cost

---------

Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>
2024-08-16 13:18:10 +02:00
Philipp Glaum
8480d62d33
fix bug in simplyfy network (#1222) 2024-08-16 13:16:52 +02:00
lisazeyen
b3f85d750f
Merge branch 'master' into country-specific-dh-forward-temperatures 2024-08-16 11:28:46 +02:00
Bobby Xiong
55cca6a0f9
Bug fix: Carrier type of added supernodes in simplify_network need to be set to "AC" (#1221)
* Fixed simplify_network.py to handle more complex topologies, i.e. if two links are connected to nearby AC buses separated by an AC line.

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Added fix for Corsica node: If region containing Corsica is modelled, include substation on Corsica as supernode (end point).

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Bug fix: Carrier type of all supernodes corrected to 'AC'

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Bug fix: Carrier type of all supernodes corrected to 'AC'

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Bug fix: Carrier type of all supernodes corrected to 'AC'

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
2024-08-15 19:45:49 +02:00
cpschau
0221372b49
modified environments to include tabula-py update and fixed PDF econding (#1219) 2024-08-15 14:52:33 +02:00
Philipp Glaum
a9f67b313f
handle new and upgraded TYNDP&NEP lines/links in base network (OSM compatible) (#1085)
* add general implementation to add tyndp and nep. TODO: Remove duplicate?

* pre_osm_merge

* clean and update base_network.py
update default config settings

* clean and update base_network.py
update default config settings

* base_network.py:remove adding of transmission projects
add_transmission_project.py: add new script for creating lines and link csv from transmission projects
add_electricity.py: add new projects from created csv files

* cluster_network.py: do not allow to group lines with different build years together-> requires pypsa update
simplify_network.py: fix bug of simplify links

* remove legacies of removing transmission projects from base_network

* restructure folders:new folder for tranmission project csv
add_transmission_projects: improve logging, cleanup

* update lines csvs and add default line type for upgraded and new lines

* remove duplicate lines which were already in gridkit

* allow to connect ac lines only to ac buses

* add manual links csv (adjusted links_tyndp.csv) and update default config

* add realease note

* remove links_tyndp.csv file, references in build_elec.smk and function in base_network.py to add them

* add configuration options for transmission projects to documentation and add template folder for transmission projects

* update pypsa version in environments

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* integrate Fabian's review comments 2

* add electricity:add import pathlib and duplicate printing out of adding line projects

* update NEP line csv

* address Fabian's comments

* build_transmission_projects: address Fabian's final comments
simplify_network: use modus to get line type which appears most often

* build_transmission_project: change from .geometry to ["geometry"]

* build_transmission_projects: remove redundanty line

* build_transmission_projects: remove buffer for europe shape because of higher resolution
default config: fix wrong key for skip argument in transmission_projects

* update configtables and default config

* update manual links csv and delete undetected duplicate links in tyndp2020

* final adjustments

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>
2024-08-15 11:42:21 +02:00
Fabian Neumann
f72afe7d10 bugfix: make sure to include Ukraine offshore shapes with new EEZ files 2024-08-14 16:27:06 +02:00
Bobby Xiong
1cf85b0be8
Fix for Corsica in simplify_network: Include local substation (#1215)
* Fixed simplify_network.py to handle more complex topologies, i.e. if two links are connected to nearby AC buses separated by an AC line.

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Added fix for Corsica node: If region containing Corsica is modelled, include substation on Corsica as supernode (end point).

* [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-14 14:22:03 +02:00
Bobby Xiong
3ef6d519d7
Fix simplify_network.py to handle more complex topologies (#1211)
* Fixed simplify_network.py to handle more complex topologies, i.e. if two links are connected to nearby AC buses separated by an AC line.

* [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-14 10:24:38 +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
Philipp Glaum
d14ced2549 cleanup 2024-08-12 10:43:13 +02:00
Philipp Glaum
5c577b6290 remove methanol transport because it has no impact 2024-08-12 10:38:01 +02:00
Philipp Glaum
77385721b6 Merge remote-tracking branch 'upstream/master' into add_methanol_techs 2024-08-12 09:52:25 +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
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
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
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
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
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
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
b298d58d61 fix missing biomass-to-methanol due to wrong if statement 2024-08-05 13:27: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
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
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
AmosSchledorn
a990a898ef update naming in add_existing_baseyear 2024-08-02 17:27:16 +02:00
pre-commit-ci[bot]
6b924ecfb0 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-08-02 15:15:11 +00:00
AmosSchledorn
3ccdde3467 Merge remote-tracking branch 'origin/master' into update-district-heating-cops 2024-08-02 17:14:31 +02:00
AmosSchledorn
e5152897e1 Merge remote-tracking branch 'origin/master' into update-district-heating-cops 2024-08-02 17:03:51 +02:00
AmosSchledorn
bbf64a2fde Refactor module structure 2024-08-02 17:03:34 +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
AmosSchledorn
318e05c9fb refactor naming 2024-08-02 16:29:54 +02:00
lisazeyen
68e9593b01 merge master 2024-08-02 15:58:01 +02:00
AmosSchledorn
4a6dd2fe33 fix naming bugs 2024-08-02 15:56:37 +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
2d79673d5e merge master 2024-08-02 15:23:35 +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
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]
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
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
c9557a5988 remove breakpoint 2024-07-31 18:50:41 +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
caa260fddb update class docs 2024-07-31 17:01:27 +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
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
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
lisazeyen
c99cd72727 include Tonis Feedback 2024-07-29 13:36:06 +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
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
da3ad1725e
Merge branch 'master' into update-district-heating-cops 2024-07-29 10:33:39 +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
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
AmosSchledorn
8875ab6c38 add licensing info 2024-07-25 15:10:45 +02:00
AmosSchledorn
d297f84ea7 update inputs for add_existing_baseyear 2024-07-25 14:50:27 +02:00
pre-commit-ci[bot]
744aaf71de [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-07-25 12:33:39 +00:00
AmosSchledorn
b80bb7bb7a update base year COPs 2024-07-25 14:33:14 +02:00
toniseibold
9b7831974f excluding emissions from sector ratios development
[pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

just changing the fillna function makes the whole PR cleaner
2024-07-24 18:22:00 +02:00
pre-commit-ci[bot]
8d6feb6a66 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-07-24 15:05:01 +00:00
AmosSchledorn
b720bd9eca Merge remote-tracking branch 'origin/master' into update-district-heating-cops 2024-07-24 15:43:34 +02:00
AmosSchledorn
eb2911cb93 rename __main__ to run 2024-07-24 15:31:48 +02:00
Fabian Neumann
0470f119cf
base_network: use GeoSeries.voronoi_polygons instead of custom solution (#1172)
* base_network: use GeoSeries.voronoi_polygons instead of custom solution

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* base_network: move voronoi calculations into separate function

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* base_network: fix typo in function voronoi()

* base_network: refine voronoi function

* add release note [no ci]

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
2024-07-24 15:31:46 +02:00
AmosSchledorn
3fac27ff27 use module structure 2024-07-24 15:03:44 +02:00
Fabian Neumann
eab315291e
remove {scope} wildcard (#1171)
* remove {scope} wildcard

* do not create removed files
2024-07-24 13:19:57 +02:00
Fabian Neumann
8b1b1144d5
cutouts: update zenodo repository version (#1176) 2024-07-24 11:01:00 +02:00
Fabian Neumann
d142d5a50b
aggregate curtailment into single curtailment generator per bus (#1177)
* add curtailment generator mode

* add documentation
2024-07-24 10:54:15 +02:00
AmosSchledorn
de10492e10 Merge remote-tracking branch 'origin/master' into update-district-heating-cops 2024-07-23 17:30:51 +02:00
lisazeyen
7451349fed
take eurostat year for transport demand 2024-07-23 15:10:05 +02:00
lisazeyen
8f2cea4d93
Merge branch 'master' into jrc-idees-2020 2024-07-22 21:43:03 +02:00
pre-commit-ci[bot]
fb26aaf38d [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-07-22 19:42:54 +00:00
lisazeyen
b957f88645 fix bugs and clean up 2024-07-22 21:40:47 +02:00
lisazeyen
53bbc28908 add eurostat data for GB agriculture 2024-07-22 21:15:40 +02:00
lisazeyen
877ca3eb44
change sign sequestration store marginal cost (#1174) 2024-07-22 16:44:26 +02:00
pre-commit-ci[bot]
5361facbb7 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-07-22 13:39:06 +00:00
AmosSchledorn
46f9c7b520 Merge remote-tracking branch 'origin/master' into update-district-heating-cops 2024-07-22 14:45:38 +02:00
Fabian Neumann
b49895a041
determine_availability_matrix_MD_UA: enable parallelism & remove plots (#1170)
* determine_availability_matrix_MD_UA: enable parallelism through temp files and remove plots

* [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-19 17:43:11 +00:00
Iegor Riepin
ba55971c23
Compatibility of data processing for Ukraine (#1146)
* data: retrieve gdp and pop raw data for UA,MD

* Updated retrieval code.

* add_electricity script for UA and MD using updated, endogenised GDP and PPP data.

* Outsourced building of gdp and ppp. Only called when UA and/or MD are in country list.

* Accepted suggestion by @fneum in retrieve rule.

* Cleaned determine_availability_matrix_MD_UA.py, removed redundant code

* Updated build_gdp_pop_non_nuts3 script to use the mean to distribute GDP p.c. Added release notes. Bug fixes.

* Bug fixes --> 'ppp' to 'pop'

* Bug fix: only distribute load to buses with substation.

* Updated to download GDP and population raster via PyPSA-Eur zenodo databundle. Removal of dedicated retrieve function. Updated release notes.

* Updated release notes.

* correct input file paths

* update zenodo url for databundle release v0.3.0

* doc: update release_notes

* minor adjustments: benchmark, increase mem_mb, remove plots, handling of optional inputs

---------

Co-authored-by: bobbyxng <bobbyxng@gmail.com>
Co-authored-by: Bobby Xiong <36541459+bobbyxng@users.noreply.github.com>
Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>
2024-07-19 19:23:35 +02:00
AmosSchledorn
560373a864 add DH cops to network 2024-07-19 18:54:30 +02:00
AmosSchledorn
0c7e7cb46b fix naming, udpate docs 2024-07-19 18:54:19 +02:00
AmosSchledorn
052394fa88 change naming from individual/district heating to denctral/central heating 2024-07-19 15:57:53 +02:00
pre-commit-ci[bot]
0e1e509006 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-07-19 13:43:16 +00:00
lisazeyen
39e853e2b3 make sure not to divide by zero 2024-07-19 15:42:44 +02:00