Commit Graph

176 Commits

Author SHA1 Message Date
Fabian
62cb6fbdd8 validation: download input data files instead 2023-08-04 17:38:21 +02:00
Fabian Neumann
23eb3548c5 Merge branch 'master' into ukraine_hackathon 2023-08-01 08:42:47 +02:00
Fabian Hofmann
1ea8cf47d8
Merge branch 'master' into validation 2023-07-31 11:20:11 +02:00
Fabian Hofmann
1d5c8c7242
Merge branch 'master' into fneum/line-rating 2023-07-26 14:56:35 +02:00
Fabian
d60be3fece Merge branch 'master' into validation 2023-07-26 13:01:34 +02:00
Fabian Neumann
ddd1840981 Merge remote-tracking branch 'origin/master' into multiyear 2023-07-26 10:23:32 +02:00
Fabian
2df6157f1b update unit commitment parameters
update nuclear p_max_pu
remove pgn files
2023-07-24 10:47:16 +02:00
Fabian
4ff7bbbd2a data: update nuclear p_max_pu France 2023-07-20 14:36:22 +02:00
Fabian
4e49dfe73e nuclear_p_max_pu: add 5 % to allow flexibility 2023-07-14 15:34:14 +02:00
Fabian Neumann
b110810669 no more override_component_attrs for multilinks 2023-07-13 22:31:55 +02:00
Fabian Neumann
59f24122e2 cherry-pick line rating code 2023-06-02 17:08:40 +02:00
Fabian Neumann
ef5320e1b8 merge master 2023-06-02 16:59:06 +02:00
lisazeyen
4854d8b4dc add data for monthly prices 2023-05-17 12:56:40 +02:00
pre-commit-ci[bot]
add135fe05 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-04-30 08:53:00 +00:00
Fabian Neumann
6acd5da4d4 Merge branch 'multiyear-sec' into multiyear 2023-04-29 18:49:49 +02:00
Fabian Neumann
30beee0959 Merge branch 'master' into multiyear 2023-04-29 12:40:55 +02:00
Fabian
89edfdb486 add unit_commitment.csv 2023-04-27 13:58:57 +02:00
Fabian Neumann
e16539a161 remove manual country codes 2023-03-16 10:36:51 +01:00
Fabian Neumann
97bbafdd70 Merge remote-tracking branch 'pypsa-eur-sec/master' into merge-pypsa-eur-sec 2023-03-06 11:54:08 +01:00
pre-commit-ci[bot]
13769f90af [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-03-06 08:27:46 +00:00
Fabian Neumann
963e7cdbcf Merge branch 'master' into update-lng-ports 2023-02-16 17:56:05 +01:00
Fabian Neumann
3d4af04d88 update eia hydro data, fix missing merge conflict 2023-01-06 21:51:33 +01:00
Fabian Neumann
1ebe53cdac merge master 2023-01-06 18:45:36 +01:00
Fabian Neumann
c17ae85f9b HVDC links Sweden Germany parameter correction 2022-12-28 12:15:17 +01:00
Fabian Neumann
780834ad87 tyndp: add greenlink and celtic interconnector 2022-12-28 09:33:36 +01:00
Fabian Neumann
27d4af8e65 entsoegridkit: additional parameter corrections 2022-12-28 09:31:48 +01:00
virio-andreyana
1a7dd850f2 remove excel file Europe-Gas-Tracker-August-2022 2022-12-15 12:34:11 +01:00
virio-andreyana
e1776518c0 Merge remote-tracking branch 'origin/update-lng-ports' into update-lng-ports 2022-12-15 12:20:05 +01:00
virio-andreyana
55ff725e3b Final edit to update LNG ports. Remove unused files 2022-12-15 11:42:21 +01:00
virio-andreyana
01f48a50e7 Replacing the IGGIELNG_LNG data with Europe-Gas-Tracker 2022-12-14 12:26:16 +01:00
virio-andreyana
4f3510e3cc Replacing the IGGIELNG_LNG data with Europe-Gas-Tracker 2022-12-07 10:36:54 +01:00
Fabian Neumann
84618b3ee1 distribute international shipping by port trade volumes 2022-11-13 13:43:05 +01:00
pre-commit-ci[bot]
5d1ef8a640 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2022-09-16 13:04:06 +00:00
Philipp Glaum
39c0a2735d costs.csv and add_elec: change hydrogen storage name entry 2022-09-06 12:07:10 +02:00
Philipp Glaum
f7939d67d9 udpate cost data and fix caused bug 2022-09-06 10:37:03 +02:00
Fabian Neumann
0bad2097b0 interpolate heat demands for years outside 2007-2015 2022-07-25 14:35:54 +02:00
Fabian Neumann
af96af1329 hydro: approximation routine for missing eia years and correction by capacity 2022-07-22 15:03:54 +02:00
Fabian
b56d1f6f4d conventional config section: update to more general attribute assignment scheme 2022-06-27 17:35:19 +02:00
Fabian
a1ee747dc6 data: add nuclear_eafs 2022-06-24 18:37:43 +02:00
Fabian
146907c756 update offshore wind investment 2022-04-28 10:56:08 +02:00
Fabian Neumann
a3d6e296e8
Merge branch 'master' into eu-energy-security 2022-04-08 19:56:26 +02:00
Fabian Neumann
4862dcf865
Merge pull request #357 from PyPSA/hvdc-links
Hvdc links
2022-04-05 17:13:15 +02:00
Fabian Neumann
bfcc20aa13
Revert "update TYNDP links which are already built" 2022-04-05 17:10:12 +02:00
Fabian Neumann
998761ec88 build_hydro: add new EIA hydro dataset 2022-04-05 16:32:53 +02:00
Fabian Neumann
2a34ab26c4 add TYNDP link replaces 2022-04-05 16:07:04 +02:00
Fabian Neumann
46acddd369 update TYNDP links which are already built 2022-04-04 22:17:40 +02:00
lisazeyen
4f288834b2 update overrides align with PyPSA version>=0.18 2022-03-18 13:46:09 +01:00
Fabian Neumann
08ad16a962 powerplants: add MD country code 2022-03-17 16:44:59 +01:00
Fabian Neumann
b1cb4da958 update gdp ppp data 2022-03-17 15:24:12 +01:00
Fabian Neumann
210d05f784 add small updated data files and adjust paths 2022-03-17 14:11:56 +01:00
Fabian Neumann
b23b3ff1a7
Merge branch 'master' into ukraine_hackathon 2022-03-17 08:48:58 +01:00
Fabian
3cb06985c9 custom powerplants: add Moldova 2022-03-10 16:48:31 +01:00
martacki
a2b1137215 update README.md 2022-03-08 12:35:00 +01:00
Fabian
6288f8d696 data: add custom_powerplants for ukraine
config: set custom_poweplants to True
2022-03-04 17:47:50 +01:00
martacki
cba8c569bd NordBalt assignment 2022-02-25 14:50:45 +01:00
martacki
2c3f1226dd linelength fix of corrupted (problem) lines 2022-02-16 21:41:13 +01:00
martacki
208cf96385 parameter_corrections - resolve 220/380 kV Line Bug 2022-02-04 14:35:49 +01:00
martacki
296fb021cf join skagerrak link 2022-01-31 16:09:42 +01:00
martacki
3a6a09995d update entsoe extract with missing lines 2022-01-29 14:19:59 +01:00
martacki
61a4108e60 update parameter_corrections for updated entsoe gridextract 2022-01-21 17:37:18 +01:00
martacki
10fbc9225c update entsoe gridextract 2022-01-21 17:35:15 +01:00
Fabian Neumann
dacb7152fe gas_network: remove old dataset 2021-11-13 17:02:54 +01:00
Fabian Neumann
12ef1302e6 add planned LNG terminals from gem.wiki and convert units to MW 2021-11-10 18:05:47 +01:00
Fabian Neumann
37e2e53486
Merge branch 'master' into retrofit-gas-pipelines 2021-11-02 19:03:26 +01:00
Fabian Neumann
2bfc091f8b update data bundle 2021-10-02 11:12:45 +02:00
Fabian Neumann
aa8cefeb5b add district_heat_share.csv 2021-08-19 10:07:51 +02:00
Fabian Neumann
5da6ac044b remove unused data from repository, add processed gas network dataset until #153 is in 2021-08-04 11:58:00 +02:00
Fabian Neumann
89eccd4f70 merge master 2021-07-02 15:00:19 +02:00
Fabian Neumann
1fc1d2a17d
Revision complete (#139)
* ammonia_production: minor cleaning and move into __main__ (#106)

* biomass_potentials: code cleaning and automatic country index inferral (#107)

* Revision: build energy totals (#111)

* blacken

* energy_totals: preliminaries

* energy_totals: update build_swiss

* energy_totals: update build_eurostat

* energy_totals: update build_idees

* energy_totals: update build_energy_totals

* energy_totals: update build_eea_co2

* energy_totals: update build_eurostat_co2

* energy_totals: update build_co2_totals

* energy_totals: update build_transport_data

* energy_totals: add tqdm progressbar to idees

* energy_totals: adjust __main__ section

* energy_totals: handle inputs via Snakefile and config

* energy_totals: handle data and emissions year via config

* energy_totals: fix reading in eurostat for different years

* energy_totals: fix erroneous drop duplicates
This caused problems for waste management in HU and SI

* energy_totals: make scope selection of CO2 or GHG a config option

* Revision: build industrial production per country (#114)

* industry-ppc: format

* industry-ppc: rewrite for performance

* industry-ppc: move reference year to config

* industry-ppct: tidy up and format (#115)

* remove stale industry demand rules (#116)

* industry-epc: rewrite for performance (#117)

* Revision: industrial distribution key (#118)

* industry-distribution: first tidying

* industry-distribution: first tidying

* industry-distribution: fix syntax

* Revision: industrial energy demand per node today (#119)

* industry-epn: minor code cleaning

* industry-epn: remove accidental artifact

* industry-epn: remove accidental artifact II

* industry-ppn: code cleaning (#120)

* minor code cleaning (#121)

* Revision: industry sector ratios (#122)

* sector-ratios: basic reformatting

* sector-ratios: add new read_excel function that filters year already

* sector-ratios: rename jrc to idees

* sector-ratios: rename conv_factor to toe_to_MWh

* sector-ratios: modularise into functions

* Move overriding of component attributes to function and into data (#123)

* move overriding of component attributes to central function and store in separate folder

* fix return of helper.override_component_attrs

* prepare: fix accidental syntax error

* override_component_attrs: bugfix that aligns with pypsa components

* Revision: build population layout (#108)

* population_layouts: move inside __main__ and blacken

* population_layouts: misc code cleaning and multiprocessing

* population_layouts: fix fill_values assignment of urban fractions

* population_layouts: bugfig for UK-GB naming ambiguity

* population_layouts: sort countries alphabetically for better overview

* config: change path to atlite cutout

* Revision: build clustered population layouts (#112)

* population_layouts: move inside __main__ and blacken

* population_layouts: misc code cleaning and multiprocessing

* population_layouts: fix fill_values assignment of urban fractions

* population_layouts: bugfig for UK-GB naming ambiguity

* population_layouts: sort countries alphabetically for better overview

* cl_pop_layout: blacken

* cl_pop_layout: turn GeoDataFrame into GeoSeries + code cleaning

* cl_pop_layout: add fraction column which is repeatedly calculated downstream

* Revision: build various heating-related time series (#113)

* population_layouts: move inside __main__ and blacken

* population_layouts: misc code cleaning and multiprocessing

* population_layouts: fix fill_values assignment of urban fractions

* population_layouts: bugfig for UK-GB naming ambiguity

* population_layouts: sort countries alphabetically for better overview

* cl_pop_layout: blacken

* cl_pop_layout: turn GeoDataFrame into GeoSeries + code cleaning

* gitignore: add .vscode

* heating_profiles: update to new atlite and move into __main__

* heating_profiles: remove extra cutout

* heating_profiles: load regions with .buffer(0) and remove clean_invalid_geometries

* heating_profiles: load regions with .buffer(0) before squeeze()

* heating_profiles: account for transpose of dataarray

* heating_profiles: account for transpose of dataarray in add_exiting_baseyear

* Reduce verbosity of Snakefile (2) (#128)

* tidy Snakefile light

* Snakefile: fix indents

* Snakefile: add missing RDIR

* tidy config by removing quotes and expanding lists (#109)

* bugfix: reorder squeeze() and buffer()

* plot/summary: cosmetic changes including: (#131)

- matplotlibrc for default style and backend
- remove unused config options
- option to configure geomap colors
- option to configure geomap bounds

* solve: align with pypsa-eur using ilopf (#129)

* tidy myopic code scripts (#132)

* use mock_snakemake from pypsa-eur (#133)

* Snakefile: add benchmark files to each rule

* Snakefile: only run build_retro_cost if endogenously optimised

* Snakefile: remove old {network} wildcard constraints

* WIP: Revision: prepare_sector_network (#124)

* population_layouts: move inside __main__ and blacken

* population_layouts: misc code cleaning and multiprocessing

* population_layouts: fix fill_values assignment of urban fractions

* population_layouts: bugfig for UK-GB naming ambiguity

* population_layouts: sort countries alphabetically for better overview

* cl_pop_layout: blacken

* cl_pop_layout: turn GeoDataFrame into GeoSeries + code cleaning

* move overriding of component attributes to central function and store in separate folder

* prepare: sort imports and remove six dependency

* prepare: remove add_emission_prices

* prepare: remove unused set_line_s_max_pu
This is a function from prepare_network

* prepare: remove unused set_line_volume_limit
This is a PyPSA-Eur function from prepare_network

* prepare: tidy add_co2limit

* remove six dependency

* prepare: tidy code first batch

* prepare: extend override_component_attrs to avoid hacky madd

* prepare: remove hacky madd() for individual components

* prepare: tidy shift function

* prepare: nodes and countries from n.buses not pop_layout

* prepare: tidy loading of pop_layout

* prepare: fix prepare_costs function

* prepare: optimise loading of traffic data

* prepare: move localizer into generate_periodic profiles

* prepare: some formatting of transport data

* prepare: eliminate some code duplication

* prepare: fix remove_h2_network
- only try to remove EU H2 store if it exists
- remove readding nodal Stores because they are never removed

* prepare: move cost adjustment to own function

* prepare: fix a syntax error

* prepare: add investment_year to get() assuming global variable

* prepare: move co2_totals out of prepare_data()

* Snakefile: remove unused prepare_sector_network inputs

* prepare: move limit p/s_nom of lines/links into function

* prepare: tidy add_co2limit file handling

* Snakefile: fix tabs

* override_component_attrs: add n/a defaults

* README: Add network picture to make scope clear

* README: Fix date of preprint (was too optimistic...)

* prepare: move some more config options to config.yaml

* prepare: runtime bugfixes

* fix benchmark path

* adjust plot ylims

* add unit attribute to bus, correct cement capture efficiency

* bugfix: land usage constrained missed inplace operation

Co-authored-by: Tom Brown <tom@nworbmot.org>

* add release notes

* remove old fix_branches() function

* deps: make geopy optional, remove unused imports

* increase default BarConvTol

* get ready for upcoming PyPSA release

* re-remove ** bug

* amend release notes

Co-authored-by: Tom Brown <tom@nworbmot.org>
2021-07-01 20:09:04 +02:00
lisazeyen
33f7f5026e Merge branch 'master' into retrofit-gas-pipelines 2021-05-12 15:20:49 +02:00
lisazeyen
fca6cb0284 add gas network data from ENTSOG and SciGRID 2021-04-15 14:22:33 +02:00
lisazeyen
36685bd016 update retro script to include ventilation, thermal bridges and heat gains. Add necessary input files in the Snakefile, remove no longer needed file 2021-02-24 16:51:58 +01:00
Fabian Neumann
2fc1ea0255
some refactoring and code cleaning (#190)
* some refactoring and code cleaning

* execute pre-commit

* pre-commit: limit large files

* add license to .pre-commit

* add pre-commit to env

* solve: tidy memory logger

* travis: add conda list for easier debugging

* undo config test/tutorial without plotting, rm matplotlibrc, .licenses

* remove {networks} wildcard

* unadd pre-commit config

* add release notes

* restore REUSE compliance

* fix docs environment python version

* env: remove gurobi from dependencies

* fix unclean merge block

* fix elif to if

* lighter rtd style

* lighter rtd style II
2020-12-03 19:50:53 +01:00
Fabian Neumann
f18b7b02cb
StorageUnit correct efficiency_dispatch/store (counter-proposal 2) (#202)
* fix efficiencies of storage units counter proposal

* extra_components: fix roundtrip efficiency

* add_electricity: remove misleading roundtrip efficiency for storageunit

* add release notes
2020-12-03 10:02:23 +01:00
Tom Brown
974155bd46 Merge branch 'master' into retro 2020-11-30 17:07:43 +01:00
Tom Brown
abbaa0d098 Move CO2 budgets from data/co2_budget.csv to dict in config.yaml
Strategy is too keep as much of configuration in config.yaml as
possible.

We also aim to allow exogenous investment-year-dependent
configurations to be done in a similar manner (e.g. share of district
heating or FCEV transport).
2020-11-30 13:21:38 +01:00
Fabian Neumann
bfbf595ad8
Parameter corrections for East-Western and Anglo-Scottish interconnection (#206)
* data: parameter corrections for East-Western and Anglo-Scottish interconnector

* add release notes
2020-11-26 17:20:48 +01:00
Fabian Neumann
3b858384d3 data: ALEGrO in operation 2020-11-17 12:46:49 +01:00
lisazeyen
d1282ba315 add option for endogenously retrofitting 2020-10-21 15:21:26 +02:00
Tom Brown
b862bb95cd Fix H2 underground potentials from TWh to MWh; simplify H2 data 2020-09-25 16:23:45 +02:00
lisazeyen
d26da9971f add data for hydrogen underground potential 2020-09-22 10:15:04 +02:00
Fabian Neumann
e2c3b80ec4
Remove onwind-landcosts from data/costs.csv and add_electricity.py (#180) 2020-08-24 11:19:57 +02:00
Fabian Neumann
2f4852347a
Fix two issues with new 2020 ENTSO-E grid extract (#181)
* base: fix errors in new entsoe extract

* add release notes

* apply suggestions from code review - remove hardcode
2020-08-24 10:33:46 +02:00
Tom Brown
515416fd75 PyPSA-Eur-Sec Version 0.2.0
Please see the release notes:

https://pypsa-eur-sec.readthedocs.io/en/latest/release_notes.html#pypsa-eur-sec-0-2-0-21st-august-2020

for more information.
2020-08-21 12:34:20 +02:00
Tom Brown
95e676828a Remove old data/costs.csv and dependencies on it 2020-08-20 14:26:39 +02:00
martavp
bd939b4792 add aditional data files with existing renewable capacities, heating capacitites, co2_budget and country codes 2020-07-07 18:51:49 +02:00
Jonas Hörsch
0813807b0f
data/entsoegridkit: Update gridkit data files (#118)
* data/entsoegridkit: Update gridkit data files

* add missing NordBalt and Estlink 1 to TYNDP

* base: lower distance tolerance, hardcode faulty bus allocation

* data: apply new parameter corrections for network extract

* doc: amend release notes [skip travis]

* doc: update release notes and base image [skip travis]

Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>
2020-06-08 18:13:51 +02:00
Tom Brown
1c5f471acb Include option for grid connection cost for onshore and utility PV
Only include these technologies since they are connected at new
locations.

Other technologies can fit in at existing connections.
2020-05-11 13:37:10 +02:00
Tom Brown
478832f484 Merge branch 'master' of github.com:nworbmot/pypsa-eur-sec 2020-04-29 09:53:11 +02:00
d-fine dev
a4db176458 add new link oil boiler
* prepare_sector_network:
    - add link for oil boiler in function add_industry()
    - add function for partitioning clusters into different heat node types

* config.yaml: add option for oil_boiler

* costs.csv: add costs for oil boiler
2020-04-09 14:58:03 +02:00
Tom Brown
9b326ba493 Include electricity distribution grid between load and EVs 2020-03-25 12:52:25 +01:00
euronion
ccc56ce3c8
Fix: Correctly determine the bus to attatch custom powerplants to. (#131)
* Add index integrity checks for custom powerplants.

* Update .csv template for custom powerplants.

* Update data/custom_powerplants.csv

* Revert "Merge branch 'master' into fix/custom-powerplants"

This reverts commit 5cd9c1afafd1ab36c31181ffed7635152805ee52, reversing
changes made to 5b1df27b25fdc89acca88395a0ba999f84dce109.

* Update release_notes.rst

* Rephrasing update to release notes.

* Merge with upstream/master (revert reverted merge).

Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>
2020-03-17 09:50:38 +01:00
Tom Brown
41f7f44dcf Make CCS optional for SMR and industry process emissions 2019-12-13 18:06:38 +01:00
Tom Brown
49a68bdd35 Separate CHP gas/solid biomass, with/without CCS
Also fix CHP p_nom_ratio constraint, and battery charger/discharger
constraint.
2019-12-12 15:03:51 +01:00
Fabian Neumann
7ddc153bd2
ec: attach hydrogen pipelines (#108) 2019-12-02 12:22:30 +01:00
Tom Brown
3fac944e5b 191108: Include a correctly-costed H2 network
Offers same topology to optimisation for H2 grid as that of HVAC and
HVDC grid.
2019-11-26 18:00:45 +01:00
Fabian Neumann
0fb57601bf doc: document powerplantmatching changes from #84 2019-11-06 15:59:34 +01:00
Tom Brown
8d68146e7c Switch to BDEW-based weekday/end space heating demand profiles
These are different for residential and services demand.

Also include Snakefile in config files copied for each run.

Use gurobi settings from gurobi support for speed.

Commented out settings for testing randomness for noise.
2019-08-07 19:08:06 +02:00
Tom Brown
d3a0f7e67d Diff intraday heat profiles for (res, services) x (water, space)
These are specified in data/heat_load_profile.csv.

The resulting heat_demand df has MultiIndex columns, where the first
level is ["sector use"], and the second level level is nodes.
2019-08-01 15:43:04 +02:00
Tom Brown
886b7c5f48 Include micro-CHP using PEMFC 2019-07-28 13:10:21 +02:00