Fix H2 underground potentials from TWh to MWh; simplify H2 data
This commit is contained in:
parent
de52711700
commit
b862bb95cd
@ -1,31 +1,31 @@
|
|||||||
,,TWh
|
ct,TWh
|
||||||
AT,False,
|
AT,
|
||||||
BA,False,
|
BA,
|
||||||
BE,False,
|
BE,
|
||||||
BG,False,
|
BG,
|
||||||
CH,False,
|
CH,
|
||||||
CZ,False,
|
CZ,
|
||||||
DE,True,4500
|
DE,4500
|
||||||
DK,True,700
|
DK,700
|
||||||
EE,False,
|
EE,
|
||||||
ES,True,350
|
ES,350
|
||||||
FI,False,
|
FI,
|
||||||
FR,False,
|
FR,
|
||||||
GB,True,1050
|
GB,1050
|
||||||
GR,True,120
|
GR,120
|
||||||
HR,False,
|
HR,
|
||||||
HU,False,
|
HU,
|
||||||
IE,False,
|
IE,
|
||||||
IT,False,
|
IT,
|
||||||
LT,False,
|
LT,
|
||||||
LU,False,
|
LU,
|
||||||
LV,False,
|
LV,
|
||||||
NL,True,150
|
NL,150
|
||||||
NO,False,
|
NO,
|
||||||
PL,True,120
|
PL,120
|
||||||
PT,True,400
|
PT,400
|
||||||
RO,False,
|
RO,
|
||||||
RS,False,
|
RS,
|
||||||
SE,False,
|
SE,
|
||||||
SI,False,
|
SI,
|
||||||
SK,False,
|
SK,
|
||||||
|
|
@ -805,17 +805,18 @@ def add_storage(network):
|
|||||||
|
|
||||||
if options['hydrogen_underground_storage']:
|
if options['hydrogen_underground_storage']:
|
||||||
h2_salt_cavern_potential = pd.read_csv(snakemake.input.h2_cavern,
|
h2_salt_cavern_potential = pd.read_csv(snakemake.input.h2_cavern,
|
||||||
index_col=0, skiprows=[0],
|
index_col=0,squeeze=True)
|
||||||
names=["potential", "TWh"])
|
h2_cavern_ct = h2_salt_cavern_potential[~h2_salt_cavern_potential.isna()]
|
||||||
h2_cavern_ct = h2_salt_cavern_potential[h2_salt_cavern_potential.potential]
|
|
||||||
cavern_nodes = pop_layout[pop_layout.ct.isin(h2_cavern_ct.index)]
|
cavern_nodes = pop_layout[pop_layout.ct.isin(h2_cavern_ct.index)]
|
||||||
|
|
||||||
h2_capital_cost = costs.at["hydrogen storage underground", "fixed"]
|
h2_capital_cost = costs.at["hydrogen storage underground", "fixed"]
|
||||||
|
|
||||||
# assumptions: weight storage potential in a country by population
|
# assumptions: weight storage potential in a country by population
|
||||||
h2_pot = (h2_cavern_ct.loc[cavern_nodes.ct, "TWh"].astype(float)
|
# TODO: fix with real geographic potentials
|
||||||
.reset_index().set_index(cavern_nodes.index))
|
#convert TWh to MWh with 1e6
|
||||||
h2_pot = h2_pot.TWh * cavern_nodes.fraction
|
h2_pot = h2_cavern_ct.loc[cavern_nodes.ct]
|
||||||
|
h2_pot.index = cavern_nodes.index
|
||||||
|
h2_pot = h2_pot * cavern_nodes.fraction * 1e6
|
||||||
|
|
||||||
network.madd("Store",
|
network.madd("Store",
|
||||||
cavern_nodes.index + " H2 Store",
|
cavern_nodes.index + " H2 Store",
|
||||||
|
Loading…
Reference in New Issue
Block a user