Fix outputs - save data for investment year

Author: tsmbland

src/muse/mca.py

@@ -325,8 +325,9 @@ def run(self) -> None:
             )
 
             # Global outputs
-            self.outputs(self.market, self.sectors, year=self.time_framework[year_idx])  # type: ignore
-            self.outputs_cache.consolidate_cache(year=self.time_framework[year_idx])
+            investment_year = years[1]
+            self.outputs(self.market, self.sectors, year=investment_year)
+            self.outputs_cache.consolidate_cache(year=investment_year)
 
             getLogger(__name__).info(
                 f"Finished simulation period {years[0]} to {years[1]} "

src/muse/outputs/sector.py

@@ -102,10 +102,7 @@ def _factory(
     quantities = [_quantity_factory(param, registry) for param in params]
     sinks = [sink_factory(param, sector_name=sector_name) for param in params]
 
-    def save_multiple_outputs(market, *args, year: int | None = None) -> list[Any]:
-        if year is None:
-            year = int(market.year.min())
-
+    def save_multiple_outputs(market, *args, year: int) -> list[Any]:
         return [
             sink(quantity(market, *args), year=year)
             for quantity, sink in zip(quantities, sinks)

src/muse/sectors/sector.py

@@ -277,7 +277,8 @@ def group_assets(x: xr.DataArray) -> xr.DataArray:
 
     def save_outputs(self) -> None:
         """Calls the outputs function with the current output data."""
-        self.outputs(self.output_data, self.capacity)
+        investment_year = self.output_data.year.values[1]
+        self.outputs(self.output_data, self.capacity, year=investment_year)
 
     def market_variables(self, market: xr.Dataset, technologies: xr.Dataset) -> Any:
         """Computes resulting market: production, consumption, and costs."""