diff --git a/docs/advanced-guide/extending-muse.ipynb b/docs/advanced-guide/extending-muse.ipynb index db2f4ed4d..e679b7e4a 100644 --- a/docs/advanced-guide/extending-muse.ipynb +++ b/docs/advanced-guide/extending-muse.ipynb @@ -157,6 +157,7 @@ "[[sectors.residential.outputs]]\n", "quantity = \"consumption_zero\"\n", "sink = \"txt\"\n", + "overwrite = true\n", "filename = \"{cwd}/{default_output_dir}/{Sector}{Quantity}{year}{suffix}\"\n", "```\n", "\n", @@ -194,7 +195,7 @@ " \"overwrite\": True,\n", " \"filename\": \"{cwd}/{default_output_dir}/{Sector}{Quantity}{year}{suffix}\",\n", "}\n", - "settings[\"sectors\"][\"residential\"][\"outputs\"].append(new_output)\n", + "settings[\"sectors\"][\"residential\"].setdefault(\"outputs\", []).append(new_output)\n", "dump(settings, (model_path / \"modified_settings.toml\").open(\"w\"))\n", "settings" ] @@ -373,7 +374,6 @@ "new_output = {\n", " \"quantity\": \"capacity\",\n", " \"sink\": \"aggregate\",\n", - " \"index\": False,\n", " \"filename\": \"{cwd}/{default_output_dir}/Cache{Quantity}.csv\",\n", "}\n", "settings[\"outputs_cache\"] = []\n", @@ -671,7 +671,7 @@ "name": "python", "nbconvert_exporter": "python", "pygments_lexer": "ipython3", - "version": "3.12.3" + "version": "3.12.4" }, "vscode": { "interpreter": { diff --git a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Gas/Capacity.csv b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Gas/Capacity.csv deleted file mode 100644 index c44e0042b..000000000 --- a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Gas/Capacity.csv +++ /dev/null @@ -1,17 +0,0 @@ -asset,capacity,installed,region,technology,year -0,15.00000000000,2020,R1,gassupply1,2020 -0,16.73530000000,2020,R1,gassupply1,2025 -0,9.23530000000,2020,R1,gassupply1,2030 -1,9.28910000000,2025,R1,gassupply1,2030 -0,1.73530000000,2020,R1,gassupply1,2035 -1,9.28910000000,2025,R1,gassupply1,2035 -2,7.47410000000,2030,R1,gassupply1,2035 -0,1.73530000000,2020,R1,gassupply1,2040 -1,9.28910000000,2025,R1,gassupply1,2040 -2,7.47410000000,2030,R1,gassupply1,2040 -0,1.73530000000,2020,R1,gassupply1,2045 -1,9.28910000000,2025,R1,gassupply1,2045 -2,7.47410000000,2030,R1,gassupply1,2045 -0,1.73530000000,2020,R1,gassupply1,2050 -1,9.28910000000,2025,R1,gassupply1,2050 -2,7.47410000000,2030,R1,gassupply1,2050 diff --git a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/MCACapacity.csv b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/MCACapacity.csv index fe48b2f1a..1235fb7bf 100644 --- a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/MCACapacity.csv +++ b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/MCACapacity.csv @@ -51,8 +51,7 @@ A1,6.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2050 A1,6.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,10.00000000000,R1,2045,R1,power,solarPV,newcapa,2050 -A1,1.00000000000,R1,2045,R1,power,windturbine,newcapa,2050 +A1,11.00000000000,R1,2045,R1,power,solarPV,newcapa,2050 A1,1.73530000000,R1,2020,R1,gas,gassupply1,newcapa,2050 A1,9.28910000000,R1,2025,R1,gas,gassupply1,newcapa,2050 A1,7.47410000000,R1,2030,R1,gas,gassupply1,newcapa,2050 diff --git a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/MCAPrices.csv b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/MCAPrices.csv index 88277e7c4..02c5dadd6 100644 --- a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/MCAPrices.csv +++ b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/MCAPrices.csv @@ -143,27 +143,27 @@ electricity,all-week,evening,all-year,18.12650000000,R1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2045 heat,all-week,evening,all-year,7.49110000000,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,19.68940000000,R1,0,MUS$2010/PJ,2050 +electricity,all-week,night,all-year,19.68400000000,R1,0,MUS$2010/PJ,2050 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,8.11630000000,R1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,8.11410000000,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,19.68940000000,R1,1,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,19.68400000000,R1,1,MUS$2010/PJ,2050 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,8.11630000000,R1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,8.11410000000,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,19.68940000000,R1,2,MUS$2010/PJ,2050 +electricity,all-week,afternoon,all-year,19.68400000000,R1,2,MUS$2010/PJ,2050 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,8.11630000000,R1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,8.11410000000,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,19.68940000000,R1,3,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,19.68400000000,R1,3,MUS$2010/PJ,2050 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,8.11630000000,R1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,8.11410000000,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,19.68940000000,R1,4,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,19.68400000000,R1,4,MUS$2010/PJ,2050 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,8.11630000000,R1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,8.11410000000,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,19.68940000000,R1,5,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,19.68400000000,R1,5,MUS$2010/PJ,2050 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,8.11630000000,R1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,8.11410000000,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/1-add-new-technology/1-introduction/Results/Power/Capacity.csv b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Power/Capacity.csv deleted file mode 100644 index 6e2876fe2..000000000 --- a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Power/Capacity.csv +++ /dev/null @@ -1,29 +0,0 @@ -asset,capacity,installed,region,technology,year -0,1,2020,R1,gasCCGT,2020 -0,6,2020,R1,gasCCGT,2025 -2,5,2020,R1,solarPV,2025 -0,5,2020,R1,gasCCGT,2030 -1,6,2025,R1,gasCCGT,2030 -2,5,2020,R1,solarPV,2030 -0,5,2020,R1,gasCCGT,2035 -1,6,2025,R1,gasCCGT,2035 -2,5,2020,R1,solarPV,2035 -3,6,2030,R1,solarPV,2035 -0,5,2020,R1,gasCCGT,2040 -1,6,2025,R1,gasCCGT,2040 -2,5,2020,R1,solarPV,2040 -3,6,2030,R1,solarPV,2040 -4,6,2035,R1,solarPV,2040 -0,5,2020,R1,gasCCGT,2045 -1,6,2025,R1,gasCCGT,2045 -2,5,2020,R1,solarPV,2045 -3,6,2030,R1,solarPV,2045 -4,6,2035,R1,solarPV,2045 -5,6,2040,R1,solarPV,2045 -0,5,2020,R1,gasCCGT,2050 -1,6,2025,R1,gasCCGT,2050 -3,6,2030,R1,solarPV,2050 -4,6,2035,R1,solarPV,2050 -5,6,2040,R1,solarPV,2050 -6,10,2045,R1,solarPV,2050 -8,1,2045,R1,windturbine,2050 diff --git a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Capacity.csv b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Capacity.csv deleted file mode 100644 index d5cf558f0..000000000 --- a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Capacity.csv +++ /dev/null @@ -1,14 +0,0 @@ -asset,capacity,installed,region,technology,year -0,10,2020,R1,gasboiler,2020 -0,5,2020,R1,gasboiler,2025 -1,19,2020,R1,heatpump,2025 -1,19,2020,R1,heatpump,2030 -2,10,2025,R1,heatpump,2030 -2,10,2025,R1,heatpump,2035 -3,26,2030,R1,heatpump,2035 -3,26,2030,R1,heatpump,2040 -4,16,2035,R1,heatpump,2040 -4,16,2035,R1,heatpump,2045 -5,32,2040,R1,heatpump,2045 -5,32,2040,R1,heatpump,2050 -6,22,2045,R1,heatpump,2050 diff --git a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Supply.csv b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Supply.csv deleted file mode 100644 index 520869501..000000000 --- a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Supply.csv +++ /dev/null @@ -1,91 +0,0 @@ -asset,commodity,day,hour,installed,month,region,supply,technology,timeslice,year -0,heat,all-week,night,2020,all-year,R1,1.00000000000,gasboiler,0,2020 -0,CO2f,all-week,night,2020,all-year,R1,64.71000000000,gasboiler,0,2020 -0,heat,all-week,morning,2020,all-year,R1,1.50000000000,gasboiler,1,2020 -0,CO2f,all-week,morning,2020,all-year,R1,97.06500000000,gasboiler,1,2020 -0,heat,all-week,afternoon,2020,all-year,R1,1.00000000000,gasboiler,2,2020 -0,CO2f,all-week,afternoon,2020,all-year,R1,64.71000000000,gasboiler,2,2020 -0,heat,all-week,early-peak,2020,all-year,R1,1.50000000000,gasboiler,3,2020 -0,CO2f,all-week,early-peak,2020,all-year,R1,97.06500000000,gasboiler,3,2020 -0,heat,all-week,late-peak,2020,all-year,R1,3.00000000000,gasboiler,4,2020 -0,CO2f,all-week,late-peak,2020,all-year,R1,194.13000000000,gasboiler,4,2020 -0,heat,all-week,evening,2020,all-year,R1,2.00000000000,gasboiler,5,2020 -0,CO2f,all-week,evening,2020,all-year,R1,129.42000000000,gasboiler,5,2020 -0,heat,all-week,night,2020,all-year,R1,0.27780000000,gasboiler,0,2025 -1,heat,all-week,night,2020,all-year,R1,1.05560000000,heatpump,0,2025 -0,CO2f,all-week,night,2020,all-year,R1,17.97500000000,gasboiler,0,2025 -0,heat,all-week,morning,2020,all-year,R1,0.41670000000,gasboiler,1,2025 -1,heat,all-week,morning,2020,all-year,R1,1.58330000000,heatpump,1,2025 -0,CO2f,all-week,morning,2020,all-year,R1,26.96250000000,gasboiler,1,2025 -0,heat,all-week,afternoon,2020,all-year,R1,0.27780000000,gasboiler,2,2025 -1,heat,all-week,afternoon,2020,all-year,R1,1.05560000000,heatpump,2,2025 -0,CO2f,all-week,afternoon,2020,all-year,R1,17.97500000000,gasboiler,2,2025 -0,heat,all-week,early-peak,2020,all-year,R1,0.41670000000,gasboiler,3,2025 -1,heat,all-week,early-peak,2020,all-year,R1,1.58330000000,heatpump,3,2025 -0,CO2f,all-week,early-peak,2020,all-year,R1,26.96250000000,gasboiler,3,2025 -0,heat,all-week,late-peak,2020,all-year,R1,0.83330000000,gasboiler,4,2025 -1,heat,all-week,late-peak,2020,all-year,R1,3.16670000000,heatpump,4,2025 -0,CO2f,all-week,late-peak,2020,all-year,R1,53.92500000000,gasboiler,4,2025 -0,heat,all-week,evening,2020,all-year,R1,0.55560000000,gasboiler,5,2025 -1,heat,all-week,evening,2020,all-year,R1,2.11110000000,heatpump,5,2025 -0,CO2f,all-week,evening,2020,all-year,R1,35.95000000000,gasboiler,5,2025 -1,heat,all-week,night,2020,all-year,R1,1.09200000000,heatpump,0,2030 -2,heat,all-week,night,2025,all-year,R1,0.57470000000,heatpump,0,2030 -1,heat,all-week,morning,2020,all-year,R1,1.63790000000,heatpump,1,2030 -2,heat,all-week,morning,2025,all-year,R1,0.86210000000,heatpump,1,2030 -1,heat,all-week,afternoon,2020,all-year,R1,1.09200000000,heatpump,2,2030 -2,heat,all-week,afternoon,2025,all-year,R1,0.57470000000,heatpump,2,2030 -1,heat,all-week,early-peak,2020,all-year,R1,1.63790000000,heatpump,3,2030 -2,heat,all-week,early-peak,2025,all-year,R1,0.86210000000,heatpump,3,2030 -1,heat,all-week,late-peak,2020,all-year,R1,3.27590000000,heatpump,4,2030 -2,heat,all-week,late-peak,2025,all-year,R1,1.72410000000,heatpump,4,2030 -1,heat,all-week,evening,2020,all-year,R1,2.18390000000,heatpump,5,2030 -2,heat,all-week,evening,2025,all-year,R1,1.14940000000,heatpump,5,2030 -2,heat,all-week,night,2025,all-year,R1,0.55560000000,heatpump,0,2035 -3,heat,all-week,night,2030,all-year,R1,1.44440000000,heatpump,0,2035 -2,heat,all-week,morning,2025,all-year,R1,0.83330000000,heatpump,1,2035 -3,heat,all-week,morning,2030,all-year,R1,2.16670000000,heatpump,1,2035 -2,heat,all-week,afternoon,2025,all-year,R1,0.55560000000,heatpump,2,2035 -3,heat,all-week,afternoon,2030,all-year,R1,1.44440000000,heatpump,2,2035 -2,heat,all-week,early-peak,2025,all-year,R1,0.83330000000,heatpump,3,2035 -3,heat,all-week,early-peak,2030,all-year,R1,2.16670000000,heatpump,3,2035 -2,heat,all-week,late-peak,2025,all-year,R1,1.66670000000,heatpump,4,2035 -3,heat,all-week,late-peak,2030,all-year,R1,4.33330000000,heatpump,4,2035 -2,heat,all-week,evening,2025,all-year,R1,1.11110000000,heatpump,5,2035 -3,heat,all-week,evening,2030,all-year,R1,2.88890000000,heatpump,5,2035 -3,heat,all-week,night,2030,all-year,R1,1.44440000000,heatpump,0,2040 -4,heat,all-week,night,2035,all-year,R1,0.88890000000,heatpump,0,2040 -3,heat,all-week,morning,2030,all-year,R1,2.16670000000,heatpump,1,2040 -4,heat,all-week,morning,2035,all-year,R1,1.33330000000,heatpump,1,2040 -3,heat,all-week,afternoon,2030,all-year,R1,1.44440000000,heatpump,2,2040 -4,heat,all-week,afternoon,2035,all-year,R1,0.88890000000,heatpump,2,2040 -3,heat,all-week,early-peak,2030,all-year,R1,2.16670000000,heatpump,3,2040 -4,heat,all-week,early-peak,2035,all-year,R1,1.33330000000,heatpump,3,2040 -3,heat,all-week,late-peak,2030,all-year,R1,4.33330000000,heatpump,4,2040 -4,heat,all-week,late-peak,2035,all-year,R1,2.66670000000,heatpump,4,2040 -3,heat,all-week,evening,2030,all-year,R1,2.88890000000,heatpump,5,2040 -4,heat,all-week,evening,2035,all-year,R1,1.77780000000,heatpump,5,2040 -4,heat,all-week,night,2035,all-year,R1,0.88890000000,heatpump,0,2045 -5,heat,all-week,night,2040,all-year,R1,1.77780000000,heatpump,0,2045 -4,heat,all-week,morning,2035,all-year,R1,1.33330000000,heatpump,1,2045 -5,heat,all-week,morning,2040,all-year,R1,2.66670000000,heatpump,1,2045 -4,heat,all-week,afternoon,2035,all-year,R1,0.88890000000,heatpump,2,2045 -5,heat,all-week,afternoon,2040,all-year,R1,1.77780000000,heatpump,2,2045 -4,heat,all-week,early-peak,2035,all-year,R1,1.33330000000,heatpump,3,2045 -5,heat,all-week,early-peak,2040,all-year,R1,2.66670000000,heatpump,3,2045 -4,heat,all-week,late-peak,2035,all-year,R1,2.66670000000,heatpump,4,2045 -5,heat,all-week,late-peak,2040,all-year,R1,5.33330000000,heatpump,4,2045 -4,heat,all-week,evening,2035,all-year,R1,1.77780000000,heatpump,5,2045 -5,heat,all-week,evening,2040,all-year,R1,3.55560000000,heatpump,5,2045 -5,heat,all-week,night,2040,all-year,R1,1.77780000000,heatpump,0,2050 -6,heat,all-week,night,2045,all-year,R1,1.22220000000,heatpump,0,2050 -5,heat,all-week,morning,2040,all-year,R1,2.66670000000,heatpump,1,2050 -6,heat,all-week,morning,2045,all-year,R1,1.83330000000,heatpump,1,2050 -5,heat,all-week,afternoon,2040,all-year,R1,1.77780000000,heatpump,2,2050 -6,heat,all-week,afternoon,2045,all-year,R1,1.22220000000,heatpump,2,2050 -5,heat,all-week,early-peak,2040,all-year,R1,2.66670000000,heatpump,3,2050 -6,heat,all-week,early-peak,2045,all-year,R1,1.83330000000,heatpump,3,2050 -5,heat,all-week,late-peak,2040,all-year,R1,5.33330000000,heatpump,4,2050 -6,heat,all-week,late-peak,2045,all-year,R1,3.66670000000,heatpump,4,2050 -5,heat,all-week,evening,2040,all-year,R1,3.55560000000,heatpump,5,2050 -6,heat,all-week,evening,2045,all-year,R1,2.44440000000,heatpump,5,2050 diff --git a/docs/tutorial-code/1-add-new-technology/1-introduction/settings.toml b/docs/tutorial-code/1-add-new-technology/1-introduction/settings.toml index c364d345b..7148ce16f 100644 --- a/docs/tutorial-code/1-add-new-technology/1-introduction/settings.toml +++ b/docs/tutorial-code/1-add-new-technology/1-introduction/settings.toml @@ -14,12 +14,12 @@ tolerance = 0.1 tolerance_unmet_demand = -0.1 [[outputs]] -quantity = "prices" +quantity = "capacity" sink = "aggregate" filename = "{cwd}/{default_output_dir}/MCA{Quantity}.csv" [[outputs]] -quantity = "capacity" +quantity = "prices" sink = "aggregate" filename = "{cwd}/{default_output_dir}/MCA{Quantity}.csv" @@ -55,18 +55,6 @@ constraints = [ demand_share = "standard_demand" # Optional, default to standard_demand forecast = 5 # Optional, defaults to 5 -[[sectors.residential.outputs]] -filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}.csv' -quantity = "capacity" -sink = 'aggregate' - -[[sectors.residential.outputs]] -filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}.csv' -sink = 'aggregate' -quantity.name = "supply" -quantity.sum_over = "timeslice" -quantity.drop = ["comm_usage", "units_prices"] - [sectors.power] type = 'default' priority = 2 @@ -81,11 +69,6 @@ existing_capacity = '{path}/technodata/power/ExistingCapacity.csv' lpsolver = "scipy" demand_share = "standard_demand" -[[sectors.power.outputs]] -filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}.csv' -quantity = "capacity" -sink = 'aggregate' - [sectors.gas] type = 'default' priority = 3 @@ -100,11 +83,6 @@ existing_capacity = '{path}/technodata/gas/ExistingCapacity.csv' lpsolver = "scipy" demand_share = "standard_demand" -[[sectors.gas.outputs]] -filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}.csv' -quantity = "capacity" -sink = 'aggregate' - [sectors.residential_presets] type = 'presets' priority = 0 diff --git a/docs/tutorial-code/1-add-new-technology/1-introduction/technodata/gas/Technodata.csv b/docs/tutorial-code/1-add-new-technology/1-introduction/technodata/gas/Technodata.csv index 784df8fbb..f7f3120d1 100644 --- a/docs/tutorial-code/1-add-new-technology/1-introduction/technodata/gas/Technodata.csv +++ b/docs/tutorial-code/1-add-new-technology/1-introduction/technodata/gas/Technodata.csv @@ -1,3 +1,3 @@ ProcessName,RegionName,Time,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent1 Unit,-,Year,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,New -gassupply1,R1,2020,0,1,0,1,2.55,1,5,1,60,35,0.9,0.00000189,86,0.1,energy,gas,gas,1 +gassupply1,R1,2020,0,1,0,1,2.55,1,10,1,100,35,0.9,0.00000189,86,0.1,energy,gas,gas,1 diff --git a/docs/tutorial-code/1-add-new-technology/1-introduction/technodata/power/Technodata.csv b/docs/tutorial-code/1-add-new-technology/1-introduction/technodata/power/Technodata.csv index 1b1601d9f..ded0e1a08 100644 --- a/docs/tutorial-code/1-add-new-technology/1-introduction/technodata/power/Technodata.csv +++ b/docs/tutorial-code/1-add-new-technology/1-introduction/technodata/power/Technodata.csv @@ -1,5 +1,5 @@ ProcessName,RegionName,Time,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent1 Unit,-,Year,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,New -gasCCGT,R1,2020,23.78234399,1,0,1,0,1,2,1,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1 -windturbine,R1,2020,36.30771182,1,0,1,0,1,2,1,60,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1 -solarPV,R1,2020,30,1,0,1,0,1,2,1,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1 +gasCCGT,R1,2020,23.78234399,1,0,1,0,1,10,1,100,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1 +windturbine,R1,2020,36.30771182,1,0,1,0,1,10,1,100,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1 +solarPV,R1,2020,30,1,0,1,0,1,10,1,100,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1 diff --git a/docs/tutorial-code/1-add-new-technology/1-introduction/technodata/residential/Technodata.csv b/docs/tutorial-code/1-add-new-technology/1-introduction/technodata/residential/Technodata.csv index cb5042134..24f3a949b 100644 --- a/docs/tutorial-code/1-add-new-technology/1-introduction/technodata/residential/Technodata.csv +++ b/docs/tutorial-code/1-add-new-technology/1-introduction/technodata/residential/Technodata.csv @@ -1,4 +1,4 @@ ProcessName,RegionName,Time,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent1 Unit,-,Year,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,New -gasboiler,R1,2020,3.8,1,0,1,0,1,10,0.2,60,10,1,0.00000189,86,0.1,energy,gas,heat,1 -heatpump,R1,2020,8.866667,1,0,1,0,1,10,0.2,60,10,1,0.00000189,86,0.1,energy,electricity,heat,1 +gasboiler,R1,2020,3.8,1,0,1,0,1,10,1,100,10,1,0.00000189,86,0.1,energy,gas,heat,1 +heatpump,R1,2020,8.866667,1,0,1,0,1,10,1,100,10,1,0.00000189,86,0.1,energy,electricity,heat,1 diff --git a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Gas/Capacity.csv b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Gas/Capacity.csv deleted file mode 100644 index fb9df2652..000000000 --- a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Gas/Capacity.csv +++ /dev/null @@ -1,17 +0,0 @@ -asset,capacity,installed,region,technology,year -0,15.00000000000,2020,R1,gassupply1,2020 -0,16.46440000000,2020,R1,gassupply1,2025 -0,8.96440000000,2020,R1,gassupply1,2030 -1,9.22000000000,2025,R1,gassupply1,2030 -0,1.46440000000,2020,R1,gassupply1,2035 -1,9.22000000000,2025,R1,gassupply1,2035 -2,7.50000000000,2030,R1,gassupply1,2035 -0,1.46440000000,2020,R1,gassupply1,2040 -1,9.22000000000,2025,R1,gassupply1,2040 -2,7.50000000000,2030,R1,gassupply1,2040 -0,1.46440000000,2020,R1,gassupply1,2045 -1,9.22000000000,2025,R1,gassupply1,2045 -2,7.50000000000,2030,R1,gassupply1,2045 -0,1.46440000000,2020,R1,gassupply1,2050 -1,9.22000000000,2025,R1,gassupply1,2050 -2,7.50000000000,2030,R1,gassupply1,2050 diff --git a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/MCACapacity.csv b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/MCACapacity.csv index ec93f2b65..d4f05f407 100644 --- a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/MCACapacity.csv +++ b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/MCACapacity.csv @@ -51,8 +51,7 @@ A1,5.88890000000,R1,2025,R1,power,gasCCGT,newcapa,2050 A1,6.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,10.00000000000,R1,2045,R1,power,solarPV,newcapa,2050 -A1,1.50000000000,R1,2045,R1,power,windturbine,newcapa,2050 +A1,11.50000000000,R1,2045,R1,power,solarPV,newcapa,2050 A1,1.46440000000,R1,2020,R1,gas,gassupply1,newcapa,2050 A1,9.22000000000,R1,2025,R1,gas,gassupply1,newcapa,2050 A1,7.50000000000,R1,2030,R1,gas,gassupply1,newcapa,2050 diff --git a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/MCAPrices.csv b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/MCAPrices.csv index 4afb878d1..cb50efbc2 100644 --- a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/MCAPrices.csv +++ b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/MCAPrices.csv @@ -143,27 +143,27 @@ electricity,all-week,evening,all-year,17.94720000000,R1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2045 heat,all-week,evening,all-year,7.41940000000,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,19.46150000000,R1,0,MUS$2010/PJ,2050 +electricity,all-week,night,all-year,19.45340000000,R1,0,MUS$2010/PJ,2050 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,8.02510000000,R1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,8.02190000000,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,19.46150000000,R1,1,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,19.45340000000,R1,1,MUS$2010/PJ,2050 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,8.02510000000,R1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,8.02190000000,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,19.46150000000,R1,2,MUS$2010/PJ,2050 +electricity,all-week,afternoon,all-year,19.45340000000,R1,2,MUS$2010/PJ,2050 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,8.02510000000,R1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,8.02190000000,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,19.46150000000,R1,3,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,19.45340000000,R1,3,MUS$2010/PJ,2050 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,8.02510000000,R1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,8.02190000000,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,19.46150000000,R1,4,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,19.45340000000,R1,4,MUS$2010/PJ,2050 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,8.02510000000,R1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,8.02190000000,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,19.46150000000,R1,5,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,19.45340000000,R1,5,MUS$2010/PJ,2050 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,8.02510000000,R1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,8.02190000000,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/1-add-new-technology/2-scenario/Results/Power/Capacity.csv b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Power/Capacity.csv deleted file mode 100644 index aba6be4c3..000000000 --- a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Power/Capacity.csv +++ /dev/null @@ -1,29 +0,0 @@ -asset,capacity,installed,region,technology,year -0,1.00000000000,2020,R1,gasCCGT,2020 -0,6.00000000000,2020,R1,gasCCGT,2025 -2,5.50000000000,2020,R1,windturbine,2025 -0,5.00000000000,2020,R1,gasCCGT,2030 -1,5.88890000000,2025,R1,gasCCGT,2030 -3,5.50000000000,2020,R1,windturbine,2030 -0,5.00000000000,2020,R1,gasCCGT,2035 -1,5.88890000000,2025,R1,gasCCGT,2035 -2,6.00000000000,2030,R1,solarPV,2035 -4,5.50000000000,2020,R1,windturbine,2035 -0,5.00000000000,2020,R1,gasCCGT,2040 -1,5.88890000000,2025,R1,gasCCGT,2040 -2,6.00000000000,2030,R1,solarPV,2040 -3,6.00000000000,2035,R1,solarPV,2040 -5,5.50000000000,2020,R1,windturbine,2040 -0,5.00000000000,2020,R1,gasCCGT,2045 -1,5.88890000000,2025,R1,gasCCGT,2045 -2,6.00000000000,2030,R1,solarPV,2045 -3,6.00000000000,2035,R1,solarPV,2045 -4,6.00000000000,2040,R1,solarPV,2045 -6,5.50000000000,2020,R1,windturbine,2045 -0,5.00000000000,2020,R1,gasCCGT,2050 -1,5.88890000000,2025,R1,gasCCGT,2050 -2,6.00000000000,2030,R1,solarPV,2050 -3,6.00000000000,2035,R1,solarPV,2050 -4,6.00000000000,2040,R1,solarPV,2050 -5,10.00000000000,2045,R1,solarPV,2050 -7,1.50000000000,2045,R1,windturbine,2050 diff --git a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Capacity.csv b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Capacity.csv deleted file mode 100644 index d5cf558f0..000000000 --- a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Capacity.csv +++ /dev/null @@ -1,14 +0,0 @@ -asset,capacity,installed,region,technology,year -0,10,2020,R1,gasboiler,2020 -0,5,2020,R1,gasboiler,2025 -1,19,2020,R1,heatpump,2025 -1,19,2020,R1,heatpump,2030 -2,10,2025,R1,heatpump,2030 -2,10,2025,R1,heatpump,2035 -3,26,2030,R1,heatpump,2035 -3,26,2030,R1,heatpump,2040 -4,16,2035,R1,heatpump,2040 -4,16,2035,R1,heatpump,2045 -5,32,2040,R1,heatpump,2045 -5,32,2040,R1,heatpump,2050 -6,22,2045,R1,heatpump,2050 diff --git a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Supply.csv b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Supply.csv deleted file mode 100644 index 520869501..000000000 --- a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Supply.csv +++ /dev/null @@ -1,91 +0,0 @@ -asset,commodity,day,hour,installed,month,region,supply,technology,timeslice,year -0,heat,all-week,night,2020,all-year,R1,1.00000000000,gasboiler,0,2020 -0,CO2f,all-week,night,2020,all-year,R1,64.71000000000,gasboiler,0,2020 -0,heat,all-week,morning,2020,all-year,R1,1.50000000000,gasboiler,1,2020 -0,CO2f,all-week,morning,2020,all-year,R1,97.06500000000,gasboiler,1,2020 -0,heat,all-week,afternoon,2020,all-year,R1,1.00000000000,gasboiler,2,2020 -0,CO2f,all-week,afternoon,2020,all-year,R1,64.71000000000,gasboiler,2,2020 -0,heat,all-week,early-peak,2020,all-year,R1,1.50000000000,gasboiler,3,2020 -0,CO2f,all-week,early-peak,2020,all-year,R1,97.06500000000,gasboiler,3,2020 -0,heat,all-week,late-peak,2020,all-year,R1,3.00000000000,gasboiler,4,2020 -0,CO2f,all-week,late-peak,2020,all-year,R1,194.13000000000,gasboiler,4,2020 -0,heat,all-week,evening,2020,all-year,R1,2.00000000000,gasboiler,5,2020 -0,CO2f,all-week,evening,2020,all-year,R1,129.42000000000,gasboiler,5,2020 -0,heat,all-week,night,2020,all-year,R1,0.27780000000,gasboiler,0,2025 -1,heat,all-week,night,2020,all-year,R1,1.05560000000,heatpump,0,2025 -0,CO2f,all-week,night,2020,all-year,R1,17.97500000000,gasboiler,0,2025 -0,heat,all-week,morning,2020,all-year,R1,0.41670000000,gasboiler,1,2025 -1,heat,all-week,morning,2020,all-year,R1,1.58330000000,heatpump,1,2025 -0,CO2f,all-week,morning,2020,all-year,R1,26.96250000000,gasboiler,1,2025 -0,heat,all-week,afternoon,2020,all-year,R1,0.27780000000,gasboiler,2,2025 -1,heat,all-week,afternoon,2020,all-year,R1,1.05560000000,heatpump,2,2025 -0,CO2f,all-week,afternoon,2020,all-year,R1,17.97500000000,gasboiler,2,2025 -0,heat,all-week,early-peak,2020,all-year,R1,0.41670000000,gasboiler,3,2025 -1,heat,all-week,early-peak,2020,all-year,R1,1.58330000000,heatpump,3,2025 -0,CO2f,all-week,early-peak,2020,all-year,R1,26.96250000000,gasboiler,3,2025 -0,heat,all-week,late-peak,2020,all-year,R1,0.83330000000,gasboiler,4,2025 -1,heat,all-week,late-peak,2020,all-year,R1,3.16670000000,heatpump,4,2025 -0,CO2f,all-week,late-peak,2020,all-year,R1,53.92500000000,gasboiler,4,2025 -0,heat,all-week,evening,2020,all-year,R1,0.55560000000,gasboiler,5,2025 -1,heat,all-week,evening,2020,all-year,R1,2.11110000000,heatpump,5,2025 -0,CO2f,all-week,evening,2020,all-year,R1,35.95000000000,gasboiler,5,2025 -1,heat,all-week,night,2020,all-year,R1,1.09200000000,heatpump,0,2030 -2,heat,all-week,night,2025,all-year,R1,0.57470000000,heatpump,0,2030 -1,heat,all-week,morning,2020,all-year,R1,1.63790000000,heatpump,1,2030 -2,heat,all-week,morning,2025,all-year,R1,0.86210000000,heatpump,1,2030 -1,heat,all-week,afternoon,2020,all-year,R1,1.09200000000,heatpump,2,2030 -2,heat,all-week,afternoon,2025,all-year,R1,0.57470000000,heatpump,2,2030 -1,heat,all-week,early-peak,2020,all-year,R1,1.63790000000,heatpump,3,2030 -2,heat,all-week,early-peak,2025,all-year,R1,0.86210000000,heatpump,3,2030 -1,heat,all-week,late-peak,2020,all-year,R1,3.27590000000,heatpump,4,2030 -2,heat,all-week,late-peak,2025,all-year,R1,1.72410000000,heatpump,4,2030 -1,heat,all-week,evening,2020,all-year,R1,2.18390000000,heatpump,5,2030 -2,heat,all-week,evening,2025,all-year,R1,1.14940000000,heatpump,5,2030 -2,heat,all-week,night,2025,all-year,R1,0.55560000000,heatpump,0,2035 -3,heat,all-week,night,2030,all-year,R1,1.44440000000,heatpump,0,2035 -2,heat,all-week,morning,2025,all-year,R1,0.83330000000,heatpump,1,2035 -3,heat,all-week,morning,2030,all-year,R1,2.16670000000,heatpump,1,2035 -2,heat,all-week,afternoon,2025,all-year,R1,0.55560000000,heatpump,2,2035 -3,heat,all-week,afternoon,2030,all-year,R1,1.44440000000,heatpump,2,2035 -2,heat,all-week,early-peak,2025,all-year,R1,0.83330000000,heatpump,3,2035 -3,heat,all-week,early-peak,2030,all-year,R1,2.16670000000,heatpump,3,2035 -2,heat,all-week,late-peak,2025,all-year,R1,1.66670000000,heatpump,4,2035 -3,heat,all-week,late-peak,2030,all-year,R1,4.33330000000,heatpump,4,2035 -2,heat,all-week,evening,2025,all-year,R1,1.11110000000,heatpump,5,2035 -3,heat,all-week,evening,2030,all-year,R1,2.88890000000,heatpump,5,2035 -3,heat,all-week,night,2030,all-year,R1,1.44440000000,heatpump,0,2040 -4,heat,all-week,night,2035,all-year,R1,0.88890000000,heatpump,0,2040 -3,heat,all-week,morning,2030,all-year,R1,2.16670000000,heatpump,1,2040 -4,heat,all-week,morning,2035,all-year,R1,1.33330000000,heatpump,1,2040 -3,heat,all-week,afternoon,2030,all-year,R1,1.44440000000,heatpump,2,2040 -4,heat,all-week,afternoon,2035,all-year,R1,0.88890000000,heatpump,2,2040 -3,heat,all-week,early-peak,2030,all-year,R1,2.16670000000,heatpump,3,2040 -4,heat,all-week,early-peak,2035,all-year,R1,1.33330000000,heatpump,3,2040 -3,heat,all-week,late-peak,2030,all-year,R1,4.33330000000,heatpump,4,2040 -4,heat,all-week,late-peak,2035,all-year,R1,2.66670000000,heatpump,4,2040 -3,heat,all-week,evening,2030,all-year,R1,2.88890000000,heatpump,5,2040 -4,heat,all-week,evening,2035,all-year,R1,1.77780000000,heatpump,5,2040 -4,heat,all-week,night,2035,all-year,R1,0.88890000000,heatpump,0,2045 -5,heat,all-week,night,2040,all-year,R1,1.77780000000,heatpump,0,2045 -4,heat,all-week,morning,2035,all-year,R1,1.33330000000,heatpump,1,2045 -5,heat,all-week,morning,2040,all-year,R1,2.66670000000,heatpump,1,2045 -4,heat,all-week,afternoon,2035,all-year,R1,0.88890000000,heatpump,2,2045 -5,heat,all-week,afternoon,2040,all-year,R1,1.77780000000,heatpump,2,2045 -4,heat,all-week,early-peak,2035,all-year,R1,1.33330000000,heatpump,3,2045 -5,heat,all-week,early-peak,2040,all-year,R1,2.66670000000,heatpump,3,2045 -4,heat,all-week,late-peak,2035,all-year,R1,2.66670000000,heatpump,4,2045 -5,heat,all-week,late-peak,2040,all-year,R1,5.33330000000,heatpump,4,2045 -4,heat,all-week,evening,2035,all-year,R1,1.77780000000,heatpump,5,2045 -5,heat,all-week,evening,2040,all-year,R1,3.55560000000,heatpump,5,2045 -5,heat,all-week,night,2040,all-year,R1,1.77780000000,heatpump,0,2050 -6,heat,all-week,night,2045,all-year,R1,1.22220000000,heatpump,0,2050 -5,heat,all-week,morning,2040,all-year,R1,2.66670000000,heatpump,1,2050 -6,heat,all-week,morning,2045,all-year,R1,1.83330000000,heatpump,1,2050 -5,heat,all-week,afternoon,2040,all-year,R1,1.77780000000,heatpump,2,2050 -6,heat,all-week,afternoon,2045,all-year,R1,1.22220000000,heatpump,2,2050 -5,heat,all-week,early-peak,2040,all-year,R1,2.66670000000,heatpump,3,2050 -6,heat,all-week,early-peak,2045,all-year,R1,1.83330000000,heatpump,3,2050 -5,heat,all-week,late-peak,2040,all-year,R1,5.33330000000,heatpump,4,2050 -6,heat,all-week,late-peak,2045,all-year,R1,3.66670000000,heatpump,4,2050 -5,heat,all-week,evening,2040,all-year,R1,3.55560000000,heatpump,5,2050 -6,heat,all-week,evening,2045,all-year,R1,2.44440000000,heatpump,5,2050 diff --git a/docs/tutorial-code/1-add-new-technology/2-scenario/settings.toml b/docs/tutorial-code/1-add-new-technology/2-scenario/settings.toml index c364d345b..7148ce16f 100644 --- a/docs/tutorial-code/1-add-new-technology/2-scenario/settings.toml +++ b/docs/tutorial-code/1-add-new-technology/2-scenario/settings.toml @@ -14,12 +14,12 @@ tolerance = 0.1 tolerance_unmet_demand = -0.1 [[outputs]] -quantity = "prices" +quantity = "capacity" sink = "aggregate" filename = "{cwd}/{default_output_dir}/MCA{Quantity}.csv" [[outputs]] -quantity = "capacity" +quantity = "prices" sink = "aggregate" filename = "{cwd}/{default_output_dir}/MCA{Quantity}.csv" @@ -55,18 +55,6 @@ constraints = [ demand_share = "standard_demand" # Optional, default to standard_demand forecast = 5 # Optional, defaults to 5 -[[sectors.residential.outputs]] -filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}.csv' -quantity = "capacity" -sink = 'aggregate' - -[[sectors.residential.outputs]] -filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}.csv' -sink = 'aggregate' -quantity.name = "supply" -quantity.sum_over = "timeslice" -quantity.drop = ["comm_usage", "units_prices"] - [sectors.power] type = 'default' priority = 2 @@ -81,11 +69,6 @@ existing_capacity = '{path}/technodata/power/ExistingCapacity.csv' lpsolver = "scipy" demand_share = "standard_demand" -[[sectors.power.outputs]] -filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}.csv' -quantity = "capacity" -sink = 'aggregate' - [sectors.gas] type = 'default' priority = 3 @@ -100,11 +83,6 @@ existing_capacity = '{path}/technodata/gas/ExistingCapacity.csv' lpsolver = "scipy" demand_share = "standard_demand" -[[sectors.gas.outputs]] -filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}.csv' -quantity = "capacity" -sink = 'aggregate' - [sectors.residential_presets] type = 'presets' priority = 0 diff --git a/docs/tutorial-code/1-add-new-technology/2-scenario/technodata/gas/Technodata.csv b/docs/tutorial-code/1-add-new-technology/2-scenario/technodata/gas/Technodata.csv index 784df8fbb..f7f3120d1 100644 --- a/docs/tutorial-code/1-add-new-technology/2-scenario/technodata/gas/Technodata.csv +++ b/docs/tutorial-code/1-add-new-technology/2-scenario/technodata/gas/Technodata.csv @@ -1,3 +1,3 @@ ProcessName,RegionName,Time,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent1 Unit,-,Year,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,New -gassupply1,R1,2020,0,1,0,1,2.55,1,5,1,60,35,0.9,0.00000189,86,0.1,energy,gas,gas,1 +gassupply1,R1,2020,0,1,0,1,2.55,1,10,1,100,35,0.9,0.00000189,86,0.1,energy,gas,gas,1 diff --git a/docs/tutorial-code/1-add-new-technology/2-scenario/technodata/power/Technodata.csv b/docs/tutorial-code/1-add-new-technology/2-scenario/technodata/power/Technodata.csv index d1ee15f87..8448780c6 100644 --- a/docs/tutorial-code/1-add-new-technology/2-scenario/technodata/power/Technodata.csv +++ b/docs/tutorial-code/1-add-new-technology/2-scenario/technodata/power/Technodata.csv @@ -1,8 +1,8 @@ ProcessName,RegionName,Time,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent1 Unit,-,Year,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,New -gasCCGT,R1,2020,23.78234399,1,0,1,0,1,2,1,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1 -gasCCGT,R1,2040,23.78234399,1,0,1,0,1,2,1,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1 -windturbine,R1,2020,36.30771182,1,0,1,0,1,2,1,60,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1 -windturbine,R1,2040,36.30771182,1,0,1,0,1,2,1,60,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1 -solarPV,R1,2020,40,1,0,1,0,1,2,1,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1 -solarPV,R1,2040,30,1,0,1,0,1,2,1,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1 +gasCCGT,R1,2020,23.78234399,1,0,1,0,1,10,1,100,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1 +gasCCGT,R1,2040,23.78234399,1,0,1,0,1,10,1,100,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1 +windturbine,R1,2020,36.30771182,1,0,1,0,1,10,1,100,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1 +windturbine,R1,2040,36.30771182,1,0,1,0,1,10,1,100,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1 +solarPV,R1,2020,40,1,0,1,0,1,10,1,100,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1 +solarPV,R1,2040,30,1,0,1,0,1,10,1,100,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1 diff --git a/docs/tutorial-code/1-add-new-technology/2-scenario/technodata/residential/Technodata.csv b/docs/tutorial-code/1-add-new-technology/2-scenario/technodata/residential/Technodata.csv index 3424b178b..5b961659e 100644 --- a/docs/tutorial-code/1-add-new-technology/2-scenario/technodata/residential/Technodata.csv +++ b/docs/tutorial-code/1-add-new-technology/2-scenario/technodata/residential/Technodata.csv @@ -1,4 +1,4 @@ ProcessName,RegionName,Time,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent1 Unit,-,Year,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,New -gasboiler,R1,2020,3.8,1,0,1,0,1,10,0.2,60,10,1,0.00000189,86,0.1,energy,gas,heat,1 -heatpump,R1,2020,8.866667,1,0,1,0,1,10,0.2,60,10,1,0.00000189,86,0.1,energy,electricity,heat,1 +gasboiler,R1,2020,3.8,1,0,1,0,1,10,1,100,10,1,0.00000189,86,0.1,energy,gas,heat,1 +heatpump,R1,2020,8.866667,1,0,1,0,1,10,1,100,10,1,0.00000189,86,0.1,energy,electricity,heat,1 diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity.csv deleted file mode 100644 index 0225f04eb..000000000 --- a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity.csv +++ /dev/null @@ -1,23 +0,0 @@ -asset,capacity,installed,region,technology,year -0,15.00000000000,2020,R1,gassupply1,2020 -0,18.38780000000,2020,R1,gassupply1,2025 -0,10.88780000000,2020,R1,gassupply1,2030 -1,12.17660000000,2025,R1,gassupply1,2030 -0,3.38780000000,2020,R1,gassupply1,2035 -1,12.17660000000,2025,R1,gassupply1,2035 -2,14.17140000000,2030,R1,gassupply1,2035 -0,3.38780000000,2020,R1,gassupply1,2040 -1,12.17660000000,2025,R1,gassupply1,2040 -2,14.17140000000,2030,R1,gassupply1,2040 -3,2.23740000000,2035,R1,gassupply1,2040 -0,3.38780000000,2020,R1,gassupply1,2045 -1,12.17660000000,2025,R1,gassupply1,2045 -2,14.17140000000,2030,R1,gassupply1,2045 -3,2.23740000000,2035,R1,gassupply1,2045 -4,4.13670000000,2040,R1,gassupply1,2045 -0,3.38780000000,2020,R1,gassupply1,2050 -1,12.17660000000,2025,R1,gassupply1,2050 -2,14.17140000000,2030,R1,gassupply1,2050 -3,2.23740000000,2035,R1,gassupply1,2050 -4,4.13670000000,2040,R1,gassupply1,2050 -5,3.86350000000,2045,R1,gassupply1,2050 diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/MCACapacity.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/MCACapacity.csv index e97b28dd7..2386fb466 100644 --- a/docs/tutorial-code/2-add-agent/1-single-objective/Results/MCACapacity.csv +++ b/docs/tutorial-code/2-add-agent/1-single-objective/Results/MCACapacity.csv @@ -7,113 +7,108 @@ A1,7.50000000000,R1,2020,R1,gas,gassupply1,newcapa,2020 A2,7.50000000000,R1,2020,R1,gas,gassupply1,newcapa,2020 A1,2.50000000000,R1,2020,R1,residential,gasboiler,newcapa,2025 A1,9.50000000000,R1,2020,R1,residential,heatpump,newcapa,2025 -A2,10.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2025 -A2,2.00000000000,R1,2020,R1,residential,heatpump,newcapa,2025 -A1,1.52780000000,R1,2020,R1,power,gasCCGT,newcapa,2025 +A2,12.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2025 +A1,1.30560000000,R1,2020,R1,power,gasCCGT,newcapa,2025 A2,0.50000000000,R1,2020,R1,power,gasCCGT,newcapa,2025 -A2,2.31250000000,R1,2020,R1,power,windturbine,newcapa,2025 -A1,9.19390000000,R1,2020,R1,gas,gassupply1,newcapa,2025 -A2,9.19390000000,R1,2020,R1,gas,gassupply1,newcapa,2025 +A2,1.81250000000,R1,2020,R1,power,windturbine,newcapa,2025 +A1,9.73230000000,R1,2020,R1,gas,gassupply1,newcapa,2025 +A2,9.73230000000,R1,2020,R1,gas,gassupply1,newcapa,2025 A1,9.50000000000,R1,2020,R1,residential,heatpump,newcapa,2030 A1,5.50000000000,R1,2025,R1,residential,heatpump,newcapa,2030 -A2,7.50000000000,R1,2020,R1,residential,gasboiler,newcapa,2030 +A2,9.50000000000,R1,2020,R1,residential,gasboiler,newcapa,2030 A2,5.50000000000,R1,2025,R1,residential,gasboiler,newcapa,2030 -A2,2.00000000000,R1,2020,R1,residential,heatpump,newcapa,2030 -A1,1.02780000000,R1,2020,R1,power,gasCCGT,newcapa,2030 -A1,2.75000000000,R1,2025,R1,power,gasCCGT,newcapa,2030 -A2,2.31250000000,R1,2020,R1,power,windturbine,newcapa,2030 -A2,6.18750000000,R1,2025,R1,power,windturbine,newcapa,2030 -A1,5.44390000000,R1,2020,R1,gas,gassupply1,newcapa,2030 -A1,6.08830000000,R1,2025,R1,gas,gassupply1,newcapa,2030 -A2,5.44390000000,R1,2020,R1,gas,gassupply1,newcapa,2030 -A2,6.08830000000,R1,2025,R1,gas,gassupply1,newcapa,2030 +A1,0.80560000000,R1,2020,R1,power,gasCCGT,newcapa,2030 +A1,2.52780000000,R1,2025,R1,power,gasCCGT,newcapa,2030 +A2,1.81250000000,R1,2020,R1,power,windturbine,newcapa,2030 +A2,5.68750000000,R1,2025,R1,power,windturbine,newcapa,2030 +A1,5.98230000000,R1,2020,R1,gas,gassupply1,newcapa,2030 +A1,6.46770000000,R1,2025,R1,gas,gassupply1,newcapa,2030 +A2,5.98230000000,R1,2020,R1,gas,gassupply1,newcapa,2030 +A2,6.46770000000,R1,2025,R1,gas,gassupply1,newcapa,2030 A1,5.50000000000,R1,2025,R1,residential,heatpump,newcapa,2035 A1,12.50000000000,R1,2030,R1,residential,heatpump,newcapa,2035 A2,5.50000000000,R1,2025,R1,residential,gasboiler,newcapa,2035 A2,12.50000000000,R1,2030,R1,residential,gasboiler,newcapa,2035 -A1,1.02780000000,R1,2020,R1,power,gasCCGT,newcapa,2035 -A1,2.75000000000,R1,2025,R1,power,gasCCGT,newcapa,2035 -A1,0.12500000000,R1,2030,R1,power,windturbine,newcapa,2035 -A2,2.31250000000,R1,2020,R1,power,windturbine,newcapa,2035 -A2,6.18750000000,R1,2025,R1,power,windturbine,newcapa,2035 -A2,0.25000000000,R1,2030,R1,power,windturbine,newcapa,2035 -A1,1.69390000000,R1,2020,R1,gas,gassupply1,newcapa,2035 -A1,6.08830000000,R1,2025,R1,gas,gassupply1,newcapa,2035 -A1,7.08570000000,R1,2030,R1,gas,gassupply1,newcapa,2035 -A2,1.69390000000,R1,2020,R1,gas,gassupply1,newcapa,2035 -A2,6.08830000000,R1,2025,R1,gas,gassupply1,newcapa,2035 -A2,7.08570000000,R1,2030,R1,gas,gassupply1,newcapa,2035 +A1,0.80560000000,R1,2020,R1,power,gasCCGT,newcapa,2035 +A1,2.52780000000,R1,2025,R1,power,gasCCGT,newcapa,2035 +A1,0.37500000000,R1,2030,R1,power,windturbine,newcapa,2035 +A2,1.81250000000,R1,2020,R1,power,windturbine,newcapa,2035 +A2,5.68750000000,R1,2025,R1,power,windturbine,newcapa,2035 +A2,0.75000000000,R1,2030,R1,power,windturbine,newcapa,2035 +A1,2.23230000000,R1,2020,R1,gas,gassupply1,newcapa,2035 +A1,6.46770000000,R1,2025,R1,gas,gassupply1,newcapa,2035 +A1,6.00700000000,R1,2030,R1,gas,gassupply1,newcapa,2035 +A2,2.23230000000,R1,2020,R1,gas,gassupply1,newcapa,2035 +A2,6.46770000000,R1,2025,R1,gas,gassupply1,newcapa,2035 +A2,6.00700000000,R1,2030,R1,gas,gassupply1,newcapa,2035 A1,12.50000000000,R1,2030,R1,residential,heatpump,newcapa,2040 A1,8.50000000000,R1,2035,R1,residential,heatpump,newcapa,2040 A2,12.50000000000,R1,2030,R1,residential,gasboiler,newcapa,2040 A2,8.50000000000,R1,2035,R1,residential,gasboiler,newcapa,2040 -A1,1.02780000000,R1,2020,R1,power,gasCCGT,newcapa,2040 -A1,2.75000000000,R1,2025,R1,power,gasCCGT,newcapa,2040 -A1,0.19440000000,R1,2035,R1,power,gasCCGT,newcapa,2040 -A1,0.12500000000,R1,2030,R1,power,windturbine,newcapa,2040 -A1,0.62500000000,R1,2035,R1,power,windturbine,newcapa,2040 -A2,2.31250000000,R1,2020,R1,power,windturbine,newcapa,2040 -A2,6.18750000000,R1,2025,R1,power,windturbine,newcapa,2040 -A2,0.25000000000,R1,2030,R1,power,windturbine,newcapa,2040 -A2,1.06250000000,R1,2035,R1,power,windturbine,newcapa,2040 -A1,1.69390000000,R1,2020,R1,gas,gassupply1,newcapa,2040 -A1,6.08830000000,R1,2025,R1,gas,gassupply1,newcapa,2040 -A1,7.08570000000,R1,2030,R1,gas,gassupply1,newcapa,2040 -A1,1.11870000000,R1,2035,R1,gas,gassupply1,newcapa,2040 -A2,1.69390000000,R1,2020,R1,gas,gassupply1,newcapa,2040 -A2,6.08830000000,R1,2025,R1,gas,gassupply1,newcapa,2040 -A2,7.08570000000,R1,2030,R1,gas,gassupply1,newcapa,2040 -A2,1.11870000000,R1,2035,R1,gas,gassupply1,newcapa,2040 +A1,0.80560000000,R1,2020,R1,power,gasCCGT,newcapa,2040 +A1,2.52780000000,R1,2025,R1,power,gasCCGT,newcapa,2040 +A1,0.37500000000,R1,2030,R1,power,windturbine,newcapa,2040 +A1,1.68750000000,R1,2035,R1,power,windturbine,newcapa,2040 +A2,1.81250000000,R1,2020,R1,power,windturbine,newcapa,2040 +A2,5.68750000000,R1,2025,R1,power,windturbine,newcapa,2040 +A2,0.75000000000,R1,2030,R1,power,windturbine,newcapa,2040 +A2,1.68750000000,R1,2035,R1,power,windturbine,newcapa,2040 +A1,2.23230000000,R1,2020,R1,gas,gassupply1,newcapa,2040 +A1,6.46770000000,R1,2025,R1,gas,gassupply1,newcapa,2040 +A1,6.00700000000,R1,2030,R1,gas,gassupply1,newcapa,2040 +A1,0.91190000000,R1,2035,R1,gas,gassupply1,newcapa,2040 +A2,2.23230000000,R1,2020,R1,gas,gassupply1,newcapa,2040 +A2,6.46770000000,R1,2025,R1,gas,gassupply1,newcapa,2040 +A2,6.00700000000,R1,2030,R1,gas,gassupply1,newcapa,2040 +A2,0.91190000000,R1,2035,R1,gas,gassupply1,newcapa,2040 A1,8.50000000000,R1,2035,R1,residential,heatpump,newcapa,2045 A1,15.50000000000,R1,2040,R1,residential,heatpump,newcapa,2045 A2,8.50000000000,R1,2035,R1,residential,gasboiler,newcapa,2045 A2,15.50000000000,R1,2040,R1,residential,gasboiler,newcapa,2045 -A1,1.02780000000,R1,2020,R1,power,gasCCGT,newcapa,2045 -A1,2.75000000000,R1,2025,R1,power,gasCCGT,newcapa,2045 -A1,0.19440000000,R1,2035,R1,power,gasCCGT,newcapa,2045 -A1,0.12500000000,R1,2030,R1,power,windturbine,newcapa,2045 -A1,0.62500000000,R1,2035,R1,power,windturbine,newcapa,2045 +A1,0.80560000000,R1,2020,R1,power,gasCCGT,newcapa,2045 +A1,2.52780000000,R1,2025,R1,power,gasCCGT,newcapa,2045 +A1,0.37500000000,R1,2030,R1,power,windturbine,newcapa,2045 +A1,1.68750000000,R1,2035,R1,power,windturbine,newcapa,2045 A1,1.50000000000,R1,2040,R1,power,windturbine,newcapa,2045 -A2,2.31250000000,R1,2020,R1,power,windturbine,newcapa,2045 -A2,6.18750000000,R1,2025,R1,power,windturbine,newcapa,2045 -A2,0.25000000000,R1,2030,R1,power,windturbine,newcapa,2045 -A2,1.06250000000,R1,2035,R1,power,windturbine,newcapa,2045 +A2,1.81250000000,R1,2020,R1,power,windturbine,newcapa,2045 +A2,5.68750000000,R1,2025,R1,power,windturbine,newcapa,2045 +A2,0.75000000000,R1,2030,R1,power,windturbine,newcapa,2045 +A2,1.68750000000,R1,2035,R1,power,windturbine,newcapa,2045 A2,1.50000000000,R1,2040,R1,power,windturbine,newcapa,2045 -A1,1.69390000000,R1,2020,R1,gas,gassupply1,newcapa,2045 -A1,6.08830000000,R1,2025,R1,gas,gassupply1,newcapa,2045 -A1,7.08570000000,R1,2030,R1,gas,gassupply1,newcapa,2045 -A1,1.11870000000,R1,2035,R1,gas,gassupply1,newcapa,2045 -A1,2.06830000000,R1,2040,R1,gas,gassupply1,newcapa,2045 -A2,1.69390000000,R1,2020,R1,gas,gassupply1,newcapa,2045 -A2,6.08830000000,R1,2025,R1,gas,gassupply1,newcapa,2045 -A2,7.08570000000,R1,2030,R1,gas,gassupply1,newcapa,2045 -A2,1.11870000000,R1,2035,R1,gas,gassupply1,newcapa,2045 -A2,2.06830000000,R1,2040,R1,gas,gassupply1,newcapa,2045 +A1,2.23230000000,R1,2020,R1,gas,gassupply1,newcapa,2045 +A1,6.46770000000,R1,2025,R1,gas,gassupply1,newcapa,2045 +A1,6.00700000000,R1,2030,R1,gas,gassupply1,newcapa,2045 +A1,0.91190000000,R1,2035,R1,gas,gassupply1,newcapa,2045 +A1,1.86430000000,R1,2040,R1,gas,gassupply1,newcapa,2045 +A2,2.23230000000,R1,2020,R1,gas,gassupply1,newcapa,2045 +A2,6.46770000000,R1,2025,R1,gas,gassupply1,newcapa,2045 +A2,6.00700000000,R1,2030,R1,gas,gassupply1,newcapa,2045 +A2,0.91190000000,R1,2035,R1,gas,gassupply1,newcapa,2045 +A2,1.86430000000,R1,2040,R1,gas,gassupply1,newcapa,2045 A1,15.50000000000,R1,2040,R1,residential,heatpump,newcapa,2050 A1,11.50000000000,R1,2045,R1,residential,heatpump,newcapa,2050 A2,15.50000000000,R1,2040,R1,residential,gasboiler,newcapa,2050 A2,11.50000000000,R1,2045,R1,residential,gasboiler,newcapa,2050 -A1,1.02780000000,R1,2020,R1,power,gasCCGT,newcapa,2050 -A1,2.75000000000,R1,2025,R1,power,gasCCGT,newcapa,2050 -A1,0.19440000000,R1,2035,R1,power,gasCCGT,newcapa,2050 -A1,0.12500000000,R1,2030,R1,power,windturbine,newcapa,2050 -A1,0.62500000000,R1,2035,R1,power,windturbine,newcapa,2050 +A1,0.80560000000,R1,2020,R1,power,gasCCGT,newcapa,2050 +A1,2.52780000000,R1,2025,R1,power,gasCCGT,newcapa,2050 +A1,0.37500000000,R1,2030,R1,power,windturbine,newcapa,2050 +A1,1.68750000000,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 -A2,6.18750000000,R1,2025,R1,power,windturbine,newcapa,2050 -A2,0.25000000000,R1,2030,R1,power,windturbine,newcapa,2050 -A2,1.06250000000,R1,2035,R1,power,windturbine,newcapa,2050 +A2,5.68750000000,R1,2025,R1,power,windturbine,newcapa,2050 +A2,0.75000000000,R1,2030,R1,power,windturbine,newcapa,2050 +A2,1.68750000000,R1,2035,R1,power,windturbine,newcapa,2050 A2,1.50000000000,R1,2040,R1,power,windturbine,newcapa,2050 -A2,3.40630000000,R1,2045,R1,power,windturbine,newcapa,2050 -A1,1.69390000000,R1,2020,R1,gas,gassupply1,newcapa,2050 -A1,6.08830000000,R1,2025,R1,gas,gassupply1,newcapa,2050 -A1,7.08570000000,R1,2030,R1,gas,gassupply1,newcapa,2050 -A1,1.11870000000,R1,2035,R1,gas,gassupply1,newcapa,2050 -A1,2.06830000000,R1,2040,R1,gas,gassupply1,newcapa,2050 -A1,1.93170000000,R1,2045,R1,gas,gassupply1,newcapa,2050 -A2,1.69390000000,R1,2020,R1,gas,gassupply1,newcapa,2050 -A2,6.08830000000,R1,2025,R1,gas,gassupply1,newcapa,2050 -A2,7.08570000000,R1,2030,R1,gas,gassupply1,newcapa,2050 -A2,1.11870000000,R1,2035,R1,gas,gassupply1,newcapa,2050 -A2,2.06830000000,R1,2040,R1,gas,gassupply1,newcapa,2050 -A2,1.93170000000,R1,2045,R1,gas,gassupply1,newcapa,2050 +A2,3.15630000000,R1,2045,R1,power,windturbine,newcapa,2050 +A1,2.23230000000,R1,2020,R1,gas,gassupply1,newcapa,2050 +A1,6.46770000000,R1,2025,R1,gas,gassupply1,newcapa,2050 +A1,6.00700000000,R1,2030,R1,gas,gassupply1,newcapa,2050 +A1,0.91190000000,R1,2035,R1,gas,gassupply1,newcapa,2050 +A1,1.86430000000,R1,2040,R1,gas,gassupply1,newcapa,2050 +A1,1.91720000000,R1,2045,R1,gas,gassupply1,newcapa,2050 +A2,2.23230000000,R1,2020,R1,gas,gassupply1,newcapa,2050 +A2,6.46770000000,R1,2025,R1,gas,gassupply1,newcapa,2050 +A2,6.00700000000,R1,2030,R1,gas,gassupply1,newcapa,2050 +A2,0.91190000000,R1,2035,R1,gas,gassupply1,newcapa,2050 +A2,1.86430000000,R1,2040,R1,gas,gassupply1,newcapa,2050 +A2,1.91720000000,R1,2045,R1,gas,gassupply1,newcapa,2050 diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/MCAPrices.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/MCAPrices.csv index 3950e30c4..73015b102 100644 --- a/docs/tutorial-code/2-add-agent/1-single-objective/Results/MCAPrices.csv +++ b/docs/tutorial-code/2-add-agent/1-single-objective/Results/MCAPrices.csv @@ -23,147 +23,147 @@ electricity,all-week,evening,all-year,19.50000000000,R1,5,MUS$2010/PJ,2020 gas,all-week,evening,all-year,7.15280000000,R1,5,MUS$2010/PJ,2020 heat,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.08310000000,R1,5,MUS$2010/kt,2020 -electricity,all-week,night,all-year,8.69150000000,R1,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,8.98640000000,R1,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,6.16680000000,R1,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,6.60550000000,R1,0,MUS$2010/PJ,2025 CO2f,all-week,night,all-year,0.12010000000,R1,0,MUS$2010/kt,2025 -electricity,all-week,morning,all-year,8.69150000000,R1,1,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,8.98640000000,R1,1,MUS$2010/PJ,2025 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,6.16680000000,R1,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,6.60550000000,R1,1,MUS$2010/PJ,2025 CO2f,all-week,morning,all-year,0.12010000000,R1,1,MUS$2010/kt,2025 -electricity,all-week,afternoon,all-year,8.69150000000,R1,2,MUS$2010/PJ,2025 +electricity,all-week,afternoon,all-year,8.98640000000,R1,2,MUS$2010/PJ,2025 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2025 -heat,all-week,afternoon,all-year,6.16680000000,R1,2,MUS$2010/PJ,2025 +heat,all-week,afternoon,all-year,6.60550000000,R1,2,MUS$2010/PJ,2025 CO2f,all-week,afternoon,all-year,0.12010000000,R1,2,MUS$2010/kt,2025 -electricity,all-week,early-peak,all-year,8.69150000000,R1,3,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,8.98640000000,R1,3,MUS$2010/PJ,2025 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,6.16680000000,R1,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,6.60550000000,R1,3,MUS$2010/PJ,2025 CO2f,all-week,early-peak,all-year,0.12010000000,R1,3,MUS$2010/kt,2025 -electricity,all-week,late-peak,all-year,8.69150000000,R1,4,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,8.98640000000,R1,4,MUS$2010/PJ,2025 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,6.16680000000,R1,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,6.60550000000,R1,4,MUS$2010/PJ,2025 CO2f,all-week,late-peak,all-year,0.12010000000,R1,4,MUS$2010/kt,2025 -electricity,all-week,evening,all-year,8.69150000000,R1,5,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,8.98640000000,R1,5,MUS$2010/PJ,2025 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,6.16680000000,R1,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,6.60550000000,R1,5,MUS$2010/PJ,2025 CO2f,all-week,evening,all-year,0.12010000000,R1,5,MUS$2010/kt,2025 electricity,all-week,night,all-year,8.65200000000,R1,0,MUS$2010/PJ,2030 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,6.78180000000,R1,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,7.25580000000,R1,0,MUS$2010/PJ,2030 CO2f,all-week,night,all-year,0.15700000000,R1,0,MUS$2010/kt,2030 electricity,all-week,morning,all-year,8.65200000000,R1,1,MUS$2010/PJ,2030 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,6.78180000000,R1,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,7.25580000000,R1,1,MUS$2010/PJ,2030 CO2f,all-week,morning,all-year,0.15700000000,R1,1,MUS$2010/kt,2030 electricity,all-week,afternoon,all-year,8.65200000000,R1,2,MUS$2010/PJ,2030 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,6.78180000000,R1,2,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,7.25580000000,R1,2,MUS$2010/PJ,2030 CO2f,all-week,afternoon,all-year,0.15700000000,R1,2,MUS$2010/kt,2030 electricity,all-week,early-peak,all-year,8.65200000000,R1,3,MUS$2010/PJ,2030 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,6.78180000000,R1,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,7.25580000000,R1,3,MUS$2010/PJ,2030 CO2f,all-week,early-peak,all-year,0.15700000000,R1,3,MUS$2010/kt,2030 electricity,all-week,late-peak,all-year,8.65200000000,R1,4,MUS$2010/PJ,2030 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,6.78180000000,R1,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,7.25580000000,R1,4,MUS$2010/PJ,2030 CO2f,all-week,late-peak,all-year,0.15700000000,R1,4,MUS$2010/kt,2030 electricity,all-week,evening,all-year,8.65200000000,R1,5,MUS$2010/PJ,2030 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,6.78180000000,R1,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,7.25580000000,R1,5,MUS$2010/PJ,2030 CO2f,all-week,evening,all-year,0.15700000000,R1,5,MUS$2010/kt,2030 -electricity,all-week,night,all-year,11.09690000000,R1,0,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,10.63240000000,R1,0,MUS$2010/PJ,2035 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,9.61740000000,R1,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,9.52450000000,R1,0,MUS$2010/PJ,2035 CO2f,all-week,night,all-year,0.21490000000,R1,0,MUS$2010/kt,2035 -electricity,all-week,morning,all-year,11.09690000000,R1,1,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,10.63240000000,R1,1,MUS$2010/PJ,2035 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,9.61740000000,R1,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,9.52450000000,R1,1,MUS$2010/PJ,2035 CO2f,all-week,morning,all-year,0.21490000000,R1,1,MUS$2010/kt,2035 -electricity,all-week,afternoon,all-year,11.09690000000,R1,2,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,10.63240000000,R1,2,MUS$2010/PJ,2035 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,9.61740000000,R1,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,9.52450000000,R1,2,MUS$2010/PJ,2035 CO2f,all-week,afternoon,all-year,0.21490000000,R1,2,MUS$2010/kt,2035 -electricity,all-week,early-peak,all-year,11.09690000000,R1,3,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,10.63240000000,R1,3,MUS$2010/PJ,2035 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,9.61740000000,R1,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,9.52450000000,R1,3,MUS$2010/PJ,2035 CO2f,all-week,early-peak,all-year,0.21490000000,R1,3,MUS$2010/kt,2035 -electricity,all-week,late-peak,all-year,11.09690000000,R1,4,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,10.63240000000,R1,4,MUS$2010/PJ,2035 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,9.61740000000,R1,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,9.52450000000,R1,4,MUS$2010/PJ,2035 CO2f,all-week,late-peak,all-year,0.21490000000,R1,4,MUS$2010/kt,2035 -electricity,all-week,evening,all-year,11.09690000000,R1,5,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,10.63240000000,R1,5,MUS$2010/PJ,2035 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,9.61740000000,R1,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,9.52450000000,R1,5,MUS$2010/PJ,2035 CO2f,all-week,evening,all-year,0.21490000000,R1,5,MUS$2010/kt,2035 -electricity,all-week,night,all-year,12.93350000000,R1,0,MUS$2010/PJ,2040 +electricity,all-week,night,all-year,11.12140000000,R1,0,MUS$2010/PJ,2040 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,11.85740000000,R1,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,11.49500000000,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,12.93350000000,R1,1,MUS$2010/PJ,2040 +electricity,all-week,morning,all-year,11.12140000000,R1,1,MUS$2010/PJ,2040 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,11.85740000000,R1,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,11.49500000000,R1,1,MUS$2010/PJ,2040 CO2f,all-week,morning,all-year,0.27280000000,R1,1,MUS$2010/kt,2040 -electricity,all-week,afternoon,all-year,12.93350000000,R1,2,MUS$2010/PJ,2040 +electricity,all-week,afternoon,all-year,11.12140000000,R1,2,MUS$2010/PJ,2040 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2040 -heat,all-week,afternoon,all-year,11.85740000000,R1,2,MUS$2010/PJ,2040 +heat,all-week,afternoon,all-year,11.49500000000,R1,2,MUS$2010/PJ,2040 CO2f,all-week,afternoon,all-year,0.27280000000,R1,2,MUS$2010/kt,2040 -electricity,all-week,early-peak,all-year,12.93350000000,R1,3,MUS$2010/PJ,2040 +electricity,all-week,early-peak,all-year,11.12140000000,R1,3,MUS$2010/PJ,2040 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,11.85740000000,R1,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,11.49500000000,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,12.93350000000,R1,4,MUS$2010/PJ,2040 +electricity,all-week,late-peak,all-year,11.12140000000,R1,4,MUS$2010/PJ,2040 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,11.85740000000,R1,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,11.49500000000,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,12.93350000000,R1,5,MUS$2010/PJ,2040 +electricity,all-week,evening,all-year,11.12140000000,R1,5,MUS$2010/PJ,2040 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,11.85740000000,R1,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,11.49500000000,R1,5,MUS$2010/PJ,2040 CO2f,all-week,evening,all-year,0.27280000000,R1,5,MUS$2010/kt,2040 -electricity,all-week,night,all-year,14.38770000000,R1,0,MUS$2010/PJ,2045 +electricity,all-week,night,all-year,12.34170000000,R1,0,MUS$2010/PJ,2045 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2045 -heat,all-week,night,all-year,14.77520000000,R1,0,MUS$2010/PJ,2045 +heat,all-week,night,all-year,14.36600000000,R1,0,MUS$2010/PJ,2045 CO2f,all-week,night,all-year,0.35390000000,R1,0,MUS$2010/kt,2045 -electricity,all-week,morning,all-year,14.38770000000,R1,1,MUS$2010/PJ,2045 +electricity,all-week,morning,all-year,12.34170000000,R1,1,MUS$2010/PJ,2045 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2045 -heat,all-week,morning,all-year,14.77520000000,R1,1,MUS$2010/PJ,2045 +heat,all-week,morning,all-year,14.36600000000,R1,1,MUS$2010/PJ,2045 CO2f,all-week,morning,all-year,0.35390000000,R1,1,MUS$2010/kt,2045 -electricity,all-week,afternoon,all-year,14.38770000000,R1,2,MUS$2010/PJ,2045 +electricity,all-week,afternoon,all-year,12.34170000000,R1,2,MUS$2010/PJ,2045 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2045 -heat,all-week,afternoon,all-year,14.77520000000,R1,2,MUS$2010/PJ,2045 +heat,all-week,afternoon,all-year,14.36600000000,R1,2,MUS$2010/PJ,2045 CO2f,all-week,afternoon,all-year,0.35390000000,R1,2,MUS$2010/kt,2045 -electricity,all-week,early-peak,all-year,14.38770000000,R1,3,MUS$2010/PJ,2045 +electricity,all-week,early-peak,all-year,12.34170000000,R1,3,MUS$2010/PJ,2045 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2045 -heat,all-week,early-peak,all-year,14.77520000000,R1,3,MUS$2010/PJ,2045 +heat,all-week,early-peak,all-year,14.36600000000,R1,3,MUS$2010/PJ,2045 CO2f,all-week,early-peak,all-year,0.35390000000,R1,3,MUS$2010/kt,2045 -electricity,all-week,late-peak,all-year,14.38770000000,R1,4,MUS$2010/PJ,2045 +electricity,all-week,late-peak,all-year,12.34170000000,R1,4,MUS$2010/PJ,2045 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2045 -heat,all-week,late-peak,all-year,14.77520000000,R1,4,MUS$2010/PJ,2045 +heat,all-week,late-peak,all-year,14.36600000000,R1,4,MUS$2010/PJ,2045 CO2f,all-week,late-peak,all-year,0.35390000000,R1,4,MUS$2010/kt,2045 -electricity,all-week,evening,all-year,14.38770000000,R1,5,MUS$2010/PJ,2045 +electricity,all-week,evening,all-year,12.34170000000,R1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2045 -heat,all-week,evening,all-year,14.77520000000,R1,5,MUS$2010/PJ,2045 +heat,all-week,evening,all-year,14.36600000000,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,15.72370000000,R1,0,MUS$2010/PJ,2050 +electricity,all-week,night,all-year,13.34640000000,R1,0,MUS$2010/PJ,2050 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,17.66930000000,R1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,17.19390000000,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,15.72370000000,R1,1,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,13.34640000000,R1,1,MUS$2010/PJ,2050 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,17.66930000000,R1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,17.19390000000,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,15.72370000000,R1,2,MUS$2010/PJ,2050 +electricity,all-week,afternoon,all-year,13.34640000000,R1,2,MUS$2010/PJ,2050 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,17.66930000000,R1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,17.19390000000,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,15.72370000000,R1,3,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,13.34640000000,R1,3,MUS$2010/PJ,2050 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,17.66930000000,R1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,17.19390000000,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,15.72370000000,R1,4,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,13.34640000000,R1,4,MUS$2010/PJ,2050 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,17.66930000000,R1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,17.19390000000,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,15.72370000000,R1,5,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,13.34640000000,R1,5,MUS$2010/PJ,2050 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,17.66930000000,R1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,17.19390000000,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/2-add-agent/1-single-objective/Results/Power/Capacity.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity.csv deleted file mode 100644 index 210c418bb..000000000 --- a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity.csv +++ /dev/null @@ -1,36 +0,0 @@ -asset,capacity,installed,region,technology,year -0,1.00000000000,2020,R1,gasCCGT,2020 -0,2.02780000000,2020,R1,gasCCGT,2025 -2,2.31250000000,2020,R1,windturbine,2025 -0,1.02780000000,2020,R1,gasCCGT,2030 -1,2.75000000000,2025,R1,gasCCGT,2030 -2,2.31250000000,2020,R1,windturbine,2030 -3,6.18750000000,2025,R1,windturbine,2030 -0,1.02780000000,2020,R1,gasCCGT,2035 -1,2.75000000000,2025,R1,gasCCGT,2035 -3,2.31250000000,2020,R1,windturbine,2035 -4,6.18750000000,2025,R1,windturbine,2035 -5,0.37500000000,2030,R1,windturbine,2035 -0,1.02780000000,2020,R1,gasCCGT,2040 -1,2.75000000000,2025,R1,gasCCGT,2040 -2,0.19440000000,2035,R1,gasCCGT,2040 -3,2.31250000000,2020,R1,windturbine,2040 -4,6.18750000000,2025,R1,windturbine,2040 -5,0.37500000000,2030,R1,windturbine,2040 -6,1.68750000000,2035,R1,windturbine,2040 -0,1.02780000000,2020,R1,gasCCGT,2045 -1,2.75000000000,2025,R1,gasCCGT,2045 -2,0.19440000000,2035,R1,gasCCGT,2045 -3,2.31250000000,2020,R1,windturbine,2045 -4,6.18750000000,2025,R1,windturbine,2045 -5,0.37500000000,2030,R1,windturbine,2045 -6,1.68750000000,2035,R1,windturbine,2045 -7,3.00000000000,2040,R1,windturbine,2045 -0,1.02780000000,2020,R1,gasCCGT,2050 -1,2.75000000000,2025,R1,gasCCGT,2050 -2,0.19440000000,2035,R1,gasCCGT,2050 -5,6.18750000000,2025,R1,windturbine,2050 -6,0.37500000000,2030,R1,windturbine,2050 -7,1.68750000000,2035,R1,windturbine,2050 -8,3.00000000000,2040,R1,windturbine,2050 -9,4.90630000000,2045,R1,windturbine,2050 diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Capacity.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Capacity.csv deleted file mode 100644 index 35be9de91..000000000 --- a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Capacity.csv +++ /dev/null @@ -1,24 +0,0 @@ -asset,capacity,installed,region,technology,year -0,10.00000000000,2020,R1,gasboiler,2020 -0,12.50000000000,2020,R1,gasboiler,2025 -2,11.50000000000,2020,R1,heatpump,2025 -0,7.50000000000,2020,R1,gasboiler,2030 -1,5.50000000000,2025,R1,gasboiler,2030 -3,11.50000000000,2020,R1,heatpump,2030 -4,5.50000000000,2025,R1,heatpump,2030 -1,5.50000000000,2025,R1,gasboiler,2035 -2,12.50000000000,2030,R1,gasboiler,2035 -5,5.50000000000,2025,R1,heatpump,2035 -6,12.50000000000,2030,R1,heatpump,2035 -2,12.50000000000,2030,R1,gasboiler,2040 -3,8.50000000000,2035,R1,gasboiler,2040 -7,12.50000000000,2030,R1,heatpump,2040 -8,8.50000000000,2035,R1,heatpump,2040 -3,8.50000000000,2035,R1,gasboiler,2045 -4,15.50000000000,2040,R1,gasboiler,2045 -9,8.50000000000,2035,R1,heatpump,2045 -10,15.50000000000,2040,R1,heatpump,2045 -4,15.50000000000,2040,R1,gasboiler,2050 -5,11.50000000000,2045,R1,gasboiler,2050 -11,15.50000000000,2040,R1,heatpump,2050 -12,11.50000000000,2045,R1,heatpump,2050 diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply.csv deleted file mode 100644 index 1c356b3e8..000000000 --- a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply.csv +++ /dev/null @@ -1,211 +0,0 @@ -asset,commodity,day,hour,installed,month,region,supply,technology,timeslice,year -0,heat,all-week,night,2020,all-year,R1,1.00000000000,gasboiler,0,2020 -0,CO2f,all-week,night,2020,all-year,R1,64.71000000000,gasboiler,0,2020 -0,heat,all-week,morning,2020,all-year,R1,1.50000000000,gasboiler,1,2020 -0,CO2f,all-week,morning,2020,all-year,R1,97.06500000000,gasboiler,1,2020 -0,heat,all-week,afternoon,2020,all-year,R1,1.00000000000,gasboiler,2,2020 -0,CO2f,all-week,afternoon,2020,all-year,R1,64.71000000000,gasboiler,2,2020 -0,heat,all-week,early-peak,2020,all-year,R1,1.50000000000,gasboiler,3,2020 -0,CO2f,all-week,early-peak,2020,all-year,R1,97.06500000000,gasboiler,3,2020 -0,heat,all-week,late-peak,2020,all-year,R1,3.00000000000,gasboiler,4,2020 -0,CO2f,all-week,late-peak,2020,all-year,R1,194.13000000000,gasboiler,4,2020 -0,heat,all-week,evening,2020,all-year,R1,2.00000000000,gasboiler,5,2020 -0,CO2f,all-week,evening,2020,all-year,R1,129.42000000000,gasboiler,5,2020 -0,heat,all-week,night,2020,all-year,R1,0.69440000000,gasboiler,0,2025 -2,heat,all-week,night,2020,all-year,R1,0.63890000000,heatpump,0,2025 -0,CO2f,all-week,night,2020,all-year,R1,44.93750000000,gasboiler,0,2025 -0,heat,all-week,morning,2020,all-year,R1,1.04170000000,gasboiler,1,2025 -2,heat,all-week,morning,2020,all-year,R1,0.95830000000,heatpump,1,2025 -0,CO2f,all-week,morning,2020,all-year,R1,67.40620000000,gasboiler,1,2025 -0,heat,all-week,afternoon,2020,all-year,R1,0.69440000000,gasboiler,2,2025 -2,heat,all-week,afternoon,2020,all-year,R1,0.63890000000,heatpump,2,2025 -0,CO2f,all-week,afternoon,2020,all-year,R1,44.93750000000,gasboiler,2,2025 -0,heat,all-week,early-peak,2020,all-year,R1,1.04170000000,gasboiler,3,2025 -2,heat,all-week,early-peak,2020,all-year,R1,0.95830000000,heatpump,3,2025 -0,CO2f,all-week,early-peak,2020,all-year,R1,67.40620000000,gasboiler,3,2025 -0,heat,all-week,late-peak,2020,all-year,R1,2.08330000000,gasboiler,4,2025 -2,heat,all-week,late-peak,2020,all-year,R1,1.91670000000,heatpump,4,2025 -0,CO2f,all-week,late-peak,2020,all-year,R1,134.81250000000,gasboiler,4,2025 -0,heat,all-week,evening,2020,all-year,R1,1.38890000000,gasboiler,5,2025 -2,heat,all-week,evening,2020,all-year,R1,1.27780000000,heatpump,5,2025 -0,CO2f,all-week,evening,2020,all-year,R1,89.87500000000,gasboiler,5,2025 -0,heat,all-week,night,2020,all-year,R1,0.41670000000,gasboiler,0,2030 -1,heat,all-week,night,2025,all-year,R1,0.30560000000,gasboiler,0,2030 -3,heat,all-week,night,2020,all-year,R1,0.63890000000,heatpump,0,2030 -4,heat,all-week,night,2025,all-year,R1,0.30560000000,heatpump,0,2030 -0,CO2f,all-week,night,2020,all-year,R1,26.96250000000,gasboiler,0,2030 -1,CO2f,all-week,night,2025,all-year,R1,19.77250000000,gasboiler,0,2030 -0,heat,all-week,morning,2020,all-year,R1,0.62500000000,gasboiler,1,2030 -1,heat,all-week,morning,2025,all-year,R1,0.45830000000,gasboiler,1,2030 -3,heat,all-week,morning,2020,all-year,R1,0.95830000000,heatpump,1,2030 -4,heat,all-week,morning,2025,all-year,R1,0.45830000000,heatpump,1,2030 -0,CO2f,all-week,morning,2020,all-year,R1,40.44370000000,gasboiler,1,2030 -1,CO2f,all-week,morning,2025,all-year,R1,29.65870000000,gasboiler,1,2030 -0,heat,all-week,afternoon,2020,all-year,R1,0.41670000000,gasboiler,2,2030 -1,heat,all-week,afternoon,2025,all-year,R1,0.30560000000,gasboiler,2,2030 -3,heat,all-week,afternoon,2020,all-year,R1,0.63890000000,heatpump,2,2030 -4,heat,all-week,afternoon,2025,all-year,R1,0.30560000000,heatpump,2,2030 -0,CO2f,all-week,afternoon,2020,all-year,R1,26.96250000000,gasboiler,2,2030 -1,CO2f,all-week,afternoon,2025,all-year,R1,19.77250000000,gasboiler,2,2030 -0,heat,all-week,early-peak,2020,all-year,R1,0.62500000000,gasboiler,3,2030 -1,heat,all-week,early-peak,2025,all-year,R1,0.45830000000,gasboiler,3,2030 -3,heat,all-week,early-peak,2020,all-year,R1,0.95830000000,heatpump,3,2030 -4,heat,all-week,early-peak,2025,all-year,R1,0.45830000000,heatpump,3,2030 -0,CO2f,all-week,early-peak,2020,all-year,R1,40.44370000000,gasboiler,3,2030 -1,CO2f,all-week,early-peak,2025,all-year,R1,29.65870000000,gasboiler,3,2030 -0,heat,all-week,late-peak,2020,all-year,R1,1.25000000000,gasboiler,4,2030 -1,heat,all-week,late-peak,2025,all-year,R1,0.91670000000,gasboiler,4,2030 -3,heat,all-week,late-peak,2020,all-year,R1,1.91670000000,heatpump,4,2030 -4,heat,all-week,late-peak,2025,all-year,R1,0.91670000000,heatpump,4,2030 -0,CO2f,all-week,late-peak,2020,all-year,R1,80.88750000000,gasboiler,4,2030 -1,CO2f,all-week,late-peak,2025,all-year,R1,59.31750000000,gasboiler,4,2030 -0,heat,all-week,evening,2020,all-year,R1,0.83330000000,gasboiler,5,2030 -1,heat,all-week,evening,2025,all-year,R1,0.61110000000,gasboiler,5,2030 -3,heat,all-week,evening,2020,all-year,R1,1.27780000000,heatpump,5,2030 -4,heat,all-week,evening,2025,all-year,R1,0.61110000000,heatpump,5,2030 -0,CO2f,all-week,evening,2020,all-year,R1,53.92500000000,gasboiler,5,2030 -1,CO2f,all-week,evening,2025,all-year,R1,39.54500000000,gasboiler,5,2030 -1,heat,all-week,night,2025,all-year,R1,0.30560000000,gasboiler,0,2035 -2,heat,all-week,night,2030,all-year,R1,0.69440000000,gasboiler,0,2035 -5,heat,all-week,night,2025,all-year,R1,0.30560000000,heatpump,0,2035 -6,heat,all-week,night,2030,all-year,R1,0.69440000000,heatpump,0,2035 -1,CO2f,all-week,night,2025,all-year,R1,19.77250000000,gasboiler,0,2035 -2,CO2f,all-week,night,2030,all-year,R1,44.93750000000,gasboiler,0,2035 -1,heat,all-week,morning,2025,all-year,R1,0.45830000000,gasboiler,1,2035 -2,heat,all-week,morning,2030,all-year,R1,1.04170000000,gasboiler,1,2035 -5,heat,all-week,morning,2025,all-year,R1,0.45830000000,heatpump,1,2035 -6,heat,all-week,morning,2030,all-year,R1,1.04170000000,heatpump,1,2035 -1,CO2f,all-week,morning,2025,all-year,R1,29.65870000000,gasboiler,1,2035 -2,CO2f,all-week,morning,2030,all-year,R1,67.40630000000,gasboiler,1,2035 -1,heat,all-week,afternoon,2025,all-year,R1,0.30560000000,gasboiler,2,2035 -2,heat,all-week,afternoon,2030,all-year,R1,0.69440000000,gasboiler,2,2035 -5,heat,all-week,afternoon,2025,all-year,R1,0.30560000000,heatpump,2,2035 -6,heat,all-week,afternoon,2030,all-year,R1,0.69440000000,heatpump,2,2035 -1,CO2f,all-week,afternoon,2025,all-year,R1,19.77250000000,gasboiler,2,2035 -2,CO2f,all-week,afternoon,2030,all-year,R1,44.93750000000,gasboiler,2,2035 -1,heat,all-week,early-peak,2025,all-year,R1,0.45830000000,gasboiler,3,2035 -2,heat,all-week,early-peak,2030,all-year,R1,1.04170000000,gasboiler,3,2035 -5,heat,all-week,early-peak,2025,all-year,R1,0.45830000000,heatpump,3,2035 -6,heat,all-week,early-peak,2030,all-year,R1,1.04170000000,heatpump,3,2035 -1,CO2f,all-week,early-peak,2025,all-year,R1,29.65870000000,gasboiler,3,2035 -2,CO2f,all-week,early-peak,2030,all-year,R1,67.40630000000,gasboiler,3,2035 -1,heat,all-week,late-peak,2025,all-year,R1,0.91670000000,gasboiler,4,2035 -2,heat,all-week,late-peak,2030,all-year,R1,2.08330000000,gasboiler,4,2035 -5,heat,all-week,late-peak,2025,all-year,R1,0.91670000000,heatpump,4,2035 -6,heat,all-week,late-peak,2030,all-year,R1,2.08330000000,heatpump,4,2035 -1,CO2f,all-week,late-peak,2025,all-year,R1,59.31750000000,gasboiler,4,2035 -2,CO2f,all-week,late-peak,2030,all-year,R1,134.81250000000,gasboiler,4,2035 -1,heat,all-week,evening,2025,all-year,R1,0.61110000000,gasboiler,5,2035 -2,heat,all-week,evening,2030,all-year,R1,1.38890000000,gasboiler,5,2035 -5,heat,all-week,evening,2025,all-year,R1,0.61110000000,heatpump,5,2035 -6,heat,all-week,evening,2030,all-year,R1,1.38890000000,heatpump,5,2035 -1,CO2f,all-week,evening,2025,all-year,R1,39.54500000000,gasboiler,5,2035 -2,CO2f,all-week,evening,2030,all-year,R1,89.87500000000,gasboiler,5,2035 -2,heat,all-week,night,2030,all-year,R1,0.69440000000,gasboiler,0,2040 -3,heat,all-week,night,2035,all-year,R1,0.47220000000,gasboiler,0,2040 -7,heat,all-week,night,2030,all-year,R1,0.69440000000,heatpump,0,2040 -8,heat,all-week,night,2035,all-year,R1,0.47220000000,heatpump,0,2040 -2,CO2f,all-week,night,2030,all-year,R1,44.93750000000,gasboiler,0,2040 -3,CO2f,all-week,night,2035,all-year,R1,30.55750000000,gasboiler,0,2040 -2,heat,all-week,morning,2030,all-year,R1,1.04170000000,gasboiler,1,2040 -3,heat,all-week,morning,2035,all-year,R1,0.70830000000,gasboiler,1,2040 -7,heat,all-week,morning,2030,all-year,R1,1.04170000000,heatpump,1,2040 -8,heat,all-week,morning,2035,all-year,R1,0.70830000000,heatpump,1,2040 -2,CO2f,all-week,morning,2030,all-year,R1,67.40630000000,gasboiler,1,2040 -3,CO2f,all-week,morning,2035,all-year,R1,45.83620000000,gasboiler,1,2040 -2,heat,all-week,afternoon,2030,all-year,R1,0.69440000000,gasboiler,2,2040 -3,heat,all-week,afternoon,2035,all-year,R1,0.47220000000,gasboiler,2,2040 -7,heat,all-week,afternoon,2030,all-year,R1,0.69440000000,heatpump,2,2040 -8,heat,all-week,afternoon,2035,all-year,R1,0.47220000000,heatpump,2,2040 -2,CO2f,all-week,afternoon,2030,all-year,R1,44.93750000000,gasboiler,2,2040 -3,CO2f,all-week,afternoon,2035,all-year,R1,30.55750000000,gasboiler,2,2040 -2,heat,all-week,early-peak,2030,all-year,R1,1.04170000000,gasboiler,3,2040 -3,heat,all-week,early-peak,2035,all-year,R1,0.70830000000,gasboiler,3,2040 -7,heat,all-week,early-peak,2030,all-year,R1,1.04170000000,heatpump,3,2040 -8,heat,all-week,early-peak,2035,all-year,R1,0.70830000000,heatpump,3,2040 -2,CO2f,all-week,early-peak,2030,all-year,R1,67.40630000000,gasboiler,3,2040 -3,CO2f,all-week,early-peak,2035,all-year,R1,45.83620000000,gasboiler,3,2040 -2,heat,all-week,late-peak,2030,all-year,R1,2.08330000000,gasboiler,4,2040 -3,heat,all-week,late-peak,2035,all-year,R1,1.41670000000,gasboiler,4,2040 -7,heat,all-week,late-peak,2030,all-year,R1,2.08330000000,heatpump,4,2040 -8,heat,all-week,late-peak,2035,all-year,R1,1.41670000000,heatpump,4,2040 -2,CO2f,all-week,late-peak,2030,all-year,R1,134.81250000000,gasboiler,4,2040 -3,CO2f,all-week,late-peak,2035,all-year,R1,91.67250000000,gasboiler,4,2040 -2,heat,all-week,evening,2030,all-year,R1,1.38890000000,gasboiler,5,2040 -3,heat,all-week,evening,2035,all-year,R1,0.94440000000,gasboiler,5,2040 -7,heat,all-week,evening,2030,all-year,R1,1.38890000000,heatpump,5,2040 -8,heat,all-week,evening,2035,all-year,R1,0.94440000000,heatpump,5,2040 -2,CO2f,all-week,evening,2030,all-year,R1,89.87500000000,gasboiler,5,2040 -3,CO2f,all-week,evening,2035,all-year,R1,61.11500000000,gasboiler,5,2040 -3,heat,all-week,night,2035,all-year,R1,0.47220000000,gasboiler,0,2045 -4,heat,all-week,night,2040,all-year,R1,0.86110000000,gasboiler,0,2045 -9,heat,all-week,night,2035,all-year,R1,0.47220000000,heatpump,0,2045 -10,heat,all-week,night,2040,all-year,R1,0.86110000000,heatpump,0,2045 -3,CO2f,all-week,night,2035,all-year,R1,30.55750000000,gasboiler,0,2045 -4,CO2f,all-week,night,2040,all-year,R1,55.72250000000,gasboiler,0,2045 -3,heat,all-week,morning,2035,all-year,R1,0.70830000000,gasboiler,1,2045 -4,heat,all-week,morning,2040,all-year,R1,1.29170000000,gasboiler,1,2045 -9,heat,all-week,morning,2035,all-year,R1,0.70830000000,heatpump,1,2045 -10,heat,all-week,morning,2040,all-year,R1,1.29170000000,heatpump,1,2045 -3,CO2f,all-week,morning,2035,all-year,R1,45.83620000000,gasboiler,1,2045 -4,CO2f,all-week,morning,2040,all-year,R1,83.58380000000,gasboiler,1,2045 -3,heat,all-week,afternoon,2035,all-year,R1,0.47220000000,gasboiler,2,2045 -4,heat,all-week,afternoon,2040,all-year,R1,0.86110000000,gasboiler,2,2045 -9,heat,all-week,afternoon,2035,all-year,R1,0.47220000000,heatpump,2,2045 -10,heat,all-week,afternoon,2040,all-year,R1,0.86110000000,heatpump,2,2045 -3,CO2f,all-week,afternoon,2035,all-year,R1,30.55750000000,gasboiler,2,2045 -4,CO2f,all-week,afternoon,2040,all-year,R1,55.72250000000,gasboiler,2,2045 -3,heat,all-week,early-peak,2035,all-year,R1,0.70830000000,gasboiler,3,2045 -4,heat,all-week,early-peak,2040,all-year,R1,1.29170000000,gasboiler,3,2045 -9,heat,all-week,early-peak,2035,all-year,R1,0.70830000000,heatpump,3,2045 -10,heat,all-week,early-peak,2040,all-year,R1,1.29170000000,heatpump,3,2045 -3,CO2f,all-week,early-peak,2035,all-year,R1,45.83620000000,gasboiler,3,2045 -4,CO2f,all-week,early-peak,2040,all-year,R1,83.58380000000,gasboiler,3,2045 -3,heat,all-week,late-peak,2035,all-year,R1,1.41670000000,gasboiler,4,2045 -4,heat,all-week,late-peak,2040,all-year,R1,2.58330000000,gasboiler,4,2045 -9,heat,all-week,late-peak,2035,all-year,R1,1.41670000000,heatpump,4,2045 -10,heat,all-week,late-peak,2040,all-year,R1,2.58330000000,heatpump,4,2045 -3,CO2f,all-week,late-peak,2035,all-year,R1,91.67250000000,gasboiler,4,2045 -4,CO2f,all-week,late-peak,2040,all-year,R1,167.16750000000,gasboiler,4,2045 -3,heat,all-week,evening,2035,all-year,R1,0.94440000000,gasboiler,5,2045 -4,heat,all-week,evening,2040,all-year,R1,1.72220000000,gasboiler,5,2045 -9,heat,all-week,evening,2035,all-year,R1,0.94440000000,heatpump,5,2045 -10,heat,all-week,evening,2040,all-year,R1,1.72220000000,heatpump,5,2045 -3,CO2f,all-week,evening,2035,all-year,R1,61.11500000000,gasboiler,5,2045 -4,CO2f,all-week,evening,2040,all-year,R1,111.44500000000,gasboiler,5,2045 -4,heat,all-week,night,2040,all-year,R1,0.86110000000,gasboiler,0,2050 -5,heat,all-week,night,2045,all-year,R1,0.63890000000,gasboiler,0,2050 -11,heat,all-week,night,2040,all-year,R1,0.86110000000,heatpump,0,2050 -12,heat,all-week,night,2045,all-year,R1,0.63890000000,heatpump,0,2050 -4,CO2f,all-week,night,2040,all-year,R1,55.72250000000,gasboiler,0,2050 -5,CO2f,all-week,night,2045,all-year,R1,41.34250000000,gasboiler,0,2050 -4,heat,all-week,morning,2040,all-year,R1,1.29170000000,gasboiler,1,2050 -5,heat,all-week,morning,2045,all-year,R1,0.95830000000,gasboiler,1,2050 -11,heat,all-week,morning,2040,all-year,R1,1.29170000000,heatpump,1,2050 -12,heat,all-week,morning,2045,all-year,R1,0.95830000000,heatpump,1,2050 -4,CO2f,all-week,morning,2040,all-year,R1,83.58380000000,gasboiler,1,2050 -5,CO2f,all-week,morning,2045,all-year,R1,62.01370000000,gasboiler,1,2050 -4,heat,all-week,afternoon,2040,all-year,R1,0.86110000000,gasboiler,2,2050 -5,heat,all-week,afternoon,2045,all-year,R1,0.63890000000,gasboiler,2,2050 -11,heat,all-week,afternoon,2040,all-year,R1,0.86110000000,heatpump,2,2050 -12,heat,all-week,afternoon,2045,all-year,R1,0.63890000000,heatpump,2,2050 -4,CO2f,all-week,afternoon,2040,all-year,R1,55.72250000000,gasboiler,2,2050 -5,CO2f,all-week,afternoon,2045,all-year,R1,41.34250000000,gasboiler,2,2050 -4,heat,all-week,early-peak,2040,all-year,R1,1.29170000000,gasboiler,3,2050 -5,heat,all-week,early-peak,2045,all-year,R1,0.95830000000,gasboiler,3,2050 -11,heat,all-week,early-peak,2040,all-year,R1,1.29170000000,heatpump,3,2050 -12,heat,all-week,early-peak,2045,all-year,R1,0.95830000000,heatpump,3,2050 -4,CO2f,all-week,early-peak,2040,all-year,R1,83.58380000000,gasboiler,3,2050 -5,CO2f,all-week,early-peak,2045,all-year,R1,62.01370000000,gasboiler,3,2050 -4,heat,all-week,late-peak,2040,all-year,R1,2.58330000000,gasboiler,4,2050 -5,heat,all-week,late-peak,2045,all-year,R1,1.91670000000,gasboiler,4,2050 -11,heat,all-week,late-peak,2040,all-year,R1,2.58330000000,heatpump,4,2050 -12,heat,all-week,late-peak,2045,all-year,R1,1.91670000000,heatpump,4,2050 -4,CO2f,all-week,late-peak,2040,all-year,R1,167.16750000000,gasboiler,4,2050 -5,CO2f,all-week,late-peak,2045,all-year,R1,124.02750000000,gasboiler,4,2050 -4,heat,all-week,evening,2040,all-year,R1,1.72220000000,gasboiler,5,2050 -5,heat,all-week,evening,2045,all-year,R1,1.27780000000,gasboiler,5,2050 -11,heat,all-week,evening,2040,all-year,R1,1.72220000000,heatpump,5,2050 -12,heat,all-week,evening,2045,all-year,R1,1.27780000000,heatpump,5,2050 -4,CO2f,all-week,evening,2040,all-year,R1,111.44500000000,gasboiler,5,2050 -5,CO2f,all-week,evening,2045,all-year,R1,82.68500000000,gasboiler,5,2050 diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/settings.toml b/docs/tutorial-code/2-add-agent/1-single-objective/settings.toml index 9d851f603..65f5261dc 100644 --- a/docs/tutorial-code/2-add-agent/1-single-objective/settings.toml +++ b/docs/tutorial-code/2-add-agent/1-single-objective/settings.toml @@ -14,12 +14,12 @@ tolerance = 0.1 tolerance_unmet_demand = -0.1 [[outputs]] -quantity = "prices" +quantity = "capacity" sink = "aggregate" filename = "{cwd}/{default_output_dir}/MCA{Quantity}.csv" [[outputs]] -quantity = "capacity" +quantity = "prices" sink = "aggregate" filename = "{cwd}/{default_output_dir}/MCA{Quantity}.csv" @@ -55,18 +55,6 @@ constraints = [ demand_share = "standard_demand" # Optional, default to standard_demand forecast = 5 # Optional, defaults to 5 -[[sectors.residential.outputs]] -filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}.csv' -quantity = "capacity" -sink = 'aggregate' - -[[sectors.residential.outputs]] -filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}.csv' -sink = 'aggregate' -quantity.name = "supply" -quantity.sum_over = "timeslice" -quantity.drop = ["comm_usage", "units_prices"] - [sectors.power] type = 'default' priority = 2 @@ -81,11 +69,6 @@ existing_capacity = '{path}/technodata/power/ExistingCapacity.csv' lpsolver = "scipy" demand_share = "standard_demand" -[[sectors.power.outputs]] -filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}.csv' -quantity = "capacity" -sink = 'aggregate' - [sectors.gas] type = 'default' priority = 3 @@ -100,11 +83,6 @@ existing_capacity = '{path}/technodata/gas/ExistingCapacity.csv' lpsolver = "scipy" demand_share = "standard_demand" -[[sectors.gas.outputs]] -filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}.csv' -quantity = "capacity" -sink = 'aggregate' - [sectors.residential_presets] type = 'presets' priority = 0 diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/technodata/gas/Technodata.csv b/docs/tutorial-code/2-add-agent/1-single-objective/technodata/gas/Technodata.csv index 99e05abc1..60477a91d 100644 --- a/docs/tutorial-code/2-add-agent/1-single-objective/technodata/gas/Technodata.csv +++ b/docs/tutorial-code/2-add-agent/1-single-objective/technodata/gas/Technodata.csv @@ -1,3 +1,3 @@ ProcessName,RegionName,Time,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent1,Agent2 Unit,-,Year,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,New,New -gassupply1,R1,2020,0,1,0,1,2.55,1,5,1,60,35,0.9,0.00000189,86,0.1,energy,gas,gas,0.5,0.5 +gassupply1,R1,2020,0,1,0,1,2.55,1,10,1,100,35,0.9,0.00000189,86,0.1,energy,gas,gas,0.5,0.5 diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/technodata/power/Technodata.csv b/docs/tutorial-code/2-add-agent/1-single-objective/technodata/power/Technodata.csv index 7489bc368..6c300fde3 100644 --- a/docs/tutorial-code/2-add-agent/1-single-objective/technodata/power/Technodata.csv +++ b/docs/tutorial-code/2-add-agent/1-single-objective/technodata/power/Technodata.csv @@ -1,4 +1,4 @@ ProcessName,RegionName,Time,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent1,Agent2 Unit,-,Year,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,New,New -gasCCGT,R1,2020,23.78234399,1,0,1,0,1,2,1,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,0.5,0.5 -windturbine,R1,2020,36.30771182,1,0,1,0,1,2,1,60,25,0.4,0.00000189,86,0.1,energy,wind,electricity,0.5,0.5 +gasCCGT,R1,2020,23.78234399,1,0,1,0,1,10,1,100,35,0.9,0.00000189,86,0.1,energy,gas,electricity,0.5,0.5 +windturbine,R1,2020,36.30771182,1,0,1,0,1,10,1,100,25,0.4,0.00000189,86,0.1,energy,wind,electricity,0.5,0.5 diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/technodata/residential/Technodata.csv b/docs/tutorial-code/2-add-agent/1-single-objective/technodata/residential/Technodata.csv index b69168ca7..84e909b49 100644 --- a/docs/tutorial-code/2-add-agent/1-single-objective/technodata/residential/Technodata.csv +++ b/docs/tutorial-code/2-add-agent/1-single-objective/technodata/residential/Technodata.csv @@ -1,4 +1,4 @@ ProcessName,RegionName,Time,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent1,Agent2 Unit,-,Year,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,New,New -gasboiler,R1,2020,3.8,1,0,1,0,1,10,0.2,60,10,1,0.00000189,86,0.1,energy,gas,heat,0.5,0.5 -heatpump,R1,2020,8.866667,1,0,1,0,1,10,0.2,60,10,1,0.00000189,86,0.1,energy,electricity,heat,0.5,0.5 +gasboiler,R1,2020,3.8,1,0,1,0,1,10,1,100,10,1,0.00000189,86,0.1,energy,gas,heat,0.5,0.5 +heatpump,R1,2020,8.866667,1,0,1,0,1,10,1,100,10,1,0.00000189,86,0.1,energy,electricity,heat,0.5,0.5 diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity.csv deleted file mode 100644 index 2d64dec7c..000000000 --- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity.csv +++ /dev/null @@ -1,20 +0,0 @@ -asset,capacity,installed,region,technology,year -0,15.00000000000,2020,R1,gassupply1,2020 -0,18.38780000000,2020,R1,gassupply1,2025 -0,10.88780000000,2020,R1,gassupply1,2030 -1,10.34110000000,2025,R1,gassupply1,2030 -0,3.38780000000,2020,R1,gassupply1,2035 -1,10.34110000000,2025,R1,gassupply1,2035 -2,14.17190000000,2030,R1,gassupply1,2035 -0,3.38780000000,2020,R1,gassupply1,2040 -1,10.34110000000,2025,R1,gassupply1,2040 -2,14.17190000000,2030,R1,gassupply1,2040 -3,3.92710000000,2035,R1,gassupply1,2040 -0,3.38780000000,2020,R1,gassupply1,2045 -1,10.34110000000,2025,R1,gassupply1,2045 -2,14.17190000000,2030,R1,gassupply1,2045 -3,3.92710000000,2035,R1,gassupply1,2045 -0,3.38780000000,2020,R1,gassupply1,2050 -1,10.34110000000,2025,R1,gassupply1,2050 -2,14.17190000000,2030,R1,gassupply1,2050 -3,3.92710000000,2035,R1,gassupply1,2050 diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/MCACapacity.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/MCACapacity.csv index 8d26262cb..545131719 100644 --- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/MCACapacity.csv +++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/MCACapacity.csv @@ -7,113 +7,107 @@ A1,7.50000000000,R1,2020,R1,gas,gassupply1,newcapa,2020 A2,7.50000000000,R1,2020,R1,gas,gassupply1,newcapa,2020 A1,2.50000000000,R1,2020,R1,residential,gasboiler,newcapa,2025 A1,9.50000000000,R1,2020,R1,residential,heatpump,newcapa,2025 -A2,10.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2025 -A2,2.00000000000,R1,2020,R1,residential,heatpump,newcapa,2025 -A1,1.52780000000,R1,2020,R1,power,gasCCGT,newcapa,2025 +A2,12.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2025 +A1,1.30560000000,R1,2020,R1,power,gasCCGT,newcapa,2025 A2,0.50000000000,R1,2020,R1,power,gasCCGT,newcapa,2025 -A2,2.31250000000,R1,2020,R1,power,windturbine,newcapa,2025 -A1,9.19390000000,R1,2020,R1,gas,gassupply1,newcapa,2025 -A2,9.19390000000,R1,2020,R1,gas,gassupply1,newcapa,2025 +A2,1.81250000000,R1,2020,R1,power,windturbine,newcapa,2025 +A1,9.73230000000,R1,2020,R1,gas,gassupply1,newcapa,2025 +A2,9.73230000000,R1,2020,R1,gas,gassupply1,newcapa,2025 A1,9.50000000000,R1,2020,R1,residential,heatpump,newcapa,2030 A1,5.50000000000,R1,2025,R1,residential,heatpump,newcapa,2030 -A2,7.50000000000,R1,2020,R1,residential,gasboiler,newcapa,2030 -A2,3.50000000000,R1,2025,R1,residential,gasboiler,newcapa,2030 -A2,2.00000000000,R1,2020,R1,residential,heatpump,newcapa,2030 -A2,2.00000000000,R1,2025,R1,residential,heatpump,newcapa,2030 -A1,1.02780000000,R1,2020,R1,power,gasCCGT,newcapa,2030 -A1,3.19440000000,R1,2025,R1,power,gasCCGT,newcapa,2030 -A2,2.31250000000,R1,2020,R1,power,windturbine,newcapa,2030 -A2,7.18750000000,R1,2025,R1,power,windturbine,newcapa,2030 -A1,5.44390000000,R1,2020,R1,gas,gassupply1,newcapa,2030 -A1,5.17050000000,R1,2025,R1,gas,gassupply1,newcapa,2030 -A2,5.44390000000,R1,2020,R1,gas,gassupply1,newcapa,2030 -A2,5.17050000000,R1,2025,R1,gas,gassupply1,newcapa,2030 +A2,9.50000000000,R1,2020,R1,residential,gasboiler,newcapa,2030 +A2,5.50000000000,R1,2025,R1,residential,heatpump,newcapa,2030 +A1,0.80560000000,R1,2020,R1,power,gasCCGT,newcapa,2030 +A1,3.75000000000,R1,2025,R1,power,gasCCGT,newcapa,2030 +A2,1.81250000000,R1,2020,R1,power,windturbine,newcapa,2030 +A2,8.43750000000,R1,2025,R1,power,windturbine,newcapa,2030 +A1,5.98230000000,R1,2020,R1,gas,gassupply1,newcapa,2030 +A1,3.94380000000,R1,2025,R1,gas,gassupply1,newcapa,2030 +A2,5.98230000000,R1,2020,R1,gas,gassupply1,newcapa,2030 +A2,3.94380000000,R1,2025,R1,gas,gassupply1,newcapa,2030 A1,5.50000000000,R1,2025,R1,residential,heatpump,newcapa,2035 A1,12.50000000000,R1,2030,R1,residential,heatpump,newcapa,2035 -A2,3.50000000000,R1,2025,R1,residential,gasboiler,newcapa,2035 -A2,12.50000000000,R1,2030,R1,residential,gasboiler,newcapa,2035 -A2,2.00000000000,R1,2025,R1,residential,heatpump,newcapa,2035 -A1,1.02780000000,R1,2020,R1,power,gasCCGT,newcapa,2035 -A1,3.19440000000,R1,2025,R1,power,gasCCGT,newcapa,2035 -A1,0.12500000000,R1,2030,R1,power,windturbine,newcapa,2035 -A2,2.31250000000,R1,2020,R1,power,windturbine,newcapa,2035 -A2,7.18750000000,R1,2025,R1,power,windturbine,newcapa,2035 -A2,0.25000000000,R1,2030,R1,power,windturbine,newcapa,2035 -A1,1.69390000000,R1,2020,R1,gas,gassupply1,newcapa,2035 -A1,5.17050000000,R1,2025,R1,gas,gassupply1,newcapa,2035 -A1,7.08590000000,R1,2030,R1,gas,gassupply1,newcapa,2035 -A2,1.69390000000,R1,2020,R1,gas,gassupply1,newcapa,2035 -A2,5.17050000000,R1,2025,R1,gas,gassupply1,newcapa,2035 -A2,7.08590000000,R1,2030,R1,gas,gassupply1,newcapa,2035 +A2,11.40000000000,R1,2030,R1,residential,gasboiler,newcapa,2035 +A2,5.50000000000,R1,2025,R1,residential,heatpump,newcapa,2035 +A2,1.10000000000,R1,2030,R1,residential,heatpump,newcapa,2035 +A1,0.80560000000,R1,2020,R1,power,gasCCGT,newcapa,2035 +A1,3.75000000000,R1,2025,R1,power,gasCCGT,newcapa,2035 +A1,0.51250000000,R1,2030,R1,power,windturbine,newcapa,2035 +A2,1.81250000000,R1,2020,R1,power,windturbine,newcapa,2035 +A2,8.43750000000,R1,2025,R1,power,windturbine,newcapa,2035 +A2,1.02500000000,R1,2030,R1,power,windturbine,newcapa,2035 +A1,2.23230000000,R1,2020,R1,gas,gassupply1,newcapa,2035 +A1,3.94380000000,R1,2025,R1,gas,gassupply1,newcapa,2035 +A1,5.41680000000,R1,2030,R1,gas,gassupply1,newcapa,2035 +A2,2.23230000000,R1,2020,R1,gas,gassupply1,newcapa,2035 +A2,3.94380000000,R1,2025,R1,gas,gassupply1,newcapa,2035 +A2,5.41680000000,R1,2030,R1,gas,gassupply1,newcapa,2035 A1,12.50000000000,R1,2030,R1,residential,heatpump,newcapa,2040 A1,8.50000000000,R1,2035,R1,residential,heatpump,newcapa,2040 -A2,12.50000000000,R1,2030,R1,residential,gasboiler,newcapa,2040 -A2,4.50000000000,R1,2035,R1,residential,gasboiler,newcapa,2040 -A2,4.00000000000,R1,2035,R1,residential,heatpump,newcapa,2040 -A1,1.02780000000,R1,2020,R1,power,gasCCGT,newcapa,2040 -A1,3.19440000000,R1,2025,R1,power,gasCCGT,newcapa,2040 -A1,0.41670000000,R1,2035,R1,power,gasCCGT,newcapa,2040 -A1,0.12500000000,R1,2030,R1,power,windturbine,newcapa,2040 -A1,0.62500000000,R1,2035,R1,power,windturbine,newcapa,2040 -A2,2.31250000000,R1,2020,R1,power,windturbine,newcapa,2040 -A2,7.18750000000,R1,2025,R1,power,windturbine,newcapa,2040 -A2,0.25000000000,R1,2030,R1,power,windturbine,newcapa,2040 -A2,1.56250000000,R1,2035,R1,power,windturbine,newcapa,2040 -A1,1.69390000000,R1,2020,R1,gas,gassupply1,newcapa,2040 -A1,5.17050000000,R1,2025,R1,gas,gassupply1,newcapa,2040 -A1,7.08590000000,R1,2030,R1,gas,gassupply1,newcapa,2040 -A1,1.96350000000,R1,2035,R1,gas,gassupply1,newcapa,2040 -A2,1.69390000000,R1,2020,R1,gas,gassupply1,newcapa,2040 -A2,5.17050000000,R1,2025,R1,gas,gassupply1,newcapa,2040 -A2,7.08590000000,R1,2030,R1,gas,gassupply1,newcapa,2040 -A2,1.96350000000,R1,2035,R1,gas,gassupply1,newcapa,2040 +A2,11.40000000000,R1,2030,R1,residential,gasboiler,newcapa,2040 +A2,1.10000000000,R1,2030,R1,residential,heatpump,newcapa,2040 +A2,8.50000000000,R1,2035,R1,residential,heatpump,newcapa,2040 +A1,0.80560000000,R1,2020,R1,power,gasCCGT,newcapa,2040 +A1,3.75000000000,R1,2025,R1,power,gasCCGT,newcapa,2040 +A1,0.09720000000,R1,2035,R1,power,gasCCGT,newcapa,2040 +A1,0.51250000000,R1,2030,R1,power,windturbine,newcapa,2040 +A1,2.56250000000,R1,2035,R1,power,windturbine,newcapa,2040 +A2,1.81250000000,R1,2020,R1,power,windturbine,newcapa,2040 +A2,8.43750000000,R1,2025,R1,power,windturbine,newcapa,2040 +A2,1.02500000000,R1,2030,R1,power,windturbine,newcapa,2040 +A2,2.78130000000,R1,2035,R1,power,windturbine,newcapa,2040 +A1,2.23230000000,R1,2020,R1,gas,gassupply1,newcapa,2040 +A1,3.94380000000,R1,2025,R1,gas,gassupply1,newcapa,2040 +A1,5.41680000000,R1,2030,R1,gas,gassupply1,newcapa,2040 +A1,0.03060000000,R1,2035,R1,gas,gassupply1,newcapa,2040 +A2,2.23230000000,R1,2020,R1,gas,gassupply1,newcapa,2040 +A2,3.94380000000,R1,2025,R1,gas,gassupply1,newcapa,2040 +A2,5.41680000000,R1,2030,R1,gas,gassupply1,newcapa,2040 +A2,0.03060000000,R1,2035,R1,gas,gassupply1,newcapa,2040 A1,8.50000000000,R1,2035,R1,residential,heatpump,newcapa,2045 A1,15.50000000000,R1,2040,R1,residential,heatpump,newcapa,2045 -A2,4.50000000000,R1,2035,R1,residential,gasboiler,newcapa,2045 -A2,11.50000000000,R1,2040,R1,residential,gasboiler,newcapa,2045 -A2,4.00000000000,R1,2035,R1,residential,heatpump,newcapa,2045 -A2,4.00000000000,R1,2040,R1,residential,heatpump,newcapa,2045 -A1,1.02780000000,R1,2020,R1,power,gasCCGT,newcapa,2045 -A1,3.19440000000,R1,2025,R1,power,gasCCGT,newcapa,2045 -A1,0.41670000000,R1,2035,R1,power,gasCCGT,newcapa,2045 -A1,0.12500000000,R1,2030,R1,power,windturbine,newcapa,2045 -A1,0.62500000000,R1,2035,R1,power,windturbine,newcapa,2045 -A1,3.00000000000,R1,2040,R1,power,windturbine,newcapa,2045 -A2,2.31250000000,R1,2020,R1,power,windturbine,newcapa,2045 -A2,7.18750000000,R1,2025,R1,power,windturbine,newcapa,2045 -A2,0.25000000000,R1,2030,R1,power,windturbine,newcapa,2045 -A2,1.56250000000,R1,2035,R1,power,windturbine,newcapa,2045 -A2,3.00000000000,R1,2040,R1,power,windturbine,newcapa,2045 -A1,1.69390000000,R1,2020,R1,gas,gassupply1,newcapa,2045 -A1,5.17050000000,R1,2025,R1,gas,gassupply1,newcapa,2045 -A1,7.08590000000,R1,2030,R1,gas,gassupply1,newcapa,2045 -A1,1.96350000000,R1,2035,R1,gas,gassupply1,newcapa,2045 -A2,1.69390000000,R1,2020,R1,gas,gassupply1,newcapa,2045 -A2,5.17050000000,R1,2025,R1,gas,gassupply1,newcapa,2045 -A2,7.08590000000,R1,2030,R1,gas,gassupply1,newcapa,2045 -A2,1.96350000000,R1,2035,R1,gas,gassupply1,newcapa,2045 +A2,8.50000000000,R1,2035,R1,residential,heatpump,newcapa,2045 +A2,15.50000000000,R1,2040,R1,residential,heatpump,newcapa,2045 +A1,0.80560000000,R1,2020,R1,power,gasCCGT,newcapa,2045 +A1,3.75000000000,R1,2025,R1,power,gasCCGT,newcapa,2045 +A1,0.09720000000,R1,2035,R1,power,gasCCGT,newcapa,2045 +A1,0.51250000000,R1,2030,R1,power,windturbine,newcapa,2045 +A1,2.56250000000,R1,2035,R1,power,windturbine,newcapa,2045 +A1,14.55000000000,R1,2040,R1,power,windturbine,newcapa,2045 +A2,1.81250000000,R1,2020,R1,power,windturbine,newcapa,2045 +A2,8.43750000000,R1,2025,R1,power,windturbine,newcapa,2045 +A2,1.02500000000,R1,2030,R1,power,windturbine,newcapa,2045 +A2,2.78130000000,R1,2035,R1,power,windturbine,newcapa,2045 +A2,5.85000000000,R1,2040,R1,power,windturbine,newcapa,2045 +A1,2.23230000000,R1,2020,R1,gas,gassupply1,newcapa,2045 +A1,3.94380000000,R1,2025,R1,gas,gassupply1,newcapa,2045 +A1,5.41680000000,R1,2030,R1,gas,gassupply1,newcapa,2045 +A1,0.03060000000,R1,2035,R1,gas,gassupply1,newcapa,2045 +A2,2.23230000000,R1,2020,R1,gas,gassupply1,newcapa,2045 +A2,3.94380000000,R1,2025,R1,gas,gassupply1,newcapa,2045 +A2,5.41680000000,R1,2030,R1,gas,gassupply1,newcapa,2045 +A2,0.03060000000,R1,2035,R1,gas,gassupply1,newcapa,2045 A1,15.50000000000,R1,2040,R1,residential,heatpump,newcapa,2050 A1,11.50000000000,R1,2045,R1,residential,heatpump,newcapa,2050 -A2,11.50000000000,R1,2040,R1,residential,gasboiler,newcapa,2050 -A2,4.00000000000,R1,2040,R1,residential,heatpump,newcapa,2050 +A2,15.50000000000,R1,2040,R1,residential,heatpump,newcapa,2050 A2,11.50000000000,R1,2045,R1,residential,heatpump,newcapa,2050 -A1,1.02780000000,R1,2020,R1,power,gasCCGT,newcapa,2050 -A1,3.19440000000,R1,2025,R1,power,gasCCGT,newcapa,2050 -A1,0.41670000000,R1,2035,R1,power,gasCCGT,newcapa,2050 -A1,0.12500000000,R1,2030,R1,power,windturbine,newcapa,2050 -A1,0.62500000000,R1,2035,R1,power,windturbine,newcapa,2050 -A1,3.00000000000,R1,2040,R1,power,windturbine,newcapa,2050 -A1,2.90630000000,R1,2045,R1,power,windturbine,newcapa,2050 -A2,7.18750000000,R1,2025,R1,power,windturbine,newcapa,2050 -A2,0.25000000000,R1,2030,R1,power,windturbine,newcapa,2050 -A2,1.56250000000,R1,2035,R1,power,windturbine,newcapa,2050 -A2,3.00000000000,R1,2040,R1,power,windturbine,newcapa,2050 -A2,8.15620000000,R1,2045,R1,power,windturbine,newcapa,2050 -A1,1.69390000000,R1,2020,R1,gas,gassupply1,newcapa,2050 -A1,5.17050000000,R1,2025,R1,gas,gassupply1,newcapa,2050 -A1,7.08590000000,R1,2030,R1,gas,gassupply1,newcapa,2050 -A1,1.96350000000,R1,2035,R1,gas,gassupply1,newcapa,2050 -A2,1.69390000000,R1,2020,R1,gas,gassupply1,newcapa,2050 -A2,5.17050000000,R1,2025,R1,gas,gassupply1,newcapa,2050 -A2,7.08590000000,R1,2030,R1,gas,gassupply1,newcapa,2050 -A2,1.96350000000,R1,2035,R1,gas,gassupply1,newcapa,2050 +A1,0.80560000000,R1,2020,R1,power,gasCCGT,newcapa,2050 +A1,3.75000000000,R1,2025,R1,power,gasCCGT,newcapa,2050 +A1,0.09720000000,R1,2035,R1,power,gasCCGT,newcapa,2050 +A1,0.51250000000,R1,2030,R1,power,windturbine,newcapa,2050 +A1,2.56250000000,R1,2035,R1,power,windturbine,newcapa,2050 +A1,14.55000000000,R1,2040,R1,power,windturbine,newcapa,2050 +A1,0.90630000000,R1,2045,R1,power,windturbine,newcapa,2050 +A2,8.43750000000,R1,2025,R1,power,windturbine,newcapa,2050 +A2,1.02500000000,R1,2030,R1,power,windturbine,newcapa,2050 +A2,2.78130000000,R1,2035,R1,power,windturbine,newcapa,2050 +A2,5.85000000000,R1,2040,R1,power,windturbine,newcapa,2050 +A2,3.90630000000,R1,2045,R1,power,windturbine,newcapa,2050 +A1,2.23230000000,R1,2020,R1,gas,gassupply1,newcapa,2050 +A1,3.94380000000,R1,2025,R1,gas,gassupply1,newcapa,2050 +A1,5.41680000000,R1,2030,R1,gas,gassupply1,newcapa,2050 +A1,0.03060000000,R1,2035,R1,gas,gassupply1,newcapa,2050 +A2,2.23230000000,R1,2020,R1,gas,gassupply1,newcapa,2050 +A2,3.94380000000,R1,2025,R1,gas,gassupply1,newcapa,2050 +A2,5.41680000000,R1,2030,R1,gas,gassupply1,newcapa,2050 +A2,0.03060000000,R1,2035,R1,gas,gassupply1,newcapa,2050 diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/MCAPrices.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/MCAPrices.csv index 60dd406ca..0f7a7f862 100644 --- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/MCAPrices.csv +++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/MCAPrices.csv @@ -23,147 +23,147 @@ electricity,all-week,evening,all-year,19.50000000000,R1,5,MUS$2010/PJ,2020 gas,all-week,evening,all-year,7.15280000000,R1,5,MUS$2010/PJ,2020 heat,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.08310000000,R1,5,MUS$2010/kt,2020 -electricity,all-week,night,all-year,8.69150000000,R1,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,8.98640000000,R1,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,6.16680000000,R1,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,6.60550000000,R1,0,MUS$2010/PJ,2025 CO2f,all-week,night,all-year,0.12010000000,R1,0,MUS$2010/kt,2025 -electricity,all-week,morning,all-year,8.69150000000,R1,1,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,8.98640000000,R1,1,MUS$2010/PJ,2025 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,6.16680000000,R1,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,6.60550000000,R1,1,MUS$2010/PJ,2025 CO2f,all-week,morning,all-year,0.12010000000,R1,1,MUS$2010/kt,2025 -electricity,all-week,afternoon,all-year,8.69150000000,R1,2,MUS$2010/PJ,2025 +electricity,all-week,afternoon,all-year,8.98640000000,R1,2,MUS$2010/PJ,2025 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2025 -heat,all-week,afternoon,all-year,6.16680000000,R1,2,MUS$2010/PJ,2025 +heat,all-week,afternoon,all-year,6.60550000000,R1,2,MUS$2010/PJ,2025 CO2f,all-week,afternoon,all-year,0.12010000000,R1,2,MUS$2010/kt,2025 -electricity,all-week,early-peak,all-year,8.69150000000,R1,3,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,8.98640000000,R1,3,MUS$2010/PJ,2025 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,6.16680000000,R1,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,6.60550000000,R1,3,MUS$2010/PJ,2025 CO2f,all-week,early-peak,all-year,0.12010000000,R1,3,MUS$2010/kt,2025 -electricity,all-week,late-peak,all-year,8.69150000000,R1,4,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,8.98640000000,R1,4,MUS$2010/PJ,2025 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,6.16680000000,R1,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,6.60550000000,R1,4,MUS$2010/PJ,2025 CO2f,all-week,late-peak,all-year,0.12010000000,R1,4,MUS$2010/kt,2025 -electricity,all-week,evening,all-year,8.69150000000,R1,5,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,8.98640000000,R1,5,MUS$2010/PJ,2025 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,6.16680000000,R1,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,6.60550000000,R1,5,MUS$2010/PJ,2025 CO2f,all-week,evening,all-year,0.12010000000,R1,5,MUS$2010/kt,2025 electricity,all-week,night,all-year,8.65200000000,R1,0,MUS$2010/PJ,2030 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,6.30790000000,R1,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,5.95250000000,R1,0,MUS$2010/PJ,2030 CO2f,all-week,night,all-year,0.15700000000,R1,0,MUS$2010/kt,2030 electricity,all-week,morning,all-year,8.65200000000,R1,1,MUS$2010/PJ,2030 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,6.30790000000,R1,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,5.95250000000,R1,1,MUS$2010/PJ,2030 CO2f,all-week,morning,all-year,0.15700000000,R1,1,MUS$2010/kt,2030 electricity,all-week,afternoon,all-year,8.65200000000,R1,2,MUS$2010/PJ,2030 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,6.30790000000,R1,2,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,5.95250000000,R1,2,MUS$2010/PJ,2030 CO2f,all-week,afternoon,all-year,0.15700000000,R1,2,MUS$2010/kt,2030 electricity,all-week,early-peak,all-year,8.65200000000,R1,3,MUS$2010/PJ,2030 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,6.30790000000,R1,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,5.95250000000,R1,3,MUS$2010/PJ,2030 CO2f,all-week,early-peak,all-year,0.15700000000,R1,3,MUS$2010/kt,2030 electricity,all-week,late-peak,all-year,8.65200000000,R1,4,MUS$2010/PJ,2030 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,6.30790000000,R1,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,5.95250000000,R1,4,MUS$2010/PJ,2030 CO2f,all-week,late-peak,all-year,0.15700000000,R1,4,MUS$2010/kt,2030 electricity,all-week,evening,all-year,8.65200000000,R1,5,MUS$2010/PJ,2030 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,6.30790000000,R1,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,5.95250000000,R1,5,MUS$2010/PJ,2030 CO2f,all-week,evening,all-year,0.15700000000,R1,5,MUS$2010/kt,2030 -electricity,all-week,night,all-year,11.11830000000,R1,0,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,10.63240000000,R1,0,MUS$2010/PJ,2035 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,9.07350000000,R1,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,7.67980000000,R1,0,MUS$2010/PJ,2035 CO2f,all-week,night,all-year,0.21490000000,R1,0,MUS$2010/kt,2035 -electricity,all-week,morning,all-year,11.11830000000,R1,1,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,10.63240000000,R1,1,MUS$2010/PJ,2035 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,9.07350000000,R1,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,7.67980000000,R1,1,MUS$2010/PJ,2035 CO2f,all-week,morning,all-year,0.21490000000,R1,1,MUS$2010/kt,2035 -electricity,all-week,afternoon,all-year,11.11830000000,R1,2,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,10.63240000000,R1,2,MUS$2010/PJ,2035 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,9.07350000000,R1,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,7.67980000000,R1,2,MUS$2010/PJ,2035 CO2f,all-week,afternoon,all-year,0.21490000000,R1,2,MUS$2010/kt,2035 -electricity,all-week,early-peak,all-year,11.11830000000,R1,3,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,10.63240000000,R1,3,MUS$2010/PJ,2035 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,9.07350000000,R1,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,7.67980000000,R1,3,MUS$2010/PJ,2035 CO2f,all-week,early-peak,all-year,0.21490000000,R1,3,MUS$2010/kt,2035 -electricity,all-week,late-peak,all-year,11.11830000000,R1,4,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,10.63240000000,R1,4,MUS$2010/PJ,2035 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,9.07350000000,R1,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,7.67980000000,R1,4,MUS$2010/PJ,2035 CO2f,all-week,late-peak,all-year,0.21490000000,R1,4,MUS$2010/kt,2035 -electricity,all-week,evening,all-year,11.11830000000,R1,5,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,10.63240000000,R1,5,MUS$2010/PJ,2035 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,9.07350000000,R1,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,7.67980000000,R1,5,MUS$2010/PJ,2035 CO2f,all-week,evening,all-year,0.21490000000,R1,5,MUS$2010/kt,2035 -electricity,all-week,night,all-year,13.07010000000,R1,0,MUS$2010/PJ,2040 +electricity,all-week,night,all-year,10.99080000000,R1,0,MUS$2010/PJ,2040 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,10.66260000000,R1,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,8.34560000000,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,13.07010000000,R1,1,MUS$2010/PJ,2040 +electricity,all-week,morning,all-year,10.99080000000,R1,1,MUS$2010/PJ,2040 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,10.66260000000,R1,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,8.34560000000,R1,1,MUS$2010/PJ,2040 CO2f,all-week,morning,all-year,0.27280000000,R1,1,MUS$2010/kt,2040 -electricity,all-week,afternoon,all-year,13.07010000000,R1,2,MUS$2010/PJ,2040 +electricity,all-week,afternoon,all-year,10.99080000000,R1,2,MUS$2010/PJ,2040 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2040 -heat,all-week,afternoon,all-year,10.66260000000,R1,2,MUS$2010/PJ,2040 +heat,all-week,afternoon,all-year,8.34560000000,R1,2,MUS$2010/PJ,2040 CO2f,all-week,afternoon,all-year,0.27280000000,R1,2,MUS$2010/kt,2040 -electricity,all-week,early-peak,all-year,13.07010000000,R1,3,MUS$2010/PJ,2040 +electricity,all-week,early-peak,all-year,10.99080000000,R1,3,MUS$2010/PJ,2040 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,10.66260000000,R1,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,8.34560000000,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,13.07010000000,R1,4,MUS$2010/PJ,2040 +electricity,all-week,late-peak,all-year,10.99080000000,R1,4,MUS$2010/PJ,2040 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,10.66260000000,R1,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,8.34560000000,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,13.07010000000,R1,5,MUS$2010/PJ,2040 +electricity,all-week,evening,all-year,10.99080000000,R1,5,MUS$2010/PJ,2040 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,10.66260000000,R1,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,8.34560000000,R1,5,MUS$2010/PJ,2040 CO2f,all-week,evening,all-year,0.27280000000,R1,5,MUS$2010/kt,2040 -electricity,all-week,night,all-year,13.39510000000,R1,0,MUS$2010/PJ,2045 +electricity,all-week,night,all-year,8.65130000000,R1,0,MUS$2010/PJ,2045 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2045 -heat,all-week,night,all-year,11.58400000000,R1,0,MUS$2010/PJ,2045 +heat,all-week,night,all-year,3.70100000000,R1,0,MUS$2010/PJ,2045 CO2f,all-week,night,all-year,0.35390000000,R1,0,MUS$2010/kt,2045 -electricity,all-week,morning,all-year,13.39510000000,R1,1,MUS$2010/PJ,2045 +electricity,all-week,morning,all-year,8.65130000000,R1,1,MUS$2010/PJ,2045 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2045 -heat,all-week,morning,all-year,11.58400000000,R1,1,MUS$2010/PJ,2045 +heat,all-week,morning,all-year,3.70100000000,R1,1,MUS$2010/PJ,2045 CO2f,all-week,morning,all-year,0.35390000000,R1,1,MUS$2010/kt,2045 -electricity,all-week,afternoon,all-year,13.39510000000,R1,2,MUS$2010/PJ,2045 +electricity,all-week,afternoon,all-year,8.65130000000,R1,2,MUS$2010/PJ,2045 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2045 -heat,all-week,afternoon,all-year,11.58400000000,R1,2,MUS$2010/PJ,2045 +heat,all-week,afternoon,all-year,3.70100000000,R1,2,MUS$2010/PJ,2045 CO2f,all-week,afternoon,all-year,0.35390000000,R1,2,MUS$2010/kt,2045 -electricity,all-week,early-peak,all-year,13.39510000000,R1,3,MUS$2010/PJ,2045 +electricity,all-week,early-peak,all-year,8.65130000000,R1,3,MUS$2010/PJ,2045 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2045 -heat,all-week,early-peak,all-year,11.58400000000,R1,3,MUS$2010/PJ,2045 +heat,all-week,early-peak,all-year,3.70100000000,R1,3,MUS$2010/PJ,2045 CO2f,all-week,early-peak,all-year,0.35390000000,R1,3,MUS$2010/kt,2045 -electricity,all-week,late-peak,all-year,13.39510000000,R1,4,MUS$2010/PJ,2045 +electricity,all-week,late-peak,all-year,8.65130000000,R1,4,MUS$2010/PJ,2045 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2045 -heat,all-week,late-peak,all-year,11.58400000000,R1,4,MUS$2010/PJ,2045 +heat,all-week,late-peak,all-year,3.70100000000,R1,4,MUS$2010/PJ,2045 CO2f,all-week,late-peak,all-year,0.35390000000,R1,4,MUS$2010/kt,2045 -electricity,all-week,evening,all-year,13.39510000000,R1,5,MUS$2010/PJ,2045 +electricity,all-week,evening,all-year,8.65130000000,R1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2045 -heat,all-week,evening,all-year,11.58400000000,R1,5,MUS$2010/PJ,2045 +heat,all-week,evening,all-year,3.70100000000,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,12.72560000000,R1,0,MUS$2010/PJ,2050 +electricity,all-week,night,all-year,9.76820000000,R1,0,MUS$2010/PJ,2050 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,10.33070000000,R1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,4.14780000000,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,12.72560000000,R1,1,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,9.76820000000,R1,1,MUS$2010/PJ,2050 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,10.33070000000,R1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,4.14780000000,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,12.72560000000,R1,2,MUS$2010/PJ,2050 +electricity,all-week,afternoon,all-year,9.76820000000,R1,2,MUS$2010/PJ,2050 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,10.33070000000,R1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,4.14780000000,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,12.72560000000,R1,3,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,9.76820000000,R1,3,MUS$2010/PJ,2050 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,10.33070000000,R1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,4.14780000000,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,12.72560000000,R1,4,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,9.76820000000,R1,4,MUS$2010/PJ,2050 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,10.33070000000,R1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,4.14780000000,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,12.72560000000,R1,5,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,9.76820000000,R1,5,MUS$2010/PJ,2050 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,10.33070000000,R1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,4.14780000000,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/2-add-agent/2-multiple-objective/Results/Power/Capacity.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity.csv deleted file mode 100644 index 0e872a203..000000000 --- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity.csv +++ /dev/null @@ -1,36 +0,0 @@ -asset,capacity,installed,region,technology,year -0,1.00000000000,2020,R1,gasCCGT,2020 -0,2.02780000000,2020,R1,gasCCGT,2025 -2,2.31250000000,2020,R1,windturbine,2025 -0,1.02780000000,2020,R1,gasCCGT,2030 -1,3.19440000000,2025,R1,gasCCGT,2030 -2,2.31250000000,2020,R1,windturbine,2030 -3,7.18750000000,2025,R1,windturbine,2030 -0,1.02780000000,2020,R1,gasCCGT,2035 -1,3.19440000000,2025,R1,gasCCGT,2035 -3,2.31250000000,2020,R1,windturbine,2035 -4,7.18750000000,2025,R1,windturbine,2035 -5,0.37500000000,2030,R1,windturbine,2035 -0,1.02780000000,2020,R1,gasCCGT,2040 -1,3.19440000000,2025,R1,gasCCGT,2040 -2,0.41670000000,2035,R1,gasCCGT,2040 -3,2.31250000000,2020,R1,windturbine,2040 -4,7.18750000000,2025,R1,windturbine,2040 -5,0.37500000000,2030,R1,windturbine,2040 -6,2.18750000000,2035,R1,windturbine,2040 -0,1.02780000000,2020,R1,gasCCGT,2045 -1,3.19440000000,2025,R1,gasCCGT,2045 -2,0.41670000000,2035,R1,gasCCGT,2045 -3,2.31250000000,2020,R1,windturbine,2045 -4,7.18750000000,2025,R1,windturbine,2045 -5,0.37500000000,2030,R1,windturbine,2045 -6,2.18750000000,2035,R1,windturbine,2045 -7,6.00000000000,2040,R1,windturbine,2045 -0,1.02780000000,2020,R1,gasCCGT,2050 -1,3.19440000000,2025,R1,gasCCGT,2050 -2,0.41670000000,2035,R1,gasCCGT,2050 -5,7.18750000000,2025,R1,windturbine,2050 -6,0.37500000000,2030,R1,windturbine,2050 -7,2.18750000000,2035,R1,windturbine,2050 -8,6.00000000000,2040,R1,windturbine,2050 -9,11.06250000000,2045,R1,windturbine,2050 diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity.csv deleted file mode 100644 index 47c6a64eb..000000000 --- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity.csv +++ /dev/null @@ -1,23 +0,0 @@ -asset,capacity,installed,region,technology,year -0,10.00000000000,2020,R1,gasboiler,2020 -0,12.50000000000,2020,R1,gasboiler,2025 -2,11.50000000000,2020,R1,heatpump,2025 -0,7.50000000000,2020,R1,gasboiler,2030 -1,3.50000000000,2025,R1,gasboiler,2030 -3,11.50000000000,2020,R1,heatpump,2030 -4,7.50000000000,2025,R1,heatpump,2030 -1,3.50000000000,2025,R1,gasboiler,2035 -2,12.50000000000,2030,R1,gasboiler,2035 -5,7.50000000000,2025,R1,heatpump,2035 -6,12.50000000000,2030,R1,heatpump,2035 -2,12.50000000000,2030,R1,gasboiler,2040 -3,4.50000000000,2035,R1,gasboiler,2040 -7,12.50000000000,2030,R1,heatpump,2040 -8,12.50000000000,2035,R1,heatpump,2040 -3,4.50000000000,2035,R1,gasboiler,2045 -4,11.50000000000,2040,R1,gasboiler,2045 -8,12.50000000000,2035,R1,heatpump,2045 -9,19.50000000000,2040,R1,heatpump,2045 -4,11.50000000000,2040,R1,gasboiler,2050 -9,19.50000000000,2040,R1,heatpump,2050 -10,23.00000000000,2045,R1,heatpump,2050 diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply.csv deleted file mode 100644 index 2ad7c23b7..000000000 --- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply.csv +++ /dev/null @@ -1,199 +0,0 @@ -asset,commodity,day,hour,installed,month,region,supply,technology,timeslice,year -0,heat,all-week,night,2020,all-year,R1,1.00000000000,gasboiler,0,2020 -0,CO2f,all-week,night,2020,all-year,R1,64.71000000000,gasboiler,0,2020 -0,heat,all-week,morning,2020,all-year,R1,1.50000000000,gasboiler,1,2020 -0,CO2f,all-week,morning,2020,all-year,R1,97.06500000000,gasboiler,1,2020 -0,heat,all-week,afternoon,2020,all-year,R1,1.00000000000,gasboiler,2,2020 -0,CO2f,all-week,afternoon,2020,all-year,R1,64.71000000000,gasboiler,2,2020 -0,heat,all-week,early-peak,2020,all-year,R1,1.50000000000,gasboiler,3,2020 -0,CO2f,all-week,early-peak,2020,all-year,R1,97.06500000000,gasboiler,3,2020 -0,heat,all-week,late-peak,2020,all-year,R1,3.00000000000,gasboiler,4,2020 -0,CO2f,all-week,late-peak,2020,all-year,R1,194.13000000000,gasboiler,4,2020 -0,heat,all-week,evening,2020,all-year,R1,2.00000000000,gasboiler,5,2020 -0,CO2f,all-week,evening,2020,all-year,R1,129.42000000000,gasboiler,5,2020 -0,heat,all-week,night,2020,all-year,R1,0.69440000000,gasboiler,0,2025 -2,heat,all-week,night,2020,all-year,R1,0.63890000000,heatpump,0,2025 -0,CO2f,all-week,night,2020,all-year,R1,44.93750000000,gasboiler,0,2025 -0,heat,all-week,morning,2020,all-year,R1,1.04170000000,gasboiler,1,2025 -2,heat,all-week,morning,2020,all-year,R1,0.95830000000,heatpump,1,2025 -0,CO2f,all-week,morning,2020,all-year,R1,67.40620000000,gasboiler,1,2025 -0,heat,all-week,afternoon,2020,all-year,R1,0.69440000000,gasboiler,2,2025 -2,heat,all-week,afternoon,2020,all-year,R1,0.63890000000,heatpump,2,2025 -0,CO2f,all-week,afternoon,2020,all-year,R1,44.93750000000,gasboiler,2,2025 -0,heat,all-week,early-peak,2020,all-year,R1,1.04170000000,gasboiler,3,2025 -2,heat,all-week,early-peak,2020,all-year,R1,0.95830000000,heatpump,3,2025 -0,CO2f,all-week,early-peak,2020,all-year,R1,67.40620000000,gasboiler,3,2025 -0,heat,all-week,late-peak,2020,all-year,R1,2.08330000000,gasboiler,4,2025 -2,heat,all-week,late-peak,2020,all-year,R1,1.91670000000,heatpump,4,2025 -0,CO2f,all-week,late-peak,2020,all-year,R1,134.81250000000,gasboiler,4,2025 -0,heat,all-week,evening,2020,all-year,R1,1.38890000000,gasboiler,5,2025 -2,heat,all-week,evening,2020,all-year,R1,1.27780000000,heatpump,5,2025 -0,CO2f,all-week,evening,2020,all-year,R1,89.87500000000,gasboiler,5,2025 -0,heat,all-week,night,2020,all-year,R1,0.41670000000,gasboiler,0,2030 -1,heat,all-week,night,2025,all-year,R1,0.19440000000,gasboiler,0,2030 -3,heat,all-week,night,2020,all-year,R1,0.63890000000,heatpump,0,2030 -4,heat,all-week,night,2025,all-year,R1,0.41670000000,heatpump,0,2030 -0,CO2f,all-week,night,2020,all-year,R1,26.96250000000,gasboiler,0,2030 -1,CO2f,all-week,night,2025,all-year,R1,12.58250000000,gasboiler,0,2030 -0,heat,all-week,morning,2020,all-year,R1,0.62500000000,gasboiler,1,2030 -1,heat,all-week,morning,2025,all-year,R1,0.29170000000,gasboiler,1,2030 -3,heat,all-week,morning,2020,all-year,R1,0.95830000000,heatpump,1,2030 -4,heat,all-week,morning,2025,all-year,R1,0.62500000000,heatpump,1,2030 -0,CO2f,all-week,morning,2020,all-year,R1,40.44370000000,gasboiler,1,2030 -1,CO2f,all-week,morning,2025,all-year,R1,18.87370000000,gasboiler,1,2030 -0,heat,all-week,afternoon,2020,all-year,R1,0.41670000000,gasboiler,2,2030 -1,heat,all-week,afternoon,2025,all-year,R1,0.19440000000,gasboiler,2,2030 -3,heat,all-week,afternoon,2020,all-year,R1,0.63890000000,heatpump,2,2030 -4,heat,all-week,afternoon,2025,all-year,R1,0.41670000000,heatpump,2,2030 -0,CO2f,all-week,afternoon,2020,all-year,R1,26.96250000000,gasboiler,2,2030 -1,CO2f,all-week,afternoon,2025,all-year,R1,12.58250000000,gasboiler,2,2030 -0,heat,all-week,early-peak,2020,all-year,R1,0.62500000000,gasboiler,3,2030 -1,heat,all-week,early-peak,2025,all-year,R1,0.29170000000,gasboiler,3,2030 -3,heat,all-week,early-peak,2020,all-year,R1,0.95830000000,heatpump,3,2030 -4,heat,all-week,early-peak,2025,all-year,R1,0.62500000000,heatpump,3,2030 -0,CO2f,all-week,early-peak,2020,all-year,R1,40.44370000000,gasboiler,3,2030 -1,CO2f,all-week,early-peak,2025,all-year,R1,18.87370000000,gasboiler,3,2030 -0,heat,all-week,late-peak,2020,all-year,R1,1.25000000000,gasboiler,4,2030 -1,heat,all-week,late-peak,2025,all-year,R1,0.58330000000,gasboiler,4,2030 -3,heat,all-week,late-peak,2020,all-year,R1,1.91670000000,heatpump,4,2030 -4,heat,all-week,late-peak,2025,all-year,R1,1.25000000000,heatpump,4,2030 -0,CO2f,all-week,late-peak,2020,all-year,R1,80.88750000000,gasboiler,4,2030 -1,CO2f,all-week,late-peak,2025,all-year,R1,37.74750000000,gasboiler,4,2030 -0,heat,all-week,evening,2020,all-year,R1,0.83330000000,gasboiler,5,2030 -1,heat,all-week,evening,2025,all-year,R1,0.38890000000,gasboiler,5,2030 -3,heat,all-week,evening,2020,all-year,R1,1.27780000000,heatpump,5,2030 -4,heat,all-week,evening,2025,all-year,R1,0.83330000000,heatpump,5,2030 -0,CO2f,all-week,evening,2020,all-year,R1,53.92500000000,gasboiler,5,2030 -1,CO2f,all-week,evening,2025,all-year,R1,25.16500000000,gasboiler,5,2030 -1,heat,all-week,night,2025,all-year,R1,0.19440000000,gasboiler,0,2035 -2,heat,all-week,night,2030,all-year,R1,0.69440000000,gasboiler,0,2035 -5,heat,all-week,night,2025,all-year,R1,0.41670000000,heatpump,0,2035 -6,heat,all-week,night,2030,all-year,R1,0.69440000000,heatpump,0,2035 -1,CO2f,all-week,night,2025,all-year,R1,12.58250000000,gasboiler,0,2035 -2,CO2f,all-week,night,2030,all-year,R1,44.93750000000,gasboiler,0,2035 -1,heat,all-week,morning,2025,all-year,R1,0.29170000000,gasboiler,1,2035 -2,heat,all-week,morning,2030,all-year,R1,1.04170000000,gasboiler,1,2035 -5,heat,all-week,morning,2025,all-year,R1,0.62500000000,heatpump,1,2035 -6,heat,all-week,morning,2030,all-year,R1,1.04170000000,heatpump,1,2035 -1,CO2f,all-week,morning,2025,all-year,R1,18.87370000000,gasboiler,1,2035 -2,CO2f,all-week,morning,2030,all-year,R1,67.40630000000,gasboiler,1,2035 -1,heat,all-week,afternoon,2025,all-year,R1,0.19440000000,gasboiler,2,2035 -2,heat,all-week,afternoon,2030,all-year,R1,0.69440000000,gasboiler,2,2035 -5,heat,all-week,afternoon,2025,all-year,R1,0.41670000000,heatpump,2,2035 -6,heat,all-week,afternoon,2030,all-year,R1,0.69440000000,heatpump,2,2035 -1,CO2f,all-week,afternoon,2025,all-year,R1,12.58250000000,gasboiler,2,2035 -2,CO2f,all-week,afternoon,2030,all-year,R1,44.93750000000,gasboiler,2,2035 -1,heat,all-week,early-peak,2025,all-year,R1,0.29170000000,gasboiler,3,2035 -2,heat,all-week,early-peak,2030,all-year,R1,1.04170000000,gasboiler,3,2035 -5,heat,all-week,early-peak,2025,all-year,R1,0.62500000000,heatpump,3,2035 -6,heat,all-week,early-peak,2030,all-year,R1,1.04170000000,heatpump,3,2035 -1,CO2f,all-week,early-peak,2025,all-year,R1,18.87370000000,gasboiler,3,2035 -2,CO2f,all-week,early-peak,2030,all-year,R1,67.40630000000,gasboiler,3,2035 -1,heat,all-week,late-peak,2025,all-year,R1,0.58330000000,gasboiler,4,2035 -2,heat,all-week,late-peak,2030,all-year,R1,2.08330000000,gasboiler,4,2035 -5,heat,all-week,late-peak,2025,all-year,R1,1.25000000000,heatpump,4,2035 -6,heat,all-week,late-peak,2030,all-year,R1,2.08330000000,heatpump,4,2035 -1,CO2f,all-week,late-peak,2025,all-year,R1,37.74750000000,gasboiler,4,2035 -2,CO2f,all-week,late-peak,2030,all-year,R1,134.81250000000,gasboiler,4,2035 -1,heat,all-week,evening,2025,all-year,R1,0.38890000000,gasboiler,5,2035 -2,heat,all-week,evening,2030,all-year,R1,1.38890000000,gasboiler,5,2035 -5,heat,all-week,evening,2025,all-year,R1,0.83330000000,heatpump,5,2035 -6,heat,all-week,evening,2030,all-year,R1,1.38890000000,heatpump,5,2035 -1,CO2f,all-week,evening,2025,all-year,R1,25.16500000000,gasboiler,5,2035 -2,CO2f,all-week,evening,2030,all-year,R1,89.87500000000,gasboiler,5,2035 -2,heat,all-week,night,2030,all-year,R1,0.69440000000,gasboiler,0,2040 -3,heat,all-week,night,2035,all-year,R1,0.25000000000,gasboiler,0,2040 -7,heat,all-week,night,2030,all-year,R1,0.69440000000,heatpump,0,2040 -8,heat,all-week,night,2035,all-year,R1,0.69440000000,heatpump,0,2040 -2,CO2f,all-week,night,2030,all-year,R1,44.93750000000,gasboiler,0,2040 -3,CO2f,all-week,night,2035,all-year,R1,16.17750000000,gasboiler,0,2040 -2,heat,all-week,morning,2030,all-year,R1,1.04170000000,gasboiler,1,2040 -3,heat,all-week,morning,2035,all-year,R1,0.37500000000,gasboiler,1,2040 -7,heat,all-week,morning,2030,all-year,R1,1.04170000000,heatpump,1,2040 -8,heat,all-week,morning,2035,all-year,R1,1.04170000000,heatpump,1,2040 -2,CO2f,all-week,morning,2030,all-year,R1,67.40630000000,gasboiler,1,2040 -3,CO2f,all-week,morning,2035,all-year,R1,24.26620000000,gasboiler,1,2040 -2,heat,all-week,afternoon,2030,all-year,R1,0.69440000000,gasboiler,2,2040 -3,heat,all-week,afternoon,2035,all-year,R1,0.25000000000,gasboiler,2,2040 -7,heat,all-week,afternoon,2030,all-year,R1,0.69440000000,heatpump,2,2040 -8,heat,all-week,afternoon,2035,all-year,R1,0.69440000000,heatpump,2,2040 -2,CO2f,all-week,afternoon,2030,all-year,R1,44.93750000000,gasboiler,2,2040 -3,CO2f,all-week,afternoon,2035,all-year,R1,16.17750000000,gasboiler,2,2040 -2,heat,all-week,early-peak,2030,all-year,R1,1.04170000000,gasboiler,3,2040 -3,heat,all-week,early-peak,2035,all-year,R1,0.37500000000,gasboiler,3,2040 -7,heat,all-week,early-peak,2030,all-year,R1,1.04170000000,heatpump,3,2040 -8,heat,all-week,early-peak,2035,all-year,R1,1.04170000000,heatpump,3,2040 -2,CO2f,all-week,early-peak,2030,all-year,R1,67.40630000000,gasboiler,3,2040 -3,CO2f,all-week,early-peak,2035,all-year,R1,24.26620000000,gasboiler,3,2040 -2,heat,all-week,late-peak,2030,all-year,R1,2.08330000000,gasboiler,4,2040 -3,heat,all-week,late-peak,2035,all-year,R1,0.75000000000,gasboiler,4,2040 -7,heat,all-week,late-peak,2030,all-year,R1,2.08330000000,heatpump,4,2040 -8,heat,all-week,late-peak,2035,all-year,R1,2.08330000000,heatpump,4,2040 -2,CO2f,all-week,late-peak,2030,all-year,R1,134.81250000000,gasboiler,4,2040 -3,CO2f,all-week,late-peak,2035,all-year,R1,48.53250000000,gasboiler,4,2040 -2,heat,all-week,evening,2030,all-year,R1,1.38890000000,gasboiler,5,2040 -3,heat,all-week,evening,2035,all-year,R1,0.50000000000,gasboiler,5,2040 -7,heat,all-week,evening,2030,all-year,R1,1.38890000000,heatpump,5,2040 -8,heat,all-week,evening,2035,all-year,R1,1.38890000000,heatpump,5,2040 -2,CO2f,all-week,evening,2030,all-year,R1,89.87500000000,gasboiler,5,2040 -3,CO2f,all-week,evening,2035,all-year,R1,32.35500000000,gasboiler,5,2040 -3,heat,all-week,night,2035,all-year,R1,0.25000000000,gasboiler,0,2045 -4,heat,all-week,night,2040,all-year,R1,0.63890000000,gasboiler,0,2045 -8,heat,all-week,night,2035,all-year,R1,0.69440000000,heatpump,0,2045 -9,heat,all-week,night,2040,all-year,R1,1.08330000000,heatpump,0,2045 -3,CO2f,all-week,night,2035,all-year,R1,16.17750000000,gasboiler,0,2045 -4,CO2f,all-week,night,2040,all-year,R1,41.34250000000,gasboiler,0,2045 -3,heat,all-week,morning,2035,all-year,R1,0.37500000000,gasboiler,1,2045 -4,heat,all-week,morning,2040,all-year,R1,0.95830000000,gasboiler,1,2045 -8,heat,all-week,morning,2035,all-year,R1,1.04170000000,heatpump,1,2045 -9,heat,all-week,morning,2040,all-year,R1,1.62500000000,heatpump,1,2045 -3,CO2f,all-week,morning,2035,all-year,R1,24.26620000000,gasboiler,1,2045 -4,CO2f,all-week,morning,2040,all-year,R1,62.01380000000,gasboiler,1,2045 -3,heat,all-week,afternoon,2035,all-year,R1,0.25000000000,gasboiler,2,2045 -4,heat,all-week,afternoon,2040,all-year,R1,0.63890000000,gasboiler,2,2045 -8,heat,all-week,afternoon,2035,all-year,R1,0.69440000000,heatpump,2,2045 -9,heat,all-week,afternoon,2040,all-year,R1,1.08330000000,heatpump,2,2045 -3,CO2f,all-week,afternoon,2035,all-year,R1,16.17750000000,gasboiler,2,2045 -4,CO2f,all-week,afternoon,2040,all-year,R1,41.34250000000,gasboiler,2,2045 -3,heat,all-week,early-peak,2035,all-year,R1,0.37500000000,gasboiler,3,2045 -4,heat,all-week,early-peak,2040,all-year,R1,0.95830000000,gasboiler,3,2045 -8,heat,all-week,early-peak,2035,all-year,R1,1.04170000000,heatpump,3,2045 -9,heat,all-week,early-peak,2040,all-year,R1,1.62500000000,heatpump,3,2045 -3,CO2f,all-week,early-peak,2035,all-year,R1,24.26620000000,gasboiler,3,2045 -4,CO2f,all-week,early-peak,2040,all-year,R1,62.01380000000,gasboiler,3,2045 -3,heat,all-week,late-peak,2035,all-year,R1,0.75000000000,gasboiler,4,2045 -4,heat,all-week,late-peak,2040,all-year,R1,1.91670000000,gasboiler,4,2045 -8,heat,all-week,late-peak,2035,all-year,R1,2.08330000000,heatpump,4,2045 -9,heat,all-week,late-peak,2040,all-year,R1,3.25000000000,heatpump,4,2045 -3,CO2f,all-week,late-peak,2035,all-year,R1,48.53250000000,gasboiler,4,2045 -4,CO2f,all-week,late-peak,2040,all-year,R1,124.02750000000,gasboiler,4,2045 -3,heat,all-week,evening,2035,all-year,R1,0.50000000000,gasboiler,5,2045 -4,heat,all-week,evening,2040,all-year,R1,1.27780000000,gasboiler,5,2045 -8,heat,all-week,evening,2035,all-year,R1,1.38890000000,heatpump,5,2045 -9,heat,all-week,evening,2040,all-year,R1,2.16670000000,heatpump,5,2045 -3,CO2f,all-week,evening,2035,all-year,R1,32.35500000000,gasboiler,5,2045 -4,CO2f,all-week,evening,2040,all-year,R1,82.68500000000,gasboiler,5,2045 -4,heat,all-week,night,2040,all-year,R1,0.63890000000,gasboiler,0,2050 -9,heat,all-week,night,2040,all-year,R1,1.08330000000,heatpump,0,2050 -10,heat,all-week,night,2045,all-year,R1,1.27780000000,heatpump,0,2050 -4,CO2f,all-week,night,2040,all-year,R1,41.34250000000,gasboiler,0,2050 -4,heat,all-week,morning,2040,all-year,R1,0.95830000000,gasboiler,1,2050 -9,heat,all-week,morning,2040,all-year,R1,1.62500000000,heatpump,1,2050 -10,heat,all-week,morning,2045,all-year,R1,1.91670000000,heatpump,1,2050 -4,CO2f,all-week,morning,2040,all-year,R1,62.01380000000,gasboiler,1,2050 -4,heat,all-week,afternoon,2040,all-year,R1,0.63890000000,gasboiler,2,2050 -9,heat,all-week,afternoon,2040,all-year,R1,1.08330000000,heatpump,2,2050 -10,heat,all-week,afternoon,2045,all-year,R1,1.27780000000,heatpump,2,2050 -4,CO2f,all-week,afternoon,2040,all-year,R1,41.34250000000,gasboiler,2,2050 -4,heat,all-week,early-peak,2040,all-year,R1,0.95830000000,gasboiler,3,2050 -9,heat,all-week,early-peak,2040,all-year,R1,1.62500000000,heatpump,3,2050 -10,heat,all-week,early-peak,2045,all-year,R1,1.91670000000,heatpump,3,2050 -4,CO2f,all-week,early-peak,2040,all-year,R1,62.01380000000,gasboiler,3,2050 -4,heat,all-week,late-peak,2040,all-year,R1,1.91670000000,gasboiler,4,2050 -9,heat,all-week,late-peak,2040,all-year,R1,3.25000000000,heatpump,4,2050 -10,heat,all-week,late-peak,2045,all-year,R1,3.83330000000,heatpump,4,2050 -4,CO2f,all-week,late-peak,2040,all-year,R1,124.02750000000,gasboiler,4,2050 -4,heat,all-week,evening,2040,all-year,R1,1.27780000000,gasboiler,5,2050 -9,heat,all-week,evening,2040,all-year,R1,2.16670000000,heatpump,5,2050 -10,heat,all-week,evening,2045,all-year,R1,2.55560000000,heatpump,5,2050 -4,CO2f,all-week,evening,2040,all-year,R1,82.68500000000,gasboiler,5,2050 diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/settings.toml b/docs/tutorial-code/2-add-agent/2-multiple-objective/settings.toml index 9d851f603..65f5261dc 100644 --- a/docs/tutorial-code/2-add-agent/2-multiple-objective/settings.toml +++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/settings.toml @@ -14,12 +14,12 @@ tolerance = 0.1 tolerance_unmet_demand = -0.1 [[outputs]] -quantity = "prices" +quantity = "capacity" sink = "aggregate" filename = "{cwd}/{default_output_dir}/MCA{Quantity}.csv" [[outputs]] -quantity = "capacity" +quantity = "prices" sink = "aggregate" filename = "{cwd}/{default_output_dir}/MCA{Quantity}.csv" @@ -55,18 +55,6 @@ constraints = [ demand_share = "standard_demand" # Optional, default to standard_demand forecast = 5 # Optional, defaults to 5 -[[sectors.residential.outputs]] -filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}.csv' -quantity = "capacity" -sink = 'aggregate' - -[[sectors.residential.outputs]] -filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}.csv' -sink = 'aggregate' -quantity.name = "supply" -quantity.sum_over = "timeslice" -quantity.drop = ["comm_usage", "units_prices"] - [sectors.power] type = 'default' priority = 2 @@ -81,11 +69,6 @@ existing_capacity = '{path}/technodata/power/ExistingCapacity.csv' lpsolver = "scipy" demand_share = "standard_demand" -[[sectors.power.outputs]] -filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}.csv' -quantity = "capacity" -sink = 'aggregate' - [sectors.gas] type = 'default' priority = 3 @@ -100,11 +83,6 @@ existing_capacity = '{path}/technodata/gas/ExistingCapacity.csv' lpsolver = "scipy" demand_share = "standard_demand" -[[sectors.gas.outputs]] -filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}.csv' -quantity = "capacity" -sink = 'aggregate' - [sectors.residential_presets] type = 'presets' priority = 0 diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/technodata/gas/Technodata.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/technodata/gas/Technodata.csv index 99e05abc1..60477a91d 100644 --- a/docs/tutorial-code/2-add-agent/2-multiple-objective/technodata/gas/Technodata.csv +++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/technodata/gas/Technodata.csv @@ -1,3 +1,3 @@ ProcessName,RegionName,Time,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent1,Agent2 Unit,-,Year,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,New,New -gassupply1,R1,2020,0,1,0,1,2.55,1,5,1,60,35,0.9,0.00000189,86,0.1,energy,gas,gas,0.5,0.5 +gassupply1,R1,2020,0,1,0,1,2.55,1,10,1,100,35,0.9,0.00000189,86,0.1,energy,gas,gas,0.5,0.5 diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/technodata/power/Technodata.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/technodata/power/Technodata.csv index 7489bc368..6c300fde3 100644 --- a/docs/tutorial-code/2-add-agent/2-multiple-objective/technodata/power/Technodata.csv +++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/technodata/power/Technodata.csv @@ -1,4 +1,4 @@ ProcessName,RegionName,Time,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent1,Agent2 Unit,-,Year,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,New,New -gasCCGT,R1,2020,23.78234399,1,0,1,0,1,2,1,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,0.5,0.5 -windturbine,R1,2020,36.30771182,1,0,1,0,1,2,1,60,25,0.4,0.00000189,86,0.1,energy,wind,electricity,0.5,0.5 +gasCCGT,R1,2020,23.78234399,1,0,1,0,1,10,1,100,35,0.9,0.00000189,86,0.1,energy,gas,electricity,0.5,0.5 +windturbine,R1,2020,36.30771182,1,0,1,0,1,10,1,100,25,0.4,0.00000189,86,0.1,energy,wind,electricity,0.5,0.5 diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/technodata/residential/Technodata.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/technodata/residential/Technodata.csv index b69168ca7..84e909b49 100644 --- a/docs/tutorial-code/2-add-agent/2-multiple-objective/technodata/residential/Technodata.csv +++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/technodata/residential/Technodata.csv @@ -1,4 +1,4 @@ ProcessName,RegionName,Time,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent1,Agent2 Unit,-,Year,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,New,New -gasboiler,R1,2020,3.8,1,0,1,0,1,10,0.2,60,10,1,0.00000189,86,0.1,energy,gas,heat,0.5,0.5 -heatpump,R1,2020,8.866667,1,0,1,0,1,10,0.2,60,10,1,0.00000189,86,0.1,energy,electricity,heat,0.5,0.5 +gasboiler,R1,2020,3.8,1,0,1,0,1,10,1,100,10,1,0.00000189,86,0.1,energy,gas,heat,0.5,0.5 +heatpump,R1,2020,8.866667,1,0,1,0,1,10,1,100,10,1,0.00000189,86,0.1,energy,electricity,heat,0.5,0.5 diff --git a/docs/tutorial-code/3-add-region/1-new-region/Results/Gas/Capacity.csv b/docs/tutorial-code/3-add-region/1-new-region/Results/Gas/Capacity.csv deleted file mode 100644 index 07daecef1..000000000 --- a/docs/tutorial-code/3-add-region/1-new-region/Results/Gas/Capacity.csv +++ /dev/null @@ -1,33 +0,0 @@ -asset,capacity,installed,region,technology,year -0,15.00000000000,2020,R1,gassupply1,2020 -1,15.00000000000,2020,R2,gassupply1,2020 -0,16.46440000000,2020,R1,gassupply1,2025 -2,16.46440000000,2020,R2,gassupply1,2025 -0,8.96440000000,2020,R1,gassupply1,2030 -1,9.22000000000,2025,R1,gassupply1,2030 -3,8.96440000000,2020,R2,gassupply1,2030 -4,9.22000000000,2025,R2,gassupply1,2030 -0,1.46440000000,2020,R1,gassupply1,2035 -1,9.22000000000,2025,R1,gassupply1,2035 -2,7.50000000000,2030,R1,gassupply1,2035 -3,1.46440000000,2020,R2,gassupply1,2035 -4,9.22000000000,2025,R2,gassupply1,2035 -5,7.50000000000,2030,R2,gassupply1,2035 -0,1.46440000000,2020,R1,gassupply1,2040 -1,9.22000000000,2025,R1,gassupply1,2040 -2,7.50000000000,2030,R1,gassupply1,2040 -3,1.46440000000,2020,R2,gassupply1,2040 -4,9.22000000000,2025,R2,gassupply1,2040 -5,7.50000000000,2030,R2,gassupply1,2040 -0,1.46440000000,2020,R1,gassupply1,2045 -1,9.22000000000,2025,R1,gassupply1,2045 -2,7.50000000000,2030,R1,gassupply1,2045 -3,1.46440000000,2020,R2,gassupply1,2045 -4,9.22000000000,2025,R2,gassupply1,2045 -5,7.50000000000,2030,R2,gassupply1,2045 -0,1.46440000000,2020,R1,gassupply1,2050 -1,9.22000000000,2025,R1,gassupply1,2050 -2,7.50000000000,2030,R1,gassupply1,2050 -3,1.46440000000,2020,R2,gassupply1,2050 -4,9.22000000000,2025,R2,gassupply1,2050 -5,7.50000000000,2030,R2,gassupply1,2050 diff --git a/docs/tutorial-code/3-add-region/1-new-region/Results/MCACapacity.csv b/docs/tutorial-code/3-add-region/1-new-region/Results/MCACapacity.csv index 7526a7017..8dee5e361 100644 --- a/docs/tutorial-code/3-add-region/1-new-region/Results/MCACapacity.csv +++ b/docs/tutorial-code/3-add-region/1-new-region/Results/MCACapacity.csv @@ -10,106 +10,121 @@ A1,19.00000000000,R1,2020,R1,residential,heatpump,newcapa,2025 A1,5.00000000000,R2,2020,R2,residential,gasboiler,newcapa,2025 A1,19.00000000000,R2,2020,R2,residential,heatpump,newcapa,2025 A1,6.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2025 -A1,5.50000000000,R1,2020,R1,power,windturbine,newcapa,2025 +A1,5.00000000000,R1,2020,R1,power,windturbine,newcapa,2025 A1,6.00000000000,R2,2020,R2,power,gasCCGT,newcapa,2025 -A1,5.50000000000,R2,2020,R2,power,windturbine,newcapa,2025 -A1,16.46440000000,R1,2020,R1,gas,gassupply1,newcapa,2025 -A1,16.46440000000,R2,2020,R2,gas,gassupply1,newcapa,2025 +A1,5.00000000000,R2,2020,R2,power,windturbine,newcapa,2025 +A1,16.73530000000,R1,2020,R1,gas,gassupply1,newcapa,2025 +A1,16.73530000000,R2,2020,R2,gas,gassupply1,newcapa,2025 A1,19.00000000000,R1,2020,R1,residential,heatpump,newcapa,2030 A1,10.00000000000,R1,2025,R1,residential,heatpump,newcapa,2030 +A1,9.00000000000,R2,2025,R2,residential,gasboiler,newcapa,2030 A1,19.00000000000,R2,2020,R2,residential,heatpump,newcapa,2030 -A1,10.00000000000,R2,2025,R2,residential,heatpump,newcapa,2030 +A1,1.00000000000,R2,2025,R2,residential,heatpump,newcapa,2030 A1,5.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2030 -A1,5.88890000000,R1,2025,R1,power,gasCCGT,newcapa,2030 -A1,5.50000000000,R1,2020,R1,power,windturbine,newcapa,2030 +A1,4.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2030 +A1,5.00000000000,R1,2020,R1,power,windturbine,newcapa,2030 A1,5.00000000000,R2,2020,R2,power,gasCCGT,newcapa,2030 -A1,5.88890000000,R2,2025,R2,power,gasCCGT,newcapa,2030 -A1,5.50000000000,R2,2020,R2,power,windturbine,newcapa,2030 -A1,8.96440000000,R1,2020,R1,gas,gassupply1,newcapa,2030 -A1,9.22000000000,R1,2025,R1,gas,gassupply1,newcapa,2030 -A1,8.96440000000,R2,2020,R2,gas,gassupply1,newcapa,2030 -A1,9.22000000000,R2,2025,R2,gas,gassupply1,newcapa,2030 +A1,4.00000000000,R2,2025,R2,power,gasCCGT,newcapa,2030 +A1,5.00000000000,R2,2020,R2,power,windturbine,newcapa,2030 +A1,9.23530000000,R1,2020,R1,gas,gassupply1,newcapa,2030 +A1,11.85120000000,R1,2025,R1,gas,gassupply1,newcapa,2030 +A1,9.23530000000,R2,2020,R2,gas,gassupply1,newcapa,2030 +A1,11.85120000000,R2,2025,R2,gas,gassupply1,newcapa,2030 A1,10.00000000000,R1,2025,R1,residential,heatpump,newcapa,2035 A1,26.00000000000,R1,2030,R1,residential,heatpump,newcapa,2035 -A1,10.00000000000,R2,2025,R2,residential,heatpump,newcapa,2035 -A1,26.00000000000,R2,2030,R2,residential,heatpump,newcapa,2035 +A1,9.00000000000,R2,2025,R2,residential,gasboiler,newcapa,2035 +A1,6.00000000000,R2,2030,R2,residential,gasboiler,newcapa,2035 +A1,1.00000000000,R2,2025,R2,residential,heatpump,newcapa,2035 +A1,19.00000000000,R2,2030,R2,residential,heatpump,newcapa,2035 A1,5.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2035 -A1,5.88890000000,R1,2025,R1,power,gasCCGT,newcapa,2035 -A1,6.00000000000,R1,2030,R1,power,solarPV,newcapa,2035 -A1,5.50000000000,R1,2020,R1,power,windturbine,newcapa,2035 +A1,4.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2035 +A1,5.00000000000,R1,2020,R1,power,windturbine,newcapa,2035 +A1,3.00000000000,R1,2030,R1,power,windturbine,newcapa,2035 A1,5.00000000000,R2,2020,R2,power,gasCCGT,newcapa,2035 -A1,5.88890000000,R2,2025,R2,power,gasCCGT,newcapa,2035 -A1,6.00000000000,R2,2030,R2,power,solarPV,newcapa,2035 -A1,5.50000000000,R2,2020,R2,power,windturbine,newcapa,2035 -A1,1.46440000000,R1,2020,R1,gas,gassupply1,newcapa,2035 -A1,9.22000000000,R1,2025,R1,gas,gassupply1,newcapa,2035 -A1,7.50000000000,R1,2030,R1,gas,gassupply1,newcapa,2035 -A1,1.46440000000,R2,2020,R2,gas,gassupply1,newcapa,2035 -A1,9.22000000000,R2,2025,R2,gas,gassupply1,newcapa,2035 -A1,7.50000000000,R2,2030,R2,gas,gassupply1,newcapa,2035 +A1,4.00000000000,R2,2025,R2,power,gasCCGT,newcapa,2035 +A1,5.00000000000,R2,2020,R2,power,windturbine,newcapa,2035 +A1,3.00000000000,R2,2030,R2,power,windturbine,newcapa,2035 +A1,1.73530000000,R1,2020,R1,gas,gassupply1,newcapa,2035 +A1,11.85120000000,R1,2025,R1,gas,gassupply1,newcapa,2035 +A1,11.32320000000,R1,2030,R1,gas,gassupply1,newcapa,2035 +A1,1.73530000000,R2,2020,R2,gas,gassupply1,newcapa,2035 +A1,11.85120000000,R2,2025,R2,gas,gassupply1,newcapa,2035 +A1,11.32320000000,R2,2030,R2,gas,gassupply1,newcapa,2035 A1,26.00000000000,R1,2030,R1,residential,heatpump,newcapa,2040 A1,16.00000000000,R1,2035,R1,residential,heatpump,newcapa,2040 -A1,26.00000000000,R2,2030,R2,residential,heatpump,newcapa,2040 -A1,16.00000000000,R2,2035,R2,residential,heatpump,newcapa,2040 +A1,6.00000000000,R2,2030,R2,residential,gasboiler,newcapa,2040 +A1,16.00000000000,R2,2035,R2,residential,gasboiler,newcapa,2040 +A1,19.00000000000,R2,2030,R2,residential,heatpump,newcapa,2040 +A1,1.00000000000,R2,2035,R2,residential,heatpump,newcapa,2040 A1,5.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2040 -A1,5.88890000000,R1,2025,R1,power,gasCCGT,newcapa,2040 -A1,6.00000000000,R1,2030,R1,power,solarPV,newcapa,2040 -A1,6.00000000000,R1,2035,R1,power,solarPV,newcapa,2040 -A1,5.50000000000,R1,2020,R1,power,windturbine,newcapa,2040 +A1,4.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2040 +A1,5.00000000000,R1,2020,R1,power,windturbine,newcapa,2040 +A1,3.00000000000,R1,2030,R1,power,windturbine,newcapa,2040 +A1,2.00000000000,R1,2035,R1,power,windturbine,newcapa,2040 A1,5.00000000000,R2,2020,R2,power,gasCCGT,newcapa,2040 -A1,5.88890000000,R2,2025,R2,power,gasCCGT,newcapa,2040 -A1,6.00000000000,R2,2030,R2,power,solarPV,newcapa,2040 -A1,6.00000000000,R2,2035,R2,power,solarPV,newcapa,2040 -A1,5.50000000000,R2,2020,R2,power,windturbine,newcapa,2040 -A1,1.46440000000,R1,2020,R1,gas,gassupply1,newcapa,2040 -A1,9.22000000000,R1,2025,R1,gas,gassupply1,newcapa,2040 -A1,7.50000000000,R1,2030,R1,gas,gassupply1,newcapa,2040 -A1,1.46440000000,R2,2020,R2,gas,gassupply1,newcapa,2040 -A1,9.22000000000,R2,2025,R2,gas,gassupply1,newcapa,2040 -A1,7.50000000000,R2,2030,R2,gas,gassupply1,newcapa,2040 +A1,4.00000000000,R2,2025,R2,power,gasCCGT,newcapa,2040 +A1,5.00000000000,R2,2020,R2,power,windturbine,newcapa,2040 +A1,3.00000000000,R2,2030,R2,power,windturbine,newcapa,2040 +A1,2.00000000000,R2,2035,R2,power,windturbine,newcapa,2040 +A1,1.73530000000,R1,2020,R1,gas,gassupply1,newcapa,2040 +A1,11.85120000000,R1,2025,R1,gas,gassupply1,newcapa,2040 +A1,11.32320000000,R1,2030,R1,gas,gassupply1,newcapa,2040 +A1,9.34160000000,R1,2035,R1,gas,gassupply1,newcapa,2040 +A1,1.73530000000,R2,2020,R2,gas,gassupply1,newcapa,2040 +A1,11.85120000000,R2,2025,R2,gas,gassupply1,newcapa,2040 +A1,11.32320000000,R2,2030,R2,gas,gassupply1,newcapa,2040 +A1,9.34160000000,R2,2035,R2,gas,gassupply1,newcapa,2040 A1,16.00000000000,R1,2035,R1,residential,heatpump,newcapa,2045 A1,32.00000000000,R1,2040,R1,residential,heatpump,newcapa,2045 -A1,16.00000000000,R2,2035,R2,residential,heatpump,newcapa,2045 -A1,32.00000000000,R2,2040,R2,residential,heatpump,newcapa,2045 +A1,16.00000000000,R2,2035,R2,residential,gasboiler,newcapa,2045 +A1,12.00000000000,R2,2040,R2,residential,gasboiler,newcapa,2045 +A1,1.00000000000,R2,2035,R2,residential,heatpump,newcapa,2045 +A1,19.00000000000,R2,2040,R2,residential,heatpump,newcapa,2045 A1,5.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2045 -A1,5.88890000000,R1,2025,R1,power,gasCCGT,newcapa,2045 -A1,6.00000000000,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,5.50000000000,R1,2020,R1,power,windturbine,newcapa,2045 +A1,4.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2045 +A1,5.00000000000,R1,2020,R1,power,windturbine,newcapa,2045 +A1,3.00000000000,R1,2030,R1,power,windturbine,newcapa,2045 +A1,2.00000000000,R1,2035,R1,power,windturbine,newcapa,2045 +A1,3.00000000000,R1,2040,R1,power,windturbine,newcapa,2045 A1,5.00000000000,R2,2020,R2,power,gasCCGT,newcapa,2045 -A1,5.88890000000,R2,2025,R2,power,gasCCGT,newcapa,2045 -A1,6.00000000000,R2,2030,R2,power,solarPV,newcapa,2045 -A1,6.00000000000,R2,2035,R2,power,solarPV,newcapa,2045 -A1,6.00000000000,R2,2040,R2,power,solarPV,newcapa,2045 -A1,5.50000000000,R2,2020,R2,power,windturbine,newcapa,2045 -A1,1.46440000000,R1,2020,R1,gas,gassupply1,newcapa,2045 -A1,9.22000000000,R1,2025,R1,gas,gassupply1,newcapa,2045 -A1,7.50000000000,R1,2030,R1,gas,gassupply1,newcapa,2045 -A1,1.46440000000,R2,2020,R2,gas,gassupply1,newcapa,2045 -A1,9.22000000000,R2,2025,R2,gas,gassupply1,newcapa,2045 -A1,7.50000000000,R2,2030,R2,gas,gassupply1,newcapa,2045 +A1,4.00000000000,R2,2025,R2,power,gasCCGT,newcapa,2045 +A1,5.00000000000,R2,2020,R2,power,windturbine,newcapa,2045 +A1,3.00000000000,R2,2030,R2,power,windturbine,newcapa,2045 +A1,2.00000000000,R2,2035,R2,power,windturbine,newcapa,2045 +A1,3.00000000000,R2,2040,R2,power,windturbine,newcapa,2045 +A1,1.73530000000,R1,2020,R1,gas,gassupply1,newcapa,2045 +A1,11.85120000000,R1,2025,R1,gas,gassupply1,newcapa,2045 +A1,11.32320000000,R1,2030,R1,gas,gassupply1,newcapa,2045 +A1,9.34160000000,R1,2035,R1,gas,gassupply1,newcapa,2045 +A1,1.73530000000,R2,2020,R2,gas,gassupply1,newcapa,2045 +A1,11.85120000000,R2,2025,R2,gas,gassupply1,newcapa,2045 +A1,11.32320000000,R2,2030,R2,gas,gassupply1,newcapa,2045 +A1,9.34160000000,R2,2035,R2,gas,gassupply1,newcapa,2045 A1,32.00000000000,R1,2040,R1,residential,heatpump,newcapa,2050 A1,22.00000000000,R1,2045,R1,residential,heatpump,newcapa,2050 -A1,32.00000000000,R2,2040,R2,residential,heatpump,newcapa,2050 -A1,22.00000000000,R2,2045,R2,residential,heatpump,newcapa,2050 +A1,12.00000000000,R2,2040,R2,residential,gasboiler,newcapa,2050 +A1,22.00000000000,R2,2045,R2,residential,gasboiler,newcapa,2050 +A1,19.00000000000,R2,2040,R2,residential,heatpump,newcapa,2050 +A1,1.00000000000,R2,2045,R2,residential,heatpump,newcapa,2050 A1,5.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2050 -A1,5.88890000000,R1,2025,R1,power,gasCCGT,newcapa,2050 -A1,6.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,10.00000000000,R1,2045,R1,power,solarPV,newcapa,2050 -A1,1.50000000000,R1,2045,R1,power,windturbine,newcapa,2050 +A1,4.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2050 +A1,3.00000000000,R1,2030,R1,power,windturbine,newcapa,2050 +A1,2.00000000000,R1,2035,R1,power,windturbine,newcapa,2050 +A1,3.00000000000,R1,2040,R1,power,windturbine,newcapa,2050 +A1,8.00000000000,R1,2045,R1,power,windturbine,newcapa,2050 A1,5.00000000000,R2,2020,R2,power,gasCCGT,newcapa,2050 -A1,5.88890000000,R2,2025,R2,power,gasCCGT,newcapa,2050 -A1,6.00000000000,R2,2030,R2,power,solarPV,newcapa,2050 -A1,6.00000000000,R2,2035,R2,power,solarPV,newcapa,2050 -A1,6.00000000000,R2,2040,R2,power,solarPV,newcapa,2050 -A1,10.00000000000,R2,2045,R2,power,solarPV,newcapa,2050 -A1,1.50000000000,R2,2045,R2,power,windturbine,newcapa,2050 -A1,1.46440000000,R1,2020,R1,gas,gassupply1,newcapa,2050 -A1,9.22000000000,R1,2025,R1,gas,gassupply1,newcapa,2050 -A1,7.50000000000,R1,2030,R1,gas,gassupply1,newcapa,2050 -A1,1.46440000000,R2,2020,R2,gas,gassupply1,newcapa,2050 -A1,9.22000000000,R2,2025,R2,gas,gassupply1,newcapa,2050 -A1,7.50000000000,R2,2030,R2,gas,gassupply1,newcapa,2050 +A1,4.00000000000,R2,2025,R2,power,gasCCGT,newcapa,2050 +A1,3.00000000000,R2,2030,R2,power,windturbine,newcapa,2050 +A1,2.00000000000,R2,2035,R2,power,windturbine,newcapa,2050 +A1,3.00000000000,R2,2040,R2,power,windturbine,newcapa,2050 +A1,8.00000000000,R2,2045,R2,power,windturbine,newcapa,2050 +A1,1.73530000000,R1,2020,R1,gas,gassupply1,newcapa,2050 +A1,11.85120000000,R1,2025,R1,gas,gassupply1,newcapa,2050 +A1,11.32320000000,R1,2030,R1,gas,gassupply1,newcapa,2050 +A1,9.34160000000,R1,2035,R1,gas,gassupply1,newcapa,2050 +A1,3.00090000000,R1,2045,R1,gas,gassupply1,newcapa,2050 +A1,1.73530000000,R2,2020,R2,gas,gassupply1,newcapa,2050 +A1,11.85120000000,R2,2025,R2,gas,gassupply1,newcapa,2050 +A1,11.32320000000,R2,2030,R2,gas,gassupply1,newcapa,2050 +A1,9.34160000000,R2,2035,R2,gas,gassupply1,newcapa,2050 +A1,3.00090000000,R2,2045,R2,gas,gassupply1,newcapa,2050 diff --git a/docs/tutorial-code/3-add-region/1-new-region/Results/MCAPrices.csv b/docs/tutorial-code/3-add-region/1-new-region/Results/MCAPrices.csv index 96119f8da..2af48ed09 100644 --- a/docs/tutorial-code/3-add-region/1-new-region/Results/MCAPrices.csv +++ b/docs/tutorial-code/3-add-region/1-new-region/Results/MCAPrices.csv @@ -47,291 +47,291 @@ heat,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020 heat,all-week,evening,all-year,100.00000000000,R2,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.08310000000,R1,5,MUS$2010/kt,2020 CO2f,all-week,evening,all-year,0.08310000000,R2,5,MUS$2010/kt,2020 -electricity,all-week,night,all-year,9.18790000000,R1,0,MUS$2010/PJ,2025 -electricity,all-week,night,all-year,9.18790000000,R2,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,9.39110000000,R1,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,9.39110000000,R2,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,0.47220000000,R2,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,4.85420000000,R1,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,4.85420000000,R2,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,4.91850000000,R1,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,4.91850000000,R2,0,MUS$2010/PJ,2025 CO2f,all-week,night,all-year,0.12010000000,R1,0,MUS$2010/kt,2025 CO2f,all-week,night,all-year,0.12010000000,R2,0,MUS$2010/kt,2025 -electricity,all-week,morning,all-year,9.18790000000,R1,1,MUS$2010/PJ,2025 -electricity,all-week,morning,all-year,9.18790000000,R2,1,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,9.39110000000,R1,1,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,9.39110000000,R2,1,MUS$2010/PJ,2025 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2025 gas,all-week,morning,all-year,0.47220000000,R2,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,4.85420000000,R1,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,4.85420000000,R2,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,4.91850000000,R1,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,4.91850000000,R2,1,MUS$2010/PJ,2025 CO2f,all-week,morning,all-year,0.12010000000,R1,1,MUS$2010/kt,2025 CO2f,all-week,morning,all-year,0.12010000000,R2,1,MUS$2010/kt,2025 -electricity,all-week,afternoon,all-year,9.18790000000,R1,2,MUS$2010/PJ,2025 -electricity,all-week,afternoon,all-year,9.18790000000,R2,2,MUS$2010/PJ,2025 +electricity,all-week,afternoon,all-year,9.39110000000,R1,2,MUS$2010/PJ,2025 +electricity,all-week,afternoon,all-year,9.39110000000,R2,2,MUS$2010/PJ,2025 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2025 gas,all-week,afternoon,all-year,0.47220000000,R2,2,MUS$2010/PJ,2025 -heat,all-week,afternoon,all-year,4.85420000000,R1,2,MUS$2010/PJ,2025 -heat,all-week,afternoon,all-year,4.85420000000,R2,2,MUS$2010/PJ,2025 +heat,all-week,afternoon,all-year,4.91850000000,R1,2,MUS$2010/PJ,2025 +heat,all-week,afternoon,all-year,4.91850000000,R2,2,MUS$2010/PJ,2025 CO2f,all-week,afternoon,all-year,0.12010000000,R1,2,MUS$2010/kt,2025 CO2f,all-week,afternoon,all-year,0.12010000000,R2,2,MUS$2010/kt,2025 -electricity,all-week,early-peak,all-year,9.18790000000,R1,3,MUS$2010/PJ,2025 -electricity,all-week,early-peak,all-year,9.18790000000,R2,3,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,9.39110000000,R1,3,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,9.39110000000,R2,3,MUS$2010/PJ,2025 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2025 gas,all-week,early-peak,all-year,0.47220000000,R2,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,4.85420000000,R1,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,4.85420000000,R2,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,4.91850000000,R1,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,4.91850000000,R2,3,MUS$2010/PJ,2025 CO2f,all-week,early-peak,all-year,0.12010000000,R1,3,MUS$2010/kt,2025 CO2f,all-week,early-peak,all-year,0.12010000000,R2,3,MUS$2010/kt,2025 -electricity,all-week,late-peak,all-year,9.18790000000,R1,4,MUS$2010/PJ,2025 -electricity,all-week,late-peak,all-year,9.18790000000,R2,4,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,9.39110000000,R1,4,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,9.39110000000,R2,4,MUS$2010/PJ,2025 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2025 gas,all-week,late-peak,all-year,0.47220000000,R2,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,4.85420000000,R1,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,4.85420000000,R2,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,4.91850000000,R1,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,4.91850000000,R2,4,MUS$2010/PJ,2025 CO2f,all-week,late-peak,all-year,0.12010000000,R1,4,MUS$2010/kt,2025 CO2f,all-week,late-peak,all-year,0.12010000000,R2,4,MUS$2010/kt,2025 -electricity,all-week,evening,all-year,9.18790000000,R1,5,MUS$2010/PJ,2025 -electricity,all-week,evening,all-year,9.18790000000,R2,5,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,9.39110000000,R1,5,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,9.39110000000,R2,5,MUS$2010/PJ,2025 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2025 gas,all-week,evening,all-year,0.47220000000,R2,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,4.85420000000,R1,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,4.85420000000,R2,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,4.91850000000,R1,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,4.91850000000,R2,5,MUS$2010/PJ,2025 CO2f,all-week,evening,all-year,0.12010000000,R1,5,MUS$2010/kt,2025 CO2f,all-week,evening,all-year,0.12010000000,R2,5,MUS$2010/kt,2025 -electricity,all-week,night,all-year,13.07600000000,R1,0,MUS$2010/PJ,2030 -electricity,all-week,night,all-year,13.07600000000,R2,0,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,12.87080000000,R1,0,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,12.87080000000,R2,0,MUS$2010/PJ,2030 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2030 gas,all-week,night,all-year,0.47220000000,R2,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,5.47090000000,R1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,5.47090000000,R2,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,6.23010000000,R1,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,6.23010000000,R2,0,MUS$2010/PJ,2030 CO2f,all-week,night,all-year,0.15700000000,R1,0,MUS$2010/kt,2030 CO2f,all-week,night,all-year,0.15700000000,R2,0,MUS$2010/kt,2030 -electricity,all-week,morning,all-year,13.07600000000,R1,1,MUS$2010/PJ,2030 -electricity,all-week,morning,all-year,13.07600000000,R2,1,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,12.87080000000,R1,1,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,12.87080000000,R2,1,MUS$2010/PJ,2030 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2030 gas,all-week,morning,all-year,0.47220000000,R2,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,5.47090000000,R1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,5.47090000000,R2,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,6.23010000000,R1,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,6.23010000000,R2,1,MUS$2010/PJ,2030 CO2f,all-week,morning,all-year,0.15700000000,R1,1,MUS$2010/kt,2030 CO2f,all-week,morning,all-year,0.15700000000,R2,1,MUS$2010/kt,2030 -electricity,all-week,afternoon,all-year,13.07600000000,R1,2,MUS$2010/PJ,2030 -electricity,all-week,afternoon,all-year,13.07600000000,R2,2,MUS$2010/PJ,2030 +electricity,all-week,afternoon,all-year,12.87080000000,R1,2,MUS$2010/PJ,2030 +electricity,all-week,afternoon,all-year,12.87080000000,R2,2,MUS$2010/PJ,2030 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2030 gas,all-week,afternoon,all-year,0.47220000000,R2,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,5.47090000000,R1,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,5.47090000000,R2,2,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,6.23010000000,R1,2,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,6.23010000000,R2,2,MUS$2010/PJ,2030 CO2f,all-week,afternoon,all-year,0.15700000000,R1,2,MUS$2010/kt,2030 CO2f,all-week,afternoon,all-year,0.15700000000,R2,2,MUS$2010/kt,2030 -electricity,all-week,early-peak,all-year,13.07600000000,R1,3,MUS$2010/PJ,2030 -electricity,all-week,early-peak,all-year,13.07600000000,R2,3,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,12.87080000000,R1,3,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,12.87080000000,R2,3,MUS$2010/PJ,2030 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2030 gas,all-week,early-peak,all-year,0.47220000000,R2,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,5.47090000000,R1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,5.47090000000,R2,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,6.23010000000,R1,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,6.23010000000,R2,3,MUS$2010/PJ,2030 CO2f,all-week,early-peak,all-year,0.15700000000,R1,3,MUS$2010/kt,2030 CO2f,all-week,early-peak,all-year,0.15700000000,R2,3,MUS$2010/kt,2030 -electricity,all-week,late-peak,all-year,13.07600000000,R1,4,MUS$2010/PJ,2030 -electricity,all-week,late-peak,all-year,13.07600000000,R2,4,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,12.87080000000,R1,4,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,12.87080000000,R2,4,MUS$2010/PJ,2030 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2030 gas,all-week,late-peak,all-year,0.47220000000,R2,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,5.47090000000,R1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,5.47090000000,R2,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,6.23010000000,R1,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,6.23010000000,R2,4,MUS$2010/PJ,2030 CO2f,all-week,late-peak,all-year,0.15700000000,R1,4,MUS$2010/kt,2030 CO2f,all-week,late-peak,all-year,0.15700000000,R2,4,MUS$2010/kt,2030 -electricity,all-week,evening,all-year,13.07600000000,R1,5,MUS$2010/PJ,2030 -electricity,all-week,evening,all-year,13.07600000000,R2,5,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,12.87080000000,R1,5,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,12.87080000000,R2,5,MUS$2010/PJ,2030 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2030 gas,all-week,evening,all-year,0.47220000000,R2,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,5.47090000000,R1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,5.47090000000,R2,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,6.23010000000,R1,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,6.23010000000,R2,5,MUS$2010/PJ,2030 CO2f,all-week,evening,all-year,0.15700000000,R1,5,MUS$2010/kt,2030 CO2f,all-week,evening,all-year,0.15700000000,R2,5,MUS$2010/kt,2030 -electricity,all-week,night,all-year,14.77530000000,R1,0,MUS$2010/PJ,2035 -electricity,all-week,night,all-year,14.77530000000,R2,0,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,15.48430000000,R1,0,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,15.48430000000,R2,0,MUS$2010/PJ,2035 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2035 gas,all-week,night,all-year,0.47220000000,R2,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,6.15060000000,R1,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,6.15060000000,R2,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,8.15000000000,R1,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,8.15000000000,R2,0,MUS$2010/PJ,2035 CO2f,all-week,night,all-year,0.21490000000,R1,0,MUS$2010/kt,2035 CO2f,all-week,night,all-year,0.21490000000,R2,0,MUS$2010/kt,2035 -electricity,all-week,morning,all-year,14.77530000000,R1,1,MUS$2010/PJ,2035 -electricity,all-week,morning,all-year,14.77530000000,R2,1,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,15.48430000000,R1,1,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,15.48430000000,R2,1,MUS$2010/PJ,2035 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2035 gas,all-week,morning,all-year,0.47220000000,R2,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,6.15060000000,R1,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,6.15060000000,R2,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,8.15000000000,R1,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,8.15000000000,R2,1,MUS$2010/PJ,2035 CO2f,all-week,morning,all-year,0.21490000000,R1,1,MUS$2010/kt,2035 CO2f,all-week,morning,all-year,0.21490000000,R2,1,MUS$2010/kt,2035 -electricity,all-week,afternoon,all-year,14.77530000000,R1,2,MUS$2010/PJ,2035 -electricity,all-week,afternoon,all-year,14.77530000000,R2,2,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,15.48430000000,R1,2,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,15.48430000000,R2,2,MUS$2010/PJ,2035 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2035 gas,all-week,afternoon,all-year,0.47220000000,R2,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,6.15060000000,R1,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,6.15060000000,R2,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,8.15000000000,R1,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,8.15000000000,R2,2,MUS$2010/PJ,2035 CO2f,all-week,afternoon,all-year,0.21490000000,R1,2,MUS$2010/kt,2035 CO2f,all-week,afternoon,all-year,0.21490000000,R2,2,MUS$2010/kt,2035 -electricity,all-week,early-peak,all-year,14.77530000000,R1,3,MUS$2010/PJ,2035 -electricity,all-week,early-peak,all-year,14.77530000000,R2,3,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,15.48430000000,R1,3,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,15.48430000000,R2,3,MUS$2010/PJ,2035 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2035 gas,all-week,early-peak,all-year,0.47220000000,R2,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,6.15060000000,R1,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,6.15060000000,R2,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,8.15000000000,R1,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,8.15000000000,R2,3,MUS$2010/PJ,2035 CO2f,all-week,early-peak,all-year,0.21490000000,R1,3,MUS$2010/kt,2035 CO2f,all-week,early-peak,all-year,0.21490000000,R2,3,MUS$2010/kt,2035 -electricity,all-week,late-peak,all-year,14.77530000000,R1,4,MUS$2010/PJ,2035 -electricity,all-week,late-peak,all-year,14.77530000000,R2,4,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,15.48430000000,R1,4,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,15.48430000000,R2,4,MUS$2010/PJ,2035 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2035 gas,all-week,late-peak,all-year,0.47220000000,R2,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,6.15060000000,R1,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,6.15060000000,R2,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,8.15000000000,R1,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,8.15000000000,R2,4,MUS$2010/PJ,2035 CO2f,all-week,late-peak,all-year,0.21490000000,R1,4,MUS$2010/kt,2035 CO2f,all-week,late-peak,all-year,0.21490000000,R2,4,MUS$2010/kt,2035 -electricity,all-week,evening,all-year,14.77530000000,R1,5,MUS$2010/PJ,2035 -electricity,all-week,evening,all-year,14.77530000000,R2,5,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,15.48430000000,R1,5,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,15.48430000000,R2,5,MUS$2010/PJ,2035 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2035 gas,all-week,evening,all-year,0.47220000000,R2,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,6.15060000000,R1,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,6.15060000000,R2,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,8.15000000000,R1,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,8.15000000000,R2,5,MUS$2010/PJ,2035 CO2f,all-week,evening,all-year,0.21490000000,R1,5,MUS$2010/kt,2035 CO2f,all-week,evening,all-year,0.21490000000,R2,5,MUS$2010/kt,2035 -electricity,all-week,night,all-year,15.97270000000,R1,0,MUS$2010/PJ,2040 -electricity,all-week,night,all-year,15.97270000000,R2,0,MUS$2010/PJ,2040 +electricity,all-week,night,all-year,18.12250000000,R1,0,MUS$2010/PJ,2040 +electricity,all-week,night,all-year,18.12250000000,R2,0,MUS$2010/PJ,2040 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2040 gas,all-week,night,all-year,0.47220000000,R2,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,6.62960000000,R1,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,6.62960000000,R2,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,10.32110000000,R1,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,10.32110000000,R2,0,MUS$2010/PJ,2040 CO2f,all-week,night,all-year,0.27280000000,R1,0,MUS$2010/kt,2040 CO2f,all-week,night,all-year,0.27280000000,R2,0,MUS$2010/kt,2040 -electricity,all-week,morning,all-year,15.97270000000,R1,1,MUS$2010/PJ,2040 -electricity,all-week,morning,all-year,15.97270000000,R2,1,MUS$2010/PJ,2040 +electricity,all-week,morning,all-year,18.12250000000,R1,1,MUS$2010/PJ,2040 +electricity,all-week,morning,all-year,18.12250000000,R2,1,MUS$2010/PJ,2040 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2040 gas,all-week,morning,all-year,0.47220000000,R2,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,6.62960000000,R1,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,6.62960000000,R2,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,10.32110000000,R1,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,10.32110000000,R2,1,MUS$2010/PJ,2040 CO2f,all-week,morning,all-year,0.27280000000,R1,1,MUS$2010/kt,2040 CO2f,all-week,morning,all-year,0.27280000000,R2,1,MUS$2010/kt,2040 -electricity,all-week,afternoon,all-year,15.97270000000,R1,2,MUS$2010/PJ,2040 -electricity,all-week,afternoon,all-year,15.97270000000,R2,2,MUS$2010/PJ,2040 +electricity,all-week,afternoon,all-year,18.12250000000,R1,2,MUS$2010/PJ,2040 +electricity,all-week,afternoon,all-year,18.12250000000,R2,2,MUS$2010/PJ,2040 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2040 gas,all-week,afternoon,all-year,0.47220000000,R2,2,MUS$2010/PJ,2040 -heat,all-week,afternoon,all-year,6.62960000000,R1,2,MUS$2010/PJ,2040 -heat,all-week,afternoon,all-year,6.62960000000,R2,2,MUS$2010/PJ,2040 +heat,all-week,afternoon,all-year,10.32110000000,R1,2,MUS$2010/PJ,2040 +heat,all-week,afternoon,all-year,10.32110000000,R2,2,MUS$2010/PJ,2040 CO2f,all-week,afternoon,all-year,0.27280000000,R1,2,MUS$2010/kt,2040 CO2f,all-week,afternoon,all-year,0.27280000000,R2,2,MUS$2010/kt,2040 -electricity,all-week,early-peak,all-year,15.97270000000,R1,3,MUS$2010/PJ,2040 -electricity,all-week,early-peak,all-year,15.97270000000,R2,3,MUS$2010/PJ,2040 +electricity,all-week,early-peak,all-year,18.12250000000,R1,3,MUS$2010/PJ,2040 +electricity,all-week,early-peak,all-year,18.12250000000,R2,3,MUS$2010/PJ,2040 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2040 gas,all-week,early-peak,all-year,0.47220000000,R2,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,6.62960000000,R1,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,6.62960000000,R2,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,10.32110000000,R1,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,10.32110000000,R2,3,MUS$2010/PJ,2040 CO2f,all-week,early-peak,all-year,0.27280000000,R1,3,MUS$2010/kt,2040 CO2f,all-week,early-peak,all-year,0.27280000000,R2,3,MUS$2010/kt,2040 -electricity,all-week,late-peak,all-year,15.97270000000,R1,4,MUS$2010/PJ,2040 -electricity,all-week,late-peak,all-year,15.97270000000,R2,4,MUS$2010/PJ,2040 +electricity,all-week,late-peak,all-year,18.12250000000,R1,4,MUS$2010/PJ,2040 +electricity,all-week,late-peak,all-year,18.12250000000,R2,4,MUS$2010/PJ,2040 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2040 gas,all-week,late-peak,all-year,0.47220000000,R2,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,6.62960000000,R1,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,6.62960000000,R2,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,10.32110000000,R1,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,10.32110000000,R2,4,MUS$2010/PJ,2040 CO2f,all-week,late-peak,all-year,0.27280000000,R1,4,MUS$2010/kt,2040 CO2f,all-week,late-peak,all-year,0.27280000000,R2,4,MUS$2010/kt,2040 -electricity,all-week,evening,all-year,15.97270000000,R1,5,MUS$2010/PJ,2040 -electricity,all-week,evening,all-year,15.97270000000,R2,5,MUS$2010/PJ,2040 +electricity,all-week,evening,all-year,18.12250000000,R1,5,MUS$2010/PJ,2040 +electricity,all-week,evening,all-year,18.12250000000,R2,5,MUS$2010/PJ,2040 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2040 gas,all-week,evening,all-year,0.47220000000,R2,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,6.62960000000,R1,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,6.62960000000,R2,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,10.32110000000,R1,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,10.32110000000,R2,5,MUS$2010/PJ,2040 CO2f,all-week,evening,all-year,0.27280000000,R1,5,MUS$2010/kt,2040 CO2f,all-week,evening,all-year,0.27280000000,R2,5,MUS$2010/kt,2040 -electricity,all-week,night,all-year,17.94720000000,R1,0,MUS$2010/PJ,2045 -electricity,all-week,night,all-year,17.94720000000,R2,0,MUS$2010/PJ,2045 +electricity,all-week,night,all-year,21.17060000000,R1,0,MUS$2010/PJ,2045 +electricity,all-week,night,all-year,21.17060000000,R2,0,MUS$2010/PJ,2045 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2045 gas,all-week,night,all-year,0.47220000000,R2,0,MUS$2010/PJ,2045 -heat,all-week,night,all-year,7.41940000000,R1,0,MUS$2010/PJ,2045 -heat,all-week,night,all-year,7.41940000000,R2,0,MUS$2010/PJ,2045 +heat,all-week,night,all-year,13.03890000000,R1,0,MUS$2010/PJ,2045 +heat,all-week,night,all-year,13.03890000000,R2,0,MUS$2010/PJ,2045 CO2f,all-week,night,all-year,0.35390000000,R1,0,MUS$2010/kt,2045 CO2f,all-week,night,all-year,0.35390000000,R2,0,MUS$2010/kt,2045 -electricity,all-week,morning,all-year,17.94720000000,R1,1,MUS$2010/PJ,2045 -electricity,all-week,morning,all-year,17.94720000000,R2,1,MUS$2010/PJ,2045 +electricity,all-week,morning,all-year,21.17060000000,R1,1,MUS$2010/PJ,2045 +electricity,all-week,morning,all-year,21.17060000000,R2,1,MUS$2010/PJ,2045 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2045 gas,all-week,morning,all-year,0.47220000000,R2,1,MUS$2010/PJ,2045 -heat,all-week,morning,all-year,7.41940000000,R1,1,MUS$2010/PJ,2045 -heat,all-week,morning,all-year,7.41940000000,R2,1,MUS$2010/PJ,2045 +heat,all-week,morning,all-year,13.03890000000,R1,1,MUS$2010/PJ,2045 +heat,all-week,morning,all-year,13.03890000000,R2,1,MUS$2010/PJ,2045 CO2f,all-week,morning,all-year,0.35390000000,R1,1,MUS$2010/kt,2045 CO2f,all-week,morning,all-year,0.35390000000,R2,1,MUS$2010/kt,2045 -electricity,all-week,afternoon,all-year,17.94720000000,R1,2,MUS$2010/PJ,2045 -electricity,all-week,afternoon,all-year,17.94720000000,R2,2,MUS$2010/PJ,2045 +electricity,all-week,afternoon,all-year,21.17060000000,R1,2,MUS$2010/PJ,2045 +electricity,all-week,afternoon,all-year,21.17060000000,R2,2,MUS$2010/PJ,2045 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2045 gas,all-week,afternoon,all-year,0.47220000000,R2,2,MUS$2010/PJ,2045 -heat,all-week,afternoon,all-year,7.41940000000,R1,2,MUS$2010/PJ,2045 -heat,all-week,afternoon,all-year,7.41940000000,R2,2,MUS$2010/PJ,2045 +heat,all-week,afternoon,all-year,13.03890000000,R1,2,MUS$2010/PJ,2045 +heat,all-week,afternoon,all-year,13.03890000000,R2,2,MUS$2010/PJ,2045 CO2f,all-week,afternoon,all-year,0.35390000000,R1,2,MUS$2010/kt,2045 CO2f,all-week,afternoon,all-year,0.35390000000,R2,2,MUS$2010/kt,2045 -electricity,all-week,early-peak,all-year,17.94720000000,R1,3,MUS$2010/PJ,2045 -electricity,all-week,early-peak,all-year,17.94720000000,R2,3,MUS$2010/PJ,2045 +electricity,all-week,early-peak,all-year,21.17060000000,R1,3,MUS$2010/PJ,2045 +electricity,all-week,early-peak,all-year,21.17060000000,R2,3,MUS$2010/PJ,2045 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2045 gas,all-week,early-peak,all-year,0.47220000000,R2,3,MUS$2010/PJ,2045 -heat,all-week,early-peak,all-year,7.41940000000,R1,3,MUS$2010/PJ,2045 -heat,all-week,early-peak,all-year,7.41940000000,R2,3,MUS$2010/PJ,2045 +heat,all-week,early-peak,all-year,13.03890000000,R1,3,MUS$2010/PJ,2045 +heat,all-week,early-peak,all-year,13.03890000000,R2,3,MUS$2010/PJ,2045 CO2f,all-week,early-peak,all-year,0.35390000000,R1,3,MUS$2010/kt,2045 CO2f,all-week,early-peak,all-year,0.35390000000,R2,3,MUS$2010/kt,2045 -electricity,all-week,late-peak,all-year,17.94720000000,R1,4,MUS$2010/PJ,2045 -electricity,all-week,late-peak,all-year,17.94720000000,R2,4,MUS$2010/PJ,2045 +electricity,all-week,late-peak,all-year,21.17060000000,R1,4,MUS$2010/PJ,2045 +electricity,all-week,late-peak,all-year,21.17060000000,R2,4,MUS$2010/PJ,2045 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2045 gas,all-week,late-peak,all-year,0.47220000000,R2,4,MUS$2010/PJ,2045 -heat,all-week,late-peak,all-year,7.41940000000,R1,4,MUS$2010/PJ,2045 -heat,all-week,late-peak,all-year,7.41940000000,R2,4,MUS$2010/PJ,2045 +heat,all-week,late-peak,all-year,13.03890000000,R1,4,MUS$2010/PJ,2045 +heat,all-week,late-peak,all-year,13.03890000000,R2,4,MUS$2010/PJ,2045 CO2f,all-week,late-peak,all-year,0.35390000000,R1,4,MUS$2010/kt,2045 CO2f,all-week,late-peak,all-year,0.35390000000,R2,4,MUS$2010/kt,2045 -electricity,all-week,evening,all-year,17.94720000000,R1,5,MUS$2010/PJ,2045 -electricity,all-week,evening,all-year,17.94720000000,R2,5,MUS$2010/PJ,2045 +electricity,all-week,evening,all-year,21.17060000000,R1,5,MUS$2010/PJ,2045 +electricity,all-week,evening,all-year,21.17060000000,R2,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,0.47220000000,R2,5,MUS$2010/PJ,2045 -heat,all-week,evening,all-year,7.41940000000,R1,5,MUS$2010/PJ,2045 -heat,all-week,evening,all-year,7.41940000000,R2,5,MUS$2010/PJ,2045 +heat,all-week,evening,all-year,13.03890000000,R1,5,MUS$2010/PJ,2045 +heat,all-week,evening,all-year,13.03890000000,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,19.46150000000,R1,0,MUS$2010/PJ,2050 -electricity,all-week,night,all-year,19.46150000000,R2,0,MUS$2010/PJ,2050 +electricity,all-week,night,all-year,23.71420000000,R1,0,MUS$2010/PJ,2050 +electricity,all-week,night,all-year,23.71420000000,R2,0,MUS$2010/PJ,2050 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2050 gas,all-week,night,all-year,0.47220000000,R2,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,8.02510000000,R1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,8.02510000000,R2,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,15.73360000000,R1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,15.73360000000,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,19.46150000000,R1,1,MUS$2010/PJ,2050 -electricity,all-week,morning,all-year,19.46150000000,R2,1,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,23.71420000000,R1,1,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,23.71420000000,R2,1,MUS$2010/PJ,2050 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2050 gas,all-week,morning,all-year,0.47220000000,R2,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,8.02510000000,R1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,8.02510000000,R2,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,15.73360000000,R1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,15.73360000000,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,19.46150000000,R1,2,MUS$2010/PJ,2050 -electricity,all-week,afternoon,all-year,19.46150000000,R2,2,MUS$2010/PJ,2050 +electricity,all-week,afternoon,all-year,23.71420000000,R1,2,MUS$2010/PJ,2050 +electricity,all-week,afternoon,all-year,23.71420000000,R2,2,MUS$2010/PJ,2050 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2050 gas,all-week,afternoon,all-year,0.47220000000,R2,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,8.02510000000,R1,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,8.02510000000,R2,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,15.73360000000,R1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,15.73360000000,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,19.46150000000,R1,3,MUS$2010/PJ,2050 -electricity,all-week,early-peak,all-year,19.46150000000,R2,3,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,23.71420000000,R1,3,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,23.71420000000,R2,3,MUS$2010/PJ,2050 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2050 gas,all-week,early-peak,all-year,0.47220000000,R2,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,8.02510000000,R1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,8.02510000000,R2,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,15.73360000000,R1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,15.73360000000,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,19.46150000000,R1,4,MUS$2010/PJ,2050 -electricity,all-week,late-peak,all-year,19.46150000000,R2,4,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,23.71420000000,R1,4,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,23.71420000000,R2,4,MUS$2010/PJ,2050 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2050 gas,all-week,late-peak,all-year,0.47220000000,R2,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,8.02510000000,R1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,8.02510000000,R2,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,15.73360000000,R1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,15.73360000000,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,19.46150000000,R1,5,MUS$2010/PJ,2050 -electricity,all-week,evening,all-year,19.46150000000,R2,5,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,23.71420000000,R1,5,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,23.71420000000,R2,5,MUS$2010/PJ,2050 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2050 gas,all-week,evening,all-year,0.47220000000,R2,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,8.02510000000,R1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,8.02510000000,R2,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,15.73360000000,R1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,15.73360000000,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/3-add-region/1-new-region/Results/Power/Capacity.csv b/docs/tutorial-code/3-add-region/1-new-region/Results/Power/Capacity.csv deleted file mode 100644 index 63f0b9018..000000000 --- a/docs/tutorial-code/3-add-region/1-new-region/Results/Power/Capacity.csv +++ /dev/null @@ -1,57 +0,0 @@ -asset,capacity,installed,region,technology,year -0,1.00000000000,2020,R1,gasCCGT,2020 -2,1.00000000000,2020,R2,gasCCGT,2020 -0,6.00000000000,2020,R1,gasCCGT,2025 -2,5.50000000000,2020,R1,windturbine,2025 -3,6.00000000000,2020,R2,gasCCGT,2025 -5,5.50000000000,2020,R2,windturbine,2025 -0,5.00000000000,2020,R1,gasCCGT,2030 -1,5.88890000000,2025,R1,gasCCGT,2030 -3,5.50000000000,2020,R1,windturbine,2030 -4,5.00000000000,2020,R2,gasCCGT,2030 -5,5.88890000000,2025,R2,gasCCGT,2030 -7,5.50000000000,2020,R2,windturbine,2030 -0,5.00000000000,2020,R1,gasCCGT,2035 -1,5.88890000000,2025,R1,gasCCGT,2035 -2,6.00000000000,2030,R1,solarPV,2035 -4,5.50000000000,2020,R1,windturbine,2035 -5,5.00000000000,2020,R2,gasCCGT,2035 -6,5.88890000000,2025,R2,gasCCGT,2035 -7,6.00000000000,2030,R2,solarPV,2035 -9,5.50000000000,2020,R2,windturbine,2035 -0,5.00000000000,2020,R1,gasCCGT,2040 -1,5.88890000000,2025,R1,gasCCGT,2040 -2,6.00000000000,2030,R1,solarPV,2040 -3,6.00000000000,2035,R1,solarPV,2040 -5,5.50000000000,2020,R1,windturbine,2040 -6,5.00000000000,2020,R2,gasCCGT,2040 -7,5.88890000000,2025,R2,gasCCGT,2040 -8,6.00000000000,2030,R2,solarPV,2040 -9,6.00000000000,2035,R2,solarPV,2040 -11,5.50000000000,2020,R2,windturbine,2040 -0,5.00000000000,2020,R1,gasCCGT,2045 -1,5.88890000000,2025,R1,gasCCGT,2045 -2,6.00000000000,2030,R1,solarPV,2045 -3,6.00000000000,2035,R1,solarPV,2045 -4,6.00000000000,2040,R1,solarPV,2045 -6,5.50000000000,2020,R1,windturbine,2045 -8,5.00000000000,2020,R2,gasCCGT,2045 -9,5.88890000000,2025,R2,gasCCGT,2045 -10,6.00000000000,2030,R2,solarPV,2045 -11,6.00000000000,2035,R2,solarPV,2045 -12,6.00000000000,2040,R2,solarPV,2045 -14,5.50000000000,2020,R2,windturbine,2045 -0,5.00000000000,2020,R1,gasCCGT,2050 -1,5.88890000000,2025,R1,gasCCGT,2050 -2,6.00000000000,2030,R1,solarPV,2050 -3,6.00000000000,2035,R1,solarPV,2050 -4,6.00000000000,2040,R1,solarPV,2050 -5,10.00000000000,2045,R1,solarPV,2050 -7,1.50000000000,2045,R1,windturbine,2050 -8,5.00000000000,2020,R2,gasCCGT,2050 -9,5.88890000000,2025,R2,gasCCGT,2050 -10,6.00000000000,2030,R2,solarPV,2050 -11,6.00000000000,2035,R2,solarPV,2050 -12,6.00000000000,2040,R2,solarPV,2050 -13,10.00000000000,2045,R2,solarPV,2050 -15,1.50000000000,2045,R2,windturbine,2050 diff --git a/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Capacity.csv b/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Capacity.csv deleted file mode 100644 index fa93142ea..000000000 --- a/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Capacity.csv +++ /dev/null @@ -1,27 +0,0 @@ -asset,capacity,installed,region,technology,year -0,10,2020,R1,gasboiler,2020 -2,10,2020,R2,gasboiler,2020 -0,5,2020,R1,gasboiler,2025 -1,19,2020,R1,heatpump,2025 -3,5,2020,R2,gasboiler,2025 -4,19,2020,R2,heatpump,2025 -1,19,2020,R1,heatpump,2030 -2,10,2025,R1,heatpump,2030 -5,19,2020,R2,heatpump,2030 -6,10,2025,R2,heatpump,2030 -2,10,2025,R1,heatpump,2035 -3,26,2030,R1,heatpump,2035 -7,10,2025,R2,heatpump,2035 -8,26,2030,R2,heatpump,2035 -3,26,2030,R1,heatpump,2040 -4,16,2035,R1,heatpump,2040 -9,26,2030,R2,heatpump,2040 -10,16,2035,R2,heatpump,2040 -4,16,2035,R1,heatpump,2045 -5,32,2040,R1,heatpump,2045 -11,16,2035,R2,heatpump,2045 -12,32,2040,R2,heatpump,2045 -5,32,2040,R1,heatpump,2050 -6,22,2045,R1,heatpump,2050 -13,32,2040,R2,heatpump,2050 -14,22,2045,R2,heatpump,2050 diff --git a/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Supply.csv b/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Supply.csv deleted file mode 100644 index 1874a28ca..000000000 --- a/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Supply.csv +++ /dev/null @@ -1,361 +0,0 @@ -asset,commodity,day,hour,installed,month,region,supply,technology,timeslice,year -0,heat,all-week,night,2020,all-year,R1,0.50000000000,gasboiler,0,2020 -2,heat,all-week,night,2020,all-year,R1,0.50000000000,gasboiler,0,2020 -0,heat,all-week,night,2020,all-year,R2,0.50000000000,gasboiler,0,2020 -2,heat,all-week,night,2020,all-year,R2,0.50000000000,gasboiler,0,2020 -0,CO2f,all-week,night,2020,all-year,R1,32.35500000000,gasboiler,0,2020 -2,CO2f,all-week,night,2020,all-year,R1,32.35500000000,gasboiler,0,2020 -0,CO2f,all-week,night,2020,all-year,R2,32.35500000000,gasboiler,0,2020 -2,CO2f,all-week,night,2020,all-year,R2,32.35500000000,gasboiler,0,2020 -0,heat,all-week,morning,2020,all-year,R1,0.75000000000,gasboiler,1,2020 -2,heat,all-week,morning,2020,all-year,R1,0.75000000000,gasboiler,1,2020 -0,heat,all-week,morning,2020,all-year,R2,0.75000000000,gasboiler,1,2020 -2,heat,all-week,morning,2020,all-year,R2,0.75000000000,gasboiler,1,2020 -0,CO2f,all-week,morning,2020,all-year,R1,48.53250000000,gasboiler,1,2020 -2,CO2f,all-week,morning,2020,all-year,R1,48.53250000000,gasboiler,1,2020 -0,CO2f,all-week,morning,2020,all-year,R2,48.53250000000,gasboiler,1,2020 -2,CO2f,all-week,morning,2020,all-year,R2,48.53250000000,gasboiler,1,2020 -0,heat,all-week,afternoon,2020,all-year,R1,0.50000000000,gasboiler,2,2020 -2,heat,all-week,afternoon,2020,all-year,R1,0.50000000000,gasboiler,2,2020 -0,heat,all-week,afternoon,2020,all-year,R2,0.50000000000,gasboiler,2,2020 -2,heat,all-week,afternoon,2020,all-year,R2,0.50000000000,gasboiler,2,2020 -0,CO2f,all-week,afternoon,2020,all-year,R1,32.35500000000,gasboiler,2,2020 -2,CO2f,all-week,afternoon,2020,all-year,R1,32.35500000000,gasboiler,2,2020 -0,CO2f,all-week,afternoon,2020,all-year,R2,32.35500000000,gasboiler,2,2020 -2,CO2f,all-week,afternoon,2020,all-year,R2,32.35500000000,gasboiler,2,2020 -0,heat,all-week,early-peak,2020,all-year,R1,0.75000000000,gasboiler,3,2020 -2,heat,all-week,early-peak,2020,all-year,R1,0.75000000000,gasboiler,3,2020 -0,heat,all-week,early-peak,2020,all-year,R2,0.75000000000,gasboiler,3,2020 -2,heat,all-week,early-peak,2020,all-year,R2,0.75000000000,gasboiler,3,2020 -0,CO2f,all-week,early-peak,2020,all-year,R1,48.53250000000,gasboiler,3,2020 -2,CO2f,all-week,early-peak,2020,all-year,R1,48.53250000000,gasboiler,3,2020 -0,CO2f,all-week,early-peak,2020,all-year,R2,48.53250000000,gasboiler,3,2020 -2,CO2f,all-week,early-peak,2020,all-year,R2,48.53250000000,gasboiler,3,2020 -0,heat,all-week,late-peak,2020,all-year,R1,1.50000000000,gasboiler,4,2020 -2,heat,all-week,late-peak,2020,all-year,R1,1.50000000000,gasboiler,4,2020 -0,heat,all-week,late-peak,2020,all-year,R2,1.50000000000,gasboiler,4,2020 -2,heat,all-week,late-peak,2020,all-year,R2,1.50000000000,gasboiler,4,2020 -0,CO2f,all-week,late-peak,2020,all-year,R1,97.06500000000,gasboiler,4,2020 -2,CO2f,all-week,late-peak,2020,all-year,R1,97.06500000000,gasboiler,4,2020 -0,CO2f,all-week,late-peak,2020,all-year,R2,97.06500000000,gasboiler,4,2020 -2,CO2f,all-week,late-peak,2020,all-year,R2,97.06500000000,gasboiler,4,2020 -0,heat,all-week,evening,2020,all-year,R1,1.00000000000,gasboiler,5,2020 -2,heat,all-week,evening,2020,all-year,R1,1.00000000000,gasboiler,5,2020 -0,heat,all-week,evening,2020,all-year,R2,1.00000000000,gasboiler,5,2020 -2,heat,all-week,evening,2020,all-year,R2,1.00000000000,gasboiler,5,2020 -0,CO2f,all-week,evening,2020,all-year,R1,64.71000000000,gasboiler,5,2020 -2,CO2f,all-week,evening,2020,all-year,R1,64.71000000000,gasboiler,5,2020 -0,CO2f,all-week,evening,2020,all-year,R2,64.71000000000,gasboiler,5,2020 -2,CO2f,all-week,evening,2020,all-year,R2,64.71000000000,gasboiler,5,2020 -0,heat,all-week,night,2020,all-year,R1,0.13890000000,gasboiler,0,2025 -1,heat,all-week,night,2020,all-year,R1,0.52780000000,heatpump,0,2025 -3,heat,all-week,night,2020,all-year,R1,0.13890000000,gasboiler,0,2025 -4,heat,all-week,night,2020,all-year,R1,0.52780000000,heatpump,0,2025 -0,heat,all-week,night,2020,all-year,R2,0.13890000000,gasboiler,0,2025 -1,heat,all-week,night,2020,all-year,R2,0.52780000000,heatpump,0,2025 -3,heat,all-week,night,2020,all-year,R2,0.13890000000,gasboiler,0,2025 -4,heat,all-week,night,2020,all-year,R2,0.52780000000,heatpump,0,2025 -0,CO2f,all-week,night,2020,all-year,R1,8.98750000000,gasboiler,0,2025 -3,CO2f,all-week,night,2020,all-year,R1,8.98750000000,gasboiler,0,2025 -0,CO2f,all-week,night,2020,all-year,R2,8.98750000000,gasboiler,0,2025 -3,CO2f,all-week,night,2020,all-year,R2,8.98750000000,gasboiler,0,2025 -0,heat,all-week,morning,2020,all-year,R1,0.20830000000,gasboiler,1,2025 -1,heat,all-week,morning,2020,all-year,R1,0.79170000000,heatpump,1,2025 -3,heat,all-week,morning,2020,all-year,R1,0.20830000000,gasboiler,1,2025 -4,heat,all-week,morning,2020,all-year,R1,0.79170000000,heatpump,1,2025 -0,heat,all-week,morning,2020,all-year,R2,0.20830000000,gasboiler,1,2025 -1,heat,all-week,morning,2020,all-year,R2,0.79170000000,heatpump,1,2025 -3,heat,all-week,morning,2020,all-year,R2,0.20830000000,gasboiler,1,2025 -4,heat,all-week,morning,2020,all-year,R2,0.79170000000,heatpump,1,2025 -0,CO2f,all-week,morning,2020,all-year,R1,13.48120000000,gasboiler,1,2025 -3,CO2f,all-week,morning,2020,all-year,R1,13.48120000000,gasboiler,1,2025 -0,CO2f,all-week,morning,2020,all-year,R2,13.48120000000,gasboiler,1,2025 -3,CO2f,all-week,morning,2020,all-year,R2,13.48120000000,gasboiler,1,2025 -0,heat,all-week,afternoon,2020,all-year,R1,0.13890000000,gasboiler,2,2025 -1,heat,all-week,afternoon,2020,all-year,R1,0.52780000000,heatpump,2,2025 -3,heat,all-week,afternoon,2020,all-year,R1,0.13890000000,gasboiler,2,2025 -4,heat,all-week,afternoon,2020,all-year,R1,0.52780000000,heatpump,2,2025 -0,heat,all-week,afternoon,2020,all-year,R2,0.13890000000,gasboiler,2,2025 -1,heat,all-week,afternoon,2020,all-year,R2,0.52780000000,heatpump,2,2025 -3,heat,all-week,afternoon,2020,all-year,R2,0.13890000000,gasboiler,2,2025 -4,heat,all-week,afternoon,2020,all-year,R2,0.52780000000,heatpump,2,2025 -0,CO2f,all-week,afternoon,2020,all-year,R1,8.98750000000,gasboiler,2,2025 -3,CO2f,all-week,afternoon,2020,all-year,R1,8.98750000000,gasboiler,2,2025 -0,CO2f,all-week,afternoon,2020,all-year,R2,8.98750000000,gasboiler,2,2025 -3,CO2f,all-week,afternoon,2020,all-year,R2,8.98750000000,gasboiler,2,2025 -0,heat,all-week,early-peak,2020,all-year,R1,0.20830000000,gasboiler,3,2025 -1,heat,all-week,early-peak,2020,all-year,R1,0.79170000000,heatpump,3,2025 -3,heat,all-week,early-peak,2020,all-year,R1,0.20830000000,gasboiler,3,2025 -4,heat,all-week,early-peak,2020,all-year,R1,0.79170000000,heatpump,3,2025 -0,heat,all-week,early-peak,2020,all-year,R2,0.20830000000,gasboiler,3,2025 -1,heat,all-week,early-peak,2020,all-year,R2,0.79170000000,heatpump,3,2025 -3,heat,all-week,early-peak,2020,all-year,R2,0.20830000000,gasboiler,3,2025 -4,heat,all-week,early-peak,2020,all-year,R2,0.79170000000,heatpump,3,2025 -0,CO2f,all-week,early-peak,2020,all-year,R1,13.48120000000,gasboiler,3,2025 -3,CO2f,all-week,early-peak,2020,all-year,R1,13.48120000000,gasboiler,3,2025 -0,CO2f,all-week,early-peak,2020,all-year,R2,13.48120000000,gasboiler,3,2025 -3,CO2f,all-week,early-peak,2020,all-year,R2,13.48120000000,gasboiler,3,2025 -0,heat,all-week,late-peak,2020,all-year,R1,0.41670000000,gasboiler,4,2025 -1,heat,all-week,late-peak,2020,all-year,R1,1.58330000000,heatpump,4,2025 -3,heat,all-week,late-peak,2020,all-year,R1,0.41670000000,gasboiler,4,2025 -4,heat,all-week,late-peak,2020,all-year,R1,1.58330000000,heatpump,4,2025 -0,heat,all-week,late-peak,2020,all-year,R2,0.41670000000,gasboiler,4,2025 -1,heat,all-week,late-peak,2020,all-year,R2,1.58330000000,heatpump,4,2025 -3,heat,all-week,late-peak,2020,all-year,R2,0.41670000000,gasboiler,4,2025 -4,heat,all-week,late-peak,2020,all-year,R2,1.58330000000,heatpump,4,2025 -0,CO2f,all-week,late-peak,2020,all-year,R1,26.96250000000,gasboiler,4,2025 -3,CO2f,all-week,late-peak,2020,all-year,R1,26.96250000000,gasboiler,4,2025 -0,CO2f,all-week,late-peak,2020,all-year,R2,26.96250000000,gasboiler,4,2025 -3,CO2f,all-week,late-peak,2020,all-year,R2,26.96250000000,gasboiler,4,2025 -0,heat,all-week,evening,2020,all-year,R1,0.27780000000,gasboiler,5,2025 -1,heat,all-week,evening,2020,all-year,R1,1.05560000000,heatpump,5,2025 -3,heat,all-week,evening,2020,all-year,R1,0.27780000000,gasboiler,5,2025 -4,heat,all-week,evening,2020,all-year,R1,1.05560000000,heatpump,5,2025 -0,heat,all-week,evening,2020,all-year,R2,0.27780000000,gasboiler,5,2025 -1,heat,all-week,evening,2020,all-year,R2,1.05560000000,heatpump,5,2025 -3,heat,all-week,evening,2020,all-year,R2,0.27780000000,gasboiler,5,2025 -4,heat,all-week,evening,2020,all-year,R2,1.05560000000,heatpump,5,2025 -0,CO2f,all-week,evening,2020,all-year,R1,17.97500000000,gasboiler,5,2025 -3,CO2f,all-week,evening,2020,all-year,R1,17.97500000000,gasboiler,5,2025 -0,CO2f,all-week,evening,2020,all-year,R2,17.97500000000,gasboiler,5,2025 -3,CO2f,all-week,evening,2020,all-year,R2,17.97500000000,gasboiler,5,2025 -1,heat,all-week,night,2020,all-year,R1,0.54600000000,heatpump,0,2030 -2,heat,all-week,night,2025,all-year,R1,0.28740000000,heatpump,0,2030 -5,heat,all-week,night,2020,all-year,R1,0.54600000000,heatpump,0,2030 -6,heat,all-week,night,2025,all-year,R1,0.28740000000,heatpump,0,2030 -1,heat,all-week,night,2020,all-year,R2,0.54600000000,heatpump,0,2030 -2,heat,all-week,night,2025,all-year,R2,0.28740000000,heatpump,0,2030 -5,heat,all-week,night,2020,all-year,R2,0.54600000000,heatpump,0,2030 -6,heat,all-week,night,2025,all-year,R2,0.28740000000,heatpump,0,2030 -1,heat,all-week,morning,2020,all-year,R1,0.81900000000,heatpump,1,2030 -2,heat,all-week,morning,2025,all-year,R1,0.43100000000,heatpump,1,2030 -5,heat,all-week,morning,2020,all-year,R1,0.81900000000,heatpump,1,2030 -6,heat,all-week,morning,2025,all-year,R1,0.43100000000,heatpump,1,2030 -1,heat,all-week,morning,2020,all-year,R2,0.81900000000,heatpump,1,2030 -2,heat,all-week,morning,2025,all-year,R2,0.43100000000,heatpump,1,2030 -5,heat,all-week,morning,2020,all-year,R2,0.81900000000,heatpump,1,2030 -6,heat,all-week,morning,2025,all-year,R2,0.43100000000,heatpump,1,2030 -1,heat,all-week,afternoon,2020,all-year,R1,0.54600000000,heatpump,2,2030 -2,heat,all-week,afternoon,2025,all-year,R1,0.28740000000,heatpump,2,2030 -5,heat,all-week,afternoon,2020,all-year,R1,0.54600000000,heatpump,2,2030 -6,heat,all-week,afternoon,2025,all-year,R1,0.28740000000,heatpump,2,2030 -1,heat,all-week,afternoon,2020,all-year,R2,0.54600000000,heatpump,2,2030 -2,heat,all-week,afternoon,2025,all-year,R2,0.28740000000,heatpump,2,2030 -5,heat,all-week,afternoon,2020,all-year,R2,0.54600000000,heatpump,2,2030 -6,heat,all-week,afternoon,2025,all-year,R2,0.28740000000,heatpump,2,2030 -1,heat,all-week,early-peak,2020,all-year,R1,0.81900000000,heatpump,3,2030 -2,heat,all-week,early-peak,2025,all-year,R1,0.43100000000,heatpump,3,2030 -5,heat,all-week,early-peak,2020,all-year,R1,0.81900000000,heatpump,3,2030 -6,heat,all-week,early-peak,2025,all-year,R1,0.43100000000,heatpump,3,2030 -1,heat,all-week,early-peak,2020,all-year,R2,0.81900000000,heatpump,3,2030 -2,heat,all-week,early-peak,2025,all-year,R2,0.43100000000,heatpump,3,2030 -5,heat,all-week,early-peak,2020,all-year,R2,0.81900000000,heatpump,3,2030 -6,heat,all-week,early-peak,2025,all-year,R2,0.43100000000,heatpump,3,2030 -1,heat,all-week,late-peak,2020,all-year,R1,1.63790000000,heatpump,4,2030 -2,heat,all-week,late-peak,2025,all-year,R1,0.86210000000,heatpump,4,2030 -5,heat,all-week,late-peak,2020,all-year,R1,1.63790000000,heatpump,4,2030 -6,heat,all-week,late-peak,2025,all-year,R1,0.86210000000,heatpump,4,2030 -1,heat,all-week,late-peak,2020,all-year,R2,1.63790000000,heatpump,4,2030 -2,heat,all-week,late-peak,2025,all-year,R2,0.86210000000,heatpump,4,2030 -5,heat,all-week,late-peak,2020,all-year,R2,1.63790000000,heatpump,4,2030 -6,heat,all-week,late-peak,2025,all-year,R2,0.86210000000,heatpump,4,2030 -1,heat,all-week,evening,2020,all-year,R1,1.09200000000,heatpump,5,2030 -2,heat,all-week,evening,2025,all-year,R1,0.57470000000,heatpump,5,2030 -5,heat,all-week,evening,2020,all-year,R1,1.09200000000,heatpump,5,2030 -6,heat,all-week,evening,2025,all-year,R1,0.57470000000,heatpump,5,2030 -1,heat,all-week,evening,2020,all-year,R2,1.09200000000,heatpump,5,2030 -2,heat,all-week,evening,2025,all-year,R2,0.57470000000,heatpump,5,2030 -5,heat,all-week,evening,2020,all-year,R2,1.09200000000,heatpump,5,2030 -6,heat,all-week,evening,2025,all-year,R2,0.57470000000,heatpump,5,2030 -2,heat,all-week,night,2025,all-year,R1,0.27780000000,heatpump,0,2035 -3,heat,all-week,night,2030,all-year,R1,0.72220000000,heatpump,0,2035 -7,heat,all-week,night,2025,all-year,R1,0.27780000000,heatpump,0,2035 -8,heat,all-week,night,2030,all-year,R1,0.72220000000,heatpump,0,2035 -2,heat,all-week,night,2025,all-year,R2,0.27780000000,heatpump,0,2035 -3,heat,all-week,night,2030,all-year,R2,0.72220000000,heatpump,0,2035 -7,heat,all-week,night,2025,all-year,R2,0.27780000000,heatpump,0,2035 -8,heat,all-week,night,2030,all-year,R2,0.72220000000,heatpump,0,2035 -2,heat,all-week,morning,2025,all-year,R1,0.41670000000,heatpump,1,2035 -3,heat,all-week,morning,2030,all-year,R1,1.08330000000,heatpump,1,2035 -7,heat,all-week,morning,2025,all-year,R1,0.41670000000,heatpump,1,2035 -8,heat,all-week,morning,2030,all-year,R1,1.08330000000,heatpump,1,2035 -2,heat,all-week,morning,2025,all-year,R2,0.41670000000,heatpump,1,2035 -3,heat,all-week,morning,2030,all-year,R2,1.08330000000,heatpump,1,2035 -7,heat,all-week,morning,2025,all-year,R2,0.41670000000,heatpump,1,2035 -8,heat,all-week,morning,2030,all-year,R2,1.08330000000,heatpump,1,2035 -2,heat,all-week,afternoon,2025,all-year,R1,0.27780000000,heatpump,2,2035 -3,heat,all-week,afternoon,2030,all-year,R1,0.72220000000,heatpump,2,2035 -7,heat,all-week,afternoon,2025,all-year,R1,0.27780000000,heatpump,2,2035 -8,heat,all-week,afternoon,2030,all-year,R1,0.72220000000,heatpump,2,2035 -2,heat,all-week,afternoon,2025,all-year,R2,0.27780000000,heatpump,2,2035 -3,heat,all-week,afternoon,2030,all-year,R2,0.72220000000,heatpump,2,2035 -7,heat,all-week,afternoon,2025,all-year,R2,0.27780000000,heatpump,2,2035 -8,heat,all-week,afternoon,2030,all-year,R2,0.72220000000,heatpump,2,2035 -2,heat,all-week,early-peak,2025,all-year,R1,0.41670000000,heatpump,3,2035 -3,heat,all-week,early-peak,2030,all-year,R1,1.08330000000,heatpump,3,2035 -7,heat,all-week,early-peak,2025,all-year,R1,0.41670000000,heatpump,3,2035 -8,heat,all-week,early-peak,2030,all-year,R1,1.08330000000,heatpump,3,2035 -2,heat,all-week,early-peak,2025,all-year,R2,0.41670000000,heatpump,3,2035 -3,heat,all-week,early-peak,2030,all-year,R2,1.08330000000,heatpump,3,2035 -7,heat,all-week,early-peak,2025,all-year,R2,0.41670000000,heatpump,3,2035 -8,heat,all-week,early-peak,2030,all-year,R2,1.08330000000,heatpump,3,2035 -2,heat,all-week,late-peak,2025,all-year,R1,0.83330000000,heatpump,4,2035 -3,heat,all-week,late-peak,2030,all-year,R1,2.16670000000,heatpump,4,2035 -7,heat,all-week,late-peak,2025,all-year,R1,0.83330000000,heatpump,4,2035 -8,heat,all-week,late-peak,2030,all-year,R1,2.16670000000,heatpump,4,2035 -2,heat,all-week,late-peak,2025,all-year,R2,0.83330000000,heatpump,4,2035 -3,heat,all-week,late-peak,2030,all-year,R2,2.16670000000,heatpump,4,2035 -7,heat,all-week,late-peak,2025,all-year,R2,0.83330000000,heatpump,4,2035 -8,heat,all-week,late-peak,2030,all-year,R2,2.16670000000,heatpump,4,2035 -2,heat,all-week,evening,2025,all-year,R1,0.55560000000,heatpump,5,2035 -3,heat,all-week,evening,2030,all-year,R1,1.44440000000,heatpump,5,2035 -7,heat,all-week,evening,2025,all-year,R1,0.55560000000,heatpump,5,2035 -8,heat,all-week,evening,2030,all-year,R1,1.44440000000,heatpump,5,2035 -2,heat,all-week,evening,2025,all-year,R2,0.55560000000,heatpump,5,2035 -3,heat,all-week,evening,2030,all-year,R2,1.44440000000,heatpump,5,2035 -7,heat,all-week,evening,2025,all-year,R2,0.55560000000,heatpump,5,2035 -8,heat,all-week,evening,2030,all-year,R2,1.44440000000,heatpump,5,2035 -3,heat,all-week,night,2030,all-year,R1,0.72220000000,heatpump,0,2040 -4,heat,all-week,night,2035,all-year,R1,0.44440000000,heatpump,0,2040 -9,heat,all-week,night,2030,all-year,R1,0.72220000000,heatpump,0,2040 -10,heat,all-week,night,2035,all-year,R1,0.44440000000,heatpump,0,2040 -3,heat,all-week,night,2030,all-year,R2,0.72220000000,heatpump,0,2040 -4,heat,all-week,night,2035,all-year,R2,0.44440000000,heatpump,0,2040 -9,heat,all-week,night,2030,all-year,R2,0.72220000000,heatpump,0,2040 -10,heat,all-week,night,2035,all-year,R2,0.44440000000,heatpump,0,2040 -3,heat,all-week,morning,2030,all-year,R1,1.08330000000,heatpump,1,2040 -4,heat,all-week,morning,2035,all-year,R1,0.66670000000,heatpump,1,2040 -9,heat,all-week,morning,2030,all-year,R1,1.08330000000,heatpump,1,2040 -10,heat,all-week,morning,2035,all-year,R1,0.66670000000,heatpump,1,2040 -3,heat,all-week,morning,2030,all-year,R2,1.08330000000,heatpump,1,2040 -4,heat,all-week,morning,2035,all-year,R2,0.66670000000,heatpump,1,2040 -9,heat,all-week,morning,2030,all-year,R2,1.08330000000,heatpump,1,2040 -10,heat,all-week,morning,2035,all-year,R2,0.66670000000,heatpump,1,2040 -3,heat,all-week,afternoon,2030,all-year,R1,0.72220000000,heatpump,2,2040 -4,heat,all-week,afternoon,2035,all-year,R1,0.44440000000,heatpump,2,2040 -9,heat,all-week,afternoon,2030,all-year,R1,0.72220000000,heatpump,2,2040 -10,heat,all-week,afternoon,2035,all-year,R1,0.44440000000,heatpump,2,2040 -3,heat,all-week,afternoon,2030,all-year,R2,0.72220000000,heatpump,2,2040 -4,heat,all-week,afternoon,2035,all-year,R2,0.44440000000,heatpump,2,2040 -9,heat,all-week,afternoon,2030,all-year,R2,0.72220000000,heatpump,2,2040 -10,heat,all-week,afternoon,2035,all-year,R2,0.44440000000,heatpump,2,2040 -3,heat,all-week,early-peak,2030,all-year,R1,1.08330000000,heatpump,3,2040 -4,heat,all-week,early-peak,2035,all-year,R1,0.66670000000,heatpump,3,2040 -9,heat,all-week,early-peak,2030,all-year,R1,1.08330000000,heatpump,3,2040 -10,heat,all-week,early-peak,2035,all-year,R1,0.66670000000,heatpump,3,2040 -3,heat,all-week,early-peak,2030,all-year,R2,1.08330000000,heatpump,3,2040 -4,heat,all-week,early-peak,2035,all-year,R2,0.66670000000,heatpump,3,2040 -9,heat,all-week,early-peak,2030,all-year,R2,1.08330000000,heatpump,3,2040 -10,heat,all-week,early-peak,2035,all-year,R2,0.66670000000,heatpump,3,2040 -3,heat,all-week,late-peak,2030,all-year,R1,2.16670000000,heatpump,4,2040 -4,heat,all-week,late-peak,2035,all-year,R1,1.33330000000,heatpump,4,2040 -9,heat,all-week,late-peak,2030,all-year,R1,2.16670000000,heatpump,4,2040 -10,heat,all-week,late-peak,2035,all-year,R1,1.33330000000,heatpump,4,2040 -3,heat,all-week,late-peak,2030,all-year,R2,2.16670000000,heatpump,4,2040 -4,heat,all-week,late-peak,2035,all-year,R2,1.33330000000,heatpump,4,2040 -9,heat,all-week,late-peak,2030,all-year,R2,2.16670000000,heatpump,4,2040 -10,heat,all-week,late-peak,2035,all-year,R2,1.33330000000,heatpump,4,2040 -3,heat,all-week,evening,2030,all-year,R1,1.44440000000,heatpump,5,2040 -4,heat,all-week,evening,2035,all-year,R1,0.88890000000,heatpump,5,2040 -9,heat,all-week,evening,2030,all-year,R1,1.44440000000,heatpump,5,2040 -10,heat,all-week,evening,2035,all-year,R1,0.88890000000,heatpump,5,2040 -3,heat,all-week,evening,2030,all-year,R2,1.44440000000,heatpump,5,2040 -4,heat,all-week,evening,2035,all-year,R2,0.88890000000,heatpump,5,2040 -9,heat,all-week,evening,2030,all-year,R2,1.44440000000,heatpump,5,2040 -10,heat,all-week,evening,2035,all-year,R2,0.88890000000,heatpump,5,2040 -4,heat,all-week,night,2035,all-year,R1,0.44440000000,heatpump,0,2045 -5,heat,all-week,night,2040,all-year,R1,0.88890000000,heatpump,0,2045 -11,heat,all-week,night,2035,all-year,R1,0.44440000000,heatpump,0,2045 -12,heat,all-week,night,2040,all-year,R1,0.88890000000,heatpump,0,2045 -4,heat,all-week,night,2035,all-year,R2,0.44440000000,heatpump,0,2045 -5,heat,all-week,night,2040,all-year,R2,0.88890000000,heatpump,0,2045 -11,heat,all-week,night,2035,all-year,R2,0.44440000000,heatpump,0,2045 -12,heat,all-week,night,2040,all-year,R2,0.88890000000,heatpump,0,2045 -4,heat,all-week,morning,2035,all-year,R1,0.66670000000,heatpump,1,2045 -5,heat,all-week,morning,2040,all-year,R1,1.33330000000,heatpump,1,2045 -11,heat,all-week,morning,2035,all-year,R1,0.66670000000,heatpump,1,2045 -12,heat,all-week,morning,2040,all-year,R1,1.33330000000,heatpump,1,2045 -4,heat,all-week,morning,2035,all-year,R2,0.66670000000,heatpump,1,2045 -5,heat,all-week,morning,2040,all-year,R2,1.33330000000,heatpump,1,2045 -11,heat,all-week,morning,2035,all-year,R2,0.66670000000,heatpump,1,2045 -12,heat,all-week,morning,2040,all-year,R2,1.33330000000,heatpump,1,2045 -4,heat,all-week,afternoon,2035,all-year,R1,0.44440000000,heatpump,2,2045 -5,heat,all-week,afternoon,2040,all-year,R1,0.88890000000,heatpump,2,2045 -11,heat,all-week,afternoon,2035,all-year,R1,0.44440000000,heatpump,2,2045 -12,heat,all-week,afternoon,2040,all-year,R1,0.88890000000,heatpump,2,2045 -4,heat,all-week,afternoon,2035,all-year,R2,0.44440000000,heatpump,2,2045 -5,heat,all-week,afternoon,2040,all-year,R2,0.88890000000,heatpump,2,2045 -11,heat,all-week,afternoon,2035,all-year,R2,0.44440000000,heatpump,2,2045 -12,heat,all-week,afternoon,2040,all-year,R2,0.88890000000,heatpump,2,2045 -4,heat,all-week,early-peak,2035,all-year,R1,0.66670000000,heatpump,3,2045 -5,heat,all-week,early-peak,2040,all-year,R1,1.33330000000,heatpump,3,2045 -11,heat,all-week,early-peak,2035,all-year,R1,0.66670000000,heatpump,3,2045 -12,heat,all-week,early-peak,2040,all-year,R1,1.33330000000,heatpump,3,2045 -4,heat,all-week,early-peak,2035,all-year,R2,0.66670000000,heatpump,3,2045 -5,heat,all-week,early-peak,2040,all-year,R2,1.33330000000,heatpump,3,2045 -11,heat,all-week,early-peak,2035,all-year,R2,0.66670000000,heatpump,3,2045 -12,heat,all-week,early-peak,2040,all-year,R2,1.33330000000,heatpump,3,2045 -4,heat,all-week,late-peak,2035,all-year,R1,1.33330000000,heatpump,4,2045 -5,heat,all-week,late-peak,2040,all-year,R1,2.66670000000,heatpump,4,2045 -11,heat,all-week,late-peak,2035,all-year,R1,1.33330000000,heatpump,4,2045 -12,heat,all-week,late-peak,2040,all-year,R1,2.66670000000,heatpump,4,2045 -4,heat,all-week,late-peak,2035,all-year,R2,1.33330000000,heatpump,4,2045 -5,heat,all-week,late-peak,2040,all-year,R2,2.66670000000,heatpump,4,2045 -11,heat,all-week,late-peak,2035,all-year,R2,1.33330000000,heatpump,4,2045 -12,heat,all-week,late-peak,2040,all-year,R2,2.66670000000,heatpump,4,2045 -4,heat,all-week,evening,2035,all-year,R1,0.88890000000,heatpump,5,2045 -5,heat,all-week,evening,2040,all-year,R1,1.77780000000,heatpump,5,2045 -11,heat,all-week,evening,2035,all-year,R1,0.88890000000,heatpump,5,2045 -12,heat,all-week,evening,2040,all-year,R1,1.77780000000,heatpump,5,2045 -4,heat,all-week,evening,2035,all-year,R2,0.88890000000,heatpump,5,2045 -5,heat,all-week,evening,2040,all-year,R2,1.77780000000,heatpump,5,2045 -11,heat,all-week,evening,2035,all-year,R2,0.88890000000,heatpump,5,2045 -12,heat,all-week,evening,2040,all-year,R2,1.77780000000,heatpump,5,2045 -5,heat,all-week,night,2040,all-year,R1,0.88890000000,heatpump,0,2050 -6,heat,all-week,night,2045,all-year,R1,0.61110000000,heatpump,0,2050 -13,heat,all-week,night,2040,all-year,R1,0.88890000000,heatpump,0,2050 -14,heat,all-week,night,2045,all-year,R1,0.61110000000,heatpump,0,2050 -5,heat,all-week,night,2040,all-year,R2,0.88890000000,heatpump,0,2050 -6,heat,all-week,night,2045,all-year,R2,0.61110000000,heatpump,0,2050 -13,heat,all-week,night,2040,all-year,R2,0.88890000000,heatpump,0,2050 -14,heat,all-week,night,2045,all-year,R2,0.61110000000,heatpump,0,2050 -5,heat,all-week,morning,2040,all-year,R1,1.33330000000,heatpump,1,2050 -6,heat,all-week,morning,2045,all-year,R1,0.91670000000,heatpump,1,2050 -13,heat,all-week,morning,2040,all-year,R1,1.33330000000,heatpump,1,2050 -14,heat,all-week,morning,2045,all-year,R1,0.91670000000,heatpump,1,2050 -5,heat,all-week,morning,2040,all-year,R2,1.33330000000,heatpump,1,2050 -6,heat,all-week,morning,2045,all-year,R2,0.91670000000,heatpump,1,2050 -13,heat,all-week,morning,2040,all-year,R2,1.33330000000,heatpump,1,2050 -14,heat,all-week,morning,2045,all-year,R2,0.91670000000,heatpump,1,2050 -5,heat,all-week,afternoon,2040,all-year,R1,0.88890000000,heatpump,2,2050 -6,heat,all-week,afternoon,2045,all-year,R1,0.61110000000,heatpump,2,2050 -13,heat,all-week,afternoon,2040,all-year,R1,0.88890000000,heatpump,2,2050 -14,heat,all-week,afternoon,2045,all-year,R1,0.61110000000,heatpump,2,2050 -5,heat,all-week,afternoon,2040,all-year,R2,0.88890000000,heatpump,2,2050 -6,heat,all-week,afternoon,2045,all-year,R2,0.61110000000,heatpump,2,2050 -13,heat,all-week,afternoon,2040,all-year,R2,0.88890000000,heatpump,2,2050 -14,heat,all-week,afternoon,2045,all-year,R2,0.61110000000,heatpump,2,2050 -5,heat,all-week,early-peak,2040,all-year,R1,1.33330000000,heatpump,3,2050 -6,heat,all-week,early-peak,2045,all-year,R1,0.91670000000,heatpump,3,2050 -13,heat,all-week,early-peak,2040,all-year,R1,1.33330000000,heatpump,3,2050 -14,heat,all-week,early-peak,2045,all-year,R1,0.91670000000,heatpump,3,2050 -5,heat,all-week,early-peak,2040,all-year,R2,1.33330000000,heatpump,3,2050 -6,heat,all-week,early-peak,2045,all-year,R2,0.91670000000,heatpump,3,2050 -13,heat,all-week,early-peak,2040,all-year,R2,1.33330000000,heatpump,3,2050 -14,heat,all-week,early-peak,2045,all-year,R2,0.91670000000,heatpump,3,2050 -5,heat,all-week,late-peak,2040,all-year,R1,2.66670000000,heatpump,4,2050 -6,heat,all-week,late-peak,2045,all-year,R1,1.83330000000,heatpump,4,2050 -13,heat,all-week,late-peak,2040,all-year,R1,2.66670000000,heatpump,4,2050 -14,heat,all-week,late-peak,2045,all-year,R1,1.83330000000,heatpump,4,2050 -5,heat,all-week,late-peak,2040,all-year,R2,2.66670000000,heatpump,4,2050 -6,heat,all-week,late-peak,2045,all-year,R2,1.83330000000,heatpump,4,2050 -13,heat,all-week,late-peak,2040,all-year,R2,2.66670000000,heatpump,4,2050 -14,heat,all-week,late-peak,2045,all-year,R2,1.83330000000,heatpump,4,2050 -5,heat,all-week,evening,2040,all-year,R1,1.77780000000,heatpump,5,2050 -6,heat,all-week,evening,2045,all-year,R1,1.22220000000,heatpump,5,2050 -13,heat,all-week,evening,2040,all-year,R1,1.77780000000,heatpump,5,2050 -14,heat,all-week,evening,2045,all-year,R1,1.22220000000,heatpump,5,2050 -5,heat,all-week,evening,2040,all-year,R2,1.77780000000,heatpump,5,2050 -6,heat,all-week,evening,2045,all-year,R2,1.22220000000,heatpump,5,2050 -13,heat,all-week,evening,2040,all-year,R2,1.77780000000,heatpump,5,2050 -14,heat,all-week,evening,2045,all-year,R2,1.22220000000,heatpump,5,2050 diff --git a/docs/tutorial-code/3-add-region/1-new-region/input/BaseYearExport.csv b/docs/tutorial-code/3-add-region/1-new-region/input/BaseYearExport.csv index bb5b862de..36b5f3a42 100644 --- a/docs/tutorial-code/3-add-region/1-new-region/input/BaseYearExport.csv +++ b/docs/tutorial-code/3-add-region/1-new-region/input/BaseYearExport.csv @@ -1,40 +1,40 @@ -RegionName,Attribute,Time,electricity,gas,heat,CO2f,wind,solar -Unit,-,Year,PJ,PJ,PJ,kt,PJ,PJ -R1,Exports,2010,0,0,0,0,0,0 -R1,Exports,2015,0,0,0,0,0,0 -R1,Exports,2020,0,0,0,0,0,0 -R1,Exports,2025,0,0,0,0,0,0 -R1,Exports,2030,0,0,0,0,0,0 -R1,Exports,2035,0,0,0,0,0,0 -R1,Exports,2040,0,0,0,0,0,0 -R1,Exports,2045,0,0,0,0,0,0 -R1,Exports,2050,0,0,0,0,0,0 -R1,Exports,2055,0,0,0,0,0,0 -R1,Exports,2060,0,0,0,0,0,0 -R1,Exports,2065,0,0,0,0,0,0 -R1,Exports,2070,0,0,0,0,0,0 -R1,Exports,2075,0,0,0,0,0,0 -R1,Exports,2080,0,0,0,0,0,0 -R1,Exports,2085,0,0,0,0,0,0 -R1,Exports,2090,0,0,0,0,0,0 -R1,Exports,2095,0,0,0,0,0,0 -R1,Exports,2100,0,0,0,0,0,0 -R2,Exports,2010,0,0,0,0,0,0 -R2,Exports,2015,0,0,0,0,0,0 -R2,Exports,2020,0,0,0,0,0,0 -R2,Exports,2025,0,0,0,0,0,0 -R2,Exports,2030,0,0,0,0,0,0 -R2,Exports,2035,0,0,0,0,0,0 -R2,Exports,2040,0,0,0,0,0,0 -R2,Exports,2045,0,0,0,0,0,0 -R2,Exports,2050,0,0,0,0,0,0 -R2,Exports,2055,0,0,0,0,0,0 -R2,Exports,2060,0,0,0,0,0,0 -R2,Exports,2065,0,0,0,0,0,0 -R2,Exports,2070,0,0,0,0,0,0 -R2,Exports,2075,0,0,0,0,0,0 -R2,Exports,2080,0,0,0,0,0,0 -R2,Exports,2085,0,0,0,0,0,0 -R2,Exports,2090,0,0,0,0,0,0 -R2,Exports,2095,0,0,0,0,0,0 -R2,Exports,2100,0,0,0,0,0,0 +RegionName,Attribute,Time,electricity,gas,heat,CO2f,wind +Unit,-,Year,PJ,PJ,PJ,kt,PJ +R1,Exports,2010,0,0,0,0,0 +R1,Exports,2015,0,0,0,0,0 +R1,Exports,2020,0,0,0,0,0 +R1,Exports,2025,0,0,0,0,0 +R1,Exports,2030,0,0,0,0,0 +R1,Exports,2035,0,0,0,0,0 +R1,Exports,2040,0,0,0,0,0 +R1,Exports,2045,0,0,0,0,0 +R1,Exports,2050,0,0,0,0,0 +R1,Exports,2055,0,0,0,0,0 +R1,Exports,2060,0,0,0,0,0 +R1,Exports,2065,0,0,0,0,0 +R1,Exports,2070,0,0,0,0,0 +R1,Exports,2075,0,0,0,0,0 +R1,Exports,2080,0,0,0,0,0 +R1,Exports,2085,0,0,0,0,0 +R1,Exports,2090,0,0,0,0,0 +R1,Exports,2095,0,0,0,0,0 +R1,Exports,2100,0,0,0,0,0 +R2,Exports,2010,0,0,0,0,0 +R2,Exports,2015,0,0,0,0,0 +R2,Exports,2020,0,0,0,0,0 +R2,Exports,2025,0,0,0,0,0 +R2,Exports,2030,0,0,0,0,0 +R2,Exports,2035,0,0,0,0,0 +R2,Exports,2040,0,0,0,0,0 +R2,Exports,2045,0,0,0,0,0 +R2,Exports,2050,0,0,0,0,0 +R2,Exports,2055,0,0,0,0,0 +R2,Exports,2060,0,0,0,0,0 +R2,Exports,2065,0,0,0,0,0 +R2,Exports,2070,0,0,0,0,0 +R2,Exports,2075,0,0,0,0,0 +R2,Exports,2080,0,0,0,0,0 +R2,Exports,2085,0,0,0,0,0 +R2,Exports,2090,0,0,0,0,0 +R2,Exports,2095,0,0,0,0,0 +R2,Exports,2100,0,0,0,0,0 diff --git a/docs/tutorial-code/3-add-region/1-new-region/input/BaseYearImport.csv b/docs/tutorial-code/3-add-region/1-new-region/input/BaseYearImport.csv index 50d94f1db..8400b37e8 100644 --- a/docs/tutorial-code/3-add-region/1-new-region/input/BaseYearImport.csv +++ b/docs/tutorial-code/3-add-region/1-new-region/input/BaseYearImport.csv @@ -1,40 +1,40 @@ -RegionName,Attribute,Time,electricity,gas,heat,CO2f,wind,solar -Unit,-,Year,PJ,PJ,PJ,kt,PJ,PJ -R1,Imports,2010,0,0,0,0,0,0 -R1,Imports,2015,0,0,0,0,0,0 -R1,Imports,2020,0,0,0,0,0,0 -R1,Imports,2025,0,0,0,0,0,0 -R1,Imports,2030,0,0,0,0,0,0 -R1,Imports,2035,0,0,0,0,0,0 -R1,Imports,2040,0,0,0,0,0,0 -R1,Imports,2045,0,0,0,0,0,0 -R1,Imports,2050,0,0,0,0,0,0 -R1,Imports,2055,0,0,0,0,0,0 -R1,Imports,2060,0,0,0,0,0,0 -R1,Imports,2065,0,0,0,0,0,0 -R1,Imports,2070,0,0,0,0,0,0 -R1,Imports,2075,0,0,0,0,0,0 -R1,Imports,2080,0,0,0,0,0,0 -R1,Imports,2085,0,0,0,0,0,0 -R1,Imports,2090,0,0,0,0,0,0 -R1,Imports,2095,0,0,0,0,0,0 -R1,Imports,2100,0,0,0,0,0,0 -R2,Imports,2010,0,0,0,0,0,0 -R2,Imports,2015,0,0,0,0,0,0 -R2,Imports,2020,0,0,0,0,0,0 -R2,Imports,2025,0,0,0,0,0,0 -R2,Imports,2030,0,0,0,0,0,0 -R2,Imports,2035,0,0,0,0,0,0 -R2,Imports,2040,0,0,0,0,0,0 -R2,Imports,2045,0,0,0,0,0,0 -R2,Imports,2050,0,0,0,0,0,0 -R2,Imports,2055,0,0,0,0,0,0 -R2,Imports,2060,0,0,0,0,0,0 -R2,Imports,2065,0,0,0,0,0,0 -R2,Imports,2070,0,0,0,0,0,0 -R2,Imports,2075,0,0,0,0,0,0 -R2,Imports,2080,0,0,0,0,0,0 -R2,Imports,2085,0,0,0,0,0,0 -R2,Imports,2090,0,0,0,0,0,0 -R2,Imports,2095,0,0,0,0,0,0 -R2,Imports,2100,0,0,0,0,0,0 +RegionName,Attribute,Time,electricity,gas,heat,CO2f,wind +Unit,-,Year,PJ,PJ,PJ,kt,PJ +R1,Imports,2010,0,0,0,0,0 +R1,Imports,2015,0,0,0,0,0 +R1,Imports,2020,0,0,0,0,0 +R1,Imports,2025,0,0,0,0,0 +R1,Imports,2030,0,0,0,0,0 +R1,Imports,2035,0,0,0,0,0 +R1,Imports,2040,0,0,0,0,0 +R1,Imports,2045,0,0,0,0,0 +R1,Imports,2050,0,0,0,0,0 +R1,Imports,2055,0,0,0,0,0 +R1,Imports,2060,0,0,0,0,0 +R1,Imports,2065,0,0,0,0,0 +R1,Imports,2070,0,0,0,0,0 +R1,Imports,2075,0,0,0,0,0 +R1,Imports,2080,0,0,0,0,0 +R1,Imports,2085,0,0,0,0,0 +R1,Imports,2090,0,0,0,0,0 +R1,Imports,2095,0,0,0,0,0 +R1,Imports,2100,0,0,0,0,0 +R2,Imports,2010,0,0,0,0,0 +R2,Imports,2015,0,0,0,0,0 +R2,Imports,2020,0,0,0,0,0 +R2,Imports,2025,0,0,0,0,0 +R2,Imports,2030,0,0,0,0,0 +R2,Imports,2035,0,0,0,0,0 +R2,Imports,2040,0,0,0,0,0 +R2,Imports,2045,0,0,0,0,0 +R2,Imports,2050,0,0,0,0,0 +R2,Imports,2055,0,0,0,0,0 +R2,Imports,2060,0,0,0,0,0 +R2,Imports,2065,0,0,0,0,0 +R2,Imports,2070,0,0,0,0,0 +R2,Imports,2075,0,0,0,0,0 +R2,Imports,2080,0,0,0,0,0 +R2,Imports,2085,0,0,0,0,0 +R2,Imports,2090,0,0,0,0,0 +R2,Imports,2095,0,0,0,0,0 +R2,Imports,2100,0,0,0,0,0 diff --git a/docs/tutorial-code/3-add-region/1-new-region/input/GlobalCommodities.csv b/docs/tutorial-code/3-add-region/1-new-region/input/GlobalCommodities.csv index 9691db73d..0d4c58da7 100644 --- a/docs/tutorial-code/3-add-region/1-new-region/input/GlobalCommodities.csv +++ b/docs/tutorial-code/3-add-region/1-new-region/input/GlobalCommodities.csv @@ -1,7 +1,6 @@ Commodity,CommodityType,CommodityName,CommodityEmissionFactor_CO2,HeatRate,Unit -Electricity,Energy,electricity,0.0,1,PJ +Electricity,Energy,electricity,0,1,PJ Gas,Energy,gas,56.1,1,PJ -Heat,Energy,heat,0.0,1,PJ -Wind,Energy,wind,0.0,1,PJ -CO2fuelcomsbustion,Environmental,CO2f,0.0,1,kt -Solar,Energy,solar,0.0,1,PJ +Heat,Energy,heat,0,1,PJ +Wind,Energy,wind,0,1,PJ +CO2fuelcomsbustion,Environmental,CO2f,0,1,kt diff --git a/docs/tutorial-code/3-add-region/1-new-region/input/Projections.csv b/docs/tutorial-code/3-add-region/1-new-region/input/Projections.csv index e9344e612..1ca5d8c9d 100644 --- a/docs/tutorial-code/3-add-region/1-new-region/input/Projections.csv +++ b/docs/tutorial-code/3-add-region/1-new-region/input/Projections.csv @@ -1,40 +1,40 @@ -RegionName,Attribute,Time,electricity,gas,heat,CO2f,wind,solar -Unit,-,Year,MUS$2010/PJ,MUS$2010/PJ,MUS$2010/PJ,MUS$2010/kt,MUS$2010/kt,MUS$2010/kt -R1,CommodityPrice,2010,14.81481472,6.6759,100,0,0,0 -R1,CommodityPrice,2015,17.89814806,6.914325,100,0.052913851,0,0 -R1,CommodityPrice,2020,19.5,7.15275,100,0.08314119,0,0 -R1,CommodityPrice,2025,21.93518528,8.10645,100,0.120069795,0,0 -R1,CommodityPrice,2030,26.50925917,9.06015,100,0.156998399,0,0 -R1,CommodityPrice,2035,26.51851861,9.2191,100,0.214877567,0,0 -R1,CommodityPrice,2040,23.85185194,9.37805,100,0.272756734,0,0 -R1,CommodityPrice,2045,23.97222222,9.193829337,100,0.35394801,0,0 -R1,CommodityPrice,2050,24.06481472,9.009608674,100,0.435139285,0,0 -R1,CommodityPrice,2055,25.3425925,8.832625604,100,0.542365578,0,0 -R1,CommodityPrice,2060,25.53703694,8.655642534,100,0.649591871,0,0 -R1,CommodityPrice,2065,25.32407417,8.485612708,100,0.780892624,0,0 -R1,CommodityPrice,2070,23.36111111,8.315582883,100,0.912193378,0,0 -R1,CommodityPrice,2075,22.27777778,8.152233126,100,1.078321687,0,0 -R1,CommodityPrice,2080,22.25925917,7.988883368,100,1.244449995,0,0 -R1,CommodityPrice,2085,22.17592583,7.831951236,100,1.4253503,0,0 -R1,CommodityPrice,2090,22.03703694,7.675019103,100,1.606250604,0,0 -R1,CommodityPrice,2095,21.94444444,7.524252461,100,1.73877515,0,0 -R1,CommodityPrice,2100,21.39814806,7.373485819,100,1.871299697,0,0 -R2,CommodityPrice,2010,14.81481472,6.6759,100,0,0,0 -R2,CommodityPrice,2015,17.89814806,6.914325,100,0.052913851,0,0 -R2,CommodityPrice,2020,19.5,7.15275,100,0.08314119,0,0 -R2,CommodityPrice,2025,21.93518528,8.10645,100,0.120069795,0,0 -R2,CommodityPrice,2030,26.50925917,9.06015,100,0.156998399,0,0 -R2,CommodityPrice,2035,26.51851861,9.2191,100,0.214877567,0,0 -R2,CommodityPrice,2040,23.85185194,9.37805,100,0.272756734,0,0 -R2,CommodityPrice,2045,23.97222222,9.193829337,100,0.35394801,0,0 -R2,CommodityPrice,2050,24.06481472,9.009608674,100,0.435139285,0,0 -R2,CommodityPrice,2055,25.3425925,8.832625604,100,0.542365578,0,0 -R2,CommodityPrice,2060,25.53703694,8.655642534,100,0.649591871,0,0 -R2,CommodityPrice,2065,25.32407417,8.485612708,100,0.780892624,0,0 -R2,CommodityPrice,2070,23.36111111,8.315582883,100,0.912193378,0,0 -R2,CommodityPrice,2075,22.27777778,8.152233126,100,1.078321687,0,0 -R2,CommodityPrice,2080,22.25925917,7.988883368,100,1.244449995,0,0 -R2,CommodityPrice,2085,22.17592583,7.831951236,100,1.4253503,0,0 -R2,CommodityPrice,2090,22.03703694,7.675019103,100,1.606250604,0,0 -R2,CommodityPrice,2095,21.94444444,7.524252461,100,1.73877515,0,0 -R2,CommodityPrice,2100,21.39814806,7.373485819,100,1.871299697,0,0 +RegionName,Attribute,Time,electricity,gas,heat,CO2f,wind +Unit,-,Year,MUS$2010/PJ,MUS$2010/PJ,MUS$2010/PJ,MUS$2010/kt,MUS$2010/kt +R1,CommodityPrice,2010,14.81481472,6.6759,100,0,0 +R1,CommodityPrice,2015,17.89814806,6.914325,100,0.052913851,0 +R1,CommodityPrice,2020,19.5,7.15275,100,0.08314119,0 +R1,CommodityPrice,2025,21.93518528,8.10645,100,0.120069795,0 +R1,CommodityPrice,2030,26.50925917,9.06015,100,0.156998399,0 +R1,CommodityPrice,2035,26.51851861,9.2191,100,0.214877567,0 +R1,CommodityPrice,2040,23.85185194,9.37805,100,0.272756734,0 +R1,CommodityPrice,2045,23.97222222,9.193829337,100,0.35394801,0 +R1,CommodityPrice,2050,24.06481472,9.009608674,100,0.435139285,0 +R1,CommodityPrice,2055,25.3425925,8.832625604,100,0.542365578,0 +R1,CommodityPrice,2060,25.53703694,8.655642534,100,0.649591871,0 +R1,CommodityPrice,2065,25.32407417,8.485612708,100,0.780892624,0 +R1,CommodityPrice,2070,23.36111111,8.315582883,100,0.912193378,0 +R1,CommodityPrice,2075,22.27777778,8.152233126,100,1.078321687,0 +R1,CommodityPrice,2080,22.25925917,7.988883368,100,1.244449995,0 +R1,CommodityPrice,2085,22.17592583,7.831951236,100,1.4253503,0 +R1,CommodityPrice,2090,22.03703694,7.675019103,100,1.606250604,0 +R1,CommodityPrice,2095,21.94444444,7.524252461,100,1.73877515,0 +R1,CommodityPrice,2100,21.39814806,7.373485819,100,1.871299697,0 +R2,CommodityPrice,2010,14.81481472,6.6759,100,0,0 +R2,CommodityPrice,2015,17.89814806,6.914325,100,0.052913851,0 +R2,CommodityPrice,2020,19.5,7.15275,100,0.08314119,0 +R2,CommodityPrice,2025,21.93518528,8.10645,100,0.120069795,0 +R2,CommodityPrice,2030,26.50925917,9.06015,100,0.156998399,0 +R2,CommodityPrice,2035,26.51851861,9.2191,100,0.214877567,0 +R2,CommodityPrice,2040,23.85185194,9.37805,100,0.272756734,0 +R2,CommodityPrice,2045,23.97222222,9.193829337,100,0.35394801,0 +R2,CommodityPrice,2050,24.06481472,9.009608674,100,0.435139285,0 +R2,CommodityPrice,2055,25.3425925,8.832625604,100,0.542365578,0 +R2,CommodityPrice,2060,25.53703694,8.655642534,100,0.649591871,0 +R2,CommodityPrice,2065,25.32407417,8.485612708,100,0.780892624,0 +R2,CommodityPrice,2070,23.36111111,8.315582883,100,0.912193378,0 +R2,CommodityPrice,2075,22.27777778,8.152233126,100,1.078321687,0 +R2,CommodityPrice,2080,22.25925917,7.988883368,100,1.244449995,0 +R2,CommodityPrice,2085,22.17592583,7.831951236,100,1.4253503,0 +R2,CommodityPrice,2090,22.03703694,7.675019103,100,1.606250604,0 +R2,CommodityPrice,2095,21.94444444,7.524252461,100,1.73877515,0 +R2,CommodityPrice,2100,21.39814806,7.373485819,100,1.871299697,0 diff --git a/docs/tutorial-code/3-add-region/1-new-region/settings.toml b/docs/tutorial-code/3-add-region/1-new-region/settings.toml index 85f2f50ce..b0db88a4c 100644 --- a/docs/tutorial-code/3-add-region/1-new-region/settings.toml +++ b/docs/tutorial-code/3-add-region/1-new-region/settings.toml @@ -6,7 +6,7 @@ regions = ["R1", "R2"] interest_rate = 0.1 interpolation_mode = 'Active' log_level = 'info' -excluded_commodities = ["wind", "solar"] +excluded_commodities = ["wind"] # Convergence parameters equilibrium_variable = 'demand' maximum_iterations = 100 @@ -14,12 +14,12 @@ tolerance = 0.1 tolerance_unmet_demand = -0.1 [[outputs]] -quantity = "prices" +quantity = "capacity" sink = "aggregate" filename = "{cwd}/{default_output_dir}/MCA{Quantity}.csv" [[outputs]] -quantity = "capacity" +quantity = "prices" sink = "aggregate" filename = "{cwd}/{default_output_dir}/MCA{Quantity}.csv" @@ -55,18 +55,6 @@ constraints = [ demand_share = "standard_demand" # Optional, default to standard_demand forecast = 5 # Optional, defaults to 5 -[[sectors.residential.outputs]] -filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}.csv' -quantity = "capacity" -sink = 'aggregate' - -[[sectors.residential.outputs]] -filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}.csv' -sink = 'aggregate' -quantity.name = "supply" -quantity.sum_over = "timeslice" -quantity.drop = ["comm_usage", "units_prices"] - [sectors.power] type = 'default' priority = 2 @@ -81,11 +69,6 @@ existing_capacity = '{path}/technodata/power/ExistingCapacity.csv' lpsolver = "scipy" demand_share = "standard_demand" -[[sectors.power.outputs]] -filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}.csv' -quantity = "capacity" -sink = 'aggregate' - [sectors.gas] type = 'default' priority = 3 @@ -100,11 +83,6 @@ existing_capacity = '{path}/technodata/gas/ExistingCapacity.csv' lpsolver = "scipy" demand_share = "standard_demand" -[[sectors.gas.outputs]] -filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}.csv' -quantity = "capacity" -sink = 'aggregate' - [sectors.residential_presets] type = 'presets' priority = 0 diff --git a/docs/tutorial-code/3-add-region/1-new-region/technodata/gas/Technodata.csv b/docs/tutorial-code/3-add-region/1-new-region/technodata/gas/Technodata.csv index 9a2f58359..9431208e3 100644 --- a/docs/tutorial-code/3-add-region/1-new-region/technodata/gas/Technodata.csv +++ b/docs/tutorial-code/3-add-region/1-new-region/technodata/gas/Technodata.csv @@ -1,4 +1,4 @@ ProcessName,RegionName,Time,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent1 Unit,-,Year,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,New -gassupply1,R1,2020,0,1,0,1,2.55,1,5,1,60,35,0.9,0.00000189,86,0.1,energy,gas,gas,1 -gassupply1,R2,2020,0,1,0,1,2.55,1,5,1,60,35,0.9,0.00000189,86,0.1,energy,gas,gas,1 +gassupply1,R1,2020,0,1,0,1,2.55,1,10,1,100,35,0.9,0.00000189,86,0.1,energy,gas,gas,1 +gassupply1,R2,2020,0,1,0,1,2.55,1,10,1,100,35,0.9,0.00000189,86,0.1,energy,gas,gas,1 diff --git a/docs/tutorial-code/3-add-region/1-new-region/technodata/power/CommIn.csv b/docs/tutorial-code/3-add-region/1-new-region/technodata/power/CommIn.csv index 7e6361495..f910382d9 100644 --- a/docs/tutorial-code/3-add-region/1-new-region/technodata/power/CommIn.csv +++ b/docs/tutorial-code/3-add-region/1-new-region/technodata/power/CommIn.csv @@ -1,14 +1,6 @@ -ProcessName,RegionName,Time,Level,electricity,gas,heat,CO2f,wind,solar -Unit,-,Year,-,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ,PJ/PJ -gasCCGT,R1,2020,fixed,0,1.67,0,0,0,0 -gasCCGT,R1,2040,fixed,0,1.67,0,0,0,0 -windturbine,R1,2020,fixed,0,0,0,0,1,0 -windturbine,R1,2040,fixed,0,0,0,0,1,0 -solarPV,R1,2020,fixed,0,0,0,0,0,1 -solarPV,R1,2040,fixed,0,0,0,0,0,1 -gasCCGT,R2,2020,fixed,0,1.67,0,0,0,0 -gasCCGT,R2,2040,fixed,0,1.67,0,0,0,0 -windturbine,R2,2020,fixed,0,0,0,0,1,0 -windturbine,R2,2040,fixed,0,0,0,0,1,0 -solarPV,R2,2020,fixed,0,0,0,0,0,1 -solarPV,R2,2040,fixed,0,0,0,0,0,1 +ProcessName,RegionName,Time,Level,electricity,gas,heat,CO2f,wind +Unit,-,Year,-,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ +gasCCGT,R1,2020,fixed,0,1.67,0,0,0 +windturbine,R1,2020,fixed,0,0,0,0,1 +gasCCGT,R2,2020,fixed,0,1.67,0,0,0 +windturbine,R2,2020,fixed,0,0,0,0,1 diff --git a/docs/tutorial-code/3-add-region/1-new-region/technodata/power/CommOut.csv b/docs/tutorial-code/3-add-region/1-new-region/technodata/power/CommOut.csv index b7be93720..a9d0ed4cc 100644 --- a/docs/tutorial-code/3-add-region/1-new-region/technodata/power/CommOut.csv +++ b/docs/tutorial-code/3-add-region/1-new-region/technodata/power/CommOut.csv @@ -1,14 +1,6 @@ -ProcessName,RegionName,Time,electricity,gas,heat,CO2f,wind,solar -Unit,-,Year,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ,PJ/PJ -gasCCGT,R1,2020,1,0,0,91.67,0,0 -gasCCGT,R1,2040,1,0,0,91.67,0,0 -windturbine,R1,2020,1,0,0,0,0,0 -windturbine,R1,2040,1,0,0,0,0,0 -solarPV,R1,2020,1,0,0,0,0,0 -solarPV,R1,2040,1,0,0,0,0,0 -gasCCGT,R2,2020,1,0,0,91.67,0,0 -gasCCGT,R2,2040,1,0,0,91.67,0,0 -windturbine,R2,2020,1,0,0,0,0,0 -windturbine,R2,2040,1,0,0,0,0,0 -solarPV,R2,2020,1,0,0,0,0,0 -solarPV,R2,2040,1,0,0,0,0,0 +ProcessName,RegionName,Time,electricity,gas,heat,CO2f,wind +Unit,-,Year,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ +gasCCGT,R1,2020,1,0,0,91.67,0 +windturbine,R1,2020,1,0,0,0,0 +gasCCGT,R2,2020,1,0,0,91.67,0 +windturbine,R2,2020,1,0,0,0,0 diff --git a/docs/tutorial-code/3-add-region/1-new-region/technodata/power/ExistingCapacity.csv b/docs/tutorial-code/3-add-region/1-new-region/technodata/power/ExistingCapacity.csv index 073ccdd53..847f4e949 100644 --- a/docs/tutorial-code/3-add-region/1-new-region/technodata/power/ExistingCapacity.csv +++ b/docs/tutorial-code/3-add-region/1-new-region/technodata/power/ExistingCapacity.csv @@ -1,7 +1,5 @@ ProcessName,RegionName,Unit,2020,2025,2030,2035,2040,2045,2050 gasCCGT,R1,PJ/y,1,1,0,0,0,0,0 windturbine,R1,PJ/y,0,0,0,0,0,0,0 -solarPV,R1,PJ/y,0,0,0,0,0,0,0 gasCCGT,R2,PJ/y,1,1,0,0,0,0,0 windturbine,R2,PJ/y,0,0,0,0,0,0,0 -solarPV,R2,PJ/y,0,0,0,0,0,0,0 diff --git a/docs/tutorial-code/3-add-region/1-new-region/technodata/power/Technodata.csv b/docs/tutorial-code/3-add-region/1-new-region/technodata/power/Technodata.csv index c9c0db131..0a982d0bf 100644 --- a/docs/tutorial-code/3-add-region/1-new-region/technodata/power/Technodata.csv +++ b/docs/tutorial-code/3-add-region/1-new-region/technodata/power/Technodata.csv @@ -1,14 +1,6 @@ ProcessName,RegionName,Time,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent1 Unit,-,Year,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,New -gasCCGT,R1,2020,23.78234399,1,0,1,0,1,2,1,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1 -gasCCGT,R1,2040,23.78234399,1,0,1,0,1,2,1,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1 -windturbine,R1,2020,36.30771182,1,0,1,0,1,2,1,60,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1 -windturbine,R1,2040,36.30771182,1,0,1,0,1,2,1,60,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1 -solarPV,R1,2020,40,1,0,1,0,1,2,1,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1 -solarPV,R1,2040,30,1,0,1,0,1,2,1,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1 -gasCCGT,R2,2020,23.78234399,1,0,1,0,1,2,1,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1 -gasCCGT,R2,2040,23.78234399,1,0,1,0,1,2,1,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1 -windturbine,R2,2020,36.30771182,1,0,1,0,1,5,1,100,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1 -windturbine,R2,2040,36.30771182,1,0,1,0,1,5,1,100,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1 -solarPV,R2,2020,40,1,0,1,0,1,2,1,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1 -solarPV,R2,2040,30,1,0,1,0,1,2,1,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1 +gasCCGT,R1,2020,23.78234399,1,0,1,0,1,10,1,100,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1 +windturbine,R1,2020,36.30771182,1,0,1,0,1,10,1,100,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1 +gasCCGT,R2,2020,23.78234399,1,0,1,0,1,10,1,100,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1 +windturbine,R2,2020,36.30771182,1,0,1,0,1,10,1,100,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1 diff --git a/docs/tutorial-code/3-add-region/1-new-region/technodata/preset/Residential2020Consumption.csv b/docs/tutorial-code/3-add-region/1-new-region/technodata/preset/Residential2020Consumption.csv index 51380d9e8..0b3394c3b 100644 --- a/docs/tutorial-code/3-add-region/1-new-region/technodata/preset/Residential2020Consumption.csv +++ b/docs/tutorial-code/3-add-region/1-new-region/technodata/preset/Residential2020Consumption.csv @@ -1,13 +1,13 @@ -RegionName,Timeslice,electricity,gas,heat,CO2f,wind,solar -R1,1,0,0,1.0,0,0,0 -R1,2,0,0,1.5,0,0,0 -R1,3,0,0,1.0,0,0,0 -R1,4,0,0,1.5,0,0,0 -R1,5,0,0,3.0,0,0,0 -R1,6,0,0,2.0,0,0,0 -R2,1,0,0,1.0,0,0,0 -R2,2,0,0,1.5,0,0,0 -R2,3,0,0,1.0,0,0,0 -R2,4,0,0,1.5,0,0,0 -R2,5,0,0,3.0,0,0,0 -R2,6,0,0,2.0,0,0,0 +RegionName,Timeslice,electricity,gas,heat,CO2f,wind +R1,1,0,0,1.0,0,0 +R1,2,0,0,1.5,0,0 +R1,3,0,0,1.0,0,0 +R1,4,0,0,1.5,0,0 +R1,5,0,0,3.0,0,0 +R1,6,0,0,2.0,0,0 +R2,1,0,0,1.0,0,0 +R2,2,0,0,1.5,0,0 +R2,3,0,0,1.0,0,0 +R2,4,0,0,1.5,0,0 +R2,5,0,0,3.0,0,0 +R2,6,0,0,2.0,0,0 diff --git a/docs/tutorial-code/3-add-region/1-new-region/technodata/preset/Residential2050Consumption.csv b/docs/tutorial-code/3-add-region/1-new-region/technodata/preset/Residential2050Consumption.csv index 30ab5ddb1..b25b175a5 100644 --- a/docs/tutorial-code/3-add-region/1-new-region/technodata/preset/Residential2050Consumption.csv +++ b/docs/tutorial-code/3-add-region/1-new-region/technodata/preset/Residential2050Consumption.csv @@ -1,13 +1,13 @@ -RegionName,Timeslice,electricity,gas,heat,CO2f,wind,solar -R1,1,0,0,3.0,0,0,0 -R1,2,0,0,4.5,0,0,0 -R1,3,0,0,3.0,0,0,0 -R1,4,0,0,4.5,0,0,0 -R1,5,0,0,9.0,0,0,0 -R1,6,0,0,6.0,0,0,0 -R2,1,0,0,3.0,0,0,0 -R2,2,0,0,4.5,0,0,0 -R2,3,0,0,3.0,0,0,0 -R2,4,0,0,4.5,0,0,0 -R2,5,0,0,9.0,0,0,0 -R2,6,0,0,6.0,0,0,0 +RegionName,Timeslice,electricity,gas,heat,CO2f,wind +R1,1,0,0,3.0,0,0 +R1,2,0,0,4.5,0,0 +R1,3,0,0,3.0,0,0 +R1,4,0,0,4.5,0,0 +R1,5,0,0,9.0,0,0 +R1,6,0,0,6.0,0,0 +R2,1,0,0,3.0,0,0 +R2,2,0,0,4.5,0,0 +R2,3,0,0,3.0,0,0 +R2,4,0,0,4.5,0,0 +R2,5,0,0,9.0,0,0 +R2,6,0,0,6.0,0,0 diff --git a/docs/tutorial-code/3-add-region/1-new-region/technodata/residential/Technodata.csv b/docs/tutorial-code/3-add-region/1-new-region/technodata/residential/Technodata.csv index 7cf19690a..e447a93ed 100644 --- a/docs/tutorial-code/3-add-region/1-new-region/technodata/residential/Technodata.csv +++ b/docs/tutorial-code/3-add-region/1-new-region/technodata/residential/Technodata.csv @@ -1,6 +1,6 @@ ProcessName,RegionName,Time,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent1 Unit,-,Year,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,New -gasboiler,R1,2020,3.8,1,0,1,0,1,10,0.2,60,10,1,0.00000189,86,0.1,energy,gas,heat,1 -heatpump,R1,2020,8.866667,1,0,1,0,1,10,0.2,60,10,1,0.00000189,86,0.1,energy,electricity,heat,1 -gasboiler,R2,2020,3.8,1,0,1,0,1,10,0.2,60,10,1,0.00000189,86,0.1,energy,gas,heat,1 -heatpump,R2,2020,8.866667,1,0,1,0,1,10,0.2,60,10,1,0.00000189,86,0.1,energy,electricity,heat,1 +gasboiler,R1,2020,3.8,1,0,1,0,1,10,1,100,10,1,0.00000189,86,0.1,energy,gas,heat,1 +heatpump,R1,2020,8.866667,1,0,1,0,1,10,1,100,10,1,0.00000189,86,0.1,energy,electricity,heat,1 +gasboiler,R2,2020,3.8,1,0,1,0,1,10,1,100,10,1,0.00000189,86,0.1,energy,gas,heat,1 +heatpump,R2,2020,8.866667,1,0,1,0,1,10,1,20,10,1,0.00000189,86,0.1,energy,electricity,heat,1 diff --git a/docs/tutorial-code/3-add-region/generate_models.py b/docs/tutorial-code/3-add-region/generate_models.py index 7c8a325db..d9ce280ee 100644 --- a/docs/tutorial-code/3-add-region/generate_models.py +++ b/docs/tutorial-code/3-add-region/generate_models.py @@ -1,8 +1,10 @@ +import os import shutil from pathlib import Path import pandas as pd +from muse import examples from muse.wizard import add_region parent_path = Path(__file__).parent @@ -19,20 +21,18 @@ def generate_model_1(): if model_path.exists(): shutil.rmtree(model_path) - # Starting point: copy model from tutorial 1 - shutil.copytree(parent_path / "../1-add-new-technology/2-scenario", model_path) - if (model_path / "Results").exists(): - shutil.rmtree(model_path / "Results") + # Starting point: copy default model + examples.copy_model(name="default", path=parent_path, overwrite=True) + os.rename(parent_path / "model", model_path) # Add region R2 add_region(model_path, region_name="R2", copy_from="R1") - # Change growth/capacity limits for windturbine in R2 - technodata_file = model_path / "technodata/power/Technodata.csv" + # Reduce capacity limit for heatpump in R2 + technodata_file = model_path / "technodata/residential/Technodata.csv" df = pd.read_csv(technodata_file) - mask = (df["RegionName"] == "R2") & (df["ProcessName"] == "windturbine") - df.loc[mask, "MaxCapacityAddition"] = 5 - df.loc[mask, "TotalCapacityLimit"] = 100 + mask = (df["RegionName"] == "R2") & (df["ProcessName"] == "heatpump") + df.loc[mask, "TotalCapacityLimit"] = 20 df.to_csv(technodata_file, index=False) diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Gas/Capacity.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Gas/Capacity.csv deleted file mode 100644 index 8f9bbbf79..000000000 --- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Gas/Capacity.csv +++ /dev/null @@ -1,33 +0,0 @@ -asset,capacity,installed,region,technology,year -0,15.00000000000,2020,R1,gassupply1,2020 -1,15.00000000000,2020,R2,gassupply1,2020 -0,16.58160000000,2020,R1,gassupply1,2025 -2,16.58160000000,2020,R2,gassupply1,2025 -0,9.08160000000,2020,R1,gassupply1,2030 -1,8.87340000000,2025,R1,gassupply1,2030 -3,9.08160000000,2020,R2,gassupply1,2030 -4,8.87340000000,2025,R2,gassupply1,2030 -0,1.58160000000,2020,R1,gassupply1,2035 -1,8.87340000000,2025,R1,gassupply1,2035 -2,7.50000000000,2030,R1,gassupply1,2035 -3,1.58160000000,2020,R2,gassupply1,2035 -4,8.87340000000,2025,R2,gassupply1,2035 -5,7.50000000000,2030,R2,gassupply1,2035 -0,1.58160000000,2020,R1,gassupply1,2040 -1,8.87340000000,2025,R1,gassupply1,2040 -2,7.50000000000,2030,R1,gassupply1,2040 -3,1.58160000000,2020,R2,gassupply1,2040 -4,8.87340000000,2025,R2,gassupply1,2040 -5,7.50000000000,2030,R2,gassupply1,2040 -0,1.58160000000,2020,R1,gassupply1,2045 -1,8.87340000000,2025,R1,gassupply1,2045 -2,7.50000000000,2030,R1,gassupply1,2045 -3,1.58160000000,2020,R2,gassupply1,2045 -4,8.87340000000,2025,R2,gassupply1,2045 -5,7.50000000000,2030,R2,gassupply1,2045 -0,1.58160000000,2020,R1,gassupply1,2050 -1,8.87340000000,2025,R1,gassupply1,2050 -2,7.50000000000,2030,R1,gassupply1,2050 -3,1.58160000000,2020,R2,gassupply1,2050 -4,8.87340000000,2025,R2,gassupply1,2050 -5,7.50000000000,2030,R2,gassupply1,2050 diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/MCACapacity.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/MCACapacity.csv index 20bfff605..432f0ba0c 100644 --- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/MCACapacity.csv +++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/MCACapacity.csv @@ -1,113 +1,57 @@ agent,capacity,dst_region,installed,region,sector,technology,type,year A1,10.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2020 -A1,10.00000000000,R2,2020,R2,residential,gasboiler,newcapa,2020 A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2020 -A1,1.00000000000,R2,2020,R2,power,gasCCGT,newcapa,2020 A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2020 -A1,15.00000000000,R2,2020,R2,gas,gassupply1,newcapa,2020 A1,5.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2025 A1,17.00000000000,R1,2020,R1,residential,heatpump,newcapa,2025 -A1,5.00000000000,R2,2020,R2,residential,gasboiler,newcapa,2025 -A1,17.00000000000,R2,2020,R2,residential,heatpump,newcapa,2025 A1,6.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2025 -A1,3.80910000000,R1,2020,R1,power,windturbine,newcapa,2025 -A1,6.00000000000,R2,2020,R2,power,gasCCGT,newcapa,2025 -A1,3.80910000000,R2,2020,R2,power,windturbine,newcapa,2025 -A1,16.58160000000,R1,2020,R1,gas,gassupply1,newcapa,2025 -A1,16.58160000000,R2,2020,R2,gas,gassupply1,newcapa,2025 +A1,3.00000000000,R1,2020,R1,power,windturbine,newcapa,2025 +A1,17.07300000000,R1,2020,R1,gas,gassupply1,newcapa,2025 A1,17.00000000000,R1,2020,R1,residential,heatpump,newcapa,2030 A1,11.00000000000,R1,2025,R1,residential,heatpump,newcapa,2030 -A1,17.00000000000,R2,2020,R2,residential,heatpump,newcapa,2030 -A1,11.00000000000,R2,2025,R2,residential,heatpump,newcapa,2030 A1,5.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2030 -A1,5.75150000000,R1,2025,R1,power,gasCCGT,newcapa,2030 -A1,3.80910000000,R1,2020,R1,power,windturbine,newcapa,2030 -A1,5.00000000000,R2,2020,R2,power,gasCCGT,newcapa,2030 -A1,5.75150000000,R2,2025,R2,power,gasCCGT,newcapa,2030 -A1,3.80910000000,R2,2020,R2,power,windturbine,newcapa,2030 -A1,9.08160000000,R1,2020,R1,gas,gassupply1,newcapa,2030 -A1,8.87340000000,R1,2025,R1,gas,gassupply1,newcapa,2030 -A1,9.08160000000,R2,2020,R2,gas,gassupply1,newcapa,2030 -A1,8.87340000000,R2,2025,R2,gas,gassupply1,newcapa,2030 +A1,6.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2030 +A1,3.00000000000,R1,2020,R1,power,windturbine,newcapa,2030 +A1,9.57300000000,R1,2020,R1,gas,gassupply1,newcapa,2030 +A1,8.96250000000,R1,2025,R1,gas,gassupply1,newcapa,2030 A1,11.00000000000,R1,2025,R1,residential,heatpump,newcapa,2035 A1,22.00000000000,R1,2030,R1,residential,heatpump,newcapa,2035 -A1,11.00000000000,R2,2025,R2,residential,heatpump,newcapa,2035 -A1,22.00000000000,R2,2030,R2,residential,heatpump,newcapa,2035 A1,5.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2035 -A1,5.75150000000,R1,2025,R1,power,gasCCGT,newcapa,2035 -A1,5.60000000000,R1,2030,R1,power,solarPV,newcapa,2035 -A1,3.80910000000,R1,2020,R1,power,windturbine,newcapa,2035 -A1,5.00000000000,R2,2020,R2,power,gasCCGT,newcapa,2035 -A1,5.75150000000,R2,2025,R2,power,gasCCGT,newcapa,2035 -A1,5.60000000000,R2,2030,R2,power,solarPV,newcapa,2035 -A1,3.80910000000,R2,2020,R2,power,windturbine,newcapa,2035 -A1,1.58160000000,R1,2020,R1,gas,gassupply1,newcapa,2035 -A1,8.87340000000,R1,2025,R1,gas,gassupply1,newcapa,2035 -A1,7.50000000000,R1,2030,R1,gas,gassupply1,newcapa,2035 -A1,1.58160000000,R2,2020,R2,gas,gassupply1,newcapa,2035 -A1,8.87340000000,R2,2025,R2,gas,gassupply1,newcapa,2035 -A1,7.50000000000,R2,2030,R2,gas,gassupply1,newcapa,2035 +A1,6.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2035 +A1,3.00000000000,R1,2020,R1,power,windturbine,newcapa,2035 +A1,5.00000000000,R1,2030,R1,power,windturbine,newcapa,2035 +A1,2.07300000000,R1,2020,R1,gas,gassupply1,newcapa,2035 +A1,8.96250000000,R1,2025,R1,gas,gassupply1,newcapa,2035 +A1,7.81130000000,R1,2030,R1,gas,gassupply1,newcapa,2035 A1,22.00000000000,R1,2030,R1,residential,heatpump,newcapa,2040 A1,17.00000000000,R1,2035,R1,residential,heatpump,newcapa,2040 -A1,22.00000000000,R2,2030,R2,residential,heatpump,newcapa,2040 -A1,17.00000000000,R2,2035,R2,residential,heatpump,newcapa,2040 A1,5.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2040 -A1,5.75150000000,R1,2025,R1,power,gasCCGT,newcapa,2040 -A1,5.60000000000,R1,2030,R1,power,solarPV,newcapa,2040 -A1,5.60000000000,R1,2035,R1,power,solarPV,newcapa,2040 -A1,3.80910000000,R1,2020,R1,power,windturbine,newcapa,2040 -A1,5.00000000000,R2,2020,R2,power,gasCCGT,newcapa,2040 -A1,5.75150000000,R2,2025,R2,power,gasCCGT,newcapa,2040 -A1,5.60000000000,R2,2030,R2,power,solarPV,newcapa,2040 -A1,5.60000000000,R2,2035,R2,power,solarPV,newcapa,2040 -A1,3.80910000000,R2,2020,R2,power,windturbine,newcapa,2040 -A1,1.58160000000,R1,2020,R1,gas,gassupply1,newcapa,2040 -A1,8.87340000000,R1,2025,R1,gas,gassupply1,newcapa,2040 -A1,7.50000000000,R1,2030,R1,gas,gassupply1,newcapa,2040 -A1,1.58160000000,R2,2020,R2,gas,gassupply1,newcapa,2040 -A1,8.87340000000,R2,2025,R2,gas,gassupply1,newcapa,2040 -A1,7.50000000000,R2,2030,R2,gas,gassupply1,newcapa,2040 +A1,6.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2040 +A1,3.00000000000,R1,2020,R1,power,windturbine,newcapa,2040 +A1,5.00000000000,R1,2030,R1,power,windturbine,newcapa,2040 +A1,6.00000000000,R1,2035,R1,power,windturbine,newcapa,2040 +A1,2.07300000000,R1,2020,R1,gas,gassupply1,newcapa,2040 +A1,8.96250000000,R1,2025,R1,gas,gassupply1,newcapa,2040 +A1,7.81130000000,R1,2030,R1,gas,gassupply1,newcapa,2040 A1,17.00000000000,R1,2035,R1,residential,heatpump,newcapa,2045 A1,27.00000000000,R1,2040,R1,residential,heatpump,newcapa,2045 -A1,17.00000000000,R2,2035,R2,residential,heatpump,newcapa,2045 -A1,27.00000000000,R2,2040,R2,residential,heatpump,newcapa,2045 A1,5.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2045 -A1,5.75150000000,R1,2025,R1,power,gasCCGT,newcapa,2045 -A1,5.60000000000,R1,2030,R1,power,solarPV,newcapa,2045 -A1,5.60000000000,R1,2035,R1,power,solarPV,newcapa,2045 -A1,5.60000000000,R1,2040,R1,power,solarPV,newcapa,2045 -A1,3.80910000000,R1,2020,R1,power,windturbine,newcapa,2045 -A1,5.00000000000,R2,2020,R2,power,gasCCGT,newcapa,2045 -A1,5.75150000000,R2,2025,R2,power,gasCCGT,newcapa,2045 -A1,5.60000000000,R2,2030,R2,power,solarPV,newcapa,2045 -A1,5.60000000000,R2,2035,R2,power,solarPV,newcapa,2045 -A1,5.60000000000,R2,2040,R2,power,solarPV,newcapa,2045 -A1,3.80910000000,R2,2020,R2,power,windturbine,newcapa,2045 -A1,1.58160000000,R1,2020,R1,gas,gassupply1,newcapa,2045 -A1,8.87340000000,R1,2025,R1,gas,gassupply1,newcapa,2045 -A1,7.50000000000,R1,2030,R1,gas,gassupply1,newcapa,2045 -A1,1.58160000000,R2,2020,R2,gas,gassupply1,newcapa,2045 -A1,8.87340000000,R2,2025,R2,gas,gassupply1,newcapa,2045 -A1,7.50000000000,R2,2030,R2,gas,gassupply1,newcapa,2045 +A1,6.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2045 +A1,3.00000000000,R1,2020,R1,power,windturbine,newcapa,2045 +A1,5.00000000000,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,2.07300000000,R1,2020,R1,gas,gassupply1,newcapa,2045 +A1,8.96250000000,R1,2025,R1,gas,gassupply1,newcapa,2045 +A1,7.81130000000,R1,2030,R1,gas,gassupply1,newcapa,2045 A1,27.00000000000,R1,2040,R1,residential,heatpump,newcapa,2050 A1,23.00000000000,R1,2045,R1,residential,heatpump,newcapa,2050 -A1,27.00000000000,R2,2040,R2,residential,heatpump,newcapa,2050 -A1,23.00000000000,R2,2045,R2,residential,heatpump,newcapa,2050 A1,5.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2050 -A1,5.75150000000,R1,2025,R1,power,gasCCGT,newcapa,2050 -A1,5.60000000000,R1,2030,R1,power,solarPV,newcapa,2050 -A1,5.60000000000,R1,2035,R1,power,solarPV,newcapa,2050 -A1,5.60000000000,R1,2040,R1,power,solarPV,newcapa,2050 -A1,9.40910000000,R1,2045,R1,power,solarPV,newcapa,2050 -A1,5.00000000000,R2,2020,R2,power,gasCCGT,newcapa,2050 -A1,5.75150000000,R2,2025,R2,power,gasCCGT,newcapa,2050 -A1,5.60000000000,R2,2030,R2,power,solarPV,newcapa,2050 -A1,5.60000000000,R2,2035,R2,power,solarPV,newcapa,2050 -A1,5.60000000000,R2,2040,R2,power,solarPV,newcapa,2050 -A1,9.40910000000,R2,2045,R2,power,solarPV,newcapa,2050 -A1,1.58160000000,R1,2020,R1,gas,gassupply1,newcapa,2050 -A1,8.87340000000,R1,2025,R1,gas,gassupply1,newcapa,2050 -A1,7.50000000000,R1,2030,R1,gas,gassupply1,newcapa,2050 -A1,1.58160000000,R2,2020,R2,gas,gassupply1,newcapa,2050 -A1,8.87340000000,R2,2025,R2,gas,gassupply1,newcapa,2050 -A1,7.50000000000,R2,2030,R2,gas,gassupply1,newcapa,2050 +A1,6.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2050 +A1,5.00000000000,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,8.00000000000,R1,2045,R1,power,windturbine,newcapa,2050 +A1,2.07300000000,R1,2020,R1,gas,gassupply1,newcapa,2050 +A1,8.96250000000,R1,2025,R1,gas,gassupply1,newcapa,2050 +A1,7.81130000000,R1,2030,R1,gas,gassupply1,newcapa,2050 diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/MCAPrices.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/MCAPrices.csv index 7b65d6153..372af7073 100644 --- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/MCAPrices.csv +++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/MCAPrices.csv @@ -1,449 +1,225 @@ commodity,day,hour,month,prices,region,timeslice,units_prices,year electricity,all-week,night,all-year,19.50000000000,R1,0,MUS$2010/PJ,2020 -electricity,all-week,night,all-year,19.50000000000,R2,0,MUS$2010/PJ,2020 gas,all-week,night,all-year,7.15280000000,R1,0,MUS$2010/PJ,2020 -gas,all-week,night,all-year,7.15280000000,R2,0,MUS$2010/PJ,2020 heat,all-week,night,all-year,100.00000000000,R1,0,MUS$2010/PJ,2020 -heat,all-week,night,all-year,100.00000000000,R2,0,MUS$2010/PJ,2020 CO2f,all-week,night,all-year,0.08310000000,R1,0,MUS$2010/kt,2020 -CO2f,all-week,night,all-year,0.08310000000,R2,0,MUS$2010/kt,2020 electricity,all-week,morning,all-year,19.50000000000,R1,1,MUS$2010/PJ,2020 -electricity,all-week,morning,all-year,19.50000000000,R2,1,MUS$2010/PJ,2020 gas,all-week,morning,all-year,7.15280000000,R1,1,MUS$2010/PJ,2020 -gas,all-week,morning,all-year,7.15280000000,R2,1,MUS$2010/PJ,2020 heat,all-week,morning,all-year,100.00000000000,R1,1,MUS$2010/PJ,2020 -heat,all-week,morning,all-year,100.00000000000,R2,1,MUS$2010/PJ,2020 CO2f,all-week,morning,all-year,0.08310000000,R1,1,MUS$2010/kt,2020 -CO2f,all-week,morning,all-year,0.08310000000,R2,1,MUS$2010/kt,2020 electricity,all-week,mid-afternoon,all-year,19.50000000000,R1,2,MUS$2010/PJ,2020 -electricity,all-week,mid-afternoon,all-year,19.50000000000,R2,2,MUS$2010/PJ,2020 gas,all-week,mid-afternoon,all-year,7.15280000000,R1,2,MUS$2010/PJ,2020 -gas,all-week,mid-afternoon,all-year,7.15280000000,R2,2,MUS$2010/PJ,2020 heat,all-week,mid-afternoon,all-year,100.00000000000,R1,2,MUS$2010/PJ,2020 -heat,all-week,mid-afternoon,all-year,100.00000000000,R2,2,MUS$2010/PJ,2020 CO2f,all-week,mid-afternoon,all-year,0.08310000000,R1,2,MUS$2010/kt,2020 -CO2f,all-week,mid-afternoon,all-year,0.08310000000,R2,2,MUS$2010/kt,2020 electricity,all-week,early-peak,all-year,19.50000000000,R1,3,MUS$2010/PJ,2020 -electricity,all-week,early-peak,all-year,19.50000000000,R2,3,MUS$2010/PJ,2020 gas,all-week,early-peak,all-year,7.15280000000,R1,3,MUS$2010/PJ,2020 -gas,all-week,early-peak,all-year,7.15280000000,R2,3,MUS$2010/PJ,2020 heat,all-week,early-peak,all-year,100.00000000000,R1,3,MUS$2010/PJ,2020 -heat,all-week,early-peak,all-year,100.00000000000,R2,3,MUS$2010/PJ,2020 CO2f,all-week,early-peak,all-year,0.08310000000,R1,3,MUS$2010/kt,2020 -CO2f,all-week,early-peak,all-year,0.08310000000,R2,3,MUS$2010/kt,2020 electricity,all-week,late-peak,all-year,19.50000000000,R1,4,MUS$2010/PJ,2020 -electricity,all-week,late-peak,all-year,19.50000000000,R2,4,MUS$2010/PJ,2020 gas,all-week,late-peak,all-year,7.15280000000,R1,4,MUS$2010/PJ,2020 -gas,all-week,late-peak,all-year,7.15280000000,R2,4,MUS$2010/PJ,2020 heat,all-week,late-peak,all-year,100.00000000000,R1,4,MUS$2010/PJ,2020 -heat,all-week,late-peak,all-year,100.00000000000,R2,4,MUS$2010/PJ,2020 CO2f,all-week,late-peak,all-year,0.08310000000,R1,4,MUS$2010/kt,2020 -CO2f,all-week,late-peak,all-year,0.08310000000,R2,4,MUS$2010/kt,2020 electricity,all-week,evening,all-year,19.50000000000,R1,5,MUS$2010/PJ,2020 -electricity,all-week,evening,all-year,19.50000000000,R2,5,MUS$2010/PJ,2020 gas,all-week,evening,all-year,7.15280000000,R1,5,MUS$2010/PJ,2020 -gas,all-week,evening,all-year,7.15280000000,R2,5,MUS$2010/PJ,2020 heat,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020 -heat,all-week,evening,all-year,100.00000000000,R2,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.08310000000,R1,5,MUS$2010/kt,2020 -CO2f,all-week,evening,all-year,0.08310000000,R2,5,MUS$2010/kt,2020 electricity,all-week,early-morning,all-year,19.50000000000,R1,6,MUS$2010/PJ,2020 -electricity,all-week,early-morning,all-year,19.50000000000,R2,6,MUS$2010/PJ,2020 gas,all-week,early-morning,all-year,7.15280000000,R1,6,MUS$2010/PJ,2020 -gas,all-week,early-morning,all-year,7.15280000000,R2,6,MUS$2010/PJ,2020 heat,all-week,early-morning,all-year,100.00000000000,R1,6,MUS$2010/PJ,2020 -heat,all-week,early-morning,all-year,100.00000000000,R2,6,MUS$2010/PJ,2020 CO2f,all-week,early-morning,all-year,0.08310000000,R1,6,MUS$2010/kt,2020 -CO2f,all-week,early-morning,all-year,0.08310000000,R2,6,MUS$2010/kt,2020 electricity,all-week,late-afternoon,all-year,19.50000000000,R1,7,MUS$2010/PJ,2020 -electricity,all-week,late-afternoon,all-year,19.50000000000,R2,7,MUS$2010/PJ,2020 gas,all-week,late-afternoon,all-year,7.15280000000,R1,7,MUS$2010/PJ,2020 -gas,all-week,late-afternoon,all-year,7.15280000000,R2,7,MUS$2010/PJ,2020 heat,all-week,late-afternoon,all-year,100.00000000000,R1,7,MUS$2010/PJ,2020 -heat,all-week,late-afternoon,all-year,100.00000000000,R2,7,MUS$2010/PJ,2020 CO2f,all-week,late-afternoon,all-year,0.08310000000,R1,7,MUS$2010/kt,2020 -CO2f,all-week,late-afternoon,all-year,0.08310000000,R2,7,MUS$2010/kt,2020 -electricity,all-week,night,all-year,9.58810000000,R1,0,MUS$2010/PJ,2025 -electricity,all-week,night,all-year,9.58810000000,R2,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,9.99700000000,R1,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,0.35420000000,R1,0,MUS$2010/PJ,2025 -gas,all-week,night,all-year,0.35420000000,R2,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,4.97980000000,R1,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,4.97980000000,R2,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,5.10610000000,R1,0,MUS$2010/PJ,2025 CO2f,all-week,night,all-year,0.12010000000,R1,0,MUS$2010/kt,2025 -CO2f,all-week,night,all-year,0.12010000000,R2,0,MUS$2010/kt,2025 -electricity,all-week,morning,all-year,9.58810000000,R1,1,MUS$2010/PJ,2025 -electricity,all-week,morning,all-year,9.58810000000,R2,1,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,9.99700000000,R1,1,MUS$2010/PJ,2025 gas,all-week,morning,all-year,0.35420000000,R1,1,MUS$2010/PJ,2025 -gas,all-week,morning,all-year,0.35420000000,R2,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,4.97980000000,R1,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,4.97980000000,R2,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,5.10610000000,R1,1,MUS$2010/PJ,2025 CO2f,all-week,morning,all-year,0.12010000000,R1,1,MUS$2010/kt,2025 -CO2f,all-week,morning,all-year,0.12010000000,R2,1,MUS$2010/kt,2025 -electricity,all-week,mid-afternoon,all-year,9.58810000000,R1,2,MUS$2010/PJ,2025 -electricity,all-week,mid-afternoon,all-year,9.58810000000,R2,2,MUS$2010/PJ,2025 +electricity,all-week,mid-afternoon,all-year,9.99700000000,R1,2,MUS$2010/PJ,2025 gas,all-week,mid-afternoon,all-year,0.35420000000,R1,2,MUS$2010/PJ,2025 -gas,all-week,mid-afternoon,all-year,0.35420000000,R2,2,MUS$2010/PJ,2025 -heat,all-week,mid-afternoon,all-year,4.97980000000,R1,2,MUS$2010/PJ,2025 -heat,all-week,mid-afternoon,all-year,4.97980000000,R2,2,MUS$2010/PJ,2025 +heat,all-week,mid-afternoon,all-year,5.10610000000,R1,2,MUS$2010/PJ,2025 CO2f,all-week,mid-afternoon,all-year,0.12010000000,R1,2,MUS$2010/kt,2025 -CO2f,all-week,mid-afternoon,all-year,0.12010000000,R2,2,MUS$2010/kt,2025 -electricity,all-week,early-peak,all-year,9.58810000000,R1,3,MUS$2010/PJ,2025 -electricity,all-week,early-peak,all-year,9.58810000000,R2,3,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,9.99700000000,R1,3,MUS$2010/PJ,2025 gas,all-week,early-peak,all-year,0.35420000000,R1,3,MUS$2010/PJ,2025 -gas,all-week,early-peak,all-year,0.35420000000,R2,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,4.97980000000,R1,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,4.97980000000,R2,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,5.10610000000,R1,3,MUS$2010/PJ,2025 CO2f,all-week,early-peak,all-year,0.12010000000,R1,3,MUS$2010/kt,2025 -CO2f,all-week,early-peak,all-year,0.12010000000,R2,3,MUS$2010/kt,2025 -electricity,all-week,late-peak,all-year,9.58810000000,R1,4,MUS$2010/PJ,2025 -electricity,all-week,late-peak,all-year,9.58810000000,R2,4,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,9.99700000000,R1,4,MUS$2010/PJ,2025 gas,all-week,late-peak,all-year,0.35420000000,R1,4,MUS$2010/PJ,2025 -gas,all-week,late-peak,all-year,0.35420000000,R2,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,4.97980000000,R1,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,4.97980000000,R2,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,5.10610000000,R1,4,MUS$2010/PJ,2025 CO2f,all-week,late-peak,all-year,0.12010000000,R1,4,MUS$2010/kt,2025 -CO2f,all-week,late-peak,all-year,0.12010000000,R2,4,MUS$2010/kt,2025 -electricity,all-week,evening,all-year,9.58810000000,R1,5,MUS$2010/PJ,2025 -electricity,all-week,evening,all-year,9.58810000000,R2,5,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,9.99700000000,R1,5,MUS$2010/PJ,2025 gas,all-week,evening,all-year,0.35420000000,R1,5,MUS$2010/PJ,2025 -gas,all-week,evening,all-year,0.35420000000,R2,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,4.97980000000,R1,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,4.97980000000,R2,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,5.10610000000,R1,5,MUS$2010/PJ,2025 CO2f,all-week,evening,all-year,0.12010000000,R1,5,MUS$2010/kt,2025 -CO2f,all-week,evening,all-year,0.12010000000,R2,5,MUS$2010/kt,2025 -electricity,all-week,early-morning,all-year,9.58810000000,R1,6,MUS$2010/PJ,2025 -electricity,all-week,early-morning,all-year,9.58810000000,R2,6,MUS$2010/PJ,2025 +electricity,all-week,early-morning,all-year,9.99700000000,R1,6,MUS$2010/PJ,2025 gas,all-week,early-morning,all-year,0.35420000000,R1,6,MUS$2010/PJ,2025 -gas,all-week,early-morning,all-year,0.35420000000,R2,6,MUS$2010/PJ,2025 -heat,all-week,early-morning,all-year,4.97980000000,R1,6,MUS$2010/PJ,2025 -heat,all-week,early-morning,all-year,4.97980000000,R2,6,MUS$2010/PJ,2025 +heat,all-week,early-morning,all-year,5.10610000000,R1,6,MUS$2010/PJ,2025 CO2f,all-week,early-morning,all-year,0.12010000000,R1,6,MUS$2010/kt,2025 -CO2f,all-week,early-morning,all-year,0.12010000000,R2,6,MUS$2010/kt,2025 -electricity,all-week,late-afternoon,all-year,9.58810000000,R1,7,MUS$2010/PJ,2025 -electricity,all-week,late-afternoon,all-year,9.58810000000,R2,7,MUS$2010/PJ,2025 +electricity,all-week,late-afternoon,all-year,9.99700000000,R1,7,MUS$2010/PJ,2025 gas,all-week,late-afternoon,all-year,0.35420000000,R1,7,MUS$2010/PJ,2025 -gas,all-week,late-afternoon,all-year,0.35420000000,R2,7,MUS$2010/PJ,2025 -heat,all-week,late-afternoon,all-year,4.97980000000,R1,7,MUS$2010/PJ,2025 -heat,all-week,late-afternoon,all-year,4.97980000000,R2,7,MUS$2010/PJ,2025 +heat,all-week,late-afternoon,all-year,5.10610000000,R1,7,MUS$2010/PJ,2025 CO2f,all-week,late-afternoon,all-year,0.12010000000,R1,7,MUS$2010/kt,2025 -CO2f,all-week,late-afternoon,all-year,0.12010000000,R2,7,MUS$2010/kt,2025 -electricity,all-week,night,all-year,13.41110000000,R1,0,MUS$2010/PJ,2030 -electricity,all-week,night,all-year,13.41110000000,R2,0,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,13.80430000000,R1,0,MUS$2010/PJ,2030 gas,all-week,night,all-year,0.35420000000,R1,0,MUS$2010/PJ,2030 -gas,all-week,night,all-year,0.35420000000,R2,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,5.54480000000,R1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,5.54480000000,R2,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,5.70210000000,R1,0,MUS$2010/PJ,2030 CO2f,all-week,night,all-year,0.15700000000,R1,0,MUS$2010/kt,2030 -CO2f,all-week,night,all-year,0.15700000000,R2,0,MUS$2010/kt,2030 -electricity,all-week,morning,all-year,13.41110000000,R1,1,MUS$2010/PJ,2030 -electricity,all-week,morning,all-year,13.41110000000,R2,1,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,13.80430000000,R1,1,MUS$2010/PJ,2030 gas,all-week,morning,all-year,0.35420000000,R1,1,MUS$2010/PJ,2030 -gas,all-week,morning,all-year,0.35420000000,R2,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,5.54480000000,R1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,5.54480000000,R2,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,5.70210000000,R1,1,MUS$2010/PJ,2030 CO2f,all-week,morning,all-year,0.15700000000,R1,1,MUS$2010/kt,2030 -CO2f,all-week,morning,all-year,0.15700000000,R2,1,MUS$2010/kt,2030 -electricity,all-week,mid-afternoon,all-year,13.41110000000,R1,2,MUS$2010/PJ,2030 -electricity,all-week,mid-afternoon,all-year,13.41110000000,R2,2,MUS$2010/PJ,2030 +electricity,all-week,mid-afternoon,all-year,13.80430000000,R1,2,MUS$2010/PJ,2030 gas,all-week,mid-afternoon,all-year,0.35420000000,R1,2,MUS$2010/PJ,2030 -gas,all-week,mid-afternoon,all-year,0.35420000000,R2,2,MUS$2010/PJ,2030 -heat,all-week,mid-afternoon,all-year,5.54480000000,R1,2,MUS$2010/PJ,2030 -heat,all-week,mid-afternoon,all-year,5.54480000000,R2,2,MUS$2010/PJ,2030 +heat,all-week,mid-afternoon,all-year,5.70210000000,R1,2,MUS$2010/PJ,2030 CO2f,all-week,mid-afternoon,all-year,0.15700000000,R1,2,MUS$2010/kt,2030 -CO2f,all-week,mid-afternoon,all-year,0.15700000000,R2,2,MUS$2010/kt,2030 -electricity,all-week,early-peak,all-year,13.41110000000,R1,3,MUS$2010/PJ,2030 -electricity,all-week,early-peak,all-year,13.41110000000,R2,3,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,13.80430000000,R1,3,MUS$2010/PJ,2030 gas,all-week,early-peak,all-year,0.35420000000,R1,3,MUS$2010/PJ,2030 -gas,all-week,early-peak,all-year,0.35420000000,R2,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,5.54480000000,R1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,5.54480000000,R2,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,5.70210000000,R1,3,MUS$2010/PJ,2030 CO2f,all-week,early-peak,all-year,0.15700000000,R1,3,MUS$2010/kt,2030 -CO2f,all-week,early-peak,all-year,0.15700000000,R2,3,MUS$2010/kt,2030 -electricity,all-week,late-peak,all-year,13.41110000000,R1,4,MUS$2010/PJ,2030 -electricity,all-week,late-peak,all-year,13.41110000000,R2,4,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,13.80430000000,R1,4,MUS$2010/PJ,2030 gas,all-week,late-peak,all-year,0.35420000000,R1,4,MUS$2010/PJ,2030 -gas,all-week,late-peak,all-year,0.35420000000,R2,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,5.54480000000,R1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,5.54480000000,R2,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,5.70210000000,R1,4,MUS$2010/PJ,2030 CO2f,all-week,late-peak,all-year,0.15700000000,R1,4,MUS$2010/kt,2030 -CO2f,all-week,late-peak,all-year,0.15700000000,R2,4,MUS$2010/kt,2030 -electricity,all-week,evening,all-year,13.41110000000,R1,5,MUS$2010/PJ,2030 -electricity,all-week,evening,all-year,13.41110000000,R2,5,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,13.80430000000,R1,5,MUS$2010/PJ,2030 gas,all-week,evening,all-year,0.35420000000,R1,5,MUS$2010/PJ,2030 -gas,all-week,evening,all-year,0.35420000000,R2,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,5.54480000000,R1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,5.54480000000,R2,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,5.70210000000,R1,5,MUS$2010/PJ,2030 CO2f,all-week,evening,all-year,0.15700000000,R1,5,MUS$2010/kt,2030 -CO2f,all-week,evening,all-year,0.15700000000,R2,5,MUS$2010/kt,2030 -electricity,all-week,early-morning,all-year,13.41110000000,R1,6,MUS$2010/PJ,2030 -electricity,all-week,early-morning,all-year,13.41110000000,R2,6,MUS$2010/PJ,2030 +electricity,all-week,early-morning,all-year,13.80430000000,R1,6,MUS$2010/PJ,2030 gas,all-week,early-morning,all-year,0.35420000000,R1,6,MUS$2010/PJ,2030 -gas,all-week,early-morning,all-year,0.35420000000,R2,6,MUS$2010/PJ,2030 -heat,all-week,early-morning,all-year,5.54480000000,R1,6,MUS$2010/PJ,2030 -heat,all-week,early-morning,all-year,5.54480000000,R2,6,MUS$2010/PJ,2030 +heat,all-week,early-morning,all-year,5.70210000000,R1,6,MUS$2010/PJ,2030 CO2f,all-week,early-morning,all-year,0.15700000000,R1,6,MUS$2010/kt,2030 -CO2f,all-week,early-morning,all-year,0.15700000000,R2,6,MUS$2010/kt,2030 -electricity,all-week,late-afternoon,all-year,13.41110000000,R1,7,MUS$2010/PJ,2030 -electricity,all-week,late-afternoon,all-year,13.41110000000,R2,7,MUS$2010/PJ,2030 +electricity,all-week,late-afternoon,all-year,13.80430000000,R1,7,MUS$2010/PJ,2030 gas,all-week,late-afternoon,all-year,0.35420000000,R1,7,MUS$2010/PJ,2030 -gas,all-week,late-afternoon,all-year,0.35420000000,R2,7,MUS$2010/PJ,2030 -heat,all-week,late-afternoon,all-year,5.54480000000,R1,7,MUS$2010/PJ,2030 -heat,all-week,late-afternoon,all-year,5.54480000000,R2,7,MUS$2010/PJ,2030 +heat,all-week,late-afternoon,all-year,5.70210000000,R1,7,MUS$2010/PJ,2030 CO2f,all-week,late-afternoon,all-year,0.15700000000,R1,7,MUS$2010/kt,2030 -CO2f,all-week,late-afternoon,all-year,0.15700000000,R2,7,MUS$2010/kt,2030 -electricity,all-week,night,all-year,15.19670000000,R1,0,MUS$2010/PJ,2035 -electricity,all-week,night,all-year,15.19670000000,R2,0,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,15.89730000000,R1,0,MUS$2010/PJ,2035 gas,all-week,night,all-year,0.35420000000,R1,0,MUS$2010/PJ,2035 -gas,all-week,night,all-year,0.35420000000,R2,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,6.25910000000,R1,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,6.25910000000,R2,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,6.53930000000,R1,0,MUS$2010/PJ,2035 CO2f,all-week,night,all-year,0.21490000000,R1,0,MUS$2010/kt,2035 -CO2f,all-week,night,all-year,0.21490000000,R2,0,MUS$2010/kt,2035 -electricity,all-week,morning,all-year,15.19670000000,R1,1,MUS$2010/PJ,2035 -electricity,all-week,morning,all-year,15.19670000000,R2,1,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,15.89730000000,R1,1,MUS$2010/PJ,2035 gas,all-week,morning,all-year,0.35420000000,R1,1,MUS$2010/PJ,2035 -gas,all-week,morning,all-year,0.35420000000,R2,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,6.25910000000,R1,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,6.25910000000,R2,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,6.53930000000,R1,1,MUS$2010/PJ,2035 CO2f,all-week,morning,all-year,0.21490000000,R1,1,MUS$2010/kt,2035 -CO2f,all-week,morning,all-year,0.21490000000,R2,1,MUS$2010/kt,2035 -electricity,all-week,mid-afternoon,all-year,15.19670000000,R1,2,MUS$2010/PJ,2035 -electricity,all-week,mid-afternoon,all-year,15.19670000000,R2,2,MUS$2010/PJ,2035 +electricity,all-week,mid-afternoon,all-year,15.89730000000,R1,2,MUS$2010/PJ,2035 gas,all-week,mid-afternoon,all-year,0.35420000000,R1,2,MUS$2010/PJ,2035 -gas,all-week,mid-afternoon,all-year,0.35420000000,R2,2,MUS$2010/PJ,2035 -heat,all-week,mid-afternoon,all-year,6.25910000000,R1,2,MUS$2010/PJ,2035 -heat,all-week,mid-afternoon,all-year,6.25910000000,R2,2,MUS$2010/PJ,2035 +heat,all-week,mid-afternoon,all-year,6.53930000000,R1,2,MUS$2010/PJ,2035 CO2f,all-week,mid-afternoon,all-year,0.21490000000,R1,2,MUS$2010/kt,2035 -CO2f,all-week,mid-afternoon,all-year,0.21490000000,R2,2,MUS$2010/kt,2035 -electricity,all-week,early-peak,all-year,15.19670000000,R1,3,MUS$2010/PJ,2035 -electricity,all-week,early-peak,all-year,15.19670000000,R2,3,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,15.89730000000,R1,3,MUS$2010/PJ,2035 gas,all-week,early-peak,all-year,0.35420000000,R1,3,MUS$2010/PJ,2035 -gas,all-week,early-peak,all-year,0.35420000000,R2,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,6.25910000000,R1,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,6.25910000000,R2,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,6.53930000000,R1,3,MUS$2010/PJ,2035 CO2f,all-week,early-peak,all-year,0.21490000000,R1,3,MUS$2010/kt,2035 -CO2f,all-week,early-peak,all-year,0.21490000000,R2,3,MUS$2010/kt,2035 -electricity,all-week,late-peak,all-year,15.19670000000,R1,4,MUS$2010/PJ,2035 -electricity,all-week,late-peak,all-year,15.19670000000,R2,4,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,15.89730000000,R1,4,MUS$2010/PJ,2035 gas,all-week,late-peak,all-year,0.35420000000,R1,4,MUS$2010/PJ,2035 -gas,all-week,late-peak,all-year,0.35420000000,R2,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,6.25910000000,R1,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,6.25910000000,R2,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,6.53930000000,R1,4,MUS$2010/PJ,2035 CO2f,all-week,late-peak,all-year,0.21490000000,R1,4,MUS$2010/kt,2035 -CO2f,all-week,late-peak,all-year,0.21490000000,R2,4,MUS$2010/kt,2035 -electricity,all-week,evening,all-year,15.19670000000,R1,5,MUS$2010/PJ,2035 -electricity,all-week,evening,all-year,15.19670000000,R2,5,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,15.89730000000,R1,5,MUS$2010/PJ,2035 gas,all-week,evening,all-year,0.35420000000,R1,5,MUS$2010/PJ,2035 -gas,all-week,evening,all-year,0.35420000000,R2,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,6.25910000000,R1,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,6.25910000000,R2,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,6.53930000000,R1,5,MUS$2010/PJ,2035 CO2f,all-week,evening,all-year,0.21490000000,R1,5,MUS$2010/kt,2035 -CO2f,all-week,evening,all-year,0.21490000000,R2,5,MUS$2010/kt,2035 -electricity,all-week,early-morning,all-year,15.19670000000,R1,6,MUS$2010/PJ,2035 -electricity,all-week,early-morning,all-year,15.19670000000,R2,6,MUS$2010/PJ,2035 +electricity,all-week,early-morning,all-year,15.89730000000,R1,6,MUS$2010/PJ,2035 gas,all-week,early-morning,all-year,0.35420000000,R1,6,MUS$2010/PJ,2035 -gas,all-week,early-morning,all-year,0.35420000000,R2,6,MUS$2010/PJ,2035 -heat,all-week,early-morning,all-year,6.25910000000,R1,6,MUS$2010/PJ,2035 -heat,all-week,early-morning,all-year,6.25910000000,R2,6,MUS$2010/PJ,2035 +heat,all-week,early-morning,all-year,6.53930000000,R1,6,MUS$2010/PJ,2035 CO2f,all-week,early-morning,all-year,0.21490000000,R1,6,MUS$2010/kt,2035 -CO2f,all-week,early-morning,all-year,0.21490000000,R2,6,MUS$2010/kt,2035 -electricity,all-week,late-afternoon,all-year,15.19670000000,R1,7,MUS$2010/PJ,2035 -electricity,all-week,late-afternoon,all-year,15.19670000000,R2,7,MUS$2010/PJ,2035 +electricity,all-week,late-afternoon,all-year,15.89730000000,R1,7,MUS$2010/PJ,2035 gas,all-week,late-afternoon,all-year,0.35420000000,R1,7,MUS$2010/PJ,2035 -gas,all-week,late-afternoon,all-year,0.35420000000,R2,7,MUS$2010/PJ,2035 -heat,all-week,late-afternoon,all-year,6.25910000000,R1,7,MUS$2010/PJ,2035 -heat,all-week,late-afternoon,all-year,6.25910000000,R2,7,MUS$2010/PJ,2035 +heat,all-week,late-afternoon,all-year,6.53930000000,R1,7,MUS$2010/PJ,2035 CO2f,all-week,late-afternoon,all-year,0.21490000000,R1,7,MUS$2010/kt,2035 -CO2f,all-week,late-afternoon,all-year,0.21490000000,R2,7,MUS$2010/kt,2035 -electricity,all-week,night,all-year,16.45990000000,R1,0,MUS$2010/PJ,2040 -electricity,all-week,night,all-year,16.45990000000,R2,0,MUS$2010/PJ,2040 +electricity,all-week,night,all-year,17.01820000000,R1,0,MUS$2010/PJ,2040 gas,all-week,night,all-year,0.35420000000,R1,0,MUS$2010/PJ,2040 -gas,all-week,night,all-year,0.35420000000,R2,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,6.76430000000,R1,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,6.76430000000,R2,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,6.98760000000,R1,0,MUS$2010/PJ,2040 CO2f,all-week,night,all-year,0.27280000000,R1,0,MUS$2010/kt,2040 -CO2f,all-week,night,all-year,0.27280000000,R2,0,MUS$2010/kt,2040 -electricity,all-week,morning,all-year,16.45990000000,R1,1,MUS$2010/PJ,2040 -electricity,all-week,morning,all-year,16.45990000000,R2,1,MUS$2010/PJ,2040 +electricity,all-week,morning,all-year,17.01820000000,R1,1,MUS$2010/PJ,2040 gas,all-week,morning,all-year,0.35420000000,R1,1,MUS$2010/PJ,2040 -gas,all-week,morning,all-year,0.35420000000,R2,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,6.76430000000,R1,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,6.76430000000,R2,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,6.98760000000,R1,1,MUS$2010/PJ,2040 CO2f,all-week,morning,all-year,0.27280000000,R1,1,MUS$2010/kt,2040 -CO2f,all-week,morning,all-year,0.27280000000,R2,1,MUS$2010/kt,2040 -electricity,all-week,mid-afternoon,all-year,16.45990000000,R1,2,MUS$2010/PJ,2040 -electricity,all-week,mid-afternoon,all-year,16.45990000000,R2,2,MUS$2010/PJ,2040 +electricity,all-week,mid-afternoon,all-year,17.01820000000,R1,2,MUS$2010/PJ,2040 gas,all-week,mid-afternoon,all-year,0.35420000000,R1,2,MUS$2010/PJ,2040 -gas,all-week,mid-afternoon,all-year,0.35420000000,R2,2,MUS$2010/PJ,2040 -heat,all-week,mid-afternoon,all-year,6.76430000000,R1,2,MUS$2010/PJ,2040 -heat,all-week,mid-afternoon,all-year,6.76430000000,R2,2,MUS$2010/PJ,2040 +heat,all-week,mid-afternoon,all-year,6.98760000000,R1,2,MUS$2010/PJ,2040 CO2f,all-week,mid-afternoon,all-year,0.27280000000,R1,2,MUS$2010/kt,2040 -CO2f,all-week,mid-afternoon,all-year,0.27280000000,R2,2,MUS$2010/kt,2040 -electricity,all-week,early-peak,all-year,16.45990000000,R1,3,MUS$2010/PJ,2040 -electricity,all-week,early-peak,all-year,16.45990000000,R2,3,MUS$2010/PJ,2040 +electricity,all-week,early-peak,all-year,17.01820000000,R1,3,MUS$2010/PJ,2040 gas,all-week,early-peak,all-year,0.35420000000,R1,3,MUS$2010/PJ,2040 -gas,all-week,early-peak,all-year,0.35420000000,R2,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,6.76430000000,R1,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,6.76430000000,R2,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,6.98760000000,R1,3,MUS$2010/PJ,2040 CO2f,all-week,early-peak,all-year,0.27280000000,R1,3,MUS$2010/kt,2040 -CO2f,all-week,early-peak,all-year,0.27280000000,R2,3,MUS$2010/kt,2040 -electricity,all-week,late-peak,all-year,16.45990000000,R1,4,MUS$2010/PJ,2040 -electricity,all-week,late-peak,all-year,16.45990000000,R2,4,MUS$2010/PJ,2040 +electricity,all-week,late-peak,all-year,17.01820000000,R1,4,MUS$2010/PJ,2040 gas,all-week,late-peak,all-year,0.35420000000,R1,4,MUS$2010/PJ,2040 -gas,all-week,late-peak,all-year,0.35420000000,R2,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,6.76430000000,R1,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,6.76430000000,R2,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,6.98760000000,R1,4,MUS$2010/PJ,2040 CO2f,all-week,late-peak,all-year,0.27280000000,R1,4,MUS$2010/kt,2040 -CO2f,all-week,late-peak,all-year,0.27280000000,R2,4,MUS$2010/kt,2040 -electricity,all-week,evening,all-year,16.45990000000,R1,5,MUS$2010/PJ,2040 -electricity,all-week,evening,all-year,16.45990000000,R2,5,MUS$2010/PJ,2040 +electricity,all-week,evening,all-year,17.01820000000,R1,5,MUS$2010/PJ,2040 gas,all-week,evening,all-year,0.35420000000,R1,5,MUS$2010/PJ,2040 -gas,all-week,evening,all-year,0.35420000000,R2,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,6.76430000000,R1,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,6.76430000000,R2,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,6.98760000000,R1,5,MUS$2010/PJ,2040 CO2f,all-week,evening,all-year,0.27280000000,R1,5,MUS$2010/kt,2040 -CO2f,all-week,evening,all-year,0.27280000000,R2,5,MUS$2010/kt,2040 -electricity,all-week,early-morning,all-year,16.45990000000,R1,6,MUS$2010/PJ,2040 -electricity,all-week,early-morning,all-year,16.45990000000,R2,6,MUS$2010/PJ,2040 +electricity,all-week,early-morning,all-year,17.01820000000,R1,6,MUS$2010/PJ,2040 gas,all-week,early-morning,all-year,0.35420000000,R1,6,MUS$2010/PJ,2040 -gas,all-week,early-morning,all-year,0.35420000000,R2,6,MUS$2010/PJ,2040 -heat,all-week,early-morning,all-year,6.76430000000,R1,6,MUS$2010/PJ,2040 -heat,all-week,early-morning,all-year,6.76430000000,R2,6,MUS$2010/PJ,2040 +heat,all-week,early-morning,all-year,6.98760000000,R1,6,MUS$2010/PJ,2040 CO2f,all-week,early-morning,all-year,0.27280000000,R1,6,MUS$2010/kt,2040 -CO2f,all-week,early-morning,all-year,0.27280000000,R2,6,MUS$2010/kt,2040 -electricity,all-week,late-afternoon,all-year,16.45990000000,R1,7,MUS$2010/PJ,2040 -electricity,all-week,late-afternoon,all-year,16.45990000000,R2,7,MUS$2010/PJ,2040 +electricity,all-week,late-afternoon,all-year,17.01820000000,R1,7,MUS$2010/PJ,2040 gas,all-week,late-afternoon,all-year,0.35420000000,R1,7,MUS$2010/PJ,2040 -gas,all-week,late-afternoon,all-year,0.35420000000,R2,7,MUS$2010/PJ,2040 -heat,all-week,late-afternoon,all-year,6.76430000000,R1,7,MUS$2010/PJ,2040 -heat,all-week,late-afternoon,all-year,6.76430000000,R2,7,MUS$2010/PJ,2040 +heat,all-week,late-afternoon,all-year,6.98760000000,R1,7,MUS$2010/PJ,2040 CO2f,all-week,late-afternoon,all-year,0.27280000000,R1,7,MUS$2010/kt,2040 -CO2f,all-week,late-afternoon,all-year,0.27280000000,R2,7,MUS$2010/kt,2040 -electricity,all-week,night,all-year,18.55050000000,R1,0,MUS$2010/PJ,2045 -electricity,all-week,night,all-year,18.55050000000,R2,0,MUS$2010/PJ,2045 +electricity,all-week,night,all-year,19.02040000000,R1,0,MUS$2010/PJ,2045 gas,all-week,night,all-year,0.35420000000,R1,0,MUS$2010/PJ,2045 -gas,all-week,night,all-year,0.35420000000,R2,0,MUS$2010/PJ,2045 -heat,all-week,night,all-year,7.60060000000,R1,0,MUS$2010/PJ,2045 -heat,all-week,night,all-year,7.60060000000,R2,0,MUS$2010/PJ,2045 +heat,all-week,night,all-year,7.78850000000,R1,0,MUS$2010/PJ,2045 CO2f,all-week,night,all-year,0.35390000000,R1,0,MUS$2010/kt,2045 -CO2f,all-week,night,all-year,0.35390000000,R2,0,MUS$2010/kt,2045 -electricity,all-week,morning,all-year,18.55050000000,R1,1,MUS$2010/PJ,2045 -electricity,all-week,morning,all-year,18.55050000000,R2,1,MUS$2010/PJ,2045 +electricity,all-week,morning,all-year,19.02040000000,R1,1,MUS$2010/PJ,2045 gas,all-week,morning,all-year,0.35420000000,R1,1,MUS$2010/PJ,2045 -gas,all-week,morning,all-year,0.35420000000,R2,1,MUS$2010/PJ,2045 -heat,all-week,morning,all-year,7.60060000000,R1,1,MUS$2010/PJ,2045 -heat,all-week,morning,all-year,7.60060000000,R2,1,MUS$2010/PJ,2045 +heat,all-week,morning,all-year,7.78850000000,R1,1,MUS$2010/PJ,2045 CO2f,all-week,morning,all-year,0.35390000000,R1,1,MUS$2010/kt,2045 -CO2f,all-week,morning,all-year,0.35390000000,R2,1,MUS$2010/kt,2045 -electricity,all-week,mid-afternoon,all-year,18.55050000000,R1,2,MUS$2010/PJ,2045 -electricity,all-week,mid-afternoon,all-year,18.55050000000,R2,2,MUS$2010/PJ,2045 +electricity,all-week,mid-afternoon,all-year,19.02040000000,R1,2,MUS$2010/PJ,2045 gas,all-week,mid-afternoon,all-year,0.35420000000,R1,2,MUS$2010/PJ,2045 -gas,all-week,mid-afternoon,all-year,0.35420000000,R2,2,MUS$2010/PJ,2045 -heat,all-week,mid-afternoon,all-year,7.60060000000,R1,2,MUS$2010/PJ,2045 -heat,all-week,mid-afternoon,all-year,7.60060000000,R2,2,MUS$2010/PJ,2045 +heat,all-week,mid-afternoon,all-year,7.78850000000,R1,2,MUS$2010/PJ,2045 CO2f,all-week,mid-afternoon,all-year,0.35390000000,R1,2,MUS$2010/kt,2045 -CO2f,all-week,mid-afternoon,all-year,0.35390000000,R2,2,MUS$2010/kt,2045 -electricity,all-week,early-peak,all-year,18.55050000000,R1,3,MUS$2010/PJ,2045 -electricity,all-week,early-peak,all-year,18.55050000000,R2,3,MUS$2010/PJ,2045 +electricity,all-week,early-peak,all-year,19.02040000000,R1,3,MUS$2010/PJ,2045 gas,all-week,early-peak,all-year,0.35420000000,R1,3,MUS$2010/PJ,2045 -gas,all-week,early-peak,all-year,0.35420000000,R2,3,MUS$2010/PJ,2045 -heat,all-week,early-peak,all-year,7.60060000000,R1,3,MUS$2010/PJ,2045 -heat,all-week,early-peak,all-year,7.60060000000,R2,3,MUS$2010/PJ,2045 +heat,all-week,early-peak,all-year,7.78850000000,R1,3,MUS$2010/PJ,2045 CO2f,all-week,early-peak,all-year,0.35390000000,R1,3,MUS$2010/kt,2045 -CO2f,all-week,early-peak,all-year,0.35390000000,R2,3,MUS$2010/kt,2045 -electricity,all-week,late-peak,all-year,18.55050000000,R1,4,MUS$2010/PJ,2045 -electricity,all-week,late-peak,all-year,18.55050000000,R2,4,MUS$2010/PJ,2045 +electricity,all-week,late-peak,all-year,19.02040000000,R1,4,MUS$2010/PJ,2045 gas,all-week,late-peak,all-year,0.35420000000,R1,4,MUS$2010/PJ,2045 -gas,all-week,late-peak,all-year,0.35420000000,R2,4,MUS$2010/PJ,2045 -heat,all-week,late-peak,all-year,7.60060000000,R1,4,MUS$2010/PJ,2045 -heat,all-week,late-peak,all-year,7.60060000000,R2,4,MUS$2010/PJ,2045 +heat,all-week,late-peak,all-year,7.78850000000,R1,4,MUS$2010/PJ,2045 CO2f,all-week,late-peak,all-year,0.35390000000,R1,4,MUS$2010/kt,2045 -CO2f,all-week,late-peak,all-year,0.35390000000,R2,4,MUS$2010/kt,2045 -electricity,all-week,evening,all-year,18.55050000000,R1,5,MUS$2010/PJ,2045 -electricity,all-week,evening,all-year,18.55050000000,R2,5,MUS$2010/PJ,2045 +electricity,all-week,evening,all-year,19.02040000000,R1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,0.35420000000,R1,5,MUS$2010/PJ,2045 -gas,all-week,evening,all-year,0.35420000000,R2,5,MUS$2010/PJ,2045 -heat,all-week,evening,all-year,7.60060000000,R1,5,MUS$2010/PJ,2045 -heat,all-week,evening,all-year,7.60060000000,R2,5,MUS$2010/PJ,2045 +heat,all-week,evening,all-year,7.78850000000,R1,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,early-morning,all-year,18.55050000000,R1,6,MUS$2010/PJ,2045 -electricity,all-week,early-morning,all-year,18.55050000000,R2,6,MUS$2010/PJ,2045 +electricity,all-week,early-morning,all-year,19.02040000000,R1,6,MUS$2010/PJ,2045 gas,all-week,early-morning,all-year,0.35420000000,R1,6,MUS$2010/PJ,2045 -gas,all-week,early-morning,all-year,0.35420000000,R2,6,MUS$2010/PJ,2045 -heat,all-week,early-morning,all-year,7.60060000000,R1,6,MUS$2010/PJ,2045 -heat,all-week,early-morning,all-year,7.60060000000,R2,6,MUS$2010/PJ,2045 +heat,all-week,early-morning,all-year,7.78850000000,R1,6,MUS$2010/PJ,2045 CO2f,all-week,early-morning,all-year,0.35390000000,R1,6,MUS$2010/kt,2045 -CO2f,all-week,early-morning,all-year,0.35390000000,R2,6,MUS$2010/kt,2045 -electricity,all-week,late-afternoon,all-year,18.55050000000,R1,7,MUS$2010/PJ,2045 -electricity,all-week,late-afternoon,all-year,18.55050000000,R2,7,MUS$2010/PJ,2045 +electricity,all-week,late-afternoon,all-year,19.02040000000,R1,7,MUS$2010/PJ,2045 gas,all-week,late-afternoon,all-year,0.35420000000,R1,7,MUS$2010/PJ,2045 -gas,all-week,late-afternoon,all-year,0.35420000000,R2,7,MUS$2010/PJ,2045 -heat,all-week,late-afternoon,all-year,7.60060000000,R1,7,MUS$2010/PJ,2045 -heat,all-week,late-afternoon,all-year,7.60060000000,R2,7,MUS$2010/PJ,2045 +heat,all-week,late-afternoon,all-year,7.78850000000,R1,7,MUS$2010/PJ,2045 CO2f,all-week,late-afternoon,all-year,0.35390000000,R1,7,MUS$2010/kt,2045 -CO2f,all-week,late-afternoon,all-year,0.35390000000,R2,7,MUS$2010/kt,2045 -electricity,all-week,night,all-year,20.16000000000,R1,0,MUS$2010/PJ,2050 -electricity,all-week,night,all-year,20.16000000000,R2,0,MUS$2010/PJ,2050 +electricity,all-week,night,all-year,20.93710000000,R1,0,MUS$2010/PJ,2050 gas,all-week,night,all-year,0.35420000000,R1,0,MUS$2010/PJ,2050 -gas,all-week,night,all-year,0.35420000000,R2,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,8.24440000000,R1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,8.24440000000,R2,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,8.55520000000,R1,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,20.16000000000,R1,1,MUS$2010/PJ,2050 -electricity,all-week,morning,all-year,20.16000000000,R2,1,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,20.93710000000,R1,1,MUS$2010/PJ,2050 gas,all-week,morning,all-year,0.35420000000,R1,1,MUS$2010/PJ,2050 -gas,all-week,morning,all-year,0.35420000000,R2,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,8.24440000000,R1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,8.24440000000,R2,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,8.55520000000,R1,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,mid-afternoon,all-year,20.16000000000,R1,2,MUS$2010/PJ,2050 -electricity,all-week,mid-afternoon,all-year,20.16000000000,R2,2,MUS$2010/PJ,2050 +electricity,all-week,mid-afternoon,all-year,20.93710000000,R1,2,MUS$2010/PJ,2050 gas,all-week,mid-afternoon,all-year,0.35420000000,R1,2,MUS$2010/PJ,2050 -gas,all-week,mid-afternoon,all-year,0.35420000000,R2,2,MUS$2010/PJ,2050 -heat,all-week,mid-afternoon,all-year,8.24440000000,R1,2,MUS$2010/PJ,2050 -heat,all-week,mid-afternoon,all-year,8.24440000000,R2,2,MUS$2010/PJ,2050 +heat,all-week,mid-afternoon,all-year,8.55520000000,R1,2,MUS$2010/PJ,2050 CO2f,all-week,mid-afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050 -CO2f,all-week,mid-afternoon,all-year,0.43510000000,R2,2,MUS$2010/kt,2050 -electricity,all-week,early-peak,all-year,20.16000000000,R1,3,MUS$2010/PJ,2050 -electricity,all-week,early-peak,all-year,20.16000000000,R2,3,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,20.93710000000,R1,3,MUS$2010/PJ,2050 gas,all-week,early-peak,all-year,0.35420000000,R1,3,MUS$2010/PJ,2050 -gas,all-week,early-peak,all-year,0.35420000000,R2,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,8.24440000000,R1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,8.24440000000,R2,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,8.55520000000,R1,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,20.16000000000,R1,4,MUS$2010/PJ,2050 -electricity,all-week,late-peak,all-year,20.16000000000,R2,4,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,20.93710000000,R1,4,MUS$2010/PJ,2050 gas,all-week,late-peak,all-year,0.35420000000,R1,4,MUS$2010/PJ,2050 -gas,all-week,late-peak,all-year,0.35420000000,R2,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,8.24440000000,R1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,8.24440000000,R2,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,8.55520000000,R1,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,20.16000000000,R1,5,MUS$2010/PJ,2050 -electricity,all-week,evening,all-year,20.16000000000,R2,5,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,20.93710000000,R1,5,MUS$2010/PJ,2050 gas,all-week,evening,all-year,0.35420000000,R1,5,MUS$2010/PJ,2050 -gas,all-week,evening,all-year,0.35420000000,R2,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,8.24440000000,R1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,8.24440000000,R2,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,8.55520000000,R1,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 -electricity,all-week,early-morning,all-year,20.16000000000,R1,6,MUS$2010/PJ,2050 -electricity,all-week,early-morning,all-year,20.16000000000,R2,6,MUS$2010/PJ,2050 +electricity,all-week,early-morning,all-year,20.93710000000,R1,6,MUS$2010/PJ,2050 gas,all-week,early-morning,all-year,0.35420000000,R1,6,MUS$2010/PJ,2050 -gas,all-week,early-morning,all-year,0.35420000000,R2,6,MUS$2010/PJ,2050 -heat,all-week,early-morning,all-year,8.24440000000,R1,6,MUS$2010/PJ,2050 -heat,all-week,early-morning,all-year,8.24440000000,R2,6,MUS$2010/PJ,2050 +heat,all-week,early-morning,all-year,8.55520000000,R1,6,MUS$2010/PJ,2050 CO2f,all-week,early-morning,all-year,0.43510000000,R1,6,MUS$2010/kt,2050 -CO2f,all-week,early-morning,all-year,0.43510000000,R2,6,MUS$2010/kt,2050 -electricity,all-week,late-afternoon,all-year,20.16000000000,R1,7,MUS$2010/PJ,2050 -electricity,all-week,late-afternoon,all-year,20.16000000000,R2,7,MUS$2010/PJ,2050 +electricity,all-week,late-afternoon,all-year,20.93710000000,R1,7,MUS$2010/PJ,2050 gas,all-week,late-afternoon,all-year,0.35420000000,R1,7,MUS$2010/PJ,2050 -gas,all-week,late-afternoon,all-year,0.35420000000,R2,7,MUS$2010/PJ,2050 -heat,all-week,late-afternoon,all-year,8.24440000000,R1,7,MUS$2010/PJ,2050 -heat,all-week,late-afternoon,all-year,8.24440000000,R2,7,MUS$2010/PJ,2050 +heat,all-week,late-afternoon,all-year,8.55520000000,R1,7,MUS$2010/PJ,2050 CO2f,all-week,late-afternoon,all-year,0.43510000000,R1,7,MUS$2010/kt,2050 -CO2f,all-week,late-afternoon,all-year,0.43510000000,R2,7,MUS$2010/kt,2050 diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Power/Capacity.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Power/Capacity.csv deleted file mode 100644 index 2accdace0..000000000 --- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Power/Capacity.csv +++ /dev/null @@ -1,55 +0,0 @@ -asset,capacity,installed,region,technology,year -0,1.00000000000,2020,R1,gasCCGT,2020 -2,1.00000000000,2020,R2,gasCCGT,2020 -0,6.00000000000,2020,R1,gasCCGT,2025 -2,3.80910000000,2020,R1,windturbine,2025 -3,6.00000000000,2020,R2,gasCCGT,2025 -5,3.80910000000,2020,R2,windturbine,2025 -0,5.00000000000,2020,R1,gasCCGT,2030 -1,5.75150000000,2025,R1,gasCCGT,2030 -3,3.80910000000,2020,R1,windturbine,2030 -4,5.00000000000,2020,R2,gasCCGT,2030 -5,5.75150000000,2025,R2,gasCCGT,2030 -7,3.80910000000,2020,R2,windturbine,2030 -0,5.00000000000,2020,R1,gasCCGT,2035 -1,5.75150000000,2025,R1,gasCCGT,2035 -2,5.60000000000,2030,R1,solarPV,2035 -4,3.80910000000,2020,R1,windturbine,2035 -5,5.00000000000,2020,R2,gasCCGT,2035 -6,5.75150000000,2025,R2,gasCCGT,2035 -7,5.60000000000,2030,R2,solarPV,2035 -9,3.80910000000,2020,R2,windturbine,2035 -0,5.00000000000,2020,R1,gasCCGT,2040 -1,5.75150000000,2025,R1,gasCCGT,2040 -2,5.60000000000,2030,R1,solarPV,2040 -3,5.60000000000,2035,R1,solarPV,2040 -5,3.80910000000,2020,R1,windturbine,2040 -6,5.00000000000,2020,R2,gasCCGT,2040 -7,5.75150000000,2025,R2,gasCCGT,2040 -8,5.60000000000,2030,R2,solarPV,2040 -9,5.60000000000,2035,R2,solarPV,2040 -11,3.80910000000,2020,R2,windturbine,2040 -0,5.00000000000,2020,R1,gasCCGT,2045 -1,5.75150000000,2025,R1,gasCCGT,2045 -2,5.60000000000,2030,R1,solarPV,2045 -3,5.60000000000,2035,R1,solarPV,2045 -4,5.60000000000,2040,R1,solarPV,2045 -6,3.80910000000,2020,R1,windturbine,2045 -7,5.00000000000,2020,R2,gasCCGT,2045 -8,5.75150000000,2025,R2,gasCCGT,2045 -9,5.60000000000,2030,R2,solarPV,2045 -10,5.60000000000,2035,R2,solarPV,2045 -11,5.60000000000,2040,R2,solarPV,2045 -13,3.80910000000,2020,R2,windturbine,2045 -0,5.00000000000,2020,R1,gasCCGT,2050 -1,5.75150000000,2025,R1,gasCCGT,2050 -2,5.60000000000,2030,R1,solarPV,2050 -3,5.60000000000,2035,R1,solarPV,2050 -4,5.60000000000,2040,R1,solarPV,2050 -5,9.40910000000,2045,R1,solarPV,2050 -7,5.00000000000,2020,R2,gasCCGT,2050 -8,5.75150000000,2025,R2,gasCCGT,2050 -9,5.60000000000,2030,R2,solarPV,2050 -10,5.60000000000,2035,R2,solarPV,2050 -11,5.60000000000,2040,R2,solarPV,2050 -12,9.40910000000,2045,R2,solarPV,2050 diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity.csv deleted file mode 100644 index 1be1b0e29..000000000 --- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity.csv +++ /dev/null @@ -1,27 +0,0 @@ -asset,capacity,installed,region,technology,year -0,10,2020,R1,gasboiler,2020 -2,10,2020,R2,gasboiler,2020 -0,5,2020,R1,gasboiler,2025 -1,17,2020,R1,heatpump,2025 -3,5,2020,R2,gasboiler,2025 -4,17,2020,R2,heatpump,2025 -1,17,2020,R1,heatpump,2030 -2,11,2025,R1,heatpump,2030 -5,17,2020,R2,heatpump,2030 -6,11,2025,R2,heatpump,2030 -2,11,2025,R1,heatpump,2035 -3,22,2030,R1,heatpump,2035 -7,11,2025,R2,heatpump,2035 -8,22,2030,R2,heatpump,2035 -3,22,2030,R1,heatpump,2040 -4,17,2035,R1,heatpump,2040 -9,22,2030,R2,heatpump,2040 -10,17,2035,R2,heatpump,2040 -4,17,2035,R1,heatpump,2045 -5,27,2040,R1,heatpump,2045 -11,17,2035,R2,heatpump,2045 -12,27,2040,R2,heatpump,2045 -5,27,2040,R1,heatpump,2050 -6,23,2045,R1,heatpump,2050 -13,27,2040,R2,heatpump,2050 -14,23,2045,R2,heatpump,2050 diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Supply.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Supply.csv deleted file mode 100644 index fb7cd7e16..000000000 --- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Supply.csv +++ /dev/null @@ -1,481 +0,0 @@ -asset,commodity,day,hour,installed,month,region,supply,technology,timeslice,year -0,heat,all-week,night,2020,all-year,R1,0.35000000000,gasboiler,0,2020 -2,heat,all-week,night,2020,all-year,R1,0.35000000000,gasboiler,0,2020 -0,heat,all-week,night,2020,all-year,R2,0.35000000000,gasboiler,0,2020 -2,heat,all-week,night,2020,all-year,R2,0.35000000000,gasboiler,0,2020 -0,CO2f,all-week,night,2020,all-year,R1,22.64850000000,gasboiler,0,2020 -2,CO2f,all-week,night,2020,all-year,R1,22.64850000000,gasboiler,0,2020 -0,CO2f,all-week,night,2020,all-year,R2,22.64850000000,gasboiler,0,2020 -2,CO2f,all-week,night,2020,all-year,R2,22.64850000000,gasboiler,0,2020 -0,heat,all-week,morning,2020,all-year,R1,0.50000000000,gasboiler,1,2020 -2,heat,all-week,morning,2020,all-year,R1,0.50000000000,gasboiler,1,2020 -0,heat,all-week,morning,2020,all-year,R2,0.50000000000,gasboiler,1,2020 -2,heat,all-week,morning,2020,all-year,R2,0.50000000000,gasboiler,1,2020 -0,CO2f,all-week,morning,2020,all-year,R1,32.35500000000,gasboiler,1,2020 -2,CO2f,all-week,morning,2020,all-year,R1,32.35500000000,gasboiler,1,2020 -0,CO2f,all-week,morning,2020,all-year,R2,32.35500000000,gasboiler,1,2020 -2,CO2f,all-week,morning,2020,all-year,R2,32.35500000000,gasboiler,1,2020 -0,heat,all-week,mid-afternoon,2020,all-year,R1,0.35000000000,gasboiler,2,2020 -2,heat,all-week,mid-afternoon,2020,all-year,R1,0.35000000000,gasboiler,2,2020 -0,heat,all-week,mid-afternoon,2020,all-year,R2,0.35000000000,gasboiler,2,2020 -2,heat,all-week,mid-afternoon,2020,all-year,R2,0.35000000000,gasboiler,2,2020 -0,CO2f,all-week,mid-afternoon,2020,all-year,R1,22.64850000000,gasboiler,2,2020 -2,CO2f,all-week,mid-afternoon,2020,all-year,R1,22.64850000000,gasboiler,2,2020 -0,CO2f,all-week,mid-afternoon,2020,all-year,R2,22.64850000000,gasboiler,2,2020 -2,CO2f,all-week,mid-afternoon,2020,all-year,R2,22.64850000000,gasboiler,2,2020 -0,heat,all-week,early-peak,2020,all-year,R1,0.50000000000,gasboiler,3,2020 -2,heat,all-week,early-peak,2020,all-year,R1,0.50000000000,gasboiler,3,2020 -0,heat,all-week,early-peak,2020,all-year,R2,0.50000000000,gasboiler,3,2020 -2,heat,all-week,early-peak,2020,all-year,R2,0.50000000000,gasboiler,3,2020 -0,CO2f,all-week,early-peak,2020,all-year,R1,32.35500000000,gasboiler,3,2020 -2,CO2f,all-week,early-peak,2020,all-year,R1,32.35500000000,gasboiler,3,2020 -0,CO2f,all-week,early-peak,2020,all-year,R2,32.35500000000,gasboiler,3,2020 -2,CO2f,all-week,early-peak,2020,all-year,R2,32.35500000000,gasboiler,3,2020 -0,heat,all-week,late-peak,2020,all-year,R1,1.05000000000,gasboiler,4,2020 -2,heat,all-week,late-peak,2020,all-year,R1,1.05000000000,gasboiler,4,2020 -0,heat,all-week,late-peak,2020,all-year,R2,1.05000000000,gasboiler,4,2020 -2,heat,all-week,late-peak,2020,all-year,R2,1.05000000000,gasboiler,4,2020 -0,CO2f,all-week,late-peak,2020,all-year,R1,67.94550000000,gasboiler,4,2020 -2,CO2f,all-week,late-peak,2020,all-year,R1,67.94550000000,gasboiler,4,2020 -0,CO2f,all-week,late-peak,2020,all-year,R2,67.94550000000,gasboiler,4,2020 -2,CO2f,all-week,late-peak,2020,all-year,R2,67.94550000000,gasboiler,4,2020 -0,heat,all-week,evening,2020,all-year,R1,0.70000000000,gasboiler,5,2020 -2,heat,all-week,evening,2020,all-year,R1,0.70000000000,gasboiler,5,2020 -0,heat,all-week,evening,2020,all-year,R2,0.70000000000,gasboiler,5,2020 -2,heat,all-week,evening,2020,all-year,R2,0.70000000000,gasboiler,5,2020 -0,CO2f,all-week,evening,2020,all-year,R1,45.29700000000,gasboiler,5,2020 -2,CO2f,all-week,evening,2020,all-year,R1,45.29700000000,gasboiler,5,2020 -0,CO2f,all-week,evening,2020,all-year,R2,45.29700000000,gasboiler,5,2020 -2,CO2f,all-week,evening,2020,all-year,R2,45.29700000000,gasboiler,5,2020 -0,heat,all-week,early-morning,2020,all-year,R1,0.70000000000,gasboiler,6,2020 -2,heat,all-week,early-morning,2020,all-year,R1,0.70000000000,gasboiler,6,2020 -0,heat,all-week,early-morning,2020,all-year,R2,0.70000000000,gasboiler,6,2020 -2,heat,all-week,early-morning,2020,all-year,R2,0.70000000000,gasboiler,6,2020 -0,CO2f,all-week,early-morning,2020,all-year,R1,45.29700000000,gasboiler,6,2020 -2,CO2f,all-week,early-morning,2020,all-year,R1,45.29700000000,gasboiler,6,2020 -0,CO2f,all-week,early-morning,2020,all-year,R2,45.29700000000,gasboiler,6,2020 -2,CO2f,all-week,early-morning,2020,all-year,R2,45.29700000000,gasboiler,6,2020 -0,heat,all-week,late-afternoon,2020,all-year,R1,0.70000000000,gasboiler,7,2020 -2,heat,all-week,late-afternoon,2020,all-year,R1,0.70000000000,gasboiler,7,2020 -0,heat,all-week,late-afternoon,2020,all-year,R2,0.70000000000,gasboiler,7,2020 -2,heat,all-week,late-afternoon,2020,all-year,R2,0.70000000000,gasboiler,7,2020 -0,CO2f,all-week,late-afternoon,2020,all-year,R1,45.29700000000,gasboiler,7,2020 -2,CO2f,all-week,late-afternoon,2020,all-year,R1,45.29700000000,gasboiler,7,2020 -0,CO2f,all-week,late-afternoon,2020,all-year,R2,45.29700000000,gasboiler,7,2020 -2,CO2f,all-week,late-afternoon,2020,all-year,R2,45.29700000000,gasboiler,7,2020 -0,heat,all-week,night,2020,all-year,R1,0.10610000000,gasboiler,0,2025 -1,heat,all-week,night,2020,all-year,R1,0.36060000000,heatpump,0,2025 -3,heat,all-week,night,2020,all-year,R1,0.10610000000,gasboiler,0,2025 -4,heat,all-week,night,2020,all-year,R1,0.36060000000,heatpump,0,2025 -0,heat,all-week,night,2020,all-year,R2,0.10610000000,gasboiler,0,2025 -1,heat,all-week,night,2020,all-year,R2,0.36060000000,heatpump,0,2025 -3,heat,all-week,night,2020,all-year,R2,0.10610000000,gasboiler,0,2025 -4,heat,all-week,night,2020,all-year,R2,0.36060000000,heatpump,0,2025 -0,CO2f,all-week,night,2020,all-year,R1,6.86320000000,gasboiler,0,2025 -3,CO2f,all-week,night,2020,all-year,R1,6.86320000000,gasboiler,0,2025 -0,CO2f,all-week,night,2020,all-year,R2,6.86320000000,gasboiler,0,2025 -3,CO2f,all-week,night,2020,all-year,R2,6.86320000000,gasboiler,0,2025 -0,heat,all-week,morning,2020,all-year,R1,0.15150000000,gasboiler,1,2025 -1,heat,all-week,morning,2020,all-year,R1,0.51520000000,heatpump,1,2025 -3,heat,all-week,morning,2020,all-year,R1,0.15150000000,gasboiler,1,2025 -4,heat,all-week,morning,2020,all-year,R1,0.51520000000,heatpump,1,2025 -0,heat,all-week,morning,2020,all-year,R2,0.15150000000,gasboiler,1,2025 -1,heat,all-week,morning,2020,all-year,R2,0.51520000000,heatpump,1,2025 -3,heat,all-week,morning,2020,all-year,R2,0.15150000000,gasboiler,1,2025 -4,heat,all-week,morning,2020,all-year,R2,0.51520000000,heatpump,1,2025 -0,CO2f,all-week,morning,2020,all-year,R1,9.80450000000,gasboiler,1,2025 -3,CO2f,all-week,morning,2020,all-year,R1,9.80450000000,gasboiler,1,2025 -0,CO2f,all-week,morning,2020,all-year,R2,9.80450000000,gasboiler,1,2025 -3,CO2f,all-week,morning,2020,all-year,R2,9.80450000000,gasboiler,1,2025 -0,heat,all-week,mid-afternoon,2020,all-year,R1,0.10610000000,gasboiler,2,2025 -1,heat,all-week,mid-afternoon,2020,all-year,R1,0.36060000000,heatpump,2,2025 -3,heat,all-week,mid-afternoon,2020,all-year,R1,0.10610000000,gasboiler,2,2025 -4,heat,all-week,mid-afternoon,2020,all-year,R1,0.36060000000,heatpump,2,2025 -0,heat,all-week,mid-afternoon,2020,all-year,R2,0.10610000000,gasboiler,2,2025 -1,heat,all-week,mid-afternoon,2020,all-year,R2,0.36060000000,heatpump,2,2025 -3,heat,all-week,mid-afternoon,2020,all-year,R2,0.10610000000,gasboiler,2,2025 -4,heat,all-week,mid-afternoon,2020,all-year,R2,0.36060000000,heatpump,2,2025 -0,CO2f,all-week,mid-afternoon,2020,all-year,R1,6.86320000000,gasboiler,2,2025 -3,CO2f,all-week,mid-afternoon,2020,all-year,R1,6.86320000000,gasboiler,2,2025 -0,CO2f,all-week,mid-afternoon,2020,all-year,R2,6.86320000000,gasboiler,2,2025 -3,CO2f,all-week,mid-afternoon,2020,all-year,R2,6.86320000000,gasboiler,2,2025 -0,heat,all-week,early-peak,2020,all-year,R1,0.15150000000,gasboiler,3,2025 -1,heat,all-week,early-peak,2020,all-year,R1,0.51520000000,heatpump,3,2025 -3,heat,all-week,early-peak,2020,all-year,R1,0.15150000000,gasboiler,3,2025 -4,heat,all-week,early-peak,2020,all-year,R1,0.51520000000,heatpump,3,2025 -0,heat,all-week,early-peak,2020,all-year,R2,0.15150000000,gasboiler,3,2025 -1,heat,all-week,early-peak,2020,all-year,R2,0.51520000000,heatpump,3,2025 -3,heat,all-week,early-peak,2020,all-year,R2,0.15150000000,gasboiler,3,2025 -4,heat,all-week,early-peak,2020,all-year,R2,0.51520000000,heatpump,3,2025 -0,CO2f,all-week,early-peak,2020,all-year,R1,9.80450000000,gasboiler,3,2025 -3,CO2f,all-week,early-peak,2020,all-year,R1,9.80450000000,gasboiler,3,2025 -0,CO2f,all-week,early-peak,2020,all-year,R2,9.80450000000,gasboiler,3,2025 -3,CO2f,all-week,early-peak,2020,all-year,R2,9.80450000000,gasboiler,3,2025 -0,heat,all-week,late-peak,2020,all-year,R1,0.31820000000,gasboiler,4,2025 -1,heat,all-week,late-peak,2020,all-year,R1,1.08180000000,heatpump,4,2025 -3,heat,all-week,late-peak,2020,all-year,R1,0.31820000000,gasboiler,4,2025 -4,heat,all-week,late-peak,2020,all-year,R1,1.08180000000,heatpump,4,2025 -0,heat,all-week,late-peak,2020,all-year,R2,0.31820000000,gasboiler,4,2025 -1,heat,all-week,late-peak,2020,all-year,R2,1.08180000000,heatpump,4,2025 -3,heat,all-week,late-peak,2020,all-year,R2,0.31820000000,gasboiler,4,2025 -4,heat,all-week,late-peak,2020,all-year,R2,1.08180000000,heatpump,4,2025 -0,CO2f,all-week,late-peak,2020,all-year,R1,20.58950000000,gasboiler,4,2025 -3,CO2f,all-week,late-peak,2020,all-year,R1,20.58950000000,gasboiler,4,2025 -0,CO2f,all-week,late-peak,2020,all-year,R2,20.58950000000,gasboiler,4,2025 -3,CO2f,all-week,late-peak,2020,all-year,R2,20.58950000000,gasboiler,4,2025 -0,heat,all-week,evening,2020,all-year,R1,0.21210000000,gasboiler,5,2025 -1,heat,all-week,evening,2020,all-year,R1,0.72120000000,heatpump,5,2025 -3,heat,all-week,evening,2020,all-year,R1,0.21210000000,gasboiler,5,2025 -4,heat,all-week,evening,2020,all-year,R1,0.72120000000,heatpump,5,2025 -0,heat,all-week,evening,2020,all-year,R2,0.21210000000,gasboiler,5,2025 -1,heat,all-week,evening,2020,all-year,R2,0.72120000000,heatpump,5,2025 -3,heat,all-week,evening,2020,all-year,R2,0.21210000000,gasboiler,5,2025 -4,heat,all-week,evening,2020,all-year,R2,0.72120000000,heatpump,5,2025 -0,CO2f,all-week,evening,2020,all-year,R1,13.72640000000,gasboiler,5,2025 -3,CO2f,all-week,evening,2020,all-year,R1,13.72640000000,gasboiler,5,2025 -0,CO2f,all-week,evening,2020,all-year,R2,13.72640000000,gasboiler,5,2025 -3,CO2f,all-week,evening,2020,all-year,R2,13.72640000000,gasboiler,5,2025 -0,heat,all-week,early-morning,2020,all-year,R1,0.21210000000,gasboiler,6,2025 -1,heat,all-week,early-morning,2020,all-year,R1,0.72120000000,heatpump,6,2025 -3,heat,all-week,early-morning,2020,all-year,R1,0.21210000000,gasboiler,6,2025 -4,heat,all-week,early-morning,2020,all-year,R1,0.72120000000,heatpump,6,2025 -0,heat,all-week,early-morning,2020,all-year,R2,0.21210000000,gasboiler,6,2025 -1,heat,all-week,early-morning,2020,all-year,R2,0.72120000000,heatpump,6,2025 -3,heat,all-week,early-morning,2020,all-year,R2,0.21210000000,gasboiler,6,2025 -4,heat,all-week,early-morning,2020,all-year,R2,0.72120000000,heatpump,6,2025 -0,CO2f,all-week,early-morning,2020,all-year,R1,13.72640000000,gasboiler,6,2025 -3,CO2f,all-week,early-morning,2020,all-year,R1,13.72640000000,gasboiler,6,2025 -0,CO2f,all-week,early-morning,2020,all-year,R2,13.72640000000,gasboiler,6,2025 -3,CO2f,all-week,early-morning,2020,all-year,R2,13.72640000000,gasboiler,6,2025 -0,heat,all-week,late-afternoon,2020,all-year,R1,0.21210000000,gasboiler,7,2025 -1,heat,all-week,late-afternoon,2020,all-year,R1,0.72120000000,heatpump,7,2025 -3,heat,all-week,late-afternoon,2020,all-year,R1,0.21210000000,gasboiler,7,2025 -4,heat,all-week,late-afternoon,2020,all-year,R1,0.72120000000,heatpump,7,2025 -0,heat,all-week,late-afternoon,2020,all-year,R2,0.21210000000,gasboiler,7,2025 -1,heat,all-week,late-afternoon,2020,all-year,R2,0.72120000000,heatpump,7,2025 -3,heat,all-week,late-afternoon,2020,all-year,R2,0.21210000000,gasboiler,7,2025 -4,heat,all-week,late-afternoon,2020,all-year,R2,0.72120000000,heatpump,7,2025 -0,CO2f,all-week,late-afternoon,2020,all-year,R1,13.72640000000,gasboiler,7,2025 -3,CO2f,all-week,late-afternoon,2020,all-year,R1,13.72640000000,gasboiler,7,2025 -0,CO2f,all-week,late-afternoon,2020,all-year,R2,13.72640000000,gasboiler,7,2025 -3,CO2f,all-week,late-afternoon,2020,all-year,R2,13.72640000000,gasboiler,7,2025 -1,heat,all-week,night,2020,all-year,R1,0.35420000000,heatpump,0,2030 -2,heat,all-week,night,2025,all-year,R1,0.22920000000,heatpump,0,2030 -5,heat,all-week,night,2020,all-year,R1,0.35420000000,heatpump,0,2030 -6,heat,all-week,night,2025,all-year,R1,0.22920000000,heatpump,0,2030 -1,heat,all-week,night,2020,all-year,R2,0.35420000000,heatpump,0,2030 -2,heat,all-week,night,2025,all-year,R2,0.22920000000,heatpump,0,2030 -5,heat,all-week,night,2020,all-year,R2,0.35420000000,heatpump,0,2030 -6,heat,all-week,night,2025,all-year,R2,0.22920000000,heatpump,0,2030 -1,heat,all-week,morning,2020,all-year,R1,0.50600000000,heatpump,1,2030 -2,heat,all-week,morning,2025,all-year,R1,0.32740000000,heatpump,1,2030 -5,heat,all-week,morning,2020,all-year,R1,0.50600000000,heatpump,1,2030 -6,heat,all-week,morning,2025,all-year,R1,0.32740000000,heatpump,1,2030 -1,heat,all-week,morning,2020,all-year,R2,0.50600000000,heatpump,1,2030 -2,heat,all-week,morning,2025,all-year,R2,0.32740000000,heatpump,1,2030 -5,heat,all-week,morning,2020,all-year,R2,0.50600000000,heatpump,1,2030 -6,heat,all-week,morning,2025,all-year,R2,0.32740000000,heatpump,1,2030 -1,heat,all-week,mid-afternoon,2020,all-year,R1,0.35420000000,heatpump,2,2030 -2,heat,all-week,mid-afternoon,2025,all-year,R1,0.22920000000,heatpump,2,2030 -5,heat,all-week,mid-afternoon,2020,all-year,R1,0.35420000000,heatpump,2,2030 -6,heat,all-week,mid-afternoon,2025,all-year,R1,0.22920000000,heatpump,2,2030 -1,heat,all-week,mid-afternoon,2020,all-year,R2,0.35420000000,heatpump,2,2030 -2,heat,all-week,mid-afternoon,2025,all-year,R2,0.22920000000,heatpump,2,2030 -5,heat,all-week,mid-afternoon,2020,all-year,R2,0.35420000000,heatpump,2,2030 -6,heat,all-week,mid-afternoon,2025,all-year,R2,0.22920000000,heatpump,2,2030 -1,heat,all-week,early-peak,2020,all-year,R1,0.50600000000,heatpump,3,2030 -2,heat,all-week,early-peak,2025,all-year,R1,0.32740000000,heatpump,3,2030 -5,heat,all-week,early-peak,2020,all-year,R1,0.50600000000,heatpump,3,2030 -6,heat,all-week,early-peak,2025,all-year,R1,0.32740000000,heatpump,3,2030 -1,heat,all-week,early-peak,2020,all-year,R2,0.50600000000,heatpump,3,2030 -2,heat,all-week,early-peak,2025,all-year,R2,0.32740000000,heatpump,3,2030 -5,heat,all-week,early-peak,2020,all-year,R2,0.50600000000,heatpump,3,2030 -6,heat,all-week,early-peak,2025,all-year,R2,0.32740000000,heatpump,3,2030 -1,heat,all-week,late-peak,2020,all-year,R1,1.06250000000,heatpump,4,2030 -2,heat,all-week,late-peak,2025,all-year,R1,0.68750000000,heatpump,4,2030 -5,heat,all-week,late-peak,2020,all-year,R1,1.06250000000,heatpump,4,2030 -6,heat,all-week,late-peak,2025,all-year,R1,0.68750000000,heatpump,4,2030 -1,heat,all-week,late-peak,2020,all-year,R2,1.06250000000,heatpump,4,2030 -2,heat,all-week,late-peak,2025,all-year,R2,0.68750000000,heatpump,4,2030 -5,heat,all-week,late-peak,2020,all-year,R2,1.06250000000,heatpump,4,2030 -6,heat,all-week,late-peak,2025,all-year,R2,0.68750000000,heatpump,4,2030 -1,heat,all-week,evening,2020,all-year,R1,0.70830000000,heatpump,5,2030 -2,heat,all-week,evening,2025,all-year,R1,0.45830000000,heatpump,5,2030 -5,heat,all-week,evening,2020,all-year,R1,0.70830000000,heatpump,5,2030 -6,heat,all-week,evening,2025,all-year,R1,0.45830000000,heatpump,5,2030 -1,heat,all-week,evening,2020,all-year,R2,0.70830000000,heatpump,5,2030 -2,heat,all-week,evening,2025,all-year,R2,0.45830000000,heatpump,5,2030 -5,heat,all-week,evening,2020,all-year,R2,0.70830000000,heatpump,5,2030 -6,heat,all-week,evening,2025,all-year,R2,0.45830000000,heatpump,5,2030 -1,heat,all-week,early-morning,2020,all-year,R1,0.70830000000,heatpump,6,2030 -2,heat,all-week,early-morning,2025,all-year,R1,0.45830000000,heatpump,6,2030 -5,heat,all-week,early-morning,2020,all-year,R1,0.70830000000,heatpump,6,2030 -6,heat,all-week,early-morning,2025,all-year,R1,0.45830000000,heatpump,6,2030 -1,heat,all-week,early-morning,2020,all-year,R2,0.70830000000,heatpump,6,2030 -2,heat,all-week,early-morning,2025,all-year,R2,0.45830000000,heatpump,6,2030 -5,heat,all-week,early-morning,2020,all-year,R2,0.70830000000,heatpump,6,2030 -6,heat,all-week,early-morning,2025,all-year,R2,0.45830000000,heatpump,6,2030 -1,heat,all-week,late-afternoon,2020,all-year,R1,0.70830000000,heatpump,7,2030 -2,heat,all-week,late-afternoon,2025,all-year,R1,0.45830000000,heatpump,7,2030 -5,heat,all-week,late-afternoon,2020,all-year,R1,0.70830000000,heatpump,7,2030 -6,heat,all-week,late-afternoon,2025,all-year,R1,0.45830000000,heatpump,7,2030 -1,heat,all-week,late-afternoon,2020,all-year,R2,0.70830000000,heatpump,7,2030 -2,heat,all-week,late-afternoon,2025,all-year,R2,0.45830000000,heatpump,7,2030 -5,heat,all-week,late-afternoon,2020,all-year,R2,0.70830000000,heatpump,7,2030 -6,heat,all-week,late-afternoon,2025,all-year,R2,0.45830000000,heatpump,7,2030 -2,heat,all-week,night,2025,all-year,R1,0.23330000000,heatpump,0,2035 -3,heat,all-week,night,2030,all-year,R1,0.46670000000,heatpump,0,2035 -7,heat,all-week,night,2025,all-year,R1,0.23330000000,heatpump,0,2035 -8,heat,all-week,night,2030,all-year,R1,0.46670000000,heatpump,0,2035 -2,heat,all-week,night,2025,all-year,R2,0.23330000000,heatpump,0,2035 -3,heat,all-week,night,2030,all-year,R2,0.46670000000,heatpump,0,2035 -7,heat,all-week,night,2025,all-year,R2,0.23330000000,heatpump,0,2035 -8,heat,all-week,night,2030,all-year,R2,0.46670000000,heatpump,0,2035 -2,heat,all-week,morning,2025,all-year,R1,0.33330000000,heatpump,1,2035 -3,heat,all-week,morning,2030,all-year,R1,0.66670000000,heatpump,1,2035 -7,heat,all-week,morning,2025,all-year,R1,0.33330000000,heatpump,1,2035 -8,heat,all-week,morning,2030,all-year,R1,0.66670000000,heatpump,1,2035 -2,heat,all-week,morning,2025,all-year,R2,0.33330000000,heatpump,1,2035 -3,heat,all-week,morning,2030,all-year,R2,0.66670000000,heatpump,1,2035 -7,heat,all-week,morning,2025,all-year,R2,0.33330000000,heatpump,1,2035 -8,heat,all-week,morning,2030,all-year,R2,0.66670000000,heatpump,1,2035 -2,heat,all-week,mid-afternoon,2025,all-year,R1,0.23330000000,heatpump,2,2035 -3,heat,all-week,mid-afternoon,2030,all-year,R1,0.46670000000,heatpump,2,2035 -7,heat,all-week,mid-afternoon,2025,all-year,R1,0.23330000000,heatpump,2,2035 -8,heat,all-week,mid-afternoon,2030,all-year,R1,0.46670000000,heatpump,2,2035 -2,heat,all-week,mid-afternoon,2025,all-year,R2,0.23330000000,heatpump,2,2035 -3,heat,all-week,mid-afternoon,2030,all-year,R2,0.46670000000,heatpump,2,2035 -7,heat,all-week,mid-afternoon,2025,all-year,R2,0.23330000000,heatpump,2,2035 -8,heat,all-week,mid-afternoon,2030,all-year,R2,0.46670000000,heatpump,2,2035 -2,heat,all-week,early-peak,2025,all-year,R1,0.33330000000,heatpump,3,2035 -3,heat,all-week,early-peak,2030,all-year,R1,0.66670000000,heatpump,3,2035 -7,heat,all-week,early-peak,2025,all-year,R1,0.33330000000,heatpump,3,2035 -8,heat,all-week,early-peak,2030,all-year,R1,0.66670000000,heatpump,3,2035 -2,heat,all-week,early-peak,2025,all-year,R2,0.33330000000,heatpump,3,2035 -3,heat,all-week,early-peak,2030,all-year,R2,0.66670000000,heatpump,3,2035 -7,heat,all-week,early-peak,2025,all-year,R2,0.33330000000,heatpump,3,2035 -8,heat,all-week,early-peak,2030,all-year,R2,0.66670000000,heatpump,3,2035 -2,heat,all-week,late-peak,2025,all-year,R1,0.70000000000,heatpump,4,2035 -3,heat,all-week,late-peak,2030,all-year,R1,1.40000000000,heatpump,4,2035 -7,heat,all-week,late-peak,2025,all-year,R1,0.70000000000,heatpump,4,2035 -8,heat,all-week,late-peak,2030,all-year,R1,1.40000000000,heatpump,4,2035 -2,heat,all-week,late-peak,2025,all-year,R2,0.70000000000,heatpump,4,2035 -3,heat,all-week,late-peak,2030,all-year,R2,1.40000000000,heatpump,4,2035 -7,heat,all-week,late-peak,2025,all-year,R2,0.70000000000,heatpump,4,2035 -8,heat,all-week,late-peak,2030,all-year,R2,1.40000000000,heatpump,4,2035 -2,heat,all-week,evening,2025,all-year,R1,0.46670000000,heatpump,5,2035 -3,heat,all-week,evening,2030,all-year,R1,0.93330000000,heatpump,5,2035 -7,heat,all-week,evening,2025,all-year,R1,0.46670000000,heatpump,5,2035 -8,heat,all-week,evening,2030,all-year,R1,0.93330000000,heatpump,5,2035 -2,heat,all-week,evening,2025,all-year,R2,0.46670000000,heatpump,5,2035 -3,heat,all-week,evening,2030,all-year,R2,0.93330000000,heatpump,5,2035 -7,heat,all-week,evening,2025,all-year,R2,0.46670000000,heatpump,5,2035 -8,heat,all-week,evening,2030,all-year,R2,0.93330000000,heatpump,5,2035 -2,heat,all-week,early-morning,2025,all-year,R1,0.46670000000,heatpump,6,2035 -3,heat,all-week,early-morning,2030,all-year,R1,0.93330000000,heatpump,6,2035 -7,heat,all-week,early-morning,2025,all-year,R1,0.46670000000,heatpump,6,2035 -8,heat,all-week,early-morning,2030,all-year,R1,0.93330000000,heatpump,6,2035 -2,heat,all-week,early-morning,2025,all-year,R2,0.46670000000,heatpump,6,2035 -3,heat,all-week,early-morning,2030,all-year,R2,0.93330000000,heatpump,6,2035 -7,heat,all-week,early-morning,2025,all-year,R2,0.46670000000,heatpump,6,2035 -8,heat,all-week,early-morning,2030,all-year,R2,0.93330000000,heatpump,6,2035 -2,heat,all-week,late-afternoon,2025,all-year,R1,0.46670000000,heatpump,7,2035 -3,heat,all-week,late-afternoon,2030,all-year,R1,0.93330000000,heatpump,7,2035 -7,heat,all-week,late-afternoon,2025,all-year,R1,0.46670000000,heatpump,7,2035 -8,heat,all-week,late-afternoon,2030,all-year,R1,0.93330000000,heatpump,7,2035 -2,heat,all-week,late-afternoon,2025,all-year,R2,0.46670000000,heatpump,7,2035 -3,heat,all-week,late-afternoon,2030,all-year,R2,0.93330000000,heatpump,7,2035 -7,heat,all-week,late-afternoon,2025,all-year,R2,0.46670000000,heatpump,7,2035 -8,heat,all-week,late-afternoon,2030,all-year,R2,0.93330000000,heatpump,7,2035 -3,heat,all-week,night,2030,all-year,R1,0.46070000000,heatpump,0,2040 -4,heat,all-week,night,2035,all-year,R1,0.35600000000,heatpump,0,2040 -9,heat,all-week,night,2030,all-year,R1,0.46070000000,heatpump,0,2040 -10,heat,all-week,night,2035,all-year,R1,0.35600000000,heatpump,0,2040 -3,heat,all-week,night,2030,all-year,R2,0.46070000000,heatpump,0,2040 -4,heat,all-week,night,2035,all-year,R2,0.35600000000,heatpump,0,2040 -9,heat,all-week,night,2030,all-year,R2,0.46070000000,heatpump,0,2040 -10,heat,all-week,night,2035,all-year,R2,0.35600000000,heatpump,0,2040 -3,heat,all-week,morning,2030,all-year,R1,0.65810000000,heatpump,1,2040 -4,heat,all-week,morning,2035,all-year,R1,0.50850000000,heatpump,1,2040 -9,heat,all-week,morning,2030,all-year,R1,0.65810000000,heatpump,1,2040 -10,heat,all-week,morning,2035,all-year,R1,0.50850000000,heatpump,1,2040 -3,heat,all-week,morning,2030,all-year,R2,0.65810000000,heatpump,1,2040 -4,heat,all-week,morning,2035,all-year,R2,0.50850000000,heatpump,1,2040 -9,heat,all-week,morning,2030,all-year,R2,0.65810000000,heatpump,1,2040 -10,heat,all-week,morning,2035,all-year,R2,0.50850000000,heatpump,1,2040 -3,heat,all-week,mid-afternoon,2030,all-year,R1,0.46070000000,heatpump,2,2040 -4,heat,all-week,mid-afternoon,2035,all-year,R1,0.35600000000,heatpump,2,2040 -9,heat,all-week,mid-afternoon,2030,all-year,R1,0.46070000000,heatpump,2,2040 -10,heat,all-week,mid-afternoon,2035,all-year,R1,0.35600000000,heatpump,2,2040 -3,heat,all-week,mid-afternoon,2030,all-year,R2,0.46070000000,heatpump,2,2040 -4,heat,all-week,mid-afternoon,2035,all-year,R2,0.35600000000,heatpump,2,2040 -9,heat,all-week,mid-afternoon,2030,all-year,R2,0.46070000000,heatpump,2,2040 -10,heat,all-week,mid-afternoon,2035,all-year,R2,0.35600000000,heatpump,2,2040 -3,heat,all-week,early-peak,2030,all-year,R1,0.65810000000,heatpump,3,2040 -4,heat,all-week,early-peak,2035,all-year,R1,0.50850000000,heatpump,3,2040 -9,heat,all-week,early-peak,2030,all-year,R1,0.65810000000,heatpump,3,2040 -10,heat,all-week,early-peak,2035,all-year,R1,0.50850000000,heatpump,3,2040 -3,heat,all-week,early-peak,2030,all-year,R2,0.65810000000,heatpump,3,2040 -4,heat,all-week,early-peak,2035,all-year,R2,0.50850000000,heatpump,3,2040 -9,heat,all-week,early-peak,2030,all-year,R2,0.65810000000,heatpump,3,2040 -10,heat,all-week,early-peak,2035,all-year,R2,0.50850000000,heatpump,3,2040 -3,heat,all-week,late-peak,2030,all-year,R1,1.38210000000,heatpump,4,2040 -4,heat,all-week,late-peak,2035,all-year,R1,1.06790000000,heatpump,4,2040 -9,heat,all-week,late-peak,2030,all-year,R1,1.38210000000,heatpump,4,2040 -10,heat,all-week,late-peak,2035,all-year,R1,1.06790000000,heatpump,4,2040 -3,heat,all-week,late-peak,2030,all-year,R2,1.38210000000,heatpump,4,2040 -4,heat,all-week,late-peak,2035,all-year,R2,1.06790000000,heatpump,4,2040 -9,heat,all-week,late-peak,2030,all-year,R2,1.38210000000,heatpump,4,2040 -10,heat,all-week,late-peak,2035,all-year,R2,1.06790000000,heatpump,4,2040 -3,heat,all-week,evening,2030,all-year,R1,0.92140000000,heatpump,5,2040 -4,heat,all-week,evening,2035,all-year,R1,0.71200000000,heatpump,5,2040 -9,heat,all-week,evening,2030,all-year,R1,0.92140000000,heatpump,5,2040 -10,heat,all-week,evening,2035,all-year,R1,0.71200000000,heatpump,5,2040 -3,heat,all-week,evening,2030,all-year,R2,0.92140000000,heatpump,5,2040 -4,heat,all-week,evening,2035,all-year,R2,0.71200000000,heatpump,5,2040 -9,heat,all-week,evening,2030,all-year,R2,0.92140000000,heatpump,5,2040 -10,heat,all-week,evening,2035,all-year,R2,0.71200000000,heatpump,5,2040 -3,heat,all-week,early-morning,2030,all-year,R1,0.92140000000,heatpump,6,2040 -4,heat,all-week,early-morning,2035,all-year,R1,0.71200000000,heatpump,6,2040 -9,heat,all-week,early-morning,2030,all-year,R1,0.92140000000,heatpump,6,2040 -10,heat,all-week,early-morning,2035,all-year,R1,0.71200000000,heatpump,6,2040 -3,heat,all-week,early-morning,2030,all-year,R2,0.92140000000,heatpump,6,2040 -4,heat,all-week,early-morning,2035,all-year,R2,0.71200000000,heatpump,6,2040 -9,heat,all-week,early-morning,2030,all-year,R2,0.92140000000,heatpump,6,2040 -10,heat,all-week,early-morning,2035,all-year,R2,0.71200000000,heatpump,6,2040 -3,heat,all-week,late-afternoon,2030,all-year,R1,0.92140000000,heatpump,7,2040 -4,heat,all-week,late-afternoon,2035,all-year,R1,0.71200000000,heatpump,7,2040 -9,heat,all-week,late-afternoon,2030,all-year,R1,0.92140000000,heatpump,7,2040 -10,heat,all-week,late-afternoon,2035,all-year,R1,0.71200000000,heatpump,7,2040 -3,heat,all-week,late-afternoon,2030,all-year,R2,0.92140000000,heatpump,7,2040 -4,heat,all-week,late-afternoon,2035,all-year,R2,0.71200000000,heatpump,7,2040 -9,heat,all-week,late-afternoon,2030,all-year,R2,0.92140000000,heatpump,7,2040 -10,heat,all-week,late-afternoon,2035,all-year,R2,0.71200000000,heatpump,7,2040 -4,heat,all-week,night,2035,all-year,R1,0.36060000000,heatpump,0,2045 -5,heat,all-week,night,2040,all-year,R1,0.57270000000,heatpump,0,2045 -11,heat,all-week,night,2035,all-year,R1,0.36060000000,heatpump,0,2045 -12,heat,all-week,night,2040,all-year,R1,0.57270000000,heatpump,0,2045 -4,heat,all-week,night,2035,all-year,R2,0.36060000000,heatpump,0,2045 -5,heat,all-week,night,2040,all-year,R2,0.57270000000,heatpump,0,2045 -11,heat,all-week,night,2035,all-year,R2,0.36060000000,heatpump,0,2045 -12,heat,all-week,night,2040,all-year,R2,0.57270000000,heatpump,0,2045 -4,heat,all-week,morning,2035,all-year,R1,0.51520000000,heatpump,1,2045 -5,heat,all-week,morning,2040,all-year,R1,0.81820000000,heatpump,1,2045 -11,heat,all-week,morning,2035,all-year,R1,0.51520000000,heatpump,1,2045 -12,heat,all-week,morning,2040,all-year,R1,0.81820000000,heatpump,1,2045 -4,heat,all-week,morning,2035,all-year,R2,0.51520000000,heatpump,1,2045 -5,heat,all-week,morning,2040,all-year,R2,0.81820000000,heatpump,1,2045 -11,heat,all-week,morning,2035,all-year,R2,0.51520000000,heatpump,1,2045 -12,heat,all-week,morning,2040,all-year,R2,0.81820000000,heatpump,1,2045 -4,heat,all-week,mid-afternoon,2035,all-year,R1,0.36060000000,heatpump,2,2045 -5,heat,all-week,mid-afternoon,2040,all-year,R1,0.57270000000,heatpump,2,2045 -11,heat,all-week,mid-afternoon,2035,all-year,R1,0.36060000000,heatpump,2,2045 -12,heat,all-week,mid-afternoon,2040,all-year,R1,0.57270000000,heatpump,2,2045 -4,heat,all-week,mid-afternoon,2035,all-year,R2,0.36060000000,heatpump,2,2045 -5,heat,all-week,mid-afternoon,2040,all-year,R2,0.57270000000,heatpump,2,2045 -11,heat,all-week,mid-afternoon,2035,all-year,R2,0.36060000000,heatpump,2,2045 -12,heat,all-week,mid-afternoon,2040,all-year,R2,0.57270000000,heatpump,2,2045 -4,heat,all-week,early-peak,2035,all-year,R1,0.51520000000,heatpump,3,2045 -5,heat,all-week,early-peak,2040,all-year,R1,0.81820000000,heatpump,3,2045 -11,heat,all-week,early-peak,2035,all-year,R1,0.51520000000,heatpump,3,2045 -12,heat,all-week,early-peak,2040,all-year,R1,0.81820000000,heatpump,3,2045 -4,heat,all-week,early-peak,2035,all-year,R2,0.51520000000,heatpump,3,2045 -5,heat,all-week,early-peak,2040,all-year,R2,0.81820000000,heatpump,3,2045 -11,heat,all-week,early-peak,2035,all-year,R2,0.51520000000,heatpump,3,2045 -12,heat,all-week,early-peak,2040,all-year,R2,0.81820000000,heatpump,3,2045 -4,heat,all-week,late-peak,2035,all-year,R1,1.08180000000,heatpump,4,2045 -5,heat,all-week,late-peak,2040,all-year,R1,1.71820000000,heatpump,4,2045 -11,heat,all-week,late-peak,2035,all-year,R1,1.08180000000,heatpump,4,2045 -12,heat,all-week,late-peak,2040,all-year,R1,1.71820000000,heatpump,4,2045 -4,heat,all-week,late-peak,2035,all-year,R2,1.08180000000,heatpump,4,2045 -5,heat,all-week,late-peak,2040,all-year,R2,1.71820000000,heatpump,4,2045 -11,heat,all-week,late-peak,2035,all-year,R2,1.08180000000,heatpump,4,2045 -12,heat,all-week,late-peak,2040,all-year,R2,1.71820000000,heatpump,4,2045 -4,heat,all-week,evening,2035,all-year,R1,0.72120000000,heatpump,5,2045 -5,heat,all-week,evening,2040,all-year,R1,1.14550000000,heatpump,5,2045 -11,heat,all-week,evening,2035,all-year,R1,0.72120000000,heatpump,5,2045 -12,heat,all-week,evening,2040,all-year,R1,1.14550000000,heatpump,5,2045 -4,heat,all-week,evening,2035,all-year,R2,0.72120000000,heatpump,5,2045 -5,heat,all-week,evening,2040,all-year,R2,1.14550000000,heatpump,5,2045 -11,heat,all-week,evening,2035,all-year,R2,0.72120000000,heatpump,5,2045 -12,heat,all-week,evening,2040,all-year,R2,1.14550000000,heatpump,5,2045 -4,heat,all-week,early-morning,2035,all-year,R1,0.72120000000,heatpump,6,2045 -5,heat,all-week,early-morning,2040,all-year,R1,1.14550000000,heatpump,6,2045 -11,heat,all-week,early-morning,2035,all-year,R1,0.72120000000,heatpump,6,2045 -12,heat,all-week,early-morning,2040,all-year,R1,1.14550000000,heatpump,6,2045 -4,heat,all-week,early-morning,2035,all-year,R2,0.72120000000,heatpump,6,2045 -5,heat,all-week,early-morning,2040,all-year,R2,1.14550000000,heatpump,6,2045 -11,heat,all-week,early-morning,2035,all-year,R2,0.72120000000,heatpump,6,2045 -12,heat,all-week,early-morning,2040,all-year,R2,1.14550000000,heatpump,6,2045 -4,heat,all-week,late-afternoon,2035,all-year,R1,0.72120000000,heatpump,7,2045 -5,heat,all-week,late-afternoon,2040,all-year,R1,1.14550000000,heatpump,7,2045 -11,heat,all-week,late-afternoon,2035,all-year,R1,0.72120000000,heatpump,7,2045 -12,heat,all-week,late-afternoon,2040,all-year,R1,1.14550000000,heatpump,7,2045 -4,heat,all-week,late-afternoon,2035,all-year,R2,0.72120000000,heatpump,7,2045 -5,heat,all-week,late-afternoon,2040,all-year,R2,1.14550000000,heatpump,7,2045 -11,heat,all-week,late-afternoon,2035,all-year,R2,0.72120000000,heatpump,7,2045 -12,heat,all-week,late-afternoon,2040,all-year,R2,1.14550000000,heatpump,7,2045 -5,heat,all-week,night,2040,all-year,R1,0.56700000000,heatpump,0,2050 -6,heat,all-week,night,2045,all-year,R1,0.48300000000,heatpump,0,2050 -13,heat,all-week,night,2040,all-year,R1,0.56700000000,heatpump,0,2050 -14,heat,all-week,night,2045,all-year,R1,0.48300000000,heatpump,0,2050 -5,heat,all-week,night,2040,all-year,R2,0.56700000000,heatpump,0,2050 -6,heat,all-week,night,2045,all-year,R2,0.48300000000,heatpump,0,2050 -13,heat,all-week,night,2040,all-year,R2,0.56700000000,heatpump,0,2050 -14,heat,all-week,night,2045,all-year,R2,0.48300000000,heatpump,0,2050 -5,heat,all-week,morning,2040,all-year,R1,0.81000000000,heatpump,1,2050 -6,heat,all-week,morning,2045,all-year,R1,0.69000000000,heatpump,1,2050 -13,heat,all-week,morning,2040,all-year,R1,0.81000000000,heatpump,1,2050 -14,heat,all-week,morning,2045,all-year,R1,0.69000000000,heatpump,1,2050 -5,heat,all-week,morning,2040,all-year,R2,0.81000000000,heatpump,1,2050 -6,heat,all-week,morning,2045,all-year,R2,0.69000000000,heatpump,1,2050 -13,heat,all-week,morning,2040,all-year,R2,0.81000000000,heatpump,1,2050 -14,heat,all-week,morning,2045,all-year,R2,0.69000000000,heatpump,1,2050 -5,heat,all-week,mid-afternoon,2040,all-year,R1,0.56700000000,heatpump,2,2050 -6,heat,all-week,mid-afternoon,2045,all-year,R1,0.48300000000,heatpump,2,2050 -13,heat,all-week,mid-afternoon,2040,all-year,R1,0.56700000000,heatpump,2,2050 -14,heat,all-week,mid-afternoon,2045,all-year,R1,0.48300000000,heatpump,2,2050 -5,heat,all-week,mid-afternoon,2040,all-year,R2,0.56700000000,heatpump,2,2050 -6,heat,all-week,mid-afternoon,2045,all-year,R2,0.48300000000,heatpump,2,2050 -13,heat,all-week,mid-afternoon,2040,all-year,R2,0.56700000000,heatpump,2,2050 -14,heat,all-week,mid-afternoon,2045,all-year,R2,0.48300000000,heatpump,2,2050 -5,heat,all-week,early-peak,2040,all-year,R1,0.81000000000,heatpump,3,2050 -6,heat,all-week,early-peak,2045,all-year,R1,0.69000000000,heatpump,3,2050 -13,heat,all-week,early-peak,2040,all-year,R1,0.81000000000,heatpump,3,2050 -14,heat,all-week,early-peak,2045,all-year,R1,0.69000000000,heatpump,3,2050 -5,heat,all-week,early-peak,2040,all-year,R2,0.81000000000,heatpump,3,2050 -6,heat,all-week,early-peak,2045,all-year,R2,0.69000000000,heatpump,3,2050 -13,heat,all-week,early-peak,2040,all-year,R2,0.81000000000,heatpump,3,2050 -14,heat,all-week,early-peak,2045,all-year,R2,0.69000000000,heatpump,3,2050 -5,heat,all-week,late-peak,2040,all-year,R1,1.70100000000,heatpump,4,2050 -6,heat,all-week,late-peak,2045,all-year,R1,1.44900000000,heatpump,4,2050 -13,heat,all-week,late-peak,2040,all-year,R1,1.70100000000,heatpump,4,2050 -14,heat,all-week,late-peak,2045,all-year,R1,1.44900000000,heatpump,4,2050 -5,heat,all-week,late-peak,2040,all-year,R2,1.70100000000,heatpump,4,2050 -6,heat,all-week,late-peak,2045,all-year,R2,1.44900000000,heatpump,4,2050 -13,heat,all-week,late-peak,2040,all-year,R2,1.70100000000,heatpump,4,2050 -14,heat,all-week,late-peak,2045,all-year,R2,1.44900000000,heatpump,4,2050 -5,heat,all-week,evening,2040,all-year,R1,1.13400000000,heatpump,5,2050 -6,heat,all-week,evening,2045,all-year,R1,0.96600000000,heatpump,5,2050 -13,heat,all-week,evening,2040,all-year,R1,1.13400000000,heatpump,5,2050 -14,heat,all-week,evening,2045,all-year,R1,0.96600000000,heatpump,5,2050 -5,heat,all-week,evening,2040,all-year,R2,1.13400000000,heatpump,5,2050 -6,heat,all-week,evening,2045,all-year,R2,0.96600000000,heatpump,5,2050 -13,heat,all-week,evening,2040,all-year,R2,1.13400000000,heatpump,5,2050 -14,heat,all-week,evening,2045,all-year,R2,0.96600000000,heatpump,5,2050 -5,heat,all-week,early-morning,2040,all-year,R1,1.13400000000,heatpump,6,2050 -6,heat,all-week,early-morning,2045,all-year,R1,0.96600000000,heatpump,6,2050 -13,heat,all-week,early-morning,2040,all-year,R1,1.13400000000,heatpump,6,2050 -14,heat,all-week,early-morning,2045,all-year,R1,0.96600000000,heatpump,6,2050 -5,heat,all-week,early-morning,2040,all-year,R2,1.13400000000,heatpump,6,2050 -6,heat,all-week,early-morning,2045,all-year,R2,0.96600000000,heatpump,6,2050 -13,heat,all-week,early-morning,2040,all-year,R2,1.13400000000,heatpump,6,2050 -14,heat,all-week,early-morning,2045,all-year,R2,0.96600000000,heatpump,6,2050 -5,heat,all-week,late-afternoon,2040,all-year,R1,1.13400000000,heatpump,7,2050 -6,heat,all-week,late-afternoon,2045,all-year,R1,0.96600000000,heatpump,7,2050 -13,heat,all-week,late-afternoon,2040,all-year,R1,1.13400000000,heatpump,7,2050 -14,heat,all-week,late-afternoon,2045,all-year,R1,0.96600000000,heatpump,7,2050 -5,heat,all-week,late-afternoon,2040,all-year,R2,1.13400000000,heatpump,7,2050 -6,heat,all-week,late-afternoon,2045,all-year,R2,0.96600000000,heatpump,7,2050 -13,heat,all-week,late-afternoon,2040,all-year,R2,1.13400000000,heatpump,7,2050 -14,heat,all-week,late-afternoon,2045,all-year,R2,0.96600000000,heatpump,7,2050 diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/input/BaseYearExport.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/input/BaseYearExport.csv index 578ab646b..f9e1c4ef0 100644 --- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/input/BaseYearExport.csv +++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/input/BaseYearExport.csv @@ -1,40 +1,21 @@ -RegionName,Attribute,Time,electricity,gas,heat,CO2f,wind,solar -Unit,-,Year,PJ,PJ,PJ,kt,PJ,PJ -R1,Exports,2010,0,0,0,0,0,0 -R1,Exports,2015,0,0,0,0,0,0 -R1,Exports,2020,0,0,0,0,0,0 -R1,Exports,2025,0,0,0,0,0,0 -R1,Exports,2030,0,0,0,0,0,0 -R1,Exports,2035,0,0,0,0,0,0 -R1,Exports,2040,0,0,0,0,0,0 -R1,Exports,2045,0,0,0,0,0,0 -R1,Exports,2050,0,0,0,0,0,0 -R1,Exports,2055,0,0,0,0,0,0 -R1,Exports,2060,0,0,0,0,0,0 -R1,Exports,2065,0,0,0,0,0,0 -R1,Exports,2070,0,0,0,0,0,0 -R1,Exports,2075,0,0,0,0,0,0 -R1,Exports,2080,0,0,0,0,0,0 -R1,Exports,2085,0,0,0,0,0,0 -R1,Exports,2090,0,0,0,0,0,0 -R1,Exports,2095,0,0,0,0,0,0 -R1,Exports,2100,0,0,0,0,0,0 -R2,Exports,2010,0,0,0,0,0,0 -R2,Exports,2015,0,0,0,0,0,0 -R2,Exports,2020,0,0,0,0,0,0 -R2,Exports,2025,0,0,0,0,0,0 -R2,Exports,2030,0,0,0,0,0,0 -R2,Exports,2035,0,0,0,0,0,0 -R2,Exports,2040,0,0,0,0,0,0 -R2,Exports,2045,0,0,0,0,0,0 -R2,Exports,2050,0,0,0,0,0,0 -R2,Exports,2055,0,0,0,0,0,0 -R2,Exports,2060,0,0,0,0,0,0 -R2,Exports,2065,0,0,0,0,0,0 -R2,Exports,2070,0,0,0,0,0,0 -R2,Exports,2075,0,0,0,0,0,0 -R2,Exports,2080,0,0,0,0,0,0 -R2,Exports,2085,0,0,0,0,0,0 -R2,Exports,2090,0,0,0,0,0,0 -R2,Exports,2095,0,0,0,0,0,0 -R2,Exports,2100,0,0,0,0,0,0 +RegionName,Attribute,Time,electricity,gas,heat,CO2f,wind +Unit,-,Year,PJ,PJ,PJ,kt,PJ +R1,Exports,2010,0,0,0,0,0 +R1,Exports,2015,0,0,0,0,0 +R1,Exports,2020,0,0,0,0,0 +R1,Exports,2025,0,0,0,0,0 +R1,Exports,2030,0,0,0,0,0 +R1,Exports,2035,0,0,0,0,0 +R1,Exports,2040,0,0,0,0,0 +R1,Exports,2045,0,0,0,0,0 +R1,Exports,2050,0,0,0,0,0 +R1,Exports,2055,0,0,0,0,0 +R1,Exports,2060,0,0,0,0,0 +R1,Exports,2065,0,0,0,0,0 +R1,Exports,2070,0,0,0,0,0 +R1,Exports,2075,0,0,0,0,0 +R1,Exports,2080,0,0,0,0,0 +R1,Exports,2085,0,0,0,0,0 +R1,Exports,2090,0,0,0,0,0 +R1,Exports,2095,0,0,0,0,0 +R1,Exports,2100,0,0,0,0,0 diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/input/BaseYearImport.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/input/BaseYearImport.csv index 1f9b8f3e5..dc027f103 100644 --- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/input/BaseYearImport.csv +++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/input/BaseYearImport.csv @@ -1,40 +1,21 @@ -RegionName,Attribute,Time,electricity,gas,heat,CO2f,wind,solar -Unit,-,Year,PJ,PJ,PJ,kt,PJ,PJ -R1,Imports,2010,0,0,0,0,0,0 -R1,Imports,2015,0,0,0,0,0,0 -R1,Imports,2020,0,0,0,0,0,0 -R1,Imports,2025,0,0,0,0,0,0 -R1,Imports,2030,0,0,0,0,0,0 -R1,Imports,2035,0,0,0,0,0,0 -R1,Imports,2040,0,0,0,0,0,0 -R1,Imports,2045,0,0,0,0,0,0 -R1,Imports,2050,0,0,0,0,0,0 -R1,Imports,2055,0,0,0,0,0,0 -R1,Imports,2060,0,0,0,0,0,0 -R1,Imports,2065,0,0,0,0,0,0 -R1,Imports,2070,0,0,0,0,0,0 -R1,Imports,2075,0,0,0,0,0,0 -R1,Imports,2080,0,0,0,0,0,0 -R1,Imports,2085,0,0,0,0,0,0 -R1,Imports,2090,0,0,0,0,0,0 -R1,Imports,2095,0,0,0,0,0,0 -R1,Imports,2100,0,0,0,0,0,0 -R2,Imports,2010,0,0,0,0,0,0 -R2,Imports,2015,0,0,0,0,0,0 -R2,Imports,2020,0,0,0,0,0,0 -R2,Imports,2025,0,0,0,0,0,0 -R2,Imports,2030,0,0,0,0,0,0 -R2,Imports,2035,0,0,0,0,0,0 -R2,Imports,2040,0,0,0,0,0,0 -R2,Imports,2045,0,0,0,0,0,0 -R2,Imports,2050,0,0,0,0,0,0 -R2,Imports,2055,0,0,0,0,0,0 -R2,Imports,2060,0,0,0,0,0,0 -R2,Imports,2065,0,0,0,0,0,0 -R2,Imports,2070,0,0,0,0,0,0 -R2,Imports,2075,0,0,0,0,0,0 -R2,Imports,2080,0,0,0,0,0,0 -R2,Imports,2085,0,0,0,0,0,0 -R2,Imports,2090,0,0,0,0,0,0 -R2,Imports,2095,0,0,0,0,0,0 -R2,Imports,2100,0,0,0,0,0,0 +RegionName,Attribute,Time,electricity,gas,heat,CO2f,wind +Unit,-,Year,PJ,PJ,PJ,kt,PJ +R1,Imports,2010,0,0,0,0,0 +R1,Imports,2015,0,0,0,0,0 +R1,Imports,2020,0,0,0,0,0 +R1,Imports,2025,0,0,0,0,0 +R1,Imports,2030,0,0,0,0,0 +R1,Imports,2035,0,0,0,0,0 +R1,Imports,2040,0,0,0,0,0 +R1,Imports,2045,0,0,0,0,0 +R1,Imports,2050,0,0,0,0,0 +R1,Imports,2055,0,0,0,0,0 +R1,Imports,2060,0,0,0,0,0 +R1,Imports,2065,0,0,0,0,0 +R1,Imports,2070,0,0,0,0,0 +R1,Imports,2075,0,0,0,0,0 +R1,Imports,2080,0,0,0,0,0 +R1,Imports,2085,0,0,0,0,0 +R1,Imports,2090,0,0,0,0,0 +R1,Imports,2095,0,0,0,0,0 +R1,Imports,2100,0,0,0,0,0 diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/input/GlobalCommodities.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/input/GlobalCommodities.csv index 9691db73d..0d4c58da7 100644 --- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/input/GlobalCommodities.csv +++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/input/GlobalCommodities.csv @@ -1,7 +1,6 @@ Commodity,CommodityType,CommodityName,CommodityEmissionFactor_CO2,HeatRate,Unit -Electricity,Energy,electricity,0.0,1,PJ +Electricity,Energy,electricity,0,1,PJ Gas,Energy,gas,56.1,1,PJ -Heat,Energy,heat,0.0,1,PJ -Wind,Energy,wind,0.0,1,PJ -CO2fuelcomsbustion,Environmental,CO2f,0.0,1,kt -Solar,Energy,solar,0.0,1,PJ +Heat,Energy,heat,0,1,PJ +Wind,Energy,wind,0,1,PJ +CO2fuelcomsbustion,Environmental,CO2f,0,1,kt diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/input/Projections.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/input/Projections.csv index eb6950ddb..a28746897 100644 --- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/input/Projections.csv +++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/input/Projections.csv @@ -1,40 +1,21 @@ -RegionName,Attribute,Time,electricity,gas,heat,CO2f,wind,solar -Unit,-,Year,MUS$2010/PJ,MUS$2010/PJ,MUS$2010/PJ,MUS$2010/kt,MUS$2010/kt,MUS$2010/kt -R1,CommodityPrice,2010,14.81481472,6.6759,100,0,0,0 -R1,CommodityPrice,2015,17.89814806,6.914325,100,0.052913851,0,0 -R1,CommodityPrice,2020,19.5,7.15275,100,0.08314119,0,0 -R1,CommodityPrice,2025,21.93518528,8.10645,100,0.120069795,0,0 -R1,CommodityPrice,2030,26.50925917,9.06015,100,0.156998399,0,0 -R1,CommodityPrice,2035,26.51851861,9.2191,100,0.214877567,0,0 -R1,CommodityPrice,2040,23.85185194,9.37805,100,0.272756734,0,0 -R1,CommodityPrice,2045,23.97222222,9.193829337,100,0.35394801,0,0 -R1,CommodityPrice,2050,24.06481472,9.009608674,100,0.435139285,0,0 -R1,CommodityPrice,2055,25.3425925,8.832625604,100,0.542365578,0,0 -R1,CommodityPrice,2060,25.53703694,8.655642534,100,0.649591871,0,0 -R1,CommodityPrice,2065,25.32407417,8.485612708,100,0.780892624,0,0 -R1,CommodityPrice,2070,23.36111111,8.315582883,100,0.912193378,0,0 -R1,CommodityPrice,2075,22.27777778,8.152233126,100,1.078321687,0,0 -R1,CommodityPrice,2080,22.25925917,7.988883368,100,1.244449995,0,0 -R1,CommodityPrice,2085,22.17592583,7.831951236,100,1.4253503,0,0 -R1,CommodityPrice,2090,22.03703694,7.675019103,100,1.606250604,0,0 -R1,CommodityPrice,2095,21.94444444,7.524252461,100,1.73877515,0,0 -R1,CommodityPrice,2100,21.39814806,7.373485819,100,1.871299697,0,0 -R2,CommodityPrice,2010,14.81481472,6.6759,100,0,0,0 -R2,CommodityPrice,2015,17.89814806,6.914325,100,0.052913851,0,0 -R2,CommodityPrice,2020,19.5,7.15275,100,0.08314119,0,0 -R2,CommodityPrice,2025,21.93518528,8.10645,100,0.120069795,0,0 -R2,CommodityPrice,2030,26.50925917,9.06015,100,0.156998399,0,0 -R2,CommodityPrice,2035,26.51851861,9.2191,100,0.214877567,0,0 -R2,CommodityPrice,2040,23.85185194,9.37805,100,0.272756734,0,0 -R2,CommodityPrice,2045,23.97222222,9.193829337,100,0.35394801,0,0 -R2,CommodityPrice,2050,24.06481472,9.009608674,100,0.435139285,0,0 -R2,CommodityPrice,2055,25.3425925,8.832625604,100,0.542365578,0,0 -R2,CommodityPrice,2060,25.53703694,8.655642534,100,0.649591871,0,0 -R2,CommodityPrice,2065,25.32407417,8.485612708,100,0.780892624,0,0 -R2,CommodityPrice,2070,23.36111111,8.315582883,100,0.912193378,0,0 -R2,CommodityPrice,2075,22.27777778,8.152233126,100,1.078321687,0,0 -R2,CommodityPrice,2080,22.25925917,7.988883368,100,1.244449995,0,0 -R2,CommodityPrice,2085,22.17592583,7.831951236,100,1.4253503,0,0 -R2,CommodityPrice,2090,22.03703694,7.675019103,100,1.606250604,0,0 -R2,CommodityPrice,2095,21.94444444,7.524252461,100,1.73877515,0,0 -R2,CommodityPrice,2100,21.39814806,7.373485819,100,1.871299697,0,0 +RegionName,Attribute,Time,electricity,gas,heat,CO2f,wind +Unit,-,Year,MUS$2010/PJ,MUS$2010/PJ,MUS$2010/PJ,MUS$2010/kt,MUS$2010/kt +R1,CommodityPrice,2010,14.81481472,6.6759,100,0,0 +R1,CommodityPrice,2015,17.89814806,6.914325,100,0.052913851,0 +R1,CommodityPrice,2020,19.5,7.15275,100,0.08314119,0 +R1,CommodityPrice,2025,21.93518528,8.10645,100,0.120069795,0 +R1,CommodityPrice,2030,26.50925917,9.06015,100,0.156998399,0 +R1,CommodityPrice,2035,26.51851861,9.2191,100,0.214877567,0 +R1,CommodityPrice,2040,23.85185194,9.37805,100,0.272756734,0 +R1,CommodityPrice,2045,23.97222222,9.193829337,100,0.35394801,0 +R1,CommodityPrice,2050,24.06481472,9.009608674,100,0.435139285,0 +R1,CommodityPrice,2055,25.3425925,8.832625604,100,0.542365578,0 +R1,CommodityPrice,2060,25.53703694,8.655642534,100,0.649591871,0 +R1,CommodityPrice,2065,25.32407417,8.485612708,100,0.780892624,0 +R1,CommodityPrice,2070,23.36111111,8.315582883,100,0.912193378,0 +R1,CommodityPrice,2075,22.27777778,8.152233126,100,1.078321687,0 +R1,CommodityPrice,2080,22.25925917,7.988883368,100,1.244449995,0 +R1,CommodityPrice,2085,22.17592583,7.831951236,100,1.4253503,0 +R1,CommodityPrice,2090,22.03703694,7.675019103,100,1.606250604,0 +R1,CommodityPrice,2095,21.94444444,7.524252461,100,1.73877515,0 +R1,CommodityPrice,2100,21.39814806,7.373485819,100,1.871299697,0 diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/settings.toml b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/settings.toml index c6580ca28..c67af4903 100644 --- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/settings.toml +++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/settings.toml @@ -2,11 +2,11 @@ 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"] +regions = ["R1"] interest_rate = 0.1 interpolation_mode = 'Active' log_level = 'info' -excluded_commodities = ["wind", "solar"] +excluded_commodities = ["wind"] # Convergence parameters equilibrium_variable = 'demand' maximum_iterations = 100 @@ -14,12 +14,12 @@ tolerance = 0.1 tolerance_unmet_demand = -0.1 [[outputs]] -quantity = "prices" +quantity = "capacity" sink = "aggregate" filename = "{cwd}/{default_output_dir}/MCA{Quantity}.csv" [[outputs]] -quantity = "capacity" +quantity = "prices" sink = "aggregate" filename = "{cwd}/{default_output_dir}/MCA{Quantity}.csv" @@ -55,18 +55,6 @@ constraints = [ demand_share = "standard_demand" # Optional, default to standard_demand forecast = 5 # Optional, defaults to 5 -[[sectors.residential.outputs]] -filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}.csv' -quantity = "capacity" -sink = 'aggregate' - -[[sectors.residential.outputs]] -filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}.csv' -sink = 'aggregate' -quantity.name = "supply" -quantity.sum_over = "timeslice" -quantity.drop = ["comm_usage", "units_prices"] - [sectors.power] type = 'default' priority = 2 @@ -81,11 +69,6 @@ existing_capacity = '{path}/technodata/power/ExistingCapacity.csv' lpsolver = "scipy" demand_share = "standard_demand" -[[sectors.power.outputs]] -filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}.csv' -quantity = "capacity" -sink = 'aggregate' - [sectors.gas] type = 'default' priority = 3 @@ -100,11 +83,6 @@ existing_capacity = '{path}/technodata/gas/ExistingCapacity.csv' lpsolver = "scipy" demand_share = "standard_demand" -[[sectors.gas.outputs]] -filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}.csv' -quantity = "capacity" -sink = 'aggregate' - [sectors.residential_presets] type = 'presets' priority = 0 diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/Agents.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/Agents.csv index c5f87c36e..23061165f 100644 --- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/Agents.csv +++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/Agents.csv @@ -1,3 +1,2 @@ AgentShare,Name,RegionName,Objective1,Objective2,Objective3,ObjData1,ObjData2,ObjData3,Objsort1,Objsort2,Objsort3,SearchRule,DecisionMethod,Quantity,MaturityThreshold,SpendLimit,Type -Agent1,A1,R1,LCOE,,,1,,,True,,,all,singleObj,1,-1,inf,New -Agent1,A1,R2,LCOE,,,1,,,True,,,all,singleObj,1,-1,inf,New +Agent1,A1,R1,LCOE,,,1,,,TRUE,,,all,singleObj,1,-1,inf,New diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/gas/CommIn.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/gas/CommIn.csv index 8e98856f0..26a926b44 100644 --- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/gas/CommIn.csv +++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/gas/CommIn.csv @@ -1,4 +1,3 @@ ProcessName,RegionName,Time,Level,electricity,gas,heat,CO2f,wind Unit,-,Year,-,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ gassupply1,R1,2020,fixed,0,0,0,0,0 -gassupply1,R2,2020,fixed,0,0,0,0,0 diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/gas/CommOut.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/gas/CommOut.csv index ab041ad35..c47a23dd5 100644 --- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/gas/CommOut.csv +++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/gas/CommOut.csv @@ -1,4 +1,3 @@ ProcessName,RegionName,Time,electricity,gas,heat,CO2f,wind Unit,-,Year,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ gassupply1,R1,2020,0,1,0,0,0 -gassupply1,R2,2020,0,1,0,0,0 diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/gas/ExistingCapacity.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/gas/ExistingCapacity.csv index 2e95999a9..753038753 100644 --- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/gas/ExistingCapacity.csv +++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/gas/ExistingCapacity.csv @@ -1,3 +1,2 @@ ProcessName,RegionName,Unit,2020,2025,2030,2035,2040,2045,2050 gassupply1,R1,PJ/y,15,15,7.5,0,0,0,0 -gassupply1,R2,PJ/y,15,15,7.5,0,0,0,0 diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/gas/Technodata.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/gas/Technodata.csv index 9a0c6eeea..7855e4fe2 100644 --- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/gas/Technodata.csv +++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/gas/Technodata.csv @@ -1,4 +1,3 @@ ProcessName,RegionName,Time,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent1 Unit,-,Year,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,New -gassupply1,R1,2020,0,1,0,1,2.55,1,5,1,60,35,0.9,0.00000189,86,0.1,energy,gas,gas,1 -gassupply1,R2,2020,0,1,0,1,2.55,1,5,1,60,35,0.9,0.00000189,86,0.1,energy,gas,gas,1 +gassupply1,R1,2020,0,1,0,1,2.55,1,10,1,100,35,0.9,0.00000189,86,0.1,energy,gas,gas,1 diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/power/CommIn.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/power/CommIn.csv index 7a8e85039..163942435 100644 --- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/power/CommIn.csv +++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/power/CommIn.csv @@ -1,14 +1,4 @@ -ProcessName,RegionName,Time,Level,electricity,gas,heat,CO2f,wind,solar -Unit,-,Year,-,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ,PJ/PJ -gasCCGT,R1,2020,fixed,0,1.67,0,0,0,0 -gasCCGT,R1,2040,fixed,0,1.67,0,0,0,0 -windturbine,R1,2020,fixed,0,0,0,0,1,0 -windturbine,R1,2040,fixed,0,0,0,0,1,0 -solarPV,R1,2020,fixed,0,0,0,0,0,1 -solarPV,R1,2040,fixed,0,0,0,0,0,1 -gasCCGT,R2,2020,fixed,0,1.67,0,0,0,0 -gasCCGT,R2,2040,fixed,0,1.67,0,0,0,0 -windturbine,R2,2020,fixed,0,0,0,0,1,0 -windturbine,R2,2040,fixed,0,0,0,0,1,0 -solarPV,R2,2020,fixed,0,0,0,0,0,1 -solarPV,R2,2040,fixed,0,0,0,0,0,1 +ProcessName,RegionName,Time,Level,electricity,gas,heat,CO2f,wind +Unit,-,Year,-,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ +gasCCGT,R1,2020,fixed,0,1.67,0,0,0 +windturbine,R1,2020,fixed,0,0,0,0,1 diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/power/CommOut.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/power/CommOut.csv index 8dd37bb8b..87d61fbc4 100644 --- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/power/CommOut.csv +++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/power/CommOut.csv @@ -1,14 +1,4 @@ -ProcessName,RegionName,Time,electricity,gas,heat,CO2f,wind,solar -Unit,-,Year,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ,PJ/PJ -gasCCGT,R1,2020,1,0,0,91.67,0,0 -gasCCGT,R1,2040,1,0,0,91.67,0,0 -windturbine,R1,2020,1,0,0,0,0,0 -windturbine,R1,2040,1,0,0,0,0,0 -solarPV,R1,2020,1,0,0,0,0,0 -solarPV,R1,2040,1,0,0,0,0,0 -gasCCGT,R2,2020,1,0,0,91.67,0,0 -gasCCGT,R2,2040,1,0,0,91.67,0,0 -windturbine,R2,2020,1,0,0,0,0,0 -windturbine,R2,2040,1,0,0,0,0,0 -solarPV,R2,2020,1,0,0,0,0,0 -solarPV,R2,2040,1,0,0,0,0,0 +ProcessName,RegionName,Time,electricity,gas,heat,CO2f,wind +Unit,-,Year,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ +gasCCGT,R1,2020,1,0,0,91.67,0 +windturbine,R1,2020,1,0,0,0,0 diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/power/ExistingCapacity.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/power/ExistingCapacity.csv index 5c648dcad..7d1f66c7d 100644 --- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/power/ExistingCapacity.csv +++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/power/ExistingCapacity.csv @@ -1,7 +1,3 @@ ProcessName,RegionName,Unit,2020,2025,2030,2035,2040,2045,2050 gasCCGT,R1,PJ/y,1,1,0,0,0,0,0 windturbine,R1,PJ/y,0,0,0,0,0,0,0 -solarPV,R1,PJ/y,0,0,0,0,0,0,0 -gasCCGT,R2,PJ/y,1,1,0,0,0,0,0 -windturbine,R2,PJ/y,0,0,0,0,0,0,0 -solarPV,R2,PJ/y,0,0,0,0,0,0,0 diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/power/Technodata.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/power/Technodata.csv index 35173cf47..7c69894bc 100644 --- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/power/Technodata.csv +++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/power/Technodata.csv @@ -1,14 +1,4 @@ ProcessName,RegionName,Time,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent1 Unit,-,Year,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,New -gasCCGT,R1,2020,23.78234399,1,0,1,0,1,2,1,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1 -gasCCGT,R1,2040,23.78234399,1,0,1,0,1,2,1,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1 -windturbine,R1,2020,36.30771182,1,0,1,0,1,2,1,60,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1 -windturbine,R1,2040,36.30771182,1,0,1,0,1,2,1,60,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1 -solarPV,R1,2020,40,1,0,1,0,1,2,1,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1 -solarPV,R1,2040,30,1,0,1,0,1,2,1,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1 -gasCCGT,R2,2020,23.78234399,1,0,1,0,1,2,1,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1 -gasCCGT,R2,2040,23.78234399,1,0,1,0,1,2,1,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1 -windturbine,R2,2020,36.30771182,1,0,1,0,1,5,1,100,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1 -windturbine,R2,2040,36.30771182,1,0,1,0,1,5,1,100,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1 -solarPV,R2,2020,40,1,0,1,0,1,2,1,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1 -solarPV,R2,2040,30,1,0,1,0,1,2,1,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1 +gasCCGT,R1,2020,23.78234399,1,0,1,0,1,10,1,100,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1 +windturbine,R1,2020,36.30771182,1,0,1,0,1,10,1,100,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1 diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/preset/Residential2020Consumption.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/preset/Residential2020Consumption.csv index 3edc5e104..b378f47ce 100644 --- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/preset/Residential2020Consumption.csv +++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/preset/Residential2020Consumption.csv @@ -1,17 +1,9 @@ -RegionName,Timeslice,electricity,gas,heat,CO2f,wind,solar -R1,1,0,0,0.7,0,0,0 -R1,2,0,0,1.0,0,0,0 -R1,3,0,0,0.7,0,0,0 -R1,4,0,0,1.0,0,0,0 -R1,5,0,0,2.1,0,0,0 -R1,6,0,0,1.4,0,0,0 -R1,7,0,0,1.4,0,0,0 -R1,8,0,0,1.4,0,0,0 -R2,1,0,0,0.7,0,0,0 -R2,2,0,0,1.0,0,0,0 -R2,3,0,0,0.7,0,0,0 -R2,4,0,0,1.0,0,0,0 -R2,5,0,0,2.1,0,0,0 -R2,6,0,0,1.4,0,0,0 -R2,7,0,0,1.4,0,0,0 -R2,8,0,0,1.4,0,0,0 +RegionName,Timeslice,electricity,gas,heat,CO2f,wind +R1,1,0,0,0.7,0,0 +R1,2,0,0,1.0,0,0 +R1,3,0,0,0.7,0,0 +R1,4,0,0,1.0,0,0 +R1,5,0,0,2.1,0,0 +R1,6,0,0,1.4,0,0 +R1,7,0,0,1.4,0,0 +R1,8,0,0,1.4,0,0 diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/preset/Residential2050Consumption.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/preset/Residential2050Consumption.csv index 257644065..921b53347 100644 --- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/preset/Residential2050Consumption.csv +++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/preset/Residential2050Consumption.csv @@ -1,17 +1,9 @@ -RegionName,Timeslice,electricity,gas,heat,CO2f,wind,solar -R1,1,0,0,2.1,0,0,0 -R1,2,0,0,3.0,0,0,0 -R1,3,0,0,2.1,0,0,0 -R1,4,0,0,3.0,0,0,0 -R1,5,0,0,6.3,0,0,0 -R1,6,0,0,4.2,0,0,0 -R1,7,0,0,4.2,0,0,0 -R1,8,0,0,4.2,0,0,0 -R2,1,0,0,2.1,0,0,0 -R2,2,0,0,3.0,0,0,0 -R2,3,0,0,2.1,0,0,0 -R2,4,0,0,3.0,0,0,0 -R2,5,0,0,6.3,0,0,0 -R2,6,0,0,4.2,0,0,0 -R2,7,0,0,4.2,0,0,0 -R2,8,0,0,4.2,0,0,0 +RegionName,Timeslice,electricity,gas,heat,CO2f,wind +R1,1,0,0,2.1,0,0 +R1,2,0,0,3.0,0,0 +R1,3,0,0,2.1,0,0 +R1,4,0,0,3.0,0,0 +R1,5,0,0,6.3,0,0 +R1,6,0,0,4.2,0,0 +R1,7,0,0,4.2,0,0 +R1,8,0,0,4.2,0,0 diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/residential/CommIn.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/residential/CommIn.csv index 3eedce971..7663f0dd2 100644 --- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/residential/CommIn.csv +++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/residential/CommIn.csv @@ -2,5 +2,3 @@ ProcessName,RegionName,Time,Level,electricity,gas,heat,CO2f,wind Unit,-,Year,-,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ gasboiler,R1,2020,fixed,0,1.16,0,0,0 heatpump,R1,2020,fixed,0.4,0,0,0,0 -gasboiler,R2,2020,fixed,0,1.16,0,0,0 -heatpump,R2,2020,fixed,0.4,0,0,0,0 diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/residential/CommOut.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/residential/CommOut.csv index 10f54e99a..420ae841a 100644 --- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/residential/CommOut.csv +++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/residential/CommOut.csv @@ -2,5 +2,3 @@ ProcessName,RegionName,Time,electricity,gas,heat,CO2f,wind Unit,-,Year,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ gasboiler,R1,2020,0,0,1,64.71,0 heatpump,R1,2020,0,0,1,0,0 -gasboiler,R2,2020,0,0,1,64.71,0 -heatpump,R2,2020,0,0,1,0,0 diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/residential/ExistingCapacity.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/residential/ExistingCapacity.csv index d57d56eb7..f3c6500db 100644 --- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/residential/ExistingCapacity.csv +++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/residential/ExistingCapacity.csv @@ -1,5 +1,3 @@ ProcessName,RegionName,Unit,2020,2025,2030,2035,2040,2045,2050 gasboiler,R1,PJ/y,10,5,0,0,0,0,0 heatpump,R1,PJ/y,0,0,0,0,0,0,0 -gasboiler,R2,PJ/y,10,5,0,0,0,0,0 -heatpump,R2,PJ/y,0,0,0,0,0,0,0 diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/residential/Technodata.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/residential/Technodata.csv index aca2d3a26..24f3a949b 100644 --- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/residential/Technodata.csv +++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/residential/Technodata.csv @@ -1,6 +1,4 @@ ProcessName,RegionName,Time,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent1 Unit,-,Year,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,New -gasboiler,R1,2020,3.8,1,0,1,0,1,10,0.2,60,10,1,0.00000189,86,0.1,energy,gas,heat,1 -heatpump,R1,2020,8.866667,1,0,1,0,1,10,0.2,60,10,1,0.00000189,86,0.1,energy,electricity,heat,1 -gasboiler,R2,2020,3.8,1,0,1,0,1,10,0.2,60,10,1,0.00000189,86,0.1,energy,gas,heat,1 -heatpump,R2,2020,8.866667,1,0,1,0,1,10,0.2,60,10,1,0.00000189,86,0.1,energy,electricity,heat,1 +gasboiler,R1,2020,3.8,1,0,1,0,1,10,1,100,10,1,0.00000189,86,0.1,energy,gas,heat,1 +heatpump,R1,2020,8.866667,1,0,1,0,1,10,1,100,10,1,0.00000189,86,0.1,energy,electricity,heat,1 diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity.csv deleted file mode 100644 index 8c854add8..000000000 --- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity.csv +++ /dev/null @@ -1,91 +0,0 @@ -asset,capacity,installed,region,technology,year -0,15.00000000000,2020,R1,gassupply1,2020 -1,15.00000000000,2020,R2,gassupply1,2020 -0,15.34280000000,2020,R1,gassupply1,2022 -2,15.34280000000,2020,R2,gassupply1,2022 -0,15.34280000000,2020,R1,gassupply1,2024 -1,0.60380000000,2022,R1,gassupply1,2024 -3,15.34280000000,2020,R2,gassupply1,2024 -4,0.60380000000,2022,R2,gassupply1,2024 -0,13.84280000000,2020,R1,gassupply1,2026 -1,0.60380000000,2022,R1,gassupply1,2026 -2,2.07490000000,2024,R1,gassupply1,2026 -4,13.84280000000,2020,R2,gassupply1,2026 -5,0.60380000000,2022,R2,gassupply1,2026 -6,2.07490000000,2024,R2,gassupply1,2026 -0,10.84280000000,2020,R1,gassupply1,2028 -1,0.60380000000,2022,R1,gassupply1,2028 -2,2.07490000000,2024,R1,gassupply1,2028 -3,3.55300000000,2026,R1,gassupply1,2028 -5,10.84280000000,2020,R2,gassupply1,2028 -6,0.60380000000,2022,R2,gassupply1,2028 -7,2.07490000000,2024,R2,gassupply1,2028 -8,3.55300000000,2026,R2,gassupply1,2028 -0,7.84280000000,2020,R1,gassupply1,2030 -1,0.60380000000,2022,R1,gassupply1,2030 -2,2.07490000000,2024,R1,gassupply1,2030 -3,3.55300000000,2026,R1,gassupply1,2030 -4,3.53600000000,2028,R1,gassupply1,2030 -6,7.84280000000,2020,R2,gassupply1,2030 -7,0.60380000000,2022,R2,gassupply1,2030 -8,2.07490000000,2024,R2,gassupply1,2030 -9,3.55300000000,2026,R2,gassupply1,2030 -10,3.53600000000,2028,R2,gassupply1,2030 -0,4.84280000000,2020,R1,gassupply1,2032 -1,0.60380000000,2022,R1,gassupply1,2032 -2,2.07490000000,2024,R1,gassupply1,2032 -3,3.55300000000,2026,R1,gassupply1,2032 -4,3.53600000000,2028,R1,gassupply1,2032 -5,4.66260000000,2030,R1,gassupply1,2032 -7,4.84280000000,2020,R2,gassupply1,2032 -8,0.60380000000,2022,R2,gassupply1,2032 -9,2.07490000000,2024,R2,gassupply1,2032 -10,3.55300000000,2026,R2,gassupply1,2032 -11,3.53600000000,2028,R2,gassupply1,2032 -12,4.66260000000,2030,R2,gassupply1,2032 -0,1.84280000000,2020,R1,gassupply1,2034 -1,0.60380000000,2022,R1,gassupply1,2034 -2,2.07490000000,2024,R1,gassupply1,2034 -3,3.55300000000,2026,R1,gassupply1,2034 -4,3.53600000000,2028,R1,gassupply1,2034 -5,4.66260000000,2030,R1,gassupply1,2034 -6,3.62850000000,2032,R1,gassupply1,2034 -8,1.84280000000,2020,R2,gassupply1,2034 -9,0.60380000000,2022,R2,gassupply1,2034 -10,2.07490000000,2024,R2,gassupply1,2034 -11,3.55300000000,2026,R2,gassupply1,2034 -12,3.53600000000,2028,R2,gassupply1,2034 -13,4.66260000000,2030,R2,gassupply1,2034 -14,3.62850000000,2032,R2,gassupply1,2034 -0,0.34280000000,2020,R1,gassupply1,2036 -1,0.60380000000,2022,R1,gassupply1,2036 -2,2.07490000000,2024,R1,gassupply1,2036 -3,3.55300000000,2026,R1,gassupply1,2036 -4,3.53600000000,2028,R1,gassupply1,2036 -5,4.66260000000,2030,R1,gassupply1,2036 -6,3.62850000000,2032,R1,gassupply1,2036 -7,1.50000000000,2034,R1,gassupply1,2036 -8,0.34280000000,2020,R2,gassupply1,2036 -9,0.60380000000,2022,R2,gassupply1,2036 -10,2.07490000000,2024,R2,gassupply1,2036 -11,3.55300000000,2026,R2,gassupply1,2036 -12,3.53600000000,2028,R2,gassupply1,2036 -13,4.66260000000,2030,R2,gassupply1,2036 -14,3.62850000000,2032,R2,gassupply1,2036 -15,1.50000000000,2034,R2,gassupply1,2036 -0,0.34280000000,2020,R1,gassupply1,2040 -1,0.60380000000,2022,R1,gassupply1,2040 -2,2.07490000000,2024,R1,gassupply1,2040 -3,3.55300000000,2026,R1,gassupply1,2040 -4,3.53600000000,2028,R1,gassupply1,2040 -5,4.66260000000,2030,R1,gassupply1,2040 -6,3.62850000000,2032,R1,gassupply1,2040 -7,1.50000000000,2034,R1,gassupply1,2040 -8,0.34280000000,2020,R2,gassupply1,2040 -9,0.60380000000,2022,R2,gassupply1,2040 -10,2.07490000000,2024,R2,gassupply1,2040 -11,3.55300000000,2026,R2,gassupply1,2040 -12,3.53600000000,2028,R2,gassupply1,2040 -13,4.66260000000,2030,R2,gassupply1,2040 -14,3.62850000000,2032,R2,gassupply1,2040 -15,1.50000000000,2034,R2,gassupply1,2040 diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/MCACapacity.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/MCACapacity.csv index b565c055d..5ab29d31f 100644 --- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/MCACapacity.csv +++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/MCACapacity.csv @@ -1,330 +1,167 @@ agent,capacity,dst_region,installed,region,sector,technology,type,year A1,10.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2020 -A1,10.00000000000,R2,2020,R2,residential,gasboiler,newcapa,2020 A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2020 -A1,1.00000000000,R2,2020,R2,power,gasCCGT,newcapa,2020 A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2020 -A1,15.00000000000,R2,2020,R2,gas,gassupply1,newcapa,2020 A1,8.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2022 A1,11.00000000000,R1,2020,R1,residential,heatpump,newcapa,2022 -A1,8.00000000000,R2,2020,R2,residential,gasboiler,newcapa,2022 -A1,11.00000000000,R2,2020,R2,residential,heatpump,newcapa,2022 A1,3.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2022 -A1,0.27320000000,R1,2020,R1,power,solarPV,newcapa,2022 A1,4.00000000000,R1,2020,R1,power,windturbine,newcapa,2022 -A1,3.00000000000,R2,2020,R2,power,gasCCGT,newcapa,2022 -A1,4.27320000000,R2,2020,R2,power,windturbine,newcapa,2022 -A1,15.34280000000,R1,2020,R1,gas,gassupply1,newcapa,2022 -A1,15.34280000000,R2,2020,R2,gas,gassupply1,newcapa,2022 +A1,15.47010000000,R1,2020,R1,gas,gassupply1,newcapa,2022 A1,6.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2024 A1,11.00000000000,R1,2020,R1,residential,heatpump,newcapa,2024 A1,4.00000000000,R1,2022,R1,residential,heatpump,newcapa,2024 -A1,6.00000000000,R2,2020,R2,residential,gasboiler,newcapa,2024 -A1,11.00000000000,R2,2020,R2,residential,heatpump,newcapa,2024 -A1,4.00000000000,R2,2022,R2,residential,heatpump,newcapa,2024 A1,3.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2024 -A1,1.85640000000,R1,2022,R1,power,gasCCGT,newcapa,2024 -A1,0.27320000000,R1,2020,R1,power,solarPV,newcapa,2024 +A1,1.00000000000,R1,2022,R1,power,gasCCGT,newcapa,2024 A1,4.00000000000,R1,2020,R1,power,windturbine,newcapa,2024 -A1,3.00000000000,R2,2020,R2,power,gasCCGT,newcapa,2024 -A1,1.85640000000,R2,2022,R2,power,gasCCGT,newcapa,2024 -A1,4.27320000000,R2,2020,R2,power,windturbine,newcapa,2024 -A1,15.34280000000,R1,2020,R1,gas,gassupply1,newcapa,2024 -A1,0.60380000000,R1,2022,R1,gas,gassupply1,newcapa,2024 -A1,15.34280000000,R2,2020,R2,gas,gassupply1,newcapa,2024 -A1,0.60380000000,R2,2022,R2,gas,gassupply1,newcapa,2024 +A1,15.47010000000,R1,2020,R1,gas,gassupply1,newcapa,2024 +A1,0.17680000000,R1,2022,R1,gas,gassupply1,newcapa,2024 A1,4.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2026 A1,11.00000000000,R1,2020,R1,residential,heatpump,newcapa,2026 A1,4.00000000000,R1,2022,R1,residential,heatpump,newcapa,2026 A1,4.00000000000,R1,2024,R1,residential,heatpump,newcapa,2026 -A1,4.00000000000,R2,2020,R2,residential,gasboiler,newcapa,2026 -A1,11.00000000000,R2,2020,R2,residential,heatpump,newcapa,2026 -A1,4.00000000000,R2,2022,R2,residential,heatpump,newcapa,2026 -A1,4.00000000000,R2,2024,R2,residential,heatpump,newcapa,2026 -A1,2.80000000000,R1,2020,R1,power,gasCCGT,newcapa,2026 -A1,1.85640000000,R1,2022,R1,power,gasCCGT,newcapa,2026 -A1,2.07980000000,R1,2024,R1,power,gasCCGT,newcapa,2026 -A1,0.27320000000,R1,2020,R1,power,solarPV,newcapa,2026 +A1,2.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2026 +A1,1.00000000000,R1,2022,R1,power,gasCCGT,newcapa,2026 +A1,3.00000000000,R1,2024,R1,power,gasCCGT,newcapa,2026 A1,4.00000000000,R1,2020,R1,power,windturbine,newcapa,2026 -A1,2.80000000000,R2,2020,R2,power,gasCCGT,newcapa,2026 -A1,1.85640000000,R2,2022,R2,power,gasCCGT,newcapa,2026 -A1,2.07980000000,R2,2024,R2,power,gasCCGT,newcapa,2026 -A1,4.27320000000,R2,2020,R2,power,windturbine,newcapa,2026 -A1,13.84280000000,R1,2020,R1,gas,gassupply1,newcapa,2026 -A1,0.60380000000,R1,2022,R1,gas,gassupply1,newcapa,2026 -A1,2.07490000000,R1,2024,R1,gas,gassupply1,newcapa,2026 -A1,13.84280000000,R2,2020,R2,gas,gassupply1,newcapa,2026 -A1,0.60380000000,R2,2022,R2,gas,gassupply1,newcapa,2026 -A1,2.07490000000,R2,2024,R2,gas,gassupply1,newcapa,2026 +A1,13.97010000000,R1,2020,R1,gas,gassupply1,newcapa,2026 +A1,0.17680000000,R1,2022,R1,gas,gassupply1,newcapa,2026 +A1,2.25000000000,R1,2024,R1,gas,gassupply1,newcapa,2026 A1,2.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2028 A1,11.00000000000,R1,2020,R1,residential,heatpump,newcapa,2028 A1,4.00000000000,R1,2022,R1,residential,heatpump,newcapa,2028 A1,4.00000000000,R1,2024,R1,residential,heatpump,newcapa,2028 A1,4.00000000000,R1,2026,R1,residential,heatpump,newcapa,2028 -A1,2.00000000000,R2,2020,R2,residential,gasboiler,newcapa,2028 -A1,11.00000000000,R2,2020,R2,residential,heatpump,newcapa,2028 -A1,4.00000000000,R2,2022,R2,residential,heatpump,newcapa,2028 -A1,4.00000000000,R2,2024,R2,residential,heatpump,newcapa,2028 -A1,4.00000000000,R2,2026,R2,residential,heatpump,newcapa,2028 -A1,2.40000000000,R1,2020,R1,power,gasCCGT,newcapa,2028 -A1,1.85640000000,R1,2022,R1,power,gasCCGT,newcapa,2028 -A1,2.07980000000,R1,2024,R1,power,gasCCGT,newcapa,2028 -A1,2.29760000000,R1,2026,R1,power,gasCCGT,newcapa,2028 -A1,0.27320000000,R1,2020,R1,power,solarPV,newcapa,2028 +A1,2.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2028 +A1,1.00000000000,R1,2022,R1,power,gasCCGT,newcapa,2028 +A1,3.00000000000,R1,2024,R1,power,gasCCGT,newcapa,2028 +A1,2.00000000000,R1,2026,R1,power,gasCCGT,newcapa,2028 A1,4.00000000000,R1,2020,R1,power,windturbine,newcapa,2028 -A1,2.40000000000,R2,2020,R2,power,gasCCGT,newcapa,2028 -A1,1.85640000000,R2,2022,R2,power,gasCCGT,newcapa,2028 -A1,2.07980000000,R2,2024,R2,power,gasCCGT,newcapa,2028 -A1,2.29760000000,R2,2026,R2,power,gasCCGT,newcapa,2028 -A1,4.27320000000,R2,2020,R2,power,windturbine,newcapa,2028 -A1,10.84280000000,R1,2020,R1,gas,gassupply1,newcapa,2028 -A1,0.60380000000,R1,2022,R1,gas,gassupply1,newcapa,2028 -A1,2.07490000000,R1,2024,R1,gas,gassupply1,newcapa,2028 -A1,3.55300000000,R1,2026,R1,gas,gassupply1,newcapa,2028 -A1,10.84280000000,R2,2020,R2,gas,gassupply1,newcapa,2028 -A1,0.60380000000,R2,2022,R2,gas,gassupply1,newcapa,2028 -A1,2.07490000000,R2,2024,R2,gas,gassupply1,newcapa,2028 -A1,3.55300000000,R2,2026,R2,gas,gassupply1,newcapa,2028 +A1,10.97010000000,R1,2020,R1,gas,gassupply1,newcapa,2028 +A1,0.17680000000,R1,2022,R1,gas,gassupply1,newcapa,2028 +A1,2.25000000000,R1,2024,R1,gas,gassupply1,newcapa,2028 +A1,3.65110000000,R1,2026,R1,gas,gassupply1,newcapa,2028 A1,11.00000000000,R1,2020,R1,residential,heatpump,newcapa,2030 A1,4.00000000000,R1,2022,R1,residential,heatpump,newcapa,2030 A1,4.00000000000,R1,2024,R1,residential,heatpump,newcapa,2030 A1,4.00000000000,R1,2026,R1,residential,heatpump,newcapa,2030 A1,5.00000000000,R1,2028,R1,residential,heatpump,newcapa,2030 -A1,11.00000000000,R2,2020,R2,residential,heatpump,newcapa,2030 -A1,4.00000000000,R2,2022,R2,residential,heatpump,newcapa,2030 -A1,4.00000000000,R2,2024,R2,residential,heatpump,newcapa,2030 -A1,4.00000000000,R2,2026,R2,residential,heatpump,newcapa,2030 -A1,5.00000000000,R2,2028,R2,residential,heatpump,newcapa,2030 A1,2.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2030 -A1,1.85640000000,R1,2022,R1,power,gasCCGT,newcapa,2030 -A1,2.07980000000,R1,2024,R1,power,gasCCGT,newcapa,2030 -A1,2.29760000000,R1,2026,R1,power,gasCCGT,newcapa,2030 -A1,2.31150000000,R1,2028,R1,power,gasCCGT,newcapa,2030 -A1,0.27320000000,R1,2020,R1,power,solarPV,newcapa,2030 +A1,1.00000000000,R1,2022,R1,power,gasCCGT,newcapa,2030 +A1,3.00000000000,R1,2024,R1,power,gasCCGT,newcapa,2030 +A1,2.00000000000,R1,2026,R1,power,gasCCGT,newcapa,2030 +A1,2.00000000000,R1,2028,R1,power,gasCCGT,newcapa,2030 A1,4.00000000000,R1,2020,R1,power,windturbine,newcapa,2030 -A1,2.00000000000,R2,2020,R2,power,gasCCGT,newcapa,2030 -A1,1.85640000000,R2,2022,R2,power,gasCCGT,newcapa,2030 -A1,2.07980000000,R2,2024,R2,power,gasCCGT,newcapa,2030 -A1,2.29760000000,R2,2026,R2,power,gasCCGT,newcapa,2030 -A1,2.31150000000,R2,2028,R2,power,gasCCGT,newcapa,2030 -A1,4.27320000000,R2,2020,R2,power,windturbine,newcapa,2030 -A1,7.84280000000,R1,2020,R1,gas,gassupply1,newcapa,2030 -A1,0.60380000000,R1,2022,R1,gas,gassupply1,newcapa,2030 -A1,2.07490000000,R1,2024,R1,gas,gassupply1,newcapa,2030 -A1,3.55300000000,R1,2026,R1,gas,gassupply1,newcapa,2030 -A1,3.53600000000,R1,2028,R1,gas,gassupply1,newcapa,2030 -A1,7.84280000000,R2,2020,R2,gas,gassupply1,newcapa,2030 -A1,0.60380000000,R2,2022,R2,gas,gassupply1,newcapa,2030 -A1,2.07490000000,R2,2024,R2,gas,gassupply1,newcapa,2030 -A1,3.55300000000,R2,2026,R2,gas,gassupply1,newcapa,2030 -A1,3.53600000000,R2,2028,R2,gas,gassupply1,newcapa,2030 +A1,7.97010000000,R1,2020,R1,gas,gassupply1,newcapa,2030 +A1,0.17680000000,R1,2022,R1,gas,gassupply1,newcapa,2030 +A1,2.25000000000,R1,2024,R1,gas,gassupply1,newcapa,2030 +A1,3.65110000000,R1,2026,R1,gas,gassupply1,newcapa,2030 +A1,3.59730000000,R1,2028,R1,gas,gassupply1,newcapa,2030 A1,4.00000000000,R1,2022,R1,residential,heatpump,newcapa,2032 A1,4.00000000000,R1,2024,R1,residential,heatpump,newcapa,2032 A1,4.00000000000,R1,2026,R1,residential,heatpump,newcapa,2032 A1,5.00000000000,R1,2028,R1,residential,heatpump,newcapa,2032 A1,13.00000000000,R1,2030,R1,residential,heatpump,newcapa,2032 -A1,4.00000000000,R2,2022,R2,residential,heatpump,newcapa,2032 -A1,4.00000000000,R2,2024,R2,residential,heatpump,newcapa,2032 -A1,4.00000000000,R2,2026,R2,residential,heatpump,newcapa,2032 -A1,5.00000000000,R2,2028,R2,residential,heatpump,newcapa,2032 -A1,13.00000000000,R2,2030,R2,residential,heatpump,newcapa,2032 A1,2.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2032 -A1,1.85640000000,R1,2022,R1,power,gasCCGT,newcapa,2032 -A1,2.07980000000,R1,2024,R1,power,gasCCGT,newcapa,2032 -A1,2.29760000000,R1,2026,R1,power,gasCCGT,newcapa,2032 -A1,2.31150000000,R1,2028,R1,power,gasCCGT,newcapa,2032 -A1,0.99560000000,R1,2030,R1,power,gasCCGT,newcapa,2032 -A1,0.27320000000,R1,2020,R1,power,solarPV,newcapa,2032 +A1,1.00000000000,R1,2022,R1,power,gasCCGT,newcapa,2032 +A1,3.00000000000,R1,2024,R1,power,gasCCGT,newcapa,2032 +A1,2.00000000000,R1,2026,R1,power,gasCCGT,newcapa,2032 +A1,2.00000000000,R1,2028,R1,power,gasCCGT,newcapa,2032 +A1,1.00000000000,R1,2030,R1,power,gasCCGT,newcapa,2032 A1,4.00000000000,R1,2020,R1,power,windturbine,newcapa,2032 -A1,2.00000000000,R2,2020,R2,power,gasCCGT,newcapa,2032 -A1,1.85640000000,R2,2022,R2,power,gasCCGT,newcapa,2032 -A1,2.07980000000,R2,2024,R2,power,gasCCGT,newcapa,2032 -A1,2.29760000000,R2,2026,R2,power,gasCCGT,newcapa,2032 -A1,2.31150000000,R2,2028,R2,power,gasCCGT,newcapa,2032 -A1,0.99560000000,R2,2030,R2,power,gasCCGT,newcapa,2032 -A1,4.27320000000,R2,2020,R2,power,windturbine,newcapa,2032 -A1,4.84280000000,R1,2020,R1,gas,gassupply1,newcapa,2032 -A1,0.60380000000,R1,2022,R1,gas,gassupply1,newcapa,2032 -A1,2.07490000000,R1,2024,R1,gas,gassupply1,newcapa,2032 -A1,3.55300000000,R1,2026,R1,gas,gassupply1,newcapa,2032 -A1,3.53600000000,R1,2028,R1,gas,gassupply1,newcapa,2032 -A1,4.66260000000,R1,2030,R1,gas,gassupply1,newcapa,2032 -A1,4.84280000000,R2,2020,R2,gas,gassupply1,newcapa,2032 -A1,0.60380000000,R2,2022,R2,gas,gassupply1,newcapa,2032 -A1,2.07490000000,R2,2024,R2,gas,gassupply1,newcapa,2032 -A1,3.55300000000,R2,2026,R2,gas,gassupply1,newcapa,2032 -A1,3.53600000000,R2,2028,R2,gas,gassupply1,newcapa,2032 -A1,4.66260000000,R2,2030,R2,gas,gassupply1,newcapa,2032 +A1,4.97010000000,R1,2020,R1,gas,gassupply1,newcapa,2032 +A1,0.17680000000,R1,2022,R1,gas,gassupply1,newcapa,2032 +A1,2.25000000000,R1,2024,R1,gas,gassupply1,newcapa,2032 +A1,3.65110000000,R1,2026,R1,gas,gassupply1,newcapa,2032 +A1,3.59730000000,R1,2028,R1,gas,gassupply1,newcapa,2032 +A1,4.67680000000,R1,2030,R1,gas,gassupply1,newcapa,2032 A1,4.00000000000,R1,2024,R1,residential,heatpump,newcapa,2034 A1,4.00000000000,R1,2026,R1,residential,heatpump,newcapa,2034 A1,5.00000000000,R1,2028,R1,residential,heatpump,newcapa,2034 A1,13.00000000000,R1,2030,R1,residential,heatpump,newcapa,2034 A1,6.00000000000,R1,2032,R1,residential,heatpump,newcapa,2034 -A1,4.00000000000,R2,2024,R2,residential,heatpump,newcapa,2034 -A1,4.00000000000,R2,2026,R2,residential,heatpump,newcapa,2034 -A1,5.00000000000,R2,2028,R2,residential,heatpump,newcapa,2034 -A1,13.00000000000,R2,2030,R2,residential,heatpump,newcapa,2034 -A1,6.00000000000,R2,2032,R2,residential,heatpump,newcapa,2034 A1,2.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2034 -A1,1.85640000000,R1,2022,R1,power,gasCCGT,newcapa,2034 -A1,2.07980000000,R1,2024,R1,power,gasCCGT,newcapa,2034 -A1,2.29760000000,R1,2026,R1,power,gasCCGT,newcapa,2034 -A1,2.31150000000,R1,2028,R1,power,gasCCGT,newcapa,2034 -A1,0.99560000000,R1,2030,R1,power,gasCCGT,newcapa,2034 -A1,0.75270000000,R1,2032,R1,power,gasCCGT,newcapa,2034 -A1,0.27320000000,R1,2020,R1,power,solarPV,newcapa,2034 -A1,0.54630000000,R1,2032,R1,power,solarPV,newcapa,2034 +A1,1.00000000000,R1,2022,R1,power,gasCCGT,newcapa,2034 +A1,3.00000000000,R1,2024,R1,power,gasCCGT,newcapa,2034 +A1,2.00000000000,R1,2026,R1,power,gasCCGT,newcapa,2034 +A1,2.00000000000,R1,2028,R1,power,gasCCGT,newcapa,2034 +A1,1.00000000000,R1,2030,R1,power,gasCCGT,newcapa,2034 +A1,1.00000000000,R1,2032,R1,power,gasCCGT,newcapa,2034 A1,4.00000000000,R1,2020,R1,power,windturbine,newcapa,2034 -A1,2.00000000000,R2,2020,R2,power,gasCCGT,newcapa,2034 -A1,1.85640000000,R2,2022,R2,power,gasCCGT,newcapa,2034 -A1,2.07980000000,R2,2024,R2,power,gasCCGT,newcapa,2034 -A1,2.29760000000,R2,2026,R2,power,gasCCGT,newcapa,2034 -A1,2.31150000000,R2,2028,R2,power,gasCCGT,newcapa,2034 -A1,0.99560000000,R2,2030,R2,power,gasCCGT,newcapa,2034 -A1,2.24000000000,R2,2032,R2,power,solarPV,newcapa,2034 -A1,4.27320000000,R2,2020,R2,power,windturbine,newcapa,2034 -A1,1.84280000000,R1,2020,R1,gas,gassupply1,newcapa,2034 -A1,0.60380000000,R1,2022,R1,gas,gassupply1,newcapa,2034 -A1,2.07490000000,R1,2024,R1,gas,gassupply1,newcapa,2034 -A1,3.55300000000,R1,2026,R1,gas,gassupply1,newcapa,2034 -A1,3.53600000000,R1,2028,R1,gas,gassupply1,newcapa,2034 -A1,4.66260000000,R1,2030,R1,gas,gassupply1,newcapa,2034 -A1,3.62850000000,R1,2032,R1,gas,gassupply1,newcapa,2034 -A1,1.84280000000,R2,2020,R2,gas,gassupply1,newcapa,2034 -A1,0.60380000000,R2,2022,R2,gas,gassupply1,newcapa,2034 -A1,2.07490000000,R2,2024,R2,gas,gassupply1,newcapa,2034 -A1,3.55300000000,R2,2026,R2,gas,gassupply1,newcapa,2034 -A1,3.53600000000,R2,2028,R2,gas,gassupply1,newcapa,2034 -A1,4.66260000000,R2,2030,R2,gas,gassupply1,newcapa,2034 -A1,3.62850000000,R2,2032,R2,gas,gassupply1,newcapa,2034 +A1,1.97010000000,R1,2020,R1,gas,gassupply1,newcapa,2034 +A1,0.17680000000,R1,2022,R1,gas,gassupply1,newcapa,2034 +A1,2.25000000000,R1,2024,R1,gas,gassupply1,newcapa,2034 +A1,3.65110000000,R1,2026,R1,gas,gassupply1,newcapa,2034 +A1,3.59730000000,R1,2028,R1,gas,gassupply1,newcapa,2034 +A1,4.67680000000,R1,2030,R1,gas,gassupply1,newcapa,2034 +A1,4.67470000000,R1,2032,R1,gas,gassupply1,newcapa,2034 A1,4.00000000000,R1,2026,R1,residential,heatpump,newcapa,2036 A1,5.00000000000,R1,2028,R1,residential,heatpump,newcapa,2036 A1,13.00000000000,R1,2030,R1,residential,heatpump,newcapa,2036 A1,6.00000000000,R1,2032,R1,residential,heatpump,newcapa,2036 A1,6.00000000000,R1,2034,R1,residential,heatpump,newcapa,2036 -A1,4.00000000000,R2,2026,R2,residential,heatpump,newcapa,2036 -A1,5.00000000000,R2,2028,R2,residential,heatpump,newcapa,2036 -A1,13.00000000000,R2,2030,R2,residential,heatpump,newcapa,2036 -A1,6.00000000000,R2,2032,R2,residential,heatpump,newcapa,2036 -A1,6.00000000000,R2,2034,R2,residential,heatpump,newcapa,2036 A1,2.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2036 -A1,1.85640000000,R1,2022,R1,power,gasCCGT,newcapa,2036 -A1,2.07980000000,R1,2024,R1,power,gasCCGT,newcapa,2036 -A1,2.29760000000,R1,2026,R1,power,gasCCGT,newcapa,2036 -A1,2.31150000000,R1,2028,R1,power,gasCCGT,newcapa,2036 -A1,0.99560000000,R1,2030,R1,power,gasCCGT,newcapa,2036 -A1,0.75270000000,R1,2032,R1,power,gasCCGT,newcapa,2036 -A1,0.27320000000,R1,2020,R1,power,solarPV,newcapa,2036 -A1,0.54630000000,R1,2032,R1,power,solarPV,newcapa,2036 -A1,1.63890000000,R1,2034,R1,power,solarPV,newcapa,2036 +A1,1.00000000000,R1,2022,R1,power,gasCCGT,newcapa,2036 +A1,3.00000000000,R1,2024,R1,power,gasCCGT,newcapa,2036 +A1,2.00000000000,R1,2026,R1,power,gasCCGT,newcapa,2036 +A1,2.00000000000,R1,2028,R1,power,gasCCGT,newcapa,2036 +A1,1.00000000000,R1,2030,R1,power,gasCCGT,newcapa,2036 +A1,1.00000000000,R1,2032,R1,power,gasCCGT,newcapa,2036 A1,4.00000000000,R1,2020,R1,power,windturbine,newcapa,2036 -A1,0.60110000000,R1,2034,R1,power,windturbine,newcapa,2036 -A1,2.00000000000,R2,2020,R2,power,gasCCGT,newcapa,2036 -A1,1.85640000000,R2,2022,R2,power,gasCCGT,newcapa,2036 -A1,2.07980000000,R2,2024,R2,power,gasCCGT,newcapa,2036 -A1,2.29760000000,R2,2026,R2,power,gasCCGT,newcapa,2036 -A1,2.31150000000,R2,2028,R2,power,gasCCGT,newcapa,2036 -A1,0.99560000000,R2,2030,R2,power,gasCCGT,newcapa,2036 -A1,2.24000000000,R2,2032,R2,power,solarPV,newcapa,2036 -A1,2.24000000000,R2,2034,R2,power,solarPV,newcapa,2036 -A1,4.27320000000,R2,2020,R2,power,windturbine,newcapa,2036 -A1,0.34280000000,R1,2020,R1,gas,gassupply1,newcapa,2036 -A1,0.60380000000,R1,2022,R1,gas,gassupply1,newcapa,2036 -A1,2.07490000000,R1,2024,R1,gas,gassupply1,newcapa,2036 -A1,3.55300000000,R1,2026,R1,gas,gassupply1,newcapa,2036 -A1,3.53600000000,R1,2028,R1,gas,gassupply1,newcapa,2036 -A1,4.66260000000,R1,2030,R1,gas,gassupply1,newcapa,2036 -A1,3.62850000000,R1,2032,R1,gas,gassupply1,newcapa,2036 -A1,1.50000000000,R1,2034,R1,gas,gassupply1,newcapa,2036 -A1,0.34280000000,R2,2020,R2,gas,gassupply1,newcapa,2036 -A1,0.60380000000,R2,2022,R2,gas,gassupply1,newcapa,2036 -A1,2.07490000000,R2,2024,R2,gas,gassupply1,newcapa,2036 -A1,3.55300000000,R2,2026,R2,gas,gassupply1,newcapa,2036 -A1,3.53600000000,R2,2028,R2,gas,gassupply1,newcapa,2036 -A1,4.66260000000,R2,2030,R2,gas,gassupply1,newcapa,2036 -A1,3.62850000000,R2,2032,R2,gas,gassupply1,newcapa,2036 -A1,1.50000000000,R2,2034,R2,gas,gassupply1,newcapa,2036 +A1,3.00000000000,R1,2034,R1,power,windturbine,newcapa,2036 +A1,0.47010000000,R1,2020,R1,gas,gassupply1,newcapa,2036 +A1,0.17680000000,R1,2022,R1,gas,gassupply1,newcapa,2036 +A1,2.25000000000,R1,2024,R1,gas,gassupply1,newcapa,2036 +A1,3.65110000000,R1,2026,R1,gas,gassupply1,newcapa,2036 +A1,3.59730000000,R1,2028,R1,gas,gassupply1,newcapa,2036 +A1,4.67680000000,R1,2030,R1,gas,gassupply1,newcapa,2036 +A1,4.67470000000,R1,2032,R1,gas,gassupply1,newcapa,2036 +A1,0.96760000000,R1,2034,R1,gas,gassupply1,newcapa,2036 A1,5.00000000000,R1,2028,R1,residential,heatpump,newcapa,2038 A1,13.00000000000,R1,2030,R1,residential,heatpump,newcapa,2038 A1,6.00000000000,R1,2032,R1,residential,heatpump,newcapa,2038 A1,6.00000000000,R1,2034,R1,residential,heatpump,newcapa,2038 A1,6.00000000000,R1,2036,R1,residential,heatpump,newcapa,2038 -A1,5.00000000000,R2,2028,R2,residential,heatpump,newcapa,2038 -A1,13.00000000000,R2,2030,R2,residential,heatpump,newcapa,2038 -A1,6.00000000000,R2,2032,R2,residential,heatpump,newcapa,2038 -A1,6.00000000000,R2,2034,R2,residential,heatpump,newcapa,2038 -A1,6.00000000000,R2,2036,R2,residential,heatpump,newcapa,2038 A1,2.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2038 -A1,1.85640000000,R1,2022,R1,power,gasCCGT,newcapa,2038 -A1,2.07980000000,R1,2024,R1,power,gasCCGT,newcapa,2038 -A1,2.29760000000,R1,2026,R1,power,gasCCGT,newcapa,2038 -A1,2.31150000000,R1,2028,R1,power,gasCCGT,newcapa,2038 -A1,0.99560000000,R1,2030,R1,power,gasCCGT,newcapa,2038 -A1,0.75270000000,R1,2032,R1,power,gasCCGT,newcapa,2038 -A1,0.27320000000,R1,2020,R1,power,solarPV,newcapa,2038 -A1,0.54630000000,R1,2032,R1,power,solarPV,newcapa,2038 -A1,1.63890000000,R1,2034,R1,power,solarPV,newcapa,2038 -A1,2.24000000000,R1,2036,R1,power,solarPV,newcapa,2038 +A1,1.00000000000,R1,2022,R1,power,gasCCGT,newcapa,2038 +A1,3.00000000000,R1,2024,R1,power,gasCCGT,newcapa,2038 +A1,2.00000000000,R1,2026,R1,power,gasCCGT,newcapa,2038 +A1,2.00000000000,R1,2028,R1,power,gasCCGT,newcapa,2038 +A1,1.00000000000,R1,2030,R1,power,gasCCGT,newcapa,2038 +A1,1.00000000000,R1,2032,R1,power,gasCCGT,newcapa,2038 A1,4.00000000000,R1,2020,R1,power,windturbine,newcapa,2038 -A1,0.60110000000,R1,2034,R1,power,windturbine,newcapa,2038 -A1,2.00000000000,R2,2020,R2,power,gasCCGT,newcapa,2038 -A1,1.85640000000,R2,2022,R2,power,gasCCGT,newcapa,2038 -A1,2.07980000000,R2,2024,R2,power,gasCCGT,newcapa,2038 -A1,2.29760000000,R2,2026,R2,power,gasCCGT,newcapa,2038 -A1,2.31150000000,R2,2028,R2,power,gasCCGT,newcapa,2038 -A1,0.99560000000,R2,2030,R2,power,gasCCGT,newcapa,2038 -A1,2.24000000000,R2,2032,R2,power,solarPV,newcapa,2038 -A1,2.24000000000,R2,2034,R2,power,solarPV,newcapa,2038 -A1,2.24000000000,R2,2036,R2,power,solarPV,newcapa,2038 -A1,4.27320000000,R2,2020,R2,power,windturbine,newcapa,2038 +A1,3.00000000000,R1,2034,R1,power,windturbine,newcapa,2038 +A1,2.00000000000,R1,2036,R1,power,windturbine,newcapa,2038 +A1,0.47010000000,R1,2020,R1,gas,gassupply1,newcapa,2038 +A1,0.17680000000,R1,2022,R1,gas,gassupply1,newcapa,2038 +A1,2.25000000000,R1,2024,R1,gas,gassupply1,newcapa,2038 +A1,3.65110000000,R1,2026,R1,gas,gassupply1,newcapa,2038 +A1,3.59730000000,R1,2028,R1,gas,gassupply1,newcapa,2038 +A1,4.67680000000,R1,2030,R1,gas,gassupply1,newcapa,2038 +A1,4.67470000000,R1,2032,R1,gas,gassupply1,newcapa,2038 +A1,0.96760000000,R1,2034,R1,gas,gassupply1,newcapa,2038 +A1,0.11000000000,R1,2036,R1,gas,gassupply1,newcapa,2038 A1,13.00000000000,R1,2030,R1,residential,heatpump,newcapa,2040 A1,6.00000000000,R1,2032,R1,residential,heatpump,newcapa,2040 A1,6.00000000000,R1,2034,R1,residential,heatpump,newcapa,2040 A1,6.00000000000,R1,2036,R1,residential,heatpump,newcapa,2040 A1,8.00000000000,R1,2038,R1,residential,heatpump,newcapa,2040 -A1,13.00000000000,R2,2030,R2,residential,heatpump,newcapa,2040 -A1,6.00000000000,R2,2032,R2,residential,heatpump,newcapa,2040 -A1,6.00000000000,R2,2034,R2,residential,heatpump,newcapa,2040 -A1,6.00000000000,R2,2036,R2,residential,heatpump,newcapa,2040 -A1,8.00000000000,R2,2038,R2,residential,heatpump,newcapa,2040 A1,2.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2040 -A1,1.85640000000,R1,2022,R1,power,gasCCGT,newcapa,2040 -A1,2.07980000000,R1,2024,R1,power,gasCCGT,newcapa,2040 -A1,2.29760000000,R1,2026,R1,power,gasCCGT,newcapa,2040 -A1,2.31150000000,R1,2028,R1,power,gasCCGT,newcapa,2040 -A1,0.99560000000,R1,2030,R1,power,gasCCGT,newcapa,2040 -A1,0.75270000000,R1,2032,R1,power,gasCCGT,newcapa,2040 -A1,0.27320000000,R1,2020,R1,power,solarPV,newcapa,2040 -A1,0.54630000000,R1,2032,R1,power,solarPV,newcapa,2040 -A1,1.63890000000,R1,2034,R1,power,solarPV,newcapa,2040 -A1,2.24000000000,R1,2036,R1,power,solarPV,newcapa,2040 -A1,2.24000000000,R1,2038,R1,power,solarPV,newcapa,2040 +A1,1.00000000000,R1,2022,R1,power,gasCCGT,newcapa,2040 +A1,3.00000000000,R1,2024,R1,power,gasCCGT,newcapa,2040 +A1,2.00000000000,R1,2026,R1,power,gasCCGT,newcapa,2040 +A1,2.00000000000,R1,2028,R1,power,gasCCGT,newcapa,2040 +A1,1.00000000000,R1,2030,R1,power,gasCCGT,newcapa,2040 +A1,1.00000000000,R1,2032,R1,power,gasCCGT,newcapa,2040 A1,4.00000000000,R1,2020,R1,power,windturbine,newcapa,2040 -A1,0.60110000000,R1,2034,R1,power,windturbine,newcapa,2040 -A1,2.00000000000,R2,2020,R2,power,gasCCGT,newcapa,2040 -A1,1.85640000000,R2,2022,R2,power,gasCCGT,newcapa,2040 -A1,2.07980000000,R2,2024,R2,power,gasCCGT,newcapa,2040 -A1,2.29760000000,R2,2026,R2,power,gasCCGT,newcapa,2040 -A1,2.31150000000,R2,2028,R2,power,gasCCGT,newcapa,2040 -A1,0.99560000000,R2,2030,R2,power,gasCCGT,newcapa,2040 -A1,2.24000000000,R2,2032,R2,power,solarPV,newcapa,2040 -A1,2.24000000000,R2,2034,R2,power,solarPV,newcapa,2040 -A1,2.24000000000,R2,2036,R2,power,solarPV,newcapa,2040 -A1,2.24000000000,R2,2038,R2,power,solarPV,newcapa,2040 -A1,4.27320000000,R2,2020,R2,power,windturbine,newcapa,2040 -A1,0.34280000000,R1,2020,R1,gas,gassupply1,newcapa,2040 -A1,0.60380000000,R1,2022,R1,gas,gassupply1,newcapa,2040 -A1,2.07490000000,R1,2024,R1,gas,gassupply1,newcapa,2040 -A1,3.55300000000,R1,2026,R1,gas,gassupply1,newcapa,2040 -A1,3.53600000000,R1,2028,R1,gas,gassupply1,newcapa,2040 -A1,4.66260000000,R1,2030,R1,gas,gassupply1,newcapa,2040 -A1,3.62850000000,R1,2032,R1,gas,gassupply1,newcapa,2040 -A1,1.50000000000,R1,2034,R1,gas,gassupply1,newcapa,2040 -A1,0.34280000000,R2,2020,R2,gas,gassupply1,newcapa,2040 -A1,0.60380000000,R2,2022,R2,gas,gassupply1,newcapa,2040 -A1,2.07490000000,R2,2024,R2,gas,gassupply1,newcapa,2040 -A1,3.55300000000,R2,2026,R2,gas,gassupply1,newcapa,2040 -A1,3.53600000000,R2,2028,R2,gas,gassupply1,newcapa,2040 -A1,4.66260000000,R2,2030,R2,gas,gassupply1,newcapa,2040 -A1,3.62850000000,R2,2032,R2,gas,gassupply1,newcapa,2040 -A1,1.50000000000,R2,2034,R2,gas,gassupply1,newcapa,2040 +A1,3.00000000000,R1,2034,R1,power,windturbine,newcapa,2040 +A1,2.00000000000,R1,2036,R1,power,windturbine,newcapa,2040 +A1,3.00000000000,R1,2038,R1,power,windturbine,newcapa,2040 +A1,0.47010000000,R1,2020,R1,gas,gassupply1,newcapa,2040 +A1,0.17680000000,R1,2022,R1,gas,gassupply1,newcapa,2040 +A1,2.25000000000,R1,2024,R1,gas,gassupply1,newcapa,2040 +A1,3.65110000000,R1,2026,R1,gas,gassupply1,newcapa,2040 +A1,3.59730000000,R1,2028,R1,gas,gassupply1,newcapa,2040 +A1,4.67680000000,R1,2030,R1,gas,gassupply1,newcapa,2040 +A1,4.67470000000,R1,2032,R1,gas,gassupply1,newcapa,2040 +A1,0.96760000000,R1,2034,R1,gas,gassupply1,newcapa,2040 +A1,0.11000000000,R1,2036,R1,gas,gassupply1,newcapa,2040 diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/MCAPrices.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/MCAPrices.csv index 433b1b5bd..0bab2dc2a 100644 --- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/MCAPrices.csv +++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/MCAPrices.csv @@ -1,705 +1,353 @@ commodity,day,hour,month,prices,region,timeslice,units_prices,year electricity,all-week,night,all-year,19.50000000000,R1,0,MUS$2010/PJ,2020 -electricity,all-week,night,all-year,19.50000000000,R2,0,MUS$2010/PJ,2020 gas,all-week,night,all-year,7.15280000000,R1,0,MUS$2010/PJ,2020 -gas,all-week,night,all-year,7.15280000000,R2,0,MUS$2010/PJ,2020 heat,all-week,night,all-year,100.00000000000,R1,0,MUS$2010/PJ,2020 -heat,all-week,night,all-year,100.00000000000,R2,0,MUS$2010/PJ,2020 CO2f,all-week,night,all-year,0.08310000000,R1,0,MUS$2010/kt,2020 -CO2f,all-week,night,all-year,0.08310000000,R2,0,MUS$2010/kt,2020 electricity,all-week,morning,all-year,19.50000000000,R1,1,MUS$2010/PJ,2020 -electricity,all-week,morning,all-year,19.50000000000,R2,1,MUS$2010/PJ,2020 gas,all-week,morning,all-year,7.15280000000,R1,1,MUS$2010/PJ,2020 -gas,all-week,morning,all-year,7.15280000000,R2,1,MUS$2010/PJ,2020 heat,all-week,morning,all-year,100.00000000000,R1,1,MUS$2010/PJ,2020 -heat,all-week,morning,all-year,100.00000000000,R2,1,MUS$2010/PJ,2020 CO2f,all-week,morning,all-year,0.08310000000,R1,1,MUS$2010/kt,2020 -CO2f,all-week,morning,all-year,0.08310000000,R2,1,MUS$2010/kt,2020 electricity,all-week,mid-afternoon,all-year,19.50000000000,R1,2,MUS$2010/PJ,2020 -electricity,all-week,mid-afternoon,all-year,19.50000000000,R2,2,MUS$2010/PJ,2020 gas,all-week,mid-afternoon,all-year,7.15280000000,R1,2,MUS$2010/PJ,2020 -gas,all-week,mid-afternoon,all-year,7.15280000000,R2,2,MUS$2010/PJ,2020 heat,all-week,mid-afternoon,all-year,100.00000000000,R1,2,MUS$2010/PJ,2020 -heat,all-week,mid-afternoon,all-year,100.00000000000,R2,2,MUS$2010/PJ,2020 CO2f,all-week,mid-afternoon,all-year,0.08310000000,R1,2,MUS$2010/kt,2020 -CO2f,all-week,mid-afternoon,all-year,0.08310000000,R2,2,MUS$2010/kt,2020 electricity,all-week,early-peak,all-year,19.50000000000,R1,3,MUS$2010/PJ,2020 -electricity,all-week,early-peak,all-year,19.50000000000,R2,3,MUS$2010/PJ,2020 gas,all-week,early-peak,all-year,7.15280000000,R1,3,MUS$2010/PJ,2020 -gas,all-week,early-peak,all-year,7.15280000000,R2,3,MUS$2010/PJ,2020 heat,all-week,early-peak,all-year,100.00000000000,R1,3,MUS$2010/PJ,2020 -heat,all-week,early-peak,all-year,100.00000000000,R2,3,MUS$2010/PJ,2020 CO2f,all-week,early-peak,all-year,0.08310000000,R1,3,MUS$2010/kt,2020 -CO2f,all-week,early-peak,all-year,0.08310000000,R2,3,MUS$2010/kt,2020 electricity,all-week,late-peak,all-year,19.50000000000,R1,4,MUS$2010/PJ,2020 -electricity,all-week,late-peak,all-year,19.50000000000,R2,4,MUS$2010/PJ,2020 gas,all-week,late-peak,all-year,7.15280000000,R1,4,MUS$2010/PJ,2020 -gas,all-week,late-peak,all-year,7.15280000000,R2,4,MUS$2010/PJ,2020 heat,all-week,late-peak,all-year,100.00000000000,R1,4,MUS$2010/PJ,2020 -heat,all-week,late-peak,all-year,100.00000000000,R2,4,MUS$2010/PJ,2020 CO2f,all-week,late-peak,all-year,0.08310000000,R1,4,MUS$2010/kt,2020 -CO2f,all-week,late-peak,all-year,0.08310000000,R2,4,MUS$2010/kt,2020 electricity,all-week,evening,all-year,19.50000000000,R1,5,MUS$2010/PJ,2020 -electricity,all-week,evening,all-year,19.50000000000,R2,5,MUS$2010/PJ,2020 gas,all-week,evening,all-year,7.15280000000,R1,5,MUS$2010/PJ,2020 -gas,all-week,evening,all-year,7.15280000000,R2,5,MUS$2010/PJ,2020 heat,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020 -heat,all-week,evening,all-year,100.00000000000,R2,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.08310000000,R1,5,MUS$2010/kt,2020 -CO2f,all-week,evening,all-year,0.08310000000,R2,5,MUS$2010/kt,2020 electricity,all-week,early-morning,all-year,19.50000000000,R1,6,MUS$2010/PJ,2020 -electricity,all-week,early-morning,all-year,19.50000000000,R2,6,MUS$2010/PJ,2020 gas,all-week,early-morning,all-year,7.15280000000,R1,6,MUS$2010/PJ,2020 -gas,all-week,early-morning,all-year,7.15280000000,R2,6,MUS$2010/PJ,2020 heat,all-week,early-morning,all-year,100.00000000000,R1,6,MUS$2010/PJ,2020 -heat,all-week,early-morning,all-year,100.00000000000,R2,6,MUS$2010/PJ,2020 CO2f,all-week,early-morning,all-year,0.08310000000,R1,6,MUS$2010/kt,2020 -CO2f,all-week,early-morning,all-year,0.08310000000,R2,6,MUS$2010/kt,2020 electricity,all-week,late-afternoon,all-year,19.50000000000,R1,7,MUS$2010/PJ,2020 -electricity,all-week,late-afternoon,all-year,19.50000000000,R2,7,MUS$2010/PJ,2020 gas,all-week,late-afternoon,all-year,7.15280000000,R1,7,MUS$2010/PJ,2020 -gas,all-week,late-afternoon,all-year,7.15280000000,R2,7,MUS$2010/PJ,2020 heat,all-week,late-afternoon,all-year,100.00000000000,R1,7,MUS$2010/PJ,2020 -heat,all-week,late-afternoon,all-year,100.00000000000,R2,7,MUS$2010/PJ,2020 CO2f,all-week,late-afternoon,all-year,0.08310000000,R1,7,MUS$2010/kt,2020 -CO2f,all-week,late-afternoon,all-year,0.08310000000,R2,7,MUS$2010/kt,2020 -electricity,all-week,night,all-year,6.55430000000,R1,0,MUS$2010/PJ,2022 -electricity,all-week,night,all-year,6.55430000000,R2,0,MUS$2010/PJ,2022 +electricity,all-week,night,all-year,6.68740000000,R1,0,MUS$2010/PJ,2022 gas,all-week,night,all-year,0.35420000000,R1,0,MUS$2010/PJ,2022 -gas,all-week,night,all-year,0.35420000000,R2,0,MUS$2010/PJ,2022 -heat,all-week,night,all-year,4.49550000000,R1,0,MUS$2010/PJ,2022 -heat,all-week,night,all-year,4.49550000000,R2,0,MUS$2010/PJ,2022 +heat,all-week,night,all-year,4.52640000000,R1,0,MUS$2010/PJ,2022 CO2f,all-week,night,all-year,0.09790000000,R1,0,MUS$2010/kt,2022 -CO2f,all-week,night,all-year,0.09790000000,R2,0,MUS$2010/kt,2022 -electricity,all-week,morning,all-year,6.55430000000,R1,1,MUS$2010/PJ,2022 -electricity,all-week,morning,all-year,6.55430000000,R2,1,MUS$2010/PJ,2022 +electricity,all-week,morning,all-year,6.68740000000,R1,1,MUS$2010/PJ,2022 gas,all-week,morning,all-year,0.35420000000,R1,1,MUS$2010/PJ,2022 -gas,all-week,morning,all-year,0.35420000000,R2,1,MUS$2010/PJ,2022 -heat,all-week,morning,all-year,4.49550000000,R1,1,MUS$2010/PJ,2022 -heat,all-week,morning,all-year,4.49550000000,R2,1,MUS$2010/PJ,2022 +heat,all-week,morning,all-year,4.52640000000,R1,1,MUS$2010/PJ,2022 CO2f,all-week,morning,all-year,0.09790000000,R1,1,MUS$2010/kt,2022 -CO2f,all-week,morning,all-year,0.09790000000,R2,1,MUS$2010/kt,2022 -electricity,all-week,mid-afternoon,all-year,6.55430000000,R1,2,MUS$2010/PJ,2022 -electricity,all-week,mid-afternoon,all-year,6.55430000000,R2,2,MUS$2010/PJ,2022 +electricity,all-week,mid-afternoon,all-year,6.68740000000,R1,2,MUS$2010/PJ,2022 gas,all-week,mid-afternoon,all-year,0.35420000000,R1,2,MUS$2010/PJ,2022 -gas,all-week,mid-afternoon,all-year,0.35420000000,R2,2,MUS$2010/PJ,2022 -heat,all-week,mid-afternoon,all-year,4.49550000000,R1,2,MUS$2010/PJ,2022 -heat,all-week,mid-afternoon,all-year,4.49550000000,R2,2,MUS$2010/PJ,2022 +heat,all-week,mid-afternoon,all-year,4.52640000000,R1,2,MUS$2010/PJ,2022 CO2f,all-week,mid-afternoon,all-year,0.09790000000,R1,2,MUS$2010/kt,2022 -CO2f,all-week,mid-afternoon,all-year,0.09790000000,R2,2,MUS$2010/kt,2022 -electricity,all-week,early-peak,all-year,6.55430000000,R1,3,MUS$2010/PJ,2022 -electricity,all-week,early-peak,all-year,6.55430000000,R2,3,MUS$2010/PJ,2022 +electricity,all-week,early-peak,all-year,6.68740000000,R1,3,MUS$2010/PJ,2022 gas,all-week,early-peak,all-year,0.35420000000,R1,3,MUS$2010/PJ,2022 -gas,all-week,early-peak,all-year,0.35420000000,R2,3,MUS$2010/PJ,2022 -heat,all-week,early-peak,all-year,4.49550000000,R1,3,MUS$2010/PJ,2022 -heat,all-week,early-peak,all-year,4.49550000000,R2,3,MUS$2010/PJ,2022 +heat,all-week,early-peak,all-year,4.52640000000,R1,3,MUS$2010/PJ,2022 CO2f,all-week,early-peak,all-year,0.09790000000,R1,3,MUS$2010/kt,2022 -CO2f,all-week,early-peak,all-year,0.09790000000,R2,3,MUS$2010/kt,2022 -electricity,all-week,late-peak,all-year,6.55430000000,R1,4,MUS$2010/PJ,2022 -electricity,all-week,late-peak,all-year,6.55430000000,R2,4,MUS$2010/PJ,2022 +electricity,all-week,late-peak,all-year,6.68740000000,R1,4,MUS$2010/PJ,2022 gas,all-week,late-peak,all-year,0.35420000000,R1,4,MUS$2010/PJ,2022 -gas,all-week,late-peak,all-year,0.35420000000,R2,4,MUS$2010/PJ,2022 -heat,all-week,late-peak,all-year,4.49550000000,R1,4,MUS$2010/PJ,2022 -heat,all-week,late-peak,all-year,4.49550000000,R2,4,MUS$2010/PJ,2022 +heat,all-week,late-peak,all-year,4.52640000000,R1,4,MUS$2010/PJ,2022 CO2f,all-week,late-peak,all-year,0.09790000000,R1,4,MUS$2010/kt,2022 -CO2f,all-week,late-peak,all-year,0.09790000000,R2,4,MUS$2010/kt,2022 -electricity,all-week,evening,all-year,6.55430000000,R1,5,MUS$2010/PJ,2022 -electricity,all-week,evening,all-year,6.55430000000,R2,5,MUS$2010/PJ,2022 +electricity,all-week,evening,all-year,6.68740000000,R1,5,MUS$2010/PJ,2022 gas,all-week,evening,all-year,0.35420000000,R1,5,MUS$2010/PJ,2022 -gas,all-week,evening,all-year,0.35420000000,R2,5,MUS$2010/PJ,2022 -heat,all-week,evening,all-year,4.49550000000,R1,5,MUS$2010/PJ,2022 -heat,all-week,evening,all-year,4.49550000000,R2,5,MUS$2010/PJ,2022 +heat,all-week,evening,all-year,4.52640000000,R1,5,MUS$2010/PJ,2022 CO2f,all-week,evening,all-year,0.09790000000,R1,5,MUS$2010/kt,2022 -CO2f,all-week,evening,all-year,0.09790000000,R2,5,MUS$2010/kt,2022 -electricity,all-week,early-morning,all-year,6.55430000000,R1,6,MUS$2010/PJ,2022 -electricity,all-week,early-morning,all-year,6.55430000000,R2,6,MUS$2010/PJ,2022 +electricity,all-week,early-morning,all-year,6.68740000000,R1,6,MUS$2010/PJ,2022 gas,all-week,early-morning,all-year,0.35420000000,R1,6,MUS$2010/PJ,2022 -gas,all-week,early-morning,all-year,0.35420000000,R2,6,MUS$2010/PJ,2022 -heat,all-week,early-morning,all-year,4.49550000000,R1,6,MUS$2010/PJ,2022 -heat,all-week,early-morning,all-year,4.49550000000,R2,6,MUS$2010/PJ,2022 +heat,all-week,early-morning,all-year,4.52640000000,R1,6,MUS$2010/PJ,2022 CO2f,all-week,early-morning,all-year,0.09790000000,R1,6,MUS$2010/kt,2022 -CO2f,all-week,early-morning,all-year,0.09790000000,R2,6,MUS$2010/kt,2022 -electricity,all-week,late-afternoon,all-year,6.55430000000,R1,7,MUS$2010/PJ,2022 -electricity,all-week,late-afternoon,all-year,6.55430000000,R2,7,MUS$2010/PJ,2022 +electricity,all-week,late-afternoon,all-year,6.68740000000,R1,7,MUS$2010/PJ,2022 gas,all-week,late-afternoon,all-year,0.35420000000,R1,7,MUS$2010/PJ,2022 -gas,all-week,late-afternoon,all-year,0.35420000000,R2,7,MUS$2010/PJ,2022 -heat,all-week,late-afternoon,all-year,4.49550000000,R1,7,MUS$2010/PJ,2022 -heat,all-week,late-afternoon,all-year,4.49550000000,R2,7,MUS$2010/PJ,2022 +heat,all-week,late-afternoon,all-year,4.52640000000,R1,7,MUS$2010/PJ,2022 CO2f,all-week,late-afternoon,all-year,0.09790000000,R1,7,MUS$2010/kt,2022 -CO2f,all-week,late-afternoon,all-year,0.09790000000,R2,7,MUS$2010/kt,2022 -electricity,all-week,night,all-year,8.44970000000,R1,0,MUS$2010/PJ,2024 -electricity,all-week,night,all-year,8.44970000000,R2,0,MUS$2010/PJ,2024 +electricity,all-week,night,all-year,8.18260000000,R1,0,MUS$2010/PJ,2024 gas,all-week,night,all-year,0.35420000000,R1,0,MUS$2010/PJ,2024 -gas,all-week,night,all-year,0.35420000000,R2,0,MUS$2010/PJ,2024 -heat,all-week,night,all-year,4.76590000000,R1,0,MUS$2010/PJ,2024 -heat,all-week,night,all-year,4.76590000000,R2,0,MUS$2010/PJ,2024 +heat,all-week,night,all-year,4.68950000000,R1,0,MUS$2010/PJ,2024 CO2f,all-week,night,all-year,0.11270000000,R1,0,MUS$2010/kt,2024 -CO2f,all-week,night,all-year,0.11270000000,R2,0,MUS$2010/kt,2024 -electricity,all-week,morning,all-year,8.44970000000,R1,1,MUS$2010/PJ,2024 -electricity,all-week,morning,all-year,8.44970000000,R2,1,MUS$2010/PJ,2024 +electricity,all-week,morning,all-year,8.18260000000,R1,1,MUS$2010/PJ,2024 gas,all-week,morning,all-year,0.35420000000,R1,1,MUS$2010/PJ,2024 -gas,all-week,morning,all-year,0.35420000000,R2,1,MUS$2010/PJ,2024 -heat,all-week,morning,all-year,4.76590000000,R1,1,MUS$2010/PJ,2024 -heat,all-week,morning,all-year,4.76590000000,R2,1,MUS$2010/PJ,2024 +heat,all-week,morning,all-year,4.68950000000,R1,1,MUS$2010/PJ,2024 CO2f,all-week,morning,all-year,0.11270000000,R1,1,MUS$2010/kt,2024 -CO2f,all-week,morning,all-year,0.11270000000,R2,1,MUS$2010/kt,2024 -electricity,all-week,mid-afternoon,all-year,8.44970000000,R1,2,MUS$2010/PJ,2024 -electricity,all-week,mid-afternoon,all-year,8.44970000000,R2,2,MUS$2010/PJ,2024 +electricity,all-week,mid-afternoon,all-year,8.18260000000,R1,2,MUS$2010/PJ,2024 gas,all-week,mid-afternoon,all-year,0.35420000000,R1,2,MUS$2010/PJ,2024 -gas,all-week,mid-afternoon,all-year,0.35420000000,R2,2,MUS$2010/PJ,2024 -heat,all-week,mid-afternoon,all-year,4.76590000000,R1,2,MUS$2010/PJ,2024 -heat,all-week,mid-afternoon,all-year,4.76590000000,R2,2,MUS$2010/PJ,2024 +heat,all-week,mid-afternoon,all-year,4.68950000000,R1,2,MUS$2010/PJ,2024 CO2f,all-week,mid-afternoon,all-year,0.11270000000,R1,2,MUS$2010/kt,2024 -CO2f,all-week,mid-afternoon,all-year,0.11270000000,R2,2,MUS$2010/kt,2024 -electricity,all-week,early-peak,all-year,8.44970000000,R1,3,MUS$2010/PJ,2024 -electricity,all-week,early-peak,all-year,8.44970000000,R2,3,MUS$2010/PJ,2024 +electricity,all-week,early-peak,all-year,8.18260000000,R1,3,MUS$2010/PJ,2024 gas,all-week,early-peak,all-year,0.35420000000,R1,3,MUS$2010/PJ,2024 -gas,all-week,early-peak,all-year,0.35420000000,R2,3,MUS$2010/PJ,2024 -heat,all-week,early-peak,all-year,4.76590000000,R1,3,MUS$2010/PJ,2024 -heat,all-week,early-peak,all-year,4.76590000000,R2,3,MUS$2010/PJ,2024 +heat,all-week,early-peak,all-year,4.68950000000,R1,3,MUS$2010/PJ,2024 CO2f,all-week,early-peak,all-year,0.11270000000,R1,3,MUS$2010/kt,2024 -CO2f,all-week,early-peak,all-year,0.11270000000,R2,3,MUS$2010/kt,2024 -electricity,all-week,late-peak,all-year,8.44970000000,R1,4,MUS$2010/PJ,2024 -electricity,all-week,late-peak,all-year,8.44970000000,R2,4,MUS$2010/PJ,2024 +electricity,all-week,late-peak,all-year,8.18260000000,R1,4,MUS$2010/PJ,2024 gas,all-week,late-peak,all-year,0.35420000000,R1,4,MUS$2010/PJ,2024 -gas,all-week,late-peak,all-year,0.35420000000,R2,4,MUS$2010/PJ,2024 -heat,all-week,late-peak,all-year,4.76590000000,R1,4,MUS$2010/PJ,2024 -heat,all-week,late-peak,all-year,4.76590000000,R2,4,MUS$2010/PJ,2024 +heat,all-week,late-peak,all-year,4.68950000000,R1,4,MUS$2010/PJ,2024 CO2f,all-week,late-peak,all-year,0.11270000000,R1,4,MUS$2010/kt,2024 -CO2f,all-week,late-peak,all-year,0.11270000000,R2,4,MUS$2010/kt,2024 -electricity,all-week,evening,all-year,8.44970000000,R1,5,MUS$2010/PJ,2024 -electricity,all-week,evening,all-year,8.44970000000,R2,5,MUS$2010/PJ,2024 +electricity,all-week,evening,all-year,8.18260000000,R1,5,MUS$2010/PJ,2024 gas,all-week,evening,all-year,0.35420000000,R1,5,MUS$2010/PJ,2024 -gas,all-week,evening,all-year,0.35420000000,R2,5,MUS$2010/PJ,2024 -heat,all-week,evening,all-year,4.76590000000,R1,5,MUS$2010/PJ,2024 -heat,all-week,evening,all-year,4.76590000000,R2,5,MUS$2010/PJ,2024 +heat,all-week,evening,all-year,4.68950000000,R1,5,MUS$2010/PJ,2024 CO2f,all-week,evening,all-year,0.11270000000,R1,5,MUS$2010/kt,2024 -CO2f,all-week,evening,all-year,0.11270000000,R2,5,MUS$2010/kt,2024 -electricity,all-week,early-morning,all-year,8.44970000000,R1,6,MUS$2010/PJ,2024 -electricity,all-week,early-morning,all-year,8.44970000000,R2,6,MUS$2010/PJ,2024 +electricity,all-week,early-morning,all-year,8.18260000000,R1,6,MUS$2010/PJ,2024 gas,all-week,early-morning,all-year,0.35420000000,R1,6,MUS$2010/PJ,2024 -gas,all-week,early-morning,all-year,0.35420000000,R2,6,MUS$2010/PJ,2024 -heat,all-week,early-morning,all-year,4.76590000000,R1,6,MUS$2010/PJ,2024 -heat,all-week,early-morning,all-year,4.76590000000,R2,6,MUS$2010/PJ,2024 +heat,all-week,early-morning,all-year,4.68950000000,R1,6,MUS$2010/PJ,2024 CO2f,all-week,early-morning,all-year,0.11270000000,R1,6,MUS$2010/kt,2024 -CO2f,all-week,early-morning,all-year,0.11270000000,R2,6,MUS$2010/kt,2024 -electricity,all-week,late-afternoon,all-year,8.44970000000,R1,7,MUS$2010/PJ,2024 -electricity,all-week,late-afternoon,all-year,8.44970000000,R2,7,MUS$2010/PJ,2024 +electricity,all-week,late-afternoon,all-year,8.18260000000,R1,7,MUS$2010/PJ,2024 gas,all-week,late-afternoon,all-year,0.35420000000,R1,7,MUS$2010/PJ,2024 -gas,all-week,late-afternoon,all-year,0.35420000000,R2,7,MUS$2010/PJ,2024 -heat,all-week,late-afternoon,all-year,4.76590000000,R1,7,MUS$2010/PJ,2024 -heat,all-week,late-afternoon,all-year,4.76590000000,R2,7,MUS$2010/PJ,2024 +heat,all-week,late-afternoon,all-year,4.68950000000,R1,7,MUS$2010/PJ,2024 CO2f,all-week,late-afternoon,all-year,0.11270000000,R1,7,MUS$2010/kt,2024 -CO2f,all-week,late-afternoon,all-year,0.11270000000,R2,7,MUS$2010/kt,2024 -electricity,all-week,night,all-year,10.11860000000,R1,0,MUS$2010/PJ,2026 -electricity,all-week,night,all-year,10.11860000000,R2,0,MUS$2010/PJ,2026 +electricity,all-week,night,all-year,10.01940000000,R1,0,MUS$2010/PJ,2026 gas,all-week,night,all-year,0.35420000000,R1,0,MUS$2010/PJ,2026 -gas,all-week,night,all-year,0.35420000000,R2,0,MUS$2010/PJ,2026 -heat,all-week,night,all-year,5.01180000000,R1,0,MUS$2010/PJ,2026 -heat,all-week,night,all-year,5.01180000000,R2,0,MUS$2010/PJ,2026 +heat,all-week,night,all-year,4.97900000000,R1,0,MUS$2010/PJ,2026 CO2f,all-week,night,all-year,0.12750000000,R1,0,MUS$2010/kt,2026 -CO2f,all-week,night,all-year,0.12750000000,R2,0,MUS$2010/kt,2026 -electricity,all-week,morning,all-year,10.11860000000,R1,1,MUS$2010/PJ,2026 -electricity,all-week,morning,all-year,10.11860000000,R2,1,MUS$2010/PJ,2026 +electricity,all-week,morning,all-year,10.01940000000,R1,1,MUS$2010/PJ,2026 gas,all-week,morning,all-year,0.35420000000,R1,1,MUS$2010/PJ,2026 -gas,all-week,morning,all-year,0.35420000000,R2,1,MUS$2010/PJ,2026 -heat,all-week,morning,all-year,5.01180000000,R1,1,MUS$2010/PJ,2026 -heat,all-week,morning,all-year,5.01180000000,R2,1,MUS$2010/PJ,2026 +heat,all-week,morning,all-year,4.97900000000,R1,1,MUS$2010/PJ,2026 CO2f,all-week,morning,all-year,0.12750000000,R1,1,MUS$2010/kt,2026 -CO2f,all-week,morning,all-year,0.12750000000,R2,1,MUS$2010/kt,2026 -electricity,all-week,mid-afternoon,all-year,10.11860000000,R1,2,MUS$2010/PJ,2026 -electricity,all-week,mid-afternoon,all-year,10.11860000000,R2,2,MUS$2010/PJ,2026 +electricity,all-week,mid-afternoon,all-year,10.01940000000,R1,2,MUS$2010/PJ,2026 gas,all-week,mid-afternoon,all-year,0.35420000000,R1,2,MUS$2010/PJ,2026 -gas,all-week,mid-afternoon,all-year,0.35420000000,R2,2,MUS$2010/PJ,2026 -heat,all-week,mid-afternoon,all-year,5.01180000000,R1,2,MUS$2010/PJ,2026 -heat,all-week,mid-afternoon,all-year,5.01180000000,R2,2,MUS$2010/PJ,2026 +heat,all-week,mid-afternoon,all-year,4.97900000000,R1,2,MUS$2010/PJ,2026 CO2f,all-week,mid-afternoon,all-year,0.12750000000,R1,2,MUS$2010/kt,2026 -CO2f,all-week,mid-afternoon,all-year,0.12750000000,R2,2,MUS$2010/kt,2026 -electricity,all-week,early-peak,all-year,10.11860000000,R1,3,MUS$2010/PJ,2026 -electricity,all-week,early-peak,all-year,10.11860000000,R2,3,MUS$2010/PJ,2026 +electricity,all-week,early-peak,all-year,10.01940000000,R1,3,MUS$2010/PJ,2026 gas,all-week,early-peak,all-year,0.35420000000,R1,3,MUS$2010/PJ,2026 -gas,all-week,early-peak,all-year,0.35420000000,R2,3,MUS$2010/PJ,2026 -heat,all-week,early-peak,all-year,5.01180000000,R1,3,MUS$2010/PJ,2026 -heat,all-week,early-peak,all-year,5.01180000000,R2,3,MUS$2010/PJ,2026 +heat,all-week,early-peak,all-year,4.97900000000,R1,3,MUS$2010/PJ,2026 CO2f,all-week,early-peak,all-year,0.12750000000,R1,3,MUS$2010/kt,2026 -CO2f,all-week,early-peak,all-year,0.12750000000,R2,3,MUS$2010/kt,2026 -electricity,all-week,late-peak,all-year,10.11860000000,R1,4,MUS$2010/PJ,2026 -electricity,all-week,late-peak,all-year,10.11860000000,R2,4,MUS$2010/PJ,2026 +electricity,all-week,late-peak,all-year,10.01940000000,R1,4,MUS$2010/PJ,2026 gas,all-week,late-peak,all-year,0.35420000000,R1,4,MUS$2010/PJ,2026 -gas,all-week,late-peak,all-year,0.35420000000,R2,4,MUS$2010/PJ,2026 -heat,all-week,late-peak,all-year,5.01180000000,R1,4,MUS$2010/PJ,2026 -heat,all-week,late-peak,all-year,5.01180000000,R2,4,MUS$2010/PJ,2026 +heat,all-week,late-peak,all-year,4.97900000000,R1,4,MUS$2010/PJ,2026 CO2f,all-week,late-peak,all-year,0.12750000000,R1,4,MUS$2010/kt,2026 -CO2f,all-week,late-peak,all-year,0.12750000000,R2,4,MUS$2010/kt,2026 -electricity,all-week,evening,all-year,10.11860000000,R1,5,MUS$2010/PJ,2026 -electricity,all-week,evening,all-year,10.11860000000,R2,5,MUS$2010/PJ,2026 +electricity,all-week,evening,all-year,10.01940000000,R1,5,MUS$2010/PJ,2026 gas,all-week,evening,all-year,0.35420000000,R1,5,MUS$2010/PJ,2026 -gas,all-week,evening,all-year,0.35420000000,R2,5,MUS$2010/PJ,2026 -heat,all-week,evening,all-year,5.01180000000,R1,5,MUS$2010/PJ,2026 -heat,all-week,evening,all-year,5.01180000000,R2,5,MUS$2010/PJ,2026 +heat,all-week,evening,all-year,4.97900000000,R1,5,MUS$2010/PJ,2026 CO2f,all-week,evening,all-year,0.12750000000,R1,5,MUS$2010/kt,2026 -CO2f,all-week,evening,all-year,0.12750000000,R2,5,MUS$2010/kt,2026 -electricity,all-week,early-morning,all-year,10.11860000000,R1,6,MUS$2010/PJ,2026 -electricity,all-week,early-morning,all-year,10.11860000000,R2,6,MUS$2010/PJ,2026 +electricity,all-week,early-morning,all-year,10.01940000000,R1,6,MUS$2010/PJ,2026 gas,all-week,early-morning,all-year,0.35420000000,R1,6,MUS$2010/PJ,2026 -gas,all-week,early-morning,all-year,0.35420000000,R2,6,MUS$2010/PJ,2026 -heat,all-week,early-morning,all-year,5.01180000000,R1,6,MUS$2010/PJ,2026 -heat,all-week,early-morning,all-year,5.01180000000,R2,6,MUS$2010/PJ,2026 +heat,all-week,early-morning,all-year,4.97900000000,R1,6,MUS$2010/PJ,2026 CO2f,all-week,early-morning,all-year,0.12750000000,R1,6,MUS$2010/kt,2026 -CO2f,all-week,early-morning,all-year,0.12750000000,R2,6,MUS$2010/kt,2026 -electricity,all-week,late-afternoon,all-year,10.11860000000,R1,7,MUS$2010/PJ,2026 -electricity,all-week,late-afternoon,all-year,10.11860000000,R2,7,MUS$2010/PJ,2026 +electricity,all-week,late-afternoon,all-year,10.01940000000,R1,7,MUS$2010/PJ,2026 gas,all-week,late-afternoon,all-year,0.35420000000,R1,7,MUS$2010/PJ,2026 -gas,all-week,late-afternoon,all-year,0.35420000000,R2,7,MUS$2010/PJ,2026 -heat,all-week,late-afternoon,all-year,5.01180000000,R1,7,MUS$2010/PJ,2026 -heat,all-week,late-afternoon,all-year,5.01180000000,R2,7,MUS$2010/PJ,2026 +heat,all-week,late-afternoon,all-year,4.97900000000,R1,7,MUS$2010/PJ,2026 CO2f,all-week,late-afternoon,all-year,0.12750000000,R1,7,MUS$2010/kt,2026 -CO2f,all-week,late-afternoon,all-year,0.12750000000,R2,7,MUS$2010/kt,2026 -electricity,all-week,night,all-year,11.67880000000,R1,0,MUS$2010/PJ,2028 -electricity,all-week,night,all-year,11.67880000000,R2,0,MUS$2010/PJ,2028 +electricity,all-week,night,all-year,11.65880000000,R1,0,MUS$2010/PJ,2028 gas,all-week,night,all-year,0.35420000000,R1,0,MUS$2010/PJ,2028 -gas,all-week,night,all-year,0.35420000000,R2,0,MUS$2010/PJ,2028 -heat,all-week,night,all-year,5.23910000000,R1,0,MUS$2010/PJ,2028 -heat,all-week,night,all-year,5.23910000000,R2,0,MUS$2010/PJ,2028 +heat,all-week,night,all-year,5.23170000000,R1,0,MUS$2010/PJ,2028 CO2f,all-week,night,all-year,0.14220000000,R1,0,MUS$2010/kt,2028 -CO2f,all-week,night,all-year,0.14220000000,R2,0,MUS$2010/kt,2028 -electricity,all-week,morning,all-year,11.67880000000,R1,1,MUS$2010/PJ,2028 -electricity,all-week,morning,all-year,11.67880000000,R2,1,MUS$2010/PJ,2028 +electricity,all-week,morning,all-year,11.65880000000,R1,1,MUS$2010/PJ,2028 gas,all-week,morning,all-year,0.35420000000,R1,1,MUS$2010/PJ,2028 -gas,all-week,morning,all-year,0.35420000000,R2,1,MUS$2010/PJ,2028 -heat,all-week,morning,all-year,5.23910000000,R1,1,MUS$2010/PJ,2028 -heat,all-week,morning,all-year,5.23910000000,R2,1,MUS$2010/PJ,2028 +heat,all-week,morning,all-year,5.23170000000,R1,1,MUS$2010/PJ,2028 CO2f,all-week,morning,all-year,0.14220000000,R1,1,MUS$2010/kt,2028 -CO2f,all-week,morning,all-year,0.14220000000,R2,1,MUS$2010/kt,2028 -electricity,all-week,mid-afternoon,all-year,11.67880000000,R1,2,MUS$2010/PJ,2028 -electricity,all-week,mid-afternoon,all-year,11.67880000000,R2,2,MUS$2010/PJ,2028 +electricity,all-week,mid-afternoon,all-year,11.65880000000,R1,2,MUS$2010/PJ,2028 gas,all-week,mid-afternoon,all-year,0.35420000000,R1,2,MUS$2010/PJ,2028 -gas,all-week,mid-afternoon,all-year,0.35420000000,R2,2,MUS$2010/PJ,2028 -heat,all-week,mid-afternoon,all-year,5.23910000000,R1,2,MUS$2010/PJ,2028 -heat,all-week,mid-afternoon,all-year,5.23910000000,R2,2,MUS$2010/PJ,2028 +heat,all-week,mid-afternoon,all-year,5.23170000000,R1,2,MUS$2010/PJ,2028 CO2f,all-week,mid-afternoon,all-year,0.14220000000,R1,2,MUS$2010/kt,2028 -CO2f,all-week,mid-afternoon,all-year,0.14220000000,R2,2,MUS$2010/kt,2028 -electricity,all-week,early-peak,all-year,11.67880000000,R1,3,MUS$2010/PJ,2028 -electricity,all-week,early-peak,all-year,11.67880000000,R2,3,MUS$2010/PJ,2028 +electricity,all-week,early-peak,all-year,11.65880000000,R1,3,MUS$2010/PJ,2028 gas,all-week,early-peak,all-year,0.35420000000,R1,3,MUS$2010/PJ,2028 -gas,all-week,early-peak,all-year,0.35420000000,R2,3,MUS$2010/PJ,2028 -heat,all-week,early-peak,all-year,5.23910000000,R1,3,MUS$2010/PJ,2028 -heat,all-week,early-peak,all-year,5.23910000000,R2,3,MUS$2010/PJ,2028 +heat,all-week,early-peak,all-year,5.23170000000,R1,3,MUS$2010/PJ,2028 CO2f,all-week,early-peak,all-year,0.14220000000,R1,3,MUS$2010/kt,2028 -CO2f,all-week,early-peak,all-year,0.14220000000,R2,3,MUS$2010/kt,2028 -electricity,all-week,late-peak,all-year,11.67880000000,R1,4,MUS$2010/PJ,2028 -electricity,all-week,late-peak,all-year,11.67880000000,R2,4,MUS$2010/PJ,2028 +electricity,all-week,late-peak,all-year,11.65880000000,R1,4,MUS$2010/PJ,2028 gas,all-week,late-peak,all-year,0.35420000000,R1,4,MUS$2010/PJ,2028 -gas,all-week,late-peak,all-year,0.35420000000,R2,4,MUS$2010/PJ,2028 -heat,all-week,late-peak,all-year,5.23910000000,R1,4,MUS$2010/PJ,2028 -heat,all-week,late-peak,all-year,5.23910000000,R2,4,MUS$2010/PJ,2028 +heat,all-week,late-peak,all-year,5.23170000000,R1,4,MUS$2010/PJ,2028 CO2f,all-week,late-peak,all-year,0.14220000000,R1,4,MUS$2010/kt,2028 -CO2f,all-week,late-peak,all-year,0.14220000000,R2,4,MUS$2010/kt,2028 -electricity,all-week,evening,all-year,11.67880000000,R1,5,MUS$2010/PJ,2028 -electricity,all-week,evening,all-year,11.67880000000,R2,5,MUS$2010/PJ,2028 +electricity,all-week,evening,all-year,11.65880000000,R1,5,MUS$2010/PJ,2028 gas,all-week,evening,all-year,0.35420000000,R1,5,MUS$2010/PJ,2028 -gas,all-week,evening,all-year,0.35420000000,R2,5,MUS$2010/PJ,2028 -heat,all-week,evening,all-year,5.23910000000,R1,5,MUS$2010/PJ,2028 -heat,all-week,evening,all-year,5.23910000000,R2,5,MUS$2010/PJ,2028 +heat,all-week,evening,all-year,5.23170000000,R1,5,MUS$2010/PJ,2028 CO2f,all-week,evening,all-year,0.14220000000,R1,5,MUS$2010/kt,2028 -CO2f,all-week,evening,all-year,0.14220000000,R2,5,MUS$2010/kt,2028 -electricity,all-week,early-morning,all-year,11.67880000000,R1,6,MUS$2010/PJ,2028 -electricity,all-week,early-morning,all-year,11.67880000000,R2,6,MUS$2010/PJ,2028 +electricity,all-week,early-morning,all-year,11.65880000000,R1,6,MUS$2010/PJ,2028 gas,all-week,early-morning,all-year,0.35420000000,R1,6,MUS$2010/PJ,2028 -gas,all-week,early-morning,all-year,0.35420000000,R2,6,MUS$2010/PJ,2028 -heat,all-week,early-morning,all-year,5.23910000000,R1,6,MUS$2010/PJ,2028 -heat,all-week,early-morning,all-year,5.23910000000,R2,6,MUS$2010/PJ,2028 +heat,all-week,early-morning,all-year,5.23170000000,R1,6,MUS$2010/PJ,2028 CO2f,all-week,early-morning,all-year,0.14220000000,R1,6,MUS$2010/kt,2028 -CO2f,all-week,early-morning,all-year,0.14220000000,R2,6,MUS$2010/kt,2028 -electricity,all-week,late-afternoon,all-year,11.67880000000,R1,7,MUS$2010/PJ,2028 -electricity,all-week,late-afternoon,all-year,11.67880000000,R2,7,MUS$2010/PJ,2028 +electricity,all-week,late-afternoon,all-year,11.65880000000,R1,7,MUS$2010/PJ,2028 gas,all-week,late-afternoon,all-year,0.35420000000,R1,7,MUS$2010/PJ,2028 -gas,all-week,late-afternoon,all-year,0.35420000000,R2,7,MUS$2010/PJ,2028 -heat,all-week,late-afternoon,all-year,5.23910000000,R1,7,MUS$2010/PJ,2028 -heat,all-week,late-afternoon,all-year,5.23910000000,R2,7,MUS$2010/PJ,2028 +heat,all-week,late-afternoon,all-year,5.23170000000,R1,7,MUS$2010/PJ,2028 CO2f,all-week,late-afternoon,all-year,0.14220000000,R1,7,MUS$2010/kt,2028 -CO2f,all-week,late-afternoon,all-year,0.14220000000,R2,7,MUS$2010/kt,2028 -electricity,all-week,night,all-year,13.17840000000,R1,0,MUS$2010/PJ,2030 -electricity,all-week,night,all-year,13.17840000000,R2,0,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,13.20130000000,R1,0,MUS$2010/PJ,2030 gas,all-week,night,all-year,0.35420000000,R1,0,MUS$2010/PJ,2030 -gas,all-week,night,all-year,0.35420000000,R2,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,5.45180000000,R1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,5.45180000000,R2,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,5.46090000000,R1,0,MUS$2010/PJ,2030 CO2f,all-week,night,all-year,0.15700000000,R1,0,MUS$2010/kt,2030 -CO2f,all-week,night,all-year,0.15700000000,R2,0,MUS$2010/kt,2030 -electricity,all-week,morning,all-year,13.17840000000,R1,1,MUS$2010/PJ,2030 -electricity,all-week,morning,all-year,13.17840000000,R2,1,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,13.20130000000,R1,1,MUS$2010/PJ,2030 gas,all-week,morning,all-year,0.35420000000,R1,1,MUS$2010/PJ,2030 -gas,all-week,morning,all-year,0.35420000000,R2,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,5.45180000000,R1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,5.45180000000,R2,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,5.46090000000,R1,1,MUS$2010/PJ,2030 CO2f,all-week,morning,all-year,0.15700000000,R1,1,MUS$2010/kt,2030 -CO2f,all-week,morning,all-year,0.15700000000,R2,1,MUS$2010/kt,2030 -electricity,all-week,mid-afternoon,all-year,13.17840000000,R1,2,MUS$2010/PJ,2030 -electricity,all-week,mid-afternoon,all-year,13.17840000000,R2,2,MUS$2010/PJ,2030 +electricity,all-week,mid-afternoon,all-year,13.20130000000,R1,2,MUS$2010/PJ,2030 gas,all-week,mid-afternoon,all-year,0.35420000000,R1,2,MUS$2010/PJ,2030 -gas,all-week,mid-afternoon,all-year,0.35420000000,R2,2,MUS$2010/PJ,2030 -heat,all-week,mid-afternoon,all-year,5.45180000000,R1,2,MUS$2010/PJ,2030 -heat,all-week,mid-afternoon,all-year,5.45180000000,R2,2,MUS$2010/PJ,2030 +heat,all-week,mid-afternoon,all-year,5.46090000000,R1,2,MUS$2010/PJ,2030 CO2f,all-week,mid-afternoon,all-year,0.15700000000,R1,2,MUS$2010/kt,2030 -CO2f,all-week,mid-afternoon,all-year,0.15700000000,R2,2,MUS$2010/kt,2030 -electricity,all-week,early-peak,all-year,13.17840000000,R1,3,MUS$2010/PJ,2030 -electricity,all-week,early-peak,all-year,13.17840000000,R2,3,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,13.20130000000,R1,3,MUS$2010/PJ,2030 gas,all-week,early-peak,all-year,0.35420000000,R1,3,MUS$2010/PJ,2030 -gas,all-week,early-peak,all-year,0.35420000000,R2,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,5.45180000000,R1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,5.45180000000,R2,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,5.46090000000,R1,3,MUS$2010/PJ,2030 CO2f,all-week,early-peak,all-year,0.15700000000,R1,3,MUS$2010/kt,2030 -CO2f,all-week,early-peak,all-year,0.15700000000,R2,3,MUS$2010/kt,2030 -electricity,all-week,late-peak,all-year,13.17840000000,R1,4,MUS$2010/PJ,2030 -electricity,all-week,late-peak,all-year,13.17840000000,R2,4,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,13.20130000000,R1,4,MUS$2010/PJ,2030 gas,all-week,late-peak,all-year,0.35420000000,R1,4,MUS$2010/PJ,2030 -gas,all-week,late-peak,all-year,0.35420000000,R2,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,5.45180000000,R1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,5.45180000000,R2,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,5.46090000000,R1,4,MUS$2010/PJ,2030 CO2f,all-week,late-peak,all-year,0.15700000000,R1,4,MUS$2010/kt,2030 -CO2f,all-week,late-peak,all-year,0.15700000000,R2,4,MUS$2010/kt,2030 -electricity,all-week,evening,all-year,13.17840000000,R1,5,MUS$2010/PJ,2030 -electricity,all-week,evening,all-year,13.17840000000,R2,5,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,13.20130000000,R1,5,MUS$2010/PJ,2030 gas,all-week,evening,all-year,0.35420000000,R1,5,MUS$2010/PJ,2030 -gas,all-week,evening,all-year,0.35420000000,R2,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,5.45180000000,R1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,5.45180000000,R2,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,5.46090000000,R1,5,MUS$2010/PJ,2030 CO2f,all-week,evening,all-year,0.15700000000,R1,5,MUS$2010/kt,2030 -CO2f,all-week,evening,all-year,0.15700000000,R2,5,MUS$2010/kt,2030 -electricity,all-week,early-morning,all-year,13.17840000000,R1,6,MUS$2010/PJ,2030 -electricity,all-week,early-morning,all-year,13.17840000000,R2,6,MUS$2010/PJ,2030 +electricity,all-week,early-morning,all-year,13.20130000000,R1,6,MUS$2010/PJ,2030 gas,all-week,early-morning,all-year,0.35420000000,R1,6,MUS$2010/PJ,2030 -gas,all-week,early-morning,all-year,0.35420000000,R2,6,MUS$2010/PJ,2030 -heat,all-week,early-morning,all-year,5.45180000000,R1,6,MUS$2010/PJ,2030 -heat,all-week,early-morning,all-year,5.45180000000,R2,6,MUS$2010/PJ,2030 +heat,all-week,early-morning,all-year,5.46090000000,R1,6,MUS$2010/PJ,2030 CO2f,all-week,early-morning,all-year,0.15700000000,R1,6,MUS$2010/kt,2030 -CO2f,all-week,early-morning,all-year,0.15700000000,R2,6,MUS$2010/kt,2030 -electricity,all-week,late-afternoon,all-year,13.17840000000,R1,7,MUS$2010/PJ,2030 -electricity,all-week,late-afternoon,all-year,13.17840000000,R2,7,MUS$2010/PJ,2030 +electricity,all-week,late-afternoon,all-year,13.20130000000,R1,7,MUS$2010/PJ,2030 gas,all-week,late-afternoon,all-year,0.35420000000,R1,7,MUS$2010/PJ,2030 -gas,all-week,late-afternoon,all-year,0.35420000000,R2,7,MUS$2010/PJ,2030 -heat,all-week,late-afternoon,all-year,5.45180000000,R1,7,MUS$2010/PJ,2030 -heat,all-week,late-afternoon,all-year,5.45180000000,R2,7,MUS$2010/PJ,2030 +heat,all-week,late-afternoon,all-year,5.46090000000,R1,7,MUS$2010/PJ,2030 CO2f,all-week,late-afternoon,all-year,0.15700000000,R1,7,MUS$2010/kt,2030 -CO2f,all-week,late-afternoon,all-year,0.15700000000,R2,7,MUS$2010/kt,2030 -electricity,all-week,night,all-year,15.15990000000,R1,0,MUS$2010/PJ,2032 -electricity,all-week,night,all-year,15.15990000000,R2,0,MUS$2010/PJ,2032 +electricity,all-week,night,all-year,15.19460000000,R1,0,MUS$2010/PJ,2032 gas,all-week,night,all-year,0.35420000000,R1,0,MUS$2010/PJ,2032 -gas,all-week,night,all-year,0.35420000000,R2,0,MUS$2010/PJ,2032 -heat,all-week,night,all-year,6.24430000000,R1,0,MUS$2010/PJ,2032 -heat,all-week,night,all-year,6.24430000000,R2,0,MUS$2010/PJ,2032 +heat,all-week,night,all-year,6.25820000000,R1,0,MUS$2010/PJ,2032 CO2f,all-week,night,all-year,0.18020000000,R1,0,MUS$2010/kt,2032 -CO2f,all-week,night,all-year,0.18020000000,R2,0,MUS$2010/kt,2032 -electricity,all-week,morning,all-year,15.15990000000,R1,1,MUS$2010/PJ,2032 -electricity,all-week,morning,all-year,15.15990000000,R2,1,MUS$2010/PJ,2032 +electricity,all-week,morning,all-year,15.19460000000,R1,1,MUS$2010/PJ,2032 gas,all-week,morning,all-year,0.35420000000,R1,1,MUS$2010/PJ,2032 -gas,all-week,morning,all-year,0.35420000000,R2,1,MUS$2010/PJ,2032 -heat,all-week,morning,all-year,6.24430000000,R1,1,MUS$2010/PJ,2032 -heat,all-week,morning,all-year,6.24430000000,R2,1,MUS$2010/PJ,2032 +heat,all-week,morning,all-year,6.25820000000,R1,1,MUS$2010/PJ,2032 CO2f,all-week,morning,all-year,0.18020000000,R1,1,MUS$2010/kt,2032 -CO2f,all-week,morning,all-year,0.18020000000,R2,1,MUS$2010/kt,2032 -electricity,all-week,mid-afternoon,all-year,15.15990000000,R1,2,MUS$2010/PJ,2032 -electricity,all-week,mid-afternoon,all-year,15.15990000000,R2,2,MUS$2010/PJ,2032 +electricity,all-week,mid-afternoon,all-year,15.19460000000,R1,2,MUS$2010/PJ,2032 gas,all-week,mid-afternoon,all-year,0.35420000000,R1,2,MUS$2010/PJ,2032 -gas,all-week,mid-afternoon,all-year,0.35420000000,R2,2,MUS$2010/PJ,2032 -heat,all-week,mid-afternoon,all-year,6.24430000000,R1,2,MUS$2010/PJ,2032 -heat,all-week,mid-afternoon,all-year,6.24430000000,R2,2,MUS$2010/PJ,2032 +heat,all-week,mid-afternoon,all-year,6.25820000000,R1,2,MUS$2010/PJ,2032 CO2f,all-week,mid-afternoon,all-year,0.18020000000,R1,2,MUS$2010/kt,2032 -CO2f,all-week,mid-afternoon,all-year,0.18020000000,R2,2,MUS$2010/kt,2032 -electricity,all-week,early-peak,all-year,15.15990000000,R1,3,MUS$2010/PJ,2032 -electricity,all-week,early-peak,all-year,15.15990000000,R2,3,MUS$2010/PJ,2032 +electricity,all-week,early-peak,all-year,15.19460000000,R1,3,MUS$2010/PJ,2032 gas,all-week,early-peak,all-year,0.35420000000,R1,3,MUS$2010/PJ,2032 -gas,all-week,early-peak,all-year,0.35420000000,R2,3,MUS$2010/PJ,2032 -heat,all-week,early-peak,all-year,6.24430000000,R1,3,MUS$2010/PJ,2032 -heat,all-week,early-peak,all-year,6.24430000000,R2,3,MUS$2010/PJ,2032 +heat,all-week,early-peak,all-year,6.25820000000,R1,3,MUS$2010/PJ,2032 CO2f,all-week,early-peak,all-year,0.18020000000,R1,3,MUS$2010/kt,2032 -CO2f,all-week,early-peak,all-year,0.18020000000,R2,3,MUS$2010/kt,2032 -electricity,all-week,late-peak,all-year,15.15990000000,R1,4,MUS$2010/PJ,2032 -electricity,all-week,late-peak,all-year,15.15990000000,R2,4,MUS$2010/PJ,2032 +electricity,all-week,late-peak,all-year,15.19460000000,R1,4,MUS$2010/PJ,2032 gas,all-week,late-peak,all-year,0.35420000000,R1,4,MUS$2010/PJ,2032 -gas,all-week,late-peak,all-year,0.35420000000,R2,4,MUS$2010/PJ,2032 -heat,all-week,late-peak,all-year,6.24430000000,R1,4,MUS$2010/PJ,2032 -heat,all-week,late-peak,all-year,6.24430000000,R2,4,MUS$2010/PJ,2032 +heat,all-week,late-peak,all-year,6.25820000000,R1,4,MUS$2010/PJ,2032 CO2f,all-week,late-peak,all-year,0.18020000000,R1,4,MUS$2010/kt,2032 -CO2f,all-week,late-peak,all-year,0.18020000000,R2,4,MUS$2010/kt,2032 -electricity,all-week,evening,all-year,15.15990000000,R1,5,MUS$2010/PJ,2032 -electricity,all-week,evening,all-year,15.15990000000,R2,5,MUS$2010/PJ,2032 +electricity,all-week,evening,all-year,15.19460000000,R1,5,MUS$2010/PJ,2032 gas,all-week,evening,all-year,0.35420000000,R1,5,MUS$2010/PJ,2032 -gas,all-week,evening,all-year,0.35420000000,R2,5,MUS$2010/PJ,2032 -heat,all-week,evening,all-year,6.24430000000,R1,5,MUS$2010/PJ,2032 -heat,all-week,evening,all-year,6.24430000000,R2,5,MUS$2010/PJ,2032 +heat,all-week,evening,all-year,6.25820000000,R1,5,MUS$2010/PJ,2032 CO2f,all-week,evening,all-year,0.18020000000,R1,5,MUS$2010/kt,2032 -CO2f,all-week,evening,all-year,0.18020000000,R2,5,MUS$2010/kt,2032 -electricity,all-week,early-morning,all-year,15.15990000000,R1,6,MUS$2010/PJ,2032 -electricity,all-week,early-morning,all-year,15.15990000000,R2,6,MUS$2010/PJ,2032 +electricity,all-week,early-morning,all-year,15.19460000000,R1,6,MUS$2010/PJ,2032 gas,all-week,early-morning,all-year,0.35420000000,R1,6,MUS$2010/PJ,2032 -gas,all-week,early-morning,all-year,0.35420000000,R2,6,MUS$2010/PJ,2032 -heat,all-week,early-morning,all-year,6.24430000000,R1,6,MUS$2010/PJ,2032 -heat,all-week,early-morning,all-year,6.24430000000,R2,6,MUS$2010/PJ,2032 +heat,all-week,early-morning,all-year,6.25820000000,R1,6,MUS$2010/PJ,2032 CO2f,all-week,early-morning,all-year,0.18020000000,R1,6,MUS$2010/kt,2032 -CO2f,all-week,early-morning,all-year,0.18020000000,R2,6,MUS$2010/kt,2032 -electricity,all-week,late-afternoon,all-year,15.15990000000,R1,7,MUS$2010/PJ,2032 -electricity,all-week,late-afternoon,all-year,15.15990000000,R2,7,MUS$2010/PJ,2032 +electricity,all-week,late-afternoon,all-year,15.19460000000,R1,7,MUS$2010/PJ,2032 gas,all-week,late-afternoon,all-year,0.35420000000,R1,7,MUS$2010/PJ,2032 -gas,all-week,late-afternoon,all-year,0.35420000000,R2,7,MUS$2010/PJ,2032 -heat,all-week,late-afternoon,all-year,6.24430000000,R1,7,MUS$2010/PJ,2032 -heat,all-week,late-afternoon,all-year,6.24430000000,R2,7,MUS$2010/PJ,2032 +heat,all-week,late-afternoon,all-year,6.25820000000,R1,7,MUS$2010/PJ,2032 CO2f,all-week,late-afternoon,all-year,0.18020000000,R1,7,MUS$2010/kt,2032 -CO2f,all-week,late-afternoon,all-year,0.18020000000,R2,7,MUS$2010/kt,2032 -electricity,all-week,night,all-year,16.37160000000,R1,0,MUS$2010/PJ,2034 -electricity,all-week,night,all-year,16.37160000000,R2,0,MUS$2010/PJ,2034 +electricity,all-week,night,all-year,17.20670000000,R1,0,MUS$2010/PJ,2034 gas,all-week,night,all-year,0.35420000000,R1,0,MUS$2010/PJ,2034 -gas,all-week,night,all-year,0.35420000000,R2,0,MUS$2010/PJ,2034 -heat,all-week,night,all-year,6.72900000000,R1,0,MUS$2010/PJ,2034 -heat,all-week,night,all-year,6.72900000000,R2,0,MUS$2010/PJ,2034 +heat,all-week,night,all-year,7.06300000000,R1,0,MUS$2010/PJ,2034 CO2f,all-week,night,all-year,0.20330000000,R1,0,MUS$2010/kt,2034 -CO2f,all-week,night,all-year,0.20330000000,R2,0,MUS$2010/kt,2034 -electricity,all-week,morning,all-year,16.37160000000,R1,1,MUS$2010/PJ,2034 -electricity,all-week,morning,all-year,16.37160000000,R2,1,MUS$2010/PJ,2034 +electricity,all-week,morning,all-year,17.20670000000,R1,1,MUS$2010/PJ,2034 gas,all-week,morning,all-year,0.35420000000,R1,1,MUS$2010/PJ,2034 -gas,all-week,morning,all-year,0.35420000000,R2,1,MUS$2010/PJ,2034 -heat,all-week,morning,all-year,6.72900000000,R1,1,MUS$2010/PJ,2034 -heat,all-week,morning,all-year,6.72900000000,R2,1,MUS$2010/PJ,2034 +heat,all-week,morning,all-year,7.06300000000,R1,1,MUS$2010/PJ,2034 CO2f,all-week,morning,all-year,0.20330000000,R1,1,MUS$2010/kt,2034 -CO2f,all-week,morning,all-year,0.20330000000,R2,1,MUS$2010/kt,2034 -electricity,all-week,mid-afternoon,all-year,16.37160000000,R1,2,MUS$2010/PJ,2034 -electricity,all-week,mid-afternoon,all-year,16.37160000000,R2,2,MUS$2010/PJ,2034 +electricity,all-week,mid-afternoon,all-year,17.20670000000,R1,2,MUS$2010/PJ,2034 gas,all-week,mid-afternoon,all-year,0.35420000000,R1,2,MUS$2010/PJ,2034 -gas,all-week,mid-afternoon,all-year,0.35420000000,R2,2,MUS$2010/PJ,2034 -heat,all-week,mid-afternoon,all-year,6.72900000000,R1,2,MUS$2010/PJ,2034 -heat,all-week,mid-afternoon,all-year,6.72900000000,R2,2,MUS$2010/PJ,2034 +heat,all-week,mid-afternoon,all-year,7.06300000000,R1,2,MUS$2010/PJ,2034 CO2f,all-week,mid-afternoon,all-year,0.20330000000,R1,2,MUS$2010/kt,2034 -CO2f,all-week,mid-afternoon,all-year,0.20330000000,R2,2,MUS$2010/kt,2034 -electricity,all-week,early-peak,all-year,16.37160000000,R1,3,MUS$2010/PJ,2034 -electricity,all-week,early-peak,all-year,16.37160000000,R2,3,MUS$2010/PJ,2034 +electricity,all-week,early-peak,all-year,17.20670000000,R1,3,MUS$2010/PJ,2034 gas,all-week,early-peak,all-year,0.35420000000,R1,3,MUS$2010/PJ,2034 -gas,all-week,early-peak,all-year,0.35420000000,R2,3,MUS$2010/PJ,2034 -heat,all-week,early-peak,all-year,6.72900000000,R1,3,MUS$2010/PJ,2034 -heat,all-week,early-peak,all-year,6.72900000000,R2,3,MUS$2010/PJ,2034 +heat,all-week,early-peak,all-year,7.06300000000,R1,3,MUS$2010/PJ,2034 CO2f,all-week,early-peak,all-year,0.20330000000,R1,3,MUS$2010/kt,2034 -CO2f,all-week,early-peak,all-year,0.20330000000,R2,3,MUS$2010/kt,2034 -electricity,all-week,late-peak,all-year,16.37160000000,R1,4,MUS$2010/PJ,2034 -electricity,all-week,late-peak,all-year,16.37160000000,R2,4,MUS$2010/PJ,2034 +electricity,all-week,late-peak,all-year,17.20670000000,R1,4,MUS$2010/PJ,2034 gas,all-week,late-peak,all-year,0.35420000000,R1,4,MUS$2010/PJ,2034 -gas,all-week,late-peak,all-year,0.35420000000,R2,4,MUS$2010/PJ,2034 -heat,all-week,late-peak,all-year,6.72900000000,R1,4,MUS$2010/PJ,2034 -heat,all-week,late-peak,all-year,6.72900000000,R2,4,MUS$2010/PJ,2034 +heat,all-week,late-peak,all-year,7.06300000000,R1,4,MUS$2010/PJ,2034 CO2f,all-week,late-peak,all-year,0.20330000000,R1,4,MUS$2010/kt,2034 -CO2f,all-week,late-peak,all-year,0.20330000000,R2,4,MUS$2010/kt,2034 -electricity,all-week,evening,all-year,16.37160000000,R1,5,MUS$2010/PJ,2034 -electricity,all-week,evening,all-year,16.37160000000,R2,5,MUS$2010/PJ,2034 +electricity,all-week,evening,all-year,17.20670000000,R1,5,MUS$2010/PJ,2034 gas,all-week,evening,all-year,0.35420000000,R1,5,MUS$2010/PJ,2034 -gas,all-week,evening,all-year,0.35420000000,R2,5,MUS$2010/PJ,2034 -heat,all-week,evening,all-year,6.72900000000,R1,5,MUS$2010/PJ,2034 -heat,all-week,evening,all-year,6.72900000000,R2,5,MUS$2010/PJ,2034 +heat,all-week,evening,all-year,7.06300000000,R1,5,MUS$2010/PJ,2034 CO2f,all-week,evening,all-year,0.20330000000,R1,5,MUS$2010/kt,2034 -CO2f,all-week,evening,all-year,0.20330000000,R2,5,MUS$2010/kt,2034 -electricity,all-week,early-morning,all-year,16.37160000000,R1,6,MUS$2010/PJ,2034 -electricity,all-week,early-morning,all-year,16.37160000000,R2,6,MUS$2010/PJ,2034 +electricity,all-week,early-morning,all-year,17.20670000000,R1,6,MUS$2010/PJ,2034 gas,all-week,early-morning,all-year,0.35420000000,R1,6,MUS$2010/PJ,2034 -gas,all-week,early-morning,all-year,0.35420000000,R2,6,MUS$2010/PJ,2034 -heat,all-week,early-morning,all-year,6.72900000000,R1,6,MUS$2010/PJ,2034 -heat,all-week,early-morning,all-year,6.72900000000,R2,6,MUS$2010/PJ,2034 +heat,all-week,early-morning,all-year,7.06300000000,R1,6,MUS$2010/PJ,2034 CO2f,all-week,early-morning,all-year,0.20330000000,R1,6,MUS$2010/kt,2034 -CO2f,all-week,early-morning,all-year,0.20330000000,R2,6,MUS$2010/kt,2034 -electricity,all-week,late-afternoon,all-year,16.37160000000,R1,7,MUS$2010/PJ,2034 -electricity,all-week,late-afternoon,all-year,16.37160000000,R2,7,MUS$2010/PJ,2034 +electricity,all-week,late-afternoon,all-year,17.20670000000,R1,7,MUS$2010/PJ,2034 gas,all-week,late-afternoon,all-year,0.35420000000,R1,7,MUS$2010/PJ,2034 -gas,all-week,late-afternoon,all-year,0.35420000000,R2,7,MUS$2010/PJ,2034 -heat,all-week,late-afternoon,all-year,6.72900000000,R1,7,MUS$2010/PJ,2034 -heat,all-week,late-afternoon,all-year,6.72900000000,R2,7,MUS$2010/PJ,2034 +heat,all-week,late-afternoon,all-year,7.06300000000,R1,7,MUS$2010/PJ,2034 CO2f,all-week,late-afternoon,all-year,0.20330000000,R1,7,MUS$2010/kt,2034 -CO2f,all-week,late-afternoon,all-year,0.20330000000,R2,7,MUS$2010/kt,2034 -electricity,all-week,night,all-year,17.02870000000,R1,0,MUS$2010/PJ,2036 -electricity,all-week,night,all-year,17.02870000000,R2,0,MUS$2010/PJ,2036 +electricity,all-week,night,all-year,17.48410000000,R1,0,MUS$2010/PJ,2036 gas,all-week,night,all-year,0.35420000000,R1,0,MUS$2010/PJ,2036 -gas,all-week,night,all-year,0.35420000000,R2,0,MUS$2010/PJ,2036 -heat,all-week,night,all-year,6.99190000000,R1,0,MUS$2010/PJ,2036 -heat,all-week,night,all-year,6.99190000000,R2,0,MUS$2010/PJ,2036 +heat,all-week,night,all-year,7.17400000000,R1,0,MUS$2010/PJ,2036 CO2f,all-week,night,all-year,0.22650000000,R1,0,MUS$2010/kt,2036 -CO2f,all-week,night,all-year,0.22650000000,R2,0,MUS$2010/kt,2036 -electricity,all-week,morning,all-year,17.02870000000,R1,1,MUS$2010/PJ,2036 -electricity,all-week,morning,all-year,17.02870000000,R2,1,MUS$2010/PJ,2036 +electricity,all-week,morning,all-year,17.48410000000,R1,1,MUS$2010/PJ,2036 gas,all-week,morning,all-year,0.35420000000,R1,1,MUS$2010/PJ,2036 -gas,all-week,morning,all-year,0.35420000000,R2,1,MUS$2010/PJ,2036 -heat,all-week,morning,all-year,6.99190000000,R1,1,MUS$2010/PJ,2036 -heat,all-week,morning,all-year,6.99190000000,R2,1,MUS$2010/PJ,2036 +heat,all-week,morning,all-year,7.17400000000,R1,1,MUS$2010/PJ,2036 CO2f,all-week,morning,all-year,0.22650000000,R1,1,MUS$2010/kt,2036 -CO2f,all-week,morning,all-year,0.22650000000,R2,1,MUS$2010/kt,2036 -electricity,all-week,mid-afternoon,all-year,17.02870000000,R1,2,MUS$2010/PJ,2036 -electricity,all-week,mid-afternoon,all-year,17.02870000000,R2,2,MUS$2010/PJ,2036 +electricity,all-week,mid-afternoon,all-year,17.48410000000,R1,2,MUS$2010/PJ,2036 gas,all-week,mid-afternoon,all-year,0.35420000000,R1,2,MUS$2010/PJ,2036 -gas,all-week,mid-afternoon,all-year,0.35420000000,R2,2,MUS$2010/PJ,2036 -heat,all-week,mid-afternoon,all-year,6.99190000000,R1,2,MUS$2010/PJ,2036 -heat,all-week,mid-afternoon,all-year,6.99190000000,R2,2,MUS$2010/PJ,2036 +heat,all-week,mid-afternoon,all-year,7.17400000000,R1,2,MUS$2010/PJ,2036 CO2f,all-week,mid-afternoon,all-year,0.22650000000,R1,2,MUS$2010/kt,2036 -CO2f,all-week,mid-afternoon,all-year,0.22650000000,R2,2,MUS$2010/kt,2036 -electricity,all-week,early-peak,all-year,17.02870000000,R1,3,MUS$2010/PJ,2036 -electricity,all-week,early-peak,all-year,17.02870000000,R2,3,MUS$2010/PJ,2036 +electricity,all-week,early-peak,all-year,17.48410000000,R1,3,MUS$2010/PJ,2036 gas,all-week,early-peak,all-year,0.35420000000,R1,3,MUS$2010/PJ,2036 -gas,all-week,early-peak,all-year,0.35420000000,R2,3,MUS$2010/PJ,2036 -heat,all-week,early-peak,all-year,6.99190000000,R1,3,MUS$2010/PJ,2036 -heat,all-week,early-peak,all-year,6.99190000000,R2,3,MUS$2010/PJ,2036 +heat,all-week,early-peak,all-year,7.17400000000,R1,3,MUS$2010/PJ,2036 CO2f,all-week,early-peak,all-year,0.22650000000,R1,3,MUS$2010/kt,2036 -CO2f,all-week,early-peak,all-year,0.22650000000,R2,3,MUS$2010/kt,2036 -electricity,all-week,late-peak,all-year,17.02870000000,R1,4,MUS$2010/PJ,2036 -electricity,all-week,late-peak,all-year,17.02870000000,R2,4,MUS$2010/PJ,2036 +electricity,all-week,late-peak,all-year,17.48410000000,R1,4,MUS$2010/PJ,2036 gas,all-week,late-peak,all-year,0.35420000000,R1,4,MUS$2010/PJ,2036 -gas,all-week,late-peak,all-year,0.35420000000,R2,4,MUS$2010/PJ,2036 -heat,all-week,late-peak,all-year,6.99190000000,R1,4,MUS$2010/PJ,2036 -heat,all-week,late-peak,all-year,6.99190000000,R2,4,MUS$2010/PJ,2036 +heat,all-week,late-peak,all-year,7.17400000000,R1,4,MUS$2010/PJ,2036 CO2f,all-week,late-peak,all-year,0.22650000000,R1,4,MUS$2010/kt,2036 -CO2f,all-week,late-peak,all-year,0.22650000000,R2,4,MUS$2010/kt,2036 -electricity,all-week,evening,all-year,17.02870000000,R1,5,MUS$2010/PJ,2036 -electricity,all-week,evening,all-year,17.02870000000,R2,5,MUS$2010/PJ,2036 +electricity,all-week,evening,all-year,17.48410000000,R1,5,MUS$2010/PJ,2036 gas,all-week,evening,all-year,0.35420000000,R1,5,MUS$2010/PJ,2036 -gas,all-week,evening,all-year,0.35420000000,R2,5,MUS$2010/PJ,2036 -heat,all-week,evening,all-year,6.99190000000,R1,5,MUS$2010/PJ,2036 -heat,all-week,evening,all-year,6.99190000000,R2,5,MUS$2010/PJ,2036 +heat,all-week,evening,all-year,7.17400000000,R1,5,MUS$2010/PJ,2036 CO2f,all-week,evening,all-year,0.22650000000,R1,5,MUS$2010/kt,2036 -CO2f,all-week,evening,all-year,0.22650000000,R2,5,MUS$2010/kt,2036 -electricity,all-week,early-morning,all-year,17.02870000000,R1,6,MUS$2010/PJ,2036 -electricity,all-week,early-morning,all-year,17.02870000000,R2,6,MUS$2010/PJ,2036 +electricity,all-week,early-morning,all-year,17.48410000000,R1,6,MUS$2010/PJ,2036 gas,all-week,early-morning,all-year,0.35420000000,R1,6,MUS$2010/PJ,2036 -gas,all-week,early-morning,all-year,0.35420000000,R2,6,MUS$2010/PJ,2036 -heat,all-week,early-morning,all-year,6.99190000000,R1,6,MUS$2010/PJ,2036 -heat,all-week,early-morning,all-year,6.99190000000,R2,6,MUS$2010/PJ,2036 +heat,all-week,early-morning,all-year,7.17400000000,R1,6,MUS$2010/PJ,2036 CO2f,all-week,early-morning,all-year,0.22650000000,R1,6,MUS$2010/kt,2036 -CO2f,all-week,early-morning,all-year,0.22650000000,R2,6,MUS$2010/kt,2036 -electricity,all-week,late-afternoon,all-year,17.02870000000,R1,7,MUS$2010/PJ,2036 -electricity,all-week,late-afternoon,all-year,17.02870000000,R2,7,MUS$2010/PJ,2036 +electricity,all-week,late-afternoon,all-year,17.48410000000,R1,7,MUS$2010/PJ,2036 gas,all-week,late-afternoon,all-year,0.35420000000,R1,7,MUS$2010/PJ,2036 -gas,all-week,late-afternoon,all-year,0.35420000000,R2,7,MUS$2010/PJ,2036 -heat,all-week,late-afternoon,all-year,6.99190000000,R1,7,MUS$2010/PJ,2036 -heat,all-week,late-afternoon,all-year,6.99190000000,R2,7,MUS$2010/PJ,2036 +heat,all-week,late-afternoon,all-year,7.17400000000,R1,7,MUS$2010/PJ,2036 CO2f,all-week,late-afternoon,all-year,0.22650000000,R1,7,MUS$2010/kt,2036 -CO2f,all-week,late-afternoon,all-year,0.22650000000,R2,7,MUS$2010/kt,2036 -electricity,all-week,night,all-year,17.60310000000,R1,0,MUS$2010/PJ,2038 -electricity,all-week,night,all-year,17.60310000000,R2,0,MUS$2010/PJ,2038 +electricity,all-week,night,all-year,18.17390000000,R1,0,MUS$2010/PJ,2038 gas,all-week,night,all-year,0.35420000000,R1,0,MUS$2010/PJ,2038 -gas,all-week,night,all-year,0.35420000000,R2,0,MUS$2010/PJ,2038 -heat,all-week,night,all-year,7.22160000000,R1,0,MUS$2010/PJ,2038 -heat,all-week,night,all-year,7.22160000000,R2,0,MUS$2010/PJ,2038 +heat,all-week,night,all-year,7.45000000000,R1,0,MUS$2010/PJ,2038 CO2f,all-week,night,all-year,0.24960000000,R1,0,MUS$2010/kt,2038 -CO2f,all-week,night,all-year,0.24960000000,R2,0,MUS$2010/kt,2038 -electricity,all-week,morning,all-year,17.60310000000,R1,1,MUS$2010/PJ,2038 -electricity,all-week,morning,all-year,17.60310000000,R2,1,MUS$2010/PJ,2038 +electricity,all-week,morning,all-year,18.17390000000,R1,1,MUS$2010/PJ,2038 gas,all-week,morning,all-year,0.35420000000,R1,1,MUS$2010/PJ,2038 -gas,all-week,morning,all-year,0.35420000000,R2,1,MUS$2010/PJ,2038 -heat,all-week,morning,all-year,7.22160000000,R1,1,MUS$2010/PJ,2038 -heat,all-week,morning,all-year,7.22160000000,R2,1,MUS$2010/PJ,2038 +heat,all-week,morning,all-year,7.45000000000,R1,1,MUS$2010/PJ,2038 CO2f,all-week,morning,all-year,0.24960000000,R1,1,MUS$2010/kt,2038 -CO2f,all-week,morning,all-year,0.24960000000,R2,1,MUS$2010/kt,2038 -electricity,all-week,mid-afternoon,all-year,17.60310000000,R1,2,MUS$2010/PJ,2038 -electricity,all-week,mid-afternoon,all-year,17.60310000000,R2,2,MUS$2010/PJ,2038 +electricity,all-week,mid-afternoon,all-year,18.17390000000,R1,2,MUS$2010/PJ,2038 gas,all-week,mid-afternoon,all-year,0.35420000000,R1,2,MUS$2010/PJ,2038 -gas,all-week,mid-afternoon,all-year,0.35420000000,R2,2,MUS$2010/PJ,2038 -heat,all-week,mid-afternoon,all-year,7.22160000000,R1,2,MUS$2010/PJ,2038 -heat,all-week,mid-afternoon,all-year,7.22160000000,R2,2,MUS$2010/PJ,2038 +heat,all-week,mid-afternoon,all-year,7.45000000000,R1,2,MUS$2010/PJ,2038 CO2f,all-week,mid-afternoon,all-year,0.24960000000,R1,2,MUS$2010/kt,2038 -CO2f,all-week,mid-afternoon,all-year,0.24960000000,R2,2,MUS$2010/kt,2038 -electricity,all-week,early-peak,all-year,17.60310000000,R1,3,MUS$2010/PJ,2038 -electricity,all-week,early-peak,all-year,17.60310000000,R2,3,MUS$2010/PJ,2038 +electricity,all-week,early-peak,all-year,18.17390000000,R1,3,MUS$2010/PJ,2038 gas,all-week,early-peak,all-year,0.35420000000,R1,3,MUS$2010/PJ,2038 -gas,all-week,early-peak,all-year,0.35420000000,R2,3,MUS$2010/PJ,2038 -heat,all-week,early-peak,all-year,7.22160000000,R1,3,MUS$2010/PJ,2038 -heat,all-week,early-peak,all-year,7.22160000000,R2,3,MUS$2010/PJ,2038 +heat,all-week,early-peak,all-year,7.45000000000,R1,3,MUS$2010/PJ,2038 CO2f,all-week,early-peak,all-year,0.24960000000,R1,3,MUS$2010/kt,2038 -CO2f,all-week,early-peak,all-year,0.24960000000,R2,3,MUS$2010/kt,2038 -electricity,all-week,late-peak,all-year,17.60310000000,R1,4,MUS$2010/PJ,2038 -electricity,all-week,late-peak,all-year,17.60310000000,R2,4,MUS$2010/PJ,2038 +electricity,all-week,late-peak,all-year,18.17390000000,R1,4,MUS$2010/PJ,2038 gas,all-week,late-peak,all-year,0.35420000000,R1,4,MUS$2010/PJ,2038 -gas,all-week,late-peak,all-year,0.35420000000,R2,4,MUS$2010/PJ,2038 -heat,all-week,late-peak,all-year,7.22160000000,R1,4,MUS$2010/PJ,2038 -heat,all-week,late-peak,all-year,7.22160000000,R2,4,MUS$2010/PJ,2038 +heat,all-week,late-peak,all-year,7.45000000000,R1,4,MUS$2010/PJ,2038 CO2f,all-week,late-peak,all-year,0.24960000000,R1,4,MUS$2010/kt,2038 -CO2f,all-week,late-peak,all-year,0.24960000000,R2,4,MUS$2010/kt,2038 -electricity,all-week,evening,all-year,17.60310000000,R1,5,MUS$2010/PJ,2038 -electricity,all-week,evening,all-year,17.60310000000,R2,5,MUS$2010/PJ,2038 +electricity,all-week,evening,all-year,18.17390000000,R1,5,MUS$2010/PJ,2038 gas,all-week,evening,all-year,0.35420000000,R1,5,MUS$2010/PJ,2038 -gas,all-week,evening,all-year,0.35420000000,R2,5,MUS$2010/PJ,2038 -heat,all-week,evening,all-year,7.22160000000,R1,5,MUS$2010/PJ,2038 -heat,all-week,evening,all-year,7.22160000000,R2,5,MUS$2010/PJ,2038 +heat,all-week,evening,all-year,7.45000000000,R1,5,MUS$2010/PJ,2038 CO2f,all-week,evening,all-year,0.24960000000,R1,5,MUS$2010/kt,2038 -CO2f,all-week,evening,all-year,0.24960000000,R2,5,MUS$2010/kt,2038 -electricity,all-week,early-morning,all-year,17.60310000000,R1,6,MUS$2010/PJ,2038 -electricity,all-week,early-morning,all-year,17.60310000000,R2,6,MUS$2010/PJ,2038 +electricity,all-week,early-morning,all-year,18.17390000000,R1,6,MUS$2010/PJ,2038 gas,all-week,early-morning,all-year,0.35420000000,R1,6,MUS$2010/PJ,2038 -gas,all-week,early-morning,all-year,0.35420000000,R2,6,MUS$2010/PJ,2038 -heat,all-week,early-morning,all-year,7.22160000000,R1,6,MUS$2010/PJ,2038 -heat,all-week,early-morning,all-year,7.22160000000,R2,6,MUS$2010/PJ,2038 +heat,all-week,early-morning,all-year,7.45000000000,R1,6,MUS$2010/PJ,2038 CO2f,all-week,early-morning,all-year,0.24960000000,R1,6,MUS$2010/kt,2038 -CO2f,all-week,early-morning,all-year,0.24960000000,R2,6,MUS$2010/kt,2038 -electricity,all-week,late-afternoon,all-year,17.60310000000,R1,7,MUS$2010/PJ,2038 -electricity,all-week,late-afternoon,all-year,17.60310000000,R2,7,MUS$2010/PJ,2038 +electricity,all-week,late-afternoon,all-year,18.17390000000,R1,7,MUS$2010/PJ,2038 gas,all-week,late-afternoon,all-year,0.35420000000,R1,7,MUS$2010/PJ,2038 -gas,all-week,late-afternoon,all-year,0.35420000000,R2,7,MUS$2010/PJ,2038 -heat,all-week,late-afternoon,all-year,7.22160000000,R1,7,MUS$2010/PJ,2038 -heat,all-week,late-afternoon,all-year,7.22160000000,R2,7,MUS$2010/PJ,2038 +heat,all-week,late-afternoon,all-year,7.45000000000,R1,7,MUS$2010/PJ,2038 CO2f,all-week,late-afternoon,all-year,0.24960000000,R1,7,MUS$2010/kt,2038 -CO2f,all-week,late-afternoon,all-year,0.24960000000,R2,7,MUS$2010/kt,2038 -electricity,all-week,night,all-year,18.10990000000,R1,0,MUS$2010/PJ,2040 -electricity,all-week,night,all-year,18.10990000000,R2,0,MUS$2010/PJ,2040 +electricity,all-week,night,all-year,18.34140000000,R1,0,MUS$2010/PJ,2040 gas,all-week,night,all-year,0.35420000000,R1,0,MUS$2010/PJ,2040 -gas,all-week,night,all-year,0.35420000000,R2,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,7.42430000000,R1,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,7.42430000000,R2,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,7.51690000000,R1,0,MUS$2010/PJ,2040 CO2f,all-week,night,all-year,0.27280000000,R1,0,MUS$2010/kt,2040 -CO2f,all-week,night,all-year,0.27280000000,R2,0,MUS$2010/kt,2040 -electricity,all-week,morning,all-year,18.10990000000,R1,1,MUS$2010/PJ,2040 -electricity,all-week,morning,all-year,18.10990000000,R2,1,MUS$2010/PJ,2040 +electricity,all-week,morning,all-year,18.34140000000,R1,1,MUS$2010/PJ,2040 gas,all-week,morning,all-year,0.35420000000,R1,1,MUS$2010/PJ,2040 -gas,all-week,morning,all-year,0.35420000000,R2,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,7.42430000000,R1,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,7.42430000000,R2,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,7.51690000000,R1,1,MUS$2010/PJ,2040 CO2f,all-week,morning,all-year,0.27280000000,R1,1,MUS$2010/kt,2040 -CO2f,all-week,morning,all-year,0.27280000000,R2,1,MUS$2010/kt,2040 -electricity,all-week,mid-afternoon,all-year,18.10990000000,R1,2,MUS$2010/PJ,2040 -electricity,all-week,mid-afternoon,all-year,18.10990000000,R2,2,MUS$2010/PJ,2040 +electricity,all-week,mid-afternoon,all-year,18.34140000000,R1,2,MUS$2010/PJ,2040 gas,all-week,mid-afternoon,all-year,0.35420000000,R1,2,MUS$2010/PJ,2040 -gas,all-week,mid-afternoon,all-year,0.35420000000,R2,2,MUS$2010/PJ,2040 -heat,all-week,mid-afternoon,all-year,7.42430000000,R1,2,MUS$2010/PJ,2040 -heat,all-week,mid-afternoon,all-year,7.42430000000,R2,2,MUS$2010/PJ,2040 +heat,all-week,mid-afternoon,all-year,7.51690000000,R1,2,MUS$2010/PJ,2040 CO2f,all-week,mid-afternoon,all-year,0.27280000000,R1,2,MUS$2010/kt,2040 -CO2f,all-week,mid-afternoon,all-year,0.27280000000,R2,2,MUS$2010/kt,2040 -electricity,all-week,early-peak,all-year,18.10990000000,R1,3,MUS$2010/PJ,2040 -electricity,all-week,early-peak,all-year,18.10990000000,R2,3,MUS$2010/PJ,2040 +electricity,all-week,early-peak,all-year,18.34140000000,R1,3,MUS$2010/PJ,2040 gas,all-week,early-peak,all-year,0.35420000000,R1,3,MUS$2010/PJ,2040 -gas,all-week,early-peak,all-year,0.35420000000,R2,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,7.42430000000,R1,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,7.42430000000,R2,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,7.51690000000,R1,3,MUS$2010/PJ,2040 CO2f,all-week,early-peak,all-year,0.27280000000,R1,3,MUS$2010/kt,2040 -CO2f,all-week,early-peak,all-year,0.27280000000,R2,3,MUS$2010/kt,2040 -electricity,all-week,late-peak,all-year,18.10990000000,R1,4,MUS$2010/PJ,2040 -electricity,all-week,late-peak,all-year,18.10990000000,R2,4,MUS$2010/PJ,2040 +electricity,all-week,late-peak,all-year,18.34140000000,R1,4,MUS$2010/PJ,2040 gas,all-week,late-peak,all-year,0.35420000000,R1,4,MUS$2010/PJ,2040 -gas,all-week,late-peak,all-year,0.35420000000,R2,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,7.42430000000,R1,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,7.42430000000,R2,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,7.51690000000,R1,4,MUS$2010/PJ,2040 CO2f,all-week,late-peak,all-year,0.27280000000,R1,4,MUS$2010/kt,2040 -CO2f,all-week,late-peak,all-year,0.27280000000,R2,4,MUS$2010/kt,2040 -electricity,all-week,evening,all-year,18.10990000000,R1,5,MUS$2010/PJ,2040 -electricity,all-week,evening,all-year,18.10990000000,R2,5,MUS$2010/PJ,2040 +electricity,all-week,evening,all-year,18.34140000000,R1,5,MUS$2010/PJ,2040 gas,all-week,evening,all-year,0.35420000000,R1,5,MUS$2010/PJ,2040 -gas,all-week,evening,all-year,0.35420000000,R2,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,7.42430000000,R1,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,7.42430000000,R2,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,7.51690000000,R1,5,MUS$2010/PJ,2040 CO2f,all-week,evening,all-year,0.27280000000,R1,5,MUS$2010/kt,2040 -CO2f,all-week,evening,all-year,0.27280000000,R2,5,MUS$2010/kt,2040 -electricity,all-week,early-morning,all-year,18.10990000000,R1,6,MUS$2010/PJ,2040 -electricity,all-week,early-morning,all-year,18.10990000000,R2,6,MUS$2010/PJ,2040 +electricity,all-week,early-morning,all-year,18.34140000000,R1,6,MUS$2010/PJ,2040 gas,all-week,early-morning,all-year,0.35420000000,R1,6,MUS$2010/PJ,2040 -gas,all-week,early-morning,all-year,0.35420000000,R2,6,MUS$2010/PJ,2040 -heat,all-week,early-morning,all-year,7.42430000000,R1,6,MUS$2010/PJ,2040 -heat,all-week,early-morning,all-year,7.42430000000,R2,6,MUS$2010/PJ,2040 +heat,all-week,early-morning,all-year,7.51690000000,R1,6,MUS$2010/PJ,2040 CO2f,all-week,early-morning,all-year,0.27280000000,R1,6,MUS$2010/kt,2040 -CO2f,all-week,early-morning,all-year,0.27280000000,R2,6,MUS$2010/kt,2040 -electricity,all-week,late-afternoon,all-year,18.10990000000,R1,7,MUS$2010/PJ,2040 -electricity,all-week,late-afternoon,all-year,18.10990000000,R2,7,MUS$2010/PJ,2040 +electricity,all-week,late-afternoon,all-year,18.34140000000,R1,7,MUS$2010/PJ,2040 gas,all-week,late-afternoon,all-year,0.35420000000,R1,7,MUS$2010/PJ,2040 -gas,all-week,late-afternoon,all-year,0.35420000000,R2,7,MUS$2010/PJ,2040 -heat,all-week,late-afternoon,all-year,7.42430000000,R1,7,MUS$2010/PJ,2040 -heat,all-week,late-afternoon,all-year,7.42430000000,R2,7,MUS$2010/PJ,2040 +heat,all-week,late-afternoon,all-year,7.51690000000,R1,7,MUS$2010/PJ,2040 CO2f,all-week,late-afternoon,all-year,0.27280000000,R1,7,MUS$2010/kt,2040 -CO2f,all-week,late-afternoon,all-year,0.27280000000,R2,7,MUS$2010/kt,2040 diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity.csv deleted file mode 100644 index fbce294fc..000000000 --- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity.csv +++ /dev/null @@ -1,150 +0,0 @@ -asset,capacity,installed,region,technology,year -0,1.00000000000,2020,R1,gasCCGT,2020 -3,1.00000000000,2020,R2,gasCCGT,2020 -0,3.00000000000,2020,R1,gasCCGT,2022 -2,0.27320000000,2020,R1,solarPV,2022 -3,4.00000000000,2020,R1,windturbine,2022 -4,3.00000000000,2020,R2,gasCCGT,2022 -6,4.27320000000,2020,R2,windturbine,2022 -0,3.00000000000,2020,R1,gasCCGT,2024 -1,1.85640000000,2022,R1,gasCCGT,2024 -3,0.27320000000,2020,R1,solarPV,2024 -4,4.00000000000,2020,R1,windturbine,2024 -5,3.00000000000,2020,R2,gasCCGT,2024 -6,1.85640000000,2022,R2,gasCCGT,2024 -8,4.27320000000,2020,R2,windturbine,2024 -0,2.80000000000,2020,R1,gasCCGT,2026 -1,1.85640000000,2022,R1,gasCCGT,2026 -2,2.07980000000,2024,R1,gasCCGT,2026 -4,0.27320000000,2020,R1,solarPV,2026 -5,4.00000000000,2020,R1,windturbine,2026 -6,2.80000000000,2020,R2,gasCCGT,2026 -7,1.85640000000,2022,R2,gasCCGT,2026 -8,2.07980000000,2024,R2,gasCCGT,2026 -10,4.27320000000,2020,R2,windturbine,2026 -0,2.40000000000,2020,R1,gasCCGT,2028 -1,1.85640000000,2022,R1,gasCCGT,2028 -2,2.07980000000,2024,R1,gasCCGT,2028 -3,2.29760000000,2026,R1,gasCCGT,2028 -5,0.27320000000,2020,R1,solarPV,2028 -6,4.00000000000,2020,R1,windturbine,2028 -7,2.40000000000,2020,R2,gasCCGT,2028 -8,1.85640000000,2022,R2,gasCCGT,2028 -9,2.07980000000,2024,R2,gasCCGT,2028 -10,2.29760000000,2026,R2,gasCCGT,2028 -12,4.27320000000,2020,R2,windturbine,2028 -0,2.00000000000,2020,R1,gasCCGT,2030 -1,1.85640000000,2022,R1,gasCCGT,2030 -2,2.07980000000,2024,R1,gasCCGT,2030 -3,2.29760000000,2026,R1,gasCCGT,2030 -4,2.31150000000,2028,R1,gasCCGT,2030 -6,0.27320000000,2020,R1,solarPV,2030 -7,4.00000000000,2020,R1,windturbine,2030 -8,2.00000000000,2020,R2,gasCCGT,2030 -9,1.85640000000,2022,R2,gasCCGT,2030 -10,2.07980000000,2024,R2,gasCCGT,2030 -11,2.29760000000,2026,R2,gasCCGT,2030 -12,2.31150000000,2028,R2,gasCCGT,2030 -14,4.27320000000,2020,R2,windturbine,2030 -0,2.00000000000,2020,R1,gasCCGT,2032 -1,1.85640000000,2022,R1,gasCCGT,2032 -2,2.07980000000,2024,R1,gasCCGT,2032 -3,2.29760000000,2026,R1,gasCCGT,2032 -4,2.31150000000,2028,R1,gasCCGT,2032 -5,0.99560000000,2030,R1,gasCCGT,2032 -7,0.27320000000,2020,R1,solarPV,2032 -9,4.00000000000,2020,R1,windturbine,2032 -10,2.00000000000,2020,R2,gasCCGT,2032 -11,1.85640000000,2022,R2,gasCCGT,2032 -12,2.07980000000,2024,R2,gasCCGT,2032 -13,2.29760000000,2026,R2,gasCCGT,2032 -14,2.31150000000,2028,R2,gasCCGT,2032 -15,0.99560000000,2030,R2,gasCCGT,2032 -17,4.27320000000,2020,R2,windturbine,2032 -0,2.00000000000,2020,R1,gasCCGT,2034 -1,1.85640000000,2022,R1,gasCCGT,2034 -2,2.07980000000,2024,R1,gasCCGT,2034 -3,2.29760000000,2026,R1,gasCCGT,2034 -4,2.31150000000,2028,R1,gasCCGT,2034 -5,0.99560000000,2030,R1,gasCCGT,2034 -6,0.75270000000,2032,R1,gasCCGT,2034 -7,0.27320000000,2020,R1,solarPV,2034 -8,0.54630000000,2032,R1,solarPV,2034 -10,4.00000000000,2020,R1,windturbine,2034 -12,2.00000000000,2020,R2,gasCCGT,2034 -13,1.85640000000,2022,R2,gasCCGT,2034 -14,2.07980000000,2024,R2,gasCCGT,2034 -15,2.29760000000,2026,R2,gasCCGT,2034 -16,2.31150000000,2028,R2,gasCCGT,2034 -17,0.99560000000,2030,R2,gasCCGT,2034 -18,2.24000000000,2032,R2,solarPV,2034 -20,4.27320000000,2020,R2,windturbine,2034 -0,2.00000000000,2020,R1,gasCCGT,2036 -1,1.85640000000,2022,R1,gasCCGT,2036 -2,2.07980000000,2024,R1,gasCCGT,2036 -3,2.29760000000,2026,R1,gasCCGT,2036 -4,2.31150000000,2028,R1,gasCCGT,2036 -5,0.99560000000,2030,R1,gasCCGT,2036 -6,0.75270000000,2032,R1,gasCCGT,2036 -7,0.27320000000,2020,R1,solarPV,2036 -8,0.54630000000,2032,R1,solarPV,2036 -9,1.63890000000,2034,R1,solarPV,2036 -11,4.00000000000,2020,R1,windturbine,2036 -12,0.60110000000,2034,R1,windturbine,2036 -13,2.00000000000,2020,R2,gasCCGT,2036 -14,1.85640000000,2022,R2,gasCCGT,2036 -15,2.07980000000,2024,R2,gasCCGT,2036 -16,2.29760000000,2026,R2,gasCCGT,2036 -17,2.31150000000,2028,R2,gasCCGT,2036 -18,0.99560000000,2030,R2,gasCCGT,2036 -19,2.24000000000,2032,R2,solarPV,2036 -20,2.24000000000,2034,R2,solarPV,2036 -22,4.27320000000,2020,R2,windturbine,2036 -0,2.00000000000,2020,R1,gasCCGT,2038 -1,1.85640000000,2022,R1,gasCCGT,2038 -2,2.07980000000,2024,R1,gasCCGT,2038 -3,2.29760000000,2026,R1,gasCCGT,2038 -4,2.31150000000,2028,R1,gasCCGT,2038 -5,0.99560000000,2030,R1,gasCCGT,2038 -6,0.75270000000,2032,R1,gasCCGT,2038 -7,0.27320000000,2020,R1,solarPV,2038 -8,0.54630000000,2032,R1,solarPV,2038 -9,1.63890000000,2034,R1,solarPV,2038 -10,2.24000000000,2036,R1,solarPV,2038 -12,4.00000000000,2020,R1,windturbine,2038 -13,0.60110000000,2034,R1,windturbine,2038 -14,2.00000000000,2020,R2,gasCCGT,2038 -15,1.85640000000,2022,R2,gasCCGT,2038 -16,2.07980000000,2024,R2,gasCCGT,2038 -17,2.29760000000,2026,R2,gasCCGT,2038 -18,2.31150000000,2028,R2,gasCCGT,2038 -19,0.99560000000,2030,R2,gasCCGT,2038 -20,2.24000000000,2032,R2,solarPV,2038 -21,2.24000000000,2034,R2,solarPV,2038 -22,2.24000000000,2036,R2,solarPV,2038 -24,4.27320000000,2020,R2,windturbine,2038 -0,2.00000000000,2020,R1,gasCCGT,2040 -1,1.85640000000,2022,R1,gasCCGT,2040 -2,2.07980000000,2024,R1,gasCCGT,2040 -3,2.29760000000,2026,R1,gasCCGT,2040 -4,2.31150000000,2028,R1,gasCCGT,2040 -5,0.99560000000,2030,R1,gasCCGT,2040 -6,0.75270000000,2032,R1,gasCCGT,2040 -7,0.27320000000,2020,R1,solarPV,2040 -8,0.54630000000,2032,R1,solarPV,2040 -9,1.63890000000,2034,R1,solarPV,2040 -10,2.24000000000,2036,R1,solarPV,2040 -11,2.24000000000,2038,R1,solarPV,2040 -13,4.00000000000,2020,R1,windturbine,2040 -14,0.60110000000,2034,R1,windturbine,2040 -15,2.00000000000,2020,R2,gasCCGT,2040 -16,1.85640000000,2022,R2,gasCCGT,2040 -17,2.07980000000,2024,R2,gasCCGT,2040 -18,2.29760000000,2026,R2,gasCCGT,2040 -19,2.31150000000,2028,R2,gasCCGT,2040 -20,0.99560000000,2030,R2,gasCCGT,2040 -21,2.24000000000,2032,R2,solarPV,2040 -22,2.24000000000,2034,R2,solarPV,2040 -23,2.24000000000,2036,R2,solarPV,2040 -24,2.24000000000,2038,R2,solarPV,2040 -26,4.27320000000,2020,R2,windturbine,2040 diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity.csv deleted file mode 100644 index f3c678b4c..000000000 --- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity.csv +++ /dev/null @@ -1,91 +0,0 @@ -asset,capacity,installed,region,technology,year -0,10,2020,R1,gasboiler,2020 -2,10,2020,R2,gasboiler,2020 -0,8,2020,R1,gasboiler,2022 -1,11,2020,R1,heatpump,2022 -3,8,2020,R2,gasboiler,2022 -4,11,2020,R2,heatpump,2022 -0,6,2020,R1,gasboiler,2024 -1,11,2020,R1,heatpump,2024 -2,4,2022,R1,heatpump,2024 -4,6,2020,R2,gasboiler,2024 -5,11,2020,R2,heatpump,2024 -6,4,2022,R2,heatpump,2024 -0,4,2020,R1,gasboiler,2026 -1,11,2020,R1,heatpump,2026 -2,4,2022,R1,heatpump,2026 -3,4,2024,R1,heatpump,2026 -5,4,2020,R2,gasboiler,2026 -6,11,2020,R2,heatpump,2026 -7,4,2022,R2,heatpump,2026 -8,4,2024,R2,heatpump,2026 -0,2,2020,R1,gasboiler,2028 -1,11,2020,R1,heatpump,2028 -2,4,2022,R1,heatpump,2028 -3,4,2024,R1,heatpump,2028 -4,4,2026,R1,heatpump,2028 -6,2,2020,R2,gasboiler,2028 -7,11,2020,R2,heatpump,2028 -8,4,2022,R2,heatpump,2028 -9,4,2024,R2,heatpump,2028 -10,4,2026,R2,heatpump,2028 -1,11,2020,R1,heatpump,2030 -2,4,2022,R1,heatpump,2030 -3,4,2024,R1,heatpump,2030 -4,4,2026,R1,heatpump,2030 -5,5,2028,R1,heatpump,2030 -8,11,2020,R2,heatpump,2030 -9,4,2022,R2,heatpump,2030 -10,4,2024,R2,heatpump,2030 -11,4,2026,R2,heatpump,2030 -12,5,2028,R2,heatpump,2030 -2,4,2022,R1,heatpump,2032 -3,4,2024,R1,heatpump,2032 -4,4,2026,R1,heatpump,2032 -5,5,2028,R1,heatpump,2032 -6,13,2030,R1,heatpump,2032 -10,4,2022,R2,heatpump,2032 -11,4,2024,R2,heatpump,2032 -12,4,2026,R2,heatpump,2032 -13,5,2028,R2,heatpump,2032 -14,13,2030,R2,heatpump,2032 -3,4,2024,R1,heatpump,2034 -4,4,2026,R1,heatpump,2034 -5,5,2028,R1,heatpump,2034 -6,13,2030,R1,heatpump,2034 -7,6,2032,R1,heatpump,2034 -12,4,2024,R2,heatpump,2034 -13,4,2026,R2,heatpump,2034 -14,5,2028,R2,heatpump,2034 -15,13,2030,R2,heatpump,2034 -16,6,2032,R2,heatpump,2034 -4,4,2026,R1,heatpump,2036 -5,5,2028,R1,heatpump,2036 -6,13,2030,R1,heatpump,2036 -7,6,2032,R1,heatpump,2036 -8,6,2034,R1,heatpump,2036 -14,4,2026,R2,heatpump,2036 -15,5,2028,R2,heatpump,2036 -16,13,2030,R2,heatpump,2036 -17,6,2032,R2,heatpump,2036 -18,6,2034,R2,heatpump,2036 -5,5,2028,R1,heatpump,2038 -6,13,2030,R1,heatpump,2038 -7,6,2032,R1,heatpump,2038 -8,6,2034,R1,heatpump,2038 -9,6,2036,R1,heatpump,2038 -16,5,2028,R2,heatpump,2038 -17,13,2030,R2,heatpump,2038 -18,6,2032,R2,heatpump,2038 -19,6,2034,R2,heatpump,2038 -20,6,2036,R2,heatpump,2038 -6,13,2030,R1,heatpump,2040 -7,6,2032,R1,heatpump,2040 -8,6,2034,R1,heatpump,2040 -9,6,2036,R1,heatpump,2040 -10,8,2038,R1,heatpump,2040 -18,13,2030,R2,heatpump,2040 -19,6,2032,R2,heatpump,2040 -20,6,2034,R2,heatpump,2040 -21,6,2036,R2,heatpump,2040 -22,8,2038,R2,heatpump,2040 diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply.csv deleted file mode 100644 index d968f7fb1..000000000 --- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply.csv +++ /dev/null @@ -1,1601 +0,0 @@ -asset,commodity,day,hour,installed,month,region,supply,technology,timeslice,year -0,heat,all-week,night,2020,all-year,R1,0.35000000000,gasboiler,0,2020 -2,heat,all-week,night,2020,all-year,R1,0.35000000000,gasboiler,0,2020 -0,heat,all-week,night,2020,all-year,R2,0.35000000000,gasboiler,0,2020 -2,heat,all-week,night,2020,all-year,R2,0.35000000000,gasboiler,0,2020 -0,CO2f,all-week,night,2020,all-year,R1,22.64850000000,gasboiler,0,2020 -2,CO2f,all-week,night,2020,all-year,R1,22.64850000000,gasboiler,0,2020 -0,CO2f,all-week,night,2020,all-year,R2,22.64850000000,gasboiler,0,2020 -2,CO2f,all-week,night,2020,all-year,R2,22.64850000000,gasboiler,0,2020 -0,heat,all-week,morning,2020,all-year,R1,0.50000000000,gasboiler,1,2020 -2,heat,all-week,morning,2020,all-year,R1,0.50000000000,gasboiler,1,2020 -0,heat,all-week,morning,2020,all-year,R2,0.50000000000,gasboiler,1,2020 -2,heat,all-week,morning,2020,all-year,R2,0.50000000000,gasboiler,1,2020 -0,CO2f,all-week,morning,2020,all-year,R1,32.35500000000,gasboiler,1,2020 -2,CO2f,all-week,morning,2020,all-year,R1,32.35500000000,gasboiler,1,2020 -0,CO2f,all-week,morning,2020,all-year,R2,32.35500000000,gasboiler,1,2020 -2,CO2f,all-week,morning,2020,all-year,R2,32.35500000000,gasboiler,1,2020 -0,heat,all-week,mid-afternoon,2020,all-year,R1,0.35000000000,gasboiler,2,2020 -2,heat,all-week,mid-afternoon,2020,all-year,R1,0.35000000000,gasboiler,2,2020 -0,heat,all-week,mid-afternoon,2020,all-year,R2,0.35000000000,gasboiler,2,2020 -2,heat,all-week,mid-afternoon,2020,all-year,R2,0.35000000000,gasboiler,2,2020 -0,CO2f,all-week,mid-afternoon,2020,all-year,R1,22.64850000000,gasboiler,2,2020 -2,CO2f,all-week,mid-afternoon,2020,all-year,R1,22.64850000000,gasboiler,2,2020 -0,CO2f,all-week,mid-afternoon,2020,all-year,R2,22.64850000000,gasboiler,2,2020 -2,CO2f,all-week,mid-afternoon,2020,all-year,R2,22.64850000000,gasboiler,2,2020 -0,heat,all-week,early-peak,2020,all-year,R1,0.50000000000,gasboiler,3,2020 -2,heat,all-week,early-peak,2020,all-year,R1,0.50000000000,gasboiler,3,2020 -0,heat,all-week,early-peak,2020,all-year,R2,0.50000000000,gasboiler,3,2020 -2,heat,all-week,early-peak,2020,all-year,R2,0.50000000000,gasboiler,3,2020 -0,CO2f,all-week,early-peak,2020,all-year,R1,32.35500000000,gasboiler,3,2020 -2,CO2f,all-week,early-peak,2020,all-year,R1,32.35500000000,gasboiler,3,2020 -0,CO2f,all-week,early-peak,2020,all-year,R2,32.35500000000,gasboiler,3,2020 -2,CO2f,all-week,early-peak,2020,all-year,R2,32.35500000000,gasboiler,3,2020 -0,heat,all-week,late-peak,2020,all-year,R1,1.05000000000,gasboiler,4,2020 -2,heat,all-week,late-peak,2020,all-year,R1,1.05000000000,gasboiler,4,2020 -0,heat,all-week,late-peak,2020,all-year,R2,1.05000000000,gasboiler,4,2020 -2,heat,all-week,late-peak,2020,all-year,R2,1.05000000000,gasboiler,4,2020 -0,CO2f,all-week,late-peak,2020,all-year,R1,67.94550000000,gasboiler,4,2020 -2,CO2f,all-week,late-peak,2020,all-year,R1,67.94550000000,gasboiler,4,2020 -0,CO2f,all-week,late-peak,2020,all-year,R2,67.94550000000,gasboiler,4,2020 -2,CO2f,all-week,late-peak,2020,all-year,R2,67.94550000000,gasboiler,4,2020 -0,heat,all-week,evening,2020,all-year,R1,0.70000000000,gasboiler,5,2020 -2,heat,all-week,evening,2020,all-year,R1,0.70000000000,gasboiler,5,2020 -0,heat,all-week,evening,2020,all-year,R2,0.70000000000,gasboiler,5,2020 -2,heat,all-week,evening,2020,all-year,R2,0.70000000000,gasboiler,5,2020 -0,CO2f,all-week,evening,2020,all-year,R1,45.29700000000,gasboiler,5,2020 -2,CO2f,all-week,evening,2020,all-year,R1,45.29700000000,gasboiler,5,2020 -0,CO2f,all-week,evening,2020,all-year,R2,45.29700000000,gasboiler,5,2020 -2,CO2f,all-week,evening,2020,all-year,R2,45.29700000000,gasboiler,5,2020 -0,heat,all-week,early-morning,2020,all-year,R1,0.70000000000,gasboiler,6,2020 -2,heat,all-week,early-morning,2020,all-year,R1,0.70000000000,gasboiler,6,2020 -0,heat,all-week,early-morning,2020,all-year,R2,0.70000000000,gasboiler,6,2020 -2,heat,all-week,early-morning,2020,all-year,R2,0.70000000000,gasboiler,6,2020 -0,CO2f,all-week,early-morning,2020,all-year,R1,45.29700000000,gasboiler,6,2020 -2,CO2f,all-week,early-morning,2020,all-year,R1,45.29700000000,gasboiler,6,2020 -0,CO2f,all-week,early-morning,2020,all-year,R2,45.29700000000,gasboiler,6,2020 -2,CO2f,all-week,early-morning,2020,all-year,R2,45.29700000000,gasboiler,6,2020 -0,heat,all-week,late-afternoon,2020,all-year,R1,0.70000000000,gasboiler,7,2020 -2,heat,all-week,late-afternoon,2020,all-year,R1,0.70000000000,gasboiler,7,2020 -0,heat,all-week,late-afternoon,2020,all-year,R2,0.70000000000,gasboiler,7,2020 -2,heat,all-week,late-afternoon,2020,all-year,R2,0.70000000000,gasboiler,7,2020 -0,CO2f,all-week,late-afternoon,2020,all-year,R1,45.29700000000,gasboiler,7,2020 -2,CO2f,all-week,late-afternoon,2020,all-year,R1,45.29700000000,gasboiler,7,2020 -0,CO2f,all-week,late-afternoon,2020,all-year,R2,45.29700000000,gasboiler,7,2020 -2,CO2f,all-week,late-afternoon,2020,all-year,R2,45.29700000000,gasboiler,7,2020 -0,heat,all-week,night,2020,all-year,R1,0.16700000000,gasboiler,0,2022 -1,heat,all-week,night,2020,all-year,R1,0.22960000000,heatpump,0,2022 -3,heat,all-week,night,2020,all-year,R1,0.16700000000,gasboiler,0,2022 -4,heat,all-week,night,2020,all-year,R1,0.22960000000,heatpump,0,2022 -0,heat,all-week,night,2020,all-year,R2,0.16700000000,gasboiler,0,2022 -1,heat,all-week,night,2020,all-year,R2,0.22960000000,heatpump,0,2022 -3,heat,all-week,night,2020,all-year,R2,0.16700000000,gasboiler,0,2022 -4,heat,all-week,night,2020,all-year,R2,0.22960000000,heatpump,0,2022 -0,CO2f,all-week,night,2020,all-year,R1,10.80770000000,gasboiler,0,2022 -3,CO2f,all-week,night,2020,all-year,R1,10.80770000000,gasboiler,0,2022 -0,CO2f,all-week,night,2020,all-year,R2,10.80770000000,gasboiler,0,2022 -3,CO2f,all-week,night,2020,all-year,R2,10.80770000000,gasboiler,0,2022 -0,heat,all-week,morning,2020,all-year,R1,0.23860000000,gasboiler,1,2022 -1,heat,all-week,morning,2020,all-year,R1,0.32810000000,heatpump,1,2022 -3,heat,all-week,morning,2020,all-year,R1,0.23860000000,gasboiler,1,2022 -4,heat,all-week,morning,2020,all-year,R1,0.32810000000,heatpump,1,2022 -0,heat,all-week,morning,2020,all-year,R2,0.23860000000,gasboiler,1,2022 -1,heat,all-week,morning,2020,all-year,R2,0.32810000000,heatpump,1,2022 -3,heat,all-week,morning,2020,all-year,R2,0.23860000000,gasboiler,1,2022 -4,heat,all-week,morning,2020,all-year,R2,0.32810000000,heatpump,1,2022 -0,CO2f,all-week,morning,2020,all-year,R1,15.43960000000,gasboiler,1,2022 -3,CO2f,all-week,morning,2020,all-year,R1,15.43960000000,gasboiler,1,2022 -0,CO2f,all-week,morning,2020,all-year,R2,15.43960000000,gasboiler,1,2022 -3,CO2f,all-week,morning,2020,all-year,R2,15.43960000000,gasboiler,1,2022 -0,heat,all-week,mid-afternoon,2020,all-year,R1,0.16700000000,gasboiler,2,2022 -1,heat,all-week,mid-afternoon,2020,all-year,R1,0.22960000000,heatpump,2,2022 -3,heat,all-week,mid-afternoon,2020,all-year,R1,0.16700000000,gasboiler,2,2022 -4,heat,all-week,mid-afternoon,2020,all-year,R1,0.22960000000,heatpump,2,2022 -0,heat,all-week,mid-afternoon,2020,all-year,R2,0.16700000000,gasboiler,2,2022 -1,heat,all-week,mid-afternoon,2020,all-year,R2,0.22960000000,heatpump,2,2022 -3,heat,all-week,mid-afternoon,2020,all-year,R2,0.16700000000,gasboiler,2,2022 -4,heat,all-week,mid-afternoon,2020,all-year,R2,0.22960000000,heatpump,2,2022 -0,CO2f,all-week,mid-afternoon,2020,all-year,R1,10.80770000000,gasboiler,2,2022 -3,CO2f,all-week,mid-afternoon,2020,all-year,R1,10.80770000000,gasboiler,2,2022 -0,CO2f,all-week,mid-afternoon,2020,all-year,R2,10.80770000000,gasboiler,2,2022 -3,CO2f,all-week,mid-afternoon,2020,all-year,R2,10.80770000000,gasboiler,2,2022 -0,heat,all-week,early-peak,2020,all-year,R1,0.23860000000,gasboiler,3,2022 -1,heat,all-week,early-peak,2020,all-year,R1,0.32810000000,heatpump,3,2022 -3,heat,all-week,early-peak,2020,all-year,R1,0.23860000000,gasboiler,3,2022 -4,heat,all-week,early-peak,2020,all-year,R1,0.32810000000,heatpump,3,2022 -0,heat,all-week,early-peak,2020,all-year,R2,0.23860000000,gasboiler,3,2022 -1,heat,all-week,early-peak,2020,all-year,R2,0.32810000000,heatpump,3,2022 -3,heat,all-week,early-peak,2020,all-year,R2,0.23860000000,gasboiler,3,2022 -4,heat,all-week,early-peak,2020,all-year,R2,0.32810000000,heatpump,3,2022 -0,CO2f,all-week,early-peak,2020,all-year,R1,15.43960000000,gasboiler,3,2022 -3,CO2f,all-week,early-peak,2020,all-year,R1,15.43960000000,gasboiler,3,2022 -0,CO2f,all-week,early-peak,2020,all-year,R2,15.43960000000,gasboiler,3,2022 -3,CO2f,all-week,early-peak,2020,all-year,R2,15.43960000000,gasboiler,3,2022 -0,heat,all-week,late-peak,2020,all-year,R1,0.50110000000,gasboiler,4,2022 -1,heat,all-week,late-peak,2020,all-year,R1,0.68890000000,heatpump,4,2022 -3,heat,all-week,late-peak,2020,all-year,R1,0.50110000000,gasboiler,4,2022 -4,heat,all-week,late-peak,2020,all-year,R1,0.68890000000,heatpump,4,2022 -0,heat,all-week,late-peak,2020,all-year,R2,0.50110000000,gasboiler,4,2022 -1,heat,all-week,late-peak,2020,all-year,R2,0.68890000000,heatpump,4,2022 -3,heat,all-week,late-peak,2020,all-year,R2,0.50110000000,gasboiler,4,2022 -4,heat,all-week,late-peak,2020,all-year,R2,0.68890000000,heatpump,4,2022 -0,CO2f,all-week,late-peak,2020,all-year,R1,32.42310000000,gasboiler,4,2022 -3,CO2f,all-week,late-peak,2020,all-year,R1,32.42310000000,gasboiler,4,2022 -0,CO2f,all-week,late-peak,2020,all-year,R2,32.42310000000,gasboiler,4,2022 -3,CO2f,all-week,late-peak,2020,all-year,R2,32.42310000000,gasboiler,4,2022 -0,heat,all-week,evening,2020,all-year,R1,0.33400000000,gasboiler,5,2022 -1,heat,all-week,evening,2020,all-year,R1,0.45930000000,heatpump,5,2022 -3,heat,all-week,evening,2020,all-year,R1,0.33400000000,gasboiler,5,2022 -4,heat,all-week,evening,2020,all-year,R1,0.45930000000,heatpump,5,2022 -0,heat,all-week,evening,2020,all-year,R2,0.33400000000,gasboiler,5,2022 -1,heat,all-week,evening,2020,all-year,R2,0.45930000000,heatpump,5,2022 -3,heat,all-week,evening,2020,all-year,R2,0.33400000000,gasboiler,5,2022 -4,heat,all-week,evening,2020,all-year,R2,0.45930000000,heatpump,5,2022 -0,CO2f,all-week,evening,2020,all-year,R1,21.61540000000,gasboiler,5,2022 -3,CO2f,all-week,evening,2020,all-year,R1,21.61540000000,gasboiler,5,2022 -0,CO2f,all-week,evening,2020,all-year,R2,21.61540000000,gasboiler,5,2022 -3,CO2f,all-week,evening,2020,all-year,R2,21.61540000000,gasboiler,5,2022 -0,heat,all-week,early-morning,2020,all-year,R1,0.33400000000,gasboiler,6,2022 -1,heat,all-week,early-morning,2020,all-year,R1,0.45930000000,heatpump,6,2022 -3,heat,all-week,early-morning,2020,all-year,R1,0.33400000000,gasboiler,6,2022 -4,heat,all-week,early-morning,2020,all-year,R1,0.45930000000,heatpump,6,2022 -0,heat,all-week,early-morning,2020,all-year,R2,0.33400000000,gasboiler,6,2022 -1,heat,all-week,early-morning,2020,all-year,R2,0.45930000000,heatpump,6,2022 -3,heat,all-week,early-morning,2020,all-year,R2,0.33400000000,gasboiler,6,2022 -4,heat,all-week,early-morning,2020,all-year,R2,0.45930000000,heatpump,6,2022 -0,CO2f,all-week,early-morning,2020,all-year,R1,21.61540000000,gasboiler,6,2022 -3,CO2f,all-week,early-morning,2020,all-year,R1,21.61540000000,gasboiler,6,2022 -0,CO2f,all-week,early-morning,2020,all-year,R2,21.61540000000,gasboiler,6,2022 -3,CO2f,all-week,early-morning,2020,all-year,R2,21.61540000000,gasboiler,6,2022 -0,heat,all-week,late-afternoon,2020,all-year,R1,0.33400000000,gasboiler,7,2022 -1,heat,all-week,late-afternoon,2020,all-year,R1,0.45930000000,heatpump,7,2022 -3,heat,all-week,late-afternoon,2020,all-year,R1,0.33400000000,gasboiler,7,2022 -4,heat,all-week,late-afternoon,2020,all-year,R1,0.45930000000,heatpump,7,2022 -0,heat,all-week,late-afternoon,2020,all-year,R2,0.33400000000,gasboiler,7,2022 -1,heat,all-week,late-afternoon,2020,all-year,R2,0.45930000000,heatpump,7,2022 -3,heat,all-week,late-afternoon,2020,all-year,R2,0.33400000000,gasboiler,7,2022 -4,heat,all-week,late-afternoon,2020,all-year,R2,0.45930000000,heatpump,7,2022 -0,CO2f,all-week,late-afternoon,2020,all-year,R1,21.61540000000,gasboiler,7,2022 -3,CO2f,all-week,late-afternoon,2020,all-year,R1,21.61540000000,gasboiler,7,2022 -0,CO2f,all-week,late-afternoon,2020,all-year,R2,21.61540000000,gasboiler,7,2022 -3,CO2f,all-week,late-afternoon,2020,all-year,R2,21.61540000000,gasboiler,7,2022 -0,heat,all-week,night,2020,all-year,R1,0.12670000000,gasboiler,0,2024 -1,heat,all-week,night,2020,all-year,R1,0.23220000000,heatpump,0,2024 -2,heat,all-week,night,2022,all-year,R1,0.08440000000,heatpump,0,2024 -4,heat,all-week,night,2020,all-year,R1,0.12670000000,gasboiler,0,2024 -5,heat,all-week,night,2020,all-year,R1,0.23220000000,heatpump,0,2024 -6,heat,all-week,night,2022,all-year,R1,0.08440000000,heatpump,0,2024 -0,heat,all-week,night,2020,all-year,R2,0.12670000000,gasboiler,0,2024 -1,heat,all-week,night,2020,all-year,R2,0.23220000000,heatpump,0,2024 -2,heat,all-week,night,2022,all-year,R2,0.08440000000,heatpump,0,2024 -4,heat,all-week,night,2020,all-year,R2,0.12670000000,gasboiler,0,2024 -5,heat,all-week,night,2020,all-year,R2,0.23220000000,heatpump,0,2024 -6,heat,all-week,night,2022,all-year,R2,0.08440000000,heatpump,0,2024 -0,CO2f,all-week,night,2020,all-year,R1,8.19660000000,gasboiler,0,2024 -4,CO2f,all-week,night,2020,all-year,R1,8.19660000000,gasboiler,0,2024 -0,CO2f,all-week,night,2020,all-year,R2,8.19660000000,gasboiler,0,2024 -4,CO2f,all-week,night,2020,all-year,R2,8.19660000000,gasboiler,0,2024 -0,heat,all-week,morning,2020,all-year,R1,0.18100000000,gasboiler,1,2024 -1,heat,all-week,morning,2020,all-year,R1,0.33170000000,heatpump,1,2024 -2,heat,all-week,morning,2022,all-year,R1,0.12060000000,heatpump,1,2024 -4,heat,all-week,morning,2020,all-year,R1,0.18100000000,gasboiler,1,2024 -5,heat,all-week,morning,2020,all-year,R1,0.33170000000,heatpump,1,2024 -6,heat,all-week,morning,2022,all-year,R1,0.12060000000,heatpump,1,2024 -0,heat,all-week,morning,2020,all-year,R2,0.18100000000,gasboiler,1,2024 -1,heat,all-week,morning,2020,all-year,R2,0.33170000000,heatpump,1,2024 -2,heat,all-week,morning,2022,all-year,R2,0.12060000000,heatpump,1,2024 -4,heat,all-week,morning,2020,all-year,R2,0.18100000000,gasboiler,1,2024 -5,heat,all-week,morning,2020,all-year,R2,0.33170000000,heatpump,1,2024 -6,heat,all-week,morning,2022,all-year,R2,0.12060000000,heatpump,1,2024 -0,CO2f,all-week,morning,2020,all-year,R1,11.70940000000,gasboiler,1,2024 -4,CO2f,all-week,morning,2020,all-year,R1,11.70940000000,gasboiler,1,2024 -0,CO2f,all-week,morning,2020,all-year,R2,11.70940000000,gasboiler,1,2024 -4,CO2f,all-week,morning,2020,all-year,R2,11.70940000000,gasboiler,1,2024 -0,heat,all-week,mid-afternoon,2020,all-year,R1,0.12670000000,gasboiler,2,2024 -1,heat,all-week,mid-afternoon,2020,all-year,R1,0.23220000000,heatpump,2,2024 -2,heat,all-week,mid-afternoon,2022,all-year,R1,0.08440000000,heatpump,2,2024 -4,heat,all-week,mid-afternoon,2020,all-year,R1,0.12670000000,gasboiler,2,2024 -5,heat,all-week,mid-afternoon,2020,all-year,R1,0.23220000000,heatpump,2,2024 -6,heat,all-week,mid-afternoon,2022,all-year,R1,0.08440000000,heatpump,2,2024 -0,heat,all-week,mid-afternoon,2020,all-year,R2,0.12670000000,gasboiler,2,2024 -1,heat,all-week,mid-afternoon,2020,all-year,R2,0.23220000000,heatpump,2,2024 -2,heat,all-week,mid-afternoon,2022,all-year,R2,0.08440000000,heatpump,2,2024 -4,heat,all-week,mid-afternoon,2020,all-year,R2,0.12670000000,gasboiler,2,2024 -5,heat,all-week,mid-afternoon,2020,all-year,R2,0.23220000000,heatpump,2,2024 -6,heat,all-week,mid-afternoon,2022,all-year,R2,0.08440000000,heatpump,2,2024 -0,CO2f,all-week,mid-afternoon,2020,all-year,R1,8.19660000000,gasboiler,2,2024 -4,CO2f,all-week,mid-afternoon,2020,all-year,R1,8.19660000000,gasboiler,2,2024 -0,CO2f,all-week,mid-afternoon,2020,all-year,R2,8.19660000000,gasboiler,2,2024 -4,CO2f,all-week,mid-afternoon,2020,all-year,R2,8.19660000000,gasboiler,2,2024 -0,heat,all-week,early-peak,2020,all-year,R1,0.18100000000,gasboiler,3,2024 -1,heat,all-week,early-peak,2020,all-year,R1,0.33170000000,heatpump,3,2024 -2,heat,all-week,early-peak,2022,all-year,R1,0.12060000000,heatpump,3,2024 -4,heat,all-week,early-peak,2020,all-year,R1,0.18100000000,gasboiler,3,2024 -5,heat,all-week,early-peak,2020,all-year,R1,0.33170000000,heatpump,3,2024 -6,heat,all-week,early-peak,2022,all-year,R1,0.12060000000,heatpump,3,2024 -0,heat,all-week,early-peak,2020,all-year,R2,0.18100000000,gasboiler,3,2024 -1,heat,all-week,early-peak,2020,all-year,R2,0.33170000000,heatpump,3,2024 -2,heat,all-week,early-peak,2022,all-year,R2,0.12060000000,heatpump,3,2024 -4,heat,all-week,early-peak,2020,all-year,R2,0.18100000000,gasboiler,3,2024 -5,heat,all-week,early-peak,2020,all-year,R2,0.33170000000,heatpump,3,2024 -6,heat,all-week,early-peak,2022,all-year,R2,0.12060000000,heatpump,3,2024 -0,CO2f,all-week,early-peak,2020,all-year,R1,11.70940000000,gasboiler,3,2024 -4,CO2f,all-week,early-peak,2020,all-year,R1,11.70940000000,gasboiler,3,2024 -0,CO2f,all-week,early-peak,2020,all-year,R2,11.70940000000,gasboiler,3,2024 -4,CO2f,all-week,early-peak,2020,all-year,R2,11.70940000000,gasboiler,3,2024 -0,heat,all-week,late-peak,2020,all-year,R1,0.38000000000,gasboiler,4,2024 -1,heat,all-week,late-peak,2020,all-year,R1,0.69670000000,heatpump,4,2024 -2,heat,all-week,late-peak,2022,all-year,R1,0.25330000000,heatpump,4,2024 -4,heat,all-week,late-peak,2020,all-year,R1,0.38000000000,gasboiler,4,2024 -5,heat,all-week,late-peak,2020,all-year,R1,0.69670000000,heatpump,4,2024 -6,heat,all-week,late-peak,2022,all-year,R1,0.25330000000,heatpump,4,2024 -0,heat,all-week,late-peak,2020,all-year,R2,0.38000000000,gasboiler,4,2024 -1,heat,all-week,late-peak,2020,all-year,R2,0.69670000000,heatpump,4,2024 -2,heat,all-week,late-peak,2022,all-year,R2,0.25330000000,heatpump,4,2024 -4,heat,all-week,late-peak,2020,all-year,R2,0.38000000000,gasboiler,4,2024 -5,heat,all-week,late-peak,2020,all-year,R2,0.69670000000,heatpump,4,2024 -6,heat,all-week,late-peak,2022,all-year,R2,0.25330000000,heatpump,4,2024 -0,CO2f,all-week,late-peak,2020,all-year,R1,24.58980000000,gasboiler,4,2024 -4,CO2f,all-week,late-peak,2020,all-year,R1,24.58980000000,gasboiler,4,2024 -0,CO2f,all-week,late-peak,2020,all-year,R2,24.58980000000,gasboiler,4,2024 -4,CO2f,all-week,late-peak,2020,all-year,R2,24.58980000000,gasboiler,4,2024 -0,heat,all-week,evening,2020,all-year,R1,0.25330000000,gasboiler,5,2024 -1,heat,all-week,evening,2020,all-year,R1,0.46440000000,heatpump,5,2024 -2,heat,all-week,evening,2022,all-year,R1,0.16890000000,heatpump,5,2024 -4,heat,all-week,evening,2020,all-year,R1,0.25330000000,gasboiler,5,2024 -5,heat,all-week,evening,2020,all-year,R1,0.46440000000,heatpump,5,2024 -6,heat,all-week,evening,2022,all-year,R1,0.16890000000,heatpump,5,2024 -0,heat,all-week,evening,2020,all-year,R2,0.25330000000,gasboiler,5,2024 -1,heat,all-week,evening,2020,all-year,R2,0.46440000000,heatpump,5,2024 -2,heat,all-week,evening,2022,all-year,R2,0.16890000000,heatpump,5,2024 -4,heat,all-week,evening,2020,all-year,R2,0.25330000000,gasboiler,5,2024 -5,heat,all-week,evening,2020,all-year,R2,0.46440000000,heatpump,5,2024 -6,heat,all-week,evening,2022,all-year,R2,0.16890000000,heatpump,5,2024 -0,CO2f,all-week,evening,2020,all-year,R1,16.39320000000,gasboiler,5,2024 -4,CO2f,all-week,evening,2020,all-year,R1,16.39320000000,gasboiler,5,2024 -0,CO2f,all-week,evening,2020,all-year,R2,16.39320000000,gasboiler,5,2024 -4,CO2f,all-week,evening,2020,all-year,R2,16.39320000000,gasboiler,5,2024 -0,heat,all-week,early-morning,2020,all-year,R1,0.25330000000,gasboiler,6,2024 -1,heat,all-week,early-morning,2020,all-year,R1,0.46440000000,heatpump,6,2024 -2,heat,all-week,early-morning,2022,all-year,R1,0.16890000000,heatpump,6,2024 -4,heat,all-week,early-morning,2020,all-year,R1,0.25330000000,gasboiler,6,2024 -5,heat,all-week,early-morning,2020,all-year,R1,0.46440000000,heatpump,6,2024 -6,heat,all-week,early-morning,2022,all-year,R1,0.16890000000,heatpump,6,2024 -0,heat,all-week,early-morning,2020,all-year,R2,0.25330000000,gasboiler,6,2024 -1,heat,all-week,early-morning,2020,all-year,R2,0.46440000000,heatpump,6,2024 -2,heat,all-week,early-morning,2022,all-year,R2,0.16890000000,heatpump,6,2024 -4,heat,all-week,early-morning,2020,all-year,R2,0.25330000000,gasboiler,6,2024 -5,heat,all-week,early-morning,2020,all-year,R2,0.46440000000,heatpump,6,2024 -6,heat,all-week,early-morning,2022,all-year,R2,0.16890000000,heatpump,6,2024 -0,CO2f,all-week,early-morning,2020,all-year,R1,16.39320000000,gasboiler,6,2024 -4,CO2f,all-week,early-morning,2020,all-year,R1,16.39320000000,gasboiler,6,2024 -0,CO2f,all-week,early-morning,2020,all-year,R2,16.39320000000,gasboiler,6,2024 -4,CO2f,all-week,early-morning,2020,all-year,R2,16.39320000000,gasboiler,6,2024 -0,heat,all-week,late-afternoon,2020,all-year,R1,0.25330000000,gasboiler,7,2024 -1,heat,all-week,late-afternoon,2020,all-year,R1,0.46440000000,heatpump,7,2024 -2,heat,all-week,late-afternoon,2022,all-year,R1,0.16890000000,heatpump,7,2024 -4,heat,all-week,late-afternoon,2020,all-year,R1,0.25330000000,gasboiler,7,2024 -5,heat,all-week,late-afternoon,2020,all-year,R1,0.46440000000,heatpump,7,2024 -6,heat,all-week,late-afternoon,2022,all-year,R1,0.16890000000,heatpump,7,2024 -0,heat,all-week,late-afternoon,2020,all-year,R2,0.25330000000,gasboiler,7,2024 -1,heat,all-week,late-afternoon,2020,all-year,R2,0.46440000000,heatpump,7,2024 -2,heat,all-week,late-afternoon,2022,all-year,R2,0.16890000000,heatpump,7,2024 -4,heat,all-week,late-afternoon,2020,all-year,R2,0.25330000000,gasboiler,7,2024 -5,heat,all-week,late-afternoon,2020,all-year,R2,0.46440000000,heatpump,7,2024 -6,heat,all-week,late-afternoon,2022,all-year,R2,0.16890000000,heatpump,7,2024 -0,CO2f,all-week,late-afternoon,2020,all-year,R1,16.39320000000,gasboiler,7,2024 -4,CO2f,all-week,late-afternoon,2020,all-year,R1,16.39320000000,gasboiler,7,2024 -0,CO2f,all-week,late-afternoon,2020,all-year,R2,16.39320000000,gasboiler,7,2024 -4,CO2f,all-week,late-afternoon,2020,all-year,R2,16.39320000000,gasboiler,7,2024 -0,heat,all-week,night,2020,all-year,R1,0.08520000000,gasboiler,0,2026 -1,heat,all-week,night,2020,all-year,R1,0.23430000000,heatpump,0,2026 -2,heat,all-week,night,2022,all-year,R1,0.08520000000,heatpump,0,2026 -3,heat,all-week,night,2024,all-year,R1,0.08520000000,heatpump,0,2026 -5,heat,all-week,night,2020,all-year,R1,0.08520000000,gasboiler,0,2026 -6,heat,all-week,night,2020,all-year,R1,0.23430000000,heatpump,0,2026 -7,heat,all-week,night,2022,all-year,R1,0.08520000000,heatpump,0,2026 -8,heat,all-week,night,2024,all-year,R1,0.08520000000,heatpump,0,2026 -0,heat,all-week,night,2020,all-year,R2,0.08520000000,gasboiler,0,2026 -1,heat,all-week,night,2020,all-year,R2,0.23430000000,heatpump,0,2026 -2,heat,all-week,night,2022,all-year,R2,0.08520000000,heatpump,0,2026 -3,heat,all-week,night,2024,all-year,R2,0.08520000000,heatpump,0,2026 -5,heat,all-week,night,2020,all-year,R2,0.08520000000,gasboiler,0,2026 -6,heat,all-week,night,2020,all-year,R2,0.23430000000,heatpump,0,2026 -7,heat,all-week,night,2022,all-year,R2,0.08520000000,heatpump,0,2026 -8,heat,all-week,night,2024,all-year,R2,0.08520000000,heatpump,0,2026 -0,CO2f,all-week,night,2020,all-year,R1,5.51440000000,gasboiler,0,2026 -5,CO2f,all-week,night,2020,all-year,R1,5.51440000000,gasboiler,0,2026 -0,CO2f,all-week,night,2020,all-year,R2,5.51440000000,gasboiler,0,2026 -5,CO2f,all-week,night,2020,all-year,R2,5.51440000000,gasboiler,0,2026 -0,heat,all-week,morning,2020,all-year,R1,0.12170000000,gasboiler,1,2026 -1,heat,all-week,morning,2020,all-year,R1,0.33480000000,heatpump,1,2026 -2,heat,all-week,morning,2022,all-year,R1,0.12170000000,heatpump,1,2026 -3,heat,all-week,morning,2024,all-year,R1,0.12170000000,heatpump,1,2026 -5,heat,all-week,morning,2020,all-year,R1,0.12170000000,gasboiler,1,2026 -6,heat,all-week,morning,2020,all-year,R1,0.33480000000,heatpump,1,2026 -7,heat,all-week,morning,2022,all-year,R1,0.12170000000,heatpump,1,2026 -8,heat,all-week,morning,2024,all-year,R1,0.12170000000,heatpump,1,2026 -0,heat,all-week,morning,2020,all-year,R2,0.12170000000,gasboiler,1,2026 -1,heat,all-week,morning,2020,all-year,R2,0.33480000000,heatpump,1,2026 -2,heat,all-week,morning,2022,all-year,R2,0.12170000000,heatpump,1,2026 -3,heat,all-week,morning,2024,all-year,R2,0.12170000000,heatpump,1,2026 -5,heat,all-week,morning,2020,all-year,R2,0.12170000000,gasboiler,1,2026 -6,heat,all-week,morning,2020,all-year,R2,0.33480000000,heatpump,1,2026 -7,heat,all-week,morning,2022,all-year,R2,0.12170000000,heatpump,1,2026 -8,heat,all-week,morning,2024,all-year,R2,0.12170000000,heatpump,1,2026 -0,CO2f,all-week,morning,2020,all-year,R1,7.87770000000,gasboiler,1,2026 -5,CO2f,all-week,morning,2020,all-year,R1,7.87770000000,gasboiler,1,2026 -0,CO2f,all-week,morning,2020,all-year,R2,7.87770000000,gasboiler,1,2026 -5,CO2f,all-week,morning,2020,all-year,R2,7.87770000000,gasboiler,1,2026 -0,heat,all-week,mid-afternoon,2020,all-year,R1,0.08520000000,gasboiler,2,2026 -1,heat,all-week,mid-afternoon,2020,all-year,R1,0.23430000000,heatpump,2,2026 -2,heat,all-week,mid-afternoon,2022,all-year,R1,0.08520000000,heatpump,2,2026 -3,heat,all-week,mid-afternoon,2024,all-year,R1,0.08520000000,heatpump,2,2026 -5,heat,all-week,mid-afternoon,2020,all-year,R1,0.08520000000,gasboiler,2,2026 -6,heat,all-week,mid-afternoon,2020,all-year,R1,0.23430000000,heatpump,2,2026 -7,heat,all-week,mid-afternoon,2022,all-year,R1,0.08520000000,heatpump,2,2026 -8,heat,all-week,mid-afternoon,2024,all-year,R1,0.08520000000,heatpump,2,2026 -0,heat,all-week,mid-afternoon,2020,all-year,R2,0.08520000000,gasboiler,2,2026 -1,heat,all-week,mid-afternoon,2020,all-year,R2,0.23430000000,heatpump,2,2026 -2,heat,all-week,mid-afternoon,2022,all-year,R2,0.08520000000,heatpump,2,2026 -3,heat,all-week,mid-afternoon,2024,all-year,R2,0.08520000000,heatpump,2,2026 -5,heat,all-week,mid-afternoon,2020,all-year,R2,0.08520000000,gasboiler,2,2026 -6,heat,all-week,mid-afternoon,2020,all-year,R2,0.23430000000,heatpump,2,2026 -7,heat,all-week,mid-afternoon,2022,all-year,R2,0.08520000000,heatpump,2,2026 -8,heat,all-week,mid-afternoon,2024,all-year,R2,0.08520000000,heatpump,2,2026 -0,CO2f,all-week,mid-afternoon,2020,all-year,R1,5.51440000000,gasboiler,2,2026 -5,CO2f,all-week,mid-afternoon,2020,all-year,R1,5.51440000000,gasboiler,2,2026 -0,CO2f,all-week,mid-afternoon,2020,all-year,R2,5.51440000000,gasboiler,2,2026 -5,CO2f,all-week,mid-afternoon,2020,all-year,R2,5.51440000000,gasboiler,2,2026 -0,heat,all-week,early-peak,2020,all-year,R1,0.12170000000,gasboiler,3,2026 -1,heat,all-week,early-peak,2020,all-year,R1,0.33480000000,heatpump,3,2026 -2,heat,all-week,early-peak,2022,all-year,R1,0.12170000000,heatpump,3,2026 -3,heat,all-week,early-peak,2024,all-year,R1,0.12170000000,heatpump,3,2026 -5,heat,all-week,early-peak,2020,all-year,R1,0.12170000000,gasboiler,3,2026 -6,heat,all-week,early-peak,2020,all-year,R1,0.33480000000,heatpump,3,2026 -7,heat,all-week,early-peak,2022,all-year,R1,0.12170000000,heatpump,3,2026 -8,heat,all-week,early-peak,2024,all-year,R1,0.12170000000,heatpump,3,2026 -0,heat,all-week,early-peak,2020,all-year,R2,0.12170000000,gasboiler,3,2026 -1,heat,all-week,early-peak,2020,all-year,R2,0.33480000000,heatpump,3,2026 -2,heat,all-week,early-peak,2022,all-year,R2,0.12170000000,heatpump,3,2026 -3,heat,all-week,early-peak,2024,all-year,R2,0.12170000000,heatpump,3,2026 -5,heat,all-week,early-peak,2020,all-year,R2,0.12170000000,gasboiler,3,2026 -6,heat,all-week,early-peak,2020,all-year,R2,0.33480000000,heatpump,3,2026 -7,heat,all-week,early-peak,2022,all-year,R2,0.12170000000,heatpump,3,2026 -8,heat,all-week,early-peak,2024,all-year,R2,0.12170000000,heatpump,3,2026 -0,CO2f,all-week,early-peak,2020,all-year,R1,7.87770000000,gasboiler,3,2026 -5,CO2f,all-week,early-peak,2020,all-year,R1,7.87770000000,gasboiler,3,2026 -0,CO2f,all-week,early-peak,2020,all-year,R2,7.87770000000,gasboiler,3,2026 -5,CO2f,all-week,early-peak,2020,all-year,R2,7.87770000000,gasboiler,3,2026 -0,heat,all-week,late-peak,2020,all-year,R1,0.25570000000,gasboiler,4,2026 -1,heat,all-week,late-peak,2020,all-year,R1,0.70300000000,heatpump,4,2026 -2,heat,all-week,late-peak,2022,all-year,R1,0.25570000000,heatpump,4,2026 -3,heat,all-week,late-peak,2024,all-year,R1,0.25570000000,heatpump,4,2026 -5,heat,all-week,late-peak,2020,all-year,R1,0.25570000000,gasboiler,4,2026 -6,heat,all-week,late-peak,2020,all-year,R1,0.70300000000,heatpump,4,2026 -7,heat,all-week,late-peak,2022,all-year,R1,0.25570000000,heatpump,4,2026 -8,heat,all-week,late-peak,2024,all-year,R1,0.25570000000,heatpump,4,2026 -0,heat,all-week,late-peak,2020,all-year,R2,0.25570000000,gasboiler,4,2026 -1,heat,all-week,late-peak,2020,all-year,R2,0.70300000000,heatpump,4,2026 -2,heat,all-week,late-peak,2022,all-year,R2,0.25570000000,heatpump,4,2026 -3,heat,all-week,late-peak,2024,all-year,R2,0.25570000000,heatpump,4,2026 -5,heat,all-week,late-peak,2020,all-year,R2,0.25570000000,gasboiler,4,2026 -6,heat,all-week,late-peak,2020,all-year,R2,0.70300000000,heatpump,4,2026 -7,heat,all-week,late-peak,2022,all-year,R2,0.25570000000,heatpump,4,2026 -8,heat,all-week,late-peak,2024,all-year,R2,0.25570000000,heatpump,4,2026 -0,CO2f,all-week,late-peak,2020,all-year,R1,16.54330000000,gasboiler,4,2026 -5,CO2f,all-week,late-peak,2020,all-year,R1,16.54330000000,gasboiler,4,2026 -0,CO2f,all-week,late-peak,2020,all-year,R2,16.54330000000,gasboiler,4,2026 -5,CO2f,all-week,late-peak,2020,all-year,R2,16.54330000000,gasboiler,4,2026 -0,heat,all-week,evening,2020,all-year,R1,0.17040000000,gasboiler,5,2026 -1,heat,all-week,evening,2020,all-year,R1,0.46870000000,heatpump,5,2026 -2,heat,all-week,evening,2022,all-year,R1,0.17040000000,heatpump,5,2026 -3,heat,all-week,evening,2024,all-year,R1,0.17040000000,heatpump,5,2026 -5,heat,all-week,evening,2020,all-year,R1,0.17040000000,gasboiler,5,2026 -6,heat,all-week,evening,2020,all-year,R1,0.46870000000,heatpump,5,2026 -7,heat,all-week,evening,2022,all-year,R1,0.17040000000,heatpump,5,2026 -8,heat,all-week,evening,2024,all-year,R1,0.17040000000,heatpump,5,2026 -0,heat,all-week,evening,2020,all-year,R2,0.17040000000,gasboiler,5,2026 -1,heat,all-week,evening,2020,all-year,R2,0.46870000000,heatpump,5,2026 -2,heat,all-week,evening,2022,all-year,R2,0.17040000000,heatpump,5,2026 -3,heat,all-week,evening,2024,all-year,R2,0.17040000000,heatpump,5,2026 -5,heat,all-week,evening,2020,all-year,R2,0.17040000000,gasboiler,5,2026 -6,heat,all-week,evening,2020,all-year,R2,0.46870000000,heatpump,5,2026 -7,heat,all-week,evening,2022,all-year,R2,0.17040000000,heatpump,5,2026 -8,heat,all-week,evening,2024,all-year,R2,0.17040000000,heatpump,5,2026 -0,CO2f,all-week,evening,2020,all-year,R1,11.02880000000,gasboiler,5,2026 -5,CO2f,all-week,evening,2020,all-year,R1,11.02880000000,gasboiler,5,2026 -0,CO2f,all-week,evening,2020,all-year,R2,11.02880000000,gasboiler,5,2026 -5,CO2f,all-week,evening,2020,all-year,R2,11.02880000000,gasboiler,5,2026 -0,heat,all-week,early-morning,2020,all-year,R1,0.17040000000,gasboiler,6,2026 -1,heat,all-week,early-morning,2020,all-year,R1,0.46870000000,heatpump,6,2026 -2,heat,all-week,early-morning,2022,all-year,R1,0.17040000000,heatpump,6,2026 -3,heat,all-week,early-morning,2024,all-year,R1,0.17040000000,heatpump,6,2026 -5,heat,all-week,early-morning,2020,all-year,R1,0.17040000000,gasboiler,6,2026 -6,heat,all-week,early-morning,2020,all-year,R1,0.46870000000,heatpump,6,2026 -7,heat,all-week,early-morning,2022,all-year,R1,0.17040000000,heatpump,6,2026 -8,heat,all-week,early-morning,2024,all-year,R1,0.17040000000,heatpump,6,2026 -0,heat,all-week,early-morning,2020,all-year,R2,0.17040000000,gasboiler,6,2026 -1,heat,all-week,early-morning,2020,all-year,R2,0.46870000000,heatpump,6,2026 -2,heat,all-week,early-morning,2022,all-year,R2,0.17040000000,heatpump,6,2026 -3,heat,all-week,early-morning,2024,all-year,R2,0.17040000000,heatpump,6,2026 -5,heat,all-week,early-morning,2020,all-year,R2,0.17040000000,gasboiler,6,2026 -6,heat,all-week,early-morning,2020,all-year,R2,0.46870000000,heatpump,6,2026 -7,heat,all-week,early-morning,2022,all-year,R2,0.17040000000,heatpump,6,2026 -8,heat,all-week,early-morning,2024,all-year,R2,0.17040000000,heatpump,6,2026 -0,CO2f,all-week,early-morning,2020,all-year,R1,11.02880000000,gasboiler,6,2026 -5,CO2f,all-week,early-morning,2020,all-year,R1,11.02880000000,gasboiler,6,2026 -0,CO2f,all-week,early-morning,2020,all-year,R2,11.02880000000,gasboiler,6,2026 -5,CO2f,all-week,early-morning,2020,all-year,R2,11.02880000000,gasboiler,6,2026 -0,heat,all-week,late-afternoon,2020,all-year,R1,0.17040000000,gasboiler,7,2026 -1,heat,all-week,late-afternoon,2020,all-year,R1,0.46870000000,heatpump,7,2026 -2,heat,all-week,late-afternoon,2022,all-year,R1,0.17040000000,heatpump,7,2026 -3,heat,all-week,late-afternoon,2024,all-year,R1,0.17040000000,heatpump,7,2026 -5,heat,all-week,late-afternoon,2020,all-year,R1,0.17040000000,gasboiler,7,2026 -6,heat,all-week,late-afternoon,2020,all-year,R1,0.46870000000,heatpump,7,2026 -7,heat,all-week,late-afternoon,2022,all-year,R1,0.17040000000,heatpump,7,2026 -8,heat,all-week,late-afternoon,2024,all-year,R1,0.17040000000,heatpump,7,2026 -0,heat,all-week,late-afternoon,2020,all-year,R2,0.17040000000,gasboiler,7,2026 -1,heat,all-week,late-afternoon,2020,all-year,R2,0.46870000000,heatpump,7,2026 -2,heat,all-week,late-afternoon,2022,all-year,R2,0.17040000000,heatpump,7,2026 -3,heat,all-week,late-afternoon,2024,all-year,R2,0.17040000000,heatpump,7,2026 -5,heat,all-week,late-afternoon,2020,all-year,R2,0.17040000000,gasboiler,7,2026 -6,heat,all-week,late-afternoon,2020,all-year,R2,0.46870000000,heatpump,7,2026 -7,heat,all-week,late-afternoon,2022,all-year,R2,0.17040000000,heatpump,7,2026 -8,heat,all-week,late-afternoon,2024,all-year,R2,0.17040000000,heatpump,7,2026 -0,CO2f,all-week,late-afternoon,2020,all-year,R1,11.02880000000,gasboiler,7,2026 -5,CO2f,all-week,late-afternoon,2020,all-year,R1,11.02880000000,gasboiler,7,2026 -0,CO2f,all-week,late-afternoon,2020,all-year,R2,11.02880000000,gasboiler,7,2026 -5,CO2f,all-week,late-afternoon,2020,all-year,R2,11.02880000000,gasboiler,7,2026 -0,heat,all-week,night,2020,all-year,R1,0.04290000000,gasboiler,0,2028 -1,heat,all-week,night,2020,all-year,R1,0.23610000000,heatpump,0,2028 -2,heat,all-week,night,2022,all-year,R1,0.08590000000,heatpump,0,2028 -3,heat,all-week,night,2024,all-year,R1,0.08590000000,heatpump,0,2028 -4,heat,all-week,night,2026,all-year,R1,0.08590000000,heatpump,0,2028 -6,heat,all-week,night,2020,all-year,R1,0.04290000000,gasboiler,0,2028 -7,heat,all-week,night,2020,all-year,R1,0.23610000000,heatpump,0,2028 -8,heat,all-week,night,2022,all-year,R1,0.08590000000,heatpump,0,2028 -9,heat,all-week,night,2024,all-year,R1,0.08590000000,heatpump,0,2028 -10,heat,all-week,night,2026,all-year,R1,0.08590000000,heatpump,0,2028 -0,heat,all-week,night,2020,all-year,R2,0.04290000000,gasboiler,0,2028 -1,heat,all-week,night,2020,all-year,R2,0.23610000000,heatpump,0,2028 -2,heat,all-week,night,2022,all-year,R2,0.08590000000,heatpump,0,2028 -3,heat,all-week,night,2024,all-year,R2,0.08590000000,heatpump,0,2028 -4,heat,all-week,night,2026,all-year,R2,0.08590000000,heatpump,0,2028 -6,heat,all-week,night,2020,all-year,R2,0.04290000000,gasboiler,0,2028 -7,heat,all-week,night,2020,all-year,R2,0.23610000000,heatpump,0,2028 -8,heat,all-week,night,2022,all-year,R2,0.08590000000,heatpump,0,2028 -9,heat,all-week,night,2024,all-year,R2,0.08590000000,heatpump,0,2028 -10,heat,all-week,night,2026,all-year,R2,0.08590000000,heatpump,0,2028 -0,CO2f,all-week,night,2020,all-year,R1,2.77820000000,gasboiler,0,2028 -6,CO2f,all-week,night,2020,all-year,R1,2.77820000000,gasboiler,0,2028 -0,CO2f,all-week,night,2020,all-year,R2,2.77820000000,gasboiler,0,2028 -6,CO2f,all-week,night,2020,all-year,R2,2.77820000000,gasboiler,0,2028 -0,heat,all-week,morning,2020,all-year,R1,0.06130000000,gasboiler,1,2028 -1,heat,all-week,morning,2020,all-year,R1,0.33730000000,heatpump,1,2028 -2,heat,all-week,morning,2022,all-year,R1,0.12270000000,heatpump,1,2028 -3,heat,all-week,morning,2024,all-year,R1,0.12270000000,heatpump,1,2028 -4,heat,all-week,morning,2026,all-year,R1,0.12270000000,heatpump,1,2028 -6,heat,all-week,morning,2020,all-year,R1,0.06130000000,gasboiler,1,2028 -7,heat,all-week,morning,2020,all-year,R1,0.33730000000,heatpump,1,2028 -8,heat,all-week,morning,2022,all-year,R1,0.12270000000,heatpump,1,2028 -9,heat,all-week,morning,2024,all-year,R1,0.12270000000,heatpump,1,2028 -10,heat,all-week,morning,2026,all-year,R1,0.12270000000,heatpump,1,2028 -0,heat,all-week,morning,2020,all-year,R2,0.06130000000,gasboiler,1,2028 -1,heat,all-week,morning,2020,all-year,R2,0.33730000000,heatpump,1,2028 -2,heat,all-week,morning,2022,all-year,R2,0.12270000000,heatpump,1,2028 -3,heat,all-week,morning,2024,all-year,R2,0.12270000000,heatpump,1,2028 -4,heat,all-week,morning,2026,all-year,R2,0.12270000000,heatpump,1,2028 -6,heat,all-week,morning,2020,all-year,R2,0.06130000000,gasboiler,1,2028 -7,heat,all-week,morning,2020,all-year,R2,0.33730000000,heatpump,1,2028 -8,heat,all-week,morning,2022,all-year,R2,0.12270000000,heatpump,1,2028 -9,heat,all-week,morning,2024,all-year,R2,0.12270000000,heatpump,1,2028 -10,heat,all-week,morning,2026,all-year,R2,0.12270000000,heatpump,1,2028 -0,CO2f,all-week,morning,2020,all-year,R1,3.96890000000,gasboiler,1,2028 -6,CO2f,all-week,morning,2020,all-year,R1,3.96890000000,gasboiler,1,2028 -0,CO2f,all-week,morning,2020,all-year,R2,3.96890000000,gasboiler,1,2028 -6,CO2f,all-week,morning,2020,all-year,R2,3.96890000000,gasboiler,1,2028 -0,heat,all-week,mid-afternoon,2020,all-year,R1,0.04290000000,gasboiler,2,2028 -1,heat,all-week,mid-afternoon,2020,all-year,R1,0.23610000000,heatpump,2,2028 -2,heat,all-week,mid-afternoon,2022,all-year,R1,0.08590000000,heatpump,2,2028 -3,heat,all-week,mid-afternoon,2024,all-year,R1,0.08590000000,heatpump,2,2028 -4,heat,all-week,mid-afternoon,2026,all-year,R1,0.08590000000,heatpump,2,2028 -6,heat,all-week,mid-afternoon,2020,all-year,R1,0.04290000000,gasboiler,2,2028 -7,heat,all-week,mid-afternoon,2020,all-year,R1,0.23610000000,heatpump,2,2028 -8,heat,all-week,mid-afternoon,2022,all-year,R1,0.08590000000,heatpump,2,2028 -9,heat,all-week,mid-afternoon,2024,all-year,R1,0.08590000000,heatpump,2,2028 -10,heat,all-week,mid-afternoon,2026,all-year,R1,0.08590000000,heatpump,2,2028 -0,heat,all-week,mid-afternoon,2020,all-year,R2,0.04290000000,gasboiler,2,2028 -1,heat,all-week,mid-afternoon,2020,all-year,R2,0.23610000000,heatpump,2,2028 -2,heat,all-week,mid-afternoon,2022,all-year,R2,0.08590000000,heatpump,2,2028 -3,heat,all-week,mid-afternoon,2024,all-year,R2,0.08590000000,heatpump,2,2028 -4,heat,all-week,mid-afternoon,2026,all-year,R2,0.08590000000,heatpump,2,2028 -6,heat,all-week,mid-afternoon,2020,all-year,R2,0.04290000000,gasboiler,2,2028 -7,heat,all-week,mid-afternoon,2020,all-year,R2,0.23610000000,heatpump,2,2028 -8,heat,all-week,mid-afternoon,2022,all-year,R2,0.08590000000,heatpump,2,2028 -9,heat,all-week,mid-afternoon,2024,all-year,R2,0.08590000000,heatpump,2,2028 -10,heat,all-week,mid-afternoon,2026,all-year,R2,0.08590000000,heatpump,2,2028 -0,CO2f,all-week,mid-afternoon,2020,all-year,R1,2.77820000000,gasboiler,2,2028 -6,CO2f,all-week,mid-afternoon,2020,all-year,R1,2.77820000000,gasboiler,2,2028 -0,CO2f,all-week,mid-afternoon,2020,all-year,R2,2.77820000000,gasboiler,2,2028 -6,CO2f,all-week,mid-afternoon,2020,all-year,R2,2.77820000000,gasboiler,2,2028 -0,heat,all-week,early-peak,2020,all-year,R1,0.06130000000,gasboiler,3,2028 -1,heat,all-week,early-peak,2020,all-year,R1,0.33730000000,heatpump,3,2028 -2,heat,all-week,early-peak,2022,all-year,R1,0.12270000000,heatpump,3,2028 -3,heat,all-week,early-peak,2024,all-year,R1,0.12270000000,heatpump,3,2028 -4,heat,all-week,early-peak,2026,all-year,R1,0.12270000000,heatpump,3,2028 -6,heat,all-week,early-peak,2020,all-year,R1,0.06130000000,gasboiler,3,2028 -7,heat,all-week,early-peak,2020,all-year,R1,0.33730000000,heatpump,3,2028 -8,heat,all-week,early-peak,2022,all-year,R1,0.12270000000,heatpump,3,2028 -9,heat,all-week,early-peak,2024,all-year,R1,0.12270000000,heatpump,3,2028 -10,heat,all-week,early-peak,2026,all-year,R1,0.12270000000,heatpump,3,2028 -0,heat,all-week,early-peak,2020,all-year,R2,0.06130000000,gasboiler,3,2028 -1,heat,all-week,early-peak,2020,all-year,R2,0.33730000000,heatpump,3,2028 -2,heat,all-week,early-peak,2022,all-year,R2,0.12270000000,heatpump,3,2028 -3,heat,all-week,early-peak,2024,all-year,R2,0.12270000000,heatpump,3,2028 -4,heat,all-week,early-peak,2026,all-year,R2,0.12270000000,heatpump,3,2028 -6,heat,all-week,early-peak,2020,all-year,R2,0.06130000000,gasboiler,3,2028 -7,heat,all-week,early-peak,2020,all-year,R2,0.33730000000,heatpump,3,2028 -8,heat,all-week,early-peak,2022,all-year,R2,0.12270000000,heatpump,3,2028 -9,heat,all-week,early-peak,2024,all-year,R2,0.12270000000,heatpump,3,2028 -10,heat,all-week,early-peak,2026,all-year,R2,0.12270000000,heatpump,3,2028 -0,CO2f,all-week,early-peak,2020,all-year,R1,3.96890000000,gasboiler,3,2028 -6,CO2f,all-week,early-peak,2020,all-year,R1,3.96890000000,gasboiler,3,2028 -0,CO2f,all-week,early-peak,2020,all-year,R2,3.96890000000,gasboiler,3,2028 -6,CO2f,all-week,early-peak,2020,all-year,R2,3.96890000000,gasboiler,3,2028 -0,heat,all-week,late-peak,2020,all-year,R1,0.12880000000,gasboiler,4,2028 -1,heat,all-week,late-peak,2020,all-year,R1,0.70840000000,heatpump,4,2028 -2,heat,all-week,late-peak,2022,all-year,R1,0.25760000000,heatpump,4,2028 -3,heat,all-week,late-peak,2024,all-year,R1,0.25760000000,heatpump,4,2028 -4,heat,all-week,late-peak,2026,all-year,R1,0.25760000000,heatpump,4,2028 -6,heat,all-week,late-peak,2020,all-year,R1,0.12880000000,gasboiler,4,2028 -7,heat,all-week,late-peak,2020,all-year,R1,0.70840000000,heatpump,4,2028 -8,heat,all-week,late-peak,2022,all-year,R1,0.25760000000,heatpump,4,2028 -9,heat,all-week,late-peak,2024,all-year,R1,0.25760000000,heatpump,4,2028 -10,heat,all-week,late-peak,2026,all-year,R1,0.25760000000,heatpump,4,2028 -0,heat,all-week,late-peak,2020,all-year,R2,0.12880000000,gasboiler,4,2028 -1,heat,all-week,late-peak,2020,all-year,R2,0.70840000000,heatpump,4,2028 -2,heat,all-week,late-peak,2022,all-year,R2,0.25760000000,heatpump,4,2028 -3,heat,all-week,late-peak,2024,all-year,R2,0.25760000000,heatpump,4,2028 -4,heat,all-week,late-peak,2026,all-year,R2,0.25760000000,heatpump,4,2028 -6,heat,all-week,late-peak,2020,all-year,R2,0.12880000000,gasboiler,4,2028 -7,heat,all-week,late-peak,2020,all-year,R2,0.70840000000,heatpump,4,2028 -8,heat,all-week,late-peak,2022,all-year,R2,0.25760000000,heatpump,4,2028 -9,heat,all-week,late-peak,2024,all-year,R2,0.25760000000,heatpump,4,2028 -10,heat,all-week,late-peak,2026,all-year,R2,0.25760000000,heatpump,4,2028 -0,CO2f,all-week,late-peak,2020,all-year,R1,8.33460000000,gasboiler,4,2028 -6,CO2f,all-week,late-peak,2020,all-year,R1,8.33460000000,gasboiler,4,2028 -0,CO2f,all-week,late-peak,2020,all-year,R2,8.33460000000,gasboiler,4,2028 -6,CO2f,all-week,late-peak,2020,all-year,R2,8.33460000000,gasboiler,4,2028 -0,heat,all-week,evening,2020,all-year,R1,0.08590000000,gasboiler,5,2028 -1,heat,all-week,evening,2020,all-year,R1,0.47230000000,heatpump,5,2028 -2,heat,all-week,evening,2022,all-year,R1,0.17170000000,heatpump,5,2028 -3,heat,all-week,evening,2024,all-year,R1,0.17170000000,heatpump,5,2028 -4,heat,all-week,evening,2026,all-year,R1,0.17170000000,heatpump,5,2028 -6,heat,all-week,evening,2020,all-year,R1,0.08590000000,gasboiler,5,2028 -7,heat,all-week,evening,2020,all-year,R1,0.47230000000,heatpump,5,2028 -8,heat,all-week,evening,2022,all-year,R1,0.17170000000,heatpump,5,2028 -9,heat,all-week,evening,2024,all-year,R1,0.17170000000,heatpump,5,2028 -10,heat,all-week,evening,2026,all-year,R1,0.17170000000,heatpump,5,2028 -0,heat,all-week,evening,2020,all-year,R2,0.08590000000,gasboiler,5,2028 -1,heat,all-week,evening,2020,all-year,R2,0.47230000000,heatpump,5,2028 -2,heat,all-week,evening,2022,all-year,R2,0.17170000000,heatpump,5,2028 -3,heat,all-week,evening,2024,all-year,R2,0.17170000000,heatpump,5,2028 -4,heat,all-week,evening,2026,all-year,R2,0.17170000000,heatpump,5,2028 -6,heat,all-week,evening,2020,all-year,R2,0.08590000000,gasboiler,5,2028 -7,heat,all-week,evening,2020,all-year,R2,0.47230000000,heatpump,5,2028 -8,heat,all-week,evening,2022,all-year,R2,0.17170000000,heatpump,5,2028 -9,heat,all-week,evening,2024,all-year,R2,0.17170000000,heatpump,5,2028 -10,heat,all-week,evening,2026,all-year,R2,0.17170000000,heatpump,5,2028 -0,CO2f,all-week,evening,2020,all-year,R1,5.55640000000,gasboiler,5,2028 -6,CO2f,all-week,evening,2020,all-year,R1,5.55640000000,gasboiler,5,2028 -0,CO2f,all-week,evening,2020,all-year,R2,5.55640000000,gasboiler,5,2028 -6,CO2f,all-week,evening,2020,all-year,R2,5.55640000000,gasboiler,5,2028 -0,heat,all-week,early-morning,2020,all-year,R1,0.08590000000,gasboiler,6,2028 -1,heat,all-week,early-morning,2020,all-year,R1,0.47230000000,heatpump,6,2028 -2,heat,all-week,early-morning,2022,all-year,R1,0.17170000000,heatpump,6,2028 -3,heat,all-week,early-morning,2024,all-year,R1,0.17170000000,heatpump,6,2028 -4,heat,all-week,early-morning,2026,all-year,R1,0.17170000000,heatpump,6,2028 -6,heat,all-week,early-morning,2020,all-year,R1,0.08590000000,gasboiler,6,2028 -7,heat,all-week,early-morning,2020,all-year,R1,0.47230000000,heatpump,6,2028 -8,heat,all-week,early-morning,2022,all-year,R1,0.17170000000,heatpump,6,2028 -9,heat,all-week,early-morning,2024,all-year,R1,0.17170000000,heatpump,6,2028 -10,heat,all-week,early-morning,2026,all-year,R1,0.17170000000,heatpump,6,2028 -0,heat,all-week,early-morning,2020,all-year,R2,0.08590000000,gasboiler,6,2028 -1,heat,all-week,early-morning,2020,all-year,R2,0.47230000000,heatpump,6,2028 -2,heat,all-week,early-morning,2022,all-year,R2,0.17170000000,heatpump,6,2028 -3,heat,all-week,early-morning,2024,all-year,R2,0.17170000000,heatpump,6,2028 -4,heat,all-week,early-morning,2026,all-year,R2,0.17170000000,heatpump,6,2028 -6,heat,all-week,early-morning,2020,all-year,R2,0.08590000000,gasboiler,6,2028 -7,heat,all-week,early-morning,2020,all-year,R2,0.47230000000,heatpump,6,2028 -8,heat,all-week,early-morning,2022,all-year,R2,0.17170000000,heatpump,6,2028 -9,heat,all-week,early-morning,2024,all-year,R2,0.17170000000,heatpump,6,2028 -10,heat,all-week,early-morning,2026,all-year,R2,0.17170000000,heatpump,6,2028 -0,CO2f,all-week,early-morning,2020,all-year,R1,5.55640000000,gasboiler,6,2028 -6,CO2f,all-week,early-morning,2020,all-year,R1,5.55640000000,gasboiler,6,2028 -0,CO2f,all-week,early-morning,2020,all-year,R2,5.55640000000,gasboiler,6,2028 -6,CO2f,all-week,early-morning,2020,all-year,R2,5.55640000000,gasboiler,6,2028 -0,heat,all-week,late-afternoon,2020,all-year,R1,0.08590000000,gasboiler,7,2028 -1,heat,all-week,late-afternoon,2020,all-year,R1,0.47230000000,heatpump,7,2028 -2,heat,all-week,late-afternoon,2022,all-year,R1,0.17170000000,heatpump,7,2028 -3,heat,all-week,late-afternoon,2024,all-year,R1,0.17170000000,heatpump,7,2028 -4,heat,all-week,late-afternoon,2026,all-year,R1,0.17170000000,heatpump,7,2028 -6,heat,all-week,late-afternoon,2020,all-year,R1,0.08590000000,gasboiler,7,2028 -7,heat,all-week,late-afternoon,2020,all-year,R1,0.47230000000,heatpump,7,2028 -8,heat,all-week,late-afternoon,2022,all-year,R1,0.17170000000,heatpump,7,2028 -9,heat,all-week,late-afternoon,2024,all-year,R1,0.17170000000,heatpump,7,2028 -10,heat,all-week,late-afternoon,2026,all-year,R1,0.17170000000,heatpump,7,2028 -0,heat,all-week,late-afternoon,2020,all-year,R2,0.08590000000,gasboiler,7,2028 -1,heat,all-week,late-afternoon,2020,all-year,R2,0.47230000000,heatpump,7,2028 -2,heat,all-week,late-afternoon,2022,all-year,R2,0.17170000000,heatpump,7,2028 -3,heat,all-week,late-afternoon,2024,all-year,R2,0.17170000000,heatpump,7,2028 -4,heat,all-week,late-afternoon,2026,all-year,R2,0.17170000000,heatpump,7,2028 -6,heat,all-week,late-afternoon,2020,all-year,R2,0.08590000000,gasboiler,7,2028 -7,heat,all-week,late-afternoon,2020,all-year,R2,0.47230000000,heatpump,7,2028 -8,heat,all-week,late-afternoon,2022,all-year,R2,0.17170000000,heatpump,7,2028 -9,heat,all-week,late-afternoon,2024,all-year,R2,0.17170000000,heatpump,7,2028 -10,heat,all-week,late-afternoon,2026,all-year,R2,0.17170000000,heatpump,7,2028 -0,CO2f,all-week,late-afternoon,2020,all-year,R1,5.55640000000,gasboiler,7,2028 -6,CO2f,all-week,late-afternoon,2020,all-year,R1,5.55640000000,gasboiler,7,2028 -0,CO2f,all-week,late-afternoon,2020,all-year,R2,5.55640000000,gasboiler,7,2028 -6,CO2f,all-week,late-afternoon,2020,all-year,R2,5.55640000000,gasboiler,7,2028 -1,heat,all-week,night,2020,all-year,R1,0.22920000000,heatpump,0,2030 -2,heat,all-week,night,2022,all-year,R1,0.08330000000,heatpump,0,2030 -3,heat,all-week,night,2024,all-year,R1,0.08330000000,heatpump,0,2030 -4,heat,all-week,night,2026,all-year,R1,0.08330000000,heatpump,0,2030 -5,heat,all-week,night,2028,all-year,R1,0.10420000000,heatpump,0,2030 -8,heat,all-week,night,2020,all-year,R1,0.22920000000,heatpump,0,2030 -9,heat,all-week,night,2022,all-year,R1,0.08330000000,heatpump,0,2030 -10,heat,all-week,night,2024,all-year,R1,0.08330000000,heatpump,0,2030 -11,heat,all-week,night,2026,all-year,R1,0.08330000000,heatpump,0,2030 -12,heat,all-week,night,2028,all-year,R1,0.10420000000,heatpump,0,2030 -1,heat,all-week,night,2020,all-year,R2,0.22920000000,heatpump,0,2030 -2,heat,all-week,night,2022,all-year,R2,0.08330000000,heatpump,0,2030 -3,heat,all-week,night,2024,all-year,R2,0.08330000000,heatpump,0,2030 -4,heat,all-week,night,2026,all-year,R2,0.08330000000,heatpump,0,2030 -5,heat,all-week,night,2028,all-year,R2,0.10420000000,heatpump,0,2030 -8,heat,all-week,night,2020,all-year,R2,0.22920000000,heatpump,0,2030 -9,heat,all-week,night,2022,all-year,R2,0.08330000000,heatpump,0,2030 -10,heat,all-week,night,2024,all-year,R2,0.08330000000,heatpump,0,2030 -11,heat,all-week,night,2026,all-year,R2,0.08330000000,heatpump,0,2030 -12,heat,all-week,night,2028,all-year,R2,0.10420000000,heatpump,0,2030 -1,heat,all-week,morning,2020,all-year,R1,0.32740000000,heatpump,1,2030 -2,heat,all-week,morning,2022,all-year,R1,0.11900000000,heatpump,1,2030 -3,heat,all-week,morning,2024,all-year,R1,0.11900000000,heatpump,1,2030 -4,heat,all-week,morning,2026,all-year,R1,0.11900000000,heatpump,1,2030 -5,heat,all-week,morning,2028,all-year,R1,0.14880000000,heatpump,1,2030 -8,heat,all-week,morning,2020,all-year,R1,0.32740000000,heatpump,1,2030 -9,heat,all-week,morning,2022,all-year,R1,0.11900000000,heatpump,1,2030 -10,heat,all-week,morning,2024,all-year,R1,0.11900000000,heatpump,1,2030 -11,heat,all-week,morning,2026,all-year,R1,0.11900000000,heatpump,1,2030 -12,heat,all-week,morning,2028,all-year,R1,0.14880000000,heatpump,1,2030 -1,heat,all-week,morning,2020,all-year,R2,0.32740000000,heatpump,1,2030 -2,heat,all-week,morning,2022,all-year,R2,0.11900000000,heatpump,1,2030 -3,heat,all-week,morning,2024,all-year,R2,0.11900000000,heatpump,1,2030 -4,heat,all-week,morning,2026,all-year,R2,0.11900000000,heatpump,1,2030 -5,heat,all-week,morning,2028,all-year,R2,0.14880000000,heatpump,1,2030 -8,heat,all-week,morning,2020,all-year,R2,0.32740000000,heatpump,1,2030 -9,heat,all-week,morning,2022,all-year,R2,0.11900000000,heatpump,1,2030 -10,heat,all-week,morning,2024,all-year,R2,0.11900000000,heatpump,1,2030 -11,heat,all-week,morning,2026,all-year,R2,0.11900000000,heatpump,1,2030 -12,heat,all-week,morning,2028,all-year,R2,0.14880000000,heatpump,1,2030 -1,heat,all-week,mid-afternoon,2020,all-year,R1,0.22920000000,heatpump,2,2030 -2,heat,all-week,mid-afternoon,2022,all-year,R1,0.08330000000,heatpump,2,2030 -3,heat,all-week,mid-afternoon,2024,all-year,R1,0.08330000000,heatpump,2,2030 -4,heat,all-week,mid-afternoon,2026,all-year,R1,0.08330000000,heatpump,2,2030 -5,heat,all-week,mid-afternoon,2028,all-year,R1,0.10420000000,heatpump,2,2030 -8,heat,all-week,mid-afternoon,2020,all-year,R1,0.22920000000,heatpump,2,2030 -9,heat,all-week,mid-afternoon,2022,all-year,R1,0.08330000000,heatpump,2,2030 -10,heat,all-week,mid-afternoon,2024,all-year,R1,0.08330000000,heatpump,2,2030 -11,heat,all-week,mid-afternoon,2026,all-year,R1,0.08330000000,heatpump,2,2030 -12,heat,all-week,mid-afternoon,2028,all-year,R1,0.10420000000,heatpump,2,2030 -1,heat,all-week,mid-afternoon,2020,all-year,R2,0.22920000000,heatpump,2,2030 -2,heat,all-week,mid-afternoon,2022,all-year,R2,0.08330000000,heatpump,2,2030 -3,heat,all-week,mid-afternoon,2024,all-year,R2,0.08330000000,heatpump,2,2030 -4,heat,all-week,mid-afternoon,2026,all-year,R2,0.08330000000,heatpump,2,2030 -5,heat,all-week,mid-afternoon,2028,all-year,R2,0.10420000000,heatpump,2,2030 -8,heat,all-week,mid-afternoon,2020,all-year,R2,0.22920000000,heatpump,2,2030 -9,heat,all-week,mid-afternoon,2022,all-year,R2,0.08330000000,heatpump,2,2030 -10,heat,all-week,mid-afternoon,2024,all-year,R2,0.08330000000,heatpump,2,2030 -11,heat,all-week,mid-afternoon,2026,all-year,R2,0.08330000000,heatpump,2,2030 -12,heat,all-week,mid-afternoon,2028,all-year,R2,0.10420000000,heatpump,2,2030 -1,heat,all-week,early-peak,2020,all-year,R1,0.32740000000,heatpump,3,2030 -2,heat,all-week,early-peak,2022,all-year,R1,0.11900000000,heatpump,3,2030 -3,heat,all-week,early-peak,2024,all-year,R1,0.11900000000,heatpump,3,2030 -4,heat,all-week,early-peak,2026,all-year,R1,0.11900000000,heatpump,3,2030 -5,heat,all-week,early-peak,2028,all-year,R1,0.14880000000,heatpump,3,2030 -8,heat,all-week,early-peak,2020,all-year,R1,0.32740000000,heatpump,3,2030 -9,heat,all-week,early-peak,2022,all-year,R1,0.11900000000,heatpump,3,2030 -10,heat,all-week,early-peak,2024,all-year,R1,0.11900000000,heatpump,3,2030 -11,heat,all-week,early-peak,2026,all-year,R1,0.11900000000,heatpump,3,2030 -12,heat,all-week,early-peak,2028,all-year,R1,0.14880000000,heatpump,3,2030 -1,heat,all-week,early-peak,2020,all-year,R2,0.32740000000,heatpump,3,2030 -2,heat,all-week,early-peak,2022,all-year,R2,0.11900000000,heatpump,3,2030 -3,heat,all-week,early-peak,2024,all-year,R2,0.11900000000,heatpump,3,2030 -4,heat,all-week,early-peak,2026,all-year,R2,0.11900000000,heatpump,3,2030 -5,heat,all-week,early-peak,2028,all-year,R2,0.14880000000,heatpump,3,2030 -8,heat,all-week,early-peak,2020,all-year,R2,0.32740000000,heatpump,3,2030 -9,heat,all-week,early-peak,2022,all-year,R2,0.11900000000,heatpump,3,2030 -10,heat,all-week,early-peak,2024,all-year,R2,0.11900000000,heatpump,3,2030 -11,heat,all-week,early-peak,2026,all-year,R2,0.11900000000,heatpump,3,2030 -12,heat,all-week,early-peak,2028,all-year,R2,0.14880000000,heatpump,3,2030 -1,heat,all-week,late-peak,2020,all-year,R1,0.68750000000,heatpump,4,2030 -2,heat,all-week,late-peak,2022,all-year,R1,0.25000000000,heatpump,4,2030 -3,heat,all-week,late-peak,2024,all-year,R1,0.25000000000,heatpump,4,2030 -4,heat,all-week,late-peak,2026,all-year,R1,0.25000000000,heatpump,4,2030 -5,heat,all-week,late-peak,2028,all-year,R1,0.31250000000,heatpump,4,2030 -8,heat,all-week,late-peak,2020,all-year,R1,0.68750000000,heatpump,4,2030 -9,heat,all-week,late-peak,2022,all-year,R1,0.25000000000,heatpump,4,2030 -10,heat,all-week,late-peak,2024,all-year,R1,0.25000000000,heatpump,4,2030 -11,heat,all-week,late-peak,2026,all-year,R1,0.25000000000,heatpump,4,2030 -12,heat,all-week,late-peak,2028,all-year,R1,0.31250000000,heatpump,4,2030 -1,heat,all-week,late-peak,2020,all-year,R2,0.68750000000,heatpump,4,2030 -2,heat,all-week,late-peak,2022,all-year,R2,0.25000000000,heatpump,4,2030 -3,heat,all-week,late-peak,2024,all-year,R2,0.25000000000,heatpump,4,2030 -4,heat,all-week,late-peak,2026,all-year,R2,0.25000000000,heatpump,4,2030 -5,heat,all-week,late-peak,2028,all-year,R2,0.31250000000,heatpump,4,2030 -8,heat,all-week,late-peak,2020,all-year,R2,0.68750000000,heatpump,4,2030 -9,heat,all-week,late-peak,2022,all-year,R2,0.25000000000,heatpump,4,2030 -10,heat,all-week,late-peak,2024,all-year,R2,0.25000000000,heatpump,4,2030 -11,heat,all-week,late-peak,2026,all-year,R2,0.25000000000,heatpump,4,2030 -12,heat,all-week,late-peak,2028,all-year,R2,0.31250000000,heatpump,4,2030 -1,heat,all-week,evening,2020,all-year,R1,0.45830000000,heatpump,5,2030 -2,heat,all-week,evening,2022,all-year,R1,0.16670000000,heatpump,5,2030 -3,heat,all-week,evening,2024,all-year,R1,0.16670000000,heatpump,5,2030 -4,heat,all-week,evening,2026,all-year,R1,0.16670000000,heatpump,5,2030 -5,heat,all-week,evening,2028,all-year,R1,0.20830000000,heatpump,5,2030 -8,heat,all-week,evening,2020,all-year,R1,0.45830000000,heatpump,5,2030 -9,heat,all-week,evening,2022,all-year,R1,0.16670000000,heatpump,5,2030 -10,heat,all-week,evening,2024,all-year,R1,0.16670000000,heatpump,5,2030 -11,heat,all-week,evening,2026,all-year,R1,0.16670000000,heatpump,5,2030 -12,heat,all-week,evening,2028,all-year,R1,0.20830000000,heatpump,5,2030 -1,heat,all-week,evening,2020,all-year,R2,0.45830000000,heatpump,5,2030 -2,heat,all-week,evening,2022,all-year,R2,0.16670000000,heatpump,5,2030 -3,heat,all-week,evening,2024,all-year,R2,0.16670000000,heatpump,5,2030 -4,heat,all-week,evening,2026,all-year,R2,0.16670000000,heatpump,5,2030 -5,heat,all-week,evening,2028,all-year,R2,0.20830000000,heatpump,5,2030 -8,heat,all-week,evening,2020,all-year,R2,0.45830000000,heatpump,5,2030 -9,heat,all-week,evening,2022,all-year,R2,0.16670000000,heatpump,5,2030 -10,heat,all-week,evening,2024,all-year,R2,0.16670000000,heatpump,5,2030 -11,heat,all-week,evening,2026,all-year,R2,0.16670000000,heatpump,5,2030 -12,heat,all-week,evening,2028,all-year,R2,0.20830000000,heatpump,5,2030 -1,heat,all-week,early-morning,2020,all-year,R1,0.45830000000,heatpump,6,2030 -2,heat,all-week,early-morning,2022,all-year,R1,0.16670000000,heatpump,6,2030 -3,heat,all-week,early-morning,2024,all-year,R1,0.16670000000,heatpump,6,2030 -4,heat,all-week,early-morning,2026,all-year,R1,0.16670000000,heatpump,6,2030 -5,heat,all-week,early-morning,2028,all-year,R1,0.20830000000,heatpump,6,2030 -8,heat,all-week,early-morning,2020,all-year,R1,0.45830000000,heatpump,6,2030 -9,heat,all-week,early-morning,2022,all-year,R1,0.16670000000,heatpump,6,2030 -10,heat,all-week,early-morning,2024,all-year,R1,0.16670000000,heatpump,6,2030 -11,heat,all-week,early-morning,2026,all-year,R1,0.16670000000,heatpump,6,2030 -12,heat,all-week,early-morning,2028,all-year,R1,0.20830000000,heatpump,6,2030 -1,heat,all-week,early-morning,2020,all-year,R2,0.45830000000,heatpump,6,2030 -2,heat,all-week,early-morning,2022,all-year,R2,0.16670000000,heatpump,6,2030 -3,heat,all-week,early-morning,2024,all-year,R2,0.16670000000,heatpump,6,2030 -4,heat,all-week,early-morning,2026,all-year,R2,0.16670000000,heatpump,6,2030 -5,heat,all-week,early-morning,2028,all-year,R2,0.20830000000,heatpump,6,2030 -8,heat,all-week,early-morning,2020,all-year,R2,0.45830000000,heatpump,6,2030 -9,heat,all-week,early-morning,2022,all-year,R2,0.16670000000,heatpump,6,2030 -10,heat,all-week,early-morning,2024,all-year,R2,0.16670000000,heatpump,6,2030 -11,heat,all-week,early-morning,2026,all-year,R2,0.16670000000,heatpump,6,2030 -12,heat,all-week,early-morning,2028,all-year,R2,0.20830000000,heatpump,6,2030 -1,heat,all-week,late-afternoon,2020,all-year,R1,0.45830000000,heatpump,7,2030 -2,heat,all-week,late-afternoon,2022,all-year,R1,0.16670000000,heatpump,7,2030 -3,heat,all-week,late-afternoon,2024,all-year,R1,0.16670000000,heatpump,7,2030 -4,heat,all-week,late-afternoon,2026,all-year,R1,0.16670000000,heatpump,7,2030 -5,heat,all-week,late-afternoon,2028,all-year,R1,0.20830000000,heatpump,7,2030 -8,heat,all-week,late-afternoon,2020,all-year,R1,0.45830000000,heatpump,7,2030 -9,heat,all-week,late-afternoon,2022,all-year,R1,0.16670000000,heatpump,7,2030 -10,heat,all-week,late-afternoon,2024,all-year,R1,0.16670000000,heatpump,7,2030 -11,heat,all-week,late-afternoon,2026,all-year,R1,0.16670000000,heatpump,7,2030 -12,heat,all-week,late-afternoon,2028,all-year,R1,0.20830000000,heatpump,7,2030 -1,heat,all-week,late-afternoon,2020,all-year,R2,0.45830000000,heatpump,7,2030 -2,heat,all-week,late-afternoon,2022,all-year,R2,0.16670000000,heatpump,7,2030 -3,heat,all-week,late-afternoon,2024,all-year,R2,0.16670000000,heatpump,7,2030 -4,heat,all-week,late-afternoon,2026,all-year,R2,0.16670000000,heatpump,7,2030 -5,heat,all-week,late-afternoon,2028,all-year,R2,0.20830000000,heatpump,7,2030 -8,heat,all-week,late-afternoon,2020,all-year,R2,0.45830000000,heatpump,7,2030 -9,heat,all-week,late-afternoon,2022,all-year,R2,0.16670000000,heatpump,7,2030 -10,heat,all-week,late-afternoon,2024,all-year,R2,0.16670000000,heatpump,7,2030 -11,heat,all-week,late-afternoon,2026,all-year,R2,0.16670000000,heatpump,7,2030 -12,heat,all-week,late-afternoon,2028,all-year,R2,0.20830000000,heatpump,7,2030 -2,heat,all-week,night,2022,all-year,R1,0.08400000000,heatpump,0,2032 -3,heat,all-week,night,2024,all-year,R1,0.08400000000,heatpump,0,2032 -4,heat,all-week,night,2026,all-year,R1,0.08400000000,heatpump,0,2032 -5,heat,all-week,night,2028,all-year,R1,0.10500000000,heatpump,0,2032 -6,heat,all-week,night,2030,all-year,R1,0.27300000000,heatpump,0,2032 -10,heat,all-week,night,2022,all-year,R1,0.08400000000,heatpump,0,2032 -11,heat,all-week,night,2024,all-year,R1,0.08400000000,heatpump,0,2032 -12,heat,all-week,night,2026,all-year,R1,0.08400000000,heatpump,0,2032 -13,heat,all-week,night,2028,all-year,R1,0.10500000000,heatpump,0,2032 -14,heat,all-week,night,2030,all-year,R1,0.27300000000,heatpump,0,2032 -2,heat,all-week,night,2022,all-year,R2,0.08400000000,heatpump,0,2032 -3,heat,all-week,night,2024,all-year,R2,0.08400000000,heatpump,0,2032 -4,heat,all-week,night,2026,all-year,R2,0.08400000000,heatpump,0,2032 -5,heat,all-week,night,2028,all-year,R2,0.10500000000,heatpump,0,2032 -6,heat,all-week,night,2030,all-year,R2,0.27300000000,heatpump,0,2032 -10,heat,all-week,night,2022,all-year,R2,0.08400000000,heatpump,0,2032 -11,heat,all-week,night,2024,all-year,R2,0.08400000000,heatpump,0,2032 -12,heat,all-week,night,2026,all-year,R2,0.08400000000,heatpump,0,2032 -13,heat,all-week,night,2028,all-year,R2,0.10500000000,heatpump,0,2032 -14,heat,all-week,night,2030,all-year,R2,0.27300000000,heatpump,0,2032 -2,heat,all-week,morning,2022,all-year,R1,0.12000000000,heatpump,1,2032 -3,heat,all-week,morning,2024,all-year,R1,0.12000000000,heatpump,1,2032 -4,heat,all-week,morning,2026,all-year,R1,0.12000000000,heatpump,1,2032 -5,heat,all-week,morning,2028,all-year,R1,0.15000000000,heatpump,1,2032 -6,heat,all-week,morning,2030,all-year,R1,0.39000000000,heatpump,1,2032 -10,heat,all-week,morning,2022,all-year,R1,0.12000000000,heatpump,1,2032 -11,heat,all-week,morning,2024,all-year,R1,0.12000000000,heatpump,1,2032 -12,heat,all-week,morning,2026,all-year,R1,0.12000000000,heatpump,1,2032 -13,heat,all-week,morning,2028,all-year,R1,0.15000000000,heatpump,1,2032 -14,heat,all-week,morning,2030,all-year,R1,0.39000000000,heatpump,1,2032 -2,heat,all-week,morning,2022,all-year,R2,0.12000000000,heatpump,1,2032 -3,heat,all-week,morning,2024,all-year,R2,0.12000000000,heatpump,1,2032 -4,heat,all-week,morning,2026,all-year,R2,0.12000000000,heatpump,1,2032 -5,heat,all-week,morning,2028,all-year,R2,0.15000000000,heatpump,1,2032 -6,heat,all-week,morning,2030,all-year,R2,0.39000000000,heatpump,1,2032 -10,heat,all-week,morning,2022,all-year,R2,0.12000000000,heatpump,1,2032 -11,heat,all-week,morning,2024,all-year,R2,0.12000000000,heatpump,1,2032 -12,heat,all-week,morning,2026,all-year,R2,0.12000000000,heatpump,1,2032 -13,heat,all-week,morning,2028,all-year,R2,0.15000000000,heatpump,1,2032 -14,heat,all-week,morning,2030,all-year,R2,0.39000000000,heatpump,1,2032 -2,heat,all-week,mid-afternoon,2022,all-year,R1,0.08400000000,heatpump,2,2032 -3,heat,all-week,mid-afternoon,2024,all-year,R1,0.08400000000,heatpump,2,2032 -4,heat,all-week,mid-afternoon,2026,all-year,R1,0.08400000000,heatpump,2,2032 -5,heat,all-week,mid-afternoon,2028,all-year,R1,0.10500000000,heatpump,2,2032 -6,heat,all-week,mid-afternoon,2030,all-year,R1,0.27300000000,heatpump,2,2032 -10,heat,all-week,mid-afternoon,2022,all-year,R1,0.08400000000,heatpump,2,2032 -11,heat,all-week,mid-afternoon,2024,all-year,R1,0.08400000000,heatpump,2,2032 -12,heat,all-week,mid-afternoon,2026,all-year,R1,0.08400000000,heatpump,2,2032 -13,heat,all-week,mid-afternoon,2028,all-year,R1,0.10500000000,heatpump,2,2032 -14,heat,all-week,mid-afternoon,2030,all-year,R1,0.27300000000,heatpump,2,2032 -2,heat,all-week,mid-afternoon,2022,all-year,R2,0.08400000000,heatpump,2,2032 -3,heat,all-week,mid-afternoon,2024,all-year,R2,0.08400000000,heatpump,2,2032 -4,heat,all-week,mid-afternoon,2026,all-year,R2,0.08400000000,heatpump,2,2032 -5,heat,all-week,mid-afternoon,2028,all-year,R2,0.10500000000,heatpump,2,2032 -6,heat,all-week,mid-afternoon,2030,all-year,R2,0.27300000000,heatpump,2,2032 -10,heat,all-week,mid-afternoon,2022,all-year,R2,0.08400000000,heatpump,2,2032 -11,heat,all-week,mid-afternoon,2024,all-year,R2,0.08400000000,heatpump,2,2032 -12,heat,all-week,mid-afternoon,2026,all-year,R2,0.08400000000,heatpump,2,2032 -13,heat,all-week,mid-afternoon,2028,all-year,R2,0.10500000000,heatpump,2,2032 -14,heat,all-week,mid-afternoon,2030,all-year,R2,0.27300000000,heatpump,2,2032 -2,heat,all-week,early-peak,2022,all-year,R1,0.12000000000,heatpump,3,2032 -3,heat,all-week,early-peak,2024,all-year,R1,0.12000000000,heatpump,3,2032 -4,heat,all-week,early-peak,2026,all-year,R1,0.12000000000,heatpump,3,2032 -5,heat,all-week,early-peak,2028,all-year,R1,0.15000000000,heatpump,3,2032 -6,heat,all-week,early-peak,2030,all-year,R1,0.39000000000,heatpump,3,2032 -10,heat,all-week,early-peak,2022,all-year,R1,0.12000000000,heatpump,3,2032 -11,heat,all-week,early-peak,2024,all-year,R1,0.12000000000,heatpump,3,2032 -12,heat,all-week,early-peak,2026,all-year,R1,0.12000000000,heatpump,3,2032 -13,heat,all-week,early-peak,2028,all-year,R1,0.15000000000,heatpump,3,2032 -14,heat,all-week,early-peak,2030,all-year,R1,0.39000000000,heatpump,3,2032 -2,heat,all-week,early-peak,2022,all-year,R2,0.12000000000,heatpump,3,2032 -3,heat,all-week,early-peak,2024,all-year,R2,0.12000000000,heatpump,3,2032 -4,heat,all-week,early-peak,2026,all-year,R2,0.12000000000,heatpump,3,2032 -5,heat,all-week,early-peak,2028,all-year,R2,0.15000000000,heatpump,3,2032 -6,heat,all-week,early-peak,2030,all-year,R2,0.39000000000,heatpump,3,2032 -10,heat,all-week,early-peak,2022,all-year,R2,0.12000000000,heatpump,3,2032 -11,heat,all-week,early-peak,2024,all-year,R2,0.12000000000,heatpump,3,2032 -12,heat,all-week,early-peak,2026,all-year,R2,0.12000000000,heatpump,3,2032 -13,heat,all-week,early-peak,2028,all-year,R2,0.15000000000,heatpump,3,2032 -14,heat,all-week,early-peak,2030,all-year,R2,0.39000000000,heatpump,3,2032 -2,heat,all-week,late-peak,2022,all-year,R1,0.25200000000,heatpump,4,2032 -3,heat,all-week,late-peak,2024,all-year,R1,0.25200000000,heatpump,4,2032 -4,heat,all-week,late-peak,2026,all-year,R1,0.25200000000,heatpump,4,2032 -5,heat,all-week,late-peak,2028,all-year,R1,0.31500000000,heatpump,4,2032 -6,heat,all-week,late-peak,2030,all-year,R1,0.81900000000,heatpump,4,2032 -10,heat,all-week,late-peak,2022,all-year,R1,0.25200000000,heatpump,4,2032 -11,heat,all-week,late-peak,2024,all-year,R1,0.25200000000,heatpump,4,2032 -12,heat,all-week,late-peak,2026,all-year,R1,0.25200000000,heatpump,4,2032 -13,heat,all-week,late-peak,2028,all-year,R1,0.31500000000,heatpump,4,2032 -14,heat,all-week,late-peak,2030,all-year,R1,0.81900000000,heatpump,4,2032 -2,heat,all-week,late-peak,2022,all-year,R2,0.25200000000,heatpump,4,2032 -3,heat,all-week,late-peak,2024,all-year,R2,0.25200000000,heatpump,4,2032 -4,heat,all-week,late-peak,2026,all-year,R2,0.25200000000,heatpump,4,2032 -5,heat,all-week,late-peak,2028,all-year,R2,0.31500000000,heatpump,4,2032 -6,heat,all-week,late-peak,2030,all-year,R2,0.81900000000,heatpump,4,2032 -10,heat,all-week,late-peak,2022,all-year,R2,0.25200000000,heatpump,4,2032 -11,heat,all-week,late-peak,2024,all-year,R2,0.25200000000,heatpump,4,2032 -12,heat,all-week,late-peak,2026,all-year,R2,0.25200000000,heatpump,4,2032 -13,heat,all-week,late-peak,2028,all-year,R2,0.31500000000,heatpump,4,2032 -14,heat,all-week,late-peak,2030,all-year,R2,0.81900000000,heatpump,4,2032 -2,heat,all-week,evening,2022,all-year,R1,0.16800000000,heatpump,5,2032 -3,heat,all-week,evening,2024,all-year,R1,0.16800000000,heatpump,5,2032 -4,heat,all-week,evening,2026,all-year,R1,0.16800000000,heatpump,5,2032 -5,heat,all-week,evening,2028,all-year,R1,0.21000000000,heatpump,5,2032 -6,heat,all-week,evening,2030,all-year,R1,0.54600000000,heatpump,5,2032 -10,heat,all-week,evening,2022,all-year,R1,0.16800000000,heatpump,5,2032 -11,heat,all-week,evening,2024,all-year,R1,0.16800000000,heatpump,5,2032 -12,heat,all-week,evening,2026,all-year,R1,0.16800000000,heatpump,5,2032 -13,heat,all-week,evening,2028,all-year,R1,0.21000000000,heatpump,5,2032 -14,heat,all-week,evening,2030,all-year,R1,0.54600000000,heatpump,5,2032 -2,heat,all-week,evening,2022,all-year,R2,0.16800000000,heatpump,5,2032 -3,heat,all-week,evening,2024,all-year,R2,0.16800000000,heatpump,5,2032 -4,heat,all-week,evening,2026,all-year,R2,0.16800000000,heatpump,5,2032 -5,heat,all-week,evening,2028,all-year,R2,0.21000000000,heatpump,5,2032 -6,heat,all-week,evening,2030,all-year,R2,0.54600000000,heatpump,5,2032 -10,heat,all-week,evening,2022,all-year,R2,0.16800000000,heatpump,5,2032 -11,heat,all-week,evening,2024,all-year,R2,0.16800000000,heatpump,5,2032 -12,heat,all-week,evening,2026,all-year,R2,0.16800000000,heatpump,5,2032 -13,heat,all-week,evening,2028,all-year,R2,0.21000000000,heatpump,5,2032 -14,heat,all-week,evening,2030,all-year,R2,0.54600000000,heatpump,5,2032 -2,heat,all-week,early-morning,2022,all-year,R1,0.16800000000,heatpump,6,2032 -3,heat,all-week,early-morning,2024,all-year,R1,0.16800000000,heatpump,6,2032 -4,heat,all-week,early-morning,2026,all-year,R1,0.16800000000,heatpump,6,2032 -5,heat,all-week,early-morning,2028,all-year,R1,0.21000000000,heatpump,6,2032 -6,heat,all-week,early-morning,2030,all-year,R1,0.54600000000,heatpump,6,2032 -10,heat,all-week,early-morning,2022,all-year,R1,0.16800000000,heatpump,6,2032 -11,heat,all-week,early-morning,2024,all-year,R1,0.16800000000,heatpump,6,2032 -12,heat,all-week,early-morning,2026,all-year,R1,0.16800000000,heatpump,6,2032 -13,heat,all-week,early-morning,2028,all-year,R1,0.21000000000,heatpump,6,2032 -14,heat,all-week,early-morning,2030,all-year,R1,0.54600000000,heatpump,6,2032 -2,heat,all-week,early-morning,2022,all-year,R2,0.16800000000,heatpump,6,2032 -3,heat,all-week,early-morning,2024,all-year,R2,0.16800000000,heatpump,6,2032 -4,heat,all-week,early-morning,2026,all-year,R2,0.16800000000,heatpump,6,2032 -5,heat,all-week,early-morning,2028,all-year,R2,0.21000000000,heatpump,6,2032 -6,heat,all-week,early-morning,2030,all-year,R2,0.54600000000,heatpump,6,2032 -10,heat,all-week,early-morning,2022,all-year,R2,0.16800000000,heatpump,6,2032 -11,heat,all-week,early-morning,2024,all-year,R2,0.16800000000,heatpump,6,2032 -12,heat,all-week,early-morning,2026,all-year,R2,0.16800000000,heatpump,6,2032 -13,heat,all-week,early-morning,2028,all-year,R2,0.21000000000,heatpump,6,2032 -14,heat,all-week,early-morning,2030,all-year,R2,0.54600000000,heatpump,6,2032 -2,heat,all-week,late-afternoon,2022,all-year,R1,0.16800000000,heatpump,7,2032 -3,heat,all-week,late-afternoon,2024,all-year,R1,0.16800000000,heatpump,7,2032 -4,heat,all-week,late-afternoon,2026,all-year,R1,0.16800000000,heatpump,7,2032 -5,heat,all-week,late-afternoon,2028,all-year,R1,0.21000000000,heatpump,7,2032 -6,heat,all-week,late-afternoon,2030,all-year,R1,0.54600000000,heatpump,7,2032 -10,heat,all-week,late-afternoon,2022,all-year,R1,0.16800000000,heatpump,7,2032 -11,heat,all-week,late-afternoon,2024,all-year,R1,0.16800000000,heatpump,7,2032 -12,heat,all-week,late-afternoon,2026,all-year,R1,0.16800000000,heatpump,7,2032 -13,heat,all-week,late-afternoon,2028,all-year,R1,0.21000000000,heatpump,7,2032 -14,heat,all-week,late-afternoon,2030,all-year,R1,0.54600000000,heatpump,7,2032 -2,heat,all-week,late-afternoon,2022,all-year,R2,0.16800000000,heatpump,7,2032 -3,heat,all-week,late-afternoon,2024,all-year,R2,0.16800000000,heatpump,7,2032 -4,heat,all-week,late-afternoon,2026,all-year,R2,0.16800000000,heatpump,7,2032 -5,heat,all-week,late-afternoon,2028,all-year,R2,0.21000000000,heatpump,7,2032 -6,heat,all-week,late-afternoon,2030,all-year,R2,0.54600000000,heatpump,7,2032 -10,heat,all-week,late-afternoon,2022,all-year,R2,0.16800000000,heatpump,7,2032 -11,heat,all-week,late-afternoon,2024,all-year,R2,0.16800000000,heatpump,7,2032 -12,heat,all-week,late-afternoon,2026,all-year,R2,0.16800000000,heatpump,7,2032 -13,heat,all-week,late-afternoon,2028,all-year,R2,0.21000000000,heatpump,7,2032 -14,heat,all-week,late-afternoon,2030,all-year,R2,0.54600000000,heatpump,7,2032 -3,heat,all-week,night,2024,all-year,R1,0.08460000000,heatpump,0,2034 -4,heat,all-week,night,2026,all-year,R1,0.08460000000,heatpump,0,2034 -5,heat,all-week,night,2028,all-year,R1,0.10570000000,heatpump,0,2034 -6,heat,all-week,night,2030,all-year,R1,0.27490000000,heatpump,0,2034 -7,heat,all-week,night,2032,all-year,R1,0.12690000000,heatpump,0,2034 -12,heat,all-week,night,2024,all-year,R1,0.08460000000,heatpump,0,2034 -13,heat,all-week,night,2026,all-year,R1,0.08460000000,heatpump,0,2034 -14,heat,all-week,night,2028,all-year,R1,0.10570000000,heatpump,0,2034 -15,heat,all-week,night,2030,all-year,R1,0.27490000000,heatpump,0,2034 -16,heat,all-week,night,2032,all-year,R1,0.12690000000,heatpump,0,2034 -3,heat,all-week,night,2024,all-year,R2,0.08460000000,heatpump,0,2034 -4,heat,all-week,night,2026,all-year,R2,0.08460000000,heatpump,0,2034 -5,heat,all-week,night,2028,all-year,R2,0.10570000000,heatpump,0,2034 -6,heat,all-week,night,2030,all-year,R2,0.27490000000,heatpump,0,2034 -7,heat,all-week,night,2032,all-year,R2,0.12690000000,heatpump,0,2034 -12,heat,all-week,night,2024,all-year,R2,0.08460000000,heatpump,0,2034 -13,heat,all-week,night,2026,all-year,R2,0.08460000000,heatpump,0,2034 -14,heat,all-week,night,2028,all-year,R2,0.10570000000,heatpump,0,2034 -15,heat,all-week,night,2030,all-year,R2,0.27490000000,heatpump,0,2034 -16,heat,all-week,night,2032,all-year,R2,0.12690000000,heatpump,0,2034 -3,heat,all-week,morning,2024,all-year,R1,0.12080000000,heatpump,1,2034 -4,heat,all-week,morning,2026,all-year,R1,0.12080000000,heatpump,1,2034 -5,heat,all-week,morning,2028,all-year,R1,0.15100000000,heatpump,1,2034 -6,heat,all-week,morning,2030,all-year,R1,0.39270000000,heatpump,1,2034 -7,heat,all-week,morning,2032,all-year,R1,0.18120000000,heatpump,1,2034 -12,heat,all-week,morning,2024,all-year,R1,0.12080000000,heatpump,1,2034 -13,heat,all-week,morning,2026,all-year,R1,0.12080000000,heatpump,1,2034 -14,heat,all-week,morning,2028,all-year,R1,0.15100000000,heatpump,1,2034 -15,heat,all-week,morning,2030,all-year,R1,0.39270000000,heatpump,1,2034 -16,heat,all-week,morning,2032,all-year,R1,0.18120000000,heatpump,1,2034 -3,heat,all-week,morning,2024,all-year,R2,0.12080000000,heatpump,1,2034 -4,heat,all-week,morning,2026,all-year,R2,0.12080000000,heatpump,1,2034 -5,heat,all-week,morning,2028,all-year,R2,0.15100000000,heatpump,1,2034 -6,heat,all-week,morning,2030,all-year,R2,0.39270000000,heatpump,1,2034 -7,heat,all-week,morning,2032,all-year,R2,0.18120000000,heatpump,1,2034 -12,heat,all-week,morning,2024,all-year,R2,0.12080000000,heatpump,1,2034 -13,heat,all-week,morning,2026,all-year,R2,0.12080000000,heatpump,1,2034 -14,heat,all-week,morning,2028,all-year,R2,0.15100000000,heatpump,1,2034 -15,heat,all-week,morning,2030,all-year,R2,0.39270000000,heatpump,1,2034 -16,heat,all-week,morning,2032,all-year,R2,0.18120000000,heatpump,1,2034 -3,heat,all-week,mid-afternoon,2024,all-year,R1,0.08460000000,heatpump,2,2034 -4,heat,all-week,mid-afternoon,2026,all-year,R1,0.08460000000,heatpump,2,2034 -5,heat,all-week,mid-afternoon,2028,all-year,R1,0.10570000000,heatpump,2,2034 -6,heat,all-week,mid-afternoon,2030,all-year,R1,0.27490000000,heatpump,2,2034 -7,heat,all-week,mid-afternoon,2032,all-year,R1,0.12690000000,heatpump,2,2034 -12,heat,all-week,mid-afternoon,2024,all-year,R1,0.08460000000,heatpump,2,2034 -13,heat,all-week,mid-afternoon,2026,all-year,R1,0.08460000000,heatpump,2,2034 -14,heat,all-week,mid-afternoon,2028,all-year,R1,0.10570000000,heatpump,2,2034 -15,heat,all-week,mid-afternoon,2030,all-year,R1,0.27490000000,heatpump,2,2034 -16,heat,all-week,mid-afternoon,2032,all-year,R1,0.12690000000,heatpump,2,2034 -3,heat,all-week,mid-afternoon,2024,all-year,R2,0.08460000000,heatpump,2,2034 -4,heat,all-week,mid-afternoon,2026,all-year,R2,0.08460000000,heatpump,2,2034 -5,heat,all-week,mid-afternoon,2028,all-year,R2,0.10570000000,heatpump,2,2034 -6,heat,all-week,mid-afternoon,2030,all-year,R2,0.27490000000,heatpump,2,2034 -7,heat,all-week,mid-afternoon,2032,all-year,R2,0.12690000000,heatpump,2,2034 -12,heat,all-week,mid-afternoon,2024,all-year,R2,0.08460000000,heatpump,2,2034 -13,heat,all-week,mid-afternoon,2026,all-year,R2,0.08460000000,heatpump,2,2034 -14,heat,all-week,mid-afternoon,2028,all-year,R2,0.10570000000,heatpump,2,2034 -15,heat,all-week,mid-afternoon,2030,all-year,R2,0.27490000000,heatpump,2,2034 -16,heat,all-week,mid-afternoon,2032,all-year,R2,0.12690000000,heatpump,2,2034 -3,heat,all-week,early-peak,2024,all-year,R1,0.12080000000,heatpump,3,2034 -4,heat,all-week,early-peak,2026,all-year,R1,0.12080000000,heatpump,3,2034 -5,heat,all-week,early-peak,2028,all-year,R1,0.15100000000,heatpump,3,2034 -6,heat,all-week,early-peak,2030,all-year,R1,0.39270000000,heatpump,3,2034 -7,heat,all-week,early-peak,2032,all-year,R1,0.18120000000,heatpump,3,2034 -12,heat,all-week,early-peak,2024,all-year,R1,0.12080000000,heatpump,3,2034 -13,heat,all-week,early-peak,2026,all-year,R1,0.12080000000,heatpump,3,2034 -14,heat,all-week,early-peak,2028,all-year,R1,0.15100000000,heatpump,3,2034 -15,heat,all-week,early-peak,2030,all-year,R1,0.39270000000,heatpump,3,2034 -16,heat,all-week,early-peak,2032,all-year,R1,0.18120000000,heatpump,3,2034 -3,heat,all-week,early-peak,2024,all-year,R2,0.12080000000,heatpump,3,2034 -4,heat,all-week,early-peak,2026,all-year,R2,0.12080000000,heatpump,3,2034 -5,heat,all-week,early-peak,2028,all-year,R2,0.15100000000,heatpump,3,2034 -6,heat,all-week,early-peak,2030,all-year,R2,0.39270000000,heatpump,3,2034 -7,heat,all-week,early-peak,2032,all-year,R2,0.18120000000,heatpump,3,2034 -12,heat,all-week,early-peak,2024,all-year,R2,0.12080000000,heatpump,3,2034 -13,heat,all-week,early-peak,2026,all-year,R2,0.12080000000,heatpump,3,2034 -14,heat,all-week,early-peak,2028,all-year,R2,0.15100000000,heatpump,3,2034 -15,heat,all-week,early-peak,2030,all-year,R2,0.39270000000,heatpump,3,2034 -16,heat,all-week,early-peak,2032,all-year,R2,0.18120000000,heatpump,3,2034 -3,heat,all-week,late-peak,2024,all-year,R1,0.25370000000,heatpump,4,2034 -4,heat,all-week,late-peak,2026,all-year,R1,0.25370000000,heatpump,4,2034 -5,heat,all-week,late-peak,2028,all-year,R1,0.31720000000,heatpump,4,2034 -6,heat,all-week,late-peak,2030,all-year,R1,0.82470000000,heatpump,4,2034 -7,heat,all-week,late-peak,2032,all-year,R1,0.38060000000,heatpump,4,2034 -12,heat,all-week,late-peak,2024,all-year,R1,0.25370000000,heatpump,4,2034 -13,heat,all-week,late-peak,2026,all-year,R1,0.25370000000,heatpump,4,2034 -14,heat,all-week,late-peak,2028,all-year,R1,0.31720000000,heatpump,4,2034 -15,heat,all-week,late-peak,2030,all-year,R1,0.82470000000,heatpump,4,2034 -16,heat,all-week,late-peak,2032,all-year,R1,0.38060000000,heatpump,4,2034 -3,heat,all-week,late-peak,2024,all-year,R2,0.25370000000,heatpump,4,2034 -4,heat,all-week,late-peak,2026,all-year,R2,0.25370000000,heatpump,4,2034 -5,heat,all-week,late-peak,2028,all-year,R2,0.31720000000,heatpump,4,2034 -6,heat,all-week,late-peak,2030,all-year,R2,0.82470000000,heatpump,4,2034 -7,heat,all-week,late-peak,2032,all-year,R2,0.38060000000,heatpump,4,2034 -12,heat,all-week,late-peak,2024,all-year,R2,0.25370000000,heatpump,4,2034 -13,heat,all-week,late-peak,2026,all-year,R2,0.25370000000,heatpump,4,2034 -14,heat,all-week,late-peak,2028,all-year,R2,0.31720000000,heatpump,4,2034 -15,heat,all-week,late-peak,2030,all-year,R2,0.82470000000,heatpump,4,2034 -16,heat,all-week,late-peak,2032,all-year,R2,0.38060000000,heatpump,4,2034 -3,heat,all-week,evening,2024,all-year,R1,0.16920000000,heatpump,5,2034 -4,heat,all-week,evening,2026,all-year,R1,0.16920000000,heatpump,5,2034 -5,heat,all-week,evening,2028,all-year,R1,0.21150000000,heatpump,5,2034 -6,heat,all-week,evening,2030,all-year,R1,0.54980000000,heatpump,5,2034 -7,heat,all-week,evening,2032,all-year,R1,0.25370000000,heatpump,5,2034 -12,heat,all-week,evening,2024,all-year,R1,0.16920000000,heatpump,5,2034 -13,heat,all-week,evening,2026,all-year,R1,0.16920000000,heatpump,5,2034 -14,heat,all-week,evening,2028,all-year,R1,0.21150000000,heatpump,5,2034 -15,heat,all-week,evening,2030,all-year,R1,0.54980000000,heatpump,5,2034 -16,heat,all-week,evening,2032,all-year,R1,0.25370000000,heatpump,5,2034 -3,heat,all-week,evening,2024,all-year,R2,0.16920000000,heatpump,5,2034 -4,heat,all-week,evening,2026,all-year,R2,0.16920000000,heatpump,5,2034 -5,heat,all-week,evening,2028,all-year,R2,0.21150000000,heatpump,5,2034 -6,heat,all-week,evening,2030,all-year,R2,0.54980000000,heatpump,5,2034 -7,heat,all-week,evening,2032,all-year,R2,0.25370000000,heatpump,5,2034 -12,heat,all-week,evening,2024,all-year,R2,0.16920000000,heatpump,5,2034 -13,heat,all-week,evening,2026,all-year,R2,0.16920000000,heatpump,5,2034 -14,heat,all-week,evening,2028,all-year,R2,0.21150000000,heatpump,5,2034 -15,heat,all-week,evening,2030,all-year,R2,0.54980000000,heatpump,5,2034 -16,heat,all-week,evening,2032,all-year,R2,0.25370000000,heatpump,5,2034 -3,heat,all-week,early-morning,2024,all-year,R1,0.16920000000,heatpump,6,2034 -4,heat,all-week,early-morning,2026,all-year,R1,0.16920000000,heatpump,6,2034 -5,heat,all-week,early-morning,2028,all-year,R1,0.21150000000,heatpump,6,2034 -6,heat,all-week,early-morning,2030,all-year,R1,0.54980000000,heatpump,6,2034 -7,heat,all-week,early-morning,2032,all-year,R1,0.25370000000,heatpump,6,2034 -12,heat,all-week,early-morning,2024,all-year,R1,0.16920000000,heatpump,6,2034 -13,heat,all-week,early-morning,2026,all-year,R1,0.16920000000,heatpump,6,2034 -14,heat,all-week,early-morning,2028,all-year,R1,0.21150000000,heatpump,6,2034 -15,heat,all-week,early-morning,2030,all-year,R1,0.54980000000,heatpump,6,2034 -16,heat,all-week,early-morning,2032,all-year,R1,0.25370000000,heatpump,6,2034 -3,heat,all-week,early-morning,2024,all-year,R2,0.16920000000,heatpump,6,2034 -4,heat,all-week,early-morning,2026,all-year,R2,0.16920000000,heatpump,6,2034 -5,heat,all-week,early-morning,2028,all-year,R2,0.21150000000,heatpump,6,2034 -6,heat,all-week,early-morning,2030,all-year,R2,0.54980000000,heatpump,6,2034 -7,heat,all-week,early-morning,2032,all-year,R2,0.25370000000,heatpump,6,2034 -12,heat,all-week,early-morning,2024,all-year,R2,0.16920000000,heatpump,6,2034 -13,heat,all-week,early-morning,2026,all-year,R2,0.16920000000,heatpump,6,2034 -14,heat,all-week,early-morning,2028,all-year,R2,0.21150000000,heatpump,6,2034 -15,heat,all-week,early-morning,2030,all-year,R2,0.54980000000,heatpump,6,2034 -16,heat,all-week,early-morning,2032,all-year,R2,0.25370000000,heatpump,6,2034 -3,heat,all-week,late-afternoon,2024,all-year,R1,0.16920000000,heatpump,7,2034 -4,heat,all-week,late-afternoon,2026,all-year,R1,0.16920000000,heatpump,7,2034 -5,heat,all-week,late-afternoon,2028,all-year,R1,0.21150000000,heatpump,7,2034 -6,heat,all-week,late-afternoon,2030,all-year,R1,0.54980000000,heatpump,7,2034 -7,heat,all-week,late-afternoon,2032,all-year,R1,0.25370000000,heatpump,7,2034 -12,heat,all-week,late-afternoon,2024,all-year,R1,0.16920000000,heatpump,7,2034 -13,heat,all-week,late-afternoon,2026,all-year,R1,0.16920000000,heatpump,7,2034 -14,heat,all-week,late-afternoon,2028,all-year,R1,0.21150000000,heatpump,7,2034 -15,heat,all-week,late-afternoon,2030,all-year,R1,0.54980000000,heatpump,7,2034 -16,heat,all-week,late-afternoon,2032,all-year,R1,0.25370000000,heatpump,7,2034 -3,heat,all-week,late-afternoon,2024,all-year,R2,0.16920000000,heatpump,7,2034 -4,heat,all-week,late-afternoon,2026,all-year,R2,0.16920000000,heatpump,7,2034 -5,heat,all-week,late-afternoon,2028,all-year,R2,0.21150000000,heatpump,7,2034 -6,heat,all-week,late-afternoon,2030,all-year,R2,0.54980000000,heatpump,7,2034 -7,heat,all-week,late-afternoon,2032,all-year,R2,0.25370000000,heatpump,7,2034 -12,heat,all-week,late-afternoon,2024,all-year,R2,0.16920000000,heatpump,7,2034 -13,heat,all-week,late-afternoon,2026,all-year,R2,0.16920000000,heatpump,7,2034 -14,heat,all-week,late-afternoon,2028,all-year,R2,0.21150000000,heatpump,7,2034 -15,heat,all-week,late-afternoon,2030,all-year,R2,0.54980000000,heatpump,7,2034 -16,heat,all-week,late-afternoon,2032,all-year,R2,0.25370000000,heatpump,7,2034 -4,heat,all-week,night,2026,all-year,R1,0.08510000000,heatpump,0,2036 -5,heat,all-week,night,2028,all-year,R1,0.10640000000,heatpump,0,2036 -6,heat,all-week,night,2030,all-year,R1,0.27660000000,heatpump,0,2036 -7,heat,all-week,night,2032,all-year,R1,0.12760000000,heatpump,0,2036 -8,heat,all-week,night,2034,all-year,R1,0.12760000000,heatpump,0,2036 -14,heat,all-week,night,2026,all-year,R1,0.08510000000,heatpump,0,2036 -15,heat,all-week,night,2028,all-year,R1,0.10640000000,heatpump,0,2036 -16,heat,all-week,night,2030,all-year,R1,0.27660000000,heatpump,0,2036 -17,heat,all-week,night,2032,all-year,R1,0.12760000000,heatpump,0,2036 -18,heat,all-week,night,2034,all-year,R1,0.12760000000,heatpump,0,2036 -4,heat,all-week,night,2026,all-year,R2,0.08510000000,heatpump,0,2036 -5,heat,all-week,night,2028,all-year,R2,0.10640000000,heatpump,0,2036 -6,heat,all-week,night,2030,all-year,R2,0.27660000000,heatpump,0,2036 -7,heat,all-week,night,2032,all-year,R2,0.12760000000,heatpump,0,2036 -8,heat,all-week,night,2034,all-year,R2,0.12760000000,heatpump,0,2036 -14,heat,all-week,night,2026,all-year,R2,0.08510000000,heatpump,0,2036 -15,heat,all-week,night,2028,all-year,R2,0.10640000000,heatpump,0,2036 -16,heat,all-week,night,2030,all-year,R2,0.27660000000,heatpump,0,2036 -17,heat,all-week,night,2032,all-year,R2,0.12760000000,heatpump,0,2036 -18,heat,all-week,night,2034,all-year,R2,0.12760000000,heatpump,0,2036 -4,heat,all-week,morning,2026,all-year,R1,0.12160000000,heatpump,1,2036 -5,heat,all-week,morning,2028,all-year,R1,0.15200000000,heatpump,1,2036 -6,heat,all-week,morning,2030,all-year,R1,0.39510000000,heatpump,1,2036 -7,heat,all-week,morning,2032,all-year,R1,0.18240000000,heatpump,1,2036 -8,heat,all-week,morning,2034,all-year,R1,0.18240000000,heatpump,1,2036 -14,heat,all-week,morning,2026,all-year,R1,0.12160000000,heatpump,1,2036 -15,heat,all-week,morning,2028,all-year,R1,0.15200000000,heatpump,1,2036 -16,heat,all-week,morning,2030,all-year,R1,0.39510000000,heatpump,1,2036 -17,heat,all-week,morning,2032,all-year,R1,0.18240000000,heatpump,1,2036 -18,heat,all-week,morning,2034,all-year,R1,0.18240000000,heatpump,1,2036 -4,heat,all-week,morning,2026,all-year,R2,0.12160000000,heatpump,1,2036 -5,heat,all-week,morning,2028,all-year,R2,0.15200000000,heatpump,1,2036 -6,heat,all-week,morning,2030,all-year,R2,0.39510000000,heatpump,1,2036 -7,heat,all-week,morning,2032,all-year,R2,0.18240000000,heatpump,1,2036 -8,heat,all-week,morning,2034,all-year,R2,0.18240000000,heatpump,1,2036 -14,heat,all-week,morning,2026,all-year,R2,0.12160000000,heatpump,1,2036 -15,heat,all-week,morning,2028,all-year,R2,0.15200000000,heatpump,1,2036 -16,heat,all-week,morning,2030,all-year,R2,0.39510000000,heatpump,1,2036 -17,heat,all-week,morning,2032,all-year,R2,0.18240000000,heatpump,1,2036 -18,heat,all-week,morning,2034,all-year,R2,0.18240000000,heatpump,1,2036 -4,heat,all-week,mid-afternoon,2026,all-year,R1,0.08510000000,heatpump,2,2036 -5,heat,all-week,mid-afternoon,2028,all-year,R1,0.10640000000,heatpump,2,2036 -6,heat,all-week,mid-afternoon,2030,all-year,R1,0.27660000000,heatpump,2,2036 -7,heat,all-week,mid-afternoon,2032,all-year,R1,0.12760000000,heatpump,2,2036 -8,heat,all-week,mid-afternoon,2034,all-year,R1,0.12760000000,heatpump,2,2036 -14,heat,all-week,mid-afternoon,2026,all-year,R1,0.08510000000,heatpump,2,2036 -15,heat,all-week,mid-afternoon,2028,all-year,R1,0.10640000000,heatpump,2,2036 -16,heat,all-week,mid-afternoon,2030,all-year,R1,0.27660000000,heatpump,2,2036 -17,heat,all-week,mid-afternoon,2032,all-year,R1,0.12760000000,heatpump,2,2036 -18,heat,all-week,mid-afternoon,2034,all-year,R1,0.12760000000,heatpump,2,2036 -4,heat,all-week,mid-afternoon,2026,all-year,R2,0.08510000000,heatpump,2,2036 -5,heat,all-week,mid-afternoon,2028,all-year,R2,0.10640000000,heatpump,2,2036 -6,heat,all-week,mid-afternoon,2030,all-year,R2,0.27660000000,heatpump,2,2036 -7,heat,all-week,mid-afternoon,2032,all-year,R2,0.12760000000,heatpump,2,2036 -8,heat,all-week,mid-afternoon,2034,all-year,R2,0.12760000000,heatpump,2,2036 -14,heat,all-week,mid-afternoon,2026,all-year,R2,0.08510000000,heatpump,2,2036 -15,heat,all-week,mid-afternoon,2028,all-year,R2,0.10640000000,heatpump,2,2036 -16,heat,all-week,mid-afternoon,2030,all-year,R2,0.27660000000,heatpump,2,2036 -17,heat,all-week,mid-afternoon,2032,all-year,R2,0.12760000000,heatpump,2,2036 -18,heat,all-week,mid-afternoon,2034,all-year,R2,0.12760000000,heatpump,2,2036 -4,heat,all-week,early-peak,2026,all-year,R1,0.12160000000,heatpump,3,2036 -5,heat,all-week,early-peak,2028,all-year,R1,0.15200000000,heatpump,3,2036 -6,heat,all-week,early-peak,2030,all-year,R1,0.39510000000,heatpump,3,2036 -7,heat,all-week,early-peak,2032,all-year,R1,0.18240000000,heatpump,3,2036 -8,heat,all-week,early-peak,2034,all-year,R1,0.18240000000,heatpump,3,2036 -14,heat,all-week,early-peak,2026,all-year,R1,0.12160000000,heatpump,3,2036 -15,heat,all-week,early-peak,2028,all-year,R1,0.15200000000,heatpump,3,2036 -16,heat,all-week,early-peak,2030,all-year,R1,0.39510000000,heatpump,3,2036 -17,heat,all-week,early-peak,2032,all-year,R1,0.18240000000,heatpump,3,2036 -18,heat,all-week,early-peak,2034,all-year,R1,0.18240000000,heatpump,3,2036 -4,heat,all-week,early-peak,2026,all-year,R2,0.12160000000,heatpump,3,2036 -5,heat,all-week,early-peak,2028,all-year,R2,0.15200000000,heatpump,3,2036 -6,heat,all-week,early-peak,2030,all-year,R2,0.39510000000,heatpump,3,2036 -7,heat,all-week,early-peak,2032,all-year,R2,0.18240000000,heatpump,3,2036 -8,heat,all-week,early-peak,2034,all-year,R2,0.18240000000,heatpump,3,2036 -14,heat,all-week,early-peak,2026,all-year,R2,0.12160000000,heatpump,3,2036 -15,heat,all-week,early-peak,2028,all-year,R2,0.15200000000,heatpump,3,2036 -16,heat,all-week,early-peak,2030,all-year,R2,0.39510000000,heatpump,3,2036 -17,heat,all-week,early-peak,2032,all-year,R2,0.18240000000,heatpump,3,2036 -18,heat,all-week,early-peak,2034,all-year,R2,0.18240000000,heatpump,3,2036 -4,heat,all-week,late-peak,2026,all-year,R1,0.25530000000,heatpump,4,2036 -5,heat,all-week,late-peak,2028,all-year,R1,0.31910000000,heatpump,4,2036 -6,heat,all-week,late-peak,2030,all-year,R1,0.82970000000,heatpump,4,2036 -7,heat,all-week,late-peak,2032,all-year,R1,0.38290000000,heatpump,4,2036 -8,heat,all-week,late-peak,2034,all-year,R1,0.38290000000,heatpump,4,2036 -14,heat,all-week,late-peak,2026,all-year,R1,0.25530000000,heatpump,4,2036 -15,heat,all-week,late-peak,2028,all-year,R1,0.31910000000,heatpump,4,2036 -16,heat,all-week,late-peak,2030,all-year,R1,0.82970000000,heatpump,4,2036 -17,heat,all-week,late-peak,2032,all-year,R1,0.38290000000,heatpump,4,2036 -18,heat,all-week,late-peak,2034,all-year,R1,0.38290000000,heatpump,4,2036 -4,heat,all-week,late-peak,2026,all-year,R2,0.25530000000,heatpump,4,2036 -5,heat,all-week,late-peak,2028,all-year,R2,0.31910000000,heatpump,4,2036 -6,heat,all-week,late-peak,2030,all-year,R2,0.82970000000,heatpump,4,2036 -7,heat,all-week,late-peak,2032,all-year,R2,0.38290000000,heatpump,4,2036 -8,heat,all-week,late-peak,2034,all-year,R2,0.38290000000,heatpump,4,2036 -14,heat,all-week,late-peak,2026,all-year,R2,0.25530000000,heatpump,4,2036 -15,heat,all-week,late-peak,2028,all-year,R2,0.31910000000,heatpump,4,2036 -16,heat,all-week,late-peak,2030,all-year,R2,0.82970000000,heatpump,4,2036 -17,heat,all-week,late-peak,2032,all-year,R2,0.38290000000,heatpump,4,2036 -18,heat,all-week,late-peak,2034,all-year,R2,0.38290000000,heatpump,4,2036 -4,heat,all-week,evening,2026,all-year,R1,0.17020000000,heatpump,5,2036 -5,heat,all-week,evening,2028,all-year,R1,0.21270000000,heatpump,5,2036 -6,heat,all-week,evening,2030,all-year,R1,0.55310000000,heatpump,5,2036 -7,heat,all-week,evening,2032,all-year,R1,0.25530000000,heatpump,5,2036 -8,heat,all-week,evening,2034,all-year,R1,0.25530000000,heatpump,5,2036 -14,heat,all-week,evening,2026,all-year,R1,0.17020000000,heatpump,5,2036 -15,heat,all-week,evening,2028,all-year,R1,0.21270000000,heatpump,5,2036 -16,heat,all-week,evening,2030,all-year,R1,0.55310000000,heatpump,5,2036 -17,heat,all-week,evening,2032,all-year,R1,0.25530000000,heatpump,5,2036 -18,heat,all-week,evening,2034,all-year,R1,0.25530000000,heatpump,5,2036 -4,heat,all-week,evening,2026,all-year,R2,0.17020000000,heatpump,5,2036 -5,heat,all-week,evening,2028,all-year,R2,0.21270000000,heatpump,5,2036 -6,heat,all-week,evening,2030,all-year,R2,0.55310000000,heatpump,5,2036 -7,heat,all-week,evening,2032,all-year,R2,0.25530000000,heatpump,5,2036 -8,heat,all-week,evening,2034,all-year,R2,0.25530000000,heatpump,5,2036 -14,heat,all-week,evening,2026,all-year,R2,0.17020000000,heatpump,5,2036 -15,heat,all-week,evening,2028,all-year,R2,0.21270000000,heatpump,5,2036 -16,heat,all-week,evening,2030,all-year,R2,0.55310000000,heatpump,5,2036 -17,heat,all-week,evening,2032,all-year,R2,0.25530000000,heatpump,5,2036 -18,heat,all-week,evening,2034,all-year,R2,0.25530000000,heatpump,5,2036 -4,heat,all-week,early-morning,2026,all-year,R1,0.17020000000,heatpump,6,2036 -5,heat,all-week,early-morning,2028,all-year,R1,0.21270000000,heatpump,6,2036 -6,heat,all-week,early-morning,2030,all-year,R1,0.55310000000,heatpump,6,2036 -7,heat,all-week,early-morning,2032,all-year,R1,0.25530000000,heatpump,6,2036 -8,heat,all-week,early-morning,2034,all-year,R1,0.25530000000,heatpump,6,2036 -14,heat,all-week,early-morning,2026,all-year,R1,0.17020000000,heatpump,6,2036 -15,heat,all-week,early-morning,2028,all-year,R1,0.21270000000,heatpump,6,2036 -16,heat,all-week,early-morning,2030,all-year,R1,0.55310000000,heatpump,6,2036 -17,heat,all-week,early-morning,2032,all-year,R1,0.25530000000,heatpump,6,2036 -18,heat,all-week,early-morning,2034,all-year,R1,0.25530000000,heatpump,6,2036 -4,heat,all-week,early-morning,2026,all-year,R2,0.17020000000,heatpump,6,2036 -5,heat,all-week,early-morning,2028,all-year,R2,0.21270000000,heatpump,6,2036 -6,heat,all-week,early-morning,2030,all-year,R2,0.55310000000,heatpump,6,2036 -7,heat,all-week,early-morning,2032,all-year,R2,0.25530000000,heatpump,6,2036 -8,heat,all-week,early-morning,2034,all-year,R2,0.25530000000,heatpump,6,2036 -14,heat,all-week,early-morning,2026,all-year,R2,0.17020000000,heatpump,6,2036 -15,heat,all-week,early-morning,2028,all-year,R2,0.21270000000,heatpump,6,2036 -16,heat,all-week,early-morning,2030,all-year,R2,0.55310000000,heatpump,6,2036 -17,heat,all-week,early-morning,2032,all-year,R2,0.25530000000,heatpump,6,2036 -18,heat,all-week,early-morning,2034,all-year,R2,0.25530000000,heatpump,6,2036 -4,heat,all-week,late-afternoon,2026,all-year,R1,0.17020000000,heatpump,7,2036 -5,heat,all-week,late-afternoon,2028,all-year,R1,0.21270000000,heatpump,7,2036 -6,heat,all-week,late-afternoon,2030,all-year,R1,0.55310000000,heatpump,7,2036 -7,heat,all-week,late-afternoon,2032,all-year,R1,0.25530000000,heatpump,7,2036 -8,heat,all-week,late-afternoon,2034,all-year,R1,0.25530000000,heatpump,7,2036 -14,heat,all-week,late-afternoon,2026,all-year,R1,0.17020000000,heatpump,7,2036 -15,heat,all-week,late-afternoon,2028,all-year,R1,0.21270000000,heatpump,7,2036 -16,heat,all-week,late-afternoon,2030,all-year,R1,0.55310000000,heatpump,7,2036 -17,heat,all-week,late-afternoon,2032,all-year,R1,0.25530000000,heatpump,7,2036 -18,heat,all-week,late-afternoon,2034,all-year,R1,0.25530000000,heatpump,7,2036 -4,heat,all-week,late-afternoon,2026,all-year,R2,0.17020000000,heatpump,7,2036 -5,heat,all-week,late-afternoon,2028,all-year,R2,0.21270000000,heatpump,7,2036 -6,heat,all-week,late-afternoon,2030,all-year,R2,0.55310000000,heatpump,7,2036 -7,heat,all-week,late-afternoon,2032,all-year,R2,0.25530000000,heatpump,7,2036 -8,heat,all-week,late-afternoon,2034,all-year,R2,0.25530000000,heatpump,7,2036 -14,heat,all-week,late-afternoon,2026,all-year,R2,0.17020000000,heatpump,7,2036 -15,heat,all-week,late-afternoon,2028,all-year,R2,0.21270000000,heatpump,7,2036 -16,heat,all-week,late-afternoon,2030,all-year,R2,0.55310000000,heatpump,7,2036 -17,heat,all-week,late-afternoon,2032,all-year,R2,0.25530000000,heatpump,7,2036 -18,heat,all-week,late-afternoon,2034,all-year,R2,0.25530000000,heatpump,7,2036 -5,heat,all-week,night,2028,all-year,R1,0.10690000000,heatpump,0,2038 -6,heat,all-week,night,2030,all-year,R1,0.27810000000,heatpump,0,2038 -7,heat,all-week,night,2032,all-year,R1,0.12830000000,heatpump,0,2038 -8,heat,all-week,night,2034,all-year,R1,0.12830000000,heatpump,0,2038 -9,heat,all-week,night,2036,all-year,R1,0.12830000000,heatpump,0,2038 -16,heat,all-week,night,2028,all-year,R1,0.10690000000,heatpump,0,2038 -17,heat,all-week,night,2030,all-year,R1,0.27810000000,heatpump,0,2038 -18,heat,all-week,night,2032,all-year,R1,0.12830000000,heatpump,0,2038 -19,heat,all-week,night,2034,all-year,R1,0.12830000000,heatpump,0,2038 -20,heat,all-week,night,2036,all-year,R1,0.12830000000,heatpump,0,2038 -5,heat,all-week,night,2028,all-year,R2,0.10690000000,heatpump,0,2038 -6,heat,all-week,night,2030,all-year,R2,0.27810000000,heatpump,0,2038 -7,heat,all-week,night,2032,all-year,R2,0.12830000000,heatpump,0,2038 -8,heat,all-week,night,2034,all-year,R2,0.12830000000,heatpump,0,2038 -9,heat,all-week,night,2036,all-year,R2,0.12830000000,heatpump,0,2038 -16,heat,all-week,night,2028,all-year,R2,0.10690000000,heatpump,0,2038 -17,heat,all-week,night,2030,all-year,R2,0.27810000000,heatpump,0,2038 -18,heat,all-week,night,2032,all-year,R2,0.12830000000,heatpump,0,2038 -19,heat,all-week,night,2034,all-year,R2,0.12830000000,heatpump,0,2038 -20,heat,all-week,night,2036,all-year,R2,0.12830000000,heatpump,0,2038 -5,heat,all-week,morning,2028,all-year,R1,0.15280000000,heatpump,1,2038 -6,heat,all-week,morning,2030,all-year,R1,0.39720000000,heatpump,1,2038 -7,heat,all-week,morning,2032,all-year,R1,0.18330000000,heatpump,1,2038 -8,heat,all-week,morning,2034,all-year,R1,0.18330000000,heatpump,1,2038 -9,heat,all-week,morning,2036,all-year,R1,0.18330000000,heatpump,1,2038 -16,heat,all-week,morning,2028,all-year,R1,0.15280000000,heatpump,1,2038 -17,heat,all-week,morning,2030,all-year,R1,0.39720000000,heatpump,1,2038 -18,heat,all-week,morning,2032,all-year,R1,0.18330000000,heatpump,1,2038 -19,heat,all-week,morning,2034,all-year,R1,0.18330000000,heatpump,1,2038 -20,heat,all-week,morning,2036,all-year,R1,0.18330000000,heatpump,1,2038 -5,heat,all-week,morning,2028,all-year,R2,0.15280000000,heatpump,1,2038 -6,heat,all-week,morning,2030,all-year,R2,0.39720000000,heatpump,1,2038 -7,heat,all-week,morning,2032,all-year,R2,0.18330000000,heatpump,1,2038 -8,heat,all-week,morning,2034,all-year,R2,0.18330000000,heatpump,1,2038 -9,heat,all-week,morning,2036,all-year,R2,0.18330000000,heatpump,1,2038 -16,heat,all-week,morning,2028,all-year,R2,0.15280000000,heatpump,1,2038 -17,heat,all-week,morning,2030,all-year,R2,0.39720000000,heatpump,1,2038 -18,heat,all-week,morning,2032,all-year,R2,0.18330000000,heatpump,1,2038 -19,heat,all-week,morning,2034,all-year,R2,0.18330000000,heatpump,1,2038 -20,heat,all-week,morning,2036,all-year,R2,0.18330000000,heatpump,1,2038 -5,heat,all-week,mid-afternoon,2028,all-year,R1,0.10690000000,heatpump,2,2038 -6,heat,all-week,mid-afternoon,2030,all-year,R1,0.27810000000,heatpump,2,2038 -7,heat,all-week,mid-afternoon,2032,all-year,R1,0.12830000000,heatpump,2,2038 -8,heat,all-week,mid-afternoon,2034,all-year,R1,0.12830000000,heatpump,2,2038 -9,heat,all-week,mid-afternoon,2036,all-year,R1,0.12830000000,heatpump,2,2038 -16,heat,all-week,mid-afternoon,2028,all-year,R1,0.10690000000,heatpump,2,2038 -17,heat,all-week,mid-afternoon,2030,all-year,R1,0.27810000000,heatpump,2,2038 -18,heat,all-week,mid-afternoon,2032,all-year,R1,0.12830000000,heatpump,2,2038 -19,heat,all-week,mid-afternoon,2034,all-year,R1,0.12830000000,heatpump,2,2038 -20,heat,all-week,mid-afternoon,2036,all-year,R1,0.12830000000,heatpump,2,2038 -5,heat,all-week,mid-afternoon,2028,all-year,R2,0.10690000000,heatpump,2,2038 -6,heat,all-week,mid-afternoon,2030,all-year,R2,0.27810000000,heatpump,2,2038 -7,heat,all-week,mid-afternoon,2032,all-year,R2,0.12830000000,heatpump,2,2038 -8,heat,all-week,mid-afternoon,2034,all-year,R2,0.12830000000,heatpump,2,2038 -9,heat,all-week,mid-afternoon,2036,all-year,R2,0.12830000000,heatpump,2,2038 -16,heat,all-week,mid-afternoon,2028,all-year,R2,0.10690000000,heatpump,2,2038 -17,heat,all-week,mid-afternoon,2030,all-year,R2,0.27810000000,heatpump,2,2038 -18,heat,all-week,mid-afternoon,2032,all-year,R2,0.12830000000,heatpump,2,2038 -19,heat,all-week,mid-afternoon,2034,all-year,R2,0.12830000000,heatpump,2,2038 -20,heat,all-week,mid-afternoon,2036,all-year,R2,0.12830000000,heatpump,2,2038 -5,heat,all-week,early-peak,2028,all-year,R1,0.15280000000,heatpump,3,2038 -6,heat,all-week,early-peak,2030,all-year,R1,0.39720000000,heatpump,3,2038 -7,heat,all-week,early-peak,2032,all-year,R1,0.18330000000,heatpump,3,2038 -8,heat,all-week,early-peak,2034,all-year,R1,0.18330000000,heatpump,3,2038 -9,heat,all-week,early-peak,2036,all-year,R1,0.18330000000,heatpump,3,2038 -16,heat,all-week,early-peak,2028,all-year,R1,0.15280000000,heatpump,3,2038 -17,heat,all-week,early-peak,2030,all-year,R1,0.39720000000,heatpump,3,2038 -18,heat,all-week,early-peak,2032,all-year,R1,0.18330000000,heatpump,3,2038 -19,heat,all-week,early-peak,2034,all-year,R1,0.18330000000,heatpump,3,2038 -20,heat,all-week,early-peak,2036,all-year,R1,0.18330000000,heatpump,3,2038 -5,heat,all-week,early-peak,2028,all-year,R2,0.15280000000,heatpump,3,2038 -6,heat,all-week,early-peak,2030,all-year,R2,0.39720000000,heatpump,3,2038 -7,heat,all-week,early-peak,2032,all-year,R2,0.18330000000,heatpump,3,2038 -8,heat,all-week,early-peak,2034,all-year,R2,0.18330000000,heatpump,3,2038 -9,heat,all-week,early-peak,2036,all-year,R2,0.18330000000,heatpump,3,2038 -16,heat,all-week,early-peak,2028,all-year,R2,0.15280000000,heatpump,3,2038 -17,heat,all-week,early-peak,2030,all-year,R2,0.39720000000,heatpump,3,2038 -18,heat,all-week,early-peak,2032,all-year,R2,0.18330000000,heatpump,3,2038 -19,heat,all-week,early-peak,2034,all-year,R2,0.18330000000,heatpump,3,2038 -20,heat,all-week,early-peak,2036,all-year,R2,0.18330000000,heatpump,3,2038 -5,heat,all-week,late-peak,2028,all-year,R1,0.32080000000,heatpump,4,2038 -6,heat,all-week,late-peak,2030,all-year,R1,0.83420000000,heatpump,4,2038 -7,heat,all-week,late-peak,2032,all-year,R1,0.38500000000,heatpump,4,2038 -8,heat,all-week,late-peak,2034,all-year,R1,0.38500000000,heatpump,4,2038 -9,heat,all-week,late-peak,2036,all-year,R1,0.38500000000,heatpump,4,2038 -16,heat,all-week,late-peak,2028,all-year,R1,0.32080000000,heatpump,4,2038 -17,heat,all-week,late-peak,2030,all-year,R1,0.83420000000,heatpump,4,2038 -18,heat,all-week,late-peak,2032,all-year,R1,0.38500000000,heatpump,4,2038 -19,heat,all-week,late-peak,2034,all-year,R1,0.38500000000,heatpump,4,2038 -20,heat,all-week,late-peak,2036,all-year,R1,0.38500000000,heatpump,4,2038 -5,heat,all-week,late-peak,2028,all-year,R2,0.32080000000,heatpump,4,2038 -6,heat,all-week,late-peak,2030,all-year,R2,0.83420000000,heatpump,4,2038 -7,heat,all-week,late-peak,2032,all-year,R2,0.38500000000,heatpump,4,2038 -8,heat,all-week,late-peak,2034,all-year,R2,0.38500000000,heatpump,4,2038 -9,heat,all-week,late-peak,2036,all-year,R2,0.38500000000,heatpump,4,2038 -16,heat,all-week,late-peak,2028,all-year,R2,0.32080000000,heatpump,4,2038 -17,heat,all-week,late-peak,2030,all-year,R2,0.83420000000,heatpump,4,2038 -18,heat,all-week,late-peak,2032,all-year,R2,0.38500000000,heatpump,4,2038 -19,heat,all-week,late-peak,2034,all-year,R2,0.38500000000,heatpump,4,2038 -20,heat,all-week,late-peak,2036,all-year,R2,0.38500000000,heatpump,4,2038 -5,heat,all-week,evening,2028,all-year,R1,0.21390000000,heatpump,5,2038 -6,heat,all-week,evening,2030,all-year,R1,0.55610000000,heatpump,5,2038 -7,heat,all-week,evening,2032,all-year,R1,0.25670000000,heatpump,5,2038 -8,heat,all-week,evening,2034,all-year,R1,0.25670000000,heatpump,5,2038 -9,heat,all-week,evening,2036,all-year,R1,0.25670000000,heatpump,5,2038 -16,heat,all-week,evening,2028,all-year,R1,0.21390000000,heatpump,5,2038 -17,heat,all-week,evening,2030,all-year,R1,0.55610000000,heatpump,5,2038 -18,heat,all-week,evening,2032,all-year,R1,0.25670000000,heatpump,5,2038 -19,heat,all-week,evening,2034,all-year,R1,0.25670000000,heatpump,5,2038 -20,heat,all-week,evening,2036,all-year,R1,0.25670000000,heatpump,5,2038 -5,heat,all-week,evening,2028,all-year,R2,0.21390000000,heatpump,5,2038 -6,heat,all-week,evening,2030,all-year,R2,0.55610000000,heatpump,5,2038 -7,heat,all-week,evening,2032,all-year,R2,0.25670000000,heatpump,5,2038 -8,heat,all-week,evening,2034,all-year,R2,0.25670000000,heatpump,5,2038 -9,heat,all-week,evening,2036,all-year,R2,0.25670000000,heatpump,5,2038 -16,heat,all-week,evening,2028,all-year,R2,0.21390000000,heatpump,5,2038 -17,heat,all-week,evening,2030,all-year,R2,0.55610000000,heatpump,5,2038 -18,heat,all-week,evening,2032,all-year,R2,0.25670000000,heatpump,5,2038 -19,heat,all-week,evening,2034,all-year,R2,0.25670000000,heatpump,5,2038 -20,heat,all-week,evening,2036,all-year,R2,0.25670000000,heatpump,5,2038 -5,heat,all-week,early-morning,2028,all-year,R1,0.21390000000,heatpump,6,2038 -6,heat,all-week,early-morning,2030,all-year,R1,0.55610000000,heatpump,6,2038 -7,heat,all-week,early-morning,2032,all-year,R1,0.25670000000,heatpump,6,2038 -8,heat,all-week,early-morning,2034,all-year,R1,0.25670000000,heatpump,6,2038 -9,heat,all-week,early-morning,2036,all-year,R1,0.25670000000,heatpump,6,2038 -16,heat,all-week,early-morning,2028,all-year,R1,0.21390000000,heatpump,6,2038 -17,heat,all-week,early-morning,2030,all-year,R1,0.55610000000,heatpump,6,2038 -18,heat,all-week,early-morning,2032,all-year,R1,0.25670000000,heatpump,6,2038 -19,heat,all-week,early-morning,2034,all-year,R1,0.25670000000,heatpump,6,2038 -20,heat,all-week,early-morning,2036,all-year,R1,0.25670000000,heatpump,6,2038 -5,heat,all-week,early-morning,2028,all-year,R2,0.21390000000,heatpump,6,2038 -6,heat,all-week,early-morning,2030,all-year,R2,0.55610000000,heatpump,6,2038 -7,heat,all-week,early-morning,2032,all-year,R2,0.25670000000,heatpump,6,2038 -8,heat,all-week,early-morning,2034,all-year,R2,0.25670000000,heatpump,6,2038 -9,heat,all-week,early-morning,2036,all-year,R2,0.25670000000,heatpump,6,2038 -16,heat,all-week,early-morning,2028,all-year,R2,0.21390000000,heatpump,6,2038 -17,heat,all-week,early-morning,2030,all-year,R2,0.55610000000,heatpump,6,2038 -18,heat,all-week,early-morning,2032,all-year,R2,0.25670000000,heatpump,6,2038 -19,heat,all-week,early-morning,2034,all-year,R2,0.25670000000,heatpump,6,2038 -20,heat,all-week,early-morning,2036,all-year,R2,0.25670000000,heatpump,6,2038 -5,heat,all-week,late-afternoon,2028,all-year,R1,0.21390000000,heatpump,7,2038 -6,heat,all-week,late-afternoon,2030,all-year,R1,0.55610000000,heatpump,7,2038 -7,heat,all-week,late-afternoon,2032,all-year,R1,0.25670000000,heatpump,7,2038 -8,heat,all-week,late-afternoon,2034,all-year,R1,0.25670000000,heatpump,7,2038 -9,heat,all-week,late-afternoon,2036,all-year,R1,0.25670000000,heatpump,7,2038 -16,heat,all-week,late-afternoon,2028,all-year,R1,0.21390000000,heatpump,7,2038 -17,heat,all-week,late-afternoon,2030,all-year,R1,0.55610000000,heatpump,7,2038 -18,heat,all-week,late-afternoon,2032,all-year,R1,0.25670000000,heatpump,7,2038 -19,heat,all-week,late-afternoon,2034,all-year,R1,0.25670000000,heatpump,7,2038 -20,heat,all-week,late-afternoon,2036,all-year,R1,0.25670000000,heatpump,7,2038 -5,heat,all-week,late-afternoon,2028,all-year,R2,0.21390000000,heatpump,7,2038 -6,heat,all-week,late-afternoon,2030,all-year,R2,0.55610000000,heatpump,7,2038 -7,heat,all-week,late-afternoon,2032,all-year,R2,0.25670000000,heatpump,7,2038 -8,heat,all-week,late-afternoon,2034,all-year,R2,0.25670000000,heatpump,7,2038 -9,heat,all-week,late-afternoon,2036,all-year,R2,0.25670000000,heatpump,7,2038 -16,heat,all-week,late-afternoon,2028,all-year,R2,0.21390000000,heatpump,7,2038 -17,heat,all-week,late-afternoon,2030,all-year,R2,0.55610000000,heatpump,7,2038 -18,heat,all-week,late-afternoon,2032,all-year,R2,0.25670000000,heatpump,7,2038 -19,heat,all-week,late-afternoon,2034,all-year,R2,0.25670000000,heatpump,7,2038 -20,heat,all-week,late-afternoon,2036,all-year,R2,0.25670000000,heatpump,7,2038 -6,heat,all-week,night,2030,all-year,R1,0.27220000000,heatpump,0,2040 -7,heat,all-week,night,2032,all-year,R1,0.12560000000,heatpump,0,2040 -8,heat,all-week,night,2034,all-year,R1,0.12560000000,heatpump,0,2040 -9,heat,all-week,night,2036,all-year,R1,0.12560000000,heatpump,0,2040 -10,heat,all-week,night,2038,all-year,R1,0.16750000000,heatpump,0,2040 -18,heat,all-week,night,2030,all-year,R1,0.27220000000,heatpump,0,2040 -19,heat,all-week,night,2032,all-year,R1,0.12560000000,heatpump,0,2040 -20,heat,all-week,night,2034,all-year,R1,0.12560000000,heatpump,0,2040 -21,heat,all-week,night,2036,all-year,R1,0.12560000000,heatpump,0,2040 -22,heat,all-week,night,2038,all-year,R1,0.16750000000,heatpump,0,2040 -6,heat,all-week,night,2030,all-year,R2,0.27220000000,heatpump,0,2040 -7,heat,all-week,night,2032,all-year,R2,0.12560000000,heatpump,0,2040 -8,heat,all-week,night,2034,all-year,R2,0.12560000000,heatpump,0,2040 -9,heat,all-week,night,2036,all-year,R2,0.12560000000,heatpump,0,2040 -10,heat,all-week,night,2038,all-year,R2,0.16750000000,heatpump,0,2040 -18,heat,all-week,night,2030,all-year,R2,0.27220000000,heatpump,0,2040 -19,heat,all-week,night,2032,all-year,R2,0.12560000000,heatpump,0,2040 -20,heat,all-week,night,2034,all-year,R2,0.12560000000,heatpump,0,2040 -21,heat,all-week,night,2036,all-year,R2,0.12560000000,heatpump,0,2040 -22,heat,all-week,night,2038,all-year,R2,0.16750000000,heatpump,0,2040 -6,heat,all-week,morning,2030,all-year,R1,0.38890000000,heatpump,1,2040 -7,heat,all-week,morning,2032,all-year,R1,0.17950000000,heatpump,1,2040 -8,heat,all-week,morning,2034,all-year,R1,0.17950000000,heatpump,1,2040 -9,heat,all-week,morning,2036,all-year,R1,0.17950000000,heatpump,1,2040 -10,heat,all-week,morning,2038,all-year,R1,0.23930000000,heatpump,1,2040 -18,heat,all-week,morning,2030,all-year,R1,0.38890000000,heatpump,1,2040 -19,heat,all-week,morning,2032,all-year,R1,0.17950000000,heatpump,1,2040 -20,heat,all-week,morning,2034,all-year,R1,0.17950000000,heatpump,1,2040 -21,heat,all-week,morning,2036,all-year,R1,0.17950000000,heatpump,1,2040 -22,heat,all-week,morning,2038,all-year,R1,0.23930000000,heatpump,1,2040 -6,heat,all-week,morning,2030,all-year,R2,0.38890000000,heatpump,1,2040 -7,heat,all-week,morning,2032,all-year,R2,0.17950000000,heatpump,1,2040 -8,heat,all-week,morning,2034,all-year,R2,0.17950000000,heatpump,1,2040 -9,heat,all-week,morning,2036,all-year,R2,0.17950000000,heatpump,1,2040 -10,heat,all-week,morning,2038,all-year,R2,0.23930000000,heatpump,1,2040 -18,heat,all-week,morning,2030,all-year,R2,0.38890000000,heatpump,1,2040 -19,heat,all-week,morning,2032,all-year,R2,0.17950000000,heatpump,1,2040 -20,heat,all-week,morning,2034,all-year,R2,0.17950000000,heatpump,1,2040 -21,heat,all-week,morning,2036,all-year,R2,0.17950000000,heatpump,1,2040 -22,heat,all-week,morning,2038,all-year,R2,0.23930000000,heatpump,1,2040 -6,heat,all-week,mid-afternoon,2030,all-year,R1,0.27220000000,heatpump,2,2040 -7,heat,all-week,mid-afternoon,2032,all-year,R1,0.12560000000,heatpump,2,2040 -8,heat,all-week,mid-afternoon,2034,all-year,R1,0.12560000000,heatpump,2,2040 -9,heat,all-week,mid-afternoon,2036,all-year,R1,0.12560000000,heatpump,2,2040 -10,heat,all-week,mid-afternoon,2038,all-year,R1,0.16750000000,heatpump,2,2040 -18,heat,all-week,mid-afternoon,2030,all-year,R1,0.27220000000,heatpump,2,2040 -19,heat,all-week,mid-afternoon,2032,all-year,R1,0.12560000000,heatpump,2,2040 -20,heat,all-week,mid-afternoon,2034,all-year,R1,0.12560000000,heatpump,2,2040 -21,heat,all-week,mid-afternoon,2036,all-year,R1,0.12560000000,heatpump,2,2040 -22,heat,all-week,mid-afternoon,2038,all-year,R1,0.16750000000,heatpump,2,2040 -6,heat,all-week,mid-afternoon,2030,all-year,R2,0.27220000000,heatpump,2,2040 -7,heat,all-week,mid-afternoon,2032,all-year,R2,0.12560000000,heatpump,2,2040 -8,heat,all-week,mid-afternoon,2034,all-year,R2,0.12560000000,heatpump,2,2040 -9,heat,all-week,mid-afternoon,2036,all-year,R2,0.12560000000,heatpump,2,2040 -10,heat,all-week,mid-afternoon,2038,all-year,R2,0.16750000000,heatpump,2,2040 -18,heat,all-week,mid-afternoon,2030,all-year,R2,0.27220000000,heatpump,2,2040 -19,heat,all-week,mid-afternoon,2032,all-year,R2,0.12560000000,heatpump,2,2040 -20,heat,all-week,mid-afternoon,2034,all-year,R2,0.12560000000,heatpump,2,2040 -21,heat,all-week,mid-afternoon,2036,all-year,R2,0.12560000000,heatpump,2,2040 -22,heat,all-week,mid-afternoon,2038,all-year,R2,0.16750000000,heatpump,2,2040 -6,heat,all-week,early-peak,2030,all-year,R1,0.38890000000,heatpump,3,2040 -7,heat,all-week,early-peak,2032,all-year,R1,0.17950000000,heatpump,3,2040 -8,heat,all-week,early-peak,2034,all-year,R1,0.17950000000,heatpump,3,2040 -9,heat,all-week,early-peak,2036,all-year,R1,0.17950000000,heatpump,3,2040 -10,heat,all-week,early-peak,2038,all-year,R1,0.23930000000,heatpump,3,2040 -18,heat,all-week,early-peak,2030,all-year,R1,0.38890000000,heatpump,3,2040 -19,heat,all-week,early-peak,2032,all-year,R1,0.17950000000,heatpump,3,2040 -20,heat,all-week,early-peak,2034,all-year,R1,0.17950000000,heatpump,3,2040 -21,heat,all-week,early-peak,2036,all-year,R1,0.17950000000,heatpump,3,2040 -22,heat,all-week,early-peak,2038,all-year,R1,0.23930000000,heatpump,3,2040 -6,heat,all-week,early-peak,2030,all-year,R2,0.38890000000,heatpump,3,2040 -7,heat,all-week,early-peak,2032,all-year,R2,0.17950000000,heatpump,3,2040 -8,heat,all-week,early-peak,2034,all-year,R2,0.17950000000,heatpump,3,2040 -9,heat,all-week,early-peak,2036,all-year,R2,0.17950000000,heatpump,3,2040 -10,heat,all-week,early-peak,2038,all-year,R2,0.23930000000,heatpump,3,2040 -18,heat,all-week,early-peak,2030,all-year,R2,0.38890000000,heatpump,3,2040 -19,heat,all-week,early-peak,2032,all-year,R2,0.17950000000,heatpump,3,2040 -20,heat,all-week,early-peak,2034,all-year,R2,0.17950000000,heatpump,3,2040 -21,heat,all-week,early-peak,2036,all-year,R2,0.17950000000,heatpump,3,2040 -22,heat,all-week,early-peak,2038,all-year,R2,0.23930000000,heatpump,3,2040 -6,heat,all-week,late-peak,2030,all-year,R1,0.81670000000,heatpump,4,2040 -7,heat,all-week,late-peak,2032,all-year,R1,0.37690000000,heatpump,4,2040 -8,heat,all-week,late-peak,2034,all-year,R1,0.37690000000,heatpump,4,2040 -9,heat,all-week,late-peak,2036,all-year,R1,0.37690000000,heatpump,4,2040 -10,heat,all-week,late-peak,2038,all-year,R1,0.50260000000,heatpump,4,2040 -18,heat,all-week,late-peak,2030,all-year,R1,0.81670000000,heatpump,4,2040 -19,heat,all-week,late-peak,2032,all-year,R1,0.37690000000,heatpump,4,2040 -20,heat,all-week,late-peak,2034,all-year,R1,0.37690000000,heatpump,4,2040 -21,heat,all-week,late-peak,2036,all-year,R1,0.37690000000,heatpump,4,2040 -22,heat,all-week,late-peak,2038,all-year,R1,0.50260000000,heatpump,4,2040 -6,heat,all-week,late-peak,2030,all-year,R2,0.81670000000,heatpump,4,2040 -7,heat,all-week,late-peak,2032,all-year,R2,0.37690000000,heatpump,4,2040 -8,heat,all-week,late-peak,2034,all-year,R2,0.37690000000,heatpump,4,2040 -9,heat,all-week,late-peak,2036,all-year,R2,0.37690000000,heatpump,4,2040 -10,heat,all-week,late-peak,2038,all-year,R2,0.50260000000,heatpump,4,2040 -18,heat,all-week,late-peak,2030,all-year,R2,0.81670000000,heatpump,4,2040 -19,heat,all-week,late-peak,2032,all-year,R2,0.37690000000,heatpump,4,2040 -20,heat,all-week,late-peak,2034,all-year,R2,0.37690000000,heatpump,4,2040 -21,heat,all-week,late-peak,2036,all-year,R2,0.37690000000,heatpump,4,2040 -22,heat,all-week,late-peak,2038,all-year,R2,0.50260000000,heatpump,4,2040 -6,heat,all-week,evening,2030,all-year,R1,0.54440000000,heatpump,5,2040 -7,heat,all-week,evening,2032,all-year,R1,0.25130000000,heatpump,5,2040 -8,heat,all-week,evening,2034,all-year,R1,0.25130000000,heatpump,5,2040 -9,heat,all-week,evening,2036,all-year,R1,0.25130000000,heatpump,5,2040 -10,heat,all-week,evening,2038,all-year,R1,0.33500000000,heatpump,5,2040 -18,heat,all-week,evening,2030,all-year,R1,0.54440000000,heatpump,5,2040 -19,heat,all-week,evening,2032,all-year,R1,0.25130000000,heatpump,5,2040 -20,heat,all-week,evening,2034,all-year,R1,0.25130000000,heatpump,5,2040 -21,heat,all-week,evening,2036,all-year,R1,0.25130000000,heatpump,5,2040 -22,heat,all-week,evening,2038,all-year,R1,0.33500000000,heatpump,5,2040 -6,heat,all-week,evening,2030,all-year,R2,0.54440000000,heatpump,5,2040 -7,heat,all-week,evening,2032,all-year,R2,0.25130000000,heatpump,5,2040 -8,heat,all-week,evening,2034,all-year,R2,0.25130000000,heatpump,5,2040 -9,heat,all-week,evening,2036,all-year,R2,0.25130000000,heatpump,5,2040 -10,heat,all-week,evening,2038,all-year,R2,0.33500000000,heatpump,5,2040 -18,heat,all-week,evening,2030,all-year,R2,0.54440000000,heatpump,5,2040 -19,heat,all-week,evening,2032,all-year,R2,0.25130000000,heatpump,5,2040 -20,heat,all-week,evening,2034,all-year,R2,0.25130000000,heatpump,5,2040 -21,heat,all-week,evening,2036,all-year,R2,0.25130000000,heatpump,5,2040 -22,heat,all-week,evening,2038,all-year,R2,0.33500000000,heatpump,5,2040 -6,heat,all-week,early-morning,2030,all-year,R1,0.54440000000,heatpump,6,2040 -7,heat,all-week,early-morning,2032,all-year,R1,0.25130000000,heatpump,6,2040 -8,heat,all-week,early-morning,2034,all-year,R1,0.25130000000,heatpump,6,2040 -9,heat,all-week,early-morning,2036,all-year,R1,0.25130000000,heatpump,6,2040 -10,heat,all-week,early-morning,2038,all-year,R1,0.33500000000,heatpump,6,2040 -18,heat,all-week,early-morning,2030,all-year,R1,0.54440000000,heatpump,6,2040 -19,heat,all-week,early-morning,2032,all-year,R1,0.25130000000,heatpump,6,2040 -20,heat,all-week,early-morning,2034,all-year,R1,0.25130000000,heatpump,6,2040 -21,heat,all-week,early-morning,2036,all-year,R1,0.25130000000,heatpump,6,2040 -22,heat,all-week,early-morning,2038,all-year,R1,0.33500000000,heatpump,6,2040 -6,heat,all-week,early-morning,2030,all-year,R2,0.54440000000,heatpump,6,2040 -7,heat,all-week,early-morning,2032,all-year,R2,0.25130000000,heatpump,6,2040 -8,heat,all-week,early-morning,2034,all-year,R2,0.25130000000,heatpump,6,2040 -9,heat,all-week,early-morning,2036,all-year,R2,0.25130000000,heatpump,6,2040 -10,heat,all-week,early-morning,2038,all-year,R2,0.33500000000,heatpump,6,2040 -18,heat,all-week,early-morning,2030,all-year,R2,0.54440000000,heatpump,6,2040 -19,heat,all-week,early-morning,2032,all-year,R2,0.25130000000,heatpump,6,2040 -20,heat,all-week,early-morning,2034,all-year,R2,0.25130000000,heatpump,6,2040 -21,heat,all-week,early-morning,2036,all-year,R2,0.25130000000,heatpump,6,2040 -22,heat,all-week,early-morning,2038,all-year,R2,0.33500000000,heatpump,6,2040 -6,heat,all-week,late-afternoon,2030,all-year,R1,0.54440000000,heatpump,7,2040 -7,heat,all-week,late-afternoon,2032,all-year,R1,0.25130000000,heatpump,7,2040 -8,heat,all-week,late-afternoon,2034,all-year,R1,0.25130000000,heatpump,7,2040 -9,heat,all-week,late-afternoon,2036,all-year,R1,0.25130000000,heatpump,7,2040 -10,heat,all-week,late-afternoon,2038,all-year,R1,0.33500000000,heatpump,7,2040 -18,heat,all-week,late-afternoon,2030,all-year,R1,0.54440000000,heatpump,7,2040 -19,heat,all-week,late-afternoon,2032,all-year,R1,0.25130000000,heatpump,7,2040 -20,heat,all-week,late-afternoon,2034,all-year,R1,0.25130000000,heatpump,7,2040 -21,heat,all-week,late-afternoon,2036,all-year,R1,0.25130000000,heatpump,7,2040 -22,heat,all-week,late-afternoon,2038,all-year,R1,0.33500000000,heatpump,7,2040 -6,heat,all-week,late-afternoon,2030,all-year,R2,0.54440000000,heatpump,7,2040 -7,heat,all-week,late-afternoon,2032,all-year,R2,0.25130000000,heatpump,7,2040 -8,heat,all-week,late-afternoon,2034,all-year,R2,0.25130000000,heatpump,7,2040 -9,heat,all-week,late-afternoon,2036,all-year,R2,0.25130000000,heatpump,7,2040 -10,heat,all-week,late-afternoon,2038,all-year,R2,0.33500000000,heatpump,7,2040 -18,heat,all-week,late-afternoon,2030,all-year,R2,0.54440000000,heatpump,7,2040 -19,heat,all-week,late-afternoon,2032,all-year,R2,0.25130000000,heatpump,7,2040 -20,heat,all-week,late-afternoon,2034,all-year,R2,0.25130000000,heatpump,7,2040 -21,heat,all-week,late-afternoon,2036,all-year,R2,0.25130000000,heatpump,7,2040 -22,heat,all-week,late-afternoon,2038,all-year,R2,0.33500000000,heatpump,7,2040 diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/input/BaseYearExport.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/input/BaseYearExport.csv index 578ab646b..f9e1c4ef0 100644 --- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/input/BaseYearExport.csv +++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/input/BaseYearExport.csv @@ -1,40 +1,21 @@ -RegionName,Attribute,Time,electricity,gas,heat,CO2f,wind,solar -Unit,-,Year,PJ,PJ,PJ,kt,PJ,PJ -R1,Exports,2010,0,0,0,0,0,0 -R1,Exports,2015,0,0,0,0,0,0 -R1,Exports,2020,0,0,0,0,0,0 -R1,Exports,2025,0,0,0,0,0,0 -R1,Exports,2030,0,0,0,0,0,0 -R1,Exports,2035,0,0,0,0,0,0 -R1,Exports,2040,0,0,0,0,0,0 -R1,Exports,2045,0,0,0,0,0,0 -R1,Exports,2050,0,0,0,0,0,0 -R1,Exports,2055,0,0,0,0,0,0 -R1,Exports,2060,0,0,0,0,0,0 -R1,Exports,2065,0,0,0,0,0,0 -R1,Exports,2070,0,0,0,0,0,0 -R1,Exports,2075,0,0,0,0,0,0 -R1,Exports,2080,0,0,0,0,0,0 -R1,Exports,2085,0,0,0,0,0,0 -R1,Exports,2090,0,0,0,0,0,0 -R1,Exports,2095,0,0,0,0,0,0 -R1,Exports,2100,0,0,0,0,0,0 -R2,Exports,2010,0,0,0,0,0,0 -R2,Exports,2015,0,0,0,0,0,0 -R2,Exports,2020,0,0,0,0,0,0 -R2,Exports,2025,0,0,0,0,0,0 -R2,Exports,2030,0,0,0,0,0,0 -R2,Exports,2035,0,0,0,0,0,0 -R2,Exports,2040,0,0,0,0,0,0 -R2,Exports,2045,0,0,0,0,0,0 -R2,Exports,2050,0,0,0,0,0,0 -R2,Exports,2055,0,0,0,0,0,0 -R2,Exports,2060,0,0,0,0,0,0 -R2,Exports,2065,0,0,0,0,0,0 -R2,Exports,2070,0,0,0,0,0,0 -R2,Exports,2075,0,0,0,0,0,0 -R2,Exports,2080,0,0,0,0,0,0 -R2,Exports,2085,0,0,0,0,0,0 -R2,Exports,2090,0,0,0,0,0,0 -R2,Exports,2095,0,0,0,0,0,0 -R2,Exports,2100,0,0,0,0,0,0 +RegionName,Attribute,Time,electricity,gas,heat,CO2f,wind +Unit,-,Year,PJ,PJ,PJ,kt,PJ +R1,Exports,2010,0,0,0,0,0 +R1,Exports,2015,0,0,0,0,0 +R1,Exports,2020,0,0,0,0,0 +R1,Exports,2025,0,0,0,0,0 +R1,Exports,2030,0,0,0,0,0 +R1,Exports,2035,0,0,0,0,0 +R1,Exports,2040,0,0,0,0,0 +R1,Exports,2045,0,0,0,0,0 +R1,Exports,2050,0,0,0,0,0 +R1,Exports,2055,0,0,0,0,0 +R1,Exports,2060,0,0,0,0,0 +R1,Exports,2065,0,0,0,0,0 +R1,Exports,2070,0,0,0,0,0 +R1,Exports,2075,0,0,0,0,0 +R1,Exports,2080,0,0,0,0,0 +R1,Exports,2085,0,0,0,0,0 +R1,Exports,2090,0,0,0,0,0 +R1,Exports,2095,0,0,0,0,0 +R1,Exports,2100,0,0,0,0,0 diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/input/BaseYearImport.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/input/BaseYearImport.csv index 1f9b8f3e5..dc027f103 100644 --- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/input/BaseYearImport.csv +++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/input/BaseYearImport.csv @@ -1,40 +1,21 @@ -RegionName,Attribute,Time,electricity,gas,heat,CO2f,wind,solar -Unit,-,Year,PJ,PJ,PJ,kt,PJ,PJ -R1,Imports,2010,0,0,0,0,0,0 -R1,Imports,2015,0,0,0,0,0,0 -R1,Imports,2020,0,0,0,0,0,0 -R1,Imports,2025,0,0,0,0,0,0 -R1,Imports,2030,0,0,0,0,0,0 -R1,Imports,2035,0,0,0,0,0,0 -R1,Imports,2040,0,0,0,0,0,0 -R1,Imports,2045,0,0,0,0,0,0 -R1,Imports,2050,0,0,0,0,0,0 -R1,Imports,2055,0,0,0,0,0,0 -R1,Imports,2060,0,0,0,0,0,0 -R1,Imports,2065,0,0,0,0,0,0 -R1,Imports,2070,0,0,0,0,0,0 -R1,Imports,2075,0,0,0,0,0,0 -R1,Imports,2080,0,0,0,0,0,0 -R1,Imports,2085,0,0,0,0,0,0 -R1,Imports,2090,0,0,0,0,0,0 -R1,Imports,2095,0,0,0,0,0,0 -R1,Imports,2100,0,0,0,0,0,0 -R2,Imports,2010,0,0,0,0,0,0 -R2,Imports,2015,0,0,0,0,0,0 -R2,Imports,2020,0,0,0,0,0,0 -R2,Imports,2025,0,0,0,0,0,0 -R2,Imports,2030,0,0,0,0,0,0 -R2,Imports,2035,0,0,0,0,0,0 -R2,Imports,2040,0,0,0,0,0,0 -R2,Imports,2045,0,0,0,0,0,0 -R2,Imports,2050,0,0,0,0,0,0 -R2,Imports,2055,0,0,0,0,0,0 -R2,Imports,2060,0,0,0,0,0,0 -R2,Imports,2065,0,0,0,0,0,0 -R2,Imports,2070,0,0,0,0,0,0 -R2,Imports,2075,0,0,0,0,0,0 -R2,Imports,2080,0,0,0,0,0,0 -R2,Imports,2085,0,0,0,0,0,0 -R2,Imports,2090,0,0,0,0,0,0 -R2,Imports,2095,0,0,0,0,0,0 -R2,Imports,2100,0,0,0,0,0,0 +RegionName,Attribute,Time,electricity,gas,heat,CO2f,wind +Unit,-,Year,PJ,PJ,PJ,kt,PJ +R1,Imports,2010,0,0,0,0,0 +R1,Imports,2015,0,0,0,0,0 +R1,Imports,2020,0,0,0,0,0 +R1,Imports,2025,0,0,0,0,0 +R1,Imports,2030,0,0,0,0,0 +R1,Imports,2035,0,0,0,0,0 +R1,Imports,2040,0,0,0,0,0 +R1,Imports,2045,0,0,0,0,0 +R1,Imports,2050,0,0,0,0,0 +R1,Imports,2055,0,0,0,0,0 +R1,Imports,2060,0,0,0,0,0 +R1,Imports,2065,0,0,0,0,0 +R1,Imports,2070,0,0,0,0,0 +R1,Imports,2075,0,0,0,0,0 +R1,Imports,2080,0,0,0,0,0 +R1,Imports,2085,0,0,0,0,0 +R1,Imports,2090,0,0,0,0,0 +R1,Imports,2095,0,0,0,0,0 +R1,Imports,2100,0,0,0,0,0 diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/input/GlobalCommodities.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/input/GlobalCommodities.csv index 9691db73d..0d4c58da7 100644 --- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/input/GlobalCommodities.csv +++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/input/GlobalCommodities.csv @@ -1,7 +1,6 @@ Commodity,CommodityType,CommodityName,CommodityEmissionFactor_CO2,HeatRate,Unit -Electricity,Energy,electricity,0.0,1,PJ +Electricity,Energy,electricity,0,1,PJ Gas,Energy,gas,56.1,1,PJ -Heat,Energy,heat,0.0,1,PJ -Wind,Energy,wind,0.0,1,PJ -CO2fuelcomsbustion,Environmental,CO2f,0.0,1,kt -Solar,Energy,solar,0.0,1,PJ +Heat,Energy,heat,0,1,PJ +Wind,Energy,wind,0,1,PJ +CO2fuelcomsbustion,Environmental,CO2f,0,1,kt diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/input/Projections.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/input/Projections.csv index eb6950ddb..a28746897 100644 --- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/input/Projections.csv +++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/input/Projections.csv @@ -1,40 +1,21 @@ -RegionName,Attribute,Time,electricity,gas,heat,CO2f,wind,solar -Unit,-,Year,MUS$2010/PJ,MUS$2010/PJ,MUS$2010/PJ,MUS$2010/kt,MUS$2010/kt,MUS$2010/kt -R1,CommodityPrice,2010,14.81481472,6.6759,100,0,0,0 -R1,CommodityPrice,2015,17.89814806,6.914325,100,0.052913851,0,0 -R1,CommodityPrice,2020,19.5,7.15275,100,0.08314119,0,0 -R1,CommodityPrice,2025,21.93518528,8.10645,100,0.120069795,0,0 -R1,CommodityPrice,2030,26.50925917,9.06015,100,0.156998399,0,0 -R1,CommodityPrice,2035,26.51851861,9.2191,100,0.214877567,0,0 -R1,CommodityPrice,2040,23.85185194,9.37805,100,0.272756734,0,0 -R1,CommodityPrice,2045,23.97222222,9.193829337,100,0.35394801,0,0 -R1,CommodityPrice,2050,24.06481472,9.009608674,100,0.435139285,0,0 -R1,CommodityPrice,2055,25.3425925,8.832625604,100,0.542365578,0,0 -R1,CommodityPrice,2060,25.53703694,8.655642534,100,0.649591871,0,0 -R1,CommodityPrice,2065,25.32407417,8.485612708,100,0.780892624,0,0 -R1,CommodityPrice,2070,23.36111111,8.315582883,100,0.912193378,0,0 -R1,CommodityPrice,2075,22.27777778,8.152233126,100,1.078321687,0,0 -R1,CommodityPrice,2080,22.25925917,7.988883368,100,1.244449995,0,0 -R1,CommodityPrice,2085,22.17592583,7.831951236,100,1.4253503,0,0 -R1,CommodityPrice,2090,22.03703694,7.675019103,100,1.606250604,0,0 -R1,CommodityPrice,2095,21.94444444,7.524252461,100,1.73877515,0,0 -R1,CommodityPrice,2100,21.39814806,7.373485819,100,1.871299697,0,0 -R2,CommodityPrice,2010,14.81481472,6.6759,100,0,0,0 -R2,CommodityPrice,2015,17.89814806,6.914325,100,0.052913851,0,0 -R2,CommodityPrice,2020,19.5,7.15275,100,0.08314119,0,0 -R2,CommodityPrice,2025,21.93518528,8.10645,100,0.120069795,0,0 -R2,CommodityPrice,2030,26.50925917,9.06015,100,0.156998399,0,0 -R2,CommodityPrice,2035,26.51851861,9.2191,100,0.214877567,0,0 -R2,CommodityPrice,2040,23.85185194,9.37805,100,0.272756734,0,0 -R2,CommodityPrice,2045,23.97222222,9.193829337,100,0.35394801,0,0 -R2,CommodityPrice,2050,24.06481472,9.009608674,100,0.435139285,0,0 -R2,CommodityPrice,2055,25.3425925,8.832625604,100,0.542365578,0,0 -R2,CommodityPrice,2060,25.53703694,8.655642534,100,0.649591871,0,0 -R2,CommodityPrice,2065,25.32407417,8.485612708,100,0.780892624,0,0 -R2,CommodityPrice,2070,23.36111111,8.315582883,100,0.912193378,0,0 -R2,CommodityPrice,2075,22.27777778,8.152233126,100,1.078321687,0,0 -R2,CommodityPrice,2080,22.25925917,7.988883368,100,1.244449995,0,0 -R2,CommodityPrice,2085,22.17592583,7.831951236,100,1.4253503,0,0 -R2,CommodityPrice,2090,22.03703694,7.675019103,100,1.606250604,0,0 -R2,CommodityPrice,2095,21.94444444,7.524252461,100,1.73877515,0,0 -R2,CommodityPrice,2100,21.39814806,7.373485819,100,1.871299697,0,0 +RegionName,Attribute,Time,electricity,gas,heat,CO2f,wind +Unit,-,Year,MUS$2010/PJ,MUS$2010/PJ,MUS$2010/PJ,MUS$2010/kt,MUS$2010/kt +R1,CommodityPrice,2010,14.81481472,6.6759,100,0,0 +R1,CommodityPrice,2015,17.89814806,6.914325,100,0.052913851,0 +R1,CommodityPrice,2020,19.5,7.15275,100,0.08314119,0 +R1,CommodityPrice,2025,21.93518528,8.10645,100,0.120069795,0 +R1,CommodityPrice,2030,26.50925917,9.06015,100,0.156998399,0 +R1,CommodityPrice,2035,26.51851861,9.2191,100,0.214877567,0 +R1,CommodityPrice,2040,23.85185194,9.37805,100,0.272756734,0 +R1,CommodityPrice,2045,23.97222222,9.193829337,100,0.35394801,0 +R1,CommodityPrice,2050,24.06481472,9.009608674,100,0.435139285,0 +R1,CommodityPrice,2055,25.3425925,8.832625604,100,0.542365578,0 +R1,CommodityPrice,2060,25.53703694,8.655642534,100,0.649591871,0 +R1,CommodityPrice,2065,25.32407417,8.485612708,100,0.780892624,0 +R1,CommodityPrice,2070,23.36111111,8.315582883,100,0.912193378,0 +R1,CommodityPrice,2075,22.27777778,8.152233126,100,1.078321687,0 +R1,CommodityPrice,2080,22.25925917,7.988883368,100,1.244449995,0 +R1,CommodityPrice,2085,22.17592583,7.831951236,100,1.4253503,0 +R1,CommodityPrice,2090,22.03703694,7.675019103,100,1.606250604,0 +R1,CommodityPrice,2095,21.94444444,7.524252461,100,1.73877515,0 +R1,CommodityPrice,2100,21.39814806,7.373485819,100,1.871299697,0 diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/settings.toml b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/settings.toml index c65fc62b5..db4432855 100644 --- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/settings.toml +++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/settings.toml @@ -2,11 +2,11 @@ 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", "R2"] +regions = ["R1"] interest_rate = 0.1 interpolation_mode = 'Active' log_level = 'info' -excluded_commodities = ["wind", "solar"] +excluded_commodities = ["wind"] # Convergence parameters equilibrium_variable = 'demand' maximum_iterations = 100 @@ -14,12 +14,12 @@ tolerance = 0.1 tolerance_unmet_demand = -0.1 [[outputs]] -quantity = "prices" +quantity = "capacity" sink = "aggregate" filename = "{cwd}/{default_output_dir}/MCA{Quantity}.csv" [[outputs]] -quantity = "capacity" +quantity = "prices" sink = "aggregate" filename = "{cwd}/{default_output_dir}/MCA{Quantity}.csv" @@ -55,18 +55,6 @@ constraints = [ demand_share = "standard_demand" # Optional, default to standard_demand forecast = 2 # Optional, defaults to 5 -[[sectors.residential.outputs]] -filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}.csv' -quantity = "capacity" -sink = 'aggregate' - -[[sectors.residential.outputs]] -filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}.csv' -sink = 'aggregate' -quantity.name = "supply" -quantity.sum_over = "timeslice" -quantity.drop = ["comm_usage", "units_prices"] - [sectors.power] type = 'default' priority = 2 @@ -82,11 +70,6 @@ lpsolver = "scipy" demand_share = "standard_demand" forecast = 2 -[[sectors.power.outputs]] -filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}.csv' -quantity = "capacity" -sink = 'aggregate' - [sectors.gas] type = 'default' priority = 3 @@ -102,11 +85,6 @@ lpsolver = "scipy" demand_share = "standard_demand" forecast = 2 -[[sectors.gas.outputs]] -filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}.csv' -quantity = "capacity" -sink = 'aggregate' - [sectors.residential_presets] type = 'presets' priority = 0 diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/Agents.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/Agents.csv index c5f87c36e..23061165f 100644 --- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/Agents.csv +++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/Agents.csv @@ -1,3 +1,2 @@ AgentShare,Name,RegionName,Objective1,Objective2,Objective3,ObjData1,ObjData2,ObjData3,Objsort1,Objsort2,Objsort3,SearchRule,DecisionMethod,Quantity,MaturityThreshold,SpendLimit,Type -Agent1,A1,R1,LCOE,,,1,,,True,,,all,singleObj,1,-1,inf,New -Agent1,A1,R2,LCOE,,,1,,,True,,,all,singleObj,1,-1,inf,New +Agent1,A1,R1,LCOE,,,1,,,TRUE,,,all,singleObj,1,-1,inf,New diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/gas/CommIn.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/gas/CommIn.csv index 8e98856f0..26a926b44 100644 --- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/gas/CommIn.csv +++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/gas/CommIn.csv @@ -1,4 +1,3 @@ ProcessName,RegionName,Time,Level,electricity,gas,heat,CO2f,wind Unit,-,Year,-,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ gassupply1,R1,2020,fixed,0,0,0,0,0 -gassupply1,R2,2020,fixed,0,0,0,0,0 diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/gas/CommOut.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/gas/CommOut.csv index ab041ad35..c47a23dd5 100644 --- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/gas/CommOut.csv +++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/gas/CommOut.csv @@ -1,4 +1,3 @@ ProcessName,RegionName,Time,electricity,gas,heat,CO2f,wind Unit,-,Year,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ gassupply1,R1,2020,0,1,0,0,0 -gassupply1,R2,2020,0,1,0,0,0 diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/gas/ExistingCapacity.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/gas/ExistingCapacity.csv index 2e95999a9..753038753 100644 --- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/gas/ExistingCapacity.csv +++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/gas/ExistingCapacity.csv @@ -1,3 +1,2 @@ ProcessName,RegionName,Unit,2020,2025,2030,2035,2040,2045,2050 gassupply1,R1,PJ/y,15,15,7.5,0,0,0,0 -gassupply1,R2,PJ/y,15,15,7.5,0,0,0,0 diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/gas/Technodata.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/gas/Technodata.csv index 9a0c6eeea..7855e4fe2 100644 --- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/gas/Technodata.csv +++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/gas/Technodata.csv @@ -1,4 +1,3 @@ ProcessName,RegionName,Time,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent1 Unit,-,Year,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,New -gassupply1,R1,2020,0,1,0,1,2.55,1,5,1,60,35,0.9,0.00000189,86,0.1,energy,gas,gas,1 -gassupply1,R2,2020,0,1,0,1,2.55,1,5,1,60,35,0.9,0.00000189,86,0.1,energy,gas,gas,1 +gassupply1,R1,2020,0,1,0,1,2.55,1,10,1,100,35,0.9,0.00000189,86,0.1,energy,gas,gas,1 diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/power/CommIn.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/power/CommIn.csv index 7a8e85039..163942435 100644 --- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/power/CommIn.csv +++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/power/CommIn.csv @@ -1,14 +1,4 @@ -ProcessName,RegionName,Time,Level,electricity,gas,heat,CO2f,wind,solar -Unit,-,Year,-,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ,PJ/PJ -gasCCGT,R1,2020,fixed,0,1.67,0,0,0,0 -gasCCGT,R1,2040,fixed,0,1.67,0,0,0,0 -windturbine,R1,2020,fixed,0,0,0,0,1,0 -windturbine,R1,2040,fixed,0,0,0,0,1,0 -solarPV,R1,2020,fixed,0,0,0,0,0,1 -solarPV,R1,2040,fixed,0,0,0,0,0,1 -gasCCGT,R2,2020,fixed,0,1.67,0,0,0,0 -gasCCGT,R2,2040,fixed,0,1.67,0,0,0,0 -windturbine,R2,2020,fixed,0,0,0,0,1,0 -windturbine,R2,2040,fixed,0,0,0,0,1,0 -solarPV,R2,2020,fixed,0,0,0,0,0,1 -solarPV,R2,2040,fixed,0,0,0,0,0,1 +ProcessName,RegionName,Time,Level,electricity,gas,heat,CO2f,wind +Unit,-,Year,-,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ +gasCCGT,R1,2020,fixed,0,1.67,0,0,0 +windturbine,R1,2020,fixed,0,0,0,0,1 diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/power/CommOut.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/power/CommOut.csv index 8dd37bb8b..87d61fbc4 100644 --- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/power/CommOut.csv +++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/power/CommOut.csv @@ -1,14 +1,4 @@ -ProcessName,RegionName,Time,electricity,gas,heat,CO2f,wind,solar -Unit,-,Year,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ,PJ/PJ -gasCCGT,R1,2020,1,0,0,91.67,0,0 -gasCCGT,R1,2040,1,0,0,91.67,0,0 -windturbine,R1,2020,1,0,0,0,0,0 -windturbine,R1,2040,1,0,0,0,0,0 -solarPV,R1,2020,1,0,0,0,0,0 -solarPV,R1,2040,1,0,0,0,0,0 -gasCCGT,R2,2020,1,0,0,91.67,0,0 -gasCCGT,R2,2040,1,0,0,91.67,0,0 -windturbine,R2,2020,1,0,0,0,0,0 -windturbine,R2,2040,1,0,0,0,0,0 -solarPV,R2,2020,1,0,0,0,0,0 -solarPV,R2,2040,1,0,0,0,0,0 +ProcessName,RegionName,Time,electricity,gas,heat,CO2f,wind +Unit,-,Year,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ +gasCCGT,R1,2020,1,0,0,91.67,0 +windturbine,R1,2020,1,0,0,0,0 diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/power/ExistingCapacity.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/power/ExistingCapacity.csv index 5c648dcad..7d1f66c7d 100644 --- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/power/ExistingCapacity.csv +++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/power/ExistingCapacity.csv @@ -1,7 +1,3 @@ ProcessName,RegionName,Unit,2020,2025,2030,2035,2040,2045,2050 gasCCGT,R1,PJ/y,1,1,0,0,0,0,0 windturbine,R1,PJ/y,0,0,0,0,0,0,0 -solarPV,R1,PJ/y,0,0,0,0,0,0,0 -gasCCGT,R2,PJ/y,1,1,0,0,0,0,0 -windturbine,R2,PJ/y,0,0,0,0,0,0,0 -solarPV,R2,PJ/y,0,0,0,0,0,0,0 diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/power/Technodata.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/power/Technodata.csv index 35173cf47..7c69894bc 100644 --- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/power/Technodata.csv +++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/power/Technodata.csv @@ -1,14 +1,4 @@ ProcessName,RegionName,Time,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent1 Unit,-,Year,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,New -gasCCGT,R1,2020,23.78234399,1,0,1,0,1,2,1,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1 -gasCCGT,R1,2040,23.78234399,1,0,1,0,1,2,1,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1 -windturbine,R1,2020,36.30771182,1,0,1,0,1,2,1,60,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1 -windturbine,R1,2040,36.30771182,1,0,1,0,1,2,1,60,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1 -solarPV,R1,2020,40,1,0,1,0,1,2,1,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1 -solarPV,R1,2040,30,1,0,1,0,1,2,1,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1 -gasCCGT,R2,2020,23.78234399,1,0,1,0,1,2,1,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1 -gasCCGT,R2,2040,23.78234399,1,0,1,0,1,2,1,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1 -windturbine,R2,2020,36.30771182,1,0,1,0,1,5,1,100,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1 -windturbine,R2,2040,36.30771182,1,0,1,0,1,5,1,100,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1 -solarPV,R2,2020,40,1,0,1,0,1,2,1,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1 -solarPV,R2,2040,30,1,0,1,0,1,2,1,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1 +gasCCGT,R1,2020,23.78234399,1,0,1,0,1,10,1,100,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1 +windturbine,R1,2020,36.30771182,1,0,1,0,1,10,1,100,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1 diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/preset/Residential2020Consumption.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/preset/Residential2020Consumption.csv index 3edc5e104..b378f47ce 100644 --- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/preset/Residential2020Consumption.csv +++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/preset/Residential2020Consumption.csv @@ -1,17 +1,9 @@ -RegionName,Timeslice,electricity,gas,heat,CO2f,wind,solar -R1,1,0,0,0.7,0,0,0 -R1,2,0,0,1.0,0,0,0 -R1,3,0,0,0.7,0,0,0 -R1,4,0,0,1.0,0,0,0 -R1,5,0,0,2.1,0,0,0 -R1,6,0,0,1.4,0,0,0 -R1,7,0,0,1.4,0,0,0 -R1,8,0,0,1.4,0,0,0 -R2,1,0,0,0.7,0,0,0 -R2,2,0,0,1.0,0,0,0 -R2,3,0,0,0.7,0,0,0 -R2,4,0,0,1.0,0,0,0 -R2,5,0,0,2.1,0,0,0 -R2,6,0,0,1.4,0,0,0 -R2,7,0,0,1.4,0,0,0 -R2,8,0,0,1.4,0,0,0 +RegionName,Timeslice,electricity,gas,heat,CO2f,wind +R1,1,0,0,0.7,0,0 +R1,2,0,0,1.0,0,0 +R1,3,0,0,0.7,0,0 +R1,4,0,0,1.0,0,0 +R1,5,0,0,2.1,0,0 +R1,6,0,0,1.4,0,0 +R1,7,0,0,1.4,0,0 +R1,8,0,0,1.4,0,0 diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/preset/Residential2050Consumption.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/preset/Residential2050Consumption.csv index 257644065..921b53347 100644 --- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/preset/Residential2050Consumption.csv +++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/preset/Residential2050Consumption.csv @@ -1,17 +1,9 @@ -RegionName,Timeslice,electricity,gas,heat,CO2f,wind,solar -R1,1,0,0,2.1,0,0,0 -R1,2,0,0,3.0,0,0,0 -R1,3,0,0,2.1,0,0,0 -R1,4,0,0,3.0,0,0,0 -R1,5,0,0,6.3,0,0,0 -R1,6,0,0,4.2,0,0,0 -R1,7,0,0,4.2,0,0,0 -R1,8,0,0,4.2,0,0,0 -R2,1,0,0,2.1,0,0,0 -R2,2,0,0,3.0,0,0,0 -R2,3,0,0,2.1,0,0,0 -R2,4,0,0,3.0,0,0,0 -R2,5,0,0,6.3,0,0,0 -R2,6,0,0,4.2,0,0,0 -R2,7,0,0,4.2,0,0,0 -R2,8,0,0,4.2,0,0,0 +RegionName,Timeslice,electricity,gas,heat,CO2f,wind +R1,1,0,0,2.1,0,0 +R1,2,0,0,3.0,0,0 +R1,3,0,0,2.1,0,0 +R1,4,0,0,3.0,0,0 +R1,5,0,0,6.3,0,0 +R1,6,0,0,4.2,0,0 +R1,7,0,0,4.2,0,0 +R1,8,0,0,4.2,0,0 diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/residential/CommIn.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/residential/CommIn.csv index 3eedce971..7663f0dd2 100644 --- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/residential/CommIn.csv +++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/residential/CommIn.csv @@ -2,5 +2,3 @@ ProcessName,RegionName,Time,Level,electricity,gas,heat,CO2f,wind Unit,-,Year,-,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ gasboiler,R1,2020,fixed,0,1.16,0,0,0 heatpump,R1,2020,fixed,0.4,0,0,0,0 -gasboiler,R2,2020,fixed,0,1.16,0,0,0 -heatpump,R2,2020,fixed,0.4,0,0,0,0 diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/residential/CommOut.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/residential/CommOut.csv index 10f54e99a..420ae841a 100644 --- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/residential/CommOut.csv +++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/residential/CommOut.csv @@ -2,5 +2,3 @@ ProcessName,RegionName,Time,electricity,gas,heat,CO2f,wind Unit,-,Year,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ gasboiler,R1,2020,0,0,1,64.71,0 heatpump,R1,2020,0,0,1,0,0 -gasboiler,R2,2020,0,0,1,64.71,0 -heatpump,R2,2020,0,0,1,0,0 diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/residential/ExistingCapacity.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/residential/ExistingCapacity.csv index d57d56eb7..f3c6500db 100644 --- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/residential/ExistingCapacity.csv +++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/residential/ExistingCapacity.csv @@ -1,5 +1,3 @@ ProcessName,RegionName,Unit,2020,2025,2030,2035,2040,2045,2050 gasboiler,R1,PJ/y,10,5,0,0,0,0,0 heatpump,R1,PJ/y,0,0,0,0,0,0,0 -gasboiler,R2,PJ/y,10,5,0,0,0,0,0 -heatpump,R2,PJ/y,0,0,0,0,0,0,0 diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/residential/Technodata.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/residential/Technodata.csv index aca2d3a26..24f3a949b 100644 --- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/residential/Technodata.csv +++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/residential/Technodata.csv @@ -1,6 +1,4 @@ ProcessName,RegionName,Time,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent1 Unit,-,Year,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,New -gasboiler,R1,2020,3.8,1,0,1,0,1,10,0.2,60,10,1,0.00000189,86,0.1,energy,gas,heat,1 -heatpump,R1,2020,8.866667,1,0,1,0,1,10,0.2,60,10,1,0.00000189,86,0.1,energy,electricity,heat,1 -gasboiler,R2,2020,3.8,1,0,1,0,1,10,0.2,60,10,1,0.00000189,86,0.1,energy,gas,heat,1 -heatpump,R2,2020,8.866667,1,0,1,0,1,10,0.2,60,10,1,0.00000189,86,0.1,energy,electricity,heat,1 +gasboiler,R1,2020,3.8,1,0,1,0,1,10,1,100,10,1,0.00000189,86,0.1,energy,gas,heat,1 +heatpump,R1,2020,8.866667,1,0,1,0,1,10,1,100,10,1,0.00000189,86,0.1,energy,electricity,heat,1 diff --git a/docs/tutorial-code/4-modify-timing-data/generate_models.py b/docs/tutorial-code/4-modify-timing-data/generate_models.py index f9d481983..c81d775cd 100644 --- a/docs/tutorial-code/4-modify-timing-data/generate_models.py +++ b/docs/tutorial-code/4-modify-timing-data/generate_models.py @@ -1,9 +1,11 @@ +import os import shutil from pathlib import Path import pandas as pd from tomlkit import dumps, parse +from muse import examples from muse.wizard import add_timeslice, get_sectors, modify_toml parent_path = Path(__file__).parent @@ -20,10 +22,9 @@ def generate_model_1(): if model_path.exists(): shutil.rmtree(model_path) - # Starting point: copy model from tutorial 3 - shutil.copytree(parent_path / "../3-add-region/1-new-region", model_path) - if (model_path / "Results").exists(): - shutil.rmtree(model_path / "Results") + # Starting point: copy default model + examples.copy_model(name="default", path=parent_path, overwrite=True) + os.rename(parent_path / "model", model_path) # Add timeslices add_timeslice(model_path, timeslice_name="early-morning", copy_from="evening") @@ -51,14 +52,6 @@ def generate_model_1(): 1.4, 1.4, 1.4, - 0.7, - 1.0, - 0.7, - 1.0, - 2.1, - 1.4, - 1.4, - 1.4, ] for year, multiplier in zip([2020, 2050], [1, 3]): file = model_path / f"technodata/preset/Residential{year}Consumption.csv" diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity.csv deleted file mode 100644 index a2a4c0708..000000000 --- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity.csv +++ /dev/null @@ -1,39 +0,0 @@ -asset,capacity,installed,region,technology,year -0,15.00000000000,2020,R1,gassupply1,2020 -1,15.00000000000,2020,R2,gassupply1,2020 -0,31.49320000000,2020,R1,gassupply1,2025 -2,31.49320000000,2020,R2,gassupply1,2025 -0,23.99320000000,2020,R1,gassupply1,2030 -1,10.24680000000,2025,R1,gassupply1,2030 -3,23.99320000000,2020,R2,gassupply1,2030 -4,10.24680000000,2025,R2,gassupply1,2030 -0,16.49320000000,2020,R1,gassupply1,2035 -1,10.24680000000,2025,R1,gassupply1,2035 -2,2.60860000000,2030,R1,gassupply1,2035 -4,16.49320000000,2020,R2,gassupply1,2035 -5,10.24680000000,2025,R2,gassupply1,2035 -6,2.60860000000,2030,R2,gassupply1,2035 -0,16.49320000000,2020,R1,gassupply1,2040 -1,10.24680000000,2025,R1,gassupply1,2040 -2,2.60860000000,2030,R1,gassupply1,2040 -3,4.89140000000,2035,R1,gassupply1,2040 -4,16.49320000000,2020,R2,gassupply1,2040 -5,10.24680000000,2025,R2,gassupply1,2040 -6,2.60860000000,2030,R2,gassupply1,2040 -7,4.89140000000,2035,R2,gassupply1,2040 -0,16.49320000000,2020,R1,gassupply1,2045 -1,10.24680000000,2025,R1,gassupply1,2045 -2,2.60860000000,2030,R1,gassupply1,2045 -3,4.89140000000,2035,R1,gassupply1,2045 -4,16.49320000000,2020,R2,gassupply1,2045 -5,10.24680000000,2025,R2,gassupply1,2045 -6,2.60860000000,2030,R2,gassupply1,2045 -7,4.89140000000,2035,R2,gassupply1,2045 -0,16.49320000000,2020,R1,gassupply1,2050 -1,10.24680000000,2025,R1,gassupply1,2050 -2,2.60860000000,2030,R1,gassupply1,2050 -3,4.89140000000,2035,R1,gassupply1,2050 -4,16.49320000000,2020,R2,gassupply1,2050 -5,10.24680000000,2025,R2,gassupply1,2050 -6,2.60860000000,2030,R2,gassupply1,2050 -7,4.89140000000,2035,R2,gassupply1,2050 diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/MCACapacity.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/MCACapacity.csv deleted file mode 100644 index a1d71b25c..000000000 --- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/MCACapacity.csv +++ /dev/null @@ -1,149 +0,0 @@ -agent,capacity,dst_region,installed,region,sector,technology,type,year -A1,10.00000000000,R1,2020,R1,residential,gas_stove,newcapa,2020 -A1,10.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2020 -A1,10.00000000000,R2,2020,R2,residential,gas_stove,newcapa,2020 -A1,10.00000000000,R2,2020,R2,residential,gasboiler,newcapa,2020 -A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2020 -A1,1.00000000000,R2,2020,R2,power,gasCCGT,newcapa,2020 -A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2020 -A1,15.00000000000,R2,2020,R2,gas,gassupply1,newcapa,2020 -A1,17.00000000000,R1,2020,R1,residential,electric_stove,newcapa,2025 -A1,5.00000000000,R1,2020,R1,residential,gas_stove,newcapa,2025 -A1,5.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2025 -A1,17.00000000000,R1,2020,R1,residential,heatpump,newcapa,2025 -A1,17.00000000000,R2,2020,R2,residential,electric_stove,newcapa,2025 -A1,5.00000000000,R2,2020,R2,residential,gas_stove,newcapa,2025 -A1,5.00000000000,R2,2020,R2,residential,gasboiler,newcapa,2025 -A1,17.00000000000,R2,2020,R2,residential,heatpump,newcapa,2025 -A1,11.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2025 -A1,9.86820000000,R1,2020,R1,power,windturbine,newcapa,2025 -A1,11.00000000000,R2,2020,R2,power,gasCCGT,newcapa,2025 -A1,9.86820000000,R2,2020,R2,power,windturbine,newcapa,2025 -A1,31.49320000000,R1,2020,R1,gas,gassupply1,newcapa,2025 -A1,31.49320000000,R2,2020,R2,gas,gassupply1,newcapa,2025 -A1,17.00000000000,R1,2020,R1,residential,electric_stove,newcapa,2030 -A1,11.00000000000,R1,2025,R1,residential,electric_stove,newcapa,2030 -A1,17.00000000000,R1,2020,R1,residential,heatpump,newcapa,2030 -A1,11.00000000000,R1,2025,R1,residential,heatpump,newcapa,2030 -A1,17.00000000000,R2,2020,R2,residential,electric_stove,newcapa,2030 -A1,11.00000000000,R2,2025,R2,residential,electric_stove,newcapa,2030 -A1,17.00000000000,R2,2020,R2,residential,heatpump,newcapa,2030 -A1,11.00000000000,R2,2025,R2,residential,heatpump,newcapa,2030 -A1,10.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2030 -A1,10.50300000000,R1,2025,R1,power,gasCCGT,newcapa,2030 -A1,9.86820000000,R1,2020,R1,power,windturbine,newcapa,2030 -A1,10.00000000000,R2,2020,R2,power,gasCCGT,newcapa,2030 -A1,10.50300000000,R2,2025,R2,power,gasCCGT,newcapa,2030 -A1,9.86820000000,R2,2020,R2,power,windturbine,newcapa,2030 -A1,23.99320000000,R1,2020,R1,gas,gassupply1,newcapa,2030 -A1,10.24680000000,R1,2025,R1,gas,gassupply1,newcapa,2030 -A1,23.99320000000,R2,2020,R2,gas,gassupply1,newcapa,2030 -A1,10.24680000000,R2,2025,R2,gas,gassupply1,newcapa,2030 -A1,11.00000000000,R1,2025,R1,residential,electric_stove,newcapa,2035 -A1,22.00000000000,R1,2030,R1,residential,electric_stove,newcapa,2035 -A1,11.00000000000,R1,2025,R1,residential,heatpump,newcapa,2035 -A1,22.00000000000,R1,2030,R1,residential,heatpump,newcapa,2035 -A1,11.00000000000,R2,2025,R2,residential,electric_stove,newcapa,2035 -A1,22.00000000000,R2,2030,R2,residential,electric_stove,newcapa,2035 -A1,11.00000000000,R2,2025,R2,residential,heatpump,newcapa,2035 -A1,22.00000000000,R2,2030,R2,residential,heatpump,newcapa,2035 -A1,10.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2035 -A1,10.50300000000,R1,2025,R1,power,gasCCGT,newcapa,2035 -A1,20.00000000000,R1,2030,R1,power,solarPV,newcapa,2035 -A1,9.86820000000,R1,2020,R1,power,windturbine,newcapa,2035 -A1,2.40000000000,R1,2030,R1,power,windturbine,newcapa,2035 -A1,10.00000000000,R2,2020,R2,power,gasCCGT,newcapa,2035 -A1,10.50300000000,R2,2025,R2,power,gasCCGT,newcapa,2035 -A1,20.00000000000,R2,2030,R2,power,solarPV,newcapa,2035 -A1,9.86820000000,R2,2020,R2,power,windturbine,newcapa,2035 -A1,2.40000000000,R2,2030,R2,power,windturbine,newcapa,2035 -A1,16.49320000000,R1,2020,R1,gas,gassupply1,newcapa,2035 -A1,10.24680000000,R1,2025,R1,gas,gassupply1,newcapa,2035 -A1,2.60860000000,R1,2030,R1,gas,gassupply1,newcapa,2035 -A1,16.49320000000,R2,2020,R2,gas,gassupply1,newcapa,2035 -A1,10.24680000000,R2,2025,R2,gas,gassupply1,newcapa,2035 -A1,2.60860000000,R2,2030,R2,gas,gassupply1,newcapa,2035 -A1,22.00000000000,R1,2030,R1,residential,electric_stove,newcapa,2040 -A1,17.00000000000,R1,2035,R1,residential,electric_stove,newcapa,2040 -A1,22.00000000000,R1,2030,R1,residential,heatpump,newcapa,2040 -A1,17.00000000000,R1,2035,R1,residential,heatpump,newcapa,2040 -A1,22.00000000000,R2,2030,R2,residential,electric_stove,newcapa,2040 -A1,17.00000000000,R2,2035,R2,residential,electric_stove,newcapa,2040 -A1,22.00000000000,R2,2030,R2,residential,heatpump,newcapa,2040 -A1,17.00000000000,R2,2035,R2,residential,heatpump,newcapa,2040 -A1,10.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2040 -A1,10.50300000000,R1,2025,R1,power,gasCCGT,newcapa,2040 -A1,20.00000000000,R1,2030,R1,power,solarPV,newcapa,2040 -A1,9.86820000000,R1,2020,R1,power,windturbine,newcapa,2040 -A1,2.40000000000,R1,2030,R1,power,windturbine,newcapa,2040 -A1,10.00000000000,R2,2020,R2,power,gasCCGT,newcapa,2040 -A1,10.50300000000,R2,2025,R2,power,gasCCGT,newcapa,2040 -A1,20.00000000000,R2,2030,R2,power,solarPV,newcapa,2040 -A1,9.86820000000,R2,2020,R2,power,windturbine,newcapa,2040 -A1,2.40000000000,R2,2030,R2,power,windturbine,newcapa,2040 -A1,16.49320000000,R1,2020,R1,gas,gassupply1,newcapa,2040 -A1,10.24680000000,R1,2025,R1,gas,gassupply1,newcapa,2040 -A1,2.60860000000,R1,2030,R1,gas,gassupply1,newcapa,2040 -A1,4.89140000000,R1,2035,R1,gas,gassupply1,newcapa,2040 -A1,16.49320000000,R2,2020,R2,gas,gassupply1,newcapa,2040 -A1,10.24680000000,R2,2025,R2,gas,gassupply1,newcapa,2040 -A1,2.60860000000,R2,2030,R2,gas,gassupply1,newcapa,2040 -A1,4.89140000000,R2,2035,R2,gas,gassupply1,newcapa,2040 -A1,17.00000000000,R1,2035,R1,residential,electric_stove,newcapa,2045 -A1,27.00000000000,R1,2040,R1,residential,electric_stove,newcapa,2045 -A1,17.00000000000,R1,2035,R1,residential,heatpump,newcapa,2045 -A1,27.00000000000,R1,2040,R1,residential,heatpump,newcapa,2045 -A1,17.00000000000,R2,2035,R2,residential,electric_stove,newcapa,2045 -A1,27.00000000000,R2,2040,R2,residential,electric_stove,newcapa,2045 -A1,17.00000000000,R2,2035,R2,residential,heatpump,newcapa,2045 -A1,27.00000000000,R2,2040,R2,residential,heatpump,newcapa,2045 -A1,10.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2045 -A1,10.50300000000,R1,2025,R1,power,gasCCGT,newcapa,2045 -A1,20.00000000000,R1,2030,R1,power,solarPV,newcapa,2045 -A1,11.20000000000,R1,2040,R1,power,solarPV,newcapa,2045 -A1,9.86820000000,R1,2020,R1,power,windturbine,newcapa,2045 -A1,2.40000000000,R1,2030,R1,power,windturbine,newcapa,2045 -A1,10.00000000000,R2,2020,R2,power,gasCCGT,newcapa,2045 -A1,10.50300000000,R2,2025,R2,power,gasCCGT,newcapa,2045 -A1,20.00000000000,R2,2030,R2,power,solarPV,newcapa,2045 -A1,11.20000000000,R2,2040,R2,power,solarPV,newcapa,2045 -A1,9.86820000000,R2,2020,R2,power,windturbine,newcapa,2045 -A1,2.40000000000,R2,2030,R2,power,windturbine,newcapa,2045 -A1,16.49320000000,R1,2020,R1,gas,gassupply1,newcapa,2045 -A1,10.24680000000,R1,2025,R1,gas,gassupply1,newcapa,2045 -A1,2.60860000000,R1,2030,R1,gas,gassupply1,newcapa,2045 -A1,4.89140000000,R1,2035,R1,gas,gassupply1,newcapa,2045 -A1,16.49320000000,R2,2020,R2,gas,gassupply1,newcapa,2045 -A1,10.24680000000,R2,2025,R2,gas,gassupply1,newcapa,2045 -A1,2.60860000000,R2,2030,R2,gas,gassupply1,newcapa,2045 -A1,4.89140000000,R2,2035,R2,gas,gassupply1,newcapa,2045 -A1,27.00000000000,R1,2040,R1,residential,electric_stove,newcapa,2050 -A1,23.00000000000,R1,2045,R1,residential,electric_stove,newcapa,2050 -A1,27.00000000000,R1,2040,R1,residential,heatpump,newcapa,2050 -A1,23.00000000000,R1,2045,R1,residential,heatpump,newcapa,2050 -A1,27.00000000000,R2,2040,R2,residential,electric_stove,newcapa,2050 -A1,23.00000000000,R2,2045,R2,residential,electric_stove,newcapa,2050 -A1,27.00000000000,R2,2040,R2,residential,heatpump,newcapa,2050 -A1,23.00000000000,R2,2045,R2,residential,heatpump,newcapa,2050 -A1,10.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2050 -A1,10.50300000000,R1,2025,R1,power,gasCCGT,newcapa,2050 -A1,20.00000000000,R1,2030,R1,power,solarPV,newcapa,2050 -A1,11.20000000000,R1,2040,R1,power,solarPV,newcapa,2050 -A1,20.00000000000,R1,2045,R1,power,solarPV,newcapa,2050 -A1,2.40000000000,R1,2030,R1,power,windturbine,newcapa,2050 -A1,1.06820000000,R1,2045,R1,power,windturbine,newcapa,2050 -A1,10.00000000000,R2,2020,R2,power,gasCCGT,newcapa,2050 -A1,10.50300000000,R2,2025,R2,power,gasCCGT,newcapa,2050 -A1,20.00000000000,R2,2030,R2,power,solarPV,newcapa,2050 -A1,11.20000000000,R2,2040,R2,power,solarPV,newcapa,2050 -A1,20.00000000000,R2,2045,R2,power,solarPV,newcapa,2050 -A1,2.40000000000,R2,2030,R2,power,windturbine,newcapa,2050 -A1,1.06820000000,R2,2045,R2,power,windturbine,newcapa,2050 -A1,16.49320000000,R1,2020,R1,gas,gassupply1,newcapa,2050 -A1,10.24680000000,R1,2025,R1,gas,gassupply1,newcapa,2050 -A1,2.60860000000,R1,2030,R1,gas,gassupply1,newcapa,2050 -A1,4.89140000000,R1,2035,R1,gas,gassupply1,newcapa,2050 -A1,16.49320000000,R2,2020,R2,gas,gassupply1,newcapa,2050 -A1,10.24680000000,R2,2025,R2,gas,gassupply1,newcapa,2050 -A1,2.60860000000,R2,2030,R2,gas,gassupply1,newcapa,2050 -A1,4.89140000000,R2,2035,R2,gas,gassupply1,newcapa,2050 diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/MCAPrices.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/MCAPrices.csv deleted file mode 100644 index 8771c8864..000000000 --- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/MCAPrices.csv +++ /dev/null @@ -1,561 +0,0 @@ -commodity,day,hour,month,prices,region,timeslice,units_prices,year -electricity,all-week,night,all-year,19.50000000000,R1,0,MUS$2010/PJ,2020 -electricity,all-week,night,all-year,19.50000000000,R2,0,MUS$2010/PJ,2020 -gas,all-week,night,all-year,7.15280000000,R1,0,MUS$2010/PJ,2020 -gas,all-week,night,all-year,7.15280000000,R2,0,MUS$2010/PJ,2020 -heat,all-week,night,all-year,100.00000000000,R1,0,MUS$2010/PJ,2020 -heat,all-week,night,all-year,100.00000000000,R2,0,MUS$2010/PJ,2020 -CO2f,all-week,night,all-year,0.08310000000,R1,0,MUS$2010/kt,2020 -CO2f,all-week,night,all-year,0.08310000000,R2,0,MUS$2010/kt,2020 -cook,all-week,night,all-year,100.00000000000,R1,0,MUS$2010/PJ,2020 -cook,all-week,night,all-year,100.00000000000,R2,0,MUS$2010/PJ,2020 -electricity,all-week,morning,all-year,19.50000000000,R1,1,MUS$2010/PJ,2020 -electricity,all-week,morning,all-year,19.50000000000,R2,1,MUS$2010/PJ,2020 -gas,all-week,morning,all-year,7.15280000000,R1,1,MUS$2010/PJ,2020 -gas,all-week,morning,all-year,7.15280000000,R2,1,MUS$2010/PJ,2020 -heat,all-week,morning,all-year,100.00000000000,R1,1,MUS$2010/PJ,2020 -heat,all-week,morning,all-year,100.00000000000,R2,1,MUS$2010/PJ,2020 -CO2f,all-week,morning,all-year,0.08310000000,R1,1,MUS$2010/kt,2020 -CO2f,all-week,morning,all-year,0.08310000000,R2,1,MUS$2010/kt,2020 -cook,all-week,morning,all-year,100.00000000000,R1,1,MUS$2010/PJ,2020 -cook,all-week,morning,all-year,100.00000000000,R2,1,MUS$2010/PJ,2020 -electricity,all-week,mid-afternoon,all-year,19.50000000000,R1,2,MUS$2010/PJ,2020 -electricity,all-week,mid-afternoon,all-year,19.50000000000,R2,2,MUS$2010/PJ,2020 -gas,all-week,mid-afternoon,all-year,7.15280000000,R1,2,MUS$2010/PJ,2020 -gas,all-week,mid-afternoon,all-year,7.15280000000,R2,2,MUS$2010/PJ,2020 -heat,all-week,mid-afternoon,all-year,100.00000000000,R1,2,MUS$2010/PJ,2020 -heat,all-week,mid-afternoon,all-year,100.00000000000,R2,2,MUS$2010/PJ,2020 -CO2f,all-week,mid-afternoon,all-year,0.08310000000,R1,2,MUS$2010/kt,2020 -CO2f,all-week,mid-afternoon,all-year,0.08310000000,R2,2,MUS$2010/kt,2020 -cook,all-week,mid-afternoon,all-year,100.00000000000,R1,2,MUS$2010/PJ,2020 -cook,all-week,mid-afternoon,all-year,100.00000000000,R2,2,MUS$2010/PJ,2020 -electricity,all-week,early-peak,all-year,19.50000000000,R1,3,MUS$2010/PJ,2020 -electricity,all-week,early-peak,all-year,19.50000000000,R2,3,MUS$2010/PJ,2020 -gas,all-week,early-peak,all-year,7.15280000000,R1,3,MUS$2010/PJ,2020 -gas,all-week,early-peak,all-year,7.15280000000,R2,3,MUS$2010/PJ,2020 -heat,all-week,early-peak,all-year,100.00000000000,R1,3,MUS$2010/PJ,2020 -heat,all-week,early-peak,all-year,100.00000000000,R2,3,MUS$2010/PJ,2020 -CO2f,all-week,early-peak,all-year,0.08310000000,R1,3,MUS$2010/kt,2020 -CO2f,all-week,early-peak,all-year,0.08310000000,R2,3,MUS$2010/kt,2020 -cook,all-week,early-peak,all-year,100.00000000000,R1,3,MUS$2010/PJ,2020 -cook,all-week,early-peak,all-year,100.00000000000,R2,3,MUS$2010/PJ,2020 -electricity,all-week,late-peak,all-year,19.50000000000,R1,4,MUS$2010/PJ,2020 -electricity,all-week,late-peak,all-year,19.50000000000,R2,4,MUS$2010/PJ,2020 -gas,all-week,late-peak,all-year,7.15280000000,R1,4,MUS$2010/PJ,2020 -gas,all-week,late-peak,all-year,7.15280000000,R2,4,MUS$2010/PJ,2020 -heat,all-week,late-peak,all-year,100.00000000000,R1,4,MUS$2010/PJ,2020 -heat,all-week,late-peak,all-year,100.00000000000,R2,4,MUS$2010/PJ,2020 -CO2f,all-week,late-peak,all-year,0.08310000000,R1,4,MUS$2010/kt,2020 -CO2f,all-week,late-peak,all-year,0.08310000000,R2,4,MUS$2010/kt,2020 -cook,all-week,late-peak,all-year,100.00000000000,R1,4,MUS$2010/PJ,2020 -cook,all-week,late-peak,all-year,100.00000000000,R2,4,MUS$2010/PJ,2020 -electricity,all-week,evening,all-year,19.50000000000,R1,5,MUS$2010/PJ,2020 -electricity,all-week,evening,all-year,19.50000000000,R2,5,MUS$2010/PJ,2020 -gas,all-week,evening,all-year,7.15280000000,R1,5,MUS$2010/PJ,2020 -gas,all-week,evening,all-year,7.15280000000,R2,5,MUS$2010/PJ,2020 -heat,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020 -heat,all-week,evening,all-year,100.00000000000,R2,5,MUS$2010/PJ,2020 -CO2f,all-week,evening,all-year,0.08310000000,R1,5,MUS$2010/kt,2020 -CO2f,all-week,evening,all-year,0.08310000000,R2,5,MUS$2010/kt,2020 -cook,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020 -cook,all-week,evening,all-year,100.00000000000,R2,5,MUS$2010/PJ,2020 -electricity,all-week,early-morning,all-year,19.50000000000,R1,6,MUS$2010/PJ,2020 -electricity,all-week,early-morning,all-year,19.50000000000,R2,6,MUS$2010/PJ,2020 -gas,all-week,early-morning,all-year,7.15280000000,R1,6,MUS$2010/PJ,2020 -gas,all-week,early-morning,all-year,7.15280000000,R2,6,MUS$2010/PJ,2020 -heat,all-week,early-morning,all-year,100.00000000000,R1,6,MUS$2010/PJ,2020 -heat,all-week,early-morning,all-year,100.00000000000,R2,6,MUS$2010/PJ,2020 -CO2f,all-week,early-morning,all-year,0.08310000000,R1,6,MUS$2010/kt,2020 -CO2f,all-week,early-morning,all-year,0.08310000000,R2,6,MUS$2010/kt,2020 -cook,all-week,early-morning,all-year,100.00000000000,R1,6,MUS$2010/PJ,2020 -cook,all-week,early-morning,all-year,100.00000000000,R2,6,MUS$2010/PJ,2020 -electricity,all-week,late-afternoon,all-year,19.50000000000,R1,7,MUS$2010/PJ,2020 -electricity,all-week,late-afternoon,all-year,19.50000000000,R2,7,MUS$2010/PJ,2020 -gas,all-week,late-afternoon,all-year,7.15280000000,R1,7,MUS$2010/PJ,2020 -gas,all-week,late-afternoon,all-year,7.15280000000,R2,7,MUS$2010/PJ,2020 -heat,all-week,late-afternoon,all-year,100.00000000000,R1,7,MUS$2010/PJ,2020 -heat,all-week,late-afternoon,all-year,100.00000000000,R2,7,MUS$2010/PJ,2020 -CO2f,all-week,late-afternoon,all-year,0.08310000000,R1,7,MUS$2010/kt,2020 -CO2f,all-week,late-afternoon,all-year,0.08310000000,R2,7,MUS$2010/kt,2020 -cook,all-week,late-afternoon,all-year,100.00000000000,R1,7,MUS$2010/PJ,2020 -cook,all-week,late-afternoon,all-year,100.00000000000,R2,7,MUS$2010/PJ,2020 -electricity,all-week,night,all-year,8.89330000000,R1,0,MUS$2010/PJ,2025 -electricity,all-week,night,all-year,8.89330000000,R2,0,MUS$2010/PJ,2025 -gas,all-week,night,all-year,0.35420000000,R1,0,MUS$2010/PJ,2025 -gas,all-week,night,all-year,0.35420000000,R2,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,4.76500000000,R1,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,4.76500000000,R2,0,MUS$2010/PJ,2025 -CO2f,all-week,night,all-year,0.12010000000,R1,0,MUS$2010/kt,2025 -CO2f,all-week,night,all-year,0.12010000000,R2,0,MUS$2010/kt,2025 -cook,all-week,night,all-year,4.36360000000,R1,0,MUS$2010/PJ,2025 -cook,all-week,night,all-year,4.36360000000,R2,0,MUS$2010/PJ,2025 -electricity,all-week,morning,all-year,8.89330000000,R1,1,MUS$2010/PJ,2025 -electricity,all-week,morning,all-year,8.89330000000,R2,1,MUS$2010/PJ,2025 -gas,all-week,morning,all-year,0.35420000000,R1,1,MUS$2010/PJ,2025 -gas,all-week,morning,all-year,0.35420000000,R2,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,4.76500000000,R1,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,4.76500000000,R2,1,MUS$2010/PJ,2025 -CO2f,all-week,morning,all-year,0.12010000000,R1,1,MUS$2010/kt,2025 -CO2f,all-week,morning,all-year,0.12010000000,R2,1,MUS$2010/kt,2025 -cook,all-week,morning,all-year,4.36360000000,R1,1,MUS$2010/PJ,2025 -cook,all-week,morning,all-year,4.36360000000,R2,1,MUS$2010/PJ,2025 -electricity,all-week,mid-afternoon,all-year,8.89330000000,R1,2,MUS$2010/PJ,2025 -electricity,all-week,mid-afternoon,all-year,8.89330000000,R2,2,MUS$2010/PJ,2025 -gas,all-week,mid-afternoon,all-year,0.35420000000,R1,2,MUS$2010/PJ,2025 -gas,all-week,mid-afternoon,all-year,0.35420000000,R2,2,MUS$2010/PJ,2025 -heat,all-week,mid-afternoon,all-year,4.76500000000,R1,2,MUS$2010/PJ,2025 -heat,all-week,mid-afternoon,all-year,4.76500000000,R2,2,MUS$2010/PJ,2025 -CO2f,all-week,mid-afternoon,all-year,0.12010000000,R1,2,MUS$2010/kt,2025 -CO2f,all-week,mid-afternoon,all-year,0.12010000000,R2,2,MUS$2010/kt,2025 -cook,all-week,mid-afternoon,all-year,4.36360000000,R1,2,MUS$2010/PJ,2025 -cook,all-week,mid-afternoon,all-year,4.36360000000,R2,2,MUS$2010/PJ,2025 -electricity,all-week,early-peak,all-year,8.89330000000,R1,3,MUS$2010/PJ,2025 -electricity,all-week,early-peak,all-year,8.89330000000,R2,3,MUS$2010/PJ,2025 -gas,all-week,early-peak,all-year,0.35420000000,R1,3,MUS$2010/PJ,2025 -gas,all-week,early-peak,all-year,0.35420000000,R2,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,4.76500000000,R1,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,4.76500000000,R2,3,MUS$2010/PJ,2025 -CO2f,all-week,early-peak,all-year,0.12010000000,R1,3,MUS$2010/kt,2025 -CO2f,all-week,early-peak,all-year,0.12010000000,R2,3,MUS$2010/kt,2025 -cook,all-week,early-peak,all-year,4.36360000000,R1,3,MUS$2010/PJ,2025 -cook,all-week,early-peak,all-year,4.36360000000,R2,3,MUS$2010/PJ,2025 -electricity,all-week,late-peak,all-year,8.89330000000,R1,4,MUS$2010/PJ,2025 -electricity,all-week,late-peak,all-year,8.89330000000,R2,4,MUS$2010/PJ,2025 -gas,all-week,late-peak,all-year,0.35420000000,R1,4,MUS$2010/PJ,2025 -gas,all-week,late-peak,all-year,0.35420000000,R2,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,4.76500000000,R1,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,4.76500000000,R2,4,MUS$2010/PJ,2025 -CO2f,all-week,late-peak,all-year,0.12010000000,R1,4,MUS$2010/kt,2025 -CO2f,all-week,late-peak,all-year,0.12010000000,R2,4,MUS$2010/kt,2025 -cook,all-week,late-peak,all-year,4.36360000000,R1,4,MUS$2010/PJ,2025 -cook,all-week,late-peak,all-year,4.36360000000,R2,4,MUS$2010/PJ,2025 -electricity,all-week,evening,all-year,8.89330000000,R1,5,MUS$2010/PJ,2025 -electricity,all-week,evening,all-year,8.89330000000,R2,5,MUS$2010/PJ,2025 -gas,all-week,evening,all-year,0.35420000000,R1,5,MUS$2010/PJ,2025 -gas,all-week,evening,all-year,0.35420000000,R2,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,4.76500000000,R1,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,4.76500000000,R2,5,MUS$2010/PJ,2025 -CO2f,all-week,evening,all-year,0.12010000000,R1,5,MUS$2010/kt,2025 -CO2f,all-week,evening,all-year,0.12010000000,R2,5,MUS$2010/kt,2025 -cook,all-week,evening,all-year,4.36360000000,R1,5,MUS$2010/PJ,2025 -cook,all-week,evening,all-year,4.36360000000,R2,5,MUS$2010/PJ,2025 -electricity,all-week,early-morning,all-year,8.89330000000,R1,6,MUS$2010/PJ,2025 -electricity,all-week,early-morning,all-year,8.89330000000,R2,6,MUS$2010/PJ,2025 -gas,all-week,early-morning,all-year,0.35420000000,R1,6,MUS$2010/PJ,2025 -gas,all-week,early-morning,all-year,0.35420000000,R2,6,MUS$2010/PJ,2025 -heat,all-week,early-morning,all-year,4.76500000000,R1,6,MUS$2010/PJ,2025 -heat,all-week,early-morning,all-year,4.76500000000,R2,6,MUS$2010/PJ,2025 -CO2f,all-week,early-morning,all-year,0.12010000000,R1,6,MUS$2010/kt,2025 -CO2f,all-week,early-morning,all-year,0.12010000000,R2,6,MUS$2010/kt,2025 -cook,all-week,early-morning,all-year,4.36360000000,R1,6,MUS$2010/PJ,2025 -cook,all-week,early-morning,all-year,4.36360000000,R2,6,MUS$2010/PJ,2025 -electricity,all-week,late-afternoon,all-year,8.89330000000,R1,7,MUS$2010/PJ,2025 -electricity,all-week,late-afternoon,all-year,8.89330000000,R2,7,MUS$2010/PJ,2025 -gas,all-week,late-afternoon,all-year,0.35420000000,R1,7,MUS$2010/PJ,2025 -gas,all-week,late-afternoon,all-year,0.35420000000,R2,7,MUS$2010/PJ,2025 -heat,all-week,late-afternoon,all-year,4.76500000000,R1,7,MUS$2010/PJ,2025 -heat,all-week,late-afternoon,all-year,4.76500000000,R2,7,MUS$2010/PJ,2025 -CO2f,all-week,late-afternoon,all-year,0.12010000000,R1,7,MUS$2010/kt,2025 -CO2f,all-week,late-afternoon,all-year,0.12010000000,R2,7,MUS$2010/kt,2025 -cook,all-week,late-afternoon,all-year,4.36360000000,R1,7,MUS$2010/PJ,2025 -cook,all-week,late-afternoon,all-year,4.36360000000,R2,7,MUS$2010/PJ,2025 -electricity,all-week,night,all-year,12.84560000000,R1,0,MUS$2010/PJ,2030 -electricity,all-week,night,all-year,12.84560000000,R2,0,MUS$2010/PJ,2030 -gas,all-week,night,all-year,0.35420000000,R1,0,MUS$2010/PJ,2030 -gas,all-week,night,all-year,0.35420000000,R2,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,5.31860000000,R1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,5.31860000000,R2,0,MUS$2010/PJ,2030 -CO2f,all-week,night,all-year,0.15700000000,R1,0,MUS$2010/kt,2030 -CO2f,all-week,night,all-year,0.15700000000,R2,0,MUS$2010/kt,2030 -cook,all-week,night,all-year,5.31860000000,R1,0,MUS$2010/PJ,2030 -cook,all-week,night,all-year,5.31860000000,R2,0,MUS$2010/PJ,2030 -electricity,all-week,morning,all-year,12.84560000000,R1,1,MUS$2010/PJ,2030 -electricity,all-week,morning,all-year,12.84560000000,R2,1,MUS$2010/PJ,2030 -gas,all-week,morning,all-year,0.35420000000,R1,1,MUS$2010/PJ,2030 -gas,all-week,morning,all-year,0.35420000000,R2,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,5.31860000000,R1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,5.31860000000,R2,1,MUS$2010/PJ,2030 -CO2f,all-week,morning,all-year,0.15700000000,R1,1,MUS$2010/kt,2030 -CO2f,all-week,morning,all-year,0.15700000000,R2,1,MUS$2010/kt,2030 -cook,all-week,morning,all-year,5.31860000000,R1,1,MUS$2010/PJ,2030 -cook,all-week,morning,all-year,5.31860000000,R2,1,MUS$2010/PJ,2030 -electricity,all-week,mid-afternoon,all-year,12.84560000000,R1,2,MUS$2010/PJ,2030 -electricity,all-week,mid-afternoon,all-year,12.84560000000,R2,2,MUS$2010/PJ,2030 -gas,all-week,mid-afternoon,all-year,0.35420000000,R1,2,MUS$2010/PJ,2030 -gas,all-week,mid-afternoon,all-year,0.35420000000,R2,2,MUS$2010/PJ,2030 -heat,all-week,mid-afternoon,all-year,5.31860000000,R1,2,MUS$2010/PJ,2030 -heat,all-week,mid-afternoon,all-year,5.31860000000,R2,2,MUS$2010/PJ,2030 -CO2f,all-week,mid-afternoon,all-year,0.15700000000,R1,2,MUS$2010/kt,2030 -CO2f,all-week,mid-afternoon,all-year,0.15700000000,R2,2,MUS$2010/kt,2030 -cook,all-week,mid-afternoon,all-year,5.31860000000,R1,2,MUS$2010/PJ,2030 -cook,all-week,mid-afternoon,all-year,5.31860000000,R2,2,MUS$2010/PJ,2030 -electricity,all-week,early-peak,all-year,12.84560000000,R1,3,MUS$2010/PJ,2030 -electricity,all-week,early-peak,all-year,12.84560000000,R2,3,MUS$2010/PJ,2030 -gas,all-week,early-peak,all-year,0.35420000000,R1,3,MUS$2010/PJ,2030 -gas,all-week,early-peak,all-year,0.35420000000,R2,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,5.31860000000,R1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,5.31860000000,R2,3,MUS$2010/PJ,2030 -CO2f,all-week,early-peak,all-year,0.15700000000,R1,3,MUS$2010/kt,2030 -CO2f,all-week,early-peak,all-year,0.15700000000,R2,3,MUS$2010/kt,2030 -cook,all-week,early-peak,all-year,5.31860000000,R1,3,MUS$2010/PJ,2030 -cook,all-week,early-peak,all-year,5.31860000000,R2,3,MUS$2010/PJ,2030 -electricity,all-week,late-peak,all-year,12.84560000000,R1,4,MUS$2010/PJ,2030 -electricity,all-week,late-peak,all-year,12.84560000000,R2,4,MUS$2010/PJ,2030 -gas,all-week,late-peak,all-year,0.35420000000,R1,4,MUS$2010/PJ,2030 -gas,all-week,late-peak,all-year,0.35420000000,R2,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,5.31860000000,R1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,5.31860000000,R2,4,MUS$2010/PJ,2030 -CO2f,all-week,late-peak,all-year,0.15700000000,R1,4,MUS$2010/kt,2030 -CO2f,all-week,late-peak,all-year,0.15700000000,R2,4,MUS$2010/kt,2030 -cook,all-week,late-peak,all-year,5.31860000000,R1,4,MUS$2010/PJ,2030 -cook,all-week,late-peak,all-year,5.31860000000,R2,4,MUS$2010/PJ,2030 -electricity,all-week,evening,all-year,12.84560000000,R1,5,MUS$2010/PJ,2030 -electricity,all-week,evening,all-year,12.84560000000,R2,5,MUS$2010/PJ,2030 -gas,all-week,evening,all-year,0.35420000000,R1,5,MUS$2010/PJ,2030 -gas,all-week,evening,all-year,0.35420000000,R2,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,5.31860000000,R1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,5.31860000000,R2,5,MUS$2010/PJ,2030 -CO2f,all-week,evening,all-year,0.15700000000,R1,5,MUS$2010/kt,2030 -CO2f,all-week,evening,all-year,0.15700000000,R2,5,MUS$2010/kt,2030 -cook,all-week,evening,all-year,5.31860000000,R1,5,MUS$2010/PJ,2030 -cook,all-week,evening,all-year,5.31860000000,R2,5,MUS$2010/PJ,2030 -electricity,all-week,early-morning,all-year,12.84560000000,R1,6,MUS$2010/PJ,2030 -electricity,all-week,early-morning,all-year,12.84560000000,R2,6,MUS$2010/PJ,2030 -gas,all-week,early-morning,all-year,0.35420000000,R1,6,MUS$2010/PJ,2030 -gas,all-week,early-morning,all-year,0.35420000000,R2,6,MUS$2010/PJ,2030 -heat,all-week,early-morning,all-year,5.31860000000,R1,6,MUS$2010/PJ,2030 -heat,all-week,early-morning,all-year,5.31860000000,R2,6,MUS$2010/PJ,2030 -CO2f,all-week,early-morning,all-year,0.15700000000,R1,6,MUS$2010/kt,2030 -CO2f,all-week,early-morning,all-year,0.15700000000,R2,6,MUS$2010/kt,2030 -cook,all-week,early-morning,all-year,5.31860000000,R1,6,MUS$2010/PJ,2030 -cook,all-week,early-morning,all-year,5.31860000000,R2,6,MUS$2010/PJ,2030 -electricity,all-week,late-afternoon,all-year,12.84560000000,R1,7,MUS$2010/PJ,2030 -electricity,all-week,late-afternoon,all-year,12.84560000000,R2,7,MUS$2010/PJ,2030 -gas,all-week,late-afternoon,all-year,0.35420000000,R1,7,MUS$2010/PJ,2030 -gas,all-week,late-afternoon,all-year,0.35420000000,R2,7,MUS$2010/PJ,2030 -heat,all-week,late-afternoon,all-year,5.31860000000,R1,7,MUS$2010/PJ,2030 -heat,all-week,late-afternoon,all-year,5.31860000000,R2,7,MUS$2010/PJ,2030 -CO2f,all-week,late-afternoon,all-year,0.15700000000,R1,7,MUS$2010/kt,2030 -CO2f,all-week,late-afternoon,all-year,0.15700000000,R2,7,MUS$2010/kt,2030 -cook,all-week,late-afternoon,all-year,5.31860000000,R1,7,MUS$2010/PJ,2030 -cook,all-week,late-afternoon,all-year,5.31860000000,R2,7,MUS$2010/PJ,2030 -electricity,all-week,night,all-year,12.64310000000,R1,0,MUS$2010/PJ,2035 -electricity,all-week,night,all-year,12.64310000000,R2,0,MUS$2010/PJ,2035 -gas,all-week,night,all-year,0.35420000000,R1,0,MUS$2010/PJ,2035 -gas,all-week,night,all-year,0.35420000000,R2,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,5.23760000000,R1,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,5.23760000000,R2,0,MUS$2010/PJ,2035 -CO2f,all-week,night,all-year,0.21490000000,R1,0,MUS$2010/kt,2035 -CO2f,all-week,night,all-year,0.21490000000,R2,0,MUS$2010/kt,2035 -cook,all-week,night,all-year,5.23760000000,R1,0,MUS$2010/PJ,2035 -cook,all-week,night,all-year,5.23760000000,R2,0,MUS$2010/PJ,2035 -electricity,all-week,morning,all-year,12.64310000000,R1,1,MUS$2010/PJ,2035 -electricity,all-week,morning,all-year,12.64310000000,R2,1,MUS$2010/PJ,2035 -gas,all-week,morning,all-year,0.35420000000,R1,1,MUS$2010/PJ,2035 -gas,all-week,morning,all-year,0.35420000000,R2,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,5.23760000000,R1,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,5.23760000000,R2,1,MUS$2010/PJ,2035 -CO2f,all-week,morning,all-year,0.21490000000,R1,1,MUS$2010/kt,2035 -CO2f,all-week,morning,all-year,0.21490000000,R2,1,MUS$2010/kt,2035 -cook,all-week,morning,all-year,5.23760000000,R1,1,MUS$2010/PJ,2035 -cook,all-week,morning,all-year,5.23760000000,R2,1,MUS$2010/PJ,2035 -electricity,all-week,mid-afternoon,all-year,12.64310000000,R1,2,MUS$2010/PJ,2035 -electricity,all-week,mid-afternoon,all-year,12.64310000000,R2,2,MUS$2010/PJ,2035 -gas,all-week,mid-afternoon,all-year,0.35420000000,R1,2,MUS$2010/PJ,2035 -gas,all-week,mid-afternoon,all-year,0.35420000000,R2,2,MUS$2010/PJ,2035 -heat,all-week,mid-afternoon,all-year,5.23760000000,R1,2,MUS$2010/PJ,2035 -heat,all-week,mid-afternoon,all-year,5.23760000000,R2,2,MUS$2010/PJ,2035 -CO2f,all-week,mid-afternoon,all-year,0.21490000000,R1,2,MUS$2010/kt,2035 -CO2f,all-week,mid-afternoon,all-year,0.21490000000,R2,2,MUS$2010/kt,2035 -cook,all-week,mid-afternoon,all-year,5.23760000000,R1,2,MUS$2010/PJ,2035 -cook,all-week,mid-afternoon,all-year,5.23760000000,R2,2,MUS$2010/PJ,2035 -electricity,all-week,early-peak,all-year,12.64310000000,R1,3,MUS$2010/PJ,2035 -electricity,all-week,early-peak,all-year,12.64310000000,R2,3,MUS$2010/PJ,2035 -gas,all-week,early-peak,all-year,0.35420000000,R1,3,MUS$2010/PJ,2035 -gas,all-week,early-peak,all-year,0.35420000000,R2,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,5.23760000000,R1,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,5.23760000000,R2,3,MUS$2010/PJ,2035 -CO2f,all-week,early-peak,all-year,0.21490000000,R1,3,MUS$2010/kt,2035 -CO2f,all-week,early-peak,all-year,0.21490000000,R2,3,MUS$2010/kt,2035 -cook,all-week,early-peak,all-year,5.23760000000,R1,3,MUS$2010/PJ,2035 -cook,all-week,early-peak,all-year,5.23760000000,R2,3,MUS$2010/PJ,2035 -electricity,all-week,late-peak,all-year,12.64310000000,R1,4,MUS$2010/PJ,2035 -electricity,all-week,late-peak,all-year,12.64310000000,R2,4,MUS$2010/PJ,2035 -gas,all-week,late-peak,all-year,0.35420000000,R1,4,MUS$2010/PJ,2035 -gas,all-week,late-peak,all-year,0.35420000000,R2,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,5.23760000000,R1,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,5.23760000000,R2,4,MUS$2010/PJ,2035 -CO2f,all-week,late-peak,all-year,0.21490000000,R1,4,MUS$2010/kt,2035 -CO2f,all-week,late-peak,all-year,0.21490000000,R2,4,MUS$2010/kt,2035 -cook,all-week,late-peak,all-year,5.23760000000,R1,4,MUS$2010/PJ,2035 -cook,all-week,late-peak,all-year,5.23760000000,R2,4,MUS$2010/PJ,2035 -electricity,all-week,evening,all-year,12.64310000000,R1,5,MUS$2010/PJ,2035 -electricity,all-week,evening,all-year,12.64310000000,R2,5,MUS$2010/PJ,2035 -gas,all-week,evening,all-year,0.35420000000,R1,5,MUS$2010/PJ,2035 -gas,all-week,evening,all-year,0.35420000000,R2,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,5.23760000000,R1,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,5.23760000000,R2,5,MUS$2010/PJ,2035 -CO2f,all-week,evening,all-year,0.21490000000,R1,5,MUS$2010/kt,2035 -CO2f,all-week,evening,all-year,0.21490000000,R2,5,MUS$2010/kt,2035 -cook,all-week,evening,all-year,5.23760000000,R1,5,MUS$2010/PJ,2035 -cook,all-week,evening,all-year,5.23760000000,R2,5,MUS$2010/PJ,2035 -electricity,all-week,early-morning,all-year,12.64310000000,R1,6,MUS$2010/PJ,2035 -electricity,all-week,early-morning,all-year,12.64310000000,R2,6,MUS$2010/PJ,2035 -gas,all-week,early-morning,all-year,0.35420000000,R1,6,MUS$2010/PJ,2035 -gas,all-week,early-morning,all-year,0.35420000000,R2,6,MUS$2010/PJ,2035 -heat,all-week,early-morning,all-year,5.23760000000,R1,6,MUS$2010/PJ,2035 -heat,all-week,early-morning,all-year,5.23760000000,R2,6,MUS$2010/PJ,2035 -CO2f,all-week,early-morning,all-year,0.21490000000,R1,6,MUS$2010/kt,2035 -CO2f,all-week,early-morning,all-year,0.21490000000,R2,6,MUS$2010/kt,2035 -cook,all-week,early-morning,all-year,5.23760000000,R1,6,MUS$2010/PJ,2035 -cook,all-week,early-morning,all-year,5.23760000000,R2,6,MUS$2010/PJ,2035 -electricity,all-week,late-afternoon,all-year,12.64310000000,R1,7,MUS$2010/PJ,2035 -electricity,all-week,late-afternoon,all-year,12.64310000000,R2,7,MUS$2010/PJ,2035 -gas,all-week,late-afternoon,all-year,0.35420000000,R1,7,MUS$2010/PJ,2035 -gas,all-week,late-afternoon,all-year,0.35420000000,R2,7,MUS$2010/PJ,2035 -heat,all-week,late-afternoon,all-year,5.23760000000,R1,7,MUS$2010/PJ,2035 -heat,all-week,late-afternoon,all-year,5.23760000000,R2,7,MUS$2010/PJ,2035 -CO2f,all-week,late-afternoon,all-year,0.21490000000,R1,7,MUS$2010/kt,2035 -CO2f,all-week,late-afternoon,all-year,0.21490000000,R2,7,MUS$2010/kt,2035 -cook,all-week,late-afternoon,all-year,5.23760000000,R1,7,MUS$2010/PJ,2035 -cook,all-week,late-afternoon,all-year,5.23760000000,R2,7,MUS$2010/PJ,2035 -electricity,all-week,night,all-year,15.76510000000,R1,0,MUS$2010/PJ,2040 -electricity,all-week,night,all-year,15.76510000000,R2,0,MUS$2010/PJ,2040 -gas,all-week,night,all-year,0.35420000000,R1,0,MUS$2010/PJ,2040 -gas,all-week,night,all-year,0.35420000000,R2,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,6.48640000000,R1,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,6.48640000000,R2,0,MUS$2010/PJ,2040 -CO2f,all-week,night,all-year,0.27280000000,R1,0,MUS$2010/kt,2040 -CO2f,all-week,night,all-year,0.27280000000,R2,0,MUS$2010/kt,2040 -cook,all-week,night,all-year,6.48640000000,R1,0,MUS$2010/PJ,2040 -cook,all-week,night,all-year,6.48640000000,R2,0,MUS$2010/PJ,2040 -electricity,all-week,morning,all-year,15.76510000000,R1,1,MUS$2010/PJ,2040 -electricity,all-week,morning,all-year,15.76510000000,R2,1,MUS$2010/PJ,2040 -gas,all-week,morning,all-year,0.35420000000,R1,1,MUS$2010/PJ,2040 -gas,all-week,morning,all-year,0.35420000000,R2,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,6.48640000000,R1,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,6.48640000000,R2,1,MUS$2010/PJ,2040 -CO2f,all-week,morning,all-year,0.27280000000,R1,1,MUS$2010/kt,2040 -CO2f,all-week,morning,all-year,0.27280000000,R2,1,MUS$2010/kt,2040 -cook,all-week,morning,all-year,6.48640000000,R1,1,MUS$2010/PJ,2040 -cook,all-week,morning,all-year,6.48640000000,R2,1,MUS$2010/PJ,2040 -electricity,all-week,mid-afternoon,all-year,15.76510000000,R1,2,MUS$2010/PJ,2040 -electricity,all-week,mid-afternoon,all-year,15.76510000000,R2,2,MUS$2010/PJ,2040 -gas,all-week,mid-afternoon,all-year,0.35420000000,R1,2,MUS$2010/PJ,2040 -gas,all-week,mid-afternoon,all-year,0.35420000000,R2,2,MUS$2010/PJ,2040 -heat,all-week,mid-afternoon,all-year,6.48640000000,R1,2,MUS$2010/PJ,2040 -heat,all-week,mid-afternoon,all-year,6.48640000000,R2,2,MUS$2010/PJ,2040 -CO2f,all-week,mid-afternoon,all-year,0.27280000000,R1,2,MUS$2010/kt,2040 -CO2f,all-week,mid-afternoon,all-year,0.27280000000,R2,2,MUS$2010/kt,2040 -cook,all-week,mid-afternoon,all-year,6.48640000000,R1,2,MUS$2010/PJ,2040 -cook,all-week,mid-afternoon,all-year,6.48640000000,R2,2,MUS$2010/PJ,2040 -electricity,all-week,early-peak,all-year,15.76510000000,R1,3,MUS$2010/PJ,2040 -electricity,all-week,early-peak,all-year,15.76510000000,R2,3,MUS$2010/PJ,2040 -gas,all-week,early-peak,all-year,0.35420000000,R1,3,MUS$2010/PJ,2040 -gas,all-week,early-peak,all-year,0.35420000000,R2,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,6.48640000000,R1,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,6.48640000000,R2,3,MUS$2010/PJ,2040 -CO2f,all-week,early-peak,all-year,0.27280000000,R1,3,MUS$2010/kt,2040 -CO2f,all-week,early-peak,all-year,0.27280000000,R2,3,MUS$2010/kt,2040 -cook,all-week,early-peak,all-year,6.48640000000,R1,3,MUS$2010/PJ,2040 -cook,all-week,early-peak,all-year,6.48640000000,R2,3,MUS$2010/PJ,2040 -electricity,all-week,late-peak,all-year,15.76510000000,R1,4,MUS$2010/PJ,2040 -electricity,all-week,late-peak,all-year,15.76510000000,R2,4,MUS$2010/PJ,2040 -gas,all-week,late-peak,all-year,0.35420000000,R1,4,MUS$2010/PJ,2040 -gas,all-week,late-peak,all-year,0.35420000000,R2,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,6.48640000000,R1,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,6.48640000000,R2,4,MUS$2010/PJ,2040 -CO2f,all-week,late-peak,all-year,0.27280000000,R1,4,MUS$2010/kt,2040 -CO2f,all-week,late-peak,all-year,0.27280000000,R2,4,MUS$2010/kt,2040 -cook,all-week,late-peak,all-year,6.48640000000,R1,4,MUS$2010/PJ,2040 -cook,all-week,late-peak,all-year,6.48640000000,R2,4,MUS$2010/PJ,2040 -electricity,all-week,evening,all-year,15.76510000000,R1,5,MUS$2010/PJ,2040 -electricity,all-week,evening,all-year,15.76510000000,R2,5,MUS$2010/PJ,2040 -gas,all-week,evening,all-year,0.35420000000,R1,5,MUS$2010/PJ,2040 -gas,all-week,evening,all-year,0.35420000000,R2,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,6.48640000000,R1,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,6.48640000000,R2,5,MUS$2010/PJ,2040 -CO2f,all-week,evening,all-year,0.27280000000,R1,5,MUS$2010/kt,2040 -CO2f,all-week,evening,all-year,0.27280000000,R2,5,MUS$2010/kt,2040 -cook,all-week,evening,all-year,6.48640000000,R1,5,MUS$2010/PJ,2040 -cook,all-week,evening,all-year,6.48640000000,R2,5,MUS$2010/PJ,2040 -electricity,all-week,early-morning,all-year,15.76510000000,R1,6,MUS$2010/PJ,2040 -electricity,all-week,early-morning,all-year,15.76510000000,R2,6,MUS$2010/PJ,2040 -gas,all-week,early-morning,all-year,0.35420000000,R1,6,MUS$2010/PJ,2040 -gas,all-week,early-morning,all-year,0.35420000000,R2,6,MUS$2010/PJ,2040 -heat,all-week,early-morning,all-year,6.48640000000,R1,6,MUS$2010/PJ,2040 -heat,all-week,early-morning,all-year,6.48640000000,R2,6,MUS$2010/PJ,2040 -CO2f,all-week,early-morning,all-year,0.27280000000,R1,6,MUS$2010/kt,2040 -CO2f,all-week,early-morning,all-year,0.27280000000,R2,6,MUS$2010/kt,2040 -cook,all-week,early-morning,all-year,6.48640000000,R1,6,MUS$2010/PJ,2040 -cook,all-week,early-morning,all-year,6.48640000000,R2,6,MUS$2010/PJ,2040 -electricity,all-week,late-afternoon,all-year,15.76510000000,R1,7,MUS$2010/PJ,2040 -electricity,all-week,late-afternoon,all-year,15.76510000000,R2,7,MUS$2010/PJ,2040 -gas,all-week,late-afternoon,all-year,0.35420000000,R1,7,MUS$2010/PJ,2040 -gas,all-week,late-afternoon,all-year,0.35420000000,R2,7,MUS$2010/PJ,2040 -heat,all-week,late-afternoon,all-year,6.48640000000,R1,7,MUS$2010/PJ,2040 -heat,all-week,late-afternoon,all-year,6.48640000000,R2,7,MUS$2010/PJ,2040 -CO2f,all-week,late-afternoon,all-year,0.27280000000,R1,7,MUS$2010/kt,2040 -CO2f,all-week,late-afternoon,all-year,0.27280000000,R2,7,MUS$2010/kt,2040 -cook,all-week,late-afternoon,all-year,6.48640000000,R1,7,MUS$2010/PJ,2040 -cook,all-week,late-afternoon,all-year,6.48640000000,R2,7,MUS$2010/PJ,2040 -electricity,all-week,night,all-year,17.75560000000,R1,0,MUS$2010/PJ,2045 -electricity,all-week,night,all-year,17.75560000000,R2,0,MUS$2010/PJ,2045 -gas,all-week,night,all-year,0.35420000000,R1,0,MUS$2010/PJ,2045 -gas,all-week,night,all-year,0.35420000000,R2,0,MUS$2010/PJ,2045 -heat,all-week,night,all-year,7.28260000000,R1,0,MUS$2010/PJ,2045 -heat,all-week,night,all-year,7.28260000000,R2,0,MUS$2010/PJ,2045 -CO2f,all-week,night,all-year,0.35390000000,R1,0,MUS$2010/kt,2045 -CO2f,all-week,night,all-year,0.35390000000,R2,0,MUS$2010/kt,2045 -cook,all-week,night,all-year,7.28260000000,R1,0,MUS$2010/PJ,2045 -cook,all-week,night,all-year,7.28260000000,R2,0,MUS$2010/PJ,2045 -electricity,all-week,morning,all-year,17.75560000000,R1,1,MUS$2010/PJ,2045 -electricity,all-week,morning,all-year,17.75560000000,R2,1,MUS$2010/PJ,2045 -gas,all-week,morning,all-year,0.35420000000,R1,1,MUS$2010/PJ,2045 -gas,all-week,morning,all-year,0.35420000000,R2,1,MUS$2010/PJ,2045 -heat,all-week,morning,all-year,7.28260000000,R1,1,MUS$2010/PJ,2045 -heat,all-week,morning,all-year,7.28260000000,R2,1,MUS$2010/PJ,2045 -CO2f,all-week,morning,all-year,0.35390000000,R1,1,MUS$2010/kt,2045 -CO2f,all-week,morning,all-year,0.35390000000,R2,1,MUS$2010/kt,2045 -cook,all-week,morning,all-year,7.28260000000,R1,1,MUS$2010/PJ,2045 -cook,all-week,morning,all-year,7.28260000000,R2,1,MUS$2010/PJ,2045 -electricity,all-week,mid-afternoon,all-year,17.75560000000,R1,2,MUS$2010/PJ,2045 -electricity,all-week,mid-afternoon,all-year,17.75560000000,R2,2,MUS$2010/PJ,2045 -gas,all-week,mid-afternoon,all-year,0.35420000000,R1,2,MUS$2010/PJ,2045 -gas,all-week,mid-afternoon,all-year,0.35420000000,R2,2,MUS$2010/PJ,2045 -heat,all-week,mid-afternoon,all-year,7.28260000000,R1,2,MUS$2010/PJ,2045 -heat,all-week,mid-afternoon,all-year,7.28260000000,R2,2,MUS$2010/PJ,2045 -CO2f,all-week,mid-afternoon,all-year,0.35390000000,R1,2,MUS$2010/kt,2045 -CO2f,all-week,mid-afternoon,all-year,0.35390000000,R2,2,MUS$2010/kt,2045 -cook,all-week,mid-afternoon,all-year,7.28260000000,R1,2,MUS$2010/PJ,2045 -cook,all-week,mid-afternoon,all-year,7.28260000000,R2,2,MUS$2010/PJ,2045 -electricity,all-week,early-peak,all-year,17.75560000000,R1,3,MUS$2010/PJ,2045 -electricity,all-week,early-peak,all-year,17.75560000000,R2,3,MUS$2010/PJ,2045 -gas,all-week,early-peak,all-year,0.35420000000,R1,3,MUS$2010/PJ,2045 -gas,all-week,early-peak,all-year,0.35420000000,R2,3,MUS$2010/PJ,2045 -heat,all-week,early-peak,all-year,7.28260000000,R1,3,MUS$2010/PJ,2045 -heat,all-week,early-peak,all-year,7.28260000000,R2,3,MUS$2010/PJ,2045 -CO2f,all-week,early-peak,all-year,0.35390000000,R1,3,MUS$2010/kt,2045 -CO2f,all-week,early-peak,all-year,0.35390000000,R2,3,MUS$2010/kt,2045 -cook,all-week,early-peak,all-year,7.28260000000,R1,3,MUS$2010/PJ,2045 -cook,all-week,early-peak,all-year,7.28260000000,R2,3,MUS$2010/PJ,2045 -electricity,all-week,late-peak,all-year,17.75560000000,R1,4,MUS$2010/PJ,2045 -electricity,all-week,late-peak,all-year,17.75560000000,R2,4,MUS$2010/PJ,2045 -gas,all-week,late-peak,all-year,0.35420000000,R1,4,MUS$2010/PJ,2045 -gas,all-week,late-peak,all-year,0.35420000000,R2,4,MUS$2010/PJ,2045 -heat,all-week,late-peak,all-year,7.28260000000,R1,4,MUS$2010/PJ,2045 -heat,all-week,late-peak,all-year,7.28260000000,R2,4,MUS$2010/PJ,2045 -CO2f,all-week,late-peak,all-year,0.35390000000,R1,4,MUS$2010/kt,2045 -CO2f,all-week,late-peak,all-year,0.35390000000,R2,4,MUS$2010/kt,2045 -cook,all-week,late-peak,all-year,7.28260000000,R1,4,MUS$2010/PJ,2045 -cook,all-week,late-peak,all-year,7.28260000000,R2,4,MUS$2010/PJ,2045 -electricity,all-week,evening,all-year,17.75560000000,R1,5,MUS$2010/PJ,2045 -electricity,all-week,evening,all-year,17.75560000000,R2,5,MUS$2010/PJ,2045 -gas,all-week,evening,all-year,0.35420000000,R1,5,MUS$2010/PJ,2045 -gas,all-week,evening,all-year,0.35420000000,R2,5,MUS$2010/PJ,2045 -heat,all-week,evening,all-year,7.28260000000,R1,5,MUS$2010/PJ,2045 -heat,all-week,evening,all-year,7.28260000000,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 -cook,all-week,evening,all-year,7.28260000000,R1,5,MUS$2010/PJ,2045 -cook,all-week,evening,all-year,7.28260000000,R2,5,MUS$2010/PJ,2045 -electricity,all-week,early-morning,all-year,17.75560000000,R1,6,MUS$2010/PJ,2045 -electricity,all-week,early-morning,all-year,17.75560000000,R2,6,MUS$2010/PJ,2045 -gas,all-week,early-morning,all-year,0.35420000000,R1,6,MUS$2010/PJ,2045 -gas,all-week,early-morning,all-year,0.35420000000,R2,6,MUS$2010/PJ,2045 -heat,all-week,early-morning,all-year,7.28260000000,R1,6,MUS$2010/PJ,2045 -heat,all-week,early-morning,all-year,7.28260000000,R2,6,MUS$2010/PJ,2045 -CO2f,all-week,early-morning,all-year,0.35390000000,R1,6,MUS$2010/kt,2045 -CO2f,all-week,early-morning,all-year,0.35390000000,R2,6,MUS$2010/kt,2045 -cook,all-week,early-morning,all-year,7.28260000000,R1,6,MUS$2010/PJ,2045 -cook,all-week,early-morning,all-year,7.28260000000,R2,6,MUS$2010/PJ,2045 -electricity,all-week,late-afternoon,all-year,17.75560000000,R1,7,MUS$2010/PJ,2045 -electricity,all-week,late-afternoon,all-year,17.75560000000,R2,7,MUS$2010/PJ,2045 -gas,all-week,late-afternoon,all-year,0.35420000000,R1,7,MUS$2010/PJ,2045 -gas,all-week,late-afternoon,all-year,0.35420000000,R2,7,MUS$2010/PJ,2045 -heat,all-week,late-afternoon,all-year,7.28260000000,R1,7,MUS$2010/PJ,2045 -heat,all-week,late-afternoon,all-year,7.28260000000,R2,7,MUS$2010/PJ,2045 -CO2f,all-week,late-afternoon,all-year,0.35390000000,R1,7,MUS$2010/kt,2045 -CO2f,all-week,late-afternoon,all-year,0.35390000000,R2,7,MUS$2010/kt,2045 -cook,all-week,late-afternoon,all-year,7.28260000000,R1,7,MUS$2010/PJ,2045 -cook,all-week,late-afternoon,all-year,7.28260000000,R2,7,MUS$2010/PJ,2045 -electricity,all-week,night,all-year,19.28480000000,R1,0,MUS$2010/PJ,2050 -electricity,all-week,night,all-year,19.28480000000,R2,0,MUS$2010/PJ,2050 -gas,all-week,night,all-year,0.35420000000,R1,0,MUS$2010/PJ,2050 -gas,all-week,night,all-year,0.35420000000,R2,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,7.89430000000,R1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,7.89430000000,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 -cook,all-week,night,all-year,7.89430000000,R1,0,MUS$2010/PJ,2050 -cook,all-week,night,all-year,7.89430000000,R2,0,MUS$2010/PJ,2050 -electricity,all-week,morning,all-year,19.28480000000,R1,1,MUS$2010/PJ,2050 -electricity,all-week,morning,all-year,19.28480000000,R2,1,MUS$2010/PJ,2050 -gas,all-week,morning,all-year,0.35420000000,R1,1,MUS$2010/PJ,2050 -gas,all-week,morning,all-year,0.35420000000,R2,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,7.89430000000,R1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,7.89430000000,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 -cook,all-week,morning,all-year,7.89430000000,R1,1,MUS$2010/PJ,2050 -cook,all-week,morning,all-year,7.89430000000,R2,1,MUS$2010/PJ,2050 -electricity,all-week,mid-afternoon,all-year,19.28480000000,R1,2,MUS$2010/PJ,2050 -electricity,all-week,mid-afternoon,all-year,19.28480000000,R2,2,MUS$2010/PJ,2050 -gas,all-week,mid-afternoon,all-year,0.35420000000,R1,2,MUS$2010/PJ,2050 -gas,all-week,mid-afternoon,all-year,0.35420000000,R2,2,MUS$2010/PJ,2050 -heat,all-week,mid-afternoon,all-year,7.89430000000,R1,2,MUS$2010/PJ,2050 -heat,all-week,mid-afternoon,all-year,7.89430000000,R2,2,MUS$2010/PJ,2050 -CO2f,all-week,mid-afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050 -CO2f,all-week,mid-afternoon,all-year,0.43510000000,R2,2,MUS$2010/kt,2050 -cook,all-week,mid-afternoon,all-year,7.89430000000,R1,2,MUS$2010/PJ,2050 -cook,all-week,mid-afternoon,all-year,7.89430000000,R2,2,MUS$2010/PJ,2050 -electricity,all-week,early-peak,all-year,19.28480000000,R1,3,MUS$2010/PJ,2050 -electricity,all-week,early-peak,all-year,19.28480000000,R2,3,MUS$2010/PJ,2050 -gas,all-week,early-peak,all-year,0.35420000000,R1,3,MUS$2010/PJ,2050 -gas,all-week,early-peak,all-year,0.35420000000,R2,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,7.89430000000,R1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,7.89430000000,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 -cook,all-week,early-peak,all-year,7.89430000000,R1,3,MUS$2010/PJ,2050 -cook,all-week,early-peak,all-year,7.89430000000,R2,3,MUS$2010/PJ,2050 -electricity,all-week,late-peak,all-year,19.28480000000,R1,4,MUS$2010/PJ,2050 -electricity,all-week,late-peak,all-year,19.28480000000,R2,4,MUS$2010/PJ,2050 -gas,all-week,late-peak,all-year,0.35420000000,R1,4,MUS$2010/PJ,2050 -gas,all-week,late-peak,all-year,0.35420000000,R2,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,7.89430000000,R1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,7.89430000000,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 -cook,all-week,late-peak,all-year,7.89430000000,R1,4,MUS$2010/PJ,2050 -cook,all-week,late-peak,all-year,7.89430000000,R2,4,MUS$2010/PJ,2050 -electricity,all-week,evening,all-year,19.28480000000,R1,5,MUS$2010/PJ,2050 -electricity,all-week,evening,all-year,19.28480000000,R2,5,MUS$2010/PJ,2050 -gas,all-week,evening,all-year,0.35420000000,R1,5,MUS$2010/PJ,2050 -gas,all-week,evening,all-year,0.35420000000,R2,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,7.89430000000,R1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,7.89430000000,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 -cook,all-week,evening,all-year,7.89430000000,R1,5,MUS$2010/PJ,2050 -cook,all-week,evening,all-year,7.89430000000,R2,5,MUS$2010/PJ,2050 -electricity,all-week,early-morning,all-year,19.28480000000,R1,6,MUS$2010/PJ,2050 -electricity,all-week,early-morning,all-year,19.28480000000,R2,6,MUS$2010/PJ,2050 -gas,all-week,early-morning,all-year,0.35420000000,R1,6,MUS$2010/PJ,2050 -gas,all-week,early-morning,all-year,0.35420000000,R2,6,MUS$2010/PJ,2050 -heat,all-week,early-morning,all-year,7.89430000000,R1,6,MUS$2010/PJ,2050 -heat,all-week,early-morning,all-year,7.89430000000,R2,6,MUS$2010/PJ,2050 -CO2f,all-week,early-morning,all-year,0.43510000000,R1,6,MUS$2010/kt,2050 -CO2f,all-week,early-morning,all-year,0.43510000000,R2,6,MUS$2010/kt,2050 -cook,all-week,early-morning,all-year,7.89430000000,R1,6,MUS$2010/PJ,2050 -cook,all-week,early-morning,all-year,7.89430000000,R2,6,MUS$2010/PJ,2050 -electricity,all-week,late-afternoon,all-year,19.28480000000,R1,7,MUS$2010/PJ,2050 -electricity,all-week,late-afternoon,all-year,19.28480000000,R2,7,MUS$2010/PJ,2050 -gas,all-week,late-afternoon,all-year,0.35420000000,R1,7,MUS$2010/PJ,2050 -gas,all-week,late-afternoon,all-year,0.35420000000,R2,7,MUS$2010/PJ,2050 -heat,all-week,late-afternoon,all-year,7.89430000000,R1,7,MUS$2010/PJ,2050 -heat,all-week,late-afternoon,all-year,7.89430000000,R2,7,MUS$2010/PJ,2050 -CO2f,all-week,late-afternoon,all-year,0.43510000000,R1,7,MUS$2010/kt,2050 -CO2f,all-week,late-afternoon,all-year,0.43510000000,R2,7,MUS$2010/kt,2050 -cook,all-week,late-afternoon,all-year,7.89430000000,R1,7,MUS$2010/PJ,2050 -cook,all-week,late-afternoon,all-year,7.89430000000,R2,7,MUS$2010/PJ,2050 diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity.csv deleted file mode 100644 index d5af9690d..000000000 --- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity.csv +++ /dev/null @@ -1,59 +0,0 @@ -asset,capacity,installed,region,technology,year -0,1.00000000000,2020,R1,gasCCGT,2020 -2,1.00000000000,2020,R2,gasCCGT,2020 -0,11.00000000000,2020,R1,gasCCGT,2025 -2,9.86820000000,2020,R1,windturbine,2025 -3,11.00000000000,2020,R2,gasCCGT,2025 -5,9.86820000000,2020,R2,windturbine,2025 -0,10.00000000000,2020,R1,gasCCGT,2030 -1,10.50300000000,2025,R1,gasCCGT,2030 -3,9.86820000000,2020,R1,windturbine,2030 -5,10.00000000000,2020,R2,gasCCGT,2030 -6,10.50300000000,2025,R2,gasCCGT,2030 -8,9.86820000000,2020,R2,windturbine,2030 -0,10.00000000000,2020,R1,gasCCGT,2035 -1,10.50300000000,2025,R1,gasCCGT,2035 -2,20.00000000000,2030,R1,solarPV,2035 -3,9.86820000000,2020,R1,windturbine,2035 -4,2.40000000000,2030,R1,windturbine,2035 -5,10.00000000000,2020,R2,gasCCGT,2035 -6,10.50300000000,2025,R2,gasCCGT,2035 -7,20.00000000000,2030,R2,solarPV,2035 -8,9.86820000000,2020,R2,windturbine,2035 -9,2.40000000000,2030,R2,windturbine,2035 -0,10.00000000000,2020,R1,gasCCGT,2040 -1,10.50300000000,2025,R1,gasCCGT,2040 -2,20.00000000000,2030,R1,solarPV,2040 -4,9.86820000000,2020,R1,windturbine,2040 -5,2.40000000000,2030,R1,windturbine,2040 -6,10.00000000000,2020,R2,gasCCGT,2040 -7,10.50300000000,2025,R2,gasCCGT,2040 -8,20.00000000000,2030,R2,solarPV,2040 -10,9.86820000000,2020,R2,windturbine,2040 -11,2.40000000000,2030,R2,windturbine,2040 -0,10.00000000000,2020,R1,gasCCGT,2045 -1,10.50300000000,2025,R1,gasCCGT,2045 -2,20.00000000000,2030,R1,solarPV,2045 -3,11.20000000000,2040,R1,solarPV,2045 -5,9.86820000000,2020,R1,windturbine,2045 -6,2.40000000000,2030,R1,windturbine,2045 -8,10.00000000000,2020,R2,gasCCGT,2045 -9,10.50300000000,2025,R2,gasCCGT,2045 -10,20.00000000000,2030,R2,solarPV,2045 -11,11.20000000000,2040,R2,solarPV,2045 -13,9.86820000000,2020,R2,windturbine,2045 -14,2.40000000000,2030,R2,windturbine,2045 -0,10.00000000000,2020,R1,gasCCGT,2050 -1,10.50300000000,2025,R1,gasCCGT,2050 -2,20.00000000000,2030,R1,solarPV,2050 -3,11.20000000000,2040,R1,solarPV,2050 -4,20.00000000000,2045,R1,solarPV,2050 -6,2.40000000000,2030,R1,windturbine,2050 -7,1.06820000000,2045,R1,windturbine,2050 -8,10.00000000000,2020,R2,gasCCGT,2050 -9,10.50300000000,2025,R2,gasCCGT,2050 -10,20.00000000000,2030,R2,solarPV,2050 -11,11.20000000000,2040,R2,solarPV,2050 -12,20.00000000000,2045,R2,solarPV,2050 -14,2.40000000000,2030,R2,windturbine,2050 -15,1.06820000000,2045,R2,windturbine,2050 diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Capacity.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Capacity.csv deleted file mode 100644 index 53a46af8f..000000000 --- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Capacity.csv +++ /dev/null @@ -1,53 +0,0 @@ -asset,capacity,installed,region,technology,year -1,10,2020,R1,gas_stove,2020 -2,10,2020,R1,gasboiler,2020 -5,10,2020,R2,gas_stove,2020 -6,10,2020,R2,gasboiler,2020 -0,17,2020,R1,electric_stove,2025 -2,5,2020,R1,gas_stove,2025 -3,5,2020,R1,gasboiler,2025 -4,17,2020,R1,heatpump,2025 -6,17,2020,R2,electric_stove,2025 -8,5,2020,R2,gas_stove,2025 -9,5,2020,R2,gasboiler,2025 -10,17,2020,R2,heatpump,2025 -0,17,2020,R1,electric_stove,2030 -1,11,2025,R1,electric_stove,2030 -5,17,2020,R1,heatpump,2030 -6,11,2025,R1,heatpump,2030 -8,17,2020,R2,electric_stove,2030 -9,11,2025,R2,electric_stove,2030 -13,17,2020,R2,heatpump,2030 -14,11,2025,R2,heatpump,2030 -1,11,2025,R1,electric_stove,2035 -2,22,2030,R1,electric_stove,2035 -7,11,2025,R1,heatpump,2035 -8,22,2030,R1,heatpump,2035 -11,11,2025,R2,electric_stove,2035 -12,22,2030,R2,electric_stove,2035 -17,11,2025,R2,heatpump,2035 -18,22,2030,R2,heatpump,2035 -2,22,2030,R1,electric_stove,2040 -3,17,2035,R1,electric_stove,2040 -9,22,2030,R1,heatpump,2040 -10,17,2035,R1,heatpump,2040 -14,22,2030,R2,electric_stove,2040 -15,17,2035,R2,electric_stove,2040 -21,22,2030,R2,heatpump,2040 -22,17,2035,R2,heatpump,2040 -3,17,2035,R1,electric_stove,2045 -4,27,2040,R1,electric_stove,2045 -11,17,2035,R1,heatpump,2045 -12,27,2040,R1,heatpump,2045 -17,17,2035,R2,electric_stove,2045 -18,27,2040,R2,electric_stove,2045 -25,17,2035,R2,heatpump,2045 -26,27,2040,R2,heatpump,2045 -4,27,2040,R1,electric_stove,2050 -5,23,2045,R1,electric_stove,2050 -13,27,2040,R1,heatpump,2050 -14,23,2045,R1,heatpump,2050 -20,27,2040,R2,electric_stove,2050 -21,23,2045,R2,electric_stove,2050 -29,27,2040,R2,heatpump,2050 -30,23,2045,R2,heatpump,2050 diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply.csv deleted file mode 100644 index 7caf36c3b..000000000 --- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply.csv +++ /dev/null @@ -1,961 +0,0 @@ -asset,commodity,day,hour,installed,month,region,supply,technology,timeslice,year -2,heat,all-week,night,2020,all-year,R1,0.35000000000,gasboiler,0,2020 -6,heat,all-week,night,2020,all-year,R1,0.35000000000,gasboiler,0,2020 -2,heat,all-week,night,2020,all-year,R2,0.35000000000,gasboiler,0,2020 -6,heat,all-week,night,2020,all-year,R2,0.35000000000,gasboiler,0,2020 -1,CO2f,all-week,night,2020,all-year,R1,17.50000000000,gas_stove,0,2020 -2,CO2f,all-week,night,2020,all-year,R1,22.64850000000,gasboiler,0,2020 -5,CO2f,all-week,night,2020,all-year,R1,17.50000000000,gas_stove,0,2020 -6,CO2f,all-week,night,2020,all-year,R1,22.64850000000,gasboiler,0,2020 -1,CO2f,all-week,night,2020,all-year,R2,17.50000000000,gas_stove,0,2020 -2,CO2f,all-week,night,2020,all-year,R2,22.64850000000,gasboiler,0,2020 -5,CO2f,all-week,night,2020,all-year,R2,17.50000000000,gas_stove,0,2020 -6,CO2f,all-week,night,2020,all-year,R2,22.64850000000,gasboiler,0,2020 -1,cook,all-week,night,2020,all-year,R1,0.35000000000,gas_stove,0,2020 -5,cook,all-week,night,2020,all-year,R1,0.35000000000,gas_stove,0,2020 -1,cook,all-week,night,2020,all-year,R2,0.35000000000,gas_stove,0,2020 -5,cook,all-week,night,2020,all-year,R2,0.35000000000,gas_stove,0,2020 -2,heat,all-week,morning,2020,all-year,R1,0.50000000000,gasboiler,1,2020 -6,heat,all-week,morning,2020,all-year,R1,0.50000000000,gasboiler,1,2020 -2,heat,all-week,morning,2020,all-year,R2,0.50000000000,gasboiler,1,2020 -6,heat,all-week,morning,2020,all-year,R2,0.50000000000,gasboiler,1,2020 -1,CO2f,all-week,morning,2020,all-year,R1,25.00000000000,gas_stove,1,2020 -2,CO2f,all-week,morning,2020,all-year,R1,32.35500000000,gasboiler,1,2020 -5,CO2f,all-week,morning,2020,all-year,R1,25.00000000000,gas_stove,1,2020 -6,CO2f,all-week,morning,2020,all-year,R1,32.35500000000,gasboiler,1,2020 -1,CO2f,all-week,morning,2020,all-year,R2,25.00000000000,gas_stove,1,2020 -2,CO2f,all-week,morning,2020,all-year,R2,32.35500000000,gasboiler,1,2020 -5,CO2f,all-week,morning,2020,all-year,R2,25.00000000000,gas_stove,1,2020 -6,CO2f,all-week,morning,2020,all-year,R2,32.35500000000,gasboiler,1,2020 -1,cook,all-week,morning,2020,all-year,R1,0.50000000000,gas_stove,1,2020 -5,cook,all-week,morning,2020,all-year,R1,0.50000000000,gas_stove,1,2020 -1,cook,all-week,morning,2020,all-year,R2,0.50000000000,gas_stove,1,2020 -5,cook,all-week,morning,2020,all-year,R2,0.50000000000,gas_stove,1,2020 -2,heat,all-week,mid-afternoon,2020,all-year,R1,0.35000000000,gasboiler,2,2020 -6,heat,all-week,mid-afternoon,2020,all-year,R1,0.35000000000,gasboiler,2,2020 -2,heat,all-week,mid-afternoon,2020,all-year,R2,0.35000000000,gasboiler,2,2020 -6,heat,all-week,mid-afternoon,2020,all-year,R2,0.35000000000,gasboiler,2,2020 -1,CO2f,all-week,mid-afternoon,2020,all-year,R1,17.50000000000,gas_stove,2,2020 -2,CO2f,all-week,mid-afternoon,2020,all-year,R1,22.64850000000,gasboiler,2,2020 -5,CO2f,all-week,mid-afternoon,2020,all-year,R1,17.50000000000,gas_stove,2,2020 -6,CO2f,all-week,mid-afternoon,2020,all-year,R1,22.64850000000,gasboiler,2,2020 -1,CO2f,all-week,mid-afternoon,2020,all-year,R2,17.50000000000,gas_stove,2,2020 -2,CO2f,all-week,mid-afternoon,2020,all-year,R2,22.64850000000,gasboiler,2,2020 -5,CO2f,all-week,mid-afternoon,2020,all-year,R2,17.50000000000,gas_stove,2,2020 -6,CO2f,all-week,mid-afternoon,2020,all-year,R2,22.64850000000,gasboiler,2,2020 -1,cook,all-week,mid-afternoon,2020,all-year,R1,0.35000000000,gas_stove,2,2020 -5,cook,all-week,mid-afternoon,2020,all-year,R1,0.35000000000,gas_stove,2,2020 -1,cook,all-week,mid-afternoon,2020,all-year,R2,0.35000000000,gas_stove,2,2020 -5,cook,all-week,mid-afternoon,2020,all-year,R2,0.35000000000,gas_stove,2,2020 -2,heat,all-week,early-peak,2020,all-year,R1,0.50000000000,gasboiler,3,2020 -6,heat,all-week,early-peak,2020,all-year,R1,0.50000000000,gasboiler,3,2020 -2,heat,all-week,early-peak,2020,all-year,R2,0.50000000000,gasboiler,3,2020 -6,heat,all-week,early-peak,2020,all-year,R2,0.50000000000,gasboiler,3,2020 -1,CO2f,all-week,early-peak,2020,all-year,R1,25.00000000000,gas_stove,3,2020 -2,CO2f,all-week,early-peak,2020,all-year,R1,32.35500000000,gasboiler,3,2020 -5,CO2f,all-week,early-peak,2020,all-year,R1,25.00000000000,gas_stove,3,2020 -6,CO2f,all-week,early-peak,2020,all-year,R1,32.35500000000,gasboiler,3,2020 -1,CO2f,all-week,early-peak,2020,all-year,R2,25.00000000000,gas_stove,3,2020 -2,CO2f,all-week,early-peak,2020,all-year,R2,32.35500000000,gasboiler,3,2020 -5,CO2f,all-week,early-peak,2020,all-year,R2,25.00000000000,gas_stove,3,2020 -6,CO2f,all-week,early-peak,2020,all-year,R2,32.35500000000,gasboiler,3,2020 -1,cook,all-week,early-peak,2020,all-year,R1,0.50000000000,gas_stove,3,2020 -5,cook,all-week,early-peak,2020,all-year,R1,0.50000000000,gas_stove,3,2020 -1,cook,all-week,early-peak,2020,all-year,R2,0.50000000000,gas_stove,3,2020 -5,cook,all-week,early-peak,2020,all-year,R2,0.50000000000,gas_stove,3,2020 -2,heat,all-week,late-peak,2020,all-year,R1,1.05000000000,gasboiler,4,2020 -6,heat,all-week,late-peak,2020,all-year,R1,1.05000000000,gasboiler,4,2020 -2,heat,all-week,late-peak,2020,all-year,R2,1.05000000000,gasboiler,4,2020 -6,heat,all-week,late-peak,2020,all-year,R2,1.05000000000,gasboiler,4,2020 -1,CO2f,all-week,late-peak,2020,all-year,R1,52.50000000000,gas_stove,4,2020 -2,CO2f,all-week,late-peak,2020,all-year,R1,67.94550000000,gasboiler,4,2020 -5,CO2f,all-week,late-peak,2020,all-year,R1,52.50000000000,gas_stove,4,2020 -6,CO2f,all-week,late-peak,2020,all-year,R1,67.94550000000,gasboiler,4,2020 -1,CO2f,all-week,late-peak,2020,all-year,R2,52.50000000000,gas_stove,4,2020 -2,CO2f,all-week,late-peak,2020,all-year,R2,67.94550000000,gasboiler,4,2020 -5,CO2f,all-week,late-peak,2020,all-year,R2,52.50000000000,gas_stove,4,2020 -6,CO2f,all-week,late-peak,2020,all-year,R2,67.94550000000,gasboiler,4,2020 -1,cook,all-week,late-peak,2020,all-year,R1,1.05000000000,gas_stove,4,2020 -5,cook,all-week,late-peak,2020,all-year,R1,1.05000000000,gas_stove,4,2020 -1,cook,all-week,late-peak,2020,all-year,R2,1.05000000000,gas_stove,4,2020 -5,cook,all-week,late-peak,2020,all-year,R2,1.05000000000,gas_stove,4,2020 -2,heat,all-week,evening,2020,all-year,R1,0.70000000000,gasboiler,5,2020 -6,heat,all-week,evening,2020,all-year,R1,0.70000000000,gasboiler,5,2020 -2,heat,all-week,evening,2020,all-year,R2,0.70000000000,gasboiler,5,2020 -6,heat,all-week,evening,2020,all-year,R2,0.70000000000,gasboiler,5,2020 -1,CO2f,all-week,evening,2020,all-year,R1,35.00000000000,gas_stove,5,2020 -2,CO2f,all-week,evening,2020,all-year,R1,45.29700000000,gasboiler,5,2020 -5,CO2f,all-week,evening,2020,all-year,R1,35.00000000000,gas_stove,5,2020 -6,CO2f,all-week,evening,2020,all-year,R1,45.29700000000,gasboiler,5,2020 -1,CO2f,all-week,evening,2020,all-year,R2,35.00000000000,gas_stove,5,2020 -2,CO2f,all-week,evening,2020,all-year,R2,45.29700000000,gasboiler,5,2020 -5,CO2f,all-week,evening,2020,all-year,R2,35.00000000000,gas_stove,5,2020 -6,CO2f,all-week,evening,2020,all-year,R2,45.29700000000,gasboiler,5,2020 -1,cook,all-week,evening,2020,all-year,R1,0.70000000000,gas_stove,5,2020 -5,cook,all-week,evening,2020,all-year,R1,0.70000000000,gas_stove,5,2020 -1,cook,all-week,evening,2020,all-year,R2,0.70000000000,gas_stove,5,2020 -5,cook,all-week,evening,2020,all-year,R2,0.70000000000,gas_stove,5,2020 -2,heat,all-week,early-morning,2020,all-year,R1,0.70000000000,gasboiler,6,2020 -6,heat,all-week,early-morning,2020,all-year,R1,0.70000000000,gasboiler,6,2020 -2,heat,all-week,early-morning,2020,all-year,R2,0.70000000000,gasboiler,6,2020 -6,heat,all-week,early-morning,2020,all-year,R2,0.70000000000,gasboiler,6,2020 -1,CO2f,all-week,early-morning,2020,all-year,R1,35.00000000000,gas_stove,6,2020 -2,CO2f,all-week,early-morning,2020,all-year,R1,45.29700000000,gasboiler,6,2020 -5,CO2f,all-week,early-morning,2020,all-year,R1,35.00000000000,gas_stove,6,2020 -6,CO2f,all-week,early-morning,2020,all-year,R1,45.29700000000,gasboiler,6,2020 -1,CO2f,all-week,early-morning,2020,all-year,R2,35.00000000000,gas_stove,6,2020 -2,CO2f,all-week,early-morning,2020,all-year,R2,45.29700000000,gasboiler,6,2020 -5,CO2f,all-week,early-morning,2020,all-year,R2,35.00000000000,gas_stove,6,2020 -6,CO2f,all-week,early-morning,2020,all-year,R2,45.29700000000,gasboiler,6,2020 -1,cook,all-week,early-morning,2020,all-year,R1,0.70000000000,gas_stove,6,2020 -5,cook,all-week,early-morning,2020,all-year,R1,0.70000000000,gas_stove,6,2020 -1,cook,all-week,early-morning,2020,all-year,R2,0.70000000000,gas_stove,6,2020 -5,cook,all-week,early-morning,2020,all-year,R2,0.70000000000,gas_stove,6,2020 -2,heat,all-week,late-afternoon,2020,all-year,R1,0.70000000000,gasboiler,7,2020 -6,heat,all-week,late-afternoon,2020,all-year,R1,0.70000000000,gasboiler,7,2020 -2,heat,all-week,late-afternoon,2020,all-year,R2,0.70000000000,gasboiler,7,2020 -6,heat,all-week,late-afternoon,2020,all-year,R2,0.70000000000,gasboiler,7,2020 -1,CO2f,all-week,late-afternoon,2020,all-year,R1,35.00000000000,gas_stove,7,2020 -2,CO2f,all-week,late-afternoon,2020,all-year,R1,45.29700000000,gasboiler,7,2020 -5,CO2f,all-week,late-afternoon,2020,all-year,R1,35.00000000000,gas_stove,7,2020 -6,CO2f,all-week,late-afternoon,2020,all-year,R1,45.29700000000,gasboiler,7,2020 -1,CO2f,all-week,late-afternoon,2020,all-year,R2,35.00000000000,gas_stove,7,2020 -2,CO2f,all-week,late-afternoon,2020,all-year,R2,45.29700000000,gasboiler,7,2020 -5,CO2f,all-week,late-afternoon,2020,all-year,R2,35.00000000000,gas_stove,7,2020 -6,CO2f,all-week,late-afternoon,2020,all-year,R2,45.29700000000,gasboiler,7,2020 -1,cook,all-week,late-afternoon,2020,all-year,R1,0.70000000000,gas_stove,7,2020 -5,cook,all-week,late-afternoon,2020,all-year,R1,0.70000000000,gas_stove,7,2020 -1,cook,all-week,late-afternoon,2020,all-year,R2,0.70000000000,gas_stove,7,2020 -5,cook,all-week,late-afternoon,2020,all-year,R2,0.70000000000,gas_stove,7,2020 -3,heat,all-week,night,2020,all-year,R1,0.10610000000,gasboiler,0,2025 -4,heat,all-week,night,2020,all-year,R1,0.36060000000,heatpump,0,2025 -9,heat,all-week,night,2020,all-year,R1,0.10610000000,gasboiler,0,2025 -10,heat,all-week,night,2020,all-year,R1,0.36060000000,heatpump,0,2025 -3,heat,all-week,night,2020,all-year,R2,0.10610000000,gasboiler,0,2025 -4,heat,all-week,night,2020,all-year,R2,0.36060000000,heatpump,0,2025 -9,heat,all-week,night,2020,all-year,R2,0.10610000000,gasboiler,0,2025 -10,heat,all-week,night,2020,all-year,R2,0.36060000000,heatpump,0,2025 -2,CO2f,all-week,night,2020,all-year,R1,5.30300000000,gas_stove,0,2025 -3,CO2f,all-week,night,2020,all-year,R1,6.86320000000,gasboiler,0,2025 -8,CO2f,all-week,night,2020,all-year,R1,5.30300000000,gas_stove,0,2025 -9,CO2f,all-week,night,2020,all-year,R1,6.86320000000,gasboiler,0,2025 -2,CO2f,all-week,night,2020,all-year,R2,5.30300000000,gas_stove,0,2025 -3,CO2f,all-week,night,2020,all-year,R2,6.86320000000,gasboiler,0,2025 -8,CO2f,all-week,night,2020,all-year,R2,5.30300000000,gas_stove,0,2025 -9,CO2f,all-week,night,2020,all-year,R2,6.86320000000,gasboiler,0,2025 -0,cook,all-week,night,2020,all-year,R1,0.36060000000,electric_stove,0,2025 -2,cook,all-week,night,2020,all-year,R1,0.10610000000,gas_stove,0,2025 -6,cook,all-week,night,2020,all-year,R1,0.36060000000,electric_stove,0,2025 -8,cook,all-week,night,2020,all-year,R1,0.10610000000,gas_stove,0,2025 -0,cook,all-week,night,2020,all-year,R2,0.36060000000,electric_stove,0,2025 -2,cook,all-week,night,2020,all-year,R2,0.10610000000,gas_stove,0,2025 -6,cook,all-week,night,2020,all-year,R2,0.36060000000,electric_stove,0,2025 -8,cook,all-week,night,2020,all-year,R2,0.10610000000,gas_stove,0,2025 -3,heat,all-week,morning,2020,all-year,R1,0.15150000000,gasboiler,1,2025 -4,heat,all-week,morning,2020,all-year,R1,0.51520000000,heatpump,1,2025 -9,heat,all-week,morning,2020,all-year,R1,0.15150000000,gasboiler,1,2025 -10,heat,all-week,morning,2020,all-year,R1,0.51520000000,heatpump,1,2025 -3,heat,all-week,morning,2020,all-year,R2,0.15150000000,gasboiler,1,2025 -4,heat,all-week,morning,2020,all-year,R2,0.51520000000,heatpump,1,2025 -9,heat,all-week,morning,2020,all-year,R2,0.15150000000,gasboiler,1,2025 -10,heat,all-week,morning,2020,all-year,R2,0.51520000000,heatpump,1,2025 -2,CO2f,all-week,morning,2020,all-year,R1,7.57580000000,gas_stove,1,2025 -3,CO2f,all-week,morning,2020,all-year,R1,9.80450000000,gasboiler,1,2025 -8,CO2f,all-week,morning,2020,all-year,R1,7.57580000000,gas_stove,1,2025 -9,CO2f,all-week,morning,2020,all-year,R1,9.80450000000,gasboiler,1,2025 -2,CO2f,all-week,morning,2020,all-year,R2,7.57580000000,gas_stove,1,2025 -3,CO2f,all-week,morning,2020,all-year,R2,9.80450000000,gasboiler,1,2025 -8,CO2f,all-week,morning,2020,all-year,R2,7.57580000000,gas_stove,1,2025 -9,CO2f,all-week,morning,2020,all-year,R2,9.80450000000,gasboiler,1,2025 -0,cook,all-week,morning,2020,all-year,R1,0.51520000000,electric_stove,1,2025 -2,cook,all-week,morning,2020,all-year,R1,0.15150000000,gas_stove,1,2025 -6,cook,all-week,morning,2020,all-year,R1,0.51520000000,electric_stove,1,2025 -8,cook,all-week,morning,2020,all-year,R1,0.15150000000,gas_stove,1,2025 -0,cook,all-week,morning,2020,all-year,R2,0.51520000000,electric_stove,1,2025 -2,cook,all-week,morning,2020,all-year,R2,0.15150000000,gas_stove,1,2025 -6,cook,all-week,morning,2020,all-year,R2,0.51520000000,electric_stove,1,2025 -8,cook,all-week,morning,2020,all-year,R2,0.15150000000,gas_stove,1,2025 -3,heat,all-week,mid-afternoon,2020,all-year,R1,0.10610000000,gasboiler,2,2025 -4,heat,all-week,mid-afternoon,2020,all-year,R1,0.36060000000,heatpump,2,2025 -9,heat,all-week,mid-afternoon,2020,all-year,R1,0.10610000000,gasboiler,2,2025 -10,heat,all-week,mid-afternoon,2020,all-year,R1,0.36060000000,heatpump,2,2025 -3,heat,all-week,mid-afternoon,2020,all-year,R2,0.10610000000,gasboiler,2,2025 -4,heat,all-week,mid-afternoon,2020,all-year,R2,0.36060000000,heatpump,2,2025 -9,heat,all-week,mid-afternoon,2020,all-year,R2,0.10610000000,gasboiler,2,2025 -10,heat,all-week,mid-afternoon,2020,all-year,R2,0.36060000000,heatpump,2,2025 -2,CO2f,all-week,mid-afternoon,2020,all-year,R1,5.30300000000,gas_stove,2,2025 -3,CO2f,all-week,mid-afternoon,2020,all-year,R1,6.86320000000,gasboiler,2,2025 -8,CO2f,all-week,mid-afternoon,2020,all-year,R1,5.30300000000,gas_stove,2,2025 -9,CO2f,all-week,mid-afternoon,2020,all-year,R1,6.86320000000,gasboiler,2,2025 -2,CO2f,all-week,mid-afternoon,2020,all-year,R2,5.30300000000,gas_stove,2,2025 -3,CO2f,all-week,mid-afternoon,2020,all-year,R2,6.86320000000,gasboiler,2,2025 -8,CO2f,all-week,mid-afternoon,2020,all-year,R2,5.30300000000,gas_stove,2,2025 -9,CO2f,all-week,mid-afternoon,2020,all-year,R2,6.86320000000,gasboiler,2,2025 -0,cook,all-week,mid-afternoon,2020,all-year,R1,0.36060000000,electric_stove,2,2025 -2,cook,all-week,mid-afternoon,2020,all-year,R1,0.10610000000,gas_stove,2,2025 -6,cook,all-week,mid-afternoon,2020,all-year,R1,0.36060000000,electric_stove,2,2025 -8,cook,all-week,mid-afternoon,2020,all-year,R1,0.10610000000,gas_stove,2,2025 -0,cook,all-week,mid-afternoon,2020,all-year,R2,0.36060000000,electric_stove,2,2025 -2,cook,all-week,mid-afternoon,2020,all-year,R2,0.10610000000,gas_stove,2,2025 -6,cook,all-week,mid-afternoon,2020,all-year,R2,0.36060000000,electric_stove,2,2025 -8,cook,all-week,mid-afternoon,2020,all-year,R2,0.10610000000,gas_stove,2,2025 -3,heat,all-week,early-peak,2020,all-year,R1,0.15150000000,gasboiler,3,2025 -4,heat,all-week,early-peak,2020,all-year,R1,0.51520000000,heatpump,3,2025 -9,heat,all-week,early-peak,2020,all-year,R1,0.15150000000,gasboiler,3,2025 -10,heat,all-week,early-peak,2020,all-year,R1,0.51520000000,heatpump,3,2025 -3,heat,all-week,early-peak,2020,all-year,R2,0.15150000000,gasboiler,3,2025 -4,heat,all-week,early-peak,2020,all-year,R2,0.51520000000,heatpump,3,2025 -9,heat,all-week,early-peak,2020,all-year,R2,0.15150000000,gasboiler,3,2025 -10,heat,all-week,early-peak,2020,all-year,R2,0.51520000000,heatpump,3,2025 -2,CO2f,all-week,early-peak,2020,all-year,R1,7.57580000000,gas_stove,3,2025 -3,CO2f,all-week,early-peak,2020,all-year,R1,9.80450000000,gasboiler,3,2025 -8,CO2f,all-week,early-peak,2020,all-year,R1,7.57580000000,gas_stove,3,2025 -9,CO2f,all-week,early-peak,2020,all-year,R1,9.80450000000,gasboiler,3,2025 -2,CO2f,all-week,early-peak,2020,all-year,R2,7.57580000000,gas_stove,3,2025 -3,CO2f,all-week,early-peak,2020,all-year,R2,9.80450000000,gasboiler,3,2025 -8,CO2f,all-week,early-peak,2020,all-year,R2,7.57580000000,gas_stove,3,2025 -9,CO2f,all-week,early-peak,2020,all-year,R2,9.80450000000,gasboiler,3,2025 -0,cook,all-week,early-peak,2020,all-year,R1,0.51520000000,electric_stove,3,2025 -2,cook,all-week,early-peak,2020,all-year,R1,0.15150000000,gas_stove,3,2025 -6,cook,all-week,early-peak,2020,all-year,R1,0.51520000000,electric_stove,3,2025 -8,cook,all-week,early-peak,2020,all-year,R1,0.15150000000,gas_stove,3,2025 -0,cook,all-week,early-peak,2020,all-year,R2,0.51520000000,electric_stove,3,2025 -2,cook,all-week,early-peak,2020,all-year,R2,0.15150000000,gas_stove,3,2025 -6,cook,all-week,early-peak,2020,all-year,R2,0.51520000000,electric_stove,3,2025 -8,cook,all-week,early-peak,2020,all-year,R2,0.15150000000,gas_stove,3,2025 -3,heat,all-week,late-peak,2020,all-year,R1,0.31820000000,gasboiler,4,2025 -4,heat,all-week,late-peak,2020,all-year,R1,1.08180000000,heatpump,4,2025 -9,heat,all-week,late-peak,2020,all-year,R1,0.31820000000,gasboiler,4,2025 -10,heat,all-week,late-peak,2020,all-year,R1,1.08180000000,heatpump,4,2025 -3,heat,all-week,late-peak,2020,all-year,R2,0.31820000000,gasboiler,4,2025 -4,heat,all-week,late-peak,2020,all-year,R2,1.08180000000,heatpump,4,2025 -9,heat,all-week,late-peak,2020,all-year,R2,0.31820000000,gasboiler,4,2025 -10,heat,all-week,late-peak,2020,all-year,R2,1.08180000000,heatpump,4,2025 -2,CO2f,all-week,late-peak,2020,all-year,R1,15.90910000000,gas_stove,4,2025 -3,CO2f,all-week,late-peak,2020,all-year,R1,20.58950000000,gasboiler,4,2025 -8,CO2f,all-week,late-peak,2020,all-year,R1,15.90910000000,gas_stove,4,2025 -9,CO2f,all-week,late-peak,2020,all-year,R1,20.58950000000,gasboiler,4,2025 -2,CO2f,all-week,late-peak,2020,all-year,R2,15.90910000000,gas_stove,4,2025 -3,CO2f,all-week,late-peak,2020,all-year,R2,20.58950000000,gasboiler,4,2025 -8,CO2f,all-week,late-peak,2020,all-year,R2,15.90910000000,gas_stove,4,2025 -9,CO2f,all-week,late-peak,2020,all-year,R2,20.58950000000,gasboiler,4,2025 -0,cook,all-week,late-peak,2020,all-year,R1,1.08180000000,electric_stove,4,2025 -2,cook,all-week,late-peak,2020,all-year,R1,0.31820000000,gas_stove,4,2025 -6,cook,all-week,late-peak,2020,all-year,R1,1.08180000000,electric_stove,4,2025 -8,cook,all-week,late-peak,2020,all-year,R1,0.31820000000,gas_stove,4,2025 -0,cook,all-week,late-peak,2020,all-year,R2,1.08180000000,electric_stove,4,2025 -2,cook,all-week,late-peak,2020,all-year,R2,0.31820000000,gas_stove,4,2025 -6,cook,all-week,late-peak,2020,all-year,R2,1.08180000000,electric_stove,4,2025 -8,cook,all-week,late-peak,2020,all-year,R2,0.31820000000,gas_stove,4,2025 -3,heat,all-week,evening,2020,all-year,R1,0.21210000000,gasboiler,5,2025 -4,heat,all-week,evening,2020,all-year,R1,0.72120000000,heatpump,5,2025 -9,heat,all-week,evening,2020,all-year,R1,0.21210000000,gasboiler,5,2025 -10,heat,all-week,evening,2020,all-year,R1,0.72120000000,heatpump,5,2025 -3,heat,all-week,evening,2020,all-year,R2,0.21210000000,gasboiler,5,2025 -4,heat,all-week,evening,2020,all-year,R2,0.72120000000,heatpump,5,2025 -9,heat,all-week,evening,2020,all-year,R2,0.21210000000,gasboiler,5,2025 -10,heat,all-week,evening,2020,all-year,R2,0.72120000000,heatpump,5,2025 -2,CO2f,all-week,evening,2020,all-year,R1,10.60610000000,gas_stove,5,2025 -3,CO2f,all-week,evening,2020,all-year,R1,13.72640000000,gasboiler,5,2025 -8,CO2f,all-week,evening,2020,all-year,R1,10.60610000000,gas_stove,5,2025 -9,CO2f,all-week,evening,2020,all-year,R1,13.72640000000,gasboiler,5,2025 -2,CO2f,all-week,evening,2020,all-year,R2,10.60610000000,gas_stove,5,2025 -3,CO2f,all-week,evening,2020,all-year,R2,13.72640000000,gasboiler,5,2025 -8,CO2f,all-week,evening,2020,all-year,R2,10.60610000000,gas_stove,5,2025 -9,CO2f,all-week,evening,2020,all-year,R2,13.72640000000,gasboiler,5,2025 -0,cook,all-week,evening,2020,all-year,R1,0.72120000000,electric_stove,5,2025 -2,cook,all-week,evening,2020,all-year,R1,0.21210000000,gas_stove,5,2025 -6,cook,all-week,evening,2020,all-year,R1,0.72120000000,electric_stove,5,2025 -8,cook,all-week,evening,2020,all-year,R1,0.21210000000,gas_stove,5,2025 -0,cook,all-week,evening,2020,all-year,R2,0.72120000000,electric_stove,5,2025 -2,cook,all-week,evening,2020,all-year,R2,0.21210000000,gas_stove,5,2025 -6,cook,all-week,evening,2020,all-year,R2,0.72120000000,electric_stove,5,2025 -8,cook,all-week,evening,2020,all-year,R2,0.21210000000,gas_stove,5,2025 -3,heat,all-week,early-morning,2020,all-year,R1,0.21210000000,gasboiler,6,2025 -4,heat,all-week,early-morning,2020,all-year,R1,0.72120000000,heatpump,6,2025 -9,heat,all-week,early-morning,2020,all-year,R1,0.21210000000,gasboiler,6,2025 -10,heat,all-week,early-morning,2020,all-year,R1,0.72120000000,heatpump,6,2025 -3,heat,all-week,early-morning,2020,all-year,R2,0.21210000000,gasboiler,6,2025 -4,heat,all-week,early-morning,2020,all-year,R2,0.72120000000,heatpump,6,2025 -9,heat,all-week,early-morning,2020,all-year,R2,0.21210000000,gasboiler,6,2025 -10,heat,all-week,early-morning,2020,all-year,R2,0.72120000000,heatpump,6,2025 -2,CO2f,all-week,early-morning,2020,all-year,R1,10.60610000000,gas_stove,6,2025 -3,CO2f,all-week,early-morning,2020,all-year,R1,13.72640000000,gasboiler,6,2025 -8,CO2f,all-week,early-morning,2020,all-year,R1,10.60610000000,gas_stove,6,2025 -9,CO2f,all-week,early-morning,2020,all-year,R1,13.72640000000,gasboiler,6,2025 -2,CO2f,all-week,early-morning,2020,all-year,R2,10.60610000000,gas_stove,6,2025 -3,CO2f,all-week,early-morning,2020,all-year,R2,13.72640000000,gasboiler,6,2025 -8,CO2f,all-week,early-morning,2020,all-year,R2,10.60610000000,gas_stove,6,2025 -9,CO2f,all-week,early-morning,2020,all-year,R2,13.72640000000,gasboiler,6,2025 -0,cook,all-week,early-morning,2020,all-year,R1,0.72120000000,electric_stove,6,2025 -2,cook,all-week,early-morning,2020,all-year,R1,0.21210000000,gas_stove,6,2025 -6,cook,all-week,early-morning,2020,all-year,R1,0.72120000000,electric_stove,6,2025 -8,cook,all-week,early-morning,2020,all-year,R1,0.21210000000,gas_stove,6,2025 -0,cook,all-week,early-morning,2020,all-year,R2,0.72120000000,electric_stove,6,2025 -2,cook,all-week,early-morning,2020,all-year,R2,0.21210000000,gas_stove,6,2025 -6,cook,all-week,early-morning,2020,all-year,R2,0.72120000000,electric_stove,6,2025 -8,cook,all-week,early-morning,2020,all-year,R2,0.21210000000,gas_stove,6,2025 -3,heat,all-week,late-afternoon,2020,all-year,R1,0.21210000000,gasboiler,7,2025 -4,heat,all-week,late-afternoon,2020,all-year,R1,0.72120000000,heatpump,7,2025 -9,heat,all-week,late-afternoon,2020,all-year,R1,0.21210000000,gasboiler,7,2025 -10,heat,all-week,late-afternoon,2020,all-year,R1,0.72120000000,heatpump,7,2025 -3,heat,all-week,late-afternoon,2020,all-year,R2,0.21210000000,gasboiler,7,2025 -4,heat,all-week,late-afternoon,2020,all-year,R2,0.72120000000,heatpump,7,2025 -9,heat,all-week,late-afternoon,2020,all-year,R2,0.21210000000,gasboiler,7,2025 -10,heat,all-week,late-afternoon,2020,all-year,R2,0.72120000000,heatpump,7,2025 -2,CO2f,all-week,late-afternoon,2020,all-year,R1,10.60610000000,gas_stove,7,2025 -3,CO2f,all-week,late-afternoon,2020,all-year,R1,13.72640000000,gasboiler,7,2025 -8,CO2f,all-week,late-afternoon,2020,all-year,R1,10.60610000000,gas_stove,7,2025 -9,CO2f,all-week,late-afternoon,2020,all-year,R1,13.72640000000,gasboiler,7,2025 -2,CO2f,all-week,late-afternoon,2020,all-year,R2,10.60610000000,gas_stove,7,2025 -3,CO2f,all-week,late-afternoon,2020,all-year,R2,13.72640000000,gasboiler,7,2025 -8,CO2f,all-week,late-afternoon,2020,all-year,R2,10.60610000000,gas_stove,7,2025 -9,CO2f,all-week,late-afternoon,2020,all-year,R2,13.72640000000,gasboiler,7,2025 -0,cook,all-week,late-afternoon,2020,all-year,R1,0.72120000000,electric_stove,7,2025 -2,cook,all-week,late-afternoon,2020,all-year,R1,0.21210000000,gas_stove,7,2025 -6,cook,all-week,late-afternoon,2020,all-year,R1,0.72120000000,electric_stove,7,2025 -8,cook,all-week,late-afternoon,2020,all-year,R1,0.21210000000,gas_stove,7,2025 -0,cook,all-week,late-afternoon,2020,all-year,R2,0.72120000000,electric_stove,7,2025 -2,cook,all-week,late-afternoon,2020,all-year,R2,0.21210000000,gas_stove,7,2025 -6,cook,all-week,late-afternoon,2020,all-year,R2,0.72120000000,electric_stove,7,2025 -8,cook,all-week,late-afternoon,2020,all-year,R2,0.21210000000,gas_stove,7,2025 -5,heat,all-week,night,2020,all-year,R1,0.35420000000,heatpump,0,2030 -6,heat,all-week,night,2025,all-year,R1,0.22920000000,heatpump,0,2030 -13,heat,all-week,night,2020,all-year,R1,0.35420000000,heatpump,0,2030 -14,heat,all-week,night,2025,all-year,R1,0.22920000000,heatpump,0,2030 -5,heat,all-week,night,2020,all-year,R2,0.35420000000,heatpump,0,2030 -6,heat,all-week,night,2025,all-year,R2,0.22920000000,heatpump,0,2030 -13,heat,all-week,night,2020,all-year,R2,0.35420000000,heatpump,0,2030 -14,heat,all-week,night,2025,all-year,R2,0.22920000000,heatpump,0,2030 -0,cook,all-week,night,2020,all-year,R1,0.35420000000,electric_stove,0,2030 -1,cook,all-week,night,2025,all-year,R1,0.22920000000,electric_stove,0,2030 -8,cook,all-week,night,2020,all-year,R1,0.35420000000,electric_stove,0,2030 -9,cook,all-week,night,2025,all-year,R1,0.22920000000,electric_stove,0,2030 -0,cook,all-week,night,2020,all-year,R2,0.35420000000,electric_stove,0,2030 -1,cook,all-week,night,2025,all-year,R2,0.22920000000,electric_stove,0,2030 -8,cook,all-week,night,2020,all-year,R2,0.35420000000,electric_stove,0,2030 -9,cook,all-week,night,2025,all-year,R2,0.22920000000,electric_stove,0,2030 -5,heat,all-week,morning,2020,all-year,R1,0.50600000000,heatpump,1,2030 -6,heat,all-week,morning,2025,all-year,R1,0.32740000000,heatpump,1,2030 -13,heat,all-week,morning,2020,all-year,R1,0.50600000000,heatpump,1,2030 -14,heat,all-week,morning,2025,all-year,R1,0.32740000000,heatpump,1,2030 -5,heat,all-week,morning,2020,all-year,R2,0.50600000000,heatpump,1,2030 -6,heat,all-week,morning,2025,all-year,R2,0.32740000000,heatpump,1,2030 -13,heat,all-week,morning,2020,all-year,R2,0.50600000000,heatpump,1,2030 -14,heat,all-week,morning,2025,all-year,R2,0.32740000000,heatpump,1,2030 -0,cook,all-week,morning,2020,all-year,R1,0.50600000000,electric_stove,1,2030 -1,cook,all-week,morning,2025,all-year,R1,0.32740000000,electric_stove,1,2030 -8,cook,all-week,morning,2020,all-year,R1,0.50600000000,electric_stove,1,2030 -9,cook,all-week,morning,2025,all-year,R1,0.32740000000,electric_stove,1,2030 -0,cook,all-week,morning,2020,all-year,R2,0.50600000000,electric_stove,1,2030 -1,cook,all-week,morning,2025,all-year,R2,0.32740000000,electric_stove,1,2030 -8,cook,all-week,morning,2020,all-year,R2,0.50600000000,electric_stove,1,2030 -9,cook,all-week,morning,2025,all-year,R2,0.32740000000,electric_stove,1,2030 -5,heat,all-week,mid-afternoon,2020,all-year,R1,0.35420000000,heatpump,2,2030 -6,heat,all-week,mid-afternoon,2025,all-year,R1,0.22920000000,heatpump,2,2030 -13,heat,all-week,mid-afternoon,2020,all-year,R1,0.35420000000,heatpump,2,2030 -14,heat,all-week,mid-afternoon,2025,all-year,R1,0.22920000000,heatpump,2,2030 -5,heat,all-week,mid-afternoon,2020,all-year,R2,0.35420000000,heatpump,2,2030 -6,heat,all-week,mid-afternoon,2025,all-year,R2,0.22920000000,heatpump,2,2030 -13,heat,all-week,mid-afternoon,2020,all-year,R2,0.35420000000,heatpump,2,2030 -14,heat,all-week,mid-afternoon,2025,all-year,R2,0.22920000000,heatpump,2,2030 -0,cook,all-week,mid-afternoon,2020,all-year,R1,0.35420000000,electric_stove,2,2030 -1,cook,all-week,mid-afternoon,2025,all-year,R1,0.22920000000,electric_stove,2,2030 -8,cook,all-week,mid-afternoon,2020,all-year,R1,0.35420000000,electric_stove,2,2030 -9,cook,all-week,mid-afternoon,2025,all-year,R1,0.22920000000,electric_stove,2,2030 -0,cook,all-week,mid-afternoon,2020,all-year,R2,0.35420000000,electric_stove,2,2030 -1,cook,all-week,mid-afternoon,2025,all-year,R2,0.22920000000,electric_stove,2,2030 -8,cook,all-week,mid-afternoon,2020,all-year,R2,0.35420000000,electric_stove,2,2030 -9,cook,all-week,mid-afternoon,2025,all-year,R2,0.22920000000,electric_stove,2,2030 -5,heat,all-week,early-peak,2020,all-year,R1,0.50600000000,heatpump,3,2030 -6,heat,all-week,early-peak,2025,all-year,R1,0.32740000000,heatpump,3,2030 -13,heat,all-week,early-peak,2020,all-year,R1,0.50600000000,heatpump,3,2030 -14,heat,all-week,early-peak,2025,all-year,R1,0.32740000000,heatpump,3,2030 -5,heat,all-week,early-peak,2020,all-year,R2,0.50600000000,heatpump,3,2030 -6,heat,all-week,early-peak,2025,all-year,R2,0.32740000000,heatpump,3,2030 -13,heat,all-week,early-peak,2020,all-year,R2,0.50600000000,heatpump,3,2030 -14,heat,all-week,early-peak,2025,all-year,R2,0.32740000000,heatpump,3,2030 -0,cook,all-week,early-peak,2020,all-year,R1,0.50600000000,electric_stove,3,2030 -1,cook,all-week,early-peak,2025,all-year,R1,0.32740000000,electric_stove,3,2030 -8,cook,all-week,early-peak,2020,all-year,R1,0.50600000000,electric_stove,3,2030 -9,cook,all-week,early-peak,2025,all-year,R1,0.32740000000,electric_stove,3,2030 -0,cook,all-week,early-peak,2020,all-year,R2,0.50600000000,electric_stove,3,2030 -1,cook,all-week,early-peak,2025,all-year,R2,0.32740000000,electric_stove,3,2030 -8,cook,all-week,early-peak,2020,all-year,R2,0.50600000000,electric_stove,3,2030 -9,cook,all-week,early-peak,2025,all-year,R2,0.32740000000,electric_stove,3,2030 -5,heat,all-week,late-peak,2020,all-year,R1,1.06250000000,heatpump,4,2030 -6,heat,all-week,late-peak,2025,all-year,R1,0.68750000000,heatpump,4,2030 -13,heat,all-week,late-peak,2020,all-year,R1,1.06250000000,heatpump,4,2030 -14,heat,all-week,late-peak,2025,all-year,R1,0.68750000000,heatpump,4,2030 -5,heat,all-week,late-peak,2020,all-year,R2,1.06250000000,heatpump,4,2030 -6,heat,all-week,late-peak,2025,all-year,R2,0.68750000000,heatpump,4,2030 -13,heat,all-week,late-peak,2020,all-year,R2,1.06250000000,heatpump,4,2030 -14,heat,all-week,late-peak,2025,all-year,R2,0.68750000000,heatpump,4,2030 -0,cook,all-week,late-peak,2020,all-year,R1,1.06250000000,electric_stove,4,2030 -1,cook,all-week,late-peak,2025,all-year,R1,0.68750000000,electric_stove,4,2030 -8,cook,all-week,late-peak,2020,all-year,R1,1.06250000000,electric_stove,4,2030 -9,cook,all-week,late-peak,2025,all-year,R1,0.68750000000,electric_stove,4,2030 -0,cook,all-week,late-peak,2020,all-year,R2,1.06250000000,electric_stove,4,2030 -1,cook,all-week,late-peak,2025,all-year,R2,0.68750000000,electric_stove,4,2030 -8,cook,all-week,late-peak,2020,all-year,R2,1.06250000000,electric_stove,4,2030 -9,cook,all-week,late-peak,2025,all-year,R2,0.68750000000,electric_stove,4,2030 -5,heat,all-week,evening,2020,all-year,R1,0.70830000000,heatpump,5,2030 -6,heat,all-week,evening,2025,all-year,R1,0.45830000000,heatpump,5,2030 -13,heat,all-week,evening,2020,all-year,R1,0.70830000000,heatpump,5,2030 -14,heat,all-week,evening,2025,all-year,R1,0.45830000000,heatpump,5,2030 -5,heat,all-week,evening,2020,all-year,R2,0.70830000000,heatpump,5,2030 -6,heat,all-week,evening,2025,all-year,R2,0.45830000000,heatpump,5,2030 -13,heat,all-week,evening,2020,all-year,R2,0.70830000000,heatpump,5,2030 -14,heat,all-week,evening,2025,all-year,R2,0.45830000000,heatpump,5,2030 -0,cook,all-week,evening,2020,all-year,R1,0.70830000000,electric_stove,5,2030 -1,cook,all-week,evening,2025,all-year,R1,0.45830000000,electric_stove,5,2030 -8,cook,all-week,evening,2020,all-year,R1,0.70830000000,electric_stove,5,2030 -9,cook,all-week,evening,2025,all-year,R1,0.45830000000,electric_stove,5,2030 -0,cook,all-week,evening,2020,all-year,R2,0.70830000000,electric_stove,5,2030 -1,cook,all-week,evening,2025,all-year,R2,0.45830000000,electric_stove,5,2030 -8,cook,all-week,evening,2020,all-year,R2,0.70830000000,electric_stove,5,2030 -9,cook,all-week,evening,2025,all-year,R2,0.45830000000,electric_stove,5,2030 -5,heat,all-week,early-morning,2020,all-year,R1,0.70830000000,heatpump,6,2030 -6,heat,all-week,early-morning,2025,all-year,R1,0.45830000000,heatpump,6,2030 -13,heat,all-week,early-morning,2020,all-year,R1,0.70830000000,heatpump,6,2030 -14,heat,all-week,early-morning,2025,all-year,R1,0.45830000000,heatpump,6,2030 -5,heat,all-week,early-morning,2020,all-year,R2,0.70830000000,heatpump,6,2030 -6,heat,all-week,early-morning,2025,all-year,R2,0.45830000000,heatpump,6,2030 -13,heat,all-week,early-morning,2020,all-year,R2,0.70830000000,heatpump,6,2030 -14,heat,all-week,early-morning,2025,all-year,R2,0.45830000000,heatpump,6,2030 -0,cook,all-week,early-morning,2020,all-year,R1,0.70830000000,electric_stove,6,2030 -1,cook,all-week,early-morning,2025,all-year,R1,0.45830000000,electric_stove,6,2030 -8,cook,all-week,early-morning,2020,all-year,R1,0.70830000000,electric_stove,6,2030 -9,cook,all-week,early-morning,2025,all-year,R1,0.45830000000,electric_stove,6,2030 -0,cook,all-week,early-morning,2020,all-year,R2,0.70830000000,electric_stove,6,2030 -1,cook,all-week,early-morning,2025,all-year,R2,0.45830000000,electric_stove,6,2030 -8,cook,all-week,early-morning,2020,all-year,R2,0.70830000000,electric_stove,6,2030 -9,cook,all-week,early-morning,2025,all-year,R2,0.45830000000,electric_stove,6,2030 -5,heat,all-week,late-afternoon,2020,all-year,R1,0.70830000000,heatpump,7,2030 -6,heat,all-week,late-afternoon,2025,all-year,R1,0.45830000000,heatpump,7,2030 -13,heat,all-week,late-afternoon,2020,all-year,R1,0.70830000000,heatpump,7,2030 -14,heat,all-week,late-afternoon,2025,all-year,R1,0.45830000000,heatpump,7,2030 -5,heat,all-week,late-afternoon,2020,all-year,R2,0.70830000000,heatpump,7,2030 -6,heat,all-week,late-afternoon,2025,all-year,R2,0.45830000000,heatpump,7,2030 -13,heat,all-week,late-afternoon,2020,all-year,R2,0.70830000000,heatpump,7,2030 -14,heat,all-week,late-afternoon,2025,all-year,R2,0.45830000000,heatpump,7,2030 -0,cook,all-week,late-afternoon,2020,all-year,R1,0.70830000000,electric_stove,7,2030 -1,cook,all-week,late-afternoon,2025,all-year,R1,0.45830000000,electric_stove,7,2030 -8,cook,all-week,late-afternoon,2020,all-year,R1,0.70830000000,electric_stove,7,2030 -9,cook,all-week,late-afternoon,2025,all-year,R1,0.45830000000,electric_stove,7,2030 -0,cook,all-week,late-afternoon,2020,all-year,R2,0.70830000000,electric_stove,7,2030 -1,cook,all-week,late-afternoon,2025,all-year,R2,0.45830000000,electric_stove,7,2030 -8,cook,all-week,late-afternoon,2020,all-year,R2,0.70830000000,electric_stove,7,2030 -9,cook,all-week,late-afternoon,2025,all-year,R2,0.45830000000,electric_stove,7,2030 -7,heat,all-week,night,2025,all-year,R1,0.23330000000,heatpump,0,2035 -8,heat,all-week,night,2030,all-year,R1,0.46670000000,heatpump,0,2035 -17,heat,all-week,night,2025,all-year,R1,0.23330000000,heatpump,0,2035 -18,heat,all-week,night,2030,all-year,R1,0.46670000000,heatpump,0,2035 -7,heat,all-week,night,2025,all-year,R2,0.23330000000,heatpump,0,2035 -8,heat,all-week,night,2030,all-year,R2,0.46670000000,heatpump,0,2035 -17,heat,all-week,night,2025,all-year,R2,0.23330000000,heatpump,0,2035 -18,heat,all-week,night,2030,all-year,R2,0.46670000000,heatpump,0,2035 -1,cook,all-week,night,2025,all-year,R1,0.23330000000,electric_stove,0,2035 -2,cook,all-week,night,2030,all-year,R1,0.46670000000,electric_stove,0,2035 -11,cook,all-week,night,2025,all-year,R1,0.23330000000,electric_stove,0,2035 -12,cook,all-week,night,2030,all-year,R1,0.46670000000,electric_stove,0,2035 -1,cook,all-week,night,2025,all-year,R2,0.23330000000,electric_stove,0,2035 -2,cook,all-week,night,2030,all-year,R2,0.46670000000,electric_stove,0,2035 -11,cook,all-week,night,2025,all-year,R2,0.23330000000,electric_stove,0,2035 -12,cook,all-week,night,2030,all-year,R2,0.46670000000,electric_stove,0,2035 -7,heat,all-week,morning,2025,all-year,R1,0.33330000000,heatpump,1,2035 -8,heat,all-week,morning,2030,all-year,R1,0.66670000000,heatpump,1,2035 -17,heat,all-week,morning,2025,all-year,R1,0.33330000000,heatpump,1,2035 -18,heat,all-week,morning,2030,all-year,R1,0.66670000000,heatpump,1,2035 -7,heat,all-week,morning,2025,all-year,R2,0.33330000000,heatpump,1,2035 -8,heat,all-week,morning,2030,all-year,R2,0.66670000000,heatpump,1,2035 -17,heat,all-week,morning,2025,all-year,R2,0.33330000000,heatpump,1,2035 -18,heat,all-week,morning,2030,all-year,R2,0.66670000000,heatpump,1,2035 -1,cook,all-week,morning,2025,all-year,R1,0.33330000000,electric_stove,1,2035 -2,cook,all-week,morning,2030,all-year,R1,0.66670000000,electric_stove,1,2035 -11,cook,all-week,morning,2025,all-year,R1,0.33330000000,electric_stove,1,2035 -12,cook,all-week,morning,2030,all-year,R1,0.66670000000,electric_stove,1,2035 -1,cook,all-week,morning,2025,all-year,R2,0.33330000000,electric_stove,1,2035 -2,cook,all-week,morning,2030,all-year,R2,0.66670000000,electric_stove,1,2035 -11,cook,all-week,morning,2025,all-year,R2,0.33330000000,electric_stove,1,2035 -12,cook,all-week,morning,2030,all-year,R2,0.66670000000,electric_stove,1,2035 -7,heat,all-week,mid-afternoon,2025,all-year,R1,0.23330000000,heatpump,2,2035 -8,heat,all-week,mid-afternoon,2030,all-year,R1,0.46670000000,heatpump,2,2035 -17,heat,all-week,mid-afternoon,2025,all-year,R1,0.23330000000,heatpump,2,2035 -18,heat,all-week,mid-afternoon,2030,all-year,R1,0.46670000000,heatpump,2,2035 -7,heat,all-week,mid-afternoon,2025,all-year,R2,0.23330000000,heatpump,2,2035 -8,heat,all-week,mid-afternoon,2030,all-year,R2,0.46670000000,heatpump,2,2035 -17,heat,all-week,mid-afternoon,2025,all-year,R2,0.23330000000,heatpump,2,2035 -18,heat,all-week,mid-afternoon,2030,all-year,R2,0.46670000000,heatpump,2,2035 -1,cook,all-week,mid-afternoon,2025,all-year,R1,0.23330000000,electric_stove,2,2035 -2,cook,all-week,mid-afternoon,2030,all-year,R1,0.46670000000,electric_stove,2,2035 -11,cook,all-week,mid-afternoon,2025,all-year,R1,0.23330000000,electric_stove,2,2035 -12,cook,all-week,mid-afternoon,2030,all-year,R1,0.46670000000,electric_stove,2,2035 -1,cook,all-week,mid-afternoon,2025,all-year,R2,0.23330000000,electric_stove,2,2035 -2,cook,all-week,mid-afternoon,2030,all-year,R2,0.46670000000,electric_stove,2,2035 -11,cook,all-week,mid-afternoon,2025,all-year,R2,0.23330000000,electric_stove,2,2035 -12,cook,all-week,mid-afternoon,2030,all-year,R2,0.46670000000,electric_stove,2,2035 -7,heat,all-week,early-peak,2025,all-year,R1,0.33330000000,heatpump,3,2035 -8,heat,all-week,early-peak,2030,all-year,R1,0.66670000000,heatpump,3,2035 -17,heat,all-week,early-peak,2025,all-year,R1,0.33330000000,heatpump,3,2035 -18,heat,all-week,early-peak,2030,all-year,R1,0.66670000000,heatpump,3,2035 -7,heat,all-week,early-peak,2025,all-year,R2,0.33330000000,heatpump,3,2035 -8,heat,all-week,early-peak,2030,all-year,R2,0.66670000000,heatpump,3,2035 -17,heat,all-week,early-peak,2025,all-year,R2,0.33330000000,heatpump,3,2035 -18,heat,all-week,early-peak,2030,all-year,R2,0.66670000000,heatpump,3,2035 -1,cook,all-week,early-peak,2025,all-year,R1,0.33330000000,electric_stove,3,2035 -2,cook,all-week,early-peak,2030,all-year,R1,0.66670000000,electric_stove,3,2035 -11,cook,all-week,early-peak,2025,all-year,R1,0.33330000000,electric_stove,3,2035 -12,cook,all-week,early-peak,2030,all-year,R1,0.66670000000,electric_stove,3,2035 -1,cook,all-week,early-peak,2025,all-year,R2,0.33330000000,electric_stove,3,2035 -2,cook,all-week,early-peak,2030,all-year,R2,0.66670000000,electric_stove,3,2035 -11,cook,all-week,early-peak,2025,all-year,R2,0.33330000000,electric_stove,3,2035 -12,cook,all-week,early-peak,2030,all-year,R2,0.66670000000,electric_stove,3,2035 -7,heat,all-week,late-peak,2025,all-year,R1,0.70000000000,heatpump,4,2035 -8,heat,all-week,late-peak,2030,all-year,R1,1.40000000000,heatpump,4,2035 -17,heat,all-week,late-peak,2025,all-year,R1,0.70000000000,heatpump,4,2035 -18,heat,all-week,late-peak,2030,all-year,R1,1.40000000000,heatpump,4,2035 -7,heat,all-week,late-peak,2025,all-year,R2,0.70000000000,heatpump,4,2035 -8,heat,all-week,late-peak,2030,all-year,R2,1.40000000000,heatpump,4,2035 -17,heat,all-week,late-peak,2025,all-year,R2,0.70000000000,heatpump,4,2035 -18,heat,all-week,late-peak,2030,all-year,R2,1.40000000000,heatpump,4,2035 -1,cook,all-week,late-peak,2025,all-year,R1,0.70000000000,electric_stove,4,2035 -2,cook,all-week,late-peak,2030,all-year,R1,1.40000000000,electric_stove,4,2035 -11,cook,all-week,late-peak,2025,all-year,R1,0.70000000000,electric_stove,4,2035 -12,cook,all-week,late-peak,2030,all-year,R1,1.40000000000,electric_stove,4,2035 -1,cook,all-week,late-peak,2025,all-year,R2,0.70000000000,electric_stove,4,2035 -2,cook,all-week,late-peak,2030,all-year,R2,1.40000000000,electric_stove,4,2035 -11,cook,all-week,late-peak,2025,all-year,R2,0.70000000000,electric_stove,4,2035 -12,cook,all-week,late-peak,2030,all-year,R2,1.40000000000,electric_stove,4,2035 -7,heat,all-week,evening,2025,all-year,R1,0.46670000000,heatpump,5,2035 -8,heat,all-week,evening,2030,all-year,R1,0.93330000000,heatpump,5,2035 -17,heat,all-week,evening,2025,all-year,R1,0.46670000000,heatpump,5,2035 -18,heat,all-week,evening,2030,all-year,R1,0.93330000000,heatpump,5,2035 -7,heat,all-week,evening,2025,all-year,R2,0.46670000000,heatpump,5,2035 -8,heat,all-week,evening,2030,all-year,R2,0.93330000000,heatpump,5,2035 -17,heat,all-week,evening,2025,all-year,R2,0.46670000000,heatpump,5,2035 -18,heat,all-week,evening,2030,all-year,R2,0.93330000000,heatpump,5,2035 -1,cook,all-week,evening,2025,all-year,R1,0.46670000000,electric_stove,5,2035 -2,cook,all-week,evening,2030,all-year,R1,0.93330000000,electric_stove,5,2035 -11,cook,all-week,evening,2025,all-year,R1,0.46670000000,electric_stove,5,2035 -12,cook,all-week,evening,2030,all-year,R1,0.93330000000,electric_stove,5,2035 -1,cook,all-week,evening,2025,all-year,R2,0.46670000000,electric_stove,5,2035 -2,cook,all-week,evening,2030,all-year,R2,0.93330000000,electric_stove,5,2035 -11,cook,all-week,evening,2025,all-year,R2,0.46670000000,electric_stove,5,2035 -12,cook,all-week,evening,2030,all-year,R2,0.93330000000,electric_stove,5,2035 -7,heat,all-week,early-morning,2025,all-year,R1,0.46670000000,heatpump,6,2035 -8,heat,all-week,early-morning,2030,all-year,R1,0.93330000000,heatpump,6,2035 -17,heat,all-week,early-morning,2025,all-year,R1,0.46670000000,heatpump,6,2035 -18,heat,all-week,early-morning,2030,all-year,R1,0.93330000000,heatpump,6,2035 -7,heat,all-week,early-morning,2025,all-year,R2,0.46670000000,heatpump,6,2035 -8,heat,all-week,early-morning,2030,all-year,R2,0.93330000000,heatpump,6,2035 -17,heat,all-week,early-morning,2025,all-year,R2,0.46670000000,heatpump,6,2035 -18,heat,all-week,early-morning,2030,all-year,R2,0.93330000000,heatpump,6,2035 -1,cook,all-week,early-morning,2025,all-year,R1,0.46670000000,electric_stove,6,2035 -2,cook,all-week,early-morning,2030,all-year,R1,0.93330000000,electric_stove,6,2035 -11,cook,all-week,early-morning,2025,all-year,R1,0.46670000000,electric_stove,6,2035 -12,cook,all-week,early-morning,2030,all-year,R1,0.93330000000,electric_stove,6,2035 -1,cook,all-week,early-morning,2025,all-year,R2,0.46670000000,electric_stove,6,2035 -2,cook,all-week,early-morning,2030,all-year,R2,0.93330000000,electric_stove,6,2035 -11,cook,all-week,early-morning,2025,all-year,R2,0.46670000000,electric_stove,6,2035 -12,cook,all-week,early-morning,2030,all-year,R2,0.93330000000,electric_stove,6,2035 -7,heat,all-week,late-afternoon,2025,all-year,R1,0.46670000000,heatpump,7,2035 -8,heat,all-week,late-afternoon,2030,all-year,R1,0.93330000000,heatpump,7,2035 -17,heat,all-week,late-afternoon,2025,all-year,R1,0.46670000000,heatpump,7,2035 -18,heat,all-week,late-afternoon,2030,all-year,R1,0.93330000000,heatpump,7,2035 -7,heat,all-week,late-afternoon,2025,all-year,R2,0.46670000000,heatpump,7,2035 -8,heat,all-week,late-afternoon,2030,all-year,R2,0.93330000000,heatpump,7,2035 -17,heat,all-week,late-afternoon,2025,all-year,R2,0.46670000000,heatpump,7,2035 -18,heat,all-week,late-afternoon,2030,all-year,R2,0.93330000000,heatpump,7,2035 -1,cook,all-week,late-afternoon,2025,all-year,R1,0.46670000000,electric_stove,7,2035 -2,cook,all-week,late-afternoon,2030,all-year,R1,0.93330000000,electric_stove,7,2035 -11,cook,all-week,late-afternoon,2025,all-year,R1,0.46670000000,electric_stove,7,2035 -12,cook,all-week,late-afternoon,2030,all-year,R1,0.93330000000,electric_stove,7,2035 -1,cook,all-week,late-afternoon,2025,all-year,R2,0.46670000000,electric_stove,7,2035 -2,cook,all-week,late-afternoon,2030,all-year,R2,0.93330000000,electric_stove,7,2035 -11,cook,all-week,late-afternoon,2025,all-year,R2,0.46670000000,electric_stove,7,2035 -12,cook,all-week,late-afternoon,2030,all-year,R2,0.93330000000,electric_stove,7,2035 -9,heat,all-week,night,2030,all-year,R1,0.46070000000,heatpump,0,2040 -10,heat,all-week,night,2035,all-year,R1,0.35600000000,heatpump,0,2040 -21,heat,all-week,night,2030,all-year,R1,0.46070000000,heatpump,0,2040 -22,heat,all-week,night,2035,all-year,R1,0.35600000000,heatpump,0,2040 -9,heat,all-week,night,2030,all-year,R2,0.46070000000,heatpump,0,2040 -10,heat,all-week,night,2035,all-year,R2,0.35600000000,heatpump,0,2040 -21,heat,all-week,night,2030,all-year,R2,0.46070000000,heatpump,0,2040 -22,heat,all-week,night,2035,all-year,R2,0.35600000000,heatpump,0,2040 -2,cook,all-week,night,2030,all-year,R1,0.46070000000,electric_stove,0,2040 -3,cook,all-week,night,2035,all-year,R1,0.35600000000,electric_stove,0,2040 -14,cook,all-week,night,2030,all-year,R1,0.46070000000,electric_stove,0,2040 -15,cook,all-week,night,2035,all-year,R1,0.35600000000,electric_stove,0,2040 -2,cook,all-week,night,2030,all-year,R2,0.46070000000,electric_stove,0,2040 -3,cook,all-week,night,2035,all-year,R2,0.35600000000,electric_stove,0,2040 -14,cook,all-week,night,2030,all-year,R2,0.46070000000,electric_stove,0,2040 -15,cook,all-week,night,2035,all-year,R2,0.35600000000,electric_stove,0,2040 -9,heat,all-week,morning,2030,all-year,R1,0.65810000000,heatpump,1,2040 -10,heat,all-week,morning,2035,all-year,R1,0.50850000000,heatpump,1,2040 -21,heat,all-week,morning,2030,all-year,R1,0.65810000000,heatpump,1,2040 -22,heat,all-week,morning,2035,all-year,R1,0.50850000000,heatpump,1,2040 -9,heat,all-week,morning,2030,all-year,R2,0.65810000000,heatpump,1,2040 -10,heat,all-week,morning,2035,all-year,R2,0.50850000000,heatpump,1,2040 -21,heat,all-week,morning,2030,all-year,R2,0.65810000000,heatpump,1,2040 -22,heat,all-week,morning,2035,all-year,R2,0.50850000000,heatpump,1,2040 -2,cook,all-week,morning,2030,all-year,R1,0.65810000000,electric_stove,1,2040 -3,cook,all-week,morning,2035,all-year,R1,0.50850000000,electric_stove,1,2040 -14,cook,all-week,morning,2030,all-year,R1,0.65810000000,electric_stove,1,2040 -15,cook,all-week,morning,2035,all-year,R1,0.50850000000,electric_stove,1,2040 -2,cook,all-week,morning,2030,all-year,R2,0.65810000000,electric_stove,1,2040 -3,cook,all-week,morning,2035,all-year,R2,0.50850000000,electric_stove,1,2040 -14,cook,all-week,morning,2030,all-year,R2,0.65810000000,electric_stove,1,2040 -15,cook,all-week,morning,2035,all-year,R2,0.50850000000,electric_stove,1,2040 -9,heat,all-week,mid-afternoon,2030,all-year,R1,0.46070000000,heatpump,2,2040 -10,heat,all-week,mid-afternoon,2035,all-year,R1,0.35600000000,heatpump,2,2040 -21,heat,all-week,mid-afternoon,2030,all-year,R1,0.46070000000,heatpump,2,2040 -22,heat,all-week,mid-afternoon,2035,all-year,R1,0.35600000000,heatpump,2,2040 -9,heat,all-week,mid-afternoon,2030,all-year,R2,0.46070000000,heatpump,2,2040 -10,heat,all-week,mid-afternoon,2035,all-year,R2,0.35600000000,heatpump,2,2040 -21,heat,all-week,mid-afternoon,2030,all-year,R2,0.46070000000,heatpump,2,2040 -22,heat,all-week,mid-afternoon,2035,all-year,R2,0.35600000000,heatpump,2,2040 -2,cook,all-week,mid-afternoon,2030,all-year,R1,0.46070000000,electric_stove,2,2040 -3,cook,all-week,mid-afternoon,2035,all-year,R1,0.35600000000,electric_stove,2,2040 -14,cook,all-week,mid-afternoon,2030,all-year,R1,0.46070000000,electric_stove,2,2040 -15,cook,all-week,mid-afternoon,2035,all-year,R1,0.35600000000,electric_stove,2,2040 -2,cook,all-week,mid-afternoon,2030,all-year,R2,0.46070000000,electric_stove,2,2040 -3,cook,all-week,mid-afternoon,2035,all-year,R2,0.35600000000,electric_stove,2,2040 -14,cook,all-week,mid-afternoon,2030,all-year,R2,0.46070000000,electric_stove,2,2040 -15,cook,all-week,mid-afternoon,2035,all-year,R2,0.35600000000,electric_stove,2,2040 -9,heat,all-week,early-peak,2030,all-year,R1,0.65810000000,heatpump,3,2040 -10,heat,all-week,early-peak,2035,all-year,R1,0.50850000000,heatpump,3,2040 -21,heat,all-week,early-peak,2030,all-year,R1,0.65810000000,heatpump,3,2040 -22,heat,all-week,early-peak,2035,all-year,R1,0.50850000000,heatpump,3,2040 -9,heat,all-week,early-peak,2030,all-year,R2,0.65810000000,heatpump,3,2040 -10,heat,all-week,early-peak,2035,all-year,R2,0.50850000000,heatpump,3,2040 -21,heat,all-week,early-peak,2030,all-year,R2,0.65810000000,heatpump,3,2040 -22,heat,all-week,early-peak,2035,all-year,R2,0.50850000000,heatpump,3,2040 -2,cook,all-week,early-peak,2030,all-year,R1,0.65810000000,electric_stove,3,2040 -3,cook,all-week,early-peak,2035,all-year,R1,0.50850000000,electric_stove,3,2040 -14,cook,all-week,early-peak,2030,all-year,R1,0.65810000000,electric_stove,3,2040 -15,cook,all-week,early-peak,2035,all-year,R1,0.50850000000,electric_stove,3,2040 -2,cook,all-week,early-peak,2030,all-year,R2,0.65810000000,electric_stove,3,2040 -3,cook,all-week,early-peak,2035,all-year,R2,0.50850000000,electric_stove,3,2040 -14,cook,all-week,early-peak,2030,all-year,R2,0.65810000000,electric_stove,3,2040 -15,cook,all-week,early-peak,2035,all-year,R2,0.50850000000,electric_stove,3,2040 -9,heat,all-week,late-peak,2030,all-year,R1,1.38210000000,heatpump,4,2040 -10,heat,all-week,late-peak,2035,all-year,R1,1.06790000000,heatpump,4,2040 -21,heat,all-week,late-peak,2030,all-year,R1,1.38210000000,heatpump,4,2040 -22,heat,all-week,late-peak,2035,all-year,R1,1.06790000000,heatpump,4,2040 -9,heat,all-week,late-peak,2030,all-year,R2,1.38210000000,heatpump,4,2040 -10,heat,all-week,late-peak,2035,all-year,R2,1.06790000000,heatpump,4,2040 -21,heat,all-week,late-peak,2030,all-year,R2,1.38210000000,heatpump,4,2040 -22,heat,all-week,late-peak,2035,all-year,R2,1.06790000000,heatpump,4,2040 -2,cook,all-week,late-peak,2030,all-year,R1,1.38210000000,electric_stove,4,2040 -3,cook,all-week,late-peak,2035,all-year,R1,1.06790000000,electric_stove,4,2040 -14,cook,all-week,late-peak,2030,all-year,R1,1.38210000000,electric_stove,4,2040 -15,cook,all-week,late-peak,2035,all-year,R1,1.06790000000,electric_stove,4,2040 -2,cook,all-week,late-peak,2030,all-year,R2,1.38210000000,electric_stove,4,2040 -3,cook,all-week,late-peak,2035,all-year,R2,1.06790000000,electric_stove,4,2040 -14,cook,all-week,late-peak,2030,all-year,R2,1.38210000000,electric_stove,4,2040 -15,cook,all-week,late-peak,2035,all-year,R2,1.06790000000,electric_stove,4,2040 -9,heat,all-week,evening,2030,all-year,R1,0.92140000000,heatpump,5,2040 -10,heat,all-week,evening,2035,all-year,R1,0.71200000000,heatpump,5,2040 -21,heat,all-week,evening,2030,all-year,R1,0.92140000000,heatpump,5,2040 -22,heat,all-week,evening,2035,all-year,R1,0.71200000000,heatpump,5,2040 -9,heat,all-week,evening,2030,all-year,R2,0.92140000000,heatpump,5,2040 -10,heat,all-week,evening,2035,all-year,R2,0.71200000000,heatpump,5,2040 -21,heat,all-week,evening,2030,all-year,R2,0.92140000000,heatpump,5,2040 -22,heat,all-week,evening,2035,all-year,R2,0.71200000000,heatpump,5,2040 -2,cook,all-week,evening,2030,all-year,R1,0.92140000000,electric_stove,5,2040 -3,cook,all-week,evening,2035,all-year,R1,0.71200000000,electric_stove,5,2040 -14,cook,all-week,evening,2030,all-year,R1,0.92140000000,electric_stove,5,2040 -15,cook,all-week,evening,2035,all-year,R1,0.71200000000,electric_stove,5,2040 -2,cook,all-week,evening,2030,all-year,R2,0.92140000000,electric_stove,5,2040 -3,cook,all-week,evening,2035,all-year,R2,0.71200000000,electric_stove,5,2040 -14,cook,all-week,evening,2030,all-year,R2,0.92140000000,electric_stove,5,2040 -15,cook,all-week,evening,2035,all-year,R2,0.71200000000,electric_stove,5,2040 -9,heat,all-week,early-morning,2030,all-year,R1,0.92140000000,heatpump,6,2040 -10,heat,all-week,early-morning,2035,all-year,R1,0.71200000000,heatpump,6,2040 -21,heat,all-week,early-morning,2030,all-year,R1,0.92140000000,heatpump,6,2040 -22,heat,all-week,early-morning,2035,all-year,R1,0.71200000000,heatpump,6,2040 -9,heat,all-week,early-morning,2030,all-year,R2,0.92140000000,heatpump,6,2040 -10,heat,all-week,early-morning,2035,all-year,R2,0.71200000000,heatpump,6,2040 -21,heat,all-week,early-morning,2030,all-year,R2,0.92140000000,heatpump,6,2040 -22,heat,all-week,early-morning,2035,all-year,R2,0.71200000000,heatpump,6,2040 -2,cook,all-week,early-morning,2030,all-year,R1,0.92140000000,electric_stove,6,2040 -3,cook,all-week,early-morning,2035,all-year,R1,0.71200000000,electric_stove,6,2040 -14,cook,all-week,early-morning,2030,all-year,R1,0.92140000000,electric_stove,6,2040 -15,cook,all-week,early-morning,2035,all-year,R1,0.71200000000,electric_stove,6,2040 -2,cook,all-week,early-morning,2030,all-year,R2,0.92140000000,electric_stove,6,2040 -3,cook,all-week,early-morning,2035,all-year,R2,0.71200000000,electric_stove,6,2040 -14,cook,all-week,early-morning,2030,all-year,R2,0.92140000000,electric_stove,6,2040 -15,cook,all-week,early-morning,2035,all-year,R2,0.71200000000,electric_stove,6,2040 -9,heat,all-week,late-afternoon,2030,all-year,R1,0.92140000000,heatpump,7,2040 -10,heat,all-week,late-afternoon,2035,all-year,R1,0.71200000000,heatpump,7,2040 -21,heat,all-week,late-afternoon,2030,all-year,R1,0.92140000000,heatpump,7,2040 -22,heat,all-week,late-afternoon,2035,all-year,R1,0.71200000000,heatpump,7,2040 -9,heat,all-week,late-afternoon,2030,all-year,R2,0.92140000000,heatpump,7,2040 -10,heat,all-week,late-afternoon,2035,all-year,R2,0.71200000000,heatpump,7,2040 -21,heat,all-week,late-afternoon,2030,all-year,R2,0.92140000000,heatpump,7,2040 -22,heat,all-week,late-afternoon,2035,all-year,R2,0.71200000000,heatpump,7,2040 -2,cook,all-week,late-afternoon,2030,all-year,R1,0.92140000000,electric_stove,7,2040 -3,cook,all-week,late-afternoon,2035,all-year,R1,0.71200000000,electric_stove,7,2040 -14,cook,all-week,late-afternoon,2030,all-year,R1,0.92140000000,electric_stove,7,2040 -15,cook,all-week,late-afternoon,2035,all-year,R1,0.71200000000,electric_stove,7,2040 -2,cook,all-week,late-afternoon,2030,all-year,R2,0.92140000000,electric_stove,7,2040 -3,cook,all-week,late-afternoon,2035,all-year,R2,0.71200000000,electric_stove,7,2040 -14,cook,all-week,late-afternoon,2030,all-year,R2,0.92140000000,electric_stove,7,2040 -15,cook,all-week,late-afternoon,2035,all-year,R2,0.71200000000,electric_stove,7,2040 -11,heat,all-week,night,2035,all-year,R1,0.36060000000,heatpump,0,2045 -12,heat,all-week,night,2040,all-year,R1,0.57270000000,heatpump,0,2045 -25,heat,all-week,night,2035,all-year,R1,0.36060000000,heatpump,0,2045 -26,heat,all-week,night,2040,all-year,R1,0.57270000000,heatpump,0,2045 -11,heat,all-week,night,2035,all-year,R2,0.36060000000,heatpump,0,2045 -12,heat,all-week,night,2040,all-year,R2,0.57270000000,heatpump,0,2045 -25,heat,all-week,night,2035,all-year,R2,0.36060000000,heatpump,0,2045 -26,heat,all-week,night,2040,all-year,R2,0.57270000000,heatpump,0,2045 -3,cook,all-week,night,2035,all-year,R1,0.36060000000,electric_stove,0,2045 -4,cook,all-week,night,2040,all-year,R1,0.57270000000,electric_stove,0,2045 -17,cook,all-week,night,2035,all-year,R1,0.36060000000,electric_stove,0,2045 -18,cook,all-week,night,2040,all-year,R1,0.57270000000,electric_stove,0,2045 -3,cook,all-week,night,2035,all-year,R2,0.36060000000,electric_stove,0,2045 -4,cook,all-week,night,2040,all-year,R2,0.57270000000,electric_stove,0,2045 -17,cook,all-week,night,2035,all-year,R2,0.36060000000,electric_stove,0,2045 -18,cook,all-week,night,2040,all-year,R2,0.57270000000,electric_stove,0,2045 -11,heat,all-week,morning,2035,all-year,R1,0.51520000000,heatpump,1,2045 -12,heat,all-week,morning,2040,all-year,R1,0.81820000000,heatpump,1,2045 -25,heat,all-week,morning,2035,all-year,R1,0.51520000000,heatpump,1,2045 -26,heat,all-week,morning,2040,all-year,R1,0.81820000000,heatpump,1,2045 -11,heat,all-week,morning,2035,all-year,R2,0.51520000000,heatpump,1,2045 -12,heat,all-week,morning,2040,all-year,R2,0.81820000000,heatpump,1,2045 -25,heat,all-week,morning,2035,all-year,R2,0.51520000000,heatpump,1,2045 -26,heat,all-week,morning,2040,all-year,R2,0.81820000000,heatpump,1,2045 -3,cook,all-week,morning,2035,all-year,R1,0.51520000000,electric_stove,1,2045 -4,cook,all-week,morning,2040,all-year,R1,0.81820000000,electric_stove,1,2045 -17,cook,all-week,morning,2035,all-year,R1,0.51520000000,electric_stove,1,2045 -18,cook,all-week,morning,2040,all-year,R1,0.81820000000,electric_stove,1,2045 -3,cook,all-week,morning,2035,all-year,R2,0.51520000000,electric_stove,1,2045 -4,cook,all-week,morning,2040,all-year,R2,0.81820000000,electric_stove,1,2045 -17,cook,all-week,morning,2035,all-year,R2,0.51520000000,electric_stove,1,2045 -18,cook,all-week,morning,2040,all-year,R2,0.81820000000,electric_stove,1,2045 -11,heat,all-week,mid-afternoon,2035,all-year,R1,0.36060000000,heatpump,2,2045 -12,heat,all-week,mid-afternoon,2040,all-year,R1,0.57270000000,heatpump,2,2045 -25,heat,all-week,mid-afternoon,2035,all-year,R1,0.36060000000,heatpump,2,2045 -26,heat,all-week,mid-afternoon,2040,all-year,R1,0.57270000000,heatpump,2,2045 -11,heat,all-week,mid-afternoon,2035,all-year,R2,0.36060000000,heatpump,2,2045 -12,heat,all-week,mid-afternoon,2040,all-year,R2,0.57270000000,heatpump,2,2045 -25,heat,all-week,mid-afternoon,2035,all-year,R2,0.36060000000,heatpump,2,2045 -26,heat,all-week,mid-afternoon,2040,all-year,R2,0.57270000000,heatpump,2,2045 -3,cook,all-week,mid-afternoon,2035,all-year,R1,0.36060000000,electric_stove,2,2045 -4,cook,all-week,mid-afternoon,2040,all-year,R1,0.57270000000,electric_stove,2,2045 -17,cook,all-week,mid-afternoon,2035,all-year,R1,0.36060000000,electric_stove,2,2045 -18,cook,all-week,mid-afternoon,2040,all-year,R1,0.57270000000,electric_stove,2,2045 -3,cook,all-week,mid-afternoon,2035,all-year,R2,0.36060000000,electric_stove,2,2045 -4,cook,all-week,mid-afternoon,2040,all-year,R2,0.57270000000,electric_stove,2,2045 -17,cook,all-week,mid-afternoon,2035,all-year,R2,0.36060000000,electric_stove,2,2045 -18,cook,all-week,mid-afternoon,2040,all-year,R2,0.57270000000,electric_stove,2,2045 -11,heat,all-week,early-peak,2035,all-year,R1,0.51520000000,heatpump,3,2045 -12,heat,all-week,early-peak,2040,all-year,R1,0.81820000000,heatpump,3,2045 -25,heat,all-week,early-peak,2035,all-year,R1,0.51520000000,heatpump,3,2045 -26,heat,all-week,early-peak,2040,all-year,R1,0.81820000000,heatpump,3,2045 -11,heat,all-week,early-peak,2035,all-year,R2,0.51520000000,heatpump,3,2045 -12,heat,all-week,early-peak,2040,all-year,R2,0.81820000000,heatpump,3,2045 -25,heat,all-week,early-peak,2035,all-year,R2,0.51520000000,heatpump,3,2045 -26,heat,all-week,early-peak,2040,all-year,R2,0.81820000000,heatpump,3,2045 -3,cook,all-week,early-peak,2035,all-year,R1,0.51520000000,electric_stove,3,2045 -4,cook,all-week,early-peak,2040,all-year,R1,0.81820000000,electric_stove,3,2045 -17,cook,all-week,early-peak,2035,all-year,R1,0.51520000000,electric_stove,3,2045 -18,cook,all-week,early-peak,2040,all-year,R1,0.81820000000,electric_stove,3,2045 -3,cook,all-week,early-peak,2035,all-year,R2,0.51520000000,electric_stove,3,2045 -4,cook,all-week,early-peak,2040,all-year,R2,0.81820000000,electric_stove,3,2045 -17,cook,all-week,early-peak,2035,all-year,R2,0.51520000000,electric_stove,3,2045 -18,cook,all-week,early-peak,2040,all-year,R2,0.81820000000,electric_stove,3,2045 -11,heat,all-week,late-peak,2035,all-year,R1,1.08180000000,heatpump,4,2045 -12,heat,all-week,late-peak,2040,all-year,R1,1.71820000000,heatpump,4,2045 -25,heat,all-week,late-peak,2035,all-year,R1,1.08180000000,heatpump,4,2045 -26,heat,all-week,late-peak,2040,all-year,R1,1.71820000000,heatpump,4,2045 -11,heat,all-week,late-peak,2035,all-year,R2,1.08180000000,heatpump,4,2045 -12,heat,all-week,late-peak,2040,all-year,R2,1.71820000000,heatpump,4,2045 -25,heat,all-week,late-peak,2035,all-year,R2,1.08180000000,heatpump,4,2045 -26,heat,all-week,late-peak,2040,all-year,R2,1.71820000000,heatpump,4,2045 -3,cook,all-week,late-peak,2035,all-year,R1,1.08180000000,electric_stove,4,2045 -4,cook,all-week,late-peak,2040,all-year,R1,1.71820000000,electric_stove,4,2045 -17,cook,all-week,late-peak,2035,all-year,R1,1.08180000000,electric_stove,4,2045 -18,cook,all-week,late-peak,2040,all-year,R1,1.71820000000,electric_stove,4,2045 -3,cook,all-week,late-peak,2035,all-year,R2,1.08180000000,electric_stove,4,2045 -4,cook,all-week,late-peak,2040,all-year,R2,1.71820000000,electric_stove,4,2045 -17,cook,all-week,late-peak,2035,all-year,R2,1.08180000000,electric_stove,4,2045 -18,cook,all-week,late-peak,2040,all-year,R2,1.71820000000,electric_stove,4,2045 -11,heat,all-week,evening,2035,all-year,R1,0.72120000000,heatpump,5,2045 -12,heat,all-week,evening,2040,all-year,R1,1.14550000000,heatpump,5,2045 -25,heat,all-week,evening,2035,all-year,R1,0.72120000000,heatpump,5,2045 -26,heat,all-week,evening,2040,all-year,R1,1.14550000000,heatpump,5,2045 -11,heat,all-week,evening,2035,all-year,R2,0.72120000000,heatpump,5,2045 -12,heat,all-week,evening,2040,all-year,R2,1.14550000000,heatpump,5,2045 -25,heat,all-week,evening,2035,all-year,R2,0.72120000000,heatpump,5,2045 -26,heat,all-week,evening,2040,all-year,R2,1.14550000000,heatpump,5,2045 -3,cook,all-week,evening,2035,all-year,R1,0.72120000000,electric_stove,5,2045 -4,cook,all-week,evening,2040,all-year,R1,1.14550000000,electric_stove,5,2045 -17,cook,all-week,evening,2035,all-year,R1,0.72120000000,electric_stove,5,2045 -18,cook,all-week,evening,2040,all-year,R1,1.14550000000,electric_stove,5,2045 -3,cook,all-week,evening,2035,all-year,R2,0.72120000000,electric_stove,5,2045 -4,cook,all-week,evening,2040,all-year,R2,1.14550000000,electric_stove,5,2045 -17,cook,all-week,evening,2035,all-year,R2,0.72120000000,electric_stove,5,2045 -18,cook,all-week,evening,2040,all-year,R2,1.14550000000,electric_stove,5,2045 -11,heat,all-week,early-morning,2035,all-year,R1,0.72120000000,heatpump,6,2045 -12,heat,all-week,early-morning,2040,all-year,R1,1.14550000000,heatpump,6,2045 -25,heat,all-week,early-morning,2035,all-year,R1,0.72120000000,heatpump,6,2045 -26,heat,all-week,early-morning,2040,all-year,R1,1.14550000000,heatpump,6,2045 -11,heat,all-week,early-morning,2035,all-year,R2,0.72120000000,heatpump,6,2045 -12,heat,all-week,early-morning,2040,all-year,R2,1.14550000000,heatpump,6,2045 -25,heat,all-week,early-morning,2035,all-year,R2,0.72120000000,heatpump,6,2045 -26,heat,all-week,early-morning,2040,all-year,R2,1.14550000000,heatpump,6,2045 -3,cook,all-week,early-morning,2035,all-year,R1,0.72120000000,electric_stove,6,2045 -4,cook,all-week,early-morning,2040,all-year,R1,1.14550000000,electric_stove,6,2045 -17,cook,all-week,early-morning,2035,all-year,R1,0.72120000000,electric_stove,6,2045 -18,cook,all-week,early-morning,2040,all-year,R1,1.14550000000,electric_stove,6,2045 -3,cook,all-week,early-morning,2035,all-year,R2,0.72120000000,electric_stove,6,2045 -4,cook,all-week,early-morning,2040,all-year,R2,1.14550000000,electric_stove,6,2045 -17,cook,all-week,early-morning,2035,all-year,R2,0.72120000000,electric_stove,6,2045 -18,cook,all-week,early-morning,2040,all-year,R2,1.14550000000,electric_stove,6,2045 -11,heat,all-week,late-afternoon,2035,all-year,R1,0.72120000000,heatpump,7,2045 -12,heat,all-week,late-afternoon,2040,all-year,R1,1.14550000000,heatpump,7,2045 -25,heat,all-week,late-afternoon,2035,all-year,R1,0.72120000000,heatpump,7,2045 -26,heat,all-week,late-afternoon,2040,all-year,R1,1.14550000000,heatpump,7,2045 -11,heat,all-week,late-afternoon,2035,all-year,R2,0.72120000000,heatpump,7,2045 -12,heat,all-week,late-afternoon,2040,all-year,R2,1.14550000000,heatpump,7,2045 -25,heat,all-week,late-afternoon,2035,all-year,R2,0.72120000000,heatpump,7,2045 -26,heat,all-week,late-afternoon,2040,all-year,R2,1.14550000000,heatpump,7,2045 -3,cook,all-week,late-afternoon,2035,all-year,R1,0.72120000000,electric_stove,7,2045 -4,cook,all-week,late-afternoon,2040,all-year,R1,1.14550000000,electric_stove,7,2045 -17,cook,all-week,late-afternoon,2035,all-year,R1,0.72120000000,electric_stove,7,2045 -18,cook,all-week,late-afternoon,2040,all-year,R1,1.14550000000,electric_stove,7,2045 -3,cook,all-week,late-afternoon,2035,all-year,R2,0.72120000000,electric_stove,7,2045 -4,cook,all-week,late-afternoon,2040,all-year,R2,1.14550000000,electric_stove,7,2045 -17,cook,all-week,late-afternoon,2035,all-year,R2,0.72120000000,electric_stove,7,2045 -18,cook,all-week,late-afternoon,2040,all-year,R2,1.14550000000,electric_stove,7,2045 -13,heat,all-week,night,2040,all-year,R1,0.56700000000,heatpump,0,2050 -14,heat,all-week,night,2045,all-year,R1,0.48300000000,heatpump,0,2050 -29,heat,all-week,night,2040,all-year,R1,0.56700000000,heatpump,0,2050 -30,heat,all-week,night,2045,all-year,R1,0.48300000000,heatpump,0,2050 -13,heat,all-week,night,2040,all-year,R2,0.56700000000,heatpump,0,2050 -14,heat,all-week,night,2045,all-year,R2,0.48300000000,heatpump,0,2050 -29,heat,all-week,night,2040,all-year,R2,0.56700000000,heatpump,0,2050 -30,heat,all-week,night,2045,all-year,R2,0.48300000000,heatpump,0,2050 -4,cook,all-week,night,2040,all-year,R1,0.56700000000,electric_stove,0,2050 -5,cook,all-week,night,2045,all-year,R1,0.48300000000,electric_stove,0,2050 -20,cook,all-week,night,2040,all-year,R1,0.56700000000,electric_stove,0,2050 -21,cook,all-week,night,2045,all-year,R1,0.48300000000,electric_stove,0,2050 -4,cook,all-week,night,2040,all-year,R2,0.56700000000,electric_stove,0,2050 -5,cook,all-week,night,2045,all-year,R2,0.48300000000,electric_stove,0,2050 -20,cook,all-week,night,2040,all-year,R2,0.56700000000,electric_stove,0,2050 -21,cook,all-week,night,2045,all-year,R2,0.48300000000,electric_stove,0,2050 -13,heat,all-week,morning,2040,all-year,R1,0.81000000000,heatpump,1,2050 -14,heat,all-week,morning,2045,all-year,R1,0.69000000000,heatpump,1,2050 -29,heat,all-week,morning,2040,all-year,R1,0.81000000000,heatpump,1,2050 -30,heat,all-week,morning,2045,all-year,R1,0.69000000000,heatpump,1,2050 -13,heat,all-week,morning,2040,all-year,R2,0.81000000000,heatpump,1,2050 -14,heat,all-week,morning,2045,all-year,R2,0.69000000000,heatpump,1,2050 -29,heat,all-week,morning,2040,all-year,R2,0.81000000000,heatpump,1,2050 -30,heat,all-week,morning,2045,all-year,R2,0.69000000000,heatpump,1,2050 -4,cook,all-week,morning,2040,all-year,R1,0.81000000000,electric_stove,1,2050 -5,cook,all-week,morning,2045,all-year,R1,0.69000000000,electric_stove,1,2050 -20,cook,all-week,morning,2040,all-year,R1,0.81000000000,electric_stove,1,2050 -21,cook,all-week,morning,2045,all-year,R1,0.69000000000,electric_stove,1,2050 -4,cook,all-week,morning,2040,all-year,R2,0.81000000000,electric_stove,1,2050 -5,cook,all-week,morning,2045,all-year,R2,0.69000000000,electric_stove,1,2050 -20,cook,all-week,morning,2040,all-year,R2,0.81000000000,electric_stove,1,2050 -21,cook,all-week,morning,2045,all-year,R2,0.69000000000,electric_stove,1,2050 -13,heat,all-week,mid-afternoon,2040,all-year,R1,0.56700000000,heatpump,2,2050 -14,heat,all-week,mid-afternoon,2045,all-year,R1,0.48300000000,heatpump,2,2050 -29,heat,all-week,mid-afternoon,2040,all-year,R1,0.56700000000,heatpump,2,2050 -30,heat,all-week,mid-afternoon,2045,all-year,R1,0.48300000000,heatpump,2,2050 -13,heat,all-week,mid-afternoon,2040,all-year,R2,0.56700000000,heatpump,2,2050 -14,heat,all-week,mid-afternoon,2045,all-year,R2,0.48300000000,heatpump,2,2050 -29,heat,all-week,mid-afternoon,2040,all-year,R2,0.56700000000,heatpump,2,2050 -30,heat,all-week,mid-afternoon,2045,all-year,R2,0.48300000000,heatpump,2,2050 -4,cook,all-week,mid-afternoon,2040,all-year,R1,0.56700000000,electric_stove,2,2050 -5,cook,all-week,mid-afternoon,2045,all-year,R1,0.48300000000,electric_stove,2,2050 -20,cook,all-week,mid-afternoon,2040,all-year,R1,0.56700000000,electric_stove,2,2050 -21,cook,all-week,mid-afternoon,2045,all-year,R1,0.48300000000,electric_stove,2,2050 -4,cook,all-week,mid-afternoon,2040,all-year,R2,0.56700000000,electric_stove,2,2050 -5,cook,all-week,mid-afternoon,2045,all-year,R2,0.48300000000,electric_stove,2,2050 -20,cook,all-week,mid-afternoon,2040,all-year,R2,0.56700000000,electric_stove,2,2050 -21,cook,all-week,mid-afternoon,2045,all-year,R2,0.48300000000,electric_stove,2,2050 -13,heat,all-week,early-peak,2040,all-year,R1,0.81000000000,heatpump,3,2050 -14,heat,all-week,early-peak,2045,all-year,R1,0.69000000000,heatpump,3,2050 -29,heat,all-week,early-peak,2040,all-year,R1,0.81000000000,heatpump,3,2050 -30,heat,all-week,early-peak,2045,all-year,R1,0.69000000000,heatpump,3,2050 -13,heat,all-week,early-peak,2040,all-year,R2,0.81000000000,heatpump,3,2050 -14,heat,all-week,early-peak,2045,all-year,R2,0.69000000000,heatpump,3,2050 -29,heat,all-week,early-peak,2040,all-year,R2,0.81000000000,heatpump,3,2050 -30,heat,all-week,early-peak,2045,all-year,R2,0.69000000000,heatpump,3,2050 -4,cook,all-week,early-peak,2040,all-year,R1,0.81000000000,electric_stove,3,2050 -5,cook,all-week,early-peak,2045,all-year,R1,0.69000000000,electric_stove,3,2050 -20,cook,all-week,early-peak,2040,all-year,R1,0.81000000000,electric_stove,3,2050 -21,cook,all-week,early-peak,2045,all-year,R1,0.69000000000,electric_stove,3,2050 -4,cook,all-week,early-peak,2040,all-year,R2,0.81000000000,electric_stove,3,2050 -5,cook,all-week,early-peak,2045,all-year,R2,0.69000000000,electric_stove,3,2050 -20,cook,all-week,early-peak,2040,all-year,R2,0.81000000000,electric_stove,3,2050 -21,cook,all-week,early-peak,2045,all-year,R2,0.69000000000,electric_stove,3,2050 -13,heat,all-week,late-peak,2040,all-year,R1,1.70100000000,heatpump,4,2050 -14,heat,all-week,late-peak,2045,all-year,R1,1.44900000000,heatpump,4,2050 -29,heat,all-week,late-peak,2040,all-year,R1,1.70100000000,heatpump,4,2050 -30,heat,all-week,late-peak,2045,all-year,R1,1.44900000000,heatpump,4,2050 -13,heat,all-week,late-peak,2040,all-year,R2,1.70100000000,heatpump,4,2050 -14,heat,all-week,late-peak,2045,all-year,R2,1.44900000000,heatpump,4,2050 -29,heat,all-week,late-peak,2040,all-year,R2,1.70100000000,heatpump,4,2050 -30,heat,all-week,late-peak,2045,all-year,R2,1.44900000000,heatpump,4,2050 -4,cook,all-week,late-peak,2040,all-year,R1,1.70100000000,electric_stove,4,2050 -5,cook,all-week,late-peak,2045,all-year,R1,1.44900000000,electric_stove,4,2050 -20,cook,all-week,late-peak,2040,all-year,R1,1.70100000000,electric_stove,4,2050 -21,cook,all-week,late-peak,2045,all-year,R1,1.44900000000,electric_stove,4,2050 -4,cook,all-week,late-peak,2040,all-year,R2,1.70100000000,electric_stove,4,2050 -5,cook,all-week,late-peak,2045,all-year,R2,1.44900000000,electric_stove,4,2050 -20,cook,all-week,late-peak,2040,all-year,R2,1.70100000000,electric_stove,4,2050 -21,cook,all-week,late-peak,2045,all-year,R2,1.44900000000,electric_stove,4,2050 -13,heat,all-week,evening,2040,all-year,R1,1.13400000000,heatpump,5,2050 -14,heat,all-week,evening,2045,all-year,R1,0.96600000000,heatpump,5,2050 -29,heat,all-week,evening,2040,all-year,R1,1.13400000000,heatpump,5,2050 -30,heat,all-week,evening,2045,all-year,R1,0.96600000000,heatpump,5,2050 -13,heat,all-week,evening,2040,all-year,R2,1.13400000000,heatpump,5,2050 -14,heat,all-week,evening,2045,all-year,R2,0.96600000000,heatpump,5,2050 -29,heat,all-week,evening,2040,all-year,R2,1.13400000000,heatpump,5,2050 -30,heat,all-week,evening,2045,all-year,R2,0.96600000000,heatpump,5,2050 -4,cook,all-week,evening,2040,all-year,R1,1.13400000000,electric_stove,5,2050 -5,cook,all-week,evening,2045,all-year,R1,0.96600000000,electric_stove,5,2050 -20,cook,all-week,evening,2040,all-year,R1,1.13400000000,electric_stove,5,2050 -21,cook,all-week,evening,2045,all-year,R1,0.96600000000,electric_stove,5,2050 -4,cook,all-week,evening,2040,all-year,R2,1.13400000000,electric_stove,5,2050 -5,cook,all-week,evening,2045,all-year,R2,0.96600000000,electric_stove,5,2050 -20,cook,all-week,evening,2040,all-year,R2,1.13400000000,electric_stove,5,2050 -21,cook,all-week,evening,2045,all-year,R2,0.96600000000,electric_stove,5,2050 -13,heat,all-week,early-morning,2040,all-year,R1,1.13400000000,heatpump,6,2050 -14,heat,all-week,early-morning,2045,all-year,R1,0.96600000000,heatpump,6,2050 -29,heat,all-week,early-morning,2040,all-year,R1,1.13400000000,heatpump,6,2050 -30,heat,all-week,early-morning,2045,all-year,R1,0.96600000000,heatpump,6,2050 -13,heat,all-week,early-morning,2040,all-year,R2,1.13400000000,heatpump,6,2050 -14,heat,all-week,early-morning,2045,all-year,R2,0.96600000000,heatpump,6,2050 -29,heat,all-week,early-morning,2040,all-year,R2,1.13400000000,heatpump,6,2050 -30,heat,all-week,early-morning,2045,all-year,R2,0.96600000000,heatpump,6,2050 -4,cook,all-week,early-morning,2040,all-year,R1,1.13400000000,electric_stove,6,2050 -5,cook,all-week,early-morning,2045,all-year,R1,0.96600000000,electric_stove,6,2050 -20,cook,all-week,early-morning,2040,all-year,R1,1.13400000000,electric_stove,6,2050 -21,cook,all-week,early-morning,2045,all-year,R1,0.96600000000,electric_stove,6,2050 -4,cook,all-week,early-morning,2040,all-year,R2,1.13400000000,electric_stove,6,2050 -5,cook,all-week,early-morning,2045,all-year,R2,0.96600000000,electric_stove,6,2050 -20,cook,all-week,early-morning,2040,all-year,R2,1.13400000000,electric_stove,6,2050 -21,cook,all-week,early-morning,2045,all-year,R2,0.96600000000,electric_stove,6,2050 -13,heat,all-week,late-afternoon,2040,all-year,R1,1.13400000000,heatpump,7,2050 -14,heat,all-week,late-afternoon,2045,all-year,R1,0.96600000000,heatpump,7,2050 -29,heat,all-week,late-afternoon,2040,all-year,R1,1.13400000000,heatpump,7,2050 -30,heat,all-week,late-afternoon,2045,all-year,R1,0.96600000000,heatpump,7,2050 -13,heat,all-week,late-afternoon,2040,all-year,R2,1.13400000000,heatpump,7,2050 -14,heat,all-week,late-afternoon,2045,all-year,R2,0.96600000000,heatpump,7,2050 -29,heat,all-week,late-afternoon,2040,all-year,R2,1.13400000000,heatpump,7,2050 -30,heat,all-week,late-afternoon,2045,all-year,R2,0.96600000000,heatpump,7,2050 -4,cook,all-week,late-afternoon,2040,all-year,R1,1.13400000000,electric_stove,7,2050 -5,cook,all-week,late-afternoon,2045,all-year,R1,0.96600000000,electric_stove,7,2050 -20,cook,all-week,late-afternoon,2040,all-year,R1,1.13400000000,electric_stove,7,2050 -21,cook,all-week,late-afternoon,2045,all-year,R1,0.96600000000,electric_stove,7,2050 -4,cook,all-week,late-afternoon,2040,all-year,R2,1.13400000000,electric_stove,7,2050 -5,cook,all-week,late-afternoon,2045,all-year,R2,0.96600000000,electric_stove,7,2050 -20,cook,all-week,late-afternoon,2040,all-year,R2,1.13400000000,electric_stove,7,2050 -21,cook,all-week,late-afternoon,2045,all-year,R2,0.96600000000,electric_stove,7,2050 diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/input/BaseYearExport.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/input/BaseYearExport.csv deleted file mode 100644 index 5524e8350..000000000 --- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/input/BaseYearExport.csv +++ /dev/null @@ -1,40 +0,0 @@ -RegionName,Attribute,Time,electricity,gas,heat,CO2f,wind,solar,cook -Unit,-,Year,PJ,PJ,PJ,kt,PJ,PJ,PJ -R1,Exports,2010,0,0,0,0,0,0,0 -R1,Exports,2015,0,0,0,0,0,0,0 -R1,Exports,2020,0,0,0,0,0,0,0 -R1,Exports,2025,0,0,0,0,0,0,0 -R1,Exports,2030,0,0,0,0,0,0,0 -R1,Exports,2035,0,0,0,0,0,0,0 -R1,Exports,2040,0,0,0,0,0,0,0 -R1,Exports,2045,0,0,0,0,0,0,0 -R1,Exports,2050,0,0,0,0,0,0,0 -R1,Exports,2055,0,0,0,0,0,0,0 -R1,Exports,2060,0,0,0,0,0,0,0 -R1,Exports,2065,0,0,0,0,0,0,0 -R1,Exports,2070,0,0,0,0,0,0,0 -R1,Exports,2075,0,0,0,0,0,0,0 -R1,Exports,2080,0,0,0,0,0,0,0 -R1,Exports,2085,0,0,0,0,0,0,0 -R1,Exports,2090,0,0,0,0,0,0,0 -R1,Exports,2095,0,0,0,0,0,0,0 -R1,Exports,2100,0,0,0,0,0,0,0 -R2,Exports,2010,0,0,0,0,0,0,0 -R2,Exports,2015,0,0,0,0,0,0,0 -R2,Exports,2020,0,0,0,0,0,0,0 -R2,Exports,2025,0,0,0,0,0,0,0 -R2,Exports,2030,0,0,0,0,0,0,0 -R2,Exports,2035,0,0,0,0,0,0,0 -R2,Exports,2040,0,0,0,0,0,0,0 -R2,Exports,2045,0,0,0,0,0,0,0 -R2,Exports,2050,0,0,0,0,0,0,0 -R2,Exports,2055,0,0,0,0,0,0,0 -R2,Exports,2060,0,0,0,0,0,0,0 -R2,Exports,2065,0,0,0,0,0,0,0 -R2,Exports,2070,0,0,0,0,0,0,0 -R2,Exports,2075,0,0,0,0,0,0,0 -R2,Exports,2080,0,0,0,0,0,0,0 -R2,Exports,2085,0,0,0,0,0,0,0 -R2,Exports,2090,0,0,0,0,0,0,0 -R2,Exports,2095,0,0,0,0,0,0,0 -R2,Exports,2100,0,0,0,0,0,0,0 diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/input/BaseYearImport.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/input/BaseYearImport.csv deleted file mode 100644 index a6d025007..000000000 --- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/input/BaseYearImport.csv +++ /dev/null @@ -1,40 +0,0 @@ -RegionName,Attribute,Time,electricity,gas,heat,CO2f,wind,solar,cook -Unit,-,Year,PJ,PJ,PJ,kt,PJ,PJ,PJ -R1,Imports,2010,0,0,0,0,0,0,0 -R1,Imports,2015,0,0,0,0,0,0,0 -R1,Imports,2020,0,0,0,0,0,0,0 -R1,Imports,2025,0,0,0,0,0,0,0 -R1,Imports,2030,0,0,0,0,0,0,0 -R1,Imports,2035,0,0,0,0,0,0,0 -R1,Imports,2040,0,0,0,0,0,0,0 -R1,Imports,2045,0,0,0,0,0,0,0 -R1,Imports,2050,0,0,0,0,0,0,0 -R1,Imports,2055,0,0,0,0,0,0,0 -R1,Imports,2060,0,0,0,0,0,0,0 -R1,Imports,2065,0,0,0,0,0,0,0 -R1,Imports,2070,0,0,0,0,0,0,0 -R1,Imports,2075,0,0,0,0,0,0,0 -R1,Imports,2080,0,0,0,0,0,0,0 -R1,Imports,2085,0,0,0,0,0,0,0 -R1,Imports,2090,0,0,0,0,0,0,0 -R1,Imports,2095,0,0,0,0,0,0,0 -R1,Imports,2100,0,0,0,0,0,0,0 -R2,Imports,2010,0,0,0,0,0,0,0 -R2,Imports,2015,0,0,0,0,0,0,0 -R2,Imports,2020,0,0,0,0,0,0,0 -R2,Imports,2025,0,0,0,0,0,0,0 -R2,Imports,2030,0,0,0,0,0,0,0 -R2,Imports,2035,0,0,0,0,0,0,0 -R2,Imports,2040,0,0,0,0,0,0,0 -R2,Imports,2045,0,0,0,0,0,0,0 -R2,Imports,2050,0,0,0,0,0,0,0 -R2,Imports,2055,0,0,0,0,0,0,0 -R2,Imports,2060,0,0,0,0,0,0,0 -R2,Imports,2065,0,0,0,0,0,0,0 -R2,Imports,2070,0,0,0,0,0,0,0 -R2,Imports,2075,0,0,0,0,0,0,0 -R2,Imports,2080,0,0,0,0,0,0,0 -R2,Imports,2085,0,0,0,0,0,0,0 -R2,Imports,2090,0,0,0,0,0,0,0 -R2,Imports,2095,0,0,0,0,0,0,0 -R2,Imports,2100,0,0,0,0,0,0,0 diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/input/Projections.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/input/Projections.csv deleted file mode 100644 index 6a1f9a174..000000000 --- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/input/Projections.csv +++ /dev/null @@ -1,40 +0,0 @@ -RegionName,Attribute,Time,electricity,gas,heat,CO2f,wind,solar,cook -Unit,-,Year,MUS$2010/PJ,MUS$2010/PJ,MUS$2010/PJ,MUS$2010/kt,MUS$2010/kt,MUS$2010/kt,MUS$2010/PJ -R1,CommodityPrice,2010,14.81481472,6.6759,100,0,0,0,100 -R1,CommodityPrice,2015,17.89814806,6.914325,100,0.052913851,0,0,100 -R1,CommodityPrice,2020,19.5,7.15275,100,0.08314119,0,0,100 -R1,CommodityPrice,2025,21.93518528,8.10645,100,0.120069795,0,0,100 -R1,CommodityPrice,2030,26.50925917,9.06015,100,0.156998399,0,0,100 -R1,CommodityPrice,2035,26.51851861,9.2191,100,0.214877567,0,0,100 -R1,CommodityPrice,2040,23.85185194,9.37805,100,0.272756734,0,0,100 -R1,CommodityPrice,2045,23.97222222,9.193829337,100,0.35394801,0,0,100 -R1,CommodityPrice,2050,24.06481472,9.009608674,100,0.435139285,0,0,100 -R1,CommodityPrice,2055,25.3425925,8.832625604,100,0.542365578,0,0,100 -R1,CommodityPrice,2060,25.53703694,8.655642534,100,0.649591871,0,0,100 -R1,CommodityPrice,2065,25.32407417,8.485612708,100,0.780892624,0,0,100 -R1,CommodityPrice,2070,23.36111111,8.315582883,100,0.912193378,0,0,100 -R1,CommodityPrice,2075,22.27777778,8.152233126,100,1.078321687,0,0,100 -R1,CommodityPrice,2080,22.25925917,7.988883368,100,1.244449995,0,0,100 -R1,CommodityPrice,2085,22.17592583,7.831951236,100,1.4253503,0,0,100 -R1,CommodityPrice,2090,22.03703694,7.675019103,100,1.606250604,0,0,100 -R1,CommodityPrice,2095,21.94444444,7.524252461,100,1.73877515,0,0,100 -R1,CommodityPrice,2100,21.39814806,7.373485819,100,1.871299697,0,0,100 -R2,CommodityPrice,2010,14.81481472,6.6759,100,0,0,0,100 -R2,CommodityPrice,2015,17.89814806,6.914325,100,0.052913851,0,0,100 -R2,CommodityPrice,2020,19.5,7.15275,100,0.08314119,0,0,100 -R2,CommodityPrice,2025,21.93518528,8.10645,100,0.120069795,0,0,100 -R2,CommodityPrice,2030,26.50925917,9.06015,100,0.156998399,0,0,100 -R2,CommodityPrice,2035,26.51851861,9.2191,100,0.214877567,0,0,100 -R2,CommodityPrice,2040,23.85185194,9.37805,100,0.272756734,0,0,100 -R2,CommodityPrice,2045,23.97222222,9.193829337,100,0.35394801,0,0,100 -R2,CommodityPrice,2050,24.06481472,9.009608674,100,0.435139285,0,0,100 -R2,CommodityPrice,2055,25.3425925,8.832625604,100,0.542365578,0,0,100 -R2,CommodityPrice,2060,25.53703694,8.655642534,100,0.649591871,0,0,100 -R2,CommodityPrice,2065,25.32407417,8.485612708,100,0.780892624,0,0,100 -R2,CommodityPrice,2070,23.36111111,8.315582883,100,0.912193378,0,0,100 -R2,CommodityPrice,2075,22.27777778,8.152233126,100,1.078321687,0,0,100 -R2,CommodityPrice,2080,22.25925917,7.988883368,100,1.244449995,0,0,100 -R2,CommodityPrice,2085,22.17592583,7.831951236,100,1.4253503,0,0,100 -R2,CommodityPrice,2090,22.03703694,7.675019103,100,1.606250604,0,0,100 -R2,CommodityPrice,2095,21.94444444,7.524252461,100,1.73877515,0,0,100 -R2,CommodityPrice,2100,21.39814806,7.373485819,100,1.871299697,0,0,100 diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/power/CommIn.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/power/CommIn.csv deleted file mode 100644 index 7e6361495..000000000 --- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/power/CommIn.csv +++ /dev/null @@ -1,14 +0,0 @@ -ProcessName,RegionName,Time,Level,electricity,gas,heat,CO2f,wind,solar -Unit,-,Year,-,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ,PJ/PJ -gasCCGT,R1,2020,fixed,0,1.67,0,0,0,0 -gasCCGT,R1,2040,fixed,0,1.67,0,0,0,0 -windturbine,R1,2020,fixed,0,0,0,0,1,0 -windturbine,R1,2040,fixed,0,0,0,0,1,0 -solarPV,R1,2020,fixed,0,0,0,0,0,1 -solarPV,R1,2040,fixed,0,0,0,0,0,1 -gasCCGT,R2,2020,fixed,0,1.67,0,0,0,0 -gasCCGT,R2,2040,fixed,0,1.67,0,0,0,0 -windturbine,R2,2020,fixed,0,0,0,0,1,0 -windturbine,R2,2040,fixed,0,0,0,0,1,0 -solarPV,R2,2020,fixed,0,0,0,0,0,1 -solarPV,R2,2040,fixed,0,0,0,0,0,1 diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/power/CommOut.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/power/CommOut.csv deleted file mode 100644 index b7be93720..000000000 --- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/power/CommOut.csv +++ /dev/null @@ -1,14 +0,0 @@ -ProcessName,RegionName,Time,electricity,gas,heat,CO2f,wind,solar -Unit,-,Year,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ,PJ/PJ -gasCCGT,R1,2020,1,0,0,91.67,0,0 -gasCCGT,R1,2040,1,0,0,91.67,0,0 -windturbine,R1,2020,1,0,0,0,0,0 -windturbine,R1,2040,1,0,0,0,0,0 -solarPV,R1,2020,1,0,0,0,0,0 -solarPV,R1,2040,1,0,0,0,0,0 -gasCCGT,R2,2020,1,0,0,91.67,0,0 -gasCCGT,R2,2040,1,0,0,91.67,0,0 -windturbine,R2,2020,1,0,0,0,0,0 -windturbine,R2,2040,1,0,0,0,0,0 -solarPV,R2,2020,1,0,0,0,0,0 -solarPV,R2,2040,1,0,0,0,0,0 diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/power/Technodata.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/power/Technodata.csv deleted file mode 100644 index c4129c087..000000000 --- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/power/Technodata.csv +++ /dev/null @@ -1,14 +0,0 @@ -ProcessName,RegionName,Time,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent1 -Unit,-,Year,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,New -gasCCGT,R1,2020,23.78234399,1,0,1,0,1,4,2,120,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1 -gasCCGT,R1,2040,23.78234399,1,0,1,0,1,4,2,120,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1 -windturbine,R1,2020,36.30771182,1,0,1,0,1,4,2,120,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1 -windturbine,R1,2040,36.30771182,1,0,1,0,1,4,2,120,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1 -solarPV,R1,2020,40,1,0,1,0,1,4,2,120,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1 -solarPV,R1,2040,30,1,0,1,0,1,4,2,120,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1 -gasCCGT,R2,2020,23.78234399,1,0,1,0,1,4,2,120,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1 -gasCCGT,R2,2040,23.78234399,1,0,1,0,1,4,2,120,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1 -windturbine,R2,2020,36.30771182,1,0,1,0,1,10,2,200,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1 -windturbine,R2,2040,36.30771182,1,0,1,0,1,10,2,200,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1 -solarPV,R2,2020,40,1,0,1,0,1,4,2,120,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1 -solarPV,R2,2040,30,1,0,1,0,1,4,2,120,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1 diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/preset/Residential2020Consumption.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/preset/Residential2020Consumption.csv deleted file mode 100644 index 1a5e49f00..000000000 --- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/preset/Residential2020Consumption.csv +++ /dev/null @@ -1,17 +0,0 @@ -RegionName,Timeslice,electricity,gas,heat,CO2f,wind,solar,cook -R1,1,0,0,0.7,0,0,0,0.7 -R1,2,0,0,1.0,0,0,0,1.0 -R1,3,0,0,0.7,0,0,0,0.7 -R1,4,0,0,1.0,0,0,0,1.0 -R1,5,0,0,2.1,0,0,0,2.1 -R1,6,0,0,1.4,0,0,0,1.4 -R1,7,0,0,1.4,0,0,0,1.4 -R1,8,0,0,1.4,0,0,0,1.4 -R2,1,0,0,0.7,0,0,0,0.7 -R2,2,0,0,1.0,0,0,0,1.0 -R2,3,0,0,0.7,0,0,0,0.7 -R2,4,0,0,1.0,0,0,0,1.0 -R2,5,0,0,2.1,0,0,0,2.1 -R2,6,0,0,1.4,0,0,0,1.4 -R2,7,0,0,1.4,0,0,0,1.4 -R2,8,0,0,1.4,0,0,0,1.4 diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/preset/Residential2050Consumption.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/preset/Residential2050Consumption.csv deleted file mode 100644 index d0e6be25a..000000000 --- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/preset/Residential2050Consumption.csv +++ /dev/null @@ -1,17 +0,0 @@ -RegionName,Timeslice,electricity,gas,heat,CO2f,wind,solar,cook -R1,1,0,0,2.1,0,0,0,2.1 -R1,2,0,0,3.0,0,0,0,3.0 -R1,3,0,0,2.1,0,0,0,2.1 -R1,4,0,0,3.0,0,0,0,3.0 -R1,5,0,0,6.3,0,0,0,6.3 -R1,6,0,0,4.2,0,0,0,4.2 -R1,7,0,0,4.2,0,0,0,4.2 -R1,8,0,0,4.2,0,0,0,4.2 -R2,1,0,0,2.1,0,0,0,2.1 -R2,2,0,0,3.0,0,0,0,3.0 -R2,3,0,0,2.1,0,0,0,2.1 -R2,4,0,0,3.0,0,0,0,3.0 -R2,5,0,0,6.3,0,0,0,6.3 -R2,6,0,0,4.2,0,0,0,4.2 -R2,7,0,0,4.2,0,0,0,4.2 -R2,8,0,0,4.2,0,0,0,4.2 diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/residential/Technodata.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/residential/Technodata.csv deleted file mode 100644 index d8f78548d..000000000 --- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/residential/Technodata.csv +++ /dev/null @@ -1,10 +0,0 @@ -ProcessName,RegionName,Time,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent1 -Unit,-,Year,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,New -gasboiler,R1,2020,3.8,1,0,1,0,1,10,0.2,60,10,1,0.00000189,86,0.1,energy,gas,heat,1 -heatpump,R1,2020,8.866667,1,0,1,0,1,10,0.2,60,10,1,0.00000189,86,0.1,energy,electricity,heat,1 -gasboiler,R2,2020,3.8,1,0,1,0,1,10,0.2,60,10,1,0.00000189,86,0.1,energy,gas,heat,1 -heatpump,R2,2020,8.866667,1,0,1,0,1,10,0.2,60,10,1,0.00000189,86,0.1,energy,electricity,heat,1 -electric_stove,R1,2020,8.866667,1,0,1,0,1,10,0.2,60,10,1,0.00000189,86,0.1,energy,electricity,cook,1 -electric_stove,R2,2020,8.866667,1,0,1,0,1,10,0.2,60,10,1,0.00000189,86,0.1,energy,electricity,cook,1 -gas_stove,R1,2020,3.8,1,0,1,0,1,10,0.2,60,10,1,0.00000189,86,0.1,energy,gas,cook,1 -gas_stove,R2,2020,3.8,1,0,1,0,1,10,0.2,60,10,1,0.00000189,86,0.1,energy,gas,cook,1 diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/MCACapacity.csv b/docs/tutorial-code/5-min-max-timeslice-constraints/1-min-constraint/Results/MCACapacity.csv similarity index 100% rename from docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/MCACapacity.csv rename to docs/tutorial-code/5-min-max-timeslice-constraints/1-min-constraint/Results/MCACapacity.csv diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/MCAPrices.csv b/docs/tutorial-code/5-min-max-timeslice-constraints/1-min-constraint/Results/MCAPrices.csv similarity index 100% rename from docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/MCAPrices.csv rename to docs/tutorial-code/5-min-max-timeslice-constraints/1-min-constraint/Results/MCAPrices.csv diff --git a/docs/tutorial-code/5-min-max-timeslice-constraints/1-min-constraint/Results/Power_Supply.csv b/docs/tutorial-code/5-min-max-timeslice-constraints/1-min-constraint/Results/Power_Supply.csv new file mode 100644 index 000000000..ff56d993c --- /dev/null +++ b/docs/tutorial-code/5-min-max-timeslice-constraints/1-min-constraint/Results/Power_Supply.csv @@ -0,0 +1,143 @@ +asset,comm_usage,commodity,day,hour,installed,month,region,supply,technology,timeslice,year +0,10,electricity,all-week,night,2020,all-year,R1,0.20000000000,gasCCGT,0,2020 +0,6,CO2f,all-week,night,2020,all-year,R1,18.33400000000,gasCCGT,0,2020 +0,10,electricity,all-week,morning,2020,all-year,R1,0.40000000000,gasCCGT,1,2020 +0,6,CO2f,all-week,morning,2020,all-year,R1,36.66800000000,gasCCGT,1,2020 +0,10,electricity,all-week,afternoon,2020,all-year,R1,0.60000000000,gasCCGT,2,2020 +0,6,CO2f,all-week,afternoon,2020,all-year,R1,55.00200000000,gasCCGT,2,2020 +0,10,electricity,all-week,early-peak,2020,all-year,R1,0.40000000000,gasCCGT,3,2020 +0,6,CO2f,all-week,early-peak,2020,all-year,R1,36.66800000000,gasCCGT,3,2020 +0,10,electricity,all-week,late-peak,2020,all-year,R1,0.80000000000,gasCCGT,4,2020 +0,6,CO2f,all-week,late-peak,2020,all-year,R1,73.33600000000,gasCCGT,4,2020 +0,10,electricity,all-week,evening,2020,all-year,R1,1.00000000000,gasCCGT,5,2020 +0,6,CO2f,all-week,evening,2020,all-year,R1,91.67000000000,gasCCGT,5,2020 +0,10,electricity,all-week,night,2020,all-year,R1,0.20000000000,gasCCGT,0,2025 +0,6,CO2f,all-week,night,2020,all-year,R1,18.33400000000,gasCCGT,0,2025 +1,10,electricity,all-week,night,2020,all-year,R1,0.22220000000,windturbine,0,2025 +0,10,electricity,all-week,morning,2020,all-year,R1,0.40000000000,gasCCGT,1,2025 +0,6,CO2f,all-week,morning,2020,all-year,R1,36.66800000000,gasCCGT,1,2025 +1,10,electricity,all-week,morning,2020,all-year,R1,0.23330000000,windturbine,1,2025 +0,10,electricity,all-week,afternoon,2020,all-year,R1,0.60000000000,gasCCGT,2,2025 +0,6,CO2f,all-week,afternoon,2020,all-year,R1,55.00200000000,gasCCGT,2,2025 +0,10,electricity,all-week,early-peak,2020,all-year,R1,0.40000000000,gasCCGT,3,2025 +0,6,CO2f,all-week,early-peak,2020,all-year,R1,36.66800000000,gasCCGT,3,2025 +1,10,electricity,all-week,early-peak,2020,all-year,R1,0.23330000000,windturbine,3,2025 +0,10,electricity,all-week,late-peak,2020,all-year,R1,0.80000000000,gasCCGT,4,2025 +0,6,CO2f,all-week,late-peak,2020,all-year,R1,73.33600000000,gasCCGT,4,2025 +1,10,electricity,all-week,late-peak,2020,all-year,R1,0.46670000000,windturbine,4,2025 +0,10,electricity,all-week,evening,2020,all-year,R1,1.00000000000,gasCCGT,5,2025 +0,6,CO2f,all-week,evening,2020,all-year,R1,91.67000000000,gasCCGT,5,2025 +1,10,electricity,all-week,night,2020,all-year,R1,0.33330000000,windturbine,0,2030 +2,10,electricity,all-week,night,2025,all-year,R1,0.33330000000,windturbine,0,2030 +1,10,electricity,all-week,morning,2020,all-year,R1,0.50000000000,windturbine,1,2030 +2,10,electricity,all-week,morning,2025,all-year,R1,0.50000000000,windturbine,1,2030 +1,10,electricity,all-week,afternoon,2020,all-year,R1,0.33330000000,windturbine,2,2030 +2,10,electricity,all-week,afternoon,2025,all-year,R1,0.33330000000,windturbine,2,2030 +1,10,electricity,all-week,early-peak,2020,all-year,R1,0.50000000000,windturbine,3,2030 +2,10,electricity,all-week,early-peak,2025,all-year,R1,0.50000000000,windturbine,3,2030 +1,10,electricity,all-week,late-peak,2020,all-year,R1,1.00000000000,windturbine,4,2030 +2,10,electricity,all-week,late-peak,2025,all-year,R1,1.00000000000,windturbine,4,2030 +1,10,electricity,all-week,evening,2020,all-year,R1,0.66670000000,windturbine,5,2030 +2,10,electricity,all-week,evening,2025,all-year,R1,0.66670000000,windturbine,5,2030 +1,10,electricity,all-week,night,2020,all-year,R1,0.20000000000,windturbine,0,2035 +2,10,electricity,all-week,night,2025,all-year,R1,0.20000000000,windturbine,0,2035 +3,10,electricity,all-week,night,2030,all-year,R1,0.40000000000,windturbine,0,2035 +1,10,electricity,all-week,morning,2020,all-year,R1,0.30000000000,windturbine,1,2035 +2,10,electricity,all-week,morning,2025,all-year,R1,0.30000000000,windturbine,1,2035 +3,10,electricity,all-week,morning,2030,all-year,R1,0.60000000000,windturbine,1,2035 +1,10,electricity,all-week,afternoon,2020,all-year,R1,0.20000000000,windturbine,2,2035 +2,10,electricity,all-week,afternoon,2025,all-year,R1,0.20000000000,windturbine,2,2035 +3,10,electricity,all-week,afternoon,2030,all-year,R1,0.40000000000,windturbine,2,2035 +1,10,electricity,all-week,early-peak,2020,all-year,R1,0.30000000000,windturbine,3,2035 +2,10,electricity,all-week,early-peak,2025,all-year,R1,0.30000000000,windturbine,3,2035 +3,10,electricity,all-week,early-peak,2030,all-year,R1,0.60000000000,windturbine,3,2035 +1,10,electricity,all-week,late-peak,2020,all-year,R1,0.60000000000,windturbine,4,2035 +2,10,electricity,all-week,late-peak,2025,all-year,R1,0.60000000000,windturbine,4,2035 +3,10,electricity,all-week,late-peak,2030,all-year,R1,1.20000000000,windturbine,4,2035 +1,10,electricity,all-week,evening,2020,all-year,R1,0.40000000000,windturbine,5,2035 +2,10,electricity,all-week,evening,2025,all-year,R1,0.40000000000,windturbine,5,2035 +3,10,electricity,all-week,evening,2030,all-year,R1,0.80000000000,windturbine,5,2035 +1,10,electricity,all-week,night,2020,all-year,R1,0.15560000000,windturbine,0,2040 +2,10,electricity,all-week,night,2025,all-year,R1,0.15560000000,windturbine,0,2040 +3,10,electricity,all-week,night,2030,all-year,R1,0.31110000000,windturbine,0,2040 +4,10,electricity,all-week,night,2035,all-year,R1,0.31110000000,windturbine,0,2040 +1,10,electricity,all-week,morning,2020,all-year,R1,0.23330000000,windturbine,1,2040 +2,10,electricity,all-week,morning,2025,all-year,R1,0.23330000000,windturbine,1,2040 +3,10,electricity,all-week,morning,2030,all-year,R1,0.46670000000,windturbine,1,2040 +4,10,electricity,all-week,morning,2035,all-year,R1,0.46670000000,windturbine,1,2040 +1,10,electricity,all-week,afternoon,2020,all-year,R1,0.15560000000,windturbine,2,2040 +2,10,electricity,all-week,afternoon,2025,all-year,R1,0.15560000000,windturbine,2,2040 +3,10,electricity,all-week,afternoon,2030,all-year,R1,0.31110000000,windturbine,2,2040 +4,10,electricity,all-week,afternoon,2035,all-year,R1,0.31110000000,windturbine,2,2040 +1,10,electricity,all-week,early-peak,2020,all-year,R1,0.23330000000,windturbine,3,2040 +2,10,electricity,all-week,early-peak,2025,all-year,R1,0.23330000000,windturbine,3,2040 +3,10,electricity,all-week,early-peak,2030,all-year,R1,0.46670000000,windturbine,3,2040 +4,10,electricity,all-week,early-peak,2035,all-year,R1,0.46670000000,windturbine,3,2040 +1,10,electricity,all-week,late-peak,2020,all-year,R1,0.46670000000,windturbine,4,2040 +2,10,electricity,all-week,late-peak,2025,all-year,R1,0.46670000000,windturbine,4,2040 +3,10,electricity,all-week,late-peak,2030,all-year,R1,0.93330000000,windturbine,4,2040 +4,10,electricity,all-week,late-peak,2035,all-year,R1,0.93330000000,windturbine,4,2040 +1,10,electricity,all-week,evening,2020,all-year,R1,0.31110000000,windturbine,5,2040 +2,10,electricity,all-week,evening,2025,all-year,R1,0.31110000000,windturbine,5,2040 +3,10,electricity,all-week,evening,2030,all-year,R1,0.62220000000,windturbine,5,2040 +4,10,electricity,all-week,evening,2035,all-year,R1,0.62220000000,windturbine,5,2040 +1,10,electricity,all-week,night,2020,all-year,R1,0.13330000000,windturbine,0,2045 +2,10,electricity,all-week,night,2025,all-year,R1,0.13330000000,windturbine,0,2045 +3,10,electricity,all-week,night,2030,all-year,R1,0.26670000000,windturbine,0,2045 +4,10,electricity,all-week,night,2035,all-year,R1,0.26670000000,windturbine,0,2045 +5,10,electricity,all-week,night,2040,all-year,R1,0.26670000000,windturbine,0,2045 +1,10,electricity,all-week,morning,2020,all-year,R1,0.20000000000,windturbine,1,2045 +2,10,electricity,all-week,morning,2025,all-year,R1,0.20000000000,windturbine,1,2045 +3,10,electricity,all-week,morning,2030,all-year,R1,0.40000000000,windturbine,1,2045 +4,10,electricity,all-week,morning,2035,all-year,R1,0.40000000000,windturbine,1,2045 +5,10,electricity,all-week,morning,2040,all-year,R1,0.40000000000,windturbine,1,2045 +1,10,electricity,all-week,afternoon,2020,all-year,R1,0.13330000000,windturbine,2,2045 +2,10,electricity,all-week,afternoon,2025,all-year,R1,0.13330000000,windturbine,2,2045 +3,10,electricity,all-week,afternoon,2030,all-year,R1,0.26670000000,windturbine,2,2045 +4,10,electricity,all-week,afternoon,2035,all-year,R1,0.26670000000,windturbine,2,2045 +5,10,electricity,all-week,afternoon,2040,all-year,R1,0.26670000000,windturbine,2,2045 +1,10,electricity,all-week,early-peak,2020,all-year,R1,0.20000000000,windturbine,3,2045 +2,10,electricity,all-week,early-peak,2025,all-year,R1,0.20000000000,windturbine,3,2045 +3,10,electricity,all-week,early-peak,2030,all-year,R1,0.40000000000,windturbine,3,2045 +4,10,electricity,all-week,early-peak,2035,all-year,R1,0.40000000000,windturbine,3,2045 +5,10,electricity,all-week,early-peak,2040,all-year,R1,0.40000000000,windturbine,3,2045 +1,10,electricity,all-week,late-peak,2020,all-year,R1,0.40000000000,windturbine,4,2045 +2,10,electricity,all-week,late-peak,2025,all-year,R1,0.40000000000,windturbine,4,2045 +3,10,electricity,all-week,late-peak,2030,all-year,R1,0.80000000000,windturbine,4,2045 +4,10,electricity,all-week,late-peak,2035,all-year,R1,0.80000000000,windturbine,4,2045 +5,10,electricity,all-week,late-peak,2040,all-year,R1,0.80000000000,windturbine,4,2045 +1,10,electricity,all-week,evening,2020,all-year,R1,0.26670000000,windturbine,5,2045 +2,10,electricity,all-week,evening,2025,all-year,R1,0.26670000000,windturbine,5,2045 +3,10,electricity,all-week,evening,2030,all-year,R1,0.53330000000,windturbine,5,2045 +4,10,electricity,all-week,evening,2035,all-year,R1,0.53330000000,windturbine,5,2045 +5,10,electricity,all-week,evening,2040,all-year,R1,0.53330000000,windturbine,5,2045 +2,10,electricity,all-week,night,2025,all-year,R1,0.13330000000,windturbine,0,2050 +3,10,electricity,all-week,night,2030,all-year,R1,0.26670000000,windturbine,0,2050 +4,10,electricity,all-week,night,2035,all-year,R1,0.26670000000,windturbine,0,2050 +5,10,electricity,all-week,night,2040,all-year,R1,0.26670000000,windturbine,0,2050 +6,10,electricity,all-week,night,2045,all-year,R1,0.26670000000,windturbine,0,2050 +2,10,electricity,all-week,morning,2025,all-year,R1,0.20000000000,windturbine,1,2050 +3,10,electricity,all-week,morning,2030,all-year,R1,0.40000000000,windturbine,1,2050 +4,10,electricity,all-week,morning,2035,all-year,R1,0.40000000000,windturbine,1,2050 +5,10,electricity,all-week,morning,2040,all-year,R1,0.40000000000,windturbine,1,2050 +6,10,electricity,all-week,morning,2045,all-year,R1,0.40000000000,windturbine,1,2050 +2,10,electricity,all-week,afternoon,2025,all-year,R1,0.13330000000,windturbine,2,2050 +3,10,electricity,all-week,afternoon,2030,all-year,R1,0.26670000000,windturbine,2,2050 +4,10,electricity,all-week,afternoon,2035,all-year,R1,0.26670000000,windturbine,2,2050 +5,10,electricity,all-week,afternoon,2040,all-year,R1,0.26670000000,windturbine,2,2050 +6,10,electricity,all-week,afternoon,2045,all-year,R1,0.26670000000,windturbine,2,2050 +2,10,electricity,all-week,early-peak,2025,all-year,R1,0.20000000000,windturbine,3,2050 +3,10,electricity,all-week,early-peak,2030,all-year,R1,0.40000000000,windturbine,3,2050 +4,10,electricity,all-week,early-peak,2035,all-year,R1,0.40000000000,windturbine,3,2050 +5,10,electricity,all-week,early-peak,2040,all-year,R1,0.40000000000,windturbine,3,2050 +6,10,electricity,all-week,early-peak,2045,all-year,R1,0.40000000000,windturbine,3,2050 +2,10,electricity,all-week,late-peak,2025,all-year,R1,0.40000000000,windturbine,4,2050 +3,10,electricity,all-week,late-peak,2030,all-year,R1,0.80000000000,windturbine,4,2050 +4,10,electricity,all-week,late-peak,2035,all-year,R1,0.80000000000,windturbine,4,2050 +5,10,electricity,all-week,late-peak,2040,all-year,R1,0.80000000000,windturbine,4,2050 +6,10,electricity,all-week,late-peak,2045,all-year,R1,0.80000000000,windturbine,4,2050 +2,10,electricity,all-week,evening,2025,all-year,R1,0.26670000000,windturbine,5,2050 +3,10,electricity,all-week,evening,2030,all-year,R1,0.53330000000,windturbine,5,2050 +4,10,electricity,all-week,evening,2035,all-year,R1,0.53330000000,windturbine,5,2050 +5,10,electricity,all-week,evening,2040,all-year,R1,0.53330000000,windturbine,5,2050 +6,10,electricity,all-week,evening,2045,all-year,R1,0.53330000000,windturbine,5,2050 diff --git a/docs/tutorial-code/6-add-correlation-demand/1-correlation/input/BaseYearExport.csv b/docs/tutorial-code/5-min-max-timeslice-constraints/1-min-constraint/input/BaseYearExport.csv similarity index 100% rename from docs/tutorial-code/6-add-correlation-demand/1-correlation/input/BaseYearExport.csv rename to docs/tutorial-code/5-min-max-timeslice-constraints/1-min-constraint/input/BaseYearExport.csv diff --git a/docs/tutorial-code/6-add-correlation-demand/1-correlation/input/BaseYearImport.csv b/docs/tutorial-code/5-min-max-timeslice-constraints/1-min-constraint/input/BaseYearImport.csv similarity index 100% rename from docs/tutorial-code/6-add-correlation-demand/1-correlation/input/BaseYearImport.csv rename to docs/tutorial-code/5-min-max-timeslice-constraints/1-min-constraint/input/BaseYearImport.csv diff --git a/docs/tutorial-code/6-add-correlation-demand/1-correlation/input/GlobalCommodities.csv b/docs/tutorial-code/5-min-max-timeslice-constraints/1-min-constraint/input/GlobalCommodities.csv similarity index 100% rename from docs/tutorial-code/6-add-correlation-demand/1-correlation/input/GlobalCommodities.csv rename to docs/tutorial-code/5-min-max-timeslice-constraints/1-min-constraint/input/GlobalCommodities.csv diff --git a/docs/tutorial-code/6-add-correlation-demand/1-correlation/input/Projections.csv b/docs/tutorial-code/5-min-max-timeslice-constraints/1-min-constraint/input/Projections.csv similarity index 100% rename from docs/tutorial-code/6-add-correlation-demand/1-correlation/input/Projections.csv rename to docs/tutorial-code/5-min-max-timeslice-constraints/1-min-constraint/input/Projections.csv diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/output.py b/docs/tutorial-code/5-min-max-timeslice-constraints/1-min-constraint/output.py similarity index 100% rename from docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/output.py rename to docs/tutorial-code/5-min-max-timeslice-constraints/1-min-constraint/output.py diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/settings.toml b/docs/tutorial-code/5-min-max-timeslice-constraints/1-min-constraint/settings.toml similarity index 69% rename from docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/settings.toml rename to docs/tutorial-code/5-min-max-timeslice-constraints/1-min-constraint/settings.toml index e8299741f..f568ef634 100644 --- a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/settings.toml +++ b/docs/tutorial-code/5-min-max-timeslice-constraints/1-min-constraint/settings.toml @@ -13,23 +13,13 @@ maximum_iterations = 100 tolerance = 0.1 tolerance_unmet_demand = -0.1 -[[outputs]] -quantity = "prices" -sink = "aggregate" -filename = "{cwd}/{default_output_dir}/MCA{Quantity}.csv" - [[outputs]] quantity = "capacity" sink = "aggregate" filename = "{cwd}/{default_output_dir}/MCA{Quantity}.csv" [[outputs]] -quantity = "timeslice_supply" -sink = "aggregate" -filename = "{cwd}/{default_output_dir}/MCA{Quantity}.csv" - -[[outputs]] -quantity = "timeslice_consumption" +quantity = "prices" sink = "aggregate" filename = "{cwd}/{default_output_dir}/MCA{Quantity}.csv" @@ -65,18 +55,6 @@ constraints = [ demand_share = "standard_demand" # Optional, default to standard_demand forecast = 5 # Optional, defaults to 5 -[[sectors.residential.outputs]] -filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}.csv' -quantity = "capacity" -sink = 'aggregate' - -[[sectors.residential.outputs]] -filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}.csv' -sink = 'aggregate' -quantity.name = "supply" -quantity.sum_over = "timeslice" -quantity.drop = ["comm_usage", "units_prices"] - [sectors.power] type = 'default' priority = 2 @@ -93,15 +71,9 @@ lpsolver = "scipy" demand_share = "standard_demand" [[sectors.power.outputs]] -filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}.csv' -quantity = "capacity" -sink = 'aggregate' - -[[sectors.power.outputs]] -filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}.csv' -sink = 'aggregate' -quantity.name = "supply" -quantity.drop = ["comm_usage", "units_prices"] +quantity = "supply" +sink = "aggregate" +filename = "{cwd}/{default_output_dir}/{Sector}_{Quantity}.csv" [sectors.gas] type = 'default' @@ -117,11 +89,6 @@ existing_capacity = '{path}/technodata/gas/ExistingCapacity.csv' lpsolver = "scipy" demand_share = "standard_demand" -[[sectors.gas.outputs]] -filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}.csv' -quantity = "capacity" -sink = 'aggregate' - [sectors.residential_presets] type = 'presets' priority = 0 @@ -129,9 +96,11 @@ consumption_path = "{path}/technodata/preset/*Consumption.csv" [timeslices] level_names = ["month", "day", "hour"] -all-year.all-week.night = 1460 -all-year.all-week.morning = 1460 -all-year.all-week.afternoon = 1460 -all-year.all-week.early-peak = 1460 -all-year.all-week.late-peak = 1460 -all-year.all-week.evening = 1460 + +[timeslices.all-year.all-week] +night = 1460 +morning = 1460 +afternoon = 1460 +early-peak = 1460 +late-peak = 1460 +evening = 1460 diff --git a/docs/tutorial-code/6-add-correlation-demand/1-correlation/technodata/Agents.csv b/docs/tutorial-code/5-min-max-timeslice-constraints/1-min-constraint/technodata/Agents.csv similarity index 100% rename from docs/tutorial-code/6-add-correlation-demand/1-correlation/technodata/Agents.csv rename to docs/tutorial-code/5-min-max-timeslice-constraints/1-min-constraint/technodata/Agents.csv diff --git a/docs/tutorial-code/6-add-correlation-demand/1-correlation/technodata/gas/CommIn.csv b/docs/tutorial-code/5-min-max-timeslice-constraints/1-min-constraint/technodata/gas/CommIn.csv similarity index 100% rename from docs/tutorial-code/6-add-correlation-demand/1-correlation/technodata/gas/CommIn.csv rename to docs/tutorial-code/5-min-max-timeslice-constraints/1-min-constraint/technodata/gas/CommIn.csv diff --git a/docs/tutorial-code/6-add-correlation-demand/1-correlation/technodata/gas/CommOut.csv b/docs/tutorial-code/5-min-max-timeslice-constraints/1-min-constraint/technodata/gas/CommOut.csv similarity index 100% rename from docs/tutorial-code/6-add-correlation-demand/1-correlation/technodata/gas/CommOut.csv rename to docs/tutorial-code/5-min-max-timeslice-constraints/1-min-constraint/technodata/gas/CommOut.csv diff --git a/docs/tutorial-code/6-add-correlation-demand/1-correlation/technodata/gas/ExistingCapacity.csv b/docs/tutorial-code/5-min-max-timeslice-constraints/1-min-constraint/technodata/gas/ExistingCapacity.csv similarity index 100% rename from docs/tutorial-code/6-add-correlation-demand/1-correlation/technodata/gas/ExistingCapacity.csv rename to docs/tutorial-code/5-min-max-timeslice-constraints/1-min-constraint/technodata/gas/ExistingCapacity.csv diff --git a/docs/tutorial-code/6-add-correlation-demand/1-correlation/technodata/gas/Technodata.csv b/docs/tutorial-code/5-min-max-timeslice-constraints/1-min-constraint/technodata/gas/Technodata.csv similarity index 78% rename from docs/tutorial-code/6-add-correlation-demand/1-correlation/technodata/gas/Technodata.csv rename to docs/tutorial-code/5-min-max-timeslice-constraints/1-min-constraint/technodata/gas/Technodata.csv index 784df8fbb..f7f3120d1 100644 --- a/docs/tutorial-code/6-add-correlation-demand/1-correlation/technodata/gas/Technodata.csv +++ b/docs/tutorial-code/5-min-max-timeslice-constraints/1-min-constraint/technodata/gas/Technodata.csv @@ -1,3 +1,3 @@ ProcessName,RegionName,Time,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent1 Unit,-,Year,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,New -gassupply1,R1,2020,0,1,0,1,2.55,1,5,1,60,35,0.9,0.00000189,86,0.1,energy,gas,gas,1 +gassupply1,R1,2020,0,1,0,1,2.55,1,10,1,100,35,0.9,0.00000189,86,0.1,energy,gas,gas,1 diff --git a/docs/tutorial-code/6-add-correlation-demand/1-correlation/technodata/power/CommIn.csv b/docs/tutorial-code/5-min-max-timeslice-constraints/1-min-constraint/technodata/power/CommIn.csv similarity index 100% rename from docs/tutorial-code/6-add-correlation-demand/1-correlation/technodata/power/CommIn.csv rename to docs/tutorial-code/5-min-max-timeslice-constraints/1-min-constraint/technodata/power/CommIn.csv diff --git a/docs/tutorial-code/6-add-correlation-demand/1-correlation/technodata/power/CommOut.csv b/docs/tutorial-code/5-min-max-timeslice-constraints/1-min-constraint/technodata/power/CommOut.csv similarity index 100% rename from docs/tutorial-code/6-add-correlation-demand/1-correlation/technodata/power/CommOut.csv rename to docs/tutorial-code/5-min-max-timeslice-constraints/1-min-constraint/technodata/power/CommOut.csv diff --git a/docs/tutorial-code/6-add-correlation-demand/1-correlation/technodata/power/ExistingCapacity.csv b/docs/tutorial-code/5-min-max-timeslice-constraints/1-min-constraint/technodata/power/ExistingCapacity.csv similarity index 100% rename from docs/tutorial-code/6-add-correlation-demand/1-correlation/technodata/power/ExistingCapacity.csv rename to docs/tutorial-code/5-min-max-timeslice-constraints/1-min-constraint/technodata/power/ExistingCapacity.csv diff --git a/docs/tutorial-code/6-add-correlation-demand/1-correlation/technodata/power/Technodata.csv b/docs/tutorial-code/5-min-max-timeslice-constraints/1-min-constraint/technodata/power/Technodata.csv similarity index 61% rename from docs/tutorial-code/6-add-correlation-demand/1-correlation/technodata/power/Technodata.csv rename to docs/tutorial-code/5-min-max-timeslice-constraints/1-min-constraint/technodata/power/Technodata.csv index 8e77c2d9a..a23d8d32e 100644 --- a/docs/tutorial-code/6-add-correlation-demand/1-correlation/technodata/power/Technodata.csv +++ b/docs/tutorial-code/5-min-max-timeslice-constraints/1-min-constraint/technodata/power/Technodata.csv @@ -1,4 +1,4 @@ ProcessName,RegionName,Time,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent1 Unit,-,Year,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,New -gasCCGT,R1,2020,23.78234399,1,0,1,0,1,2,1,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1 -windturbine,R1,2020,36.30771182,1,0,1,0,1,2,1,60,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1 +gasCCGT,R1,2020,23.78234399,1,0,1,0,1,10,1,100,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1 +windturbine,R1,2020,36.30771182,1,0,1,0,1,10,1,100,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1 diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/technodata/power/TechnodataTimeslices.csv b/docs/tutorial-code/5-min-max-timeslice-constraints/1-min-constraint/technodata/power/TechnodataTimeslices.csv similarity index 98% rename from docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/technodata/power/TechnodataTimeslices.csv rename to docs/tutorial-code/5-min-max-timeslice-constraints/1-min-constraint/technodata/power/TechnodataTimeslices.csv index 9516eab6f..ea9f7dbc4 100644 --- a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/technodata/power/TechnodataTimeslices.csv +++ b/docs/tutorial-code/5-min-max-timeslice-constraints/1-min-constraint/technodata/power/TechnodataTimeslices.csv @@ -1,14 +1,14 @@ -ProcessName,RegionName,Time,ObjSort,month,day,hour,UtilizationFactor,MinimumServiceFactor -Unit,-,Year,-,-,-,-,-,- -gasCCGT,R1,2020,upper,all-year,all-week,night,1,0.2 -gasCCGT,R1,2020,upper,all-year,all-week,morning,1,0.4 -gasCCGT,R1,2020,upper,all-year,all-week,afternoon,1,0.6 -gasCCGT,R1,2020,upper,all-year,all-week,early-peak,1,0.4 -gasCCGT,R1,2020,upper,all-year,all-week,late-peak,1,0.8 -gasCCGT,R1,2020,upper,all-year,all-week,evening,1,1 -windturbine,R1,2020,upper,all-year,all-week,night,1,0 -windturbine,R1,2020,upper,all-year,all-week,morning,1,0 -windturbine,R1,2020,upper,all-year,all-week,afternoon,1,0 -windturbine,R1,2020,upper,all-year,all-week,early-peak,1,0 -windturbine,R1,2020,upper,all-year,all-week,late-peak,1,0 -windturbine,R1,2020,upper,all-year,all-week,evening,1,0 +ProcessName,RegionName,Time,ObjSort,month,day,hour,UtilizationFactor,MinimumServiceFactor +Unit,-,Year,-,-,-,-,-,- +gasCCGT,R1,2020,upper,all-year,all-week,night,1,0.2 +gasCCGT,R1,2020,upper,all-year,all-week,morning,1,0.4 +gasCCGT,R1,2020,upper,all-year,all-week,afternoon,1,0.6 +gasCCGT,R1,2020,upper,all-year,all-week,early-peak,1,0.4 +gasCCGT,R1,2020,upper,all-year,all-week,late-peak,1,0.8 +gasCCGT,R1,2020,upper,all-year,all-week,evening,1,1 +windturbine,R1,2020,upper,all-year,all-week,night,1,0 +windturbine,R1,2020,upper,all-year,all-week,morning,1,0 +windturbine,R1,2020,upper,all-year,all-week,afternoon,1,0 +windturbine,R1,2020,upper,all-year,all-week,early-peak,1,0 +windturbine,R1,2020,upper,all-year,all-week,late-peak,1,0 +windturbine,R1,2020,upper,all-year,all-week,evening,1,0 diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/technodata/preset/Residential2020Consumption.csv b/docs/tutorial-code/5-min-max-timeslice-constraints/1-min-constraint/technodata/preset/Residential2020Consumption.csv similarity index 100% rename from docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/technodata/preset/Residential2020Consumption.csv rename to docs/tutorial-code/5-min-max-timeslice-constraints/1-min-constraint/technodata/preset/Residential2020Consumption.csv diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/technodata/preset/Residential2050Consumption.csv b/docs/tutorial-code/5-min-max-timeslice-constraints/1-min-constraint/technodata/preset/Residential2050Consumption.csv similarity index 100% rename from docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/technodata/preset/Residential2050Consumption.csv rename to docs/tutorial-code/5-min-max-timeslice-constraints/1-min-constraint/technodata/preset/Residential2050Consumption.csv diff --git a/docs/tutorial-code/6-add-correlation-demand/1-correlation/technodata/residential/CommIn.csv b/docs/tutorial-code/5-min-max-timeslice-constraints/1-min-constraint/technodata/residential/CommIn.csv similarity index 100% rename from docs/tutorial-code/6-add-correlation-demand/1-correlation/technodata/residential/CommIn.csv rename to docs/tutorial-code/5-min-max-timeslice-constraints/1-min-constraint/technodata/residential/CommIn.csv diff --git a/docs/tutorial-code/6-add-correlation-demand/1-correlation/technodata/residential/CommOut.csv b/docs/tutorial-code/5-min-max-timeslice-constraints/1-min-constraint/technodata/residential/CommOut.csv similarity index 100% rename from docs/tutorial-code/6-add-correlation-demand/1-correlation/technodata/residential/CommOut.csv rename to docs/tutorial-code/5-min-max-timeslice-constraints/1-min-constraint/technodata/residential/CommOut.csv diff --git a/docs/tutorial-code/6-add-correlation-demand/1-correlation/technodata/residential/ExistingCapacity.csv b/docs/tutorial-code/5-min-max-timeslice-constraints/1-min-constraint/technodata/residential/ExistingCapacity.csv similarity index 100% rename from docs/tutorial-code/6-add-correlation-demand/1-correlation/technodata/residential/ExistingCapacity.csv rename to docs/tutorial-code/5-min-max-timeslice-constraints/1-min-constraint/technodata/residential/ExistingCapacity.csv diff --git a/docs/tutorial-code/5-min-max-timeslice-constraints/1-min-constraint/technodata/residential/Technodata.csv b/docs/tutorial-code/5-min-max-timeslice-constraints/1-min-constraint/technodata/residential/Technodata.csv new file mode 100644 index 000000000..5b961659e --- /dev/null +++ b/docs/tutorial-code/5-min-max-timeslice-constraints/1-min-constraint/technodata/residential/Technodata.csv @@ -0,0 +1,4 @@ +ProcessName,RegionName,Time,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent1 +Unit,-,Year,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,New +gasboiler,R1,2020,3.8,1,0,1,0,1,10,1,100,10,1,0.00000189,86,0.1,energy,gas,heat,1 +heatpump,R1,2020,8.866667,1,0,1,0,1,10,1,100,10,1,0.00000189,86,0.1,energy,electricity,heat,1 diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/MCACapacity.csv b/docs/tutorial-code/5-min-max-timeslice-constraints/2-max-constraint/Results/MCACapacity.csv similarity index 100% rename from docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/MCACapacity.csv rename to docs/tutorial-code/5-min-max-timeslice-constraints/2-max-constraint/Results/MCACapacity.csv diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/MCAPrices.csv b/docs/tutorial-code/5-min-max-timeslice-constraints/2-max-constraint/Results/MCAPrices.csv similarity index 100% rename from docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/MCAPrices.csv rename to docs/tutorial-code/5-min-max-timeslice-constraints/2-max-constraint/Results/MCAPrices.csv diff --git a/docs/tutorial-code/5-min-max-timeslice-constraints/2-max-constraint/Results/Power_Supply.csv b/docs/tutorial-code/5-min-max-timeslice-constraints/2-max-constraint/Results/Power_Supply.csv new file mode 100644 index 000000000..173adbe8e --- /dev/null +++ b/docs/tutorial-code/5-min-max-timeslice-constraints/2-max-constraint/Results/Power_Supply.csv @@ -0,0 +1,115 @@ +asset,comm_usage,commodity,day,hour,installed,month,region,supply,technology,timeslice,year +0,10,electricity,all-week,night,2020,all-year,R1,0.20000000000,gasCCGT,0,2020 +0,6,CO2f,all-week,night,2020,all-year,R1,18.33400000000,gasCCGT,0,2020 +0,10,electricity,all-week,morning,2020,all-year,R1,0.40000000000,gasCCGT,1,2020 +0,6,CO2f,all-week,morning,2020,all-year,R1,36.66800000000,gasCCGT,1,2020 +0,10,electricity,all-week,afternoon,2020,all-year,R1,0.60000000000,gasCCGT,2,2020 +0,6,CO2f,all-week,afternoon,2020,all-year,R1,55.00200000000,gasCCGT,2,2020 +0,10,electricity,all-week,early-peak,2020,all-year,R1,0.40000000000,gasCCGT,3,2020 +0,6,CO2f,all-week,early-peak,2020,all-year,R1,36.66800000000,gasCCGT,3,2020 +0,10,electricity,all-week,late-peak,2020,all-year,R1,0.80000000000,gasCCGT,4,2020 +0,6,CO2f,all-week,late-peak,2020,all-year,R1,73.33600000000,gasCCGT,4,2020 +0,10,electricity,all-week,evening,2020,all-year,R1,1.00000000000,gasCCGT,5,2020 +0,6,CO2f,all-week,evening,2020,all-year,R1,91.67000000000,gasCCGT,5,2020 +0,10,electricity,all-week,night,2020,all-year,R1,0.42220000000,gasCCGT,0,2025 +0,6,CO2f,all-week,night,2020,all-year,R1,38.70510000000,gasCCGT,0,2025 +0,10,electricity,all-week,morning,2020,all-year,R1,0.63330000000,gasCCGT,1,2025 +0,6,CO2f,all-week,morning,2020,all-year,R1,58.05770000000,gasCCGT,1,2025 +0,10,electricity,all-week,afternoon,2020,all-year,R1,0.60000000000,gasCCGT,2,2025 +0,6,CO2f,all-week,afternoon,2020,all-year,R1,55.00200000000,gasCCGT,2,2025 +0,10,electricity,all-week,early-peak,2020,all-year,R1,0.63330000000,gasCCGT,3,2025 +0,6,CO2f,all-week,early-peak,2020,all-year,R1,58.05770000000,gasCCGT,3,2025 +0,10,electricity,all-week,late-peak,2020,all-year,R1,1.26670000000,gasCCGT,4,2025 +0,6,CO2f,all-week,late-peak,2020,all-year,R1,116.11530000000,gasCCGT,4,2025 +0,10,electricity,all-week,evening,2020,all-year,R1,1.00000000000,gasCCGT,5,2025 +0,6,CO2f,all-week,evening,2020,all-year,R1,91.67000000000,gasCCGT,5,2025 +4,10,electricity,all-week,night,2025,all-year,R1,0.66670000000,windturbine,0,2030 +4,10,electricity,all-week,morning,2025,all-year,R1,0.50000000000,windturbine,1,2030 +4,10,electricity,all-week,afternoon,2025,all-year,R1,0.50000000000,windturbine,2,2030 +4,10,electricity,all-week,early-peak,2025,all-year,R1,1.00000000000,windturbine,3,2030 +4,10,electricity,all-week,late-peak,2025,all-year,R1,1.00000000000,windturbine,4,2030 +4,10,electricity,all-week,evening,2025,all-year,R1,1.00000000000,windturbine,5,2030 +5,10,electricity,all-week,night,2025,all-year,R1,0.40000000000,windturbine,0,2035 +6,10,electricity,all-week,night,2030,all-year,R1,0.40000000000,windturbine,0,2035 +5,10,electricity,all-week,morning,2025,all-year,R1,0.50000000000,windturbine,1,2035 +6,10,electricity,all-week,morning,2030,all-year,R1,0.50000000000,windturbine,1,2035 +5,10,electricity,all-week,afternoon,2025,all-year,R1,0.40000000000,windturbine,2,2035 +6,10,electricity,all-week,afternoon,2030,all-year,R1,0.40000000000,windturbine,2,2035 +5,10,electricity,all-week,early-peak,2025,all-year,R1,0.60000000000,windturbine,3,2035 +6,10,electricity,all-week,early-peak,2030,all-year,R1,0.60000000000,windturbine,3,2035 +5,10,electricity,all-week,late-peak,2025,all-year,R1,1.00000000000,windturbine,4,2035 +6,10,electricity,all-week,late-peak,2030,all-year,R1,1.00000000000,windturbine,4,2035 +5,10,electricity,all-week,evening,2025,all-year,R1,0.80000000000,windturbine,5,2035 +6,10,electricity,all-week,evening,2030,all-year,R1,0.80000000000,windturbine,5,2035 +6,10,electricity,all-week,night,2025,all-year,R1,0.31110000000,windturbine,0,2040 +7,10,electricity,all-week,night,2030,all-year,R1,0.31110000000,windturbine,0,2040 +8,10,electricity,all-week,night,2035,all-year,R1,0.31110000000,windturbine,0,2040 +6,10,electricity,all-week,morning,2025,all-year,R1,0.46670000000,windturbine,1,2040 +7,10,electricity,all-week,morning,2030,all-year,R1,0.46670000000,windturbine,1,2040 +8,10,electricity,all-week,morning,2035,all-year,R1,0.46670000000,windturbine,1,2040 +6,10,electricity,all-week,afternoon,2025,all-year,R1,0.31110000000,windturbine,2,2040 +7,10,electricity,all-week,afternoon,2030,all-year,R1,0.31110000000,windturbine,2,2040 +8,10,electricity,all-week,afternoon,2035,all-year,R1,0.31110000000,windturbine,2,2040 +6,10,electricity,all-week,early-peak,2025,all-year,R1,0.46670000000,windturbine,3,2040 +7,10,electricity,all-week,early-peak,2030,all-year,R1,0.46670000000,windturbine,3,2040 +8,10,electricity,all-week,early-peak,2035,all-year,R1,0.46670000000,windturbine,3,2040 +6,10,electricity,all-week,late-peak,2025,all-year,R1,0.93330000000,windturbine,4,2040 +7,10,electricity,all-week,late-peak,2030,all-year,R1,0.93330000000,windturbine,4,2040 +8,10,electricity,all-week,late-peak,2035,all-year,R1,0.93330000000,windturbine,4,2040 +6,10,electricity,all-week,evening,2025,all-year,R1,0.62220000000,windturbine,5,2040 +7,10,electricity,all-week,evening,2030,all-year,R1,0.62220000000,windturbine,5,2040 +8,10,electricity,all-week,evening,2035,all-year,R1,0.62220000000,windturbine,5,2040 +7,10,electricity,all-week,night,2025,all-year,R1,0.21330000000,windturbine,0,2045 +8,10,electricity,all-week,night,2030,all-year,R1,0.21330000000,windturbine,0,2045 +9,10,electricity,all-week,night,2035,all-year,R1,0.21330000000,windturbine,0,2045 +10,10,electricity,all-week,night,2040,all-year,R1,0.42670000000,windturbine,0,2045 +7,10,electricity,all-week,morning,2025,all-year,R1,0.32000000000,windturbine,1,2045 +8,10,electricity,all-week,morning,2030,all-year,R1,0.32000000000,windturbine,1,2045 +9,10,electricity,all-week,morning,2035,all-year,R1,0.32000000000,windturbine,1,2045 +10,10,electricity,all-week,morning,2040,all-year,R1,0.64000000000,windturbine,1,2045 +7,10,electricity,all-week,afternoon,2025,all-year,R1,0.21330000000,windturbine,2,2045 +8,10,electricity,all-week,afternoon,2030,all-year,R1,0.21330000000,windturbine,2,2045 +9,10,electricity,all-week,afternoon,2035,all-year,R1,0.21330000000,windturbine,2,2045 +10,10,electricity,all-week,afternoon,2040,all-year,R1,0.42670000000,windturbine,2,2045 +7,10,electricity,all-week,early-peak,2025,all-year,R1,0.32000000000,windturbine,3,2045 +8,10,electricity,all-week,early-peak,2030,all-year,R1,0.32000000000,windturbine,3,2045 +9,10,electricity,all-week,early-peak,2035,all-year,R1,0.32000000000,windturbine,3,2045 +10,10,electricity,all-week,early-peak,2040,all-year,R1,0.64000000000,windturbine,3,2045 +7,10,electricity,all-week,late-peak,2025,all-year,R1,0.64000000000,windturbine,4,2045 +8,10,electricity,all-week,late-peak,2030,all-year,R1,0.64000000000,windturbine,4,2045 +9,10,electricity,all-week,late-peak,2035,all-year,R1,0.64000000000,windturbine,4,2045 +10,10,electricity,all-week,late-peak,2040,all-year,R1,1.28000000000,windturbine,4,2045 +7,10,electricity,all-week,evening,2025,all-year,R1,0.42670000000,windturbine,5,2045 +8,10,electricity,all-week,evening,2030,all-year,R1,0.42670000000,windturbine,5,2045 +9,10,electricity,all-week,evening,2035,all-year,R1,0.42670000000,windturbine,5,2045 +10,10,electricity,all-week,evening,2040,all-year,R1,0.85330000000,windturbine,5,2045 +8,10,electricity,all-week,night,2025,all-year,R1,0.17140000000,windturbine,0,2050 +9,10,electricity,all-week,night,2030,all-year,R1,0.17140000000,windturbine,0,2050 +10,10,electricity,all-week,night,2035,all-year,R1,0.17140000000,windturbine,0,2050 +11,10,electricity,all-week,night,2040,all-year,R1,0.34290000000,windturbine,0,2050 +12,10,electricity,all-week,night,2045,all-year,R1,0.34290000000,windturbine,0,2050 +8,10,electricity,all-week,morning,2025,all-year,R1,0.25710000000,windturbine,1,2050 +9,10,electricity,all-week,morning,2030,all-year,R1,0.25710000000,windturbine,1,2050 +10,10,electricity,all-week,morning,2035,all-year,R1,0.25710000000,windturbine,1,2050 +11,10,electricity,all-week,morning,2040,all-year,R1,0.51430000000,windturbine,1,2050 +12,10,electricity,all-week,morning,2045,all-year,R1,0.51430000000,windturbine,1,2050 +8,10,electricity,all-week,afternoon,2025,all-year,R1,0.17140000000,windturbine,2,2050 +9,10,electricity,all-week,afternoon,2030,all-year,R1,0.17140000000,windturbine,2,2050 +10,10,electricity,all-week,afternoon,2035,all-year,R1,0.17140000000,windturbine,2,2050 +11,10,electricity,all-week,afternoon,2040,all-year,R1,0.34290000000,windturbine,2,2050 +12,10,electricity,all-week,afternoon,2045,all-year,R1,0.34290000000,windturbine,2,2050 +8,10,electricity,all-week,early-peak,2025,all-year,R1,0.25710000000,windturbine,3,2050 +9,10,electricity,all-week,early-peak,2030,all-year,R1,0.25710000000,windturbine,3,2050 +10,10,electricity,all-week,early-peak,2035,all-year,R1,0.25710000000,windturbine,3,2050 +11,10,electricity,all-week,early-peak,2040,all-year,R1,0.51430000000,windturbine,3,2050 +12,10,electricity,all-week,early-peak,2045,all-year,R1,0.51430000000,windturbine,3,2050 +8,10,electricity,all-week,late-peak,2025,all-year,R1,0.51430000000,windturbine,4,2050 +9,10,electricity,all-week,late-peak,2030,all-year,R1,0.51430000000,windturbine,4,2050 +10,10,electricity,all-week,late-peak,2035,all-year,R1,0.51430000000,windturbine,4,2050 +11,10,electricity,all-week,late-peak,2040,all-year,R1,1.02860000000,windturbine,4,2050 +12,10,electricity,all-week,late-peak,2045,all-year,R1,1.02860000000,windturbine,4,2050 +8,10,electricity,all-week,evening,2025,all-year,R1,0.34290000000,windturbine,5,2050 +9,10,electricity,all-week,evening,2030,all-year,R1,0.34290000000,windturbine,5,2050 +10,10,electricity,all-week,evening,2035,all-year,R1,0.34290000000,windturbine,5,2050 +11,10,electricity,all-week,evening,2040,all-year,R1,0.68570000000,windturbine,5,2050 +12,10,electricity,all-week,evening,2045,all-year,R1,0.68570000000,windturbine,5,2050 diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/input/BaseYearExport.csv b/docs/tutorial-code/5-min-max-timeslice-constraints/2-max-constraint/input/BaseYearExport.csv similarity index 100% rename from docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/input/BaseYearExport.csv rename to docs/tutorial-code/5-min-max-timeslice-constraints/2-max-constraint/input/BaseYearExport.csv diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/input/BaseYearImport.csv b/docs/tutorial-code/5-min-max-timeslice-constraints/2-max-constraint/input/BaseYearImport.csv similarity index 100% rename from docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/input/BaseYearImport.csv rename to docs/tutorial-code/5-min-max-timeslice-constraints/2-max-constraint/input/BaseYearImport.csv diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/input/GlobalCommodities.csv b/docs/tutorial-code/5-min-max-timeslice-constraints/2-max-constraint/input/GlobalCommodities.csv similarity index 100% rename from docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/input/GlobalCommodities.csv rename to docs/tutorial-code/5-min-max-timeslice-constraints/2-max-constraint/input/GlobalCommodities.csv diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/input/Projections.csv b/docs/tutorial-code/5-min-max-timeslice-constraints/2-max-constraint/input/Projections.csv similarity index 100% rename from docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/input/Projections.csv rename to docs/tutorial-code/5-min-max-timeslice-constraints/2-max-constraint/input/Projections.csv diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/output.py b/docs/tutorial-code/5-min-max-timeslice-constraints/2-max-constraint/output.py similarity index 100% rename from docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/output.py rename to docs/tutorial-code/5-min-max-timeslice-constraints/2-max-constraint/output.py diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/settings.toml b/docs/tutorial-code/5-min-max-timeslice-constraints/2-max-constraint/settings.toml similarity index 69% rename from docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/settings.toml rename to docs/tutorial-code/5-min-max-timeslice-constraints/2-max-constraint/settings.toml index e8299741f..f568ef634 100644 --- a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/settings.toml +++ b/docs/tutorial-code/5-min-max-timeslice-constraints/2-max-constraint/settings.toml @@ -13,23 +13,13 @@ maximum_iterations = 100 tolerance = 0.1 tolerance_unmet_demand = -0.1 -[[outputs]] -quantity = "prices" -sink = "aggregate" -filename = "{cwd}/{default_output_dir}/MCA{Quantity}.csv" - [[outputs]] quantity = "capacity" sink = "aggregate" filename = "{cwd}/{default_output_dir}/MCA{Quantity}.csv" [[outputs]] -quantity = "timeslice_supply" -sink = "aggregate" -filename = "{cwd}/{default_output_dir}/MCA{Quantity}.csv" - -[[outputs]] -quantity = "timeslice_consumption" +quantity = "prices" sink = "aggregate" filename = "{cwd}/{default_output_dir}/MCA{Quantity}.csv" @@ -65,18 +55,6 @@ constraints = [ demand_share = "standard_demand" # Optional, default to standard_demand forecast = 5 # Optional, defaults to 5 -[[sectors.residential.outputs]] -filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}.csv' -quantity = "capacity" -sink = 'aggregate' - -[[sectors.residential.outputs]] -filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}.csv' -sink = 'aggregate' -quantity.name = "supply" -quantity.sum_over = "timeslice" -quantity.drop = ["comm_usage", "units_prices"] - [sectors.power] type = 'default' priority = 2 @@ -93,15 +71,9 @@ lpsolver = "scipy" demand_share = "standard_demand" [[sectors.power.outputs]] -filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}.csv' -quantity = "capacity" -sink = 'aggregate' - -[[sectors.power.outputs]] -filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}.csv' -sink = 'aggregate' -quantity.name = "supply" -quantity.drop = ["comm_usage", "units_prices"] +quantity = "supply" +sink = "aggregate" +filename = "{cwd}/{default_output_dir}/{Sector}_{Quantity}.csv" [sectors.gas] type = 'default' @@ -117,11 +89,6 @@ existing_capacity = '{path}/technodata/gas/ExistingCapacity.csv' lpsolver = "scipy" demand_share = "standard_demand" -[[sectors.gas.outputs]] -filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}.csv' -quantity = "capacity" -sink = 'aggregate' - [sectors.residential_presets] type = 'presets' priority = 0 @@ -129,9 +96,11 @@ consumption_path = "{path}/technodata/preset/*Consumption.csv" [timeslices] level_names = ["month", "day", "hour"] -all-year.all-week.night = 1460 -all-year.all-week.morning = 1460 -all-year.all-week.afternoon = 1460 -all-year.all-week.early-peak = 1460 -all-year.all-week.late-peak = 1460 -all-year.all-week.evening = 1460 + +[timeslices.all-year.all-week] +night = 1460 +morning = 1460 +afternoon = 1460 +early-peak = 1460 +late-peak = 1460 +evening = 1460 diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/technodata/Agents.csv b/docs/tutorial-code/5-min-max-timeslice-constraints/2-max-constraint/technodata/Agents.csv similarity index 100% rename from docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/technodata/Agents.csv rename to docs/tutorial-code/5-min-max-timeslice-constraints/2-max-constraint/technodata/Agents.csv diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/technodata/gas/CommIn.csv b/docs/tutorial-code/5-min-max-timeslice-constraints/2-max-constraint/technodata/gas/CommIn.csv similarity index 100% rename from docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/technodata/gas/CommIn.csv rename to docs/tutorial-code/5-min-max-timeslice-constraints/2-max-constraint/technodata/gas/CommIn.csv diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/technodata/gas/CommOut.csv b/docs/tutorial-code/5-min-max-timeslice-constraints/2-max-constraint/technodata/gas/CommOut.csv similarity index 100% rename from docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/technodata/gas/CommOut.csv rename to docs/tutorial-code/5-min-max-timeslice-constraints/2-max-constraint/technodata/gas/CommOut.csv diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/technodata/gas/ExistingCapacity.csv b/docs/tutorial-code/5-min-max-timeslice-constraints/2-max-constraint/technodata/gas/ExistingCapacity.csv similarity index 100% rename from docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/technodata/gas/ExistingCapacity.csv rename to docs/tutorial-code/5-min-max-timeslice-constraints/2-max-constraint/technodata/gas/ExistingCapacity.csv diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/technodata/gas/Technodata.csv b/docs/tutorial-code/5-min-max-timeslice-constraints/2-max-constraint/technodata/gas/Technodata.csv similarity index 78% rename from docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/technodata/gas/Technodata.csv rename to docs/tutorial-code/5-min-max-timeslice-constraints/2-max-constraint/technodata/gas/Technodata.csv index 484a19533..f7f3120d1 100644 --- a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/technodata/gas/Technodata.csv +++ b/docs/tutorial-code/5-min-max-timeslice-constraints/2-max-constraint/technodata/gas/Technodata.csv @@ -1,3 +1,3 @@ ProcessName,RegionName,Time,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent1 Unit,-,Year,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,New -gassupply1,R1,2020,0,1,0,1,2.55,1,50,10,600,35,0.9,0.00000189,86,0.1,energy,gas,gas,1 +gassupply1,R1,2020,0,1,0,1,2.55,1,10,1,100,35,0.9,0.00000189,86,0.1,energy,gas,gas,1 diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/technodata/power/CommIn.csv b/docs/tutorial-code/5-min-max-timeslice-constraints/2-max-constraint/technodata/power/CommIn.csv similarity index 100% rename from docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/technodata/power/CommIn.csv rename to docs/tutorial-code/5-min-max-timeslice-constraints/2-max-constraint/technodata/power/CommIn.csv diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/technodata/power/CommOut.csv b/docs/tutorial-code/5-min-max-timeslice-constraints/2-max-constraint/technodata/power/CommOut.csv similarity index 100% rename from docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/technodata/power/CommOut.csv rename to docs/tutorial-code/5-min-max-timeslice-constraints/2-max-constraint/technodata/power/CommOut.csv diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/technodata/power/ExistingCapacity.csv b/docs/tutorial-code/5-min-max-timeslice-constraints/2-max-constraint/technodata/power/ExistingCapacity.csv similarity index 100% rename from docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/technodata/power/ExistingCapacity.csv rename to docs/tutorial-code/5-min-max-timeslice-constraints/2-max-constraint/technodata/power/ExistingCapacity.csv diff --git a/docs/tutorial-code/6-add-correlation-demand/1-correlation/technodata/residential/Technodata.csv b/docs/tutorial-code/5-min-max-timeslice-constraints/2-max-constraint/technodata/power/Technodata.csv similarity index 61% rename from docs/tutorial-code/6-add-correlation-demand/1-correlation/technodata/residential/Technodata.csv rename to docs/tutorial-code/5-min-max-timeslice-constraints/2-max-constraint/technodata/power/Technodata.csv index 3424b178b..a23d8d32e 100644 --- a/docs/tutorial-code/6-add-correlation-demand/1-correlation/technodata/residential/Technodata.csv +++ b/docs/tutorial-code/5-min-max-timeslice-constraints/2-max-constraint/technodata/power/Technodata.csv @@ -1,4 +1,4 @@ ProcessName,RegionName,Time,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent1 Unit,-,Year,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,New -gasboiler,R1,2020,3.8,1,0,1,0,1,10,0.2,60,10,1,0.00000189,86,0.1,energy,gas,heat,1 -heatpump,R1,2020,8.866667,1,0,1,0,1,10,0.2,60,10,1,0.00000189,86,0.1,energy,electricity,heat,1 +gasCCGT,R1,2020,23.78234399,1,0,1,0,1,10,1,100,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1 +windturbine,R1,2020,36.30771182,1,0,1,0,1,10,1,100,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1 diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/technodata/power/TechnodataTimeslices.csv b/docs/tutorial-code/5-min-max-timeslice-constraints/2-max-constraint/technodata/power/TechnodataTimeslices.csv similarity index 98% rename from docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/technodata/power/TechnodataTimeslices.csv rename to docs/tutorial-code/5-min-max-timeslice-constraints/2-max-constraint/technodata/power/TechnodataTimeslices.csv index a75c7bebb..97c5bbe97 100644 --- a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/technodata/power/TechnodataTimeslices.csv +++ b/docs/tutorial-code/5-min-max-timeslice-constraints/2-max-constraint/technodata/power/TechnodataTimeslices.csv @@ -1,14 +1,14 @@ -ProcessName,RegionName,Time,ObjSort,month,day,hour,UtilizationFactor,MinimumServiceFactor -Unit,-,Year,-,-,-,-,-,- -gasCCGT,R1,2020,upper,all-year,all-week,night,1,0.2 -gasCCGT,R1,2020,upper,all-year,all-week,morning,1,0.4 -gasCCGT,R1,2020,upper,all-year,all-week,afternoon,1,0.6 -gasCCGT,R1,2020,upper,all-year,all-week,early-peak,1,0.4 -gasCCGT,R1,2020,upper,all-year,all-week,late-peak,1,0.8 -gasCCGT,R1,2020,upper,all-year,all-week,evening,1,1 -windturbine,R1,2020,upper,all-year,all-week,night,1,0 -windturbine,R1,2020,upper,all-year,all-week,morning,0.5,0 -windturbine,R1,2020,upper,all-year,all-week,afternoon,0.5,0 -windturbine,R1,2020,upper,all-year,all-week,early-peak,1,0 -windturbine,R1,2020,upper,all-year,all-week,late-peak,1,0 -windturbine,R1,2020,upper,all-year,all-week,evening,1,0 +ProcessName,RegionName,Time,ObjSort,month,day,hour,UtilizationFactor,MinimumServiceFactor +Unit,-,Year,-,-,-,-,-,- +gasCCGT,R1,2020,upper,all-year,all-week,night,1,0.2 +gasCCGT,R1,2020,upper,all-year,all-week,morning,1,0.4 +gasCCGT,R1,2020,upper,all-year,all-week,afternoon,1,0.6 +gasCCGT,R1,2020,upper,all-year,all-week,early-peak,1,0.4 +gasCCGT,R1,2020,upper,all-year,all-week,late-peak,1,0.8 +gasCCGT,R1,2020,upper,all-year,all-week,evening,1,1 +windturbine,R1,2020,upper,all-year,all-week,night,1,0 +windturbine,R1,2020,upper,all-year,all-week,morning,0.5,0 +windturbine,R1,2020,upper,all-year,all-week,afternoon,0.5,0 +windturbine,R1,2020,upper,all-year,all-week,early-peak,1,0 +windturbine,R1,2020,upper,all-year,all-week,late-peak,1,0 +windturbine,R1,2020,upper,all-year,all-week,evening,1,0 diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/technodata/preset/Residential2020Consumption.csv b/docs/tutorial-code/5-min-max-timeslice-constraints/2-max-constraint/technodata/preset/Residential2020Consumption.csv similarity index 100% rename from docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/technodata/preset/Residential2020Consumption.csv rename to docs/tutorial-code/5-min-max-timeslice-constraints/2-max-constraint/technodata/preset/Residential2020Consumption.csv diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/technodata/preset/Residential2050Consumption.csv b/docs/tutorial-code/5-min-max-timeslice-constraints/2-max-constraint/technodata/preset/Residential2050Consumption.csv similarity index 100% rename from docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/technodata/preset/Residential2050Consumption.csv rename to docs/tutorial-code/5-min-max-timeslice-constraints/2-max-constraint/technodata/preset/Residential2050Consumption.csv diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/technodata/residential/CommIn.csv b/docs/tutorial-code/5-min-max-timeslice-constraints/2-max-constraint/technodata/residential/CommIn.csv similarity index 100% rename from docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/technodata/residential/CommIn.csv rename to docs/tutorial-code/5-min-max-timeslice-constraints/2-max-constraint/technodata/residential/CommIn.csv diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/technodata/residential/CommOut.csv b/docs/tutorial-code/5-min-max-timeslice-constraints/2-max-constraint/technodata/residential/CommOut.csv similarity index 100% rename from docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/technodata/residential/CommOut.csv rename to docs/tutorial-code/5-min-max-timeslice-constraints/2-max-constraint/technodata/residential/CommOut.csv diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/technodata/residential/ExistingCapacity.csv b/docs/tutorial-code/5-min-max-timeslice-constraints/2-max-constraint/technodata/residential/ExistingCapacity.csv similarity index 100% rename from docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/technodata/residential/ExistingCapacity.csv rename to docs/tutorial-code/5-min-max-timeslice-constraints/2-max-constraint/technodata/residential/ExistingCapacity.csv diff --git a/docs/tutorial-code/5-min-max-timeslice-constraints/2-max-constraint/technodata/residential/Technodata.csv b/docs/tutorial-code/5-min-max-timeslice-constraints/2-max-constraint/technodata/residential/Technodata.csv new file mode 100644 index 000000000..5b961659e --- /dev/null +++ b/docs/tutorial-code/5-min-max-timeslice-constraints/2-max-constraint/technodata/residential/Technodata.csv @@ -0,0 +1,4 @@ +ProcessName,RegionName,Time,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent1 +Unit,-,Year,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,New +gasboiler,R1,2020,3.8,1,0,1,0,1,10,1,100,10,1,0.00000189,86,0.1,energy,gas,heat,1 +heatpump,R1,2020,8.866667,1,0,1,0,1,10,1,100,10,1,0.00000189,86,0.1,energy,electricity,heat,1 diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/generate_models.py b/docs/tutorial-code/5-min-max-timeslice-constraints/generate_models.py similarity index 100% rename from docs/tutorial-code/7-min-max-timeslice-constraints/generate_models.py rename to docs/tutorial-code/5-min-max-timeslice-constraints/generate_models.py diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/visualise-max-service.ipynb b/docs/tutorial-code/5-min-max-timeslice-constraints/visualise-max-service.ipynb similarity index 99% rename from docs/tutorial-code/7-min-max-timeslice-constraints/visualise-max-service.ipynb rename to docs/tutorial-code/5-min-max-timeslice-constraints/visualise-max-service.ipynb index ebb3127e2..4113739ca 100644 --- a/docs/tutorial-code/7-min-max-timeslice-constraints/visualise-max-service.ipynb +++ b/docs/tutorial-code/5-min-max-timeslice-constraints/visualise-max-service.ipynb @@ -36,7 +36,7 @@ "metadata": {}, "outputs": [], "source": [ - "power_supply = pd.read_csv(\"2-max-constraint/Results/Power/Supply.csv\")\n", + "power_supply = pd.read_csv(\"2-max-constraint/Results/Power_Supply.csv\")\n", "\n", "sns.lineplot(\n", " data=power_supply[\n", diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/visualise-min-service.ipynb b/docs/tutorial-code/5-min-max-timeslice-constraints/visualise-min-service.ipynb similarity index 79% rename from docs/tutorial-code/7-min-max-timeslice-constraints/visualise-min-service.ipynb rename to docs/tutorial-code/5-min-max-timeslice-constraints/visualise-min-service.ipynb index 24d43265a..3ec938af1 100644 --- a/docs/tutorial-code/7-min-max-timeslice-constraints/visualise-min-service.ipynb +++ b/docs/tutorial-code/5-min-max-timeslice-constraints/visualise-min-service.ipynb @@ -36,7 +36,7 @@ "metadata": {}, "outputs": [], "source": [ - "power_supply = pd.read_csv(\"1-min-constraint/Results/Power/Supply.csv\")\n", + "power_supply = pd.read_csv(\"1-min-constraint/Results/Power_Supply.csv\")\n", "\n", "sns.lineplot(\n", " data=power_supply[\n", @@ -51,22 +51,6 @@ "plt.ylim(0, 10)" ] }, - { - "cell_type": "code", - "execution_count": null, - "metadata": {}, - "outputs": [], - "source": [ - "residential_capacity = pd.read_csv(\"1-min-constraint/Results/Residential/Capacity.csv\")\n", - "grouped_by = (\n", - " residential_capacity.groupby([\"year\", \"technology\", \"region\"]).sum().reset_index()\n", - ")\n", - "\n", - "g = sns.FacetGrid(data=grouped_by, row=\"region\")\n", - "g.map(sns.lineplot, \"year\", \"capacity\", \"technology\")\n", - "g.add_legend()" - ] - }, { "cell_type": "code", "execution_count": null, diff --git a/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Gas/Capacity.csv b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Gas/Capacity.csv deleted file mode 100644 index fd4ccf63c..000000000 --- a/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Gas/Capacity.csv +++ /dev/null @@ -1,20 +0,0 @@ -asset,capacity,installed,region,technology,year -0,15.00000000000,2020,R1,gassupply1,2020 -0,15.39710000000,2020,R1,gassupply1,2025 -0,7.89710000000,2020,R1,gassupply1,2030 -1,5.10950000000,2025,R1,gassupply1,2030 -0,0.39710000000,2020,R1,gassupply1,2035 -1,5.10950000000,2025,R1,gassupply1,2035 -2,6.35960000000,2030,R1,gassupply1,2035 -0,0.39710000000,2020,R1,gassupply1,2040 -1,5.10950000000,2025,R1,gassupply1,2040 -2,6.35960000000,2030,R1,gassupply1,2040 -3,0.32400000000,2035,R1,gassupply1,2040 -0,0.39710000000,2020,R1,gassupply1,2045 -1,5.10950000000,2025,R1,gassupply1,2045 -2,6.35960000000,2030,R1,gassupply1,2045 -3,0.32400000000,2035,R1,gassupply1,2045 -0,0.39710000000,2020,R1,gassupply1,2050 -1,5.10950000000,2025,R1,gassupply1,2050 -2,6.35960000000,2030,R1,gassupply1,2050 -3,0.32400000000,2035,R1,gassupply1,2050 diff --git a/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Power/Capacity.csv b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Power/Capacity.csv deleted file mode 100644 index 533832f7f..000000000 --- a/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Power/Capacity.csv +++ /dev/null @@ -1,19 +0,0 @@ -asset,capacity,installed,region,technology,year -0,1,2020,R1,gasCCGT,2020 -0,5,2020,R1,gasCCGT,2025 -0,4,2020,R1,gasCCGT,2030 -1,3,2025,R1,gasCCGT,2030 -0,4,2020,R1,gasCCGT,2035 -1,3,2025,R1,gasCCGT,2035 -2,2,2030,R1,windturbine,2035 -0,4,2020,R1,gasCCGT,2040 -1,3,2025,R1,gasCCGT,2040 -2,2,2030,R1,windturbine,2040 -0,4,2020,R1,gasCCGT,2045 -1,3,2025,R1,gasCCGT,2045 -2,2,2030,R1,windturbine,2045 -4,1,2040,R1,windturbine,2045 -0,4,2020,R1,gasCCGT,2050 -1,3,2025,R1,gasCCGT,2050 -2,2,2030,R1,windturbine,2050 -4,1,2040,R1,windturbine,2050 diff --git a/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Capacity.csv b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Capacity.csv deleted file mode 100644 index 90403d4bd..000000000 --- a/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Capacity.csv +++ /dev/null @@ -1,14 +0,0 @@ -asset,capacity,installed,region,technology,year -0,10,2020,R1,gasboiler,2020 -0,5,2020,R1,gasboiler,2025 -1,11,2020,R1,heatpump,2025 -1,11,2020,R1,heatpump,2030 -2,6,2025,R1,heatpump,2030 -2,6,2025,R1,heatpump,2035 -3,12,2030,R1,heatpump,2035 -3,12,2030,R1,heatpump,2040 -4,6,2035,R1,heatpump,2040 -4,6,2035,R1,heatpump,2045 -5,12,2040,R1,heatpump,2045 -5,12,2040,R1,heatpump,2050 -6,7,2045,R1,heatpump,2050 diff --git a/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Supply.csv b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Supply.csv deleted file mode 100644 index cb0ae306e..000000000 --- a/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Supply.csv +++ /dev/null @@ -1,91 +0,0 @@ -asset,commodity,day,hour,installed,month,region,supply,technology,timeslice,year -0,heat,all-week,night,2020,all-year,R1,0.89580000000,gasboiler,0,2020 -0,CO2f,all-week,night,2020,all-year,R1,57.96670000000,gasboiler,0,2020 -0,heat,all-week,morning,2020,all-year,R1,1.35000000000,gasboiler,1,2020 -0,CO2f,all-week,morning,2020,all-year,R1,87.35830000000,gasboiler,1,2020 -0,heat,all-week,afternoon,2020,all-year,R1,0.89580000000,gasboiler,2,2020 -0,CO2f,all-week,afternoon,2020,all-year,R1,57.96670000000,gasboiler,2,2020 -0,heat,all-week,early-peak,2020,all-year,R1,1.35000000000,gasboiler,3,2020 -0,CO2f,all-week,early-peak,2020,all-year,R1,87.35830000000,gasboiler,3,2020 -0,heat,all-week,late-peak,2020,all-year,R1,2.70000000000,gasboiler,4,2020 -0,CO2f,all-week,late-peak,2020,all-year,R1,174.71660000000,gasboiler,4,2020 -0,heat,all-week,evening,2020,all-year,R1,1.80420000000,gasboiler,5,2020 -0,CO2f,all-week,evening,2020,all-year,R1,116.74990000000,gasboiler,5,2020 -0,heat,all-week,night,2020,all-year,R1,0.29140000000,gasboiler,0,2025 -1,heat,all-week,night,2020,all-year,R1,0.64110000000,heatpump,0,2025 -0,CO2f,all-week,night,2020,all-year,R1,18.85620000000,gasboiler,0,2025 -0,heat,all-week,morning,2020,all-year,R1,0.43910000000,gasboiler,1,2025 -1,heat,all-week,morning,2020,all-year,R1,0.96610000000,heatpump,1,2025 -0,CO2f,all-week,morning,2020,all-year,R1,28.41710000000,gasboiler,1,2025 -0,heat,all-week,afternoon,2020,all-year,R1,0.29140000000,gasboiler,2,2025 -1,heat,all-week,afternoon,2020,all-year,R1,0.64110000000,heatpump,2,2025 -0,CO2f,all-week,afternoon,2020,all-year,R1,18.85620000000,gasboiler,2,2025 -0,heat,all-week,early-peak,2020,all-year,R1,0.43910000000,gasboiler,3,2025 -1,heat,all-week,early-peak,2020,all-year,R1,0.96610000000,heatpump,3,2025 -0,CO2f,all-week,early-peak,2020,all-year,R1,28.41710000000,gasboiler,3,2025 -0,heat,all-week,late-peak,2020,all-year,R1,0.87830000000,gasboiler,4,2025 -1,heat,all-week,late-peak,2020,all-year,R1,1.93220000000,heatpump,4,2025 -0,CO2f,all-week,late-peak,2020,all-year,R1,56.83430000000,gasboiler,4,2025 -0,heat,all-week,evening,2020,all-year,R1,0.58690000000,gasboiler,5,2025 -1,heat,all-week,evening,2020,all-year,R1,1.29120000000,heatpump,5,2025 -0,CO2f,all-week,evening,2020,all-year,R1,37.97810000000,gasboiler,5,2025 -1,heat,all-week,night,2020,all-year,R1,0.62700000000,heatpump,0,2030 -2,heat,all-week,night,2025,all-year,R1,0.34200000000,heatpump,0,2030 -1,heat,all-week,morning,2020,all-year,R1,0.94490000000,heatpump,1,2030 -2,heat,all-week,morning,2025,all-year,R1,0.51540000000,heatpump,1,2030 -1,heat,all-week,afternoon,2020,all-year,R1,0.62700000000,heatpump,2,2030 -2,heat,all-week,afternoon,2025,all-year,R1,0.34200000000,heatpump,2,2030 -1,heat,all-week,early-peak,2020,all-year,R1,0.94490000000,heatpump,3,2030 -2,heat,all-week,early-peak,2025,all-year,R1,0.51540000000,heatpump,3,2030 -1,heat,all-week,late-peak,2020,all-year,R1,1.88980000000,heatpump,4,2030 -2,heat,all-week,late-peak,2025,all-year,R1,1.03080000000,heatpump,4,2030 -1,heat,all-week,evening,2020,all-year,R1,1.26280000000,heatpump,5,2030 -2,heat,all-week,evening,2025,all-year,R1,0.68880000000,heatpump,5,2030 -2,heat,all-week,night,2025,all-year,R1,0.33210000000,heatpump,0,2035 -3,heat,all-week,night,2030,all-year,R1,0.66420000000,heatpump,0,2035 -2,heat,all-week,morning,2025,all-year,R1,0.50050000000,heatpump,1,2035 -3,heat,all-week,morning,2030,all-year,R1,1.00100000000,heatpump,1,2035 -2,heat,all-week,afternoon,2025,all-year,R1,0.33210000000,heatpump,2,2035 -3,heat,all-week,afternoon,2030,all-year,R1,0.66420000000,heatpump,2,2035 -2,heat,all-week,early-peak,2025,all-year,R1,0.50050000000,heatpump,3,2035 -3,heat,all-week,early-peak,2030,all-year,R1,1.00100000000,heatpump,3,2035 -2,heat,all-week,late-peak,2025,all-year,R1,1.00100000000,heatpump,4,2035 -3,heat,all-week,late-peak,2030,all-year,R1,2.00190000000,heatpump,4,2035 -2,heat,all-week,evening,2025,all-year,R1,0.66890000000,heatpump,5,2035 -3,heat,all-week,evening,2030,all-year,R1,1.33780000000,heatpump,5,2035 -3,heat,all-week,night,2030,all-year,R1,0.68230000000,heatpump,0,2040 -4,heat,all-week,night,2035,all-year,R1,0.34120000000,heatpump,0,2040 -3,heat,all-week,morning,2030,all-year,R1,1.02830000000,heatpump,1,2040 -4,heat,all-week,morning,2035,all-year,R1,0.51420000000,heatpump,1,2040 -3,heat,all-week,afternoon,2030,all-year,R1,0.68230000000,heatpump,2,2040 -4,heat,all-week,afternoon,2035,all-year,R1,0.34120000000,heatpump,2,2040 -3,heat,all-week,early-peak,2030,all-year,R1,1.02830000000,heatpump,3,2040 -4,heat,all-week,early-peak,2035,all-year,R1,0.51420000000,heatpump,3,2040 -3,heat,all-week,late-peak,2030,all-year,R1,2.05660000000,heatpump,4,2040 -4,heat,all-week,late-peak,2035,all-year,R1,1.02830000000,heatpump,4,2040 -3,heat,all-week,evening,2030,all-year,R1,1.37430000000,heatpump,5,2040 -4,heat,all-week,evening,2035,all-year,R1,0.68710000000,heatpump,5,2040 -4,heat,all-week,night,2035,all-year,R1,0.34700000000,heatpump,0,2045 -5,heat,all-week,night,2040,all-year,R1,0.69400000000,heatpump,0,2045 -4,heat,all-week,morning,2035,all-year,R1,0.52300000000,heatpump,1,2045 -5,heat,all-week,morning,2040,all-year,R1,1.04590000000,heatpump,1,2045 -4,heat,all-week,afternoon,2035,all-year,R1,0.34700000000,heatpump,2,2045 -5,heat,all-week,afternoon,2040,all-year,R1,0.69400000000,heatpump,2,2045 -4,heat,all-week,early-peak,2035,all-year,R1,0.52300000000,heatpump,3,2045 -5,heat,all-week,early-peak,2040,all-year,R1,1.04590000000,heatpump,3,2045 -4,heat,all-week,late-peak,2035,all-year,R1,1.04590000000,heatpump,4,2045 -5,heat,all-week,late-peak,2040,all-year,R1,2.09180000000,heatpump,4,2045 -4,heat,all-week,evening,2035,all-year,R1,0.69890000000,heatpump,5,2045 -5,heat,all-week,evening,2040,all-year,R1,1.39780000000,heatpump,5,2045 -5,heat,all-week,night,2040,all-year,R1,0.66850000000,heatpump,0,2050 -6,heat,all-week,night,2045,all-year,R1,0.39000000000,heatpump,0,2050 -5,heat,all-week,morning,2040,all-year,R1,1.00750000000,heatpump,1,2050 -6,heat,all-week,morning,2045,all-year,R1,0.58770000000,heatpump,1,2050 -5,heat,all-week,afternoon,2040,all-year,R1,0.66850000000,heatpump,2,2050 -6,heat,all-week,afternoon,2045,all-year,R1,0.39000000000,heatpump,2,2050 -5,heat,all-week,early-peak,2040,all-year,R1,1.00750000000,heatpump,3,2050 -6,heat,all-week,early-peak,2045,all-year,R1,0.58770000000,heatpump,3,2050 -5,heat,all-week,late-peak,2040,all-year,R1,2.01500000000,heatpump,4,2050 -6,heat,all-week,late-peak,2045,all-year,R1,1.17540000000,heatpump,4,2050 -5,heat,all-week,evening,2040,all-year,R1,1.34650000000,heatpump,5,2050 -6,heat,all-week,evening,2045,all-year,R1,0.78540000000,heatpump,5,2050 diff --git a/docs/tutorial-code/6-add-service-demand/1-exogenous-demand/Results/MCACapacity.csv b/docs/tutorial-code/6-add-service-demand/1-exogenous-demand/Results/MCACapacity.csv new file mode 100644 index 000000000..b80fab80a --- /dev/null +++ b/docs/tutorial-code/6-add-service-demand/1-exogenous-demand/Results/MCACapacity.csv @@ -0,0 +1,73 @@ +agent,capacity,dst_region,installed,region,sector,technology,type,year +A1,10.00000000000,R1,2020,R1,residential,gas_stove,newcapa,2020 +A1,10.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2020 +A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2020 +A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2020 +A1,19.00000000000,R1,2020,R1,residential,electric_stove,newcapa,2025 +A1,5.00000000000,R1,2020,R1,residential,gas_stove,newcapa,2025 +A1,5.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2025 +A1,19.00000000000,R1,2020,R1,residential,heatpump,newcapa,2025 +A1,6.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2025 +A1,24.00000000000,R1,2020,R1,power,windturbine,newcapa,2025 +A1,23.04250000000,R1,2020,R1,gas,gassupply1,newcapa,2025 +A1,19.00000000000,R1,2020,R1,residential,electric_stove,newcapa,2030 +A1,10.00000000000,R1,2025,R1,residential,electric_stove,newcapa,2030 +A1,19.00000000000,R1,2020,R1,residential,heatpump,newcapa,2030 +A1,10.00000000000,R1,2025,R1,residential,heatpump,newcapa,2030 +A1,5.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2030 +A1,11.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2030 +A1,24.00000000000,R1,2020,R1,power,windturbine,newcapa,2030 +A1,15.54250000000,R1,2020,R1,gas,gassupply1,newcapa,2030 +A1,11.17750000000,R1,2025,R1,gas,gassupply1,newcapa,2030 +A1,10.00000000000,R1,2025,R1,residential,electric_stove,newcapa,2035 +A1,26.00000000000,R1,2030,R1,residential,electric_stove,newcapa,2035 +A1,10.00000000000,R1,2025,R1,residential,heatpump,newcapa,2035 +A1,26.00000000000,R1,2030,R1,residential,heatpump,newcapa,2035 +A1,5.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2035 +A1,11.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2035 +A1,24.00000000000,R1,2020,R1,power,windturbine,newcapa,2035 +A1,12.00000000000,R1,2030,R1,power,windturbine,newcapa,2035 +A1,8.04250000000,R1,2020,R1,gas,gassupply1,newcapa,2035 +A1,11.17750000000,R1,2025,R1,gas,gassupply1,newcapa,2035 +A1,7.50000000000,R1,2030,R1,gas,gassupply1,newcapa,2035 +A1,26.00000000000,R1,2030,R1,residential,electric_stove,newcapa,2040 +A1,16.00000000000,R1,2035,R1,residential,electric_stove,newcapa,2040 +A1,26.00000000000,R1,2030,R1,residential,heatpump,newcapa,2040 +A1,16.00000000000,R1,2035,R1,residential,heatpump,newcapa,2040 +A1,5.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2040 +A1,11.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2040 +A1,24.00000000000,R1,2020,R1,power,windturbine,newcapa,2040 +A1,12.00000000000,R1,2030,R1,power,windturbine,newcapa,2040 +A1,11.00000000000,R1,2035,R1,power,windturbine,newcapa,2040 +A1,8.04250000000,R1,2020,R1,gas,gassupply1,newcapa,2040 +A1,11.17750000000,R1,2025,R1,gas,gassupply1,newcapa,2040 +A1,7.50000000000,R1,2030,R1,gas,gassupply1,newcapa,2040 +A1,0.64390000000,R1,2035,R1,gas,gassupply1,newcapa,2040 +A1,16.00000000000,R1,2035,R1,residential,electric_stove,newcapa,2045 +A1,32.00000000000,R1,2040,R1,residential,electric_stove,newcapa,2045 +A1,16.00000000000,R1,2035,R1,residential,heatpump,newcapa,2045 +A1,32.00000000000,R1,2040,R1,residential,heatpump,newcapa,2045 +A1,5.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2045 +A1,11.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2045 +A1,24.00000000000,R1,2020,R1,power,windturbine,newcapa,2045 +A1,12.00000000000,R1,2030,R1,power,windturbine,newcapa,2045 +A1,11.00000000000,R1,2035,R1,power,windturbine,newcapa,2045 +A1,13.00000000000,R1,2040,R1,power,windturbine,newcapa,2045 +A1,8.04250000000,R1,2020,R1,gas,gassupply1,newcapa,2045 +A1,11.17750000000,R1,2025,R1,gas,gassupply1,newcapa,2045 +A1,7.50000000000,R1,2030,R1,gas,gassupply1,newcapa,2045 +A1,0.64390000000,R1,2035,R1,gas,gassupply1,newcapa,2045 +A1,32.00000000000,R1,2040,R1,residential,electric_stove,newcapa,2050 +A1,22.00000000000,R1,2045,R1,residential,electric_stove,newcapa,2050 +A1,32.00000000000,R1,2040,R1,residential,heatpump,newcapa,2050 +A1,22.00000000000,R1,2045,R1,residential,heatpump,newcapa,2050 +A1,5.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2050 +A1,11.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2050 +A1,12.00000000000,R1,2030,R1,power,windturbine,newcapa,2050 +A1,11.00000000000,R1,2035,R1,power,windturbine,newcapa,2050 +A1,13.00000000000,R1,2040,R1,power,windturbine,newcapa,2050 +A1,35.00000000000,R1,2045,R1,power,windturbine,newcapa,2050 +A1,8.04250000000,R1,2020,R1,gas,gassupply1,newcapa,2050 +A1,11.17750000000,R1,2025,R1,gas,gassupply1,newcapa,2050 +A1,7.50000000000,R1,2030,R1,gas,gassupply1,newcapa,2050 +A1,0.64390000000,R1,2035,R1,gas,gassupply1,newcapa,2050 diff --git a/docs/tutorial-code/6-add-service-demand/1-exogenous-demand/Results/MCAPrices.csv b/docs/tutorial-code/6-add-service-demand/1-exogenous-demand/Results/MCAPrices.csv new file mode 100644 index 000000000..89307a3c4 --- /dev/null +++ b/docs/tutorial-code/6-add-service-demand/1-exogenous-demand/Results/MCAPrices.csv @@ -0,0 +1,211 @@ +commodity,day,hour,month,prices,region,timeslice,units_prices,year +electricity,all-week,night,all-year,19.50000000000,R1,0,MUS$2010/PJ,2020 +gas,all-week,night,all-year,7.15280000000,R1,0,MUS$2010/PJ,2020 +heat,all-week,night,all-year,100.00000000000,R1,0,MUS$2010/PJ,2020 +CO2f,all-week,night,all-year,0.08310000000,R1,0,MUS$2010/kt,2020 +cook,all-week,night,all-year,100.00000000000,R1,0,MUS$2010/PJ,2020 +electricity,all-week,morning,all-year,19.50000000000,R1,1,MUS$2010/PJ,2020 +gas,all-week,morning,all-year,7.15280000000,R1,1,MUS$2010/PJ,2020 +heat,all-week,morning,all-year,100.00000000000,R1,1,MUS$2010/PJ,2020 +CO2f,all-week,morning,all-year,0.08310000000,R1,1,MUS$2010/kt,2020 +cook,all-week,morning,all-year,100.00000000000,R1,1,MUS$2010/PJ,2020 +electricity,all-week,afternoon,all-year,19.50000000000,R1,2,MUS$2010/PJ,2020 +gas,all-week,afternoon,all-year,7.15280000000,R1,2,MUS$2010/PJ,2020 +heat,all-week,afternoon,all-year,100.00000000000,R1,2,MUS$2010/PJ,2020 +CO2f,all-week,afternoon,all-year,0.08310000000,R1,2,MUS$2010/kt,2020 +cook,all-week,afternoon,all-year,100.00000000000,R1,2,MUS$2010/PJ,2020 +electricity,all-week,early-peak,all-year,19.50000000000,R1,3,MUS$2010/PJ,2020 +gas,all-week,early-peak,all-year,7.15280000000,R1,3,MUS$2010/PJ,2020 +heat,all-week,early-peak,all-year,100.00000000000,R1,3,MUS$2010/PJ,2020 +CO2f,all-week,early-peak,all-year,0.08310000000,R1,3,MUS$2010/kt,2020 +cook,all-week,early-peak,all-year,100.00000000000,R1,3,MUS$2010/PJ,2020 +electricity,all-week,late-peak,all-year,19.50000000000,R1,4,MUS$2010/PJ,2020 +gas,all-week,late-peak,all-year,7.15280000000,R1,4,MUS$2010/PJ,2020 +heat,all-week,late-peak,all-year,100.00000000000,R1,4,MUS$2010/PJ,2020 +CO2f,all-week,late-peak,all-year,0.08310000000,R1,4,MUS$2010/kt,2020 +cook,all-week,late-peak,all-year,100.00000000000,R1,4,MUS$2010/PJ,2020 +electricity,all-week,evening,all-year,19.50000000000,R1,5,MUS$2010/PJ,2020 +gas,all-week,evening,all-year,7.15280000000,R1,5,MUS$2010/PJ,2020 +heat,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020 +CO2f,all-week,evening,all-year,0.08310000000,R1,5,MUS$2010/kt,2020 +cook,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020 +electricity,all-week,night,all-year,5.47740000000,R1,0,MUS$2010/PJ,2025 +gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,3.67920000000,R1,0,MUS$2010/PJ,2025 +CO2f,all-week,night,all-year,0.12010000000,R1,0,MUS$2010/kt,2025 +cook,all-week,night,all-year,3.31120000000,R1,0,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,5.47740000000,R1,1,MUS$2010/PJ,2025 +gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,3.67920000000,R1,1,MUS$2010/PJ,2025 +CO2f,all-week,morning,all-year,0.12010000000,R1,1,MUS$2010/kt,2025 +cook,all-week,morning,all-year,3.31120000000,R1,1,MUS$2010/PJ,2025 +electricity,all-week,afternoon,all-year,5.47740000000,R1,2,MUS$2010/PJ,2025 +gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2025 +heat,all-week,afternoon,all-year,3.67920000000,R1,2,MUS$2010/PJ,2025 +CO2f,all-week,afternoon,all-year,0.12010000000,R1,2,MUS$2010/kt,2025 +cook,all-week,afternoon,all-year,3.31120000000,R1,2,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,5.47740000000,R1,3,MUS$2010/PJ,2025 +gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,3.67920000000,R1,3,MUS$2010/PJ,2025 +CO2f,all-week,early-peak,all-year,0.12010000000,R1,3,MUS$2010/kt,2025 +cook,all-week,early-peak,all-year,3.31120000000,R1,3,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,5.47740000000,R1,4,MUS$2010/PJ,2025 +gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,3.67920000000,R1,4,MUS$2010/PJ,2025 +CO2f,all-week,late-peak,all-year,0.12010000000,R1,4,MUS$2010/kt,2025 +cook,all-week,late-peak,all-year,3.31120000000,R1,4,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,5.47740000000,R1,5,MUS$2010/PJ,2025 +gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,3.67920000000,R1,5,MUS$2010/PJ,2025 +CO2f,all-week,evening,all-year,0.12010000000,R1,5,MUS$2010/kt,2025 +cook,all-week,evening,all-year,3.31120000000,R1,5,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,10.04900000000,R1,0,MUS$2010/PJ,2030 +gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,4.26010000000,R1,0,MUS$2010/PJ,2030 +CO2f,all-week,night,all-year,0.15700000000,R1,0,MUS$2010/kt,2030 +cook,all-week,night,all-year,4.26010000000,R1,0,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,10.04900000000,R1,1,MUS$2010/PJ,2030 +gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,4.26010000000,R1,1,MUS$2010/PJ,2030 +CO2f,all-week,morning,all-year,0.15700000000,R1,1,MUS$2010/kt,2030 +cook,all-week,morning,all-year,4.26010000000,R1,1,MUS$2010/PJ,2030 +electricity,all-week,afternoon,all-year,10.04900000000,R1,2,MUS$2010/PJ,2030 +gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,4.26010000000,R1,2,MUS$2010/PJ,2030 +CO2f,all-week,afternoon,all-year,0.15700000000,R1,2,MUS$2010/kt,2030 +cook,all-week,afternoon,all-year,4.26010000000,R1,2,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,10.04900000000,R1,3,MUS$2010/PJ,2030 +gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,4.26010000000,R1,3,MUS$2010/PJ,2030 +CO2f,all-week,early-peak,all-year,0.15700000000,R1,3,MUS$2010/kt,2030 +cook,all-week,early-peak,all-year,4.26010000000,R1,3,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,10.04900000000,R1,4,MUS$2010/PJ,2030 +gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,4.26010000000,R1,4,MUS$2010/PJ,2030 +CO2f,all-week,late-peak,all-year,0.15700000000,R1,4,MUS$2010/kt,2030 +cook,all-week,late-peak,all-year,4.26010000000,R1,4,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,10.04900000000,R1,5,MUS$2010/PJ,2030 +gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,4.26010000000,R1,5,MUS$2010/PJ,2030 +CO2f,all-week,evening,all-year,0.15700000000,R1,5,MUS$2010/kt,2030 +cook,all-week,evening,all-year,4.26010000000,R1,5,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,11.30490000000,R1,0,MUS$2010/PJ,2035 +gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,4.76250000000,R1,0,MUS$2010/PJ,2035 +CO2f,all-week,night,all-year,0.21490000000,R1,0,MUS$2010/kt,2035 +cook,all-week,night,all-year,4.76250000000,R1,0,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,11.30490000000,R1,1,MUS$2010/PJ,2035 +gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,4.76250000000,R1,1,MUS$2010/PJ,2035 +CO2f,all-week,morning,all-year,0.21490000000,R1,1,MUS$2010/kt,2035 +cook,all-week,morning,all-year,4.76250000000,R1,1,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,11.30490000000,R1,2,MUS$2010/PJ,2035 +gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,4.76250000000,R1,2,MUS$2010/PJ,2035 +CO2f,all-week,afternoon,all-year,0.21490000000,R1,2,MUS$2010/kt,2035 +cook,all-week,afternoon,all-year,4.76250000000,R1,2,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,11.30490000000,R1,3,MUS$2010/PJ,2035 +gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,4.76250000000,R1,3,MUS$2010/PJ,2035 +CO2f,all-week,early-peak,all-year,0.21490000000,R1,3,MUS$2010/kt,2035 +cook,all-week,early-peak,all-year,4.76250000000,R1,3,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,11.30490000000,R1,4,MUS$2010/PJ,2035 +gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,4.76250000000,R1,4,MUS$2010/PJ,2035 +CO2f,all-week,late-peak,all-year,0.21490000000,R1,4,MUS$2010/kt,2035 +cook,all-week,late-peak,all-year,4.76250000000,R1,4,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,11.30490000000,R1,5,MUS$2010/PJ,2035 +gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,4.76250000000,R1,5,MUS$2010/PJ,2035 +CO2f,all-week,evening,all-year,0.21490000000,R1,5,MUS$2010/kt,2035 +cook,all-week,evening,all-year,4.76250000000,R1,5,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,12.32880000000,R1,0,MUS$2010/PJ,2040 +gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,5.17200000000,R1,0,MUS$2010/PJ,2040 +CO2f,all-week,night,all-year,0.27280000000,R1,0,MUS$2010/kt,2040 +cook,all-week,night,all-year,5.17200000000,R1,0,MUS$2010/PJ,2040 +electricity,all-week,morning,all-year,12.32880000000,R1,1,MUS$2010/PJ,2040 +gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,5.17200000000,R1,1,MUS$2010/PJ,2040 +CO2f,all-week,morning,all-year,0.27280000000,R1,1,MUS$2010/kt,2040 +cook,all-week,morning,all-year,5.17200000000,R1,1,MUS$2010/PJ,2040 +electricity,all-week,afternoon,all-year,12.32880000000,R1,2,MUS$2010/PJ,2040 +gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2040 +heat,all-week,afternoon,all-year,5.17200000000,R1,2,MUS$2010/PJ,2040 +CO2f,all-week,afternoon,all-year,0.27280000000,R1,2,MUS$2010/kt,2040 +cook,all-week,afternoon,all-year,5.17200000000,R1,2,MUS$2010/PJ,2040 +electricity,all-week,early-peak,all-year,12.32880000000,R1,3,MUS$2010/PJ,2040 +gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,5.17200000000,R1,3,MUS$2010/PJ,2040 +CO2f,all-week,early-peak,all-year,0.27280000000,R1,3,MUS$2010/kt,2040 +cook,all-week,early-peak,all-year,5.17200000000,R1,3,MUS$2010/PJ,2040 +electricity,all-week,late-peak,all-year,12.32880000000,R1,4,MUS$2010/PJ,2040 +gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,5.17200000000,R1,4,MUS$2010/PJ,2040 +CO2f,all-week,late-peak,all-year,0.27280000000,R1,4,MUS$2010/kt,2040 +cook,all-week,late-peak,all-year,5.17200000000,R1,4,MUS$2010/PJ,2040 +electricity,all-week,evening,all-year,12.32880000000,R1,5,MUS$2010/PJ,2040 +gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,5.17200000000,R1,5,MUS$2010/PJ,2040 +CO2f,all-week,evening,all-year,0.27280000000,R1,5,MUS$2010/kt,2040 +cook,all-week,evening,all-year,5.17200000000,R1,5,MUS$2010/PJ,2040 +electricity,all-week,night,all-year,13.67600000000,R1,0,MUS$2010/PJ,2045 +gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2045 +heat,all-week,night,all-year,5.71090000000,R1,0,MUS$2010/PJ,2045 +CO2f,all-week,night,all-year,0.35390000000,R1,0,MUS$2010/kt,2045 +cook,all-week,night,all-year,5.71090000000,R1,0,MUS$2010/PJ,2045 +electricity,all-week,morning,all-year,13.67600000000,R1,1,MUS$2010/PJ,2045 +gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2045 +heat,all-week,morning,all-year,5.71090000000,R1,1,MUS$2010/PJ,2045 +CO2f,all-week,morning,all-year,0.35390000000,R1,1,MUS$2010/kt,2045 +cook,all-week,morning,all-year,5.71090000000,R1,1,MUS$2010/PJ,2045 +electricity,all-week,afternoon,all-year,13.67600000000,R1,2,MUS$2010/PJ,2045 +gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2045 +heat,all-week,afternoon,all-year,5.71090000000,R1,2,MUS$2010/PJ,2045 +CO2f,all-week,afternoon,all-year,0.35390000000,R1,2,MUS$2010/kt,2045 +cook,all-week,afternoon,all-year,5.71090000000,R1,2,MUS$2010/PJ,2045 +electricity,all-week,early-peak,all-year,13.67600000000,R1,3,MUS$2010/PJ,2045 +gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2045 +heat,all-week,early-peak,all-year,5.71090000000,R1,3,MUS$2010/PJ,2045 +CO2f,all-week,early-peak,all-year,0.35390000000,R1,3,MUS$2010/kt,2045 +cook,all-week,early-peak,all-year,5.71090000000,R1,3,MUS$2010/PJ,2045 +electricity,all-week,late-peak,all-year,13.67600000000,R1,4,MUS$2010/PJ,2045 +gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2045 +heat,all-week,late-peak,all-year,5.71090000000,R1,4,MUS$2010/PJ,2045 +CO2f,all-week,late-peak,all-year,0.35390000000,R1,4,MUS$2010/kt,2045 +cook,all-week,late-peak,all-year,5.71090000000,R1,4,MUS$2010/PJ,2045 +electricity,all-week,evening,all-year,13.67600000000,R1,5,MUS$2010/PJ,2045 +gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2045 +heat,all-week,evening,all-year,5.71090000000,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.71090000000,R1,5,MUS$2010/PJ,2045 +electricity,all-week,night,all-year,14.94550000000,R1,0,MUS$2010/PJ,2050 +gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,6.21870000000,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,6.21870000000,R1,0,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,14.94550000000,R1,1,MUS$2010/PJ,2050 +gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,6.21870000000,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,6.21870000000,R1,1,MUS$2010/PJ,2050 +electricity,all-week,afternoon,all-year,14.94550000000,R1,2,MUS$2010/PJ,2050 +gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,6.21870000000,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,6.21870000000,R1,2,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,14.94550000000,R1,3,MUS$2010/PJ,2050 +gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,6.21870000000,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,6.21870000000,R1,3,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,14.94550000000,R1,4,MUS$2010/PJ,2050 +gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,6.21870000000,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,6.21870000000,R1,4,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,14.94550000000,R1,5,MUS$2010/PJ,2050 +gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,6.21870000000,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,6.21870000000,R1,5,MUS$2010/PJ,2050 diff --git a/docs/tutorial-code/6-add-service-demand/1-exogenous-demand/input/BaseYearExport.csv b/docs/tutorial-code/6-add-service-demand/1-exogenous-demand/input/BaseYearExport.csv new file mode 100644 index 000000000..0d6165908 --- /dev/null +++ b/docs/tutorial-code/6-add-service-demand/1-exogenous-demand/input/BaseYearExport.csv @@ -0,0 +1,21 @@ +RegionName,Attribute,Time,electricity,gas,heat,CO2f,wind,cook +Unit,-,Year,PJ,PJ,PJ,kt,PJ,PJ +R1,Exports,2010,0,0,0,0,0,0 +R1,Exports,2015,0,0,0,0,0,0 +R1,Exports,2020,0,0,0,0,0,0 +R1,Exports,2025,0,0,0,0,0,0 +R1,Exports,2030,0,0,0,0,0,0 +R1,Exports,2035,0,0,0,0,0,0 +R1,Exports,2040,0,0,0,0,0,0 +R1,Exports,2045,0,0,0,0,0,0 +R1,Exports,2050,0,0,0,0,0,0 +R1,Exports,2055,0,0,0,0,0,0 +R1,Exports,2060,0,0,0,0,0,0 +R1,Exports,2065,0,0,0,0,0,0 +R1,Exports,2070,0,0,0,0,0,0 +R1,Exports,2075,0,0,0,0,0,0 +R1,Exports,2080,0,0,0,0,0,0 +R1,Exports,2085,0,0,0,0,0,0 +R1,Exports,2090,0,0,0,0,0,0 +R1,Exports,2095,0,0,0,0,0,0 +R1,Exports,2100,0,0,0,0,0,0 diff --git a/docs/tutorial-code/6-add-service-demand/1-exogenous-demand/input/BaseYearImport.csv b/docs/tutorial-code/6-add-service-demand/1-exogenous-demand/input/BaseYearImport.csv new file mode 100644 index 000000000..9cda51eed --- /dev/null +++ b/docs/tutorial-code/6-add-service-demand/1-exogenous-demand/input/BaseYearImport.csv @@ -0,0 +1,21 @@ +RegionName,Attribute,Time,electricity,gas,heat,CO2f,wind,cook +Unit,-,Year,PJ,PJ,PJ,kt,PJ,PJ +R1,Imports,2010,0,0,0,0,0,0 +R1,Imports,2015,0,0,0,0,0,0 +R1,Imports,2020,0,0,0,0,0,0 +R1,Imports,2025,0,0,0,0,0,0 +R1,Imports,2030,0,0,0,0,0,0 +R1,Imports,2035,0,0,0,0,0,0 +R1,Imports,2040,0,0,0,0,0,0 +R1,Imports,2045,0,0,0,0,0,0 +R1,Imports,2050,0,0,0,0,0,0 +R1,Imports,2055,0,0,0,0,0,0 +R1,Imports,2060,0,0,0,0,0,0 +R1,Imports,2065,0,0,0,0,0,0 +R1,Imports,2070,0,0,0,0,0,0 +R1,Imports,2075,0,0,0,0,0,0 +R1,Imports,2080,0,0,0,0,0,0 +R1,Imports,2085,0,0,0,0,0,0 +R1,Imports,2090,0,0,0,0,0,0 +R1,Imports,2095,0,0,0,0,0,0 +R1,Imports,2100,0,0,0,0,0,0 diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/input/GlobalCommodities.csv b/docs/tutorial-code/6-add-service-demand/1-exogenous-demand/input/GlobalCommodities.csv similarity index 90% rename from docs/tutorial-code/5-add-service-demand/1-exogenous-demand/input/GlobalCommodities.csv rename to docs/tutorial-code/6-add-service-demand/1-exogenous-demand/input/GlobalCommodities.csv index aea518c65..0eb1a5b3b 100644 --- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/input/GlobalCommodities.csv +++ b/docs/tutorial-code/6-add-service-demand/1-exogenous-demand/input/GlobalCommodities.csv @@ -4,5 +4,4 @@ Gas,Energy,gas,56.1,1,PJ Heat,Energy,heat,0.0,1,PJ Wind,Energy,wind,0.0,1,PJ CO2fuelcomsbustion,Environmental,CO2f,0.0,1,kt -Solar,Energy,solar,0.0,1,PJ Cook,Energy,cook,0.0,1,PJ diff --git a/docs/tutorial-code/6-add-service-demand/1-exogenous-demand/input/Projections.csv b/docs/tutorial-code/6-add-service-demand/1-exogenous-demand/input/Projections.csv new file mode 100644 index 000000000..4fc02cb49 --- /dev/null +++ b/docs/tutorial-code/6-add-service-demand/1-exogenous-demand/input/Projections.csv @@ -0,0 +1,21 @@ +RegionName,Attribute,Time,electricity,gas,heat,CO2f,wind,cook +Unit,-,Year,MUS$2010/PJ,MUS$2010/PJ,MUS$2010/PJ,MUS$2010/kt,MUS$2010/kt,MUS$2010/PJ +R1,CommodityPrice,2010,14.81481472,6.6759,100,0,0,100 +R1,CommodityPrice,2015,17.89814806,6.914325,100,0.052913851,0,100 +R1,CommodityPrice,2020,19.5,7.15275,100,0.08314119,0,100 +R1,CommodityPrice,2025,21.93518528,8.10645,100,0.120069795,0,100 +R1,CommodityPrice,2030,26.50925917,9.06015,100,0.156998399,0,100 +R1,CommodityPrice,2035,26.51851861,9.2191,100,0.214877567,0,100 +R1,CommodityPrice,2040,23.85185194,9.37805,100,0.272756734,0,100 +R1,CommodityPrice,2045,23.97222222,9.193829337,100,0.35394801,0,100 +R1,CommodityPrice,2050,24.06481472,9.009608674,100,0.435139285,0,100 +R1,CommodityPrice,2055,25.3425925,8.832625604,100,0.542365578,0,100 +R1,CommodityPrice,2060,25.53703694,8.655642534,100,0.649591871,0,100 +R1,CommodityPrice,2065,25.32407417,8.485612708,100,0.780892624,0,100 +R1,CommodityPrice,2070,23.36111111,8.315582883,100,0.912193378,0,100 +R1,CommodityPrice,2075,22.27777778,8.152233126,100,1.078321687,0,100 +R1,CommodityPrice,2080,22.25925917,7.988883368,100,1.244449995,0,100 +R1,CommodityPrice,2085,22.17592583,7.831951236,100,1.4253503,0,100 +R1,CommodityPrice,2090,22.03703694,7.675019103,100,1.606250604,0,100 +R1,CommodityPrice,2095,21.94444444,7.524252461,100,1.73877515,0,100 +R1,CommodityPrice,2100,21.39814806,7.373485819,100,1.871299697,0,100 diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/settings.toml b/docs/tutorial-code/6-add-service-demand/1-exogenous-demand/settings.toml similarity index 76% rename from docs/tutorial-code/5-add-service-demand/1-exogenous-demand/settings.toml rename to docs/tutorial-code/6-add-service-demand/1-exogenous-demand/settings.toml index c6580ca28..65f5261dc 100644 --- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/settings.toml +++ b/docs/tutorial-code/6-add-service-demand/1-exogenous-demand/settings.toml @@ -2,11 +2,11 @@ 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"] +regions = ["R1"] interest_rate = 0.1 interpolation_mode = 'Active' log_level = 'info' -excluded_commodities = ["wind", "solar"] +excluded_commodities = ["wind"] # Convergence parameters equilibrium_variable = 'demand' maximum_iterations = 100 @@ -14,12 +14,12 @@ tolerance = 0.1 tolerance_unmet_demand = -0.1 [[outputs]] -quantity = "prices" +quantity = "capacity" sink = "aggregate" filename = "{cwd}/{default_output_dir}/MCA{Quantity}.csv" [[outputs]] -quantity = "capacity" +quantity = "prices" sink = "aggregate" filename = "{cwd}/{default_output_dir}/MCA{Quantity}.csv" @@ -55,18 +55,6 @@ constraints = [ demand_share = "standard_demand" # Optional, default to standard_demand forecast = 5 # Optional, defaults to 5 -[[sectors.residential.outputs]] -filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}.csv' -quantity = "capacity" -sink = 'aggregate' - -[[sectors.residential.outputs]] -filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}.csv' -sink = 'aggregate' -quantity.name = "supply" -quantity.sum_over = "timeslice" -quantity.drop = ["comm_usage", "units_prices"] - [sectors.power] type = 'default' priority = 2 @@ -81,11 +69,6 @@ existing_capacity = '{path}/technodata/power/ExistingCapacity.csv' lpsolver = "scipy" demand_share = "standard_demand" -[[sectors.power.outputs]] -filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}.csv' -quantity = "capacity" -sink = 'aggregate' - [sectors.gas] type = 'default' priority = 3 @@ -100,11 +83,6 @@ existing_capacity = '{path}/technodata/gas/ExistingCapacity.csv' lpsolver = "scipy" demand_share = "standard_demand" -[[sectors.gas.outputs]] -filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}.csv' -quantity = "capacity" -sink = 'aggregate' - [sectors.residential_presets] type = 'presets' priority = 0 @@ -114,11 +92,9 @@ consumption_path = "{path}/technodata/preset/*Consumption.csv" level_names = ["month", "day", "hour"] [timeslices.all-year.all-week] -night = 1095 -morning = 1095 -mid-afternoon = 1095 -early-peak = 1095 -late-peak = 1095 -evening = 1095 -early-morning = 1095 -late-afternoon = 1095 +night = 1460 +morning = 1460 +afternoon = 1460 +early-peak = 1460 +late-peak = 1460 +evening = 1460 diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/technodata/Agents.csv b/docs/tutorial-code/6-add-service-demand/1-exogenous-demand/technodata/Agents.csv similarity index 100% rename from docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/technodata/Agents.csv rename to docs/tutorial-code/6-add-service-demand/1-exogenous-demand/technodata/Agents.csv diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/technodata/gas/CommIn.csv b/docs/tutorial-code/6-add-service-demand/1-exogenous-demand/technodata/gas/CommIn.csv similarity index 100% rename from docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/technodata/gas/CommIn.csv rename to docs/tutorial-code/6-add-service-demand/1-exogenous-demand/technodata/gas/CommIn.csv diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/technodata/gas/CommOut.csv b/docs/tutorial-code/6-add-service-demand/1-exogenous-demand/technodata/gas/CommOut.csv similarity index 100% rename from docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/technodata/gas/CommOut.csv rename to docs/tutorial-code/6-add-service-demand/1-exogenous-demand/technodata/gas/CommOut.csv diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/technodata/gas/ExistingCapacity.csv b/docs/tutorial-code/6-add-service-demand/1-exogenous-demand/technodata/gas/ExistingCapacity.csv similarity index 100% rename from docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/technodata/gas/ExistingCapacity.csv rename to docs/tutorial-code/6-add-service-demand/1-exogenous-demand/technodata/gas/ExistingCapacity.csv diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/technodata/gas/Technodata.csv b/docs/tutorial-code/6-add-service-demand/1-exogenous-demand/technodata/gas/Technodata.csv similarity index 78% rename from docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/technodata/gas/Technodata.csv rename to docs/tutorial-code/6-add-service-demand/1-exogenous-demand/technodata/gas/Technodata.csv index 484a19533..f7f3120d1 100644 --- a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/technodata/gas/Technodata.csv +++ b/docs/tutorial-code/6-add-service-demand/1-exogenous-demand/technodata/gas/Technodata.csv @@ -1,3 +1,3 @@ ProcessName,RegionName,Time,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent1 Unit,-,Year,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,New -gassupply1,R1,2020,0,1,0,1,2.55,1,50,10,600,35,0.9,0.00000189,86,0.1,energy,gas,gas,1 +gassupply1,R1,2020,0,1,0,1,2.55,1,10,1,100,35,0.9,0.00000189,86,0.1,energy,gas,gas,1 diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/technodata/power/CommIn.csv b/docs/tutorial-code/6-add-service-demand/1-exogenous-demand/technodata/power/CommIn.csv similarity index 100% rename from docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/technodata/power/CommIn.csv rename to docs/tutorial-code/6-add-service-demand/1-exogenous-demand/technodata/power/CommIn.csv diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/technodata/power/CommOut.csv b/docs/tutorial-code/6-add-service-demand/1-exogenous-demand/technodata/power/CommOut.csv similarity index 100% rename from docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/technodata/power/CommOut.csv rename to docs/tutorial-code/6-add-service-demand/1-exogenous-demand/technodata/power/CommOut.csv diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/technodata/power/ExistingCapacity.csv b/docs/tutorial-code/6-add-service-demand/1-exogenous-demand/technodata/power/ExistingCapacity.csv similarity index 100% rename from docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/technodata/power/ExistingCapacity.csv rename to docs/tutorial-code/6-add-service-demand/1-exogenous-demand/technodata/power/ExistingCapacity.csv diff --git a/docs/tutorial-code/6-add-service-demand/1-exogenous-demand/technodata/power/Technodata.csv b/docs/tutorial-code/6-add-service-demand/1-exogenous-demand/technodata/power/Technodata.csv new file mode 100644 index 000000000..a23d8d32e --- /dev/null +++ b/docs/tutorial-code/6-add-service-demand/1-exogenous-demand/technodata/power/Technodata.csv @@ -0,0 +1,4 @@ +ProcessName,RegionName,Time,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent1 +Unit,-,Year,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,New +gasCCGT,R1,2020,23.78234399,1,0,1,0,1,10,1,100,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1 +windturbine,R1,2020,36.30771182,1,0,1,0,1,10,1,100,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1 diff --git a/docs/tutorial-code/6-add-service-demand/1-exogenous-demand/technodata/preset/Residential2020Consumption.csv b/docs/tutorial-code/6-add-service-demand/1-exogenous-demand/technodata/preset/Residential2020Consumption.csv new file mode 100644 index 000000000..17be15868 --- /dev/null +++ b/docs/tutorial-code/6-add-service-demand/1-exogenous-demand/technodata/preset/Residential2020Consumption.csv @@ -0,0 +1,7 @@ +RegionName,Timeslice,electricity,gas,heat,CO2f,wind,cook +R1,1,0,0,1.0,0,0,1.0 +R1,2,0,0,1.5,0,0,1.5 +R1,3,0,0,1.0,0,0,1.0 +R1,4,0,0,1.5,0,0,1.5 +R1,5,0,0,3.0,0,0,3.0 +R1,6,0,0,2.0,0,0,2.0 diff --git a/docs/tutorial-code/6-add-service-demand/1-exogenous-demand/technodata/preset/Residential2050Consumption.csv b/docs/tutorial-code/6-add-service-demand/1-exogenous-demand/technodata/preset/Residential2050Consumption.csv new file mode 100644 index 000000000..4533f5dd1 --- /dev/null +++ b/docs/tutorial-code/6-add-service-demand/1-exogenous-demand/technodata/preset/Residential2050Consumption.csv @@ -0,0 +1,7 @@ +RegionName,Timeslice,electricity,gas,heat,CO2f,wind,cook +R1,1,0,0,3.0,0,0,3.0 +R1,2,0,0,4.5,0,0,4.5 +R1,3,0,0,3.0,0,0,3.0 +R1,4,0,0,4.5,0,0,4.5 +R1,5,0,0,9.0,0,0,9.0 +R1,6,0,0,6.0,0,0,6.0 diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/residential/CommIn.csv b/docs/tutorial-code/6-add-service-demand/1-exogenous-demand/technodata/residential/CommIn.csv similarity index 63% rename from docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/residential/CommIn.csv rename to docs/tutorial-code/6-add-service-demand/1-exogenous-demand/technodata/residential/CommIn.csv index 5653886c0..3ddabc934 100644 --- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/residential/CommIn.csv +++ b/docs/tutorial-code/6-add-service-demand/1-exogenous-demand/technodata/residential/CommIn.csv @@ -2,9 +2,5 @@ ProcessName,RegionName,Time,Level,electricity,gas,heat,CO2f,wind,cook Unit,-,Year,-,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ,PJ/PJ gasboiler,R1,2020,fixed,0,1.16,0,0,0,0 heatpump,R1,2020,fixed,0.4,0,0,0,0,0 -gasboiler,R2,2020,fixed,0,1.16,0,0,0,0 -heatpump,R2,2020,fixed,0.4,0,0,0,0,0 electric_stove,R1,2020,fixed,0.4,0,0,0,0,0 -electric_stove,R2,2020,fixed,0.4,0,0,0,0,0 gas_stove,R1,2020,fixed,0,1.16,0,0,0,0 -gas_stove,R2,2020,fixed,0,1.16,0,0,0,0 diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/residential/CommOut.csv b/docs/tutorial-code/6-add-service-demand/1-exogenous-demand/technodata/residential/CommOut.csv similarity index 65% rename from docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/residential/CommOut.csv rename to docs/tutorial-code/6-add-service-demand/1-exogenous-demand/technodata/residential/CommOut.csv index 8ce7a0dfa..775f682dd 100644 --- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/residential/CommOut.csv +++ b/docs/tutorial-code/6-add-service-demand/1-exogenous-demand/technodata/residential/CommOut.csv @@ -2,9 +2,5 @@ ProcessName,RegionName,Time,electricity,gas,heat,CO2f,wind,cook Unit,-,Year,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ,PJ/PJ gasboiler,R1,2020,0,0,1,64.71,0,0 heatpump,R1,2020,0,0,1,0,0,0 -gasboiler,R2,2020,0,0,1,64.71,0,0 -heatpump,R2,2020,0,0,1,0,0,0 electric_stove,R1,2020,0,0,0,0,0,1 -electric_stove,R2,2020,0,0,0,0,0,1 gas_stove,R1,2020,0,0,0,50,0,1 -gas_stove,R2,2020,0,0,0,50,0,1 diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/residential/ExistingCapacity.csv b/docs/tutorial-code/6-add-service-demand/1-exogenous-demand/technodata/residential/ExistingCapacity.csv similarity index 59% rename from docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/residential/ExistingCapacity.csv rename to docs/tutorial-code/6-add-service-demand/1-exogenous-demand/technodata/residential/ExistingCapacity.csv index 5ade79dc0..4ae98ff05 100644 --- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/residential/ExistingCapacity.csv +++ b/docs/tutorial-code/6-add-service-demand/1-exogenous-demand/technodata/residential/ExistingCapacity.csv @@ -1,9 +1,5 @@ ProcessName,RegionName,Unit,2020,2025,2030,2035,2040,2045,2050 gasboiler,R1,PJ/y,10,5,0,0,0,0,0 heatpump,R1,PJ/y,0,0,0,0,0,0,0 -gasboiler,R2,PJ/y,10,5,0,0,0,0,0 -heatpump,R2,PJ/y,0,0,0,0,0,0,0 electric_stove,R1,PJ/y,0,0,0,0,0,0,0 -electric_stove,R2,PJ/y,0,0,0,0,0,0,0 gas_stove,R1,PJ/y,10,5,0,0,0,0,0 -gas_stove,R2,PJ/y,10,5,0,0,0,0,0 diff --git a/docs/tutorial-code/6-add-service-demand/1-exogenous-demand/technodata/residential/Technodata.csv b/docs/tutorial-code/6-add-service-demand/1-exogenous-demand/technodata/residential/Technodata.csv new file mode 100644 index 000000000..03f00b936 --- /dev/null +++ b/docs/tutorial-code/6-add-service-demand/1-exogenous-demand/technodata/residential/Technodata.csv @@ -0,0 +1,6 @@ +ProcessName,RegionName,Time,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent1 +Unit,-,Year,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,New +gasboiler,R1,2020,3.8,1,0,1,0,1,10,1,100,10,1,0.00000189,86,0.1,energy,gas,heat,1 +heatpump,R1,2020,8.866667,1,0,1,0,1,10,1,100,10,1,0.00000189,86,0.1,energy,electricity,heat,1 +electric_stove,R1,2020,8.866667,1,0,1,0,1,10,1,100,10,1,0.00000189,86,0.1,energy,electricity,cook,1 +gas_stove,R1,2020,3.8,1,0,1,0,1,10,1,100,10,1,0.00000189,86,0.1,energy,gas,cook,1 diff --git a/docs/tutorial-code/5-add-service-demand/generate_models.py b/docs/tutorial-code/6-add-service-demand/generate_models.py similarity index 70% rename from docs/tutorial-code/5-add-service-demand/generate_models.py rename to docs/tutorial-code/6-add-service-demand/generate_models.py index 38f4428f9..635b629a1 100644 --- a/docs/tutorial-code/5-add-service-demand/generate_models.py +++ b/docs/tutorial-code/6-add-service-demand/generate_models.py @@ -1,8 +1,10 @@ +import os import shutil from pathlib import Path import pandas as pd +from muse import examples from muse.wizard import add_new_commodity, add_new_process parent_path = Path(__file__).parent @@ -19,13 +21,9 @@ def generate_model_1(): if model_path.exists(): shutil.rmtree(model_path) - # Starting point: copy model from tutorial 4 - shutil.copytree( - parent_path / "../4-modify-timing-data/1-modify-timeslices", - model_path, - ) - if (model_path / "Results").exists(): - shutil.rmtree(model_path / "Results") + # Starting point: copy default model + examples.copy_model(name="default", path=parent_path, overwrite=True) + os.rename(parent_path / "model", model_path) # Copy gas commodity in power sector -> cook add_new_commodity(model_path, "cook", "residential", "heat") @@ -63,17 +61,6 @@ def generate_model_1(): df.loc[df["ProcessName"] == "electric_stove", "EndUse"] = "cook" df.to_csv(technodata_file, index=False) - # Increase capacity limits in power sector - technodata_file = model_path / "technodata/power/Technodata.csv" - df = pd.read_csv(technodata_file) - df.loc[1:, "MaxCapacityAddition"] = pd.to_numeric(df.loc[1:, "MaxCapacityAddition"]) - df.loc[1:, "MaxCapacityAddition"] *= 2 - df.loc[1:, "MaxCapacityGrowth"] = pd.to_numeric(df.loc[1:, "MaxCapacityGrowth"]) - df.loc[1:, "MaxCapacityGrowth"] *= 2 - df.loc[1:, "TotalCapacityLimit"] = pd.to_numeric(df.loc[1:, "TotalCapacityLimit"]) - df.loc[1:, "TotalCapacityLimit"] *= 2 - df.to_csv(technodata_file, index=False) - if __name__ == "__main__": generate_model_1() diff --git a/docs/tutorial-code/5-add-service-demand/visualise-service-demand-addition.ipynb b/docs/tutorial-code/6-add-service-demand/visualise-service-demand-addition.ipynb similarity index 100% rename from docs/tutorial-code/5-add-service-demand/visualise-service-demand-addition.ipynb rename to docs/tutorial-code/6-add-service-demand/visualise-service-demand-addition.ipynb diff --git a/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/MCACapacity.csv b/docs/tutorial-code/7-add-correlation-demand/1-correlation/Results/MCACapacity.csv similarity index 100% rename from docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/MCACapacity.csv rename to docs/tutorial-code/7-add-correlation-demand/1-correlation/Results/MCACapacity.csv diff --git a/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/MCAPrices.csv b/docs/tutorial-code/7-add-correlation-demand/1-correlation/Results/MCAPrices.csv similarity index 100% rename from docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/MCAPrices.csv rename to docs/tutorial-code/7-add-correlation-demand/1-correlation/Results/MCAPrices.csv diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/input/BaseYearExport.csv b/docs/tutorial-code/7-add-correlation-demand/1-correlation/input/BaseYearExport.csv similarity index 100% rename from docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/input/BaseYearExport.csv rename to docs/tutorial-code/7-add-correlation-demand/1-correlation/input/BaseYearExport.csv diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/input/BaseYearImport.csv b/docs/tutorial-code/7-add-correlation-demand/1-correlation/input/BaseYearImport.csv similarity index 100% rename from docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/input/BaseYearImport.csv rename to docs/tutorial-code/7-add-correlation-demand/1-correlation/input/BaseYearImport.csv diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/input/GlobalCommodities.csv b/docs/tutorial-code/7-add-correlation-demand/1-correlation/input/GlobalCommodities.csv similarity index 100% rename from docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/input/GlobalCommodities.csv rename to docs/tutorial-code/7-add-correlation-demand/1-correlation/input/GlobalCommodities.csv diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/input/Projections.csv b/docs/tutorial-code/7-add-correlation-demand/1-correlation/input/Projections.csv similarity index 100% rename from docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/input/Projections.csv rename to docs/tutorial-code/7-add-correlation-demand/1-correlation/input/Projections.csv diff --git a/docs/tutorial-code/6-add-correlation-demand/1-correlation/settings.toml b/docs/tutorial-code/7-add-correlation-demand/1-correlation/settings.toml similarity index 82% rename from docs/tutorial-code/6-add-correlation-demand/1-correlation/settings.toml rename to docs/tutorial-code/7-add-correlation-demand/1-correlation/settings.toml index f7dcccce2..6c401f43a 100644 --- a/docs/tutorial-code/6-add-correlation-demand/1-correlation/settings.toml +++ b/docs/tutorial-code/7-add-correlation-demand/1-correlation/settings.toml @@ -14,12 +14,12 @@ tolerance = 0.1 tolerance_unmet_demand = -0.1 [[outputs]] -quantity = "prices" +quantity = "capacity" sink = "aggregate" filename = "{cwd}/{default_output_dir}/MCA{Quantity}.csv" [[outputs]] -quantity = "capacity" +quantity = "prices" sink = "aggregate" filename = "{cwd}/{default_output_dir}/MCA{Quantity}.csv" @@ -55,18 +55,6 @@ constraints = [ demand_share = "standard_demand" # Optional, default to standard_demand forecast = 5 # Optional, defaults to 5 -[[sectors.residential.outputs]] -filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}.csv' -quantity = "capacity" -sink = 'aggregate' - -[[sectors.residential.outputs]] -filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}.csv' -sink = 'aggregate' -quantity.name = "supply" -quantity.sum_over = "timeslice" -quantity.drop = ["comm_usage", "units_prices"] - [sectors.power] type = 'default' priority = 2 @@ -81,11 +69,6 @@ existing_capacity = '{path}/technodata/power/ExistingCapacity.csv' lpsolver = "scipy" demand_share = "standard_demand" -[[sectors.power.outputs]] -filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}.csv' -quantity = "capacity" -sink = 'aggregate' - [sectors.gas] type = 'default' priority = 3 @@ -100,11 +83,6 @@ existing_capacity = '{path}/technodata/gas/ExistingCapacity.csv' lpsolver = "scipy" demand_share = "standard_demand" -[[sectors.gas.outputs]] -filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}.csv' -quantity = "capacity" -sink = 'aggregate' - [sectors.residential_presets] type = 'presets' priority = 0 diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/Agents.csv b/docs/tutorial-code/7-add-correlation-demand/1-correlation/technodata/Agents.csv similarity index 61% rename from docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/Agents.csv rename to docs/tutorial-code/7-add-correlation-demand/1-correlation/technodata/Agents.csv index c3dad5536..cf90980d9 100644 --- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/Agents.csv +++ b/docs/tutorial-code/7-add-correlation-demand/1-correlation/technodata/Agents.csv @@ -1,3 +1,2 @@ AgentShare,Name,RegionName,Objective1,Objective2,Objective3,ObjData1,ObjData2,ObjData3,Objsort1,Objsort2,Objsort3,SearchRule,DecisionMethod,Quantity,MaturityThreshold,SpendLimit,Type -Agent1,A1,R1,LCOE,,,1,,,True,,,all,singleObj,1,-1,inf,New -Agent1,A1,R2,LCOE,,,1,,,True,,,all,singleObj,1,-1,inf,New +Agent1,A1,R1,LCOE,,,1,,,TRUE,,,all,singleObj,1,-1,inf,New diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/gas/CommIn.csv b/docs/tutorial-code/7-add-correlation-demand/1-correlation/technodata/gas/CommIn.csv similarity index 80% rename from docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/gas/CommIn.csv rename to docs/tutorial-code/7-add-correlation-demand/1-correlation/technodata/gas/CommIn.csv index 0e85ade1f..60af1f4ad 100644 --- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/gas/CommIn.csv +++ b/docs/tutorial-code/7-add-correlation-demand/1-correlation/technodata/gas/CommIn.csv @@ -1,4 +1,3 @@ ProcessName,RegionName,Time,Level,electricity,gas,heat,CO2f,wind Unit,-,Year,-,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ gassupply1,R1,2020,fixed,0,0,0,0,0 -gassupply1,R2,2020,fixed,0,0,0,0,0 diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/gas/CommOut.csv b/docs/tutorial-code/7-add-correlation-demand/1-correlation/technodata/gas/CommOut.csv similarity index 81% rename from docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/gas/CommOut.csv rename to docs/tutorial-code/7-add-correlation-demand/1-correlation/technodata/gas/CommOut.csv index f0eb38ea4..cbe4de904 100644 --- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/gas/CommOut.csv +++ b/docs/tutorial-code/7-add-correlation-demand/1-correlation/technodata/gas/CommOut.csv @@ -1,4 +1,3 @@ ProcessName,RegionName,Time,electricity,gas,heat,CO2f,wind Unit,-,Year,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ gassupply1,R1,2020,0,1,0,0,0 -gassupply1,R2,2020,0,1,0,0,0 diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/gas/ExistingCapacity.csv b/docs/tutorial-code/7-add-correlation-demand/1-correlation/technodata/gas/ExistingCapacity.csv similarity index 72% rename from docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/gas/ExistingCapacity.csv rename to docs/tutorial-code/7-add-correlation-demand/1-correlation/technodata/gas/ExistingCapacity.csv index 3cd9976f8..6862d5bb1 100644 --- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/gas/ExistingCapacity.csv +++ b/docs/tutorial-code/7-add-correlation-demand/1-correlation/technodata/gas/ExistingCapacity.csv @@ -1,3 +1,2 @@ ProcessName,RegionName,Unit,2020,2025,2030,2035,2040,2045,2050 gassupply1,R1,PJ/y,15,15,7.5,0,0,0,0 -gassupply1,R2,PJ/y,15,15,7.5,0,0,0,0 diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/gas/Technodata.csv b/docs/tutorial-code/7-add-correlation-demand/1-correlation/technodata/gas/Technodata.csv similarity index 65% rename from docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/gas/Technodata.csv rename to docs/tutorial-code/7-add-correlation-demand/1-correlation/technodata/gas/Technodata.csv index 9a2f58359..f7f3120d1 100644 --- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/gas/Technodata.csv +++ b/docs/tutorial-code/7-add-correlation-demand/1-correlation/technodata/gas/Technodata.csv @@ -1,4 +1,3 @@ ProcessName,RegionName,Time,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent1 Unit,-,Year,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,New -gassupply1,R1,2020,0,1,0,1,2.55,1,5,1,60,35,0.9,0.00000189,86,0.1,energy,gas,gas,1 -gassupply1,R2,2020,0,1,0,1,2.55,1,5,1,60,35,0.9,0.00000189,86,0.1,energy,gas,gas,1 +gassupply1,R1,2020,0,1,0,1,2.55,1,10,1,100,35,0.9,0.00000189,86,0.1,energy,gas,gas,1 diff --git a/docs/tutorial-code/7-add-correlation-demand/1-correlation/technodata/power/CommIn.csv b/docs/tutorial-code/7-add-correlation-demand/1-correlation/technodata/power/CommIn.csv new file mode 100644 index 000000000..c78f9c6e1 --- /dev/null +++ b/docs/tutorial-code/7-add-correlation-demand/1-correlation/technodata/power/CommIn.csv @@ -0,0 +1,4 @@ +ProcessName,RegionName,Time,Level,electricity,gas,heat,CO2f,wind +Unit,-,Year,-,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ +gasCCGT,R1,2020,fixed,0,1.67,0,0,0 +windturbine,R1,2020,fixed,0,0,0,0,1 diff --git a/docs/tutorial-code/7-add-correlation-demand/1-correlation/technodata/power/CommOut.csv b/docs/tutorial-code/7-add-correlation-demand/1-correlation/technodata/power/CommOut.csv new file mode 100644 index 000000000..efaac0580 --- /dev/null +++ b/docs/tutorial-code/7-add-correlation-demand/1-correlation/technodata/power/CommOut.csv @@ -0,0 +1,4 @@ +ProcessName,RegionName,Time,electricity,gas,heat,CO2f,wind +Unit,-,Year,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ +gasCCGT,R1,2020,1,0,0,91.67,0 +windturbine,R1,2020,1,0,0,0,0 diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/power/ExistingCapacity.csv b/docs/tutorial-code/7-add-correlation-demand/1-correlation/technodata/power/ExistingCapacity.csv similarity index 50% rename from docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/power/ExistingCapacity.csv rename to docs/tutorial-code/7-add-correlation-demand/1-correlation/technodata/power/ExistingCapacity.csv index 073ccdd53..2171d259c 100644 --- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/power/ExistingCapacity.csv +++ b/docs/tutorial-code/7-add-correlation-demand/1-correlation/technodata/power/ExistingCapacity.csv @@ -1,7 +1,3 @@ ProcessName,RegionName,Unit,2020,2025,2030,2035,2040,2045,2050 gasCCGT,R1,PJ/y,1,1,0,0,0,0,0 windturbine,R1,PJ/y,0,0,0,0,0,0,0 -solarPV,R1,PJ/y,0,0,0,0,0,0,0 -gasCCGT,R2,PJ/y,1,1,0,0,0,0,0 -windturbine,R2,PJ/y,0,0,0,0,0,0,0 -solarPV,R2,PJ/y,0,0,0,0,0,0,0 diff --git a/docs/tutorial-code/7-add-correlation-demand/1-correlation/technodata/power/Technodata.csv b/docs/tutorial-code/7-add-correlation-demand/1-correlation/technodata/power/Technodata.csv new file mode 100644 index 000000000..a23d8d32e --- /dev/null +++ b/docs/tutorial-code/7-add-correlation-demand/1-correlation/technodata/power/Technodata.csv @@ -0,0 +1,4 @@ +ProcessName,RegionName,Time,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent1 +Unit,-,Year,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,New +gasCCGT,R1,2020,23.78234399,1,0,1,0,1,10,1,100,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1 +windturbine,R1,2020,36.30771182,1,0,1,0,1,10,1,100,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1 diff --git a/docs/tutorial-code/6-add-correlation-demand/1-correlation/technodata/preset/Macrodrivers.csv b/docs/tutorial-code/7-add-correlation-demand/1-correlation/technodata/preset/Macrodrivers.csv similarity index 100% rename from docs/tutorial-code/6-add-correlation-demand/1-correlation/technodata/preset/Macrodrivers.csv rename to docs/tutorial-code/7-add-correlation-demand/1-correlation/technodata/preset/Macrodrivers.csv diff --git a/docs/tutorial-code/6-add-correlation-demand/1-correlation/technodata/preset/TimesliceSharepreset.csv b/docs/tutorial-code/7-add-correlation-demand/1-correlation/technodata/preset/TimesliceSharepreset.csv similarity index 100% rename from docs/tutorial-code/6-add-correlation-demand/1-correlation/technodata/preset/TimesliceSharepreset.csv rename to docs/tutorial-code/7-add-correlation-demand/1-correlation/technodata/preset/TimesliceSharepreset.csv diff --git a/docs/tutorial-code/6-add-correlation-demand/1-correlation/technodata/preset/regressionparameters.csv b/docs/tutorial-code/7-add-correlation-demand/1-correlation/technodata/preset/regressionparameters.csv similarity index 100% rename from docs/tutorial-code/6-add-correlation-demand/1-correlation/technodata/preset/regressionparameters.csv rename to docs/tutorial-code/7-add-correlation-demand/1-correlation/technodata/preset/regressionparameters.csv diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/technodata/residential/CommIn.csv b/docs/tutorial-code/7-add-correlation-demand/1-correlation/technodata/residential/CommIn.csv similarity index 100% rename from docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/technodata/residential/CommIn.csv rename to docs/tutorial-code/7-add-correlation-demand/1-correlation/technodata/residential/CommIn.csv diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/technodata/residential/CommOut.csv b/docs/tutorial-code/7-add-correlation-demand/1-correlation/technodata/residential/CommOut.csv similarity index 100% rename from docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/technodata/residential/CommOut.csv rename to docs/tutorial-code/7-add-correlation-demand/1-correlation/technodata/residential/CommOut.csv diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/technodata/residential/ExistingCapacity.csv b/docs/tutorial-code/7-add-correlation-demand/1-correlation/technodata/residential/ExistingCapacity.csv similarity index 100% rename from docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/technodata/residential/ExistingCapacity.csv rename to docs/tutorial-code/7-add-correlation-demand/1-correlation/technodata/residential/ExistingCapacity.csv diff --git a/docs/tutorial-code/7-add-correlation-demand/1-correlation/technodata/residential/Technodata.csv b/docs/tutorial-code/7-add-correlation-demand/1-correlation/technodata/residential/Technodata.csv new file mode 100644 index 000000000..5b961659e --- /dev/null +++ b/docs/tutorial-code/7-add-correlation-demand/1-correlation/technodata/residential/Technodata.csv @@ -0,0 +1,4 @@ +ProcessName,RegionName,Time,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent1 +Unit,-,Year,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,New +gasboiler,R1,2020,3.8,1,0,1,0,1,10,1,100,10,1,0.00000189,86,0.1,energy,gas,heat,1 +heatpump,R1,2020,8.866667,1,0,1,0,1,10,1,100,10,1,0.00000189,86,0.1,energy,electricity,heat,1 diff --git a/docs/tutorial-code/6-add-correlation-demand/Macrodrivers.csv b/docs/tutorial-code/7-add-correlation-demand/Macrodrivers.csv similarity index 100% rename from docs/tutorial-code/6-add-correlation-demand/Macrodrivers.csv rename to docs/tutorial-code/7-add-correlation-demand/Macrodrivers.csv diff --git a/docs/tutorial-code/6-add-correlation-demand/TimesliceSharepreset.csv b/docs/tutorial-code/7-add-correlation-demand/TimesliceSharepreset.csv similarity index 100% rename from docs/tutorial-code/6-add-correlation-demand/TimesliceSharepreset.csv rename to docs/tutorial-code/7-add-correlation-demand/TimesliceSharepreset.csv diff --git a/docs/tutorial-code/6-add-correlation-demand/generate_models.py b/docs/tutorial-code/7-add-correlation-demand/generate_models.py similarity index 100% rename from docs/tutorial-code/6-add-correlation-demand/generate_models.py rename to docs/tutorial-code/7-add-correlation-demand/generate_models.py diff --git a/docs/tutorial-code/6-add-correlation-demand/regressionparameters.csv b/docs/tutorial-code/7-add-correlation-demand/regressionparameters.csv similarity index 100% rename from docs/tutorial-code/6-add-correlation-demand/regressionparameters.csv rename to docs/tutorial-code/7-add-correlation-demand/regressionparameters.csv diff --git a/docs/tutorial-code/6-add-correlation-demand/visualise-correlation-demand.ipynb b/docs/tutorial-code/7-add-correlation-demand/visualise-correlation-demand.ipynb similarity index 100% rename from docs/tutorial-code/6-add-correlation-demand/visualise-correlation-demand.ipynb rename to docs/tutorial-code/7-add-correlation-demand/visualise-correlation-demand.ipynb diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Gas/Capacity.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Gas/Capacity.csv deleted file mode 100644 index 43fc9244a..000000000 --- a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Gas/Capacity.csv +++ /dev/null @@ -1,8 +0,0 @@ -asset,capacity,installed,region,technology,year -0,15.00000000000,2020,R1,gassupply1,2020 -0,15.42960000000,2020,R1,gassupply1,2025 -0,7.92960000000,2020,R1,gassupply1,2030 -0,0.42960000000,2020,R1,gassupply1,2035 -0,0.42960000000,2020,R1,gassupply1,2040 -0,0.42960000000,2020,R1,gassupply1,2045 -0,0.42960000000,2020,R1,gassupply1,2050 diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/MCAMetric_Consumption.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/MCAMetric_Consumption.csv deleted file mode 100644 index 42d2f554e..000000000 --- a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/MCAMetric_Consumption.csv +++ /dev/null @@ -1,205 +0,0 @@ -agent,asset,category,comm_usage,commodity,consumption,day,dst_region,hour,installed,month,region,sector,technology,timeslice,units_prices,year -A1,0,newcapa,CONSUMABLE|ENERGY,gas,1.16000000000,all-week,R1,night,2020,all-year,R1,residential,gasboiler,0,MUS$2010/PJ,2020 -A1,0,newcapa,CONSUMABLE|ENERGY,gas,1.74000000000,all-week,R1,morning,2020,all-year,R1,residential,gasboiler,1,MUS$2010/PJ,2020 -A1,0,newcapa,CONSUMABLE|ENERGY,gas,1.16000000000,all-week,R1,afternoon,2020,all-year,R1,residential,gasboiler,2,MUS$2010/PJ,2020 -A1,0,newcapa,CONSUMABLE|ENERGY,gas,1.74000000000,all-week,R1,early-peak,2020,all-year,R1,residential,gasboiler,3,MUS$2010/PJ,2020 -A1,0,newcapa,CONSUMABLE|ENERGY,gas,3.48000000000,all-week,R1,late-peak,2020,all-year,R1,residential,gasboiler,4,MUS$2010/PJ,2020 -A1,0,newcapa,CONSUMABLE|ENERGY,gas,2.32000000000,all-week,R1,evening,2020,all-year,R1,residential,gasboiler,5,MUS$2010/PJ,2020 -A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.32222222222,all-week,R1,night,2020,all-year,R1,residential,gasboiler,0,MUS$2010/PJ,2025 -A1,1,newcapa,CONSUMABLE|ENERGY,electricity,0.42222222222,all-week,R1,night,2020,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2025 -A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.48333333333,all-week,R1,morning,2020,all-year,R1,residential,gasboiler,1,MUS$2010/PJ,2025 -A1,1,newcapa,CONSUMABLE|ENERGY,electricity,0.63333333333,all-week,R1,morning,2020,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2025 -A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.32222222222,all-week,R1,afternoon,2020,all-year,R1,residential,gasboiler,2,MUS$2010/PJ,2025 -A1,1,newcapa,CONSUMABLE|ENERGY,electricity,0.42222222222,all-week,R1,afternoon,2020,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2025 -A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.48333333333,all-week,R1,early-peak,2020,all-year,R1,residential,gasboiler,3,MUS$2010/PJ,2025 -A1,1,newcapa,CONSUMABLE|ENERGY,electricity,0.63333333333,all-week,R1,early-peak,2020,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2025 -A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.96666666667,all-week,R1,late-peak,2020,all-year,R1,residential,gasboiler,4,MUS$2010/PJ,2025 -A1,1,newcapa,CONSUMABLE|ENERGY,electricity,1.26666666667,all-week,R1,late-peak,2020,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2025 -A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.64444444444,all-week,R1,evening,2020,all-year,R1,residential,gasboiler,5,MUS$2010/PJ,2025 -A1,1,newcapa,CONSUMABLE|ENERGY,electricity,0.84444444444,all-week,R1,evening,2020,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2025 -A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.35255555556,all-week,R1,night,2020,all-year,R1,power,gasCCGT,0,MUS$2010/PJ,2025 -A1,1,newcapa,CONSUMABLE|ENERGY,wind,0.21111111111,all-week,R1,night,2020,all-year,R1,power,windturbine,0,MUS$2010/kt,2025 -A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.52883333333,all-week,R1,morning,2020,all-year,R1,power,gasCCGT,1,MUS$2010/PJ,2025 -A1,1,newcapa,CONSUMABLE|ENERGY,wind,0.31666666667,all-week,R1,morning,2020,all-year,R1,power,windturbine,1,MUS$2010/kt,2025 -A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.35255555556,all-week,R1,afternoon,2020,all-year,R1,power,gasCCGT,2,MUS$2010/PJ,2025 -A1,1,newcapa,CONSUMABLE|ENERGY,wind,0.21111111111,all-week,R1,afternoon,2020,all-year,R1,power,windturbine,2,MUS$2010/kt,2025 -A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.52883333333,all-week,R1,early-peak,2020,all-year,R1,power,gasCCGT,3,MUS$2010/PJ,2025 -A1,1,newcapa,CONSUMABLE|ENERGY,wind,0.31666666667,all-week,R1,early-peak,2020,all-year,R1,power,windturbine,3,MUS$2010/kt,2025 -A1,0,newcapa,CONSUMABLE|ENERGY,gas,1.05766666667,all-week,R1,late-peak,2020,all-year,R1,power,gasCCGT,4,MUS$2010/PJ,2025 -A1,1,newcapa,CONSUMABLE|ENERGY,wind,0.63333333333,all-week,R1,late-peak,2020,all-year,R1,power,windturbine,4,MUS$2010/kt,2025 -A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.70511111111,all-week,R1,evening,2020,all-year,R1,power,gasCCGT,5,MUS$2010/PJ,2025 -A1,1,newcapa,CONSUMABLE|ENERGY,wind,0.42222222222,all-week,R1,evening,2020,all-year,R1,power,windturbine,5,MUS$2010/kt,2025 -A1,1,newcapa,CONSUMABLE|ENERGY,electricity,0.43678160920,all-week,R1,night,2020,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2030 -A1,2,newcapa,CONSUMABLE|ENERGY,electricity,0.22988505747,all-week,R1,night,2025,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2030 -A1,1,newcapa,CONSUMABLE|ENERGY,electricity,0.65517241379,all-week,R1,morning,2020,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2030 -A1,2,newcapa,CONSUMABLE|ENERGY,electricity,0.34482758621,all-week,R1,morning,2025,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2030 -A1,1,newcapa,CONSUMABLE|ENERGY,electricity,0.43678160920,all-week,R1,afternoon,2020,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2030 -A1,2,newcapa,CONSUMABLE|ENERGY,electricity,0.22988505747,all-week,R1,afternoon,2025,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2030 -A1,1,newcapa,CONSUMABLE|ENERGY,electricity,0.65517241379,all-week,R1,early-peak,2020,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2030 -A1,2,newcapa,CONSUMABLE|ENERGY,electricity,0.34482758621,all-week,R1,early-peak,2025,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2030 -A1,1,newcapa,CONSUMABLE|ENERGY,electricity,1.31034482759,all-week,R1,late-peak,2020,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2030 -A1,2,newcapa,CONSUMABLE|ENERGY,electricity,0.68965517241,all-week,R1,late-peak,2025,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2030 -A1,1,newcapa,CONSUMABLE|ENERGY,electricity,0.87356321839,all-week,R1,evening,2020,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2030 -A1,2,newcapa,CONSUMABLE|ENERGY,electricity,0.45977011494,all-week,R1,evening,2025,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2030 -A1,1,newcapa,CONSUMABLE|ENERGY,wind,0.33333333333,all-week,R1,night,2020,all-year,R1,power,windturbine,0,MUS$2010/kt,2030 -A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.33333333333,all-week,R1,night,2025,all-year,R1,power,windturbine,0,MUS$2010/kt,2030 -A1,1,newcapa,CONSUMABLE|ENERGY,wind,0.50000000000,all-week,R1,morning,2020,all-year,R1,power,windturbine,1,MUS$2010/kt,2030 -A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.50000000000,all-week,R1,morning,2025,all-year,R1,power,windturbine,1,MUS$2010/kt,2030 -A1,1,newcapa,CONSUMABLE|ENERGY,wind,0.33333333333,all-week,R1,afternoon,2020,all-year,R1,power,windturbine,2,MUS$2010/kt,2030 -A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.33333333333,all-week,R1,afternoon,2025,all-year,R1,power,windturbine,2,MUS$2010/kt,2030 -A1,1,newcapa,CONSUMABLE|ENERGY,wind,0.50000000000,all-week,R1,early-peak,2020,all-year,R1,power,windturbine,3,MUS$2010/kt,2030 -A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.50000000000,all-week,R1,early-peak,2025,all-year,R1,power,windturbine,3,MUS$2010/kt,2030 -A1,1,newcapa,CONSUMABLE|ENERGY,wind,1.00000000000,all-week,R1,late-peak,2020,all-year,R1,power,windturbine,4,MUS$2010/kt,2030 -A1,2,newcapa,CONSUMABLE|ENERGY,wind,1.00000000000,all-week,R1,late-peak,2025,all-year,R1,power,windturbine,4,MUS$2010/kt,2030 -A1,1,newcapa,CONSUMABLE|ENERGY,wind,0.66666666667,all-week,R1,evening,2020,all-year,R1,power,windturbine,5,MUS$2010/kt,2030 -A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.66666666667,all-week,R1,evening,2025,all-year,R1,power,windturbine,5,MUS$2010/kt,2030 -A1,2,newcapa,CONSUMABLE|ENERGY,electricity,0.22222222222,all-week,R1,night,2025,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2035 -A1,3,newcapa,CONSUMABLE|ENERGY,electricity,0.57777777778,all-week,R1,night,2030,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2035 -A1,2,newcapa,CONSUMABLE|ENERGY,electricity,0.33333333333,all-week,R1,morning,2025,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2035 -A1,3,newcapa,CONSUMABLE|ENERGY,electricity,0.86666666667,all-week,R1,morning,2030,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2035 -A1,2,newcapa,CONSUMABLE|ENERGY,electricity,0.22222222222,all-week,R1,afternoon,2025,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2035 -A1,3,newcapa,CONSUMABLE|ENERGY,electricity,0.57777777778,all-week,R1,afternoon,2030,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2035 -A1,2,newcapa,CONSUMABLE|ENERGY,electricity,0.33333333333,all-week,R1,early-peak,2025,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2035 -A1,3,newcapa,CONSUMABLE|ENERGY,electricity,0.86666666667,all-week,R1,early-peak,2030,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2035 -A1,2,newcapa,CONSUMABLE|ENERGY,electricity,0.66666666667,all-week,R1,late-peak,2025,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2035 -A1,3,newcapa,CONSUMABLE|ENERGY,electricity,1.73333333333,all-week,R1,late-peak,2030,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2035 -A1,2,newcapa,CONSUMABLE|ENERGY,electricity,0.44444444444,all-week,R1,evening,2025,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2035 -A1,3,newcapa,CONSUMABLE|ENERGY,electricity,1.15555555556,all-week,R1,evening,2030,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2035 -A1,1,newcapa,CONSUMABLE|ENERGY,wind,0.20000000000,all-week,R1,night,2020,all-year,R1,power,windturbine,0,MUS$2010/kt,2035 -A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.20000000000,all-week,R1,night,2025,all-year,R1,power,windturbine,0,MUS$2010/kt,2035 -A1,3,newcapa,CONSUMABLE|ENERGY,wind,0.40000000000,all-week,R1,night,2030,all-year,R1,power,windturbine,0,MUS$2010/kt,2035 -A1,1,newcapa,CONSUMABLE|ENERGY,wind,0.30000000000,all-week,R1,morning,2020,all-year,R1,power,windturbine,1,MUS$2010/kt,2035 -A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.30000000000,all-week,R1,morning,2025,all-year,R1,power,windturbine,1,MUS$2010/kt,2035 -A1,3,newcapa,CONSUMABLE|ENERGY,wind,0.60000000000,all-week,R1,morning,2030,all-year,R1,power,windturbine,1,MUS$2010/kt,2035 -A1,1,newcapa,CONSUMABLE|ENERGY,wind,0.20000000000,all-week,R1,afternoon,2020,all-year,R1,power,windturbine,2,MUS$2010/kt,2035 -A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.20000000000,all-week,R1,afternoon,2025,all-year,R1,power,windturbine,2,MUS$2010/kt,2035 -A1,3,newcapa,CONSUMABLE|ENERGY,wind,0.40000000000,all-week,R1,afternoon,2030,all-year,R1,power,windturbine,2,MUS$2010/kt,2035 -A1,1,newcapa,CONSUMABLE|ENERGY,wind,0.30000000000,all-week,R1,early-peak,2020,all-year,R1,power,windturbine,3,MUS$2010/kt,2035 -A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.30000000000,all-week,R1,early-peak,2025,all-year,R1,power,windturbine,3,MUS$2010/kt,2035 -A1,3,newcapa,CONSUMABLE|ENERGY,wind,0.60000000000,all-week,R1,early-peak,2030,all-year,R1,power,windturbine,3,MUS$2010/kt,2035 -A1,1,newcapa,CONSUMABLE|ENERGY,wind,0.60000000000,all-week,R1,late-peak,2020,all-year,R1,power,windturbine,4,MUS$2010/kt,2035 -A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.60000000000,all-week,R1,late-peak,2025,all-year,R1,power,windturbine,4,MUS$2010/kt,2035 -A1,3,newcapa,CONSUMABLE|ENERGY,wind,1.20000000000,all-week,R1,late-peak,2030,all-year,R1,power,windturbine,4,MUS$2010/kt,2035 -A1,1,newcapa,CONSUMABLE|ENERGY,wind,0.40000000000,all-week,R1,evening,2020,all-year,R1,power,windturbine,5,MUS$2010/kt,2035 -A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.40000000000,all-week,R1,evening,2025,all-year,R1,power,windturbine,5,MUS$2010/kt,2035 -A1,3,newcapa,CONSUMABLE|ENERGY,wind,0.80000000000,all-week,R1,evening,2030,all-year,R1,power,windturbine,5,MUS$2010/kt,2035 -A1,3,newcapa,CONSUMABLE|ENERGY,electricity,0.57777777778,all-week,R1,night,2030,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2040 -A1,4,newcapa,CONSUMABLE|ENERGY,electricity,0.35555555556,all-week,R1,night,2035,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2040 -A1,3,newcapa,CONSUMABLE|ENERGY,electricity,0.86666666667,all-week,R1,morning,2030,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2040 -A1,4,newcapa,CONSUMABLE|ENERGY,electricity,0.53333333333,all-week,R1,morning,2035,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2040 -A1,3,newcapa,CONSUMABLE|ENERGY,electricity,0.57777777778,all-week,R1,afternoon,2030,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2040 -A1,4,newcapa,CONSUMABLE|ENERGY,electricity,0.35555555556,all-week,R1,afternoon,2035,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2040 -A1,3,newcapa,CONSUMABLE|ENERGY,electricity,0.86666666667,all-week,R1,early-peak,2030,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2040 -A1,4,newcapa,CONSUMABLE|ENERGY,electricity,0.53333333333,all-week,R1,early-peak,2035,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2040 -A1,3,newcapa,CONSUMABLE|ENERGY,electricity,1.73333333333,all-week,R1,late-peak,2030,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2040 -A1,4,newcapa,CONSUMABLE|ENERGY,electricity,1.06666666667,all-week,R1,late-peak,2035,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2040 -A1,3,newcapa,CONSUMABLE|ENERGY,electricity,1.15555555556,all-week,R1,evening,2030,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2040 -A1,4,newcapa,CONSUMABLE|ENERGY,electricity,0.71111111111,all-week,R1,evening,2035,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2040 -A1,1,newcapa,CONSUMABLE|ENERGY,wind,0.15555555556,all-week,R1,night,2020,all-year,R1,power,windturbine,0,MUS$2010/kt,2040 -A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.15555555556,all-week,R1,night,2025,all-year,R1,power,windturbine,0,MUS$2010/kt,2040 -A1,3,newcapa,CONSUMABLE|ENERGY,wind,0.31111111111,all-week,R1,night,2030,all-year,R1,power,windturbine,0,MUS$2010/kt,2040 -A1,4,newcapa,CONSUMABLE|ENERGY,wind,0.31111111111,all-week,R1,night,2035,all-year,R1,power,windturbine,0,MUS$2010/kt,2040 -A1,1,newcapa,CONSUMABLE|ENERGY,wind,0.23333333333,all-week,R1,morning,2020,all-year,R1,power,windturbine,1,MUS$2010/kt,2040 -A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.23333333333,all-week,R1,morning,2025,all-year,R1,power,windturbine,1,MUS$2010/kt,2040 -A1,3,newcapa,CONSUMABLE|ENERGY,wind,0.46666666667,all-week,R1,morning,2030,all-year,R1,power,windturbine,1,MUS$2010/kt,2040 -A1,4,newcapa,CONSUMABLE|ENERGY,wind,0.46666666667,all-week,R1,morning,2035,all-year,R1,power,windturbine,1,MUS$2010/kt,2040 -A1,1,newcapa,CONSUMABLE|ENERGY,wind,0.15555555556,all-week,R1,afternoon,2020,all-year,R1,power,windturbine,2,MUS$2010/kt,2040 -A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.15555555556,all-week,R1,afternoon,2025,all-year,R1,power,windturbine,2,MUS$2010/kt,2040 -A1,3,newcapa,CONSUMABLE|ENERGY,wind,0.31111111111,all-week,R1,afternoon,2030,all-year,R1,power,windturbine,2,MUS$2010/kt,2040 -A1,4,newcapa,CONSUMABLE|ENERGY,wind,0.31111111111,all-week,R1,afternoon,2035,all-year,R1,power,windturbine,2,MUS$2010/kt,2040 -A1,1,newcapa,CONSUMABLE|ENERGY,wind,0.23333333333,all-week,R1,early-peak,2020,all-year,R1,power,windturbine,3,MUS$2010/kt,2040 -A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.23333333333,all-week,R1,early-peak,2025,all-year,R1,power,windturbine,3,MUS$2010/kt,2040 -A1,3,newcapa,CONSUMABLE|ENERGY,wind,0.46666666667,all-week,R1,early-peak,2030,all-year,R1,power,windturbine,3,MUS$2010/kt,2040 -A1,4,newcapa,CONSUMABLE|ENERGY,wind,0.46666666667,all-week,R1,early-peak,2035,all-year,R1,power,windturbine,3,MUS$2010/kt,2040 -A1,1,newcapa,CONSUMABLE|ENERGY,wind,0.46666666667,all-week,R1,late-peak,2020,all-year,R1,power,windturbine,4,MUS$2010/kt,2040 -A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.46666666667,all-week,R1,late-peak,2025,all-year,R1,power,windturbine,4,MUS$2010/kt,2040 -A1,3,newcapa,CONSUMABLE|ENERGY,wind,0.93333333333,all-week,R1,late-peak,2030,all-year,R1,power,windturbine,4,MUS$2010/kt,2040 -A1,4,newcapa,CONSUMABLE|ENERGY,wind,0.93333333333,all-week,R1,late-peak,2035,all-year,R1,power,windturbine,4,MUS$2010/kt,2040 -A1,1,newcapa,CONSUMABLE|ENERGY,wind,0.31111111111,all-week,R1,evening,2020,all-year,R1,power,windturbine,5,MUS$2010/kt,2040 -A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.31111111111,all-week,R1,evening,2025,all-year,R1,power,windturbine,5,MUS$2010/kt,2040 -A1,3,newcapa,CONSUMABLE|ENERGY,wind,0.62222222222,all-week,R1,evening,2030,all-year,R1,power,windturbine,5,MUS$2010/kt,2040 -A1,4,newcapa,CONSUMABLE|ENERGY,wind,0.62222222222,all-week,R1,evening,2035,all-year,R1,power,windturbine,5,MUS$2010/kt,2040 -A1,4,newcapa,CONSUMABLE|ENERGY,electricity,0.35555555556,all-week,R1,night,2035,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2045 -A1,5,newcapa,CONSUMABLE|ENERGY,electricity,0.71111111111,all-week,R1,night,2040,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2045 -A1,4,newcapa,CONSUMABLE|ENERGY,electricity,0.53333333333,all-week,R1,morning,2035,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2045 -A1,5,newcapa,CONSUMABLE|ENERGY,electricity,1.06666666667,all-week,R1,morning,2040,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2045 -A1,4,newcapa,CONSUMABLE|ENERGY,electricity,0.35555555556,all-week,R1,afternoon,2035,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2045 -A1,5,newcapa,CONSUMABLE|ENERGY,electricity,0.71111111111,all-week,R1,afternoon,2040,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2045 -A1,4,newcapa,CONSUMABLE|ENERGY,electricity,0.53333333333,all-week,R1,early-peak,2035,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2045 -A1,5,newcapa,CONSUMABLE|ENERGY,electricity,1.06666666667,all-week,R1,early-peak,2040,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2045 -A1,4,newcapa,CONSUMABLE|ENERGY,electricity,1.06666666667,all-week,R1,late-peak,2035,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2045 -A1,5,newcapa,CONSUMABLE|ENERGY,electricity,2.13333333333,all-week,R1,late-peak,2040,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2045 -A1,4,newcapa,CONSUMABLE|ENERGY,electricity,0.71111111111,all-week,R1,evening,2035,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2045 -A1,5,newcapa,CONSUMABLE|ENERGY,electricity,1.42222222222,all-week,R1,evening,2040,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2045 -A1,1,newcapa,CONSUMABLE|ENERGY,wind,0.13333333333,all-week,R1,night,2020,all-year,R1,power,windturbine,0,MUS$2010/kt,2045 -A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.13333333333,all-week,R1,night,2025,all-year,R1,power,windturbine,0,MUS$2010/kt,2045 -A1,3,newcapa,CONSUMABLE|ENERGY,wind,0.26666666667,all-week,R1,night,2030,all-year,R1,power,windturbine,0,MUS$2010/kt,2045 -A1,4,newcapa,CONSUMABLE|ENERGY,wind,0.26666666667,all-week,R1,night,2035,all-year,R1,power,windturbine,0,MUS$2010/kt,2045 -A1,5,newcapa,CONSUMABLE|ENERGY,wind,0.26666666667,all-week,R1,night,2040,all-year,R1,power,windturbine,0,MUS$2010/kt,2045 -A1,1,newcapa,CONSUMABLE|ENERGY,wind,0.20000000000,all-week,R1,morning,2020,all-year,R1,power,windturbine,1,MUS$2010/kt,2045 -A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.20000000000,all-week,R1,morning,2025,all-year,R1,power,windturbine,1,MUS$2010/kt,2045 -A1,3,newcapa,CONSUMABLE|ENERGY,wind,0.40000000000,all-week,R1,morning,2030,all-year,R1,power,windturbine,1,MUS$2010/kt,2045 -A1,4,newcapa,CONSUMABLE|ENERGY,wind,0.40000000000,all-week,R1,morning,2035,all-year,R1,power,windturbine,1,MUS$2010/kt,2045 -A1,5,newcapa,CONSUMABLE|ENERGY,wind,0.40000000000,all-week,R1,morning,2040,all-year,R1,power,windturbine,1,MUS$2010/kt,2045 -A1,1,newcapa,CONSUMABLE|ENERGY,wind,0.13333333333,all-week,R1,afternoon,2020,all-year,R1,power,windturbine,2,MUS$2010/kt,2045 -A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.13333333333,all-week,R1,afternoon,2025,all-year,R1,power,windturbine,2,MUS$2010/kt,2045 -A1,3,newcapa,CONSUMABLE|ENERGY,wind,0.26666666667,all-week,R1,afternoon,2030,all-year,R1,power,windturbine,2,MUS$2010/kt,2045 -A1,4,newcapa,CONSUMABLE|ENERGY,wind,0.26666666667,all-week,R1,afternoon,2035,all-year,R1,power,windturbine,2,MUS$2010/kt,2045 -A1,5,newcapa,CONSUMABLE|ENERGY,wind,0.26666666667,all-week,R1,afternoon,2040,all-year,R1,power,windturbine,2,MUS$2010/kt,2045 -A1,1,newcapa,CONSUMABLE|ENERGY,wind,0.20000000000,all-week,R1,early-peak,2020,all-year,R1,power,windturbine,3,MUS$2010/kt,2045 -A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.20000000000,all-week,R1,early-peak,2025,all-year,R1,power,windturbine,3,MUS$2010/kt,2045 -A1,3,newcapa,CONSUMABLE|ENERGY,wind,0.40000000000,all-week,R1,early-peak,2030,all-year,R1,power,windturbine,3,MUS$2010/kt,2045 -A1,4,newcapa,CONSUMABLE|ENERGY,wind,0.40000000000,all-week,R1,early-peak,2035,all-year,R1,power,windturbine,3,MUS$2010/kt,2045 -A1,5,newcapa,CONSUMABLE|ENERGY,wind,0.40000000000,all-week,R1,early-peak,2040,all-year,R1,power,windturbine,3,MUS$2010/kt,2045 -A1,1,newcapa,CONSUMABLE|ENERGY,wind,0.40000000000,all-week,R1,late-peak,2020,all-year,R1,power,windturbine,4,MUS$2010/kt,2045 -A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.40000000000,all-week,R1,late-peak,2025,all-year,R1,power,windturbine,4,MUS$2010/kt,2045 -A1,3,newcapa,CONSUMABLE|ENERGY,wind,0.80000000000,all-week,R1,late-peak,2030,all-year,R1,power,windturbine,4,MUS$2010/kt,2045 -A1,4,newcapa,CONSUMABLE|ENERGY,wind,0.80000000000,all-week,R1,late-peak,2035,all-year,R1,power,windturbine,4,MUS$2010/kt,2045 -A1,5,newcapa,CONSUMABLE|ENERGY,wind,0.80000000000,all-week,R1,late-peak,2040,all-year,R1,power,windturbine,4,MUS$2010/kt,2045 -A1,1,newcapa,CONSUMABLE|ENERGY,wind,0.26666666667,all-week,R1,evening,2020,all-year,R1,power,windturbine,5,MUS$2010/kt,2045 -A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.26666666667,all-week,R1,evening,2025,all-year,R1,power,windturbine,5,MUS$2010/kt,2045 -A1,3,newcapa,CONSUMABLE|ENERGY,wind,0.53333333333,all-week,R1,evening,2030,all-year,R1,power,windturbine,5,MUS$2010/kt,2045 -A1,4,newcapa,CONSUMABLE|ENERGY,wind,0.53333333333,all-week,R1,evening,2035,all-year,R1,power,windturbine,5,MUS$2010/kt,2045 -A1,5,newcapa,CONSUMABLE|ENERGY,wind,0.53333333333,all-week,R1,evening,2040,all-year,R1,power,windturbine,5,MUS$2010/kt,2045 -A1,5,newcapa,CONSUMABLE|ENERGY,electricity,0.71111111111,all-week,R1,night,2040,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2050 -A1,6,newcapa,CONSUMABLE|ENERGY,electricity,0.48888888889,all-week,R1,night,2045,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2050 -A1,5,newcapa,CONSUMABLE|ENERGY,electricity,1.06666666667,all-week,R1,morning,2040,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2050 -A1,6,newcapa,CONSUMABLE|ENERGY,electricity,0.73333333333,all-week,R1,morning,2045,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2050 -A1,5,newcapa,CONSUMABLE|ENERGY,electricity,0.71111111111,all-week,R1,afternoon,2040,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2050 -A1,6,newcapa,CONSUMABLE|ENERGY,electricity,0.48888888889,all-week,R1,afternoon,2045,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2050 -A1,5,newcapa,CONSUMABLE|ENERGY,electricity,1.06666666667,all-week,R1,early-peak,2040,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2050 -A1,6,newcapa,CONSUMABLE|ENERGY,electricity,0.73333333333,all-week,R1,early-peak,2045,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2050 -A1,5,newcapa,CONSUMABLE|ENERGY,electricity,2.13333333333,all-week,R1,late-peak,2040,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2050 -A1,6,newcapa,CONSUMABLE|ENERGY,electricity,1.46666666667,all-week,R1,late-peak,2045,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2050 -A1,5,newcapa,CONSUMABLE|ENERGY,electricity,1.42222222222,all-week,R1,evening,2040,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2050 -A1,6,newcapa,CONSUMABLE|ENERGY,electricity,0.97777777778,all-week,R1,evening,2045,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2050 -A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.13333333333,all-week,R1,night,2025,all-year,R1,power,windturbine,0,MUS$2010/kt,2050 -A1,3,newcapa,CONSUMABLE|ENERGY,wind,0.26666666667,all-week,R1,night,2030,all-year,R1,power,windturbine,0,MUS$2010/kt,2050 -A1,4,newcapa,CONSUMABLE|ENERGY,wind,0.26666666667,all-week,R1,night,2035,all-year,R1,power,windturbine,0,MUS$2010/kt,2050 -A1,5,newcapa,CONSUMABLE|ENERGY,wind,0.26666666667,all-week,R1,night,2040,all-year,R1,power,windturbine,0,MUS$2010/kt,2050 -A1,6,newcapa,CONSUMABLE|ENERGY,wind,0.26666666667,all-week,R1,night,2045,all-year,R1,power,windturbine,0,MUS$2010/kt,2050 -A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.20000000000,all-week,R1,morning,2025,all-year,R1,power,windturbine,1,MUS$2010/kt,2050 -A1,3,newcapa,CONSUMABLE|ENERGY,wind,0.40000000000,all-week,R1,morning,2030,all-year,R1,power,windturbine,1,MUS$2010/kt,2050 -A1,4,newcapa,CONSUMABLE|ENERGY,wind,0.40000000000,all-week,R1,morning,2035,all-year,R1,power,windturbine,1,MUS$2010/kt,2050 -A1,5,newcapa,CONSUMABLE|ENERGY,wind,0.40000000000,all-week,R1,morning,2040,all-year,R1,power,windturbine,1,MUS$2010/kt,2050 -A1,6,newcapa,CONSUMABLE|ENERGY,wind,0.40000000000,all-week,R1,morning,2045,all-year,R1,power,windturbine,1,MUS$2010/kt,2050 -A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.13333333333,all-week,R1,afternoon,2025,all-year,R1,power,windturbine,2,MUS$2010/kt,2050 -A1,3,newcapa,CONSUMABLE|ENERGY,wind,0.26666666667,all-week,R1,afternoon,2030,all-year,R1,power,windturbine,2,MUS$2010/kt,2050 -A1,4,newcapa,CONSUMABLE|ENERGY,wind,0.26666666667,all-week,R1,afternoon,2035,all-year,R1,power,windturbine,2,MUS$2010/kt,2050 -A1,5,newcapa,CONSUMABLE|ENERGY,wind,0.26666666667,all-week,R1,afternoon,2040,all-year,R1,power,windturbine,2,MUS$2010/kt,2050 -A1,6,newcapa,CONSUMABLE|ENERGY,wind,0.26666666667,all-week,R1,afternoon,2045,all-year,R1,power,windturbine,2,MUS$2010/kt,2050 -A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.20000000000,all-week,R1,early-peak,2025,all-year,R1,power,windturbine,3,MUS$2010/kt,2050 -A1,3,newcapa,CONSUMABLE|ENERGY,wind,0.40000000000,all-week,R1,early-peak,2030,all-year,R1,power,windturbine,3,MUS$2010/kt,2050 -A1,4,newcapa,CONSUMABLE|ENERGY,wind,0.40000000000,all-week,R1,early-peak,2035,all-year,R1,power,windturbine,3,MUS$2010/kt,2050 -A1,5,newcapa,CONSUMABLE|ENERGY,wind,0.40000000000,all-week,R1,early-peak,2040,all-year,R1,power,windturbine,3,MUS$2010/kt,2050 -A1,6,newcapa,CONSUMABLE|ENERGY,wind,0.40000000000,all-week,R1,early-peak,2045,all-year,R1,power,windturbine,3,MUS$2010/kt,2050 -A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.40000000000,all-week,R1,late-peak,2025,all-year,R1,power,windturbine,4,MUS$2010/kt,2050 -A1,3,newcapa,CONSUMABLE|ENERGY,wind,0.80000000000,all-week,R1,late-peak,2030,all-year,R1,power,windturbine,4,MUS$2010/kt,2050 -A1,4,newcapa,CONSUMABLE|ENERGY,wind,0.80000000000,all-week,R1,late-peak,2035,all-year,R1,power,windturbine,4,MUS$2010/kt,2050 -A1,5,newcapa,CONSUMABLE|ENERGY,wind,0.80000000000,all-week,R1,late-peak,2040,all-year,R1,power,windturbine,4,MUS$2010/kt,2050 -A1,6,newcapa,CONSUMABLE|ENERGY,wind,0.80000000000,all-week,R1,late-peak,2045,all-year,R1,power,windturbine,4,MUS$2010/kt,2050 -A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.26666666667,all-week,R1,evening,2025,all-year,R1,power,windturbine,5,MUS$2010/kt,2050 -A1,3,newcapa,CONSUMABLE|ENERGY,wind,0.53333333333,all-week,R1,evening,2030,all-year,R1,power,windturbine,5,MUS$2010/kt,2050 -A1,4,newcapa,CONSUMABLE|ENERGY,wind,0.53333333333,all-week,R1,evening,2035,all-year,R1,power,windturbine,5,MUS$2010/kt,2050 -A1,5,newcapa,CONSUMABLE|ENERGY,wind,0.53333333333,all-week,R1,evening,2040,all-year,R1,power,windturbine,5,MUS$2010/kt,2050 -A1,6,newcapa,CONSUMABLE|ENERGY,wind,0.53333333333,all-week,R1,evening,2045,all-year,R1,power,windturbine,5,MUS$2010/kt,2050 diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/MCAMetric_Supply.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/MCAMetric_Supply.csv deleted file mode 100644 index f55b1db27..000000000 --- a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/MCAMetric_Supply.csv +++ /dev/null @@ -1,235 +0,0 @@ -agent,asset,category,comm_usage,commodity,day,dst_region,hour,installed,month,region,sector,supply,technology,timeslice,units_prices,year -A1,0,newcapa,PRODUCT|ENERGY,heat,all-week,R1,night,2020,all-year,R1,residential,1.00000000000,gasboiler,0,MUS$2010/PJ,2020 -A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2020,all-year,R1,residential,64.71000000000,gasboiler,0,MUS$2010/kt,2020 -A1,0,newcapa,PRODUCT|ENERGY,heat,all-week,R1,morning,2020,all-year,R1,residential,1.50000000000,gasboiler,1,MUS$2010/PJ,2020 -A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2020,all-year,R1,residential,97.06500000000,gasboiler,1,MUS$2010/kt,2020 -A1,0,newcapa,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2020,all-year,R1,residential,1.00000000000,gasboiler,2,MUS$2010/PJ,2020 -A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2020,all-year,R1,residential,64.71000000000,gasboiler,2,MUS$2010/kt,2020 -A1,0,newcapa,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2020,all-year,R1,residential,1.50000000000,gasboiler,3,MUS$2010/PJ,2020 -A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2020,all-year,R1,residential,97.06500000000,gasboiler,3,MUS$2010/kt,2020 -A1,0,newcapa,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2020,all-year,R1,residential,3.00000000000,gasboiler,4,MUS$2010/PJ,2020 -A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2020,all-year,R1,residential,194.13000000000,gasboiler,4,MUS$2010/kt,2020 -A1,0,newcapa,PRODUCT|ENERGY,heat,all-week,R1,evening,2020,all-year,R1,residential,2.00000000000,gasboiler,5,MUS$2010/PJ,2020 -A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2020,all-year,R1,residential,129.42000000000,gasboiler,5,MUS$2010/kt,2020 -A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,night,2020,all-year,R1,gas,1.16732260678,gassupply1,0,MUS$2010/PJ,2020 -A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,morning,2020,all-year,R1,gas,1.88146776247,gassupply1,1,MUS$2010/PJ,2020 -A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2020,all-year,R1,gas,1.68925801597,gassupply1,2,MUS$2010/PJ,2020 -A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2020,all-year,R1,gas,1.88146776247,gassupply1,3,MUS$2010/PJ,2020 -A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2020,all-year,R1,gas,3.76293552495,gassupply1,4,MUS$2010/PJ,2020 -A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,evening,2020,all-year,R1,gas,3.11754832735,gassupply1,5,MUS$2010/PJ,2020 -A1,0,newcapa,PRODUCT|ENERGY,heat,all-week,R1,night,2020,all-year,R1,residential,0.27777777778,gasboiler,0,MUS$2010/PJ,2025 -A1,1,newcapa,PRODUCT|ENERGY,heat,all-week,R1,night,2020,all-year,R1,residential,1.05555555556,heatpump,0,MUS$2010/PJ,2025 -A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2020,all-year,R1,residential,17.97500000000,gasboiler,0,MUS$2010/kt,2025 -A1,0,newcapa,PRODUCT|ENERGY,heat,all-week,R1,morning,2020,all-year,R1,residential,0.41666666667,gasboiler,1,MUS$2010/PJ,2025 -A1,1,newcapa,PRODUCT|ENERGY,heat,all-week,R1,morning,2020,all-year,R1,residential,1.58333333333,heatpump,1,MUS$2010/PJ,2025 -A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2020,all-year,R1,residential,26.96250000000,gasboiler,1,MUS$2010/kt,2025 -A1,0,newcapa,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2020,all-year,R1,residential,0.27777777778,gasboiler,2,MUS$2010/PJ,2025 -A1,1,newcapa,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2020,all-year,R1,residential,1.05555555556,heatpump,2,MUS$2010/PJ,2025 -A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2020,all-year,R1,residential,17.97500000000,gasboiler,2,MUS$2010/kt,2025 -A1,0,newcapa,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2020,all-year,R1,residential,0.41666666667,gasboiler,3,MUS$2010/PJ,2025 -A1,1,newcapa,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2020,all-year,R1,residential,1.58333333333,heatpump,3,MUS$2010/PJ,2025 -A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2020,all-year,R1,residential,26.96250000000,gasboiler,3,MUS$2010/kt,2025 -A1,0,newcapa,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2020,all-year,R1,residential,0.83333333333,gasboiler,4,MUS$2010/PJ,2025 -A1,1,newcapa,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2020,all-year,R1,residential,3.16666666667,heatpump,4,MUS$2010/PJ,2025 -A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2020,all-year,R1,residential,53.92500000000,gasboiler,4,MUS$2010/kt,2025 -A1,0,newcapa,PRODUCT|ENERGY,heat,all-week,R1,evening,2020,all-year,R1,residential,0.55555555556,gasboiler,5,MUS$2010/PJ,2025 -A1,1,newcapa,PRODUCT|ENERGY,heat,all-week,R1,evening,2020,all-year,R1,residential,2.11111111111,heatpump,5,MUS$2010/PJ,2025 -A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2020,all-year,R1,residential,35.95000000000,gasboiler,5,MUS$2010/kt,2025 -A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.21111111111,gasCCGT,0,MUS$2010/PJ,2025 -A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.21111111111,windturbine,0,MUS$2010/PJ,2025 -A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2020,all-year,R1,power,19.35255555556,gasCCGT,0,MUS$2010/kt,2025 -A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.31666666667,gasCCGT,1,MUS$2010/PJ,2025 -A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.31666666667,windturbine,1,MUS$2010/PJ,2025 -A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2020,all-year,R1,power,29.02883333333,gasCCGT,1,MUS$2010/kt,2025 -A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.21111111111,gasCCGT,2,MUS$2010/PJ,2025 -A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.21111111111,windturbine,2,MUS$2010/PJ,2025 -A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2020,all-year,R1,power,19.35255555556,gasCCGT,2,MUS$2010/kt,2025 -A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.31666666667,gasCCGT,3,MUS$2010/PJ,2025 -A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.31666666667,windturbine,3,MUS$2010/PJ,2025 -A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2020,all-year,R1,power,29.02883333333,gasCCGT,3,MUS$2010/kt,2025 -A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.63333333333,gasCCGT,4,MUS$2010/PJ,2025 -A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.63333333333,windturbine,4,MUS$2010/PJ,2025 -A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2020,all-year,R1,power,58.05766666667,gasCCGT,4,MUS$2010/kt,2025 -A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.42222222222,gasCCGT,5,MUS$2010/PJ,2025 -A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.42222222222,windturbine,5,MUS$2010/PJ,2025 -A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2020,all-year,R1,power,38.70511111111,gasCCGT,5,MUS$2010/kt,2025 -A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,night,2020,all-year,R1,gas,0.65622222222,gassupply1,0,MUS$2010/PJ,2025 -A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,morning,2020,all-year,R1,gas,1.15133333333,gassupply1,1,MUS$2010/PJ,2025 -A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2020,all-year,R1,gas,1.32422222222,gassupply1,2,MUS$2010/PJ,2025 -A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2020,all-year,R1,gas,1.15133333333,gassupply1,3,MUS$2010/PJ,2025 -A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2020,all-year,R1,gas,2.30266666667,gassupply1,4,MUS$2010/PJ,2025 -A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,evening,2020,all-year,R1,gas,2.31444444444,gassupply1,5,MUS$2010/PJ,2025 -A1,1,newcapa,PRODUCT|ENERGY,heat,all-week,R1,night,2020,all-year,R1,residential,1.09195402299,heatpump,0,MUS$2010/PJ,2030 -A1,2,newcapa,PRODUCT|ENERGY,heat,all-week,R1,night,2025,all-year,R1,residential,0.57471264368,heatpump,0,MUS$2010/PJ,2030 -A1,1,newcapa,PRODUCT|ENERGY,heat,all-week,R1,morning,2020,all-year,R1,residential,1.63793103448,heatpump,1,MUS$2010/PJ,2030 -A1,2,newcapa,PRODUCT|ENERGY,heat,all-week,R1,morning,2025,all-year,R1,residential,0.86206896552,heatpump,1,MUS$2010/PJ,2030 -A1,1,newcapa,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2020,all-year,R1,residential,1.09195402299,heatpump,2,MUS$2010/PJ,2030 -A1,2,newcapa,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2025,all-year,R1,residential,0.57471264368,heatpump,2,MUS$2010/PJ,2030 -A1,1,newcapa,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2020,all-year,R1,residential,1.63793103448,heatpump,3,MUS$2010/PJ,2030 -A1,2,newcapa,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2025,all-year,R1,residential,0.86206896552,heatpump,3,MUS$2010/PJ,2030 -A1,1,newcapa,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2020,all-year,R1,residential,3.27586206897,heatpump,4,MUS$2010/PJ,2030 -A1,2,newcapa,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2025,all-year,R1,residential,1.72413793103,heatpump,4,MUS$2010/PJ,2030 -A1,1,newcapa,PRODUCT|ENERGY,heat,all-week,R1,evening,2020,all-year,R1,residential,2.18390804598,heatpump,5,MUS$2010/PJ,2030 -A1,2,newcapa,PRODUCT|ENERGY,heat,all-week,R1,evening,2025,all-year,R1,residential,1.14942528736,heatpump,5,MUS$2010/PJ,2030 -A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.33333333333,windturbine,0,MUS$2010/PJ,2030 -A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.33333333333,windturbine,0,MUS$2010/PJ,2030 -A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.50000000000,windturbine,1,MUS$2010/PJ,2030 -A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.50000000000,windturbine,1,MUS$2010/PJ,2030 -A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.33333333333,windturbine,2,MUS$2010/PJ,2030 -A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.33333333333,windturbine,2,MUS$2010/PJ,2030 -A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.50000000000,windturbine,3,MUS$2010/PJ,2030 -A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.50000000000,windturbine,3,MUS$2010/PJ,2030 -A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,1.00000000000,windturbine,4,MUS$2010/PJ,2030 -A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,1.00000000000,windturbine,4,MUS$2010/PJ,2030 -A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.66666666667,windturbine,5,MUS$2010/PJ,2030 -A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.66666666667,windturbine,5,MUS$2010/PJ,2030 -A1,2,newcapa,PRODUCT|ENERGY,heat,all-week,R1,night,2025,all-year,R1,residential,0.55555555556,heatpump,0,MUS$2010/PJ,2035 -A1,3,newcapa,PRODUCT|ENERGY,heat,all-week,R1,night,2030,all-year,R1,residential,1.44444444444,heatpump,0,MUS$2010/PJ,2035 -A1,2,newcapa,PRODUCT|ENERGY,heat,all-week,R1,morning,2025,all-year,R1,residential,0.83333333333,heatpump,1,MUS$2010/PJ,2035 -A1,3,newcapa,PRODUCT|ENERGY,heat,all-week,R1,morning,2030,all-year,R1,residential,2.16666666667,heatpump,1,MUS$2010/PJ,2035 -A1,2,newcapa,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2025,all-year,R1,residential,0.55555555556,heatpump,2,MUS$2010/PJ,2035 -A1,3,newcapa,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2030,all-year,R1,residential,1.44444444444,heatpump,2,MUS$2010/PJ,2035 -A1,2,newcapa,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2025,all-year,R1,residential,0.83333333333,heatpump,3,MUS$2010/PJ,2035 -A1,3,newcapa,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2030,all-year,R1,residential,2.16666666667,heatpump,3,MUS$2010/PJ,2035 -A1,2,newcapa,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2025,all-year,R1,residential,1.66666666667,heatpump,4,MUS$2010/PJ,2035 -A1,3,newcapa,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2030,all-year,R1,residential,4.33333333333,heatpump,4,MUS$2010/PJ,2035 -A1,2,newcapa,PRODUCT|ENERGY,heat,all-week,R1,evening,2025,all-year,R1,residential,1.11111111111,heatpump,5,MUS$2010/PJ,2035 -A1,3,newcapa,PRODUCT|ENERGY,heat,all-week,R1,evening,2030,all-year,R1,residential,2.88888888889,heatpump,5,MUS$2010/PJ,2035 -A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.20000000000,windturbine,0,MUS$2010/PJ,2035 -A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.20000000000,windturbine,0,MUS$2010/PJ,2035 -A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2030,all-year,R1,power,0.40000000000,windturbine,0,MUS$2010/PJ,2035 -A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.30000000000,windturbine,1,MUS$2010/PJ,2035 -A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.30000000000,windturbine,1,MUS$2010/PJ,2035 -A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2030,all-year,R1,power,0.60000000000,windturbine,1,MUS$2010/PJ,2035 -A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.20000000000,windturbine,2,MUS$2010/PJ,2035 -A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.20000000000,windturbine,2,MUS$2010/PJ,2035 -A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2030,all-year,R1,power,0.40000000000,windturbine,2,MUS$2010/PJ,2035 -A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.30000000000,windturbine,3,MUS$2010/PJ,2035 -A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.30000000000,windturbine,3,MUS$2010/PJ,2035 -A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2030,all-year,R1,power,0.60000000000,windturbine,3,MUS$2010/PJ,2035 -A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.60000000000,windturbine,4,MUS$2010/PJ,2035 -A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.60000000000,windturbine,4,MUS$2010/PJ,2035 -A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2030,all-year,R1,power,1.20000000000,windturbine,4,MUS$2010/PJ,2035 -A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.40000000000,windturbine,5,MUS$2010/PJ,2035 -A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.40000000000,windturbine,5,MUS$2010/PJ,2035 -A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2030,all-year,R1,power,0.80000000000,windturbine,5,MUS$2010/PJ,2035 -A1,3,newcapa,PRODUCT|ENERGY,heat,all-week,R1,night,2030,all-year,R1,residential,1.44444444444,heatpump,0,MUS$2010/PJ,2040 -A1,4,newcapa,PRODUCT|ENERGY,heat,all-week,R1,night,2035,all-year,R1,residential,0.88888888889,heatpump,0,MUS$2010/PJ,2040 -A1,3,newcapa,PRODUCT|ENERGY,heat,all-week,R1,morning,2030,all-year,R1,residential,2.16666666667,heatpump,1,MUS$2010/PJ,2040 -A1,4,newcapa,PRODUCT|ENERGY,heat,all-week,R1,morning,2035,all-year,R1,residential,1.33333333333,heatpump,1,MUS$2010/PJ,2040 -A1,3,newcapa,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2030,all-year,R1,residential,1.44444444444,heatpump,2,MUS$2010/PJ,2040 -A1,4,newcapa,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2035,all-year,R1,residential,0.88888888889,heatpump,2,MUS$2010/PJ,2040 -A1,3,newcapa,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2030,all-year,R1,residential,2.16666666667,heatpump,3,MUS$2010/PJ,2040 -A1,4,newcapa,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2035,all-year,R1,residential,1.33333333333,heatpump,3,MUS$2010/PJ,2040 -A1,3,newcapa,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2030,all-year,R1,residential,4.33333333333,heatpump,4,MUS$2010/PJ,2040 -A1,4,newcapa,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2035,all-year,R1,residential,2.66666666667,heatpump,4,MUS$2010/PJ,2040 -A1,3,newcapa,PRODUCT|ENERGY,heat,all-week,R1,evening,2030,all-year,R1,residential,2.88888888889,heatpump,5,MUS$2010/PJ,2040 -A1,4,newcapa,PRODUCT|ENERGY,heat,all-week,R1,evening,2035,all-year,R1,residential,1.77777777778,heatpump,5,MUS$2010/PJ,2040 -A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.15555555556,windturbine,0,MUS$2010/PJ,2040 -A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.15555555556,windturbine,0,MUS$2010/PJ,2040 -A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2030,all-year,R1,power,0.31111111111,windturbine,0,MUS$2010/PJ,2040 -A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2035,all-year,R1,power,0.31111111111,windturbine,0,MUS$2010/PJ,2040 -A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.23333333333,windturbine,1,MUS$2010/PJ,2040 -A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.23333333333,windturbine,1,MUS$2010/PJ,2040 -A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2030,all-year,R1,power,0.46666666667,windturbine,1,MUS$2010/PJ,2040 -A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2035,all-year,R1,power,0.46666666667,windturbine,1,MUS$2010/PJ,2040 -A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.15555555556,windturbine,2,MUS$2010/PJ,2040 -A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.15555555556,windturbine,2,MUS$2010/PJ,2040 -A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2030,all-year,R1,power,0.31111111111,windturbine,2,MUS$2010/PJ,2040 -A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2035,all-year,R1,power,0.31111111111,windturbine,2,MUS$2010/PJ,2040 -A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.23333333333,windturbine,3,MUS$2010/PJ,2040 -A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.23333333333,windturbine,3,MUS$2010/PJ,2040 -A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2030,all-year,R1,power,0.46666666667,windturbine,3,MUS$2010/PJ,2040 -A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2035,all-year,R1,power,0.46666666667,windturbine,3,MUS$2010/PJ,2040 -A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.46666666667,windturbine,4,MUS$2010/PJ,2040 -A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.46666666667,windturbine,4,MUS$2010/PJ,2040 -A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2030,all-year,R1,power,0.93333333333,windturbine,4,MUS$2010/PJ,2040 -A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2035,all-year,R1,power,0.93333333333,windturbine,4,MUS$2010/PJ,2040 -A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.31111111111,windturbine,5,MUS$2010/PJ,2040 -A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.31111111111,windturbine,5,MUS$2010/PJ,2040 -A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2030,all-year,R1,power,0.62222222222,windturbine,5,MUS$2010/PJ,2040 -A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2035,all-year,R1,power,0.62222222222,windturbine,5,MUS$2010/PJ,2040 -A1,4,newcapa,PRODUCT|ENERGY,heat,all-week,R1,night,2035,all-year,R1,residential,0.88888888889,heatpump,0,MUS$2010/PJ,2045 -A1,5,newcapa,PRODUCT|ENERGY,heat,all-week,R1,night,2040,all-year,R1,residential,1.77777777778,heatpump,0,MUS$2010/PJ,2045 -A1,4,newcapa,PRODUCT|ENERGY,heat,all-week,R1,morning,2035,all-year,R1,residential,1.33333333333,heatpump,1,MUS$2010/PJ,2045 -A1,5,newcapa,PRODUCT|ENERGY,heat,all-week,R1,morning,2040,all-year,R1,residential,2.66666666667,heatpump,1,MUS$2010/PJ,2045 -A1,4,newcapa,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2035,all-year,R1,residential,0.88888888889,heatpump,2,MUS$2010/PJ,2045 -A1,5,newcapa,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2040,all-year,R1,residential,1.77777777778,heatpump,2,MUS$2010/PJ,2045 -A1,4,newcapa,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2035,all-year,R1,residential,1.33333333333,heatpump,3,MUS$2010/PJ,2045 -A1,5,newcapa,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2040,all-year,R1,residential,2.66666666667,heatpump,3,MUS$2010/PJ,2045 -A1,4,newcapa,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2035,all-year,R1,residential,2.66666666667,heatpump,4,MUS$2010/PJ,2045 -A1,5,newcapa,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2040,all-year,R1,residential,5.33333333333,heatpump,4,MUS$2010/PJ,2045 -A1,4,newcapa,PRODUCT|ENERGY,heat,all-week,R1,evening,2035,all-year,R1,residential,1.77777777778,heatpump,5,MUS$2010/PJ,2045 -A1,5,newcapa,PRODUCT|ENERGY,heat,all-week,R1,evening,2040,all-year,R1,residential,3.55555555556,heatpump,5,MUS$2010/PJ,2045 -A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.13333333333,windturbine,0,MUS$2010/PJ,2045 -A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.13333333333,windturbine,0,MUS$2010/PJ,2045 -A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2030,all-year,R1,power,0.26666666667,windturbine,0,MUS$2010/PJ,2045 -A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2035,all-year,R1,power,0.26666666667,windturbine,0,MUS$2010/PJ,2045 -A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2040,all-year,R1,power,0.26666666667,windturbine,0,MUS$2010/PJ,2045 -A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.20000000000,windturbine,1,MUS$2010/PJ,2045 -A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.20000000000,windturbine,1,MUS$2010/PJ,2045 -A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2030,all-year,R1,power,0.40000000000,windturbine,1,MUS$2010/PJ,2045 -A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2035,all-year,R1,power,0.40000000000,windturbine,1,MUS$2010/PJ,2045 -A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2040,all-year,R1,power,0.40000000000,windturbine,1,MUS$2010/PJ,2045 -A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.13333333333,windturbine,2,MUS$2010/PJ,2045 -A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.13333333333,windturbine,2,MUS$2010/PJ,2045 -A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2030,all-year,R1,power,0.26666666667,windturbine,2,MUS$2010/PJ,2045 -A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2035,all-year,R1,power,0.26666666667,windturbine,2,MUS$2010/PJ,2045 -A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2040,all-year,R1,power,0.26666666667,windturbine,2,MUS$2010/PJ,2045 -A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.20000000000,windturbine,3,MUS$2010/PJ,2045 -A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.20000000000,windturbine,3,MUS$2010/PJ,2045 -A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2030,all-year,R1,power,0.40000000000,windturbine,3,MUS$2010/PJ,2045 -A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2035,all-year,R1,power,0.40000000000,windturbine,3,MUS$2010/PJ,2045 -A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2040,all-year,R1,power,0.40000000000,windturbine,3,MUS$2010/PJ,2045 -A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.40000000000,windturbine,4,MUS$2010/PJ,2045 -A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.40000000000,windturbine,4,MUS$2010/PJ,2045 -A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2030,all-year,R1,power,0.80000000000,windturbine,4,MUS$2010/PJ,2045 -A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2035,all-year,R1,power,0.80000000000,windturbine,4,MUS$2010/PJ,2045 -A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2040,all-year,R1,power,0.80000000000,windturbine,4,MUS$2010/PJ,2045 -A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.26666666667,windturbine,5,MUS$2010/PJ,2045 -A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.26666666667,windturbine,5,MUS$2010/PJ,2045 -A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2030,all-year,R1,power,0.53333333333,windturbine,5,MUS$2010/PJ,2045 -A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2035,all-year,R1,power,0.53333333333,windturbine,5,MUS$2010/PJ,2045 -A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2040,all-year,R1,power,0.53333333333,windturbine,5,MUS$2010/PJ,2045 -A1,5,newcapa,PRODUCT|ENERGY,heat,all-week,R1,night,2040,all-year,R1,residential,1.77777777778,heatpump,0,MUS$2010/PJ,2050 -A1,6,newcapa,PRODUCT|ENERGY,heat,all-week,R1,night,2045,all-year,R1,residential,1.22222222222,heatpump,0,MUS$2010/PJ,2050 -A1,5,newcapa,PRODUCT|ENERGY,heat,all-week,R1,morning,2040,all-year,R1,residential,2.66666666667,heatpump,1,MUS$2010/PJ,2050 -A1,6,newcapa,PRODUCT|ENERGY,heat,all-week,R1,morning,2045,all-year,R1,residential,1.83333333333,heatpump,1,MUS$2010/PJ,2050 -A1,5,newcapa,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2040,all-year,R1,residential,1.77777777778,heatpump,2,MUS$2010/PJ,2050 -A1,6,newcapa,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2045,all-year,R1,residential,1.22222222222,heatpump,2,MUS$2010/PJ,2050 -A1,5,newcapa,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2040,all-year,R1,residential,2.66666666667,heatpump,3,MUS$2010/PJ,2050 -A1,6,newcapa,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2045,all-year,R1,residential,1.83333333333,heatpump,3,MUS$2010/PJ,2050 -A1,5,newcapa,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2040,all-year,R1,residential,5.33333333333,heatpump,4,MUS$2010/PJ,2050 -A1,6,newcapa,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2045,all-year,R1,residential,3.66666666667,heatpump,4,MUS$2010/PJ,2050 -A1,5,newcapa,PRODUCT|ENERGY,heat,all-week,R1,evening,2040,all-year,R1,residential,3.55555555556,heatpump,5,MUS$2010/PJ,2050 -A1,6,newcapa,PRODUCT|ENERGY,heat,all-week,R1,evening,2045,all-year,R1,residential,2.44444444444,heatpump,5,MUS$2010/PJ,2050 -A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.13333333333,windturbine,0,MUS$2010/PJ,2050 -A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2030,all-year,R1,power,0.26666666667,windturbine,0,MUS$2010/PJ,2050 -A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2035,all-year,R1,power,0.26666666667,windturbine,0,MUS$2010/PJ,2050 -A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2040,all-year,R1,power,0.26666666667,windturbine,0,MUS$2010/PJ,2050 -A1,6,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2045,all-year,R1,power,0.26666666667,windturbine,0,MUS$2010/PJ,2050 -A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.20000000000,windturbine,1,MUS$2010/PJ,2050 -A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2030,all-year,R1,power,0.40000000000,windturbine,1,MUS$2010/PJ,2050 -A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2035,all-year,R1,power,0.40000000000,windturbine,1,MUS$2010/PJ,2050 -A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2040,all-year,R1,power,0.40000000000,windturbine,1,MUS$2010/PJ,2050 -A1,6,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2045,all-year,R1,power,0.40000000000,windturbine,1,MUS$2010/PJ,2050 -A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.13333333333,windturbine,2,MUS$2010/PJ,2050 -A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2030,all-year,R1,power,0.26666666667,windturbine,2,MUS$2010/PJ,2050 -A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2035,all-year,R1,power,0.26666666667,windturbine,2,MUS$2010/PJ,2050 -A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2040,all-year,R1,power,0.26666666667,windturbine,2,MUS$2010/PJ,2050 -A1,6,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2045,all-year,R1,power,0.26666666667,windturbine,2,MUS$2010/PJ,2050 -A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.20000000000,windturbine,3,MUS$2010/PJ,2050 -A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2030,all-year,R1,power,0.40000000000,windturbine,3,MUS$2010/PJ,2050 -A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2035,all-year,R1,power,0.40000000000,windturbine,3,MUS$2010/PJ,2050 -A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2040,all-year,R1,power,0.40000000000,windturbine,3,MUS$2010/PJ,2050 -A1,6,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2045,all-year,R1,power,0.40000000000,windturbine,3,MUS$2010/PJ,2050 -A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.40000000000,windturbine,4,MUS$2010/PJ,2050 -A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2030,all-year,R1,power,0.80000000000,windturbine,4,MUS$2010/PJ,2050 -A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2035,all-year,R1,power,0.80000000000,windturbine,4,MUS$2010/PJ,2050 -A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2040,all-year,R1,power,0.80000000000,windturbine,4,MUS$2010/PJ,2050 -A1,6,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2045,all-year,R1,power,0.80000000000,windturbine,4,MUS$2010/PJ,2050 -A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.26666666667,windturbine,5,MUS$2010/PJ,2050 -A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2030,all-year,R1,power,0.53333333333,windturbine,5,MUS$2010/PJ,2050 -A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2035,all-year,R1,power,0.53333333333,windturbine,5,MUS$2010/PJ,2050 -A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2040,all-year,R1,power,0.53333333333,windturbine,5,MUS$2010/PJ,2050 -A1,6,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2045,all-year,R1,power,0.53333333333,windturbine,5,MUS$2010/PJ,2050 diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Capacity.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Capacity.csv deleted file mode 100644 index 48c981a8d..000000000 --- a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Capacity.csv +++ /dev/null @@ -1,23 +0,0 @@ -asset,capacity,installed,region,technology,year -0,1,2020,R1,gasCCGT,2020 -0,1,2020,R1,gasCCGT,2025 -1,1,2020,R1,windturbine,2025 -1,1,2020,R1,windturbine,2030 -2,1,2025,R1,windturbine,2030 -1,1,2020,R1,windturbine,2035 -2,1,2025,R1,windturbine,2035 -3,2,2030,R1,windturbine,2035 -1,1,2020,R1,windturbine,2040 -2,1,2025,R1,windturbine,2040 -3,2,2030,R1,windturbine,2040 -4,2,2035,R1,windturbine,2040 -1,1,2020,R1,windturbine,2045 -2,1,2025,R1,windturbine,2045 -3,2,2030,R1,windturbine,2045 -4,2,2035,R1,windturbine,2045 -5,2,2040,R1,windturbine,2045 -2,1,2025,R1,windturbine,2050 -3,2,2030,R1,windturbine,2050 -4,2,2035,R1,windturbine,2050 -5,2,2040,R1,windturbine,2050 -6,2,2045,R1,windturbine,2050 diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Supply.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Supply.csv deleted file mode 100644 index 6dd1abdec..000000000 --- a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Supply.csv +++ /dev/null @@ -1,143 +0,0 @@ -asset,commodity,day,hour,installed,month,region,supply,technology,timeslice,year -0,electricity,all-week,night,2020,all-year,R1,0.20000000000,gasCCGT,0,2020 -0,CO2f,all-week,night,2020,all-year,R1,18.33400000000,gasCCGT,0,2020 -0,electricity,all-week,morning,2020,all-year,R1,0.40000000000,gasCCGT,1,2020 -0,CO2f,all-week,morning,2020,all-year,R1,36.66800000000,gasCCGT,1,2020 -0,electricity,all-week,afternoon,2020,all-year,R1,0.60000000000,gasCCGT,2,2020 -0,CO2f,all-week,afternoon,2020,all-year,R1,55.00200000000,gasCCGT,2,2020 -0,electricity,all-week,early-peak,2020,all-year,R1,0.40000000000,gasCCGT,3,2020 -0,CO2f,all-week,early-peak,2020,all-year,R1,36.66800000000,gasCCGT,3,2020 -0,electricity,all-week,late-peak,2020,all-year,R1,0.80000000000,gasCCGT,4,2020 -0,CO2f,all-week,late-peak,2020,all-year,R1,73.33600000000,gasCCGT,4,2020 -0,electricity,all-week,evening,2020,all-year,R1,1.00000000000,gasCCGT,5,2020 -0,CO2f,all-week,evening,2020,all-year,R1,91.67000000000,gasCCGT,5,2020 -0,electricity,all-week,night,2020,all-year,R1,0.20000000000,gasCCGT,0,2025 -0,CO2f,all-week,night,2020,all-year,R1,18.33400000000,gasCCGT,0,2025 -1,electricity,all-week,night,2020,all-year,R1,0.22220000000,windturbine,0,2025 -0,electricity,all-week,morning,2020,all-year,R1,0.40000000000,gasCCGT,1,2025 -0,CO2f,all-week,morning,2020,all-year,R1,36.66800000000,gasCCGT,1,2025 -1,electricity,all-week,morning,2020,all-year,R1,0.23330000000,windturbine,1,2025 -0,electricity,all-week,afternoon,2020,all-year,R1,0.60000000000,gasCCGT,2,2025 -0,CO2f,all-week,afternoon,2020,all-year,R1,55.00200000000,gasCCGT,2,2025 -0,electricity,all-week,early-peak,2020,all-year,R1,0.40000000000,gasCCGT,3,2025 -0,CO2f,all-week,early-peak,2020,all-year,R1,36.66800000000,gasCCGT,3,2025 -1,electricity,all-week,early-peak,2020,all-year,R1,0.23330000000,windturbine,3,2025 -0,electricity,all-week,late-peak,2020,all-year,R1,0.80000000000,gasCCGT,4,2025 -0,CO2f,all-week,late-peak,2020,all-year,R1,73.33600000000,gasCCGT,4,2025 -1,electricity,all-week,late-peak,2020,all-year,R1,0.46670000000,windturbine,4,2025 -0,electricity,all-week,evening,2020,all-year,R1,1.00000000000,gasCCGT,5,2025 -0,CO2f,all-week,evening,2020,all-year,R1,91.67000000000,gasCCGT,5,2025 -1,electricity,all-week,night,2020,all-year,R1,0.33330000000,windturbine,0,2030 -2,electricity,all-week,night,2025,all-year,R1,0.33330000000,windturbine,0,2030 -1,electricity,all-week,morning,2020,all-year,R1,0.50000000000,windturbine,1,2030 -2,electricity,all-week,morning,2025,all-year,R1,0.50000000000,windturbine,1,2030 -1,electricity,all-week,afternoon,2020,all-year,R1,0.33330000000,windturbine,2,2030 -2,electricity,all-week,afternoon,2025,all-year,R1,0.33330000000,windturbine,2,2030 -1,electricity,all-week,early-peak,2020,all-year,R1,0.50000000000,windturbine,3,2030 -2,electricity,all-week,early-peak,2025,all-year,R1,0.50000000000,windturbine,3,2030 -1,electricity,all-week,late-peak,2020,all-year,R1,1.00000000000,windturbine,4,2030 -2,electricity,all-week,late-peak,2025,all-year,R1,1.00000000000,windturbine,4,2030 -1,electricity,all-week,evening,2020,all-year,R1,0.66670000000,windturbine,5,2030 -2,electricity,all-week,evening,2025,all-year,R1,0.66670000000,windturbine,5,2030 -1,electricity,all-week,night,2020,all-year,R1,0.20000000000,windturbine,0,2035 -2,electricity,all-week,night,2025,all-year,R1,0.20000000000,windturbine,0,2035 -3,electricity,all-week,night,2030,all-year,R1,0.40000000000,windturbine,0,2035 -1,electricity,all-week,morning,2020,all-year,R1,0.30000000000,windturbine,1,2035 -2,electricity,all-week,morning,2025,all-year,R1,0.30000000000,windturbine,1,2035 -3,electricity,all-week,morning,2030,all-year,R1,0.60000000000,windturbine,1,2035 -1,electricity,all-week,afternoon,2020,all-year,R1,0.20000000000,windturbine,2,2035 -2,electricity,all-week,afternoon,2025,all-year,R1,0.20000000000,windturbine,2,2035 -3,electricity,all-week,afternoon,2030,all-year,R1,0.40000000000,windturbine,2,2035 -1,electricity,all-week,early-peak,2020,all-year,R1,0.30000000000,windturbine,3,2035 -2,electricity,all-week,early-peak,2025,all-year,R1,0.30000000000,windturbine,3,2035 -3,electricity,all-week,early-peak,2030,all-year,R1,0.60000000000,windturbine,3,2035 -1,electricity,all-week,late-peak,2020,all-year,R1,0.60000000000,windturbine,4,2035 -2,electricity,all-week,late-peak,2025,all-year,R1,0.60000000000,windturbine,4,2035 -3,electricity,all-week,late-peak,2030,all-year,R1,1.20000000000,windturbine,4,2035 -1,electricity,all-week,evening,2020,all-year,R1,0.40000000000,windturbine,5,2035 -2,electricity,all-week,evening,2025,all-year,R1,0.40000000000,windturbine,5,2035 -3,electricity,all-week,evening,2030,all-year,R1,0.80000000000,windturbine,5,2035 -1,electricity,all-week,night,2020,all-year,R1,0.15560000000,windturbine,0,2040 -2,electricity,all-week,night,2025,all-year,R1,0.15560000000,windturbine,0,2040 -3,electricity,all-week,night,2030,all-year,R1,0.31110000000,windturbine,0,2040 -4,electricity,all-week,night,2035,all-year,R1,0.31110000000,windturbine,0,2040 -1,electricity,all-week,morning,2020,all-year,R1,0.23330000000,windturbine,1,2040 -2,electricity,all-week,morning,2025,all-year,R1,0.23330000000,windturbine,1,2040 -3,electricity,all-week,morning,2030,all-year,R1,0.46670000000,windturbine,1,2040 -4,electricity,all-week,morning,2035,all-year,R1,0.46670000000,windturbine,1,2040 -1,electricity,all-week,afternoon,2020,all-year,R1,0.15560000000,windturbine,2,2040 -2,electricity,all-week,afternoon,2025,all-year,R1,0.15560000000,windturbine,2,2040 -3,electricity,all-week,afternoon,2030,all-year,R1,0.31110000000,windturbine,2,2040 -4,electricity,all-week,afternoon,2035,all-year,R1,0.31110000000,windturbine,2,2040 -1,electricity,all-week,early-peak,2020,all-year,R1,0.23330000000,windturbine,3,2040 -2,electricity,all-week,early-peak,2025,all-year,R1,0.23330000000,windturbine,3,2040 -3,electricity,all-week,early-peak,2030,all-year,R1,0.46670000000,windturbine,3,2040 -4,electricity,all-week,early-peak,2035,all-year,R1,0.46670000000,windturbine,3,2040 -1,electricity,all-week,late-peak,2020,all-year,R1,0.46670000000,windturbine,4,2040 -2,electricity,all-week,late-peak,2025,all-year,R1,0.46670000000,windturbine,4,2040 -3,electricity,all-week,late-peak,2030,all-year,R1,0.93330000000,windturbine,4,2040 -4,electricity,all-week,late-peak,2035,all-year,R1,0.93330000000,windturbine,4,2040 -1,electricity,all-week,evening,2020,all-year,R1,0.31110000000,windturbine,5,2040 -2,electricity,all-week,evening,2025,all-year,R1,0.31110000000,windturbine,5,2040 -3,electricity,all-week,evening,2030,all-year,R1,0.62220000000,windturbine,5,2040 -4,electricity,all-week,evening,2035,all-year,R1,0.62220000000,windturbine,5,2040 -1,electricity,all-week,night,2020,all-year,R1,0.13330000000,windturbine,0,2045 -2,electricity,all-week,night,2025,all-year,R1,0.13330000000,windturbine,0,2045 -3,electricity,all-week,night,2030,all-year,R1,0.26670000000,windturbine,0,2045 -4,electricity,all-week,night,2035,all-year,R1,0.26670000000,windturbine,0,2045 -5,electricity,all-week,night,2040,all-year,R1,0.26670000000,windturbine,0,2045 -1,electricity,all-week,morning,2020,all-year,R1,0.20000000000,windturbine,1,2045 -2,electricity,all-week,morning,2025,all-year,R1,0.20000000000,windturbine,1,2045 -3,electricity,all-week,morning,2030,all-year,R1,0.40000000000,windturbine,1,2045 -4,electricity,all-week,morning,2035,all-year,R1,0.40000000000,windturbine,1,2045 -5,electricity,all-week,morning,2040,all-year,R1,0.40000000000,windturbine,1,2045 -1,electricity,all-week,afternoon,2020,all-year,R1,0.13330000000,windturbine,2,2045 -2,electricity,all-week,afternoon,2025,all-year,R1,0.13330000000,windturbine,2,2045 -3,electricity,all-week,afternoon,2030,all-year,R1,0.26670000000,windturbine,2,2045 -4,electricity,all-week,afternoon,2035,all-year,R1,0.26670000000,windturbine,2,2045 -5,electricity,all-week,afternoon,2040,all-year,R1,0.26670000000,windturbine,2,2045 -1,electricity,all-week,early-peak,2020,all-year,R1,0.20000000000,windturbine,3,2045 -2,electricity,all-week,early-peak,2025,all-year,R1,0.20000000000,windturbine,3,2045 -3,electricity,all-week,early-peak,2030,all-year,R1,0.40000000000,windturbine,3,2045 -4,electricity,all-week,early-peak,2035,all-year,R1,0.40000000000,windturbine,3,2045 -5,electricity,all-week,early-peak,2040,all-year,R1,0.40000000000,windturbine,3,2045 -1,electricity,all-week,late-peak,2020,all-year,R1,0.40000000000,windturbine,4,2045 -2,electricity,all-week,late-peak,2025,all-year,R1,0.40000000000,windturbine,4,2045 -3,electricity,all-week,late-peak,2030,all-year,R1,0.80000000000,windturbine,4,2045 -4,electricity,all-week,late-peak,2035,all-year,R1,0.80000000000,windturbine,4,2045 -5,electricity,all-week,late-peak,2040,all-year,R1,0.80000000000,windturbine,4,2045 -1,electricity,all-week,evening,2020,all-year,R1,0.26670000000,windturbine,5,2045 -2,electricity,all-week,evening,2025,all-year,R1,0.26670000000,windturbine,5,2045 -3,electricity,all-week,evening,2030,all-year,R1,0.53330000000,windturbine,5,2045 -4,electricity,all-week,evening,2035,all-year,R1,0.53330000000,windturbine,5,2045 -5,electricity,all-week,evening,2040,all-year,R1,0.53330000000,windturbine,5,2045 -2,electricity,all-week,night,2025,all-year,R1,0.13330000000,windturbine,0,2050 -3,electricity,all-week,night,2030,all-year,R1,0.26670000000,windturbine,0,2050 -4,electricity,all-week,night,2035,all-year,R1,0.26670000000,windturbine,0,2050 -5,electricity,all-week,night,2040,all-year,R1,0.26670000000,windturbine,0,2050 -6,electricity,all-week,night,2045,all-year,R1,0.26670000000,windturbine,0,2050 -2,electricity,all-week,morning,2025,all-year,R1,0.20000000000,windturbine,1,2050 -3,electricity,all-week,morning,2030,all-year,R1,0.40000000000,windturbine,1,2050 -4,electricity,all-week,morning,2035,all-year,R1,0.40000000000,windturbine,1,2050 -5,electricity,all-week,morning,2040,all-year,R1,0.40000000000,windturbine,1,2050 -6,electricity,all-week,morning,2045,all-year,R1,0.40000000000,windturbine,1,2050 -2,electricity,all-week,afternoon,2025,all-year,R1,0.13330000000,windturbine,2,2050 -3,electricity,all-week,afternoon,2030,all-year,R1,0.26670000000,windturbine,2,2050 -4,electricity,all-week,afternoon,2035,all-year,R1,0.26670000000,windturbine,2,2050 -5,electricity,all-week,afternoon,2040,all-year,R1,0.26670000000,windturbine,2,2050 -6,electricity,all-week,afternoon,2045,all-year,R1,0.26670000000,windturbine,2,2050 -2,electricity,all-week,early-peak,2025,all-year,R1,0.20000000000,windturbine,3,2050 -3,electricity,all-week,early-peak,2030,all-year,R1,0.40000000000,windturbine,3,2050 -4,electricity,all-week,early-peak,2035,all-year,R1,0.40000000000,windturbine,3,2050 -5,electricity,all-week,early-peak,2040,all-year,R1,0.40000000000,windturbine,3,2050 -6,electricity,all-week,early-peak,2045,all-year,R1,0.40000000000,windturbine,3,2050 -2,electricity,all-week,late-peak,2025,all-year,R1,0.40000000000,windturbine,4,2050 -3,electricity,all-week,late-peak,2030,all-year,R1,0.80000000000,windturbine,4,2050 -4,electricity,all-week,late-peak,2035,all-year,R1,0.80000000000,windturbine,4,2050 -5,electricity,all-week,late-peak,2040,all-year,R1,0.80000000000,windturbine,4,2050 -6,electricity,all-week,late-peak,2045,all-year,R1,0.80000000000,windturbine,4,2050 -2,electricity,all-week,evening,2025,all-year,R1,0.26670000000,windturbine,5,2050 -3,electricity,all-week,evening,2030,all-year,R1,0.53330000000,windturbine,5,2050 -4,electricity,all-week,evening,2035,all-year,R1,0.53330000000,windturbine,5,2050 -5,electricity,all-week,evening,2040,all-year,R1,0.53330000000,windturbine,5,2050 -6,electricity,all-week,evening,2045,all-year,R1,0.53330000000,windturbine,5,2050 diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Capacity.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Capacity.csv deleted file mode 100644 index d5cf558f0..000000000 --- a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Capacity.csv +++ /dev/null @@ -1,14 +0,0 @@ -asset,capacity,installed,region,technology,year -0,10,2020,R1,gasboiler,2020 -0,5,2020,R1,gasboiler,2025 -1,19,2020,R1,heatpump,2025 -1,19,2020,R1,heatpump,2030 -2,10,2025,R1,heatpump,2030 -2,10,2025,R1,heatpump,2035 -3,26,2030,R1,heatpump,2035 -3,26,2030,R1,heatpump,2040 -4,16,2035,R1,heatpump,2040 -4,16,2035,R1,heatpump,2045 -5,32,2040,R1,heatpump,2045 -5,32,2040,R1,heatpump,2050 -6,22,2045,R1,heatpump,2050 diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Supply.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Supply.csv deleted file mode 100644 index 520869501..000000000 --- a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Supply.csv +++ /dev/null @@ -1,91 +0,0 @@ -asset,commodity,day,hour,installed,month,region,supply,technology,timeslice,year -0,heat,all-week,night,2020,all-year,R1,1.00000000000,gasboiler,0,2020 -0,CO2f,all-week,night,2020,all-year,R1,64.71000000000,gasboiler,0,2020 -0,heat,all-week,morning,2020,all-year,R1,1.50000000000,gasboiler,1,2020 -0,CO2f,all-week,morning,2020,all-year,R1,97.06500000000,gasboiler,1,2020 -0,heat,all-week,afternoon,2020,all-year,R1,1.00000000000,gasboiler,2,2020 -0,CO2f,all-week,afternoon,2020,all-year,R1,64.71000000000,gasboiler,2,2020 -0,heat,all-week,early-peak,2020,all-year,R1,1.50000000000,gasboiler,3,2020 -0,CO2f,all-week,early-peak,2020,all-year,R1,97.06500000000,gasboiler,3,2020 -0,heat,all-week,late-peak,2020,all-year,R1,3.00000000000,gasboiler,4,2020 -0,CO2f,all-week,late-peak,2020,all-year,R1,194.13000000000,gasboiler,4,2020 -0,heat,all-week,evening,2020,all-year,R1,2.00000000000,gasboiler,5,2020 -0,CO2f,all-week,evening,2020,all-year,R1,129.42000000000,gasboiler,5,2020 -0,heat,all-week,night,2020,all-year,R1,0.27780000000,gasboiler,0,2025 -1,heat,all-week,night,2020,all-year,R1,1.05560000000,heatpump,0,2025 -0,CO2f,all-week,night,2020,all-year,R1,17.97500000000,gasboiler,0,2025 -0,heat,all-week,morning,2020,all-year,R1,0.41670000000,gasboiler,1,2025 -1,heat,all-week,morning,2020,all-year,R1,1.58330000000,heatpump,1,2025 -0,CO2f,all-week,morning,2020,all-year,R1,26.96250000000,gasboiler,1,2025 -0,heat,all-week,afternoon,2020,all-year,R1,0.27780000000,gasboiler,2,2025 -1,heat,all-week,afternoon,2020,all-year,R1,1.05560000000,heatpump,2,2025 -0,CO2f,all-week,afternoon,2020,all-year,R1,17.97500000000,gasboiler,2,2025 -0,heat,all-week,early-peak,2020,all-year,R1,0.41670000000,gasboiler,3,2025 -1,heat,all-week,early-peak,2020,all-year,R1,1.58330000000,heatpump,3,2025 -0,CO2f,all-week,early-peak,2020,all-year,R1,26.96250000000,gasboiler,3,2025 -0,heat,all-week,late-peak,2020,all-year,R1,0.83330000000,gasboiler,4,2025 -1,heat,all-week,late-peak,2020,all-year,R1,3.16670000000,heatpump,4,2025 -0,CO2f,all-week,late-peak,2020,all-year,R1,53.92500000000,gasboiler,4,2025 -0,heat,all-week,evening,2020,all-year,R1,0.55560000000,gasboiler,5,2025 -1,heat,all-week,evening,2020,all-year,R1,2.11110000000,heatpump,5,2025 -0,CO2f,all-week,evening,2020,all-year,R1,35.95000000000,gasboiler,5,2025 -1,heat,all-week,night,2020,all-year,R1,1.09200000000,heatpump,0,2030 -2,heat,all-week,night,2025,all-year,R1,0.57470000000,heatpump,0,2030 -1,heat,all-week,morning,2020,all-year,R1,1.63790000000,heatpump,1,2030 -2,heat,all-week,morning,2025,all-year,R1,0.86210000000,heatpump,1,2030 -1,heat,all-week,afternoon,2020,all-year,R1,1.09200000000,heatpump,2,2030 -2,heat,all-week,afternoon,2025,all-year,R1,0.57470000000,heatpump,2,2030 -1,heat,all-week,early-peak,2020,all-year,R1,1.63790000000,heatpump,3,2030 -2,heat,all-week,early-peak,2025,all-year,R1,0.86210000000,heatpump,3,2030 -1,heat,all-week,late-peak,2020,all-year,R1,3.27590000000,heatpump,4,2030 -2,heat,all-week,late-peak,2025,all-year,R1,1.72410000000,heatpump,4,2030 -1,heat,all-week,evening,2020,all-year,R1,2.18390000000,heatpump,5,2030 -2,heat,all-week,evening,2025,all-year,R1,1.14940000000,heatpump,5,2030 -2,heat,all-week,night,2025,all-year,R1,0.55560000000,heatpump,0,2035 -3,heat,all-week,night,2030,all-year,R1,1.44440000000,heatpump,0,2035 -2,heat,all-week,morning,2025,all-year,R1,0.83330000000,heatpump,1,2035 -3,heat,all-week,morning,2030,all-year,R1,2.16670000000,heatpump,1,2035 -2,heat,all-week,afternoon,2025,all-year,R1,0.55560000000,heatpump,2,2035 -3,heat,all-week,afternoon,2030,all-year,R1,1.44440000000,heatpump,2,2035 -2,heat,all-week,early-peak,2025,all-year,R1,0.83330000000,heatpump,3,2035 -3,heat,all-week,early-peak,2030,all-year,R1,2.16670000000,heatpump,3,2035 -2,heat,all-week,late-peak,2025,all-year,R1,1.66670000000,heatpump,4,2035 -3,heat,all-week,late-peak,2030,all-year,R1,4.33330000000,heatpump,4,2035 -2,heat,all-week,evening,2025,all-year,R1,1.11110000000,heatpump,5,2035 -3,heat,all-week,evening,2030,all-year,R1,2.88890000000,heatpump,5,2035 -3,heat,all-week,night,2030,all-year,R1,1.44440000000,heatpump,0,2040 -4,heat,all-week,night,2035,all-year,R1,0.88890000000,heatpump,0,2040 -3,heat,all-week,morning,2030,all-year,R1,2.16670000000,heatpump,1,2040 -4,heat,all-week,morning,2035,all-year,R1,1.33330000000,heatpump,1,2040 -3,heat,all-week,afternoon,2030,all-year,R1,1.44440000000,heatpump,2,2040 -4,heat,all-week,afternoon,2035,all-year,R1,0.88890000000,heatpump,2,2040 -3,heat,all-week,early-peak,2030,all-year,R1,2.16670000000,heatpump,3,2040 -4,heat,all-week,early-peak,2035,all-year,R1,1.33330000000,heatpump,3,2040 -3,heat,all-week,late-peak,2030,all-year,R1,4.33330000000,heatpump,4,2040 -4,heat,all-week,late-peak,2035,all-year,R1,2.66670000000,heatpump,4,2040 -3,heat,all-week,evening,2030,all-year,R1,2.88890000000,heatpump,5,2040 -4,heat,all-week,evening,2035,all-year,R1,1.77780000000,heatpump,5,2040 -4,heat,all-week,night,2035,all-year,R1,0.88890000000,heatpump,0,2045 -5,heat,all-week,night,2040,all-year,R1,1.77780000000,heatpump,0,2045 -4,heat,all-week,morning,2035,all-year,R1,1.33330000000,heatpump,1,2045 -5,heat,all-week,morning,2040,all-year,R1,2.66670000000,heatpump,1,2045 -4,heat,all-week,afternoon,2035,all-year,R1,0.88890000000,heatpump,2,2045 -5,heat,all-week,afternoon,2040,all-year,R1,1.77780000000,heatpump,2,2045 -4,heat,all-week,early-peak,2035,all-year,R1,1.33330000000,heatpump,3,2045 -5,heat,all-week,early-peak,2040,all-year,R1,2.66670000000,heatpump,3,2045 -4,heat,all-week,late-peak,2035,all-year,R1,2.66670000000,heatpump,4,2045 -5,heat,all-week,late-peak,2040,all-year,R1,5.33330000000,heatpump,4,2045 -4,heat,all-week,evening,2035,all-year,R1,1.77780000000,heatpump,5,2045 -5,heat,all-week,evening,2040,all-year,R1,3.55560000000,heatpump,5,2045 -5,heat,all-week,night,2040,all-year,R1,1.77780000000,heatpump,0,2050 -6,heat,all-week,night,2045,all-year,R1,1.22220000000,heatpump,0,2050 -5,heat,all-week,morning,2040,all-year,R1,2.66670000000,heatpump,1,2050 -6,heat,all-week,morning,2045,all-year,R1,1.83330000000,heatpump,1,2050 -5,heat,all-week,afternoon,2040,all-year,R1,1.77780000000,heatpump,2,2050 -6,heat,all-week,afternoon,2045,all-year,R1,1.22220000000,heatpump,2,2050 -5,heat,all-week,early-peak,2040,all-year,R1,2.66670000000,heatpump,3,2050 -6,heat,all-week,early-peak,2045,all-year,R1,1.83330000000,heatpump,3,2050 -5,heat,all-week,late-peak,2040,all-year,R1,5.33330000000,heatpump,4,2050 -6,heat,all-week,late-peak,2045,all-year,R1,3.66670000000,heatpump,4,2050 -5,heat,all-week,evening,2040,all-year,R1,3.55560000000,heatpump,5,2050 -6,heat,all-week,evening,2045,all-year,R1,2.44440000000,heatpump,5,2050 diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/technodata/power/Technodata.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/technodata/power/Technodata.csv deleted file mode 100644 index 32a48cb8a..000000000 --- a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/technodata/power/Technodata.csv +++ /dev/null @@ -1,4 +0,0 @@ -ProcessName,RegionName,Time,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent1 -Unit,-,Year,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,New -gasCCGT,R1,2020,23.78234399,1,0,1,0,1,200,20,100,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1 -windturbine,R1,2020,36.30771182,1,0,1,0,1,200,20,60,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1 diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/technodata/residential/Technodata.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/technodata/residential/Technodata.csv deleted file mode 100644 index 3424b178b..000000000 --- a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/technodata/residential/Technodata.csv +++ /dev/null @@ -1,4 +0,0 @@ -ProcessName,RegionName,Time,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent1 -Unit,-,Year,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,New -gasboiler,R1,2020,3.8,1,0,1,0,1,10,0.2,60,10,1,0.00000189,86,0.1,energy,gas,heat,1 -heatpump,R1,2020,8.866667,1,0,1,0,1,10,0.2,60,10,1,0.00000189,86,0.1,energy,electricity,heat,1 diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Gas/Capacity.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Gas/Capacity.csv deleted file mode 100644 index 2e9b0ada4..000000000 --- a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Gas/Capacity.csv +++ /dev/null @@ -1,8 +0,0 @@ -asset,capacity,installed,region,technology,year -0,15.00000000000,2020,R1,gassupply1,2020 -0,20.54670000000,2020,R1,gassupply1,2025 -0,13.04670000000,2020,R1,gassupply1,2030 -0,5.54670000000,2020,R1,gassupply1,2035 -0,5.54670000000,2020,R1,gassupply1,2040 -0,5.54670000000,2020,R1,gassupply1,2045 -0,5.54670000000,2020,R1,gassupply1,2050 diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/MCAMetric_Consumption.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/MCAMetric_Consumption.csv deleted file mode 100644 index 88964aa21..000000000 --- a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/MCAMetric_Consumption.csv +++ /dev/null @@ -1,175 +0,0 @@ -agent,asset,category,comm_usage,commodity,consumption,day,dst_region,hour,installed,month,region,sector,technology,timeslice,units_prices,year -A1,0,newcapa,CONSUMABLE|ENERGY,gas,1.16000000000,all-week,R1,night,2020,all-year,R1,residential,gasboiler,0,MUS$2010/PJ,2020 -A1,0,newcapa,CONSUMABLE|ENERGY,gas,1.74000000000,all-week,R1,morning,2020,all-year,R1,residential,gasboiler,1,MUS$2010/PJ,2020 -A1,0,newcapa,CONSUMABLE|ENERGY,gas,1.16000000000,all-week,R1,afternoon,2020,all-year,R1,residential,gasboiler,2,MUS$2010/PJ,2020 -A1,0,newcapa,CONSUMABLE|ENERGY,gas,1.74000000000,all-week,R1,early-peak,2020,all-year,R1,residential,gasboiler,3,MUS$2010/PJ,2020 -A1,0,newcapa,CONSUMABLE|ENERGY,gas,3.48000000000,all-week,R1,late-peak,2020,all-year,R1,residential,gasboiler,4,MUS$2010/PJ,2020 -A1,0,newcapa,CONSUMABLE|ENERGY,gas,2.32000000000,all-week,R1,evening,2020,all-year,R1,residential,gasboiler,5,MUS$2010/PJ,2020 -A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.32222222222,all-week,R1,night,2020,all-year,R1,residential,gasboiler,0,MUS$2010/PJ,2025 -A1,1,newcapa,CONSUMABLE|ENERGY,electricity,0.42222222222,all-week,R1,night,2020,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2025 -A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.48333333333,all-week,R1,morning,2020,all-year,R1,residential,gasboiler,1,MUS$2010/PJ,2025 -A1,1,newcapa,CONSUMABLE|ENERGY,electricity,0.63333333333,all-week,R1,morning,2020,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2025 -A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.32222222222,all-week,R1,afternoon,2020,all-year,R1,residential,gasboiler,2,MUS$2010/PJ,2025 -A1,1,newcapa,CONSUMABLE|ENERGY,electricity,0.42222222222,all-week,R1,afternoon,2020,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2025 -A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.48333333333,all-week,R1,early-peak,2020,all-year,R1,residential,gasboiler,3,MUS$2010/PJ,2025 -A1,1,newcapa,CONSUMABLE|ENERGY,electricity,0.63333333333,all-week,R1,early-peak,2020,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2025 -A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.96666666667,all-week,R1,late-peak,2020,all-year,R1,residential,gasboiler,4,MUS$2010/PJ,2025 -A1,1,newcapa,CONSUMABLE|ENERGY,electricity,1.26666666667,all-week,R1,late-peak,2020,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2025 -A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.64444444444,all-week,R1,evening,2020,all-year,R1,residential,gasboiler,5,MUS$2010/PJ,2025 -A1,1,newcapa,CONSUMABLE|ENERGY,electricity,0.84444444444,all-week,R1,evening,2020,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2025 -A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.70511111111,all-week,R1,night,2020,all-year,R1,power,gasCCGT,0,MUS$2010/PJ,2025 -A1,0,newcapa,CONSUMABLE|ENERGY,gas,1.05766666667,all-week,R1,morning,2020,all-year,R1,power,gasCCGT,1,MUS$2010/PJ,2025 -A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.70511111111,all-week,R1,afternoon,2020,all-year,R1,power,gasCCGT,2,MUS$2010/PJ,2025 -A1,0,newcapa,CONSUMABLE|ENERGY,gas,1.05766666667,all-week,R1,early-peak,2020,all-year,R1,power,gasCCGT,3,MUS$2010/PJ,2025 -A1,0,newcapa,CONSUMABLE|ENERGY,gas,1.67000000000,all-week,R1,late-peak,2020,all-year,R1,power,gasCCGT,4,MUS$2010/PJ,2025 -A1,0,newcapa,CONSUMABLE|ENERGY,gas,1.41022222222,all-week,R1,evening,2020,all-year,R1,power,gasCCGT,5,MUS$2010/PJ,2025 -A1,1,newcapa,CONSUMABLE|ENERGY,electricity,0.43678160920,all-week,R1,night,2020,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2030 -A1,2,newcapa,CONSUMABLE|ENERGY,electricity,0.22988505747,all-week,R1,night,2025,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2030 -A1,1,newcapa,CONSUMABLE|ENERGY,electricity,0.65517241379,all-week,R1,morning,2020,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2030 -A1,2,newcapa,CONSUMABLE|ENERGY,electricity,0.34482758621,all-week,R1,morning,2025,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2030 -A1,1,newcapa,CONSUMABLE|ENERGY,electricity,0.43678160920,all-week,R1,afternoon,2020,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2030 -A1,2,newcapa,CONSUMABLE|ENERGY,electricity,0.22988505747,all-week,R1,afternoon,2025,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2030 -A1,1,newcapa,CONSUMABLE|ENERGY,electricity,0.65517241379,all-week,R1,early-peak,2020,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2030 -A1,2,newcapa,CONSUMABLE|ENERGY,electricity,0.34482758621,all-week,R1,early-peak,2025,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2030 -A1,1,newcapa,CONSUMABLE|ENERGY,electricity,1.31034482759,all-week,R1,late-peak,2020,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2030 -A1,2,newcapa,CONSUMABLE|ENERGY,electricity,0.68965517241,all-week,R1,late-peak,2025,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2030 -A1,1,newcapa,CONSUMABLE|ENERGY,electricity,0.87356321839,all-week,R1,evening,2020,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2030 -A1,2,newcapa,CONSUMABLE|ENERGY,electricity,0.45977011494,all-week,R1,evening,2025,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2030 -A1,3,newcapa,CONSUMABLE|ENERGY,wind,0.66666666667,all-week,R1,night,2025,all-year,R1,power,windturbine,0,MUS$2010/kt,2030 -A1,3,newcapa,CONSUMABLE|ENERGY,wind,0.50000000000,all-week,R1,morning,2025,all-year,R1,power,windturbine,1,MUS$2010/kt,2030 -A1,3,newcapa,CONSUMABLE|ENERGY,wind,0.50000000000,all-week,R1,afternoon,2025,all-year,R1,power,windturbine,2,MUS$2010/kt,2030 -A1,3,newcapa,CONSUMABLE|ENERGY,wind,1.00000000000,all-week,R1,early-peak,2025,all-year,R1,power,windturbine,3,MUS$2010/kt,2030 -A1,3,newcapa,CONSUMABLE|ENERGY,wind,1.00000000000,all-week,R1,late-peak,2025,all-year,R1,power,windturbine,4,MUS$2010/kt,2030 -A1,3,newcapa,CONSUMABLE|ENERGY,wind,1.00000000000,all-week,R1,evening,2025,all-year,R1,power,windturbine,5,MUS$2010/kt,2030 -A1,2,newcapa,CONSUMABLE|ENERGY,electricity,0.22222222222,all-week,R1,night,2025,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2035 -A1,3,newcapa,CONSUMABLE|ENERGY,electricity,0.57777777778,all-week,R1,night,2030,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2035 -A1,2,newcapa,CONSUMABLE|ENERGY,electricity,0.33333333333,all-week,R1,morning,2025,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2035 -A1,3,newcapa,CONSUMABLE|ENERGY,electricity,0.86666666667,all-week,R1,morning,2030,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2035 -A1,2,newcapa,CONSUMABLE|ENERGY,electricity,0.22222222222,all-week,R1,afternoon,2025,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2035 -A1,3,newcapa,CONSUMABLE|ENERGY,electricity,0.57777777778,all-week,R1,afternoon,2030,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2035 -A1,2,newcapa,CONSUMABLE|ENERGY,electricity,0.33333333333,all-week,R1,early-peak,2025,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2035 -A1,3,newcapa,CONSUMABLE|ENERGY,electricity,0.86666666667,all-week,R1,early-peak,2030,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2035 -A1,2,newcapa,CONSUMABLE|ENERGY,electricity,0.66666666667,all-week,R1,late-peak,2025,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2035 -A1,3,newcapa,CONSUMABLE|ENERGY,electricity,1.73333333333,all-week,R1,late-peak,2030,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2035 -A1,2,newcapa,CONSUMABLE|ENERGY,electricity,0.44444444444,all-week,R1,evening,2025,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2035 -A1,3,newcapa,CONSUMABLE|ENERGY,electricity,1.15555555556,all-week,R1,evening,2030,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2035 -A1,3,newcapa,CONSUMABLE|ENERGY,wind,0.40000000000,all-week,R1,night,2025,all-year,R1,power,windturbine,0,MUS$2010/kt,2035 -A1,5,newcapa,CONSUMABLE|ENERGY,wind,0.40000000000,all-week,R1,night,2030,all-year,R1,power,windturbine,0,MUS$2010/kt,2035 -A1,3,newcapa,CONSUMABLE|ENERGY,wind,0.50000000000,all-week,R1,morning,2025,all-year,R1,power,windturbine,1,MUS$2010/kt,2035 -A1,5,newcapa,CONSUMABLE|ENERGY,wind,0.50000000000,all-week,R1,morning,2030,all-year,R1,power,windturbine,1,MUS$2010/kt,2035 -A1,3,newcapa,CONSUMABLE|ENERGY,wind,0.40000000000,all-week,R1,afternoon,2025,all-year,R1,power,windturbine,2,MUS$2010/kt,2035 -A1,5,newcapa,CONSUMABLE|ENERGY,wind,0.40000000000,all-week,R1,afternoon,2030,all-year,R1,power,windturbine,2,MUS$2010/kt,2035 -A1,3,newcapa,CONSUMABLE|ENERGY,wind,0.60000000000,all-week,R1,early-peak,2025,all-year,R1,power,windturbine,3,MUS$2010/kt,2035 -A1,5,newcapa,CONSUMABLE|ENERGY,wind,0.60000000000,all-week,R1,early-peak,2030,all-year,R1,power,windturbine,3,MUS$2010/kt,2035 -A1,3,newcapa,CONSUMABLE|ENERGY,wind,1.00000000000,all-week,R1,late-peak,2025,all-year,R1,power,windturbine,4,MUS$2010/kt,2035 -A1,5,newcapa,CONSUMABLE|ENERGY,wind,1.00000000000,all-week,R1,late-peak,2030,all-year,R1,power,windturbine,4,MUS$2010/kt,2035 -A1,3,newcapa,CONSUMABLE|ENERGY,wind,0.80000000000,all-week,R1,evening,2025,all-year,R1,power,windturbine,5,MUS$2010/kt,2035 -A1,5,newcapa,CONSUMABLE|ENERGY,wind,0.80000000000,all-week,R1,evening,2030,all-year,R1,power,windturbine,5,MUS$2010/kt,2035 -A1,3,newcapa,CONSUMABLE|ENERGY,electricity,0.57777777778,all-week,R1,night,2030,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2040 -A1,4,newcapa,CONSUMABLE|ENERGY,electricity,0.35555555556,all-week,R1,night,2035,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2040 -A1,3,newcapa,CONSUMABLE|ENERGY,electricity,0.86666666667,all-week,R1,morning,2030,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2040 -A1,4,newcapa,CONSUMABLE|ENERGY,electricity,0.53333333333,all-week,R1,morning,2035,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2040 -A1,3,newcapa,CONSUMABLE|ENERGY,electricity,0.57777777778,all-week,R1,afternoon,2030,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2040 -A1,4,newcapa,CONSUMABLE|ENERGY,electricity,0.35555555556,all-week,R1,afternoon,2035,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2040 -A1,3,newcapa,CONSUMABLE|ENERGY,electricity,0.86666666667,all-week,R1,early-peak,2030,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2040 -A1,4,newcapa,CONSUMABLE|ENERGY,electricity,0.53333333333,all-week,R1,early-peak,2035,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2040 -A1,3,newcapa,CONSUMABLE|ENERGY,electricity,1.73333333333,all-week,R1,late-peak,2030,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2040 -A1,4,newcapa,CONSUMABLE|ENERGY,electricity,1.06666666667,all-week,R1,late-peak,2035,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2040 -A1,3,newcapa,CONSUMABLE|ENERGY,electricity,1.15555555556,all-week,R1,evening,2030,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2040 -A1,4,newcapa,CONSUMABLE|ENERGY,electricity,0.71111111111,all-week,R1,evening,2035,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2040 -A1,3,newcapa,CONSUMABLE|ENERGY,wind,0.31111111111,all-week,R1,night,2025,all-year,R1,power,windturbine,0,MUS$2010/kt,2040 -A1,5,newcapa,CONSUMABLE|ENERGY,wind,0.31111111111,all-week,R1,night,2030,all-year,R1,power,windturbine,0,MUS$2010/kt,2040 -A1,7,newcapa,CONSUMABLE|ENERGY,wind,0.31111111111,all-week,R1,night,2035,all-year,R1,power,windturbine,0,MUS$2010/kt,2040 -A1,3,newcapa,CONSUMABLE|ENERGY,wind,0.46666666667,all-week,R1,morning,2025,all-year,R1,power,windturbine,1,MUS$2010/kt,2040 -A1,5,newcapa,CONSUMABLE|ENERGY,wind,0.46666666667,all-week,R1,morning,2030,all-year,R1,power,windturbine,1,MUS$2010/kt,2040 -A1,7,newcapa,CONSUMABLE|ENERGY,wind,0.46666666667,all-week,R1,morning,2035,all-year,R1,power,windturbine,1,MUS$2010/kt,2040 -A1,3,newcapa,CONSUMABLE|ENERGY,wind,0.31111111111,all-week,R1,afternoon,2025,all-year,R1,power,windturbine,2,MUS$2010/kt,2040 -A1,5,newcapa,CONSUMABLE|ENERGY,wind,0.31111111111,all-week,R1,afternoon,2030,all-year,R1,power,windturbine,2,MUS$2010/kt,2040 -A1,7,newcapa,CONSUMABLE|ENERGY,wind,0.31111111111,all-week,R1,afternoon,2035,all-year,R1,power,windturbine,2,MUS$2010/kt,2040 -A1,3,newcapa,CONSUMABLE|ENERGY,wind,0.46666666667,all-week,R1,early-peak,2025,all-year,R1,power,windturbine,3,MUS$2010/kt,2040 -A1,5,newcapa,CONSUMABLE|ENERGY,wind,0.46666666667,all-week,R1,early-peak,2030,all-year,R1,power,windturbine,3,MUS$2010/kt,2040 -A1,7,newcapa,CONSUMABLE|ENERGY,wind,0.46666666667,all-week,R1,early-peak,2035,all-year,R1,power,windturbine,3,MUS$2010/kt,2040 -A1,3,newcapa,CONSUMABLE|ENERGY,wind,0.93333333333,all-week,R1,late-peak,2025,all-year,R1,power,windturbine,4,MUS$2010/kt,2040 -A1,5,newcapa,CONSUMABLE|ENERGY,wind,0.93333333333,all-week,R1,late-peak,2030,all-year,R1,power,windturbine,4,MUS$2010/kt,2040 -A1,7,newcapa,CONSUMABLE|ENERGY,wind,0.93333333333,all-week,R1,late-peak,2035,all-year,R1,power,windturbine,4,MUS$2010/kt,2040 -A1,3,newcapa,CONSUMABLE|ENERGY,wind,0.62222222222,all-week,R1,evening,2025,all-year,R1,power,windturbine,5,MUS$2010/kt,2040 -A1,5,newcapa,CONSUMABLE|ENERGY,wind,0.62222222222,all-week,R1,evening,2030,all-year,R1,power,windturbine,5,MUS$2010/kt,2040 -A1,7,newcapa,CONSUMABLE|ENERGY,wind,0.62222222222,all-week,R1,evening,2035,all-year,R1,power,windturbine,5,MUS$2010/kt,2040 -A1,4,newcapa,CONSUMABLE|ENERGY,electricity,0.35555555556,all-week,R1,night,2035,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2045 -A1,5,newcapa,CONSUMABLE|ENERGY,electricity,0.71111111111,all-week,R1,night,2040,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2045 -A1,4,newcapa,CONSUMABLE|ENERGY,electricity,0.53333333333,all-week,R1,morning,2035,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2045 -A1,5,newcapa,CONSUMABLE|ENERGY,electricity,1.06666666667,all-week,R1,morning,2040,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2045 -A1,4,newcapa,CONSUMABLE|ENERGY,electricity,0.35555555556,all-week,R1,afternoon,2035,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2045 -A1,5,newcapa,CONSUMABLE|ENERGY,electricity,0.71111111111,all-week,R1,afternoon,2040,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2045 -A1,4,newcapa,CONSUMABLE|ENERGY,electricity,0.53333333333,all-week,R1,early-peak,2035,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2045 -A1,5,newcapa,CONSUMABLE|ENERGY,electricity,1.06666666667,all-week,R1,early-peak,2040,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2045 -A1,4,newcapa,CONSUMABLE|ENERGY,electricity,1.06666666667,all-week,R1,late-peak,2035,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2045 -A1,5,newcapa,CONSUMABLE|ENERGY,electricity,2.13333333333,all-week,R1,late-peak,2040,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2045 -A1,4,newcapa,CONSUMABLE|ENERGY,electricity,0.71111111111,all-week,R1,evening,2035,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2045 -A1,5,newcapa,CONSUMABLE|ENERGY,electricity,1.42222222222,all-week,R1,evening,2040,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2045 -A1,3,newcapa,CONSUMABLE|ENERGY,wind,0.21333333333,all-week,R1,night,2025,all-year,R1,power,windturbine,0,MUS$2010/kt,2045 -A1,5,newcapa,CONSUMABLE|ENERGY,wind,0.21333333333,all-week,R1,night,2030,all-year,R1,power,windturbine,0,MUS$2010/kt,2045 -A1,7,newcapa,CONSUMABLE|ENERGY,wind,0.21333333333,all-week,R1,night,2035,all-year,R1,power,windturbine,0,MUS$2010/kt,2045 -A1,9,newcapa,CONSUMABLE|ENERGY,wind,0.42666666667,all-week,R1,night,2040,all-year,R1,power,windturbine,0,MUS$2010/kt,2045 -A1,3,newcapa,CONSUMABLE|ENERGY,wind,0.32000000000,all-week,R1,morning,2025,all-year,R1,power,windturbine,1,MUS$2010/kt,2045 -A1,5,newcapa,CONSUMABLE|ENERGY,wind,0.32000000000,all-week,R1,morning,2030,all-year,R1,power,windturbine,1,MUS$2010/kt,2045 -A1,7,newcapa,CONSUMABLE|ENERGY,wind,0.32000000000,all-week,R1,morning,2035,all-year,R1,power,windturbine,1,MUS$2010/kt,2045 -A1,9,newcapa,CONSUMABLE|ENERGY,wind,0.64000000000,all-week,R1,morning,2040,all-year,R1,power,windturbine,1,MUS$2010/kt,2045 -A1,3,newcapa,CONSUMABLE|ENERGY,wind,0.21333333333,all-week,R1,afternoon,2025,all-year,R1,power,windturbine,2,MUS$2010/kt,2045 -A1,5,newcapa,CONSUMABLE|ENERGY,wind,0.21333333333,all-week,R1,afternoon,2030,all-year,R1,power,windturbine,2,MUS$2010/kt,2045 -A1,7,newcapa,CONSUMABLE|ENERGY,wind,0.21333333333,all-week,R1,afternoon,2035,all-year,R1,power,windturbine,2,MUS$2010/kt,2045 -A1,9,newcapa,CONSUMABLE|ENERGY,wind,0.42666666667,all-week,R1,afternoon,2040,all-year,R1,power,windturbine,2,MUS$2010/kt,2045 -A1,3,newcapa,CONSUMABLE|ENERGY,wind,0.32000000000,all-week,R1,early-peak,2025,all-year,R1,power,windturbine,3,MUS$2010/kt,2045 -A1,5,newcapa,CONSUMABLE|ENERGY,wind,0.32000000000,all-week,R1,early-peak,2030,all-year,R1,power,windturbine,3,MUS$2010/kt,2045 -A1,7,newcapa,CONSUMABLE|ENERGY,wind,0.32000000000,all-week,R1,early-peak,2035,all-year,R1,power,windturbine,3,MUS$2010/kt,2045 -A1,9,newcapa,CONSUMABLE|ENERGY,wind,0.64000000000,all-week,R1,early-peak,2040,all-year,R1,power,windturbine,3,MUS$2010/kt,2045 -A1,3,newcapa,CONSUMABLE|ENERGY,wind,0.64000000000,all-week,R1,late-peak,2025,all-year,R1,power,windturbine,4,MUS$2010/kt,2045 -A1,5,newcapa,CONSUMABLE|ENERGY,wind,0.64000000000,all-week,R1,late-peak,2030,all-year,R1,power,windturbine,4,MUS$2010/kt,2045 -A1,7,newcapa,CONSUMABLE|ENERGY,wind,0.64000000000,all-week,R1,late-peak,2035,all-year,R1,power,windturbine,4,MUS$2010/kt,2045 -A1,9,newcapa,CONSUMABLE|ENERGY,wind,1.28000000000,all-week,R1,late-peak,2040,all-year,R1,power,windturbine,4,MUS$2010/kt,2045 -A1,3,newcapa,CONSUMABLE|ENERGY,wind,0.42666666667,all-week,R1,evening,2025,all-year,R1,power,windturbine,5,MUS$2010/kt,2045 -A1,5,newcapa,CONSUMABLE|ENERGY,wind,0.42666666667,all-week,R1,evening,2030,all-year,R1,power,windturbine,5,MUS$2010/kt,2045 -A1,7,newcapa,CONSUMABLE|ENERGY,wind,0.42666666667,all-week,R1,evening,2035,all-year,R1,power,windturbine,5,MUS$2010/kt,2045 -A1,9,newcapa,CONSUMABLE|ENERGY,wind,0.85333333333,all-week,R1,evening,2040,all-year,R1,power,windturbine,5,MUS$2010/kt,2045 -A1,5,newcapa,CONSUMABLE|ENERGY,electricity,0.71111111111,all-week,R1,night,2040,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2050 -A1,6,newcapa,CONSUMABLE|ENERGY,electricity,0.48888888889,all-week,R1,night,2045,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2050 -A1,5,newcapa,CONSUMABLE|ENERGY,electricity,1.06666666667,all-week,R1,morning,2040,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2050 -A1,6,newcapa,CONSUMABLE|ENERGY,electricity,0.73333333333,all-week,R1,morning,2045,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2050 -A1,5,newcapa,CONSUMABLE|ENERGY,electricity,0.71111111111,all-week,R1,afternoon,2040,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2050 -A1,6,newcapa,CONSUMABLE|ENERGY,electricity,0.48888888889,all-week,R1,afternoon,2045,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2050 -A1,5,newcapa,CONSUMABLE|ENERGY,electricity,1.06666666667,all-week,R1,early-peak,2040,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2050 -A1,6,newcapa,CONSUMABLE|ENERGY,electricity,0.73333333333,all-week,R1,early-peak,2045,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2050 -A1,5,newcapa,CONSUMABLE|ENERGY,electricity,2.13333333333,all-week,R1,late-peak,2040,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2050 -A1,6,newcapa,CONSUMABLE|ENERGY,electricity,1.46666666667,all-week,R1,late-peak,2045,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2050 -A1,5,newcapa,CONSUMABLE|ENERGY,electricity,1.42222222222,all-week,R1,evening,2040,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2050 -A1,6,newcapa,CONSUMABLE|ENERGY,electricity,0.97777777778,all-week,R1,evening,2045,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2050 -A1,3,newcapa,CONSUMABLE|ENERGY,wind,0.17142857143,all-week,R1,night,2025,all-year,R1,power,windturbine,0,MUS$2010/kt,2050 -A1,5,newcapa,CONSUMABLE|ENERGY,wind,0.17142857143,all-week,R1,night,2030,all-year,R1,power,windturbine,0,MUS$2010/kt,2050 -A1,7,newcapa,CONSUMABLE|ENERGY,wind,0.17142857143,all-week,R1,night,2035,all-year,R1,power,windturbine,0,MUS$2010/kt,2050 -A1,9,newcapa,CONSUMABLE|ENERGY,wind,0.34285714286,all-week,R1,night,2040,all-year,R1,power,windturbine,0,MUS$2010/kt,2050 -A1,11,newcapa,CONSUMABLE|ENERGY,wind,0.34285714286,all-week,R1,night,2045,all-year,R1,power,windturbine,0,MUS$2010/kt,2050 -A1,3,newcapa,CONSUMABLE|ENERGY,wind,0.25714285714,all-week,R1,morning,2025,all-year,R1,power,windturbine,1,MUS$2010/kt,2050 -A1,5,newcapa,CONSUMABLE|ENERGY,wind,0.25714285714,all-week,R1,morning,2030,all-year,R1,power,windturbine,1,MUS$2010/kt,2050 -A1,7,newcapa,CONSUMABLE|ENERGY,wind,0.25714285714,all-week,R1,morning,2035,all-year,R1,power,windturbine,1,MUS$2010/kt,2050 -A1,9,newcapa,CONSUMABLE|ENERGY,wind,0.51428571429,all-week,R1,morning,2040,all-year,R1,power,windturbine,1,MUS$2010/kt,2050 -A1,11,newcapa,CONSUMABLE|ENERGY,wind,0.51428571429,all-week,R1,morning,2045,all-year,R1,power,windturbine,1,MUS$2010/kt,2050 -A1,3,newcapa,CONSUMABLE|ENERGY,wind,0.17142857143,all-week,R1,afternoon,2025,all-year,R1,power,windturbine,2,MUS$2010/kt,2050 -A1,5,newcapa,CONSUMABLE|ENERGY,wind,0.17142857143,all-week,R1,afternoon,2030,all-year,R1,power,windturbine,2,MUS$2010/kt,2050 -A1,7,newcapa,CONSUMABLE|ENERGY,wind,0.17142857143,all-week,R1,afternoon,2035,all-year,R1,power,windturbine,2,MUS$2010/kt,2050 -A1,9,newcapa,CONSUMABLE|ENERGY,wind,0.34285714286,all-week,R1,afternoon,2040,all-year,R1,power,windturbine,2,MUS$2010/kt,2050 -A1,11,newcapa,CONSUMABLE|ENERGY,wind,0.34285714286,all-week,R1,afternoon,2045,all-year,R1,power,windturbine,2,MUS$2010/kt,2050 -A1,3,newcapa,CONSUMABLE|ENERGY,wind,0.25714285714,all-week,R1,early-peak,2025,all-year,R1,power,windturbine,3,MUS$2010/kt,2050 -A1,5,newcapa,CONSUMABLE|ENERGY,wind,0.25714285714,all-week,R1,early-peak,2030,all-year,R1,power,windturbine,3,MUS$2010/kt,2050 -A1,7,newcapa,CONSUMABLE|ENERGY,wind,0.25714285714,all-week,R1,early-peak,2035,all-year,R1,power,windturbine,3,MUS$2010/kt,2050 -A1,9,newcapa,CONSUMABLE|ENERGY,wind,0.51428571429,all-week,R1,early-peak,2040,all-year,R1,power,windturbine,3,MUS$2010/kt,2050 -A1,11,newcapa,CONSUMABLE|ENERGY,wind,0.51428571429,all-week,R1,early-peak,2045,all-year,R1,power,windturbine,3,MUS$2010/kt,2050 -A1,3,newcapa,CONSUMABLE|ENERGY,wind,0.51428571429,all-week,R1,late-peak,2025,all-year,R1,power,windturbine,4,MUS$2010/kt,2050 -A1,5,newcapa,CONSUMABLE|ENERGY,wind,0.51428571429,all-week,R1,late-peak,2030,all-year,R1,power,windturbine,4,MUS$2010/kt,2050 -A1,7,newcapa,CONSUMABLE|ENERGY,wind,0.51428571429,all-week,R1,late-peak,2035,all-year,R1,power,windturbine,4,MUS$2010/kt,2050 -A1,9,newcapa,CONSUMABLE|ENERGY,wind,1.02857142857,all-week,R1,late-peak,2040,all-year,R1,power,windturbine,4,MUS$2010/kt,2050 -A1,11,newcapa,CONSUMABLE|ENERGY,wind,1.02857142857,all-week,R1,late-peak,2045,all-year,R1,power,windturbine,4,MUS$2010/kt,2050 -A1,3,newcapa,CONSUMABLE|ENERGY,wind,0.34285714286,all-week,R1,evening,2025,all-year,R1,power,windturbine,5,MUS$2010/kt,2050 -A1,5,newcapa,CONSUMABLE|ENERGY,wind,0.34285714286,all-week,R1,evening,2030,all-year,R1,power,windturbine,5,MUS$2010/kt,2050 -A1,7,newcapa,CONSUMABLE|ENERGY,wind,0.34285714286,all-week,R1,evening,2035,all-year,R1,power,windturbine,5,MUS$2010/kt,2050 -A1,9,newcapa,CONSUMABLE|ENERGY,wind,0.68571428571,all-week,R1,evening,2040,all-year,R1,power,windturbine,5,MUS$2010/kt,2050 -A1,11,newcapa,CONSUMABLE|ENERGY,wind,0.68571428571,all-week,R1,evening,2045,all-year,R1,power,windturbine,5,MUS$2010/kt,2050 diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/MCAMetric_Supply.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/MCAMetric_Supply.csv deleted file mode 100644 index 420269593..000000000 --- a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/MCAMetric_Supply.csv +++ /dev/null @@ -1,205 +0,0 @@ -agent,asset,category,comm_usage,commodity,day,dst_region,hour,installed,month,region,sector,supply,technology,timeslice,units_prices,year -A1,0,newcapa,PRODUCT|ENERGY,heat,all-week,R1,night,2020,all-year,R1,residential,1.00000000000,gasboiler,0,MUS$2010/PJ,2020 -A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2020,all-year,R1,residential,64.71000000000,gasboiler,0,MUS$2010/kt,2020 -A1,0,newcapa,PRODUCT|ENERGY,heat,all-week,R1,morning,2020,all-year,R1,residential,1.50000000000,gasboiler,1,MUS$2010/PJ,2020 -A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2020,all-year,R1,residential,97.06500000000,gasboiler,1,MUS$2010/kt,2020 -A1,0,newcapa,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2020,all-year,R1,residential,1.00000000000,gasboiler,2,MUS$2010/PJ,2020 -A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2020,all-year,R1,residential,64.71000000000,gasboiler,2,MUS$2010/kt,2020 -A1,0,newcapa,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2020,all-year,R1,residential,1.50000000000,gasboiler,3,MUS$2010/PJ,2020 -A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2020,all-year,R1,residential,97.06500000000,gasboiler,3,MUS$2010/kt,2020 -A1,0,newcapa,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2020,all-year,R1,residential,3.00000000000,gasboiler,4,MUS$2010/PJ,2020 -A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2020,all-year,R1,residential,194.13000000000,gasboiler,4,MUS$2010/kt,2020 -A1,0,newcapa,PRODUCT|ENERGY,heat,all-week,R1,evening,2020,all-year,R1,residential,2.00000000000,gasboiler,5,MUS$2010/PJ,2020 -A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2020,all-year,R1,residential,129.42000000000,gasboiler,5,MUS$2010/kt,2020 -A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,night,2020,all-year,R1,gas,1.16732260678,gassupply1,0,MUS$2010/PJ,2020 -A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,morning,2020,all-year,R1,gas,1.88146776247,gassupply1,1,MUS$2010/PJ,2020 -A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2020,all-year,R1,gas,1.68925801597,gassupply1,2,MUS$2010/PJ,2020 -A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2020,all-year,R1,gas,1.88146776247,gassupply1,3,MUS$2010/PJ,2020 -A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2020,all-year,R1,gas,3.76293552495,gassupply1,4,MUS$2010/PJ,2020 -A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,evening,2020,all-year,R1,gas,3.11754832735,gassupply1,5,MUS$2010/PJ,2020 -A1,0,newcapa,PRODUCT|ENERGY,heat,all-week,R1,night,2020,all-year,R1,residential,0.27777777778,gasboiler,0,MUS$2010/PJ,2025 -A1,1,newcapa,PRODUCT|ENERGY,heat,all-week,R1,night,2020,all-year,R1,residential,1.05555555556,heatpump,0,MUS$2010/PJ,2025 -A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2020,all-year,R1,residential,17.97500000000,gasboiler,0,MUS$2010/kt,2025 -A1,0,newcapa,PRODUCT|ENERGY,heat,all-week,R1,morning,2020,all-year,R1,residential,0.41666666667,gasboiler,1,MUS$2010/PJ,2025 -A1,1,newcapa,PRODUCT|ENERGY,heat,all-week,R1,morning,2020,all-year,R1,residential,1.58333333333,heatpump,1,MUS$2010/PJ,2025 -A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2020,all-year,R1,residential,26.96250000000,gasboiler,1,MUS$2010/kt,2025 -A1,0,newcapa,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2020,all-year,R1,residential,0.27777777778,gasboiler,2,MUS$2010/PJ,2025 -A1,1,newcapa,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2020,all-year,R1,residential,1.05555555556,heatpump,2,MUS$2010/PJ,2025 -A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2020,all-year,R1,residential,17.97500000000,gasboiler,2,MUS$2010/kt,2025 -A1,0,newcapa,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2020,all-year,R1,residential,0.41666666667,gasboiler,3,MUS$2010/PJ,2025 -A1,1,newcapa,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2020,all-year,R1,residential,1.58333333333,heatpump,3,MUS$2010/PJ,2025 -A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2020,all-year,R1,residential,26.96250000000,gasboiler,3,MUS$2010/kt,2025 -A1,0,newcapa,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2020,all-year,R1,residential,0.83333333333,gasboiler,4,MUS$2010/PJ,2025 -A1,1,newcapa,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2020,all-year,R1,residential,3.16666666667,heatpump,4,MUS$2010/PJ,2025 -A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2020,all-year,R1,residential,53.92500000000,gasboiler,4,MUS$2010/kt,2025 -A1,0,newcapa,PRODUCT|ENERGY,heat,all-week,R1,evening,2020,all-year,R1,residential,0.55555555556,gasboiler,5,MUS$2010/PJ,2025 -A1,1,newcapa,PRODUCT|ENERGY,heat,all-week,R1,evening,2020,all-year,R1,residential,2.11111111111,heatpump,5,MUS$2010/PJ,2025 -A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2020,all-year,R1,residential,35.95000000000,gasboiler,5,MUS$2010/kt,2025 -A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.42222222222,gasCCGT,0,MUS$2010/PJ,2025 -A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2020,all-year,R1,power,38.70511111111,gasCCGT,0,MUS$2010/kt,2025 -A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.63333333333,gasCCGT,1,MUS$2010/PJ,2025 -A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2020,all-year,R1,power,58.05766666667,gasCCGT,1,MUS$2010/kt,2025 -A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.42222222222,gasCCGT,2,MUS$2010/PJ,2025 -A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2020,all-year,R1,power,38.70511111111,gasCCGT,2,MUS$2010/kt,2025 -A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.63333333333,gasCCGT,3,MUS$2010/PJ,2025 -A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2020,all-year,R1,power,58.05766666667,gasCCGT,3,MUS$2010/kt,2025 -A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,1.00000000000,gasCCGT,4,MUS$2010/PJ,2025 -A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2020,all-year,R1,power,91.67000000000,gasCCGT,4,MUS$2010/kt,2025 -A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.84444444444,gasCCGT,5,MUS$2010/PJ,2025 -A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2020,all-year,R1,power,77.41022222222,gasCCGT,5,MUS$2010/kt,2025 -A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,night,2020,all-year,R1,gas,1.02733333333,gassupply1,0,MUS$2010/PJ,2025 -A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,morning,2020,all-year,R1,gas,1.54100000000,gassupply1,1,MUS$2010/PJ,2025 -A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2020,all-year,R1,gas,1.32422222222,gassupply1,2,MUS$2010/PJ,2025 -A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2020,all-year,R1,gas,1.54100000000,gassupply1,3,MUS$2010/PJ,2025 -A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2020,all-year,R1,gas,3.08200000000,gassupply1,4,MUS$2010/PJ,2025 -A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,evening,2020,all-year,R1,gas,2.31444444444,gassupply1,5,MUS$2010/PJ,2025 -A1,1,newcapa,PRODUCT|ENERGY,heat,all-week,R1,night,2020,all-year,R1,residential,1.09195402299,heatpump,0,MUS$2010/PJ,2030 -A1,2,newcapa,PRODUCT|ENERGY,heat,all-week,R1,night,2025,all-year,R1,residential,0.57471264368,heatpump,0,MUS$2010/PJ,2030 -A1,1,newcapa,PRODUCT|ENERGY,heat,all-week,R1,morning,2020,all-year,R1,residential,1.63793103448,heatpump,1,MUS$2010/PJ,2030 -A1,2,newcapa,PRODUCT|ENERGY,heat,all-week,R1,morning,2025,all-year,R1,residential,0.86206896552,heatpump,1,MUS$2010/PJ,2030 -A1,1,newcapa,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2020,all-year,R1,residential,1.09195402299,heatpump,2,MUS$2010/PJ,2030 -A1,2,newcapa,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2025,all-year,R1,residential,0.57471264368,heatpump,2,MUS$2010/PJ,2030 -A1,1,newcapa,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2020,all-year,R1,residential,1.63793103448,heatpump,3,MUS$2010/PJ,2030 -A1,2,newcapa,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2025,all-year,R1,residential,0.86206896552,heatpump,3,MUS$2010/PJ,2030 -A1,1,newcapa,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2020,all-year,R1,residential,3.27586206897,heatpump,4,MUS$2010/PJ,2030 -A1,2,newcapa,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2025,all-year,R1,residential,1.72413793103,heatpump,4,MUS$2010/PJ,2030 -A1,1,newcapa,PRODUCT|ENERGY,heat,all-week,R1,evening,2020,all-year,R1,residential,2.18390804598,heatpump,5,MUS$2010/PJ,2030 -A1,2,newcapa,PRODUCT|ENERGY,heat,all-week,R1,evening,2025,all-year,R1,residential,1.14942528736,heatpump,5,MUS$2010/PJ,2030 -A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.66666666667,windturbine,0,MUS$2010/PJ,2030 -A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.50000000000,windturbine,1,MUS$2010/PJ,2030 -A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.50000000000,windturbine,2,MUS$2010/PJ,2030 -A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,1.00000000000,windturbine,3,MUS$2010/PJ,2030 -A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,1.00000000000,windturbine,4,MUS$2010/PJ,2030 -A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,1.00000000000,windturbine,5,MUS$2010/PJ,2030 -A1,2,newcapa,PRODUCT|ENERGY,heat,all-week,R1,night,2025,all-year,R1,residential,0.55555555556,heatpump,0,MUS$2010/PJ,2035 -A1,3,newcapa,PRODUCT|ENERGY,heat,all-week,R1,night,2030,all-year,R1,residential,1.44444444444,heatpump,0,MUS$2010/PJ,2035 -A1,2,newcapa,PRODUCT|ENERGY,heat,all-week,R1,morning,2025,all-year,R1,residential,0.83333333333,heatpump,1,MUS$2010/PJ,2035 -A1,3,newcapa,PRODUCT|ENERGY,heat,all-week,R1,morning,2030,all-year,R1,residential,2.16666666667,heatpump,1,MUS$2010/PJ,2035 -A1,2,newcapa,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2025,all-year,R1,residential,0.55555555556,heatpump,2,MUS$2010/PJ,2035 -A1,3,newcapa,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2030,all-year,R1,residential,1.44444444444,heatpump,2,MUS$2010/PJ,2035 -A1,2,newcapa,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2025,all-year,R1,residential,0.83333333333,heatpump,3,MUS$2010/PJ,2035 -A1,3,newcapa,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2030,all-year,R1,residential,2.16666666667,heatpump,3,MUS$2010/PJ,2035 -A1,2,newcapa,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2025,all-year,R1,residential,1.66666666667,heatpump,4,MUS$2010/PJ,2035 -A1,3,newcapa,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2030,all-year,R1,residential,4.33333333333,heatpump,4,MUS$2010/PJ,2035 -A1,2,newcapa,PRODUCT|ENERGY,heat,all-week,R1,evening,2025,all-year,R1,residential,1.11111111111,heatpump,5,MUS$2010/PJ,2035 -A1,3,newcapa,PRODUCT|ENERGY,heat,all-week,R1,evening,2030,all-year,R1,residential,2.88888888889,heatpump,5,MUS$2010/PJ,2035 -A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.40000000000,windturbine,0,MUS$2010/PJ,2035 -A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2030,all-year,R1,power,0.40000000000,windturbine,0,MUS$2010/PJ,2035 -A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.50000000000,windturbine,1,MUS$2010/PJ,2035 -A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2030,all-year,R1,power,0.50000000000,windturbine,1,MUS$2010/PJ,2035 -A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.40000000000,windturbine,2,MUS$2010/PJ,2035 -A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2030,all-year,R1,power,0.40000000000,windturbine,2,MUS$2010/PJ,2035 -A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.60000000000,windturbine,3,MUS$2010/PJ,2035 -A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2030,all-year,R1,power,0.60000000000,windturbine,3,MUS$2010/PJ,2035 -A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,1.00000000000,windturbine,4,MUS$2010/PJ,2035 -A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2030,all-year,R1,power,1.00000000000,windturbine,4,MUS$2010/PJ,2035 -A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.80000000000,windturbine,5,MUS$2010/PJ,2035 -A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2030,all-year,R1,power,0.80000000000,windturbine,5,MUS$2010/PJ,2035 -A1,3,newcapa,PRODUCT|ENERGY,heat,all-week,R1,night,2030,all-year,R1,residential,1.44444444444,heatpump,0,MUS$2010/PJ,2040 -A1,4,newcapa,PRODUCT|ENERGY,heat,all-week,R1,night,2035,all-year,R1,residential,0.88888888889,heatpump,0,MUS$2010/PJ,2040 -A1,3,newcapa,PRODUCT|ENERGY,heat,all-week,R1,morning,2030,all-year,R1,residential,2.16666666667,heatpump,1,MUS$2010/PJ,2040 -A1,4,newcapa,PRODUCT|ENERGY,heat,all-week,R1,morning,2035,all-year,R1,residential,1.33333333333,heatpump,1,MUS$2010/PJ,2040 -A1,3,newcapa,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2030,all-year,R1,residential,1.44444444444,heatpump,2,MUS$2010/PJ,2040 -A1,4,newcapa,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2035,all-year,R1,residential,0.88888888889,heatpump,2,MUS$2010/PJ,2040 -A1,3,newcapa,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2030,all-year,R1,residential,2.16666666667,heatpump,3,MUS$2010/PJ,2040 -A1,4,newcapa,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2035,all-year,R1,residential,1.33333333333,heatpump,3,MUS$2010/PJ,2040 -A1,3,newcapa,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2030,all-year,R1,residential,4.33333333333,heatpump,4,MUS$2010/PJ,2040 -A1,4,newcapa,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2035,all-year,R1,residential,2.66666666667,heatpump,4,MUS$2010/PJ,2040 -A1,3,newcapa,PRODUCT|ENERGY,heat,all-week,R1,evening,2030,all-year,R1,residential,2.88888888889,heatpump,5,MUS$2010/PJ,2040 -A1,4,newcapa,PRODUCT|ENERGY,heat,all-week,R1,evening,2035,all-year,R1,residential,1.77777777778,heatpump,5,MUS$2010/PJ,2040 -A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.31111111111,windturbine,0,MUS$2010/PJ,2040 -A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2030,all-year,R1,power,0.31111111111,windturbine,0,MUS$2010/PJ,2040 -A1,7,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2035,all-year,R1,power,0.31111111111,windturbine,0,MUS$2010/PJ,2040 -A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.46666666667,windturbine,1,MUS$2010/PJ,2040 -A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2030,all-year,R1,power,0.46666666667,windturbine,1,MUS$2010/PJ,2040 -A1,7,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2035,all-year,R1,power,0.46666666667,windturbine,1,MUS$2010/PJ,2040 -A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.31111111111,windturbine,2,MUS$2010/PJ,2040 -A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2030,all-year,R1,power,0.31111111111,windturbine,2,MUS$2010/PJ,2040 -A1,7,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2035,all-year,R1,power,0.31111111111,windturbine,2,MUS$2010/PJ,2040 -A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.46666666667,windturbine,3,MUS$2010/PJ,2040 -A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2030,all-year,R1,power,0.46666666667,windturbine,3,MUS$2010/PJ,2040 -A1,7,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2035,all-year,R1,power,0.46666666667,windturbine,3,MUS$2010/PJ,2040 -A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.93333333333,windturbine,4,MUS$2010/PJ,2040 -A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2030,all-year,R1,power,0.93333333333,windturbine,4,MUS$2010/PJ,2040 -A1,7,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2035,all-year,R1,power,0.93333333333,windturbine,4,MUS$2010/PJ,2040 -A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.62222222222,windturbine,5,MUS$2010/PJ,2040 -A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2030,all-year,R1,power,0.62222222222,windturbine,5,MUS$2010/PJ,2040 -A1,7,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2035,all-year,R1,power,0.62222222222,windturbine,5,MUS$2010/PJ,2040 -A1,4,newcapa,PRODUCT|ENERGY,heat,all-week,R1,night,2035,all-year,R1,residential,0.88888888889,heatpump,0,MUS$2010/PJ,2045 -A1,5,newcapa,PRODUCT|ENERGY,heat,all-week,R1,night,2040,all-year,R1,residential,1.77777777778,heatpump,0,MUS$2010/PJ,2045 -A1,4,newcapa,PRODUCT|ENERGY,heat,all-week,R1,morning,2035,all-year,R1,residential,1.33333333333,heatpump,1,MUS$2010/PJ,2045 -A1,5,newcapa,PRODUCT|ENERGY,heat,all-week,R1,morning,2040,all-year,R1,residential,2.66666666667,heatpump,1,MUS$2010/PJ,2045 -A1,4,newcapa,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2035,all-year,R1,residential,0.88888888889,heatpump,2,MUS$2010/PJ,2045 -A1,5,newcapa,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2040,all-year,R1,residential,1.77777777778,heatpump,2,MUS$2010/PJ,2045 -A1,4,newcapa,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2035,all-year,R1,residential,1.33333333333,heatpump,3,MUS$2010/PJ,2045 -A1,5,newcapa,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2040,all-year,R1,residential,2.66666666667,heatpump,3,MUS$2010/PJ,2045 -A1,4,newcapa,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2035,all-year,R1,residential,2.66666666667,heatpump,4,MUS$2010/PJ,2045 -A1,5,newcapa,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2040,all-year,R1,residential,5.33333333333,heatpump,4,MUS$2010/PJ,2045 -A1,4,newcapa,PRODUCT|ENERGY,heat,all-week,R1,evening,2035,all-year,R1,residential,1.77777777778,heatpump,5,MUS$2010/PJ,2045 -A1,5,newcapa,PRODUCT|ENERGY,heat,all-week,R1,evening,2040,all-year,R1,residential,3.55555555556,heatpump,5,MUS$2010/PJ,2045 -A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.21333333333,windturbine,0,MUS$2010/PJ,2045 -A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2030,all-year,R1,power,0.21333333333,windturbine,0,MUS$2010/PJ,2045 -A1,7,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2035,all-year,R1,power,0.21333333333,windturbine,0,MUS$2010/PJ,2045 -A1,9,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2040,all-year,R1,power,0.42666666667,windturbine,0,MUS$2010/PJ,2045 -A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.32000000000,windturbine,1,MUS$2010/PJ,2045 -A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2030,all-year,R1,power,0.32000000000,windturbine,1,MUS$2010/PJ,2045 -A1,7,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2035,all-year,R1,power,0.32000000000,windturbine,1,MUS$2010/PJ,2045 -A1,9,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2040,all-year,R1,power,0.64000000000,windturbine,1,MUS$2010/PJ,2045 -A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.21333333333,windturbine,2,MUS$2010/PJ,2045 -A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2030,all-year,R1,power,0.21333333333,windturbine,2,MUS$2010/PJ,2045 -A1,7,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2035,all-year,R1,power,0.21333333333,windturbine,2,MUS$2010/PJ,2045 -A1,9,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2040,all-year,R1,power,0.42666666667,windturbine,2,MUS$2010/PJ,2045 -A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.32000000000,windturbine,3,MUS$2010/PJ,2045 -A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2030,all-year,R1,power,0.32000000000,windturbine,3,MUS$2010/PJ,2045 -A1,7,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2035,all-year,R1,power,0.32000000000,windturbine,3,MUS$2010/PJ,2045 -A1,9,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2040,all-year,R1,power,0.64000000000,windturbine,3,MUS$2010/PJ,2045 -A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.64000000000,windturbine,4,MUS$2010/PJ,2045 -A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2030,all-year,R1,power,0.64000000000,windturbine,4,MUS$2010/PJ,2045 -A1,7,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2035,all-year,R1,power,0.64000000000,windturbine,4,MUS$2010/PJ,2045 -A1,9,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2040,all-year,R1,power,1.28000000000,windturbine,4,MUS$2010/PJ,2045 -A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.42666666667,windturbine,5,MUS$2010/PJ,2045 -A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2030,all-year,R1,power,0.42666666667,windturbine,5,MUS$2010/PJ,2045 -A1,7,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2035,all-year,R1,power,0.42666666667,windturbine,5,MUS$2010/PJ,2045 -A1,9,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2040,all-year,R1,power,0.85333333333,windturbine,5,MUS$2010/PJ,2045 -A1,5,newcapa,PRODUCT|ENERGY,heat,all-week,R1,night,2040,all-year,R1,residential,1.77777777778,heatpump,0,MUS$2010/PJ,2050 -A1,6,newcapa,PRODUCT|ENERGY,heat,all-week,R1,night,2045,all-year,R1,residential,1.22222222222,heatpump,0,MUS$2010/PJ,2050 -A1,5,newcapa,PRODUCT|ENERGY,heat,all-week,R1,morning,2040,all-year,R1,residential,2.66666666667,heatpump,1,MUS$2010/PJ,2050 -A1,6,newcapa,PRODUCT|ENERGY,heat,all-week,R1,morning,2045,all-year,R1,residential,1.83333333333,heatpump,1,MUS$2010/PJ,2050 -A1,5,newcapa,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2040,all-year,R1,residential,1.77777777778,heatpump,2,MUS$2010/PJ,2050 -A1,6,newcapa,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2045,all-year,R1,residential,1.22222222222,heatpump,2,MUS$2010/PJ,2050 -A1,5,newcapa,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2040,all-year,R1,residential,2.66666666667,heatpump,3,MUS$2010/PJ,2050 -A1,6,newcapa,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2045,all-year,R1,residential,1.83333333333,heatpump,3,MUS$2010/PJ,2050 -A1,5,newcapa,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2040,all-year,R1,residential,5.33333333333,heatpump,4,MUS$2010/PJ,2050 -A1,6,newcapa,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2045,all-year,R1,residential,3.66666666667,heatpump,4,MUS$2010/PJ,2050 -A1,5,newcapa,PRODUCT|ENERGY,heat,all-week,R1,evening,2040,all-year,R1,residential,3.55555555556,heatpump,5,MUS$2010/PJ,2050 -A1,6,newcapa,PRODUCT|ENERGY,heat,all-week,R1,evening,2045,all-year,R1,residential,2.44444444444,heatpump,5,MUS$2010/PJ,2050 -A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.17142857143,windturbine,0,MUS$2010/PJ,2050 -A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2030,all-year,R1,power,0.17142857143,windturbine,0,MUS$2010/PJ,2050 -A1,7,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2035,all-year,R1,power,0.17142857143,windturbine,0,MUS$2010/PJ,2050 -A1,9,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2040,all-year,R1,power,0.34285714286,windturbine,0,MUS$2010/PJ,2050 -A1,11,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2045,all-year,R1,power,0.34285714286,windturbine,0,MUS$2010/PJ,2050 -A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.25714285714,windturbine,1,MUS$2010/PJ,2050 -A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2030,all-year,R1,power,0.25714285714,windturbine,1,MUS$2010/PJ,2050 -A1,7,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2035,all-year,R1,power,0.25714285714,windturbine,1,MUS$2010/PJ,2050 -A1,9,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2040,all-year,R1,power,0.51428571429,windturbine,1,MUS$2010/PJ,2050 -A1,11,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2045,all-year,R1,power,0.51428571429,windturbine,1,MUS$2010/PJ,2050 -A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.17142857143,windturbine,2,MUS$2010/PJ,2050 -A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2030,all-year,R1,power,0.17142857143,windturbine,2,MUS$2010/PJ,2050 -A1,7,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2035,all-year,R1,power,0.17142857143,windturbine,2,MUS$2010/PJ,2050 -A1,9,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2040,all-year,R1,power,0.34285714286,windturbine,2,MUS$2010/PJ,2050 -A1,11,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2045,all-year,R1,power,0.34285714286,windturbine,2,MUS$2010/PJ,2050 -A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.25714285714,windturbine,3,MUS$2010/PJ,2050 -A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2030,all-year,R1,power,0.25714285714,windturbine,3,MUS$2010/PJ,2050 -A1,7,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2035,all-year,R1,power,0.25714285714,windturbine,3,MUS$2010/PJ,2050 -A1,9,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2040,all-year,R1,power,0.51428571429,windturbine,3,MUS$2010/PJ,2050 -A1,11,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2045,all-year,R1,power,0.51428571429,windturbine,3,MUS$2010/PJ,2050 -A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.51428571429,windturbine,4,MUS$2010/PJ,2050 -A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2030,all-year,R1,power,0.51428571429,windturbine,4,MUS$2010/PJ,2050 -A1,7,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2035,all-year,R1,power,0.51428571429,windturbine,4,MUS$2010/PJ,2050 -A1,9,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2040,all-year,R1,power,1.02857142857,windturbine,4,MUS$2010/PJ,2050 -A1,11,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2045,all-year,R1,power,1.02857142857,windturbine,4,MUS$2010/PJ,2050 -A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.34285714286,windturbine,5,MUS$2010/PJ,2050 -A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2030,all-year,R1,power,0.34285714286,windturbine,5,MUS$2010/PJ,2050 -A1,7,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2035,all-year,R1,power,0.34285714286,windturbine,5,MUS$2010/PJ,2050 -A1,9,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2040,all-year,R1,power,0.68571428571,windturbine,5,MUS$2010/PJ,2050 -A1,11,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2045,all-year,R1,power,0.68571428571,windturbine,5,MUS$2010/PJ,2050 diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Capacity.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Capacity.csv deleted file mode 100644 index f7ca7b390..000000000 --- a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Capacity.csv +++ /dev/null @@ -1,18 +0,0 @@ -asset,capacity,installed,region,technology,year -0,1,2020,R1,gasCCGT,2020 -0,1,2020,R1,gasCCGT,2025 -4,1,2025,R1,windturbine,2030 -5,1,2025,R1,windturbine,2035 -6,1,2030,R1,windturbine,2035 -6,1,2025,R1,windturbine,2040 -7,1,2030,R1,windturbine,2040 -8,1,2035,R1,windturbine,2040 -7,1,2025,R1,windturbine,2045 -8,1,2030,R1,windturbine,2045 -9,1,2035,R1,windturbine,2045 -10,2,2040,R1,windturbine,2045 -8,1,2025,R1,windturbine,2050 -9,1,2030,R1,windturbine,2050 -10,1,2035,R1,windturbine,2050 -11,2,2040,R1,windturbine,2050 -12,2,2045,R1,windturbine,2050 diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Supply.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Supply.csv deleted file mode 100644 index 8c3edee1d..000000000 --- a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Supply.csv +++ /dev/null @@ -1,115 +0,0 @@ -asset,commodity,day,hour,installed,month,region,supply,technology,timeslice,year -0,electricity,all-week,night,2020,all-year,R1,0.20000000000,gasCCGT,0,2020 -0,CO2f,all-week,night,2020,all-year,R1,18.33400000000,gasCCGT,0,2020 -0,electricity,all-week,morning,2020,all-year,R1,0.40000000000,gasCCGT,1,2020 -0,CO2f,all-week,morning,2020,all-year,R1,36.66800000000,gasCCGT,1,2020 -0,electricity,all-week,afternoon,2020,all-year,R1,0.60000000000,gasCCGT,2,2020 -0,CO2f,all-week,afternoon,2020,all-year,R1,55.00200000000,gasCCGT,2,2020 -0,electricity,all-week,early-peak,2020,all-year,R1,0.40000000000,gasCCGT,3,2020 -0,CO2f,all-week,early-peak,2020,all-year,R1,36.66800000000,gasCCGT,3,2020 -0,electricity,all-week,late-peak,2020,all-year,R1,0.80000000000,gasCCGT,4,2020 -0,CO2f,all-week,late-peak,2020,all-year,R1,73.33600000000,gasCCGT,4,2020 -0,electricity,all-week,evening,2020,all-year,R1,1.00000000000,gasCCGT,5,2020 -0,CO2f,all-week,evening,2020,all-year,R1,91.67000000000,gasCCGT,5,2020 -0,electricity,all-week,night,2020,all-year,R1,0.42220000000,gasCCGT,0,2025 -0,CO2f,all-week,night,2020,all-year,R1,38.70510000000,gasCCGT,0,2025 -0,electricity,all-week,morning,2020,all-year,R1,0.63330000000,gasCCGT,1,2025 -0,CO2f,all-week,morning,2020,all-year,R1,58.05770000000,gasCCGT,1,2025 -0,electricity,all-week,afternoon,2020,all-year,R1,0.60000000000,gasCCGT,2,2025 -0,CO2f,all-week,afternoon,2020,all-year,R1,55.00200000000,gasCCGT,2,2025 -0,electricity,all-week,early-peak,2020,all-year,R1,0.63330000000,gasCCGT,3,2025 -0,CO2f,all-week,early-peak,2020,all-year,R1,58.05770000000,gasCCGT,3,2025 -0,electricity,all-week,late-peak,2020,all-year,R1,1.26670000000,gasCCGT,4,2025 -0,CO2f,all-week,late-peak,2020,all-year,R1,116.11530000000,gasCCGT,4,2025 -0,electricity,all-week,evening,2020,all-year,R1,1.00000000000,gasCCGT,5,2025 -0,CO2f,all-week,evening,2020,all-year,R1,91.67000000000,gasCCGT,5,2025 -4,electricity,all-week,night,2025,all-year,R1,0.66670000000,windturbine,0,2030 -4,electricity,all-week,morning,2025,all-year,R1,0.50000000000,windturbine,1,2030 -4,electricity,all-week,afternoon,2025,all-year,R1,0.50000000000,windturbine,2,2030 -4,electricity,all-week,early-peak,2025,all-year,R1,1.00000000000,windturbine,3,2030 -4,electricity,all-week,late-peak,2025,all-year,R1,1.00000000000,windturbine,4,2030 -4,electricity,all-week,evening,2025,all-year,R1,1.00000000000,windturbine,5,2030 -5,electricity,all-week,night,2025,all-year,R1,0.40000000000,windturbine,0,2035 -6,electricity,all-week,night,2030,all-year,R1,0.40000000000,windturbine,0,2035 -5,electricity,all-week,morning,2025,all-year,R1,0.50000000000,windturbine,1,2035 -6,electricity,all-week,morning,2030,all-year,R1,0.50000000000,windturbine,1,2035 -5,electricity,all-week,afternoon,2025,all-year,R1,0.40000000000,windturbine,2,2035 -6,electricity,all-week,afternoon,2030,all-year,R1,0.40000000000,windturbine,2,2035 -5,electricity,all-week,early-peak,2025,all-year,R1,0.60000000000,windturbine,3,2035 -6,electricity,all-week,early-peak,2030,all-year,R1,0.60000000000,windturbine,3,2035 -5,electricity,all-week,late-peak,2025,all-year,R1,1.00000000000,windturbine,4,2035 -6,electricity,all-week,late-peak,2030,all-year,R1,1.00000000000,windturbine,4,2035 -5,electricity,all-week,evening,2025,all-year,R1,0.80000000000,windturbine,5,2035 -6,electricity,all-week,evening,2030,all-year,R1,0.80000000000,windturbine,5,2035 -6,electricity,all-week,night,2025,all-year,R1,0.31110000000,windturbine,0,2040 -7,electricity,all-week,night,2030,all-year,R1,0.31110000000,windturbine,0,2040 -8,electricity,all-week,night,2035,all-year,R1,0.31110000000,windturbine,0,2040 -6,electricity,all-week,morning,2025,all-year,R1,0.46670000000,windturbine,1,2040 -7,electricity,all-week,morning,2030,all-year,R1,0.46670000000,windturbine,1,2040 -8,electricity,all-week,morning,2035,all-year,R1,0.46670000000,windturbine,1,2040 -6,electricity,all-week,afternoon,2025,all-year,R1,0.31110000000,windturbine,2,2040 -7,electricity,all-week,afternoon,2030,all-year,R1,0.31110000000,windturbine,2,2040 -8,electricity,all-week,afternoon,2035,all-year,R1,0.31110000000,windturbine,2,2040 -6,electricity,all-week,early-peak,2025,all-year,R1,0.46670000000,windturbine,3,2040 -7,electricity,all-week,early-peak,2030,all-year,R1,0.46670000000,windturbine,3,2040 -8,electricity,all-week,early-peak,2035,all-year,R1,0.46670000000,windturbine,3,2040 -6,electricity,all-week,late-peak,2025,all-year,R1,0.93330000000,windturbine,4,2040 -7,electricity,all-week,late-peak,2030,all-year,R1,0.93330000000,windturbine,4,2040 -8,electricity,all-week,late-peak,2035,all-year,R1,0.93330000000,windturbine,4,2040 -6,electricity,all-week,evening,2025,all-year,R1,0.62220000000,windturbine,5,2040 -7,electricity,all-week,evening,2030,all-year,R1,0.62220000000,windturbine,5,2040 -8,electricity,all-week,evening,2035,all-year,R1,0.62220000000,windturbine,5,2040 -7,electricity,all-week,night,2025,all-year,R1,0.21330000000,windturbine,0,2045 -8,electricity,all-week,night,2030,all-year,R1,0.21330000000,windturbine,0,2045 -9,electricity,all-week,night,2035,all-year,R1,0.21330000000,windturbine,0,2045 -10,electricity,all-week,night,2040,all-year,R1,0.42670000000,windturbine,0,2045 -7,electricity,all-week,morning,2025,all-year,R1,0.32000000000,windturbine,1,2045 -8,electricity,all-week,morning,2030,all-year,R1,0.32000000000,windturbine,1,2045 -9,electricity,all-week,morning,2035,all-year,R1,0.32000000000,windturbine,1,2045 -10,electricity,all-week,morning,2040,all-year,R1,0.64000000000,windturbine,1,2045 -7,electricity,all-week,afternoon,2025,all-year,R1,0.21330000000,windturbine,2,2045 -8,electricity,all-week,afternoon,2030,all-year,R1,0.21330000000,windturbine,2,2045 -9,electricity,all-week,afternoon,2035,all-year,R1,0.21330000000,windturbine,2,2045 -10,electricity,all-week,afternoon,2040,all-year,R1,0.42670000000,windturbine,2,2045 -7,electricity,all-week,early-peak,2025,all-year,R1,0.32000000000,windturbine,3,2045 -8,electricity,all-week,early-peak,2030,all-year,R1,0.32000000000,windturbine,3,2045 -9,electricity,all-week,early-peak,2035,all-year,R1,0.32000000000,windturbine,3,2045 -10,electricity,all-week,early-peak,2040,all-year,R1,0.64000000000,windturbine,3,2045 -7,electricity,all-week,late-peak,2025,all-year,R1,0.64000000000,windturbine,4,2045 -8,electricity,all-week,late-peak,2030,all-year,R1,0.64000000000,windturbine,4,2045 -9,electricity,all-week,late-peak,2035,all-year,R1,0.64000000000,windturbine,4,2045 -10,electricity,all-week,late-peak,2040,all-year,R1,1.28000000000,windturbine,4,2045 -7,electricity,all-week,evening,2025,all-year,R1,0.42670000000,windturbine,5,2045 -8,electricity,all-week,evening,2030,all-year,R1,0.42670000000,windturbine,5,2045 -9,electricity,all-week,evening,2035,all-year,R1,0.42670000000,windturbine,5,2045 -10,electricity,all-week,evening,2040,all-year,R1,0.85330000000,windturbine,5,2045 -8,electricity,all-week,night,2025,all-year,R1,0.17140000000,windturbine,0,2050 -9,electricity,all-week,night,2030,all-year,R1,0.17140000000,windturbine,0,2050 -10,electricity,all-week,night,2035,all-year,R1,0.17140000000,windturbine,0,2050 -11,electricity,all-week,night,2040,all-year,R1,0.34290000000,windturbine,0,2050 -12,electricity,all-week,night,2045,all-year,R1,0.34290000000,windturbine,0,2050 -8,electricity,all-week,morning,2025,all-year,R1,0.25710000000,windturbine,1,2050 -9,electricity,all-week,morning,2030,all-year,R1,0.25710000000,windturbine,1,2050 -10,electricity,all-week,morning,2035,all-year,R1,0.25710000000,windturbine,1,2050 -11,electricity,all-week,morning,2040,all-year,R1,0.51430000000,windturbine,1,2050 -12,electricity,all-week,morning,2045,all-year,R1,0.51430000000,windturbine,1,2050 -8,electricity,all-week,afternoon,2025,all-year,R1,0.17140000000,windturbine,2,2050 -9,electricity,all-week,afternoon,2030,all-year,R1,0.17140000000,windturbine,2,2050 -10,electricity,all-week,afternoon,2035,all-year,R1,0.17140000000,windturbine,2,2050 -11,electricity,all-week,afternoon,2040,all-year,R1,0.34290000000,windturbine,2,2050 -12,electricity,all-week,afternoon,2045,all-year,R1,0.34290000000,windturbine,2,2050 -8,electricity,all-week,early-peak,2025,all-year,R1,0.25710000000,windturbine,3,2050 -9,electricity,all-week,early-peak,2030,all-year,R1,0.25710000000,windturbine,3,2050 -10,electricity,all-week,early-peak,2035,all-year,R1,0.25710000000,windturbine,3,2050 -11,electricity,all-week,early-peak,2040,all-year,R1,0.51430000000,windturbine,3,2050 -12,electricity,all-week,early-peak,2045,all-year,R1,0.51430000000,windturbine,3,2050 -8,electricity,all-week,late-peak,2025,all-year,R1,0.51430000000,windturbine,4,2050 -9,electricity,all-week,late-peak,2030,all-year,R1,0.51430000000,windturbine,4,2050 -10,electricity,all-week,late-peak,2035,all-year,R1,0.51430000000,windturbine,4,2050 -11,electricity,all-week,late-peak,2040,all-year,R1,1.02860000000,windturbine,4,2050 -12,electricity,all-week,late-peak,2045,all-year,R1,1.02860000000,windturbine,4,2050 -8,electricity,all-week,evening,2025,all-year,R1,0.34290000000,windturbine,5,2050 -9,electricity,all-week,evening,2030,all-year,R1,0.34290000000,windturbine,5,2050 -10,electricity,all-week,evening,2035,all-year,R1,0.34290000000,windturbine,5,2050 -11,electricity,all-week,evening,2040,all-year,R1,0.68570000000,windturbine,5,2050 -12,electricity,all-week,evening,2045,all-year,R1,0.68570000000,windturbine,5,2050 diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Capacity.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Capacity.csv deleted file mode 100644 index d5cf558f0..000000000 --- a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Capacity.csv +++ /dev/null @@ -1,14 +0,0 @@ -asset,capacity,installed,region,technology,year -0,10,2020,R1,gasboiler,2020 -0,5,2020,R1,gasboiler,2025 -1,19,2020,R1,heatpump,2025 -1,19,2020,R1,heatpump,2030 -2,10,2025,R1,heatpump,2030 -2,10,2025,R1,heatpump,2035 -3,26,2030,R1,heatpump,2035 -3,26,2030,R1,heatpump,2040 -4,16,2035,R1,heatpump,2040 -4,16,2035,R1,heatpump,2045 -5,32,2040,R1,heatpump,2045 -5,32,2040,R1,heatpump,2050 -6,22,2045,R1,heatpump,2050 diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Supply.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Supply.csv deleted file mode 100644 index 520869501..000000000 --- a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Supply.csv +++ /dev/null @@ -1,91 +0,0 @@ -asset,commodity,day,hour,installed,month,region,supply,technology,timeslice,year -0,heat,all-week,night,2020,all-year,R1,1.00000000000,gasboiler,0,2020 -0,CO2f,all-week,night,2020,all-year,R1,64.71000000000,gasboiler,0,2020 -0,heat,all-week,morning,2020,all-year,R1,1.50000000000,gasboiler,1,2020 -0,CO2f,all-week,morning,2020,all-year,R1,97.06500000000,gasboiler,1,2020 -0,heat,all-week,afternoon,2020,all-year,R1,1.00000000000,gasboiler,2,2020 -0,CO2f,all-week,afternoon,2020,all-year,R1,64.71000000000,gasboiler,2,2020 -0,heat,all-week,early-peak,2020,all-year,R1,1.50000000000,gasboiler,3,2020 -0,CO2f,all-week,early-peak,2020,all-year,R1,97.06500000000,gasboiler,3,2020 -0,heat,all-week,late-peak,2020,all-year,R1,3.00000000000,gasboiler,4,2020 -0,CO2f,all-week,late-peak,2020,all-year,R1,194.13000000000,gasboiler,4,2020 -0,heat,all-week,evening,2020,all-year,R1,2.00000000000,gasboiler,5,2020 -0,CO2f,all-week,evening,2020,all-year,R1,129.42000000000,gasboiler,5,2020 -0,heat,all-week,night,2020,all-year,R1,0.27780000000,gasboiler,0,2025 -1,heat,all-week,night,2020,all-year,R1,1.05560000000,heatpump,0,2025 -0,CO2f,all-week,night,2020,all-year,R1,17.97500000000,gasboiler,0,2025 -0,heat,all-week,morning,2020,all-year,R1,0.41670000000,gasboiler,1,2025 -1,heat,all-week,morning,2020,all-year,R1,1.58330000000,heatpump,1,2025 -0,CO2f,all-week,morning,2020,all-year,R1,26.96250000000,gasboiler,1,2025 -0,heat,all-week,afternoon,2020,all-year,R1,0.27780000000,gasboiler,2,2025 -1,heat,all-week,afternoon,2020,all-year,R1,1.05560000000,heatpump,2,2025 -0,CO2f,all-week,afternoon,2020,all-year,R1,17.97500000000,gasboiler,2,2025 -0,heat,all-week,early-peak,2020,all-year,R1,0.41670000000,gasboiler,3,2025 -1,heat,all-week,early-peak,2020,all-year,R1,1.58330000000,heatpump,3,2025 -0,CO2f,all-week,early-peak,2020,all-year,R1,26.96250000000,gasboiler,3,2025 -0,heat,all-week,late-peak,2020,all-year,R1,0.83330000000,gasboiler,4,2025 -1,heat,all-week,late-peak,2020,all-year,R1,3.16670000000,heatpump,4,2025 -0,CO2f,all-week,late-peak,2020,all-year,R1,53.92500000000,gasboiler,4,2025 -0,heat,all-week,evening,2020,all-year,R1,0.55560000000,gasboiler,5,2025 -1,heat,all-week,evening,2020,all-year,R1,2.11110000000,heatpump,5,2025 -0,CO2f,all-week,evening,2020,all-year,R1,35.95000000000,gasboiler,5,2025 -1,heat,all-week,night,2020,all-year,R1,1.09200000000,heatpump,0,2030 -2,heat,all-week,night,2025,all-year,R1,0.57470000000,heatpump,0,2030 -1,heat,all-week,morning,2020,all-year,R1,1.63790000000,heatpump,1,2030 -2,heat,all-week,morning,2025,all-year,R1,0.86210000000,heatpump,1,2030 -1,heat,all-week,afternoon,2020,all-year,R1,1.09200000000,heatpump,2,2030 -2,heat,all-week,afternoon,2025,all-year,R1,0.57470000000,heatpump,2,2030 -1,heat,all-week,early-peak,2020,all-year,R1,1.63790000000,heatpump,3,2030 -2,heat,all-week,early-peak,2025,all-year,R1,0.86210000000,heatpump,3,2030 -1,heat,all-week,late-peak,2020,all-year,R1,3.27590000000,heatpump,4,2030 -2,heat,all-week,late-peak,2025,all-year,R1,1.72410000000,heatpump,4,2030 -1,heat,all-week,evening,2020,all-year,R1,2.18390000000,heatpump,5,2030 -2,heat,all-week,evening,2025,all-year,R1,1.14940000000,heatpump,5,2030 -2,heat,all-week,night,2025,all-year,R1,0.55560000000,heatpump,0,2035 -3,heat,all-week,night,2030,all-year,R1,1.44440000000,heatpump,0,2035 -2,heat,all-week,morning,2025,all-year,R1,0.83330000000,heatpump,1,2035 -3,heat,all-week,morning,2030,all-year,R1,2.16670000000,heatpump,1,2035 -2,heat,all-week,afternoon,2025,all-year,R1,0.55560000000,heatpump,2,2035 -3,heat,all-week,afternoon,2030,all-year,R1,1.44440000000,heatpump,2,2035 -2,heat,all-week,early-peak,2025,all-year,R1,0.83330000000,heatpump,3,2035 -3,heat,all-week,early-peak,2030,all-year,R1,2.16670000000,heatpump,3,2035 -2,heat,all-week,late-peak,2025,all-year,R1,1.66670000000,heatpump,4,2035 -3,heat,all-week,late-peak,2030,all-year,R1,4.33330000000,heatpump,4,2035 -2,heat,all-week,evening,2025,all-year,R1,1.11110000000,heatpump,5,2035 -3,heat,all-week,evening,2030,all-year,R1,2.88890000000,heatpump,5,2035 -3,heat,all-week,night,2030,all-year,R1,1.44440000000,heatpump,0,2040 -4,heat,all-week,night,2035,all-year,R1,0.88890000000,heatpump,0,2040 -3,heat,all-week,morning,2030,all-year,R1,2.16670000000,heatpump,1,2040 -4,heat,all-week,morning,2035,all-year,R1,1.33330000000,heatpump,1,2040 -3,heat,all-week,afternoon,2030,all-year,R1,1.44440000000,heatpump,2,2040 -4,heat,all-week,afternoon,2035,all-year,R1,0.88890000000,heatpump,2,2040 -3,heat,all-week,early-peak,2030,all-year,R1,2.16670000000,heatpump,3,2040 -4,heat,all-week,early-peak,2035,all-year,R1,1.33330000000,heatpump,3,2040 -3,heat,all-week,late-peak,2030,all-year,R1,4.33330000000,heatpump,4,2040 -4,heat,all-week,late-peak,2035,all-year,R1,2.66670000000,heatpump,4,2040 -3,heat,all-week,evening,2030,all-year,R1,2.88890000000,heatpump,5,2040 -4,heat,all-week,evening,2035,all-year,R1,1.77780000000,heatpump,5,2040 -4,heat,all-week,night,2035,all-year,R1,0.88890000000,heatpump,0,2045 -5,heat,all-week,night,2040,all-year,R1,1.77780000000,heatpump,0,2045 -4,heat,all-week,morning,2035,all-year,R1,1.33330000000,heatpump,1,2045 -5,heat,all-week,morning,2040,all-year,R1,2.66670000000,heatpump,1,2045 -4,heat,all-week,afternoon,2035,all-year,R1,0.88890000000,heatpump,2,2045 -5,heat,all-week,afternoon,2040,all-year,R1,1.77780000000,heatpump,2,2045 -4,heat,all-week,early-peak,2035,all-year,R1,1.33330000000,heatpump,3,2045 -5,heat,all-week,early-peak,2040,all-year,R1,2.66670000000,heatpump,3,2045 -4,heat,all-week,late-peak,2035,all-year,R1,2.66670000000,heatpump,4,2045 -5,heat,all-week,late-peak,2040,all-year,R1,5.33330000000,heatpump,4,2045 -4,heat,all-week,evening,2035,all-year,R1,1.77780000000,heatpump,5,2045 -5,heat,all-week,evening,2040,all-year,R1,3.55560000000,heatpump,5,2045 -5,heat,all-week,night,2040,all-year,R1,1.77780000000,heatpump,0,2050 -6,heat,all-week,night,2045,all-year,R1,1.22220000000,heatpump,0,2050 -5,heat,all-week,morning,2040,all-year,R1,2.66670000000,heatpump,1,2050 -6,heat,all-week,morning,2045,all-year,R1,1.83330000000,heatpump,1,2050 -5,heat,all-week,afternoon,2040,all-year,R1,1.77780000000,heatpump,2,2050 -6,heat,all-week,afternoon,2045,all-year,R1,1.22220000000,heatpump,2,2050 -5,heat,all-week,early-peak,2040,all-year,R1,2.66670000000,heatpump,3,2050 -6,heat,all-week,early-peak,2045,all-year,R1,1.83330000000,heatpump,3,2050 -5,heat,all-week,late-peak,2040,all-year,R1,5.33330000000,heatpump,4,2050 -6,heat,all-week,late-peak,2045,all-year,R1,3.66670000000,heatpump,4,2050 -5,heat,all-week,evening,2040,all-year,R1,3.55560000000,heatpump,5,2050 -6,heat,all-week,evening,2045,all-year,R1,2.44440000000,heatpump,5,2050 diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/technodata/power/Technodata.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/technodata/power/Technodata.csv deleted file mode 100644 index 32a48cb8a..000000000 --- a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/technodata/power/Technodata.csv +++ /dev/null @@ -1,4 +0,0 @@ -ProcessName,RegionName,Time,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent1 -Unit,-,Year,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,New -gasCCGT,R1,2020,23.78234399,1,0,1,0,1,200,20,100,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1 -windturbine,R1,2020,36.30771182,1,0,1,0,1,200,20,60,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1 diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/technodata/residential/Technodata.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/technodata/residential/Technodata.csv deleted file mode 100644 index 3424b178b..000000000 --- a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/technodata/residential/Technodata.csv +++ /dev/null @@ -1,4 +0,0 @@ -ProcessName,RegionName,Time,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent1 -Unit,-,Year,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,New -gasboiler,R1,2020,3.8,1,0,1,0,1,10,0.2,60,10,1,0.00000189,86,0.1,energy,gas,heat,1 -heatpump,R1,2020,8.866667,1,0,1,0,1,10,0.2,60,10,1,0.00000189,86,0.1,energy,electricity,heat,1 diff --git a/docs/user-guide/add-agent.ipynb b/docs/user-guide/add-agent.ipynb index 95c07a4cc..6dc84f655 100644 --- a/docs/user-guide/add-agent.ipynb +++ b/docs/user-guide/add-agent.ipynb @@ -21,7 +21,9 @@ "\n", "We will begin by adding a second agent to this model. Compared to the current agent, which bases investment decisions on minimising [LCOE](https://en.wikipedia.org/wiki/Levelized_cost_of_electricity), the second agent will aim to minimise fuel consumption costs.\n", "\n", - "To achieve this, first, we must modify the ```Agents.csv``` file in the directory:\n", + "## Creating an agent\n", + "\n", + "To create the new agent, we must first modify the ```Agents.csv``` file in the directory:\n", "\n", " {PATH_TO_MODEL}/technodata/Agents.csv" ] @@ -30,14 +32,14 @@ "cell_type": "markdown", "metadata": {}, "source": [ - "To start with, we will copy the data for agent `A1` to create a new agent `A2`, and we will change the objective of this agent to `fuel_consumption_cost`. Also notice that we amend the `Quantity` column. The reason for this is that we want to specify that Agent `A1` makes up 50% of the population, and `A2` makes up the remaining 50% of the population.\n", + "To start with, we will copy the data for agent `A1` to create a new agent `A2`, and we will change the objective of this agent to `fuel_consumption_cost`. We keep `Objsort1` as True, which indicates that the objective should be minimised, rather than maximised. Also notice that we amend the `Quantity` column, to specify that each agent makes up 50% of the population.\n", "\n", "Again, we only show some of the columns due to space constraints, however see [here](https://github.com/EnergySystemsModellingLab/MUSE_OS/blob/main/docs/tutorial-code/2-add-agent/1-single-objective/technodata/Agents.csv) for the full file.\n", "\n", - "|AgentShare|Name|RegionName|Objective1|Objective2|Objective3|ObjData1|ObjData2|…|DecisionMethod|Quantity|…|Type|\n", - "|-|-|-|-|-|-|-|-|-|-|-|-|-|\n", - "|Agent1|A1|R1|LCOE|||1||…|singleObj|**0.5**|…|New|\n", - "|**Agent2**|**A2**|**R1**|**fuel_consumption_cost**|||**1**||…|**singleObj**|**0.5**|…|**New**|" + "|AgentShare|Name|RegionName|Objective1|…|ObjData1|…|DecisionMethod|Quantity|…|Type|\n", + "|-|-|-|-|-|-|-|-|-|-|-|\n", + "|Agent1|A1|R1|LCOE|…|1|…|singleObj|**0.5**|…|New|\n", + "|**Agent2**|**A2**|**R1**|**fuel_consumption_cost**|…|**1**|…|**singleObj**|**0.5**|…|**New**|" ] }, { @@ -46,17 +48,13 @@ "source": [ "We then edit all of the `Technodata` files to split the existing capacity between the two agents by the proportions we like. As we now have two agents which take up 50% of the population each, we will split the existing capacity by 50% for each of the agents. \n", "\n", - "The new technodata file for the power sector will look like the following:\n", + "The new technodata file for the power sector should look like the following:\n", "\n", "|ProcessName|RegionName|Time|cap_par|cap_exp|…|Fuel|EndUse|Agent1|Agent2|\n", "|-|-|-|-|-|-|-|-|-|-|\n", "|Unit|-|Year|MUS$2010/PJ_a|-|…|-|-|New|**New**|\n", "|gasCCGT|R1|2020|23.78234399|1|…|gas|electricity|**0.5**|**0.5**|\n", - "|gasCCGT|R1|2040|23.78234399|1|…|gas|electricity|**0.5**|**0.5**|\n", "|windturbine|R1|2020|36.30771182|1|…|wind|electricity|**0.5**|**0.5**|\n", - "|windturbine|R1|2040|36.30771182|1|…|wind|electricity|**0.5**|**0.5**|\n", - "|solarPV|R1|2020|40|1|...|solar|electricity|**0.5**|**0.5**|\n", - "|solarPV|R1|2040|30|1|...|solar|electricity|**0.5**|**0.5**|\n", "\n", "Remember you will have to make the same changes for the residential and gas sectors!" ] @@ -131,30 +129,30 @@ "cell_type": "markdown", "metadata": {}, "source": [ - "We can see different results between the two agents. Whilst agent `A1` invests heavily in heat pumps, agent `A2` invests mostly in gas boilers, due to the lower fuel costs of this technology." + "We can see different results between the two agents. Whilst agent `A1` invests heavily in heat pumps, agent `A2` invests entirely in gas boilers, due to the lower fuel costs of this technology." ] }, { "cell_type": "markdown", "metadata": {}, "source": [ + "## Combining multiple objectives\n", + "\n", "We can also use multiple objectives for a single agent, combining objectives by taking a weighted sum. We will try this for agent A2, using both `fuel_consumption_cost` and `LCOE` with relative weights of 0.5 each.\n", "\n", - "To do this, we need to modify the `Objective2`, `ObjData1`, `ObjData2`, `Objsort2` and `DecisionMethod` columns in the ```Agents.csv``` file, to look like the following:\n", + "To do this, we need to add the new objective in the `Objective2` column, use `Objsort2` to indicate that this objective should be minimised, modify `DecisionMethod` to indicate that a weighted sum should be taken between the two objectives, and specify the weights of the two objectives in `ObjData1` and `ObjData2`:\n", "\n", - "|AgentShare|Name|RegionName|Objective1|Objective2|Objective3|ObjData1|ObjData2|…|Objsort2|…|DecisionMethod|Quantity|…|Type|\n", + "|AgentShare|Name|RegionName|Objective1|Objective2|…|ObjData1|ObjData2|…|Objsort2|…|DecisionMethod|Quantity|…|Type|\n", "|-|-|-|-|-|-|-|-|-|-|-|-|-|-|-|\n", - "|Agent1|A1|R1|LCOE|||1||…||…|singleObj|0.5|…|New|\n", - "|Agent2|A2|R1|fuel_consumption_cost|**LCOE**||**0.5**|**0.5**|…|**True**|**…**|**weighted_sum**|0.5|…|New|" + "|Agent1|A1|R1|LCOE||…|1||…||…|singleObj|0.5|…|New|\n", + "|Agent2|A2|R1|fuel_consumption_cost|**LCOE**|…|**0.5**|**0.5**|…|**True**|…|**weighted_sum**|0.5|…|New|" ] }, { "cell_type": "markdown", "metadata": {}, "source": [ - "The `Objsort2` parameter indicates that the second objective should be minimised, rather than maximised.\n", - "\n", - "We will then re-run the simulation. Once the model has run to completion, we can visualise the results as before:" + "We will then re-run the simulation, and visualise the results as before:" ] }, { @@ -192,25 +190,6 @@ "\n", "Have a play around with the files to see if you can come up with different scenarios!" ] - }, - { - "cell_type": "markdown", - "metadata": {}, - "source": [ - "## Next steps " - ] - }, - { - "cell_type": "markdown", - "metadata": {}, - "source": [ - "In the next section we will show you how to add a new region. The next tutorial will build on the model from tutorial 1 (with just one agent), so the model from this tutorial can be left aside for now." - ] - }, - { - "cell_type": "markdown", - "metadata": {}, - "source": [] } ], "metadata": { diff --git a/docs/user-guide/add-gdp-correlation-demand.ipynb b/docs/user-guide/add-gdp-correlation-demand.ipynb index c1e09b72d..137492e29 100644 --- a/docs/user-guide/add-gdp-correlation-demand.ipynb +++ b/docs/user-guide/add-gdp-correlation-demand.ipynb @@ -14,7 +14,13 @@ "In the previous section we added an exogenous service demand. That is, we explicitly specified what the demand would be per year. \n", "However, we may not know what the electricity demand may be per year. Instead, we may conclude that our electricity demand is a function of the GDP and population of a particular region. \n", "To accommodate such a scenario, MUSE enables us to choose a regression function that estimates service demands from GDP and population, which may be more certain in your case.\n", - "In this section we will show how this can be done." + "In this section we will show how this can be done.\n", + "\n", + "This tutorial will build off the default model that comes with MUSE. To copy the files for this model, run:\n", + "\n", + "```bash\n", + "python -m muse --model default --copy PATH/TO/COPY/THE/MODEL/TO\n", + "```" ] }, { @@ -28,15 +34,7 @@ "cell_type": "markdown", "metadata": {}, "source": [ - "For this work, we will use the `default` example from the MUSE repository, and will not build on the previous examples. This is done to simplify the model at this point.\n", - "\n", - "You can copy the files for the default model in order to edit them like so:\n", - "\n", - "```bash\n", - "python -m muse --model default --copy PATH/TO/COPY/THE/MODEL/TO\n", - "```\n", - "\n", - "Similarly to before, we must amend the `technodata/preset` folder for this. As we are no longer explicitly specifying demand, we can delete the `Residential2020Consumption.csv` and `Residential2050Consumption.csv` files. Instead, we must replace these files with the following:\n", + "Similarly to before, we must amend the `technodata/preset` folder. As we are no longer explicitly specifying demand, we can delete the `Residential2020Consumption.csv` and `Residential2050Consumption.csv` files. Instead, we must replace these files with the following:\n", "\n", "- A macrodrivers file. This contains the drivers of the service demand that we want to model. For this example, these will include GDP based on purchasing power parity (GDP PPP) and the population that we expect from 2010 to 2110.\n", "\n", @@ -52,11 +50,11 @@ "\n", "- [TimesliceSharepreset.csv](https://github.com/EnergySystemsModellingLab/MUSE_OS/blob/main/docs/tutorial-code/6-add-correlation-demand/1-correlation/technodata/preset/TimesliceSharepreset.csv)\n", "\n", - "For a full introduction to these files, see the link [here](../inputs/correlation_files.rst).\n", + "For a full description of these files, see the link [here](../inputs/correlation_files.rst).\n", "\n", "Download these files and save them within the `preset` folder.\n", "\n", - "Next, we must amend our toml file to include our new way of calculating the preset service demand." + "Next, we must amend our toml file to link to these files." ] }, { @@ -70,9 +68,7 @@ "cell_type": "markdown", "metadata": {}, "source": [ - "Editing the TOML file to include this can be done relatively quickly if we know the variable names.\n", - "\n", - "In the second bottom section of the toml file, you will see the following section: \n", + "Towards the bottom of the toml file, you will see the following section: \n", "\n", "```toml\n", "[sectors.residential_presets]\n", @@ -81,7 +77,7 @@ "consumption_path= \"{path}/technodata/preset/*Consumption.csv\"\n", "```\n", "\n", - "This enables us to run the model in exogenous mode, but now we would like to run the model from the files previously mentioned. This can be done by linking new variables to the new files, as follows:\n", + "This enables us to run the model in exogenous mode (i.e. explicitly specifying demand), but now we would like to run the model using the new regression files. This can be done by linking new variables to the new files, as follows:\n", "\n", "```toml\n", "[sectors.residential_presets]\n", @@ -90,9 +86,7 @@ "timeslice_shares_path = '{path}/technodata/preset/TimesliceSharepreset.csv'\n", "macrodrivers_path = '{path}/technodata/preset/Macrodrivers.csv'\n", "regression_path = '{path}/technodata/preset/regressionparameters.csv'\n", - "```\n", - "\n", - "We effectively linked the new files to MUSE." + "```" ] }, { @@ -128,7 +122,7 @@ "outputs": [], "source": [ "mca_capacity = pd.read_csv(\n", - " \"../tutorial-code/6-add-correlation-demand/1-correlation/Results/MCACapacity.csv\"\n", + " \"../tutorial-code/7-add-correlation-demand/1-correlation/Results/MCACapacity.csv\"\n", ")\n", "mca_capacity.head()" ] @@ -160,17 +154,13 @@ "cell_type": "markdown", "metadata": {}, "source": [ - "As expected, we see a scenario emerge with much higher capacity limits. The demand does not increase linearly, with variations in the total demand in the residential sector. This is due to the new function not being a linear function." + "As expected, we see a different scenario emerge. The demand does not increase linearly, with variations in the total demand in the residential sector, in line with the changing population data." ] }, { "cell_type": "markdown", "metadata": {}, - "source": [ - "## Next steps\n", - "\n", - "In the next section we will see how we can enforce outputs of technologies by timeslice. For instance, we can prevent solar photovoltaics from producing electricity at night, or ensure that a nuclear power plant runs at a minimum capacity during the day." - ] + "source": [] } ], "metadata": { @@ -189,7 +179,7 @@ "name": "python", "nbconvert_exporter": "python", "pygments_lexer": "ipython3", - "version": "3.12.3" + "version": "3.12.4" }, "vscode": { "interpreter": { diff --git a/docs/user-guide/add-region.ipynb b/docs/user-guide/add-region.ipynb index b99c49674..553902f56 100644 --- a/docs/user-guide/add-region.ipynb +++ b/docs/user-guide/add-region.ipynb @@ -11,11 +11,17 @@ "cell_type": "markdown", "metadata": {}, "source": [ - "The next step is to add a region which we will call `R2`, however, this could equally be called `USA` or `India`. This requires us to undertake a similar process as before of modifying the input simulation data.\n", + "This tutorial will show you how to add additional regions to the model.\n", "\n", - "This tutorial will follow on from the model in tutorial 1 (including the price change in 2040). To begin, copy your files from tutorial 1 to a new location.\n", + "Again, we will build off the default model that comes with MUSE. To copy the files for this model, run:\n", "\n", - "To add a new region, we begin by modifying the ```settings.toml``` file. We just have to add our new region to the ```regions``` variable, in the 4th line of the file, like so:\n", + "```bash\n", + "python -m muse --model default --copy PATH/TO/COPY/THE/MODEL/TO\n", + "```\n", + "\n", + "We will add a region called `R2` (however, this could equally be called `USA` or `India`). This requires us to undertake a similar process as before of modifying the input simulation data.\n", + "\n", + "We begin by modifying the `settings.toml` file. We just have to add our new region to the `regions` variable, in the 4th line of the file, like so:\n", "\n", "```toml\n", "regions = [\"R1\", \"R2\"]\n", @@ -30,13 +36,11 @@ "cell_type": "markdown", "metadata": {}, "source": [ - "Effectively, for this example, we will copy and paste the results for each of the input files from region `R1`, and change the name of the region for the new rows to `R2`. \n", + "Effectively, for this example, we will copy and paste the rows in each of the input files from region `R1`, and change the name of the region for the new rows to `R2`. \n", "\n", "We have placed two examples as to how to edit the residential sector below. Again, the edited data are highlighted in **bold**, with the original data in normal text. \n", "\n", - "For the sake of brevity, we have omitted the entries for 2040 for the `CommIn.csv` file, however, just make sure to copy and paste the values for 2020 to 2040 here. The full file can be seen [here](https://github.com/EnergySystemsModellingLab/MUSE_OS/blob/main/docs/tutorial-code/3-add-region/1-new-region/technodata/residential/CommIn.csv). \n", - "\n", - "The following file is the modified ```/technodata/residential/CommIn.csv``` file:\n", + "The following file is the modified `/technodata/residential/CommIn.csv` file:\n", "\n", "|ProcessName|RegionName|Time|Level|electricity|gas|heat|CO2f|wind|\n", "|-|-|-|-|-|-|-|-|-|\n", @@ -47,7 +51,7 @@ "|**heatpump**|**R2**|**2020**|**fixed**|**0.4**|**0**|**0**|**0**|**0**|\n", "|...|...|...|...|...|...|...|...|...|\n", "\n", - "Whereas the following file is the modified ```/technodata/residential/ExistingCapacity.csv``` file:\n", + "Whereas the following file is the modified `/technodata/residential/ExistingCapacity.csv` file:\n", "\n", "|ProcessName|RegionName|Unit|2020|2025|2030|2035|2040|2045|2050|\n", "|-|-|-|-|-|-|-|-|-|-|\n", @@ -56,23 +60,17 @@ "|**gasboiler**|**R2**|**PJ/y**|**10**|**5**|**0**|**0**|**0**|**0**|**0**|\n", "|**heatpump**|**R2**|**PJ/y**|**0**|**0**|**0**|**0**|**0**|**0**|**0**|\n", "\n", - "We will follow a similar process in the ```/technodata/power/Technodata.csv``` file, copying the lines from `R1` to create `R2`. In this tutorial we will test the scenario where `windturbine` in `R2` has increased capacity limits compared to `R1`, which is highlighted below in bold. The rest of the elements are the same for `R1` as they are for `R2`.\n", - "\n", - "Again, we don't show the entries for 2040, apart from the edited windturbine row, for the sake of brevity.\n", + "We will follow a similar process in the `/technodata/residential/Technodata.csv` file, copying the lines from `R1` to create `R2`. In this tutorial we will test the scenario where `heatpump` has a strict upper limit on total capacity in `R2`, using the `TotalCapacityLimit` parameter, which is highlighted below in bold. The rest of the elements are the same for `R1` as they are for `R2`.\n", "\n", - "|ProcessName|RegionName|Time|…|MaxCapacityAddition|MaxCapacityGrowth|TotalCapacityLimit|…|Agent1|\n", - "|-|-|-|-|-|-|-|-|-|\n", - "|Unit|-|Year|…|PJ|%|PJ|…|New|\n", - "|gasCCGT|R1|2020|…|2|1|60|…|1|\n", - "|windturbine|R1|2020|…|2|1|60|…|1|\n", - "|solarPV|R1|2020|…|2|1|60|…|1|\n", - "|gasCCGT|R2|2020|…|2|1|60|…|1|\n", - "|windturbine|R2|2020|…|**5**|1|**100**|…|1|\n", - "|windturbine|R2|2040|…|**5**|1|**100**|…|1|\n", - "|solarPV|R2|2020|…|2|1|60|…|1|\n", - "|...|...|...|...|...|...|...|...|...|\n", + "|ProcessName|RegionName|Time|…|TotalCapacityLimit|…|Agent1|\n", + "|-|-|-|-|-|-|-|\n", + "|Unit|-|Year|…|PJ|…|New|\n", + "|gasboiler|R1|2020|…|100|…|1|\n", + "|heatpump|R1|2020|…|100|…|1|\n", + "|gasboiler|R2|2020|…|100|…|1|\n", + "|heatpump|R2|2020|…|**20**|…|1|\n", "\n", - "Now, go ahead and amend all of the other input files for each of the sectors by copying and pasting the rows from `R1` and replacing the `RegionName` to `R2` for the new rows. You must also modify the `BaseYearExport.csv`, `BaseYearImport.csv` and `Projections.csv` files in the `input` folder in a similar way. In this example we won't include any trade between regions, so all values in `BaseYearExport.csv` and `BaseYearImport.csv` should be left as zero.\n", + "Now, go ahead and amend all of the other input files for each of the sectors (including the preset sector, which defines the residential commodity demand in each region) by copying and pasting the rows from `R1` and replacing the `RegionName` to `R2` for the new rows. You must also modify the `Projections.csv` file in the `input` folder in a similar way.\n", "\n", "All of the edited input files can be seen [here](https://github.com/EnergySystemsModellingLab/MUSE_OS/tree/main/docs/tutorial-code/3-add-region/1-new-region)." ] @@ -81,7 +79,7 @@ "cell_type": "markdown", "metadata": {}, "source": [ - "Again, we will run the results using the ```python -m pip muse settings.toml``` in the command line, and analyse the data as follows:" + "Again, we will run the results using the ```python -m pip muse settings.toml``` in the command line, and visualize the data as follows:" ] }, { @@ -128,27 +126,13 @@ "cell_type": "markdown", "metadata": {}, "source": [ - "Due to the similar natures of the two regions, with the parameters effectively copied and pasted between them, the results are very similar in both `R1` and `R2`. `gassupply1` drops significantly within the gas sector due to the carbon price profile. Which leads to the increasing demand of `heatpump` and falling demand of `gasboiler` in both region `R1` and `R2`. `windturbine` and `solarPV` increase significantly to match this demand of `heatpump`. Region `R2` has a slightly higher share of `windturbine` resulting from the increase in capacity that we introduced.\n", + "We can see that `R2` quickly reaches its capacity limit for `heatpump`, and additional investment in `gasboiler` needed to meet the residential heating demand.\n", "\n", "Have a play around with the various costs data in the technodata files for each of the sectors and technologies to see if different scenarios emerge. Although be careful. In some cases, the constraints on certain technologies will make it impossible for the demand to be met and it will give you an error such as the following:\n", "\n", " message: 'The algorithm terminated successfully and determined that the problem is infeasible.'\n", "\n", - "To avoid this error message you may have to relax the constraints in the technodata files. For instance, `MaxCapacityGrowth`." - ] - }, - { - "cell_type": "markdown", - "metadata": {}, - "source": [ - "## Next steps" - ] - }, - { - "cell_type": "markdown", - "metadata": {}, - "source": [ - "In the next section we modify the `settings.toml` file to change the timeslicing arrangements as well as project until 2040, instead of 2050, in two benchmark year time steps." + "To avoid this error message you may have to relax the constraints in the technodata files (`MaxCapacityGrowth`, `MaxCapacityAddition` and `TotalCapacityLimit`)" ] } ], @@ -168,7 +152,7 @@ "name": "python", "nbconvert_exporter": "python", "pygments_lexer": "ipython3", - "version": "3.12.3" + "version": "3.12.4" } }, "nbformat": 4, diff --git a/docs/user-guide/add-solar.ipynb b/docs/user-guide/add-solar.ipynb index d44a5712e..abca14403 100644 --- a/docs/user-guide/add-solar.ipynb +++ b/docs/user-guide/add-solar.ipynb @@ -18,7 +18,7 @@ "cell_type": "markdown", "metadata": {}, "source": [ - "MUSE is made up of a number of different [input files](../inputs/index.rst). These, however, can be broadly split into two:\n", + "MUSE is made up of a number of different [input files](../inputs/index.rst). These can be broadly split into two types:\n", "\n", "- [Simulation settings](../inputs/toml.rst)\n", "\n", @@ -26,13 +26,13 @@ "\n", "Simulation settings specify how a simulation should be run. For example, which sectors to run, for how many years, the benchmark years and what to output. In this context, benchmark years are the years in which the model is solved. In the examples following, we solve for every 5 years, ie. 2020, 2025, 2030...\n", "\n", - "Whereas, simulation data parametrises the technologies involved in the simulation, or the number and kinds of agents.\n", + "Simulation data, on the other hand, parametrises the technologies involved in the simulation, or the number and kinds of agents.\n", "\n", "To create a customised case study it is necessary to edit both of these file types.\n", "\n", "Simulation settings are specified in a TOML file. [TOML](https://github.com/toml-lang/toml) is a simple, extensible and intuitive file format well suited for specifying small sets of complex data.\n", "\n", - "Simulation data is specified in [CSV](https://en.wikipedia.org/wiki/Comma-separated_values). This is a common format used for larger datasets, and is made up of columns and rows, with a comma used to differentiate between entries. \n", + "Simulation data is specified in [CSV](https://en.wikipedia.org/wiki/Comma-separated_values) files. This is a common format used for larger datasets, and is made up of columns and rows, with a comma used to differentiate between entries. \n", "\n", "MUSE requires at least the following files to successfully run:\n", "\n", @@ -63,7 +63,7 @@ "cell_type": "markdown", "metadata": {}, "source": [ - "In this section, we will add solar photovoltaics to the default model seen in the [example page](../running-muse-example.ipynb). To achieve this, we must modify some of the input files shown in the above section. To get the default model and be able to edit the files use:\n", + "In this section, we will add solar photovoltaics to the default model seen in the [example page](../running-muse-example.ipynb). To achieve this, we must modify some of the input files shown in the above section. To create a copy of the default model files, run:\n", "\n", "```bash\n", "python -m muse --model default --copy PATH/TO/COPY/THE/MODEL/TO\n", @@ -83,11 +83,11 @@ "cell_type": "markdown", "metadata": {}, "source": [ - "Within the default folder there is the ```settings.toml``` file, `input` folder and `technodata` folder. To add a technology within the power sector, we must open the ```technodata``` folder followed by the ```power``` folder.\n", + "Within the default folder you'll find a ```settings.toml``` file, `input` folder and `technodata` folder. To add a technology within the power sector, we must open the ```technodata``` folder followed by the ```power``` folder.\n", "\n", "At this point, we must note that we require consistency in input and output units. For example, if capacity is in PJ, the same basis would be needed for the output files `CommIn.csv` and `CommOut.csv`. In addition, across sectors a commodity needs to maintain the same unit. In these examples, we use the unit petajoule (PJ).\n", "\n", - "Next, we will edit the ```CommIn.csv``` file, which specifies the commodities consumed by solar photovoltaics.\n", + "We will first edit the ```CommIn.csv``` file, which specifies the commodities consumed by solar photovoltaics.\n", "\n", "The table below shows the original ```CommIn.csv``` version in normal text, and the added column and row in **bold**.\n", "\n", @@ -105,17 +105,17 @@ "- we call this technology ```solarPV``` \n", "- place it in region ```R1``` \n", "- the data in this row is associated to the year 2020\n", - "- the input type is fixed\n", + "- the input type is [fixed](../inputs/commodities_io.rst)\n", "- solarPV consumes solar\n", "\n", - "As the solar commodity has not been previously defined, we must define it by adding a column, which we will call solar. We fill out the entries in the solar column, ie. that neither `gasCCGT` nor `windturbine` consume solar.\n" + "As the solar commodity has not been previously defined, we must define it by adding a column, which we will call `solar`. We fill out the entries in the solar column, ie. that neither `gasCCGT` nor `windturbine` consume `solar`.\n" ] }, { "cell_type": "markdown", "metadata": {}, "source": [ - "We repeat this process for the file: ```CommOut.csv```. This file specifies the output of the technology. In our case, solar photovoltaics only output ```electricity```. This is unlike ```gasCCGT``` which also outputs ```CO2f```, or carbon dioxide.\n", + "We repeat this process for the file: ```CommOut.csv```. This file specifies the output of the technology. In our case, solar photovoltaics only output ```electricity```. This is unlike ```gasCCGT``` which also outputs ```CO2f``` (carbon dioxide).\n", "\n", "|ProcessName|RegionName|Time|electricity|gas|heat|CO2f|wind|**solar**|\n", "|-|-|-|-|-|-|-|-|----|\n", @@ -133,7 +133,7 @@ "cell_type": "markdown", "metadata": {}, "source": [ - "The next file to modify is the ```ExistingCapacity.csv``` file. This file details the existing capacity of each technology, per benchmark year. For this example, we will set the existing capacity to be 0. Please note, that the model interpolates between years linearly. \n", + "The next file to modify is the `ExistingCapacity.csv` file. This file details the existing capacity of each technology, and a decommissioning profile across the time framework. For this example, we will set the existing capacity to be 0. Please note that the model interpolates linearly between years. \n", "\n", "|ProcessName|RegionName|Unit|2020|2025|2030|2035|2040|2045|2050|\n", "|-|-|-|-|-|-|-|-|-|-|\n", @@ -146,30 +146,18 @@ "cell_type": "markdown", "metadata": {}, "source": [ - "Finally, the ```Technodata.csv``` contains parametrisation data for the technology, such as the cost, growth constraints, lifetime of the power plant and fuel used. The technodata file is too long for it all to be displayed here, so we will truncate the full version." - ] - }, - { - "cell_type": "markdown", - "metadata": {}, - "source": [ - "Here, we will only define the parameters: ```processName```, ```RegionName```, ```Time```, ```Level```,```cap_par```, ```Fuel```,```EndUse```,```Agent2``` and ```Agent1```\n", + "Finally, the `Technodata.csv` file contains parametrisation data for the technology, such as the cost, growth constraints, lifetime of the power plant and fuel used. \n", "\n", - "We shall copy the existing parameters from the ```windturbine``` technology for the remaining parameters that can be seen in the ```Technodata.csv``` file for brevity. You can see the full file [here](https://github.com/EnergySystemsModellingLab/MUSE_OS/blob/main/docs/tutorial-code/1-add-new-technology/1-introduction/technodata/power/Technodata.csv).\n", + "We will only display the some of the parameters, as the table is too large to display in full. The remaining parameters will be copied from the `windturbine` technology. You can see the full file [here](https://github.com/EnergySystemsModellingLab/MUSE_OS/blob/main/docs/tutorial-code/1-add-new-technology/1-introduction/technodata/power/Technodata.csv), and details about each parameter [here](../inputs/technodata.rst).\n", "\n", - "Again, flat forward extension is used here. Therefore, as in this example we only provide data for the benchmark year 2020. 2025 and the following benchmark years will keep the same characteristics, e.g. costs, for each benchmark year of the simulation." - ] - }, - { - "cell_type": "markdown", - "metadata": {}, - "source": [ "|ProcessName|RegionName|Time|Level|cap_par|cap_exp|…|Fuel|EndUse|Agent1|\n", "|-|-|-|-|-|-|-|-|-|-|\n", "|Unit|-|Year|-|MUS$2010/PJ_a|-|…|-|-|New|\n", "|gasCCGT|R1|2020|fixed|23.78234399|1|…|gas|electricity|1|\n", "|windturbine|R1|2020|fixed|36.30771182|1|…|wind|electricity|1|\n", - "|**solarPV**|**R1**|**2020**|**fixed**|**30**|**1**|...|**solar**|**electricity**|**1**" + "|**solarPV**|**R1**|**2020**|**fixed**|**30**|**1**|...|**solar**|**electricity**|**1**|\n", + "\n", + "Again, flat forward extension is used. Therefore, as we only provide data for the benchmark year 2020, 2025 and the following benchmark years will keep the same characteristics." ] }, { @@ -183,48 +171,16 @@ "cell_type": "markdown", "metadata": {}, "source": [ - "Next, navigate to the ```input``` folder.\n", - "\n", - "We must now edit each of the files found here to add the new solar commodity. Due to space constraints we will not display all of the entries contained in the input files. The edited files can be viewed [here](https://github.com/EnergySystemsModellingLab/MUSE_OS/tree/main/docs/tutorial-code/1-add-new-technology/1-introduction) however." - ] - }, - { - "cell_type": "markdown", - "metadata": {}, - "source": [ - "The ```BaseYearExport.csv``` file defines the exports in the base year. For our example we add a column to indicate that there is no export for solar. However, it is important that a column exists for our new commodity.\n", + "Next, navigate to the `input` folder.\n", "\n", - "It is noted, however, that the `BaseYearImport.csv` as well as the `BaseYearExport.csv` files are optional files to define exogenous imports and exports; all values are set to zero if they are not used.\n", - "\n", - "|RegionName|Attribute|Time|electricity|gas|heat|CO2f|wind|**solar**|\n", - "|-|-|-|-|-|-|-|-|-|\n", - "|Unit|-|Year|PJ|PJ|PJ|kt|PJ|**PJ**|\n", - "|R1|Exports|2010|0|0|0|0|0|**0**|\n", - "|R1|Exports|2015|0|0|0|0|0|**0**|\n", - "|...|...|...|...|...|...|...|...|**...**|\n", - "|R1|Exports|2100|0|0|0|0|0|**0**|" + "We must now edit each of the files found here to add the new `solar` commodity. Due to space constraints we will not display all of the entries contained in every input. You can be view the edited files in full [here](https://github.com/EnergySystemsModellingLab/MUSE_OS/tree/main/docs/tutorial-code/1-add-new-technology/1-introduction)." ] }, { "cell_type": "markdown", "metadata": {}, "source": [ - "The ```BaseYearImport.csv``` file defines the imports in the base year. Similarly to ```BaseYearExport.csv```, we add a column for solar in the ```BaseYearImport.csv``` file. Again, we indicate that solar has no imports.\n", - "\n", - "|RegionName|Attribute|Time|electricity|gas|heat|CO2f|wind|**solar**|\n", - "|-|-|-|-|-|-|-|-|-|\n", - "|Unit|-|Year|PJ|PJ|PJ|kt|PJ|**PJ**|\n", - "|R1|Imports|2010|0|0|0|0|0|**0**|\n", - "|R1|Imports|2015|0|0|0|0|0|**0**|\n", - "|...|...|...|...|...|...|...|...|**...**|\n", - "|R1|Imports|2100|0|0|0|0|0|**0**|" - ] - }, - { - "cell_type": "markdown", - "metadata": {}, - "source": [ - "The ```GlobalCommodities.csv``` file is the file which defines the commodities. Here we give the commodities a commodity type, CO2 emissions factor and heat rate. For this file, we will add the solar commodity, with zero CO2 emissions factor and a heat rate of 1.\n", + "Commodities are defined in the `GlobalCommodities.csv` file. Here we give the commodities a commodity type, CO2 emissions factor and heat rate. For this file, we will add the `solar` commodity, with zero CO2 emissions factor and a heat rate of 1.\n", "\n", "|Commodity|CommodityType|CommodityName|CommodityEmissionFactor_CO2|HeatRate|Unit|\n", "|-|-|-|-|-|-|\n", @@ -240,7 +196,7 @@ "cell_type": "markdown", "metadata": {}, "source": [ - "The ```Projections.csv``` file details the initial market prices for the commodities. The market clearing algorithm will update these throughout the simulation, however, an initial estimate is required to start the simulation. As solar energy is free, we will indicate this by adding a final column.\n", + "The `Projections.csv` file details the initial market prices for the commodities. The market clearing algorithm will update these throughout the simulation, however an initial estimate is required to start the simulation. As solar energy is free, we will indicate this by adding a final column.\n", "\n", "Please note that the unit row is not read by MUSE, but used as a reference for the user. The units should be consistent across all input files for MUSE; MUSE does not carry out any unit conversion.\n", "\n", @@ -253,6 +209,13 @@ "|R1|CommodityPrice|2100|21.39814806|7.373485819|100|1.871299697|0|**0**|" ] }, + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "It is also possible to model import and export of commodities, using the `BaseYearImport.csv` and `BaseYearExport.csv` files, along with the `base_year_import` and `base_year_import` settings in the [settings file](../inputs/toml#global-input-files). However we will not do this here." + ] + }, { "cell_type": "markdown", "metadata": {}, @@ -285,14 +248,11 @@ "metadata": {}, "source": [ "Now we are able to run our simulation with the new solar power technology.\n", - "\n", - "To do this we run the same run command as previously in the command line:\n", + "To do this, we run the following command in the command line:\n", "\n", "```bash\n", "python -m muse settings.toml\n", - "```\n", - "\n", - "The output should be similar to the output [here](../example-output.ipynb). However, expect the simulation to take slightly longer to run. This is due to the additional calculations made." + "```" ] }, { @@ -316,9 +276,7 @@ "cell_type": "markdown", "metadata": {}, "source": [ - "Next, we will import the ```MCACapacity.csv``` file into pandas and print the first 5 lines using the ```head()``` command.\n", - "\n", - "Make sure to change the file path of `\"../tutorial-code/1-add-new-technology/1-introduction/Results/MCACapacity.csv\"` to where the `MCACapacity.csv` is on your computer, otherwise you will receive an error when you import the csv file." + "First, we will import the ```MCACapacity.csv``` file using pandas, and print the first 5 lines with the ```head()``` command. (Make sure to change the file path as appropriate.)" ] }, { @@ -367,25 +325,25 @@ "cell_type": "markdown", "metadata": {}, "source": [ - "We can now see that there is `solarPV` in the power sector in addition to `windturbine` and `gasCCGT`, when compared to the example [here](../running-muse-example.ipynb)! That's great and means it worked! \n", + "We can now see that there is `solarPV` capacity in the power sector, compared to the example [here](../running-muse-example.ipynb) where `solarPV` is absent! That's great and means it worked! \n", "\n", - "The difference in uptake of `solarPV` compared to `windturbine` is due to the fact that `solarPV` has a lower `cap_par` cost of 30, compared to the `windturbine`. Meaning that `solarPV` outcompetes both `windturbine` and `gasCCGT` in the electricity market." + "We can see that `solarPV` has a higher uptake than `gasCCGT`, and has entirely replaced `windturbine` in of the sector, which is likely due to the lower `cap_par` (capital cost) which makes it more favourable for investment. We can investigate this by changing the `cap_par` value for `solarPV`, which we will do in the next section." ] }, { "cell_type": "markdown", "metadata": {}, "source": [ - "## Change Solar Price" + "## Change Capital costs of Solar" ] }, { "cell_type": "markdown", "metadata": {}, "source": [ - "Now, we will observe what happens if we increase the price of solar to be more expensive than wind in the year 2020, but then reduce the price of solar in 2040. By doing this, we should observe an increase in wind in the first few benchmark years of the simulation, followed by a transition to solar as we approach the year 2040.\n", + "Now, we will observe what happens if we increase the capital price of solar to be more expensive than wind in the year 2020, but then reduce the price of solar in 2040. By doing this, we should observe an initial investment in wind in the first few benchmark years of the simulation, followed by a transition to solar as we approach the year 2040.\n", "\n", - "To achieve this we have to modify the `Technodata.csv`, `CommIn.csv` and `CommOut.csv` files in the `power` sector.\n", + "To achieve this, we have to modify the `Technodata.csv`, `CommIn.csv` and `CommOut.csv` files in the `power` sector.\n", "\n", "First, we will amend the `Technodata.csv` file as follows:\n", "\n", @@ -399,11 +357,11 @@ "|solarPV|R1|2020|**40**|1|...|solar|electricity|1|\n", "|**solarPV**|**R1**|**2040**|**30**|**1**|**...**|**solar**|**electricity**|**1**|\n", "\n", - "Notice that we must provide entries for 2040 for the other technologies, `gasCCGT` and `windturbine`. For this example, we will keep these the same as before, copying and pasting the rows. \n", + "Here, we increase `cap_par` for `solarPV` to 40 in the year 2020, and create a new row for 2040 with a reduced `cap_par` of 30.\n", "\n", - "Here, we increase the ```cap_par``` variable by 10 for `solarPV` in the year 2020, to be a total of 40, and then reduce `cap_par` by 10 in 2040, again for `solarPV`. \n", + "MUSE uses interpolation for the years which are unknown. So in this example, for the benchmark years between 2020 and 2040 (2025, 2030, 2035), MUSE uses interpolated `cap_par` values. The interpolation mode can be set in the `settings.toml` file, and defaults to linear interpolation. This example uses the default setting for interpolation.\n", "\n", - "MUSE uses interpolation for the years which are unknown. So in this example, for the benchmark years between 2020 and 2040 (2025, 2030, 2035), MUSE uses interpolated `cap_par` values. The interpolation mode can be set in the `settings.toml` file, and defaults to linear interpolation. This example uses the default setting for interpolation." + "Note that we must also provide entries for 2040 for the other technologies, `gasCCGT` and `windturbine`. For this example, we will keep these the same as before, copying and pasting the rows. " ] }, { @@ -412,7 +370,7 @@ "source": [ "Next we will modify the `CommIn.csv` file.\n", "\n", - "For this step, we have to provide the input commodities for each technology, in each of the years defined in the `Technodata.csv` file. So, for this example we are required to provide entries for the years 2020 and 2040 for each of the technologies. For now, we won't change the 2040 values compared to the 2020. Therefore, we just need to copy and paste each of the entries for each of the technologies, as shown below:\n", + "For this step, we have to provide the input commodities for each technology, in each of the years defined in the `Technodata.csv` file. So, for this example, we are required to provide entries for the years 2020 and 2040 for each of the technologies. For now, we won't change the 2040 values compared to the 2020. Therefore, we just need to copy and paste each of the entries for each of the technologies, as shown below:\n", "\n", "|ProcessName|RegionName|Time|Level|electricity|gas|heat|CO2f|wind|solar|\n", "|-|-|-|-|-|-|-|-|-|-|\n", @@ -426,14 +384,7 @@ "\n", "We must do the same for the `CommOut.csv` file. For the sake of brevity we won't show you this, but the link to the file can be found [here](https://github.com/EnergySystemsModellingLab/MUSE_OS/blob/main/docs/tutorial-code/1-add-new-technology/2-scenario/technodata/power/CommOut.csv).\n", "\n", - "We will now rerun the simulation, using the same command as previously and visualise the new results." - ] - }, - { - "cell_type": "markdown", - "metadata": {}, - "source": [ - "We must import the new ```MCACapacity.csv``` file again, and then visualise the results." + "We will now rerun the simulation, using the same command as previously, import the new `MCACapacity.csv` file again, and visualise the results:" ] }, { @@ -467,25 +418,9 @@ "cell_type": "markdown", "metadata": {}, "source": [ - "From the results, we can see that `windturbine` now outcompetes `solarPV` in the year 2025. However, between the years 2025 and 2050, as the cost of `solarPV` decreases, the share of `solarPV` begins to increase.\n", - "\n", - "For the full example with the completed input files see [here](https://github.com/EnergySystemsModellingLab/MUSE_OS/tree/main/docs/tutorial-code/1-add-new-technology/2-scenario)" - ] - }, - { - "cell_type": "markdown", - "metadata": {}, - "source": [ - "## Next steps" - ] - }, - { - "cell_type": "markdown", - "metadata": {}, - "source": [ - "Please save a copy of the current model (with the changing costs in 2040), as we will be building on it directly in tutorial 3.\n", + "From the results, we can see that `windturbine` now outcompetes `solarPV` in the year 2025. However, between the years 2025 and 2050, as the capital cost of `solarPV` decreases, the share of `solarPV` begins to increase.\n", "\n", - "In the next tutorial we will add a new agent to the simulation. " + "For the full example with the completed input files see [here](https://github.com/EnergySystemsModellingLab/MUSE_OS/tree/main/docs/tutorial-code/1-add-new-technology/2-scenario)." ] }, { @@ -510,7 +445,7 @@ "name": "python", "nbconvert_exporter": "python", "pygments_lexer": "ipython3", - "version": "3.12.3" + "version": "3.12.4" } }, "nbformat": 4, diff --git a/docs/user-guide/additional-service-demand.ipynb b/docs/user-guide/additional-service-demand.ipynb index a0f5811f5..5fa966307 100644 --- a/docs/user-guide/additional-service-demand.ipynb +++ b/docs/user-guide/additional-service-demand.ipynb @@ -14,7 +14,13 @@ "In this section, we detail how to add a service demand to MUSE. \n", "In the residential sector, a service demand could be cooking. Houses require energy to cook food and a technology to service this demand, such as an electric stove. \n", "This process consists of setting a demand, either through inputs derived from the user or correlations of GDP and population which reflect the socioeconomic development of a region or country. \n", - "In addition, a technology must be added to service this new demand." + "In addition, a technology must be added to service this new demand.\n", + "\n", + "This tutorial will build off the default model that comes with MUSE. To copy the files for this model, run:\n", + "\n", + "```bash\n", + "python -m muse --model default --copy PATH/TO/COPY/THE/MODEL/TO\n", + "```" ] }, { @@ -28,45 +34,31 @@ "cell_type": "markdown", "metadata": {}, "source": [ - "The model in this tutorial will build directly on the model from the previous tutorial (with the additional timeslices, but before modifying the time horizon).\n", - "\n", - "Firstly, we must add the demand section. In this example, we will add a cooking preset demand. To achieve this, we will now edit the `Residential2020Consumption.csv` and `Residential2050Consumption.csv` files, found within the `technodata/preset/` directory.\n", + "In this example, we will add a cooking preset demand. To achieve this, we will first edit the `Residential2020Consumption.csv` and `Residential2050Consumption.csv` files, found within the `technodata/preset/` directory.\n", "\n", - "The `Residential2020Consumption.csv` file allows us to specify the demand in 2020 for each region and technology per timeslice. The `Residential2050Consumption.csv` file does the same but for the year 2050. The datapoints between these are interpolated.\n", + "The `Residential2020Consumption.csv` file allows us to specify the demand in 2020 for each region and technology per timeslice. The `Residential2050Consumption.csv` file does the same, but for the year 2050. The datapoints between these years are interpolated.\n", "\n", - "Firstly, we must add the new service demand: `cook` as a column in these two files. Next, we add the demand. For simplicity we will copy over the values from the `heat` column:" + "Firstly, we must add the new service demand, `cook`, to these two files, with values specifying the demand. For simplicity, we will copy over the values from the `heat` column:" ] }, { "cell_type": "markdown", "metadata": {}, "source": [ - "|RegionName|Timeslice|electricity|gas|heat|CO2f|wind|solar|**cook**|\n", - "|-|-|-|-|-|-|-|-|-|\n", - "|R1|1|0|0|0.7|0|0|0|**0.7**|\n", - "|R1|2|0|0|1.0|0|0|0|**1.0**|\n", - "|R1|3|0|0|0.7|0|0|0|**0.7**|\n", - "|R1|4|0|0|1.0|0|0|0|**1.0**|\n", - "|R1|5|0|0|2.1|0|0|0|**2.1**|\n", - "|R1|6|0|0|1.4|0|0|0|**1.4**|\n", - "|R1|7|0|0|1.4|0|0|0|**1.4**|\n", - "|R1|8|0|0|1.4|0|0|0|**1.4**|\n", - "|R2|1|0|0|0.7|0|0|0|**0.7**|\n", - "|R2|2|0|0|1.0|0|0|0|**1.0**|\n", - "|R2|3|0|0|0.7|0|0|0|**0.7**|\n", - "|R2|4|0|0|1.0|0|0|0|**1.0**|\n", - "|R2|5|0|0|2.1|0|0|0|**2.1**|\n", - "|R2|6|0|0|1.4|0|0|0|**1.4**|\n", - "|R2|7|0|0|1.4|0|0|0|**1.4**|\n", - "|R2|8|0|0|1.4|0|0|0|**1.4**|\n" + "|RegionName|Timeslice|electricity|gas|heat|CO2f|wind|**cook**|\n", + "|-|-|-|-|-|-|-|-|\n", + "|R1|1|0|0|0.7|0|0|**1.0**|\n", + "|R1|2|0|0|1.0|0|0|**1.5**|\n", + "|R1|3|0|0|0.7|0|0|**1.0**|\n", + "|R1|4|0|0|1.0|0|0|**1.5**|\n", + "|R1|5|0|0|2.1|0|0|**3.0**|\n", + "|R1|6|0|0|1.4|0|0|**2.0**|" ] }, { "cell_type": "markdown", "metadata": {}, "source": [ - "As can be seen, we only need to add a `cook` column in the file, as well as the demand level for each timeslice and each region. This can be seen through the addition of a positive number in the `cook` column.\n", - "\n", "The process is very similar for the `Residential2050Consumption.csv` file: again we copy the values over from the `heat` column. For the complete file see the link [here](https://github.com/EnergySystemsModellingLab/MUSE_OS/blob/main/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/preset/Residential2050Consumption.csv)." ] }, @@ -74,35 +66,7 @@ "cell_type": "markdown", "metadata": {}, "source": [ - "Next, we must edit the files within the `input` folder. For this, we must add the `cook` service demand to each of these files.\n", - "\n", - "First, we will amend the `BaseYearExport.csv` and `BaseYearImport.csv` files. For this, we say that there is no import or export of the `cook` service demand. A brief example is outlined below for `BaseYearExport.csv`:\n", - "\n", - "|RegionName|Attribute|Time|electricity|gas|heat|CO2f|wind|solar|**cook**|\n", - "|-|-|-|-|-|-|-|-|-|-|\n", - "|Unit|-|Year|PJ|PJ|PJ|kt|PJ|PJ|**PJ**|\n", - "|R1|Exports|2010|0|0|0|0|0|0|**0**|\n", - "|...|...|...|...|...|...|...|...|...|**...**|\n", - "|R2|Exports|2100|0|0|0|0|0|0|**0**|\n", - "\n", - "The same is true for the `BaseYearImport.csv` file:\n", - "\n", - "|RegionName|Attribute|Time|electricity|gas|heat|CO2f|wind|solar|**cook**|\n", - "|-|-|-|-|-|-|-|-|-|-|\n", - "|Unit|-|Year|PJ|PJ|PJ|kt|PJ|PJ|**PJ**|\n", - "|R1|Imports|2010|0|0|0|0|0|0|**0**|\n", - "|...|...|...|...|...|...|...|...|...|**...**|\n", - "|R2|Imports|2100|0|0|0|0|0|0|**0**|\n", - "\n" - ] - }, - { - "cell_type": "markdown", - "metadata": {}, - "source": [ - "Next, we must edit the `GlobalCommodities.csv` file. This is where we define the new commodity `cook`. It tells MUSE the commodity type, name, emissions factor of CO2 and heat rate, amongst other things. \n", - "\n", - "The example used for this tutorial is below: \n", + "Next, we must edit the `GlobalCommodities.csv` file (in the `input` folder). This is where we define the new commodity `cook`. It tells MUSE the commodity type, name, emissions factor of CO2 and heat rate, amongst other things:\n", "\n", "|Commodity|CommodityType|CommodityName|CommodityEmissionFactor_CO2|HeatRate|Unit|\n", "|-|-|-|-|-|-|\n", @@ -111,7 +75,6 @@ "|Heat|Energy|heat|0|1|PJ|\n", "|Wind|Energy|wind|0|1|PJ|\n", "|CO2fuelcomsbustion|Environmental|CO2f|0|1|kt|\n", - "|Solar|Energy|solar|0|1|PJ|\n", "|**Cook**|**Energy**|**cook**|**0**|**1**|**PJ**|" ] }, @@ -119,14 +82,14 @@ "cell_type": "markdown", "metadata": {}, "source": [ - "Finally, the `Projections.csv` file must be changed. This is a large file which details the expected cost of the technology in the first benchmark year of the simulation. Due to its size, we will only show two rows of the new column `cook`.\n", + "Finally, the `Projections.csv` file must be changed. This is a large file which details the expected cost of the technology across the timeframe of the simulation. Due to its size, we will only show two rows of the new column `cook`:\n", "\n", "|RegionName|Attribute|Time|…|**cook**|\n", "|-|-|-|-|-|\n", "|Unit|-|Year|…|**MUS\\$2010/PJ**|\n", "|R1|CommodityPrice|2010|…|**100**|\n", "|…|…|…|…|**…**|\n", - "|R2|CommodityPrice|2100|…|**100**|\n", + "|R1|CommodityPrice|2100|…|**100**|\n", "\n", "We set every price of cook to be `100MUS$2010/PJ`" ] @@ -144,24 +107,19 @@ "source": [ "Next, we must add a technology to service this new demand. This is achieved through a similar process as the section in the [\"1. adding a new technology\"](add-solar.ipynb) section. However, we must be careful to specify the end-use of the technology as `cook`.\n", "\n", - "For this example, we will add two competing technologies to service the cooking demand: `electric_stove` and `gas_stove` to the `Technodata.csv` file in `/technodata/residential/Technodata.csv`.\n", - "\n", - "Again, in the interests of space, we have omitted the existing `gasboiler` and `heatpump` technologies. But we copy the `heatpump` row for `R1` and paste it for the new `electric_stove` for both `R1` and `R2`. For `gas_stove` we copy and paste the data for `gasboiler` from region `R1` for both `R1` and `R2`. \n", - "\n", - "An important modification, however, is specifying the end-use for these new technologies to be `cook` and not `heat`.\n", + "For this example, we will add two competing technologies to service the cooking demand (`electric_stove` and `gas_stove`) to the `Technodata.csv` file in `/technodata/residential`.\n", "\n", - "|ProcessName|RegionName|Time|Level|cap_par|…|Fuel|EndUse|Agent1|\n", - "|-|-|-|-|-|-|-|-|-|\n", - "|Unit|-|Year|-|MUS$2010/PJ_a|…|-|-|New|\n", - "|gasboiler|R1|2020|fixed|3.8|…|gas|heat|1|\n", - "|...|...|...|...|...|...|...|...|...|\n", - "|**electric_stove**|**R1**|**2020**|**fixed**|**8.8667**|**…**|**electricity**|**cook**|**1**|\n", - "|**electric_stove**|**R2**|**2020**|**fixed**|**8.8667**|**…**|**electricity**|**cook**|**1**|\n", - "|**gas_stove**|**R1**|**2020**|**fixed**|**3.8**|**…**|**gas**|**cook**|**1**|\n", - "|**gas_stove**|**R2**|**2020**|**fixed**|**3.8**|**…**|**gas**|**cook**|**1**|\n", + "Again, in the interests of space, we have omitted the existing `gasboiler` and `heatpump` technologies. For the new `electric_stove` technology, we will copy and paste the data from the `heatpump` row. For `gas_stove`, we copy and paste the data for `gasboiler`. Importantly, however, we must specify the end-use for these new technologies to be `cook` and not `heat`:\n", "\n", + "|ProcessName|RegionName|Time|cap_par|…|Fuel|EndUse|Agent1|\n", + "|-|-|-|-|-|-|-|-|\n", + "|Unit|-|Year|MUS$2010/PJ_a|…|-|-|New|\n", + "|gasboiler|R1|2020|3.8|…|gas|heat|1|\n", + "|...|...|...|...|...|...|...|...|\n", + "|**electric_stove**|**R1**|**2020**|**8.8667**|**…**|**electricity**|**cook**|**1**|\n", + "|**gas_stove**|**R1**|**2020**|**3.8**|**…**|**gas**|**cook**|**1**|\n", "\n", - "As can be seen we have added two technologies, in the two regions with different `cap_par` costs. We specified their respective fuels, and the enduse for both is `cook`. For the full file please see [here](https://github.com/EnergySystemsModellingLab/MUSE_OS/blob/main/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/power/Technodata.csv)." + "As can be seen, we have added two technologies with different `cap_par` costs. We specified their respective fuels, and the enduse for both is `cook`. For the full file please see [here](https://github.com/EnergySystemsModellingLab/MUSE_OS/blob/main/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/power/Technodata.csv)." ] }, { @@ -169,28 +127,12 @@ "metadata": {}, "source": [ "We must also add the data for these new technologies to the following files:\n", - "\n", "- `CommIn.csv`\n", - "\n", "- `CommOut.csv`\n", - "\n", "- `ExistingCapacity.csv`\n", "\n", "This is largely a similar process to the tutorial shown in [\"adding a new technology\"](add-solar.ipynb). We must add the input to each of the technologies (gas and electricity for `gas_stove` and `electric_stove` respectively), outputs of `cook` for both and the existing capacity for each technology in each region.\n", "\n", - "Due to the additional demand for electricity brought on by the new `cook` demand, it is necessary to relax the growth constraints in the `technodata/power/Technodata.csv` file. For this example, we will double all the values for `MaxCapaciyAddition`, `MaxCapacityGrowth` and `TotalCapacityLimit`, as follows:\n", - "\n", - "|ProcessName|RegionName|…|MaxCapacityAddition|MaxCapacityGrowth|TotalCapacityLimit|…|Agent1|\n", - "|-|-|-|-|-|-|-|-|\n", - "|Unit|-|…|PJ|%|PJ|…|New|\n", - "|gasCCGT|R1|…|**4**|**2**|**120**|…|1|\n", - "|windturbine|R1|…|**4**|**2**|**120**|…|1|\n", - "|solarPV|R1|…|**4**|**2**|**120**|…|1|\n", - "|gasCCGT|R2|…|**4**|**2**|**120**|…|1|\n", - "|windturbine|R2|…|**10**|**2**|**200**|…|1|\n", - "|solarPV|R2|…|**4**|**2**|**120**|…|1|\n", - "|...|...|...|...|...|...|...|...|\n", - "\n", "To prevent repetition of the [\"adding a new technology\"](add-solar.ipynb) section, we will leave the full files [here](https://github.com/EnergySystemsModellingLab/MUSE_OS/tree/main/docs/tutorial-code/5-add-service-demand/1-exogenous-demand). " ] }, @@ -212,8 +154,7 @@ "outputs": [], "source": [ "import matplotlib.pyplot as plt\n", - "import pandas as pd\n", - "import seaborn as sns" + "import pandas as pd" ] }, { @@ -223,7 +164,7 @@ "outputs": [], "source": [ "mca_capacity = pd.read_csv(\n", - " \"../tutorial-code/5-add-service-demand/1-exogenous-demand/Results/MCACapacity.csv\"\n", + " \"../tutorial-code/6-add-service-demand/1-exogenous-demand/Results/MCACapacity.csv\"\n", ")\n", "mca_capacity.head()" ] @@ -234,44 +175,28 @@ "metadata": {}, "outputs": [], "source": [ + "fig, axes = plt.subplots(1, 3)\n", "all_years = mca_capacity[\"year\"].unique()\n", - "for sector_name, sector_data in mca_capacity.groupby(\"sector\"):\n", - " sector_capacity = (\n", - " sector_data.groupby([\"technology\", \"region\", \"year\"]).sum().reset_index()\n", - " )\n", - " g = sns.FacetGrid(data=sector_capacity, col=\"region\")\n", - " g.map_dataframe(\n", - " lambda data, **kwargs: data.pivot(\n", - " index=\"year\", columns=\"technology\", values=\"capacity\"\n", - " )\n", - " .reindex(all_years)\n", - " .plot(kind=\"bar\", stacked=True, ax=plt.gca())\n", - " )\n", - " g.add_legend()\n", - " g.set_ylabels(\"Capacity (PJ)\")\n", - " g.figure.suptitle(f\"{sector_name.capitalize()} Sector:\")\n", - " g.figure.subplots_adjust(top=0.8)" - ] - }, - { - "cell_type": "markdown", - "metadata": {}, - "source": [ - "We can see that `electric_stove` is used and `gas_stove` is barely used at all. Therefore, compared to the previous tutorial, there is a larger increase in capacity in the `power` sector to accommodate this increase in demand for electricity, which is largely driven by `windturbine` and `solarPV`." - ] - }, - { - "cell_type": "markdown", - "metadata": {}, - "source": [ - "## Next steps" + "for ax, (sector_name, sector_data) in zip(axes, mca_capacity.groupby(\"sector\")):\n", + " sector_capacity = sector_data.groupby([\"year\", \"technology\"]).sum().reset_index()\n", + " sector_capacity.pivot(\n", + " index=\"year\", columns=\"technology\", values=\"capacity\"\n", + " ).reindex(all_years).plot(kind=\"bar\", stacked=True, ax=ax)\n", + " ax.set_ylabel(\"Capacity (PJ)\")\n", + " ax.set_xlabel(\"Year\")\n", + " ax.set_title(f\"{sector_name.capitalize()} Sector:\", fontsize=10)\n", + " ax.legend(title=None, prop={\"size\": 8})\n", + " ax.tick_params(axis=\"both\", labelsize=8)\n", + "\n", + "fig.set_size_inches(8, 2.5)\n", + "fig.subplots_adjust(wspace=0.5)" ] }, { "cell_type": "markdown", "metadata": {}, "source": [ - "In the next section we will use a regression function to estimate electricity demand from GDP and population data." + "We can see that `electric_stove` is heavily used in the residential sector, and `gas_stove` is barely used at all. Therefore, compared to the default model, there is a larger increase in capacity in the `power` sector to accommodate this increase in demand for electricity, which is largely driven by `windturbine`." ] } ], @@ -291,7 +216,7 @@ "name": "python", "nbconvert_exporter": "python", "pygments_lexer": "ipython3", - "version": "3.12.3" + "version": "3.12.4" }, "vscode": { "interpreter": { diff --git a/docs/user-guide/index.rst b/docs/user-guide/index.rst index 2b2537a49..bf99cf0ac 100644 --- a/docs/user-guide/index.rst +++ b/docs/user-guide/index.rst @@ -5,87 +5,47 @@ Customising MUSE Tutorials Next, we show you how to customise MUSE to create your own scenarios. -We recommend following the tutorials step by step, as the files build on the previous examples. If you prefer to jump straight in, your results may be different to the ones presented. To help you, we have provided the code to generate the various examples in case you want to compare your code to ours. Links to this code can be found in the table below, in the `Tutorial Information`_ section. - +The tutorials can be attempted in any order, but we recommend starting with the first tutorial and working your way through the list. +We have also provided links to the input and results files for each of the tutorials in the table below, should you wish to compare your results with the expected results. .. toctree:: :maxdepth: 1 - :caption: Tutorial contents: + :hidden: add-solar add-agent add-region modify-timing-data + min-max-timeslice-constraints additional-service-demand add-gdp-correlation-demand - min-max-timeslice-constraints - - -Tutorial Information --------------------- - - -Below is a table to help you keep up with the different scenarios. The "Tutorial" header refers to the tutorial number as per the contents table. For example, Tutorial 1 is equal to "1. Adding a new technology". The "Agents", "Regions", "Residential Technologies", "Power Technologies" and "Gas Technologies" headers contain a tuple which contains the respective technologies present in the tutorial. The "Code" header provides a link to the files required to generate the tutorials. -In the table below, you will notice a x2 after some of the technology tuples. This refers to the fact that there are two regions, and the technologies within each region are the same for both regions. -.. list-table:: Scenarios - :widths: 5 25 25 25 25 25 5 +.. list-table:: + :widths: 5 100 5 :header-rows: 1 * - Tutorial - - Agents - - Regions - - Residential Technologies - - Power Technologies - - Gas Technologies - - Code + - Description + - Files * - 1 - - [A1] - - [R1] - - [gasboiler, heatpump] - - [gasCCGT, windturbine, solarPV] - - [gassuply1] + - :ref:`/user-guide/add-solar.ipynb` - `[1] `_ * - 2 - - [A1, A2] - - [R1] - - [gasboiler, heatpump] - - [gasCCGT, windturbine, solarPV] - - [gassuply1] + - :ref:`/user-guide/add-agent.ipynb` - `[2] `_ * - 3 - - [A1, A2] x2 - - [R1, R2] - - [gasboiler, heatpump] x2 - - [gasCCGT, windturbine, solarPV] x2 - - [gassuply1] x2 + - :ref:`/user-guide/add-region.ipynb` - `[3] `_ * - 4 - - [A1, A2] x2 - - [R1, R2] - - [gasboiler, heatpump] x2 - - [gasCCGT, windturbine, solarPV] x2 - - [gassuply1] x2 + - :ref:`/user-guide/modify-timing-data.ipynb` - `[4] `_ * - 5 - - [A1, A2] x2 - - [R1, R2] - - [gasboiler, heatpump, electric_stove, gas_stove] x2 - - [gasCCGT, windturbine, solarPV] x2 - - [gassuply1] x2 - - `[5] `_ + - :ref:`/user-guide/min-max-timeslice-constraints.ipynb` + - `[5] `_ * - 6 - - [A1] - - [R1] - - [gasboiler, heatpump] - - [gasCCGT, windturbine, solarPV] - - [gassuply1] - - `[6] `_ + - :ref:`/user-guide/additional-service-demand.ipynb` + - `[6] `_ * - 7 - - [A1] - - [R1] - - [gasboiler, heatpump] - - [gasCCGT, windturbine] - - [gassuply1] - - `[7] `_ + - :ref:`/user-guide/add-gdp-correlation-demand.ipynb` + - `[7] `_ diff --git a/docs/user-guide/min-max-timeslice-constraints.ipynb b/docs/user-guide/min-max-timeslice-constraints.ipynb index 1f5a950d9..e2a677422 100644 --- a/docs/user-guide/min-max-timeslice-constraints.ipynb +++ b/docs/user-guide/min-max-timeslice-constraints.ipynb @@ -13,18 +13,18 @@ "source": [ "In some sectors it may be the case that a technology can only output a certain amount at a certain time. For instance, solar photovoltaics (PV) don't produce power in the dark, and thus their output is limited at night. \n", "\n", - "In this section, we explain how to add constraints to outputs of technologies at certain timeslices. This could either by a maximum constraint, for instance with the solar PV example previously mentioned. Or, this could be a minimum constraint, where we expect a minimum amount of output by a nuclear power plant at all times." + "In this section, we explain how to add constraints to outputs of technologies at certain timeslices. This could either be a maximum constraint, for instance with the solar PV example previously mentioned. Or, this could be a minimum constraint, for example with a nuclear power plant, where we expect a minimum output at all times." ] }, { "cell_type": "markdown", "metadata": {}, "source": [ - "## Minimum timeslice\n", + "## Minimum timeslice constraint\n", "\n", "In this tutorial we will be amending the `default_timeslice` example.\n", "\n", - "Copy this model so you can edit the files:\n", + "To copy this model so you can edit the files, run:\n", "\n", "```bash\n", "python -m muse --model default_timeslice --copy PATH/TO/COPY/THE/MODEL/TO\n", @@ -58,7 +58,7 @@ "cell_type": "markdown", "metadata": {}, "source": [ - "Looking at `settings.toml` file, you should see that the file has already been linked to the appropriate sector:\n", + "Looking at the `settings.toml` file, you should see that the file has already been linked to the appropriate sector:\n", "\n", "```toml\n", "[sectors.power]\n", @@ -71,18 +71,34 @@ "technodata_timeslices = '{path}/technodata/power/TechnodataTimeslices.csv'\n", "```\n", " \n", - "Notice the `technodata_timeslices` path in the bottom row of the code above." + "Notice the `technodata_timeslices` path in the bottom row." ] }, { "cell_type": "markdown", "metadata": {}, "source": [ - "Once this has been completed, we are able to run MUSE as before, with the following command:\n", + "The `default_timeslice` model also includes one additional output, which gives a detailed breakdown of commodity supply in the power sector:\n", + "\n", + "```toml\n", + "[[sectors.power.outputs]]\n", + "filename = \"{cwd}/{default_output_dir}/{Sector}_{Quantity}.csv\"\n", + "sink = \"aggregate\"\n", + "quantity = \"supply\"\n", + "```\n", + "\n", + "This will create a new file in the results folder called `Power_Supply.csv`, which will be important for the analysis below." + ] + }, + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "Once this has been completed, we can run MUSE as before, with the following command:\n", "\n", " python -m muse settings.toml\n", "\n", - "Next, we will visualise the output of the technologies as before. However, this time we will visualise the supply outputs per technology and per timeslice." + "Next, we will visualise the output of the technologies in each timeslice:" ] }, { @@ -102,13 +118,13 @@ "outputs": [], "source": [ "power_supply = pd.read_csv(\n", - " \"../tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Supply.csv\"\n", + " \"../tutorial-code/5-min-max-timeslice-constraints/1-min-constraint/Results/Power_Supply.csv\"\n", ")\n", - "gassCCGT_electricity_supply_2020 = (\n", + "gassCCGT_electricity_supply_2025 = (\n", " power_supply[\n", " (power_supply.technology == \"gasCCGT\")\n", " & (power_supply.commodity == \"electricity\")\n", - " & (power_supply.year == 2020)\n", + " & (power_supply.year == 2025)\n", " ]\n", " .groupby([\"timeslice\", \"technology\"])\n", " .sum()\n", @@ -116,19 +132,19 @@ ")\n", "\n", "ax = sns.barplot(\n", - " data=gassCCGT_electricity_supply_2020,\n", + " data=gassCCGT_electricity_supply_2025,\n", " x=\"timeslice\",\n", " y=\"supply\",\n", " hue=\"technology\",\n", ")\n", - "ax.set_title(\"Supply versus timeslice for the year 2020\")" + "ax.set_title(\"Electricity supply from gasCCGT in 2025\")" ] }, { "cell_type": "markdown", "metadata": {}, "source": [ - "As expected, for the year 2020, the gasCCGT supplies the electricity mix by the minimum per timeslice. This is as specified in the `TechnodataTimeslices.csv` file. Starting from a supply of 0.2 in the first timeslice and ending with a supply of 1 in the last timeslice. The supply increases linearly apart from during the 3rd timeslice, where it reduces to 0.4." + "Here, we can see that the supply of electricity by `gasCCGT` in 2025 perfectly matches the values that we inputted for the `MinimumServiceFactor`. Given the capacity of `gasCCGT` in this year of 1 (see the `MCACapacity.csv` file), this suggests that this technology is operating at its minimum permitted level in all timeslices." ] }, { @@ -142,7 +158,7 @@ "cell_type": "markdown", "metadata": {}, "source": [ - "Next, we want to ensure that the supply of `windturbine` does not exceed a certain value during the day. This may be because, for example, there is reduced wind during the day. We will, therefore, modify the `TechnodataTimeslices.csv` file by changing the values of `UtilizationFactor` and `MinimumServiceFactor` as shown.\n", + "Next, we want to ensure that the supply of `windturbine` does not exceed a certain value during the day. This may be because, for example, there is reduced wind during the day. We will, therefore, modify the `TechnodataTimeslices.csv` file by changing the `UtilizationFactor`, as shown:\n", "\n", "|ProcessName|RegionName|Time|month|day|hour|UtilizationFactor|MinimumServiceFactor|\n", "|-|-|-|-|-|-|-|-|\n", @@ -165,7 +181,7 @@ "cell_type": "markdown", "metadata": {}, "source": [ - "Once this has been saved, we can run the model again (`python -m muse settings.toml`). Next, we can visualise our results as before. We should hopefully see a reduction in the output of `windturbine` to 0.5 in the 2nd and 3rd timeslices:" + "Once this has been saved, we can run the model again (`python -m muse settings.toml`), and visualise our results as before. We should hopefully see a reduction in the output of `windturbine` in the 2nd and 3rd timeslices:" ] }, { @@ -175,7 +191,7 @@ "outputs": [], "source": [ "power_supply = pd.read_csv(\n", - " \"../tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Supply.csv\"\n", + " \"../tutorial-code/5-min-max-timeslice-constraints/2-max-constraint/Results/Power_Supply.csv\"\n", ")\n", "windturbine_electricity_supply_2030 = (\n", " power_supply[\n", @@ -194,24 +210,17 @@ " y=\"supply\",\n", " hue=\"technology\",\n", ")\n", - "ax.set_title(\"Supply versus timeslice for the year 2030\")" + "ax.set_title(\"Electricity supply from windturbine in 2030\")" ] }, { "cell_type": "markdown", "metadata": {}, "source": [ - "As expected, we can see an enforced reduction in `windturbine` output to 0.5 in the 2nd (1) and 3rd (2) timeslices.\n", + "As expected, we can see an enforced reduction in `windturbine` output in the 2nd (1) and 3rd (2) timeslices.\n", "\n", - "## Next steps\n", - "\n", - "This brings us to the end of the user guide! Using the information explained in this tutorial, or following similar steps, you will be able to create complex scenarios of your choosing." + "From the `MCACapacity.csv` file, we can see that the capacity of `windturbine` in this year is 1. Therefore, the results show that `windturbine` is operating at its maximum permitted level in all timeslices apart from the first, where it's operating below this level." ] - }, - { - "cell_type": "markdown", - "metadata": {}, - "source": [] } ], "metadata": { diff --git a/docs/user-guide/modify-timing-data.ipynb b/docs/user-guide/modify-timing-data.ipynb index 5eef6bbe9..b986cdc40 100644 --- a/docs/user-guide/modify-timing-data.ipynb +++ b/docs/user-guide/modify-timing-data.ipynb @@ -11,7 +11,13 @@ "cell_type": "markdown", "metadata": {}, "source": [ - "In this section we will show you how to modify the timeslicing arrangement as well as change the time horizon and benchmark year intervals by modifying the ```settings.toml``` file." + "In this section we will show you how to modify the timeslicing arrangement as well as change the time horizon and benchmark year intervals by modifying the ```settings.toml``` file.\n", + "\n", + "This tutorial will build off the default model that comes with MUSE. To copy the files for this model, run:\n", + "\n", + "```bash\n", + "python -m muse --model default --copy PATH/TO/COPY/THE/MODEL/TO\n", + "```" ] }, { @@ -25,9 +31,7 @@ "cell_type": "markdown", "metadata": {}, "source": [ - "This tutorial will build directly on the model from the previous tutorial.\n", - "\n", - "Timeslicing is the division of a single benchmark year into multiple different sections. For example, we could slice the benchmark year into different seasons, make a distinction between weekday and weekend or a distinction between morning and night. We do this as energy demand profiles can show a difference between these timeslices. eg. Electricity consumption is lower during the night than during the day.\n", + "Timeslicing is the division of a single benchmark year into multiple different sections. For example, we could slice the benchmark year into different seasons, make a distinction between weekday and weekend or a distinction between morning and night. We do this as energy demand profiles can show a difference between these timeslices (eg. electricity consumption is lower during the night than during the day).\n", "\n", "To achieve this, we have to modify the ```settings.toml``` file, as well as the files within the preset folder: ```Residential2020Consumption.csv``` and ```Residential2050Consumption.csv```. This is so that we can edit the demand for the residential sector for the new timeslices.\n", "\n", @@ -47,7 +51,7 @@ "all-year.all-week.late-afternoon = 1095\n", "```\n", " \n", - "The number of timeslices within this should add up to 8760; the number of hours in a benchmark year. Whilst this is required, MUSE does not check and enforce this.\n", + "The total length of the timeslices should add up to 8760; the number of hours in a benchmark year. Whilst this is required, MUSE does not check and enforce this.\n", " \n", "Next, we modify both Residential Consumption files. Again, we put the text in bold for the modified entries. We must add the demand for the two additional timelsices, which we call timeslice 7 and 8. We will also change the demand for `heat` in the existing timeslices.\n", "\n", @@ -63,16 +67,8 @@ "|R1|6|0|0|**1.4**|0|0|0|\n", "|**R1**|**7**|**0**|**0**|**1.4**|**0**|**0**|**0**|\n", "|**R1**|**8**|**0**|**0**|**1.4**|**0**|**0**|**0**|\n", - "|R2|1|0|0|**0.7**|0|0|0|\n", - "|R2|2|0|0|**1.0**|0|0|0|\n", - "|R2|3|0|0|**0.7**|0|0|0|\n", - "|R2|4|0|0|**1.0**|0|0|0|\n", - "|R2|5|0|0|**2.1**|0|0|0|\n", - "|R2|6|0|0|**1.4**|0|0|0|\n", - "|**R2**|**7**|**0**|**0**|**1.4**|**0**|**0**|**0**|\n", - "|**R2**|**8**|**0**|**0**|**1.4**|**0**|**0**|**0**|\n", "\n", - "We do the same for the ```Residential2050Consumption.csv```, but set the demand in 2050 to be triple that of 2020 in every timeslice. See [here](https://github.com/EnergySystemsModellingLab/MUSE_OS/blob/main/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/preset/Residential2050Consumption.csv) for the full file." + "We do the same for the `Residential2050Consumption.csv`, but set the demand in 2050 to be triple that of 2020 in every timeslice. See [here](https://github.com/EnergySystemsModellingLab/MUSE_OS/blob/main/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/preset/Residential2050Consumption.csv) for the full file." ] }, { @@ -91,8 +87,7 @@ "outputs": [], "source": [ "import matplotlib.pyplot as plt\n", - "import pandas as pd\n", - "import seaborn as sns" + "import pandas as pd" ] }, { @@ -111,32 +106,22 @@ "mca_capacity = pd.read_csv(\n", " \"../tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/MCACapacity.csv\"\n", ")\n", + "\n", + "fig, axes = plt.subplots(1, 3)\n", "all_years = mca_capacity[\"year\"].unique()\n", - "for sector_name, sector_data in mca_capacity.groupby(\"sector\"):\n", - " sector_capacity = (\n", - " sector_data.groupby([\"region\", \"year\", \"technology\"]).sum().reset_index()\n", - " )\n", - " g = sns.FacetGrid(data=sector_capacity, col=\"region\")\n", - " g.map_dataframe(\n", - " lambda data, **kwargs: data.pivot(\n", - " index=\"year\", columns=\"technology\", values=\"capacity\"\n", - " )\n", - " .reindex(all_years)\n", - " .plot(kind=\"bar\", stacked=True, ax=plt.gca())\n", - " )\n", - " g.add_legend()\n", - " g.set_ylabels(\"Capacity (PJ)\")\n", - " g.figure.suptitle(f\"{sector_name.capitalize()} Sector:\")\n", - " g.figure.subplots_adjust(top=0.8)" - ] - }, - { - "cell_type": "markdown", - "metadata": {}, - "source": [ - "Compared to the scenario where we added a [region](add-region.ipynb), there is a slight increase in `solarPV` across both regions in the power sector. However, the rest remains largely unchanged. \n", + "for ax, (sector_name, sector_data) in zip(axes, mca_capacity.groupby(\"sector\")):\n", + " sector_capacity = sector_data.groupby([\"year\", \"technology\"]).sum().reset_index()\n", + " sector_capacity.pivot(\n", + " index=\"year\", columns=\"technology\", values=\"capacity\"\n", + " ).reindex(all_years).plot(kind=\"bar\", stacked=True, ax=ax)\n", + " ax.set_ylabel(\"Capacity (PJ)\")\n", + " ax.set_xlabel(\"Year\")\n", + " ax.set_title(f\"{sector_name.capitalize()} Sector:\", fontsize=10)\n", + " ax.legend(title=None, prop={\"size\": 8})\n", + " ax.tick_params(axis=\"both\", labelsize=8)\n", "\n", - "This example shows the trade-off between time granularity and speed of computation. This is due to the fact that as we add more timesteps, the model takes longer to run, but slightly different scenarios emerge. It is up to you to decide what level of granularity is required for your use case." + "fig.set_size_inches(8, 2.5)\n", + "fig.subplots_adjust(wspace=0.5)" ] }, { @@ -152,9 +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. However, before doing so, please make a copy of the current model as the next tutorial will build directly off the model in its current state.\n", - "\n", - "Making this change is quite simple as we only have two lines to change. We will modify 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 first two lines of the `settings.toml` file, as follows:" ] }, { @@ -162,9 +145,8 @@ "metadata": {}, "source": [ "```toml\n", - "# Global settings - most REQUIRED\n", "time_framework = [2020, 2022, 2024, 2026, 2028, 2030, 2032, 2034, 2036, 2038, 2040]\n", - "foresight = 2 # Has to be a multiple of the minimum separation between the benchmark years \n", + "foresight = 2\n", "```" ] }, @@ -185,6 +167,13 @@ "```" ] }, + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "After making these changes, we can re-run the model and visualise the results:" + ] + }, { "cell_type": "code", "execution_count": null, @@ -194,45 +183,29 @@ "mca_capacity = pd.read_csv(\n", " \"../tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/MCACapacity.csv\"\n", ")\n", + "\n", + "fig, axes = plt.subplots(1, 3)\n", "all_years = mca_capacity[\"year\"].unique()\n", - "for sector_name, sector_data in mca_capacity.groupby(\"sector\"):\n", - " sector_capacity = (\n", - " sector_data.groupby([\"region\", \"year\", \"technology\"]).sum().reset_index()\n", - " )\n", - " g = sns.FacetGrid(data=sector_capacity, col=\"region\")\n", - " g.map_dataframe(\n", - " lambda data, **kwargs: data.pivot(\n", - " index=\"year\", columns=\"technology\", values=\"capacity\"\n", - " )\n", - " .reindex(all_years)\n", - " .plot(kind=\"bar\", stacked=True, ax=plt.gca())\n", - " )\n", - " g.add_legend()\n", - " g.set_ylabels(\"Capacity (PJ)\")\n", - " g.figure.suptitle(f\"{sector_name.capitalize()} Sector:\")\n", - " g.figure.subplots_adjust(top=0.8)\n", - " g.set(ylim=(0, None))" - ] - }, - { - "cell_type": "markdown", - "metadata": {}, - "source": [ - "Through the addition of more benchmark years, we are able to see a different scenario develop." - ] - }, - { - "cell_type": "markdown", - "metadata": {}, - "source": [ - "## Next steps " + "for ax, (sector_name, sector_data) in zip(axes, mca_capacity.groupby(\"sector\")):\n", + " sector_capacity = sector_data.groupby([\"year\", \"technology\"]).sum().reset_index()\n", + " sector_capacity.pivot(\n", + " index=\"year\", columns=\"technology\", values=\"capacity\"\n", + " ).reindex(all_years).plot(kind=\"bar\", stacked=True, ax=ax)\n", + " ax.set_ylabel(\"Capacity (PJ)\")\n", + " ax.set_xlabel(\"Year\")\n", + " ax.set_title(f\"{sector_name.capitalize()} Sector:\", fontsize=10)\n", + " ax.legend(title=None, prop={\"size\": 8})\n", + " ax.tick_params(axis=\"both\", labelsize=8)\n", + "\n", + "fig.set_size_inches(8, 2.5)\n", + "fig.subplots_adjust(wspace=0.5)" ] }, { "cell_type": "markdown", "metadata": {}, "source": [ - "In the next section we detail how to add an exogenous service demand, such as demand for heating or cooking. The next tutorial will build directly on from the model in this tutorial." + "As we add more timeslices or years, the model takes longer to run, but slightly different scenarios emerge. This highlights the trade-off between time granularity and speed of computation. It is up to you to decide what level of granularity is required for your use case." ] }, { @@ -257,7 +230,7 @@ "name": "python", "nbconvert_exporter": "python", "pygments_lexer": "ipython3", - "version": "3.12.3" + "version": "3.12.4" } }, "nbformat": 4, diff --git a/src/muse/data/example/default/settings.toml b/src/muse/data/example/default/settings.toml index 9d851f603..65f5261dc 100644 --- a/src/muse/data/example/default/settings.toml +++ b/src/muse/data/example/default/settings.toml @@ -14,12 +14,12 @@ tolerance = 0.1 tolerance_unmet_demand = -0.1 [[outputs]] -quantity = "prices" +quantity = "capacity" sink = "aggregate" filename = "{cwd}/{default_output_dir}/MCA{Quantity}.csv" [[outputs]] -quantity = "capacity" +quantity = "prices" sink = "aggregate" filename = "{cwd}/{default_output_dir}/MCA{Quantity}.csv" @@ -55,18 +55,6 @@ constraints = [ demand_share = "standard_demand" # Optional, default to standard_demand forecast = 5 # Optional, defaults to 5 -[[sectors.residential.outputs]] -filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}.csv' -quantity = "capacity" -sink = 'aggregate' - -[[sectors.residential.outputs]] -filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}.csv' -sink = 'aggregate' -quantity.name = "supply" -quantity.sum_over = "timeslice" -quantity.drop = ["comm_usage", "units_prices"] - [sectors.power] type = 'default' priority = 2 @@ -81,11 +69,6 @@ existing_capacity = '{path}/technodata/power/ExistingCapacity.csv' lpsolver = "scipy" demand_share = "standard_demand" -[[sectors.power.outputs]] -filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}.csv' -quantity = "capacity" -sink = 'aggregate' - [sectors.gas] type = 'default' priority = 3 @@ -100,11 +83,6 @@ existing_capacity = '{path}/technodata/gas/ExistingCapacity.csv' lpsolver = "scipy" demand_share = "standard_demand" -[[sectors.gas.outputs]] -filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}.csv' -quantity = "capacity" -sink = 'aggregate' - [sectors.residential_presets] type = 'presets' priority = 0 diff --git a/src/muse/data/example/default/technodata/gas/Technodata.csv b/src/muse/data/example/default/technodata/gas/Technodata.csv index 784df8fbb..f7f3120d1 100644 --- a/src/muse/data/example/default/technodata/gas/Technodata.csv +++ b/src/muse/data/example/default/technodata/gas/Technodata.csv @@ -1,3 +1,3 @@ ProcessName,RegionName,Time,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent1 Unit,-,Year,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,New -gassupply1,R1,2020,0,1,0,1,2.55,1,5,1,60,35,0.9,0.00000189,86,0.1,energy,gas,gas,1 +gassupply1,R1,2020,0,1,0,1,2.55,1,10,1,100,35,0.9,0.00000189,86,0.1,energy,gas,gas,1 diff --git a/src/muse/data/example/default/technodata/power/Technodata.csv b/src/muse/data/example/default/technodata/power/Technodata.csv index 8e77c2d9a..a23d8d32e 100644 --- a/src/muse/data/example/default/technodata/power/Technodata.csv +++ b/src/muse/data/example/default/technodata/power/Technodata.csv @@ -1,4 +1,4 @@ ProcessName,RegionName,Time,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent1 Unit,-,Year,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,New -gasCCGT,R1,2020,23.78234399,1,0,1,0,1,2,1,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1 -windturbine,R1,2020,36.30771182,1,0,1,0,1,2,1,60,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1 +gasCCGT,R1,2020,23.78234399,1,0,1,0,1,10,1,100,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1 +windturbine,R1,2020,36.30771182,1,0,1,0,1,10,1,100,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1 diff --git a/src/muse/data/example/default/technodata/residential/Technodata.csv b/src/muse/data/example/default/technodata/residential/Technodata.csv index 3424b178b..5b961659e 100644 --- a/src/muse/data/example/default/technodata/residential/Technodata.csv +++ b/src/muse/data/example/default/technodata/residential/Technodata.csv @@ -1,4 +1,4 @@ ProcessName,RegionName,Time,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent1 Unit,-,Year,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,New -gasboiler,R1,2020,3.8,1,0,1,0,1,10,0.2,60,10,1,0.00000189,86,0.1,energy,gas,heat,1 -heatpump,R1,2020,8.866667,1,0,1,0,1,10,0.2,60,10,1,0.00000189,86,0.1,energy,electricity,heat,1 +gasboiler,R1,2020,3.8,1,0,1,0,1,10,1,100,10,1,0.00000189,86,0.1,energy,gas,heat,1 +heatpump,R1,2020,8.866667,1,0,1,0,1,10,1,100,10,1,0.00000189,86,0.1,energy,electricity,heat,1 diff --git a/src/muse/data/example/default_retro/settings.toml b/src/muse/data/example/default_retro/settings.toml index f17da5dee..ad863406a 100644 --- a/src/muse/data/example/default_retro/settings.toml +++ b/src/muse/data/example/default_retro/settings.toml @@ -14,12 +14,12 @@ tolerance = 0.1 tolerance_unmet_demand = -0.1 [[outputs]] -quantity = "prices" +quantity = "capacity" sink = "aggregate" filename = "{cwd}/{default_output_dir}/MCA{Quantity}.csv" [[outputs]] -quantity = "capacity" +quantity = "prices" sink = "aggregate" filename = "{cwd}/{default_output_dir}/MCA{Quantity}.csv" @@ -55,18 +55,6 @@ constraints = [ demand_share = "new_and_retro" # Optional, default to standard_demand forecast = 5 # Optional, defaults to 5 -[[sectors.residential.outputs]] -filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}.csv' -quantity = "capacity" -sink = 'aggregate' - -[[sectors.residential.outputs]] -filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}.csv' -sink = 'aggregate' -quantity.name = "supply" -quantity.sum_over = "timeslice" -quantity.drop = ["comm_usage", "units_prices"] - [[sectors.residential.interactions]] net = 'new_to_retro' interaction = 'transfer' @@ -85,11 +73,6 @@ existing_capacity = '{path}/technodata/power/ExistingCapacity.csv' lpsolver = "scipy" demand_share = "new_and_retro" -[[sectors.power.outputs]] -filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}.csv' -quantity = "capacity" -sink = 'aggregate' - [[sectors.power.interactions]] net = 'new_to_retro' interaction = 'transfer' @@ -108,11 +91,6 @@ existing_capacity = '{path}/technodata/gas/ExistingCapacity.csv' lpsolver = "scipy" demand_share = "new_and_retro" -[[sectors.gas.outputs]] -filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}.csv' -quantity = "capacity" -sink = 'aggregate' - [[sectors.gas.interactions]] net = 'new_to_retro' interaction = 'transfer' diff --git a/src/muse/data/example/default_retro/technodata/gas/CommOut.csv b/src/muse/data/example/default_retro/technodata/gas/CommOut.csv index 97520cdfd..cbe4de904 100644 --- a/src/muse/data/example/default_retro/technodata/gas/CommOut.csv +++ b/src/muse/data/example/default_retro/technodata/gas/CommOut.csv @@ -1,3 +1,3 @@ -ProcessName,RegionName,Time,Level,electricity,gas,heat,CO2f,wind -Unit,-,Year,-,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ -gassupply1,R1,2020,fixed,0,1,0,0,0 +ProcessName,RegionName,Time,electricity,gas,heat,CO2f,wind +Unit,-,Year,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ +gassupply1,R1,2020,0,1,0,0,0 diff --git a/src/muse/data/example/default_retro/technodata/gas/Technodata.csv b/src/muse/data/example/default_retro/technodata/gas/Technodata.csv index 25614cf7b..518222a09 100644 --- a/src/muse/data/example/default_retro/technodata/gas/Technodata.csv +++ b/src/muse/data/example/default_retro/technodata/gas/Technodata.csv @@ -1,3 +1,3 @@ -ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2 -Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit -gassupply1,R1,2020,fixed,0,1,0,1,2.55,1,5,1,60,35,0.9,0.00000189,86,0.1,energy,gas,gas,1 +ProcessName,RegionName,Time,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2 +Unit,-,Year,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit +gassupply1,R1,2020,0,1,0,1,2.55,1,10,1,100,35,0.9,0.00000189,86,0.1,energy,gas,gas,1 diff --git a/src/muse/data/example/default_retro/technodata/power/CommOut.csv b/src/muse/data/example/default_retro/technodata/power/CommOut.csv index 03a2f4dd1..efaac0580 100644 --- a/src/muse/data/example/default_retro/technodata/power/CommOut.csv +++ b/src/muse/data/example/default_retro/technodata/power/CommOut.csv @@ -1,4 +1,4 @@ -ProcessName,RegionName,Time,Level,electricity,gas,heat,CO2f,wind -Unit,-,Year,-,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ -gasCCGT,R1,2020,fixed,1,0,0,91.67,0 -windturbine,R1,2020,fixed,1,0,0,0,0 +ProcessName,RegionName,Time,electricity,gas,heat,CO2f,wind +Unit,-,Year,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ +gasCCGT,R1,2020,1,0,0,91.67,0 +windturbine,R1,2020,1,0,0,0,0 diff --git a/src/muse/data/example/default_retro/technodata/power/Technodata.csv b/src/muse/data/example/default_retro/technodata/power/Technodata.csv index 9d767cfa6..d514d5007 100644 --- a/src/muse/data/example/default_retro/technodata/power/Technodata.csv +++ b/src/muse/data/example/default_retro/technodata/power/Technodata.csv @@ -1,4 +1,4 @@ -ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2 -Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit -gasCCGT,R1,2020,fixed,23.78234399,1,0,1,0,1,2,1,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1 -windturbine,R1,2020,fixed,36.30771182,1,0,1,0,1,2,1,60,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1 +ProcessName,RegionName,Time,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2 +Unit,-,Year,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit +gasCCGT,R1,2020,23.78234399,1,0,1,0,1,10,1,100,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1 +windturbine,R1,2020,36.30771182,1,0,1,0,1,10,1,100,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1 diff --git a/src/muse/data/example/default_retro/technodata/residential/CommOut.csv b/src/muse/data/example/default_retro/technodata/residential/CommOut.csv index f32c59a02..78f282479 100644 --- a/src/muse/data/example/default_retro/technodata/residential/CommOut.csv +++ b/src/muse/data/example/default_retro/technodata/residential/CommOut.csv @@ -1,4 +1,4 @@ -ProcessName,RegionName,Time,Level,electricity,gas,heat,CO2f,wind -Unit,-,Year,-,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ -gasboiler,R1,2020,fixed,0,0,1,64.71,0 -heatpump,R1,2020,fixed,0,0,1,0,0 +ProcessName,RegionName,Time,electricity,gas,heat,CO2f,wind +Unit,-,Year,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ +gasboiler,R1,2020,0,0,1,64.71,0 +heatpump,R1,2020,0,0,1,0,0 diff --git a/src/muse/data/example/default_retro/technodata/residential/Technodata.csv b/src/muse/data/example/default_retro/technodata/residential/Technodata.csv index aa4eb867a..06dacd389 100644 --- a/src/muse/data/example/default_retro/technodata/residential/Technodata.csv +++ b/src/muse/data/example/default_retro/technodata/residential/Technodata.csv @@ -1,4 +1,4 @@ -ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2 -Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit -gasboiler,R1,2020,fixed,3.8,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,gas,heat,1 -heatpump,R1,2020,fixed,8.866667,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,electricity,heat,1 +ProcessName,RegionName,Time,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2 +Unit,-,Year,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit +gasboiler,R1,2020,3.8,1,0,1,0,1,10,1,100,10,1,0.00000189,86,0.1,energy,gas,heat,1 +heatpump,R1,2020,8.866667,1,0,1,0,1,10,1,100,10,1,0.00000189,86,0.1,energy,electricity,heat,1 diff --git a/src/muse/data/example/default_timeslice/settings.toml b/src/muse/data/example/default_timeslice/settings.toml index e8299741f..f568ef634 100644 --- a/src/muse/data/example/default_timeslice/settings.toml +++ b/src/muse/data/example/default_timeslice/settings.toml @@ -13,23 +13,13 @@ maximum_iterations = 100 tolerance = 0.1 tolerance_unmet_demand = -0.1 -[[outputs]] -quantity = "prices" -sink = "aggregate" -filename = "{cwd}/{default_output_dir}/MCA{Quantity}.csv" - [[outputs]] quantity = "capacity" sink = "aggregate" filename = "{cwd}/{default_output_dir}/MCA{Quantity}.csv" [[outputs]] -quantity = "timeslice_supply" -sink = "aggregate" -filename = "{cwd}/{default_output_dir}/MCA{Quantity}.csv" - -[[outputs]] -quantity = "timeslice_consumption" +quantity = "prices" sink = "aggregate" filename = "{cwd}/{default_output_dir}/MCA{Quantity}.csv" @@ -65,18 +55,6 @@ constraints = [ demand_share = "standard_demand" # Optional, default to standard_demand forecast = 5 # Optional, defaults to 5 -[[sectors.residential.outputs]] -filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}.csv' -quantity = "capacity" -sink = 'aggregate' - -[[sectors.residential.outputs]] -filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}.csv' -sink = 'aggregate' -quantity.name = "supply" -quantity.sum_over = "timeslice" -quantity.drop = ["comm_usage", "units_prices"] - [sectors.power] type = 'default' priority = 2 @@ -93,15 +71,9 @@ lpsolver = "scipy" demand_share = "standard_demand" [[sectors.power.outputs]] -filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}.csv' -quantity = "capacity" -sink = 'aggregate' - -[[sectors.power.outputs]] -filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}.csv' -sink = 'aggregate' -quantity.name = "supply" -quantity.drop = ["comm_usage", "units_prices"] +quantity = "supply" +sink = "aggregate" +filename = "{cwd}/{default_output_dir}/{Sector}_{Quantity}.csv" [sectors.gas] type = 'default' @@ -117,11 +89,6 @@ existing_capacity = '{path}/technodata/gas/ExistingCapacity.csv' lpsolver = "scipy" demand_share = "standard_demand" -[[sectors.gas.outputs]] -filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}.csv' -quantity = "capacity" -sink = 'aggregate' - [sectors.residential_presets] type = 'presets' priority = 0 @@ -129,9 +96,11 @@ consumption_path = "{path}/technodata/preset/*Consumption.csv" [timeslices] level_names = ["month", "day", "hour"] -all-year.all-week.night = 1460 -all-year.all-week.morning = 1460 -all-year.all-week.afternoon = 1460 -all-year.all-week.early-peak = 1460 -all-year.all-week.late-peak = 1460 -all-year.all-week.evening = 1460 + +[timeslices.all-year.all-week] +night = 1460 +morning = 1460 +afternoon = 1460 +early-peak = 1460 +late-peak = 1460 +evening = 1460 diff --git a/src/muse/data/example/default_timeslice/technodata/gas/Technodata.csv b/src/muse/data/example/default_timeslice/technodata/gas/Technodata.csv index 484a19533..f7f3120d1 100644 --- a/src/muse/data/example/default_timeslice/technodata/gas/Technodata.csv +++ b/src/muse/data/example/default_timeslice/technodata/gas/Technodata.csv @@ -1,3 +1,3 @@ ProcessName,RegionName,Time,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent1 Unit,-,Year,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,New -gassupply1,R1,2020,0,1,0,1,2.55,1,50,10,600,35,0.9,0.00000189,86,0.1,energy,gas,gas,1 +gassupply1,R1,2020,0,1,0,1,2.55,1,10,1,100,35,0.9,0.00000189,86,0.1,energy,gas,gas,1 diff --git a/src/muse/data/example/default_timeslice/technodata/power/Technodata.csv b/src/muse/data/example/default_timeslice/technodata/power/Technodata.csv index 32a48cb8a..a23d8d32e 100644 --- a/src/muse/data/example/default_timeslice/technodata/power/Technodata.csv +++ b/src/muse/data/example/default_timeslice/technodata/power/Technodata.csv @@ -1,4 +1,4 @@ ProcessName,RegionName,Time,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent1 Unit,-,Year,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,New -gasCCGT,R1,2020,23.78234399,1,0,1,0,1,200,20,100,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1 -windturbine,R1,2020,36.30771182,1,0,1,0,1,200,20,60,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1 +gasCCGT,R1,2020,23.78234399,1,0,1,0,1,10,1,100,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1 +windturbine,R1,2020,36.30771182,1,0,1,0,1,10,1,100,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1 diff --git a/src/muse/data/example/default_timeslice/technodata/residential/Technodata.csv b/src/muse/data/example/default_timeslice/technodata/residential/Technodata.csv index 3424b178b..5b961659e 100644 --- a/src/muse/data/example/default_timeslice/technodata/residential/Technodata.csv +++ b/src/muse/data/example/default_timeslice/technodata/residential/Technodata.csv @@ -1,4 +1,4 @@ ProcessName,RegionName,Time,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent1 Unit,-,Year,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,New -gasboiler,R1,2020,3.8,1,0,1,0,1,10,0.2,60,10,1,0.00000189,86,0.1,energy,gas,heat,1 -heatpump,R1,2020,8.866667,1,0,1,0,1,10,0.2,60,10,1,0.00000189,86,0.1,energy,electricity,heat,1 +gasboiler,R1,2020,3.8,1,0,1,0,1,10,1,100,10,1,0.00000189,86,0.1,energy,gas,heat,1 +heatpump,R1,2020,8.866667,1,0,1,0,1,10,1,100,10,1,0.00000189,86,0.1,energy,electricity,heat,1 diff --git a/src/muse/data/example/minimum_service/settings.toml b/src/muse/data/example/minimum_service/settings.toml index 06a656e8f..bbab44c42 100644 --- a/src/muse/data/example/minimum_service/settings.toml +++ b/src/muse/data/example/minimum_service/settings.toml @@ -22,12 +22,17 @@ projections = '{path}/input/Projections.csv' global_commodities = '{path}/input/GlobalCommodities.csv' [[outputs]] -quantity = "timeslice_supply" +quantity = "capacity" sink = "aggregate" filename = "{cwd}/{default_output_dir}/MCA{Quantity}.csv" [[outputs]] -quantity = "capacity" +quantity = "supply" +sink = "aggregate" +filename = "{cwd}/{default_output_dir}/MCA{Quantity}.csv" + +[[outputs]] +quantity = "prices" sink = "aggregate" filename = "{cwd}/{default_output_dir}/MCA{Quantity}.csv" @@ -55,18 +60,6 @@ constraints = [ demand_share = "standard_demand" # Optional, default to standard_demand forecast = 5 # Optional, defaults to 5 -[[sectors.industry.outputs]] -filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}.csv' -quantity = "capacity" -sink = 'aggregate' - -[[sectors.industry.outputs]] -filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}.csv' -sink = 'aggregate' -quantity.name = "supply" -quantity.sum_over = "timeslice" -quantity.drop = ["comm_usage", "units_prices"] - [sectors.industry_presets] type = 'presets' priority = 0 diff --git a/src/muse/data/example/trade/settings.toml b/src/muse/data/example/trade/settings.toml index e2c16c428..a851e6a96 100644 --- a/src/muse/data/example/trade/settings.toml +++ b/src/muse/data/example/trade/settings.toml @@ -14,12 +14,12 @@ tolerance = 0.1 tolerance_unmet_demand = -0.1 [[outputs]] -quantity = "prices" +quantity = "capacity" sink = "aggregate" filename = "{cwd}/{default_output_dir}/MCA{Quantity}.csv" [[outputs]] -quantity = "capacity" +quantity = "prices" sink = "aggregate" filename = "{cwd}/{default_output_dir}/MCA{Quantity}.csv" @@ -62,12 +62,6 @@ demand_share = "new_and_retro" forecast = 5 asset_threshold = 1e-4 -[[sectors.residential.outputs]] -filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}.csv' -quantity = "capacity" -sink = 'aggregate' -columns = ["asset", "year", "region", "technology", "installed", "capacity"] - [[sectors.residential.interactions]] net = 'new_to_retro' interaction = 'transfer' @@ -100,20 +94,6 @@ demand_share = "unmet_forecasted_demand" forecast = 5 asset_threshold = 1e-4 -[[sectors.power.outputs]] -filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}.csv' -quantity = "capacity" -sink = 'aggregate' -columns = [ - "dst_region", - "year", - "asset", - "region", - "technology", - "installed", - "capacity" -] - [sectors.gas] type = 'default' priority = 3 @@ -142,20 +122,6 @@ demand_share = "unmet_forecasted_demand" forecast = 5 asset_threshold = 1e-4 -[[sectors.gas.outputs]] -filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}.csv' -quantity = "capacity" -sink = 'aggregate' -columns = [ - "dst_region", - "year", - "asset", - "region", - "technology", - "installed", - "capacity" -] - [timeslices] level_names = ["month", "day", "hour"] all-year.all-week.night = 1460 diff --git a/src/muse/demand_share.py b/src/muse/demand_share.py index 27e3eba56..f95e43f30 100644 --- a/src/muse/demand_share.py +++ b/src/muse/demand_share.py @@ -665,8 +665,8 @@ def new_demand( """Calculates the new demand that needs to be covered. It groups the demand related to an increase in consumption as well as the existing - demand associated with decomissoned assets. Internally, it just call `new_and_retro` - demands and adds together both components. + demand associated with decommissoned assets. Internally, it just calls + `new_and_retro` demands and adds together both components. """ demand = new_and_retro_demands( capacity, market, technologies, production, current_year, forecast diff --git a/tests/example_outputs/default/Gas/Capacity.csv b/tests/example_outputs/default/Gas/Capacity.csv deleted file mode 100644 index b8b8c36a0..000000000 --- a/tests/example_outputs/default/Gas/Capacity.csv +++ /dev/null @@ -1,18 +0,0 @@ -asset,capacity,installed,region,technology,year -0,15.00000000000,2020,R1,gassupply1,2020 -0,16.73530000000,2020,R1,gassupply1,2025 -0,9.23530000000,2020,R1,gassupply1,2030 -1,9.28910000000,2025,R1,gassupply1,2030 -0,1.73530000000,2020,R1,gassupply1,2035 -1,9.28910000000,2025,R1,gassupply1,2035 -2,7.47410000000,2030,R1,gassupply1,2035 -0,1.73530000000,2020,R1,gassupply1,2040 -1,9.28910000000,2025,R1,gassupply1,2040 -2,7.47410000000,2030,R1,gassupply1,2040 -0,1.73530000000,2020,R1,gassupply1,2045 -1,9.28910000000,2025,R1,gassupply1,2045 -2,7.47410000000,2030,R1,gassupply1,2045 -0,1.73530000000,2020,R1,gassupply1,2050 -1,9.28910000000,2025,R1,gassupply1,2050 -2,7.47410000000,2030,R1,gassupply1,2050 -3,0.30680000000,2045,R1,gassupply1,2050 diff --git a/tests/example_outputs/default/MCACapacity.csv b/tests/example_outputs/default/MCACapacity.csv index f554b21fc..f797d4286 100644 --- a/tests/example_outputs/default/MCACapacity.csv +++ b/tests/example_outputs/default/MCACapacity.csv @@ -51,8 +51,7 @@ A1,6.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2050 A1,6.00000000000,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,10.00000000000,R1,2045,R1,power,windturbine,newcapa,2050 +A1,11.00000000000,R1,2045,R1,power,windturbine,newcapa,2050 A1,1.73530000000,R1,2020,R1,gas,gassupply1,newcapa,2050 A1,9.28910000000,R1,2025,R1,gas,gassupply1,newcapa,2050 A1,7.47410000000,R1,2030,R1,gas,gassupply1,newcapa,2050 -A1,0.30680000000,R1,2045,R1,gas,gassupply1,newcapa,2050 diff --git a/tests/example_outputs/default/MCAPrices.csv b/tests/example_outputs/default/MCAPrices.csv index e692a7519..20946c704 100644 --- a/tests/example_outputs/default/MCAPrices.csv +++ b/tests/example_outputs/default/MCAPrices.csv @@ -143,27 +143,27 @@ electricity,all-week,evening,all-year,18.26600000000,R1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2045 heat,all-week,evening,all-year,7.54690000000,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.18470000000,R1,0,MUS$2010/PJ,2050 +electricity,all-week,night,all-year,19.84020000000,R1,0,MUS$2010/PJ,2050 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,8.31440000000,R1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,8.17660000000,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.18470000000,R1,1,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,19.84020000000,R1,1,MUS$2010/PJ,2050 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,8.31440000000,R1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,8.17660000000,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.18470000000,R1,2,MUS$2010/PJ,2050 +electricity,all-week,afternoon,all-year,19.84020000000,R1,2,MUS$2010/PJ,2050 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,8.31440000000,R1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,8.17660000000,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.18470000000,R1,3,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,19.84020000000,R1,3,MUS$2010/PJ,2050 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,8.31440000000,R1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,8.17660000000,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.18470000000,R1,4,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,19.84020000000,R1,4,MUS$2010/PJ,2050 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,8.31440000000,R1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,8.17660000000,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.18470000000,R1,5,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,19.84020000000,R1,5,MUS$2010/PJ,2050 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,8.31440000000,R1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,8.17660000000,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/Power/Capacity.csv b/tests/example_outputs/default/Power/Capacity.csv deleted file mode 100644 index 847c7f8b4..000000000 --- a/tests/example_outputs/default/Power/Capacity.csv +++ /dev/null @@ -1,28 +0,0 @@ -asset,capacity,installed,region,technology,year -0,1,2020,R1,gasCCGT,2020 -0,6,2020,R1,gasCCGT,2025 -2,5,2020,R1,windturbine,2025 -0,5,2020,R1,gasCCGT,2030 -1,6,2025,R1,gasCCGT,2030 -2,5,2020,R1,windturbine,2030 -0,5,2020,R1,gasCCGT,2035 -1,6,2025,R1,gasCCGT,2035 -2,5,2020,R1,windturbine,2035 -3,6,2030,R1,windturbine,2035 -0,5,2020,R1,gasCCGT,2040 -1,6,2025,R1,gasCCGT,2040 -2,5,2020,R1,windturbine,2040 -3,6,2030,R1,windturbine,2040 -4,6,2035,R1,windturbine,2040 -0,5,2020,R1,gasCCGT,2045 -1,6,2025,R1,gasCCGT,2045 -3,5,2020,R1,windturbine,2045 -4,6,2030,R1,windturbine,2045 -5,6,2035,R1,windturbine,2045 -6,6,2040,R1,windturbine,2045 -0,5,2020,R1,gasCCGT,2050 -1,6,2025,R1,gasCCGT,2050 -4,6,2030,R1,windturbine,2050 -5,6,2035,R1,windturbine,2050 -6,6,2040,R1,windturbine,2050 -7,10,2045,R1,windturbine,2050 diff --git a/tests/example_outputs/default/Residential/Capacity.csv b/tests/example_outputs/default/Residential/Capacity.csv deleted file mode 100644 index d5cf558f0..000000000 --- a/tests/example_outputs/default/Residential/Capacity.csv +++ /dev/null @@ -1,14 +0,0 @@ -asset,capacity,installed,region,technology,year -0,10,2020,R1,gasboiler,2020 -0,5,2020,R1,gasboiler,2025 -1,19,2020,R1,heatpump,2025 -1,19,2020,R1,heatpump,2030 -2,10,2025,R1,heatpump,2030 -2,10,2025,R1,heatpump,2035 -3,26,2030,R1,heatpump,2035 -3,26,2030,R1,heatpump,2040 -4,16,2035,R1,heatpump,2040 -4,16,2035,R1,heatpump,2045 -5,32,2040,R1,heatpump,2045 -5,32,2040,R1,heatpump,2050 -6,22,2045,R1,heatpump,2050 diff --git a/tests/example_outputs/default/Residential/Supply.csv b/tests/example_outputs/default/Residential/Supply.csv deleted file mode 100644 index 520869501..000000000 --- a/tests/example_outputs/default/Residential/Supply.csv +++ /dev/null @@ -1,91 +0,0 @@ -asset,commodity,day,hour,installed,month,region,supply,technology,timeslice,year -0,heat,all-week,night,2020,all-year,R1,1.00000000000,gasboiler,0,2020 -0,CO2f,all-week,night,2020,all-year,R1,64.71000000000,gasboiler,0,2020 -0,heat,all-week,morning,2020,all-year,R1,1.50000000000,gasboiler,1,2020 -0,CO2f,all-week,morning,2020,all-year,R1,97.06500000000,gasboiler,1,2020 -0,heat,all-week,afternoon,2020,all-year,R1,1.00000000000,gasboiler,2,2020 -0,CO2f,all-week,afternoon,2020,all-year,R1,64.71000000000,gasboiler,2,2020 -0,heat,all-week,early-peak,2020,all-year,R1,1.50000000000,gasboiler,3,2020 -0,CO2f,all-week,early-peak,2020,all-year,R1,97.06500000000,gasboiler,3,2020 -0,heat,all-week,late-peak,2020,all-year,R1,3.00000000000,gasboiler,4,2020 -0,CO2f,all-week,late-peak,2020,all-year,R1,194.13000000000,gasboiler,4,2020 -0,heat,all-week,evening,2020,all-year,R1,2.00000000000,gasboiler,5,2020 -0,CO2f,all-week,evening,2020,all-year,R1,129.42000000000,gasboiler,5,2020 -0,heat,all-week,night,2020,all-year,R1,0.27780000000,gasboiler,0,2025 -1,heat,all-week,night,2020,all-year,R1,1.05560000000,heatpump,0,2025 -0,CO2f,all-week,night,2020,all-year,R1,17.97500000000,gasboiler,0,2025 -0,heat,all-week,morning,2020,all-year,R1,0.41670000000,gasboiler,1,2025 -1,heat,all-week,morning,2020,all-year,R1,1.58330000000,heatpump,1,2025 -0,CO2f,all-week,morning,2020,all-year,R1,26.96250000000,gasboiler,1,2025 -0,heat,all-week,afternoon,2020,all-year,R1,0.27780000000,gasboiler,2,2025 -1,heat,all-week,afternoon,2020,all-year,R1,1.05560000000,heatpump,2,2025 -0,CO2f,all-week,afternoon,2020,all-year,R1,17.97500000000,gasboiler,2,2025 -0,heat,all-week,early-peak,2020,all-year,R1,0.41670000000,gasboiler,3,2025 -1,heat,all-week,early-peak,2020,all-year,R1,1.58330000000,heatpump,3,2025 -0,CO2f,all-week,early-peak,2020,all-year,R1,26.96250000000,gasboiler,3,2025 -0,heat,all-week,late-peak,2020,all-year,R1,0.83330000000,gasboiler,4,2025 -1,heat,all-week,late-peak,2020,all-year,R1,3.16670000000,heatpump,4,2025 -0,CO2f,all-week,late-peak,2020,all-year,R1,53.92500000000,gasboiler,4,2025 -0,heat,all-week,evening,2020,all-year,R1,0.55560000000,gasboiler,5,2025 -1,heat,all-week,evening,2020,all-year,R1,2.11110000000,heatpump,5,2025 -0,CO2f,all-week,evening,2020,all-year,R1,35.95000000000,gasboiler,5,2025 -1,heat,all-week,night,2020,all-year,R1,1.09200000000,heatpump,0,2030 -2,heat,all-week,night,2025,all-year,R1,0.57470000000,heatpump,0,2030 -1,heat,all-week,morning,2020,all-year,R1,1.63790000000,heatpump,1,2030 -2,heat,all-week,morning,2025,all-year,R1,0.86210000000,heatpump,1,2030 -1,heat,all-week,afternoon,2020,all-year,R1,1.09200000000,heatpump,2,2030 -2,heat,all-week,afternoon,2025,all-year,R1,0.57470000000,heatpump,2,2030 -1,heat,all-week,early-peak,2020,all-year,R1,1.63790000000,heatpump,3,2030 -2,heat,all-week,early-peak,2025,all-year,R1,0.86210000000,heatpump,3,2030 -1,heat,all-week,late-peak,2020,all-year,R1,3.27590000000,heatpump,4,2030 -2,heat,all-week,late-peak,2025,all-year,R1,1.72410000000,heatpump,4,2030 -1,heat,all-week,evening,2020,all-year,R1,2.18390000000,heatpump,5,2030 -2,heat,all-week,evening,2025,all-year,R1,1.14940000000,heatpump,5,2030 -2,heat,all-week,night,2025,all-year,R1,0.55560000000,heatpump,0,2035 -3,heat,all-week,night,2030,all-year,R1,1.44440000000,heatpump,0,2035 -2,heat,all-week,morning,2025,all-year,R1,0.83330000000,heatpump,1,2035 -3,heat,all-week,morning,2030,all-year,R1,2.16670000000,heatpump,1,2035 -2,heat,all-week,afternoon,2025,all-year,R1,0.55560000000,heatpump,2,2035 -3,heat,all-week,afternoon,2030,all-year,R1,1.44440000000,heatpump,2,2035 -2,heat,all-week,early-peak,2025,all-year,R1,0.83330000000,heatpump,3,2035 -3,heat,all-week,early-peak,2030,all-year,R1,2.16670000000,heatpump,3,2035 -2,heat,all-week,late-peak,2025,all-year,R1,1.66670000000,heatpump,4,2035 -3,heat,all-week,late-peak,2030,all-year,R1,4.33330000000,heatpump,4,2035 -2,heat,all-week,evening,2025,all-year,R1,1.11110000000,heatpump,5,2035 -3,heat,all-week,evening,2030,all-year,R1,2.88890000000,heatpump,5,2035 -3,heat,all-week,night,2030,all-year,R1,1.44440000000,heatpump,0,2040 -4,heat,all-week,night,2035,all-year,R1,0.88890000000,heatpump,0,2040 -3,heat,all-week,morning,2030,all-year,R1,2.16670000000,heatpump,1,2040 -4,heat,all-week,morning,2035,all-year,R1,1.33330000000,heatpump,1,2040 -3,heat,all-week,afternoon,2030,all-year,R1,1.44440000000,heatpump,2,2040 -4,heat,all-week,afternoon,2035,all-year,R1,0.88890000000,heatpump,2,2040 -3,heat,all-week,early-peak,2030,all-year,R1,2.16670000000,heatpump,3,2040 -4,heat,all-week,early-peak,2035,all-year,R1,1.33330000000,heatpump,3,2040 -3,heat,all-week,late-peak,2030,all-year,R1,4.33330000000,heatpump,4,2040 -4,heat,all-week,late-peak,2035,all-year,R1,2.66670000000,heatpump,4,2040 -3,heat,all-week,evening,2030,all-year,R1,2.88890000000,heatpump,5,2040 -4,heat,all-week,evening,2035,all-year,R1,1.77780000000,heatpump,5,2040 -4,heat,all-week,night,2035,all-year,R1,0.88890000000,heatpump,0,2045 -5,heat,all-week,night,2040,all-year,R1,1.77780000000,heatpump,0,2045 -4,heat,all-week,morning,2035,all-year,R1,1.33330000000,heatpump,1,2045 -5,heat,all-week,morning,2040,all-year,R1,2.66670000000,heatpump,1,2045 -4,heat,all-week,afternoon,2035,all-year,R1,0.88890000000,heatpump,2,2045 -5,heat,all-week,afternoon,2040,all-year,R1,1.77780000000,heatpump,2,2045 -4,heat,all-week,early-peak,2035,all-year,R1,1.33330000000,heatpump,3,2045 -5,heat,all-week,early-peak,2040,all-year,R1,2.66670000000,heatpump,3,2045 -4,heat,all-week,late-peak,2035,all-year,R1,2.66670000000,heatpump,4,2045 -5,heat,all-week,late-peak,2040,all-year,R1,5.33330000000,heatpump,4,2045 -4,heat,all-week,evening,2035,all-year,R1,1.77780000000,heatpump,5,2045 -5,heat,all-week,evening,2040,all-year,R1,3.55560000000,heatpump,5,2045 -5,heat,all-week,night,2040,all-year,R1,1.77780000000,heatpump,0,2050 -6,heat,all-week,night,2045,all-year,R1,1.22220000000,heatpump,0,2050 -5,heat,all-week,morning,2040,all-year,R1,2.66670000000,heatpump,1,2050 -6,heat,all-week,morning,2045,all-year,R1,1.83330000000,heatpump,1,2050 -5,heat,all-week,afternoon,2040,all-year,R1,1.77780000000,heatpump,2,2050 -6,heat,all-week,afternoon,2045,all-year,R1,1.22220000000,heatpump,2,2050 -5,heat,all-week,early-peak,2040,all-year,R1,2.66670000000,heatpump,3,2050 -6,heat,all-week,early-peak,2045,all-year,R1,1.83330000000,heatpump,3,2050 -5,heat,all-week,late-peak,2040,all-year,R1,5.33330000000,heatpump,4,2050 -6,heat,all-week,late-peak,2045,all-year,R1,3.66670000000,heatpump,4,2050 -5,heat,all-week,evening,2040,all-year,R1,3.55560000000,heatpump,5,2050 -6,heat,all-week,evening,2045,all-year,R1,2.44440000000,heatpump,5,2050 diff --git a/tests/example_outputs/default_retro/Gas/Capacity.csv b/tests/example_outputs/default_retro/Gas/Capacity.csv deleted file mode 100644 index 22ed483ce..000000000 --- a/tests/example_outputs/default_retro/Gas/Capacity.csv +++ /dev/null @@ -1,17 +0,0 @@ -asset,capacity,installed,region,technology,year -0,15.00000000000,2020,R1,gassupply1,2020 -0,16.46440000000,2020,R1,gassupply1,2025 -0,8.96440000000,2020,R1,gassupply1,2030 -1,11.46130000000,2025,R1,gassupply1,2030 -0,1.46440000000,2020,R1,gassupply1,2035 -1,11.46130000000,2025,R1,gassupply1,2035 -2,7.50000000000,2030,R1,gassupply1,2035 -0,1.46440000000,2020,R1,gassupply1,2040 -1,11.46130000000,2025,R1,gassupply1,2040 -2,7.50000000000,2030,R1,gassupply1,2040 -0,1.46440000000,2020,R1,gassupply1,2045 -1,11.46130000000,2025,R1,gassupply1,2045 -2,7.50000000000,2030,R1,gassupply1,2045 -0,1.46440000000,2020,R1,gassupply1,2050 -1,11.46130000000,2025,R1,gassupply1,2050 -2,7.50000000000,2030,R1,gassupply1,2050 diff --git a/tests/example_outputs/default_retro/MCACapacity.csv b/tests/example_outputs/default_retro/MCACapacity.csv index 7a9f61616..203bf7cf8 100644 --- a/tests/example_outputs/default_retro/MCACapacity.csv +++ b/tests/example_outputs/default_retro/MCACapacity.csv @@ -7,55 +7,51 @@ A1,19.00000000000,R1,2020,R1,residential,heatpump,retrofit,2025 A1,6.00000000000,R1,2020,R1,power,gasCCGT,retrofit,2025 A1,5.50000000000,R1,2020,R1,power,windturbine,retrofit,2025 A1,16.46440000000,R1,2020,R1,gas,gassupply1,retrofit,2025 -A1,4.10000000000,R1,2025,R1,residential,gasboiler,retrofit,2030 A1,19.00000000000,R1,2020,R1,residential,heatpump,retrofit,2030 -A1,6.90000000000,R1,2025,R1,residential,heatpump,retrofit,2030 +A1,11.00000000000,R1,2025,R1,residential,heatpump,retrofit,2030 A1,5.00000000000,R1,2020,R1,power,gasCCGT,retrofit,2030 -A1,4.06670000000,R1,2025,R1,power,gasCCGT,retrofit,2030 +A1,5.88890000000,R1,2025,R1,power,gasCCGT,retrofit,2030 A1,5.50000000000,R1,2020,R1,power,windturbine,retrofit,2030 A1,8.96440000000,R1,2020,R1,gas,gassupply1,retrofit,2030 -A1,11.46130000000,R1,2025,R1,gas,gassupply1,retrofit,2030 -A1,4.10000000000,R1,2025,R1,residential,gasboiler,retrofit,2035 -A1,6.90000000000,R1,2025,R1,residential,heatpump,retrofit,2035 +A1,9.22000000000,R1,2025,R1,gas,gassupply1,retrofit,2030 +A1,11.00000000000,R1,2025,R1,residential,heatpump,retrofit,2035 A1,25.00000000000,R1,2030,R1,residential,heatpump,retrofit,2035 A1,5.00000000000,R1,2020,R1,power,gasCCGT,retrofit,2035 -A1,4.06670000000,R1,2025,R1,power,gasCCGT,retrofit,2035 +A1,5.88890000000,R1,2025,R1,power,gasCCGT,retrofit,2035 A1,5.50000000000,R1,2020,R1,power,windturbine,retrofit,2035 A1,6.00000000000,R1,2030,R1,power,windturbine,retrofit,2035 A1,1.46440000000,R1,2020,R1,gas,gassupply1,retrofit,2035 -A1,11.46130000000,R1,2025,R1,gas,gassupply1,retrofit,2035 +A1,9.22000000000,R1,2025,R1,gas,gassupply1,retrofit,2035 A1,7.50000000000,R1,2030,R1,gas,gassupply1,retrofit,2035 -A1,0.91000000000,R1,2035,R1,residential,gasboiler,retrofit,2040 A1,25.00000000000,R1,2030,R1,residential,heatpump,retrofit,2040 -A1,16.09000000000,R1,2035,R1,residential,heatpump,retrofit,2040 +A1,17.00000000000,R1,2035,R1,residential,heatpump,retrofit,2040 A1,5.00000000000,R1,2020,R1,power,gasCCGT,retrofit,2040 -A1,4.06670000000,R1,2025,R1,power,gasCCGT,retrofit,2040 +A1,5.88890000000,R1,2025,R1,power,gasCCGT,retrofit,2040 A1,5.50000000000,R1,2020,R1,power,windturbine,retrofit,2040 A1,6.00000000000,R1,2030,R1,power,windturbine,retrofit,2040 -A1,9.19000000000,R1,2035,R1,power,windturbine,retrofit,2040 +A1,6.00000000000,R1,2035,R1,power,windturbine,retrofit,2040 A1,1.46440000000,R1,2020,R1,gas,gassupply1,retrofit,2040 -A1,11.46130000000,R1,2025,R1,gas,gassupply1,retrofit,2040 +A1,9.22000000000,R1,2025,R1,gas,gassupply1,retrofit,2040 A1,7.50000000000,R1,2030,R1,gas,gassupply1,retrofit,2040 -A1,0.91000000000,R1,2035,R1,residential,gasboiler,retrofit,2045 -A1,16.09000000000,R1,2035,R1,residential,heatpump,retrofit,2045 +A1,17.00000000000,R1,2035,R1,residential,heatpump,retrofit,2045 A1,31.00000000000,R1,2040,R1,residential,heatpump,retrofit,2045 A1,5.00000000000,R1,2020,R1,power,gasCCGT,retrofit,2045 -A1,4.06670000000,R1,2025,R1,power,gasCCGT,retrofit,2045 +A1,5.88890000000,R1,2025,R1,power,gasCCGT,retrofit,2045 A1,5.50000000000,R1,2020,R1,power,windturbine,retrofit,2045 A1,6.00000000000,R1,2030,R1,power,windturbine,retrofit,2045 -A1,9.19000000000,R1,2035,R1,power,windturbine,retrofit,2045 +A1,6.00000000000,R1,2035,R1,power,windturbine,retrofit,2045 A1,6.00000000000,R1,2040,R1,power,windturbine,retrofit,2045 A1,1.46440000000,R1,2020,R1,gas,gassupply1,retrofit,2045 -A1,11.46130000000,R1,2025,R1,gas,gassupply1,retrofit,2045 +A1,9.22000000000,R1,2025,R1,gas,gassupply1,retrofit,2045 A1,7.50000000000,R1,2030,R1,gas,gassupply1,retrofit,2045 A1,31.00000000000,R1,2040,R1,residential,heatpump,retrofit,2050 A1,23.00000000000,R1,2045,R1,residential,heatpump,retrofit,2050 A1,5.00000000000,R1,2020,R1,power,gasCCGT,retrofit,2050 -A1,4.06670000000,R1,2025,R1,power,gasCCGT,retrofit,2050 +A1,5.88890000000,R1,2025,R1,power,gasCCGT,retrofit,2050 A1,6.00000000000,R1,2030,R1,power,windturbine,retrofit,2050 -A1,9.19000000000,R1,2035,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,12.41000000000,R1,2045,R1,power,windturbine,retrofit,2050 +A1,11.50000000000,R1,2045,R1,power,windturbine,retrofit,2050 A1,1.46440000000,R1,2020,R1,gas,gassupply1,retrofit,2050 -A1,11.46130000000,R1,2025,R1,gas,gassupply1,retrofit,2050 +A1,9.22000000000,R1,2025,R1,gas,gassupply1,retrofit,2050 A1,7.50000000000,R1,2030,R1,gas,gassupply1,retrofit,2050 diff --git a/tests/example_outputs/default_retro/MCAPrices.csv b/tests/example_outputs/default_retro/MCAPrices.csv index 214113930..ca7378aff 100644 --- a/tests/example_outputs/default_retro/MCAPrices.csv +++ b/tests/example_outputs/default_retro/MCAPrices.csv @@ -47,123 +47,123 @@ electricity,all-week,evening,all-year,9.18790000000,R1,5,MUS$2010/PJ,2025 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2025 heat,all-week,evening,all-year,4.85420000000,R1,5,MUS$2010/PJ,2025 CO2f,all-week,evening,all-year,0.12010000000,R1,5,MUS$2010/kt,2025 -electricity,all-week,night,all-year,12.67060000000,R1,0,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,13.07600000000,R1,0,MUS$2010/PJ,2030 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,6.06060000000,R1,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,5.47090000000,R1,0,MUS$2010/PJ,2030 CO2f,all-week,night,all-year,0.15700000000,R1,0,MUS$2010/kt,2030 -electricity,all-week,morning,all-year,12.67060000000,R1,1,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,13.07600000000,R1,1,MUS$2010/PJ,2030 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,6.06060000000,R1,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,5.47090000000,R1,1,MUS$2010/PJ,2030 CO2f,all-week,morning,all-year,0.15700000000,R1,1,MUS$2010/kt,2030 -electricity,all-week,afternoon,all-year,12.67060000000,R1,2,MUS$2010/PJ,2030 +electricity,all-week,afternoon,all-year,13.07600000000,R1,2,MUS$2010/PJ,2030 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,6.06060000000,R1,2,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,5.47090000000,R1,2,MUS$2010/PJ,2030 CO2f,all-week,afternoon,all-year,0.15700000000,R1,2,MUS$2010/kt,2030 -electricity,all-week,early-peak,all-year,12.67060000000,R1,3,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,13.07600000000,R1,3,MUS$2010/PJ,2030 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,6.06060000000,R1,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,5.47090000000,R1,3,MUS$2010/PJ,2030 CO2f,all-week,early-peak,all-year,0.15700000000,R1,3,MUS$2010/kt,2030 -electricity,all-week,late-peak,all-year,12.67060000000,R1,4,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,13.07600000000,R1,4,MUS$2010/PJ,2030 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,6.06060000000,R1,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,5.47090000000,R1,4,MUS$2010/PJ,2030 CO2f,all-week,late-peak,all-year,0.15700000000,R1,4,MUS$2010/kt,2030 -electricity,all-week,evening,all-year,12.67060000000,R1,5,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,13.07600000000,R1,5,MUS$2010/PJ,2030 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,6.06060000000,R1,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,5.47090000000,R1,5,MUS$2010/PJ,2030 CO2f,all-week,evening,all-year,0.15700000000,R1,5,MUS$2010/kt,2030 -electricity,all-week,night,all-year,13.99390000000,R1,0,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,14.78530000000,R1,0,MUS$2010/PJ,2035 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,6.83090000000,R1,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,6.15460000000,R1,0,MUS$2010/PJ,2035 CO2f,all-week,night,all-year,0.21490000000,R1,0,MUS$2010/kt,2035 -electricity,all-week,morning,all-year,13.99390000000,R1,1,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,14.78530000000,R1,1,MUS$2010/PJ,2035 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,6.83090000000,R1,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,6.15460000000,R1,1,MUS$2010/PJ,2035 CO2f,all-week,morning,all-year,0.21490000000,R1,1,MUS$2010/kt,2035 -electricity,all-week,afternoon,all-year,13.99390000000,R1,2,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,14.78530000000,R1,2,MUS$2010/PJ,2035 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,6.83090000000,R1,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,6.15460000000,R1,2,MUS$2010/PJ,2035 CO2f,all-week,afternoon,all-year,0.21490000000,R1,2,MUS$2010/kt,2035 -electricity,all-week,early-peak,all-year,13.99390000000,R1,3,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,14.78530000000,R1,3,MUS$2010/PJ,2035 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,6.83090000000,R1,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,6.15460000000,R1,3,MUS$2010/PJ,2035 CO2f,all-week,early-peak,all-year,0.21490000000,R1,3,MUS$2010/kt,2035 -electricity,all-week,late-peak,all-year,13.99390000000,R1,4,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,14.78530000000,R1,4,MUS$2010/PJ,2035 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,6.83090000000,R1,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,6.15460000000,R1,4,MUS$2010/PJ,2035 CO2f,all-week,late-peak,all-year,0.21490000000,R1,4,MUS$2010/kt,2035 -electricity,all-week,evening,all-year,13.99390000000,R1,5,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,14.78530000000,R1,5,MUS$2010/PJ,2035 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,6.83090000000,R1,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,6.15460000000,R1,5,MUS$2010/PJ,2035 CO2f,all-week,evening,all-year,0.21490000000,R1,5,MUS$2010/kt,2035 -electricity,all-week,night,all-year,13.87100000000,R1,0,MUS$2010/PJ,2040 +electricity,all-week,night,all-year,16.00630000000,R1,0,MUS$2010/PJ,2040 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,6.06000000000,R1,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,6.64300000000,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,13.87100000000,R1,1,MUS$2010/PJ,2040 +electricity,all-week,morning,all-year,16.00630000000,R1,1,MUS$2010/PJ,2040 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,6.06000000000,R1,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,6.64300000000,R1,1,MUS$2010/PJ,2040 CO2f,all-week,morning,all-year,0.27280000000,R1,1,MUS$2010/kt,2040 -electricity,all-week,afternoon,all-year,13.87100000000,R1,2,MUS$2010/PJ,2040 +electricity,all-week,afternoon,all-year,16.00630000000,R1,2,MUS$2010/PJ,2040 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2040 -heat,all-week,afternoon,all-year,6.06000000000,R1,2,MUS$2010/PJ,2040 +heat,all-week,afternoon,all-year,6.64300000000,R1,2,MUS$2010/PJ,2040 CO2f,all-week,afternoon,all-year,0.27280000000,R1,2,MUS$2010/kt,2040 -electricity,all-week,early-peak,all-year,13.87100000000,R1,3,MUS$2010/PJ,2040 +electricity,all-week,early-peak,all-year,16.00630000000,R1,3,MUS$2010/PJ,2040 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,6.06000000000,R1,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,6.64300000000,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,13.87100000000,R1,4,MUS$2010/PJ,2040 +electricity,all-week,late-peak,all-year,16.00630000000,R1,4,MUS$2010/PJ,2040 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,6.06000000000,R1,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,6.64300000000,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,13.87100000000,R1,5,MUS$2010/PJ,2040 +electricity,all-week,evening,all-year,16.00630000000,R1,5,MUS$2010/PJ,2040 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,6.06000000000,R1,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,6.64300000000,R1,5,MUS$2010/PJ,2040 CO2f,all-week,evening,all-year,0.27280000000,R1,5,MUS$2010/kt,2040 -electricity,all-week,night,all-year,15.54030000000,R1,0,MUS$2010/PJ,2045 +electricity,all-week,night,all-year,18.01280000000,R1,0,MUS$2010/PJ,2045 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2045 -heat,all-week,night,all-year,6.78080000000,R1,0,MUS$2010/PJ,2045 +heat,all-week,night,all-year,7.44560000000,R1,0,MUS$2010/PJ,2045 CO2f,all-week,night,all-year,0.35390000000,R1,0,MUS$2010/kt,2045 -electricity,all-week,morning,all-year,15.54030000000,R1,1,MUS$2010/PJ,2045 +electricity,all-week,morning,all-year,18.01280000000,R1,1,MUS$2010/PJ,2045 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2045 -heat,all-week,morning,all-year,6.78080000000,R1,1,MUS$2010/PJ,2045 +heat,all-week,morning,all-year,7.44560000000,R1,1,MUS$2010/PJ,2045 CO2f,all-week,morning,all-year,0.35390000000,R1,1,MUS$2010/kt,2045 -electricity,all-week,afternoon,all-year,15.54030000000,R1,2,MUS$2010/PJ,2045 +electricity,all-week,afternoon,all-year,18.01280000000,R1,2,MUS$2010/PJ,2045 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2045 -heat,all-week,afternoon,all-year,6.78080000000,R1,2,MUS$2010/PJ,2045 +heat,all-week,afternoon,all-year,7.44560000000,R1,2,MUS$2010/PJ,2045 CO2f,all-week,afternoon,all-year,0.35390000000,R1,2,MUS$2010/kt,2045 -electricity,all-week,early-peak,all-year,15.54030000000,R1,3,MUS$2010/PJ,2045 +electricity,all-week,early-peak,all-year,18.01280000000,R1,3,MUS$2010/PJ,2045 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2045 -heat,all-week,early-peak,all-year,6.78080000000,R1,3,MUS$2010/PJ,2045 +heat,all-week,early-peak,all-year,7.44560000000,R1,3,MUS$2010/PJ,2045 CO2f,all-week,early-peak,all-year,0.35390000000,R1,3,MUS$2010/kt,2045 -electricity,all-week,late-peak,all-year,15.54030000000,R1,4,MUS$2010/PJ,2045 +electricity,all-week,late-peak,all-year,18.01280000000,R1,4,MUS$2010/PJ,2045 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2045 -heat,all-week,late-peak,all-year,6.78080000000,R1,4,MUS$2010/PJ,2045 +heat,all-week,late-peak,all-year,7.44560000000,R1,4,MUS$2010/PJ,2045 CO2f,all-week,late-peak,all-year,0.35390000000,R1,4,MUS$2010/kt,2045 -electricity,all-week,evening,all-year,15.54030000000,R1,5,MUS$2010/PJ,2045 +electricity,all-week,evening,all-year,18.01280000000,R1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2045 -heat,all-week,evening,all-year,6.78080000000,R1,5,MUS$2010/PJ,2045 +heat,all-week,evening,all-year,7.44560000000,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,16.57670000000,R1,0,MUS$2010/PJ,2050 +electricity,all-week,night,all-year,19.57340000000,R1,0,MUS$2010/PJ,2050 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,6.87120000000,R1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,8.06980000000,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,16.57670000000,R1,1,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,19.57340000000,R1,1,MUS$2010/PJ,2050 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,6.87120000000,R1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,8.06980000000,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,16.57670000000,R1,2,MUS$2010/PJ,2050 +electricity,all-week,afternoon,all-year,19.57340000000,R1,2,MUS$2010/PJ,2050 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,6.87120000000,R1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,8.06980000000,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,16.57670000000,R1,3,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,19.57340000000,R1,3,MUS$2010/PJ,2050 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,6.87120000000,R1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,8.06980000000,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,16.57670000000,R1,4,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,19.57340000000,R1,4,MUS$2010/PJ,2050 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,6.87120000000,R1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,8.06980000000,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,16.57670000000,R1,5,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,19.57340000000,R1,5,MUS$2010/PJ,2050 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,6.87120000000,R1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,8.06980000000,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/Power/Capacity.csv b/tests/example_outputs/default_retro/Power/Capacity.csv deleted file mode 100644 index f49a1fd5f..000000000 --- a/tests/example_outputs/default_retro/Power/Capacity.csv +++ /dev/null @@ -1,28 +0,0 @@ -asset,capacity,installed,region,technology,year -0,1.00000000000,2020,R1,gasCCGT,2020 -0,6.00000000000,2020,R1,gasCCGT,2025 -2,5.50000000000,2020,R1,windturbine,2025 -0,5.00000000000,2020,R1,gasCCGT,2030 -1,4.06670000000,2025,R1,gasCCGT,2030 -2,5.50000000000,2020,R1,windturbine,2030 -0,5.00000000000,2020,R1,gasCCGT,2035 -1,4.06670000000,2025,R1,gasCCGT,2035 -2,5.50000000000,2020,R1,windturbine,2035 -3,6.00000000000,2030,R1,windturbine,2035 -0,5.00000000000,2020,R1,gasCCGT,2040 -1,4.06670000000,2025,R1,gasCCGT,2040 -2,5.50000000000,2020,R1,windturbine,2040 -3,6.00000000000,2030,R1,windturbine,2040 -4,9.19000000000,2035,R1,windturbine,2040 -0,5.00000000000,2020,R1,gasCCGT,2045 -1,4.06670000000,2025,R1,gasCCGT,2045 -2,5.50000000000,2020,R1,windturbine,2045 -3,6.00000000000,2030,R1,windturbine,2045 -4,9.19000000000,2035,R1,windturbine,2045 -5,6.00000000000,2040,R1,windturbine,2045 -0,5.00000000000,2020,R1,gasCCGT,2050 -1,4.06670000000,2025,R1,gasCCGT,2050 -3,6.00000000000,2030,R1,windturbine,2050 -4,9.19000000000,2035,R1,windturbine,2050 -5,6.00000000000,2040,R1,windturbine,2050 -6,12.41000000000,2045,R1,windturbine,2050 diff --git a/tests/example_outputs/default_retro/Residential/Capacity.csv b/tests/example_outputs/default_retro/Residential/Capacity.csv deleted file mode 100644 index afb9f4183..000000000 --- a/tests/example_outputs/default_retro/Residential/Capacity.csv +++ /dev/null @@ -1,18 +0,0 @@ -asset,capacity,installed,region,technology,year -0,10.00000000000,2020,R1,gasboiler,2020 -0,5.00000000000,2020,R1,gasboiler,2025 -2,19.00000000000,2020,R1,heatpump,2025 -0,4.10000000000,2025,R1,gasboiler,2030 -1,19.00000000000,2020,R1,heatpump,2030 -2,6.90000000000,2025,R1,heatpump,2030 -0,4.10000000000,2025,R1,gasboiler,2035 -2,6.90000000000,2025,R1,heatpump,2035 -3,25.00000000000,2030,R1,heatpump,2035 -0,0.91000000000,2035,R1,gasboiler,2040 -1,25.00000000000,2030,R1,heatpump,2040 -2,16.09000000000,2035,R1,heatpump,2040 -0,0.91000000000,2035,R1,gasboiler,2045 -1,16.09000000000,2035,R1,heatpump,2045 -2,31.00000000000,2040,R1,heatpump,2045 -2,31.00000000000,2040,R1,heatpump,2050 -3,23.00000000000,2045,R1,heatpump,2050 diff --git a/tests/example_outputs/default_retro/Residential/Supply.csv b/tests/example_outputs/default_retro/Residential/Supply.csv deleted file mode 100644 index f65b3e310..000000000 --- a/tests/example_outputs/default_retro/Residential/Supply.csv +++ /dev/null @@ -1,139 +0,0 @@ -asset,commodity,day,hour,installed,month,region,supply,technology,timeslice,year -0,heat,all-week,night,2020,all-year,R1,1.00000000000,gasboiler,0,2020 -0,CO2f,all-week,night,2020,all-year,R1,64.71000000000,gasboiler,0,2020 -0,heat,all-week,morning,2020,all-year,R1,1.50000000000,gasboiler,1,2020 -0,CO2f,all-week,morning,2020,all-year,R1,97.06500000000,gasboiler,1,2020 -0,heat,all-week,afternoon,2020,all-year,R1,1.00000000000,gasboiler,2,2020 -0,CO2f,all-week,afternoon,2020,all-year,R1,64.71000000000,gasboiler,2,2020 -0,heat,all-week,early-peak,2020,all-year,R1,1.50000000000,gasboiler,3,2020 -0,CO2f,all-week,early-peak,2020,all-year,R1,97.06500000000,gasboiler,3,2020 -0,heat,all-week,late-peak,2020,all-year,R1,3.00000000000,gasboiler,4,2020 -0,CO2f,all-week,late-peak,2020,all-year,R1,194.13000000000,gasboiler,4,2020 -0,heat,all-week,evening,2020,all-year,R1,2.00000000000,gasboiler,5,2020 -0,CO2f,all-week,evening,2020,all-year,R1,129.42000000000,gasboiler,5,2020 -0,heat,all-week,night,2020,all-year,R1,0.27780000000,gasboiler,0,2025 -2,heat,all-week,night,2020,all-year,R1,1.05560000000,heatpump,0,2025 -0,CO2f,all-week,night,2020,all-year,R1,17.97500000000,gasboiler,0,2025 -0,heat,all-week,morning,2020,all-year,R1,0.41670000000,gasboiler,1,2025 -2,heat,all-week,morning,2020,all-year,R1,1.58330000000,heatpump,1,2025 -0,CO2f,all-week,morning,2020,all-year,R1,26.96250000000,gasboiler,1,2025 -0,heat,all-week,afternoon,2020,all-year,R1,0.27780000000,gasboiler,2,2025 -2,heat,all-week,afternoon,2020,all-year,R1,1.05560000000,heatpump,2,2025 -0,CO2f,all-week,afternoon,2020,all-year,R1,17.97500000000,gasboiler,2,2025 -0,heat,all-week,early-peak,2020,all-year,R1,0.41670000000,gasboiler,3,2025 -2,heat,all-week,early-peak,2020,all-year,R1,1.58330000000,heatpump,3,2025 -0,CO2f,all-week,early-peak,2020,all-year,R1,26.96250000000,gasboiler,3,2025 -0,heat,all-week,late-peak,2020,all-year,R1,0.83330000000,gasboiler,4,2025 -2,heat,all-week,late-peak,2020,all-year,R1,3.16670000000,heatpump,4,2025 -0,CO2f,all-week,late-peak,2020,all-year,R1,53.92500000000,gasboiler,4,2025 -0,heat,all-week,evening,2020,all-year,R1,0.55560000000,gasboiler,5,2025 -2,heat,all-week,evening,2020,all-year,R1,2.11110000000,heatpump,5,2025 -0,CO2f,all-week,evening,2020,all-year,R1,35.95000000000,gasboiler,5,2025 -0,heat,all-week,night,2025,all-year,R1,0.22780000000,gasboiler,0,2030 -1,heat,all-week,night,2020,all-year,R1,1.05560000000,heatpump,0,2030 -2,heat,all-week,night,2025,all-year,R1,0.38330000000,heatpump,0,2030 -0,CO2f,all-week,night,2025,all-year,R1,14.73950000000,gasboiler,0,2030 -0,heat,all-week,morning,2025,all-year,R1,0.34170000000,gasboiler,1,2030 -1,heat,all-week,morning,2020,all-year,R1,1.58330000000,heatpump,1,2030 -2,heat,all-week,morning,2025,all-year,R1,0.57500000000,heatpump,1,2030 -0,CO2f,all-week,morning,2025,all-year,R1,22.10920000000,gasboiler,1,2030 -0,heat,all-week,afternoon,2025,all-year,R1,0.22780000000,gasboiler,2,2030 -1,heat,all-week,afternoon,2020,all-year,R1,1.05560000000,heatpump,2,2030 -2,heat,all-week,afternoon,2025,all-year,R1,0.38330000000,heatpump,2,2030 -0,CO2f,all-week,afternoon,2025,all-year,R1,14.73950000000,gasboiler,2,2030 -0,heat,all-week,early-peak,2025,all-year,R1,0.34170000000,gasboiler,3,2030 -1,heat,all-week,early-peak,2020,all-year,R1,1.58330000000,heatpump,3,2030 -2,heat,all-week,early-peak,2025,all-year,R1,0.57500000000,heatpump,3,2030 -0,CO2f,all-week,early-peak,2025,all-year,R1,22.10920000000,gasboiler,3,2030 -0,heat,all-week,late-peak,2025,all-year,R1,0.68330000000,gasboiler,4,2030 -1,heat,all-week,late-peak,2020,all-year,R1,3.16670000000,heatpump,4,2030 -2,heat,all-week,late-peak,2025,all-year,R1,1.15000000000,heatpump,4,2030 -0,CO2f,all-week,late-peak,2025,all-year,R1,44.21850000000,gasboiler,4,2030 -0,heat,all-week,evening,2025,all-year,R1,0.45560000000,gasboiler,5,2030 -1,heat,all-week,evening,2020,all-year,R1,2.11110000000,heatpump,5,2030 -2,heat,all-week,evening,2025,all-year,R1,0.76670000000,heatpump,5,2030 -0,CO2f,all-week,evening,2025,all-year,R1,29.47900000000,gasboiler,5,2030 -0,heat,all-week,night,2025,all-year,R1,0.22780000000,gasboiler,0,2035 -2,heat,all-week,night,2025,all-year,R1,0.38330000000,heatpump,0,2035 -3,heat,all-week,night,2030,all-year,R1,1.38890000000,heatpump,0,2035 -0,CO2f,all-week,night,2025,all-year,R1,14.73950000000,gasboiler,0,2035 -0,heat,all-week,morning,2025,all-year,R1,0.34170000000,gasboiler,1,2035 -2,heat,all-week,morning,2025,all-year,R1,0.57500000000,heatpump,1,2035 -3,heat,all-week,morning,2030,all-year,R1,2.08330000000,heatpump,1,2035 -0,CO2f,all-week,morning,2025,all-year,R1,22.10920000000,gasboiler,1,2035 -0,heat,all-week,afternoon,2025,all-year,R1,0.22780000000,gasboiler,2,2035 -2,heat,all-week,afternoon,2025,all-year,R1,0.38330000000,heatpump,2,2035 -3,heat,all-week,afternoon,2030,all-year,R1,1.38890000000,heatpump,2,2035 -0,CO2f,all-week,afternoon,2025,all-year,R1,14.73950000000,gasboiler,2,2035 -0,heat,all-week,early-peak,2025,all-year,R1,0.34170000000,gasboiler,3,2035 -2,heat,all-week,early-peak,2025,all-year,R1,0.57500000000,heatpump,3,2035 -3,heat,all-week,early-peak,2030,all-year,R1,2.08330000000,heatpump,3,2035 -0,CO2f,all-week,early-peak,2025,all-year,R1,22.10920000000,gasboiler,3,2035 -0,heat,all-week,late-peak,2025,all-year,R1,0.68330000000,gasboiler,4,2035 -2,heat,all-week,late-peak,2025,all-year,R1,1.15000000000,heatpump,4,2035 -3,heat,all-week,late-peak,2030,all-year,R1,4.16670000000,heatpump,4,2035 -0,CO2f,all-week,late-peak,2025,all-year,R1,44.21850000000,gasboiler,4,2035 -0,heat,all-week,evening,2025,all-year,R1,0.45560000000,gasboiler,5,2035 -2,heat,all-week,evening,2025,all-year,R1,0.76670000000,heatpump,5,2035 -3,heat,all-week,evening,2030,all-year,R1,2.77780000000,heatpump,5,2035 -0,CO2f,all-week,evening,2025,all-year,R1,29.47900000000,gasboiler,5,2035 -0,heat,all-week,night,2035,all-year,R1,0.05060000000,gasboiler,0,2040 -1,heat,all-week,night,2030,all-year,R1,1.38890000000,heatpump,0,2040 -2,heat,all-week,night,2035,all-year,R1,0.89390000000,heatpump,0,2040 -0,CO2f,all-week,night,2035,all-year,R1,3.27140000000,gasboiler,0,2040 -0,heat,all-week,morning,2035,all-year,R1,0.07580000000,gasboiler,1,2040 -1,heat,all-week,morning,2030,all-year,R1,2.08330000000,heatpump,1,2040 -2,heat,all-week,morning,2035,all-year,R1,1.34080000000,heatpump,1,2040 -0,CO2f,all-week,morning,2035,all-year,R1,4.90720000000,gasboiler,1,2040 -0,heat,all-week,afternoon,2035,all-year,R1,0.05060000000,gasboiler,2,2040 -1,heat,all-week,afternoon,2030,all-year,R1,1.38890000000,heatpump,2,2040 -2,heat,all-week,afternoon,2035,all-year,R1,0.89390000000,heatpump,2,2040 -0,CO2f,all-week,afternoon,2035,all-year,R1,3.27140000000,gasboiler,2,2040 -0,heat,all-week,early-peak,2035,all-year,R1,0.07580000000,gasboiler,3,2040 -1,heat,all-week,early-peak,2030,all-year,R1,2.08330000000,heatpump,3,2040 -2,heat,all-week,early-peak,2035,all-year,R1,1.34080000000,heatpump,3,2040 -0,CO2f,all-week,early-peak,2035,all-year,R1,4.90720000000,gasboiler,3,2040 -0,heat,all-week,late-peak,2035,all-year,R1,0.15170000000,gasboiler,4,2040 -1,heat,all-week,late-peak,2030,all-year,R1,4.16670000000,heatpump,4,2040 -2,heat,all-week,late-peak,2035,all-year,R1,2.68170000000,heatpump,4,2040 -0,CO2f,all-week,late-peak,2035,all-year,R1,9.81430000000,gasboiler,4,2040 -0,heat,all-week,evening,2035,all-year,R1,0.10110000000,gasboiler,5,2040 -1,heat,all-week,evening,2030,all-year,R1,2.77780000000,heatpump,5,2040 -2,heat,all-week,evening,2035,all-year,R1,1.78780000000,heatpump,5,2040 -0,CO2f,all-week,evening,2035,all-year,R1,6.54290000000,gasboiler,5,2040 -0,heat,all-week,night,2035,all-year,R1,0.05060000000,gasboiler,0,2045 -1,heat,all-week,night,2035,all-year,R1,0.89390000000,heatpump,0,2045 -2,heat,all-week,night,2040,all-year,R1,1.72220000000,heatpump,0,2045 -0,CO2f,all-week,night,2035,all-year,R1,3.27140000000,gasboiler,0,2045 -0,heat,all-week,morning,2035,all-year,R1,0.07580000000,gasboiler,1,2045 -1,heat,all-week,morning,2035,all-year,R1,1.34080000000,heatpump,1,2045 -2,heat,all-week,morning,2040,all-year,R1,2.58330000000,heatpump,1,2045 -0,CO2f,all-week,morning,2035,all-year,R1,4.90720000000,gasboiler,1,2045 -0,heat,all-week,afternoon,2035,all-year,R1,0.05060000000,gasboiler,2,2045 -1,heat,all-week,afternoon,2035,all-year,R1,0.89390000000,heatpump,2,2045 -2,heat,all-week,afternoon,2040,all-year,R1,1.72220000000,heatpump,2,2045 -0,CO2f,all-week,afternoon,2035,all-year,R1,3.27140000000,gasboiler,2,2045 -0,heat,all-week,early-peak,2035,all-year,R1,0.07580000000,gasboiler,3,2045 -1,heat,all-week,early-peak,2035,all-year,R1,1.34080000000,heatpump,3,2045 -2,heat,all-week,early-peak,2040,all-year,R1,2.58330000000,heatpump,3,2045 -0,CO2f,all-week,early-peak,2035,all-year,R1,4.90720000000,gasboiler,3,2045 -0,heat,all-week,late-peak,2035,all-year,R1,0.15170000000,gasboiler,4,2045 -1,heat,all-week,late-peak,2035,all-year,R1,2.68170000000,heatpump,4,2045 -2,heat,all-week,late-peak,2040,all-year,R1,5.16670000000,heatpump,4,2045 -0,CO2f,all-week,late-peak,2035,all-year,R1,9.81430000000,gasboiler,4,2045 -0,heat,all-week,evening,2035,all-year,R1,0.10110000000,gasboiler,5,2045 -1,heat,all-week,evening,2035,all-year,R1,1.78780000000,heatpump,5,2045 -2,heat,all-week,evening,2040,all-year,R1,3.44440000000,heatpump,5,2045 -0,CO2f,all-week,evening,2035,all-year,R1,6.54290000000,gasboiler,5,2045 -2,heat,all-week,night,2040,all-year,R1,1.72220000000,heatpump,0,2050 -3,heat,all-week,night,2045,all-year,R1,1.27780000000,heatpump,0,2050 -2,heat,all-week,morning,2040,all-year,R1,2.58330000000,heatpump,1,2050 -3,heat,all-week,morning,2045,all-year,R1,1.91670000000,heatpump,1,2050 -2,heat,all-week,afternoon,2040,all-year,R1,1.72220000000,heatpump,2,2050 -3,heat,all-week,afternoon,2045,all-year,R1,1.27780000000,heatpump,2,2050 -2,heat,all-week,early-peak,2040,all-year,R1,2.58330000000,heatpump,3,2050 -3,heat,all-week,early-peak,2045,all-year,R1,1.91670000000,heatpump,3,2050 -2,heat,all-week,late-peak,2040,all-year,R1,5.16670000000,heatpump,4,2050 -3,heat,all-week,late-peak,2045,all-year,R1,3.83330000000,heatpump,4,2050 -2,heat,all-week,evening,2040,all-year,R1,3.44440000000,heatpump,5,2050 -3,heat,all-week,evening,2045,all-year,R1,2.55560000000,heatpump,5,2050 diff --git a/tests/example_outputs/default_timeslice/Gas/Capacity.csv b/tests/example_outputs/default_timeslice/Gas/Capacity.csv deleted file mode 100644 index b53fa2b48..000000000 --- a/tests/example_outputs/default_timeslice/Gas/Capacity.csv +++ /dev/null @@ -1,4 +0,0 @@ -asset,capacity,installed,region,technology,year -0,15.00000000000,2020,R1,gassupply1,2020 -0,15.00000000000,2020,R1,gassupply1,2025 -0,7.50000000000,2020,R1,gassupply1,2030 diff --git a/tests/example_outputs/default_timeslice/MCAMetric_Consumption.csv b/tests/example_outputs/default_timeslice/MCAMetric_Consumption.csv deleted file mode 100644 index 42d2f554e..000000000 --- a/tests/example_outputs/default_timeslice/MCAMetric_Consumption.csv +++ /dev/null @@ -1,205 +0,0 @@ -agent,asset,category,comm_usage,commodity,consumption,day,dst_region,hour,installed,month,region,sector,technology,timeslice,units_prices,year -A1,0,newcapa,CONSUMABLE|ENERGY,gas,1.16000000000,all-week,R1,night,2020,all-year,R1,residential,gasboiler,0,MUS$2010/PJ,2020 -A1,0,newcapa,CONSUMABLE|ENERGY,gas,1.74000000000,all-week,R1,morning,2020,all-year,R1,residential,gasboiler,1,MUS$2010/PJ,2020 -A1,0,newcapa,CONSUMABLE|ENERGY,gas,1.16000000000,all-week,R1,afternoon,2020,all-year,R1,residential,gasboiler,2,MUS$2010/PJ,2020 -A1,0,newcapa,CONSUMABLE|ENERGY,gas,1.74000000000,all-week,R1,early-peak,2020,all-year,R1,residential,gasboiler,3,MUS$2010/PJ,2020 -A1,0,newcapa,CONSUMABLE|ENERGY,gas,3.48000000000,all-week,R1,late-peak,2020,all-year,R1,residential,gasboiler,4,MUS$2010/PJ,2020 -A1,0,newcapa,CONSUMABLE|ENERGY,gas,2.32000000000,all-week,R1,evening,2020,all-year,R1,residential,gasboiler,5,MUS$2010/PJ,2020 -A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.32222222222,all-week,R1,night,2020,all-year,R1,residential,gasboiler,0,MUS$2010/PJ,2025 -A1,1,newcapa,CONSUMABLE|ENERGY,electricity,0.42222222222,all-week,R1,night,2020,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2025 -A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.48333333333,all-week,R1,morning,2020,all-year,R1,residential,gasboiler,1,MUS$2010/PJ,2025 -A1,1,newcapa,CONSUMABLE|ENERGY,electricity,0.63333333333,all-week,R1,morning,2020,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2025 -A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.32222222222,all-week,R1,afternoon,2020,all-year,R1,residential,gasboiler,2,MUS$2010/PJ,2025 -A1,1,newcapa,CONSUMABLE|ENERGY,electricity,0.42222222222,all-week,R1,afternoon,2020,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2025 -A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.48333333333,all-week,R1,early-peak,2020,all-year,R1,residential,gasboiler,3,MUS$2010/PJ,2025 -A1,1,newcapa,CONSUMABLE|ENERGY,electricity,0.63333333333,all-week,R1,early-peak,2020,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2025 -A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.96666666667,all-week,R1,late-peak,2020,all-year,R1,residential,gasboiler,4,MUS$2010/PJ,2025 -A1,1,newcapa,CONSUMABLE|ENERGY,electricity,1.26666666667,all-week,R1,late-peak,2020,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2025 -A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.64444444444,all-week,R1,evening,2020,all-year,R1,residential,gasboiler,5,MUS$2010/PJ,2025 -A1,1,newcapa,CONSUMABLE|ENERGY,electricity,0.84444444444,all-week,R1,evening,2020,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2025 -A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.35255555556,all-week,R1,night,2020,all-year,R1,power,gasCCGT,0,MUS$2010/PJ,2025 -A1,1,newcapa,CONSUMABLE|ENERGY,wind,0.21111111111,all-week,R1,night,2020,all-year,R1,power,windturbine,0,MUS$2010/kt,2025 -A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.52883333333,all-week,R1,morning,2020,all-year,R1,power,gasCCGT,1,MUS$2010/PJ,2025 -A1,1,newcapa,CONSUMABLE|ENERGY,wind,0.31666666667,all-week,R1,morning,2020,all-year,R1,power,windturbine,1,MUS$2010/kt,2025 -A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.35255555556,all-week,R1,afternoon,2020,all-year,R1,power,gasCCGT,2,MUS$2010/PJ,2025 -A1,1,newcapa,CONSUMABLE|ENERGY,wind,0.21111111111,all-week,R1,afternoon,2020,all-year,R1,power,windturbine,2,MUS$2010/kt,2025 -A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.52883333333,all-week,R1,early-peak,2020,all-year,R1,power,gasCCGT,3,MUS$2010/PJ,2025 -A1,1,newcapa,CONSUMABLE|ENERGY,wind,0.31666666667,all-week,R1,early-peak,2020,all-year,R1,power,windturbine,3,MUS$2010/kt,2025 -A1,0,newcapa,CONSUMABLE|ENERGY,gas,1.05766666667,all-week,R1,late-peak,2020,all-year,R1,power,gasCCGT,4,MUS$2010/PJ,2025 -A1,1,newcapa,CONSUMABLE|ENERGY,wind,0.63333333333,all-week,R1,late-peak,2020,all-year,R1,power,windturbine,4,MUS$2010/kt,2025 -A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.70511111111,all-week,R1,evening,2020,all-year,R1,power,gasCCGT,5,MUS$2010/PJ,2025 -A1,1,newcapa,CONSUMABLE|ENERGY,wind,0.42222222222,all-week,R1,evening,2020,all-year,R1,power,windturbine,5,MUS$2010/kt,2025 -A1,1,newcapa,CONSUMABLE|ENERGY,electricity,0.43678160920,all-week,R1,night,2020,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2030 -A1,2,newcapa,CONSUMABLE|ENERGY,electricity,0.22988505747,all-week,R1,night,2025,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2030 -A1,1,newcapa,CONSUMABLE|ENERGY,electricity,0.65517241379,all-week,R1,morning,2020,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2030 -A1,2,newcapa,CONSUMABLE|ENERGY,electricity,0.34482758621,all-week,R1,morning,2025,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2030 -A1,1,newcapa,CONSUMABLE|ENERGY,electricity,0.43678160920,all-week,R1,afternoon,2020,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2030 -A1,2,newcapa,CONSUMABLE|ENERGY,electricity,0.22988505747,all-week,R1,afternoon,2025,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2030 -A1,1,newcapa,CONSUMABLE|ENERGY,electricity,0.65517241379,all-week,R1,early-peak,2020,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2030 -A1,2,newcapa,CONSUMABLE|ENERGY,electricity,0.34482758621,all-week,R1,early-peak,2025,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2030 -A1,1,newcapa,CONSUMABLE|ENERGY,electricity,1.31034482759,all-week,R1,late-peak,2020,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2030 -A1,2,newcapa,CONSUMABLE|ENERGY,electricity,0.68965517241,all-week,R1,late-peak,2025,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2030 -A1,1,newcapa,CONSUMABLE|ENERGY,electricity,0.87356321839,all-week,R1,evening,2020,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2030 -A1,2,newcapa,CONSUMABLE|ENERGY,electricity,0.45977011494,all-week,R1,evening,2025,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2030 -A1,1,newcapa,CONSUMABLE|ENERGY,wind,0.33333333333,all-week,R1,night,2020,all-year,R1,power,windturbine,0,MUS$2010/kt,2030 -A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.33333333333,all-week,R1,night,2025,all-year,R1,power,windturbine,0,MUS$2010/kt,2030 -A1,1,newcapa,CONSUMABLE|ENERGY,wind,0.50000000000,all-week,R1,morning,2020,all-year,R1,power,windturbine,1,MUS$2010/kt,2030 -A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.50000000000,all-week,R1,morning,2025,all-year,R1,power,windturbine,1,MUS$2010/kt,2030 -A1,1,newcapa,CONSUMABLE|ENERGY,wind,0.33333333333,all-week,R1,afternoon,2020,all-year,R1,power,windturbine,2,MUS$2010/kt,2030 -A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.33333333333,all-week,R1,afternoon,2025,all-year,R1,power,windturbine,2,MUS$2010/kt,2030 -A1,1,newcapa,CONSUMABLE|ENERGY,wind,0.50000000000,all-week,R1,early-peak,2020,all-year,R1,power,windturbine,3,MUS$2010/kt,2030 -A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.50000000000,all-week,R1,early-peak,2025,all-year,R1,power,windturbine,3,MUS$2010/kt,2030 -A1,1,newcapa,CONSUMABLE|ENERGY,wind,1.00000000000,all-week,R1,late-peak,2020,all-year,R1,power,windturbine,4,MUS$2010/kt,2030 -A1,2,newcapa,CONSUMABLE|ENERGY,wind,1.00000000000,all-week,R1,late-peak,2025,all-year,R1,power,windturbine,4,MUS$2010/kt,2030 -A1,1,newcapa,CONSUMABLE|ENERGY,wind,0.66666666667,all-week,R1,evening,2020,all-year,R1,power,windturbine,5,MUS$2010/kt,2030 -A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.66666666667,all-week,R1,evening,2025,all-year,R1,power,windturbine,5,MUS$2010/kt,2030 -A1,2,newcapa,CONSUMABLE|ENERGY,electricity,0.22222222222,all-week,R1,night,2025,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2035 -A1,3,newcapa,CONSUMABLE|ENERGY,electricity,0.57777777778,all-week,R1,night,2030,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2035 -A1,2,newcapa,CONSUMABLE|ENERGY,electricity,0.33333333333,all-week,R1,morning,2025,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2035 -A1,3,newcapa,CONSUMABLE|ENERGY,electricity,0.86666666667,all-week,R1,morning,2030,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2035 -A1,2,newcapa,CONSUMABLE|ENERGY,electricity,0.22222222222,all-week,R1,afternoon,2025,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2035 -A1,3,newcapa,CONSUMABLE|ENERGY,electricity,0.57777777778,all-week,R1,afternoon,2030,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2035 -A1,2,newcapa,CONSUMABLE|ENERGY,electricity,0.33333333333,all-week,R1,early-peak,2025,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2035 -A1,3,newcapa,CONSUMABLE|ENERGY,electricity,0.86666666667,all-week,R1,early-peak,2030,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2035 -A1,2,newcapa,CONSUMABLE|ENERGY,electricity,0.66666666667,all-week,R1,late-peak,2025,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2035 -A1,3,newcapa,CONSUMABLE|ENERGY,electricity,1.73333333333,all-week,R1,late-peak,2030,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2035 -A1,2,newcapa,CONSUMABLE|ENERGY,electricity,0.44444444444,all-week,R1,evening,2025,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2035 -A1,3,newcapa,CONSUMABLE|ENERGY,electricity,1.15555555556,all-week,R1,evening,2030,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2035 -A1,1,newcapa,CONSUMABLE|ENERGY,wind,0.20000000000,all-week,R1,night,2020,all-year,R1,power,windturbine,0,MUS$2010/kt,2035 -A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.20000000000,all-week,R1,night,2025,all-year,R1,power,windturbine,0,MUS$2010/kt,2035 -A1,3,newcapa,CONSUMABLE|ENERGY,wind,0.40000000000,all-week,R1,night,2030,all-year,R1,power,windturbine,0,MUS$2010/kt,2035 -A1,1,newcapa,CONSUMABLE|ENERGY,wind,0.30000000000,all-week,R1,morning,2020,all-year,R1,power,windturbine,1,MUS$2010/kt,2035 -A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.30000000000,all-week,R1,morning,2025,all-year,R1,power,windturbine,1,MUS$2010/kt,2035 -A1,3,newcapa,CONSUMABLE|ENERGY,wind,0.60000000000,all-week,R1,morning,2030,all-year,R1,power,windturbine,1,MUS$2010/kt,2035 -A1,1,newcapa,CONSUMABLE|ENERGY,wind,0.20000000000,all-week,R1,afternoon,2020,all-year,R1,power,windturbine,2,MUS$2010/kt,2035 -A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.20000000000,all-week,R1,afternoon,2025,all-year,R1,power,windturbine,2,MUS$2010/kt,2035 -A1,3,newcapa,CONSUMABLE|ENERGY,wind,0.40000000000,all-week,R1,afternoon,2030,all-year,R1,power,windturbine,2,MUS$2010/kt,2035 -A1,1,newcapa,CONSUMABLE|ENERGY,wind,0.30000000000,all-week,R1,early-peak,2020,all-year,R1,power,windturbine,3,MUS$2010/kt,2035 -A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.30000000000,all-week,R1,early-peak,2025,all-year,R1,power,windturbine,3,MUS$2010/kt,2035 -A1,3,newcapa,CONSUMABLE|ENERGY,wind,0.60000000000,all-week,R1,early-peak,2030,all-year,R1,power,windturbine,3,MUS$2010/kt,2035 -A1,1,newcapa,CONSUMABLE|ENERGY,wind,0.60000000000,all-week,R1,late-peak,2020,all-year,R1,power,windturbine,4,MUS$2010/kt,2035 -A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.60000000000,all-week,R1,late-peak,2025,all-year,R1,power,windturbine,4,MUS$2010/kt,2035 -A1,3,newcapa,CONSUMABLE|ENERGY,wind,1.20000000000,all-week,R1,late-peak,2030,all-year,R1,power,windturbine,4,MUS$2010/kt,2035 -A1,1,newcapa,CONSUMABLE|ENERGY,wind,0.40000000000,all-week,R1,evening,2020,all-year,R1,power,windturbine,5,MUS$2010/kt,2035 -A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.40000000000,all-week,R1,evening,2025,all-year,R1,power,windturbine,5,MUS$2010/kt,2035 -A1,3,newcapa,CONSUMABLE|ENERGY,wind,0.80000000000,all-week,R1,evening,2030,all-year,R1,power,windturbine,5,MUS$2010/kt,2035 -A1,3,newcapa,CONSUMABLE|ENERGY,electricity,0.57777777778,all-week,R1,night,2030,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2040 -A1,4,newcapa,CONSUMABLE|ENERGY,electricity,0.35555555556,all-week,R1,night,2035,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2040 -A1,3,newcapa,CONSUMABLE|ENERGY,electricity,0.86666666667,all-week,R1,morning,2030,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2040 -A1,4,newcapa,CONSUMABLE|ENERGY,electricity,0.53333333333,all-week,R1,morning,2035,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2040 -A1,3,newcapa,CONSUMABLE|ENERGY,electricity,0.57777777778,all-week,R1,afternoon,2030,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2040 -A1,4,newcapa,CONSUMABLE|ENERGY,electricity,0.35555555556,all-week,R1,afternoon,2035,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2040 -A1,3,newcapa,CONSUMABLE|ENERGY,electricity,0.86666666667,all-week,R1,early-peak,2030,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2040 -A1,4,newcapa,CONSUMABLE|ENERGY,electricity,0.53333333333,all-week,R1,early-peak,2035,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2040 -A1,3,newcapa,CONSUMABLE|ENERGY,electricity,1.73333333333,all-week,R1,late-peak,2030,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2040 -A1,4,newcapa,CONSUMABLE|ENERGY,electricity,1.06666666667,all-week,R1,late-peak,2035,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2040 -A1,3,newcapa,CONSUMABLE|ENERGY,electricity,1.15555555556,all-week,R1,evening,2030,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2040 -A1,4,newcapa,CONSUMABLE|ENERGY,electricity,0.71111111111,all-week,R1,evening,2035,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2040 -A1,1,newcapa,CONSUMABLE|ENERGY,wind,0.15555555556,all-week,R1,night,2020,all-year,R1,power,windturbine,0,MUS$2010/kt,2040 -A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.15555555556,all-week,R1,night,2025,all-year,R1,power,windturbine,0,MUS$2010/kt,2040 -A1,3,newcapa,CONSUMABLE|ENERGY,wind,0.31111111111,all-week,R1,night,2030,all-year,R1,power,windturbine,0,MUS$2010/kt,2040 -A1,4,newcapa,CONSUMABLE|ENERGY,wind,0.31111111111,all-week,R1,night,2035,all-year,R1,power,windturbine,0,MUS$2010/kt,2040 -A1,1,newcapa,CONSUMABLE|ENERGY,wind,0.23333333333,all-week,R1,morning,2020,all-year,R1,power,windturbine,1,MUS$2010/kt,2040 -A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.23333333333,all-week,R1,morning,2025,all-year,R1,power,windturbine,1,MUS$2010/kt,2040 -A1,3,newcapa,CONSUMABLE|ENERGY,wind,0.46666666667,all-week,R1,morning,2030,all-year,R1,power,windturbine,1,MUS$2010/kt,2040 -A1,4,newcapa,CONSUMABLE|ENERGY,wind,0.46666666667,all-week,R1,morning,2035,all-year,R1,power,windturbine,1,MUS$2010/kt,2040 -A1,1,newcapa,CONSUMABLE|ENERGY,wind,0.15555555556,all-week,R1,afternoon,2020,all-year,R1,power,windturbine,2,MUS$2010/kt,2040 -A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.15555555556,all-week,R1,afternoon,2025,all-year,R1,power,windturbine,2,MUS$2010/kt,2040 -A1,3,newcapa,CONSUMABLE|ENERGY,wind,0.31111111111,all-week,R1,afternoon,2030,all-year,R1,power,windturbine,2,MUS$2010/kt,2040 -A1,4,newcapa,CONSUMABLE|ENERGY,wind,0.31111111111,all-week,R1,afternoon,2035,all-year,R1,power,windturbine,2,MUS$2010/kt,2040 -A1,1,newcapa,CONSUMABLE|ENERGY,wind,0.23333333333,all-week,R1,early-peak,2020,all-year,R1,power,windturbine,3,MUS$2010/kt,2040 -A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.23333333333,all-week,R1,early-peak,2025,all-year,R1,power,windturbine,3,MUS$2010/kt,2040 -A1,3,newcapa,CONSUMABLE|ENERGY,wind,0.46666666667,all-week,R1,early-peak,2030,all-year,R1,power,windturbine,3,MUS$2010/kt,2040 -A1,4,newcapa,CONSUMABLE|ENERGY,wind,0.46666666667,all-week,R1,early-peak,2035,all-year,R1,power,windturbine,3,MUS$2010/kt,2040 -A1,1,newcapa,CONSUMABLE|ENERGY,wind,0.46666666667,all-week,R1,late-peak,2020,all-year,R1,power,windturbine,4,MUS$2010/kt,2040 -A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.46666666667,all-week,R1,late-peak,2025,all-year,R1,power,windturbine,4,MUS$2010/kt,2040 -A1,3,newcapa,CONSUMABLE|ENERGY,wind,0.93333333333,all-week,R1,late-peak,2030,all-year,R1,power,windturbine,4,MUS$2010/kt,2040 -A1,4,newcapa,CONSUMABLE|ENERGY,wind,0.93333333333,all-week,R1,late-peak,2035,all-year,R1,power,windturbine,4,MUS$2010/kt,2040 -A1,1,newcapa,CONSUMABLE|ENERGY,wind,0.31111111111,all-week,R1,evening,2020,all-year,R1,power,windturbine,5,MUS$2010/kt,2040 -A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.31111111111,all-week,R1,evening,2025,all-year,R1,power,windturbine,5,MUS$2010/kt,2040 -A1,3,newcapa,CONSUMABLE|ENERGY,wind,0.62222222222,all-week,R1,evening,2030,all-year,R1,power,windturbine,5,MUS$2010/kt,2040 -A1,4,newcapa,CONSUMABLE|ENERGY,wind,0.62222222222,all-week,R1,evening,2035,all-year,R1,power,windturbine,5,MUS$2010/kt,2040 -A1,4,newcapa,CONSUMABLE|ENERGY,electricity,0.35555555556,all-week,R1,night,2035,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2045 -A1,5,newcapa,CONSUMABLE|ENERGY,electricity,0.71111111111,all-week,R1,night,2040,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2045 -A1,4,newcapa,CONSUMABLE|ENERGY,electricity,0.53333333333,all-week,R1,morning,2035,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2045 -A1,5,newcapa,CONSUMABLE|ENERGY,electricity,1.06666666667,all-week,R1,morning,2040,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2045 -A1,4,newcapa,CONSUMABLE|ENERGY,electricity,0.35555555556,all-week,R1,afternoon,2035,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2045 -A1,5,newcapa,CONSUMABLE|ENERGY,electricity,0.71111111111,all-week,R1,afternoon,2040,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2045 -A1,4,newcapa,CONSUMABLE|ENERGY,electricity,0.53333333333,all-week,R1,early-peak,2035,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2045 -A1,5,newcapa,CONSUMABLE|ENERGY,electricity,1.06666666667,all-week,R1,early-peak,2040,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2045 -A1,4,newcapa,CONSUMABLE|ENERGY,electricity,1.06666666667,all-week,R1,late-peak,2035,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2045 -A1,5,newcapa,CONSUMABLE|ENERGY,electricity,2.13333333333,all-week,R1,late-peak,2040,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2045 -A1,4,newcapa,CONSUMABLE|ENERGY,electricity,0.71111111111,all-week,R1,evening,2035,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2045 -A1,5,newcapa,CONSUMABLE|ENERGY,electricity,1.42222222222,all-week,R1,evening,2040,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2045 -A1,1,newcapa,CONSUMABLE|ENERGY,wind,0.13333333333,all-week,R1,night,2020,all-year,R1,power,windturbine,0,MUS$2010/kt,2045 -A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.13333333333,all-week,R1,night,2025,all-year,R1,power,windturbine,0,MUS$2010/kt,2045 -A1,3,newcapa,CONSUMABLE|ENERGY,wind,0.26666666667,all-week,R1,night,2030,all-year,R1,power,windturbine,0,MUS$2010/kt,2045 -A1,4,newcapa,CONSUMABLE|ENERGY,wind,0.26666666667,all-week,R1,night,2035,all-year,R1,power,windturbine,0,MUS$2010/kt,2045 -A1,5,newcapa,CONSUMABLE|ENERGY,wind,0.26666666667,all-week,R1,night,2040,all-year,R1,power,windturbine,0,MUS$2010/kt,2045 -A1,1,newcapa,CONSUMABLE|ENERGY,wind,0.20000000000,all-week,R1,morning,2020,all-year,R1,power,windturbine,1,MUS$2010/kt,2045 -A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.20000000000,all-week,R1,morning,2025,all-year,R1,power,windturbine,1,MUS$2010/kt,2045 -A1,3,newcapa,CONSUMABLE|ENERGY,wind,0.40000000000,all-week,R1,morning,2030,all-year,R1,power,windturbine,1,MUS$2010/kt,2045 -A1,4,newcapa,CONSUMABLE|ENERGY,wind,0.40000000000,all-week,R1,morning,2035,all-year,R1,power,windturbine,1,MUS$2010/kt,2045 -A1,5,newcapa,CONSUMABLE|ENERGY,wind,0.40000000000,all-week,R1,morning,2040,all-year,R1,power,windturbine,1,MUS$2010/kt,2045 -A1,1,newcapa,CONSUMABLE|ENERGY,wind,0.13333333333,all-week,R1,afternoon,2020,all-year,R1,power,windturbine,2,MUS$2010/kt,2045 -A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.13333333333,all-week,R1,afternoon,2025,all-year,R1,power,windturbine,2,MUS$2010/kt,2045 -A1,3,newcapa,CONSUMABLE|ENERGY,wind,0.26666666667,all-week,R1,afternoon,2030,all-year,R1,power,windturbine,2,MUS$2010/kt,2045 -A1,4,newcapa,CONSUMABLE|ENERGY,wind,0.26666666667,all-week,R1,afternoon,2035,all-year,R1,power,windturbine,2,MUS$2010/kt,2045 -A1,5,newcapa,CONSUMABLE|ENERGY,wind,0.26666666667,all-week,R1,afternoon,2040,all-year,R1,power,windturbine,2,MUS$2010/kt,2045 -A1,1,newcapa,CONSUMABLE|ENERGY,wind,0.20000000000,all-week,R1,early-peak,2020,all-year,R1,power,windturbine,3,MUS$2010/kt,2045 -A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.20000000000,all-week,R1,early-peak,2025,all-year,R1,power,windturbine,3,MUS$2010/kt,2045 -A1,3,newcapa,CONSUMABLE|ENERGY,wind,0.40000000000,all-week,R1,early-peak,2030,all-year,R1,power,windturbine,3,MUS$2010/kt,2045 -A1,4,newcapa,CONSUMABLE|ENERGY,wind,0.40000000000,all-week,R1,early-peak,2035,all-year,R1,power,windturbine,3,MUS$2010/kt,2045 -A1,5,newcapa,CONSUMABLE|ENERGY,wind,0.40000000000,all-week,R1,early-peak,2040,all-year,R1,power,windturbine,3,MUS$2010/kt,2045 -A1,1,newcapa,CONSUMABLE|ENERGY,wind,0.40000000000,all-week,R1,late-peak,2020,all-year,R1,power,windturbine,4,MUS$2010/kt,2045 -A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.40000000000,all-week,R1,late-peak,2025,all-year,R1,power,windturbine,4,MUS$2010/kt,2045 -A1,3,newcapa,CONSUMABLE|ENERGY,wind,0.80000000000,all-week,R1,late-peak,2030,all-year,R1,power,windturbine,4,MUS$2010/kt,2045 -A1,4,newcapa,CONSUMABLE|ENERGY,wind,0.80000000000,all-week,R1,late-peak,2035,all-year,R1,power,windturbine,4,MUS$2010/kt,2045 -A1,5,newcapa,CONSUMABLE|ENERGY,wind,0.80000000000,all-week,R1,late-peak,2040,all-year,R1,power,windturbine,4,MUS$2010/kt,2045 -A1,1,newcapa,CONSUMABLE|ENERGY,wind,0.26666666667,all-week,R1,evening,2020,all-year,R1,power,windturbine,5,MUS$2010/kt,2045 -A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.26666666667,all-week,R1,evening,2025,all-year,R1,power,windturbine,5,MUS$2010/kt,2045 -A1,3,newcapa,CONSUMABLE|ENERGY,wind,0.53333333333,all-week,R1,evening,2030,all-year,R1,power,windturbine,5,MUS$2010/kt,2045 -A1,4,newcapa,CONSUMABLE|ENERGY,wind,0.53333333333,all-week,R1,evening,2035,all-year,R1,power,windturbine,5,MUS$2010/kt,2045 -A1,5,newcapa,CONSUMABLE|ENERGY,wind,0.53333333333,all-week,R1,evening,2040,all-year,R1,power,windturbine,5,MUS$2010/kt,2045 -A1,5,newcapa,CONSUMABLE|ENERGY,electricity,0.71111111111,all-week,R1,night,2040,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2050 -A1,6,newcapa,CONSUMABLE|ENERGY,electricity,0.48888888889,all-week,R1,night,2045,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2050 -A1,5,newcapa,CONSUMABLE|ENERGY,electricity,1.06666666667,all-week,R1,morning,2040,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2050 -A1,6,newcapa,CONSUMABLE|ENERGY,electricity,0.73333333333,all-week,R1,morning,2045,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2050 -A1,5,newcapa,CONSUMABLE|ENERGY,electricity,0.71111111111,all-week,R1,afternoon,2040,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2050 -A1,6,newcapa,CONSUMABLE|ENERGY,electricity,0.48888888889,all-week,R1,afternoon,2045,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2050 -A1,5,newcapa,CONSUMABLE|ENERGY,electricity,1.06666666667,all-week,R1,early-peak,2040,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2050 -A1,6,newcapa,CONSUMABLE|ENERGY,electricity,0.73333333333,all-week,R1,early-peak,2045,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2050 -A1,5,newcapa,CONSUMABLE|ENERGY,electricity,2.13333333333,all-week,R1,late-peak,2040,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2050 -A1,6,newcapa,CONSUMABLE|ENERGY,electricity,1.46666666667,all-week,R1,late-peak,2045,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2050 -A1,5,newcapa,CONSUMABLE|ENERGY,electricity,1.42222222222,all-week,R1,evening,2040,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2050 -A1,6,newcapa,CONSUMABLE|ENERGY,electricity,0.97777777778,all-week,R1,evening,2045,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2050 -A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.13333333333,all-week,R1,night,2025,all-year,R1,power,windturbine,0,MUS$2010/kt,2050 -A1,3,newcapa,CONSUMABLE|ENERGY,wind,0.26666666667,all-week,R1,night,2030,all-year,R1,power,windturbine,0,MUS$2010/kt,2050 -A1,4,newcapa,CONSUMABLE|ENERGY,wind,0.26666666667,all-week,R1,night,2035,all-year,R1,power,windturbine,0,MUS$2010/kt,2050 -A1,5,newcapa,CONSUMABLE|ENERGY,wind,0.26666666667,all-week,R1,night,2040,all-year,R1,power,windturbine,0,MUS$2010/kt,2050 -A1,6,newcapa,CONSUMABLE|ENERGY,wind,0.26666666667,all-week,R1,night,2045,all-year,R1,power,windturbine,0,MUS$2010/kt,2050 -A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.20000000000,all-week,R1,morning,2025,all-year,R1,power,windturbine,1,MUS$2010/kt,2050 -A1,3,newcapa,CONSUMABLE|ENERGY,wind,0.40000000000,all-week,R1,morning,2030,all-year,R1,power,windturbine,1,MUS$2010/kt,2050 -A1,4,newcapa,CONSUMABLE|ENERGY,wind,0.40000000000,all-week,R1,morning,2035,all-year,R1,power,windturbine,1,MUS$2010/kt,2050 -A1,5,newcapa,CONSUMABLE|ENERGY,wind,0.40000000000,all-week,R1,morning,2040,all-year,R1,power,windturbine,1,MUS$2010/kt,2050 -A1,6,newcapa,CONSUMABLE|ENERGY,wind,0.40000000000,all-week,R1,morning,2045,all-year,R1,power,windturbine,1,MUS$2010/kt,2050 -A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.13333333333,all-week,R1,afternoon,2025,all-year,R1,power,windturbine,2,MUS$2010/kt,2050 -A1,3,newcapa,CONSUMABLE|ENERGY,wind,0.26666666667,all-week,R1,afternoon,2030,all-year,R1,power,windturbine,2,MUS$2010/kt,2050 -A1,4,newcapa,CONSUMABLE|ENERGY,wind,0.26666666667,all-week,R1,afternoon,2035,all-year,R1,power,windturbine,2,MUS$2010/kt,2050 -A1,5,newcapa,CONSUMABLE|ENERGY,wind,0.26666666667,all-week,R1,afternoon,2040,all-year,R1,power,windturbine,2,MUS$2010/kt,2050 -A1,6,newcapa,CONSUMABLE|ENERGY,wind,0.26666666667,all-week,R1,afternoon,2045,all-year,R1,power,windturbine,2,MUS$2010/kt,2050 -A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.20000000000,all-week,R1,early-peak,2025,all-year,R1,power,windturbine,3,MUS$2010/kt,2050 -A1,3,newcapa,CONSUMABLE|ENERGY,wind,0.40000000000,all-week,R1,early-peak,2030,all-year,R1,power,windturbine,3,MUS$2010/kt,2050 -A1,4,newcapa,CONSUMABLE|ENERGY,wind,0.40000000000,all-week,R1,early-peak,2035,all-year,R1,power,windturbine,3,MUS$2010/kt,2050 -A1,5,newcapa,CONSUMABLE|ENERGY,wind,0.40000000000,all-week,R1,early-peak,2040,all-year,R1,power,windturbine,3,MUS$2010/kt,2050 -A1,6,newcapa,CONSUMABLE|ENERGY,wind,0.40000000000,all-week,R1,early-peak,2045,all-year,R1,power,windturbine,3,MUS$2010/kt,2050 -A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.40000000000,all-week,R1,late-peak,2025,all-year,R1,power,windturbine,4,MUS$2010/kt,2050 -A1,3,newcapa,CONSUMABLE|ENERGY,wind,0.80000000000,all-week,R1,late-peak,2030,all-year,R1,power,windturbine,4,MUS$2010/kt,2050 -A1,4,newcapa,CONSUMABLE|ENERGY,wind,0.80000000000,all-week,R1,late-peak,2035,all-year,R1,power,windturbine,4,MUS$2010/kt,2050 -A1,5,newcapa,CONSUMABLE|ENERGY,wind,0.80000000000,all-week,R1,late-peak,2040,all-year,R1,power,windturbine,4,MUS$2010/kt,2050 -A1,6,newcapa,CONSUMABLE|ENERGY,wind,0.80000000000,all-week,R1,late-peak,2045,all-year,R1,power,windturbine,4,MUS$2010/kt,2050 -A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.26666666667,all-week,R1,evening,2025,all-year,R1,power,windturbine,5,MUS$2010/kt,2050 -A1,3,newcapa,CONSUMABLE|ENERGY,wind,0.53333333333,all-week,R1,evening,2030,all-year,R1,power,windturbine,5,MUS$2010/kt,2050 -A1,4,newcapa,CONSUMABLE|ENERGY,wind,0.53333333333,all-week,R1,evening,2035,all-year,R1,power,windturbine,5,MUS$2010/kt,2050 -A1,5,newcapa,CONSUMABLE|ENERGY,wind,0.53333333333,all-week,R1,evening,2040,all-year,R1,power,windturbine,5,MUS$2010/kt,2050 -A1,6,newcapa,CONSUMABLE|ENERGY,wind,0.53333333333,all-week,R1,evening,2045,all-year,R1,power,windturbine,5,MUS$2010/kt,2050 diff --git a/tests/example_outputs/default_timeslice/MCAMetric_Supply.csv b/tests/example_outputs/default_timeslice/MCAMetric_Supply.csv deleted file mode 100644 index 235684bea..000000000 --- a/tests/example_outputs/default_timeslice/MCAMetric_Supply.csv +++ /dev/null @@ -1,235 +0,0 @@ -agent,asset,category,comm_usage,commodity,day,dst_region,hour,installed,month,region,sector,supply,technology,timeslice,units_prices,year -A1,0,newcapa,PRODUCT|ENERGY,heat,all-week,R1,night,2020,all-year,R1,residential,1.00000000000,gasboiler,0,MUS$2010/PJ,2020 -A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2020,all-year,R1,residential,64.71000000000,gasboiler,0,MUS$2010/kt,2020 -A1,0,newcapa,PRODUCT|ENERGY,heat,all-week,R1,morning,2020,all-year,R1,residential,1.50000000000,gasboiler,1,MUS$2010/PJ,2020 -A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2020,all-year,R1,residential,97.06500000000,gasboiler,1,MUS$2010/kt,2020 -A1,0,newcapa,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2020,all-year,R1,residential,1.00000000000,gasboiler,2,MUS$2010/PJ,2020 -A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2020,all-year,R1,residential,64.71000000000,gasboiler,2,MUS$2010/kt,2020 -A1,0,newcapa,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2020,all-year,R1,residential,1.50000000000,gasboiler,3,MUS$2010/PJ,2020 -A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2020,all-year,R1,residential,97.06500000000,gasboiler,3,MUS$2010/kt,2020 -A1,0,newcapa,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2020,all-year,R1,residential,3.00000000000,gasboiler,4,MUS$2010/PJ,2020 -A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2020,all-year,R1,residential,194.13000000000,gasboiler,4,MUS$2010/kt,2020 -A1,0,newcapa,PRODUCT|ENERGY,heat,all-week,R1,evening,2020,all-year,R1,residential,2.00000000000,gasboiler,5,MUS$2010/PJ,2020 -A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2020,all-year,R1,residential,129.42000000000,gasboiler,5,MUS$2010/kt,2020 -A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,night,2020,all-year,R1,gas,1.16000000000,gassupply1,0,MUS$2010/PJ,2020 -A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,morning,2020,all-year,R1,gas,1.74000000000,gassupply1,1,MUS$2010/PJ,2020 -A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2020,all-year,R1,gas,1.16000000000,gassupply1,2,MUS$2010/PJ,2020 -A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2020,all-year,R1,gas,1.74000000000,gassupply1,3,MUS$2010/PJ,2020 -A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2020,all-year,R1,gas,3.48000000000,gassupply1,4,MUS$2010/PJ,2020 -A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,evening,2020,all-year,R1,gas,2.32000000000,gassupply1,5,MUS$2010/PJ,2020 -A1,0,newcapa,PRODUCT|ENERGY,heat,all-week,R1,night,2020,all-year,R1,residential,0.27777777778,gasboiler,0,MUS$2010/PJ,2025 -A1,1,newcapa,PRODUCT|ENERGY,heat,all-week,R1,night,2020,all-year,R1,residential,1.05555555556,heatpump,0,MUS$2010/PJ,2025 -A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2020,all-year,R1,residential,17.97500000000,gasboiler,0,MUS$2010/kt,2025 -A1,0,newcapa,PRODUCT|ENERGY,heat,all-week,R1,morning,2020,all-year,R1,residential,0.41666666667,gasboiler,1,MUS$2010/PJ,2025 -A1,1,newcapa,PRODUCT|ENERGY,heat,all-week,R1,morning,2020,all-year,R1,residential,1.58333333333,heatpump,1,MUS$2010/PJ,2025 -A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2020,all-year,R1,residential,26.96250000000,gasboiler,1,MUS$2010/kt,2025 -A1,0,newcapa,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2020,all-year,R1,residential,0.27777777778,gasboiler,2,MUS$2010/PJ,2025 -A1,1,newcapa,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2020,all-year,R1,residential,1.05555555556,heatpump,2,MUS$2010/PJ,2025 -A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2020,all-year,R1,residential,17.97500000000,gasboiler,2,MUS$2010/kt,2025 -A1,0,newcapa,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2020,all-year,R1,residential,0.41666666667,gasboiler,3,MUS$2010/PJ,2025 -A1,1,newcapa,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2020,all-year,R1,residential,1.58333333333,heatpump,3,MUS$2010/PJ,2025 -A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2020,all-year,R1,residential,26.96250000000,gasboiler,3,MUS$2010/kt,2025 -A1,0,newcapa,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2020,all-year,R1,residential,0.83333333333,gasboiler,4,MUS$2010/PJ,2025 -A1,1,newcapa,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2020,all-year,R1,residential,3.16666666667,heatpump,4,MUS$2010/PJ,2025 -A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2020,all-year,R1,residential,53.92500000000,gasboiler,4,MUS$2010/kt,2025 -A1,0,newcapa,PRODUCT|ENERGY,heat,all-week,R1,evening,2020,all-year,R1,residential,0.55555555556,gasboiler,5,MUS$2010/PJ,2025 -A1,1,newcapa,PRODUCT|ENERGY,heat,all-week,R1,evening,2020,all-year,R1,residential,2.11111111111,heatpump,5,MUS$2010/PJ,2025 -A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2020,all-year,R1,residential,35.95000000000,gasboiler,5,MUS$2010/kt,2025 -A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.21111111111,gasCCGT,0,MUS$2010/PJ,2025 -A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.21111111111,windturbine,0,MUS$2010/PJ,2025 -A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2020,all-year,R1,power,19.35255555556,gasCCGT,0,MUS$2010/kt,2025 -A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.31666666667,gasCCGT,1,MUS$2010/PJ,2025 -A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.31666666667,windturbine,1,MUS$2010/PJ,2025 -A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2020,all-year,R1,power,29.02883333333,gasCCGT,1,MUS$2010/kt,2025 -A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.21111111111,gasCCGT,2,MUS$2010/PJ,2025 -A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.21111111111,windturbine,2,MUS$2010/PJ,2025 -A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2020,all-year,R1,power,19.35255555556,gasCCGT,2,MUS$2010/kt,2025 -A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.31666666667,gasCCGT,3,MUS$2010/PJ,2025 -A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.31666666667,windturbine,3,MUS$2010/PJ,2025 -A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2020,all-year,R1,power,29.02883333333,gasCCGT,3,MUS$2010/kt,2025 -A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.63333333333,gasCCGT,4,MUS$2010/PJ,2025 -A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.63333333333,windturbine,4,MUS$2010/PJ,2025 -A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2020,all-year,R1,power,58.05766666667,gasCCGT,4,MUS$2010/kt,2025 -A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.42222222222,gasCCGT,5,MUS$2010/PJ,2025 -A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.42222222222,windturbine,5,MUS$2010/PJ,2025 -A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2020,all-year,R1,power,38.70511111111,gasCCGT,5,MUS$2010/kt,2025 -A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,night,2020,all-year,R1,gas,0.32222222222,gassupply1,0,MUS$2010/PJ,2025 -A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,morning,2020,all-year,R1,gas,0.48333333333,gassupply1,1,MUS$2010/PJ,2025 -A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2020,all-year,R1,gas,0.32222222222,gassupply1,2,MUS$2010/PJ,2025 -A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2020,all-year,R1,gas,0.48333333333,gassupply1,3,MUS$2010/PJ,2025 -A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2020,all-year,R1,gas,1.41200000000,gassupply1,4,MUS$2010/PJ,2025 -A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,evening,2020,all-year,R1,gas,0.64444444444,gassupply1,5,MUS$2010/PJ,2025 -A1,1,newcapa,PRODUCT|ENERGY,heat,all-week,R1,night,2020,all-year,R1,residential,1.09195402299,heatpump,0,MUS$2010/PJ,2030 -A1,2,newcapa,PRODUCT|ENERGY,heat,all-week,R1,night,2025,all-year,R1,residential,0.57471264368,heatpump,0,MUS$2010/PJ,2030 -A1,1,newcapa,PRODUCT|ENERGY,heat,all-week,R1,morning,2020,all-year,R1,residential,1.63793103448,heatpump,1,MUS$2010/PJ,2030 -A1,2,newcapa,PRODUCT|ENERGY,heat,all-week,R1,morning,2025,all-year,R1,residential,0.86206896552,heatpump,1,MUS$2010/PJ,2030 -A1,1,newcapa,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2020,all-year,R1,residential,1.09195402299,heatpump,2,MUS$2010/PJ,2030 -A1,2,newcapa,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2025,all-year,R1,residential,0.57471264368,heatpump,2,MUS$2010/PJ,2030 -A1,1,newcapa,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2020,all-year,R1,residential,1.63793103448,heatpump,3,MUS$2010/PJ,2030 -A1,2,newcapa,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2025,all-year,R1,residential,0.86206896552,heatpump,3,MUS$2010/PJ,2030 -A1,1,newcapa,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2020,all-year,R1,residential,3.27586206897,heatpump,4,MUS$2010/PJ,2030 -A1,2,newcapa,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2025,all-year,R1,residential,1.72413793103,heatpump,4,MUS$2010/PJ,2030 -A1,1,newcapa,PRODUCT|ENERGY,heat,all-week,R1,evening,2020,all-year,R1,residential,2.18390804598,heatpump,5,MUS$2010/PJ,2030 -A1,2,newcapa,PRODUCT|ENERGY,heat,all-week,R1,evening,2025,all-year,R1,residential,1.14942528736,heatpump,5,MUS$2010/PJ,2030 -A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.33333333333,windturbine,0,MUS$2010/PJ,2030 -A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.33333333333,windturbine,0,MUS$2010/PJ,2030 -A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.50000000000,windturbine,1,MUS$2010/PJ,2030 -A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.50000000000,windturbine,1,MUS$2010/PJ,2030 -A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.33333333333,windturbine,2,MUS$2010/PJ,2030 -A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.33333333333,windturbine,2,MUS$2010/PJ,2030 -A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.50000000000,windturbine,3,MUS$2010/PJ,2030 -A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.50000000000,windturbine,3,MUS$2010/PJ,2030 -A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,1.00000000000,windturbine,4,MUS$2010/PJ,2030 -A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,1.00000000000,windturbine,4,MUS$2010/PJ,2030 -A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.66666666667,windturbine,5,MUS$2010/PJ,2030 -A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.66666666667,windturbine,5,MUS$2010/PJ,2030 -A1,2,newcapa,PRODUCT|ENERGY,heat,all-week,R1,night,2025,all-year,R1,residential,0.55555555556,heatpump,0,MUS$2010/PJ,2035 -A1,3,newcapa,PRODUCT|ENERGY,heat,all-week,R1,night,2030,all-year,R1,residential,1.44444444444,heatpump,0,MUS$2010/PJ,2035 -A1,2,newcapa,PRODUCT|ENERGY,heat,all-week,R1,morning,2025,all-year,R1,residential,0.83333333333,heatpump,1,MUS$2010/PJ,2035 -A1,3,newcapa,PRODUCT|ENERGY,heat,all-week,R1,morning,2030,all-year,R1,residential,2.16666666667,heatpump,1,MUS$2010/PJ,2035 -A1,2,newcapa,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2025,all-year,R1,residential,0.55555555556,heatpump,2,MUS$2010/PJ,2035 -A1,3,newcapa,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2030,all-year,R1,residential,1.44444444444,heatpump,2,MUS$2010/PJ,2035 -A1,2,newcapa,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2025,all-year,R1,residential,0.83333333333,heatpump,3,MUS$2010/PJ,2035 -A1,3,newcapa,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2030,all-year,R1,residential,2.16666666667,heatpump,3,MUS$2010/PJ,2035 -A1,2,newcapa,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2025,all-year,R1,residential,1.66666666667,heatpump,4,MUS$2010/PJ,2035 -A1,3,newcapa,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2030,all-year,R1,residential,4.33333333333,heatpump,4,MUS$2010/PJ,2035 -A1,2,newcapa,PRODUCT|ENERGY,heat,all-week,R1,evening,2025,all-year,R1,residential,1.11111111111,heatpump,5,MUS$2010/PJ,2035 -A1,3,newcapa,PRODUCT|ENERGY,heat,all-week,R1,evening,2030,all-year,R1,residential,2.88888888889,heatpump,5,MUS$2010/PJ,2035 -A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.20000000000,windturbine,0,MUS$2010/PJ,2035 -A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.20000000000,windturbine,0,MUS$2010/PJ,2035 -A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2030,all-year,R1,power,0.40000000000,windturbine,0,MUS$2010/PJ,2035 -A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.30000000000,windturbine,1,MUS$2010/PJ,2035 -A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.30000000000,windturbine,1,MUS$2010/PJ,2035 -A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2030,all-year,R1,power,0.60000000000,windturbine,1,MUS$2010/PJ,2035 -A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.20000000000,windturbine,2,MUS$2010/PJ,2035 -A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.20000000000,windturbine,2,MUS$2010/PJ,2035 -A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2030,all-year,R1,power,0.40000000000,windturbine,2,MUS$2010/PJ,2035 -A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.30000000000,windturbine,3,MUS$2010/PJ,2035 -A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.30000000000,windturbine,3,MUS$2010/PJ,2035 -A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2030,all-year,R1,power,0.60000000000,windturbine,3,MUS$2010/PJ,2035 -A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.60000000000,windturbine,4,MUS$2010/PJ,2035 -A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.60000000000,windturbine,4,MUS$2010/PJ,2035 -A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2030,all-year,R1,power,1.20000000000,windturbine,4,MUS$2010/PJ,2035 -A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.40000000000,windturbine,5,MUS$2010/PJ,2035 -A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.40000000000,windturbine,5,MUS$2010/PJ,2035 -A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2030,all-year,R1,power,0.80000000000,windturbine,5,MUS$2010/PJ,2035 -A1,3,newcapa,PRODUCT|ENERGY,heat,all-week,R1,night,2030,all-year,R1,residential,1.44444444444,heatpump,0,MUS$2010/PJ,2040 -A1,4,newcapa,PRODUCT|ENERGY,heat,all-week,R1,night,2035,all-year,R1,residential,0.88888888889,heatpump,0,MUS$2010/PJ,2040 -A1,3,newcapa,PRODUCT|ENERGY,heat,all-week,R1,morning,2030,all-year,R1,residential,2.16666666667,heatpump,1,MUS$2010/PJ,2040 -A1,4,newcapa,PRODUCT|ENERGY,heat,all-week,R1,morning,2035,all-year,R1,residential,1.33333333333,heatpump,1,MUS$2010/PJ,2040 -A1,3,newcapa,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2030,all-year,R1,residential,1.44444444444,heatpump,2,MUS$2010/PJ,2040 -A1,4,newcapa,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2035,all-year,R1,residential,0.88888888889,heatpump,2,MUS$2010/PJ,2040 -A1,3,newcapa,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2030,all-year,R1,residential,2.16666666667,heatpump,3,MUS$2010/PJ,2040 -A1,4,newcapa,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2035,all-year,R1,residential,1.33333333333,heatpump,3,MUS$2010/PJ,2040 -A1,3,newcapa,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2030,all-year,R1,residential,4.33333333333,heatpump,4,MUS$2010/PJ,2040 -A1,4,newcapa,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2035,all-year,R1,residential,2.66666666667,heatpump,4,MUS$2010/PJ,2040 -A1,3,newcapa,PRODUCT|ENERGY,heat,all-week,R1,evening,2030,all-year,R1,residential,2.88888888889,heatpump,5,MUS$2010/PJ,2040 -A1,4,newcapa,PRODUCT|ENERGY,heat,all-week,R1,evening,2035,all-year,R1,residential,1.77777777778,heatpump,5,MUS$2010/PJ,2040 -A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.15555555556,windturbine,0,MUS$2010/PJ,2040 -A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.15555555556,windturbine,0,MUS$2010/PJ,2040 -A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2030,all-year,R1,power,0.31111111111,windturbine,0,MUS$2010/PJ,2040 -A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2035,all-year,R1,power,0.31111111111,windturbine,0,MUS$2010/PJ,2040 -A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.23333333333,windturbine,1,MUS$2010/PJ,2040 -A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.23333333333,windturbine,1,MUS$2010/PJ,2040 -A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2030,all-year,R1,power,0.46666666667,windturbine,1,MUS$2010/PJ,2040 -A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2035,all-year,R1,power,0.46666666667,windturbine,1,MUS$2010/PJ,2040 -A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.15555555556,windturbine,2,MUS$2010/PJ,2040 -A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.15555555556,windturbine,2,MUS$2010/PJ,2040 -A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2030,all-year,R1,power,0.31111111111,windturbine,2,MUS$2010/PJ,2040 -A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2035,all-year,R1,power,0.31111111111,windturbine,2,MUS$2010/PJ,2040 -A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.23333333333,windturbine,3,MUS$2010/PJ,2040 -A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.23333333333,windturbine,3,MUS$2010/PJ,2040 -A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2030,all-year,R1,power,0.46666666667,windturbine,3,MUS$2010/PJ,2040 -A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2035,all-year,R1,power,0.46666666667,windturbine,3,MUS$2010/PJ,2040 -A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.46666666667,windturbine,4,MUS$2010/PJ,2040 -A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.46666666667,windturbine,4,MUS$2010/PJ,2040 -A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2030,all-year,R1,power,0.93333333333,windturbine,4,MUS$2010/PJ,2040 -A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2035,all-year,R1,power,0.93333333333,windturbine,4,MUS$2010/PJ,2040 -A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.31111111111,windturbine,5,MUS$2010/PJ,2040 -A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.31111111111,windturbine,5,MUS$2010/PJ,2040 -A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2030,all-year,R1,power,0.62222222222,windturbine,5,MUS$2010/PJ,2040 -A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2035,all-year,R1,power,0.62222222222,windturbine,5,MUS$2010/PJ,2040 -A1,4,newcapa,PRODUCT|ENERGY,heat,all-week,R1,night,2035,all-year,R1,residential,0.88888888889,heatpump,0,MUS$2010/PJ,2045 -A1,5,newcapa,PRODUCT|ENERGY,heat,all-week,R1,night,2040,all-year,R1,residential,1.77777777778,heatpump,0,MUS$2010/PJ,2045 -A1,4,newcapa,PRODUCT|ENERGY,heat,all-week,R1,morning,2035,all-year,R1,residential,1.33333333333,heatpump,1,MUS$2010/PJ,2045 -A1,5,newcapa,PRODUCT|ENERGY,heat,all-week,R1,morning,2040,all-year,R1,residential,2.66666666667,heatpump,1,MUS$2010/PJ,2045 -A1,4,newcapa,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2035,all-year,R1,residential,0.88888888889,heatpump,2,MUS$2010/PJ,2045 -A1,5,newcapa,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2040,all-year,R1,residential,1.77777777778,heatpump,2,MUS$2010/PJ,2045 -A1,4,newcapa,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2035,all-year,R1,residential,1.33333333333,heatpump,3,MUS$2010/PJ,2045 -A1,5,newcapa,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2040,all-year,R1,residential,2.66666666667,heatpump,3,MUS$2010/PJ,2045 -A1,4,newcapa,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2035,all-year,R1,residential,2.66666666667,heatpump,4,MUS$2010/PJ,2045 -A1,5,newcapa,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2040,all-year,R1,residential,5.33333333333,heatpump,4,MUS$2010/PJ,2045 -A1,4,newcapa,PRODUCT|ENERGY,heat,all-week,R1,evening,2035,all-year,R1,residential,1.77777777778,heatpump,5,MUS$2010/PJ,2045 -A1,5,newcapa,PRODUCT|ENERGY,heat,all-week,R1,evening,2040,all-year,R1,residential,3.55555555556,heatpump,5,MUS$2010/PJ,2045 -A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.13333333333,windturbine,0,MUS$2010/PJ,2045 -A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.13333333333,windturbine,0,MUS$2010/PJ,2045 -A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2030,all-year,R1,power,0.26666666667,windturbine,0,MUS$2010/PJ,2045 -A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2035,all-year,R1,power,0.26666666667,windturbine,0,MUS$2010/PJ,2045 -A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2040,all-year,R1,power,0.26666666667,windturbine,0,MUS$2010/PJ,2045 -A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.20000000000,windturbine,1,MUS$2010/PJ,2045 -A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.20000000000,windturbine,1,MUS$2010/PJ,2045 -A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2030,all-year,R1,power,0.40000000000,windturbine,1,MUS$2010/PJ,2045 -A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2035,all-year,R1,power,0.40000000000,windturbine,1,MUS$2010/PJ,2045 -A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2040,all-year,R1,power,0.40000000000,windturbine,1,MUS$2010/PJ,2045 -A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.13333333333,windturbine,2,MUS$2010/PJ,2045 -A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.13333333333,windturbine,2,MUS$2010/PJ,2045 -A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2030,all-year,R1,power,0.26666666667,windturbine,2,MUS$2010/PJ,2045 -A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2035,all-year,R1,power,0.26666666667,windturbine,2,MUS$2010/PJ,2045 -A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2040,all-year,R1,power,0.26666666667,windturbine,2,MUS$2010/PJ,2045 -A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.20000000000,windturbine,3,MUS$2010/PJ,2045 -A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.20000000000,windturbine,3,MUS$2010/PJ,2045 -A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2030,all-year,R1,power,0.40000000000,windturbine,3,MUS$2010/PJ,2045 -A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2035,all-year,R1,power,0.40000000000,windturbine,3,MUS$2010/PJ,2045 -A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2040,all-year,R1,power,0.40000000000,windturbine,3,MUS$2010/PJ,2045 -A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.40000000000,windturbine,4,MUS$2010/PJ,2045 -A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.40000000000,windturbine,4,MUS$2010/PJ,2045 -A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2030,all-year,R1,power,0.80000000000,windturbine,4,MUS$2010/PJ,2045 -A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2035,all-year,R1,power,0.80000000000,windturbine,4,MUS$2010/PJ,2045 -A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2040,all-year,R1,power,0.80000000000,windturbine,4,MUS$2010/PJ,2045 -A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.26666666667,windturbine,5,MUS$2010/PJ,2045 -A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.26666666667,windturbine,5,MUS$2010/PJ,2045 -A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2030,all-year,R1,power,0.53333333333,windturbine,5,MUS$2010/PJ,2045 -A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2035,all-year,R1,power,0.53333333333,windturbine,5,MUS$2010/PJ,2045 -A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2040,all-year,R1,power,0.53333333333,windturbine,5,MUS$2010/PJ,2045 -A1,5,newcapa,PRODUCT|ENERGY,heat,all-week,R1,night,2040,all-year,R1,residential,1.77777777778,heatpump,0,MUS$2010/PJ,2050 -A1,6,newcapa,PRODUCT|ENERGY,heat,all-week,R1,night,2045,all-year,R1,residential,1.22222222222,heatpump,0,MUS$2010/PJ,2050 -A1,5,newcapa,PRODUCT|ENERGY,heat,all-week,R1,morning,2040,all-year,R1,residential,2.66666666667,heatpump,1,MUS$2010/PJ,2050 -A1,6,newcapa,PRODUCT|ENERGY,heat,all-week,R1,morning,2045,all-year,R1,residential,1.83333333333,heatpump,1,MUS$2010/PJ,2050 -A1,5,newcapa,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2040,all-year,R1,residential,1.77777777778,heatpump,2,MUS$2010/PJ,2050 -A1,6,newcapa,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2045,all-year,R1,residential,1.22222222222,heatpump,2,MUS$2010/PJ,2050 -A1,5,newcapa,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2040,all-year,R1,residential,2.66666666667,heatpump,3,MUS$2010/PJ,2050 -A1,6,newcapa,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2045,all-year,R1,residential,1.83333333333,heatpump,3,MUS$2010/PJ,2050 -A1,5,newcapa,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2040,all-year,R1,residential,5.33333333333,heatpump,4,MUS$2010/PJ,2050 -A1,6,newcapa,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2045,all-year,R1,residential,3.66666666667,heatpump,4,MUS$2010/PJ,2050 -A1,5,newcapa,PRODUCT|ENERGY,heat,all-week,R1,evening,2040,all-year,R1,residential,3.55555555556,heatpump,5,MUS$2010/PJ,2050 -A1,6,newcapa,PRODUCT|ENERGY,heat,all-week,R1,evening,2045,all-year,R1,residential,2.44444444444,heatpump,5,MUS$2010/PJ,2050 -A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.13333333333,windturbine,0,MUS$2010/PJ,2050 -A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2030,all-year,R1,power,0.26666666667,windturbine,0,MUS$2010/PJ,2050 -A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2035,all-year,R1,power,0.26666666667,windturbine,0,MUS$2010/PJ,2050 -A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2040,all-year,R1,power,0.26666666667,windturbine,0,MUS$2010/PJ,2050 -A1,6,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2045,all-year,R1,power,0.26666666667,windturbine,0,MUS$2010/PJ,2050 -A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.20000000000,windturbine,1,MUS$2010/PJ,2050 -A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2030,all-year,R1,power,0.40000000000,windturbine,1,MUS$2010/PJ,2050 -A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2035,all-year,R1,power,0.40000000000,windturbine,1,MUS$2010/PJ,2050 -A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2040,all-year,R1,power,0.40000000000,windturbine,1,MUS$2010/PJ,2050 -A1,6,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2045,all-year,R1,power,0.40000000000,windturbine,1,MUS$2010/PJ,2050 -A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.13333333333,windturbine,2,MUS$2010/PJ,2050 -A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2030,all-year,R1,power,0.26666666667,windturbine,2,MUS$2010/PJ,2050 -A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2035,all-year,R1,power,0.26666666667,windturbine,2,MUS$2010/PJ,2050 -A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2040,all-year,R1,power,0.26666666667,windturbine,2,MUS$2010/PJ,2050 -A1,6,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2045,all-year,R1,power,0.26666666667,windturbine,2,MUS$2010/PJ,2050 -A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.20000000000,windturbine,3,MUS$2010/PJ,2050 -A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2030,all-year,R1,power,0.40000000000,windturbine,3,MUS$2010/PJ,2050 -A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2035,all-year,R1,power,0.40000000000,windturbine,3,MUS$2010/PJ,2050 -A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2040,all-year,R1,power,0.40000000000,windturbine,3,MUS$2010/PJ,2050 -A1,6,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2045,all-year,R1,power,0.40000000000,windturbine,3,MUS$2010/PJ,2050 -A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.40000000000,windturbine,4,MUS$2010/PJ,2050 -A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2030,all-year,R1,power,0.80000000000,windturbine,4,MUS$2010/PJ,2050 -A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2035,all-year,R1,power,0.80000000000,windturbine,4,MUS$2010/PJ,2050 -A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2040,all-year,R1,power,0.80000000000,windturbine,4,MUS$2010/PJ,2050 -A1,6,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2045,all-year,R1,power,0.80000000000,windturbine,4,MUS$2010/PJ,2050 -A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.26666666667,windturbine,5,MUS$2010/PJ,2050 -A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2030,all-year,R1,power,0.53333333333,windturbine,5,MUS$2010/PJ,2050 -A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2035,all-year,R1,power,0.53333333333,windturbine,5,MUS$2010/PJ,2050 -A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2040,all-year,R1,power,0.53333333333,windturbine,5,MUS$2010/PJ,2050 -A1,6,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2045,all-year,R1,power,0.53333333333,windturbine,5,MUS$2010/PJ,2050 diff --git a/tests/example_outputs/default_timeslice/Power/Capacity.csv b/tests/example_outputs/default_timeslice/Power/Capacity.csv deleted file mode 100644 index 48c981a8d..000000000 --- a/tests/example_outputs/default_timeslice/Power/Capacity.csv +++ /dev/null @@ -1,23 +0,0 @@ -asset,capacity,installed,region,technology,year -0,1,2020,R1,gasCCGT,2020 -0,1,2020,R1,gasCCGT,2025 -1,1,2020,R1,windturbine,2025 -1,1,2020,R1,windturbine,2030 -2,1,2025,R1,windturbine,2030 -1,1,2020,R1,windturbine,2035 -2,1,2025,R1,windturbine,2035 -3,2,2030,R1,windturbine,2035 -1,1,2020,R1,windturbine,2040 -2,1,2025,R1,windturbine,2040 -3,2,2030,R1,windturbine,2040 -4,2,2035,R1,windturbine,2040 -1,1,2020,R1,windturbine,2045 -2,1,2025,R1,windturbine,2045 -3,2,2030,R1,windturbine,2045 -4,2,2035,R1,windturbine,2045 -5,2,2040,R1,windturbine,2045 -2,1,2025,R1,windturbine,2050 -3,2,2030,R1,windturbine,2050 -4,2,2035,R1,windturbine,2050 -5,2,2040,R1,windturbine,2050 -6,2,2045,R1,windturbine,2050 diff --git a/tests/example_outputs/default_timeslice/Power/Supply.csv b/tests/example_outputs/default_timeslice/Power/Supply.csv deleted file mode 100644 index cc5f768bc..000000000 --- a/tests/example_outputs/default_timeslice/Power/Supply.csv +++ /dev/null @@ -1,123 +0,0 @@ -asset,commodity,day,hour,installed,month,region,supply,technology,timeslice,year -1,electricity,all-week,night,2020,all-year,R1,0.42220000000,windturbine,0,2025 -1,electricity,all-week,morning,2020,all-year,R1,0.63330000000,windturbine,1,2025 -1,electricity,all-week,afternoon,2020,all-year,R1,0.42220000000,windturbine,2,2025 -1,electricity,all-week,early-peak,2020,all-year,R1,0.63330000000,windturbine,3,2025 -0,electricity,all-week,late-peak,2020,all-year,R1,0.26670000000,gasCCGT,4,2025 -0,CO2f,all-week,late-peak,2020,all-year,R1,24.44530000000,gasCCGT,4,2025 -1,electricity,all-week,late-peak,2020,all-year,R1,1.00000000000,windturbine,4,2025 -1,electricity,all-week,evening,2020,all-year,R1,0.84440000000,windturbine,5,2025 -1,electricity,all-week,night,2020,all-year,R1,0.33330000000,windturbine,0,2030 -2,electricity,all-week,night,2025,all-year,R1,0.33330000000,windturbine,0,2030 -1,electricity,all-week,morning,2020,all-year,R1,0.50000000000,windturbine,1,2030 -2,electricity,all-week,morning,2025,all-year,R1,0.50000000000,windturbine,1,2030 -1,electricity,all-week,afternoon,2020,all-year,R1,0.33330000000,windturbine,2,2030 -2,electricity,all-week,afternoon,2025,all-year,R1,0.33330000000,windturbine,2,2030 -1,electricity,all-week,early-peak,2020,all-year,R1,0.50000000000,windturbine,3,2030 -2,electricity,all-week,early-peak,2025,all-year,R1,0.50000000000,windturbine,3,2030 -1,electricity,all-week,late-peak,2020,all-year,R1,1.00000000000,windturbine,4,2030 -2,electricity,all-week,late-peak,2025,all-year,R1,1.00000000000,windturbine,4,2030 -1,electricity,all-week,evening,2020,all-year,R1,0.66670000000,windturbine,5,2030 -2,electricity,all-week,evening,2025,all-year,R1,0.66670000000,windturbine,5,2030 -1,electricity,all-week,night,2020,all-year,R1,0.20000000000,windturbine,0,2035 -2,electricity,all-week,night,2025,all-year,R1,0.20000000000,windturbine,0,2035 -3,electricity,all-week,night,2030,all-year,R1,0.40000000000,windturbine,0,2035 -1,electricity,all-week,morning,2020,all-year,R1,0.30000000000,windturbine,1,2035 -2,electricity,all-week,morning,2025,all-year,R1,0.30000000000,windturbine,1,2035 -3,electricity,all-week,morning,2030,all-year,R1,0.60000000000,windturbine,1,2035 -1,electricity,all-week,afternoon,2020,all-year,R1,0.20000000000,windturbine,2,2035 -2,electricity,all-week,afternoon,2025,all-year,R1,0.20000000000,windturbine,2,2035 -3,electricity,all-week,afternoon,2030,all-year,R1,0.40000000000,windturbine,2,2035 -1,electricity,all-week,early-peak,2020,all-year,R1,0.30000000000,windturbine,3,2035 -2,electricity,all-week,early-peak,2025,all-year,R1,0.30000000000,windturbine,3,2035 -3,electricity,all-week,early-peak,2030,all-year,R1,0.60000000000,windturbine,3,2035 -1,electricity,all-week,late-peak,2020,all-year,R1,0.60000000000,windturbine,4,2035 -2,electricity,all-week,late-peak,2025,all-year,R1,0.60000000000,windturbine,4,2035 -3,electricity,all-week,late-peak,2030,all-year,R1,1.20000000000,windturbine,4,2035 -1,electricity,all-week,evening,2020,all-year,R1,0.40000000000,windturbine,5,2035 -2,electricity,all-week,evening,2025,all-year,R1,0.40000000000,windturbine,5,2035 -3,electricity,all-week,evening,2030,all-year,R1,0.80000000000,windturbine,5,2035 -1,electricity,all-week,night,2020,all-year,R1,0.15560000000,windturbine,0,2040 -2,electricity,all-week,night,2025,all-year,R1,0.15560000000,windturbine,0,2040 -3,electricity,all-week,night,2030,all-year,R1,0.31110000000,windturbine,0,2040 -4,electricity,all-week,night,2035,all-year,R1,0.31110000000,windturbine,0,2040 -1,electricity,all-week,morning,2020,all-year,R1,0.23330000000,windturbine,1,2040 -2,electricity,all-week,morning,2025,all-year,R1,0.23330000000,windturbine,1,2040 -3,electricity,all-week,morning,2030,all-year,R1,0.46670000000,windturbine,1,2040 -4,electricity,all-week,morning,2035,all-year,R1,0.46670000000,windturbine,1,2040 -1,electricity,all-week,afternoon,2020,all-year,R1,0.15560000000,windturbine,2,2040 -2,electricity,all-week,afternoon,2025,all-year,R1,0.15560000000,windturbine,2,2040 -3,electricity,all-week,afternoon,2030,all-year,R1,0.31110000000,windturbine,2,2040 -4,electricity,all-week,afternoon,2035,all-year,R1,0.31110000000,windturbine,2,2040 -1,electricity,all-week,early-peak,2020,all-year,R1,0.23330000000,windturbine,3,2040 -2,electricity,all-week,early-peak,2025,all-year,R1,0.23330000000,windturbine,3,2040 -3,electricity,all-week,early-peak,2030,all-year,R1,0.46670000000,windturbine,3,2040 -4,electricity,all-week,early-peak,2035,all-year,R1,0.46670000000,windturbine,3,2040 -1,electricity,all-week,late-peak,2020,all-year,R1,0.46670000000,windturbine,4,2040 -2,electricity,all-week,late-peak,2025,all-year,R1,0.46670000000,windturbine,4,2040 -3,electricity,all-week,late-peak,2030,all-year,R1,0.93330000000,windturbine,4,2040 -4,electricity,all-week,late-peak,2035,all-year,R1,0.93330000000,windturbine,4,2040 -1,electricity,all-week,evening,2020,all-year,R1,0.31110000000,windturbine,5,2040 -2,electricity,all-week,evening,2025,all-year,R1,0.31110000000,windturbine,5,2040 -3,electricity,all-week,evening,2030,all-year,R1,0.62220000000,windturbine,5,2040 -4,electricity,all-week,evening,2035,all-year,R1,0.62220000000,windturbine,5,2040 -1,electricity,all-week,night,2020,all-year,R1,0.13330000000,windturbine,0,2045 -2,electricity,all-week,night,2025,all-year,R1,0.13330000000,windturbine,0,2045 -3,electricity,all-week,night,2030,all-year,R1,0.26670000000,windturbine,0,2045 -4,electricity,all-week,night,2035,all-year,R1,0.26670000000,windturbine,0,2045 -5,electricity,all-week,night,2040,all-year,R1,0.26670000000,windturbine,0,2045 -1,electricity,all-week,morning,2020,all-year,R1,0.20000000000,windturbine,1,2045 -2,electricity,all-week,morning,2025,all-year,R1,0.20000000000,windturbine,1,2045 -3,electricity,all-week,morning,2030,all-year,R1,0.40000000000,windturbine,1,2045 -4,electricity,all-week,morning,2035,all-year,R1,0.40000000000,windturbine,1,2045 -5,electricity,all-week,morning,2040,all-year,R1,0.40000000000,windturbine,1,2045 -1,electricity,all-week,afternoon,2020,all-year,R1,0.13330000000,windturbine,2,2045 -2,electricity,all-week,afternoon,2025,all-year,R1,0.13330000000,windturbine,2,2045 -3,electricity,all-week,afternoon,2030,all-year,R1,0.26670000000,windturbine,2,2045 -4,electricity,all-week,afternoon,2035,all-year,R1,0.26670000000,windturbine,2,2045 -5,electricity,all-week,afternoon,2040,all-year,R1,0.26670000000,windturbine,2,2045 -1,electricity,all-week,early-peak,2020,all-year,R1,0.20000000000,windturbine,3,2045 -2,electricity,all-week,early-peak,2025,all-year,R1,0.20000000000,windturbine,3,2045 -3,electricity,all-week,early-peak,2030,all-year,R1,0.40000000000,windturbine,3,2045 -4,electricity,all-week,early-peak,2035,all-year,R1,0.40000000000,windturbine,3,2045 -5,electricity,all-week,early-peak,2040,all-year,R1,0.40000000000,windturbine,3,2045 -1,electricity,all-week,late-peak,2020,all-year,R1,0.40000000000,windturbine,4,2045 -2,electricity,all-week,late-peak,2025,all-year,R1,0.40000000000,windturbine,4,2045 -3,electricity,all-week,late-peak,2030,all-year,R1,0.80000000000,windturbine,4,2045 -4,electricity,all-week,late-peak,2035,all-year,R1,0.80000000000,windturbine,4,2045 -5,electricity,all-week,late-peak,2040,all-year,R1,0.80000000000,windturbine,4,2045 -1,electricity,all-week,evening,2020,all-year,R1,0.26670000000,windturbine,5,2045 -2,electricity,all-week,evening,2025,all-year,R1,0.26670000000,windturbine,5,2045 -3,electricity,all-week,evening,2030,all-year,R1,0.53330000000,windturbine,5,2045 -4,electricity,all-week,evening,2035,all-year,R1,0.53330000000,windturbine,5,2045 -5,electricity,all-week,evening,2040,all-year,R1,0.53330000000,windturbine,5,2045 -2,electricity,all-week,night,2025,all-year,R1,0.13330000000,windturbine,0,2050 -3,electricity,all-week,night,2030,all-year,R1,0.26670000000,windturbine,0,2050 -4,electricity,all-week,night,2035,all-year,R1,0.26670000000,windturbine,0,2050 -5,electricity,all-week,night,2040,all-year,R1,0.26670000000,windturbine,0,2050 -6,electricity,all-week,night,2045,all-year,R1,0.26670000000,windturbine,0,2050 -2,electricity,all-week,morning,2025,all-year,R1,0.20000000000,windturbine,1,2050 -3,electricity,all-week,morning,2030,all-year,R1,0.40000000000,windturbine,1,2050 -4,electricity,all-week,morning,2035,all-year,R1,0.40000000000,windturbine,1,2050 -5,electricity,all-week,morning,2040,all-year,R1,0.40000000000,windturbine,1,2050 -6,electricity,all-week,morning,2045,all-year,R1,0.40000000000,windturbine,1,2050 -2,electricity,all-week,afternoon,2025,all-year,R1,0.13330000000,windturbine,2,2050 -3,electricity,all-week,afternoon,2030,all-year,R1,0.26670000000,windturbine,2,2050 -4,electricity,all-week,afternoon,2035,all-year,R1,0.26670000000,windturbine,2,2050 -5,electricity,all-week,afternoon,2040,all-year,R1,0.26670000000,windturbine,2,2050 -6,electricity,all-week,afternoon,2045,all-year,R1,0.26670000000,windturbine,2,2050 -2,electricity,all-week,early-peak,2025,all-year,R1,0.20000000000,windturbine,3,2050 -3,electricity,all-week,early-peak,2030,all-year,R1,0.40000000000,windturbine,3,2050 -4,electricity,all-week,early-peak,2035,all-year,R1,0.40000000000,windturbine,3,2050 -5,electricity,all-week,early-peak,2040,all-year,R1,0.40000000000,windturbine,3,2050 -6,electricity,all-week,early-peak,2045,all-year,R1,0.40000000000,windturbine,3,2050 -2,electricity,all-week,late-peak,2025,all-year,R1,0.40000000000,windturbine,4,2050 -3,electricity,all-week,late-peak,2030,all-year,R1,0.80000000000,windturbine,4,2050 -4,electricity,all-week,late-peak,2035,all-year,R1,0.80000000000,windturbine,4,2050 -5,electricity,all-week,late-peak,2040,all-year,R1,0.80000000000,windturbine,4,2050 -6,electricity,all-week,late-peak,2045,all-year,R1,0.80000000000,windturbine,4,2050 -2,electricity,all-week,evening,2025,all-year,R1,0.26670000000,windturbine,5,2050 -3,electricity,all-week,evening,2030,all-year,R1,0.53330000000,windturbine,5,2050 -4,electricity,all-week,evening,2035,all-year,R1,0.53330000000,windturbine,5,2050 -5,electricity,all-week,evening,2040,all-year,R1,0.53330000000,windturbine,5,2050 -6,electricity,all-week,evening,2045,all-year,R1,0.53330000000,windturbine,5,2050 diff --git a/tests/example_outputs/default_timeslice/Residential/Capacity.csv b/tests/example_outputs/default_timeslice/Residential/Capacity.csv deleted file mode 100644 index d5cf558f0..000000000 --- a/tests/example_outputs/default_timeslice/Residential/Capacity.csv +++ /dev/null @@ -1,14 +0,0 @@ -asset,capacity,installed,region,technology,year -0,10,2020,R1,gasboiler,2020 -0,5,2020,R1,gasboiler,2025 -1,19,2020,R1,heatpump,2025 -1,19,2020,R1,heatpump,2030 -2,10,2025,R1,heatpump,2030 -2,10,2025,R1,heatpump,2035 -3,26,2030,R1,heatpump,2035 -3,26,2030,R1,heatpump,2040 -4,16,2035,R1,heatpump,2040 -4,16,2035,R1,heatpump,2045 -5,32,2040,R1,heatpump,2045 -5,32,2040,R1,heatpump,2050 -6,22,2045,R1,heatpump,2050 diff --git a/tests/example_outputs/default_timeslice/Residential/Supply.csv b/tests/example_outputs/default_timeslice/Residential/Supply.csv deleted file mode 100644 index 520869501..000000000 --- a/tests/example_outputs/default_timeslice/Residential/Supply.csv +++ /dev/null @@ -1,91 +0,0 @@ -asset,commodity,day,hour,installed,month,region,supply,technology,timeslice,year -0,heat,all-week,night,2020,all-year,R1,1.00000000000,gasboiler,0,2020 -0,CO2f,all-week,night,2020,all-year,R1,64.71000000000,gasboiler,0,2020 -0,heat,all-week,morning,2020,all-year,R1,1.50000000000,gasboiler,1,2020 -0,CO2f,all-week,morning,2020,all-year,R1,97.06500000000,gasboiler,1,2020 -0,heat,all-week,afternoon,2020,all-year,R1,1.00000000000,gasboiler,2,2020 -0,CO2f,all-week,afternoon,2020,all-year,R1,64.71000000000,gasboiler,2,2020 -0,heat,all-week,early-peak,2020,all-year,R1,1.50000000000,gasboiler,3,2020 -0,CO2f,all-week,early-peak,2020,all-year,R1,97.06500000000,gasboiler,3,2020 -0,heat,all-week,late-peak,2020,all-year,R1,3.00000000000,gasboiler,4,2020 -0,CO2f,all-week,late-peak,2020,all-year,R1,194.13000000000,gasboiler,4,2020 -0,heat,all-week,evening,2020,all-year,R1,2.00000000000,gasboiler,5,2020 -0,CO2f,all-week,evening,2020,all-year,R1,129.42000000000,gasboiler,5,2020 -0,heat,all-week,night,2020,all-year,R1,0.27780000000,gasboiler,0,2025 -1,heat,all-week,night,2020,all-year,R1,1.05560000000,heatpump,0,2025 -0,CO2f,all-week,night,2020,all-year,R1,17.97500000000,gasboiler,0,2025 -0,heat,all-week,morning,2020,all-year,R1,0.41670000000,gasboiler,1,2025 -1,heat,all-week,morning,2020,all-year,R1,1.58330000000,heatpump,1,2025 -0,CO2f,all-week,morning,2020,all-year,R1,26.96250000000,gasboiler,1,2025 -0,heat,all-week,afternoon,2020,all-year,R1,0.27780000000,gasboiler,2,2025 -1,heat,all-week,afternoon,2020,all-year,R1,1.05560000000,heatpump,2,2025 -0,CO2f,all-week,afternoon,2020,all-year,R1,17.97500000000,gasboiler,2,2025 -0,heat,all-week,early-peak,2020,all-year,R1,0.41670000000,gasboiler,3,2025 -1,heat,all-week,early-peak,2020,all-year,R1,1.58330000000,heatpump,3,2025 -0,CO2f,all-week,early-peak,2020,all-year,R1,26.96250000000,gasboiler,3,2025 -0,heat,all-week,late-peak,2020,all-year,R1,0.83330000000,gasboiler,4,2025 -1,heat,all-week,late-peak,2020,all-year,R1,3.16670000000,heatpump,4,2025 -0,CO2f,all-week,late-peak,2020,all-year,R1,53.92500000000,gasboiler,4,2025 -0,heat,all-week,evening,2020,all-year,R1,0.55560000000,gasboiler,5,2025 -1,heat,all-week,evening,2020,all-year,R1,2.11110000000,heatpump,5,2025 -0,CO2f,all-week,evening,2020,all-year,R1,35.95000000000,gasboiler,5,2025 -1,heat,all-week,night,2020,all-year,R1,1.09200000000,heatpump,0,2030 -2,heat,all-week,night,2025,all-year,R1,0.57470000000,heatpump,0,2030 -1,heat,all-week,morning,2020,all-year,R1,1.63790000000,heatpump,1,2030 -2,heat,all-week,morning,2025,all-year,R1,0.86210000000,heatpump,1,2030 -1,heat,all-week,afternoon,2020,all-year,R1,1.09200000000,heatpump,2,2030 -2,heat,all-week,afternoon,2025,all-year,R1,0.57470000000,heatpump,2,2030 -1,heat,all-week,early-peak,2020,all-year,R1,1.63790000000,heatpump,3,2030 -2,heat,all-week,early-peak,2025,all-year,R1,0.86210000000,heatpump,3,2030 -1,heat,all-week,late-peak,2020,all-year,R1,3.27590000000,heatpump,4,2030 -2,heat,all-week,late-peak,2025,all-year,R1,1.72410000000,heatpump,4,2030 -1,heat,all-week,evening,2020,all-year,R1,2.18390000000,heatpump,5,2030 -2,heat,all-week,evening,2025,all-year,R1,1.14940000000,heatpump,5,2030 -2,heat,all-week,night,2025,all-year,R1,0.55560000000,heatpump,0,2035 -3,heat,all-week,night,2030,all-year,R1,1.44440000000,heatpump,0,2035 -2,heat,all-week,morning,2025,all-year,R1,0.83330000000,heatpump,1,2035 -3,heat,all-week,morning,2030,all-year,R1,2.16670000000,heatpump,1,2035 -2,heat,all-week,afternoon,2025,all-year,R1,0.55560000000,heatpump,2,2035 -3,heat,all-week,afternoon,2030,all-year,R1,1.44440000000,heatpump,2,2035 -2,heat,all-week,early-peak,2025,all-year,R1,0.83330000000,heatpump,3,2035 -3,heat,all-week,early-peak,2030,all-year,R1,2.16670000000,heatpump,3,2035 -2,heat,all-week,late-peak,2025,all-year,R1,1.66670000000,heatpump,4,2035 -3,heat,all-week,late-peak,2030,all-year,R1,4.33330000000,heatpump,4,2035 -2,heat,all-week,evening,2025,all-year,R1,1.11110000000,heatpump,5,2035 -3,heat,all-week,evening,2030,all-year,R1,2.88890000000,heatpump,5,2035 -3,heat,all-week,night,2030,all-year,R1,1.44440000000,heatpump,0,2040 -4,heat,all-week,night,2035,all-year,R1,0.88890000000,heatpump,0,2040 -3,heat,all-week,morning,2030,all-year,R1,2.16670000000,heatpump,1,2040 -4,heat,all-week,morning,2035,all-year,R1,1.33330000000,heatpump,1,2040 -3,heat,all-week,afternoon,2030,all-year,R1,1.44440000000,heatpump,2,2040 -4,heat,all-week,afternoon,2035,all-year,R1,0.88890000000,heatpump,2,2040 -3,heat,all-week,early-peak,2030,all-year,R1,2.16670000000,heatpump,3,2040 -4,heat,all-week,early-peak,2035,all-year,R1,1.33330000000,heatpump,3,2040 -3,heat,all-week,late-peak,2030,all-year,R1,4.33330000000,heatpump,4,2040 -4,heat,all-week,late-peak,2035,all-year,R1,2.66670000000,heatpump,4,2040 -3,heat,all-week,evening,2030,all-year,R1,2.88890000000,heatpump,5,2040 -4,heat,all-week,evening,2035,all-year,R1,1.77780000000,heatpump,5,2040 -4,heat,all-week,night,2035,all-year,R1,0.88890000000,heatpump,0,2045 -5,heat,all-week,night,2040,all-year,R1,1.77780000000,heatpump,0,2045 -4,heat,all-week,morning,2035,all-year,R1,1.33330000000,heatpump,1,2045 -5,heat,all-week,morning,2040,all-year,R1,2.66670000000,heatpump,1,2045 -4,heat,all-week,afternoon,2035,all-year,R1,0.88890000000,heatpump,2,2045 -5,heat,all-week,afternoon,2040,all-year,R1,1.77780000000,heatpump,2,2045 -4,heat,all-week,early-peak,2035,all-year,R1,1.33330000000,heatpump,3,2045 -5,heat,all-week,early-peak,2040,all-year,R1,2.66670000000,heatpump,3,2045 -4,heat,all-week,late-peak,2035,all-year,R1,2.66670000000,heatpump,4,2045 -5,heat,all-week,late-peak,2040,all-year,R1,5.33330000000,heatpump,4,2045 -4,heat,all-week,evening,2035,all-year,R1,1.77780000000,heatpump,5,2045 -5,heat,all-week,evening,2040,all-year,R1,3.55560000000,heatpump,5,2045 -5,heat,all-week,night,2040,all-year,R1,1.77780000000,heatpump,0,2050 -6,heat,all-week,night,2045,all-year,R1,1.22220000000,heatpump,0,2050 -5,heat,all-week,morning,2040,all-year,R1,2.66670000000,heatpump,1,2050 -6,heat,all-week,morning,2045,all-year,R1,1.83330000000,heatpump,1,2050 -5,heat,all-week,afternoon,2040,all-year,R1,1.77780000000,heatpump,2,2050 -6,heat,all-week,afternoon,2045,all-year,R1,1.22220000000,heatpump,2,2050 -5,heat,all-week,early-peak,2040,all-year,R1,2.66670000000,heatpump,3,2050 -6,heat,all-week,early-peak,2045,all-year,R1,1.83330000000,heatpump,3,2050 -5,heat,all-week,late-peak,2040,all-year,R1,5.33330000000,heatpump,4,2050 -6,heat,all-week,late-peak,2045,all-year,R1,3.66670000000,heatpump,4,2050 -5,heat,all-week,evening,2040,all-year,R1,3.55560000000,heatpump,5,2050 -6,heat,all-week,evening,2045,all-year,R1,2.44440000000,heatpump,5,2050 diff --git a/tests/example_outputs/medium/Gas/Capacity.csv b/tests/example_outputs/medium/Gas/Capacity.csv deleted file mode 100644 index 0f21ffbf8..000000000 --- a/tests/example_outputs/medium/Gas/Capacity.csv +++ /dev/null @@ -1,18 +0,0 @@ -asset,capacity,installed,region,technology,year -0,15.00000000000,2020,R1,gassupply1,2020 -0,26.63810000000,2020,R1,gassupply1,2025 -0,19.13810000000,2020,R1,gassupply1,2030 -1,12.51020000000,2025,R1,gassupply1,2030 -0,11.63810000000,2020,R1,gassupply1,2035 -1,12.51020000000,2025,R1,gassupply1,2035 -2,10.02210000000,2030,R1,gassupply1,2035 -0,11.63810000000,2020,R1,gassupply1,2040 -1,12.51020000000,2025,R1,gassupply1,2040 -2,10.02210000000,2030,R1,gassupply1,2040 -0,11.63810000000,2020,R1,gassupply1,2045 -1,12.51020000000,2025,R1,gassupply1,2045 -2,10.02210000000,2030,R1,gassupply1,2045 -0,11.63810000000,2020,R1,gassupply1,2050 -1,12.51020000000,2025,R1,gassupply1,2050 -2,10.02210000000,2030,R1,gassupply1,2050 -3,0.88640000000,2045,R1,gassupply1,2050 diff --git a/tests/example_outputs/medium/Power/Capacity.csv b/tests/example_outputs/medium/Power/Capacity.csv deleted file mode 100644 index 5755ef966..000000000 --- a/tests/example_outputs/medium/Power/Capacity.csv +++ /dev/null @@ -1,18 +0,0 @@ -asset,capacity,installed,region,technology,year -0,1,2020,R1,gasCCGT,2020 -0,1,2020,R1,gasCCGT,2025 -1,3,2025,R1,gasCCGT,2030 -1,3,2025,R1,gasCCGT,2035 -3,4,2030,R1,windturbine,2035 -1,3,2025,R1,gasCCGT,2040 -3,4,2030,R1,windturbine,2040 -4,10,2035,R1,windturbine,2040 -1,3,2025,R1,gasCCGT,2045 -3,4,2030,R1,windturbine,2045 -4,10,2035,R1,windturbine,2045 -5,3,2040,R1,windturbine,2045 -1,3,2025,R1,gasCCGT,2050 -3,4,2030,R1,windturbine,2050 -4,10,2035,R1,windturbine,2050 -5,3,2040,R1,windturbine,2050 -6,3,2045,R1,windturbine,2050 diff --git a/tests/example_outputs/medium/Residential/Capacity.csv b/tests/example_outputs/medium/Residential/Capacity.csv deleted file mode 100644 index 09cfd7d6d..000000000 --- a/tests/example_outputs/medium/Residential/Capacity.csv +++ /dev/null @@ -1,28 +0,0 @@ -asset,capacity,installed,region,technology,year -0,10,2020,R1,gasboiler,2020 -1,10,2020,R1,gasstove,2020 -0,8,2020,R1,gasboiler,2025 -2,12,2020,R1,gasstove,2025 -4,4,2020,R1,heatpump,2025 -1,7,2025,R1,gasboiler,2030 -2,4,2020,R1,gasstove,2030 -3,11,2025,R1,gasstove,2030 -5,4,2020,R1,heatpump,2030 -6,4,2025,R1,heatpump,2030 -1,7,2025,R1,gasboiler,2035 -3,11,2025,R1,gasstove,2035 -4,7,2030,R1,gasstove,2035 -7,4,2025,R1,heatpump,2035 -8,7,2030,R1,heatpump,2035 -4,7,2030,R1,gasstove,2040 -5,14,2035,R1,gasstove,2040 -9,7,2030,R1,heatpump,2040 -10,14,2035,R1,heatpump,2040 -5,14,2035,R1,gasstove,2045 -6,10,2040,R1,gasstove,2045 -11,14,2035,R1,heatpump,2045 -12,10,2040,R1,heatpump,2045 -6,10,2040,R1,gasstove,2050 -7,17,2045,R1,gasstove,2050 -13,10,2040,R1,heatpump,2050 -14,17,2045,R1,heatpump,2050 diff --git a/tests/example_outputs/medium/Residential/Supply.csv b/tests/example_outputs/medium/Residential/Supply.csv deleted file mode 100644 index 38b5ab15b..000000000 --- a/tests/example_outputs/medium/Residential/Supply.csv +++ /dev/null @@ -1,187 +0,0 @@ -asset,commodity,day,hour,installed,month,region,supply,technology,timeslice,year -0,CO2f,all-week,night,2020,all-year,R1,32.35290000000,gasboiler,0,2020 -1,cook,all-week,night,2020,all-year,R1,0.50000000000,gasstove,0,2020 -0,heat,all-week,night,2020,all-year,R1,0.50000000000,gasboiler,0,2020 -0,CO2f,all-week,morning,2020,all-year,R1,48.52940000000,gasboiler,1,2020 -1,cook,all-week,morning,2020,all-year,R1,0.75000000000,gasstove,1,2020 -0,heat,all-week,morning,2020,all-year,R1,0.75000000000,gasboiler,1,2020 -0,CO2f,all-week,afternoon,2020,all-year,R1,32.35290000000,gasboiler,2,2020 -1,cook,all-week,afternoon,2020,all-year,R1,0.50000000000,gasstove,2,2020 -0,heat,all-week,afternoon,2020,all-year,R1,0.50000000000,gasboiler,2,2020 -0,CO2f,all-week,early-peak,2020,all-year,R1,48.52940000000,gasboiler,3,2020 -1,cook,all-week,early-peak,2020,all-year,R1,0.75000000000,gasstove,3,2020 -0,heat,all-week,early-peak,2020,all-year,R1,0.75000000000,gasboiler,3,2020 -0,CO2f,all-week,late-peak,2020,all-year,R1,97.05880000000,gasboiler,4,2020 -1,cook,all-week,late-peak,2020,all-year,R1,1.50000000000,gasstove,4,2020 -0,heat,all-week,late-peak,2020,all-year,R1,1.50000000000,gasboiler,4,2020 -0,CO2f,all-week,evening,2020,all-year,R1,64.70590000000,gasboiler,5,2020 -1,cook,all-week,evening,2020,all-year,R1,1.00000000000,gasstove,5,2020 -0,heat,all-week,evening,2020,all-year,R1,1.00000000000,gasboiler,5,2020 -0,CO2f,all-week,night,2020,all-year,R1,28.75820000000,gasboiler,0,2025 -2,cook,all-week,night,2020,all-year,R1,0.66670000000,gasstove,0,2025 -0,heat,all-week,night,2020,all-year,R1,0.44440000000,gasboiler,0,2025 -4,heat,all-week,night,2020,all-year,R1,0.22220000000,heatpump,0,2025 -0,CO2f,all-week,morning,2020,all-year,R1,43.13730000000,gasboiler,1,2025 -2,cook,all-week,morning,2020,all-year,R1,1.00000000000,gasstove,1,2025 -0,heat,all-week,morning,2020,all-year,R1,0.66670000000,gasboiler,1,2025 -4,heat,all-week,morning,2020,all-year,R1,0.33330000000,heatpump,1,2025 -0,CO2f,all-week,afternoon,2020,all-year,R1,28.75820000000,gasboiler,2,2025 -2,cook,all-week,afternoon,2020,all-year,R1,0.66670000000,gasstove,2,2025 -0,heat,all-week,afternoon,2020,all-year,R1,0.44440000000,gasboiler,2,2025 -4,heat,all-week,afternoon,2020,all-year,R1,0.22220000000,heatpump,2,2025 -0,CO2f,all-week,early-peak,2020,all-year,R1,43.13730000000,gasboiler,3,2025 -2,cook,all-week,early-peak,2020,all-year,R1,1.00000000000,gasstove,3,2025 -0,heat,all-week,early-peak,2020,all-year,R1,0.66670000000,gasboiler,3,2025 -4,heat,all-week,early-peak,2020,all-year,R1,0.33330000000,heatpump,3,2025 -0,CO2f,all-week,late-peak,2020,all-year,R1,86.27450000000,gasboiler,4,2025 -2,cook,all-week,late-peak,2020,all-year,R1,2.00000000000,gasstove,4,2025 -0,heat,all-week,late-peak,2020,all-year,R1,1.33330000000,gasboiler,4,2025 -4,heat,all-week,late-peak,2020,all-year,R1,0.66670000000,heatpump,4,2025 -0,CO2f,all-week,evening,2020,all-year,R1,57.51630000000,gasboiler,5,2025 -2,cook,all-week,evening,2020,all-year,R1,1.33330000000,gasstove,5,2025 -0,heat,all-week,evening,2020,all-year,R1,0.88890000000,gasboiler,5,2025 -4,heat,all-week,evening,2020,all-year,R1,0.44440000000,heatpump,5,2025 -1,CO2f,all-week,night,2025,all-year,R1,25.16340000000,gasboiler,0,2030 -2,cook,all-week,night,2020,all-year,R1,0.22220000000,gasstove,0,2030 -3,cook,all-week,night,2025,all-year,R1,0.61110000000,gasstove,0,2030 -1,heat,all-week,night,2025,all-year,R1,0.38890000000,gasboiler,0,2030 -5,heat,all-week,night,2020,all-year,R1,0.22220000000,heatpump,0,2030 -6,heat,all-week,night,2025,all-year,R1,0.22220000000,heatpump,0,2030 -1,CO2f,all-week,morning,2025,all-year,R1,37.74510000000,gasboiler,1,2030 -2,cook,all-week,morning,2020,all-year,R1,0.33330000000,gasstove,1,2030 -3,cook,all-week,morning,2025,all-year,R1,0.91670000000,gasstove,1,2030 -1,heat,all-week,morning,2025,all-year,R1,0.58330000000,gasboiler,1,2030 -5,heat,all-week,morning,2020,all-year,R1,0.33330000000,heatpump,1,2030 -6,heat,all-week,morning,2025,all-year,R1,0.33330000000,heatpump,1,2030 -1,CO2f,all-week,afternoon,2025,all-year,R1,25.16340000000,gasboiler,2,2030 -2,cook,all-week,afternoon,2020,all-year,R1,0.22220000000,gasstove,2,2030 -3,cook,all-week,afternoon,2025,all-year,R1,0.61110000000,gasstove,2,2030 -1,heat,all-week,afternoon,2025,all-year,R1,0.38890000000,gasboiler,2,2030 -5,heat,all-week,afternoon,2020,all-year,R1,0.22220000000,heatpump,2,2030 -6,heat,all-week,afternoon,2025,all-year,R1,0.22220000000,heatpump,2,2030 -1,CO2f,all-week,early-peak,2025,all-year,R1,37.74510000000,gasboiler,3,2030 -2,cook,all-week,early-peak,2020,all-year,R1,0.33330000000,gasstove,3,2030 -3,cook,all-week,early-peak,2025,all-year,R1,0.91670000000,gasstove,3,2030 -1,heat,all-week,early-peak,2025,all-year,R1,0.58330000000,gasboiler,3,2030 -5,heat,all-week,early-peak,2020,all-year,R1,0.33330000000,heatpump,3,2030 -6,heat,all-week,early-peak,2025,all-year,R1,0.33330000000,heatpump,3,2030 -1,CO2f,all-week,late-peak,2025,all-year,R1,75.49020000000,gasboiler,4,2030 -2,cook,all-week,late-peak,2020,all-year,R1,0.66670000000,gasstove,4,2030 -3,cook,all-week,late-peak,2025,all-year,R1,1.83330000000,gasstove,4,2030 -1,heat,all-week,late-peak,2025,all-year,R1,1.16670000000,gasboiler,4,2030 -5,heat,all-week,late-peak,2020,all-year,R1,0.66670000000,heatpump,4,2030 -6,heat,all-week,late-peak,2025,all-year,R1,0.66670000000,heatpump,4,2030 -1,CO2f,all-week,evening,2025,all-year,R1,50.32680000000,gasboiler,5,2030 -2,cook,all-week,evening,2020,all-year,R1,0.44440000000,gasstove,5,2030 -3,cook,all-week,evening,2025,all-year,R1,1.22220000000,gasstove,5,2030 -1,heat,all-week,evening,2025,all-year,R1,0.77780000000,gasboiler,5,2030 -5,heat,all-week,evening,2020,all-year,R1,0.44440000000,heatpump,5,2030 -6,heat,all-week,evening,2025,all-year,R1,0.44440000000,heatpump,5,2030 -1,CO2f,all-week,night,2025,all-year,R1,25.16340000000,gasboiler,0,2035 -3,cook,all-week,night,2025,all-year,R1,0.61110000000,gasstove,0,2035 -4,cook,all-week,night,2030,all-year,R1,0.38890000000,gasstove,0,2035 -1,heat,all-week,night,2025,all-year,R1,0.38890000000,gasboiler,0,2035 -7,heat,all-week,night,2025,all-year,R1,0.22220000000,heatpump,0,2035 -8,heat,all-week,night,2030,all-year,R1,0.38890000000,heatpump,0,2035 -1,CO2f,all-week,morning,2025,all-year,R1,37.74510000000,gasboiler,1,2035 -3,cook,all-week,morning,2025,all-year,R1,0.91670000000,gasstove,1,2035 -4,cook,all-week,morning,2030,all-year,R1,0.58330000000,gasstove,1,2035 -1,heat,all-week,morning,2025,all-year,R1,0.58330000000,gasboiler,1,2035 -7,heat,all-week,morning,2025,all-year,R1,0.33330000000,heatpump,1,2035 -8,heat,all-week,morning,2030,all-year,R1,0.58330000000,heatpump,1,2035 -1,CO2f,all-week,afternoon,2025,all-year,R1,25.16340000000,gasboiler,2,2035 -3,cook,all-week,afternoon,2025,all-year,R1,0.61110000000,gasstove,2,2035 -4,cook,all-week,afternoon,2030,all-year,R1,0.38890000000,gasstove,2,2035 -1,heat,all-week,afternoon,2025,all-year,R1,0.38890000000,gasboiler,2,2035 -7,heat,all-week,afternoon,2025,all-year,R1,0.22220000000,heatpump,2,2035 -8,heat,all-week,afternoon,2030,all-year,R1,0.38890000000,heatpump,2,2035 -1,CO2f,all-week,early-peak,2025,all-year,R1,37.74510000000,gasboiler,3,2035 -3,cook,all-week,early-peak,2025,all-year,R1,0.91670000000,gasstove,3,2035 -4,cook,all-week,early-peak,2030,all-year,R1,0.58330000000,gasstove,3,2035 -1,heat,all-week,early-peak,2025,all-year,R1,0.58330000000,gasboiler,3,2035 -7,heat,all-week,early-peak,2025,all-year,R1,0.33330000000,heatpump,3,2035 -8,heat,all-week,early-peak,2030,all-year,R1,0.58330000000,heatpump,3,2035 -1,CO2f,all-week,late-peak,2025,all-year,R1,75.49020000000,gasboiler,4,2035 -3,cook,all-week,late-peak,2025,all-year,R1,1.83330000000,gasstove,4,2035 -4,cook,all-week,late-peak,2030,all-year,R1,1.16670000000,gasstove,4,2035 -1,heat,all-week,late-peak,2025,all-year,R1,1.16670000000,gasboiler,4,2035 -7,heat,all-week,late-peak,2025,all-year,R1,0.66670000000,heatpump,4,2035 -8,heat,all-week,late-peak,2030,all-year,R1,1.16670000000,heatpump,4,2035 -1,CO2f,all-week,evening,2025,all-year,R1,50.32680000000,gasboiler,5,2035 -3,cook,all-week,evening,2025,all-year,R1,1.22220000000,gasstove,5,2035 -4,cook,all-week,evening,2030,all-year,R1,0.77780000000,gasstove,5,2035 -1,heat,all-week,evening,2025,all-year,R1,0.77780000000,gasboiler,5,2035 -7,heat,all-week,evening,2025,all-year,R1,0.44440000000,heatpump,5,2035 -8,heat,all-week,evening,2030,all-year,R1,0.77780000000,heatpump,5,2035 -4,cook,all-week,night,2030,all-year,R1,0.38890000000,gasstove,0,2040 -5,cook,all-week,night,2035,all-year,R1,0.77780000000,gasstove,0,2040 -9,heat,all-week,night,2030,all-year,R1,0.38890000000,heatpump,0,2040 -10,heat,all-week,night,2035,all-year,R1,0.77780000000,heatpump,0,2040 -4,cook,all-week,morning,2030,all-year,R1,0.58330000000,gasstove,1,2040 -5,cook,all-week,morning,2035,all-year,R1,1.16670000000,gasstove,1,2040 -9,heat,all-week,morning,2030,all-year,R1,0.58330000000,heatpump,1,2040 -10,heat,all-week,morning,2035,all-year,R1,1.16670000000,heatpump,1,2040 -4,cook,all-week,afternoon,2030,all-year,R1,0.38890000000,gasstove,2,2040 -5,cook,all-week,afternoon,2035,all-year,R1,0.77780000000,gasstove,2,2040 -9,heat,all-week,afternoon,2030,all-year,R1,0.38890000000,heatpump,2,2040 -10,heat,all-week,afternoon,2035,all-year,R1,0.77780000000,heatpump,2,2040 -4,cook,all-week,early-peak,2030,all-year,R1,0.58330000000,gasstove,3,2040 -5,cook,all-week,early-peak,2035,all-year,R1,1.16670000000,gasstove,3,2040 -9,heat,all-week,early-peak,2030,all-year,R1,0.58330000000,heatpump,3,2040 -10,heat,all-week,early-peak,2035,all-year,R1,1.16670000000,heatpump,3,2040 -4,cook,all-week,late-peak,2030,all-year,R1,1.16670000000,gasstove,4,2040 -5,cook,all-week,late-peak,2035,all-year,R1,2.33330000000,gasstove,4,2040 -9,heat,all-week,late-peak,2030,all-year,R1,1.16670000000,heatpump,4,2040 -10,heat,all-week,late-peak,2035,all-year,R1,2.33330000000,heatpump,4,2040 -4,cook,all-week,evening,2030,all-year,R1,0.77780000000,gasstove,5,2040 -5,cook,all-week,evening,2035,all-year,R1,1.55560000000,gasstove,5,2040 -9,heat,all-week,evening,2030,all-year,R1,0.77780000000,heatpump,5,2040 -10,heat,all-week,evening,2035,all-year,R1,1.55560000000,heatpump,5,2040 -5,cook,all-week,night,2035,all-year,R1,0.77780000000,gasstove,0,2045 -6,cook,all-week,night,2040,all-year,R1,0.55560000000,gasstove,0,2045 -11,heat,all-week,night,2035,all-year,R1,0.77780000000,heatpump,0,2045 -12,heat,all-week,night,2040,all-year,R1,0.55560000000,heatpump,0,2045 -5,cook,all-week,morning,2035,all-year,R1,1.16670000000,gasstove,1,2045 -6,cook,all-week,morning,2040,all-year,R1,0.83330000000,gasstove,1,2045 -11,heat,all-week,morning,2035,all-year,R1,1.16670000000,heatpump,1,2045 -12,heat,all-week,morning,2040,all-year,R1,0.83330000000,heatpump,1,2045 -5,cook,all-week,afternoon,2035,all-year,R1,0.77780000000,gasstove,2,2045 -6,cook,all-week,afternoon,2040,all-year,R1,0.55560000000,gasstove,2,2045 -11,heat,all-week,afternoon,2035,all-year,R1,0.77780000000,heatpump,2,2045 -12,heat,all-week,afternoon,2040,all-year,R1,0.55560000000,heatpump,2,2045 -5,cook,all-week,early-peak,2035,all-year,R1,1.16670000000,gasstove,3,2045 -6,cook,all-week,early-peak,2040,all-year,R1,0.83330000000,gasstove,3,2045 -11,heat,all-week,early-peak,2035,all-year,R1,1.16670000000,heatpump,3,2045 -12,heat,all-week,early-peak,2040,all-year,R1,0.83330000000,heatpump,3,2045 -5,cook,all-week,late-peak,2035,all-year,R1,2.33330000000,gasstove,4,2045 -6,cook,all-week,late-peak,2040,all-year,R1,1.66670000000,gasstove,4,2045 -11,heat,all-week,late-peak,2035,all-year,R1,2.33330000000,heatpump,4,2045 -12,heat,all-week,late-peak,2040,all-year,R1,1.66670000000,heatpump,4,2045 -5,cook,all-week,evening,2035,all-year,R1,1.55560000000,gasstove,5,2045 -6,cook,all-week,evening,2040,all-year,R1,1.11110000000,gasstove,5,2045 -11,heat,all-week,evening,2035,all-year,R1,1.55560000000,heatpump,5,2045 -12,heat,all-week,evening,2040,all-year,R1,1.11110000000,heatpump,5,2045 -6,cook,all-week,night,2040,all-year,R1,0.55560000000,gasstove,0,2050 -7,cook,all-week,night,2045,all-year,R1,0.94440000000,gasstove,0,2050 -13,heat,all-week,night,2040,all-year,R1,0.55560000000,heatpump,0,2050 -14,heat,all-week,night,2045,all-year,R1,0.94440000000,heatpump,0,2050 -6,cook,all-week,morning,2040,all-year,R1,0.83330000000,gasstove,1,2050 -7,cook,all-week,morning,2045,all-year,R1,1.41670000000,gasstove,1,2050 -13,heat,all-week,morning,2040,all-year,R1,0.83330000000,heatpump,1,2050 -14,heat,all-week,morning,2045,all-year,R1,1.41670000000,heatpump,1,2050 -6,cook,all-week,afternoon,2040,all-year,R1,0.55560000000,gasstove,2,2050 -7,cook,all-week,afternoon,2045,all-year,R1,0.94440000000,gasstove,2,2050 -13,heat,all-week,afternoon,2040,all-year,R1,0.55560000000,heatpump,2,2050 -14,heat,all-week,afternoon,2045,all-year,R1,0.94440000000,heatpump,2,2050 -6,cook,all-week,early-peak,2040,all-year,R1,0.83330000000,gasstove,3,2050 -7,cook,all-week,early-peak,2045,all-year,R1,1.41670000000,gasstove,3,2050 -13,heat,all-week,early-peak,2040,all-year,R1,0.83330000000,heatpump,3,2050 -14,heat,all-week,early-peak,2045,all-year,R1,1.41670000000,heatpump,3,2050 -6,cook,all-week,late-peak,2040,all-year,R1,1.66670000000,gasstove,4,2050 -7,cook,all-week,late-peak,2045,all-year,R1,2.83330000000,gasstove,4,2050 -13,heat,all-week,late-peak,2040,all-year,R1,1.66670000000,heatpump,4,2050 -14,heat,all-week,late-peak,2045,all-year,R1,2.83330000000,heatpump,4,2050 -6,cook,all-week,evening,2040,all-year,R1,1.11110000000,gasstove,5,2050 -7,cook,all-week,evening,2045,all-year,R1,1.88890000000,gasstove,5,2050 -13,heat,all-week,evening,2040,all-year,R1,1.11110000000,heatpump,5,2050 -14,heat,all-week,evening,2045,all-year,R1,1.88890000000,heatpump,5,2050 diff --git a/tests/example_outputs/minimum_service/Industry/Capacity.csv b/tests/example_outputs/minimum_service/Industry/Capacity.csv deleted file mode 100644 index b0053da4a..000000000 --- a/tests/example_outputs/minimum_service/Industry/Capacity.csv +++ /dev/null @@ -1,35 +0,0 @@ -asset,capacity,installed,region,technology,year -0,26.00000000000,2010,R1,procammonia_1,2010 -1,26.00000000000,2010,R1,procammonia_2,2010 -0,29.90000000000,2010,R1,procammonia_1,2015 -2,24.35470000000,2010,R1,procammonia_2,2015 -0,25.56670000000,2010,R1,procammonia_1,2020 -1,8.66670000000,2015,R1,procammonia_1,2020 -3,20.02140000000,2010,R1,procammonia_2,2020 -0,21.23330000000,2010,R1,procammonia_1,2025 -1,8.66670000000,2015,R1,procammonia_1,2025 -2,8.70630000000,2020,R1,procammonia_1,2025 -4,15.68800000000,2010,R1,procammonia_2,2025 -0,16.90000000000,2010,R1,procammonia_1,2030 -1,8.66670000000,2015,R1,procammonia_1,2030 -2,8.70630000000,2020,R1,procammonia_1,2030 -3,8.70630000000,2025,R1,procammonia_1,2030 -5,11.35470000000,2010,R1,procammonia_2,2030 -0,4.33330000000,2010,R1,procammonia_1,2035 -1,8.66670000000,2015,R1,procammonia_1,2035 -2,8.70630000000,2020,R1,procammonia_1,2035 -3,8.70630000000,2025,R1,procammonia_1,2035 -4,18.79580000000,2030,R1,procammonia_1,2035 -6,4.33330000000,2010,R1,procammonia_2,2035 -2,8.70630000000,2020,R1,procammonia_1,2040 -3,8.70630000000,2025,R1,procammonia_1,2040 -4,18.79580000000,2030,R1,procammonia_1,2040 -5,16.54120000000,2035,R1,procammonia_1,2040 -3,8.70630000000,2025,R1,procammonia_1,2045 -4,18.79580000000,2030,R1,procammonia_1,2045 -5,16.54120000000,2035,R1,procammonia_1,2045 -6,7.21970000000,2040,R1,procammonia_1,2045 -4,18.79580000000,2030,R1,procammonia_1,2050 -5,16.54120000000,2035,R1,procammonia_1,2050 -6,7.21970000000,2040,R1,procammonia_1,2050 -7,7.21970000000,2045,R1,procammonia_1,2050 diff --git a/tests/example_outputs/minimum_service/Industry/Supply.csv b/tests/example_outputs/minimum_service/Industry/Supply.csv deleted file mode 100644 index 26a6a6f8e..000000000 --- a/tests/example_outputs/minimum_service/Industry/Supply.csv +++ /dev/null @@ -1,205 +0,0 @@ -asset,commodity,day,hour,installed,month,region,supply,technology,timeslice,year -0,CO2f,all-week,all-day,2010,winter,R1,30397.66160000000,procammonia_1,0,2010 -1,CO2f,all-week,all-day,2010,winter,R1,22694.61780000000,procammonia_2,0,2010 -0,ammonia,all-week,all-day,2010,winter,R1,7.29300000000,procammonia_1,0,2010 -1,ammonia,all-week,all-day,2010,winter,R1,7.29300000000,procammonia_2,0,2010 -0,CO2f,all-week,all-day,2010,summer,R1,31318.80280000000,procammonia_1,1,2010 -1,CO2f,all-week,all-day,2010,summer,R1,23382.33350000000,procammonia_2,1,2010 -0,ammonia,all-week,all-day,2010,summer,R1,7.51400000000,procammonia_1,1,2010 -1,ammonia,all-week,all-day,2010,summer,R1,7.51400000000,procammonia_2,1,2010 -0,CO2f,all-week,all-day,2010,spring-autumn,R1,30397.66160000000,procammonia_1,2,2010 -1,CO2f,all-week,all-day,2010,spring-autumn,R1,22694.61780000000,procammonia_2,2,2010 -0,ammonia,all-week,all-day,2010,spring-autumn,R1,7.29300000000,procammonia_1,2,2010 -1,ammonia,all-week,all-day,2010,spring-autumn,R1,7.29300000000,procammonia_2,2,2010 -0,CO2f,all-week,all-day,2010,winter,R1,34271.87340000000,procammonia_1,0,2015 -2,CO2f,all-week,all-day,2010,winter,R1,20841.64410000000,procammonia_2,0,2015 -0,ammonia,all-week,all-day,2010,winter,R1,8.22250000000,procammonia_1,0,2015 -2,ammonia,all-week,all-day,2010,winter,R1,6.69750000000,procammonia_2,0,2015 -0,CO2f,all-week,all-day,2010,summer,R1,35310.41500000000,procammonia_1,1,2015 -2,CO2f,all-week,all-day,2010,summer,R1,21473.20910000000,procammonia_2,1,2015 -0,ammonia,all-week,all-day,2010,summer,R1,8.47170000000,procammonia_1,1,2015 -2,ammonia,all-week,all-day,2010,summer,R1,6.90050000000,procammonia_2,1,2015 -0,CO2f,all-week,all-day,2010,spring-autumn,R1,34271.87340000000,procammonia_1,2,2015 -2,CO2f,all-week,all-day,2010,spring-autumn,R1,20841.64410000000,procammonia_2,2,2015 -0,ammonia,all-week,all-day,2010,spring-autumn,R1,8.22250000000,procammonia_1,2,2015 -2,ammonia,all-week,all-day,2010,spring-autumn,R1,6.69750000000,procammonia_2,2,2015 -0,CO2f,all-week,all-day,2010,winter,R1,29304.93520000000,procammonia_1,0,2020 -1,CO2f,all-week,all-day,2015,winter,R1,9857.22610000000,procammonia_1,0,2020 -3,CO2f,all-week,all-day,2010,winter,R1,17133.37320000000,procammonia_2,0,2020 -0,ammonia,all-week,all-day,2010,winter,R1,7.03080000000,procammonia_1,0,2020 -1,ammonia,all-week,all-day,2015,winter,R1,2.38330000000,procammonia_1,0,2020 -3,ammonia,all-week,all-day,2010,winter,R1,5.50590000000,procammonia_2,0,2020 -0,CO2f,all-week,all-day,2010,summer,R1,30192.96350000000,procammonia_1,1,2020 -1,CO2f,all-week,all-day,2015,summer,R1,10155.92990000000,procammonia_1,1,2020 -3,CO2f,all-week,all-day,2010,summer,R1,17652.56630000000,procammonia_2,1,2020 -0,ammonia,all-week,all-day,2010,summer,R1,7.24390000000,procammonia_1,1,2020 -1,ammonia,all-week,all-day,2015,summer,R1,2.45560000000,procammonia_1,1,2020 -3,ammonia,all-week,all-day,2010,summer,R1,5.67270000000,procammonia_2,1,2020 -0,CO2f,all-week,all-day,2010,spring-autumn,R1,29304.93520000000,procammonia_1,2,2020 -1,CO2f,all-week,all-day,2015,spring-autumn,R1,9857.22610000000,procammonia_1,2,2020 -3,CO2f,all-week,all-day,2010,spring-autumn,R1,17133.37320000000,procammonia_2,2,2020 -0,ammonia,all-week,all-day,2010,spring-autumn,R1,7.03080000000,procammonia_1,2,2020 -1,ammonia,all-week,all-day,2015,spring-autumn,R1,2.38330000000,procammonia_1,2,2020 -3,ammonia,all-week,all-day,2010,spring-autumn,R1,5.50590000000,procammonia_2,2,2020 -0,CO2f,all-week,all-day,2010,winter,R1,24337.99700000000,procammonia_1,0,2025 -1,CO2f,all-week,all-day,2015,winter,R1,9857.22610000000,procammonia_1,0,2025 -2,CO2f,all-week,all-day,2020,winter,R1,9825.27560000000,procammonia_1,0,2025 -4,CO2f,all-week,all-day,2010,winter,R1,13425.10230000000,procammonia_2,0,2025 -0,ammonia,all-week,all-day,2010,winter,R1,5.83920000000,procammonia_1,0,2025 -1,ammonia,all-week,all-day,2015,winter,R1,2.38330000000,procammonia_1,0,2025 -2,ammonia,all-week,all-day,2020,winter,R1,2.39420000000,procammonia_1,0,2025 -4,ammonia,all-week,all-day,2010,winter,R1,4.31420000000,procammonia_2,0,2025 -0,CO2f,all-week,all-day,2010,summer,R1,25075.51210000000,procammonia_1,1,2025 -1,CO2f,all-week,all-day,2015,summer,R1,10155.92990000000,procammonia_1,1,2025 -2,CO2f,all-week,all-day,2020,summer,R1,10123.01120000000,procammonia_1,1,2025 -4,CO2f,all-week,all-day,2010,summer,R1,13831.92360000000,procammonia_2,1,2025 -0,ammonia,all-week,all-day,2010,summer,R1,6.01610000000,procammonia_1,1,2025 -1,ammonia,all-week,all-day,2015,summer,R1,2.45560000000,procammonia_1,1,2025 -2,ammonia,all-week,all-day,2020,summer,R1,2.46680000000,procammonia_1,1,2025 -4,ammonia,all-week,all-day,2010,summer,R1,4.44490000000,procammonia_2,1,2025 -0,CO2f,all-week,all-day,2010,spring-autumn,R1,24337.99700000000,procammonia_1,2,2025 -1,CO2f,all-week,all-day,2015,spring-autumn,R1,9857.22610000000,procammonia_1,2,2025 -2,CO2f,all-week,all-day,2020,spring-autumn,R1,9825.27560000000,procammonia_1,2,2025 -4,CO2f,all-week,all-day,2010,spring-autumn,R1,13425.10230000000,procammonia_2,2,2025 -0,ammonia,all-week,all-day,2010,spring-autumn,R1,5.83920000000,procammonia_1,2,2025 -1,ammonia,all-week,all-day,2015,spring-autumn,R1,2.38330000000,procammonia_1,2,2025 -2,ammonia,all-week,all-day,2020,spring-autumn,R1,2.39420000000,procammonia_1,2,2025 -4,ammonia,all-week,all-day,2010,spring-autumn,R1,4.31420000000,procammonia_2,2,2025 -0,CO2f,all-week,all-day,2010,winter,R1,19371.05890000000,procammonia_1,0,2030 -1,CO2f,all-week,all-day,2015,winter,R1,9857.22610000000,procammonia_1,0,2030 -2,CO2f,all-week,all-day,2020,winter,R1,9825.27560000000,procammonia_1,0,2030 -3,CO2f,all-week,all-day,2025,winter,R1,9748.27500000000,procammonia_1,0,2030 -5,CO2f,all-week,all-day,2010,winter,R1,9716.83140000000,procammonia_2,0,2030 -0,ammonia,all-week,all-day,2010,winter,R1,4.64750000000,procammonia_1,0,2030 -1,ammonia,all-week,all-day,2015,winter,R1,2.38330000000,procammonia_1,0,2030 -2,ammonia,all-week,all-day,2020,winter,R1,2.39420000000,procammonia_1,0,2030 -3,ammonia,all-week,all-day,2025,winter,R1,2.39420000000,procammonia_1,0,2030 -5,ammonia,all-week,all-day,2010,winter,R1,3.12250000000,procammonia_2,0,2030 -0,CO2f,all-week,all-day,2010,summer,R1,19958.06060000000,procammonia_1,1,2030 -1,CO2f,all-week,all-day,2015,summer,R1,10155.92990000000,procammonia_1,1,2030 -2,CO2f,all-week,all-day,2020,summer,R1,10123.01120000000,procammonia_1,1,2030 -3,CO2f,all-week,all-day,2025,summer,R1,10043.67720000000,procammonia_1,1,2030 -5,CO2f,all-week,all-day,2010,summer,R1,10011.28090000000,procammonia_2,1,2030 -0,ammonia,all-week,all-day,2010,summer,R1,4.78830000000,procammonia_1,1,2030 -1,ammonia,all-week,all-day,2015,summer,R1,2.45560000000,procammonia_1,1,2030 -2,ammonia,all-week,all-day,2020,summer,R1,2.46680000000,procammonia_1,1,2030 -3,ammonia,all-week,all-day,2025,summer,R1,2.46680000000,procammonia_1,1,2030 -5,ammonia,all-week,all-day,2010,summer,R1,3.21720000000,procammonia_2,1,2030 -0,CO2f,all-week,all-day,2010,spring-autumn,R1,19371.05890000000,procammonia_1,2,2030 -1,CO2f,all-week,all-day,2015,spring-autumn,R1,9857.22610000000,procammonia_1,2,2030 -2,CO2f,all-week,all-day,2020,spring-autumn,R1,9825.27560000000,procammonia_1,2,2030 -3,CO2f,all-week,all-day,2025,spring-autumn,R1,9748.27500000000,procammonia_1,2,2030 -5,CO2f,all-week,all-day,2010,spring-autumn,R1,9716.83140000000,procammonia_2,2,2030 -0,ammonia,all-week,all-day,2010,spring-autumn,R1,4.64750000000,procammonia_1,2,2030 -1,ammonia,all-week,all-day,2015,spring-autumn,R1,2.38330000000,procammonia_1,2,2030 -2,ammonia,all-week,all-day,2020,spring-autumn,R1,2.39420000000,procammonia_1,2,2030 -3,ammonia,all-week,all-day,2025,spring-autumn,R1,2.39420000000,procammonia_1,2,2030 -5,ammonia,all-week,all-day,2010,spring-autumn,R1,3.12250000000,procammonia_2,2,2030 -0,CO2f,all-week,all-day,2010,winter,R1,4966.93820000000,procammonia_1,0,2035 -1,CO2f,all-week,all-day,2015,winter,R1,9857.22610000000,procammonia_1,0,2035 -2,CO2f,all-week,all-day,2020,winter,R1,9825.27560000000,procammonia_1,0,2035 -3,CO2f,all-week,all-day,2025,winter,R1,9748.27500000000,procammonia_1,0,2035 -4,CO2f,all-week,all-day,2030,winter,R1,20879.16640000000,procammonia_1,0,2035 -6,CO2f,all-week,all-day,2010,winter,R1,3708.27090000000,procammonia_2,0,2035 -0,ammonia,all-week,all-day,2010,winter,R1,1.19170000000,procammonia_1,0,2035 -1,ammonia,all-week,all-day,2015,winter,R1,2.38330000000,procammonia_1,0,2035 -2,ammonia,all-week,all-day,2020,winter,R1,2.39420000000,procammonia_1,0,2035 -3,ammonia,all-week,all-day,2025,winter,R1,2.39420000000,procammonia_1,0,2035 -4,ammonia,all-week,all-day,2030,winter,R1,5.16890000000,procammonia_1,0,2035 -6,ammonia,all-week,all-day,2010,winter,R1,1.19170000000,procammonia_2,0,2035 -0,CO2f,all-week,all-day,2010,summer,R1,5117.45140000000,procammonia_1,1,2035 -1,CO2f,all-week,all-day,2015,summer,R1,10155.92990000000,procammonia_1,1,2035 -2,CO2f,all-week,all-day,2020,summer,R1,10123.01120000000,procammonia_1,1,2035 -3,CO2f,all-week,all-day,2025,summer,R1,10043.67720000000,procammonia_1,1,2035 -4,CO2f,all-week,all-day,2030,summer,R1,21511.86840000000,procammonia_1,1,2035 -6,CO2f,all-week,all-day,2010,summer,R1,3820.64270000000,procammonia_2,1,2035 -0,ammonia,all-week,all-day,2010,summer,R1,1.22780000000,procammonia_1,1,2035 -1,ammonia,all-week,all-day,2015,summer,R1,2.45560000000,procammonia_1,1,2035 -2,ammonia,all-week,all-day,2020,summer,R1,2.46680000000,procammonia_1,1,2035 -3,ammonia,all-week,all-day,2025,summer,R1,2.46680000000,procammonia_1,1,2035 -4,ammonia,all-week,all-day,2030,summer,R1,5.32550000000,procammonia_1,1,2035 -6,ammonia,all-week,all-day,2010,summer,R1,1.22780000000,procammonia_2,1,2035 -0,CO2f,all-week,all-day,2010,spring-autumn,R1,4966.93820000000,procammonia_1,2,2035 -1,CO2f,all-week,all-day,2015,spring-autumn,R1,9857.22610000000,procammonia_1,2,2035 -2,CO2f,all-week,all-day,2020,spring-autumn,R1,9825.27560000000,procammonia_1,2,2035 -3,CO2f,all-week,all-day,2025,spring-autumn,R1,9748.27500000000,procammonia_1,2,2035 -4,CO2f,all-week,all-day,2030,spring-autumn,R1,20879.16640000000,procammonia_1,2,2035 -6,CO2f,all-week,all-day,2010,spring-autumn,R1,3708.27090000000,procammonia_2,2,2035 -0,ammonia,all-week,all-day,2010,spring-autumn,R1,1.19170000000,procammonia_1,2,2035 -1,ammonia,all-week,all-day,2015,spring-autumn,R1,2.38330000000,procammonia_1,2,2035 -2,ammonia,all-week,all-day,2020,spring-autumn,R1,2.39420000000,procammonia_1,2,2035 -3,ammonia,all-week,all-day,2025,spring-autumn,R1,2.39420000000,procammonia_1,2,2035 -4,ammonia,all-week,all-day,2030,spring-autumn,R1,5.16890000000,procammonia_1,2,2035 -6,ammonia,all-week,all-day,2010,spring-autumn,R1,1.19170000000,procammonia_2,2,2035 -2,CO2f,all-week,all-day,2020,winter,R1,9825.27560000000,procammonia_1,0,2040 -3,CO2f,all-week,all-day,2025,winter,R1,9748.27500000000,procammonia_1,0,2040 -4,CO2f,all-week,all-day,2030,winter,R1,20879.16630000000,procammonia_1,0,2040 -5,CO2f,all-week,all-day,2035,winter,R1,18228.27250000000,procammonia_1,0,2040 -2,ammonia,all-week,all-day,2020,winter,R1,2.39420000000,procammonia_1,0,2040 -3,ammonia,all-week,all-day,2025,winter,R1,2.39420000000,procammonia_1,0,2040 -4,ammonia,all-week,all-day,2030,winter,R1,5.16890000000,procammonia_1,0,2040 -5,ammonia,all-week,all-day,2035,winter,R1,4.54880000000,procammonia_1,0,2040 -2,CO2f,all-week,all-day,2020,summer,R1,10123.01120000000,procammonia_1,1,2040 -3,CO2f,all-week,all-day,2025,summer,R1,10043.67720000000,procammonia_1,1,2040 -4,CO2f,all-week,all-day,2030,summer,R1,21511.86840000000,procammonia_1,1,2040 -5,CO2f,all-week,all-day,2035,summer,R1,18780.64440000000,procammonia_1,1,2040 -2,ammonia,all-week,all-day,2020,summer,R1,2.46680000000,procammonia_1,1,2040 -3,ammonia,all-week,all-day,2025,summer,R1,2.46680000000,procammonia_1,1,2040 -4,ammonia,all-week,all-day,2030,summer,R1,5.32550000000,procammonia_1,1,2040 -5,ammonia,all-week,all-day,2035,summer,R1,4.68670000000,procammonia_1,1,2040 -2,CO2f,all-week,all-day,2020,spring-autumn,R1,9825.27560000000,procammonia_1,2,2040 -3,CO2f,all-week,all-day,2025,spring-autumn,R1,9748.27500000000,procammonia_1,2,2040 -4,CO2f,all-week,all-day,2030,spring-autumn,R1,20879.16630000000,procammonia_1,2,2040 -5,CO2f,all-week,all-day,2035,spring-autumn,R1,18228.27250000000,procammonia_1,2,2040 -2,ammonia,all-week,all-day,2020,spring-autumn,R1,2.39420000000,procammonia_1,2,2040 -3,ammonia,all-week,all-day,2025,spring-autumn,R1,2.39420000000,procammonia_1,2,2040 -4,ammonia,all-week,all-day,2030,spring-autumn,R1,5.16890000000,procammonia_1,2,2040 -5,ammonia,all-week,all-day,2035,spring-autumn,R1,4.54880000000,procammonia_1,2,2040 -3,CO2f,all-week,all-day,2025,winter,R1,9748.27500000000,procammonia_1,0,2045 -4,CO2f,all-week,all-day,2030,winter,R1,20879.16630000000,procammonia_1,0,2045 -5,CO2f,all-week,all-day,2035,winter,R1,18228.27250000000,procammonia_1,0,2045 -6,CO2f,all-week,all-day,2040,winter,R1,7892.26240000000,procammonia_1,0,2045 -3,ammonia,all-week,all-day,2025,winter,R1,2.39420000000,procammonia_1,0,2045 -4,ammonia,all-week,all-day,2030,winter,R1,5.16890000000,procammonia_1,0,2045 -5,ammonia,all-week,all-day,2035,winter,R1,4.54880000000,procammonia_1,0,2045 -6,ammonia,all-week,all-day,2040,winter,R1,1.98540000000,procammonia_1,0,2045 -3,CO2f,all-week,all-day,2025,summer,R1,10043.67720000000,procammonia_1,1,2045 -4,CO2f,all-week,all-day,2030,summer,R1,21511.86840000000,procammonia_1,1,2045 -5,CO2f,all-week,all-day,2035,summer,R1,18780.64440000000,procammonia_1,1,2045 -6,CO2f,all-week,all-day,2040,summer,R1,8131.42190000000,procammonia_1,1,2045 -3,ammonia,all-week,all-day,2025,summer,R1,2.46680000000,procammonia_1,1,2045 -4,ammonia,all-week,all-day,2030,summer,R1,5.32550000000,procammonia_1,1,2045 -5,ammonia,all-week,all-day,2035,summer,R1,4.68670000000,procammonia_1,1,2045 -6,ammonia,all-week,all-day,2040,summer,R1,2.04560000000,procammonia_1,1,2045 -3,CO2f,all-week,all-day,2025,spring-autumn,R1,9748.27500000000,procammonia_1,2,2045 -4,CO2f,all-week,all-day,2030,spring-autumn,R1,20879.16630000000,procammonia_1,2,2045 -5,CO2f,all-week,all-day,2035,spring-autumn,R1,18228.27250000000,procammonia_1,2,2045 -6,CO2f,all-week,all-day,2040,spring-autumn,R1,7892.26240000000,procammonia_1,2,2045 -3,ammonia,all-week,all-day,2025,spring-autumn,R1,2.39420000000,procammonia_1,2,2045 -4,ammonia,all-week,all-day,2030,spring-autumn,R1,5.16890000000,procammonia_1,2,2045 -5,ammonia,all-week,all-day,2035,spring-autumn,R1,4.54880000000,procammonia_1,2,2045 -6,ammonia,all-week,all-day,2040,spring-autumn,R1,1.98540000000,procammonia_1,2,2045 -4,CO2f,all-week,all-day,2030,winter,R1,20879.16640000000,procammonia_1,0,2050 -5,CO2f,all-week,all-day,2035,winter,R1,18228.27250000000,procammonia_1,0,2050 -6,CO2f,all-week,all-day,2040,winter,R1,7892.26240000000,procammonia_1,0,2050 -7,CO2f,all-week,all-day,2045,winter,R1,7828.40920000000,procammonia_1,0,2050 -4,ammonia,all-week,all-day,2030,winter,R1,5.16890000000,procammonia_1,0,2050 -5,ammonia,all-week,all-day,2035,winter,R1,4.54880000000,procammonia_1,0,2050 -6,ammonia,all-week,all-day,2040,winter,R1,1.98540000000,procammonia_1,0,2050 -7,ammonia,all-week,all-day,2045,winter,R1,1.98540000000,procammonia_1,0,2050 -4,CO2f,all-week,all-day,2030,summer,R1,21511.86840000000,procammonia_1,1,2050 -5,CO2f,all-week,all-day,2035,summer,R1,18780.64440000000,procammonia_1,1,2050 -6,CO2f,all-week,all-day,2040,summer,R1,8131.42190000000,procammonia_1,1,2050 -7,CO2f,all-week,all-day,2045,summer,R1,8065.63370000000,procammonia_1,1,2050 -4,ammonia,all-week,all-day,2030,summer,R1,5.32550000000,procammonia_1,1,2050 -5,ammonia,all-week,all-day,2035,summer,R1,4.68670000000,procammonia_1,1,2050 -6,ammonia,all-week,all-day,2040,summer,R1,2.04560000000,procammonia_1,1,2050 -7,ammonia,all-week,all-day,2045,summer,R1,2.04560000000,procammonia_1,1,2050 -4,CO2f,all-week,all-day,2030,spring-autumn,R1,20879.16640000000,procammonia_1,2,2050 -5,CO2f,all-week,all-day,2035,spring-autumn,R1,18228.27250000000,procammonia_1,2,2050 -6,CO2f,all-week,all-day,2040,spring-autumn,R1,7892.26240000000,procammonia_1,2,2050 -7,CO2f,all-week,all-day,2045,spring-autumn,R1,7828.40920000000,procammonia_1,2,2050 -4,ammonia,all-week,all-day,2030,spring-autumn,R1,5.16890000000,procammonia_1,2,2050 -5,ammonia,all-week,all-day,2035,spring-autumn,R1,4.54880000000,procammonia_1,2,2050 -6,ammonia,all-week,all-day,2040,spring-autumn,R1,1.98540000000,procammonia_1,2,2050 -7,ammonia,all-week,all-day,2045,spring-autumn,R1,1.98540000000,procammonia_1,2,2050 diff --git a/tests/example_outputs/minimum_service/MCAMetric_Supply.csv b/tests/example_outputs/minimum_service/MCAMetric_Supply.csv deleted file mode 100644 index 8b27272b1..000000000 --- a/tests/example_outputs/minimum_service/MCAMetric_Supply.csv +++ /dev/null @@ -1,205 +0,0 @@ -agent,asset,category,comm_usage,commodity,day,dst_region,hour,installed,month,region,sector,supply,technology,timeslice,units_prices,year -A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,winter,R1,industry,30397.66158285232,procammonia_1,0,MUS$2010/kt,2010 -A1,1,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,winter,R1,industry,22694.61779869451,procammonia_2,0,MUS$2010/kt,2010 -A1,0,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2010,winter,R1,industry,7.29300000068,procammonia_1,0,MUS$2010/Mt,2010 -A1,1,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2010,winter,R1,industry,7.29300000068,procammonia_2,0,MUS$2010/Mt,2010 -A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,summer,R1,industry,31318.80283429535,procammonia_1,1,MUS$2010/kt,2010 -A1,1,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,summer,R1,industry,23382.33348311096,procammonia_2,1,MUS$2010/kt,2010 -A1,0,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2010,summer,R1,industry,7.51399999863,procammonia_1,1,MUS$2010/Mt,2010 -A1,1,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2010,summer,R1,industry,7.51399999863,procammonia_2,1,MUS$2010/Mt,2010 -A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,spring-autumn,R1,industry,30397.66158285232,procammonia_1,2,MUS$2010/kt,2010 -A1,1,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,spring-autumn,R1,industry,22694.61779869451,procammonia_2,2,MUS$2010/kt,2010 -A1,0,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2010,spring-autumn,R1,industry,7.29300000068,procammonia_1,2,MUS$2010/Mt,2010 -A1,1,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2010,spring-autumn,R1,industry,7.29300000068,procammonia_2,2,MUS$2010/Mt,2010 -A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,winter,R1,industry,34007.42989250853,procammonia_1,0,MUS$2010/kt,2015 -A1,1,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,winter,R1,industry,20680.82894531053,procammonia_2,0,MUS$2010/kt,2015 -A1,0,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2010,winter,R1,industry,8.22250000227,procammonia_1,0,MUS$2010/Mt,2015 -A1,1,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2010,winter,R1,industry,6.69753999773,procammonia_2,0,MUS$2010/Mt,2015 -A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,summer,R1,industry,35037.95806139958,procammonia_1,1,MUS$2010/kt,2015 -A1,1,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,summer,R1,industry,21307.52072565159,procammonia_2,1,MUS$2010/kt,2015 -A1,0,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2010,summer,R1,industry,8.47166666667,procammonia_1,1,MUS$2010/Mt,2015 -A1,1,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2010,summer,R1,industry,6.90049575333,procammonia_2,1,MUS$2010/Mt,2015 -A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,spring-autumn,R1,industry,34007.42989250853,procammonia_1,2,MUS$2010/kt,2015 -A1,1,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,spring-autumn,R1,industry,20680.82894531053,procammonia_2,2,MUS$2010/kt,2015 -A1,0,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2010,spring-autumn,R1,industry,8.22250000227,procammonia_1,2,MUS$2010/Mt,2015 -A1,1,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2010,spring-autumn,R1,industry,6.69753999773,procammonia_2,2,MUS$2010/Mt,2015 -A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,winter,R1,industry,28852.69853027302,procammonia_1,0,MUS$2010/kt,2020 -A1,1,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,winter,R1,industry,16868.96930416728,procammonia_2,0,MUS$2010/kt,2020 -A1,2,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2015,winter,R1,industry,9780.57579057130,procammonia_1,0,MUS$2010/kt,2020 -A1,0,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2010,winter,R1,industry,7.03083333344,procammonia_1,0,MUS$2010/Mt,2020 -A1,1,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2010,winter,R1,industry,5.50587332890,procammonia_2,0,MUS$2010/Mt,2020 -A1,2,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2015,winter,R1,industry,2.38333333766,procammonia_1,0,MUS$2010/Mt,2020 -A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,summer,R1,industry,29727.02271995599,procammonia_1,1,MUS$2010/kt,2020 -A1,1,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,summer,R1,industry,17380.15018737576,procammonia_2,1,MUS$2010/kt,2020 -A1,2,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2015,summer,R1,industry,10076.95687235302,procammonia_1,1,MUS$2010/kt,2020 -A1,0,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2010,summer,R1,industry,7.24388888700,procammonia_1,1,MUS$2010/Mt,2020 -A1,1,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2010,summer,R1,industry,5.67271797367,procammonia_2,1,MUS$2010/Mt,2020 -A1,2,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2015,summer,R1,industry,2.45555555933,procammonia_1,1,MUS$2010/Mt,2020 -A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,spring-autumn,R1,industry,28852.69853027302,procammonia_1,2,MUS$2010/kt,2020 -A1,1,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,spring-autumn,R1,industry,16868.96930416728,procammonia_2,2,MUS$2010/kt,2020 -A1,2,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2015,spring-autumn,R1,industry,9780.57579057130,procammonia_1,2,MUS$2010/kt,2020 -A1,0,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2010,spring-autumn,R1,industry,7.03083333344,procammonia_1,2,MUS$2010/Mt,2020 -A1,1,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2010,spring-autumn,R1,industry,5.50587332890,procammonia_2,2,MUS$2010/Mt,2020 -A1,2,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2015,spring-autumn,R1,industry,2.38333333766,procammonia_1,2,MUS$2010/Mt,2020 -A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,winter,R1,industry,23774.61745868616,procammonia_1,0,MUS$2010/kt,2025 -A1,1,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,winter,R1,industry,13114.33607353469,procammonia_2,0,MUS$2010/kt,2025 -A1,2,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2015,winter,R1,industry,9703.92550979379,procammonia_1,0,MUS$2010/kt,2025 -A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2020,winter,R1,industry,9748.27496047046,procammonia_1,0,MUS$2010/kt,2025 -A1,0,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2010,winter,R1,industry,5.83916666713,procammonia_1,0,MUS$2010/Mt,2025 -A1,1,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2010,winter,R1,industry,4.31420666265,procammonia_2,0,MUS$2010/Mt,2025 -A1,2,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2015,winter,R1,industry,2.38333333756,procammonia_1,0,MUS$2010/Mt,2025 -A1,3,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2020,winter,R1,industry,2.39422578765,procammonia_1,0,MUS$2010/Mt,2025 -A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,summer,R1,industry,24495.06040618948,procammonia_1,1,MUS$2010/kt,2025 -A1,1,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,summer,R1,industry,13511.74019378120,procammonia_2,1,MUS$2010/kt,2025 -A1,2,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2015,summer,R1,industry,9997.98385621208,procammonia_1,1,MUS$2010/kt,2025 -A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2020,summer,R1,industry,10043.67722962572,procammonia_1,1,MUS$2010/kt,2025 -A1,0,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2010,summer,R1,industry,6.01611111017,procammonia_1,1,MUS$2010/Mt,2025 -A1,1,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2010,summer,R1,industry,4.44494019683,procammonia_2,1,MUS$2010/Mt,2025 -A1,2,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2015,summer,R1,industry,2.45555555933,procammonia_1,1,MUS$2010/Mt,2025 -A1,3,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2020,summer,R1,industry,2.46677808367,procammonia_1,1,MUS$2010/Mt,2025 -A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,spring-autumn,R1,industry,23774.61745868616,procammonia_1,2,MUS$2010/kt,2025 -A1,1,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,spring-autumn,R1,industry,13114.33607353469,procammonia_2,2,MUS$2010/kt,2025 -A1,2,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2015,spring-autumn,R1,industry,9703.92550979379,procammonia_1,2,MUS$2010/kt,2025 -A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2020,spring-autumn,R1,industry,9748.27496047046,procammonia_1,2,MUS$2010/kt,2025 -A1,0,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2010,spring-autumn,R1,industry,5.83916666713,procammonia_1,2,MUS$2010/Mt,2025 -A1,1,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2010,spring-autumn,R1,industry,4.31420666265,procammonia_2,2,MUS$2010/Mt,2025 -A1,2,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2015,spring-autumn,R1,industry,2.38333333756,procammonia_1,2,MUS$2010/Mt,2025 -A1,3,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2020,spring-autumn,R1,industry,2.39422578765,procammonia_1,2,MUS$2010/Mt,2025 -A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,winter,R1,industry,18773.18666438033,procammonia_1,0,MUS$2010/kt,2030 -A1,1,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,winter,R1,industry,9416.92924324588,procammonia_2,0,MUS$2010/kt,2030 -A1,2,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2015,winter,R1,industry,9627.27522902292,procammonia_1,0,MUS$2010/kt,2030 -A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2020,winter,R1,industry,9671.27436808157,procammonia_1,0,MUS$2010/kt,2030 -A1,4,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2025,winter,R1,industry,9671.27437474662,procammonia_1,0,MUS$2010/kt,2030 -A1,0,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2010,winter,R1,industry,4.64750000009,procammonia_1,0,MUS$2010/Mt,2030 -A1,1,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2010,winter,R1,industry,3.12253999567,procammonia_2,0,MUS$2010/Mt,2030 -A1,2,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2015,winter,R1,industry,2.38333333747,procammonia_1,0,MUS$2010/Mt,2030 -A1,3,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2020,winter,R1,industry,2.39422578756,procammonia_1,0,MUS$2010/Mt,2030 -A1,4,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2025,winter,R1,industry,2.39422578921,procammonia_1,0,MUS$2010/Mt,2030 -A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,summer,R1,industry,19342.07110494816,procammonia_1,1,MUS$2010/kt,2030 -A1,1,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,summer,R1,industry,9702.29073355563,procammonia_2,1,MUS$2010/kt,2030 -A1,2,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2015,summer,R1,industry,9919.01084007114,procammonia_1,1,MUS$2010/kt,2030 -A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2020,summer,R1,industry,9964.34328636507,procammonia_1,1,MUS$2010/kt,2030 -A1,4,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2025,summer,R1,industry,9964.34329323209,procammonia_1,1,MUS$2010/kt,2030 -A1,0,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2010,summer,R1,industry,4.78833333248,procammonia_1,1,MUS$2010/Mt,2030 -A1,1,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2010,summer,R1,industry,3.21716241915,procammonia_2,1,MUS$2010/Mt,2030 -A1,2,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2015,summer,R1,industry,2.45555555933,procammonia_1,1,MUS$2010/Mt,2030 -A1,3,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2020,summer,R1,industry,2.46677808367,procammonia_1,1,MUS$2010/Mt,2030 -A1,4,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2025,summer,R1,industry,2.46677808537,procammonia_1,1,MUS$2010/Mt,2030 -A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,spring-autumn,R1,industry,18773.18666438033,procammonia_1,2,MUS$2010/kt,2030 -A1,1,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,spring-autumn,R1,industry,9416.92924324588,procammonia_2,2,MUS$2010/kt,2030 -A1,2,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2015,spring-autumn,R1,industry,9627.27522902292,procammonia_1,2,MUS$2010/kt,2030 -A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2020,spring-autumn,R1,industry,9671.27436808157,procammonia_1,2,MUS$2010/kt,2030 -A1,4,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2025,spring-autumn,R1,industry,9671.27437474662,procammonia_1,2,MUS$2010/kt,2030 -A1,0,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2010,spring-autumn,R1,industry,4.64750000009,procammonia_1,2,MUS$2010/Mt,2030 -A1,1,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2010,spring-autumn,R1,industry,3.12253999567,procammonia_2,2,MUS$2010/Mt,2030 -A1,2,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2015,spring-autumn,R1,industry,2.38333333747,procammonia_1,2,MUS$2010/Mt,2030 -A1,3,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2020,spring-autumn,R1,industry,2.39422578756,procammonia_1,2,MUS$2010/Mt,2030 -A1,4,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2025,spring-autumn,R1,industry,2.39422578921,procammonia_1,2,MUS$2010/Mt,2030 -A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,winter,R1,industry,4775.31246614086,procammonia_1,0,MUS$2010/kt,2035 -A1,1,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,winter,R1,industry,3565.20487545684,procammonia_2,0,MUS$2010/kt,2035 -A1,2,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2015,winter,R1,industry,9550.62494770967,procammonia_1,0,MUS$2010/kt,2035 -A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2020,winter,R1,industry,9594.27377514783,procammonia_1,0,MUS$2010/kt,2035 -A1,4,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2025,winter,R1,industry,9594.27378175981,procammonia_1,0,MUS$2010/kt,2035 -A1,5,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2030,winter,R1,industry,20712.93095079166,procammonia_1,0,MUS$2010/kt,2035 -A1,0,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2010,winter,R1,industry,1.19166666669,procammonia_1,0,MUS$2010/Mt,2035 -A1,1,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2010,winter,R1,industry,1.19166666669,procammonia_2,0,MUS$2010/Mt,2035 -A1,2,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2015,winter,R1,industry,2.38333333724,procammonia_1,0,MUS$2010/Mt,2035 -A1,3,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2020,winter,R1,industry,2.39422578733,procammonia_1,0,MUS$2010/Mt,2035 -A1,4,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2025,winter,R1,industry,2.39422578898,procammonia_1,0,MUS$2010/Mt,2035 -A1,5,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2030,winter,R1,industry,5.16885744307,procammonia_1,0,MUS$2010/Mt,2035 -A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,summer,R1,industry,4920.01890401737,procammonia_1,1,MUS$2010/kt,2035 -A1,1,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,summer,R1,industry,3673.24138646744,procammonia_2,1,MUS$2010/kt,2035 -A1,2,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2015,summer,R1,industry,9840.03782393019,procammonia_1,1,MUS$2010/kt,2035 -A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2020,summer,R1,industry,9885.00934310442,procammonia_1,1,MUS$2010/kt,2035 -A1,4,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2025,summer,R1,industry,9885.00934991676,procammonia_1,1,MUS$2010/kt,2035 -A1,5,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2030,summer,R1,industry,21340.59552292663,procammonia_1,1,MUS$2010/kt,2035 -A1,0,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2010,summer,R1,industry,1.22777777768,procammonia_1,1,MUS$2010/Mt,2035 -A1,1,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2010,summer,R1,industry,1.22777777768,procammonia_2,1,MUS$2010/Mt,2035 -A1,2,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2015,summer,R1,industry,2.45555555933,procammonia_1,1,MUS$2010/Mt,2035 -A1,3,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2020,summer,R1,industry,2.46677808367,procammonia_1,1,MUS$2010/Mt,2035 -A1,4,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2025,summer,R1,industry,2.46677808537,procammonia_1,1,MUS$2010/Mt,2035 -A1,5,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2030,summer,R1,industry,5.32548948627,procammonia_1,1,MUS$2010/Mt,2035 -A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,spring-autumn,R1,industry,4775.31246614086,procammonia_1,2,MUS$2010/kt,2035 -A1,1,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,spring-autumn,R1,industry,3565.20487545684,procammonia_2,2,MUS$2010/kt,2035 -A1,2,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2015,spring-autumn,R1,industry,9550.62494770967,procammonia_1,2,MUS$2010/kt,2035 -A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2020,spring-autumn,R1,industry,9594.27377514783,procammonia_1,2,MUS$2010/kt,2035 -A1,4,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2025,spring-autumn,R1,industry,9594.27378175981,procammonia_1,2,MUS$2010/kt,2035 -A1,5,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2030,spring-autumn,R1,industry,20712.93095079166,procammonia_1,2,MUS$2010/kt,2035 -A1,0,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2010,spring-autumn,R1,industry,1.19166666669,procammonia_1,2,MUS$2010/Mt,2035 -A1,1,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2010,spring-autumn,R1,industry,1.19166666669,procammonia_2,2,MUS$2010/Mt,2035 -A1,2,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2015,spring-autumn,R1,industry,2.38333333724,procammonia_1,2,MUS$2010/Mt,2035 -A1,3,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2020,spring-autumn,R1,industry,2.39422578733,procammonia_1,2,MUS$2010/Mt,2035 -A1,4,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2025,spring-autumn,R1,industry,2.39422578898,procammonia_1,2,MUS$2010/Mt,2035 -A1,5,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2030,spring-autumn,R1,industry,5.16885744307,procammonia_1,2,MUS$2010/Mt,2035 -A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2020,winter,R1,industry,9517.27318220130,procammonia_1,0,MUS$2010/kt,2040 -A1,4,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2025,winter,R1,industry,9517.27318876022,procammonia_1,0,MUS$2010/kt,2040 -A1,5,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2030,winter,R1,industry,20546.69554806604,procammonia_1,0,MUS$2010/kt,2040 -A1,6,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2035,winter,R1,industry,18081.97813945043,procammonia_1,0,MUS$2010/kt,2040 -A1,3,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2020,winter,R1,industry,2.39422578709,procammonia_1,0,MUS$2010/Mt,2040 -A1,4,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2025,winter,R1,industry,2.39422578874,procammonia_1,0,MUS$2010/Mt,2040 -A1,5,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2030,winter,R1,industry,5.16885744255,procammonia_1,0,MUS$2010/Mt,2040 -A1,6,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2035,winter,R1,industry,4.54881745162,procammonia_1,0,MUS$2010/Mt,2040 -A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2020,summer,R1,industry,9805.67539984377,procammonia_1,1,MUS$2010/kt,2040 -A1,4,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2025,summer,R1,industry,9805.67540660143,procammonia_1,1,MUS$2010/kt,2040 -A1,5,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2030,summer,R1,industry,21169.32268588623,procammonia_1,1,MUS$2010/kt,2040 -A1,6,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2035,summer,R1,industry,18629.91687094893,procammonia_1,1,MUS$2010/kt,2040 -A1,3,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2020,summer,R1,industry,2.46677808367,procammonia_1,1,MUS$2010/Mt,2040 -A1,4,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2025,summer,R1,industry,2.46677808537,procammonia_1,1,MUS$2010/Mt,2040 -A1,5,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2030,summer,R1,industry,5.32548948627,procammonia_1,1,MUS$2010/Mt,2040 -A1,6,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2035,summer,R1,industry,4.68666040470,procammonia_1,1,MUS$2010/Mt,2040 -A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2020,spring-autumn,R1,industry,9517.27318220130,procammonia_1,2,MUS$2010/kt,2040 -A1,4,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2025,spring-autumn,R1,industry,9517.27318876022,procammonia_1,2,MUS$2010/kt,2040 -A1,5,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2030,spring-autumn,R1,industry,20546.69554806604,procammonia_1,2,MUS$2010/kt,2040 -A1,6,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2035,spring-autumn,R1,industry,18081.97813945043,procammonia_1,2,MUS$2010/kt,2040 -A1,3,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2020,spring-autumn,R1,industry,2.39422578709,procammonia_1,2,MUS$2010/Mt,2040 -A1,4,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2025,spring-autumn,R1,industry,2.39422578874,procammonia_1,2,MUS$2010/Mt,2040 -A1,5,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2030,spring-autumn,R1,industry,5.16885744255,procammonia_1,2,MUS$2010/Mt,2040 -A1,6,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2035,spring-autumn,R1,industry,4.54881745162,procammonia_1,2,MUS$2010/Mt,2040 -A1,4,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2025,winter,R1,industry,9440.27259691583,procammonia_1,0,MUS$2010/kt,2045 -A1,5,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2030,winter,R1,industry,20380.46014783439,procammonia_1,0,MUS$2010/kt,2045 -A1,6,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2035,winter,R1,industry,17935.68381849941,procammonia_1,0,MUS$2010/kt,2045 -A1,7,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2040,winter,R1,industry,7828.40914377241,procammonia_1,0,MUS$2010/kt,2045 -A1,4,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2025,winter,R1,industry,2.39422578879,procammonia_1,0,MUS$2010/Mt,2045 -A1,5,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2030,winter,R1,industry,5.16885744266,procammonia_1,0,MUS$2010/Mt,2045 -A1,6,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2035,winter,R1,industry,4.54881745172,procammonia_1,0,MUS$2010/Mt,2045 -A1,7,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2040,winter,R1,industry,1.98542773684,procammonia_1,0,MUS$2010/Mt,2045 -A1,4,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2025,summer,R1,industry,9726.34146328611,procammonia_1,1,MUS$2010/kt,2045 -A1,5,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2030,summer,R1,industry,20998.04984884583,procammonia_1,1,MUS$2010/kt,2045 -A1,6,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2035,summer,R1,industry,18479.18938837144,procammonia_1,1,MUS$2010/kt,2045 -A1,7,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2040,summer,R1,industry,8065.63366311239,procammonia_1,1,MUS$2010/kt,2045 -A1,4,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2025,summer,R1,industry,2.46677808537,procammonia_1,1,MUS$2010/Mt,2045 -A1,5,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2030,summer,R1,industry,5.32548948627,procammonia_1,1,MUS$2010/Mt,2045 -A1,6,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2035,summer,R1,industry,4.68666040470,procammonia_1,1,MUS$2010/Mt,2045 -A1,7,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2040,summer,R1,industry,2.04559221367,procammonia_1,1,MUS$2010/Mt,2045 -A1,4,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2025,spring-autumn,R1,industry,9440.27259691583,procammonia_1,2,MUS$2010/kt,2045 -A1,5,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2030,spring-autumn,R1,industry,20380.46014783439,procammonia_1,2,MUS$2010/kt,2045 -A1,6,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2035,spring-autumn,R1,industry,17935.68381849941,procammonia_1,2,MUS$2010/kt,2045 -A1,7,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2040,spring-autumn,R1,industry,7828.40914377241,procammonia_1,2,MUS$2010/kt,2045 -A1,4,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2025,spring-autumn,R1,industry,2.39422578879,procammonia_1,2,MUS$2010/Mt,2045 -A1,5,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2030,spring-autumn,R1,industry,5.16885744266,procammonia_1,2,MUS$2010/Mt,2045 -A1,6,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2035,spring-autumn,R1,industry,4.54881745172,procammonia_1,2,MUS$2010/Mt,2045 -A1,7,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2040,spring-autumn,R1,industry,1.98542773684,procammonia_1,2,MUS$2010/Mt,2045 -A1,5,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2030,winter,R1,industry,20214.22474762099,procammonia_1,0,MUS$2010/kt,2050 -A1,6,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2035,winter,R1,industry,17789.38949756446,procammonia_1,0,MUS$2010/kt,2050 -A1,7,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2040,winter,R1,industry,7764.55588836946,procammonia_1,0,MUS$2010/kt,2050 -A1,8,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2045,winter,R1,industry,7764.55589482224,procammonia_1,0,MUS$2010/kt,2050 -A1,5,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2030,winter,R1,industry,5.16885744278,procammonia_1,0,MUS$2010/Mt,2050 -A1,6,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2035,winter,R1,industry,4.54881745182,procammonia_1,0,MUS$2010/Mt,2050 -A1,7,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2040,winter,R1,industry,1.98542773688,procammonia_1,0,MUS$2010/Mt,2050 -A1,8,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2045,winter,R1,industry,1.98542773853,procammonia_1,0,MUS$2010/Mt,2050 -A1,5,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2030,summer,R1,industry,20826.77701180542,procammonia_1,1,MUS$2010/kt,2050 -A1,6,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2035,summer,R1,industry,18328.46190579394,procammonia_1,1,MUS$2010/kt,2050 -A1,7,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2040,summer,R1,industry,7999.84546040052,procammonia_1,1,MUS$2010/kt,2050 -A1,8,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2045,summer,R1,industry,7999.84546704883,procammonia_1,1,MUS$2010/kt,2050 -A1,5,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2030,summer,R1,industry,5.32548948627,procammonia_1,1,MUS$2010/Mt,2050 -A1,6,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2035,summer,R1,industry,4.68666040470,procammonia_1,1,MUS$2010/Mt,2050 -A1,7,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2040,summer,R1,industry,2.04559221367,procammonia_1,1,MUS$2010/Mt,2050 -A1,8,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2045,summer,R1,industry,2.04559221537,procammonia_1,1,MUS$2010/Mt,2050 -A1,5,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2030,spring-autumn,R1,industry,20214.22474762099,procammonia_1,2,MUS$2010/kt,2050 -A1,6,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2035,spring-autumn,R1,industry,17789.38949756446,procammonia_1,2,MUS$2010/kt,2050 -A1,7,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2040,spring-autumn,R1,industry,7764.55588836946,procammonia_1,2,MUS$2010/kt,2050 -A1,8,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2045,spring-autumn,R1,industry,7764.55589482224,procammonia_1,2,MUS$2010/kt,2050 -A1,5,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2030,spring-autumn,R1,industry,5.16885744278,procammonia_1,2,MUS$2010/Mt,2050 -A1,6,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2035,spring-autumn,R1,industry,4.54881745182,procammonia_1,2,MUS$2010/Mt,2050 -A1,7,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2040,spring-autumn,R1,industry,1.98542773688,procammonia_1,2,MUS$2010/Mt,2050 -A1,8,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2045,spring-autumn,R1,industry,1.98542773853,procammonia_1,2,MUS$2010/Mt,2050 diff --git a/tests/example_outputs/minimum_service/MCAPrices.csv b/tests/example_outputs/minimum_service/MCAPrices.csv new file mode 100644 index 000000000..a1914ef93 --- /dev/null +++ b/tests/example_outputs/minimum_service/MCAPrices.csv @@ -0,0 +1,109 @@ +commodity,day,hour,month,prices,region,timeslice,units_prices,year +fuel3,all-week,all-day,winter,0.05330000000,R1,0,MUS$2010/PJ,2010 +fuel1,all-week,all-day,winter,1.00000000000,R1,0,MUS$2010/PJ,2010 +fuel2,all-week,all-day,winter,9.55120000000,R1,0,MUS$2010/PJ,2010 +ammonia,all-week,all-day,winter,321.15000000000,R1,0,MUS$2010/Mt,2010 +fuel3,all-week,all-day,summer,0.05330000000,R1,1,MUS$2010/PJ,2010 +fuel1,all-week,all-day,summer,1.00000000000,R1,1,MUS$2010/PJ,2010 +fuel2,all-week,all-day,summer,9.55120000000,R1,1,MUS$2010/PJ,2010 +ammonia,all-week,all-day,summer,321.15000000000,R1,1,MUS$2010/Mt,2010 +fuel3,all-week,all-day,spring-autumn,0.05330000000,R1,2,MUS$2010/PJ,2010 +fuel1,all-week,all-day,spring-autumn,1.00000000000,R1,2,MUS$2010/PJ,2010 +fuel2,all-week,all-day,spring-autumn,9.55120000000,R1,2,MUS$2010/PJ,2010 +ammonia,all-week,all-day,spring-autumn,321.15000000000,R1,2,MUS$2010/Mt,2010 +fuel3,all-week,all-day,winter,0.06170000000,R1,0,MUS$2010/PJ,2015 +fuel1,all-week,all-day,winter,1.08770000000,R1,0,MUS$2010/PJ,2015 +fuel2,all-week,all-day,winter,9.51690000000,R1,0,MUS$2010/PJ,2015 +ammonia,all-week,all-day,winter,384.08350000000,R1,0,MUS$2010/Mt,2015 +fuel3,all-week,all-day,summer,0.06170000000,R1,1,MUS$2010/PJ,2015 +fuel1,all-week,all-day,summer,1.08770000000,R1,1,MUS$2010/PJ,2015 +fuel2,all-week,all-day,summer,9.51690000000,R1,1,MUS$2010/PJ,2015 +ammonia,all-week,all-day,summer,384.08350000000,R1,1,MUS$2010/Mt,2015 +fuel3,all-week,all-day,spring-autumn,0.06170000000,R1,2,MUS$2010/PJ,2015 +fuel1,all-week,all-day,spring-autumn,1.08770000000,R1,2,MUS$2010/PJ,2015 +fuel2,all-week,all-day,spring-autumn,9.51690000000,R1,2,MUS$2010/PJ,2015 +ammonia,all-week,all-day,spring-autumn,384.08350000000,R1,2,MUS$2010/Mt,2015 +fuel3,all-week,all-day,winter,0.07020000000,R1,0,MUS$2010/PJ,2020 +fuel1,all-week,all-day,winter,1.17540000000,R1,0,MUS$2010/PJ,2020 +fuel2,all-week,all-day,winter,9.48260000000,R1,0,MUS$2010/PJ,2020 +ammonia,all-week,all-day,winter,406.89500000000,R1,0,MUS$2010/Mt,2020 +fuel3,all-week,all-day,summer,0.07020000000,R1,1,MUS$2010/PJ,2020 +fuel1,all-week,all-day,summer,1.17540000000,R1,1,MUS$2010/PJ,2020 +fuel2,all-week,all-day,summer,9.48260000000,R1,1,MUS$2010/PJ,2020 +ammonia,all-week,all-day,summer,406.89500000000,R1,1,MUS$2010/Mt,2020 +fuel3,all-week,all-day,spring-autumn,0.07020000000,R1,2,MUS$2010/PJ,2020 +fuel1,all-week,all-day,spring-autumn,1.17540000000,R1,2,MUS$2010/PJ,2020 +fuel2,all-week,all-day,spring-autumn,9.48260000000,R1,2,MUS$2010/PJ,2020 +ammonia,all-week,all-day,spring-autumn,406.89500000000,R1,2,MUS$2010/Mt,2020 +fuel3,all-week,all-day,winter,0.08280000000,R1,0,MUS$2010/PJ,2025 +fuel1,all-week,all-day,winter,1.16670000000,R1,0,MUS$2010/PJ,2025 +fuel2,all-week,all-day,winter,10.71080000000,R1,0,MUS$2010/PJ,2025 +ammonia,all-week,all-day,winter,461.98460000000,R1,0,MUS$2010/Mt,2025 +fuel3,all-week,all-day,summer,0.08280000000,R1,1,MUS$2010/PJ,2025 +fuel1,all-week,all-day,summer,1.16670000000,R1,1,MUS$2010/PJ,2025 +fuel2,all-week,all-day,summer,10.71080000000,R1,1,MUS$2010/PJ,2025 +ammonia,all-week,all-day,summer,461.98460000000,R1,1,MUS$2010/Mt,2025 +fuel3,all-week,all-day,spring-autumn,0.08280000000,R1,2,MUS$2010/PJ,2025 +fuel1,all-week,all-day,spring-autumn,1.16670000000,R1,2,MUS$2010/PJ,2025 +fuel2,all-week,all-day,spring-autumn,10.71080000000,R1,2,MUS$2010/PJ,2025 +ammonia,all-week,all-day,spring-autumn,461.98460000000,R1,2,MUS$2010/Mt,2025 +fuel3,all-week,all-day,winter,0.09540000000,R1,0,MUS$2010/PJ,2030 +fuel1,all-week,all-day,winter,1.15790000000,R1,0,MUS$2010/PJ,2030 +fuel2,all-week,all-day,winter,11.93900000000,R1,0,MUS$2010/PJ,2030 +ammonia,all-week,all-day,winter,516.55490000000,R1,0,MUS$2010/Mt,2030 +fuel3,all-week,all-day,summer,0.09540000000,R1,1,MUS$2010/PJ,2030 +fuel1,all-week,all-day,summer,1.15790000000,R1,1,MUS$2010/PJ,2030 +fuel2,all-week,all-day,summer,11.93900000000,R1,1,MUS$2010/PJ,2030 +ammonia,all-week,all-day,summer,516.55490000000,R1,1,MUS$2010/Mt,2030 +fuel3,all-week,all-day,spring-autumn,0.09540000000,R1,2,MUS$2010/PJ,2030 +fuel1,all-week,all-day,spring-autumn,1.15790000000,R1,2,MUS$2010/PJ,2030 +fuel2,all-week,all-day,spring-autumn,11.93900000000,R1,2,MUS$2010/PJ,2030 +ammonia,all-week,all-day,spring-autumn,516.55490000000,R1,2,MUS$2010/Mt,2030 +fuel3,all-week,all-day,winter,0.09070000000,R1,0,MUS$2010/PJ,2035 +fuel1,all-week,all-day,winter,1.14910000000,R1,0,MUS$2010/PJ,2035 +fuel2,all-week,all-day,winter,11.81550000000,R1,0,MUS$2010/PJ,2035 +ammonia,all-week,all-day,winter,485.53360000000,R1,0,MUS$2010/Mt,2035 +fuel3,all-week,all-day,summer,0.09070000000,R1,1,MUS$2010/PJ,2035 +fuel1,all-week,all-day,summer,1.14910000000,R1,1,MUS$2010/PJ,2035 +fuel2,all-week,all-day,summer,11.81550000000,R1,1,MUS$2010/PJ,2035 +ammonia,all-week,all-day,summer,485.53360000000,R1,1,MUS$2010/Mt,2035 +fuel3,all-week,all-day,spring-autumn,0.09070000000,R1,2,MUS$2010/PJ,2035 +fuel1,all-week,all-day,spring-autumn,1.14910000000,R1,2,MUS$2010/PJ,2035 +fuel2,all-week,all-day,spring-autumn,11.81550000000,R1,2,MUS$2010/PJ,2035 +ammonia,all-week,all-day,spring-autumn,485.53360000000,R1,2,MUS$2010/Mt,2035 +fuel3,all-week,all-day,winter,0.08600000000,R1,0,MUS$2010/PJ,2040 +fuel1,all-week,all-day,winter,1.14040000000,R1,0,MUS$2010/PJ,2040 +fuel2,all-week,all-day,winter,11.69200000000,R1,0,MUS$2010/PJ,2040 +ammonia,all-week,all-day,winter,454.09650000000,R1,0,MUS$2010/Mt,2040 +fuel3,all-week,all-day,summer,0.08600000000,R1,1,MUS$2010/PJ,2040 +fuel1,all-week,all-day,summer,1.14040000000,R1,1,MUS$2010/PJ,2040 +fuel2,all-week,all-day,summer,11.69200000000,R1,1,MUS$2010/PJ,2040 +ammonia,all-week,all-day,summer,454.09650000000,R1,1,MUS$2010/Mt,2040 +fuel3,all-week,all-day,spring-autumn,0.08600000000,R1,2,MUS$2010/PJ,2040 +fuel1,all-week,all-day,spring-autumn,1.14040000000,R1,2,MUS$2010/PJ,2040 +fuel2,all-week,all-day,spring-autumn,11.69200000000,R1,2,MUS$2010/PJ,2040 +ammonia,all-week,all-day,spring-autumn,454.09650000000,R1,2,MUS$2010/Mt,2040 +fuel3,all-week,all-day,winter,0.08600000000,R1,0,MUS$2010/PJ,2045 +fuel1,all-week,all-day,winter,1.14040000000,R1,0,MUS$2010/PJ,2045 +fuel2,all-week,all-day,winter,11.69200000000,R1,0,MUS$2010/PJ,2045 +ammonia,all-week,all-day,winter,451.89580000000,R1,0,MUS$2010/Mt,2045 +fuel3,all-week,all-day,summer,0.08600000000,R1,1,MUS$2010/PJ,2045 +fuel1,all-week,all-day,summer,1.14040000000,R1,1,MUS$2010/PJ,2045 +fuel2,all-week,all-day,summer,11.69200000000,R1,1,MUS$2010/PJ,2045 +ammonia,all-week,all-day,summer,451.89580000000,R1,1,MUS$2010/Mt,2045 +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,451.89580000000,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,449.67040000000,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,449.67040000000,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,449.67040000000,R1,2,MUS$2010/Mt,2050 diff --git a/tests/example_outputs/minimum_service/MCASupply.csv b/tests/example_outputs/minimum_service/MCASupply.csv new file mode 100644 index 000000000..099a575b8 --- /dev/null +++ b/tests/example_outputs/minimum_service/MCASupply.csv @@ -0,0 +1,55 @@ +commodity,day,hour,month,region,supply,timeslice,units_prices,year +ammonia,all-week,all-day,winter,R1,14.58600000000,0,MUS$2010/Mt,2010 +CO2f,all-week,all-day,winter,R1,53092.27940000000,0,MUS$2010/kt,2010 +ammonia,all-week,all-day,summer,R1,15.02800000000,1,MUS$2010/Mt,2010 +CO2f,all-week,all-day,summer,R1,54701.13630000000,1,MUS$2010/kt,2010 +ammonia,all-week,all-day,spring-autumn,R1,14.58600000000,2,MUS$2010/Mt,2010 +CO2f,all-week,all-day,spring-autumn,R1,53092.27940000000,2,MUS$2010/kt,2010 +ammonia,all-week,all-day,winter,R1,14.92000000000,0,MUS$2010/Mt,2015 +CO2f,all-week,all-day,winter,R1,55113.51750000000,0,MUS$2010/kt,2015 +ammonia,all-week,all-day,summer,R1,15.37220000000,1,MUS$2010/Mt,2015 +CO2f,all-week,all-day,summer,R1,56783.62400000000,1,MUS$2010/kt,2015 +ammonia,all-week,all-day,spring-autumn,R1,14.92000000000,2,MUS$2010/Mt,2015 +CO2f,all-week,all-day,spring-autumn,R1,55113.51750000000,2,MUS$2010/kt,2015 +ammonia,all-week,all-day,winter,R1,14.92000000000,0,MUS$2010/Mt,2020 +CO2f,all-week,all-day,winter,R1,56295.53450000000,0,MUS$2010/kt,2020 +ammonia,all-week,all-day,summer,R1,15.37220000000,1,MUS$2010/Mt,2020 +CO2f,all-week,all-day,summer,R1,58001.45970000000,1,MUS$2010/kt,2020 +ammonia,all-week,all-day,spring-autumn,R1,14.92000000000,2,MUS$2010/Mt,2020 +CO2f,all-week,all-day,spring-autumn,R1,56295.53450000000,2,MUS$2010/kt,2020 +ammonia,all-week,all-day,winter,R1,14.93090000000,0,MUS$2010/Mt,2025 +CO2f,all-week,all-day,winter,R1,57445.60100000000,0,MUS$2010/kt,2025 +ammonia,all-week,all-day,summer,R1,15.38340000000,1,MUS$2010/Mt,2025 +CO2f,all-week,all-day,summer,R1,59186.37670000000,1,MUS$2010/kt,2025 +ammonia,all-week,all-day,spring-autumn,R1,14.93090000000,2,MUS$2010/Mt,2025 +CO2f,all-week,all-day,spring-autumn,R1,57445.60100000000,2,MUS$2010/kt,2025 +ammonia,all-week,all-day,winter,R1,14.94180000000,0,MUS$2010/Mt,2030 +CO2f,all-week,all-day,winter,R1,58518.66690000000,0,MUS$2010/kt,2030 +ammonia,all-week,all-day,summer,R1,15.39460000000,1,MUS$2010/Mt,2030 +CO2f,all-week,all-day,summer,R1,60291.95980000000,1,MUS$2010/kt,2030 +ammonia,all-week,all-day,spring-autumn,R1,14.94180000000,2,MUS$2010/Mt,2030 +CO2f,all-week,all-day,spring-autumn,R1,58518.66690000000,2,MUS$2010/kt,2030 +ammonia,all-week,all-day,winter,R1,14.72400000000,0,MUS$2010/Mt,2035 +CO2f,all-week,all-day,winter,R1,58985.15200000000,0,MUS$2010/kt,2035 +ammonia,all-week,all-day,summer,R1,15.17020000000,1,MUS$2010/Mt,2035 +CO2f,all-week,all-day,summer,R1,60772.58080000000,1,MUS$2010/kt,2035 +ammonia,all-week,all-day,spring-autumn,R1,14.72400000000,2,MUS$2010/Mt,2035 +CO2f,all-week,all-day,spring-autumn,R1,58985.15200000000,2,MUS$2010/kt,2035 +ammonia,all-week,all-day,winter,R1,14.50610000000,0,MUS$2010/Mt,2040 +CO2f,all-week,all-day,winter,R1,58680.98930000000,0,MUS$2010/kt,2040 +ammonia,all-week,all-day,summer,R1,14.94570000000,1,MUS$2010/Mt,2040 +CO2f,all-week,all-day,summer,R1,60459.20110000000,1,MUS$2010/kt,2040 +ammonia,all-week,all-day,spring-autumn,R1,14.50610000000,2,MUS$2010/Mt,2040 +CO2f,all-week,all-day,spring-autumn,R1,58680.98930000000,2,MUS$2010/kt,2040 +ammonia,all-week,all-day,winter,R1,14.09730000000,0,MUS$2010/Mt,2045 +CO2f,all-week,all-day,winter,R1,56747.97620000000,0,MUS$2010/kt,2045 +ammonia,all-week,all-day,summer,R1,14.52450000000,1,MUS$2010/Mt,2045 +CO2f,all-week,all-day,summer,R1,58467.61180000000,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,56747.97620000000,2,MUS$2010/kt,2045 +ammonia,all-week,all-day,winter,R1,13.68850000000,0,MUS$2010/Mt,2050 +CO2f,all-week,all-day,winter,R1,54828.11040000000,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,56489.56820000000,1,MUS$2010/kt,2050 +ammonia,all-week,all-day,spring-autumn,R1,13.68850000000,2,MUS$2010/Mt,2050 +CO2f,all-week,all-day,spring-autumn,R1,54828.11040000000,2,MUS$2010/kt,2050 diff --git a/tests/example_outputs/multiple_agents/Gas/Capacity.csv b/tests/example_outputs/multiple_agents/Gas/Capacity.csv deleted file mode 100644 index b8b8c36a0..000000000 --- a/tests/example_outputs/multiple_agents/Gas/Capacity.csv +++ /dev/null @@ -1,18 +0,0 @@ -asset,capacity,installed,region,technology,year -0,15.00000000000,2020,R1,gassupply1,2020 -0,16.73530000000,2020,R1,gassupply1,2025 -0,9.23530000000,2020,R1,gassupply1,2030 -1,9.28910000000,2025,R1,gassupply1,2030 -0,1.73530000000,2020,R1,gassupply1,2035 -1,9.28910000000,2025,R1,gassupply1,2035 -2,7.47410000000,2030,R1,gassupply1,2035 -0,1.73530000000,2020,R1,gassupply1,2040 -1,9.28910000000,2025,R1,gassupply1,2040 -2,7.47410000000,2030,R1,gassupply1,2040 -0,1.73530000000,2020,R1,gassupply1,2045 -1,9.28910000000,2025,R1,gassupply1,2045 -2,7.47410000000,2030,R1,gassupply1,2045 -0,1.73530000000,2020,R1,gassupply1,2050 -1,9.28910000000,2025,R1,gassupply1,2050 -2,7.47410000000,2030,R1,gassupply1,2050 -3,0.30680000000,2045,R1,gassupply1,2050 diff --git a/tests/example_outputs/multiple_agents/MCACapacity.csv b/tests/example_outputs/multiple_agents/MCACapacity.csv index fbdd171b6..2258c64d7 100644 --- a/tests/example_outputs/multiple_agents/MCACapacity.csv +++ b/tests/example_outputs/multiple_agents/MCACapacity.csv @@ -64,8 +64,7 @@ A1,6.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2050 A1,6.00000000000,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,10.00000000000,R1,2045,R1,power,windturbine,newcapa,2050 +A1,11.00000000000,R1,2045,R1,power,windturbine,newcapa,2050 A1,1.73530000000,R1,2020,R1,gas,gassupply1,newcapa,2050 A1,9.28910000000,R1,2025,R1,gas,gassupply1,newcapa,2050 A1,7.47410000000,R1,2030,R1,gas,gassupply1,newcapa,2050 -A1,0.30680000000,R1,2045,R1,gas,gassupply1,newcapa,2050 diff --git a/tests/example_outputs/multiple_agents/MCAPrices.csv b/tests/example_outputs/multiple_agents/MCAPrices.csv index e692a7519..20946c704 100644 --- a/tests/example_outputs/multiple_agents/MCAPrices.csv +++ b/tests/example_outputs/multiple_agents/MCAPrices.csv @@ -143,27 +143,27 @@ electricity,all-week,evening,all-year,18.26600000000,R1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2045 heat,all-week,evening,all-year,7.54690000000,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.18470000000,R1,0,MUS$2010/PJ,2050 +electricity,all-week,night,all-year,19.84020000000,R1,0,MUS$2010/PJ,2050 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,8.31440000000,R1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,8.17660000000,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.18470000000,R1,1,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,19.84020000000,R1,1,MUS$2010/PJ,2050 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,8.31440000000,R1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,8.17660000000,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.18470000000,R1,2,MUS$2010/PJ,2050 +electricity,all-week,afternoon,all-year,19.84020000000,R1,2,MUS$2010/PJ,2050 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,8.31440000000,R1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,8.17660000000,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.18470000000,R1,3,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,19.84020000000,R1,3,MUS$2010/PJ,2050 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,8.31440000000,R1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,8.17660000000,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.18470000000,R1,4,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,19.84020000000,R1,4,MUS$2010/PJ,2050 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,8.31440000000,R1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,8.17660000000,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.18470000000,R1,5,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,19.84020000000,R1,5,MUS$2010/PJ,2050 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,8.31440000000,R1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,8.17660000000,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/multiple_agents/Power/Capacity.csv b/tests/example_outputs/multiple_agents/Power/Capacity.csv deleted file mode 100644 index 847c7f8b4..000000000 --- a/tests/example_outputs/multiple_agents/Power/Capacity.csv +++ /dev/null @@ -1,28 +0,0 @@ -asset,capacity,installed,region,technology,year -0,1,2020,R1,gasCCGT,2020 -0,6,2020,R1,gasCCGT,2025 -2,5,2020,R1,windturbine,2025 -0,5,2020,R1,gasCCGT,2030 -1,6,2025,R1,gasCCGT,2030 -2,5,2020,R1,windturbine,2030 -0,5,2020,R1,gasCCGT,2035 -1,6,2025,R1,gasCCGT,2035 -2,5,2020,R1,windturbine,2035 -3,6,2030,R1,windturbine,2035 -0,5,2020,R1,gasCCGT,2040 -1,6,2025,R1,gasCCGT,2040 -2,5,2020,R1,windturbine,2040 -3,6,2030,R1,windturbine,2040 -4,6,2035,R1,windturbine,2040 -0,5,2020,R1,gasCCGT,2045 -1,6,2025,R1,gasCCGT,2045 -3,5,2020,R1,windturbine,2045 -4,6,2030,R1,windturbine,2045 -5,6,2035,R1,windturbine,2045 -6,6,2040,R1,windturbine,2045 -0,5,2020,R1,gasCCGT,2050 -1,6,2025,R1,gasCCGT,2050 -4,6,2030,R1,windturbine,2050 -5,6,2035,R1,windturbine,2050 -6,6,2040,R1,windturbine,2050 -7,10,2045,R1,windturbine,2050 diff --git a/tests/example_outputs/multiple_agents/Residential/Capacity.csv b/tests/example_outputs/multiple_agents/Residential/Capacity.csv deleted file mode 100644 index d2c867272..000000000 --- a/tests/example_outputs/multiple_agents/Residential/Capacity.csv +++ /dev/null @@ -1,14 +0,0 @@ -asset,capacity,installed,region,technology,year -0,10.00000000000,2020,R1,gasboiler,2020 -0,5.00000000000,2020,R1,gasboiler,2025 -1,19.00000000000,2020,R1,heatpump,2025 -1,19.00000000000,2020,R1,heatpump,2030 -2,11.00000000000,2025,R1,heatpump,2030 -2,11.00000000000,2025,R1,heatpump,2035 -3,25.00000000000,2030,R1,heatpump,2035 -3,25.00000000000,2030,R1,heatpump,2040 -4,17.00000000000,2035,R1,heatpump,2040 -4,17.00000000000,2035,R1,heatpump,2045 -5,31.00000000000,2040,R1,heatpump,2045 -5,31.00000000000,2040,R1,heatpump,2050 -6,23.00000000000,2045,R1,heatpump,2050 diff --git a/tests/example_outputs/multiple_agents/Residential/Supply.csv b/tests/example_outputs/multiple_agents/Residential/Supply.csv deleted file mode 100644 index f33b0f268..000000000 --- a/tests/example_outputs/multiple_agents/Residential/Supply.csv +++ /dev/null @@ -1,91 +0,0 @@ -asset,commodity,day,hour,installed,month,region,supply,technology,timeslice,year -0,heat,all-week,night,2020,all-year,R1,1.00000000000,gasboiler,0,2020 -0,CO2f,all-week,night,2020,all-year,R1,64.71000000000,gasboiler,0,2020 -0,heat,all-week,morning,2020,all-year,R1,1.50000000000,gasboiler,1,2020 -0,CO2f,all-week,morning,2020,all-year,R1,97.06500000000,gasboiler,1,2020 -0,heat,all-week,afternoon,2020,all-year,R1,1.00000000000,gasboiler,2,2020 -0,CO2f,all-week,afternoon,2020,all-year,R1,64.71000000000,gasboiler,2,2020 -0,heat,all-week,early-peak,2020,all-year,R1,1.50000000000,gasboiler,3,2020 -0,CO2f,all-week,early-peak,2020,all-year,R1,97.06500000000,gasboiler,3,2020 -0,heat,all-week,late-peak,2020,all-year,R1,3.00000000000,gasboiler,4,2020 -0,CO2f,all-week,late-peak,2020,all-year,R1,194.13000000000,gasboiler,4,2020 -0,heat,all-week,evening,2020,all-year,R1,2.00000000000,gasboiler,5,2020 -0,CO2f,all-week,evening,2020,all-year,R1,129.42000000000,gasboiler,5,2020 -0,heat,all-week,night,2020,all-year,R1,0.27780000000,gasboiler,0,2025 -1,heat,all-week,night,2020,all-year,R1,1.05560000000,heatpump,0,2025 -0,CO2f,all-week,night,2020,all-year,R1,17.97500000000,gasboiler,0,2025 -0,heat,all-week,morning,2020,all-year,R1,0.41670000000,gasboiler,1,2025 -1,heat,all-week,morning,2020,all-year,R1,1.58330000000,heatpump,1,2025 -0,CO2f,all-week,morning,2020,all-year,R1,26.96250000000,gasboiler,1,2025 -0,heat,all-week,afternoon,2020,all-year,R1,0.27780000000,gasboiler,2,2025 -1,heat,all-week,afternoon,2020,all-year,R1,1.05560000000,heatpump,2,2025 -0,CO2f,all-week,afternoon,2020,all-year,R1,17.97500000000,gasboiler,2,2025 -0,heat,all-week,early-peak,2020,all-year,R1,0.41670000000,gasboiler,3,2025 -1,heat,all-week,early-peak,2020,all-year,R1,1.58330000000,heatpump,3,2025 -0,CO2f,all-week,early-peak,2020,all-year,R1,26.96250000000,gasboiler,3,2025 -0,heat,all-week,late-peak,2020,all-year,R1,0.83330000000,gasboiler,4,2025 -1,heat,all-week,late-peak,2020,all-year,R1,3.16670000000,heatpump,4,2025 -0,CO2f,all-week,late-peak,2020,all-year,R1,53.92500000000,gasboiler,4,2025 -0,heat,all-week,evening,2020,all-year,R1,0.55560000000,gasboiler,5,2025 -1,heat,all-week,evening,2020,all-year,R1,2.11110000000,heatpump,5,2025 -0,CO2f,all-week,evening,2020,all-year,R1,35.95000000000,gasboiler,5,2025 -1,heat,all-week,night,2020,all-year,R1,1.05560000000,heatpump,0,2030 -2,heat,all-week,night,2025,all-year,R1,0.61110000000,heatpump,0,2030 -1,heat,all-week,morning,2020,all-year,R1,1.58330000000,heatpump,1,2030 -2,heat,all-week,morning,2025,all-year,R1,0.91670000000,heatpump,1,2030 -1,heat,all-week,afternoon,2020,all-year,R1,1.05560000000,heatpump,2,2030 -2,heat,all-week,afternoon,2025,all-year,R1,0.61110000000,heatpump,2,2030 -1,heat,all-week,early-peak,2020,all-year,R1,1.58330000000,heatpump,3,2030 -2,heat,all-week,early-peak,2025,all-year,R1,0.91670000000,heatpump,3,2030 -1,heat,all-week,late-peak,2020,all-year,R1,3.16670000000,heatpump,4,2030 -2,heat,all-week,late-peak,2025,all-year,R1,1.83330000000,heatpump,4,2030 -1,heat,all-week,evening,2020,all-year,R1,2.11110000000,heatpump,5,2030 -2,heat,all-week,evening,2025,all-year,R1,1.22220000000,heatpump,5,2030 -2,heat,all-week,night,2025,all-year,R1,0.61110000000,heatpump,0,2035 -3,heat,all-week,night,2030,all-year,R1,1.38890000000,heatpump,0,2035 -2,heat,all-week,morning,2025,all-year,R1,0.91670000000,heatpump,1,2035 -3,heat,all-week,morning,2030,all-year,R1,2.08330000000,heatpump,1,2035 -2,heat,all-week,afternoon,2025,all-year,R1,0.61110000000,heatpump,2,2035 -3,heat,all-week,afternoon,2030,all-year,R1,1.38890000000,heatpump,2,2035 -2,heat,all-week,early-peak,2025,all-year,R1,0.91670000000,heatpump,3,2035 -3,heat,all-week,early-peak,2030,all-year,R1,2.08330000000,heatpump,3,2035 -2,heat,all-week,late-peak,2025,all-year,R1,1.83330000000,heatpump,4,2035 -3,heat,all-week,late-peak,2030,all-year,R1,4.16670000000,heatpump,4,2035 -2,heat,all-week,evening,2025,all-year,R1,1.22220000000,heatpump,5,2035 -3,heat,all-week,evening,2030,all-year,R1,2.77780000000,heatpump,5,2035 -3,heat,all-week,night,2030,all-year,R1,1.38890000000,heatpump,0,2040 -4,heat,all-week,night,2035,all-year,R1,0.94440000000,heatpump,0,2040 -3,heat,all-week,morning,2030,all-year,R1,2.08330000000,heatpump,1,2040 -4,heat,all-week,morning,2035,all-year,R1,1.41670000000,heatpump,1,2040 -3,heat,all-week,afternoon,2030,all-year,R1,1.38890000000,heatpump,2,2040 -4,heat,all-week,afternoon,2035,all-year,R1,0.94440000000,heatpump,2,2040 -3,heat,all-week,early-peak,2030,all-year,R1,2.08330000000,heatpump,3,2040 -4,heat,all-week,early-peak,2035,all-year,R1,1.41670000000,heatpump,3,2040 -3,heat,all-week,late-peak,2030,all-year,R1,4.16670000000,heatpump,4,2040 -4,heat,all-week,late-peak,2035,all-year,R1,2.83330000000,heatpump,4,2040 -3,heat,all-week,evening,2030,all-year,R1,2.77780000000,heatpump,5,2040 -4,heat,all-week,evening,2035,all-year,R1,1.88890000000,heatpump,5,2040 -4,heat,all-week,night,2035,all-year,R1,0.94440000000,heatpump,0,2045 -5,heat,all-week,night,2040,all-year,R1,1.72220000000,heatpump,0,2045 -4,heat,all-week,morning,2035,all-year,R1,1.41670000000,heatpump,1,2045 -5,heat,all-week,morning,2040,all-year,R1,2.58330000000,heatpump,1,2045 -4,heat,all-week,afternoon,2035,all-year,R1,0.94440000000,heatpump,2,2045 -5,heat,all-week,afternoon,2040,all-year,R1,1.72220000000,heatpump,2,2045 -4,heat,all-week,early-peak,2035,all-year,R1,1.41670000000,heatpump,3,2045 -5,heat,all-week,early-peak,2040,all-year,R1,2.58330000000,heatpump,3,2045 -4,heat,all-week,late-peak,2035,all-year,R1,2.83330000000,heatpump,4,2045 -5,heat,all-week,late-peak,2040,all-year,R1,5.16670000000,heatpump,4,2045 -4,heat,all-week,evening,2035,all-year,R1,1.88890000000,heatpump,5,2045 -5,heat,all-week,evening,2040,all-year,R1,3.44440000000,heatpump,5,2045 -5,heat,all-week,night,2040,all-year,R1,1.72220000000,heatpump,0,2050 -6,heat,all-week,night,2045,all-year,R1,1.27780000000,heatpump,0,2050 -5,heat,all-week,morning,2040,all-year,R1,2.58330000000,heatpump,1,2050 -6,heat,all-week,morning,2045,all-year,R1,1.91670000000,heatpump,1,2050 -5,heat,all-week,afternoon,2040,all-year,R1,1.72220000000,heatpump,2,2050 -6,heat,all-week,afternoon,2045,all-year,R1,1.27780000000,heatpump,2,2050 -5,heat,all-week,early-peak,2040,all-year,R1,2.58330000000,heatpump,3,2050 -6,heat,all-week,early-peak,2045,all-year,R1,1.91670000000,heatpump,3,2050 -5,heat,all-week,late-peak,2040,all-year,R1,5.16670000000,heatpump,4,2050 -6,heat,all-week,late-peak,2045,all-year,R1,3.83330000000,heatpump,4,2050 -5,heat,all-week,evening,2040,all-year,R1,3.44440000000,heatpump,5,2050 -6,heat,all-week,evening,2045,all-year,R1,2.55560000000,heatpump,5,2050 diff --git a/tests/example_outputs/trade/Gas/Capacity.csv b/tests/example_outputs/trade/Gas/Capacity.csv deleted file mode 100644 index c190aea60..000000000 --- a/tests/example_outputs/trade/Gas/Capacity.csv +++ /dev/null @@ -1,9 +0,0 @@ -dst_region,year,asset,region,technology,installed,capacity -R1,2020,0,R1,gassupply1,2010,3000.00000000000 -R2,2020,1,R2,gassupply1,2010,1200.00000000000 -R1,2025,0,R1,gassupply1,2010,2100.00000000000 -R2,2025,1,R2,gassupply1,2010,700.00000000000 -R1,2030,0,R1,gassupply1,2010,2100.00000000000 -R2,2030,1,R2,gassupply1,2010,700.00000000000 -R1,2035,0,R1,gassupply1,2010,1470.00000000000 -R2,2035,1,R2,gassupply1,2010,490.00000000000 diff --git a/tests/example_outputs/trade/Power/Capacity.csv b/tests/example_outputs/trade/Power/Capacity.csv deleted file mode 100644 index 0864331dd..000000000 --- a/tests/example_outputs/trade/Power/Capacity.csv +++ /dev/null @@ -1,9 +0,0 @@ -dst_region,year,asset,region,technology,installed,capacity -R1,2020,0,R1,gasCCGT,2010,240.00000000000 -R2,2020,1,R2,gasCCGT,2010,200.00000000000 -R1,2025,0,R1,gasCCGT,2010,192.00000000000 -R2,2025,1,R2,gasCCGT,2010,140.00000000000 -R1,2030,0,R1,gasCCGT,2010,153.60000000000 -R2,2030,1,R2,gasCCGT,2010,98.00000000000 -R1,2035,0,R1,gasCCGT,2010,122.88000000000 -R2,2035,1,R2,gasCCGT,2010,68.60000000000 diff --git a/tests/example_outputs/trade/Residential/Capacity.csv b/tests/example_outputs/trade/Residential/Capacity.csv deleted file mode 100644 index 8add49406..000000000 --- a/tests/example_outputs/trade/Residential/Capacity.csv +++ /dev/null @@ -1,15 +0,0 @@ -asset,year,region,technology,installed,capacity -0,2020,R1,gasboiler,2010,662.76000000000 -2,2020,R2,gasboiler,2010,35.00000000000 -0,2025,R1,gasboiler,2010,463.93200000000 -1,2025,R1,gasboiler,2020,355.93470000000 -3,2025,R2,gasboiler,2010,24.50000000000 -0,2030,R1,gasboiler,2010,463.93200000000 -1,2030,R1,gasboiler,2020,355.93470000000 -2,2030,R1,gasboiler,2025,74.53330000000 -4,2030,R2,gasboiler,2010,24.50000000000 -0,2035,R1,gasboiler,2010,394.34220000000 -1,2035,R1,gasboiler,2025,74.53330000000 -2,2035,R1,gasboiler,2030,444.15780000000 -3,2035,R2,gasboiler,2010,17.15000000000 -4,2035,R2,gasboiler,2030,1.63330000000 diff --git a/tests/test_readers.py b/tests/test_readers.py index c2ee83273..f98d2b6ae 100644 --- a/tests/test_readers.py +++ b/tests/test_readers.py @@ -459,7 +459,7 @@ def test_read_technodictionary(default_model): tech_type=np.dtype("