martacki
|
29fe0fb7fb
|
hierarchical clustering: account for changes from merging master
|
2022-06-27 21:02:45 +02:00 |
|
Martha Frysztacki
|
50a518a155
|
Merge branch 'master' into introduce_hac_clustering
|
2022-06-27 20:45:40 +02:00 |
|
Fabian Neumann
|
cc1c9fd752
|
Merge pull request #386 from PyPSA/revert-336-rm-raster-natura
Revert "remove build/retrieve natura raster, directly use shapefile"
|
2022-06-27 19:01:19 +02:00 |
|
Fabian Neumann
|
51de606aab
|
Revert "remove build/retrieve natura raster, directly use shapefile"
|
2022-06-27 19:00:41 +02:00 |
|
Martha Frysztacki
|
d3afd21377
|
Merge pull request #380 from PyPSA/harmonize_clustering_strategies
clustering strategies moved to configurables
|
2022-06-27 14:35:05 +02:00 |
|
martacki
|
a3af137b74
|
clustering strats to configurables: move duplicate code to _helpers script & import
|
2022-06-27 14:18:47 +02:00 |
|
Martha Frysztacki
|
5587327be3
|
Merge branch 'master' into harmonize_clustering_strategies
|
2022-06-27 14:02:45 +02:00 |
|
martacki
|
2dfa2753ba
|
clustering strats to configurables: config spacing
|
2022-06-27 13:59:04 +02:00 |
|
Fabian Neumann
|
77e3debebb
|
Merge pull request #336 from PyPSA/rm-raster-natura
remove build/retrieve natura raster, directly use shapefile
|
2022-06-24 23:23:38 +02:00 |
|
Fabian Neumann
|
4e8d510332
|
Merge branch 'master' into rm-raster-natura
|
2022-06-24 23:12:39 +02:00 |
|
martacki
|
c9c738e96b
|
clustering strats to configurables: set defaults for yaml-incompatible strats + include in stubaggregation
|
2022-06-24 20:57:53 +02:00 |
|
Fabian Neumann
|
4c5ec8e5f1
|
Merge branch 'master' into introduce_hac_clustering
|
2022-06-24 20:22:47 +02:00 |
|
Fabian Neumann
|
54f88b871a
|
Merge pull request #320 from PyPSA/load-shedding-carrier
solve_network: fix load shedding attributes
|
2022-06-24 20:20:05 +02:00 |
|
Fabian Neumann
|
2a55ad2162
|
Merge branch 'master' into load-shedding-carrier
|
2022-06-24 20:19:37 +02:00 |
|
Fabian Neumann
|
d321b2b762
|
resolve merge conflicts
|
2022-06-24 20:15:32 +02:00 |
|
Martha Frysztacki
|
4722099a7b
|
Merge branch 'master' into harmonize_clustering_strategies
|
2022-06-24 20:10:05 +02:00 |
|
Fabian Neumann
|
8d9bbacd9b
|
Merge pull request #365 from PyPSA/bugfixes_manual_load
bugfixes for manual load adjustments
|
2022-06-24 20:06:31 +02:00 |
|
Fabian Neumann
|
ac966c0a99
|
Merge branch 'master' into bugfixes_manual_load
|
2022-06-24 19:57:16 +02:00 |
|
Fabian Neumann
|
34c75fc59e
|
Merge branch 'master' into harmonize_clustering_strategies
|
2022-06-24 19:49:26 +02:00 |
|
Fabian Hofmann
|
467a1eb5e7
|
Merge pull request #384 from PyPSA/dask-distributed
Enable parallel computing with new dask version
|
2022-06-24 14:27:41 +02:00 |
|
Fabian
|
75f9719076
|
build_renewable_profiles: use LocalCluster instance
|
2022-06-24 14:07:51 +02:00 |
|
Fabian
|
743fdea874
|
add dask-worker-space to gitignore
|
2022-06-23 21:39:28 +02:00 |
|
Fabian
|
d18867ce61
|
build_renewable_profiles: use dask client instead of kwargs
|
2022-06-23 21:27:18 +02:00 |
|
martacki
|
8dba48c412
|
clustering strats to configurables: documentation and testing
|
2022-06-21 19:08:22 +02:00 |
|
Martha Frysztacki
|
e004b27f40
|
Merge branch 'master' into harmonize_clustering_strategies
|
2022-06-21 18:44:28 +02:00 |
|
martacki
|
bdd0cc3aa1
|
clustering strats to configurables: review suggestions
|
2022-06-21 18:42:49 +02:00 |
|
Fabian Neumann
|
4e60e8d675
|
Merge pull request #381 from p-glaum/fix_snakemake_error
helpers: check snakemake version for bug fix
|
2022-06-21 16:32:16 +02:00 |
|
Fabian Neumann
|
fe5467e4e4
|
Merge branch 'master' into fix_snakemake_error
|
2022-06-21 16:21:32 +02:00 |
|
Fabian Neumann
|
cc657b7628
|
Update scripts/_helpers.py
|
2022-06-21 16:21:21 +02:00 |
|
Philipp Glaum
|
51ff3f02bb
|
helpers: check snakemake version for bug fix
|
2022-06-21 16:13:16 +02:00 |
|
martacki
|
b4d8dd8ecb
|
add changes from PR #379
|
2022-06-20 19:21:08 +02:00 |
|
martacki
|
bef4967e84
|
clustering strategies moved to configurables
|
2022-06-20 18:58:23 +02:00 |
|
Fabian Hofmann
|
21183f7b23
|
Merge pull request #379 from PyPSA/cluster-strategy-conventionals
cluster-network: add strategies for conventionals
|
2022-06-20 18:48:20 +02:00 |
|
Fabian Hofmann
|
8c704c024e
|
Merge branch 'master' into cluster-strategy-conventionals
|
2022-06-20 18:23:02 +02:00 |
|
Fabian
|
c2413aeef4
|
cluster-network: add strategies for conventionals
|
2022-06-20 18:20:28 +02:00 |
|
Fabian Neumann
|
8e93fe9fb7
|
Merge pull request #378 from p-glaum/fix_snakemake_error
fix snakemake error introduced after v7.7.0
|
2022-06-20 13:34:19 +02:00 |
|
Philipp Glaum
|
5df588ccb8
|
fix snakemake error introduced after v7.7.0
|
2022-06-20 12:45:28 +02:00 |
|
Fabian Neumann
|
93827ace1c
|
Merge pull request #376 from PyPSA/calc-landuse-wo-progressbar
build_renewable_profiles: set show progress default to False
|
2022-06-14 17:38:08 +02:00 |
|
Fabian Hofmann
|
6b9932f5e8
|
build_renewable_profiles: set show progress default to False
|
2022-06-14 15:24:10 +02:00 |
|
Fabian Hofmann
|
137e8dbed6
|
Merge pull request #374 from zoltanmaric/344-missing-retreive-snakemake-keys-fn
Remove usages of `retrieve_snakemake_keys`
|
2022-06-08 17:57:04 +02:00 |
|
zoltanmaric
|
1a7b439f2d
|
Remove usages of retrieve_snakemake_keys
|
2022-06-08 17:32:33 +02:00 |
|
Fabian Hofmann
|
61f994783c
|
Merge pull request #373 from PyPSA/snakemake-keys-followup
plot_summary: remove deprecated retrieve_snakemake_keys function
|
2022-06-08 17:25:14 +02:00 |
|
martacki
|
cd92d8092b
|
plot_summary: remove deprecated retrieve_snakemake_keys function
|
2022-06-08 15:49:06 +02:00 |
|
Fabian Hofmann
|
565c2cbf6f
|
Merge pull request #349 from PyPSA/voronoi
build_bus_regions: move voronoi partition from `vresutils` to script
|
2022-06-07 17:53:42 +02:00 |
|
Fabian Neumann
|
a2f39abee2
|
Merge branch 'master' into voronoi
|
2022-06-07 15:23:30 +02:00 |
|
Fabian Hofmann
|
bdd094d796
|
Update scripts/build_bus_regions.py
|
2022-06-07 15:01:40 +02:00 |
|
Fabian Hofmann
|
97fbf77ff8
|
Update scripts/build_bus_regions.py
|
2022-06-07 15:01:18 +02:00 |
|
Fabian Hofmann
|
aa867cb704
|
Update scripts/build_bus_regions.py
Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>
|
2022-06-07 15:00:57 +02:00 |
|
Fabian Neumann
|
d5db3b8d80
|
Update scripts/build_bus_regions.py
Co-authored-by: Fabian Hofmann <fab.hof@gmx.de>
|
2022-06-07 10:57:01 +02:00 |
|
Fabian Neumann
|
3d6702a6f0
|
Merge pull request #372 from pz-max/rasterio-fix
restrict rasterio version
|
2022-06-03 19:47:43 +02:00 |
|