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 |
|
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 |
|
Fabian Hofmann
|
6fb3520fc1
|
Merge branch 'master' into eu-energy-security
|
2022-06-21 14:12:43 +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 Hofmann
|
bebbb003e5
|
Merge branch 'master' into eu-energy-security
|
2022-06-15 15:02:21 +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
|
1c0975181e
|
add_electricity: fix missing config key
|
2022-06-10 11:23:35 +02:00 |
|
Fabian
|
13992125bd
|
cluster_network: adjust generator strategy for new columns
|
2022-06-10 11:23:26 +02:00 |
|
Fabian
|
f5a9a27a5d
|
Merge branch 'eu-energy-security' of github.com:PyPSA/pypsa-eur into eu-energy-security
|
2022-06-10 00:36:55 +02:00 |
|