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

2876 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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 Neumann
e1a6e13f75 add release note [no ci] 2022-06-23 15:28:00 +02:00
Fabian Neumann
2037534557 prepare: only add ammonia to spatial if config selected 2022-06-23 15:24:44 +02:00
Fabian Neumann
d69efe3d1f add ammonia color to config.default.yaml 2022-06-23 15:22:21 +02:00
Fabian Neumann
9f91af28e7 fix syntax errors 2022-06-23 15:17:41 +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
Fabian Neumann
37c052667a handle absent ammonia config flag 2022-06-22 15:50:32 +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 Neumann
173ab7b318 add_electricity: make drop_leap_year own function 2022-06-16 09:00:33 +02:00
Fabian Neumann
e9bab1622c resolve merge conflicts 2022-06-16 08:53:42 +02:00
Fabian Neumann
b4c819c757 config: add fixed_year parameter for load 2022-06-16 08:53:07 +02:00
Fabian Neumann
cb0554f609 config: add fixed_year parameter for load 2022-06-16 08:51:06 +02:00
Fabian Neumann
6713317bbe add_electricity: fix missing variable assignment 2022-06-16 08:46:47 +02:00
Fabian Neumann
a2e26004d7 add further missing handling of weather_year wildcard 2022-06-15 15:36:37 +02:00
Fabian Neumann
9f9e65afb1 add missing handling of weather_year wildcard 2022-06-15 15:18:07 +02:00
Fabian Neumann
ec4a45b46b add weather_year wildcard to mock_snakemake objects 2022-06-15 15:03:17 +02:00
Fabian Hofmann
bebbb003e5
Merge branch 'master' into eu-energy-security 2022-06-15 15:02:21 +02:00
Fabian Neumann
8055e45b68 combine time selection with weather year 2022-06-15 14:56:46 +02:00
Fabian Neumann
0b27e40710 Snakefile: load data is weather-year dependent 2022-06-15 14:15:00 +02:00
Fabian Neumann
95b01735c8 Snakefile: fix regex for weather year to allow empty 2022-06-15 14:14:36 +02:00
Fabian Neumann
5cc6e9e18a doc: add reference to new config settings 2022-06-15 14:07:48 +02:00
Fabian Neumann
500890b6af Snakefile: remove duplicate use of weather year wildcard 2022-06-15 14:02:40 +02:00
Fabian Neumann
e9b3cb7558 add_electricity: remove unused load data handling 2022-06-15 14:02:19 +02:00
Fabian Neumann
ff2de7066f remove upstream deleted build_country_flh 2022-06-15 14:01:27 +02:00
Fabian Neumann
91ca07d72f add option to specify deviating norm year for hydro 2022-06-15 14:00:47 +02:00
Fabian Neumann
4a44c45ace add option to cut Feb 29 in leap years 2022-06-15 13:51:56 +02:00
Fabian Neumann
2b43f43006 add more versatile cutout building with weather years 2022-06-15 13:51:08 +02:00
Fabian Neumann
6d260435a6 allow fixed load data year deviating from snapshots 2022-06-15 13:50:00 +02:00
Fabian Neumann
a71552eb1b fix parameter correcitons 2022-06-15 09:30:52 +02:00
Fabian Neumann
fa66c50dc1 merge master 2022-06-15 09:29:19 +02:00