Remove remains of the forecast feature

docs/advanced-guide/extending-muse.ipynb

@@ -100,6 +100,7 @@
     "def consumption_zero(\n",
     "    market: Dataset,\n",
     "    capacity: DataArray,\n",
+    "    **kwargs,\n",
     "):\n",
     "    \"\"\"Current consumption.\"\"\"\n",
     "    result = (\n",
@@ -300,13 +301,15 @@
     "def capacity(\n",
     "    cached: list[xr.DataArray],\n",
     "    agents: MutableMapping[str, MutableMapping[str, str]],\n",
+    "    **kwargs,\n",
     ") -> pd.DataFrame:\n",
     "    \"\"\"Consolidates the cached capacity into a single DataFrame to save.\n",
     "\n",
     "    Args:\n",
     "        cached (list[xr.DataArray]): The list of cached arrays during the calculation of\n",
     "        the time period with the capacity.\n",
     "        agents (MutableMapping[Text, MutableMapping[Text, Text]]): Agents' metadata.\n",
+    "        kwargs: unused.\n",
     "\n",
     "    Returns:\n",
     "        pd.DataFrame: DataFrame with the consolidated data for retro agents.\n",
@@ -457,6 +460,7 @@
     "    sum_over: Optional[list[str]] = None,\n",
     "    drop: Optional[list[str]] = None,\n",
     "    rounding: int = 4,\n",
+    "    **kwargs,\n",
     "):\n",
     "    \"\"\"Current consumption.\"\"\"\n",
     "    result = (\n",
