Philipp Glaum
ba7a5363e7
update Fabians review comments
2022-07-29 14:56:39 +02:00
Philipp Glaum
8af09d9bec
fix raster format error due to import
2022-07-28 15:21:21 +02:00
Philipp Glaum
6d070a19e0
initial ship raster implementation
2022-07-28 10:38:24 +02:00
Fabian Neumann
d2b8e3c3d2
Merge pull request #389 from PyPSA/meta
...
store config and wildcards in n.meta
2022-07-27 10:01:51 +02:00
Fabian Neumann
a1507124f6
Merge branch 'release-v0.5' into meta
2022-07-27 09:43:36 +02:00
Fabian Neumann
060bc49223
helpers: make copy of snakemake.config to avoid non-serializable JSON
2022-07-27 09:26:21 +02:00
Fabian Neumann
8d132464bd
Merge branch 'release-v0.5' into introduce_modularity_clustering
2022-07-27 09:04:39 +02:00
Fabian Neumann
cdd063d3b0
scripts: remove deprecated clustering methods, remove unused imports
2022-07-27 09:02:34 +02:00
Fabian Neumann
87388d4b4a
update author affiliations
2022-07-26 15:32:48 +02:00
Fabian Neumann
8fc0c57ed6
update copyright years
2022-07-26 15:05:59 +02:00
Fabian Neumann
239dcfdd1e
Merge branch 'master' into introduce_modularity_clustering
2022-07-26 14:04:56 +02:00
Fabian Neumann
31bc87adba
Merge branch 'master' into meta
2022-07-26 14:02:26 +02:00
Fabian Hofmann
b5308fa72b
Merge branch 'master' into technology-data
2022-07-21 17:03:36 +02:00
Fabian Hofmann
3ba7e2ab90
Merge branch 'master' into technology-data
2022-07-21 15:36:12 +02:00
Fabian Neumann
4ec95fa90e
hydro: distribute eia data for former countries to successor states by ratio
2022-07-20 13:01:14 +02:00
Martha Frysztacki
b63385444c
Merge branch 'master' into introduce_modularity_clustering
2022-07-19 09:51:06 +02:00
Fabian Neumann
a860643dd8
reduce number of columns for simplified and clustered regions
2022-07-18 17:28:09 +02:00
martacki
387271b03b
new spatial clustering method: modularity
2022-07-13 14:51:48 +02:00
Julio Pascual
5d98cc7e97
Update build_load_data.py
2022-07-04 18:53:41 +02:00
Julio Pascual
433f0af409
Update build_load_data.py
2022-07-04 18:51:49 +02:00
Julio Pascual
ce3b193a88
Update add_electricity.py
2022-07-04 18:42:22 +02:00
Julio Pascual
0d9ffdcee3
Update build_load_data.py
2022-07-04 18:41:08 +02:00
Julio Pascual
44f793be91
Changed doc info in retrieve_databundle.py
...
Simply changed the text regarding the output directory. It said 'cutouts/bundle' but I think it should be 'data/bundle'. It only affects the documentation.
2022-07-04 11:49:55 +02:00
Fabian Neumann
27e5dec4e6
documentation fixes
2022-06-30 09:01:49 +02:00
Fabian Neumann
217780263d
store config and wildcards in n.meta
2022-06-30 08:39:03 +02:00
Fabian
67ac464b6a
add_electricity: use conventional_inputs from snakemake.input for attach_conventional_generators
2022-06-28 16:33:46 +02:00
Fabian Hofmann
e175d1aa0e
Merge branch 'eu-energy-security' into eu-energy-security-conventional-attrs
2022-06-28 13:22:39 +02:00
Fabian Hofmann
82013fd081
Update scripts/add_electricity.py
...
Co-authored-by: Martha Frysztacki <martha.frysztacki@kit.edu>
2022-06-28 13:16:55 +02:00
Fabian Hofmann
3294ad92eb
Update scripts/solve_network.py
...
Co-authored-by: Martha Frysztacki <martha.frysztacki@kit.edu>
2022-06-28 13:14:47 +02:00
Fabian
9d997fbd79
generalize conventional attr handling through config
2022-06-28 10:14:26 +02:00
Fabian Neumann
74f8ca1c7f
Merge branch 'master' into eu-energy-security
2022-06-28 08:09:39 +02:00
Fabian Neumann
971e970250
Merge branch 'master' into landlock-fix-alterative
2022-06-28 07:47:13 +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
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
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
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
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
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
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
