Commit Graph

5159 Commits

Author SHA1 Message Date
Philipp Glaum
150157fe40 Merge branch 'fix_msw' of github.com:PyPSA/pypsa-eur into fix_msw 2024-09-03 16:03:20 +02:00
Philipp Glaum
7b98afc85a fix if condition to add msw 2024-09-03 16:02:28 +02:00
pre-commit-ci[bot]
5e5944df57 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-09-03 12:12:22 +00:00
Philipp Glaum
30bcddb66a prepare_sector_networks: account correctely for msw co2
environment.yaml: add license comment
2024-09-03 14:10:20 +02:00
Fabian Neumann
d2e7562962 fix version number in release notes 2024-08-30 18:16:52 +02:00
Fabian Neumann
0a1d58fa55 update version number, amend authors 2024-08-30 18:12:49 +02:00
Fabian Neumann
e8353ec031 Merge branch 'master' into prepare-release-v0.12.0 2024-08-30 18:07:38 +02:00
Fabian Neumann
56f2b581bf
Add emissions and fuel consumption from fuel refinieries (#1253)
* Add emissions and fuel consumption from fuel refinieries

* [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-30 18:06:41 +02:00
Fabian Neumann
3a1ee934da prepare release v0.12.0 2024-08-30 18:06:26 +02:00
Lukas Trippe
8d78fe83be
ci: code scanning with CodeQL (#1251)
* ci: code scanning with CodeQL

* [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-30 16:42:35 +02:00
Fabian Neumann
0df54bc370 Squashed commit of the following:
commit a2b82195b872bae11a9e247c53756ca3ae512362
Author: Fabian Neumann <fabian.neumann@outlook.de>
Date:   Fri Aug 30 16:13:36 2024 +0200

    minor adjustments

commit 4f9eb04fec4534abbef10fedd4d9b5c34f064670
Merge: 7b525a51 bf2d82a3
Author: Fabian Neumann <fabian.neumann@outlook.de>
Date:   Fri Aug 30 16:08:58 2024 +0200

    Merge branch 'master' into master

commit 7b525a515a36a4ebb248280546583ac843f6b277
Merge: d9033374 a357ba11
Author: danielelerede-oet <daniele.lerede@openenergytransition.org>
Date:   Mon Aug 26 13:21:06 2024 +0200

    Merge branch 'master' into master

commit d9033374e4bf0bb70df0828743b9aab69c0cbb27
Author: danielelerede-oet <daniele.lerede@openenergytransition.org>
Date:   Mon Aug 26 10:34:27 2024 +0200

    Update scripts/solve_network.py

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

commit 98e6c5b0f152ca7e064b3c80be26f50040628388
Author: danielelerede-oet <daniele.lerede@openenergytransition.org>
Date:   Mon Aug 26 10:34:21 2024 +0200

    Update scripts/solve_network.py

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

commit be19a2ba2401a2815c09e74d2add24461b3fe2aa
Author: danielelerede-oet <daniele.lerede@openenergytransition.org>
Date:   Mon Aug 26 10:34:15 2024 +0200

    Update scripts/solve_operations_network.py

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

commit 8093eaa399cfea62d1ef93ec4ed5ed46bf5dcc6d
Author: danielelerede-oet <daniele.lerede@openenergytransition.org>
Date:   Mon Aug 26 10:34:08 2024 +0200

    Update scripts/solve_network.py

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

commit 746d1761accbe44d3a851430b94844fe3ab43d72
Author: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date:   Wed Aug 21 15:29:12 2024 +0000

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

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

commit f46fdee7f7ceeb9040ee73123fa4a3bd1aa14a56
Author: Daniele Lerede <daniele.lerede@openenergytransition.org>
Date:   Wed Aug 21 17:11:32 2024 +0200

    fix solve_operations_network
2024-08-30 16:15:34 +02:00
Amos Schledorn
bf2d82a384
Dynamic central heating temperatures (#1206)
* feat: Add rule to build central heating temperature profiles, adjust build_cop_profiles accordingly

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

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

* style: make new config settings prettier

* docs: add file headers

* docs: update configtables and module docstring

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

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

* docs: update release notes

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

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

* chore: use smooth ambient temperature through rolling window; remove default vals in class

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

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

* Update doc/configtables/sector.csv

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Amos Schledorn <a.schledorn@tu-berlin.de>
Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>
2024-08-30 16:01:46 +02:00
Philipp Glaum
d2f8162d7b
prepare_sector_network: correct if statement (#1252) 2024-08-30 15:56:21 +02:00
Fabian Neumann
88d28de3a1
resolve Kosovo (XK) as separate country (#1249)
* resolve Kosovo (XK) as separate country

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

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

* fillna

* add missing key in data/existing_infrastructure/existing_heating_raw.csv

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
2024-08-30 15:36:03 +02:00
Philipp Glaum
4f8d583d38
prepare_sector_network: fix municipal waste transport links (#1250) 2024-08-30 13:34:06 +00:00
Fabian Neumann
3a1b57515a
industry: steel GEM, ammonia, refinery, cement plants non-EU (#1241)
* industry distribution: split EAF + integrated using GEM GSPT, add ammonia plants

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

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

* add release note [no ci]

* add cement plant data for countries not in Hotmaps

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

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

* add refineries data for countries not in Hotmaps

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
2024-08-30 14:53:54 +02:00
Fabian Neumann
e815c36b5c revert ffill of ammonia production 2024-08-30 12:13:15 +02:00
Philipp Glaum
bc09f1df77
prepare_sector_network.py: add oil bus whenever industry is added (#1247)
* prepare_sector_network.py: add oil bus whenever industry is added

* prepare_sector_network: Move added oil and methnaol buses to top of "add_industry", and add oil buses where used in "add_biomass"
2024-08-30 12:06:11 +02:00
Fabian Neumann
2cf6951858 build_ammonia_production: forward fill missing values 2024-08-30 12:02:39 +02:00
Fabian Neumann
b207b4ebe8
remove unused geth2015 hydro capacities (#1246) 2024-08-30 10:26:48 +02:00
Fabian Neumann
1b2ec575bc
retrieve urban population fraction from World Bank API (#1248)
* retrieve urban population fraction from World Bank API

* [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-30 10:26:34 +02:00
lisazeyen
35e81b90a5
Merge pull request #1243 from PyPSA/fix_msw_stores
fix municipal waste store timeseries
2024-08-29 15:59:46 +02:00
pre-commit-ci[bot]
bca4f95a07 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-08-29 13:38:41 +00:00
Philipp Glaum
7665de61d3 prepare_sector_network: convert e_max_pu timeseries for msw stores to pd.DataFrame. 2024-08-29 15:34:44 +02:00
Fabian Neumann
0c296aa28f change base_network default to 'osm-prebuilt' 2024-08-29 12:04:27 +02:00
Fabian Neumann
550bda4b44 eurostat_co2: fix update to 2023 energy balances 2024-08-29 11:49:37 +02:00
Fabian Neumann
9c0ab3e0c0 amend codespell blacklist 2024-08-28 14:41:54 +02:00
Fabian Neumann
3f94f89a84
build_powerplants: can assign to all buses not just substations (#1239) 2024-08-26 15:38:30 +00:00
Fabian Neumann
bbff4297f9
temporarily disable n.shapes until memory issues resolved (#1238) 2024-08-26 15:16:06 +00:00
Tom Brown
66051e04d4
build_electricity: raise memory for build_tranmission_projects (#1237)
2 GB RAM was not enough, to avoid out-of-memory problems raised to 4 GB.
2024-08-26 16:51:57 +02:00
Fabian Neumann
20d5eb7cb7
update nuclear EAF based on 2021-2023 IAEA data (#1236) 2024-08-26 13:18:39 +00:00
Fabian Neumann
cab85cbb61
update GEM Europe gas tracker to May 2024 version (#1235) 2024-08-26 13:04:15 +00:00
Fabian Neumann
b44f544d77 simplify_network: do not use mode for linetype inferral 2024-08-26 13:56:10 +02:00
Fabian Neumann
a357ba11e9
add capital cost for liquid carbonaceous fuel stores (closes #489) (#1234)
* add capital cost for liquid carbonaceous fuel stores (closes #489)

* [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-26 11:21:15 +02:00
Bobby Xiong
ef0bbd5f37
Custom busmap (#1231)
* Added functionality to set custom_busmaps for different base_networks.

* Updated configtables and location for busmaps.

* Added release nots.

* removed run parameter in mock_snakemake (only used for debugging).

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

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

---------

Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
2024-08-23 17:35:46 +02:00
Fabian Neumann
73d1353608 cluster_network: fix if no clustering required 2024-08-23 09:17:21 +02:00
Fabian Neumann
6c9d23ced2 config: set correct minimum number of clusters 2024-08-22 15:24:22 +02:00
Bobby Xiong
0c36de9bf8
Introducing OpenStreetMap high-voltage grid to PyPSA-Eur (#1079)
* Implemented  which uses the overpass API to download power features for individual countries.

* Extended  rule by input.

* Bug fixes and improvements to clean_osm_data.py. Added  in retrieve_osm_data.py.

* Updated clean_osm_data and retrieve_osm_data to create clean substations.

* Finished clean_osm_data function.

* Added check whether line is a circle. If so, drop it.

* Extended build_electricity.smk by build_osm_network.py

* Added build_osm_network

* Working osm-network-fast

* Bug fixes.

* Finalised and cleaned  including docstrings.

* Added try catch to retrieve_osm_data. Allows for parallelisation of downloads.

* Updated cleaning process.

* Set maximum number of threads for retrieving to 4, wrt. fair usage policy and potential request errors.

* Intermediate update on clean_osm_data.py. Added docstrings.

* Bug fix.

* Bug fix.

* Bug fixes in data types out of clean_osm_data

* Significant improvements to retrieve_osm_data, clean_osm_data. Cleaned code. Speed improvements

* Cleaned config.

* Fixes.

* Bug fixes.

* Updated default config

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

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

* Removed overpass from required packages. Not needed anymore.

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

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

* Added links_relations (route = power, frequency = 0) to retrieval. This will change how HVDC links are extracted in the near future.

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

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

* Work-in-progress clean_osm_data

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

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

* Added clean links output to clean_osm_data. Script uses OSM relations to retrieve clean HVDC links.

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

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

* New code for integrating HVDC links. Using relations. Base network implementation functioning.

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

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

* removed manual line dropping.

* Updated clean script

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

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

* reverted Snakefile to default: sync settings

* added prebuilt functionality.

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

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

* Updated build_electricity.smk to work with scenario management.

* removed commented-out code.

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

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

* removed commented-out code.

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

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

* Fixed bug in pdf export by substituting pdf export with svg.

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

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

* Bug-fix Snakefile

* dropped not needed columns from build_osm_network.

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

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

* Updated build_shapes, config.default and clean_osm_data.

* pre-commit changes.

* test

* Added initial prepare_osm_network_release.py script

* Finalised prepare_osm_network_release script to build clean and stable OSM base_network input files.

* Added new rules/development.smk

* Updated clean_osm_data to add substation_centroid to linestrings

* Updated clean_osm_data to add substation_centroid to linestrings

* Updated clean_osm_data to add substation_centroid to linestrings

* Updated clean_osm_data to add substation_centroid to linestrings

* Added osm-prebuilt functionality and zenodo sandbox repository.

* Updated clean_osm_data to geopandas v.1.01

* Made base_network and build_osm_network function more robust for empty links.

* Made base_network and build_osm_network function more robust for empty links.

* Bug fix in base_network. Voltage level null is now kept (relevant e.g. for Corsica)

* Merge with hcanges in upstream PR 1146. Fixing UA and MD.

* Updated Zenodo and fixed prepare_osm_network_release

* Updated osm network release.

* Updated prepare osm network release.

* Updated MD, UA scripts.

* Cleaned determine_availability_matrix_MD_UA.py, removed redundant code

* Bug fixes.

* Bug fixes for UA MD scripts.

* Rename of build script.

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

* Updated zenodo sandbox repository.

* Updated config.default

* Cleaned config.default.yaml: Related settings grouped together and redundant voltage settings aggregated.

* Cleaned config.default.yaml: Related settings grouped together and redundant voltage settings aggregated. Added release notes.

* Updated Zenodo repositories for OSM-prebuilt to offcial publication.

* Updated configtables

* Updated links.csv: Under_construction lines to in commission.

* Updated link 8394 and parameter_corrections: Continuation of North-Sea-Link.

* Major update: fix simplify_network, fix Corsica, updated build_osm_network to include lines overpassing nodes.

* remove config backup

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

* 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

* Updated rules and base_network for compatibility with TYNDP projects.

* Updated Zenodo repository and prebuilt network to include 150 kV HVDC connections.

* Removed outdated config backup.

* Implemented all comments from PR #1079. Cleaned up OSM implementation.

* Bug fix: Added all voltages, 200 kV-750 kV, to default config.

* Cleaning and bugfixes.

* Updated Zenodo repository to https://zenodo.org/records/13358976. Added converter voltages, 'underground' property for DC lines/cables, and included Konti-Skan HVDC (DK-SE). Added compatibility with https://github.com/PyPSA/pypsa-eur/pull/1079 and https://github.com/PyPSA/pypsa-eur/pull/1085

* Apply suggestions from code review

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

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

* simplify_network: handle complicated transformer topologies

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

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

* syntax fix

---------

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-22 15:01:20 +02:00
lisazeyen
e273f4ec9d
Merge pull request #1228 from PyPSA/co2-seq-per-period
Co2 sequestration potential depending on investment period
2024-08-20 15:33:18 +02:00
lisazeyen
7490647084 update release notes and doc 2024-08-20 15:06:02 +02:00
lisazeyen
5fb89068fd right intend for co2 seq potential 2024-08-20 15:06:02 +02:00
pre-commit-ci[bot]
2682c313ba [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-08-20 12:04:47 +00:00
lisazeyen
dcc84dfb9f update config 2024-08-20 14:02:12 +02:00
lisazeyen
3ad83c2097 Merge remote-tracking branch 'origin' 2024-08-20 13:51:44 +02:00
lisazeyen
f4819d0b4c co2 sequestration depending on period 2024-08-20 13:51:33 +02:00
lisazeyen
05dba2d36b
Merge pull request #1227 from PyPSA/industry-ratios-infinity-bug
avoid infinity in sector rations
2024-08-20 10:25:11 +02:00
pre-commit-ci[bot]
8b0474e41c [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-08-20 08:16:00 +00:00
lisazeyen
50c2fee6ce
avoid infinity in sector rations 2024-08-20 10:14:59 +02:00
lisazeyen
49053f3fb7
Merge pull request #1225 from PyPSA/fix-transport-data-year-selection
Make year selection more secure in transport data creation
2024-08-20 09:47:27 +02:00
pre-commit-ci[bot]
54a2d24517 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-08-19 11:39:36 +00:00