* add oil bus; extend global biomass limit; set unsustainable potentials to zero for overnight
* keep sustainable potentials for switzerland
* remove potential distinction for overnight; additional global constraint for unsustainable solid biomass
* add unsustainable generator suffix
* added unsustainable solid biomass bus; changed global constraints to equality; removed forced emptying of unsustainable solid biomass store
* restored equality constraint for sustainable solid biomass; restored forced emptying of unsustainable store
* remove directory change for debugger
* added tech_color for unsustainable solid biomass
* modified spatial namespaces and removed suffixes
* chore: make overdim_factor heat-system-specific
* doc: update configtables
* doc: update release notes
* [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
* fix: read overdimensioning factor for industrial oil boilers from options
* [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
---------
Co-authored-by: Amos Schledorn <a.schledorn@tu-berlin.de>
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>
* bugfix: determine bus_carrier locally instead of overwriting n.stores
* add release_note
* [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>
This change consists of:
- reading the final energy (FE) to thermal energy service (TES)
efficiency for each each country, seperately for gas and oil (this
efficiency represents e.g. the losses in older non-condensing
boilers)
- using TES instead of FE for the n.loads, so that it is pure energy
service instead of including losses in legacy equipment
- using the stored efficiencies for baseyear equipment in
add_existing_baseyear
In the baseyear (e.g. 2020) this should have no effect on FE, since
the reduction to TES is conpensated by the lower efficiencies of
existing equipment.
In the future (e.g. 2050) this leads to a reduction in heating demand,
since new equipment is more efficient than existing.
* 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>
* 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>
* 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>
* 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>
* 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"
* 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>
* 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>
* 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>
* 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>
* 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>
* 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>
* 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>
* 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>
* 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>
* 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>