@@ -652,6 +656,11 @@
    "source": [
     "In the next section we will output a technology filter, to stop agents from investing in a certain technology, and a new metric to combine multiple objectives."
    ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": []
   }
  ],
  "metadata": {

docs/application-flow.rst

@@ -414,7 +414,7 @@ This deeper level of the process is where most of the input options of MUSE are
 Investment
 ~~~~~~~~~~
 
-In the investment step is where new capacity is added to the different assets managed by the agents. This investment might be needed to cover an increase in demand (between now and forecast) or to match decommissioned assets, typically to do both.
+In the investment step is where new capacity is added to the different assets managed by the agents. This investment might be needed to cover an increase in demand (between now and the investment year) or to match decommissioned assets, typically to do both.
 
 The following graph summarises the process.
 
@@ -455,8 +455,8 @@ The following graph summarises the process.
 
 First the demand is distributed among the available agents as requested by the ``demand_share`` argument of each ``subsector`` in the ``settings.toml`` file. This distribution can be done based on any attribute or property of the agents, as included in the ``Agents.csv`` file. Demand can also be shared across multiple agents, depending on the "quantity" attribute (defined in ``Agents.csv``). The two built-in options in MUSE are:
 
-- `standard_demand` (default): The demand is split only amongst *new* agents (indeed there will be an error if a *retro* agent is found for this subsector). *New* agents get a share of the increase in demand for the forecast years well as the demand that occurs from decommissioned assets.
-- `new_and_retro`: The input demand is split amongst both *new* and *retro* agents. *New* agents get a share of the increase in demand for the forecast year, whereas *retrofit* agents are assigned a share of the demand that occurs from decommissioned assets.
+- `standard_demand` (default): The demand is split only amongst *new* agents (indeed there will be an error if a *retro* agent is found for this subsector). *New* agents get a share of the increase in demand over the investment period as well as the demand that occurs from decommissioned assets.
+- `new_and_retro`: The input demand is split amongst both *new* and *retro* agents. *New* agents get a share of the increase in demand for the investment period, whereas *retrofit* agents are assigned a share of the demand that occurs from decommissioned assets.
 
 Then, each agent select the technologies it can invest in based on what is needed and the **search rules** defined for it in the ``Agents.csv`` file. The possible search rules are described in :py:mod:`muse.filters`. These determine the search rules for each replacement technology.
 

docs/inputs/toml.rst

@@ -455,11 +455,11 @@ Sectors contain a number of subsections:
 
         - :py:func:`~muse.demand_share.standard_demand` (default): The input demand is
           split amongst *new* agents. *New* agents get a share of the increase in demand
-          for the forecast years, as well as the demand that occurs from decommissioned
+          over the investment period, as well as the demand that occurs from decommissioned
           assets.
         - :py:func:`~muse.demand_share.new_and_retro`: The input demand is split amongst
           both *new* and *retrofit* agents. *New* agents get a share of the increase in
-          demand for the forecast year, whereas *retrofit* agents are assigned a share
+          demand over the investment period, whereas *retrofit* agents are assigned a share
           of the demand that occurs from decommissioned assets.
 
     *constraints*
@@ -577,7 +577,6 @@ function of macro-economic data, i.e. population and gdp.
     macrodrivers_path = '{path}/technodata/Macrodrivers.csv'
     regression_path = '{path}/technodata/regressionparameters.csv'
     timeslices_levels = {'day': ['all-day']}
-    forecast = [0, 5]
 
 The following attributes are accepted:
 

docs/tutorial-code/add-agent/1-single-objective/Results/MCACapacity.csv

@@ -91,3 +91,30 @@ A2,3.23720000000,R1,2030,R1,gas,gassupply1,newcapa,2045
 A2,5.68330000000,R1,2035,R1,gas,gassupply1,newcapa,2045
 A2,1.93330000000,R1,2040,R1,gas,gassupply1,newcapa,2045
 A2,1.93330000000,R1,2045,R1,gas,gassupply1,newcapa,2045
+A1,15.50000000000,R1,2045,R1,residential,heatpump,newcapa,2050
+A1,11.50000000000,R1,2050,R1,residential,heatpump,newcapa,2050
+A2,15.50000000000,R1,2045,R1,residential,gasboiler,newcapa,2050
+A2,11.50000000000,R1,2050,R1,residential,gasboiler,newcapa,2050
+A1,1.61110000000,R1,2025,R1,power,gasCCGT,newcapa,2050
+A1,3.87500000000,R1,2030,R1,power,windturbine,newcapa,2050
+A1,1.50000000000,R1,2035,R1,power,windturbine,newcapa,2050
+A1,1.50000000000,R1,2040,R1,power,windturbine,newcapa,2050
+A1,1.50000000000,R1,2045,R1,power,windturbine,newcapa,2050
+A1,1.50000000000,R1,2050,R1,power,windturbine,newcapa,2050
+A2,3.87500000000,R1,2030,R1,power,windturbine,newcapa,2050
+A2,1.50000000000,R1,2035,R1,power,windturbine,newcapa,2050
+A2,1.50000000000,R1,2040,R1,power,windturbine,newcapa,2050
+A2,1.50000000000,R1,2045,R1,power,windturbine,newcapa,2050
+A2,3.31250000000,R1,2050,R1,power,windturbine,newcapa,2050
+A1,4.02470000000,R1,2025,R1,gas,gassupply1,newcapa,2050
+A1,3.23720000000,R1,2030,R1,gas,gassupply1,newcapa,2050
+A1,5.68330000000,R1,2035,R1,gas,gassupply1,newcapa,2050
+A1,1.93330000000,R1,2040,R1,gas,gassupply1,newcapa,2050
+A1,1.93330000000,R1,2045,R1,gas,gassupply1,newcapa,2050
+A1,1.93330000000,R1,2050,R1,gas,gassupply1,newcapa,2050
+A2,4.02470000000,R1,2025,R1,gas,gassupply1,newcapa,2050
+A2,3.23720000000,R1,2030,R1,gas,gassupply1,newcapa,2050
+A2,5.68330000000,R1,2035,R1,gas,gassupply1,newcapa,2050
+A2,1.93330000000,R1,2040,R1,gas,gassupply1,newcapa,2050
+A2,1.93330000000,R1,2045,R1,gas,gassupply1,newcapa,2050
+A2,1.93330000000,R1,2050,R1,gas,gassupply1,newcapa,2050

docs/tutorial-code/add-agent/1-single-objective/Results/MCAPrices.csv

@@ -143,3 +143,27 @@ electricity,all-week,evening,all-year,21.57000000000,R1,5,MUS$2010/PJ,2045
 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2045
 heat,all-week,evening,all-year,19.10030000000,R1,5,MUS$2010/PJ,2045
 CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045
+electricity,all-week,night,all-year,21.69980000000,R1,0,MUS$2010/PJ,2050
+gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050
+heat,all-week,night,all-year,21.75320000000,R1,0,MUS$2010/PJ,2050
+CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050
+electricity,all-week,morning,all-year,21.69980000000,R1,1,MUS$2010/PJ,2050
+gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050
+heat,all-week,morning,all-year,21.75320000000,R1,1,MUS$2010/PJ,2050
+CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050
+electricity,all-week,afternoon,all-year,21.69980000000,R1,2,MUS$2010/PJ,2050
+gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050
+heat,all-week,afternoon,all-year,21.75320000000,R1,2,MUS$2010/PJ,2050
+CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050
+electricity,all-week,early-peak,all-year,21.69980000000,R1,3,MUS$2010/PJ,2050
+gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050
+heat,all-week,early-peak,all-year,21.75320000000,R1,3,MUS$2010/PJ,2050
+CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050
+electricity,all-week,late-peak,all-year,21.69980000000,R1,4,MUS$2010/PJ,2050
+gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050
+heat,all-week,late-peak,all-year,21.75320000000,R1,4,MUS$2010/PJ,2050
+CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050
+electricity,all-week,evening,all-year,21.69980000000,R1,5,MUS$2010/PJ,2050
+gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050
+heat,all-week,evening,all-year,21.75320000000,R1,5,MUS$2010/PJ,2050
+CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050

docs/tutorial-code/add-agent/1-single-objective/settings.toml

@@ -51,7 +51,6 @@ constraints = [
     "demand_limiting_capacity"
 ]
 demand_share = "standard_demand"  # Optional, default to standard_demand
-forecast = 5  # Optional, defaults to 5
 
 [sectors.power]
 type = 'default'

docs/tutorial-code/add-agent/2-multiple-objective/Results/MCACapacity.csv

@@ -91,3 +91,28 @@ A2,3.23720000000,R1,2030,R1,gas,gassupply1,newcapa,2045
 A2,5.68330000000,R1,2035,R1,gas,gassupply1,newcapa,2045
 A2,1.93330000000,R1,2040,R1,gas,gassupply1,newcapa,2045
 A2,1.93330000000,R1,2045,R1,gas,gassupply1,newcapa,2045
+A1,15.50000000000,R1,2045,R1,residential,heatpump,newcapa,2050
+A1,11.50000000000,R1,2050,R1,residential,heatpump,newcapa,2050
+A2,15.50000000000,R1,2045,R1,residential,gasboiler,newcapa,2050
+A2,11.50000000000,R1,2050,R1,residential,heatpump,newcapa,2050
+A1,1.61110000000,R1,2025,R1,power,gasCCGT,newcapa,2050
+A1,3.87500000000,R1,2030,R1,power,windturbine,newcapa,2050
+A1,1.50000000000,R1,2035,R1,power,windturbine,newcapa,2050
+A1,1.50000000000,R1,2040,R1,power,windturbine,newcapa,2050
+A1,1.50000000000,R1,2045,R1,power,windturbine,newcapa,2050
+A1,7.25000000000,R1,2050,R1,power,windturbine,newcapa,2050
+A2,3.87500000000,R1,2030,R1,power,windturbine,newcapa,2050
+A2,1.50000000000,R1,2035,R1,power,windturbine,newcapa,2050
+A2,1.50000000000,R1,2040,R1,power,windturbine,newcapa,2050
+A2,1.50000000000,R1,2045,R1,power,windturbine,newcapa,2050
+A2,9.06250000000,R1,2050,R1,power,windturbine,newcapa,2050
+A1,4.02470000000,R1,2025,R1,gas,gassupply1,newcapa,2050
+A1,3.23720000000,R1,2030,R1,gas,gassupply1,newcapa,2050
+A1,5.68330000000,R1,2035,R1,gas,gassupply1,newcapa,2050
+A1,1.93330000000,R1,2040,R1,gas,gassupply1,newcapa,2050
+A1,1.93330000000,R1,2045,R1,gas,gassupply1,newcapa,2050
+A2,4.02470000000,R1,2025,R1,gas,gassupply1,newcapa,2050
+A2,3.23720000000,R1,2030,R1,gas,gassupply1,newcapa,2050
+A2,5.68330000000,R1,2035,R1,gas,gassupply1,newcapa,2050
+A2,1.93330000000,R1,2040,R1,gas,gassupply1,newcapa,2050
+A2,1.93330000000,R1,2045,R1,gas,gassupply1,newcapa,2050

docs/tutorial-code/add-agent/2-multiple-objective/Results/MCAPrices.csv

@@ -143,3 +143,27 @@ electricity,all-week,evening,all-year,21.57000000000,R1,5,MUS$2010/PJ,2045
 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2045
 heat,all-week,evening,all-year,19.10030000000,R1,5,MUS$2010/PJ,2045
 CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045
+electricity,all-week,night,all-year,20.51220000000,R1,0,MUS$2010/PJ,2050
+gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050
+heat,all-week,night,all-year,16.95260000000,R1,0,MUS$2010/PJ,2050
+CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050
+electricity,all-week,morning,all-year,20.51220000000,R1,1,MUS$2010/PJ,2050
+gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050
+heat,all-week,morning,all-year,16.95260000000,R1,1,MUS$2010/PJ,2050
+CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050
+electricity,all-week,afternoon,all-year,20.51220000000,R1,2,MUS$2010/PJ,2050
+gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050
+heat,all-week,afternoon,all-year,16.95260000000,R1,2,MUS$2010/PJ,2050
+CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050
+electricity,all-week,early-peak,all-year,20.51220000000,R1,3,MUS$2010/PJ,2050
+gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050
+heat,all-week,early-peak,all-year,16.95260000000,R1,3,MUS$2010/PJ,2050
+CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050
+electricity,all-week,late-peak,all-year,20.51220000000,R1,4,MUS$2010/PJ,2050
+gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050
+heat,all-week,late-peak,all-year,16.95260000000,R1,4,MUS$2010/PJ,2050
+CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050
+electricity,all-week,evening,all-year,20.51220000000,R1,5,MUS$2010/PJ,2050
+gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050
+heat,all-week,evening,all-year,16.95260000000,R1,5,MUS$2010/PJ,2050
+CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050

docs/tutorial-code/add-agent/2-multiple-objective/settings.toml

@@ -51,7 +51,6 @@ constraints = [
     "demand_limiting_capacity"
 ]
 demand_share = "standard_demand"  # Optional, default to standard_demand
-forecast = 5  # Optional, defaults to 5
 
 [sectors.power]
 type = 'default'

docs/tutorial-code/add-correlation-demand/1-correlation/Results/MCACapacity.csv

@@ -38,3 +38,13 @@ A1,0.49190000000,R1,2040,R1,power,windturbine,newcapa,2045
 A1,0.31700000000,R1,2045,R1,power,windturbine,newcapa,2045
 A1,0.24960000000,R1,2025,R1,gas,gassupply1,newcapa,2045
 A1,6.88560000000,R1,2035,R1,gas,gassupply1,newcapa,2045
+A1,12.67390000000,R1,2045,R1,residential,heatpump,newcapa,2050
+A1,6.46840000000,R1,2050,R1,residential,heatpump,newcapa,2050
+A1,4.27250000000,R1,2025,R1,power,gasCCGT,newcapa,2050
+A1,7.91060000000,R1,2030,R1,power,windturbine,newcapa,2050
+A1,0.49370000000,R1,2035,R1,power,windturbine,newcapa,2050
+A1,0.49190000000,R1,2040,R1,power,windturbine,newcapa,2050
+A1,0.31700000000,R1,2045,R1,power,windturbine,newcapa,2050
+A1,0.31590000000,R1,2050,R1,power,windturbine,newcapa,2050
+A1,0.24960000000,R1,2025,R1,gas,gassupply1,newcapa,2050
+A1,6.88560000000,R1,2035,R1,gas,gassupply1,newcapa,2050

docs/tutorial-code/add-correlation-demand/1-correlation/Results/MCAPrices.csv

@@ -143,3 +143,27 @@ electricity,all-week,evening,all-year,30.07470000000,R1,5,MUS$2010/PJ,2045
 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2045
 heat,all-week,evening,all-year,14.62850000000,R1,5,MUS$2010/PJ,2045
 CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045
+electricity,all-week,night,all-year,33.61330000000,R1,0,MUS$2010/PJ,2050
+gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050
+heat,all-week,night,all-year,16.04400000000,R1,0,MUS$2010/PJ,2050
+CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050
+electricity,all-week,morning,all-year,33.61330000000,R1,1,MUS$2010/PJ,2050
+gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050
+heat,all-week,morning,all-year,16.04400000000,R1,1,MUS$2010/PJ,2050
+CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050
+electricity,all-week,afternoon,all-year,33.61330000000,R1,2,MUS$2010/PJ,2050
+gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050
+heat,all-week,afternoon,all-year,16.04400000000,R1,2,MUS$2010/PJ,2050
+CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050
+electricity,all-week,early-peak,all-year,33.61330000000,R1,3,MUS$2010/PJ,2050
+gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050
+heat,all-week,early-peak,all-year,16.04400000000,R1,3,MUS$2010/PJ,2050
+CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050
+electricity,all-week,late-peak,all-year,33.61330000000,R1,4,MUS$2010/PJ,2050
+gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050
+heat,all-week,late-peak,all-year,16.04400000000,R1,4,MUS$2010/PJ,2050
+CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050
+electricity,all-week,evening,all-year,33.61330000000,R1,5,MUS$2010/PJ,2050
+gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050
+heat,all-week,evening,all-year,16.04400000000,R1,5,MUS$2010/PJ,2050
+CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050

docs/tutorial-code/add-correlation-demand/1-correlation/settings.toml

@@ -51,7 +51,6 @@ constraints = [
     "demand_limiting_capacity"
 ]
 demand_share = "standard_demand"  # Optional, default to standard_demand
-forecast = 5  # Optional, defaults to 5
 
 [sectors.power]
 type = 'default'

docs/tutorial-code/add-new-technology/1-introduction/Results/MCACapacity.csv

@@ -30,3 +30,10 @@ A1,13.25000000000,R1,2030,R1,power,solarPV,newcapa,2045
 A1,6.00000000000,R1,2035,R1,power,solarPV,newcapa,2045
 A1,6.00000000000,R1,2040,R1,power,solarPV,newcapa,2045
 A1,6.00000000000,R1,2045,R1,power,solarPV,newcapa,2045
+A1,31.00000000000,R1,2045,R1,residential,heatpump,newcapa,2050
+A1,23.00000000000,R1,2050,R1,residential,heatpump,newcapa,2050
+A1,13.25000000000,R1,2030,R1,power,solarPV,newcapa,2050
+A1,6.00000000000,R1,2035,R1,power,solarPV,newcapa,2050
+A1,6.00000000000,R1,2040,R1,power,solarPV,newcapa,2050
+A1,6.00000000000,R1,2045,R1,power,solarPV,newcapa,2050
+A1,22.75000000000,R1,2050,R1,power,solarPV,newcapa,2050

docs/tutorial-code/add-new-technology/1-introduction/Results/MCAPrices.csv

@@ -143,3 +143,27 @@ electricity,all-week,evening,all-year,14.87270000000,R1,5,MUS$2010/PJ,2045
 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2045
 heat,all-week,evening,all-year,8.54650000000,R1,5,MUS$2010/PJ,2045
 CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045
+electricity,all-week,night,all-year,14.87270000000,R1,0,MUS$2010/PJ,2050
+gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050
+heat,all-week,night,all-year,8.54650000000,R1,0,MUS$2010/PJ,2050
+CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050
+electricity,all-week,morning,all-year,14.87270000000,R1,1,MUS$2010/PJ,2050
+gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050
+heat,all-week,morning,all-year,8.54650000000,R1,1,MUS$2010/PJ,2050
+CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050
+electricity,all-week,afternoon,all-year,14.87270000000,R1,2,MUS$2010/PJ,2050
+gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050
+heat,all-week,afternoon,all-year,8.54650000000,R1,2,MUS$2010/PJ,2050
+CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050
+electricity,all-week,early-peak,all-year,14.87270000000,R1,3,MUS$2010/PJ,2050
+gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050
+heat,all-week,early-peak,all-year,8.54650000000,R1,3,MUS$2010/PJ,2050
+CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050
+electricity,all-week,late-peak,all-year,14.87270000000,R1,4,MUS$2010/PJ,2050
+gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050
+heat,all-week,late-peak,all-year,8.54650000000,R1,4,MUS$2010/PJ,2050
+CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050
+electricity,all-week,evening,all-year,14.87270000000,R1,5,MUS$2010/PJ,2050
+gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050
+heat,all-week,evening,all-year,8.54650000000,R1,5,MUS$2010/PJ,2050
+CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050

docs/tutorial-code/add-new-technology/1-introduction/settings.toml

@@ -51,7 +51,6 @@ constraints = [
     "demand_limiting_capacity"
 ]
 demand_share = "standard_demand"  # Optional, default to standard_demand
-forecast = 5  # Optional, defaults to 5
 
 [sectors.power]
 type = 'default'

docs/tutorial-code/add-new-technology/2-scenario/Results/MCACapacity.csv

@@ -43,3 +43,13 @@ A1,6.00000000000,R1,2045,R1,power,solarPV,newcapa,2045
 A1,1.91410000000,R1,2025,R1,power,windturbine,newcapa,2045
 A1,4.12600000000,R1,2025,R1,gas,gassupply1,newcapa,2045
 A1,6.88560000000,R1,2035,R1,gas,gassupply1,newcapa,2045
+A1,31.00000000000,R1,2045,R1,residential,heatpump,newcapa,2050
+A1,23.00000000000,R1,2050,R1,residential,heatpump,newcapa,2050
+A1,6.59380000000,R1,2025,R1,power,gasCCGT,newcapa,2050
+A1,13.25000000000,R1,2030,R1,power,solarPV,newcapa,2050
+A1,6.00000000000,R1,2035,R1,power,solarPV,newcapa,2050
+A1,6.00000000000,R1,2040,R1,power,solarPV,newcapa,2050
+A1,6.00000000000,R1,2045,R1,power,solarPV,newcapa,2050
+A1,7.91410000000,R1,2050,R1,power,solarPV,newcapa,2050
+A1,4.12600000000,R1,2025,R1,gas,gassupply1,newcapa,2050
+A1,6.88560000000,R1,2035,R1,gas,gassupply1,newcapa,2050