Commit Graph

661 Commits

Author SHA1 Message Date
Fabian Neumann
6765ffda8f fix electricity.csv 2021-04-06 13:27:21 +02:00
martacki
bd57548788 merge 2021-03-24 12:00:45 +01:00
Max Parzen
184b060903
syntax correction 2021-03-23 20:27:13 +00:00
Max Parzen
f9e73690e1
Update add_extra_components 2021-03-23 19:34:13 +00:00
Max Parzen
b4a992c4db
update config.yaml
adding to marginal costs:
- electroysis
- fuel cell
- battery inverter
2021-03-23 19:30:06 +00:00
Max Parzen
165148d26c
Update scripts/add_extra_components.py
Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>
2021-03-23 19:22:39 +00:00
pz-max
2f9e9075e8 adding marginal cost for storage 2021-03-23 17:29:59 +00:00
Koen van Greevenbroek
9048af482f
Add a check to fix KeyError (#220) (#228)
In some cases, in networks with DC links, a non-existing column would
be referenced in an empty Dataframe. This commit adds a check for this
case.

Co-authored-by: Koen van Greevenbroek <koen@vesoldo.com>
2021-03-10 18:16:09 +01:00
eb5194
b9fdacad4d simplify: delete columns with incorrect/accurate entries 2021-01-20 20:39:22 +01:00
eb5194
ea8e643dc4 add_electricity.py Resolve FutureWarning 771 Index.__or__ operating as set operation is deprecated 2021-01-19 15:20:58 +01:00
Fabian Neumann
df2425d4a0
Update README.md 2021-01-14 21:22:34 +01:00
lukasnacken
4e44822514
Add openpyxl to environment.yaml to fix #215 (#216) 2021-01-13 17:24:42 +01:00
Chiara Anselmetti
ed4fdc9150
Keep links to store components when using ATK wildcard (#214)
* Update prepare_network.py

The new ATK wildcard removes all lines + links without further distinction; however, since storage options are now modeled as store components, the links to and from the the storage units for (dis)charge are eliminated as well. Thus, the storage options drop out of the optimisation. 
Especially when only allowing renewables as generation sources, optimisation may become infeasible for a high temporal resolution (capacity factors = 0 for certain hours; no further options to serve the load). 
This issue does not arise with the ATKc wildcard, since bus0 and bus1 of the (dis)charge links share the same country code.

The proposed change is a very quick fix in the enforce_autarky function, solely removing DC links.

* Update scripts/prepare_network.py

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

* Update prepare_network.py

Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>
2021-01-11 10:27:27 +01:00
Fabian Neumann
8f2ace03ee doc: fix electricity.csv format [skip travis] 2020-12-15 15:17:37 +01:00
Fabian Neumann
9966c751bd envs: restore REUSE compliance [skip travis] 2020-12-07 09:45:14 +01:00
Fabian Neumann
5a917dc5a9 doc: change zenodo links to latest [skip travis] 2020-12-07 09:43:17 +01:00
Fabian Neumann
08674a6cda
Release v0.3 (#213)
* release_notes: order for release

* doc: fix smaller typos and tidy up

* config: bump version

* doc: fix line references

* doc: bump confpy version

* envs: update fixed versions yaml

* Snakefile: simplify all_elec to all
2020-12-05 17:54:50 +01:00
Fabian Neumann
3ad6340c13 travis: correctly constrain version 2020-12-04 18:53:12 +01:00
Fabian Neumann
1baa309252 travis: ipopt 3.13.3 does not provide windows executables
https://github.com/conda-forge/ipopt-feedstock/issues/55
2020-12-04 18:44:34 +01:00
Fabian
f563b612e4 doc/configuration.rst: update lines 2020-12-03 23:47:38 +01:00
FabianHofmann
3fa5bbad1c
Opsd renewable ppls (#212)
* fix clustering of offwind-ac and offwind-dc in sites option

* add release nodes

* attach renewable assets by location (lat and lon) from OPSD register to network

* adapt default config to changes

* undo changes from a differen PR in cluster_network.py

* undo changes from a different PR, add release notes for this PR

* correct release notes

* add comments for relevant settings in add_electricity.py

* adjust configtable for electricity to OPSD renewable option and add estimate_renewable_capacities_from_capacitiy_stats

* reset cluster_network to HEAD

* add_electricity: Capacity is float

* config: add GB to OPSD_VRE_countries

* review and modify implementation

* update release notes

* Update envs/environment.yaml

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

Co-authored-by: martha.frysztacki <eb5194@iai-esm003.iai.kit.edu>
Co-authored-by: eb5194 <martha.frysztacki@kit.edu>
Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>
2020-12-03 23:13:41 +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
84edde8f63
add time series segmentation with tsam package (#186)
* add time segmentation with tsam

* cut off SEG

* Snakefile: adjust memory function

* untangle memory reservation calculation

* prepare: document segmentation option

* correct typo
2020-12-03 16:02:21 +01:00
Martha Maria
cfb979a0d0
Custom busmap for clustering (#193)
* add option to use custom clustermaps from data folder

* adapt default config to custom busmap

* input file from Snakefile

* adapt input description

* add option to use custom clustermaps from data folder

* adapt default config to custom busmap

* input file from Snakefile

* adapt input description

* Snakefile: custom_busmap in cluster_network input is now csv

* cluster_network: custom_busmap is now read as csv file, adaptions of description

* simplify_network: adapt descriptions

* configfiles: add cutom_clustermaps switch

* unify clustarmap and busmap names

* unify clustermap and busmap names

* test/config: unify clustermap and busmap names

* cluster_network: make clustering_for_n_clusters compatible with simplify_network

* simplify_network: make compatible with changes in cluster_network.py

* Update scripts/cluster_network.py

* Update scripts/simplify_network.py

* Update scripts/simplify_network.py

* Update scripts/cluster_network.py

* Update scripts/cluster_network.py

* cluster_network: move custom_busmap flag to enable; simplify names

* cluster_network: move custom_busmap flag to enable; simplify names

* custom_busmap: add documentation

* cluster_network: add default for custom_busmap for compatibility with old configs

* cluster_network: add default for custom_busmap for compatibility with old configs

Co-authored-by: martha.frysztacki <eb5194@iai-esm003.iai.kit.edu>
Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>
2020-12-03 15:17:16 +01:00
FabianHofmann
9792069ab3
Update load processing (#211)
* build_load_data

* Add documentation

* updating load data import

* Update Config files

* Update load.csv

* Update add_electricity.py

* change log file name

* Update scripts/add_electricity.py

Co-authored-by: FabianHofmann <hofmann@fias.uni-frankfurt.de>

* Update scripts/build_load_data.py

Co-authored-by: FabianHofmann <hofmann@fias.uni-frankfurt.de>

* Update scripts/build_load_data.py

Co-authored-by: FabianHofmann <hofmann@fias.uni-frankfurt.de>

* Update scripts/build_load_data.py

Co-authored-by: FabianHofmann <hofmann@fias.uni-frankfurt.de>

* Update build_load_data.py

* Update build_load_data.py

* Update scripts/build_load_data.py

Co-authored-by: FabianHofmann <hofmann@fias.uni-frankfurt.de>

* update gap handling in build_load_data

* Update build_load_data.py

* Update config.test1.yaml

* update test.config

* Update config.tutorial.yaml

* update load csv function for load data

* Update build_load_data.py

* Update config.test1.yaml

* Update add_electricity.py

* Update build_load_data.py

* Added error messages if load data contains gaps after modifications

* general adjustments:
	- reduce data source to only entsoe statistics
	- sanitize code
	- adjust logging messages
	- adjust daocstrings

* update Snakefile config and docs

* update release notes
rename build_load -> build_load_data in config

* small follow up

* - reintroduce choice between powerstatistics and transparency
- remove load_ timeseries from databundle
- always build load_data
- reinsert scaling factor in config
- fix url to 2019 version

* update doc: configtable, release notes
update config.yaml

* follow up

Co-authored-by: Jan Frederick <jan.frederick.unnewehr@inatech.uni-freiburg.de>
Co-authored-by: JanFrederickUnnewehr <50404069+JanFrederickUnnewehr@users.noreply.github.com>
2020-12-03 12:49:04 +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
Fabian Neumann
c1447875d5
no defaults channel in environment.yaml (#144)
* no defaults channel in environment.yaml

* GIS from conda-forge

* remove channel pinning and add descartes via conda

* remove geopandas version restriction

* travis: remove duplicated conda list
2020-12-02 17:48:47 +01:00
Fabian Neumann
03170f4aaf
add option for p_nom_max factors in {opts} wildcard (#207)
* prepare: add option for potential reduction sweeps

* prepare: fix attr lookup for potential/cost reduction sweeps

* prepare: fix attr naming cost -> capital_cost

* add release notes
2020-11-26 17:25:14 +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
de0478968c
config: make storage modelling with Store and Link default (#205) 2020-11-25 13:18:30 +01:00
Fabian Neumann
5240b090d9 Merge branch 'master' of github.com:PyPSA/pypsa-eur 2020-11-17 12:47:00 +01:00
Fabian Neumann
3b858384d3 data: ALEGrO in operation 2020-11-17 12:46:49 +01:00
Fabian Neumann
2e70e8d15b
prepare: fix transmission limit when no HVDC links in network (#209) 2020-11-12 17:37:43 +01:00
Fabian Neumann
9c526687fd environment: remove snakemake-minimal version constraint 2020-11-12 16:27:52 +01:00
Fabian Neumann
984e688615 skip cost aggregation of component if empty 2020-10-28 15:30:36 +01:00
Martha Maria
52683236cd
prepare_network: fix nmo security margin (#199)
* prepare_network: fix nmo security margin

* Update doc/release_notes.rst

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

* Update scripts/prepare_network.py

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

Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>
2020-10-02 15:55:22 +02:00
Martha Maria
2e76b88ec8
simplify_ and cluster_network: clustermaps to csv (#198)
* simplify and clustering: output and input from HDF format to CSV

* add release notes

* simplify and clustering: output files from Snakefile
2020-10-02 12:53:56 +02:00
Fabian Neumann
4d0a860246 Merge branch 'master' of github.com:PyPSA/pypsa-eur 2020-09-26 13:16:19 +02:00
Fabian Neumann
88f1184315 travis: only build master and PRs onto master 2020-09-26 13:16:00 +02:00
Fabian Neumann
ab6dc633bf
Options for regional equity and autarky (#166)
* solve: add option for equity constraints

* solve: scale more

* prepare: add option to limit line/link capacity

* solve: add inflow to EQ constraints

* solve: reindex inflow to match load

* update config files and references

* add autarky option

* move release notes

* add spillage to equity requirements

* prepare: fix accidental code removal

* prepare: add country autarky option

* consider snapshot_weightings for inflow

* trigger CI
2020-09-26 13:10:50 +02:00
Fabian Neumann
0988551896
environment: limit libgdal to 3.0.4 max (#197)
* environment: limit libgdal to 3.0.4 max

* environment: test numpy version

* environment: lift numpy version restriction

* environment: reintroduce numpy version restriction
2020-09-25 19:57:09 +02:00
Fabian Neumann
9966038837 environment: limit libgdal to 3.0.2 (2nd try) 2020-09-25 15:47:44 +02:00
Fabian Neumann
b81dfcaada environment: limit libgdal to 3.0.2 2020-09-25 15:34:35 +02:00
Fabian Neumann
db3a0e8e5c travis: all via mamba 2020-09-25 15:18:59 +02:00
Fabian Neumann
06b8fe1e98 environment: add mamba 2020-09-25 15:06:39 +02:00
Fabian Neumann
fc7f04d1d8 travis: switch solver installation back to conda 2020-09-25 14:53:17 +02:00
Fabian Neumann
336392fcf8 travis: debug which solver causes problem 2020-09-25 14:44:31 +02:00
Fabian Neumann
c7dd302262 travis: fix path to environment file 2020-09-25 14:16:04 +02:00
Fabian Neumann
baff295721 travis: remove unnecessary env create via conda 2020-09-25 14:13:55 +02:00
Fabian Neumann
456daa6260
travis: use mamba for faster builds (#196)
* travis: use mamba for faster builds

* doc: add release notes [skip travis]
2020-09-25 14:08:46 +02:00