Tidy outputs module

Author: tsmbland

src/muse/outputs/mca.py

@@ -257,15 +257,14 @@ def sector_fuel_costs(
     agent_market = market.copy()
     if len(technologies) > 0:
         for a in agents:
-            output_year = a.year
             agent_market["consumption"] = (market.consumption * a.quantity).sel(
-                year=output_year
+                year=a.year
             )
             commodity = is_fuel(technologies.comm_usage)
 
             capacity = a.filter_input(
                 a.assets.capacity,
-                year=output_year,
+                year=a.year,
             ).fillna(0.0)
 
             production = supply(
@@ -274,7 +273,7 @@ def sector_fuel_costs(
                 technologies,
             )
 
-            prices = a.filter_input(market.prices, year=output_year)
+            prices = a.filter_input(market.prices, year=a.year)
             fcons = consumption(
                 technologies=technologies, production=production, prices=prices
             )
@@ -283,7 +282,7 @@ def sector_fuel_costs(
             data_agent["agent"] = a.name
             data_agent["category"] = a.category
             data_agent["sector"] = getattr(sector, "name", "unnamed")
-            data_agent["year"] = output_year
+            data_agent["year"] = a.year
             data_agent = multiindex_to_coords(data_agent, "timeslice").to_dataframe(
                 "fuel_consumption_costs"
             )
@@ -315,18 +314,17 @@ def sector_capital_costs(
 
     if len(technologies) > 0:
         for a in agents:
-            output_year = a.year
-            capacity = a.filter_input(a.assets.capacity, year=output_year).fillna(0.0)
+            capacity = a.filter_input(a.assets.capacity, year=a.year).fillna(0.0)
             data = a.filter_input(
                 technologies[["cap_par", "cap_exp"]],
-                year=output_year,
+                year=a.year,
                 technology=capacity.technology,
             )
             data_agent = distribute_timeslice(data.cap_par * (capacity**data.cap_exp))
             data_agent["agent"] = a.name
             data_agent["category"] = a.category
             data_agent["sector"] = getattr(sector, "name", "unnamed")
-            data_agent["year"] = output_year
+            data_agent["year"] = a.year
             data_agent = multiindex_to_coords(data_agent, "timeslice").to_dataframe(
                 "capital_costs"
             )
@@ -362,23 +360,22 @@ def sector_emission_costs(
     agent_market = market.copy()
     if len(technologies) > 0:
         for a in agents:
-            output_year = a.year
             agent_market["consumption"] = (market.consumption * a.quantity).sel(
-                year=output_year
+                year=a.year
             )
 
-            capacity = a.filter_input(a.assets.capacity, year=output_year).fillna(0.0)
+            capacity = a.filter_input(a.assets.capacity, year=a.year).fillna(0.0)
             allemissions = a.filter_input(
                 technologies.fixed_outputs,
                 commodity=is_pollutant(technologies.comm_usage),
                 technology=capacity.technology,
-                year=output_year,
+                year=a.year,
             )
             envs = is_pollutant(technologies.comm_usage)
             enduses = is_enduse(technologies.comm_usage)
             i = (np.where(envs))[0][0]
             red_envs = envs[i].commodity.values
-            prices = a.filter_input(market.prices, year=output_year, commodity=red_envs)
+            prices = a.filter_input(market.prices, year=a.year, commodity=red_envs)
             production = supply(
                 agent_market,
                 capacity,
@@ -390,7 +387,7 @@ def sector_emission_costs(
             data_agent["agent"] = a.name
             data_agent["category"] = a.category
             data_agent["sector"] = getattr(sector, "name", "unnamed")
-            data_agent["year"] = output_year
+            data_agent["year"] = a.year
             data_agent = multiindex_to_coords(data_agent, "timeslice").to_dataframe(
                 "emission_costs"
             )
@@ -427,8 +424,7 @@ def sector_lcoe(sector: AbstractSector, market: xr.Dataset, **kwargs) -> pd.Data
     agents = retro if len(retro) > 0 else new
     if len(technologies) > 0:
         for agent in agents:
-            output_year = agent.year
-            agent_market = market.sel(year=output_year).copy()
+            agent_market = market.sel(year=agent.year).copy()
             agent_market["consumption"] = agent_market.consumption * agent.quantity
             included = [
                 i
@@ -439,16 +435,15 @@ def sector_lcoe(sector: AbstractSector, market: xr.Dataset, **kwargs) -> pd.Data
                 i for i in agent_market["commodity"].values if i not in included
             ]
             agent_market.loc[dict(commodity=excluded)] = 0
-            years = [output_year, agent.year]
-            agent_market["prices"] = agent.filter_input(market["prices"], year=years)
+            agent_market["prices"] = agent.filter_input(
+                market["prices"], year=agent.year
+            )
 
             techs = agent.filter_input(
                 technologies,
                 year=agent.year,
             )
-            prices = agent_market["prices"].sel(
-                commodity=techs.commodity, year=agent.year
-            )
+            prices = agent_market["prices"].sel(commodity=techs.commodity)
             demand = agent_market.consumption.sel(commodity=included)
             capacity = agent.filter_input(capacity_to_service_demand(demand, techs))
             production = (
@@ -473,7 +468,7 @@ def sector_lcoe(sector: AbstractSector, market: xr.Dataset, **kwargs) -> pd.Data
             data_agent["agent"] = agent.name
             data_agent["category"] = agent.category
             data_agent["sector"] = getattr(sector, "name", "unnamed")
-            data_agent["year"] = output_year
+            data_agent["year"] = agent.year
             data_agent = data_agent.fillna(0)
             data_agent = multiindex_to_coords(data_agent, "timeslice").to_dataframe(
                 "LCOE"
@@ -510,8 +505,7 @@ def sector_eac(sector: AbstractSector, market: xr.Dataset, **kwargs) -> pd.DataF
     agents = retro if len(retro) > 0 else new
     if len(technologies) > 0:
         for agent in agents:
-            output_year = agent.year
-            agent_market = market.sel(year=output_year).copy()
+            agent_market = market.sel(year=agent.year).copy()
             agent_market["consumption"] = agent_market.consumption * agent.quantity
             included = [
                 i
@@ -522,16 +516,15 @@ def sector_eac(sector: AbstractSector, market: xr.Dataset, **kwargs) -> pd.DataF
                 i for i in agent_market["commodity"].values if i not in included
             ]
             agent_market.loc[dict(commodity=excluded)] = 0
-            years = [output_year, agent.year]
-            agent_market["prices"] = agent.filter_input(market["prices"], year=years)
+            agent_market["prices"] = agent.filter_input(
+                market["prices"], year=agent.year
+            )
 
             techs = agent.filter_input(
                 technologies,
                 year=agent.year,
             )
-            prices = agent_market["prices"].sel(
-                commodity=techs.commodity, year=agent.year
-            )
+            prices = agent_market["prices"].sel(commodity=techs.commodity)
             demand = agent_market.consumption.sel(commodity=included)
             capacity = agent.filter_input(capacity_to_service_demand(demand, techs))
             production = (
@@ -555,7 +548,7 @@ def sector_eac(sector: AbstractSector, market: xr.Dataset, **kwargs) -> pd.DataF
             data_agent["agent"] = agent.name
             data_agent["category"] = agent.category
             data_agent["sector"] = getattr(sector, "name", "unnamed")
-            data_agent["year"] = output_year
+            data_agent["year"] = agent.year
             data_agent = multiindex_to_coords(data_agent, "timeslice").to_dataframe(
                 "capital_costs"
             )