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

1147 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Fabian
c68aa028ff add_electricity: fix missing config key 2022-06-10 00:36:07 +02:00
Fabian
8cbe4e4f9d update release notes and doc 2022-06-10 00:33:09 +02:00
Fabian Hofmann
12bed0745d
Merge branch 'master' into eu-energy-security 2022-06-09 23:41:48 +02:00
Fabian
f45803ff10 add_electricity: fix missing backwards compat and warnings 2022-06-09 23:40:32 +02:00
Fabian
76cd0751b4 Merge branch 'eu-energy-security' of github.com:PyPSA/pypsa-eur into eu-energy-security 2022-06-09 20:36:35 +02:00
Fabian
26a56d1836 update release notes 2022-06-09 20:33:13 +02:00
Fabian
0ec3a8638b add_electricity & config: 
- refactor attachment of conventional carriers
  - refactor scaling of renewable carriers
 2022-06-09 20:31:50 +02:00
Fabian
eb59e68f35 Snakefile: remove RDIR selection 2022-06-09 20:24:28 +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
8b855f0478 add_elecitricity: scale only missing renewable capacities from OPSD 2022-06-07 15:17:49 +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 Hofmann
619b471f72
Merge branch 'master' into eu-energy-security 2022-06-07 10:05:11 +02:00