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

878 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Fabian
d1334c1670 Merge branch 'snakemake_dependencies_in_functions' of github.com:PyPSA/pypsa-eur into snakemake_dependencies_in_functions 2022-01-11 10:00:55 +01:00
Fabian
39a6753ece build_powerplants: revise changes 2022-01-11 09:59:58 +01:00
Fabian
01e93545f6 add_extra_components: revise changes 2022-01-11 09:59:34 +01:00
Fabian
acd7122aad add_electricity: revert changes in add_nice_carrier_names 2022-01-11 09:58:59 +01:00
Fabian Hofmann
2c318a247e
Update scripts/prepare_network.py 
Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>
 2022-01-11 09:55:22 +01:00
Fabian
66f2d36f0d add_electricity: revise code and make it leaner 2022-01-11 09:38:34 +01:00
Max Parzen
6249a9b558
Merge branch 'PyPSA:master' into master 2021-12-23 12:35:10 +01:00
Fabian Neumann
47ab49e86b
Merge pull request #299 from p-glaum/master 
hot fix for snakemake bug
 2021-12-17 01:20:50 +01:00
Philipp Glaum
ed83988ed1 hot fix for snakemake bug 2021-12-15 11:02:03 +01:00
Max Parzen
23d2b91bed
Merge branch 'master' into master 2021-12-15 10:26:14 +01:00
Fabian Neumann
f06c7958bc restore REUSE compliance [skip ci] 2021-12-04 18:21:08 +01:00
Max Parzen
f1243c3e0c Fix distribute clustering with cbc/glpk/ipopt 
Assume you have 10 nodes that need to be distributed between 2 countries.
What can happen with some of the open source solvers is that one country
gets assigned to 9.01 (float) nodes, and the other one to 0.99.

Now using .astype(int) would lead to a node distribution of 0 and 9, as
the `astype(int)` function round down by default (0.99 -> 0). This assigned
zero value breaks the code in case open source solvers are used.
Gurobi somehow does deal with it.
 2021-11-24 14:16:24 +01:00
Fabian Hofmann
1da908b956
Merge pull request #289 from PyPSA/fix-build-load 
Separate load data retrieval from processing with new rule `retrieve_load_data`
 2021-11-10 14:55:44 +01:00
Fabian Neumann
f6a145e4a3
Merge branch 'master' into fix-build-load 2021-11-10 10:38:14 +01:00
Fabian Neumann
c0d1656091 build_load_data: separate retrieving and processing load data 2021-11-10 10:37:09 +01:00
Fabian Neumann
3905cd8823
Merge branch 'master' into snakemake_dependencies_in_functions 2021-11-10 10:17:32 +01:00
Fabian Neumann
0d71d7b89c
Merge pull request #288 from fwitte/fix/typos_in_docs 
Fix link appearence and missing parentheses
 2021-11-10 10:04:29 +01:00
Fabian Neumann
646c5011af
Merge branch 'master' into snakemake_dependencies_in_functions 2021-11-10 09:46:57 +01:00
Francesco Witte
9379c135fd Fix link appearence and missing parentheses 2021-11-09 15:56:59 +01:00
Fabian Neumann
96af7abef4
Merge pull request #283 from PyPSA/rsync 
add basic setup of rsync with files to ignore
 2021-11-08 15:24:24 +01:00
Fabian Hofmann
111309cc56
Merge branch 'master' into rsync 2021-11-08 10:53:14 +01:00
Fabian Neumann
7588f90b09 Merge branch 'master' of github.com:PyPSA/pypsa-eur 2021-11-04 10:26:24 +01:00
Fabian Neumann
9c85179432
Merge pull request #281 from PyPSA/fix-scipy-import 
base_network.py: fix scipy spatial import
 2021-11-04 10:26:16 +01:00
Fabian Neumann
8c533c0382
Merge branch 'master' into fix-scipy-import 2021-11-04 10:25:59 +01:00
Fabian Neumann
50548b23f9 add basic setup of rsync with files to ignore 2021-10-07 12:26:48 +02:00
Fabian Hofmann
8bf7f499cf
Merge pull request #282 from PyPSA/doc-fix-css-theme 
doc: fix css theme
 2021-10-06 14:26:59 +02:00
