add lifetime
This commit is contained in:
parent
a21b1f2d10
commit
f47ce1c432
@ -406,6 +406,7 @@ def attach_wind_and_solar(
|
|||||||
capital_cost=capital_cost,
|
capital_cost=capital_cost,
|
||||||
efficiency=costs.at[supcar, "efficiency"],
|
efficiency=costs.at[supcar, "efficiency"],
|
||||||
p_max_pu=ds["profile"].transpose("time", "bus").to_pandas(),
|
p_max_pu=ds["profile"].transpose("time", "bus").to_pandas(),
|
||||||
|
lifetime=costs.at[supcar, "lifetime"],
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
|
@ -1150,6 +1150,7 @@ def add_storage_and_grids(n, costs):
|
|||||||
e_cyclic=True,
|
e_cyclic=True,
|
||||||
carrier="H2 Store",
|
carrier="H2 Store",
|
||||||
capital_cost=h2_capital_cost,
|
capital_cost=h2_capital_cost,
|
||||||
|
lifetime=costs.at["hydrogen storage tank type 1 including compressor", "lifetime"],
|
||||||
)
|
)
|
||||||
|
|
||||||
if options["gas_network"] or options["H2_retrofit"]:
|
if options["gas_network"] or options["H2_retrofit"]:
|
||||||
@ -3273,20 +3274,20 @@ def set_temporal_aggregation(n, opts, solver_name):
|
|||||||
break
|
break
|
||||||
return n
|
return n
|
||||||
|
|
||||||
|
#%%
|
||||||
if __name__ == "__main__":
|
if __name__ == "__main__":
|
||||||
if "snakemake" not in globals():
|
if "snakemake" not in globals():
|
||||||
from _helpers import mock_snakemake
|
from _helpers import mock_snakemake
|
||||||
|
|
||||||
snakemake = mock_snakemake(
|
snakemake = mock_snakemake(
|
||||||
"prepare_sector_network",
|
"prepare_sector_network",
|
||||||
configfiles="test/config.overnight.yaml",
|
# configfiles="test/config.overnight.yaml",
|
||||||
simpl="",
|
simpl="",
|
||||||
opts="",
|
opts="",
|
||||||
clusters="5",
|
clusters="37",
|
||||||
ll="v1.5",
|
ll="v1.0",
|
||||||
sector_opts="CO2L0-24H-T-H-B-I-A-solar+p3-dist1",
|
sector_opts="8760H-T-H-B-I-A-solar+p3-dist1",
|
||||||
planning_horizons="2030",
|
planning_horizons="2020",
|
||||||
)
|
)
|
||||||
|
|
||||||
logging.basicConfig(level=snakemake.config["logging"]["level"])
|
logging.basicConfig(level=snakemake.config["logging"]["level"])
|
||||||
@ -3319,7 +3320,7 @@ if __name__ == "__main__":
|
|||||||
|
|
||||||
spatial = define_spatial(pop_layout.index, options)
|
spatial = define_spatial(pop_layout.index, options)
|
||||||
|
|
||||||
if snakemake.params.foresight == "myopic":
|
if snakemake.params.foresight in ["myopic", "perfect"]:
|
||||||
add_lifetime_wind_solar(n, costs)
|
add_lifetime_wind_solar(n, costs)
|
||||||
|
|
||||||
conventional = snakemake.params.conventional_carriers
|
conventional = snakemake.params.conventional_carriers
|
||||||
@ -3434,7 +3435,7 @@ if __name__ == "__main__":
|
|||||||
if options["electricity_grid_connection"]:
|
if options["electricity_grid_connection"]:
|
||||||
add_electricity_grid_connection(n, costs)
|
add_electricity_grid_connection(n, costs)
|
||||||
|
|
||||||
first_year_myopic = (snakemake.params.foresight == "myopic") and (
|
first_year_myopic = (snakemake.params.foresight in ["myopic", "perfect"]) and (
|
||||||
snakemake.params.planning_horizons[0] == investment_year
|
snakemake.params.planning_horizons[0] == investment_year
|
||||||
)
|
)
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user