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

2383 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Fabian Neumann
31bc87adba
Merge branch 'master' into meta 2022-07-26 14:02:26 +02:00
Fabian Neumann
07296b02e2
Merge pull request #252 from PyPSA/gpd-version-check 
use packaging.version instead of deprecated distutils.StrictVersion
 2022-07-25 15:10:46 +02:00
Fabian Neumann
2791e7bdc2 use packaging.version instead of deprecated distutils.StrictVersion 2022-07-25 14:27:31 +02:00
Fabian Neumann
503ecd2907 use + separator instead of : 2022-07-24 21:27:12 +02:00
Fabian Neumann
a65dd4e6c2 use snakemake.utils.update_config instead of mergedeep 2022-07-24 21:26:19 +02:00
Fabian Neumann
84c8a9bc0e env: add pyxlsb to read .xslb files with pandas 2022-07-23 09:24:03 +02:00
Fabian Hofmann
9e57a5bb4f
Merge pull request #184 from PyPSA/technology-data 
integrate technology-data cost file
 2022-07-21 17:16:48 +02:00
Fabian Hofmann
b5308fa72b
Merge branch 'master' into technology-data 2022-07-21 17:03:36 +02:00
Fabian Hofmann
4f633f0caa
Merge pull request #398 from pz-max/config-fix 
clean config, add H2 pipeline comment
 2022-07-21 16:33:00 +02:00
Fabian Hofmann
42d636c04b
Merge branch 'master' into config-fix 2022-07-21 16:22:14 +02:00
Fabian Neumann
1a6588fbeb
Merge pull request #397 from PyPSA/hydro-former-countries 
distribute eia hydro of former countries to successors by ratio
 2022-07-21 16:00:07 +02:00
Max Parzen
3210bbf8f9 clean config, add H2 pipeline comment 2022-07-21 14:43:28 +01:00
Fabian Hofmann
3ba7e2ab90
Merge branch 'master' into technology-data 2022-07-21 15:36:12 +02:00
Fabian Neumann
b3dac6d3c4 subworkflow flags amend 2022-07-20 15:53:57 +02:00
Fabian Neumann
d346e9c34a Merge branch 'master' of github.com:pypsa/pypsa-eur-sec 2022-07-20 15:47:55 +02:00
Fabian Neumann
10243398e7 do not use subworkflow flags for pure data# 
causes problems when config retrieve_databundle is disabled
 2022-07-20 15:47:47 +02:00
Fabian Neumann
4ec95fa90e hydro: distribute eia data for former countries to successor states by ratio 2022-07-20 13:01:14 +02:00
Fabian Neumann
6047c8d750 add mergedeep to dependencies 2022-07-20 11:47:07 +02:00
Fabian Neumann
cb00ba58ce add option to specify any config through sector opts with CF:<label>:...:value 2022-07-20 11:35:12 +02:00
Martha Frysztacki
b63385444c
Merge branch 'master' into introduce_modularity_clustering 2022-07-19 09:51:06 +02:00
Tom Brown
ec1aa1b76b README, doc: add reference to hydrogen network paper as showcase of model 2022-07-18 20:40:21 +02:00
Fabian Neumann
433fc7a96b
Merge pull request #395 from PyPSA/fix-regions-files 
reduce number of columns for simplified and clustered regions
 2022-07-18 17:47:03 +02:00
Fabian Neumann
a860643dd8 reduce number of columns for simplified and clustered regions 2022-07-18 17:28:09 +02:00
martacki
90ffc35f05 documentation 2022-07-13 15:39:46 +02:00
martacki
387271b03b new spatial clustering method: modularity 2022-07-13 14:51:48 +02:00
Fabian Neumann
51c76651ba
Merge pull request #248 from PyPSA/thermal-storage-bugfix 
fix unit conversion for thermal energy storage
 2022-07-11 19:04:53 +02:00
Fabian Neumann
adc0dd1e0c fix unit conversion for thermal energy storage (closes #247) 2022-07-11 15:46:21 +02:00
Fabian Neumann
44e8fbd5aa
Merge pull request #392 from jpscl/master 
Changes in documentation regarding load
 2022-07-04 19:38:28 +02:00
Julio Pascual
5d98cc7e97
Update build_load_data.py 2022-07-04 18:53:41 +02:00
Julio Pascual
433f0af409
Update build_load_data.py 2022-07-04 18:51:49 +02:00
Julio Pascual
ce3b193a88
Update add_electricity.py 2022-07-04 18:42:22 +02:00
Julio Pascual
0d9ffdcee3
Update build_load_data.py 2022-07-04 18:41:08 +02:00
Fabian Neumann
302f0d4a95
Merge pull request #391 from jpscl/patch-1 
Changed doc info in retrieve_databundle.py
 2022-07-04 12:34:38 +02:00
Julio Pascual
44f793be91
Changed doc info in retrieve_databundle.py 
Simply changed the text regarding the output directory. It said 'cutouts/bundle' but I think it should be 'data/bundle'. It only affects the documentation.
 2022-07-04 11:49:55 +02:00
Fabian Neumann
8143f7e0fd remove accidental config file additions 2022-07-01 10:16:11 +02:00
Fabian Neumann
3986856282 merge master 2022-07-01 10:13:33 +02:00
Fabian Neumann
5082c8761b
Merge pull request #245 from PyPSA/bus_units 
Document units of bus carriers
 2022-06-30 17:43:14 +02:00
Fabian Neumann
611cd383da
Merge pull request #390 from PyPSA/doc-julio 
documentation fixes
 2022-06-30 17:40:45 +02:00
Irieo
5d60e8c6e6 Label oil and biomass buses also as MWh_LHV 2022-06-30 17:37:40 +02:00
Iegor Riepin
53ad90095a
Update scripts/prepare_sector_network.py 
sync it up to Fabian's feeling of useful things

Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>
 2022-06-30 17:17:12 +02:00
Iegor Riepin
eddeb227a7
Update scripts/prepare_sector_network.py 
code style update

Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>
 2022-06-30 17:15:41 +02:00
Fabian Neumann
27e5dec4e6 documentation fixes 2022-06-30 09:01:49 +02:00
Fabian Neumann
3134bbb5c5 remove accidental file additions 2022-06-30 08:43:46 +02:00
Fabian Neumann
b96207c73e store config and wildcards in n.meta 2022-06-30 08:42:18 +02:00
Fabian Neumann
217780263d store config and wildcards in n.meta 2022-06-30 08:39:03 +02:00
lisazeyen
b4d0a8404c change unit from carrier gas from MWh_th -> MWh_LHV 2022-06-29 08:57:08 +02:00
lisazeyen
187c9cbaa3 add release notes 2022-06-29 08:49:29 +02:00
Irieo
7604bb1654 Document units of bus carriers 2022-06-28 18:31:45 +02:00
Fabian Neumann
a8171ec9f3 color adaptations, new features 2022-06-28 18:03:29 +02:00
Fabian Hofmann
080075ec9f
Merge pull request #353 from PyPSA/eu-energy-security 
European energy security
 2022-06-28 17:19:54 +02:00