fix heating_system.sector bug
This commit is contained in:
parent
4315b3a18a
commit
6a1438cffd
@ -447,15 +447,17 @@ def get_efficiency(heat_system, carrier, nodes, heating_efficiencies, costs):
|
|||||||
- For other sectors, the default boiler efficiency is retrieved from the `costs` database.
|
- For other sectors, the default boiler efficiency is retrieved from the `costs` database.
|
||||||
"""
|
"""
|
||||||
|
|
||||||
if heat_system.sector.value == "residential":
|
if heat_system.value == "urban central":
|
||||||
|
boiler_costs_name = getattr(heat_system, f"{carrier}_boiler_costs_name")
|
||||||
|
efficiency = costs.at[boiler_costs_name, "efficiency"]
|
||||||
|
elif heat_system.sector.value == "residential":
|
||||||
key = f"{carrier} residential space efficiency"
|
key = f"{carrier} residential space efficiency"
|
||||||
efficiency = nodes.str[:2].map(heating_efficiencies[key])
|
efficiency = nodes.str[:2].map(heating_efficiencies[key])
|
||||||
elif heat_system.sector.value == "services":
|
elif heat_system.sector.value == "services":
|
||||||
key = f"{carrier} services space efficiency"
|
key = f"{carrier} services space efficiency"
|
||||||
efficiency = nodes.str[:2].map(heating_efficiencies[key])
|
efficiency = nodes.str[:2].map(heating_efficiencies[key])
|
||||||
else:
|
else:
|
||||||
boiler_costs_name = getattr(heat_system, f"{carrier}_boiler_costs_name")
|
logger.warning(f"{heat_system} not defined.")
|
||||||
efficiency = costs.at[boiler_costs_name, "efficiency"]
|
|
||||||
|
|
||||||
return efficiency
|
return efficiency
|
||||||
|
|
||||||
@ -671,13 +673,13 @@ if __name__ == "__main__":
|
|||||||
|
|
||||||
snakemake = mock_snakemake(
|
snakemake = mock_snakemake(
|
||||||
"add_existing_baseyear",
|
"add_existing_baseyear",
|
||||||
configfiles="config/config.yaml",
|
configfiles="config/test/config.myopic.yaml",
|
||||||
simpl="",
|
simpl="",
|
||||||
clusters="38",
|
clusters="5",
|
||||||
ll="vopt",
|
ll="v1.5",
|
||||||
opts="",
|
opts="",
|
||||||
sector_opts="",
|
sector_opts="",
|
||||||
planning_horizons=2020,
|
planning_horizons=2030,
|
||||||
)
|
)
|
||||||
|
|
||||||
configure_logging(snakemake)
|
configure_logging(snakemake)
|
||||||
|
Loading…
Reference in New Issue
Block a user