Merge branch 'main' into v1.2.2

.github/PULL_REQUEST_TEMPLATE.md

@@ -8,10 +8,6 @@ Fixes # (issue)
 
 ## Type of change
 
-Please add a line in the relevant section of
-[CHANGELOG.md](https://github.com/EnergySystemsModellingLab/MUSE_OS/blob/development/CHANGELOG.md) to
-document the change (include PR #) - note reverse order of PR #s.
-
 - [ ] New feature (non-breaking change which adds functionality)
 - [ ] Optimization (non-breaking, back-end change that speeds up the code)
 - [ ] Bug fix (non-breaking change which fixes an issue)

.github/workflows/ci.yml

@@ -4,7 +4,7 @@ on:
   pull_request:
     types: [opened, synchronize, reopened]
   push:
-    branches: [main, develop]
+    branches: main
   workflow_call:
 
 jobs:

docs/getting-help.rst

@@ -5,7 +5,7 @@ Getting help
 
 Using MUSE can be daunting at first. It is a very powerful tool, but unleashing all its capabilities might take some time and effort. There are several resources available to help you with that:
 
-- :ref:`customising-muse`: The tutorials - and the underlying code, `available in the GitHub repository <https://github.com/EnergySystemsModellingLab/MUSE_OS/tree/develop/docs/tutorial-code>`_ - are the easiest way to start using MUSE and adapting it to your own needs. Look for one that looks similar to what you will need and use it as the starting point of your own simulation.
+- :ref:`customising-muse`: The tutorials - and the underlying code, `available in the GitHub repository <https://github.com/EnergySystemsModellingLab/MUSE_OS/tree/main/docs/tutorial-code>`_ - are the easiest way to start using MUSE and adapting it to your own needs. Look for one that looks similar to what you will need and use it as the starting point of your own simulation.
 
 - The `MUSE users mailing list <https://groups.google.com/g/muse-model>`_ is your next stop to get help with MUSE. Have a look at past topics in case anyone has hit the same issue as you or open your own questions if nothing fits what you are looking for.
 

docs/tutorial-code/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,month,day,hour,UtilizationFactor,MinimumServiceFactor
+Unit,-,Year,-,-,-,-,-
+gasCCGT,R1,2020,all-year,all-week,night,1,0.2
+gasCCGT,R1,2020,all-year,all-week,morning,1,0.4
+gasCCGT,R1,2020,all-year,all-week,afternoon,1,0.6
+gasCCGT,R1,2020,all-year,all-week,early-peak,1,0.4
+gasCCGT,R1,2020,all-year,all-week,late-peak,1,0.8
+gasCCGT,R1,2020,all-year,all-week,evening,1,1
+windturbine,R1,2020,all-year,all-week,night,1,0
+windturbine,R1,2020,all-year,all-week,morning,1,0
+windturbine,R1,2020,all-year,all-week,afternoon,1,0
+windturbine,R1,2020,all-year,all-week,early-peak,1,0
+windturbine,R1,2020,all-year,all-week,late-peak,1,0
+windturbine,R1,2020,all-year,all-week,evening,1,0

docs/tutorial-code/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,0.5,0
-gasCCGT,R1,2020,upper,all-year,all-week,evening,0.5,0
-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,month,day,hour,UtilizationFactor,MinimumServiceFactor
+Unit,-,Year,-,-,-,-,-
+gasCCGT,R1,2020,all-year,all-week,night,1,0.2
+gasCCGT,R1,2020,all-year,all-week,morning,1,0.4
+gasCCGT,R1,2020,all-year,all-week,afternoon,1,0.6
+gasCCGT,R1,2020,all-year,all-week,early-peak,1,0.4
+gasCCGT,R1,2020,all-year,all-week,late-peak,0.5,0
+gasCCGT,R1,2020,all-year,all-week,evening,0.5,0
+windturbine,R1,2020,all-year,all-week,night,1,0
+windturbine,R1,2020,all-year,all-week,morning,1,0
+windturbine,R1,2020,all-year,all-week,afternoon,1,0
+windturbine,R1,2020,all-year,all-week,early-peak,1,0
+windturbine,R1,2020,all-year,all-week,late-peak,1,0
+windturbine,R1,2020,all-year,all-week,evening,1,0

src/muse/data/example/default_timeslice/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
-gasCCGT,R1,2020,upper,all-year,all-week,morning,1,0
-gasCCGT,R1,2020,upper,all-year,all-week,afternoon,1,0
-gasCCGT,R1,2020,upper,all-year,all-week,early-peak,1,0
-gasCCGT,R1,2020,upper,all-year,all-week,late-peak,1,0
-gasCCGT,R1,2020,upper,all-year,all-week,evening,1,0
-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,month,day,hour,UtilizationFactor,MinimumServiceFactor
+Unit,-,Year,-,-,-,-,-
+gasCCGT,R1,2020,all-year,all-week,night,1,0
+gasCCGT,R1,2020,all-year,all-week,morning,1,0
+gasCCGT,R1,2020,all-year,all-week,afternoon,1,0
+gasCCGT,R1,2020,all-year,all-week,early-peak,1,0
+gasCCGT,R1,2020,all-year,all-week,late-peak,1,0
+gasCCGT,R1,2020,all-year,all-week,evening,1,0
+windturbine,R1,2020,all-year,all-week,night,1,0
+windturbine,R1,2020,all-year,all-week,morning,1,0
+windturbine,R1,2020,all-year,all-week,afternoon,1,0
+windturbine,R1,2020,all-year,all-week,early-peak,1,0
+windturbine,R1,2020,all-year,all-week,late-peak,1,0
+windturbine,R1,2020,all-year,all-week,evening,1,0

src/muse/utilities.py

@@ -412,6 +412,8 @@ def merge_assets(
             dim=dimension,
         )
     forgroup = result.pipe(coords_to_multiindex, dimension=dimension)
+    if isinstance(forgroup, xr.DataArray):
+        forgroup = forgroup.to_dataset()
     if len(forgroup[dimension]) != len(set(forgroup[dimension].values)):
         result = (
             forgroup.groupby(dimension)

tests/test_utilities.py

@@ -269,7 +269,7 @@ def fake(year, order=("installed", "technology")):
             .interp(year=ab_side.year, method="linear")
             .fillna(0)
         )
-        assert ab_side.values == approx((a_side + b_side).values)
+        assert (ab_side.capacity == approx((a_side + b_side).values)).all()
 
 
 def test_avoid_repetitions():