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

79 Commits

Author SHA1 Message Date
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
Fabian Neumann
0fb57601bf doc: document powerplantmatching changes from #84 2019-11-06 15:59:34 +01:00
Fabian Neumann
cabe2e2a3f doc: fix typo co2base and agg_p_nom_limits [skip travis] 2019-11-06 15:22:27 +01:00
Fabian Neumann
7406ceb50e doc: add co2base and agg_p_nom_limits [skip travis] 2019-11-06 15:19:22 +01:00
Fabian Neumann
2ace4f2e94 retrieve*: add documentation 2019-11-06 14:50:59 +01:00
Fabian Neumann
b5f6a94687 added release notes v0.1.0 2019-10-29 16:48:15 +01:00
Fabian Neumann
c37e8dc799
doc/index.rst: fix type 2019-10-28 18:11:19 +01:00
Fabian Neumann
b711517bd9
Update index.rst 2019-10-28 18:09:17 +01:00
Fabian Neumann
28fcd5ca3a
doc/index: add build status 2019-10-28 18:04:44 +01:00
Fabian Neumann
777e5e97ff
fix typo in doc/tutorial.rst 2019-10-28 14:07:27 +01:00
Fabian Neumann
2a05124c80 correct config.default.yaml line references 2019-10-24 16:45:49 +02:00
Fabian Neumann
9aaa26cbbe add zenodo files (closes #60) 2019-10-24 15:54:12 +02:00
Fabian Neumann
531497f1f8 leave docker for later 2019-10-03 17:09:25 +02:00
Fabian Neumann
9158670db0 fix type: default to tutorial 2019-10-03 16:26:11 +02:00
Fabian Neumann
0dc42ef359 add plotting rules note and solver note 2019-10-03 16:21:59 +02:00
Fabian Neumann
9ab516ff39 add example for snakemake and configuration 2019-10-03 16:13:44 +02:00
Fabian Neumann
6f27e753e5 default and tutorial config.x.yaml - cf. #49 2019-10-03 12:37:23 +02:00
Fabian Neumann
e44c5491af add snippets from config.yaml in doc 2019-10-02 15:49:24 +02:00
Fabian Neumann
ec913363c7 add costs section 2019-10-02 14:56:04 +02:00
Fabian Neumann
3c843ad91e revert to backticks in headers 2019-08-14 18:03:34 +02:00
Fabian Neumann
03b51cac18 add rulegraphs 2019-08-14 17:15:07 +02:00
Fabian Neumann
0e5886081e move rules to own pages and adapt image paths 2019-08-14 15:36:46 +02:00
Fabian Neumann
737ffc930d Merge branch 'documentation' of https://github.com/pypsa/pypsa-eur into documentation 2019-08-14 15:30:25 +02:00
Fabian Neumann
81d920087c
Update doc/wildcards.rst 
Co-Authored-By: Jonas Hörsch <coroa@posteo.de>
 2019-08-14 12:56:31 +02:00
Fabian Neumann
4730245ae3 numbered sections in rules overview 2019-08-14 12:05:06 +02:00
Fabian Neumann
28e9901408 limitations line break corrections 2019-08-14 11:55:42 +02:00
Fabian Neumann
f16a107aea result sample 2019-08-14 10:35:41 +02:00
Fabian Neumann
b2e7ad9188 add limitations and result sample 2019-08-14 10:34:59 +02:00