Commit Graph

80 Commits

Author SHA1 Message Date
Fabian
825d3e84d2 replace progressbar by tqdm 2023-02-22 14:20:18 +01:00
Fabian Neumann
e2ec25073a limit openpyxl version 2023-02-16 19:41:55 +01:00
Fabian Neumann
9bb52ddab0 update fixed versions environment.yaml 2023-02-16 16:07:01 +01:00
Fabian Neumann
7a51560c2b update fixed versions environment.yaml 2023-02-16 16:04:49 +01:00
Fabian Neumann
9c1182fe96 prepare release 0.7 2023-02-16 11:50:55 +01:00
Fabian Neumann
4a106aae65
Merge branch 'master' into fix/deprecation-warning-pandas-1.4 2023-02-11 09:34:49 +01:00
Fabian
0b20c734dc env: update shapely to >=2.0 2023-02-08 20:45:59 +01:00
Fabian Neumann
bca35ff3e1
Revert "env: add pygeos" 2023-02-08 18:49:17 +01:00
Fabian
d6df197294 env: add pygeos 2023-02-08 18:40:42 +01:00
Fabian Hofmann
f94be5c2f5
Merge branch 'master' into fix/deprecation-warning-pandas-1.4 2023-02-07 11:00:02 +01:00
Fabian Neumann
c9dc64e0ed limit matplotlib < 3.6 2022-12-28 15:10:45 +01:00
Fabian Neumann
70cea4aea3 revert to shapely<2.0 2022-12-27 11:51:01 +01:00
Fabian Neumann
e14382239e try shapely 2.0 2022-12-27 11:43:02 +01:00
Fabian Neumann
8bd840c252 limit numpy < 1.24 2022-12-27 11:30:33 +01:00
Fabian Neumann
06bee06d56 update pypsa, vresutils master, lift fione restriction 2022-12-27 10:51:02 +01:00
Fabian Neumann
01cc146733 lift minimum pypsa version, pyomo 6.4.3 compatibility 2022-12-06 14:38:40 +01:00
Fabian Hofmann
62ca32b274
Merge branch 'master' into fix/deprecation-warning-pandas-1.4 2022-09-26 12:33:13 +02:00
Fabian Hofmann
10b564fc57
Merge branch 'master' into rasterio-1.3 2022-09-19 12:40:58 +02:00
Fabian Neumann
b5b88c6554 lift rasterio restriction to allow atlite 0.2.9 2022-09-16 16:14:30 +02:00
pre-commit-ci[bot]
5d1ef8a640 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2022-09-16 13:04:06 +00:00
Fabian Neumann
61f4f397e4 remove non-essential packages 2022-09-10 15:41:21 +02:00
Fabian Neumann
c13d3a520c settle envs/environment.yaml 2022-09-10 15:38:30 +02:00
Fabian Neumann
ed6d93f6f7 add missing SPDX license identifier 2022-09-10 15:36:01 +02:00
Fabian Neumann
5f08dca2fd prepare release 0.6.0 2022-09-10 15:31:43 +02:00
Fabian Neumann
eb72d8aaad add release 0.5 envs/environment.fixed.yaml 2022-07-27 13:08:12 +02:00
Fabian Neumann
8d132464bd
Merge branch 'release-v0.5' into introduce_modularity_clustering 2022-07-27 09:04:39 +02:00
Fabian Neumann
8fc0c57ed6 update copyright years 2022-07-26 15:05:59 +02:00
Fabian Neumann
e523cb4cb5 doc: minor updates 2022-07-26 15:01:21 +02:00
Fabian Neumann
239dcfdd1e
Merge branch 'master' into introduce_modularity_clustering 2022-07-26 14:04:56 +02:00
Fabian Neumann
e3555523d8 env: use new pypsa 0.20 2022-07-26 14:04:06 +02:00
Fabian Neumann
84c8a9bc0e env: add pyxlsb to read .xslb files with pandas 2022-07-23 09:24:03 +02:00
Fabian Neumann
6047c8d750 add mergedeep to dependencies 2022-07-20 11:47:07 +02:00
martacki
387271b03b new spatial clustering method: modularity 2022-07-13 14:51:48 +02:00
Fabian Neumann
74f8ca1c7f
Merge branch 'master' into eu-energy-security 2022-06-28 08:09:39 +02:00
Fabian Neumann
971e970250
Merge branch 'master' into landlock-fix-alterative 2022-06-28 07:47:13 +02:00
Fabian Neumann
8e57d68b73
Merge branch 'master' into landlock-fix-alterative 2022-06-27 09:44:42 +02:00
Fabian Neumann
5ca231824e
Merge branch 'master' into eu-energy-security 2022-06-27 08:58:37 +02:00
Fabian Neumann
4c5ec8e5f1
Merge branch 'master' into introduce_hac_clustering 2022-06-24 20:22:47 +02:00
Fabian Neumann
d321b2b762 resolve merge conflicts 2022-06-24 20:15:32 +02:00
Fabian
c42d2bd97d refactor save to geojson file functionality to allow import/export of empty geodfs 2022-06-24 15:11:21 +02:00
Fabian
95e8a9534a env: remove duplicated ppm dependency 2022-06-23 16:07:33 +02:00
Fabian Hofmann
619b471f72
Merge branch 'master' into eu-energy-security 2022-06-07 10:05:11 +02:00
Max Parzen
21f627c74e update version 2022-06-03 17:05:32 +01:00
Max Parzen
798c015bf6 restrict rasterio version 2022-06-03 17:03:10 +01:00
Ebbe Kyhl
3bb8a7967a
Powerplantmatching version 0.5.3 as lower bound 2022-05-30 08:15:54 +02:00
Ebbe Kyhl
4706422f4b
Update version of powerplantmatching
Hi,

I recently became aware that I was using an older version (0.4.8) of the powerplantmatching. I tested my setup with the newer version (0.5.3), and it runs without any issues.

The following is a comment/question on the powerplantmatching dataset, which maybe is relevant to mention:
With regard to pumped-hydro storage (PHS), the newest version of powerplantmatching entails an energy storage capacity of 4.3 TWh (Europe-aggregate, assuming 6-hours duration for plants that do not have duration specified). In the earlier version 0.4.8, this was vastly overestimated at 10 TWh. As comparison, Geth et al. (2015) showed 1.3 TWh (including Norway and Switzerland) using 2012-numbers. PHS power capacity has increased from roughly 50 to 55 GW from 2014 to 2020 (iha, 2015, 2021), so energy storage capacity most likely is increased as well. But is it fair to say that energy storage capacity has been quadrupled since 2012 (from 1.3 TWh to 4.3 TWh)? Or how can we interpret this difference? 

Sources:
Geth et al., 2015, https://doi.org/10.1016/j.rser.2015.07.145 
iha, 2015, https://www.aler-renovaveis.org/contents/lerpublication/iha_2015_sept_hydropower-status-report.pdf
iha, 2021, https://assets-global.website-files.com/5f749e4b9399c80b5e421384/60c37321987070812596e26a_IHA20212405-status-report-02_LR.pdf
2022-05-27 16:14:01 +02:00
Fabian
e5cb2d34fb env: update to powerplantmatching >= 0.5.3 2022-04-08 11:30:29 +02:00
Fabian
b1143dc39b env: update to powerplantmatching >= v0.5.2 2022-04-07 21:48:00 +02:00
Fabian Neumann
9812e64e82 resolve cherry merge conflict 2 2022-04-05 16:34:02 +02:00
Fabian
7bc9b8012c powerplants: update to ppm >= v0.5.1 2022-04-04 18:07:48 +02:00