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 |
|
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 |
|
Ebbe Kyhl
|
2a3b576cbd
|
Add coal with carbon capture
|
2022-06-14 15:00:53 +02:00 |
|
Fabian Neumann
|
4ecfccea6c
|
handle ammonia demand both regionalised and copperplated
|
2022-06-10 17:07:48 +02:00 |
|
Fabian Neumann
|
9d5d88f565
|
Merge branch 'nh3' of github.com:pypsa/pypsa-eur-sec into nh3
|
2022-06-10 16:56:08 +02:00 |
|
Fabian Neumann
|
27ac40d2ea
|
use spatial namespace to manage ammonia resolution
|
2022-06-10 16:56:00 +02:00 |
|
Fabian Neumann
|
4984ba199e
|
use spatial namespace to manage ammonia resolution
|
2022-06-10 16:53:37 +02:00 |
|
Fabian Neumann
|
a2a4cf7c02
|
use config to manage conversion efficiencies
|
2022-06-10 16:43:29 +02:00 |
|
Fabian Neumann
|
2d562c1349
|
add coloring for ammonia
|
2022-06-10 14:57:03 +02:00 |
|
Fabian Neumann
|
2e9ee7b796
|
Merge branch 'nh3' of github.com:pypsa/pypsa-eur-sec into nh3
|
2022-06-10 14:46:51 +02:00 |
|
Fabian Neumann
|
6cfee1f98a
|
add ammonia as carrier: with Haber-Bosch, crackers, store, load
|
2022-06-10 14:46:39 +02:00 |
|
Fabian Neumann
|
9573f33860
|
add ammonia as carrier: with Haber-Bosch, crackers, store, load
|
2022-06-10 14:44:36 +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 |
|