Merge branch 'develop' into new-data-input

Author: tsmbland

CITATION.cff

@@ -8,6 +8,6 @@ authors:
     - family-names: Hawkes
       given-names: Adam
 
-title: SGIModel/MUSE_OS
+title: MUSE_OS
 version: v1.0.1
 date-released: 2022-03-25

docs/conf.py

@@ -6,7 +6,7 @@
 # -- Project information -----------------------------------------------------
 
 project = "MUSE"
-copyright = "2022, Sustainable Gas Institute"
+copyright = "2024, Imperial College London"
 author = "Imperial College London"
 release = "1.1.0"
 version = ".".join(release.split(".")[:2])

docs/objects.inv

@@ -76,6 +76,7 @@ commodities_out = '{path}/technodata/power/CommOut.csv'
 agents = '{path}/technodata/Agents.csv'
 existing_capacity = '{path}/technodata/power/ExistingCapacity.csv'
 lpsolver = "scipy"
+demand_share = "standard_demand"
 
 [sectors.gas]
 type = 'default'
@@ -89,6 +90,7 @@ commodities_out = '{path}/technodata/gas/CommOut.csv'
 agents = '{path}/technodata/Agents.csv'
 existing_capacity = '{path}/technodata/gas/ExistingCapacity.csv'
 lpsolver = "scipy"
+demand_share = "standard_demand"
 
 [sectors.residential_presets]
 type = 'presets'