Merge branch 'develop' into main

Author: tsmbland

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 1.2.0rc1
+current_version = 1.2.0rc2
 commit = True
 tag = True
 

CITATION.cff

@@ -9,5 +9,5 @@ authors:
       given-names: Adam
 
 title: MUSE_OS
-version: v1.2.0rc1
-date-released: 2024-07-29
+version: v1.2.0rc2
+date-released: 2024-08-13

docs/advanced-guide/extending-muse.ipynb

@@ -99,7 +99,6 @@
     "def consumption_zero(\n",
     "    market: Dataset,\n",
     "    capacity: DataArray,\n",
-    "    technologies: Dataset,\n",
     "):\n",
     "    \"\"\"Current consumption.\"\"\"\n",
     "    result = (\n",
@@ -451,7 +450,6 @@
     "def consumption_zero(  # noqa: F811\n",
     "    market: Dataset,\n",
     "    capacity: DataArray,\n",
-    "    technologies: Dataset,\n",
     "    sum_over: Optional[list[str]] = None,\n",
     "    drop: Optional[list[str]] = None,\n",
     "    rounding: int = 4,\n",

docs/conf.py

@@ -8,7 +8,7 @@
 project = "MUSE"
 copyright = "2024, Imperial College London"
 author = "Imperial College London"
-release = "1.2.0rc1"
+release = "1.2.0rc2"
 version = ".".join(release.split(".")[:2])
 
 # -- General configuration ---------------------------------------------------

docs/inputs/toml.rst

@@ -670,27 +670,19 @@ The following attributes are accepted:
    The CSV format should follow the following format:
 
    .. csv-table:: Consumption
-      :header: " ", "RegionName", "ProcessName", "Timeslice", "electricity", "diesel", "algae"
-      :stub-columns: 4
+      :header: "RegionName", "Timeslice", "electricity", "diesel", "algae"
+      :stub-columns: 2
 
-      0,USA,fluorescent light,1,1.9, 0, 0
-      1,USA,fluorescent light,2,1.8, 0, 0
+      USA,1,1.9,0,0
+      USA,2,1.8,0,0
 
-
-   The index column as well as "RegionName", "ProcessName", and "Timeslice" must be
-   present. Further columns are reserved for commodities. "Timeslice" refers to the
+   The "RegionName" and "Timeslice" columns must be present.
+   Further columns are reserved for commodities. "Timeslice" refers to the
    index of the timeslice. Timeslices should be defined consistently to the sectoral
    level timeslices.
-   The column "ProcessName" needs to be present and filled in, in order for the data
-   to be read properly but it does not affect the simulation.
-
-
-*supply_path*
-   CSV file, one per year, indicating the amount of a commodities produced. It follows
-   the same format as :ref:`consumption_path <preset-consumption>`.
 
 *supply_path*
-   CSV file, one per year, indicating the amount of a commodities produced. It follows
+   CSV file, one per year, indicating the amount of commodities produced. It follows
    the same format as :ref:`consumption_path <preset-consumption>`.
 
 *prices_path*

docs/tutorial-code/0-new-decision-metric/technodata/preset/Residential2020Consumption.csv

@@ -1,7 +1,7 @@
-,RegionName,ProcessName,Timeslice,electricity,gas,heat,CO2f,wind
-0,R1,gasboiler,1,0,0,1,0,0
-1,R1,gasboiler,2,0,0,1.5,0,0
-2,R1,gasboiler,3,0,0,1,0,0
-3,R1,gasboiler,4,0,0,1.5,0,0
-4,R1,gasboiler,5,0,0,3,0,0
-5,R1,gasboiler,6,0,0,2,0,0
+RegionName,Timeslice,electricity,gas,heat,CO2f,wind
+R1,1,0,0,1,0,0
+R1,2,0,0,1.5,0,0
+R1,3,0,0,1,0,0
+R1,4,0,0,1.5,0,0
+R1,5,0,0,3,0,0
+R1,6,0,0,2,0,0

docs/tutorial-code/0-new-decision-metric/technodata/preset/Residential2050Consumption.csv

@@ -1,7 +1,7 @@
-,RegionName,ProcessName,Timeslice,electricity,gas,heat,CO2f,wind
-0,R1,gasboiler,1,0,0,3,0,0
-1,R1,gasboiler,2,0,0,4.5,0,0
-2,R1,gasboiler,3,0,0,3,0,0
-3,R1,gasboiler,4,0,0,4.5,0,0
-4,R1,gasboiler,5,0,0,9,0,0
-5,R1,gasboiler,6,0,0,6,0,0
+RegionName,Timeslice,electricity,gas,heat,CO2f,wind
+R1,1,0,0,3,0,0
+R1,2,0,0,4.5,0,0
+R1,3,0,0,3,0,0
+R1,4,0,0,4.5,0,0
+R1,5,0,0,9,0,0
+R1,6,0,0,6,0,0

docs/tutorial-code/1-add-new-technology/1-introduction/technodata/preset/Residential2020Consumption.csv

@@ -1,7 +1,7 @@
-RegionName,ProcessName,Timeslice,electricity,gas,heat,CO2f,wind,solar
-R1,gasboiler,1,0,0,1.0,0,0,0
-R1,gasboiler,2,0,0,1.5,0,0,0
-R1,gasboiler,3,0,0,1.0,0,0,0
-R1,gasboiler,4,0,0,1.5,0,0,0
-R1,gasboiler,5,0,0,3.0,0,0,0
-R1,gasboiler,6,0,0,2.0,0,0,0
+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

docs/tutorial-code/1-add-new-technology/1-introduction/technodata/preset/Residential2050Consumption.csv

@@ -1,7 +1,7 @@
-RegionName,ProcessName,Timeslice,electricity,gas,heat,CO2f,wind,solar
-R1,gasboiler,1,0,0,3.0,0,0,0
-R1,gasboiler,2,0,0,4.5,0,0,0
-R1,gasboiler,3,0,0,3.0,0,0,0
-R1,gasboiler,4,0,0,4.5,0,0,0
-R1,gasboiler,5,0,0,9.0,0,0,0
-R1,gasboiler,6,0,0,6.0,0,0,0
+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

docs/tutorial-code/1-add-new-technology/2-scenario/technodata/preset/Residential2020Consumption.csv

@@ -1,7 +1,7 @@
-RegionName,ProcessName,Timeslice,electricity,gas,heat,CO2f,wind,solar
-R1,gasboiler,1,0,0,1.0,0,0,0
-R1,gasboiler,2,0,0,1.5,0,0,0
-R1,gasboiler,3,0,0,1.0,0,0,0
-R1,gasboiler,4,0,0,1.5,0,0,0
-R1,gasboiler,5,0,0,3.0,0,0,0
-R1,gasboiler,6,0,0,2.0,0,0,0
+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