Merge branch 'develop' into update/pre-commit-hooks

Author: tsmbland

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": {

docs/tutorial-code/1-add-new-technology/1-introduction/Results/Gas/Capacity.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

docs/tutorial-code/1-add-new-technology/1-introduction/Results/MCACapacity.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

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

@@ -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

docs/tutorial-code/1-add-new-technology/1-introduction/Results/Power/Capacity.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

docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Capacity.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