Remove foresight parameter (#641)

* Move broadcast_techs out of quantities module

* Update _inner_split

* Fix trade model

* Fix constraints tests

* Fix demand_share tests

* Fix quantities tests

* Fix trade tests

* Fix adhoc model

* Rename broadcast_techs to broadcast_over_assets

* Better docstring, rename argument

* Delete filter_with_template

* Remove `broadcast_over_assets` from `capacity_in_use`

* Fix trade tests

* Edit TODO

* Remove foresight parameter

* Update settings and documentation

* Temporarily suppress test

* Fix carbon budget framework

* Revert change to settings

* Update settings and documentation

* Revert change to settings

* Update results

* Small changes to fix tests

* Add warning about deprecated parameter

* Clarify log messages

* Better final message

docs/advanced-guide/extending-muse.ipynb

@@ -560,7 +560,6 @@
    "outputs": [],
    "source": [
     "all_txt_files = sorted((Path() / \"Results\").glob(\"Residential*.txt\"))\n",
-    "assert len(all_txt_files) == 7\n",
     "assert \"Hello, you!\" in all_txt_files[0].read_text()\n",
     "all_txt_files"
    ]

docs/inputs/toml.rst

@@ -24,7 +24,6 @@ a whole.
 .. code-block:: TOML
 
    time_framework = [2020, 2025, 2030, 2035, 2040, 2045, 2050]
-   foresight = 5
    regions = ["USA"]
    interest_rate = 0.1
    interpolation_mode = 'Active'
@@ -38,10 +37,6 @@ a whole.
 *time_framework*
    Required. List of years for which the simulation will run.
 
-*foresight*
-   Required. Integer defining the number of years at which prices are updated at every iteration.
-   It needs to equal or be a multiple of the interval of years in the *time_framework*. Default to 5 years.
-
 *region*
    Subset of regions to consider. If not given, defaults to all regions found in the
    simulation data.

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

@@ -91,30 +91,3 @@ 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,27 +143,3 @@ 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

@@ -1,7 +1,6 @@
 # Global settings - most REQUIRED
 
 time_framework = [2020, 2025, 2030, 2035, 2040, 2045, 2050]
-foresight = 5  # Has to be a multiple of the minimum separation between the years in time framework
 regions = ["R1"]
 interest_rate = 0.1
 interpolation_mode = 'Active'

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

@@ -91,28 +91,3 @@ 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,27 +143,3 @@ 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

@@ -1,7 +1,6 @@
 # Global settings - most REQUIRED
 
 time_framework = [2020, 2025, 2030, 2035, 2040, 2045, 2050]
-foresight = 5  # Has to be a multiple of the minimum separation between the years in time framework
 regions = ["R1"]
 interest_rate = 0.1
 interpolation_mode = 'Active'

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

@@ -38,13 +38,3 @@ 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,27 +143,3 @@ 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

@@ -1,7 +1,6 @@
 # Global settings - most REQUIRED
 
 time_framework = [2020, 2025, 2030, 2035, 2040, 2045, 2050]
-foresight = 5  # Has to be a multiple of the minimum separation between the years in time framework
 regions = ["R1"]
 interest_rate = 0.1
 interpolation_mode = 'Active'

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

@@ -30,10 +30,3 @@ 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,27 +143,3 @@ 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

@@ -1,7 +1,6 @@
 # Global settings - most REQUIRED
 
 time_framework = [2020, 2025, 2030, 2035, 2040, 2045, 2050]
-foresight = 5  # Has to be a multiple of the minimum separation between the years in time framework
 regions = ["R1"]
 interest_rate = 0.1
 interpolation_mode = 'Active'

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

@@ -43,13 +43,3 @@ 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

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

@@ -143,27 +143,3 @@ electricity,all-week,evening,all-year,24.10890000000,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,12.24100000000,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,25.01660000000,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,12.60410000000,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,25.01660000000,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,12.60410000000,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,25.01660000000,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,12.60410000000,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,25.01660000000,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,12.60410000000,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,25.01660000000,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,12.60410000000,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,25.01660000000,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,12.60410000000,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/2-scenario/settings.toml

@@ -1,7 +1,6 @@
 # Global settings - most REQUIRED
 
 time_framework = [2020, 2025, 2030, 2035, 2040, 2045, 2050]
-foresight = 5  # Has to be a multiple of the minimum separation between the years in time framework
 regions = ["R1"]
 interest_rate = 0.1
 interpolation_mode = 'Active'

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

@@ -99,27 +99,3 @@ A1,12.27440000000,R2,2030,R2,gas,gassupply1,newcapa,2045
 A1,15.23330000000,R2,2035,R2,gas,gassupply1,newcapa,2045
 A1,7.73330000000,R2,2040,R2,gas,gassupply1,newcapa,2045
 A1,7.73330000000,R2,2045,R2,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,12.00000000000,R2,2045,R2,residential,gasboiler,newcapa,2050
-A1,22.00000000000,R2,2050,R2,residential,gasboiler,newcapa,2050
-A1,19.00000000000,R2,2045,R2,residential,heatpump,newcapa,2050
-A1,1.00000000000,R2,2050,R2,residential,heatpump,newcapa,2050
-A1,6.59380000000,R1,2025,R1,power,gasCCGT,newcapa,2050
-A1,0.27960000000,R1,2030,R1,power,gasCCGT,newcapa,2050
-A1,12.62080000000,R1,2030,R1,power,windturbine,newcapa,2050
-A1,6.00000000000,R1,2035,R1,power,windturbine,newcapa,2050
-A1,6.00000000000,R1,2040,R1,power,windturbine,newcapa,2050
-A1,6.00000000000,R1,2045,R1,power,windturbine,newcapa,2050
-A1,7.91410000000,R1,2050,R1,power,windturbine,newcapa,2050
-A1,6.59380000000,R2,2025,R2,power,gasCCGT,newcapa,2050
-A1,3.25000000000,R2,2030,R2,power,windturbine,newcapa,2050
-A1,1.91410000000,R2,2050,R2,power,windturbine,newcapa,2050
-A1,4.12600000000,R1,2025,R1,gas,gassupply1,newcapa,2050
-A1,7.35250000000,R1,2035,R1,gas,gassupply1,newcapa,2050
-A1,4.12600000000,R2,2025,R2,gas,gassupply1,newcapa,2050
-A1,12.27440000000,R2,2030,R2,gas,gassupply1,newcapa,2050
-A1,15.23330000000,R2,2035,R2,gas,gassupply1,newcapa,2050
-A1,7.73330000000,R2,2040,R2,gas,gassupply1,newcapa,2050
-A1,7.73330000000,R2,2045,R2,gas,gassupply1,newcapa,2050
-A1,7.73330000000,R2,2050,R2,gas,gassupply1,newcapa,2050