Fabian Hofmann
0425817a7b
Merge branch 'master' into doc-fix-css-theme 2021-10-06 14:09:00 +02:00
Fabian Neumann
3a07804ef5
Merge pull request #279 from koen-vg/master 
Update CPLEX default parameters (and documentation)
 2021-10-06 12:41:49 +02:00
Fabian Neumann
a431bbd5a7
Merge branch 'master' into master 2021-10-06 12:23:14 +02:00
Fabian
fccf5323d2 doc: fix css theme 2021-10-06 12:16:12 +02:00
Fabian
23d3216d92 base_network.py: fix scipy spatial import 2021-10-05 17:30:22 +02:00
Fabian Neumann
02670c1b7f
Merge pull request #280 from PyPSA/offshore-density 
config: reduce default deployment density for offshore wind
 2021-10-05 12:38:27 +02:00
Fabian Neumann
1b2c6e17c5 add release note for offshore density reduction 2021-10-05 12:21:45 +02:00
Fabian Neumann
af625d7379 config: reduce default deployment density for offshore wind 2021-10-05 12:18:10 +02:00
Koen van Greevenbroek
66524bf797 Update obsolete link to CPLEX documentation 2021-10-05 11:21:17 +02:00
Koen van Greevenbroek
08349d7897 Also update the default CPLEX configuration in test config 2021-10-05 11:08:32 +02:00
Koen van Greevenbroek
5ee280b96f Update default CPLEX options following PyPSA update 
For more recent versions of CPLEX and PyPSA, using dotted options
works while the current default crashes a CPLEX solve with
"AttributeError: 'RootParameterGroup' object has no attribute
'barrier_convergetol'". See https://github.com/PyPSA/PyPSA/pull/168.
 2021-10-05 11:00:30 +02:00
Fabian Neumann
a54f66a686
Merge pull request #278 from PyPSA/wake-simpl 
add correction factor to offshore wind for wake losses
 2021-09-27 14:04:03 +02:00
Fabian Neumann
04c8d1fd02 add correction factor to offshore wind for wake losses 2021-09-23 08:57:18 +02:00
Fabian Neumann
54e35a3c86 update environment.fixed.yaml 2021-09-22 16:49:30 +02:00
Fabian Neumann
089fc5b747 final tweaks of release notes 2021-09-22 16:46:23 +02:00
Fabian Neumann
2f2ac89c87 update main affiliation 2021-09-20 11:43:04 +02:00
Fabian Neumann
77023d370b
Merge pull request #276 from PyPSA/mit-license 
Change PyPSA-Eur licence from copyleft GPLv3 to more liberal MIT
 2021-09-20 11:36:09 +02:00
Fabian Neumann
785caecdb5 no proj 8 2021-09-20 11:18:47 +02:00
Fabian Neumann
da883b1283 limit pyproj to 3.1.0 2021-09-20 11:12:26 +02:00
Fabian Neumann
ede9146735 limit pyproj 2021-09-20 11:02:57 +02:00
Fabian Neumann
8996e09dc2
Merge branch 'master' into mit-license 2021-09-20 09:28:32 +02:00
Fabian Neumann
4e91d157b6
Merge pull request #277 from koen-vg/static-retrieve 
Mark datasets from Zenodo as static
 2021-09-15 13:28:30 +02:00
Koen van Greevenbroek
6485b98973 Mark datasets from Zenodo as static 
When retrieving a remote file over HTTP, Snakemake uses the
"last-modified" property in HTTP header as a proxy for `mtime` of the
remote file. If this time is more recent than the `mtime` of the
output of the retrieve rule, the rule is triggered and the remote file
is retrieved again (since it was apparently updated).

However, Zenodo periodically updates the "last-modified" property of
records retrieved over HTTP even if those records have not been
updated. This causes Snakemake to false assume that the records have
to downloaded again.

By setting `static=True` for datasets we know don't actually change,
we avoid this problem.
 2021-09-15 11:44:49 +02:00
Martha Frysztacki
251f0adb7e
Merge branch 'master' into snakemake_dependencies_in_functions 2021-09-14 16:50:48 +02:00