Remove represent_hours function

Author: tsmbland

src/muse/objectives.py

@@ -214,12 +214,8 @@ def capacity_to_service_demand(
 ) -> xr.DataArray:
     """Minimum capacity required to fulfill the demand."""
     from muse.quantities import capacity_to_service_demand
-    from muse.timeslices import represent_hours
 
-    hours = represent_hours(demand.timeslice)
-    return capacity_to_service_demand(
-        demand=demand, technologies=technologies, hours=hours
-    )
+    return capacity_to_service_demand(demand=demand, technologies=technologies)
 
 
 @register_objective
@@ -230,13 +226,12 @@ def capacity_in_use(
     **kwargs,
 ):
     from muse.commodities import is_enduse
-    from muse.timeslices import represent_hours
+    from muse.timeslices import TIMESLICE
 
-    hours = represent_hours(demand.timeslice)
     enduses = is_enduse(technologies.comm_usage.sel(commodity=demand.commodity))
     return (
-        (demand.sel(commodity=enduses).sum("commodity") / hours).sum("timeslice")
-        * hours.sum()
+        (demand.sel(commodity=enduses).sum("commodity") / TIMESLICE).sum("timeslice")
+        * TIMESLICE.sum()
         / technologies.utilization_factor
     )
 

src/muse/quantities.py

@@ -529,14 +529,11 @@ def group_assets(x: xr.DataArray) -> xr.DataArray:
 def capacity_to_service_demand(
     demand: xr.DataArray,
     technologies: xr.Dataset,
-    hours=None,
 ) -> xr.DataArray:
     """Minimum capacity required to fulfill the demand."""
-    from muse.timeslices import represent_hours
+    from muse.timeslices import TIMESLICE
 
-    if hours is None:
-        hours = represent_hours(demand.timeslice)
-    max_hours = hours.max() / hours.sum()
+    max_hours = TIMESLICE.max() / TIMESLICE.sum()
     commodity_output = technologies.fixed_outputs.sel(commodity=demand.commodity)
     max_demand = (
         demand.where(commodity_output > 0, 0)

src/muse/timeslices.py

@@ -6,7 +6,6 @@
     "convert_timeslice",
     "timeslice_projector",
     "setup_module",
-    "represent_hours",
 ]
 
 from collections.abc import Mapping, Sequence
@@ -588,19 +587,6 @@ def new_to_old_timeslice(ts: DataArray, ag_level="Month") -> dict:
     return converted_ts
 
 
-def represent_hours(
-    timeslices: DataArray, nhours: Union[int, float] = 8765.82
-) -> DataArray:
-    """Number of hours per timeslice.
-
-    Arguments:
-        timeslices: The timeslice for which to compute the number of hours
-        nhours: The total number of hours represented in the timeslice. Defaults to the
-            average number of hours in year.
-    """
-    return convert_timeslice(DataArray([nhours]), timeslices).squeeze()
-
-
 def drop_timeslice(data: DataArray) -> DataArray:
     """Drop the timeslice variable from a DataArray.