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

749 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Martha Frysztacki
7067d924cc
Merge branch 'master' into snakemake_dependencies_in_functions 2022-01-14 11:05:54 +01:00
martacki
deac9f32e7 move snakemake keys (input, output, config, ...) to own variables 2022-01-14 11:05:15 +01:00
Fabian Neumann
72e277a007
update environment and address deprecations (#291) 
* update environment and address deprecations

* check pandas<1.3

* limit snakemake due to ascii encoding error, address review comments

* remove version restriction on snakemake
 2022-01-14 07:43:21 +00:00
Martha Frysztacki
5dd24ca87f
Merge pull request #294 from pz-max/master 
Fix distribute clustering with cbc/glpk/ipopt
 2022-01-13 19:02:51 +01:00
martacki
fccb59098d pull 2022-01-13 18:56:26 +01:00
martacki
9b7bb27da1 snakemake dependencies in base_network 2022-01-13 18:54:27 +01:00
Fabian Neumann
5cf649f39d
Merge branch 'master' into snakemake_dependencies_in_functions 2022-01-13 18:48:09 +01:00
Fabian Neumann
4bdce8893f
Merge branch 'master' into master 2022-01-13 18:46:26 +01:00
euronion
b660277e37
Merge pull request #303 from PyPSA/misc/improve-ci-speed 
[DNMY] Improve CI performance.
 2022-01-13 18:25:12 +01:00
martacki
505f093141 fix ordering of kwargs in add_co2limit 2022-01-13 18:00:22 +01:00
Martha Frysztacki
07c4870655
Merge branch 'master' into snakemake_dependencies_in_functions 2022-01-13 17:09:46 +01:00
Martha Frysztacki
d9235125cc
Merge branch 'master' into master 2022-01-13 17:00:36 +01:00
Fabian Neumann
9601ed65de
Merge pull request #304 from PyPSA/pv-correction 
disable solar PV CF correction factor for default satellite data
 2022-01-13 16:53:10 +01:00
Martha Frysztacki
ba9849b3bb
Merge branch 'master' into master 2022-01-13 16:50:57 +01:00
Fabian Neumann
a747c88d08 disable solar PV CF correction factor for default satellite data (closes #285) 2022-01-13 15:42:48 +01:00
Fabian Neumann
e1aae5a98e minor adjustment to memory requirements of add_electricity, cluster_network 2022-01-13 15:36:13 +01:00
Fabian Hofmann
94364cbeeb
Update scripts/cluster_network.py 
Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>
 2022-01-11 10:31:49 +01:00
Fabian
281700751a Merge branch 'snakemake_dependencies_in_functions' of github.com:PyPSA/pypsa-eur into snakemake_dependencies_in_functions 2022-01-11 10:28:11 +01:00
Fabian
ed7fd27adc build_shapes: use country_list as argument 2022-01-11 10:24:45 +01:00
Fabian
c7a443c969 build_shapes: revise changes 2022-01-11 10:23:22 +01:00
Martha Frysztacki
418ce4be28
Merge branch 'master' into snakemake_dependencies_in_functions 2022-01-11 10:03:32 +01:00
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