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
Fabian Neumann
2ace4f2e94
retrieve*: add documentation
2019-11-06 14:50:59 +01:00
Fabian Neumann
0c537f159f
retrieve*: clean retrieve rules
2019-11-06 12:04:01 +01:00
Fabian Neumann
bf12d25879
Merge pull request #51 from fneum/solve_network
...
Add `extra_functionality` and `extra_postprocessing` to solve_network()
2019-11-06 11:38:15 +01:00
Fabian Neumann
4d9b02ea12
solve_network: add snapshots as required argument
2019-11-06 11:33:57 +01:00
Fabian Neumann
8be2c4c254
results: remove folder
2019-11-06 11:25:09 +01:00
Fabian Neumann
bbfc5bde0b
Merge branch 'fneum-co2limit'
2019-11-06 11:21:37 +01:00
Fabian Neumann
82392c6c07
Merge branch 'co2limit' of https://github.com/fneum/pypsa-eur into fneum-co2limit
2019-11-06 11:19:41 +01:00
Fabian
3597f931cf
Snakefile remove space
2019-11-05 14:57:59 +01:00
Fabian
594489ef22
snakefile: remove commented files
2019-11-05 14:55:51 +01:00
Fabian
b1a38229f4
ignore sort warning
2019-11-05 14:29:15 +01:00
Fabian
f6e44d2805
include data retrieving in workflow
2019-11-05 12:53:21 +01:00
Fabian Neumann
67390cc2a9
Update scripts/prepare_network.py
2019-11-05 11:21:33 +01:00
Fabian
eb14486e29
config add tiny description for powerplantfilter and custom_powerplants
2019-11-04 16:45:41 +01:00
FabianHofmann
3b83985436
Merge pull request #84 from PyPSA/powerplants
...
Update powerplants according to new powerplantmatching version
2019-11-04 16:26:54 +01:00
FabianHofmann
d0e2fed4d7
incorporate suggestions
2019-11-01 13:27:42 +01:00
FabianHofmann
8f5415f69c
test: add electricity changes to config
2019-10-31 18:35:18 +01:00
