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

1241 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
martacki
f1dedd9429 hierarchical clustering: release notes & revert to old default clustering algorithm (kmeans) 2022-06-27 21:11:49 +02:00
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
Fabian
b56d1f6f4d conventional config section: update to more general attribute assignment scheme 2022-06-27 17:35:19 +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 Hofmann
8349e85252
Apply suggestions from code review 
Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>
 2022-06-27 11:48:45 +02:00
Fabian Neumann
fa43038564 remove params from input as they are not exposed to input 2022-06-27 10:35:39 +02:00
Fabian Neumann
4d79a0dc96
Apply suggestions from code review 2022-06-27 10:23:22 +02:00
Fabian Neumann
9c6c6d243f
Adaptations to match current PyPSA-Eur version 2022-06-27 10:21:08 +02:00
Fabian Neumann
8e57d68b73
Merge branch 'master' into landlock-fix-alterative 2022-06-27 09:44:42 +02:00
Fabian Neumann
5ca231824e
Merge branch 'master' into eu-energy-security 2022-06-27 08:58:37 +02:00
Fabian Neumann
520f7e440e
Merge branch 'master' into technology-data 2022-06-25 11:05:41 +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
b37c1d98d3 update release notes 2022-06-24 18:44:03 +02:00
Fabian
a1ee747dc6 data: add nuclear_eafs 2022-06-24 18:37:43 +02:00
Fabian
3dbd8d1492 add_electricity: fix read_csv 2022-06-24 18:31:39 +02:00
Fabian Hofmann
17d7403f20
build_powerplants: apply suggestions from code review 
Co-authored-by: Martha Frysztacki <martha.frysztacki@kit.edu>
 2022-06-24 15:34:26 +02:00
Fabian
a019034f80 Merge branch 'master' into eu-energy-security 2022-06-24 15:28:07 +02:00
Fabian
c42d2bd97d refactor save to geojson file functionality to allow import/export of empty geodfs 2022-06-24 15:11:21 +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
Fabian
b581e7afc6 build_hydro_profiles: revert changes 2022-06-23 21:19:41 +02:00
Fabian
0fd7d689a1 Merge branch 'master' into eu-energy-security 2022-06-23 20:53:43 +02:00
Fabian
2c5643a5f8 add_electricity: fix conventional config 2022-06-23 16:36:22 +02:00
Fabian Hofmann
2e212fb436
Update test/config.test1.yaml 
Co-authored-by: Martha Frysztacki <martha.frysztacki@kit.edu>
 2022-06-23 16:16:36 +02:00
Fabian Hofmann
348b14b052
Update scripts/build_hydro_profile.py 
Co-authored-by: Martha Frysztacki <martha.frysztacki@kit.edu>
 2022-06-23 16:15:37 +02:00
Fabian Hofmann
d6930b878a
Update scripts/cluster_network.py 
Co-authored-by: Martha Frysztacki <martha.frysztacki@kit.edu>
 2022-06-23 16:14:20 +02:00
Fabian
95e8a9534a env: remove duplicated ppm dependency 2022-06-23 16:07:33 +02:00
Fabian
441d7d56f9 fix eafs and conventional setttings 2022-06-23 16:04:49 +02:00
Fabian Hofmann
db78f9cd2a
Update scripts/add_electricity.py 
Co-authored-by: Martha Frysztacki <martha.frysztacki@kit.edu>
 2022-06-23 15:54:22 +02:00
Fabian Hofmann
f6b7317d04
Update config.tutorial.yaml 
Co-authored-by: Martha Frysztacki <martha.frysztacki@kit.edu>
 2022-06-23 15:14:38 +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