Fabian Neumann
aff5e09195
hydro: store corrected eia stats
2022-07-25 17:04:56 +02:00
Fabian Neumann
96b599aedd
use numpy instead of sklearn for regressino
2022-07-25 11:52:51 +02:00
Fabian Neumann
5bb432141d
hydro: add documentation for eia approximation/correction options
2022-07-22 18:34:16 +02:00
Fabian Neumann
f52c8cd974
merge master
2022-07-22 18:30:16 +02:00
Fabian Neumann
af96af1329
hydro: approximation routine for missing eia years and correction by capacity
2022-07-22 15:03:54 +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
b171614fea
must parse fixed_year to string
2022-07-20 16:37:22 +02:00
Fabian Neumann
b04a55a248
merge former countries hydro profiles
2022-07-20 15:03:48 +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
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
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
611cd383da
Merge pull request #390 from PyPSA/doc-julio
...
documentation fixes
2022-06-30 17:40:45 +02:00
Fabian Neumann
27e5dec4e6
documentation fixes
2022-06-30 09:01:49 +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 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
martacki
e9e00291c5
update configtables/opts to include CH4L option
2022-06-28 13:40:14 +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
Martha Frysztacki
50a518a155
Merge branch 'master' into introduce_hac_clustering
2022-06-27 20:45:40 +02:00
Fabian Neumann
cc1c9fd752
Merge pull request #386 from PyPSA/revert-336-rm-raster-natura
...
Revert "remove build/retrieve natura raster, directly use shapefile"
2022-06-27 19:01:19 +02:00
Fabian Neumann
51de606aab
Revert "remove build/retrieve natura raster, directly use shapefile"
2022-06-27 19:00:41 +02:00
Fabian
b56d1f6f4d
conventional config section: update to more general attribute assignment scheme
2022-06-27 17:35:19 +02:00
Martha Frysztacki
d3afd21377
Merge pull request #380 from PyPSA/harmonize_clustering_strategies
...
clustering strategies moved to configurables
2022-06-27 14:35:05 +02:00
martacki
a3af137b74
clustering strats to configurables: move duplicate code to _helpers script & import
2022-06-27 14:18:47 +02:00
