bjoern/pypsa-eur
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
542 Commits 1 Branch 0 Tags 133 MiB
5442d541b4
Commit Graph

106 Commits

Author SHA1 Message Date
Fabian Neumann
ca0ad08438 reflect filename changes in documentation 2020-10-18 14:47:46 +02:00
Fabian Neumann
bcd7f86b5c remove {networks} wildcard 2020-10-09 17:03:49 +02:00
Fabian Neumann
f3b1d3d513 undo config test/tutorial without plotting, rm matplotlibrc, .licenses 2020-10-03 11:38:51 +02:00
Fabian Neumann
6deac6ced3 merge master 2020-10-03 11:15:39 +02: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
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
b756773b9d merge master 2020-09-26 11:21:16 +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
Martha Maria
047276b2dc
Fix clustering sites (#191) 
* fix clustering of offwind-ac and offwind-dc in sites option

* add release nodes

Co-authored-by: martha.frysztacki <eb5194@iai-esm003.iai.kit.edu>
 2020-09-24 10:13:13 +02:00
Fabian Neumann
cbd22c2efd execute pre-commit 2020-09-11 15:26:43 +02:00
Fabian Neumann
f6dd2e12f3 some refactoring and code cleaning 2020-09-11 12:40:53 +02:00
FabianHofmann
cfd815aa42
Don't remove capital cost for lines and links when setting lv, lc limit (#183) 
* solve #175

* adjust wildcards explanation

* allow lv and lc limits below 1
 2020-08-28 17:59:51 +02:00
FabianHofmann
04f19f214d
fix emission prices (#171) 
* fix emission prices

I'm not sure if the previous setup was intentional, but regarding that different generators might have different efficiencies and the emissions are carrier specific only, it makes more sense set net emission price.

* small fix

* update release_notes and config
 2020-08-25 12:12:00 +02:00
Fabian Neumann
e2605a25dc amend release notes from GCP PR [skip travis] 2020-08-24 14:39:10 +02:00
Max Parzen
2c1626f1dd
Adding Google Cloud Platform set-up (#177) 
* Adding default file

* Added GCP purpose

* Google Cloud Platform registration

* Created  VM set-up step

* Installation of Cloud SDK

* Step 5 - Extra.

* Installation of WinSCP

* Note field

* Important tips

* Update GCP-set-up-for-windows.rst

* Adding YouTube video for WinSCP

* minor corrections

* Rename rst file

* Updated index.rst

* Update text according to Fabian

* Update doc/cloudcomputing.rst

Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>
 2020-08-24 14:19:23 +02:00
FabianHofmann
1cde8d300a
Fix up add_nice_carrier_names for new pandas (#178) 
* solve #174

* update release notes

Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>
 2020-08-24 11:04:54 +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
Fabian Neumann
8c5efb5252
add compatibility with pyomo 5.7.0 (#172) 
* add compatibility with pyomo 5.7.0

* add release notes [skip travis]
 2020-07-20 17:33:15 +02:00
Fabian Neumann
165dd2d440
uncertain costs: facilitate parameter sweep (#167) 
* add opts for cost parameter sweep

* add pr link to release note
 2020-07-10 16:41:44 +02:00
Fabian Neumann
2627c96a9e
Prepare Release v0.2.0 (#165) 
* prepare release v0.2.0

* prepare release v0.2.0 v2 [skip travis]
 2020-06-08 20:43:35 +02:00
Fabian Neumann
d66b70e180 doc: update release notes and documentation [skip travis] 2020-06-08 18:29:15 +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
Fabian Neumann
5ea29551b9
add REUSE.software license information (#160) 
* add REUSE.software license information

* add release note on licensing

* Update doc/index.rst

Co-authored-by: euronion <42553970+euronion@users.noreply.github.com>

* Update doc/index.rst

Co-authored-by: euronion <42553970+euronion@users.noreply.github.com>

* Update doc/release_notes.rst [skip travis]

Co-authored-by: euronion <42553970+euronion@users.noreply.github.com>
 2020-05-29 09:50:55 +02:00
Fabian Neumann
6bde6e52de doc: fix tutorial video embedding [skip travis] 2020-05-28 21:30:10 +02:00
Fabian Neumann
9199012860 doc: link tutorial videos, slides and snakemake badge [skip travis] 2020-05-28 20:36:45 +02:00
euronion
bb3477cd69
Add information on PRs to contribution guidelines. (#151) 2020-04-14 10:54:39 +02:00
Fabian Neumann
0c6c23478b fix snakemake as --cores (-j) is now a mandatory argument 
in 5.11.0 https://snakemake.readthedocs.io/en/stable/project_info/history.html
 2020-03-17 14:55:30 +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
euronion
2f85b0ede5
Separate retrieval and building of cutouts, natura raster into distinct configurations each. (#136) 
* Separate config switches for retrieving and building cutout, natura raster.

* Include new switches in tutorial and test configs.

* Update release_notes.rst

* Update toplevel.csv

* Update tutorial.rst

* Update configuration.rst
 2020-03-16 15:51:47 +01:00
Fabian Neumann
e6057196e5 doc: add warning and link to pypsa-eur-sec [skip travis] 2020-03-15 13:28:06 +01:00
FabianHofmann
1ecca802f3 Nomopyomo (#116) 
* play around, add new nomopyomo feature

* fix constraints

* fix constraints

* set solver to cbc due to error with gurobi900

* update environments
shift lv and lc constraints to prepare_network
start modifying opt constraints

* correct BAU

* correct environment

* fix import

* fix SAFE constraint

* fix battery charger ratio constraint

* code cleaning

* restructure solve scripts

* fix CCL constraint

* adjust doc

* solve_network: update doc string

* revert unwanted changes

* update environment.yaml

* update environment.yaml II

* force conda update, revert last commit

* revert last change, use other channel priority

* remove trace_sove_network

* add skip_iterating and track_iterations options to config file

* revert last commit, fix environment to current pypsa master

* line break, trigger CI with updated pypsa

* nomopyomo: PR review

Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>
 2020-02-10 12:06:43 +01:00
Fabian Neumann
b479973b7e doc: fix tutorial notes to account for '_ec' in filenames [skip travis] 
* Adressing feedback from denyin: Private message regarding: [pypsa] MissingRuleException when using snakemake command
 2020-02-02 11:07:29 +01:00
Fabian Neumann
c1ec91f5ba doc: note on open-source solver setup [skip travis] 2020-01-24 17:02:09 +01:00
Fabian Neumann
5934f4f7a1
prepare release v0.1.0 (#117) 2020-01-09 14:09:28 +01:00
Fabian Neumann
4cab8a7cf0 doc: fix typo in toplevel.csv [skip travis] 2020-01-07 10:39:58 +01:00
Fabian Neumann
b8e3682bba doc: update release notes [skip travis] 2019-12-22 18:38:01 +01:00
Fabian Neumann
7ddc153bd2
ec: attach hydrogen pipelines (#108) 2019-12-02 12:22:30 +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
81d9d2ab4d
battery+H2: option for stores and links instead of storage_units (#97) 
* add_electricity: stores and links instead of storageunits

* move code for attaching in add_extra_stores.py

* Update Snakefile

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

* Update Snakefile

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

* Update Snakefile

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

* rename to add_extra_components.py

* incorporate suggestions

* Snakefile: update script name

* extra_components: import _add_missing_carriers_from_costs

* Add '_ec" infix in Snakefile

* Snakefile add infix at missing spot

* remove unintendetely inserted data.bundle, correct import in add_extra_components

* environment: fix pyyaml version

* set powerplantmatching as conda-dependency

* environment fix minimal ppm version

* environment reinsert pyyaml

* environment: carry over changes to environment.docs.yaml

* extra_components: add carriers

* update docstring

* Update scripts/add_extra_components.py

* Update scripts/add_extra_components.py

* tutorial: fix hyperlink [skip travis]

* update release notes

* update documentation

* add_electricity: merge removal of suptech
 2019-11-19 19:36:28 +01:00
JanFrederickUnnewehr
6cde3e902b own databundle (#96) 
* config.default.yaml

* retrieve_databundle: docs, config and defaults

* fix capitalisation of true/false
 2019-11-19 15:56:44 +01:00
Fabian Neumann
9517eda1d7
add option for nuclear expansion at current locations (#98) 
* add_electricity: add option for nuclear expansion at current locations

* doc: add documentation on adding nuclear options
 2019-11-19 12:26:01 +01:00
Fabian Neumann
3370bd3b92 doc: update documentation on Ep option 2019-11-14 15:50:03 +01:00
Fabian Neumann
61be125bd8 doc: fix line references in tutorial 2019-11-14 14:51:19 +01:00
Fabian Neumann
27efd78784 doc-config: fix line references [skip travis] 2019-11-07 18:16:01 +01:00
Fabian Neumann
e54119d878
cluster: add focus weights (in favor of #26) (#87) 
* cluster: add focus weights (in favor of #26)

* clear assert of total focus

Co-Authored-By: FabianHofmann <hofmann@fias.uni-frankfurt.de>
 2019-11-07 15:38:25 +01:00
Fabian Neumann
be32e92dbb doc-tutorial: add alternative for windows users 2019-11-07 14:41:52 +01:00
Fabian Neumann
59a39bc00c doc: update release notes [skip travis] 2019-11-06 17:53:38 +01:00
Fabian Neumann
4f2c1c3080 doc: update workflow chart [skip travis] 2019-11-06 17:51:18 +01:00
Fabian Neumann
99cb4a4354
Merge pull request #86 from PyPSA/workflow 
Integrate data retrieving into snakemake workflow
 2019-11-06 16:06:11 +01:00