Commit Graph

1070 Commits

Author SHA1 Message Date
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
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
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
9a37fe6572 merge master 2022-06-15 09:22:51 +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