bjoern/pypsa-eur
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
2,597 Commits 1 Branch 0 Tags 133 MiB
99963edaaf
Commit Graph

2597 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tom Brown
80642ae9af Fix post-processing to read nomopyomo nc; fix MultiIndex issue 
With new pandas:

pd.Index([])|pd.MultiIndex(...)

returns a pd.Index, not a pd.MultiIndex, so just reversed:

pd.MultiIndex(...)|pd.Index([])

This returns a pd.MultiIndex.
 2019-12-06 16:56:33 +01:00
Tom Brown
066f1b0bb5 Fix solve_network.py to use nomopyomo for LV > 1.0 2019-12-06 16:55:28 +01:00
martavp
f6d407cc24
Add files via upload 
describe biomass
 2019-12-04 16:38:19 +01:00
martavp
5038faa020
Delete build_biomass_potentials.py 
describe biomass
 2019-12-04 16:37:50 +01:00
FabianHofmann
5143a258ac build_powerplants: Fix add_custom_powerplants 
Typo and type instability.

Fixes #109.
 2019-12-03 00:52:52 +01:00
Fabian Neumann
7ddc153bd2
ec: attach hydrogen pipelines (#108) 2019-12-02 12:22:30 +01:00
FabianHofmann
036d44418d
Merge pull request #105 from PyPSA/config-default 
Snakefile: load default config if config.yaml does not exist
 2019-11-29 09:15:13 +01:00
Fabian Neumann
f5175713af Snakefile: load default config if config.yaml does not exist 2019-11-28 16:33:33 +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
Tom Brown
51aa25aace Clarify origin of industry assumptions 2019-11-27 20:28:19 +01:00
Tom Brown
6cbd3384e4 Merge branch 'master' of github.com:nworbmot/pypsa-eur-sec 2019-11-27 18:36:01 +01:00
Tom Brown
8982147706 Convert code to use PyPSA nomopyomo branch; only works for LV=1.0 
Will extend to LV > 1.0 soon.
 2019-11-27 18:34:53 +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
FabianHofmann
7dc9bb2941
Merge pull request #104 from PyPSA/normpath 
Snakefile: use normpath for solver logs
 2019-11-22 16:59:26 +01:00
Fabian Neumann
efb5f064b7 Snakefile: use normpath for solver logs 
* mailing list: pypsa-eur_questions related: generated data and solver conf issues, 2019/11/19, 19:13
 2019-11-22 15:13:46 +01:00
Fabian Neumann
a74c15a132 trigger new travis build (skipped through squash) 2019-11-19 19:45:08 +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
e59d2c4162 scripts/* revise imports 2019-11-14 17:50:24 +01:00
Fabian
bb9bbf295a Merge branch 'master' of github.com:PyPSA/pypsa-eur 2019-11-14 16:32:24 +01:00
Fabian
af22261c10 prepare_network: revise imports, add line_break 2019-11-14 16:21:00 +01:00
Fabian Neumann
3ca488798c
Emission price option `Ep reactivated (#100) 
* prepare_network: reactivate Ep option (closes #63)

* doc: update documentation on Ep option
 2019-11-14 16:15:42 +01:00
Fabian Neumann
3370bd3b92 doc: update documentation on Ep option 2019-11-14 15:50:03 +01:00
Fabian Neumann
6a6bae41db prepare_network: reactivate Ep option (closes #63) 2019-11-14 15:41:09 +01:00
Fabian Neumann
61be125bd8 doc: fix line references in tutorial 2019-11-14 14:51:19 +01:00
Fabian Neumann
c857f4ce95 retrieve_cutout: execute retrieve cutout only once 2019-11-11 16:51:25 +01:00
Fabian Neumann
a35dbc067c build_natura: add cutouts as input (closes #95) 2019-11-11 16:29:27 +01:00
Fabian Neumann
7cd3b8a42b solve: undo update line parameter 2019-11-09 13:23:01 +01:00
Fabian Neumann
998b13dc3a
solve: update line parameters if not iterating 2019-11-09 13:16:31 +01:00
Fabian Neumann
3fd5c5d0e1 cluster: add tolerance to country weight sum L 2019-11-09 12:58:04 +01:00
FabianHofmann
0ea5a5c28f Powerplants (#94) 
* add nice carrier names to n.carriers

* closes #48

* update environment
 2019-11-09 09:08:25 +01:00
Fabian Neumann
7141ce9e5c environment: update to pypsa v0.15 2019-11-08 17:02:42 +01:00
Fabian Neumann
ecf8448826
environment_docs vresutils master [skip travis] 2019-11-08 16:51:01 +01:00
Fabian Neumann
4010e9450d
Complete test pipeline for windows with vresutils memorylogger fixed (#93) 2019-11-08 16:47:39 +01:00
Fabian Neumann
d32f2105cd fix deprecation: logger.warn -> logger.warning 2019-11-08 16:46:29 +01:00
Fabian Neumann
27efd78784 doc-config: fix line references [skip travis] 2019-11-07 18:16:01 +01:00
Fabian Neumann
a71cb6fc26 build_hydro: fix logger (closes #91) 2019-11-07 17:38:08 +01:00
Fabian Neumann
7df2b76f9d
cluster_network: fix focus_weights for mult sync 2019-11-07 16:54:09 +01:00
Fabian Neumann
47d4882593
Testing on multiple operating systems with travis (#90) 
* multiple os travis

* add coincbc via conda-forge

* switch to glpk

* circumvent windows subfolder snakemake path issue
cf. snakemake/snakemake/#46

* travis: skip solving for windows
 2019-11-07 15:39:23 +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
fd4e43c085 Snakefile: fix inputs for retrieve_databundle 2019-11-06 17:50:57 +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
64916a1179 test: add solving rule [skip travis] 2019-11-06 16:05:35 +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