[pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
This commit is contained in:
parent
c1f44ea86f
commit
5b2efe313f
@ -3338,7 +3338,10 @@ def add_enhanced_geothermal(
|
|||||||
# The orc cost are attributed to a separate link representing the ORC.
|
# The orc cost are attributed to a separate link representing the ORC.
|
||||||
egs_potentials["capital_cost"] = (
|
egs_potentials["capital_cost"] = (
|
||||||
(egs_annuity + FOM / (1.0 + FOM))
|
(egs_annuity + FOM / (1.0 + FOM))
|
||||||
* (egs_potentials["CAPEX"] * 1000. - costs.at["organic rankine cycle", "investment"])
|
* (
|
||||||
|
egs_potentials["CAPEX"] * 1000.0
|
||||||
|
- costs.at["organic rankine cycle", "investment"]
|
||||||
|
)
|
||||||
* Nyears
|
* Nyears
|
||||||
)
|
)
|
||||||
assert (
|
assert (
|
||||||
@ -3421,10 +3424,7 @@ def add_enhanced_geothermal(
|
|||||||
well_name = f"{bus} enhanced geothermal" + appendix
|
well_name = f"{bus} enhanced geothermal" + appendix
|
||||||
|
|
||||||
bus_eta = pd.concat(
|
bus_eta = pd.concat(
|
||||||
(
|
(efficiency[bus].rename(idx) for idx in well_name),
|
||||||
efficiency[bus].rename(idx)
|
|
||||||
for idx in well_name
|
|
||||||
),
|
|
||||||
axis=1,
|
axis=1,
|
||||||
)
|
)
|
||||||
|
|
||||||
@ -3470,7 +3470,9 @@ def add_enhanced_geothermal(
|
|||||||
p_nom_extendable=True,
|
p_nom_extendable=True,
|
||||||
)
|
)
|
||||||
elif as_chp and not bus + " urban central heat" in n.buses.index:
|
elif as_chp and not bus + " urban central heat" in n.buses.index:
|
||||||
n.links.at[bus + " geothermal organic rankine cycle", "efficiency"] = efficiency_orc
|
n.links.at[
|
||||||
|
bus + " geothermal organic rankine cycle", "efficiency"
|
||||||
|
] = efficiency_orc
|
||||||
|
|
||||||
if snakemake.params.sector["enhanced_geothermal_flexible"]:
|
if snakemake.params.sector["enhanced_geothermal_flexible"]:
|
||||||
# this StorageUnit represents flexible operation using the geothermal reservoir.
|
# this StorageUnit represents flexible operation using the geothermal reservoir.
|
||||||
@ -3485,7 +3487,7 @@ def add_enhanced_geothermal(
|
|||||||
max_hours = max_hours * boost
|
max_hours = max_hours * boost
|
||||||
n.add(
|
n.add(
|
||||||
"StorageUnit",
|
"StorageUnit",
|
||||||
bus + ' geothermal reservoir',
|
bus + " geothermal reservoir",
|
||||||
bus=f"{bus} geothermal heat surface",
|
bus=f"{bus} geothermal heat surface",
|
||||||
carrier="geothermal heat",
|
carrier="geothermal heat",
|
||||||
p_nom_extendable=True,
|
p_nom_extendable=True,
|
||||||
|
Loading…
Reference in New Issue
Block a user