Update JRC Hydro Database version

[brynpickering]

From V4 to V7, and update the method extracting data from the zip to be version hash agnostic.

[timtroendle]

Even more relevant: this PR moves from Geth PHS storage capacities to JRC PHS storage capacities.

[timtroendle]

The version update is very nice, thanks!

Moving away from Geth data may be fine, but it would be good to understand the consequences. See my comment.

[timtroendle]

This file should be deleted as it's not necessary anymore.

[brynpickering]

In terms of changes, they are below. There are some big differences, but I have been reliably informed that the Italian data is much more realistic in JRC than in Geth et al. (and there is an order of magnitude difference between the two). So, it might not be that JRC was vastly overestimating, but that Geth was vastly underestimating...

	geth_phs	jrc_dam	jrc_phs
AL	NaN	62267.00	NaN
AT	132410.0	1544800.00	527400.0
BA	NaN	303.00	3.4
BE	5710.0	0.00	5000.0
BG	11130.0	0.00	0.0
CH	311480.0	1803200.00	780.0
CY	0.0	NaN	NaN
CZ	5720.0	0.00	0.0
DE	39120.0	0.00	35400.0
DK	0.0	NaN	NaN
EE	0.0	NaN	NaN
ES	70000.0	4176442.00	4261523.0
FI	0.0	0.00	NaN
FR	83370.0	2126400.00	73776.0
GB	26700.0	0.00	26700.0
GR	4970.0	1855000.00	0.0
HR	2340.0	0.00	14800.0
HU	0.0	0.00	NaN
IE	1800.0	0.00	0.0
IT	68270.0	2600.00	398595.0
LT	10800.0	0.00	0.0
LU	4920.0	NaN	4478.0
LV	0.0	46330.00	NaN
ME	NaN	2894.00	NaN
MK	NaN	0.00	NaN
MT	0.0	NaN	NaN
NL	0.0	NaN	NaN
NO	399390.0	40547872.95	4952921.7
PL	7960.0	0.00	7960.0
PT	40770.0	1334260.00	181012.0
RO	10200.0	0.00	10.2
RS	NaN	646350.00	0.0
SE	72120.0	0.00	25000.0
SI	500.0	0.00	0.0
SK	3630.0	0.00	0.0

[timtroendle]

Geth is certainly an underestimation as they say themselves they do not cover all plants. The numbers are dramatically different sometimes though, and I personally simply don't know which one's better.

What do you think of keeping Geth data and the scaling mechanism as an option?

[brynpickering]

@timtroendle I will update this once #45 is merged in. I will allow one to set a binary config option to scale capacities based on Geth, and default it to False.

[timtroendle]

When updating, could you separate this PR into two: one for updating the data (solving #19) and one for making Geth optional? The two do not seem linked to me and the later is a big change.

[brynpickering]

When updating, could you separate this PR into two: one for updating the data (solving #19) and one for making Geth optional? The two do not seem linked to me and the later is a big change.

It would be much easier to keep them in this PR, if that's OK. They are linked in that updating the JRC hydro database is moving closer to the 'reality' of PHS capacity (as that database can be assumed to have only improved), which thus makes the Geth scaling possibly unnecessary, hence that change.

[brynpickering]

Ignore that, I'll split them as I ned to rebase onto develop branch anyway

[brynpickering]

Closed in favour of split into #48 and #49