Commit Graph

2714 Commits

Author SHA1 Message Date
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
Fabian Neumann
20e1fb40fb update mock_snakemake for new snakemake versions 2022-06-28 17:18:09 +02:00
Fabian Hofmann
03265373c7
Merge pull request #388 from PyPSA/eu-energy-security-conventional-attrs
generalize conventional attr handling through config
2022-06-28 16:38:28 +02:00
Fabian
67ac464b6a add_electricity: use conventional_inputs from snakemake.input for attach_conventional_generators 2022-06-28 16:33:46 +02:00
Fabian Neumann
8b134405dd
Merge pull request #243 from ebbekyhl/Coal-carbon-capture
Add coal with carbon capture
2022-06-28 14:04:31 +02:00
martacki
e9e00291c5 update configtables/opts to include CH4L option 2022-06-28 13:40:14 +02:00
Ebbe Kyhl
e9f2d65cda
Indent by two layers 2022-06-28 13:35:44 +02:00
Fabian Hofmann
e175d1aa0e
Merge branch 'eu-energy-security' into eu-energy-security-conventional-attrs 2022-06-28 13:22:39 +02:00
Fabian
c9ee3e7b36 Merge branch 'eu-energy-security-conventional-attrs' of github.com:PyPSA/pypsa-eur into eu-energy-security-conventional-attrs 2022-06-28 13:17:08 +02:00
Fabian Hofmann
82013fd081
Update scripts/add_electricity.py
Co-authored-by: Martha Frysztacki <martha.frysztacki@kit.edu>
2022-06-28 13:16:55 +02:00
Fabian
522f218eed Snakefile: rename attrs to attr in add_electricity input function 2022-06-28 13:15:37 +02:00
Fabian Hofmann
3294ad92eb
Update scripts/solve_network.py
Co-authored-by: Martha Frysztacki <martha.frysztacki@kit.edu>
2022-06-28 13:14:47 +02:00
Fabian Hofmann
917f41ef21
Update Snakefile
Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>
2022-06-28 13:11:08 +02:00
Fabian
9d997fbd79 generalize conventional attr handling through config 2022-06-28 10:14:26 +02:00
Fabian Neumann
74f8ca1c7f
Merge branch 'master' into eu-energy-security 2022-06-28 08:09:39 +02:00
Fabian Neumann
452d8cd63f
Merge pull request #383 from PyPSA/landlock-fix-alterative
Landlock country fix alternative
2022-06-28 08:02:48 +02:00
Fabian Neumann
971e970250
Merge branch 'master' into landlock-fix-alterative 2022-06-28 07:47:13 +02:00
Fabian Neumann
f9a996e5df
Merge pull request #293 from PyPSA/introduce_hac_clustering
introduce hierarchical agglomeratice clustering (hac)
2022-06-28 07:44:52 +02:00
martacki
f1dedd9429 hierarchical clustering: release notes & revert to old default clustering algorithm (kmeans) 2022-06-27 21:11:49 +02:00
martacki
29fe0fb7fb hierarchical clustering: account for changes from merging master 2022-06-27 21:02:45 +02:00