Commit Graph

101 Commits

Author SHA1 Message Date
Fabian Neumann
d57989c027
scripts: mini code cleanup (#140) 2020-03-16 15:55:01 +01:00
Fabian Neumann
5934f4f7a1
prepare release v0.1.0 (#117) 2020-01-09 14:09:28 +01:00
FabianHofmann
eaf30a9b65
Introduce mocksnakemake which acutally parses Snakefile (#107)
* rewrite mocksnakemake for parsing real Snakefile

* continue add function to scripts

* going through all scripts, setting new mocksnakemake

* fix plotting scripts

* fix build_country_flh

* fix build_country_flh II

* adjust config files

* fix make_summary for tutorial network

* create dir also for output

* incorporate suggestions

* consistent import of mocksnakemake

* consistent import of mocksnakemake II

* Update scripts/_helpers.py

Co-Authored-By: euronion <42553970+euronion@users.noreply.github.com>

* Update scripts/_helpers.py

Co-Authored-By: euronion <42553970+euronion@users.noreply.github.com>

* Update scripts/_helpers.py

Co-Authored-By: euronion <42553970+euronion@users.noreply.github.com>

* Update scripts/_helpers.py

Co-Authored-By: euronion <42553970+euronion@users.noreply.github.com>

* Update scripts/plot_network.py

Co-Authored-By: euronion <42553970+euronion@users.noreply.github.com>

* Update scripts/plot_network.py

Co-Authored-By: euronion <42553970+euronion@users.noreply.github.com>

* Update scripts/retrieve_databundle.py

Co-Authored-By: euronion <42553970+euronion@users.noreply.github.com>

* use pathlib for mocksnakemake

* rename mocksnakemake into mock_snakemake

* revert change in data

* Update scripts/_helpers.py

Co-Authored-By: euronion <42553970+euronion@users.noreply.github.com>

* remove setting logfile in mock_snakemake, use Path in configure_logging

* fix fallback path and base_dir
fix return type of make_io_accessable

* reformulate mock_snakemake

* incorporate suggestion, fix typos

* mock_snakemake: apply absolute paths again, add assertion error
*.py: make hard coded io path accessable for mock_snakemake

* retrieve_natura_raster: use snakemake.output for fn_out

* include suggestion

* Apply suggestions from code review

Co-Authored-By: Jonas Hörsch <jonas.hoersch@posteo.de>

* linting, add return ad end of file

* Update scripts/plot_p_nom_max.py

Co-Authored-By: Jonas Hörsch <jonas.hoersch@posteo.de>

* Update scripts/plot_p_nom_max.py

fixes #112

Co-Authored-By: Jonas Hörsch <jonas.hoersch@posteo.de>

* plot_p_nom_max: small correction

* config.tutorial.yaml fix snapshots end

* use techs instead of technology

* revert try out from previous commit, complete replacing

* change clusters -> clusts in plot_p_nom_max due to wildcard constraints of clusters

* change clusters -> clusts in plot_p_nom_max due to wildcard constraints of clusters II
2019-12-09 21:29:15 +01:00
euronion
85c356297a Add logging to logfiles to all snakemake workflow scripts. (#102)
* Add logging to logfiles to all snakemake workflow scripts.

* Fix missing quotation marks in Snakefile.

* Apply suggestions from code review

Co-Authored-By: Fabian Neumann <fabian.neumann@outlook.de>

* Apply suggestions from code review

Co-Authored-By: Fabian Neumann <fabian.neumann@outlook.de>

* doc: fix _ec_ filenames in docs

* Allow logging message format to be specified in config.yaml.

* Add logging for Snakemake rule 'retrieve_databundle '.

* Add limited logging to STDERR only for retrieve_*.py scripts.

* Import progressbar module only on demand.

* Fix logging to file and enable concurrent printing to STDERR for most scripts.

* Add new 'logging_format' option to Travis CI test config.yaml.

* Add missing parenthesis (bug fix) and cross-os compatible paths.

* Fix typos in messages.

* Use correct log files for logging (bug fix).

* doc: fix line references

* config: logging_format in all configs

* doc: add doc for logging_format

* environment: update to powerplantmatching 0.4.3

* doc: update line references for tutorial.rst

* Change logging configuration scheme for config.yaml.

* Add helper function for doing basic logging configuration.

* Add logpath for prepare_links_p_nom rule.

* Outsource basic logging configuration for all scripts to _helper submodule.

* Update documentation for changed config.yaml structure.

Instead of 'logging_level' and 'logging_format', now 'logging' with subcategories is used.

* _helpers: Change configure_logging signature.
2019-11-28 08:22:52 +01:00
Fabian Neumann
d32f2105cd fix deprecation: logger.warn -> logger.warning 2019-11-08 16:46:29 +01:00
Fabian
b1a38229f4 ignore sort warning 2019-11-05 14:29:15 +01:00
Fabian Neumann
0fef13ee86 resolve merge conflicts 2019-10-24 16:22:57 +02:00
Fabian Neumann
0e5886081e move rules to own pages and adapt image paths 2019-08-14 15:36:46 +02:00
Fabian Neumann
3a94d4f5ef add seealso from module description to config documentatoin 2019-08-13 10:03:46 +02:00
Fabian Neumann
89d89deec0 further improve documentation 2019-08-12 19:01:53 +02:00
Fabian Neumann
a5d9bc9c7c add input/output descriptions (WIP) 2019-08-11 22:34:18 +02:00
Fabian Neumann
f7159de47f
base_network: return zero underwater fraction if no link geometry given (closes #53)
fixes #53
2019-08-11 16:59:56 +02:00
Fabian Neumann
67cf28b593 fill in relevant settings sections 2019-08-11 13:17:36 +02:00
Fabian Neumann
1bded0ab9b add rule section headers 2019-08-11 11:40:47 +02:00
Fabian Neumann
ea96d499e7
base_network: scale snapshot weightings to sum up to 1 year
If the user selects a date range of less than a year in `config.yaml` the snapshot weightings should be scaled to add up to represet 8760 hours (1 year) such that operational expenses and investments are aligned in the objective function.
2019-08-10 12:33:14 +02:00
Jonas Hoersch
fb0d44f64e Add a summary sentence for each rule taken from scripts 2019-08-08 15:07:08 +02:00
Jonas Hoersch
07143fb2cd base_network: Zero s_nom of under_construction lines 2019-07-26 11:43:34 +02:00
Jonas Hoersch
5de59fe453 base_network: Replace deprecated yaml.load by yaml.safe_load
Refer to https://msg.pyyaml.org/load for details.
2019-06-05 18:07:36 +02:00
Jonas Hoersch
3688122aa7 base_network: [compat] read_csv in pandas 0.24 is stricter
read_csv now raises a ValueError when it encounters NaN in a boolean column.
2019-03-06 20:40:29 +01:00
Jonas Hoersch
7f3f096ba6 Fix model for country selections without DC links (fixes #5) 2019-02-13 19:03:57 +01:00
Jonas Hoersch
1b6fe5be80 base_network: Fix _add_links_from_tyndp if there are none left (fixes #5) 2019-02-12 16:41:07 +01:00
Jonas Hoersch
bfb92a5d29 base_network: Remove unconnected components after removing under_construction branches 2019-01-22 10:11:43 +01:00
Jonas Hoersch
4cba751331 base_network: Warn about TYNDP links which fall outside of the area of interest
Happens when countries is only a subset.
2019-01-22 10:10:00 +01:00
Jonas Hoersch
a340e4f1a3 base_network: Remove tyndp links outside of desired countries 2019-01-02 18:13:30 +01:00
Jonas Hoersch
f60c1fdb41 Rename index column in geojson imports 2018-12-19 15:37:18 +01:00
Jonas Hörsch
91b83930dd base_network: Important small fixes
- Allow connecting at substations
- Fix offshore shape selection
2018-10-27 03:46:48 +02:00
Jonas Hörsch
c0fe95a31d base_network: Improve assignment of countries 2018-10-26 16:08:50 +02:00
Jonas Hörsch
6f3b44e5e4 fixup! base_network: Don't update the capacity of TYNDP links from links_p_nom 2018-10-09 15:44:20 +02:00
Jonas Hörsch
b74c19e6ba base_network: Don't update the capacity of TYNDP links from links_p_nom 2018-09-27 18:29:44 +02:00
Jonas Hörsch
07e36a4854 base_network: Some TYNDP links replace existing links and buses 2018-09-27 18:28:52 +02:00
Jonas Hörsch
37d817c70f base_network: Fix bug in _closest_links and fix SACOI capacity 2018-09-27 18:27:33 +02:00
Jonas Hörsch
72b484dd6b base_network: Only buses with at least one finished connection may have load 2018-09-27 18:25:41 +02:00
Jonas Hörsch
52e214a3b2 base_network: Add links from TYNDP
Manually collected from https://tyndp.entsoe.eu/. Deactivated by default.
2018-09-24 20:19:47 +02:00
Jonas Hörsch
3afacfeacc base_network, config: Links do not follow the n-1 constraint 2018-09-03 23:20:46 +02:00
Jonas Hörsch
6f98607aec base_network: Improve treatment of under_construction links 2018-08-27 19:13:41 +02:00
Jonas Hörsch
cd44a92185 base_network: Adds heuristic to replace the B2B converter LT-PL by an HVDC tie-line 2018-08-27 14:20:31 +02:00
Jonas Hörsch
94c10fc72b base_network: underwater_fraction skips links without a geometry 2018-08-27 14:19:50 +02:00
Jonas Hörsch
900defa07c fixup! base_network: Add underwater_fraction to links 2018-08-16 22:14:38 +02:00
Jonas Hörsch
4e078002af base_network: Add underwater_fraction to links 2018-08-14 17:03:13 +02:00
Jonas Hörsch
4526fbb4ae Fix small edge cases when looking at only a subset of the european countries 2018-08-08 16:28:32 +02:00
Jonas Hörsch
8e4abc3fce build_shapes: Build shapes in separate rule from bundled data
- country_shapes
- offshore_shapes
- nuts3_shapes (nuts3 shapes already include population and gdp data)
2018-08-03 11:49:51 +02:00
Jonas Hörsch
6d680a0262 Allow including lines and links which are still under construction 2018-07-10 16:37:50 +02:00
Jonas Hörsch
b0993c8b52 Minor fix to allow omitting parameter corrections 2018-07-10 16:34:46 +02:00
Jonas Hörsch
c3da3f7f6a base_network: set s_nom from linetypes 2018-03-14 13:18:26 +01:00
Jonas Hörsch
81bcf2aad2 Properly set s_nom on lines 2018-03-13 10:48:45 +01:00
Jonas Hörsch
b7a1a090f1 Use MockSnakemake and logging.basicConfig everywhere 2018-02-01 12:42:11 +01:00
Jonas Hörsch
2fc2d09ad3 base_network: Buses under construction should not be used as substations 2018-02-01 12:28:21 +01:00
Jonas Hörsch
5222b7c288 base_network: parameter_corrections respect column type 2018-01-30 16:26:04 +01:00
Jonas Hoersch
a867e245b3 Electricity network, Clustering and Solving 2018-01-29 22:28:33 +01:00
Jonas Hoersch
2c7f013e39 base_network: Remove clean-up code that moved directly into gridkit 2017-12-19 13:28:16 +01:00
Jonas Hoersch
5f4dc833b8 scripts: Add first version of base_network and solve_network scripts 2017-12-18 20:31:27 +01:00