diff --git a/docs/advanced-guide/extending-muse.ipynb b/docs/advanced-guide/extending-muse.ipynb index e679b7e4a..27048ba2c 100644 --- a/docs/advanced-guide/extending-muse.ipynb +++ b/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" ] diff --git a/docs/inputs/toml.rst b/docs/inputs/toml.rst index 66241f1e2..d0014ce3c 100644 --- a/docs/inputs/toml.rst +++ b/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. diff --git a/docs/tutorial-code/add-agent/1-single-objective/Results/MCACapacity.csv b/docs/tutorial-code/add-agent/1-single-objective/Results/MCACapacity.csv index d3f0aeb81..ea0c8ef96 100644 --- a/docs/tutorial-code/add-agent/1-single-objective/Results/MCACapacity.csv +++ b/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 diff --git a/docs/tutorial-code/add-agent/1-single-objective/Results/MCAPrices.csv b/docs/tutorial-code/add-agent/1-single-objective/Results/MCAPrices.csv index 94c5c0571..7964d0a1e 100644 --- a/docs/tutorial-code/add-agent/1-single-objective/Results/MCAPrices.csv +++ b/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 diff --git a/docs/tutorial-code/add-agent/1-single-objective/settings.toml b/docs/tutorial-code/add-agent/1-single-objective/settings.toml index 8c508b8cd..7cf1d26dc 100644 --- a/docs/tutorial-code/add-agent/1-single-objective/settings.toml +++ b/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' diff --git a/docs/tutorial-code/add-agent/2-multiple-objective/Results/MCACapacity.csv b/docs/tutorial-code/add-agent/2-multiple-objective/Results/MCACapacity.csv index 08471d84e..ea0c8ef96 100644 --- a/docs/tutorial-code/add-agent/2-multiple-objective/Results/MCACapacity.csv +++ b/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 diff --git a/docs/tutorial-code/add-agent/2-multiple-objective/Results/MCAPrices.csv b/docs/tutorial-code/add-agent/2-multiple-objective/Results/MCAPrices.csv index ba2ac2718..7964d0a1e 100644 --- a/docs/tutorial-code/add-agent/2-multiple-objective/Results/MCAPrices.csv +++ b/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 diff --git a/docs/tutorial-code/add-agent/2-multiple-objective/settings.toml b/docs/tutorial-code/add-agent/2-multiple-objective/settings.toml index 8c508b8cd..7cf1d26dc 100644 --- a/docs/tutorial-code/add-agent/2-multiple-objective/settings.toml +++ b/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' diff --git a/docs/tutorial-code/add-correlation-demand/1-correlation/Results/MCACapacity.csv b/docs/tutorial-code/add-correlation-demand/1-correlation/Results/MCACapacity.csv index 0c2b73d2f..0f784f8f5 100644 --- a/docs/tutorial-code/add-correlation-demand/1-correlation/Results/MCACapacity.csv +++ b/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 diff --git a/docs/tutorial-code/add-correlation-demand/1-correlation/Results/MCAPrices.csv b/docs/tutorial-code/add-correlation-demand/1-correlation/Results/MCAPrices.csv index f806474f7..618937468 100644 --- a/docs/tutorial-code/add-correlation-demand/1-correlation/Results/MCAPrices.csv +++ b/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 diff --git a/docs/tutorial-code/add-correlation-demand/1-correlation/settings.toml b/docs/tutorial-code/add-correlation-demand/1-correlation/settings.toml index ab825a656..6bf2121c7 100644 --- a/docs/tutorial-code/add-correlation-demand/1-correlation/settings.toml +++ b/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' diff --git a/docs/tutorial-code/add-new-technology/1-introduction/Results/MCACapacity.csv b/docs/tutorial-code/add-new-technology/1-introduction/Results/MCACapacity.csv index d0767bf6a..593bcae69 100644 --- a/docs/tutorial-code/add-new-technology/1-introduction/Results/MCACapacity.csv +++ b/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 diff --git a/docs/tutorial-code/add-new-technology/1-introduction/Results/MCAPrices.csv b/docs/tutorial-code/add-new-technology/1-introduction/Results/MCAPrices.csv index 46b6e12bb..8be0b1287 100644 --- a/docs/tutorial-code/add-new-technology/1-introduction/Results/MCAPrices.csv +++ b/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 diff --git a/docs/tutorial-code/add-new-technology/1-introduction/settings.toml b/docs/tutorial-code/add-new-technology/1-introduction/settings.toml index 25c2d0c85..dae716a19 100644 --- a/docs/tutorial-code/add-new-technology/1-introduction/settings.toml +++ b/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' diff --git a/docs/tutorial-code/add-new-technology/2-scenario/Results/MCACapacity.csv b/docs/tutorial-code/add-new-technology/2-scenario/Results/MCACapacity.csv index 1d0a03115..9397c720e 100644 --- a/docs/tutorial-code/add-new-technology/2-scenario/Results/MCACapacity.csv +++ b/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 diff --git a/docs/tutorial-code/add-new-technology/2-scenario/Results/MCAPrices.csv b/docs/tutorial-code/add-new-technology/2-scenario/Results/MCAPrices.csv index 5147a8c94..96680e9a7 100644 --- a/docs/tutorial-code/add-new-technology/2-scenario/Results/MCAPrices.csv +++ b/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 diff --git a/docs/tutorial-code/add-new-technology/2-scenario/settings.toml b/docs/tutorial-code/add-new-technology/2-scenario/settings.toml index 25c2d0c85..dae716a19 100644 --- a/docs/tutorial-code/add-new-technology/2-scenario/settings.toml +++ b/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' diff --git a/docs/tutorial-code/add-region/1-new-region/Results/MCACapacity.csv b/docs/tutorial-code/add-region/1-new-region/Results/MCACapacity.csv index 960a24355..255cc0ec0 100644 --- a/docs/tutorial-code/add-region/1-new-region/Results/MCACapacity.csv +++ b/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 diff --git a/docs/tutorial-code/add-region/1-new-region/Results/MCAPrices.csv b/docs/tutorial-code/add-region/1-new-region/Results/MCAPrices.csv index b9ced2d02..14c564667 100644 --- a/docs/tutorial-code/add-region/1-new-region/Results/MCAPrices.csv +++ b/docs/tutorial-code/add-region/1-new-region/Results/MCAPrices.csv @@ -287,51 +287,3 @@ heat,all-week,evening,all-year,12.84360000000,R1,5,MUS$2010/PJ,2045 heat,all-week,evening,all-year,22.74000000000,R2,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045 CO2f,all-week,evening,all-year,0.35390000000,R2,5,MUS$2010/kt,2045 -electricity,all-week,night,all-year,26.90080000000,R1,0,MUS$2010/PJ,2050 -electricity,all-week,night,all-year,41.05480000000,R2,0,MUS$2010/PJ,2050 -gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050 -gas,all-week,night,all-year,2.55000000000,R2,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,13.35770000000,R1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,27.33660000000,R2,0,MUS$2010/PJ,2050 -CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050 -CO2f,all-week,night,all-year,0.43510000000,R2,0,MUS$2010/kt,2050 -electricity,all-week,morning,all-year,26.90080000000,R1,1,MUS$2010/PJ,2050 -electricity,all-week,morning,all-year,41.05480000000,R2,1,MUS$2010/PJ,2050 -gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050 -gas,all-week,morning,all-year,2.55000000000,R2,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,13.35770000000,R1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,27.33660000000,R2,1,MUS$2010/PJ,2050 -CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050 -CO2f,all-week,morning,all-year,0.43510000000,R2,1,MUS$2010/kt,2050 -electricity,all-week,afternoon,all-year,26.90080000000,R1,2,MUS$2010/PJ,2050 -electricity,all-week,afternoon,all-year,41.05480000000,R2,2,MUS$2010/PJ,2050 -gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050 -gas,all-week,afternoon,all-year,2.55000000000,R2,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,13.35770000000,R1,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,27.33660000000,R2,2,MUS$2010/PJ,2050 -CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050 -CO2f,all-week,afternoon,all-year,0.43510000000,R2,2,MUS$2010/kt,2050 -electricity,all-week,early-peak,all-year,26.90080000000,R1,3,MUS$2010/PJ,2050 -electricity,all-week,early-peak,all-year,41.05480000000,R2,3,MUS$2010/PJ,2050 -gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050 -gas,all-week,early-peak,all-year,2.55000000000,R2,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,13.35770000000,R1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,27.33660000000,R2,3,MUS$2010/PJ,2050 -CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050 -CO2f,all-week,early-peak,all-year,0.43510000000,R2,3,MUS$2010/kt,2050 -electricity,all-week,late-peak,all-year,26.90080000000,R1,4,MUS$2010/PJ,2050 -electricity,all-week,late-peak,all-year,41.05480000000,R2,4,MUS$2010/PJ,2050 -gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050 -gas,all-week,late-peak,all-year,2.55000000000,R2,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,13.35770000000,R1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,27.33660000000,R2,4,MUS$2010/PJ,2050 -CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050 -CO2f,all-week,late-peak,all-year,0.43510000000,R2,4,MUS$2010/kt,2050 -electricity,all-week,evening,all-year,26.90080000000,R1,5,MUS$2010/PJ,2050 -electricity,all-week,evening,all-year,41.05480000000,R2,5,MUS$2010/PJ,2050 -gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050 -gas,all-week,evening,all-year,2.55000000000,R2,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,13.35770000000,R1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,27.33660000000,R2,5,MUS$2010/PJ,2050 -CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050 -CO2f,all-week,evening,all-year,0.43510000000,R2,5,MUS$2010/kt,2050 diff --git a/docs/tutorial-code/add-region/1-new-region/settings.toml b/docs/tutorial-code/add-region/1-new-region/settings.toml index 6dfa11930..2ce2fb767 100644 --- a/docs/tutorial-code/add-region/1-new-region/settings.toml +++ b/docs/tutorial-code/add-region/1-new-region/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", "R2"] interest_rate = 0.1 interpolation_mode = 'Active' diff --git a/docs/tutorial-code/add-service-demand/1-exogenous-demand/Results/MCACapacity.csv b/docs/tutorial-code/add-service-demand/1-exogenous-demand/Results/MCACapacity.csv index 5012430c6..c8b104bfe 100644 --- a/docs/tutorial-code/add-service-demand/1-exogenous-demand/Results/MCACapacity.csv +++ b/docs/tutorial-code/add-service-demand/1-exogenous-demand/Results/MCACapacity.csv @@ -54,15 +54,3 @@ A1,12.00000000000,R1,2040,R1,power,windturbine,newcapa,2045 A1,12.00000000000,R1,2045,R1,power,windturbine,newcapa,2045 A1,10.57050000000,R1,2025,R1,gas,gassupply1,newcapa,2045 A1,0.44110000000,R1,2035,R1,gas,gassupply1,newcapa,2045 -A1,31.00000000000,R1,2045,R1,residential,electric_stove,newcapa,2050 -A1,23.00000000000,R1,2050,R1,residential,electric_stove,newcapa,2050 -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,24.25000000000,R1,2030,R1,power,windturbine,newcapa,2050 -A1,12.00000000000,R1,2035,R1,power,windturbine,newcapa,2050 -A1,12.00000000000,R1,2040,R1,power,windturbine,newcapa,2050 -A1,12.00000000000,R1,2045,R1,power,windturbine,newcapa,2050 -A1,32.91410000000,R1,2050,R1,power,windturbine,newcapa,2050 -A1,10.57050000000,R1,2025,R1,gas,gassupply1,newcapa,2050 -A1,0.44110000000,R1,2035,R1,gas,gassupply1,newcapa,2050 diff --git a/docs/tutorial-code/add-service-demand/1-exogenous-demand/Results/MCAPrices.csv b/docs/tutorial-code/add-service-demand/1-exogenous-demand/Results/MCAPrices.csv index bf7c1af91..f4b0bf1b4 100644 --- a/docs/tutorial-code/add-service-demand/1-exogenous-demand/Results/MCAPrices.csv +++ b/docs/tutorial-code/add-service-demand/1-exogenous-demand/Results/MCAPrices.csv @@ -179,33 +179,3 @@ gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2045 heat,all-week,evening,all-year,11.25850000000,R1,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045 cook,all-week,evening,all-year,11.25850000000,R1,5,MUS$2010/PJ,2045 -electricity,all-week,night,all-year,22.26920000000,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,11.50510000000,R1,0,MUS$2010/PJ,2050 -CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050 -cook,all-week,night,all-year,11.50510000000,R1,0,MUS$2010/PJ,2050 -electricity,all-week,morning,all-year,22.26920000000,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,11.50510000000,R1,1,MUS$2010/PJ,2050 -CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050 -cook,all-week,morning,all-year,11.50510000000,R1,1,MUS$2010/PJ,2050 -electricity,all-week,afternoon,all-year,22.26920000000,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,11.50510000000,R1,2,MUS$2010/PJ,2050 -CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050 -cook,all-week,afternoon,all-year,11.50510000000,R1,2,MUS$2010/PJ,2050 -electricity,all-week,early-peak,all-year,22.26920000000,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,11.50510000000,R1,3,MUS$2010/PJ,2050 -CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050 -cook,all-week,early-peak,all-year,11.50510000000,R1,3,MUS$2010/PJ,2050 -electricity,all-week,late-peak,all-year,22.26920000000,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,11.50510000000,R1,4,MUS$2010/PJ,2050 -CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050 -cook,all-week,late-peak,all-year,11.50510000000,R1,4,MUS$2010/PJ,2050 -electricity,all-week,evening,all-year,22.26920000000,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,11.50510000000,R1,5,MUS$2010/PJ,2050 -CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050 -cook,all-week,evening,all-year,11.50510000000,R1,5,MUS$2010/PJ,2050 diff --git a/docs/tutorial-code/add-service-demand/1-exogenous-demand/settings.toml b/docs/tutorial-code/add-service-demand/1-exogenous-demand/settings.toml index 8c508b8cd..7cf1d26dc 100644 --- a/docs/tutorial-code/add-service-demand/1-exogenous-demand/settings.toml +++ b/docs/tutorial-code/add-service-demand/1-exogenous-demand/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' diff --git a/docs/tutorial-code/carbon-budget/1-carbon-budget/Results/MCACapacity.csv b/docs/tutorial-code/carbon-budget/1-carbon-budget/Results/MCACapacity.csv index c0aced739..357e67807 100644 --- a/docs/tutorial-code/carbon-budget/1-carbon-budget/Results/MCACapacity.csv +++ b/docs/tutorial-code/carbon-budget/1-carbon-budget/Results/MCACapacity.csv @@ -13,10 +13,3 @@ A1,5.88890000000,R1,2030,R1,power,gasCCGT,newcapa,2030 A1,16.75000000000,R1,2025,R1,power,windturbine,newcapa,2030 A1,7.50000000000,R1,2020,R1,gas,gassupply1,newcapa,2030 A1,2.33440000000,R1,2030,R1,gas,gassupply1,newcapa,2030 -A1,11.00000000000,R1,2030,R1,residential,heatpump,newcapa,2035 -A1,25.00000000000,R1,2035,R1,residential,heatpump,newcapa,2035 -A1,5.88890000000,R1,2030,R1,power,gasCCGT,newcapa,2035 -A1,16.75000000000,R1,2025,R1,power,windturbine,newcapa,2035 -A1,6.00000000000,R1,2035,R1,power,windturbine,newcapa,2035 -A1,2.33440000000,R1,2030,R1,gas,gassupply1,newcapa,2035 -A1,7.50000000000,R1,2035,R1,gas,gassupply1,newcapa,2035 diff --git a/docs/tutorial-code/carbon-budget/1-carbon-budget/Results/MCAPrices.csv b/docs/tutorial-code/carbon-budget/1-carbon-budget/Results/MCAPrices.csv index c5d5c2055..a7505cb8c 100644 --- a/docs/tutorial-code/carbon-budget/1-carbon-budget/Results/MCAPrices.csv +++ b/docs/tutorial-code/carbon-budget/1-carbon-budget/Results/MCAPrices.csv @@ -71,27 +71,3 @@ electricity,all-week,evening,all-year,18.96750000000,R1,5,MUS$2010/PJ,2030 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2030 heat,all-week,evening,all-year,10.18440000000,R1,5,MUS$2010/PJ,2030 CO2f,all-week,evening,all-year,0.12000000000,R1,5,MUS$2010/kt,2030 -electricity,all-week,night,all-year,21.16800000000,R1,0,MUS$2010/PJ,2035 -gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,11.06460000000,R1,0,MUS$2010/PJ,2035 -CO2f,all-week,night,all-year,0.19000000000,R1,0,MUS$2010/kt,2035 -electricity,all-week,morning,all-year,21.16800000000,R1,1,MUS$2010/PJ,2035 -gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,11.06460000000,R1,1,MUS$2010/PJ,2035 -CO2f,all-week,morning,all-year,0.19000000000,R1,1,MUS$2010/kt,2035 -electricity,all-week,afternoon,all-year,21.16800000000,R1,2,MUS$2010/PJ,2035 -gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,11.06460000000,R1,2,MUS$2010/PJ,2035 -CO2f,all-week,afternoon,all-year,0.19000000000,R1,2,MUS$2010/kt,2035 -electricity,all-week,early-peak,all-year,21.16800000000,R1,3,MUS$2010/PJ,2035 -gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,11.06460000000,R1,3,MUS$2010/PJ,2035 -CO2f,all-week,early-peak,all-year,0.19000000000,R1,3,MUS$2010/kt,2035 -electricity,all-week,late-peak,all-year,21.16800000000,R1,4,MUS$2010/PJ,2035 -gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,11.06460000000,R1,4,MUS$2010/PJ,2035 -CO2f,all-week,late-peak,all-year,0.19000000000,R1,4,MUS$2010/kt,2035 -electricity,all-week,evening,all-year,21.16800000000,R1,5,MUS$2010/PJ,2035 -gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,11.06460000000,R1,5,MUS$2010/PJ,2035 -CO2f,all-week,evening,all-year,0.19000000000,R1,5,MUS$2010/kt,2035 diff --git a/docs/tutorial-code/carbon-budget/1-carbon-budget/Results/MCASupply.csv b/docs/tutorial-code/carbon-budget/1-carbon-budget/Results/MCASupply.csv index f1a5fe685..27166a56d 100644 --- a/docs/tutorial-code/carbon-budget/1-carbon-budget/Results/MCASupply.csv +++ b/docs/tutorial-code/carbon-budget/1-carbon-budget/Results/MCASupply.csv @@ -65,27 +65,3 @@ electricity,all-week,evening,all-year,R1,1.33330000000,5,MUS$2010/PJ,2030 gas,all-week,evening,all-year,R1,0.98340000000,5,MUS$2010/PJ,2030 heat,all-week,evening,all-year,R1,3.33330000000,5,MUS$2010/PJ,2030 CO2f,all-week,evening,all-year,R1,53.98340000000,5,MUS$2010/kt,2030 -electricity,all-week,night,all-year,R1,0.80000000000,0,MUS$2010/PJ,2035 -gas,all-week,night,all-year,R1,0.49170000000,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,R1,2.00000000000,0,MUS$2010/PJ,2035 -CO2f,all-week,night,all-year,R1,26.99170000000,0,MUS$2010/kt,2035 -electricity,all-week,morning,all-year,R1,1.20000000000,1,MUS$2010/PJ,2035 -gas,all-week,morning,all-year,R1,0.73760000000,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,R1,3.00000000000,1,MUS$2010/PJ,2035 -CO2f,all-week,morning,all-year,R1,40.48760000000,1,MUS$2010/kt,2035 -electricity,all-week,afternoon,all-year,R1,0.80000000000,2,MUS$2010/PJ,2035 -gas,all-week,afternoon,all-year,R1,0.49170000000,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,R1,2.00000000000,2,MUS$2010/PJ,2035 -CO2f,all-week,afternoon,all-year,R1,26.99170000000,2,MUS$2010/kt,2035 -electricity,all-week,early-peak,all-year,R1,1.20000000000,3,MUS$2010/PJ,2035 -gas,all-week,early-peak,all-year,R1,0.73760000000,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,R1,3.00000000000,3,MUS$2010/PJ,2035 -CO2f,all-week,early-peak,all-year,R1,40.48760000000,3,MUS$2010/kt,2035 -electricity,all-week,late-peak,all-year,R1,2.40000000000,4,MUS$2010/PJ,2035 -gas,all-week,late-peak,all-year,R1,1.47520000000,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,R1,6.00000000000,4,MUS$2010/PJ,2035 -CO2f,all-week,late-peak,all-year,R1,80.97520000000,4,MUS$2010/kt,2035 -electricity,all-week,evening,all-year,R1,1.60000000000,5,MUS$2010/PJ,2035 -gas,all-week,evening,all-year,R1,0.98340000000,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,R1,4.00000000000,5,MUS$2010/PJ,2035 -CO2f,all-week,evening,all-year,R1,53.98340000000,5,MUS$2010/kt,2035 diff --git a/docs/tutorial-code/carbon-budget/1-carbon-budget/settings.toml b/docs/tutorial-code/carbon-budget/1-carbon-budget/settings.toml index ba5fac9c7..c828b3607 100644 --- a/docs/tutorial-code/carbon-budget/1-carbon-budget/settings.toml +++ b/docs/tutorial-code/carbon-budget/1-carbon-budget/settings.toml @@ -1,7 +1,6 @@ # Global settings - most REQUIRED time_framework = [2020, 2025, 2030, 2035] -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' diff --git a/docs/tutorial-code/min-max-timeslice-constraints/1-min-constraint/Results/MCACapacity.csv b/docs/tutorial-code/min-max-timeslice-constraints/1-min-constraint/Results/MCACapacity.csv index fb43c23d0..4cc29c1f0 100644 --- a/docs/tutorial-code/min-max-timeslice-constraints/1-min-constraint/Results/MCACapacity.csv +++ b/docs/tutorial-code/min-max-timeslice-constraints/1-min-constraint/Results/MCACapacity.csv @@ -30,10 +30,3 @@ A1,5.40000000000,R1,2030,R1,power,windturbine,newcapa,2045 A1,2.40000000000,R1,2035,R1,power,windturbine,newcapa,2045 A1,2.40000000000,R1,2040,R1,power,windturbine,newcapa,2045 A1,2.40000000000,R1,2045,R1,power,windturbine,newcapa,2045 -A1,31.00000000000,R1,2045,R1,residential,heatpump,newcapa,2050 -A1,23.00000000000,R1,2050,R1,residential,heatpump,newcapa,2050 -A1,5.40000000000,R1,2030,R1,power,windturbine,newcapa,2050 -A1,2.40000000000,R1,2035,R1,power,windturbine,newcapa,2050 -A1,2.40000000000,R1,2040,R1,power,windturbine,newcapa,2050 -A1,2.40000000000,R1,2045,R1,power,windturbine,newcapa,2050 -A1,9.00000000000,R1,2050,R1,power,windturbine,newcapa,2050 diff --git a/docs/tutorial-code/min-max-timeslice-constraints/1-min-constraint/Results/MCAPrices.csv b/docs/tutorial-code/min-max-timeslice-constraints/1-min-constraint/Results/MCAPrices.csv index c3a1eb9c9..9c7ec3faa 100644 --- a/docs/tutorial-code/min-max-timeslice-constraints/1-min-constraint/Results/MCAPrices.csv +++ b/docs/tutorial-code/min-max-timeslice-constraints/1-min-constraint/Results/MCAPrices.csv @@ -143,27 +143,3 @@ electricity,all-week,evening,all-year,7.19990000000,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,5.47740000000,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,7.19990000000,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,5.47740000000,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,7.19990000000,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,5.47740000000,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,7.19990000000,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,5.47740000000,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,7.19990000000,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,5.47740000000,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,7.19990000000,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,5.47740000000,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,7.19990000000,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,5.47740000000,R1,5,MUS$2010/PJ,2050 -CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050 diff --git a/docs/tutorial-code/min-max-timeslice-constraints/1-min-constraint/Results/Power_Supply.csv b/docs/tutorial-code/min-max-timeslice-constraints/1-min-constraint/Results/Power_Supply.csv index b19777c40..18ed2f4cb 100644 --- a/docs/tutorial-code/min-max-timeslice-constraints/1-min-constraint/Results/Power_Supply.csv +++ b/docs/tutorial-code/min-max-timeslice-constraints/1-min-constraint/Results/Power_Supply.csv @@ -1,145 +1,115 @@ asset,comm_usage,commodity,day,hour,installed,month,region,supply,technology,timeslice,units_prices,year -0,10,electricity,all-week,night,2020,all-year,R1,0.03330000000,gasCCGT,0,MUS$2010/PJ,2020 -0,6,CO2f,all-week,night,2020,all-year,R1,3.05570000000,gasCCGT,0,MUS$2010/kt,2020 -0,10,electricity,all-week,morning,2020,all-year,R1,0.06670000000,gasCCGT,1,MUS$2010/PJ,2020 -0,6,CO2f,all-week,morning,2020,all-year,R1,6.11130000000,gasCCGT,1,MUS$2010/kt,2020 -0,10,electricity,all-week,afternoon,2020,all-year,R1,0.10000000000,gasCCGT,2,MUS$2010/PJ,2020 -0,6,CO2f,all-week,afternoon,2020,all-year,R1,9.16700000000,gasCCGT,2,MUS$2010/kt,2020 -0,10,electricity,all-week,early-peak,2020,all-year,R1,0.06670000000,gasCCGT,3,MUS$2010/PJ,2020 -0,6,CO2f,all-week,early-peak,2020,all-year,R1,6.11130000000,gasCCGT,3,MUS$2010/kt,2020 -0,10,electricity,all-week,late-peak,2020,all-year,R1,0.13330000000,gasCCGT,4,MUS$2010/PJ,2020 -0,6,CO2f,all-week,late-peak,2020,all-year,R1,12.22270000000,gasCCGT,4,MUS$2010/kt,2020 -0,10,electricity,all-week,evening,2020,all-year,R1,0.16670000000,gasCCGT,5,MUS$2010/PJ,2020 -0,6,CO2f,all-week,evening,2020,all-year,R1,15.27830000000,gasCCGT,5,MUS$2010/kt,2020 -0,10,electricity,all-week,night,2020,all-year,R1,0.05560000000,gasCCGT,0,MUS$2010/PJ,2025 -1,10,electricity,all-week,night,2025,all-year,R1,0.36670000000,windturbine,0,MUS$2010/PJ,2025 -0,6,CO2f,all-week,night,2020,all-year,R1,5.09280000000,gasCCGT,0,MUS$2010/kt,2025 -0,10,electricity,all-week,morning,2020,all-year,R1,0.08330000000,gasCCGT,1,MUS$2010/PJ,2025 -1,10,electricity,all-week,morning,2025,all-year,R1,0.55000000000,windturbine,1,MUS$2010/PJ,2025 -0,6,CO2f,all-week,morning,2020,all-year,R1,7.63920000000,gasCCGT,1,MUS$2010/kt,2025 -0,10,electricity,all-week,afternoon,2020,all-year,R1,0.10000000000,gasCCGT,2,MUS$2010/PJ,2025 -1,10,electricity,all-week,afternoon,2025,all-year,R1,0.36670000000,windturbine,2,MUS$2010/PJ,2025 -0,6,CO2f,all-week,afternoon,2020,all-year,R1,9.16700000000,gasCCGT,2,MUS$2010/kt,2025 -0,10,electricity,all-week,early-peak,2020,all-year,R1,0.08330000000,gasCCGT,3,MUS$2010/PJ,2025 -1,10,electricity,all-week,early-peak,2025,all-year,R1,0.55000000000,windturbine,3,MUS$2010/PJ,2025 -0,6,CO2f,all-week,early-peak,2020,all-year,R1,7.63920000000,gasCCGT,3,MUS$2010/kt,2025 -0,10,electricity,all-week,late-peak,2020,all-year,R1,0.16670000000,gasCCGT,4,MUS$2010/PJ,2025 -1,10,electricity,all-week,late-peak,2025,all-year,R1,1.10000000000,windturbine,4,MUS$2010/PJ,2025 -0,6,CO2f,all-week,late-peak,2020,all-year,R1,15.27830000000,gasCCGT,4,MUS$2010/kt,2025 -0,10,electricity,all-week,evening,2020,all-year,R1,0.16670000000,gasCCGT,5,MUS$2010/PJ,2025 -1,10,electricity,all-week,evening,2025,all-year,R1,0.73330000000,windturbine,5,MUS$2010/PJ,2025 -0,6,CO2f,all-week,evening,2020,all-year,R1,15.27830000000,gasCCGT,5,MUS$2010/kt,2025 -0,10,electricity,all-week,night,2025,all-year,R1,0.36670000000,windturbine,0,MUS$2010/PJ,2030 -1,10,electricity,all-week,night,2030,all-year,R1,0.30000000000,windturbine,0,MUS$2010/PJ,2030 -0,10,electricity,all-week,morning,2025,all-year,R1,0.55000000000,windturbine,1,MUS$2010/PJ,2030 -1,10,electricity,all-week,morning,2030,all-year,R1,0.45000000000,windturbine,1,MUS$2010/PJ,2030 -0,10,electricity,all-week,afternoon,2025,all-year,R1,0.36670000000,windturbine,2,MUS$2010/PJ,2030 -1,10,electricity,all-week,afternoon,2030,all-year,R1,0.30000000000,windturbine,2,MUS$2010/PJ,2030 -0,10,electricity,all-week,early-peak,2025,all-year,R1,0.55000000000,windturbine,3,MUS$2010/PJ,2030 -1,10,electricity,all-week,early-peak,2030,all-year,R1,0.45000000000,windturbine,3,MUS$2010/PJ,2030 -0,10,electricity,all-week,late-peak,2025,all-year,R1,1.10000000000,windturbine,4,MUS$2010/PJ,2030 -1,10,electricity,all-week,late-peak,2030,all-year,R1,0.90000000000,windturbine,4,MUS$2010/PJ,2030 -0,10,electricity,all-week,evening,2025,all-year,R1,0.73330000000,windturbine,5,MUS$2010/PJ,2030 -1,10,electricity,all-week,evening,2030,all-year,R1,0.60000000000,windturbine,5,MUS$2010/PJ,2030 -0,10,electricity,all-week,night,2025,all-year,R1,0.36670000000,windturbine,0,MUS$2010/PJ,2035 -1,10,electricity,all-week,night,2030,all-year,R1,0.30000000000,windturbine,0,MUS$2010/PJ,2035 -2,10,electricity,all-week,night,2035,all-year,R1,0.13330000000,windturbine,0,MUS$2010/PJ,2035 -0,10,electricity,all-week,morning,2025,all-year,R1,0.55000000000,windturbine,1,MUS$2010/PJ,2035 -1,10,electricity,all-week,morning,2030,all-year,R1,0.45000000000,windturbine,1,MUS$2010/PJ,2035 -2,10,electricity,all-week,morning,2035,all-year,R1,0.20000000000,windturbine,1,MUS$2010/PJ,2035 -0,10,electricity,all-week,afternoon,2025,all-year,R1,0.36670000000,windturbine,2,MUS$2010/PJ,2035 -1,10,electricity,all-week,afternoon,2030,all-year,R1,0.30000000000,windturbine,2,MUS$2010/PJ,2035 -2,10,electricity,all-week,afternoon,2035,all-year,R1,0.13330000000,windturbine,2,MUS$2010/PJ,2035 -0,10,electricity,all-week,early-peak,2025,all-year,R1,0.55000000000,windturbine,3,MUS$2010/PJ,2035 -1,10,electricity,all-week,early-peak,2030,all-year,R1,0.45000000000,windturbine,3,MUS$2010/PJ,2035 -2,10,electricity,all-week,early-peak,2035,all-year,R1,0.20000000000,windturbine,3,MUS$2010/PJ,2035 -0,10,electricity,all-week,late-peak,2025,all-year,R1,1.10000000000,windturbine,4,MUS$2010/PJ,2035 -1,10,electricity,all-week,late-peak,2030,all-year,R1,0.90000000000,windturbine,4,MUS$2010/PJ,2035 -2,10,electricity,all-week,late-peak,2035,all-year,R1,0.40000000000,windturbine,4,MUS$2010/PJ,2035 -0,10,electricity,all-week,evening,2025,all-year,R1,0.73330000000,windturbine,5,MUS$2010/PJ,2035 -1,10,electricity,all-week,evening,2030,all-year,R1,0.60000000000,windturbine,5,MUS$2010/PJ,2035 -2,10,electricity,all-week,evening,2035,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2035 -0,10,electricity,all-week,night,2025,all-year,R1,0.36670000000,windturbine,0,MUS$2010/PJ,2040 -1,10,electricity,all-week,night,2030,all-year,R1,0.30000000000,windturbine,0,MUS$2010/PJ,2040 -2,10,electricity,all-week,night,2035,all-year,R1,0.13330000000,windturbine,0,MUS$2010/PJ,2040 -3,10,electricity,all-week,night,2040,all-year,R1,0.13330000000,windturbine,0,MUS$2010/PJ,2040 -0,10,electricity,all-week,morning,2025,all-year,R1,0.55000000000,windturbine,1,MUS$2010/PJ,2040 -1,10,electricity,all-week,morning,2030,all-year,R1,0.45000000000,windturbine,1,MUS$2010/PJ,2040 -2,10,electricity,all-week,morning,2035,all-year,R1,0.20000000000,windturbine,1,MUS$2010/PJ,2040 -3,10,electricity,all-week,morning,2040,all-year,R1,0.20000000000,windturbine,1,MUS$2010/PJ,2040 -0,10,electricity,all-week,afternoon,2025,all-year,R1,0.36670000000,windturbine,2,MUS$2010/PJ,2040 -1,10,electricity,all-week,afternoon,2030,all-year,R1,0.30000000000,windturbine,2,MUS$2010/PJ,2040 -2,10,electricity,all-week,afternoon,2035,all-year,R1,0.13330000000,windturbine,2,MUS$2010/PJ,2040 -3,10,electricity,all-week,afternoon,2040,all-year,R1,0.13330000000,windturbine,2,MUS$2010/PJ,2040 -0,10,electricity,all-week,early-peak,2025,all-year,R1,0.55000000000,windturbine,3,MUS$2010/PJ,2040 -1,10,electricity,all-week,early-peak,2030,all-year,R1,0.45000000000,windturbine,3,MUS$2010/PJ,2040 -2,10,electricity,all-week,early-peak,2035,all-year,R1,0.20000000000,windturbine,3,MUS$2010/PJ,2040 -3,10,electricity,all-week,early-peak,2040,all-year,R1,0.20000000000,windturbine,3,MUS$2010/PJ,2040 -0,10,electricity,all-week,late-peak,2025,all-year,R1,1.10000000000,windturbine,4,MUS$2010/PJ,2040 -1,10,electricity,all-week,late-peak,2030,all-year,R1,0.90000000000,windturbine,4,MUS$2010/PJ,2040 -2,10,electricity,all-week,late-peak,2035,all-year,R1,0.40000000000,windturbine,4,MUS$2010/PJ,2040 -3,10,electricity,all-week,late-peak,2040,all-year,R1,0.40000000000,windturbine,4,MUS$2010/PJ,2040 -0,10,electricity,all-week,evening,2025,all-year,R1,0.73330000000,windturbine,5,MUS$2010/PJ,2040 -1,10,electricity,all-week,evening,2030,all-year,R1,0.60000000000,windturbine,5,MUS$2010/PJ,2040 -2,10,electricity,all-week,evening,2035,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2040 -3,10,electricity,all-week,evening,2040,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2040 -0,10,electricity,all-week,night,2025,all-year,R1,0.36670000000,windturbine,0,MUS$2010/PJ,2045 -1,10,electricity,all-week,night,2030,all-year,R1,0.30000000000,windturbine,0,MUS$2010/PJ,2045 -2,10,electricity,all-week,night,2035,all-year,R1,0.13330000000,windturbine,0,MUS$2010/PJ,2045 -3,10,electricity,all-week,night,2040,all-year,R1,0.13330000000,windturbine,0,MUS$2010/PJ,2045 -4,10,electricity,all-week,night,2045,all-year,R1,0.13330000000,windturbine,0,MUS$2010/PJ,2045 -0,10,electricity,all-week,morning,2025,all-year,R1,0.55000000000,windturbine,1,MUS$2010/PJ,2045 -1,10,electricity,all-week,morning,2030,all-year,R1,0.45000000000,windturbine,1,MUS$2010/PJ,2045 -2,10,electricity,all-week,morning,2035,all-year,R1,0.20000000000,windturbine,1,MUS$2010/PJ,2045 -3,10,electricity,all-week,morning,2040,all-year,R1,0.20000000000,windturbine,1,MUS$2010/PJ,2045 -4,10,electricity,all-week,morning,2045,all-year,R1,0.20000000000,windturbine,1,MUS$2010/PJ,2045 -0,10,electricity,all-week,afternoon,2025,all-year,R1,0.36670000000,windturbine,2,MUS$2010/PJ,2045 -1,10,electricity,all-week,afternoon,2030,all-year,R1,0.30000000000,windturbine,2,MUS$2010/PJ,2045 -2,10,electricity,all-week,afternoon,2035,all-year,R1,0.13330000000,windturbine,2,MUS$2010/PJ,2045 -3,10,electricity,all-week,afternoon,2040,all-year,R1,0.13330000000,windturbine,2,MUS$2010/PJ,2045 -4,10,electricity,all-week,afternoon,2045,all-year,R1,0.13330000000,windturbine,2,MUS$2010/PJ,2045 -0,10,electricity,all-week,early-peak,2025,all-year,R1,0.55000000000,windturbine,3,MUS$2010/PJ,2045 -1,10,electricity,all-week,early-peak,2030,all-year,R1,0.45000000000,windturbine,3,MUS$2010/PJ,2045 -2,10,electricity,all-week,early-peak,2035,all-year,R1,0.20000000000,windturbine,3,MUS$2010/PJ,2045 -3,10,electricity,all-week,early-peak,2040,all-year,R1,0.20000000000,windturbine,3,MUS$2010/PJ,2045 -4,10,electricity,all-week,early-peak,2045,all-year,R1,0.20000000000,windturbine,3,MUS$2010/PJ,2045 -0,10,electricity,all-week,late-peak,2025,all-year,R1,1.10000000000,windturbine,4,MUS$2010/PJ,2045 -1,10,electricity,all-week,late-peak,2030,all-year,R1,0.90000000000,windturbine,4,MUS$2010/PJ,2045 -2,10,electricity,all-week,late-peak,2035,all-year,R1,0.40000000000,windturbine,4,MUS$2010/PJ,2045 -3,10,electricity,all-week,late-peak,2040,all-year,R1,0.40000000000,windturbine,4,MUS$2010/PJ,2045 -4,10,electricity,all-week,late-peak,2045,all-year,R1,0.40000000000,windturbine,4,MUS$2010/PJ,2045 -0,10,electricity,all-week,evening,2025,all-year,R1,0.73330000000,windturbine,5,MUS$2010/PJ,2045 -1,10,electricity,all-week,evening,2030,all-year,R1,0.60000000000,windturbine,5,MUS$2010/PJ,2045 -2,10,electricity,all-week,evening,2035,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2045 -3,10,electricity,all-week,evening,2040,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2045 -4,10,electricity,all-week,evening,2045,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2045 -0,10,electricity,all-week,night,2030,all-year,R1,0.30000000000,windturbine,0,MUS$2010/PJ,2050 -1,10,electricity,all-week,night,2035,all-year,R1,0.13330000000,windturbine,0,MUS$2010/PJ,2050 -2,10,electricity,all-week,night,2040,all-year,R1,0.13330000000,windturbine,0,MUS$2010/PJ,2050 -3,10,electricity,all-week,night,2045,all-year,R1,0.13330000000,windturbine,0,MUS$2010/PJ,2050 -4,10,electricity,all-week,night,2050,all-year,R1,0.50000000000,windturbine,0,MUS$2010/PJ,2050 -0,10,electricity,all-week,morning,2030,all-year,R1,0.45000000000,windturbine,1,MUS$2010/PJ,2050 -1,10,electricity,all-week,morning,2035,all-year,R1,0.20000000000,windturbine,1,MUS$2010/PJ,2050 -2,10,electricity,all-week,morning,2040,all-year,R1,0.20000000000,windturbine,1,MUS$2010/PJ,2050 -3,10,electricity,all-week,morning,2045,all-year,R1,0.20000000000,windturbine,1,MUS$2010/PJ,2050 -4,10,electricity,all-week,morning,2050,all-year,R1,0.75000000000,windturbine,1,MUS$2010/PJ,2050 -0,10,electricity,all-week,afternoon,2030,all-year,R1,0.30000000000,windturbine,2,MUS$2010/PJ,2050 -1,10,electricity,all-week,afternoon,2035,all-year,R1,0.13330000000,windturbine,2,MUS$2010/PJ,2050 -2,10,electricity,all-week,afternoon,2040,all-year,R1,0.13330000000,windturbine,2,MUS$2010/PJ,2050 -3,10,electricity,all-week,afternoon,2045,all-year,R1,0.13330000000,windturbine,2,MUS$2010/PJ,2050 -4,10,electricity,all-week,afternoon,2050,all-year,R1,0.50000000000,windturbine,2,MUS$2010/PJ,2050 -0,10,electricity,all-week,early-peak,2030,all-year,R1,0.45000000000,windturbine,3,MUS$2010/PJ,2050 -1,10,electricity,all-week,early-peak,2035,all-year,R1,0.20000000000,windturbine,3,MUS$2010/PJ,2050 -2,10,electricity,all-week,early-peak,2040,all-year,R1,0.20000000000,windturbine,3,MUS$2010/PJ,2050 -3,10,electricity,all-week,early-peak,2045,all-year,R1,0.20000000000,windturbine,3,MUS$2010/PJ,2050 -4,10,electricity,all-week,early-peak,2050,all-year,R1,0.75000000000,windturbine,3,MUS$2010/PJ,2050 -0,10,electricity,all-week,late-peak,2030,all-year,R1,0.90000000000,windturbine,4,MUS$2010/PJ,2050 -1,10,electricity,all-week,late-peak,2035,all-year,R1,0.40000000000,windturbine,4,MUS$2010/PJ,2050 -2,10,electricity,all-week,late-peak,2040,all-year,R1,0.40000000000,windturbine,4,MUS$2010/PJ,2050 -3,10,electricity,all-week,late-peak,2045,all-year,R1,0.40000000000,windturbine,4,MUS$2010/PJ,2050 -4,10,electricity,all-week,late-peak,2050,all-year,R1,1.50000000000,windturbine,4,MUS$2010/PJ,2050 -0,10,electricity,all-week,evening,2030,all-year,R1,0.60000000000,windturbine,5,MUS$2010/PJ,2050 -1,10,electricity,all-week,evening,2035,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2050 -2,10,electricity,all-week,evening,2040,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2050 -3,10,electricity,all-week,evening,2045,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2050 -4,10,electricity,all-week,evening,2050,all-year,R1,1.00000000000,windturbine,5,MUS$2010/PJ,2050 +0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2020,all-year,R1,0.03330000000,gasCCGT,0,MUS$2010/PJ,2020 +0,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,all-week,night,2020,all-year,R1,3.05570000000,gasCCGT,0,MUS$2010/kt,2020 +0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2020,all-year,R1,0.06670000000,gasCCGT,1,MUS$2010/PJ,2020 +0,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,all-week,morning,2020,all-year,R1,6.11130000000,gasCCGT,1,MUS$2010/kt,2020 +0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2020,all-year,R1,0.10000000000,gasCCGT,2,MUS$2010/PJ,2020 +0,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,all-week,afternoon,2020,all-year,R1,9.16700000000,gasCCGT,2,MUS$2010/kt,2020 +0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2020,all-year,R1,0.06670000000,gasCCGT,3,MUS$2010/PJ,2020 +0,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,all-week,early-peak,2020,all-year,R1,6.11130000000,gasCCGT,3,MUS$2010/kt,2020 +0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2020,all-year,R1,0.13330000000,gasCCGT,4,MUS$2010/PJ,2020 +0,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,all-week,late-peak,2020,all-year,R1,12.22270000000,gasCCGT,4,MUS$2010/kt,2020 +0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2020,all-year,R1,0.16670000000,gasCCGT,5,MUS$2010/PJ,2020 +0,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,all-week,evening,2020,all-year,R1,15.27830000000,gasCCGT,5,MUS$2010/kt,2020 +0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2020,all-year,R1,0.05560000000,gasCCGT,0,MUS$2010/PJ,2025 +1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2025,all-year,R1,0.36670000000,windturbine,0,MUS$2010/PJ,2025 +0,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,all-week,night,2020,all-year,R1,5.09280000000,gasCCGT,0,MUS$2010/kt,2025 +0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2020,all-year,R1,0.08330000000,gasCCGT,1,MUS$2010/PJ,2025 +1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2025,all-year,R1,0.55000000000,windturbine,1,MUS$2010/PJ,2025 +0,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,all-week,morning,2020,all-year,R1,7.63920000000,gasCCGT,1,MUS$2010/kt,2025 +0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2020,all-year,R1,0.10000000000,gasCCGT,2,MUS$2010/PJ,2025 +1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2025,all-year,R1,0.36670000000,windturbine,2,MUS$2010/PJ,2025 +0,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,all-week,afternoon,2020,all-year,R1,9.16700000000,gasCCGT,2,MUS$2010/kt,2025 +0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2020,all-year,R1,0.08330000000,gasCCGT,3,MUS$2010/PJ,2025 +1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2025,all-year,R1,0.55000000000,windturbine,3,MUS$2010/PJ,2025 +0,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,all-week,early-peak,2020,all-year,R1,7.63920000000,gasCCGT,3,MUS$2010/kt,2025 +0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2020,all-year,R1,0.16670000000,gasCCGT,4,MUS$2010/PJ,2025 +1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2025,all-year,R1,1.10000000000,windturbine,4,MUS$2010/PJ,2025 +0,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,all-week,late-peak,2020,all-year,R1,15.27830000000,gasCCGT,4,MUS$2010/kt,2025 +0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2020,all-year,R1,0.16670000000,gasCCGT,5,MUS$2010/PJ,2025 +1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2025,all-year,R1,0.73330000000,windturbine,5,MUS$2010/PJ,2025 +0,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,all-week,evening,2020,all-year,R1,15.27830000000,gasCCGT,5,MUS$2010/kt,2025 +0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2025,all-year,R1,0.36670000000,windturbine,0,MUS$2010/PJ,2030 +1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2030,all-year,R1,0.30000000000,windturbine,0,MUS$2010/PJ,2030 +0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2025,all-year,R1,0.55000000000,windturbine,1,MUS$2010/PJ,2030 +1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2030,all-year,R1,0.45000000000,windturbine,1,MUS$2010/PJ,2030 +0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2025,all-year,R1,0.36670000000,windturbine,2,MUS$2010/PJ,2030 +1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2030,all-year,R1,0.30000000000,windturbine,2,MUS$2010/PJ,2030 +0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2025,all-year,R1,0.55000000000,windturbine,3,MUS$2010/PJ,2030 +1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2030,all-year,R1,0.45000000000,windturbine,3,MUS$2010/PJ,2030 +0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2025,all-year,R1,1.10000000000,windturbine,4,MUS$2010/PJ,2030 +1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2030,all-year,R1,0.90000000000,windturbine,4,MUS$2010/PJ,2030 +0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2025,all-year,R1,0.73330000000,windturbine,5,MUS$2010/PJ,2030 +1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2030,all-year,R1,0.60000000000,windturbine,5,MUS$2010/PJ,2030 +0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2025,all-year,R1,0.36670000000,windturbine,0,MUS$2010/PJ,2035 +1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2030,all-year,R1,0.30000000000,windturbine,0,MUS$2010/PJ,2035 +2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2035,all-year,R1,0.13330000000,windturbine,0,MUS$2010/PJ,2035 +0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2025,all-year,R1,0.55000000000,windturbine,1,MUS$2010/PJ,2035 +1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2030,all-year,R1,0.45000000000,windturbine,1,MUS$2010/PJ,2035 +2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2035,all-year,R1,0.20000000000,windturbine,1,MUS$2010/PJ,2035 +0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2025,all-year,R1,0.36670000000,windturbine,2,MUS$2010/PJ,2035 +1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2030,all-year,R1,0.30000000000,windturbine,2,MUS$2010/PJ,2035 +2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2035,all-year,R1,0.13330000000,windturbine,2,MUS$2010/PJ,2035 +0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2025,all-year,R1,0.55000000000,windturbine,3,MUS$2010/PJ,2035 +1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2030,all-year,R1,0.45000000000,windturbine,3,MUS$2010/PJ,2035 +2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2035,all-year,R1,0.20000000000,windturbine,3,MUS$2010/PJ,2035 +0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2025,all-year,R1,1.10000000000,windturbine,4,MUS$2010/PJ,2035 +1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2030,all-year,R1,0.90000000000,windturbine,4,MUS$2010/PJ,2035 +2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2035,all-year,R1,0.40000000000,windturbine,4,MUS$2010/PJ,2035 +0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2025,all-year,R1,0.73330000000,windturbine,5,MUS$2010/PJ,2035 +1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2030,all-year,R1,0.60000000000,windturbine,5,MUS$2010/PJ,2035 +2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2035,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2035 +0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2025,all-year,R1,0.36670000000,windturbine,0,MUS$2010/PJ,2040 +1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2030,all-year,R1,0.30000000000,windturbine,0,MUS$2010/PJ,2040 +2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2035,all-year,R1,0.13330000000,windturbine,0,MUS$2010/PJ,2040 +3,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2040,all-year,R1,0.13330000000,windturbine,0,MUS$2010/PJ,2040 +0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2025,all-year,R1,0.55000000000,windturbine,1,MUS$2010/PJ,2040 +1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2030,all-year,R1,0.45000000000,windturbine,1,MUS$2010/PJ,2040 +2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2035,all-year,R1,0.20000000000,windturbine,1,MUS$2010/PJ,2040 +3,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2040,all-year,R1,0.20000000000,windturbine,1,MUS$2010/PJ,2040 +0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2025,all-year,R1,0.36670000000,windturbine,2,MUS$2010/PJ,2040 +1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2030,all-year,R1,0.30000000000,windturbine,2,MUS$2010/PJ,2040 +2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2035,all-year,R1,0.13330000000,windturbine,2,MUS$2010/PJ,2040 +3,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2040,all-year,R1,0.13330000000,windturbine,2,MUS$2010/PJ,2040 +0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2025,all-year,R1,0.55000000000,windturbine,3,MUS$2010/PJ,2040 +1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2030,all-year,R1,0.45000000000,windturbine,3,MUS$2010/PJ,2040 +2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2035,all-year,R1,0.20000000000,windturbine,3,MUS$2010/PJ,2040 +3,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2040,all-year,R1,0.20000000000,windturbine,3,MUS$2010/PJ,2040 +0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2025,all-year,R1,1.10000000000,windturbine,4,MUS$2010/PJ,2040 +1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2030,all-year,R1,0.90000000000,windturbine,4,MUS$2010/PJ,2040 +2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2035,all-year,R1,0.40000000000,windturbine,4,MUS$2010/PJ,2040 +3,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2040,all-year,R1,0.40000000000,windturbine,4,MUS$2010/PJ,2040 +0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2025,all-year,R1,0.73330000000,windturbine,5,MUS$2010/PJ,2040 +1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2030,all-year,R1,0.60000000000,windturbine,5,MUS$2010/PJ,2040 +2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2035,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2040 +3,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2040,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2040 +0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2025,all-year,R1,0.36670000000,windturbine,0,MUS$2010/PJ,2045 +1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2030,all-year,R1,0.30000000000,windturbine,0,MUS$2010/PJ,2045 +2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2035,all-year,R1,0.13330000000,windturbine,0,MUS$2010/PJ,2045 +3,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2040,all-year,R1,0.13330000000,windturbine,0,MUS$2010/PJ,2045 +4,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2045,all-year,R1,0.13330000000,windturbine,0,MUS$2010/PJ,2045 +0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2025,all-year,R1,0.55000000000,windturbine,1,MUS$2010/PJ,2045 +1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2030,all-year,R1,0.45000000000,windturbine,1,MUS$2010/PJ,2045 +2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2035,all-year,R1,0.20000000000,windturbine,1,MUS$2010/PJ,2045 +3,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2040,all-year,R1,0.20000000000,windturbine,1,MUS$2010/PJ,2045 +4,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2045,all-year,R1,0.20000000000,windturbine,1,MUS$2010/PJ,2045 +0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2025,all-year,R1,0.36670000000,windturbine,2,MUS$2010/PJ,2045 +1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2030,all-year,R1,0.30000000000,windturbine,2,MUS$2010/PJ,2045 +2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2035,all-year,R1,0.13330000000,windturbine,2,MUS$2010/PJ,2045 +3,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2040,all-year,R1,0.13330000000,windturbine,2,MUS$2010/PJ,2045 +4,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2045,all-year,R1,0.13330000000,windturbine,2,MUS$2010/PJ,2045 +0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2025,all-year,R1,0.55000000000,windturbine,3,MUS$2010/PJ,2045 +1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2030,all-year,R1,0.45000000000,windturbine,3,MUS$2010/PJ,2045 +2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2035,all-year,R1,0.20000000000,windturbine,3,MUS$2010/PJ,2045 +3,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2040,all-year,R1,0.20000000000,windturbine,3,MUS$2010/PJ,2045 +4,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2045,all-year,R1,0.20000000000,windturbine,3,MUS$2010/PJ,2045 +0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2025,all-year,R1,1.10000000000,windturbine,4,MUS$2010/PJ,2045 +1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2030,all-year,R1,0.90000000000,windturbine,4,MUS$2010/PJ,2045 +2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2035,all-year,R1,0.40000000000,windturbine,4,MUS$2010/PJ,2045 +3,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2040,all-year,R1,0.40000000000,windturbine,4,MUS$2010/PJ,2045 +4,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2045,all-year,R1,0.40000000000,windturbine,4,MUS$2010/PJ,2045 +0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2025,all-year,R1,0.73330000000,windturbine,5,MUS$2010/PJ,2045 +1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2030,all-year,R1,0.60000000000,windturbine,5,MUS$2010/PJ,2045 +2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2035,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2045 +3,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2040,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2045 +4,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2045,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2045 diff --git a/docs/tutorial-code/min-max-timeslice-constraints/1-min-constraint/settings.toml b/docs/tutorial-code/min-max-timeslice-constraints/1-min-constraint/settings.toml index 05130bfd0..dcd8f1383 100644 --- a/docs/tutorial-code/min-max-timeslice-constraints/1-min-constraint/settings.toml +++ b/docs/tutorial-code/min-max-timeslice-constraints/1-min-constraint/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' diff --git a/docs/tutorial-code/min-max-timeslice-constraints/2-max-constraint/Results/MCACapacity.csv b/docs/tutorial-code/min-max-timeslice-constraints/2-max-constraint/Results/MCACapacity.csv index 7d122ba67..48b275d9e 100644 --- a/docs/tutorial-code/min-max-timeslice-constraints/2-max-constraint/Results/MCACapacity.csv +++ b/docs/tutorial-code/min-max-timeslice-constraints/2-max-constraint/Results/MCACapacity.csv @@ -30,10 +30,3 @@ A1,4.90000000000,R1,2030,R1,power,windturbine,newcapa,2045 A1,2.40000000000,R1,2035,R1,power,windturbine,newcapa,2045 A1,2.40000000000,R1,2040,R1,power,windturbine,newcapa,2045 A1,2.40000000000,R1,2045,R1,power,windturbine,newcapa,2045 -A1,31.00000000000,R1,2045,R1,residential,heatpump,newcapa,2050 -A1,23.00000000000,R1,2050,R1,residential,heatpump,newcapa,2050 -A1,4.90000000000,R1,2030,R1,power,windturbine,newcapa,2050 -A1,2.40000000000,R1,2035,R1,power,windturbine,newcapa,2050 -A1,2.40000000000,R1,2040,R1,power,windturbine,newcapa,2050 -A1,2.40000000000,R1,2045,R1,power,windturbine,newcapa,2050 -A1,9.50000000000,R1,2050,R1,power,windturbine,newcapa,2050 diff --git a/docs/tutorial-code/min-max-timeslice-constraints/2-max-constraint/Results/MCAPrices.csv b/docs/tutorial-code/min-max-timeslice-constraints/2-max-constraint/Results/MCAPrices.csv index 6e9e1ba96..336d4aa92 100644 --- a/docs/tutorial-code/min-max-timeslice-constraints/2-max-constraint/Results/MCAPrices.csv +++ b/docs/tutorial-code/min-max-timeslice-constraints/2-max-constraint/Results/MCAPrices.csv @@ -143,27 +143,3 @@ electricity,all-week,evening,all-year,7.19990000000,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,5.47740000000,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,7.19990000000,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,5.47740000000,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,7.19990000000,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,5.47740000000,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,7.19990000000,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,5.47740000000,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,7.19990000000,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,5.47740000000,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,7.19990000000,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,5.47740000000,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,7.19990000000,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,5.47740000000,R1,5,MUS$2010/PJ,2050 -CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050 diff --git a/docs/tutorial-code/min-max-timeslice-constraints/2-max-constraint/Results/Power_Supply.csv b/docs/tutorial-code/min-max-timeslice-constraints/2-max-constraint/Results/Power_Supply.csv index 7adbe90b2..1e62a502c 100644 --- a/docs/tutorial-code/min-max-timeslice-constraints/2-max-constraint/Results/Power_Supply.csv +++ b/docs/tutorial-code/min-max-timeslice-constraints/2-max-constraint/Results/Power_Supply.csv @@ -1,141 +1,111 @@ asset,comm_usage,commodity,day,hour,installed,month,region,supply,technology,timeslice,units_prices,year -0,10,electricity,all-week,night,2020,all-year,R1,0.03330000000,gasCCGT,0,MUS$2010/PJ,2020 -0,6,CO2f,all-week,night,2020,all-year,R1,3.05570000000,gasCCGT,0,MUS$2010/kt,2020 -0,10,electricity,all-week,morning,2020,all-year,R1,0.06670000000,gasCCGT,1,MUS$2010/PJ,2020 -0,6,CO2f,all-week,morning,2020,all-year,R1,6.11130000000,gasCCGT,1,MUS$2010/kt,2020 -0,10,electricity,all-week,afternoon,2020,all-year,R1,0.10000000000,gasCCGT,2,MUS$2010/PJ,2020 -0,6,CO2f,all-week,afternoon,2020,all-year,R1,9.16700000000,gasCCGT,2,MUS$2010/kt,2020 -0,10,electricity,all-week,early-peak,2020,all-year,R1,0.06670000000,gasCCGT,3,MUS$2010/PJ,2020 -0,6,CO2f,all-week,early-peak,2020,all-year,R1,6.11130000000,gasCCGT,3,MUS$2010/kt,2020 -0,10,electricity,all-week,night,2020,all-year,R1,0.05210000000,gasCCGT,0,MUS$2010/PJ,2025 -1,10,electricity,all-week,night,2025,all-year,R1,0.37010000000,windturbine,0,MUS$2010/PJ,2025 -0,6,CO2f,all-week,night,2020,all-year,R1,4.77840000000,gasCCGT,0,MUS$2010/kt,2025 -0,10,electricity,all-week,morning,2020,all-year,R1,0.07820000000,gasCCGT,1,MUS$2010/PJ,2025 -1,10,electricity,all-week,morning,2025,all-year,R1,0.55510000000,windturbine,1,MUS$2010/PJ,2025 -0,6,CO2f,all-week,morning,2020,all-year,R1,7.16760000000,gasCCGT,1,MUS$2010/kt,2025 -0,10,electricity,all-week,afternoon,2020,all-year,R1,0.10000000000,gasCCGT,2,MUS$2010/PJ,2025 -1,10,electricity,all-week,afternoon,2025,all-year,R1,0.37010000000,windturbine,2,MUS$2010/PJ,2025 -0,6,CO2f,all-week,afternoon,2020,all-year,R1,9.16700000000,gasCCGT,2,MUS$2010/kt,2025 -0,10,electricity,all-week,early-peak,2020,all-year,R1,0.07820000000,gasCCGT,3,MUS$2010/PJ,2025 -1,10,electricity,all-week,early-peak,2025,all-year,R1,0.55510000000,windturbine,3,MUS$2010/PJ,2025 -0,6,CO2f,all-week,early-peak,2020,all-year,R1,7.16760000000,gasCCGT,3,MUS$2010/kt,2025 -0,10,electricity,all-week,late-peak,2020,all-year,R1,0.08330000000,gasCCGT,4,MUS$2010/PJ,2025 -1,10,electricity,all-week,late-peak,2025,all-year,R1,1.18330000000,windturbine,4,MUS$2010/PJ,2025 -0,6,CO2f,all-week,late-peak,2020,all-year,R1,7.63920000000,gasCCGT,4,MUS$2010/kt,2025 -0,10,electricity,all-week,evening,2020,all-year,R1,0.05560000000,gasCCGT,5,MUS$2010/PJ,2025 -1,10,electricity,all-week,evening,2025,all-year,R1,0.78890000000,windturbine,5,MUS$2010/PJ,2025 -0,6,CO2f,all-week,evening,2020,all-year,R1,5.09280000000,gasCCGT,5,MUS$2010/kt,2025 -0,10,electricity,all-week,night,2025,all-year,R1,0.39440000000,windturbine,0,MUS$2010/PJ,2030 -1,10,electricity,all-week,night,2030,all-year,R1,0.27220000000,windturbine,0,MUS$2010/PJ,2030 -0,10,electricity,all-week,morning,2025,all-year,R1,0.59170000000,windturbine,1,MUS$2010/PJ,2030 -1,10,electricity,all-week,morning,2030,all-year,R1,0.40830000000,windturbine,1,MUS$2010/PJ,2030 -0,10,electricity,all-week,afternoon,2025,all-year,R1,0.39440000000,windturbine,2,MUS$2010/PJ,2030 -1,10,electricity,all-week,afternoon,2030,all-year,R1,0.27220000000,windturbine,2,MUS$2010/PJ,2030 -0,10,electricity,all-week,early-peak,2025,all-year,R1,0.59170000000,windturbine,3,MUS$2010/PJ,2030 -1,10,electricity,all-week,early-peak,2030,all-year,R1,0.40830000000,windturbine,3,MUS$2010/PJ,2030 -0,10,electricity,all-week,late-peak,2025,all-year,R1,1.18330000000,windturbine,4,MUS$2010/PJ,2030 -1,10,electricity,all-week,late-peak,2030,all-year,R1,0.81670000000,windturbine,4,MUS$2010/PJ,2030 -0,10,electricity,all-week,evening,2025,all-year,R1,0.78890000000,windturbine,5,MUS$2010/PJ,2030 -1,10,electricity,all-week,evening,2030,all-year,R1,0.54440000000,windturbine,5,MUS$2010/PJ,2030 -0,10,electricity,all-week,night,2025,all-year,R1,0.39440000000,windturbine,0,MUS$2010/PJ,2035 -1,10,electricity,all-week,night,2030,all-year,R1,0.27220000000,windturbine,0,MUS$2010/PJ,2035 -2,10,electricity,all-week,night,2035,all-year,R1,0.13330000000,windturbine,0,MUS$2010/PJ,2035 -0,10,electricity,all-week,morning,2025,all-year,R1,0.59170000000,windturbine,1,MUS$2010/PJ,2035 -1,10,electricity,all-week,morning,2030,all-year,R1,0.40830000000,windturbine,1,MUS$2010/PJ,2035 -2,10,electricity,all-week,morning,2035,all-year,R1,0.20000000000,windturbine,1,MUS$2010/PJ,2035 -0,10,electricity,all-week,afternoon,2025,all-year,R1,0.39440000000,windturbine,2,MUS$2010/PJ,2035 -1,10,electricity,all-week,afternoon,2030,all-year,R1,0.27220000000,windturbine,2,MUS$2010/PJ,2035 -2,10,electricity,all-week,afternoon,2035,all-year,R1,0.13330000000,windturbine,2,MUS$2010/PJ,2035 -0,10,electricity,all-week,early-peak,2025,all-year,R1,0.59170000000,windturbine,3,MUS$2010/PJ,2035 -1,10,electricity,all-week,early-peak,2030,all-year,R1,0.40830000000,windturbine,3,MUS$2010/PJ,2035 -2,10,electricity,all-week,early-peak,2035,all-year,R1,0.20000000000,windturbine,3,MUS$2010/PJ,2035 -0,10,electricity,all-week,late-peak,2025,all-year,R1,1.18330000000,windturbine,4,MUS$2010/PJ,2035 -1,10,electricity,all-week,late-peak,2030,all-year,R1,0.81670000000,windturbine,4,MUS$2010/PJ,2035 -2,10,electricity,all-week,late-peak,2035,all-year,R1,0.40000000000,windturbine,4,MUS$2010/PJ,2035 -0,10,electricity,all-week,evening,2025,all-year,R1,0.78890000000,windturbine,5,MUS$2010/PJ,2035 -1,10,electricity,all-week,evening,2030,all-year,R1,0.54440000000,windturbine,5,MUS$2010/PJ,2035 -2,10,electricity,all-week,evening,2035,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2035 -0,10,electricity,all-week,night,2025,all-year,R1,0.39440000000,windturbine,0,MUS$2010/PJ,2040 -1,10,electricity,all-week,night,2030,all-year,R1,0.27220000000,windturbine,0,MUS$2010/PJ,2040 -2,10,electricity,all-week,night,2035,all-year,R1,0.13330000000,windturbine,0,MUS$2010/PJ,2040 -3,10,electricity,all-week,night,2040,all-year,R1,0.13330000000,windturbine,0,MUS$2010/PJ,2040 -0,10,electricity,all-week,morning,2025,all-year,R1,0.59170000000,windturbine,1,MUS$2010/PJ,2040 -1,10,electricity,all-week,morning,2030,all-year,R1,0.40830000000,windturbine,1,MUS$2010/PJ,2040 -2,10,electricity,all-week,morning,2035,all-year,R1,0.20000000000,windturbine,1,MUS$2010/PJ,2040 -3,10,electricity,all-week,morning,2040,all-year,R1,0.20000000000,windturbine,1,MUS$2010/PJ,2040 -0,10,electricity,all-week,afternoon,2025,all-year,R1,0.39440000000,windturbine,2,MUS$2010/PJ,2040 -1,10,electricity,all-week,afternoon,2030,all-year,R1,0.27220000000,windturbine,2,MUS$2010/PJ,2040 -2,10,electricity,all-week,afternoon,2035,all-year,R1,0.13330000000,windturbine,2,MUS$2010/PJ,2040 -3,10,electricity,all-week,afternoon,2040,all-year,R1,0.13330000000,windturbine,2,MUS$2010/PJ,2040 -0,10,electricity,all-week,early-peak,2025,all-year,R1,0.59170000000,windturbine,3,MUS$2010/PJ,2040 -1,10,electricity,all-week,early-peak,2030,all-year,R1,0.40830000000,windturbine,3,MUS$2010/PJ,2040 -2,10,electricity,all-week,early-peak,2035,all-year,R1,0.20000000000,windturbine,3,MUS$2010/PJ,2040 -3,10,electricity,all-week,early-peak,2040,all-year,R1,0.20000000000,windturbine,3,MUS$2010/PJ,2040 -0,10,electricity,all-week,late-peak,2025,all-year,R1,1.18330000000,windturbine,4,MUS$2010/PJ,2040 -1,10,electricity,all-week,late-peak,2030,all-year,R1,0.81670000000,windturbine,4,MUS$2010/PJ,2040 -2,10,electricity,all-week,late-peak,2035,all-year,R1,0.40000000000,windturbine,4,MUS$2010/PJ,2040 -3,10,electricity,all-week,late-peak,2040,all-year,R1,0.40000000000,windturbine,4,MUS$2010/PJ,2040 -0,10,electricity,all-week,evening,2025,all-year,R1,0.78890000000,windturbine,5,MUS$2010/PJ,2040 -1,10,electricity,all-week,evening,2030,all-year,R1,0.54440000000,windturbine,5,MUS$2010/PJ,2040 -2,10,electricity,all-week,evening,2035,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2040 -3,10,electricity,all-week,evening,2040,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2040 -0,10,electricity,all-week,night,2025,all-year,R1,0.39440000000,windturbine,0,MUS$2010/PJ,2045 -1,10,electricity,all-week,night,2030,all-year,R1,0.27220000000,windturbine,0,MUS$2010/PJ,2045 -2,10,electricity,all-week,night,2035,all-year,R1,0.13330000000,windturbine,0,MUS$2010/PJ,2045 -3,10,electricity,all-week,night,2040,all-year,R1,0.13330000000,windturbine,0,MUS$2010/PJ,2045 -4,10,electricity,all-week,night,2045,all-year,R1,0.13330000000,windturbine,0,MUS$2010/PJ,2045 -0,10,electricity,all-week,morning,2025,all-year,R1,0.59170000000,windturbine,1,MUS$2010/PJ,2045 -1,10,electricity,all-week,morning,2030,all-year,R1,0.40830000000,windturbine,1,MUS$2010/PJ,2045 -2,10,electricity,all-week,morning,2035,all-year,R1,0.20000000000,windturbine,1,MUS$2010/PJ,2045 -3,10,electricity,all-week,morning,2040,all-year,R1,0.20000000000,windturbine,1,MUS$2010/PJ,2045 -4,10,electricity,all-week,morning,2045,all-year,R1,0.20000000000,windturbine,1,MUS$2010/PJ,2045 -0,10,electricity,all-week,afternoon,2025,all-year,R1,0.39440000000,windturbine,2,MUS$2010/PJ,2045 -1,10,electricity,all-week,afternoon,2030,all-year,R1,0.27220000000,windturbine,2,MUS$2010/PJ,2045 -2,10,electricity,all-week,afternoon,2035,all-year,R1,0.13330000000,windturbine,2,MUS$2010/PJ,2045 -3,10,electricity,all-week,afternoon,2040,all-year,R1,0.13330000000,windturbine,2,MUS$2010/PJ,2045 -4,10,electricity,all-week,afternoon,2045,all-year,R1,0.13330000000,windturbine,2,MUS$2010/PJ,2045 -0,10,electricity,all-week,early-peak,2025,all-year,R1,0.59170000000,windturbine,3,MUS$2010/PJ,2045 -1,10,electricity,all-week,early-peak,2030,all-year,R1,0.40830000000,windturbine,3,MUS$2010/PJ,2045 -2,10,electricity,all-week,early-peak,2035,all-year,R1,0.20000000000,windturbine,3,MUS$2010/PJ,2045 -3,10,electricity,all-week,early-peak,2040,all-year,R1,0.20000000000,windturbine,3,MUS$2010/PJ,2045 -4,10,electricity,all-week,early-peak,2045,all-year,R1,0.20000000000,windturbine,3,MUS$2010/PJ,2045 -0,10,electricity,all-week,late-peak,2025,all-year,R1,1.18330000000,windturbine,4,MUS$2010/PJ,2045 -1,10,electricity,all-week,late-peak,2030,all-year,R1,0.81670000000,windturbine,4,MUS$2010/PJ,2045 -2,10,electricity,all-week,late-peak,2035,all-year,R1,0.40000000000,windturbine,4,MUS$2010/PJ,2045 -3,10,electricity,all-week,late-peak,2040,all-year,R1,0.40000000000,windturbine,4,MUS$2010/PJ,2045 -4,10,electricity,all-week,late-peak,2045,all-year,R1,0.40000000000,windturbine,4,MUS$2010/PJ,2045 -0,10,electricity,all-week,evening,2025,all-year,R1,0.78890000000,windturbine,5,MUS$2010/PJ,2045 -1,10,electricity,all-week,evening,2030,all-year,R1,0.54440000000,windturbine,5,MUS$2010/PJ,2045 -2,10,electricity,all-week,evening,2035,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2045 -3,10,electricity,all-week,evening,2040,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2045 -4,10,electricity,all-week,evening,2045,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2045 -0,10,electricity,all-week,night,2030,all-year,R1,0.27220000000,windturbine,0,MUS$2010/PJ,2050 -1,10,electricity,all-week,night,2035,all-year,R1,0.13330000000,windturbine,0,MUS$2010/PJ,2050 -2,10,electricity,all-week,night,2040,all-year,R1,0.13330000000,windturbine,0,MUS$2010/PJ,2050 -3,10,electricity,all-week,night,2045,all-year,R1,0.13330000000,windturbine,0,MUS$2010/PJ,2050 -4,10,electricity,all-week,night,2050,all-year,R1,0.52780000000,windturbine,0,MUS$2010/PJ,2050 -0,10,electricity,all-week,morning,2030,all-year,R1,0.40830000000,windturbine,1,MUS$2010/PJ,2050 -1,10,electricity,all-week,morning,2035,all-year,R1,0.20000000000,windturbine,1,MUS$2010/PJ,2050 -2,10,electricity,all-week,morning,2040,all-year,R1,0.20000000000,windturbine,1,MUS$2010/PJ,2050 -3,10,electricity,all-week,morning,2045,all-year,R1,0.20000000000,windturbine,1,MUS$2010/PJ,2050 -4,10,electricity,all-week,morning,2050,all-year,R1,0.79170000000,windturbine,1,MUS$2010/PJ,2050 -0,10,electricity,all-week,afternoon,2030,all-year,R1,0.27220000000,windturbine,2,MUS$2010/PJ,2050 -1,10,electricity,all-week,afternoon,2035,all-year,R1,0.13330000000,windturbine,2,MUS$2010/PJ,2050 -2,10,electricity,all-week,afternoon,2040,all-year,R1,0.13330000000,windturbine,2,MUS$2010/PJ,2050 -3,10,electricity,all-week,afternoon,2045,all-year,R1,0.13330000000,windturbine,2,MUS$2010/PJ,2050 -4,10,electricity,all-week,afternoon,2050,all-year,R1,0.52780000000,windturbine,2,MUS$2010/PJ,2050 -0,10,electricity,all-week,early-peak,2030,all-year,R1,0.40830000000,windturbine,3,MUS$2010/PJ,2050 -1,10,electricity,all-week,early-peak,2035,all-year,R1,0.20000000000,windturbine,3,MUS$2010/PJ,2050 -2,10,electricity,all-week,early-peak,2040,all-year,R1,0.20000000000,windturbine,3,MUS$2010/PJ,2050 -3,10,electricity,all-week,early-peak,2045,all-year,R1,0.20000000000,windturbine,3,MUS$2010/PJ,2050 -4,10,electricity,all-week,early-peak,2050,all-year,R1,0.79170000000,windturbine,3,MUS$2010/PJ,2050 -0,10,electricity,all-week,late-peak,2030,all-year,R1,0.81670000000,windturbine,4,MUS$2010/PJ,2050 -1,10,electricity,all-week,late-peak,2035,all-year,R1,0.40000000000,windturbine,4,MUS$2010/PJ,2050 -2,10,electricity,all-week,late-peak,2040,all-year,R1,0.40000000000,windturbine,4,MUS$2010/PJ,2050 -3,10,electricity,all-week,late-peak,2045,all-year,R1,0.40000000000,windturbine,4,MUS$2010/PJ,2050 -4,10,electricity,all-week,late-peak,2050,all-year,R1,1.58330000000,windturbine,4,MUS$2010/PJ,2050 -0,10,electricity,all-week,evening,2030,all-year,R1,0.54440000000,windturbine,5,MUS$2010/PJ,2050 -1,10,electricity,all-week,evening,2035,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2050 -2,10,electricity,all-week,evening,2040,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2050 -3,10,electricity,all-week,evening,2045,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2050 -4,10,electricity,all-week,evening,2050,all-year,R1,1.05560000000,windturbine,5,MUS$2010/PJ,2050 +0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2020,all-year,R1,0.03330000000,gasCCGT,0,MUS$2010/PJ,2020 +0,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,all-week,night,2020,all-year,R1,3.05570000000,gasCCGT,0,MUS$2010/kt,2020 +0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2020,all-year,R1,0.06670000000,gasCCGT,1,MUS$2010/PJ,2020 +0,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,all-week,morning,2020,all-year,R1,6.11130000000,gasCCGT,1,MUS$2010/kt,2020 +0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2020,all-year,R1,0.10000000000,gasCCGT,2,MUS$2010/PJ,2020 +0,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,all-week,afternoon,2020,all-year,R1,9.16700000000,gasCCGT,2,MUS$2010/kt,2020 +0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2020,all-year,R1,0.06670000000,gasCCGT,3,MUS$2010/PJ,2020 +0,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,all-week,early-peak,2020,all-year,R1,6.11130000000,gasCCGT,3,MUS$2010/kt,2020 +0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2020,all-year,R1,0.05210000000,gasCCGT,0,MUS$2010/PJ,2025 +1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2025,all-year,R1,0.37010000000,windturbine,0,MUS$2010/PJ,2025 +0,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,all-week,night,2020,all-year,R1,4.77840000000,gasCCGT,0,MUS$2010/kt,2025 +0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2020,all-year,R1,0.07820000000,gasCCGT,1,MUS$2010/PJ,2025 +1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2025,all-year,R1,0.55510000000,windturbine,1,MUS$2010/PJ,2025 +0,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,all-week,morning,2020,all-year,R1,7.16760000000,gasCCGT,1,MUS$2010/kt,2025 +0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2020,all-year,R1,0.10000000000,gasCCGT,2,MUS$2010/PJ,2025 +1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2025,all-year,R1,0.37010000000,windturbine,2,MUS$2010/PJ,2025 +0,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,all-week,afternoon,2020,all-year,R1,9.16700000000,gasCCGT,2,MUS$2010/kt,2025 +0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2020,all-year,R1,0.07820000000,gasCCGT,3,MUS$2010/PJ,2025 +1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2025,all-year,R1,0.55510000000,windturbine,3,MUS$2010/PJ,2025 +0,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,all-week,early-peak,2020,all-year,R1,7.16760000000,gasCCGT,3,MUS$2010/kt,2025 +0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2020,all-year,R1,0.08330000000,gasCCGT,4,MUS$2010/PJ,2025 +1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2025,all-year,R1,1.18330000000,windturbine,4,MUS$2010/PJ,2025 +0,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,all-week,late-peak,2020,all-year,R1,7.63920000000,gasCCGT,4,MUS$2010/kt,2025 +0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2020,all-year,R1,0.05560000000,gasCCGT,5,MUS$2010/PJ,2025 +1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2025,all-year,R1,0.78890000000,windturbine,5,MUS$2010/PJ,2025 +0,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,all-week,evening,2020,all-year,R1,5.09280000000,gasCCGT,5,MUS$2010/kt,2025 +0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2025,all-year,R1,0.39440000000,windturbine,0,MUS$2010/PJ,2030 +1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2030,all-year,R1,0.27220000000,windturbine,0,MUS$2010/PJ,2030 +0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2025,all-year,R1,0.59170000000,windturbine,1,MUS$2010/PJ,2030 +1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2030,all-year,R1,0.40830000000,windturbine,1,MUS$2010/PJ,2030 +0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2025,all-year,R1,0.39440000000,windturbine,2,MUS$2010/PJ,2030 +1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2030,all-year,R1,0.27220000000,windturbine,2,MUS$2010/PJ,2030 +0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2025,all-year,R1,0.59170000000,windturbine,3,MUS$2010/PJ,2030 +1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2030,all-year,R1,0.40830000000,windturbine,3,MUS$2010/PJ,2030 +0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2025,all-year,R1,1.18330000000,windturbine,4,MUS$2010/PJ,2030 +1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2030,all-year,R1,0.81670000000,windturbine,4,MUS$2010/PJ,2030 +0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2025,all-year,R1,0.78890000000,windturbine,5,MUS$2010/PJ,2030 +1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2030,all-year,R1,0.54440000000,windturbine,5,MUS$2010/PJ,2030 +0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2025,all-year,R1,0.39440000000,windturbine,0,MUS$2010/PJ,2035 +1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2030,all-year,R1,0.27220000000,windturbine,0,MUS$2010/PJ,2035 +2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2035,all-year,R1,0.13330000000,windturbine,0,MUS$2010/PJ,2035 +0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2025,all-year,R1,0.59170000000,windturbine,1,MUS$2010/PJ,2035 +1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2030,all-year,R1,0.40830000000,windturbine,1,MUS$2010/PJ,2035 +2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2035,all-year,R1,0.20000000000,windturbine,1,MUS$2010/PJ,2035 +0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2025,all-year,R1,0.39440000000,windturbine,2,MUS$2010/PJ,2035 +1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2030,all-year,R1,0.27220000000,windturbine,2,MUS$2010/PJ,2035 +2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2035,all-year,R1,0.13330000000,windturbine,2,MUS$2010/PJ,2035 +0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2025,all-year,R1,0.59170000000,windturbine,3,MUS$2010/PJ,2035 +1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2030,all-year,R1,0.40830000000,windturbine,3,MUS$2010/PJ,2035 +2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2035,all-year,R1,0.20000000000,windturbine,3,MUS$2010/PJ,2035 +0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2025,all-year,R1,1.18330000000,windturbine,4,MUS$2010/PJ,2035 +1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2030,all-year,R1,0.81670000000,windturbine,4,MUS$2010/PJ,2035 +2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2035,all-year,R1,0.40000000000,windturbine,4,MUS$2010/PJ,2035 +0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2025,all-year,R1,0.78890000000,windturbine,5,MUS$2010/PJ,2035 +1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2030,all-year,R1,0.54440000000,windturbine,5,MUS$2010/PJ,2035 +2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2035,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2035 +0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2025,all-year,R1,0.39440000000,windturbine,0,MUS$2010/PJ,2040 +1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2030,all-year,R1,0.27220000000,windturbine,0,MUS$2010/PJ,2040 +2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2035,all-year,R1,0.13330000000,windturbine,0,MUS$2010/PJ,2040 +3,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2040,all-year,R1,0.13330000000,windturbine,0,MUS$2010/PJ,2040 +0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2025,all-year,R1,0.59170000000,windturbine,1,MUS$2010/PJ,2040 +1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2030,all-year,R1,0.40830000000,windturbine,1,MUS$2010/PJ,2040 +2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2035,all-year,R1,0.20000000000,windturbine,1,MUS$2010/PJ,2040 +3,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2040,all-year,R1,0.20000000000,windturbine,1,MUS$2010/PJ,2040 +0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2025,all-year,R1,0.39440000000,windturbine,2,MUS$2010/PJ,2040 +1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2030,all-year,R1,0.27220000000,windturbine,2,MUS$2010/PJ,2040 +2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2035,all-year,R1,0.13330000000,windturbine,2,MUS$2010/PJ,2040 +3,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2040,all-year,R1,0.13330000000,windturbine,2,MUS$2010/PJ,2040 +0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2025,all-year,R1,0.59170000000,windturbine,3,MUS$2010/PJ,2040 +1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2030,all-year,R1,0.40830000000,windturbine,3,MUS$2010/PJ,2040 +2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2035,all-year,R1,0.20000000000,windturbine,3,MUS$2010/PJ,2040 +3,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2040,all-year,R1,0.20000000000,windturbine,3,MUS$2010/PJ,2040 +0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2025,all-year,R1,1.18330000000,windturbine,4,MUS$2010/PJ,2040 +1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2030,all-year,R1,0.81670000000,windturbine,4,MUS$2010/PJ,2040 +2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2035,all-year,R1,0.40000000000,windturbine,4,MUS$2010/PJ,2040 +3,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2040,all-year,R1,0.40000000000,windturbine,4,MUS$2010/PJ,2040 +0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2025,all-year,R1,0.78890000000,windturbine,5,MUS$2010/PJ,2040 +1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2030,all-year,R1,0.54440000000,windturbine,5,MUS$2010/PJ,2040 +2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2035,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2040 +3,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2040,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2040 +0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2025,all-year,R1,0.39440000000,windturbine,0,MUS$2010/PJ,2045 +1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2030,all-year,R1,0.27220000000,windturbine,0,MUS$2010/PJ,2045 +2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2035,all-year,R1,0.13330000000,windturbine,0,MUS$2010/PJ,2045 +3,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2040,all-year,R1,0.13330000000,windturbine,0,MUS$2010/PJ,2045 +4,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2045,all-year,R1,0.13330000000,windturbine,0,MUS$2010/PJ,2045 +0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2025,all-year,R1,0.59170000000,windturbine,1,MUS$2010/PJ,2045 +1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2030,all-year,R1,0.40830000000,windturbine,1,MUS$2010/PJ,2045 +2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2035,all-year,R1,0.20000000000,windturbine,1,MUS$2010/PJ,2045 +3,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2040,all-year,R1,0.20000000000,windturbine,1,MUS$2010/PJ,2045 +4,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2045,all-year,R1,0.20000000000,windturbine,1,MUS$2010/PJ,2045 +0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2025,all-year,R1,0.39440000000,windturbine,2,MUS$2010/PJ,2045 +1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2030,all-year,R1,0.27220000000,windturbine,2,MUS$2010/PJ,2045 +2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2035,all-year,R1,0.13330000000,windturbine,2,MUS$2010/PJ,2045 +3,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2040,all-year,R1,0.13330000000,windturbine,2,MUS$2010/PJ,2045 +4,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2045,all-year,R1,0.13330000000,windturbine,2,MUS$2010/PJ,2045 +0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2025,all-year,R1,0.59170000000,windturbine,3,MUS$2010/PJ,2045 +1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2030,all-year,R1,0.40830000000,windturbine,3,MUS$2010/PJ,2045 +2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2035,all-year,R1,0.20000000000,windturbine,3,MUS$2010/PJ,2045 +3,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2040,all-year,R1,0.20000000000,windturbine,3,MUS$2010/PJ,2045 +4,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2045,all-year,R1,0.20000000000,windturbine,3,MUS$2010/PJ,2045 +0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2025,all-year,R1,1.18330000000,windturbine,4,MUS$2010/PJ,2045 +1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2030,all-year,R1,0.81670000000,windturbine,4,MUS$2010/PJ,2045 +2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2035,all-year,R1,0.40000000000,windturbine,4,MUS$2010/PJ,2045 +3,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2040,all-year,R1,0.40000000000,windturbine,4,MUS$2010/PJ,2045 +4,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2045,all-year,R1,0.40000000000,windturbine,4,MUS$2010/PJ,2045 +0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2025,all-year,R1,0.78890000000,windturbine,5,MUS$2010/PJ,2045 +1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2030,all-year,R1,0.54440000000,windturbine,5,MUS$2010/PJ,2045 +2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2035,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2045 +3,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2040,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2045 +4,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2045,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2045 diff --git a/docs/tutorial-code/min-max-timeslice-constraints/2-max-constraint/settings.toml b/docs/tutorial-code/min-max-timeslice-constraints/2-max-constraint/settings.toml index 05130bfd0..dcd8f1383 100644 --- a/docs/tutorial-code/min-max-timeslice-constraints/2-max-constraint/settings.toml +++ b/docs/tutorial-code/min-max-timeslice-constraints/2-max-constraint/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' diff --git a/docs/tutorial-code/modify-timing-data/1-modify-timeslices/Results/MCACapacity.csv b/docs/tutorial-code/modify-timing-data/1-modify-timeslices/Results/MCACapacity.csv index b57a8cc6a..25cfe1164 100644 --- a/docs/tutorial-code/modify-timing-data/1-modify-timeslices/Results/MCACapacity.csv +++ b/docs/tutorial-code/modify-timing-data/1-modify-timeslices/Results/MCACapacity.csv @@ -51,15 +51,3 @@ A1,5.60000000000,R1,2045,R1,power,windturbine,newcapa,2045 A1,4.12600000000,R1,2025,R1,gas,gassupply1,newcapa,2045 A1,7.38610000000,R1,2030,R1,gas,gassupply1,newcapa,2045 A1,7.50000000000,R1,2035,R1,gas,gassupply1,newcapa,2045 -A1,28.60000000000,R1,2045,R1,residential,heatpump,newcapa,2050 -A1,21.80000000000,R1,2050,R1,residential,heatpump,newcapa,2050 -A1,6.59380000000,R1,2025,R1,power,gasCCGT,newcapa,2050 -A1,4.79070000000,R1,2030,R1,power,gasCCGT,newcapa,2050 -A1,2.07080000000,R1,2030,R1,power,windturbine,newcapa,2050 -A1,5.60000000000,R1,2035,R1,power,windturbine,newcapa,2050 -A1,5.60000000000,R1,2040,R1,power,windturbine,newcapa,2050 -A1,5.60000000000,R1,2045,R1,power,windturbine,newcapa,2050 -A1,5.91410000000,R1,2050,R1,power,windturbine,newcapa,2050 -A1,4.12600000000,R1,2025,R1,gas,gassupply1,newcapa,2050 -A1,7.38610000000,R1,2030,R1,gas,gassupply1,newcapa,2050 -A1,7.50000000000,R1,2035,R1,gas,gassupply1,newcapa,2050 diff --git a/docs/tutorial-code/modify-timing-data/1-modify-timeslices/Results/MCAPrices.csv b/docs/tutorial-code/modify-timing-data/1-modify-timeslices/Results/MCAPrices.csv index 8062d64f0..2aa26615c 100644 --- a/docs/tutorial-code/modify-timing-data/1-modify-timeslices/Results/MCAPrices.csv +++ b/docs/tutorial-code/modify-timing-data/1-modify-timeslices/Results/MCAPrices.csv @@ -191,35 +191,3 @@ electricity,all-week,late-afternoon,all-year,31.11670000000,R1,7,MUS$2010/PJ,204 gas,all-week,late-afternoon,all-year,2.55000000000,R1,7,MUS$2010/PJ,2045 heat,all-week,late-afternoon,all-year,14.94590000000,R1,7,MUS$2010/PJ,2045 CO2f,all-week,late-afternoon,all-year,0.35390000000,R1,7,MUS$2010/kt,2045 -electricity,all-week,night,all-year,33.36640000000,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,15.84580000000,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.36640000000,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,15.84580000000,R1,1,MUS$2010/PJ,2050 -CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050 -electricity,all-week,mid-afternoon,all-year,33.36640000000,R1,2,MUS$2010/PJ,2050 -gas,all-week,mid-afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050 -heat,all-week,mid-afternoon,all-year,15.84580000000,R1,2,MUS$2010/PJ,2050 -CO2f,all-week,mid-afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050 -electricity,all-week,early-peak,all-year,33.36640000000,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,15.84580000000,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.36640000000,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,15.84580000000,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.36640000000,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,15.84580000000,R1,5,MUS$2010/PJ,2050 -CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050 -electricity,all-week,early-morning,all-year,33.36640000000,R1,6,MUS$2010/PJ,2050 -gas,all-week,early-morning,all-year,2.55000000000,R1,6,MUS$2010/PJ,2050 -heat,all-week,early-morning,all-year,15.84580000000,R1,6,MUS$2010/PJ,2050 -CO2f,all-week,early-morning,all-year,0.43510000000,R1,6,MUS$2010/kt,2050 -electricity,all-week,late-afternoon,all-year,33.36640000000,R1,7,MUS$2010/PJ,2050 -gas,all-week,late-afternoon,all-year,2.55000000000,R1,7,MUS$2010/PJ,2050 -heat,all-week,late-afternoon,all-year,15.84580000000,R1,7,MUS$2010/PJ,2050 -CO2f,all-week,late-afternoon,all-year,0.43510000000,R1,7,MUS$2010/kt,2050 diff --git a/docs/tutorial-code/modify-timing-data/1-modify-timeslices/settings.toml b/docs/tutorial-code/modify-timing-data/1-modify-timeslices/settings.toml index 679f3c266..45654d876 100644 --- a/docs/tutorial-code/modify-timing-data/1-modify-timeslices/settings.toml +++ b/docs/tutorial-code/modify-timing-data/1-modify-timeslices/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' diff --git a/docs/tutorial-code/modify-timing-data/2-modify-time-framework/Results/MCACapacity.csv b/docs/tutorial-code/modify-timing-data/2-modify-time-framework/Results/MCACapacity.csv index a1cf35c01..a6805883c 100644 --- a/docs/tutorial-code/modify-timing-data/2-modify-time-framework/Results/MCACapacity.csv +++ b/docs/tutorial-code/modify-timing-data/2-modify-time-framework/Results/MCACapacity.csv @@ -138,26 +138,3 @@ A1,2.24000000000,R1,2032,R1,power,windturbine,newcapa,2038 A1,2.24000000000,R1,2034,R1,power,windturbine,newcapa,2038 A1,2.24000000000,R1,2036,R1,power,windturbine,newcapa,2038 A1,2.24000000000,R1,2038,R1,power,windturbine,newcapa,2038 -A1,13.28000000000,R1,2032,R1,residential,heatpump,newcapa,2040 -A1,6.48000000000,R1,2034,R1,residential,heatpump,newcapa,2040 -A1,6.48000000000,R1,2036,R1,residential,heatpump,newcapa,2040 -A1,6.48000000000,R1,2038,R1,residential,heatpump,newcapa,2040 -A1,6.48000000000,R1,2040,R1,residential,heatpump,newcapa,2040 -A1,3.00000000000,R1,2022,R1,power,gasCCGT,newcapa,2040 -A1,1.88440000000,R1,2024,R1,power,gasCCGT,newcapa,2040 -A1,2.08440000000,R1,2026,R1,power,gasCCGT,newcapa,2040 -A1,2.28440000000,R1,2028,R1,power,gasCCGT,newcapa,2040 -A1,2.04000000000,R1,2022,R1,power,windturbine,newcapa,2040 -A1,5.14000000000,R1,2030,R1,power,windturbine,newcapa,2040 -A1,2.24000000000,R1,2032,R1,power,windturbine,newcapa,2040 -A1,2.24000000000,R1,2034,R1,power,windturbine,newcapa,2040 -A1,2.24000000000,R1,2036,R1,power,windturbine,newcapa,2040 -A1,2.24000000000,R1,2038,R1,power,windturbine,newcapa,2040 -A1,2.24000000000,R1,2040,R1,power,windturbine,newcapa,2040 -A1,1.99110000000,R1,2022,R1,gas,gassupply1,newcapa,2040 -A1,0.56920000000,R1,2024,R1,gas,gassupply1,newcapa,2040 -A1,2.06920000000,R1,2026,R1,gas,gassupply1,newcapa,2040 -A1,3.56920000000,R1,2028,R1,gas,gassupply1,newcapa,2040 -A1,2.75420000000,R1,2032,R1,gas,gassupply1,newcapa,2040 -A1,3.00000000000,R1,2034,R1,gas,gassupply1,newcapa,2040 -A1,1.50000000000,R1,2036,R1,gas,gassupply1,newcapa,2040 diff --git a/docs/tutorial-code/modify-timing-data/2-modify-time-framework/Results/MCAPrices.csv b/docs/tutorial-code/modify-timing-data/2-modify-time-framework/Results/MCAPrices.csv index bcd61a467..7b7db94e1 100644 --- a/docs/tutorial-code/modify-timing-data/2-modify-time-framework/Results/MCAPrices.csv +++ b/docs/tutorial-code/modify-timing-data/2-modify-time-framework/Results/MCAPrices.csv @@ -319,35 +319,3 @@ electricity,all-week,late-afternoon,all-year,25.52450000000,R1,7,MUS$2010/PJ,203 gas,all-week,late-afternoon,all-year,2.55000000000,R1,7,MUS$2010/PJ,2038 heat,all-week,late-afternoon,all-year,12.70910000000,R1,7,MUS$2010/PJ,2038 CO2f,all-week,late-afternoon,all-year,0.24960000000,R1,7,MUS$2010/kt,2038 -electricity,all-week,night,all-year,26.18290000000,R1,0,MUS$2010/PJ,2040 -gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,12.97240000000,R1,0,MUS$2010/PJ,2040 -CO2f,all-week,night,all-year,0.27280000000,R1,0,MUS$2010/kt,2040 -electricity,all-week,morning,all-year,26.18290000000,R1,1,MUS$2010/PJ,2040 -gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,12.97240000000,R1,1,MUS$2010/PJ,2040 -CO2f,all-week,morning,all-year,0.27280000000,R1,1,MUS$2010/kt,2040 -electricity,all-week,mid-afternoon,all-year,26.18290000000,R1,2,MUS$2010/PJ,2040 -gas,all-week,mid-afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2040 -heat,all-week,mid-afternoon,all-year,12.97240000000,R1,2,MUS$2010/PJ,2040 -CO2f,all-week,mid-afternoon,all-year,0.27280000000,R1,2,MUS$2010/kt,2040 -electricity,all-week,early-peak,all-year,26.18290000000,R1,3,MUS$2010/PJ,2040 -gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,12.97240000000,R1,3,MUS$2010/PJ,2040 -CO2f,all-week,early-peak,all-year,0.27280000000,R1,3,MUS$2010/kt,2040 -electricity,all-week,late-peak,all-year,26.18290000000,R1,4,MUS$2010/PJ,2040 -gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,12.97240000000,R1,4,MUS$2010/PJ,2040 -CO2f,all-week,late-peak,all-year,0.27280000000,R1,4,MUS$2010/kt,2040 -electricity,all-week,evening,all-year,26.18290000000,R1,5,MUS$2010/PJ,2040 -gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,12.97240000000,R1,5,MUS$2010/PJ,2040 -CO2f,all-week,evening,all-year,0.27280000000,R1,5,MUS$2010/kt,2040 -electricity,all-week,early-morning,all-year,26.18290000000,R1,6,MUS$2010/PJ,2040 -gas,all-week,early-morning,all-year,2.55000000000,R1,6,MUS$2010/PJ,2040 -heat,all-week,early-morning,all-year,12.97240000000,R1,6,MUS$2010/PJ,2040 -CO2f,all-week,early-morning,all-year,0.27280000000,R1,6,MUS$2010/kt,2040 -electricity,all-week,late-afternoon,all-year,26.18290000000,R1,7,MUS$2010/PJ,2040 -gas,all-week,late-afternoon,all-year,2.55000000000,R1,7,MUS$2010/PJ,2040 -heat,all-week,late-afternoon,all-year,12.97240000000,R1,7,MUS$2010/PJ,2040 -CO2f,all-week,late-afternoon,all-year,0.27280000000,R1,7,MUS$2010/kt,2040 diff --git a/docs/tutorial-code/modify-timing-data/2-modify-time-framework/settings.toml b/docs/tutorial-code/modify-timing-data/2-modify-time-framework/settings.toml index 4a264e54d..2b45aa5cc 100644 --- a/docs/tutorial-code/modify-timing-data/2-modify-time-framework/settings.toml +++ b/docs/tutorial-code/modify-timing-data/2-modify-time-framework/settings.toml @@ -1,7 +1,6 @@ # Global settings - most REQUIRED time_framework = [2020, 2022, 2024, 2026, 2028, 2030, 2032, 2034, 2036, 2038, 2040] -foresight = 2 # Has to be a multiple of the minimum separation between the years in time framework regions = ["R1"] interest_rate = 0.1 interpolation_mode = 'Active' diff --git a/docs/tutorial-code/modify-timing-data/generate_models.py b/docs/tutorial-code/modify-timing-data/generate_models.py index c81d775cd..5da0d313d 100644 --- a/docs/tutorial-code/modify-timing-data/generate_models.py +++ b/docs/tutorial-code/modify-timing-data/generate_models.py @@ -80,7 +80,6 @@ def generate_model_2(): settings_file = model_path / "settings.toml" time_framework = [2020, 2022, 2024, 2026, 2028, 2030, 2032, 2034, 2036, 2038, 2040] modify_toml(settings_file, lambda x: x.update({"time_framework": time_framework})) - modify_toml(settings_file, lambda x: x.update({"foresight": 2})) for sector in get_sectors(model_path): modify_toml( settings_file, diff --git a/docs/tutorial-code/new-decision-metric/Results/MCACapacity.csv b/docs/tutorial-code/new-decision-metric/Results/MCACapacity.csv index 2a91c624e..63229b23f 100644 --- a/docs/tutorial-code/new-decision-metric/Results/MCACapacity.csv +++ b/docs/tutorial-code/new-decision-metric/Results/MCACapacity.csv @@ -47,14 +47,3 @@ A1,6.00000000000,R1,2045,R1,power,solarPV,newcapa,2045 A1,3.40130000000,R1,2025,R1,power,windturbine,newcapa,2045 A1,3.25000000000,R1,2030,R1,power,windturbine,newcapa,2045 A1,2.48550000000,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,1.48830000000,R1,2025,R1,power,gasCCGT,newcapa,2050 -A1,10.00000000000,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,10.00000000000,R1,2050,R1,power,solarPV,newcapa,2050 -A1,3.25000000000,R1,2030,R1,power,windturbine,newcapa,2050 -A1,9.40130000000,R1,2050,R1,power,windturbine,newcapa,2050 -A1,2.48550000000,R1,2035,R1,gas,gassupply1,newcapa,2050 diff --git a/docs/tutorial-code/new-decision-metric/Results/MCAPrices.csv b/docs/tutorial-code/new-decision-metric/Results/MCAPrices.csv index 811f907ed..ea92faa3c 100644 --- a/docs/tutorial-code/new-decision-metric/Results/MCAPrices.csv +++ b/docs/tutorial-code/new-decision-metric/Results/MCAPrices.csv @@ -143,27 +143,3 @@ electricity,all-week,evening,all-year,17.17320000000,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,9.46670000000,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,17.72660000000,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,9.68810000000,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,17.72660000000,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,9.68810000000,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,17.72660000000,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,9.68810000000,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,17.72660000000,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,9.68810000000,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,17.72660000000,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,9.68810000000,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,17.72660000000,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,9.68810000000,R1,5,MUS$2010/PJ,2050 -CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050 diff --git a/docs/tutorial-code/new-decision-metric/settings.toml b/docs/tutorial-code/new-decision-metric/settings.toml index 12d7ad113..da544d982 100644 --- a/docs/tutorial-code/new-decision-metric/settings.toml +++ b/docs/tutorial-code/new-decision-metric/settings.toml @@ -1,7 +1,6 @@ plugins = "{path}/new_decision.py" # 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' diff --git a/docs/user-guide/modify-timing-data.ipynb b/docs/user-guide/modify-timing-data.ipynb index 26d1eaea8..100bfdeff 100644 --- a/docs/user-guide/modify-timing-data.ipynb +++ b/docs/user-guide/modify-timing-data.ipynb @@ -137,7 +137,7 @@ "source": [ "For the previous examples, we have run the scenario from 2020 to 2050, in 5 year time steps per benchmark year. However, we may want to run a more detailed scenario, with 2 year time steps, and up until the year 2040.\n", "\n", - "We will make this change by modifying the current model. Firstly, we need to change the first two lines of the `settings.toml` file, as follows:" + "We will make this change by modifying the current model. Firstly, we need to change the time framework defined in `settings.toml` file, as follows:" ] }, { @@ -146,7 +146,6 @@ "source": [ "```toml\n", "time_framework = [2020, 2022, 2024, 2026, 2028, 2030, 2032, 2034, 2036, 2038, 2040]\n", - "foresight = 2\n", "```" ] }, @@ -154,8 +153,6 @@ "cell_type": "markdown", "metadata": {}, "source": [ - "The `time_framework` details each benchmark year in which we run the simulation. The ```foresight``` variable details how much foresight an agent has when making investments. \n", - "\n", "We also have to modity the `forecast` value for each sector. For example, for the power sector the `sectors.power.subsectors.all` section should now look as follows:\n", "\n", "```toml\n", diff --git a/src/muse/__main__.py b/src/muse/__main__.py index cd0ad90f5..5286dc93a 100644 --- a/src/muse/__main__.py +++ b/src/muse/__main__.py @@ -114,8 +114,8 @@ def patched_broadcast_compat_data(self, other): "(e.g. a capacity dataset with an 'asset' dimension) with a fully explicit " "technology dataset (e.g. a technology dataset with 'region' and " "'technology' dimensions). " - "Please use `broadcast_techs` on the latter object before performing this " - "operation." + "Please use `broadcast_over_assets` on the latter object before performing " + "this operation." ) return self_data, other_data, dims diff --git a/src/muse/agents/agent.py b/src/muse/agents/agent.py index a4e05f160..159f39e77 100644 --- a/src/muse/agents/agent.py +++ b/src/muse/agents/agent.py @@ -257,7 +257,6 @@ def asset_housekeeping(self): - remove empty assets - remove years prior to current - - interpolate current year and forecasted year """ # TODO: move this into search and make sure filters, demand_share and # what not use assets from search. That would remove another bit of diff --git a/src/muse/data/default_settings.toml b/src/muse/data/default_settings.toml index 35bc1113c..09d0f373a 100644 --- a/src/muse/data/default_settings.toml +++ b/src/muse/data/default_settings.toml @@ -1,9 +1,6 @@ # Global settings time_framework = 'REQUIRED' -# foresight must be a multiple of the minimum separation between the years in time -# framework -foresight = 'REQUIRED' regions = 'REQUIRED' interest_rate = 0.1 interpolation_mode = 'Active' diff --git a/src/muse/data/example/default/settings.toml b/src/muse/data/example/default/settings.toml index 8c508b8cd..7cf1d26dc 100644 --- a/src/muse/data/example/default/settings.toml +++ b/src/muse/data/example/default/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' diff --git a/src/muse/data/example/default_retro/settings.toml b/src/muse/data/example/default_retro/settings.toml index 4c9cae789..9011517a1 100644 --- a/src/muse/data/example/default_retro/settings.toml +++ b/src/muse/data/example/default_retro/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' diff --git a/src/muse/data/example/default_timeslice/settings.toml b/src/muse/data/example/default_timeslice/settings.toml index 05130bfd0..dcd8f1383 100644 --- a/src/muse/data/example/default_timeslice/settings.toml +++ b/src/muse/data/example/default_timeslice/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' diff --git a/src/muse/data/example/minimum_service/settings.toml b/src/muse/data/example/minimum_service/settings.toml index bbab44c42..005ef519f 100644 --- a/src/muse/data/example/minimum_service/settings.toml +++ b/src/muse/data/example/minimum_service/settings.toml @@ -1,8 +1,6 @@ # Global settings - most REQUIRED time_framework = [2010, 2015, 2020, 2025, 2030, 2035, 2040, 2045, 2050] -# Has to be a multiple of the minimum separation between the years in time framework -foresight = 5 regions = ["R1"] interest_rate = 0.1 interpolation_mode = 'Active' diff --git a/src/muse/data/example/trade/settings.toml b/src/muse/data/example/trade/settings.toml index a851e6a96..0a8d83477 100644 --- a/src/muse/data/example/trade/settings.toml +++ b/src/muse/data/example/trade/settings.toml @@ -1,7 +1,6 @@ # Global settings - most REQUIRED time_framework = [2020, 2025, 2030, 2035] -foresight = 5 # Has to be a multiple of the minimum separation between the years in time framework regions = ["R1", "R2"] interest_rate = 0.1 interpolation_mode = 'Active' diff --git a/src/muse/demand_share.py b/src/muse/demand_share.py index 40397bf3f..17b0be3b4 100644 --- a/src/muse/demand_share.py +++ b/src/muse/demand_share.py @@ -246,11 +246,11 @@ def new_and_retro( from muse.commodities import is_enduse from muse.quantities import maximum_production - from muse.utilities import agent_concatenation, reduce_assets + from muse.utilities import agent_concatenation, broadcast_over_assets, reduce_assets current_year, investment_year = map(int, market.year.values) - def decommissioning(capacity): + def decommissioning(capacity, technologies): return decommissioning_demand( technologies=technologies, capacity=capacity.interp( @@ -263,10 +263,13 @@ def decommissioning(capacity): year=[current_year, investment_year], kwargs={"fill_value": 0.0} ) + # Select technodata for assets + technodata = broadcast_over_assets(technologies, capacity, installed_as_year=True) + demands = new_and_retro_demands( capacity, market, - technologies, + technodata, timeslice_level=timeslice_level, ) @@ -284,19 +287,20 @@ def decommissioning(capacity): id_to_share: MutableMapping[Hashable, xr.DataArray] = {} for region in demands.region.values: - regional_techs = technologies.sel(region=region) retro_capacity: MutableMapping[Hashable, xr.DataArray] = { agent.uuid: agent.assets.capacity for agent in agents if agent.category == "retrofit" and agent.region == region } - + retro_technodata: MutableMapping[Hashable, xr.Dataset] = { + agent_uuid: technodata.sel(asset=retro_capacity[agent_uuid].asset) + for agent_uuid in retro_capacity.keys() + } name_to_id = { (agent.name, agent.region): agent.uuid for agent in agents if agent.category == "retrofit" and agent.region == region } - id_to_rquantity = { agent.uuid: (agent.name, agent.region, agent.quantity) for agent in agents @@ -305,6 +309,7 @@ def decommissioning(capacity): retro_demands: MutableMapping[Hashable, xr.DataArray] = _inner_split( retro_capacity, + retro_technodata, demands.retrofit.sel(region=region), decommissioning, id_to_rquantity, @@ -319,7 +324,10 @@ def decommissioning(capacity): for agent in agents if agent.category != "retrofit" and agent.region == region } - + new_technodata: MutableMapping[Hashable, xr.Dataset] = { + agent_uuid: technodata.sel(asset=new_capacity[agent_uuid].asset) + for agent_uuid in new_capacity.keys() + } id_to_nquantity = { agent.uuid: (agent.name, agent.region, agent.quantity) for agent in agents @@ -327,10 +335,10 @@ def decommissioning(capacity): } new_demands = _inner_split( new_capacity, + new_technodata, demands.new.sel(region=region), partial( maximum_production, - technologies=regional_techs, year=current_year, timeslice_level=timeslice_level, ), @@ -372,11 +380,11 @@ def standard_demand( from muse.commodities import is_enduse from muse.quantities import maximum_production - from muse.utilities import agent_concatenation, reduce_assets + from muse.utilities import agent_concatenation, broadcast_over_assets, reduce_assets current_year, investment_year = map(int, market.year.values) - def decommissioning(capacity): + def decommissioning(capacity, technologies): return decommissioning_demand( technologies=technologies, capacity=capacity.interp( @@ -395,11 +403,14 @@ def decommissioning(capacity): year=[current_year, investment_year], kwargs={"fill_value": 0.0} ) + # Select technodata for assets + technodata = broadcast_over_assets(technologies, capacity, installed_as_year=True) + # Calculate new and retrofit demands demands = new_and_retro_demands( capacity=capacity, market=market, - technologies=technologies, + technologies=technodata, timeslice_level=timeslice_level, ) @@ -416,6 +427,10 @@ def decommissioning(capacity): for agent in agents if agent.region == region } + current_technodata: MutableMapping[Hashable, xr.Dataset] = { + agent_uuid: technodata.sel(asset=current_capacity[agent_uuid].asset) + for agent_uuid in current_capacity.keys() + } # Split demands between agents id_to_quantity = { @@ -425,16 +440,17 @@ def decommissioning(capacity): } retro_demands: MutableMapping[Hashable, xr.DataArray] = _inner_split( current_capacity, + current_technodata, demands.retrofit.sel(region=region), decommissioning, id_to_quantity, ) new_demands = _inner_split( current_capacity, + current_technodata, demands.new.sel(region=region), partial( maximum_production, - technologies=technologies.sel(region=region), year=current_year, timeslice_level=timeslice_level, ), @@ -461,7 +477,7 @@ def unmet_forecasted_demand( ) -> xr.DataArray: """Forecast demand that cannot be serviced by non-decommissioned current assets.""" from muse.commodities import is_enduse - from muse.utilities import reduce_assets + from muse.utilities import broadcast_over_assets, reduce_assets current_year, investment_year = map(int, market.year.values) @@ -477,11 +493,14 @@ def unmet_forecasted_demand( future_market = smarket.sel(year=investment_year, drop=True) future_capacity = capacity.sel(year=investment_year) + # Select technology data for assets + techs = broadcast_over_assets(technologies, capacity, installed_as_year=True) + # Calculate unmet demand result = unmet_demand( market=future_market, capacity=future_capacity, - technologies=technologies, + technologies=techs, timeslice_level=timeslice_level, ) assert "year" not in result.dims @@ -490,6 +509,7 @@ def unmet_forecasted_demand( def _inner_split( assets: Mapping[Hashable, xr.DataArray], + technologies: Mapping[Hashable, xr.DataSet], demand: xr.DataArray, method: Callable, quantity: Mapping, @@ -503,7 +523,7 @@ def _inner_split( # Find decrease in capacity production by each asset over time shares: Mapping[Hashable, xr.DataArray] = { - key: method(capacity=capacity) + key: method(capacity=capacity, technologies=technologies[key]) .groupby("technology") .sum("asset") .rename(technology="asset") diff --git a/src/muse/examples.py b/src/muse/examples.py index 963e9e67e..3aa3e2878 100644 --- a/src/muse/examples.py +++ b/src/muse/examples.py @@ -264,21 +264,19 @@ def matching_market(sector: str, model: str = "default") -> xr.Dataset: from muse.examples import sector as load_sector from muse.quantities import consumption, maximum_production from muse.sectors import Sector - from muse.utilities import agent_concatenation + from muse.utilities import agent_concatenation, broadcast_over_assets loaded_sector = cast(Sector, load_sector(sector, model)) assets = agent_concatenation({u.uuid: u.assets for u in list(loaded_sector.agents)}) market = xr.Dataset() - production = cast( - xr.DataArray, - maximum_production(loaded_sector.technologies, assets.capacity), - ) + techs = broadcast_over_assets(loaded_sector.technologies, assets.capacity) + production = maximum_production(techs, assets.capacity) market["supply"] = production.sum("asset") if "dst_region" in market.dims: market = market.rename(dst_region="region") if market.region.dims: - consump = consumption(loaded_sector.technologies, production) + consump = consumption(techs, production) market["consumption"] = drop_timeslice( consump.groupby("region").sum( {"asset", "dst_region"}.intersection(consump.dims) @@ -287,7 +285,7 @@ def matching_market(sector: str, model: str = "default") -> xr.Dataset: ) else: market["consumption"] = ( - consumption(loaded_sector.technologies, production).sum( + consumption(techs, production).sum( {"asset", "dst_region"}.intersection(market.dims) ) + market.supply diff --git a/src/muse/investments.py b/src/muse/investments.py index 948039ef8..eee255693 100644 --- a/src/muse/investments.py +++ b/src/muse/investments.py @@ -225,6 +225,7 @@ def adhoc_match_demand( ) -> xr.DataArray: from muse.demand_matching import demand_matching from muse.quantities import capacity_in_use, maximum_production + from muse.utilities import broadcast_over_assets assert "year" not in technologies.dims @@ -232,7 +233,7 @@ def adhoc_match_demand( max_capacity = next(c for c in constraints if c.name == "max capacity expansion").b max_prod = maximum_production( - technologies, + broadcast_over_assets(technologies, max_capacity), max_capacity, technology=costs.replacement, commodity=demand.commodity, @@ -254,7 +255,7 @@ def adhoc_match_demand( capacity = capacity_in_use( production, - technologies, + broadcast_over_assets(technologies, production), technology=production.replacement, timeslice_level=timeslice_level, ).drop_vars("technology") diff --git a/src/muse/mca.py b/src/muse/mca.py index 8a1539010..2e4d3a7bf 100644 --- a/src/muse/mca.py +++ b/src/muse/mca.py @@ -76,7 +76,6 @@ def factory(cls, settings: str | Path | Mapping | Any) -> MCA: ) extras = { - "foresight", "regions", "interest_rate", "log_level", @@ -92,8 +91,16 @@ def factory(cls, settings: str | Path | Mapping | Any) -> MCA: for k, v in settings._asdict().items() if not hasattr(v, "_asdict") and k not in extras } - if "equilibrium" in global_kw: - global_kw["equilibrium"] = global_kw.pop("equilibrium") + + # Legacy: warn user about deprecation of "foresight" parameter (#641) + if "foresight" in global_kw: + msg = ( + "The `foresight` parameter has been deprecated. " + "Please remove from your settings file." + ) + getLogger(__name__).warning(msg) + global_kw.pop("foresight") + carbon_kw = { k: v._asdict() if hasattr(v, "_asdict") else v for k, v in settings.carbon_budget_control._asdict().items() @@ -273,7 +280,9 @@ def run(self) -> None: for year_idx in range(nyear): years = self.time_framework[year_idx : year_idx + 2] - getLogger(__name__).info(f"Running simulation year {years[0]}...") + getLogger(__name__).info( + f"Running simulation years {years[0]} to {years[1]}" + ) new_market = self.market[variables].sel(year=years) assert isinstance(new_market, Dataset) new_market.supply[:] = 0 @@ -320,7 +329,8 @@ def run(self) -> None: self.outputs_cache.consolidate_cache(year=self.time_framework[year_idx]) getLogger(__name__).info( - f"Finish simulation year {years[0]} ({year_idx + 1}/{nyear})!" + f"Finished simulation period {years[0]} to {years[1]} " + f"({year_idx + 1}/{nyear})!" ) diff --git a/src/muse/quantities.py b/src/muse/quantities.py index 8878d0e85..147e8f94f 100644 --- a/src/muse/quantities.py +++ b/src/muse/quantities.py @@ -43,7 +43,7 @@ def supply( input commodities). """ from muse.commodities import CommodityUsage, check_usage, is_pollutant - from muse.utilities import broadcast_techs + from muse.utilities import broadcast_over_assets assert "asset" not in demand.dims assert "asset" in capacity.dims @@ -74,9 +74,9 @@ def supply( else: # Multi-region models - demand = broadcast_techs(demand, maxprod, installed_as_year=False) + demand = broadcast_over_assets(demand, maxprod, installed_as_year=False) total_maxprod_by_region = maxprod.groupby("region").sum(dim="asset") - share_by_asset = maxprod / broadcast_techs( + share_by_asset = maxprod / broadcast_over_assets( total_maxprod_by_region, maxprod, installed_as_year=False ) demand_by_asset = (demand * share_by_asset).fillna(0) @@ -114,19 +114,15 @@ def emission( A data array containing emissions (and only emissions). """ from muse.commodities import is_pollutant - from muse.utilities import broadcast_techs - - assert "asset" in production.dims # Calculate the production amplitude of each asset - techs = broadcast_techs(technologies, production, installed_as_year=True) - prod_amplitude = production_amplitude(production, techs) + prod_amplitude = production_amplitude(production, technologies) # Calculate the production of environmental pollutants # = prod_amplitude * fixed_outputs - envs = is_pollutant(techs.comm_usage) + envs = is_pollutant(technologies.comm_usage) envs_production = prod_amplitude * broadcast_timeslice( - techs.sel(commodity=envs).fixed_outputs, level=timeslice_level + technologies.sel(commodity=envs).fixed_outputs, level=timeslice_level ) return envs_production @@ -162,24 +158,17 @@ def consumption( dimensions as `production`. """ - from muse.utilities import filter_with_template - - params = filter_with_template( - technologies[["fixed_inputs", "flexible_inputs", "fixed_outputs"]], - production, - ) - # Calculate degree of technology activity - prod_amplitude = production_amplitude(production, params) + prod_amplitude = production_amplitude(production, technologies) # Calculate consumption of fixed commodities consumption_fixed = prod_amplitude * broadcast_timeslice( - params.fixed_inputs, level=timeslice_level + technologies.fixed_inputs, level=timeslice_level ) assert all(consumption_fixed.commodity.values == production.commodity.values) # If there are no flexible inputs, then we are done - if not (params.flexible_inputs > 0).any(): + if not (technologies.flexible_inputs > 0).any(): return consumption_fixed # If prices are not given, then we can't consider flexible inputs, so just return @@ -188,7 +177,7 @@ def consumption( return consumption_fixed # Flexible inputs - flexs = broadcast_timeslice(params.flexible_inputs, level=timeslice_level) + flexs = broadcast_timeslice(technologies.flexible_inputs, level=timeslice_level) # Calculate the cheapest fuel for each flexible technology priceflex = prices * flexs @@ -230,8 +219,7 @@ def maximum_production( capacity: Capacity of each technology of interest. In practice, the capacity can refer to asset capacity, the max capacity, or the capacity-in-use. technologies: xr.Dataset describing the features of the technologies of - interests. It should contain `fixed_outputs` and `utilization_factor`. It's - shape is matched to `capacity` using `muse.utilities.broadcast_techs`. + interests. It should contain `fixed_outputs` and `utilization_factor`. filters: keyword arguments are used to filter down the capacity and technologies. Filters not relevant to the quantities of interest, i.e. filters that are not a dimension of `capacity` or `technologies`, are @@ -243,18 +231,14 @@ def maximum_production( filters and the set of technologies in `capacity`. """ from muse.commodities import is_enduse - from muse.utilities import broadcast_techs, filter_input + from muse.utilities import filter_input capa = filter_input( capacity, **{k: v for k, v in filters.items() if k in capacity.dims} ) - btechs = broadcast_techs( - technologies[["fixed_outputs", "utilization_factor"]], - capa, - installed_as_year=True, - ) + ftechs = filter_input( - btechs, **{k: v for k, v in filters.items() if k in btechs.dims} + technologies, **{k: v for k, v in filters.items() if k in technologies.dims} ) result = ( broadcast_timeslice(capa, level=timeslice_level) @@ -278,8 +262,7 @@ def capacity_in_use( Arguments: production: Production from each technology of interest. technologies: xr.Dataset describing the features of the technologies of - interests. It should contain `fixed_outputs` and `utilization_factor`. It's - shape is matched to `capacity` using `muse.utilities.broadcast_techs`. + interests. It should contain `fixed_outputs` and `utilization_factor`. max_dim: reduces the given dimensions using `max`. Defaults to "commodity". If None, then no reduction is performed. filters: keyword arguments are used to filter down the capacity and @@ -292,17 +275,14 @@ def capacity_in_use( Capacity-in-use for each technology, whittled down by the filters. """ from muse.commodities import is_enduse - from muse.utilities import broadcast_techs, filter_input + from muse.utilities import filter_input prod = filter_input( production, **{k: v for k, v in filters.items() if k in production.dims} ) - techs = technologies[["fixed_outputs", "utilization_factor"]] - assert isinstance(techs, xr.Dataset) - btechs = broadcast_techs(techs, prod, installed_as_year=True) ftechs = filter_input( - btechs, **{k: v for k, v in filters.items() if k in technologies.dims} + technologies, **{k: v for k, v in filters.items() if k in technologies.dims} ) factor = 1 / (ftechs.fixed_outputs * ftechs.utilization_factor) @@ -345,7 +325,6 @@ def minimum_production( refer to asset capacity, the max capacity, or the capacity-in-use. technologies: xr.Dataset describing the features of the technologies of interests. It should contain `fixed_outputs` and `minimum_service_factor`. - Its shape is matched to `capacity` using `muse.utilities.broadcast_techs`. timeslices: xr.DataArray of the timeslicing scheme. Production data will be returned in this format. filters: keyword arguments are used to filter down the capacity and @@ -359,7 +338,7 @@ def minimum_production( the filters and the set of technologies in `capacity`. """ from muse.commodities import is_enduse - from muse.utilities import broadcast_techs, filter_input + from muse.utilities import filter_input capa = filter_input( capacity, **{k: v for k, v in filters.items() if k in capacity.dims} @@ -368,13 +347,8 @@ def minimum_production( if "minimum_service_factor" not in technologies: return broadcast_timeslice(xr.zeros_like(capa), level=timeslice_level) - btechs = broadcast_techs( - technologies[["fixed_outputs", "minimum_service_factor"]], - capa, - installed_as_year=True, - ) ftechs = filter_input( - btechs, **{k: v for k, v in filters.items() if k in btechs.dims} + technologies, **{k: v for k, v in filters.items() if k in technologies.dims} ) result = ( broadcast_timeslice(capa, level=timeslice_level) diff --git a/src/muse/readers/toml.py b/src/muse/readers/toml.py index 0c65ccce1..4067aec91 100644 --- a/src/muse/readers/toml.py +++ b/src/muse/readers/toml.py @@ -394,6 +394,9 @@ def read_settings( setup_module(settings) settings.pop("timeslices", None) + # Set up time framework + settings["time_framework"] = np.array(sorted(settings["time_framework"]), dtype=int) + # Finally, we run some checks to make sure all makes sense and files exist. validate_settings(settings) @@ -541,8 +544,8 @@ def check_budget_parameters(settings: dict) -> None: assert length == len(settings["time_framework"]), msg coords = settings["time_framework"] else: - assert length + 1 == len(settings["time_framework"]), msg - coords = settings["time_framework"][:-1] + assert length == len(settings["time_framework"]), msg + coords = settings["time_framework"] # If Ok, we transform the list into an xr.DataArray settings["carbon_budget_control"]["budget"] = xr.DataArray( @@ -554,27 +557,6 @@ def check_budget_parameters(settings: dict) -> None: settings["carbon_budget_control"]["budget"] = xr.DataArray([]) -@register_settings_check(vary_name=False) -def check_foresight(settings: dict) -> None: - """Check that foresight is a multiple of the smaller time_framework difference. - - If so, we update the time framework adding the foresight year to the list and - transforming it into an array - """ - tfmin = np.diff(settings["time_framework"]).min() - msg = "ERROR - foresight is not a multiple of the smaller time_framework difference" - assert settings["foresight"] % tfmin == 0, msg - - settings["time_framework"].sort() - - # This adds to the years list a new year separated from the last one a “foresight” - # number of years. - settings["time_framework"].append( - settings["time_framework"][-1] + settings["foresight"] - ) - settings["time_framework"] = np.array(settings["time_framework"], dtype=int) - - @register_settings_check(vary_name=False) def check_iteration_control(settings: dict) -> None: """Checks the variables related to the control of the iterations. diff --git a/src/muse/sectors/sector.py b/src/muse/sectors/sector.py index 71a8e0de0..34f79aa5e 100644 --- a/src/muse/sectors/sector.py +++ b/src/muse/sectors/sector.py @@ -201,7 +201,9 @@ def group_assets(x: xr.DataArray) -> xr.DataArray: # Time period from the market object assert len(mca_market.year) == 2 current_year, investment_year = map(int, mca_market.year.values) - getLogger(__name__).info(f"Running {self.name} for year {current_year}") + getLogger(__name__).info( + f"Running {self.name} for years {current_year} to {investment_year}" + ) # Agent interactions self.interactions(list(self.agents)) @@ -291,31 +293,33 @@ def market_variables(self, market: xr.Dataset, technologies: xr.Dataset) -> Any: from muse.commodities import is_pollutant from muse.costs import levelized_cost_of_energy, supply_cost from muse.quantities import consumption - from muse.utilities import broadcast_techs + from muse.utilities import broadcast_over_assets years = market.year.values capacity = self.capacity.interp(year=years, **self.interpolation) + # Select technology data for each asset + # Each asset uses the technology data from the year it was installed + technodata = broadcast_over_assets( + technologies, capacity, installed_as_year=True + ) + # Calculate supply supply = self.supply_prod( market=market, capacity=capacity, - technologies=technologies, + technologies=technodata, timeslice_level=self.timeslice_level, ) # Calculate consumption consume = consumption( - technologies, + technologies=technodata, production=supply, prices=market.prices, timeslice_level=self.timeslice_level, ) - # Select technology data for each asset - # Each asset uses the technology data from the year it was installed - technodata = broadcast_techs(technologies, supply, installed_as_year=True) - # Calculate LCOE # We select data for the second year, which corresponds to the investment year lcoe = levelized_cost_of_energy( diff --git a/src/muse/utilities.py b/src/muse/utilities.py index 40b93b0ea..8f735e250 100644 --- a/src/muse/utilities.py +++ b/src/muse/utilities.py @@ -179,42 +179,46 @@ def operation(x): return result.drop_vars("asset") -def broadcast_techs( - technologies: xr.Dataset | xr.DataArray, +def broadcast_over_assets( + data: xr.Dataset | xr.DataArray, template: xr.DataArray | xr.Dataset, installed_as_year: bool = True, ) -> xr.Dataset | xr.DataArray: - """Broadcasts technologies to the shape of template in given dimension. + """Broadcasts an array to the shape of a template containing asset-level data. - The dimensions of the technologies are fully explicit, in that each concept - 'technology', 'region', 'year' (for year of issue) is a separate dimension. - However, the dataset or data arrays representing other quantities, such as - capacity, are often flattened out with coordinates 'region', 'installed', - and 'technology' represented in a single 'asset' dimension. This latter - representation is sparse if not all combinations of 'region', 'installed', - and 'technology' are present, whereas the former representation makes it - easier to select a subset of the same. + The dimensions of many arrays (such as technology datasets) are fully explicit, in + that each concept (e.g. 'technology', 'region', 'year') is a separate dimension. + However, other datasets (e.g capacity), are presented on a per-asset basis, + containing a single 'asset' dimension with with coordinates such as 'region', + 'installed' (year of installation), and 'technology'. This latter representation is + sparse if not all combinations of 'region', 'installed' and 'technology' are + present. - This function broadcast the first representation to the shape and coordinates - of the second. + This function broadcasts the first representation to the shape and coordinates + of the second, selecting the appropriate values for each asset (see example below). - Note: this is not necessarily limited to `technology` datasets. For + Note: this is not necessarily limited to technology datasets. For example, it could also be used on a dataset of commodity prices to select prices - relevant to each asset (e.g. if assets exist in multiple regions). In this example, - installed_as_year should be set to False (see below). + relevant to each asset (e.g. if assets exist in multiple regions). Arguments: - technologies: The dataset to broadcast - template: the dataset or data-array to use as a template - installed_as_year: True means that the "year" dimension in the technologies - dataset corresponds to the year that the asset was installed. Will commonly - be True for most technology parameters (e.g. var_par/fix_par are specified - the year that an asset is installed, and fixed for the lifetime of the - asset). If True, the technologies dataset must have data for every possible - "installed" year in the template. + data: The dataset/data-array to broadcast + template: The dataset/data-array to use as a template + installed_as_year: True means that the "year" dimension in 'data` + corresponds to the year that the asset was installed. This will commonly + be the case for most technology parameters (e.g. var_par/fix_par are + specified the year that an asset is installed, and fixed for the lifetime of + the asset). In this case, `data` must have a year coordinate for every + possible "installed" year in the template. + + Conversely, if the values in `data` apply to the year of activity, rather + than the year of installation, `installed_as_year` should be False. + An example would be commodity prices, which can change over the lifetime + of an asset. In this case, if "year" is present as a dimension in `data`, + it will be maintained as a separate dimension in the output. Example: - Define the technology array: + Define the data array: >>> import xarray as xr >>> technologies = xr.DataArray( ... data=[[1, 2, 3], [4, 5, 6]], @@ -241,9 +245,9 @@ def broadcast_techs( capacity of each asset, for example. We want to select the values from the technology array that correspond to each - asset in the template. To do this, we perform `broadcast_techs` on + asset in the template. To do this, we perform `broadcast_over_assets` on `technologies` using `assets` as a template: - >>> broadcast_techs(technologies, assets, installed_as_year=False) + >>> broadcast_over_assets(technologies, assets, installed_as_year=False) Size: 16B array([1, 5]) Coordinates: @@ -255,7 +259,7 @@ def broadcast_techs( in the output is the value in the original technology array that matches the technology & region of each asset. """ - # TODO: this will return `technologies` unchanged if the template has no "asset" + # TODO: this will return `data` unchanged if the template has no "asset" # dimension, but strictly speaking we shouldn't allow this. # assert "asset" in template.dims @@ -267,18 +271,16 @@ def broadcast_techs( # TODO: this should be stricter, and enforce that the template has "installed" data, # and that the technologies dataset has a "year" dimension. # if installed_as_year: - if installed_as_year and "installed" in names and "year" in technologies.dims: + if installed_as_year and "installed" in names and "year" in data.dims: # assert "installed" in names - technologies = technologies.rename(year="installed") + data = data.rename(year="installed") - # The first selection reduces the size of technologies without affecting the + # The first selection reduces the size of the data without affecting the # dimensions. - first_sel = { - n: technologies[n].isin(template[n]) for n in names if n in technologies.dims - } - techs = technologies.sel(first_sel) + first_sel = {n: data[n].isin(template[n]) for n in names if n in data.dims} + techs = data.sel(first_sel) - # Reshape the technology array to match the template + # Reshape the array to match the template second_sel = {n: template[n] for n in template.coords if n in techs.dims} return techs.sel(second_sel) @@ -329,38 +331,6 @@ def filter_input( return dataset -def filter_with_template( - data: xr.Dataset | xr.DataArray, - template: xr.DataArray | xr.Dataset, - **kwargs, -): - """Filters data to match template. - - If the `asset_dimension` is present in `template.dims`, then the call is - forwarded to `broadcast_techs`. Otherwise, the set of dimensions and indices - in common between `template` and `data` are determined, and the resulting - call is forwarded to `filter_input`. - - Arguments: - data: Data to transform - template: Data from which to figure coordinates and dimensions - asset_dimension: Name of the dimension which if present indicates the - format is that of an *asset* (see `broadcast_techs`) - kwargs: passed on to `broadcast_techs` or `filter_input` - - Returns: - `data` transformed to match the form of `template` - """ - if "asset" in template.dims: - return broadcast_techs(data, template) - - match_indices = set(data.dims).intersection(template.dims) - set(kwargs) - match = {d: template[d].isin(data[d]).values for d in match_indices if d != "year"} - if "year" in match_indices: - match["year"] = template.year.values - return filter_input(data, **match, **kwargs) # type: ignore - - def tupled_dimension(array: np.ndarray, axis: int): """Transforms one axis into a tuples.""" if array.shape[axis] == 1: diff --git a/tests/conftest.py b/tests/conftest.py index 60f6d7aed..8a176d072 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -383,7 +383,7 @@ def _stock( from numpy.random import choice, rand from xarray import Dataset - from muse.utilities import broadcast_techs + from muse.utilities import broadcast_over_assets n_assets = 10 @@ -396,7 +396,7 @@ def _stock( assets = Dataset(coords=asset_coords) # Create random capacity data - capacity_limits = broadcast_techs(technologies.total_capacity_limit, assets) + capacity_limits = broadcast_over_assets(technologies.total_capacity_limit, assets) factors = cumprod(rand(n_assets, len(coords["year"])) / 4 + 0.75, axis=1).clip( max=1 ) @@ -484,7 +484,6 @@ def drop_optionals(settings): required = { "time_framework": [2010, 2015, 2020], - "foresight": 10, "regions": ["MEX"], "interest_rate": 0.1, "equilibrium": False, diff --git a/tests/example_outputs/default/Results/MCACapacity.csv b/tests/example_outputs/default/Results/MCACapacity.csv index 9d6707290..8c271eae7 100644 --- a/tests/example_outputs/default/Results/MCACapacity.csv +++ b/tests/example_outputs/default/Results/MCACapacity.csv @@ -47,14 +47,3 @@ A1,6.00000000000,R1,2040,R1,power,windturbine,newcapa,2045 A1,6.00000000000,R1,2045,R1,power,windturbine,newcapa,2045 A1,4.12600000000,R1,2025,R1,gas,gassupply1,newcapa,2045 A1,7.35250000000,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,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,4.12600000000,R1,2025,R1,gas,gassupply1,newcapa,2050 -A1,7.35250000000,R1,2035,R1,gas,gassupply1,newcapa,2050 diff --git a/tests/example_outputs/default/Results/MCAPrices.csv b/tests/example_outputs/default/Results/MCAPrices.csv index 94a1a3b81..5b0ca6dc2 100644 --- a/tests/example_outputs/default/Results/MCAPrices.csv +++ b/tests/example_outputs/default/Results/MCAPrices.csv @@ -143,27 +143,3 @@ electricity,all-week,evening,all-year,25.61540000000,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.84360000000,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,26.90080000000,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,13.35770000000,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,26.90080000000,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,13.35770000000,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,26.90080000000,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,13.35770000000,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,26.90080000000,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,13.35770000000,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,26.90080000000,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,13.35770000000,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,26.90080000000,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,13.35770000000,R1,5,MUS$2010/PJ,2050 -CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050 diff --git a/tests/example_outputs/default_adhoc/Results/MCACapacity.csv b/tests/example_outputs/default_adhoc/Results/MCACapacity.csv index 1697de22d..3dae1b300 100644 --- a/tests/example_outputs/default_adhoc/Results/MCACapacity.csv +++ b/tests/example_outputs/default_adhoc/Results/MCACapacity.csv @@ -30,10 +30,3 @@ A1,13.25000000000,R1,2030,R1,power,windturbine,newcapa,2045 A1,6.00000000000,R1,2035,R1,power,windturbine,newcapa,2045 A1,6.00000000000,R1,2040,R1,power,windturbine,newcapa,2045 A1,6.00000000000,R1,2045,R1,power,windturbine,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,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,22.75000000000,R1,2050,R1,power,windturbine,newcapa,2050 diff --git a/tests/example_outputs/default_adhoc/Results/MCAPrices.csv b/tests/example_outputs/default_adhoc/Results/MCAPrices.csv index 6cfb41719..7336a95aa 100644 --- a/tests/example_outputs/default_adhoc/Results/MCAPrices.csv +++ b/tests/example_outputs/default_adhoc/Results/MCAPrices.csv @@ -143,27 +143,3 @@ electricity,all-week,evening,all-year,17.99980000000,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,9.79730000000,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,17.99980000000,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,9.79730000000,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,17.99980000000,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,9.79730000000,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,17.99980000000,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,9.79730000000,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,17.99980000000,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,9.79730000000,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,17.99980000000,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,9.79730000000,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,17.99980000000,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,9.79730000000,R1,5,MUS$2010/PJ,2050 -CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050 diff --git a/tests/example_outputs/default_retro/Results/MCACapacity.csv b/tests/example_outputs/default_retro/Results/MCACapacity.csv index ca280d002..2260d06b5 100644 --- a/tests/example_outputs/default_retro/Results/MCACapacity.csv +++ b/tests/example_outputs/default_retro/Results/MCACapacity.csv @@ -38,13 +38,3 @@ A1,6.00000000000,R1,2040,R1,power,windturbine,retrofit,2045 A1,6.00000000000,R1,2045,R1,power,windturbine,retrofit,2045 A1,5.54670000000,R1,2025,R1,gas,gassupply1,retrofit,2045 A1,6.88560000000,R1,2035,R1,gas,gassupply1,retrofit,2045 -A1,31.00000000000,R1,2045,R1,residential,heatpump,retrofit,2050 -A1,23.00000000000,R1,2050,R1,residential,heatpump,retrofit,2050 -A1,7.44440000000,R1,2025,R1,power,gasCCGT,retrofit,2050 -A1,13.25000000000,R1,2030,R1,power,windturbine,retrofit,2050 -A1,6.00000000000,R1,2035,R1,power,windturbine,retrofit,2050 -A1,6.00000000000,R1,2040,R1,power,windturbine,retrofit,2050 -A1,6.00000000000,R1,2045,R1,power,windturbine,retrofit,2050 -A1,6.00000000000,R1,2050,R1,power,windturbine,retrofit,2050 -A1,5.54670000000,R1,2025,R1,gas,gassupply1,retrofit,2050 -A1,6.88560000000,R1,2035,R1,gas,gassupply1,retrofit,2050 diff --git a/tests/example_outputs/default_retro/Results/MCAPrices.csv b/tests/example_outputs/default_retro/Results/MCAPrices.csv index a42f1fbfa..9c7507365 100644 --- a/tests/example_outputs/default_retro/Results/MCAPrices.csv +++ b/tests/example_outputs/default_retro/Results/MCAPrices.csv @@ -143,27 +143,3 @@ electricity,all-week,evening,all-year,26.24810000000,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,13.09670000000,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,27.64030000000,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,13.65350000000,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,27.64030000000,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,13.65350000000,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,27.64030000000,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,13.65350000000,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,27.64030000000,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,13.65350000000,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,27.64030000000,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,13.65350000000,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,27.64030000000,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,13.65350000000,R1,5,MUS$2010/PJ,2050 -CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050 diff --git a/tests/example_outputs/default_timeslice/Results/MCACapacity.csv b/tests/example_outputs/default_timeslice/Results/MCACapacity.csv index fb43c23d0..4cc29c1f0 100644 --- a/tests/example_outputs/default_timeslice/Results/MCACapacity.csv +++ b/tests/example_outputs/default_timeslice/Results/MCACapacity.csv @@ -30,10 +30,3 @@ A1,5.40000000000,R1,2030,R1,power,windturbine,newcapa,2045 A1,2.40000000000,R1,2035,R1,power,windturbine,newcapa,2045 A1,2.40000000000,R1,2040,R1,power,windturbine,newcapa,2045 A1,2.40000000000,R1,2045,R1,power,windturbine,newcapa,2045 -A1,31.00000000000,R1,2045,R1,residential,heatpump,newcapa,2050 -A1,23.00000000000,R1,2050,R1,residential,heatpump,newcapa,2050 -A1,5.40000000000,R1,2030,R1,power,windturbine,newcapa,2050 -A1,2.40000000000,R1,2035,R1,power,windturbine,newcapa,2050 -A1,2.40000000000,R1,2040,R1,power,windturbine,newcapa,2050 -A1,2.40000000000,R1,2045,R1,power,windturbine,newcapa,2050 -A1,9.00000000000,R1,2050,R1,power,windturbine,newcapa,2050 diff --git a/tests/example_outputs/default_timeslice/Results/MCAPrices.csv b/tests/example_outputs/default_timeslice/Results/MCAPrices.csv index 98e28b6bf..cd458e05d 100644 --- a/tests/example_outputs/default_timeslice/Results/MCAPrices.csv +++ b/tests/example_outputs/default_timeslice/Results/MCAPrices.csv @@ -143,27 +143,3 @@ electricity,all-week,evening,all-year,7.19990000000,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,5.47740000000,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,7.19990000000,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,5.47740000000,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,7.19990000000,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,5.47740000000,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,7.19990000000,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,5.47740000000,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,7.19990000000,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,5.47740000000,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,7.19990000000,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,5.47740000000,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,7.19990000000,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,5.47740000000,R1,5,MUS$2010/PJ,2050 -CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050 diff --git a/tests/example_outputs/default_timeslice/Results/Power_Supply.csv b/tests/example_outputs/default_timeslice/Results/Power_Supply.csv index 01dc5b535..38fcef76c 100644 --- a/tests/example_outputs/default_timeslice/Results/Power_Supply.csv +++ b/tests/example_outputs/default_timeslice/Results/Power_Supply.csv @@ -101,33 +101,3 @@ asset,comm_usage,commodity,day,hour,installed,month,region,supply,technology,tim 2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2035,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2045 3,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2040,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2045 4,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2045,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2045 -0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2030,all-year,R1,0.30000000000,windturbine,0,MUS$2010/PJ,2050 -1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2035,all-year,R1,0.13330000000,windturbine,0,MUS$2010/PJ,2050 -2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2040,all-year,R1,0.13330000000,windturbine,0,MUS$2010/PJ,2050 -3,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2045,all-year,R1,0.13330000000,windturbine,0,MUS$2010/PJ,2050 -4,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2050,all-year,R1,0.50000000000,windturbine,0,MUS$2010/PJ,2050 -0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2030,all-year,R1,0.45000000000,windturbine,1,MUS$2010/PJ,2050 -1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2035,all-year,R1,0.20000000000,windturbine,1,MUS$2010/PJ,2050 -2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2040,all-year,R1,0.20000000000,windturbine,1,MUS$2010/PJ,2050 -3,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2045,all-year,R1,0.20000000000,windturbine,1,MUS$2010/PJ,2050 -4,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2050,all-year,R1,0.75000000000,windturbine,1,MUS$2010/PJ,2050 -0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2030,all-year,R1,0.30000000000,windturbine,2,MUS$2010/PJ,2050 -1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2035,all-year,R1,0.13330000000,windturbine,2,MUS$2010/PJ,2050 -2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2040,all-year,R1,0.13330000000,windturbine,2,MUS$2010/PJ,2050 -3,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2045,all-year,R1,0.13330000000,windturbine,2,MUS$2010/PJ,2050 -4,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2050,all-year,R1,0.50000000000,windturbine,2,MUS$2010/PJ,2050 -0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2030,all-year,R1,0.45000000000,windturbine,3,MUS$2010/PJ,2050 -1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2035,all-year,R1,0.20000000000,windturbine,3,MUS$2010/PJ,2050 -2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2040,all-year,R1,0.20000000000,windturbine,3,MUS$2010/PJ,2050 -3,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2045,all-year,R1,0.20000000000,windturbine,3,MUS$2010/PJ,2050 -4,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2050,all-year,R1,0.75000000000,windturbine,3,MUS$2010/PJ,2050 -0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2030,all-year,R1,0.90000000000,windturbine,4,MUS$2010/PJ,2050 -1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2035,all-year,R1,0.40000000000,windturbine,4,MUS$2010/PJ,2050 -2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2040,all-year,R1,0.40000000000,windturbine,4,MUS$2010/PJ,2050 -3,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2045,all-year,R1,0.40000000000,windturbine,4,MUS$2010/PJ,2050 -4,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2050,all-year,R1,1.50000000000,windturbine,4,MUS$2010/PJ,2050 -0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2030,all-year,R1,0.60000000000,windturbine,5,MUS$2010/PJ,2050 -1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2035,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2050 -2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2040,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2050 -3,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2045,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2050 -4,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2050,all-year,R1,1.00000000000,windturbine,5,MUS$2010/PJ,2050 diff --git a/tests/example_outputs/medium/Results/MCACapacity.csv b/tests/example_outputs/medium/Results/MCACapacity.csv index 47c2dd664..ca4c99ade 100644 --- a/tests/example_outputs/medium/Results/MCACapacity.csv +++ b/tests/example_outputs/medium/Results/MCACapacity.csv @@ -56,18 +56,3 @@ A1,11.63810000000,R1,2025,R1,gas,gassupply1,newcapa,2045 A1,5.34770000000,R1,2030,R1,gas,gassupply1,newcapa,2045 A1,10.83330000000,R1,2035,R1,gas,gassupply1,newcapa,2045 A1,0.14640000000,R1,2045,R1,gas,gassupply1,newcapa,2045 -A1,10.00000000000,R1,2045,R1,residential,gasstove,newcapa,2050 -A1,17.00000000000,R1,2050,R1,residential,gasstove,newcapa,2050 -A1,10.00000000000,R1,2045,R1,residential,heatpump,newcapa,2050 -A1,17.00000000000,R1,2050,R1,residential,heatpump,newcapa,2050 -A1,0.77780000000,R1,2025,R1,power,gasCCGT,newcapa,2050 -A1,8.20330000000,R1,2030,R1,power,windturbine,newcapa,2050 -A1,3.00000000000,R1,2035,R1,power,windturbine,newcapa,2050 -A1,8.04670000000,R1,2040,R1,power,windturbine,newcapa,2050 -A1,3.00000000000,R1,2045,R1,power,windturbine,newcapa,2050 -A1,3.00000000000,R1,2050,R1,power,windturbine,newcapa,2050 -A1,11.63810000000,R1,2025,R1,gas,gassupply1,newcapa,2050 -A1,5.34770000000,R1,2030,R1,gas,gassupply1,newcapa,2050 -A1,10.83330000000,R1,2035,R1,gas,gassupply1,newcapa,2050 -A1,0.14640000000,R1,2045,R1,gas,gassupply1,newcapa,2050 -A1,3.33330000000,R1,2050,R1,gas,gassupply1,newcapa,2050 diff --git a/tests/example_outputs/medium/Results/MCAPrices.csv b/tests/example_outputs/medium/Results/MCAPrices.csv index e3ddfa9ba..e35561fc7 100644 --- a/tests/example_outputs/medium/Results/MCAPrices.csv +++ b/tests/example_outputs/medium/Results/MCAPrices.csv @@ -179,33 +179,3 @@ gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2045 heat,all-week,evening,all-year,10.48670000000,R1,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045 cook,all-week,evening,all-year,5.14740000000,R1,5,MUS$2010/PJ,2045 -electricity,all-week,night,all-year,20.01420000000,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,10.60310000000,R1,0,MUS$2010/PJ,2050 -CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050 -cook,all-week,night,all-year,5.14740000000,R1,0,MUS$2010/PJ,2050 -electricity,all-week,morning,all-year,20.01420000000,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,10.60310000000,R1,1,MUS$2010/PJ,2050 -CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050 -cook,all-week,morning,all-year,5.14740000000,R1,1,MUS$2010/PJ,2050 -electricity,all-week,afternoon,all-year,20.01420000000,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,10.60310000000,R1,2,MUS$2010/PJ,2050 -CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050 -cook,all-week,afternoon,all-year,5.14740000000,R1,2,MUS$2010/PJ,2050 -electricity,all-week,early-peak,all-year,20.01420000000,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,10.60310000000,R1,3,MUS$2010/PJ,2050 -CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050 -cook,all-week,early-peak,all-year,5.14740000000,R1,3,MUS$2010/PJ,2050 -electricity,all-week,late-peak,all-year,20.01420000000,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,10.60310000000,R1,4,MUS$2010/PJ,2050 -CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050 -cook,all-week,late-peak,all-year,5.14740000000,R1,4,MUS$2010/PJ,2050 -electricity,all-week,evening,all-year,20.01420000000,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,10.60310000000,R1,5,MUS$2010/PJ,2050 -CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050 -cook,all-week,evening,all-year,5.14740000000,R1,5,MUS$2010/PJ,2050 diff --git a/tests/example_outputs/minimum_service/Results/MCACapacity.csv b/tests/example_outputs/minimum_service/Results/MCACapacity.csv index 28d815ddd..638edd772 100644 --- a/tests/example_outputs/minimum_service/Results/MCACapacity.csv +++ b/tests/example_outputs/minimum_service/Results/MCACapacity.csv @@ -37,7 +37,3 @@ A1,8.70630000000,R1,2030,R1,industry,procammonia_1,newcapa,2045 A1,18.79580000000,R1,2035,R1,industry,procammonia_1,newcapa,2045 A1,16.54120000000,R1,2040,R1,industry,procammonia_1,newcapa,2045 A1,7.21970000000,R1,2045,R1,industry,procammonia_1,newcapa,2045 -A1,18.79580000000,R1,2035,R1,industry,procammonia_1,newcapa,2050 -A1,16.54120000000,R1,2040,R1,industry,procammonia_1,newcapa,2050 -A1,7.21970000000,R1,2045,R1,industry,procammonia_1,newcapa,2050 -A1,7.21970000000,R1,2050,R1,industry,procammonia_1,newcapa,2050 diff --git a/tests/example_outputs/minimum_service/Results/MCAPrices.csv b/tests/example_outputs/minimum_service/Results/MCAPrices.csv index 0d4aa4dd2..65a63033f 100644 --- a/tests/example_outputs/minimum_service/Results/MCAPrices.csv +++ b/tests/example_outputs/minimum_service/Results/MCAPrices.csv @@ -95,15 +95,3 @@ fuel3,all-week,all-day,spring-autumn,0.08600000000,R1,2,MUS$2010/PJ,2045 fuel1,all-week,all-day,spring-autumn,1.14040000000,R1,2,MUS$2010/PJ,2045 fuel2,all-week,all-day,spring-autumn,11.69200000000,R1,2,MUS$2010/PJ,2045 ammonia,all-week,all-day,spring-autumn,458.21660000000,R1,2,MUS$2010/Mt,2045 -fuel3,all-week,all-day,winter,0.08600000000,R1,0,MUS$2010/PJ,2050 -fuel1,all-week,all-day,winter,1.14040000000,R1,0,MUS$2010/PJ,2050 -fuel2,all-week,all-day,winter,11.69200000000,R1,0,MUS$2010/PJ,2050 -ammonia,all-week,all-day,winter,455.91800000000,R1,0,MUS$2010/Mt,2050 -fuel3,all-week,all-day,summer,0.08600000000,R1,1,MUS$2010/PJ,2050 -fuel1,all-week,all-day,summer,1.14040000000,R1,1,MUS$2010/PJ,2050 -fuel2,all-week,all-day,summer,11.69200000000,R1,1,MUS$2010/PJ,2050 -ammonia,all-week,all-day,summer,455.94940000000,R1,1,MUS$2010/Mt,2050 -fuel3,all-week,all-day,spring-autumn,0.08600000000,R1,2,MUS$2010/PJ,2050 -fuel1,all-week,all-day,spring-autumn,1.14040000000,R1,2,MUS$2010/PJ,2050 -fuel2,all-week,all-day,spring-autumn,11.69200000000,R1,2,MUS$2010/PJ,2050 -ammonia,all-week,all-day,spring-autumn,455.91800000000,R1,2,MUS$2010/Mt,2050 diff --git a/tests/example_outputs/minimum_service/Results/MCASupply.csv b/tests/example_outputs/minimum_service/Results/MCASupply.csv index 86ac2073f..fc0955d32 100644 --- a/tests/example_outputs/minimum_service/Results/MCASupply.csv +++ b/tests/example_outputs/minimum_service/Results/MCASupply.csv @@ -47,9 +47,3 @@ ammonia,all-week,all-day,summer,R1,14.52450000000,1,MUS$2010/Mt,2045 CO2f,all-week,all-day,summer,R1,58000.48940000000,1,MUS$2010/kt,2045 ammonia,all-week,all-day,spring-autumn,R1,14.09730000000,2,MUS$2010/Mt,2045 CO2f,all-week,all-day,spring-autumn,R1,56294.59260000000,2,MUS$2010/kt,2045 -ammonia,all-week,all-day,winter,R1,13.74870000000,0,MUS$2010/Mt,2050 -CO2f,all-week,all-day,winter,R1,54623.16370000000,0,MUS$2010/kt,2050 -ammonia,all-week,all-day,summer,R1,14.10330000000,1,MUS$2010/Mt,2050 -CO2f,all-week,all-day,summer,R1,56035.99150000000,1,MUS$2010/kt,2050 -ammonia,all-week,all-day,spring-autumn,R1,13.74870000000,2,MUS$2010/Mt,2050 -CO2f,all-week,all-day,spring-autumn,R1,54623.16370000000,2,MUS$2010/kt,2050 diff --git a/tests/example_outputs/multiple_agents/Results/MCACapacity.csv b/tests/example_outputs/multiple_agents/Results/MCACapacity.csv index 4609502be..e5426235c 100644 --- a/tests/example_outputs/multiple_agents/Results/MCACapacity.csv +++ b/tests/example_outputs/multiple_agents/Results/MCACapacity.csv @@ -58,16 +58,3 @@ A1,6.00000000000,R1,2040,R1,power,windturbine,newcapa,2045 A1,6.00000000000,R1,2045,R1,power,windturbine,newcapa,2045 A1,4.12600000000,R1,2025,R1,gas,gassupply1,newcapa,2045 A1,7.35250000000,R1,2035,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,heatpump,newcapa,2050 -A2,11.50000000000,R1,2050,R1,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,4.12600000000,R1,2025,R1,gas,gassupply1,newcapa,2050 -A1,7.35250000000,R1,2035,R1,gas,gassupply1,newcapa,2050 diff --git a/tests/example_outputs/multiple_agents/Results/MCAPrices.csv b/tests/example_outputs/multiple_agents/Results/MCAPrices.csv index 94a1a3b81..5b0ca6dc2 100644 --- a/tests/example_outputs/multiple_agents/Results/MCAPrices.csv +++ b/tests/example_outputs/multiple_agents/Results/MCAPrices.csv @@ -143,27 +143,3 @@ electricity,all-week,evening,all-year,25.61540000000,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.84360000000,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,26.90080000000,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,13.35770000000,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,26.90080000000,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,13.35770000000,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,26.90080000000,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,13.35770000000,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,26.90080000000,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,13.35770000000,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,26.90080000000,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,13.35770000000,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,26.90080000000,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,13.35770000000,R1,5,MUS$2010/PJ,2050 -CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050 diff --git a/tests/example_outputs/trade/Results/MCACapacity.csv b/tests/example_outputs/trade/Results/MCACapacity.csv index dc0f12b09..eba56c678 100644 --- a/tests/example_outputs/trade/Results/MCACapacity.csv +++ b/tests/example_outputs/trade/Results/MCACapacity.csv @@ -17,10 +17,3 @@ A1,153.60000000000,R1,2010,R1,power,gasCCGT,agent,2030 A1,98.00000000000,R2,2010,R2,power,gasCCGT,agent,2030 A1,2100.00000000000,R1,2010,R1,gas,gassupply1,agent,2030 A1,700.00000000000,R2,2010,R2,gas,gassupply1,agent,2030 -A1,394.34220000000,R1,2010,R1,residential,gasboiler,retrofit,2035 -A1,173.94730000000,R1,2030,R1,residential,heatpump,retrofit,2035 -A1,344.74380000000,R1,2035,R1,residential,heatpump,retrofit,2035 -A1,20.82500000000,R2,2010,R2,residential,gasboiler,retrofit,2035 -A1,18.78330000000,R2,2035,R2,residential,heatpump,retrofit,2035 -A1,122.88000000000,R1,2010,R1,power,gasCCGT,agent,2035 -A1,68.60000000000,R2,2010,R2,power,gasCCGT,agent,2035 diff --git a/tests/example_outputs/trade/Results/MCAPrices.csv b/tests/example_outputs/trade/Results/MCAPrices.csv index 0e114684c..793412378 100644 --- a/tests/example_outputs/trade/Results/MCAPrices.csv +++ b/tests/example_outputs/trade/Results/MCAPrices.csv @@ -95,39 +95,3 @@ gas,all-week,evening,all-year,20.52280000000,R1,5,MUS$2010/PJ,2030 gas,all-week,evening,all-year,161.27260000000,R2,5,MUS$2010/PJ,2030 heat,all-week,evening,all-year,18.24100000000,R1,5,MUS$2010/PJ,2030 heat,all-week,evening,all-year,192.11860000000,R2,5,MUS$2010/PJ,2030 -electricity,all-week,night,all-year,41.37870000000,R1,0,MUS$2010/PJ,2035 -electricity,all-week,night,all-year,363.84600000000,R2,0,MUS$2010/PJ,2035 -gas,all-week,night,all-year,26.31110000000,R1,0,MUS$2010/PJ,2035 -gas,all-week,night,all-year,209.37450000000,R2,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,22.07810000000,R1,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,193.44360000000,R2,0,MUS$2010/PJ,2035 -electricity,all-week,morning,all-year,41.37870000000,R1,1,MUS$2010/PJ,2035 -electricity,all-week,morning,all-year,363.84600000000,R2,1,MUS$2010/PJ,2035 -gas,all-week,morning,all-year,26.31110000000,R1,1,MUS$2010/PJ,2035 -gas,all-week,morning,all-year,209.37450000000,R2,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,22.07810000000,R1,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,193.44360000000,R2,1,MUS$2010/PJ,2035 -electricity,all-week,afternoon,all-year,41.37870000000,R1,2,MUS$2010/PJ,2035 -electricity,all-week,afternoon,all-year,363.84600000000,R2,2,MUS$2010/PJ,2035 -gas,all-week,afternoon,all-year,26.31110000000,R1,2,MUS$2010/PJ,2035 -gas,all-week,afternoon,all-year,209.37450000000,R2,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,22.07810000000,R1,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,193.44360000000,R2,2,MUS$2010/PJ,2035 -electricity,all-week,early-peak,all-year,41.37870000000,R1,3,MUS$2010/PJ,2035 -electricity,all-week,early-peak,all-year,363.84600000000,R2,3,MUS$2010/PJ,2035 -gas,all-week,early-peak,all-year,26.31110000000,R1,3,MUS$2010/PJ,2035 -gas,all-week,early-peak,all-year,209.37450000000,R2,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,22.07810000000,R1,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,193.44360000000,R2,3,MUS$2010/PJ,2035 -electricity,all-week,late-peak,all-year,41.37870000000,R1,4,MUS$2010/PJ,2035 -electricity,all-week,late-peak,all-year,363.84600000000,R2,4,MUS$2010/PJ,2035 -gas,all-week,late-peak,all-year,26.31110000000,R1,4,MUS$2010/PJ,2035 -gas,all-week,late-peak,all-year,209.37450000000,R2,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,22.07810000000,R1,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,193.44360000000,R2,4,MUS$2010/PJ,2035 -electricity,all-week,evening,all-year,41.37870000000,R1,5,MUS$2010/PJ,2035 -electricity,all-week,evening,all-year,363.84600000000,R2,5,MUS$2010/PJ,2035 -gas,all-week,evening,all-year,26.31110000000,R1,5,MUS$2010/PJ,2035 -gas,all-week,evening,all-year,209.37450000000,R2,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,22.07810000000,R1,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,193.44360000000,R2,5,MUS$2010/PJ,2035 diff --git a/tests/test_constraints.py b/tests/test_constraints.py index 4293262c4..336e519b6 100644 --- a/tests/test_constraints.py +++ b/tests/test_constraints.py @@ -58,9 +58,10 @@ def capacity(assets): @fixture def market_demand(assets, technologies): from muse.quantities import maximum_production + from muse.utilities import broadcast_over_assets return 0.8 * maximum_production( - technologies, + broadcast_over_assets(technologies, assets), assets.capacity, ).sel(year=INVESTMENT_YEAR).groupby("technology").sum("asset").rename( technology="asset" diff --git a/tests/test_costs.py b/tests/test_costs.py index 49b5cee00..1683a889a 100644 --- a/tests/test_costs.py +++ b/tests/test_costs.py @@ -18,18 +18,18 @@ def _capacity(_technologies, demand_share): @fixture def _technologies(technologies, demand_share): """Technology parameters for each asset.""" - from muse.utilities import broadcast_techs + from muse.utilities import broadcast_over_assets - return broadcast_techs(technologies.sel(year=YEAR), demand_share) + return broadcast_over_assets(technologies.sel(year=YEAR), demand_share) @fixture def _prices(market, demand_share): """Prices relevant to each asset.""" - from muse.utilities import broadcast_techs + from muse.utilities import broadcast_over_assets prices = market.prices.sel(year=YEAR) - return broadcast_techs(prices, demand_share, installed_as_year=False) + return broadcast_over_assets(prices, demand_share, installed_as_year=False) @fixture diff --git a/tests/test_demand_share.py b/tests/test_demand_share.py index e210dbb0d..569038fd0 100644 --- a/tests/test_demand_share.py +++ b/tests/test_demand_share.py @@ -21,9 +21,9 @@ def _technologies(technologies, _capacity): @fixture def _market(_technologies, _capacity, timeslice): """A market which matches stocks exactly.""" - from muse.utilities import broadcast_techs + from muse.utilities import broadcast_over_assets - _technologies = broadcast_techs(_technologies, _capacity) + _technologies = broadcast_over_assets(_technologies, _capacity) return _matching_market(_technologies, _capacity).transpose( "timeslice", "region", "commodity", "year" ) @@ -55,13 +55,18 @@ def test_fixtures(_capacity, _market, _technologies): def test_new_retro_split_zero_unmet(_capacity, _market, _technologies): from muse.demand_share import new_and_retro_demands + from muse.utilities import broadcast_over_assets + _technologies = broadcast_over_assets(_technologies, _capacity) share = new_and_retro_demands(_capacity, _market, _technologies) assert (share == 0).all() def test_new_retro_split_zero_consumption_increase(_capacity, _market, _technologies): from muse.demand_share import new_and_retro_demands + from muse.utilities import broadcast_over_assets + + _technologies = broadcast_over_assets(_technologies, _capacity) _market.consumption.loc[{"year": INVESTMENT_YEAR}] = _market.consumption.sel( year=CURRENT_YEAR @@ -92,6 +97,9 @@ def test_new_retro_split_zero_consumption_increase(_capacity, _market, _technolo def test_new_retro_split_zero_new_unmet(_capacity, _market, _technologies): from muse.demand_share import new_and_retro_demands + from muse.utilities import broadcast_over_assets + + _technologies = broadcast_over_assets(_technologies, _capacity) _market.consumption.loc[{"year": INVESTMENT_YEAR}] = _market.supply.sel( year=CURRENT_YEAR, drop=True @@ -127,6 +135,9 @@ def test_new_retro_split_zero_new_unmet(_capacity, _market, _technologies): def test_new_retro_accounting_identity(_capacity, _market, _technologies): from muse.demand_share import new_and_retro_demands from muse.quantities import maximum_production + from muse.utilities import broadcast_over_assets + + _technologies = broadcast_over_assets(_technologies, _capacity) share = new_and_retro_demands(_capacity, _market, _technologies) assert (share >= 0).all() @@ -155,12 +166,13 @@ def test_new_retro_accounting_identity(_capacity, _market, _technologies): def test_demand_split(_capacity, _market, _technologies): from muse.commodities import is_enduse from muse.demand_share import _inner_split as inner_split + from muse.utilities import broadcast_over_assets - def method(capacity): + def method(capacity, technologies): from muse.demand_share import decommissioning_demand return decommissioning_demand( - _technologies.sel(region="USA"), + technologies, capacity, ) @@ -168,8 +180,10 @@ def method(capacity): year=INVESTMENT_YEAR, region="USA", drop=True ).where(is_enduse(_technologies.comm_usage.sel(commodity=_market.commodity))) agents = dict(scully=_capacity, mulder=_capacity) + _technologies = broadcast_over_assets(_technologies, _capacity) + technodata = dict(scully=_technologies, mulder=_technologies) quantity = dict(scully=("scully", "USA", 0.3), mulder=("mulder", "USA", 0.7)) - share = inner_split(agents, demand, method, quantity) + share = inner_split(agents, technodata, demand, method, quantity) enduse = is_enduse(_technologies.comm_usage) assert (share["scully"].sel(commodity=~enduse) == 0).all() @@ -189,12 +203,13 @@ def test_demand_split_zero_share(_capacity, _market, _technologies): """See issue SgiModel/StarMuse#688.""" from muse.commodities import is_enduse from muse.demand_share import _inner_split as inner_split + from muse.utilities import broadcast_over_assets - def method(capacity): + def method(capacity, technologies): from muse.demand_share import decommissioning_demand return 0 * decommissioning_demand( - _technologies.sel(region="USA"), + technologies, capacity, ) @@ -202,8 +217,10 @@ def method(capacity): year=INVESTMENT_YEAR, region="USA", drop=True ).where(is_enduse(_technologies.comm_usage.sel(commodity=_market.commodity))) agents = dict(scully=0.3 * _capacity, mulder=0.7 * _capacity) + _technologies = broadcast_over_assets(_technologies, _capacity) + technodata = dict(scully=_technologies, mulder=_technologies) quantity = dict(scully=("scully", "USA", 1), mulder=("mulder", "USA", 1)) - share = inner_split(agents, demand, method, quantity) + share = inner_split(agents, technodata, demand, method, quantity) enduse = is_enduse(_technologies.comm_usage) assert (share["scully"].sel(commodity=~enduse) == 0).all() @@ -227,12 +244,17 @@ def test_new_retro_demand_share(_technologies, market, timeslice, stock): from muse.commodities import is_enduse from muse.demand_share import new_and_retro + from muse.utilities import broadcast_over_assets asia_stock = stock.where(stock.region == "ASEAN", drop=True) usa_stock = stock.where(stock.region == "USA", drop=True) - asia_market = _matching_market(_technologies, asia_stock.capacity) - usa_market = _matching_market(_technologies, usa_stock.capacity) + asia_market = _matching_market( + broadcast_over_assets(_technologies, asia_stock), asia_stock.capacity + ) + usa_market = _matching_market( + broadcast_over_assets(_technologies, usa_stock), usa_stock.capacity + ) market = xr.concat((asia_market, usa_market), dim="region") market.consumption.loc[{"year": 2030}] *= 2 @@ -281,12 +303,17 @@ def test_standard_demand_share(_technologies, timeslice, stock): from muse.commodities import is_enduse from muse.demand_share import standard_demand from muse.errors import RetrofitAgentInStandardDemandShare + from muse.utilities import broadcast_over_assets asia_stock = stock.where(stock.region == "ASEAN", drop=True) usa_stock = stock.where(stock.region == "USA", drop=True) - asia_market = _matching_market(_technologies, asia_stock.capacity) - usa_market = _matching_market(_technologies, usa_stock.capacity) + asia_market = _matching_market( + broadcast_over_assets(_technologies, asia_stock), asia_stock.capacity + ) + usa_market = _matching_market( + broadcast_over_assets(_technologies, usa_stock), usa_stock.capacity + ) market = xr.concat((asia_market, usa_market), dim="region") market.consumption.loc[{"year": 2030}] *= 2 @@ -332,12 +359,17 @@ def test_unmet_forecast_demand(_technologies, timeslice, stock): from muse.commodities import is_enduse from muse.demand_share import unmet_forecasted_demand + from muse.utilities import broadcast_over_assets asia_stock = stock.where(stock.region == "ASEAN", drop=True) usa_stock = stock.where(stock.region == "USA", drop=True) - asia_market = _matching_market(_technologies, asia_stock.capacity) - usa_market = _matching_market(_technologies, usa_stock.capacity) + asia_market = _matching_market( + broadcast_over_assets(_technologies, asia_stock), asia_stock.capacity + ) + usa_market = _matching_market( + broadcast_over_assets(_technologies, usa_stock), usa_stock.capacity + ) market = xr.concat((asia_market, usa_market), dim="region") # spoof some agents @@ -387,6 +419,9 @@ class Agent: def test_decommissioning_demand(_technologies, _capacity, timeslice): from muse.commodities import is_enduse from muse.demand_share import decommissioning_demand + from muse.utilities import broadcast_over_assets + + _technologies = broadcast_over_assets(_technologies, _capacity) _capacity.loc[{"year": CURRENT_YEAR}] = current = 1.3 _capacity.loc[{"year": INVESTMENT_YEAR}] = forecast = 1.0 diff --git a/tests/test_objectives.py b/tests/test_objectives.py index 17e0b527d..06a42fef0 100644 --- a/tests/test_objectives.py +++ b/tests/test_objectives.py @@ -10,18 +10,18 @@ def _demand(demand_share): @fixture def _technologies(technologies, demand_share): - from muse.utilities import broadcast_techs + from muse.utilities import broadcast_over_assets techs = technologies.sel(year=YEAR).rename(technology="replacement") - return broadcast_techs(techs, demand_share) + return broadcast_over_assets(techs, demand_share) @fixture def _prices(market, demand_share): - from muse.utilities import broadcast_techs + from muse.utilities import broadcast_over_assets prices = market.prices.sel(year=YEAR) - return broadcast_techs(prices, demand_share, installed_as_year=False) + return broadcast_over_assets(prices, demand_share, installed_as_year=False) def test_fixtures(_technologies, _demand, _prices): diff --git a/tests/test_outputs.py b/tests/test_outputs.py index db011e150..e776f2d66 100644 --- a/tests/test_outputs.py +++ b/tests/test_outputs.py @@ -266,8 +266,10 @@ def test_mca_aggregate_outputs(tmpdir): mca.run() assert (tmpdir / "model" / "Prices.csv").exists() - data = pd.read_csv(tmpdir / "model" / "Prices.csv") - assert set(data.year) == set(settings["time_framework"]) + + # TODO: should pass again after #612 + # data = pd.read_csv(tmpdir / "model" / "Prices.csv") + # assert set(data.year) == set(settings["time_framework"]) @mark.usefixtures("save_registries") diff --git a/tests/test_quantities.py b/tests/test_quantities.py index 2a5d0e8d6..1877f47e1 100644 --- a/tests/test_quantities.py +++ b/tests/test_quantities.py @@ -3,18 +3,23 @@ from pytest import approx, fixture, mark +@fixture +def technologies(technologies, capacity, timeslice): + from muse.utilities import broadcast_over_assets + + return broadcast_over_assets(technologies, capacity) + + @fixture def production( technologies: xr.Dataset, capacity: xr.DataArray, timeslice ) -> xr.DataArray: from muse.timeslices import broadcast_timeslice, distribute_timeslice - from muse.utilities import broadcast_techs - techs = broadcast_techs(technologies, capacity) return ( broadcast_timeslice(capacity) - * distribute_timeslice(techs.fixed_outputs) - * broadcast_timeslice(techs.utilization_factor) + * distribute_timeslice(technologies.fixed_outputs) + * broadcast_timeslice(technologies.utilization_factor) ) @@ -36,7 +41,7 @@ def test_consumption(technologies, production, market): def test_production_aggregate_asset_view( - capacity: xr.DataArray, technologies: xr.Dataset + technologies: xr.Dataset, capacity: xr.DataArray ): """Production when capacity has format of agent.sector. @@ -85,17 +90,17 @@ def test_production_aggregate_asset_view( @mark.xfail def test_production_agent_asset_view( - capacity: xr.DataArray, technologies: xr.Dataset, timeslice + technologies: xr.Dataset, capacity: xr.DataArray, timeslice ): """Production when capacity has format of agent.assets.capacity. - TODO: not currently supported. Need to make maximum_production more generic so it - can handle capacity data without an "asset" dimension. + TODO: This requires a fully-explicit technologies dataset. Need to rework the + fixtures. """ from muse.utilities import coords_to_multiindex, reduce_assets capacity = coords_to_multiindex(reduce_assets(capacity)).unstack("asset").fillna(0) - test_production_aggregate_asset_view(capacity, technologies) + test_production_aggregate_asset_view(technologies, capacity) def test_capacity_in_use(production: xr.DataArray, technologies: xr.Dataset): @@ -172,7 +177,7 @@ def test_supply_single_region(technologies, capacity, production, timeslice): # Select data for a single region region = "USA" - technologies = technologies.sel(region=region) + technologies = technologies.where(technologies.region == region, drop=True) capacity = capacity.where(capacity.region == region, drop=True) production = production.where(production.region == region, drop=True) @@ -229,8 +234,8 @@ def test_supply_with_min_service(technologies, capacity, production, timeslice): def test_production_amplitude(production, technologies): from muse.quantities import production_amplitude - from muse.utilities import broadcast_techs + from muse.utilities import broadcast_over_assets - techs = broadcast_techs(technologies, production) + techs = broadcast_over_assets(technologies, production) result = production_amplitude(production, techs) assert set(result.dims) == set(production.dims) - {"commodity"} diff --git a/tests/test_readers.py b/tests/test_readers.py index 295082eda..ec00d1726 100644 --- a/tests/test_readers.py +++ b/tests/test_readers.py @@ -97,13 +97,6 @@ def test_check_budget_parameters(settings: dict): check_budget_parameters(settings) -def test_check_foresight(settings: dict): - """Tests the check_budget_parameters function.""" - from muse.readers.toml import check_foresight - - check_foresight(settings) - - def test_check_global_data_files(settings: dict, user_data_files): """Tests the check_global_data_files function.""" from muse.readers.toml import check_global_data_files diff --git a/tests/test_utilities.py b/tests/test_utilities.py index cb557ae46..d7767fc02 100644 --- a/tests/test_utilities.py +++ b/tests/test_utilities.py @@ -40,22 +40,22 @@ def test_reduce_assets_with_zero_size(capacity: xr.DataArray): assert (actual == x).all() -def test_broadcast_techs(technologies, capacity): - from muse.utilities import broadcast_techs +def test_broadcast_over_assets(technologies, capacity): + from muse.utilities import broadcast_over_assets # Test with installed_as_year = True - result1 = broadcast_techs(technologies, capacity, installed_as_year=True) + result1 = broadcast_over_assets(technologies, capacity, installed_as_year=True) assert set(result1.dims) == {"asset", "commodity"} assert (result1.asset == capacity.asset).all() # Test with installed_as_year = False - result2 = broadcast_techs(technologies, capacity, installed_as_year=False) + result2 = broadcast_over_assets(technologies, capacity, installed_as_year=False) assert set(result2.dims) == {"asset", "commodity", "year"} assert (result2.asset == capacity.asset).all() # Template without "asset" dimensions (TODO: need to make the function stricter) # with raises(AssertionError): - # broadcast_techs(technologies, technologies) + # broadcast_over_assets(technologies, technologies) def test_tupled_dimension_no_tupling():