From bd875ac4372f9d6018f98a4b039496ce989ab6ef Mon Sep 17 00:00:00 2001 From: Diego Alonso Alvarez Date: Fri, 21 Jun 2024 11:12:19 +0100 Subject: [PATCH 01/12] Add minimum_production quantity --- src/muse/quantities.py | 52 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/src/muse/quantities.py b/src/muse/quantities.py index 162e1fcf5..ae27ee42b 100644 --- a/src/muse/quantities.py +++ b/src/muse/quantities.py @@ -660,3 +660,55 @@ def group_assets(x: xr.DataArray) -> xr.DataArray: result = xr.zeros_like(maxprod) result[dict(commodity=commodity)] = result[dict(commodity=commodity)] + production return result + + +def minimum_production(technologies: xr.Dataset, capacity: xr.DataArray, **filters): + r"""Minimum production for a given capacity. + + Given a capacity :math:`\mathcal{A}_{t, \iota}^r`, the minimum service factor + :math:`\alpha^r_{t, \iota}` and the the fixed outputs of each technology + :math:`\beta^r_{t, \iota, c}`, then the result production is: + + .. math:: + + P_{t, \iota}^r = + \alpha^r_{t, \iota}\beta^r_{t, \iota, c}\mathcal{A}_{t, \iota}^r + + The dimensions above are only indicative. The function should work with many + different input values, e.g. with capacities expanded over time-slices :math:`t` or + agents :math:`i`. + + Arguments: + capacity: Capacity of each technology of interest. In practice, the capacity can + refer to asset capacity, the max capacity, or the capacity-in-use. + technologies: xr.Dataset describing the features of the technologies of + interests. It should contain `fixed_outputs` and `minimum_service_factor`. + It's shape is matched to `capacity` using `muse.utilities.broadcast_techs`. + filters: keyword arguments are used to filter down the capacity and + technologies. Filters not relevant to the quantities of interest, i.e. + filters that are not a dimension of `capacity` or `technologies`, are + silently ignored. + + Return: + `capacity * fixed_outputs * minimum_service_factor`, whittled down according to + the filters and the set of technologies in `capacity`. + """ + from muse.commodities import is_enduse + from muse.utilities import broadcast_techs, filter_input + + capa = filter_input( + capacity, **{k: v for k, v in filters.items() if k in capacity.dims} + ) + + if "minimum_service_factor" not in technologies: + return xr.zeros_like(capa) + + btechs = broadcast_techs( # type: ignore + cast(xr.Dataset, technologies[["fixed_outputs", "minimum_service_factor"]]), + capa, + ) + ftechs = filter_input( + btechs, **{k: v for k, v in filters.items() if k in btechs.dims} + ) + result = capa * ftechs.fixed_outputs * ftechs.minimum_service_factor + return result.where(is_enduse(result.comm_usage), 0) From be438a2c488afea99ff96369aae7459b20d119fc Mon Sep 17 00:00:00 2001 From: Diego Alonso Alvarez Date: Fri, 21 Jun 2024 13:22:01 +0100 Subject: [PATCH 02/12] Use min_production in the supply calculation --- src/muse/quantities.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/muse/quantities.py b/src/muse/quantities.py index ae27ee42b..e36b17bee 100644 --- a/src/muse/quantities.py +++ b/src/muse/quantities.py @@ -47,6 +47,7 @@ def supply( production_method = maximum_production maxprod = production_method(technologies, capacity) + minprod = minimum_production(technologies, capacity) size = np.array(maxprod.region).size # in presence of trade demand needs to map maxprod dst_region if ( @@ -86,12 +87,14 @@ def supply( expanded_demand = (demand * maxprod / maxprod.sum(demsum)).fillna(0) expanded_maxprod = (maxprod * demand / demand.sum(prodsum)).fillna(0) - + expanded_minprod = (minprod * demand / demand.sum(prodsum)).fillna(0) expanded_demand = expanded_demand.reindex_like(maxprod) + expanded_minprod = expanded_minprod.reindex_like(maxprod) result = expanded_demand.where( expanded_demand <= expanded_maxprod, expanded_maxprod ) + result = result.where(result >= expanded_minprod, expanded_minprod) # add production of environmental pollutants env = is_pollutant(technologies.comm_usage) From 902e8a023b3983faebb81e40be0e4f0167f8257f Mon Sep 17 00:00:00 2001 From: Diego Alonso Alvarez Date: Fri, 21 Jun 2024 13:43:05 +0100 Subject: [PATCH 03/12] Update defautl_timeslice example --- .../MCAMetric_Consumption.csv | 252 ++++++++--------- .../default_timeslice/MCAMetric_Supply.csv | 264 +++++++++--------- 2 files changed, 258 insertions(+), 258 deletions(-) diff --git a/tests/example_outputs/default_timeslice/MCAMetric_Consumption.csv b/tests/example_outputs/default_timeslice/MCAMetric_Consumption.csv index 69eb3a4f7..42e954962 100644 --- a/tests/example_outputs/default_timeslice/MCAMetric_Consumption.csv +++ b/tests/example_outputs/default_timeslice/MCAMetric_Consumption.csv @@ -17,18 +17,18 @@ A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.96666666667,R1,65,2020.0000000 A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,1.26666666667,R1,68,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000 A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.64444444444,R1,81,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000 A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.84444444444,R1,84,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000 -A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.33576719577,R1,1,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000 -A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.22116402116,R1,7,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2025.00000000000 -A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.50365079365,R1,13,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000 -A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.33174603175,R1,19,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2025.00000000000 -A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.33576719577,R1,25,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2025.00000000000 -A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.22116402116,R1,31,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2025.00000000000 -A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.50365079365,R1,37,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000 -A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.33174603175,R1,43,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2025.00000000000 -A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,1.00730158730,R1,49,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000 -A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.66349206349,R1,55,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2025.00000000000 -A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.67153439153,R1,61,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000 -A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.44232804233,R1,67,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2025.00000000000 +A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,1.67000000000,R1,1,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000 +A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,1.10000000000,R1,7,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2025.00000000000 +A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,1.67000000000,R1,13,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000 +A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,1.10000000000,R1,19,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2025.00000000000 +A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,1.67000000000,R1,25,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2025.00000000000 +A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,1.10000000000,R1,31,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2025.00000000000 +A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,1.67000000000,R1,37,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000 +A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,1.10000000000,R1,43,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2025.00000000000 +A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,1.67000000000,R1,49,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000 +A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,1.10000000000,R1,55,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2025.00000000000 +A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,1.67000000000,R1,61,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000 +A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,1.10000000000,R1,67,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2025.00000000000 A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.42222222222,R1,0,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000 A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.26422222222,R1,5,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000 A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.15333333333,R1,8,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000 @@ -47,18 +47,18 @@ A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.46000000000,R1,72,2025 A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.84444444444,R1,80,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000 A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.52844444444,R1,85,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000 A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.30666666667,R1,88,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000 -A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.23951240017,R1,3,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2030.00000000000 -A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.33604315539,R1,7,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2030.00000000000 -A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.35926860025,R1,15,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2030.00000000000 -A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.50406473308,R1,19,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2030.00000000000 -A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.23951240017,R1,27,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2030.00000000000 -A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.33604315539,R1,31,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2030.00000000000 -A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.35926860025,R1,39,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2030.00000000000 -A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.50406473308,R1,43,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2030.00000000000 -A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.71853720050,R1,51,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2030.00000000000 -A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,1.00812946616,R1,55,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2030.00000000000 -A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.47902480034,R1,63,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2030.00000000000 -A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.67208631077,R1,67,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2030.00000000000 +A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,wind,1.10000000000,R1,3,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2030.00000000000 +A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,1.54333333333,R1,7,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2030.00000000000 +A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,wind,1.10000000000,R1,15,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2030.00000000000 +A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,1.54333333333,R1,19,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2030.00000000000 +A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,wind,1.10000000000,R1,27,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2030.00000000000 +A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,1.54333333333,R1,31,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2030.00000000000 +A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,wind,1.10000000000,R1,39,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2030.00000000000 +A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,1.54333333333,R1,43,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2030.00000000000 +A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,wind,1.10000000000,R1,51,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2030.00000000000 +A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,1.54333333333,R1,55,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2030.00000000000 +A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,wind,1.10000000000,R1,63,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2030.00000000000 +A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,1.54333333333,R1,67,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2030.00000000000 A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.26422222222,R1,1,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000 A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.15333333333,R1,4,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000 A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.55555555556,R1,8,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000 @@ -77,24 +77,24 @@ A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,1.66666666667,R1,88,2030 A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.52844444444,R1,101,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000 A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.30666666667,R1,104,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000 A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,1.11111111111,R1,108,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000 -A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.18011035545,R1,3,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2035.00000000000 -A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.25270028658,R1,7,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2035.00000000000 -A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.27607824686,R1,11,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2035.00000000000 -A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.27016553317,R1,19,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2035.00000000000 -A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.37905042987,R1,23,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2035.00000000000 -A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.41411737029,R1,27,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2035.00000000000 -A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.18011035545,R1,35,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2035.00000000000 -A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.25270028658,R1,39,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2035.00000000000 -A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.27607824686,R1,43,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2035.00000000000 -A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.27016553317,R1,51,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2035.00000000000 -A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.37905042987,R1,55,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2035.00000000000 -A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.41411737029,R1,59,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2035.00000000000 -A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.54033106634,R1,67,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2035.00000000000 -A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.75810085975,R1,71,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2035.00000000000 -A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.82823474058,R1,75,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2035.00000000000 -A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.36022071089,R1,83,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2035.00000000000 -A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.50540057316,R1,87,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2035.00000000000 -A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.55215649372,R1,91,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2035.00000000000 +A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,wind,1.10000000000,R1,3,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2035.00000000000 +A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,1.54333333333,R1,7,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2035.00000000000 +A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,wind,1.68611111111,R1,11,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2035.00000000000 +A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,wind,1.10000000000,R1,19,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2035.00000000000 +A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,1.54333333333,R1,23,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2035.00000000000 +A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,wind,1.68611111111,R1,27,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2035.00000000000 +A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,wind,1.10000000000,R1,35,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2035.00000000000 +A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,1.54333333333,R1,39,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2035.00000000000 +A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,wind,1.68611111111,R1,43,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2035.00000000000 +A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,wind,1.10000000000,R1,51,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2035.00000000000 +A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,1.54333333333,R1,55,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2035.00000000000 +A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,wind,1.68611111111,R1,59,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2035.00000000000 +A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,wind,1.10000000000,R1,67,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2035.00000000000 +A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,1.54333333333,R1,71,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2035.00000000000 +A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,wind,1.68611111111,R1,75,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2035.00000000000 +A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,wind,1.10000000000,R1,83,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2035.00000000000 +A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,1.54333333333,R1,87,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2035.00000000000 +A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,wind,1.68611111111,R1,91,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2035.00000000000 A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.55555555556,R1,0,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000 A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.05864444444,R1,5,2035.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000 A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.35755555556,R1,8,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000 @@ -113,30 +113,30 @@ A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,1.07266666667,R1,72,2035 A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,1.11111111111,R1,80,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000 A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.11728888889,R1,85,2035.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000 A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.71511111111,R1,88,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000 -A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.15824641356,R1,3,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2040.00000000000 -A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.22202451357,R1,7,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2040.00000000000 -A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.24256457836,R1,11,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2040.00000000000 -A1,3.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.29027560563,R1,15,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2040.00000000000 -A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.23736962033,R1,23,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2040.00000000000 -A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.33303677035,R1,27,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2040.00000000000 -A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.36384686753,R1,31,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2040.00000000000 -A1,3.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.43541340845,R1,35,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2040.00000000000 -A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.15824641356,R1,43,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2040.00000000000 -A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.22202451357,R1,47,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2040.00000000000 -A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.24256457836,R1,51,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2040.00000000000 -A1,3.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.29027560563,R1,55,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2040.00000000000 -A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.23736962033,R1,63,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2040.00000000000 -A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.33303677035,R1,67,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2040.00000000000 -A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.36384686753,R1,71,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2040.00000000000 -A1,3.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.43541340845,R1,75,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2040.00000000000 -A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.47473924067,R1,83,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2040.00000000000 -A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.66607354070,R1,87,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2040.00000000000 -A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.72769373507,R1,91,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2040.00000000000 -A1,3.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.87082681690,R1,95,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2040.00000000000 -A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.31649282711,R1,103,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2040.00000000000 -A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.44404902713,R1,107,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2040.00000000000 -A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.48512915671,R1,111,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2040.00000000000 -A1,3.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.58055121127,R1,115,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2040.00000000000 +A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,wind,1.10000000000,R1,3,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2040.00000000000 +A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,1.54333333333,R1,7,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2040.00000000000 +A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,wind,1.68611111111,R1,11,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2040.00000000000 +A1,3.00000000000,retrofit,CONSUMABLE|ENERGY,wind,2.01775925926,R1,15,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2040.00000000000 +A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,wind,1.10000000000,R1,23,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2040.00000000000 +A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,1.54333333333,R1,27,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2040.00000000000 +A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,wind,1.68611111111,R1,31,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2040.00000000000 +A1,3.00000000000,retrofit,CONSUMABLE|ENERGY,wind,2.01775925926,R1,35,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2040.00000000000 +A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,wind,1.10000000000,R1,43,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2040.00000000000 +A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,1.54333333333,R1,47,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2040.00000000000 +A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,wind,1.68611111111,R1,51,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2040.00000000000 +A1,3.00000000000,retrofit,CONSUMABLE|ENERGY,wind,2.01775925926,R1,55,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2040.00000000000 +A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,wind,1.10000000000,R1,63,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2040.00000000000 +A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,1.54333333333,R1,67,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2040.00000000000 +A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,wind,1.68611111111,R1,71,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2040.00000000000 +A1,3.00000000000,retrofit,CONSUMABLE|ENERGY,wind,2.01775925926,R1,75,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2040.00000000000 +A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,wind,1.10000000000,R1,83,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2040.00000000000 +A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,1.54333333333,R1,87,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2040.00000000000 +A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,wind,1.68611111111,R1,91,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2040.00000000000 +A1,3.00000000000,retrofit,CONSUMABLE|ENERGY,wind,2.01775925926,R1,95,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2040.00000000000 +A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,wind,1.10000000000,R1,103,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2040.00000000000 +A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,1.54333333333,R1,107,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2040.00000000000 +A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,wind,1.68611111111,R1,111,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2040.00000000000 +A1,3.00000000000,retrofit,CONSUMABLE|ENERGY,wind,2.01775925926,R1,115,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2040.00000000000 A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.05864444444,R1,1,2035.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000 A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.35755555556,R1,4,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000 A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.68888888889,R1,8,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000 @@ -155,36 +155,36 @@ A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,2.06666666667,R1,72,2040 A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.11728888889,R1,81,2035.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000 A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.71511111111,R1,84,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000 A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,1.37777777778,R1,88,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000 -A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.13656827502,R1,3,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2045.00000000000 -A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.19160942829,R1,7,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2045.00000000000 -A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.20933571449,R1,11,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2045.00000000000 -A1,3.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.25051081949,R1,15,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2045.00000000000 -A1,4.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.25842020716,R1,19,2040.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2045.00000000000 -A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.20485241253,R1,27,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2045.00000000000 -A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.28741414243,R1,31,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2045.00000000000 -A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.31400357173,R1,35,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2045.00000000000 -A1,3.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.37576622924,R1,39,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2045.00000000000 -A1,4.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.38763031074,R1,43,2040.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2045.00000000000 -A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.13656827502,R1,51,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2045.00000000000 -A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.19160942829,R1,55,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2045.00000000000 -A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.20933571449,R1,59,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2045.00000000000 -A1,3.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.25051081949,R1,63,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2045.00000000000 -A1,4.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.25842020716,R1,67,2040.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2045.00000000000 -A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.20485241253,R1,75,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2045.00000000000 -A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.28741414243,R1,79,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2045.00000000000 -A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.31400357173,R1,83,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2045.00000000000 -A1,3.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.37576622924,R1,87,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2045.00000000000 -A1,4.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.38763031074,R1,91,2040.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2045.00000000000 -A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.40970482506,R1,99,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2045.00000000000 -A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.57482828486,R1,103,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2045.00000000000 -A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.62800714346,R1,107,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2045.00000000000 -A1,3.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.75153245848,R1,111,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2045.00000000000 -A1,4.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.77526062148,R1,115,2040.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2045.00000000000 -A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.27313655004,R1,123,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2045.00000000000 -A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.38321885657,R1,127,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2045.00000000000 -A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.41867142897,R1,131,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2045.00000000000 -A1,3.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.50102163899,R1,135,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2045.00000000000 -A1,4.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.51684041432,R1,139,2040.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2045.00000000000 +A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,wind,1.10000000000,R1,3,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2045.00000000000 +A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,1.54333333333,R1,7,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2045.00000000000 +A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,wind,1.68611111111,R1,11,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2045.00000000000 +A1,3.00000000000,retrofit,CONSUMABLE|ENERGY,wind,2.01775925926,R1,15,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2045.00000000000 +A1,4.00000000000,retrofit,CONSUMABLE|ENERGY,wind,2.08146604938,R1,19,2040.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2045.00000000000 +A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,wind,1.10000000000,R1,27,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2045.00000000000 +A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,1.54333333333,R1,31,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2045.00000000000 +A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,wind,1.68611111111,R1,35,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2045.00000000000 +A1,3.00000000000,retrofit,CONSUMABLE|ENERGY,wind,2.01775925926,R1,39,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2045.00000000000 +A1,4.00000000000,retrofit,CONSUMABLE|ENERGY,wind,2.08146604938,R1,43,2040.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2045.00000000000 +A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,wind,1.10000000000,R1,51,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2045.00000000000 +A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,1.54333333333,R1,55,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2045.00000000000 +A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,wind,1.68611111111,R1,59,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2045.00000000000 +A1,3.00000000000,retrofit,CONSUMABLE|ENERGY,wind,2.01775925926,R1,63,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2045.00000000000 +A1,4.00000000000,retrofit,CONSUMABLE|ENERGY,wind,2.08146604938,R1,67,2040.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2045.00000000000 +A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,wind,1.10000000000,R1,75,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2045.00000000000 +A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,1.54333333333,R1,79,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2045.00000000000 +A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,wind,1.68611111111,R1,83,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2045.00000000000 +A1,3.00000000000,retrofit,CONSUMABLE|ENERGY,wind,2.01775925926,R1,87,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2045.00000000000 +A1,4.00000000000,retrofit,CONSUMABLE|ENERGY,wind,2.08146604938,R1,91,2040.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2045.00000000000 +A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,wind,1.10000000000,R1,99,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2045.00000000000 +A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,1.54333333333,R1,103,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2045.00000000000 +A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,wind,1.68611111111,R1,107,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2045.00000000000 +A1,3.00000000000,retrofit,CONSUMABLE|ENERGY,wind,2.01775925926,R1,111,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2045.00000000000 +A1,4.00000000000,retrofit,CONSUMABLE|ENERGY,wind,2.08146604938,R1,115,2040.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2045.00000000000 +A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,wind,1.10000000000,R1,123,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2045.00000000000 +A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,1.54333333333,R1,127,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2045.00000000000 +A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,wind,1.68611111111,R1,131,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2045.00000000000 +A1,3.00000000000,retrofit,CONSUMABLE|ENERGY,wind,2.01775925926,R1,135,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2045.00000000000 +A1,4.00000000000,retrofit,CONSUMABLE|ENERGY,wind,2.08146604938,R1,139,2040.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2045.00000000000 A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.68888888889,R1,0,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000 A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.51111111111,R1,4,2045.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000 A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,1.03333333333,R1,12,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000 @@ -197,33 +197,33 @@ A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,2.06666666667,R1,48,2040 A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,1.53333333333,R1,52,2045.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000 A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,1.37777777778,R1,60,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000 A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,1.02222222222,R1,64,2045.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000 -A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.19078573323,R1,3,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2050.00000000000 -A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.20843581726,R1,7,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2050.00000000000 -A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.24943391777,R1,11,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2050.00000000000 -A1,3.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.25730930438,R1,15,2040.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2050.00000000000 -A1,4.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.29403522736,R1,19,2045.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2050.00000000000 -A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.28617859985,R1,27,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2050.00000000000 -A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.31265372589,R1,31,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2050.00000000000 -A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.37415087666,R1,35,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2050.00000000000 -A1,3.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.38596395657,R1,39,2040.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2050.00000000000 -A1,4.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.44105284104,R1,43,2045.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2050.00000000000 -A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.19078573323,R1,51,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2050.00000000000 -A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.20843581726,R1,55,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2050.00000000000 -A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.24943391777,R1,59,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2050.00000000000 -A1,3.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.25730930438,R1,63,2040.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2050.00000000000 -A1,4.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.29403522736,R1,67,2045.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2050.00000000000 -A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.28617859985,R1,75,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2050.00000000000 -A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.31265372589,R1,79,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2050.00000000000 -A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.37415087666,R1,83,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2050.00000000000 -A1,3.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.38596395657,R1,87,2040.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2050.00000000000 -A1,4.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.44105284104,R1,91,2045.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2050.00000000000 -A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.57235719969,R1,99,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2050.00000000000 -A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.62530745179,R1,103,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2050.00000000000 -A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.74830175331,R1,107,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2050.00000000000 -A1,3.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.77192791314,R1,111,2040.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2050.00000000000 -A1,4.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.88210568207,R1,115,2045.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2050.00000000000 -A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.38157146646,R1,123,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2050.00000000000 -A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.41687163452,R1,127,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2050.00000000000 -A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.49886783554,R1,131,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2050.00000000000 -A1,3.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.51461860876,R1,135,2040.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2050.00000000000 -A1,4.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.58807045471,R1,139,2045.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2050.00000000000 +A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,wind,1.54333333333,R1,3,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2050.00000000000 +A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,1.68611111111,R1,7,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2050.00000000000 +A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,wind,2.01775925926,R1,11,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2050.00000000000 +A1,3.00000000000,retrofit,CONSUMABLE|ENERGY,wind,2.08146604938,R1,15,2040.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2050.00000000000 +A1,4.00000000000,retrofit,CONSUMABLE|ENERGY,wind,2.37855504115,R1,19,2045.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2050.00000000000 +A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,wind,1.54333333333,R1,27,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2050.00000000000 +A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,1.68611111111,R1,31,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2050.00000000000 +A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,wind,2.01775925926,R1,35,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2050.00000000000 +A1,3.00000000000,retrofit,CONSUMABLE|ENERGY,wind,2.08146604938,R1,39,2040.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2050.00000000000 +A1,4.00000000000,retrofit,CONSUMABLE|ENERGY,wind,2.37855504115,R1,43,2045.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2050.00000000000 +A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,wind,1.54333333333,R1,51,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2050.00000000000 +A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,1.68611111111,R1,55,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2050.00000000000 +A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,wind,2.01775925926,R1,59,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2050.00000000000 +A1,3.00000000000,retrofit,CONSUMABLE|ENERGY,wind,2.08146604938,R1,63,2040.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2050.00000000000 +A1,4.00000000000,retrofit,CONSUMABLE|ENERGY,wind,2.37855504115,R1,67,2045.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2050.00000000000 +A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,wind,1.54333333333,R1,75,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2050.00000000000 +A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,1.68611111111,R1,79,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2050.00000000000 +A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,wind,2.01775925926,R1,83,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2050.00000000000 +A1,3.00000000000,retrofit,CONSUMABLE|ENERGY,wind,2.08146604938,R1,87,2040.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2050.00000000000 +A1,4.00000000000,retrofit,CONSUMABLE|ENERGY,wind,2.37855504115,R1,91,2045.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2050.00000000000 +A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,wind,1.54333333333,R1,99,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2050.00000000000 +A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,1.68611111111,R1,103,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2050.00000000000 +A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,wind,2.01775925926,R1,107,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2050.00000000000 +A1,3.00000000000,retrofit,CONSUMABLE|ENERGY,wind,2.08146604938,R1,111,2040.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2050.00000000000 +A1,4.00000000000,retrofit,CONSUMABLE|ENERGY,wind,2.37855504115,R1,115,2045.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2050.00000000000 +A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,wind,1.54333333333,R1,123,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2050.00000000000 +A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,1.68611111111,R1,127,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2050.00000000000 +A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,wind,2.01775925926,R1,131,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2050.00000000000 +A1,3.00000000000,retrofit,CONSUMABLE|ENERGY,wind,2.08146604938,R1,135,2040.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2050.00000000000 +A1,4.00000000000,retrofit,CONSUMABLE|ENERGY,wind,2.37855504115,R1,139,2045.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2050.00000000000 diff --git a/tests/example_outputs/default_timeslice/MCAMetric_Supply.csv b/tests/example_outputs/default_timeslice/MCAMetric_Supply.csv index 0f6d4a88a..9fe28392a 100644 --- a/tests/example_outputs/default_timeslice/MCAMetric_Supply.csv +++ b/tests/example_outputs/default_timeslice/MCAMetric_Supply.csv @@ -35,24 +35,24 @@ A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,76,2020.00000000000,R1,r A1,0.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,88,2020.00000000000,R1,residential,0.55555555556,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000 A1,1.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,89,2020.00000000000,R1,residential,2.11111111111,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000 A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,92,2020.00000000000,R1,residential,35.95000000000,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2025.00000000000 -A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,0,2020.00000000000,R1,power,0.20105820106,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000 -A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,1,2020.00000000000,R1,power,0.22116402116,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000 -A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,6,2020.00000000000,R1,power,18.43100529101,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/kt,2025.00000000000 -A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,12,2020.00000000000,R1,power,0.30158730159,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000 -A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,13,2020.00000000000,R1,power,0.33174603175,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000 -A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,18,2020.00000000000,R1,power,27.64650793651,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2025.00000000000 -A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,24,2020.00000000000,R1,power,0.20105820106,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2025.00000000000 -A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,25,2020.00000000000,R1,power,0.22116402116,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2025.00000000000 -A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,30,2020.00000000000,R1,power,18.43100529101,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2025.00000000000 -A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,36,2020.00000000000,R1,power,0.30158730159,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000 -A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,37,2020.00000000000,R1,power,0.33174603175,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000 -A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,42,2020.00000000000,R1,power,27.64650793651,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2025.00000000000 -A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,48,2020.00000000000,R1,power,0.60317460317,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000 -A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,49,2020.00000000000,R1,power,0.66349206349,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000 -A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,54,2020.00000000000,R1,power,55.29301587302,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2025.00000000000 -A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,60,2020.00000000000,R1,power,0.40211640212,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000 -A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,61,2020.00000000000,R1,power,0.44232804233,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000 -A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,66,2020.00000000000,R1,power,36.86201058201,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2025.00000000000 +A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,0,2020.00000000000,R1,power,1.00000000000,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000 +A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,1,2020.00000000000,R1,power,1.10000000000,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000 +A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,6,2020.00000000000,R1,power,91.67000000000,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/kt,2025.00000000000 +A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,12,2020.00000000000,R1,power,1.00000000000,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000 +A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,13,2020.00000000000,R1,power,1.10000000000,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000 +A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,18,2020.00000000000,R1,power,91.67000000000,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2025.00000000000 +A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,24,2020.00000000000,R1,power,1.00000000000,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2025.00000000000 +A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,25,2020.00000000000,R1,power,1.10000000000,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2025.00000000000 +A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,30,2020.00000000000,R1,power,91.67000000000,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2025.00000000000 +A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,36,2020.00000000000,R1,power,1.00000000000,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000 +A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,37,2020.00000000000,R1,power,1.10000000000,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000 +A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,42,2020.00000000000,R1,power,91.67000000000,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2025.00000000000 +A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,48,2020.00000000000,R1,power,1.00000000000,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000 +A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,49,2020.00000000000,R1,power,1.10000000000,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000 +A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,54,2020.00000000000,R1,power,91.67000000000,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2025.00000000000 +A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,60,2020.00000000000,R1,power,1.00000000000,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000 +A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,61,2020.00000000000,R1,power,1.10000000000,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000 +A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,66,2020.00000000000,R1,power,91.67000000000,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2025.00000000000 A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,0,2020.00000000000,R1,gas,1.99222222222,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000 A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,1,2020.00000000000,R1,gas,2.15333333333,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000 A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,2,2020.00000000000,R1,gas,1.99222222222,gassupply1,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2025.00000000000 @@ -83,18 +83,18 @@ A1,0.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,88,2020.00000000000,R1,resident A1,1.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,89,2025.00000000000,R1,residential,0.45555555556,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000 A1,2.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,90,2025.00000000000,R1,residential,0.76666666667,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000 A1,1.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,93,2025.00000000000,R1,residential,29.47900000000,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2030.00000000000 -A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,0,2020.00000000000,R1,power,0.23951240017,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000 -A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,1,2025.00000000000,R1,power,0.33604315539,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000 -A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,12,2020.00000000000,R1,power,0.35926860025,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000 -A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,13,2025.00000000000,R1,power,0.50406473308,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000 -A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,24,2020.00000000000,R1,power,0.23951240017,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2030.00000000000 -A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,25,2025.00000000000,R1,power,0.33604315539,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2030.00000000000 -A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,36,2020.00000000000,R1,power,0.35926860025,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000 -A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,37,2025.00000000000,R1,power,0.50406473308,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000 -A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,48,2020.00000000000,R1,power,0.71853720050,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000 -A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,49,2025.00000000000,R1,power,1.00812946616,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000 -A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,60,2020.00000000000,R1,power,0.47902480034,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000 -A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,61,2025.00000000000,R1,power,0.67208631077,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000 +A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,0,2020.00000000000,R1,power,1.10000000000,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000 +A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,1,2025.00000000000,R1,power,1.54333333333,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000 +A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,12,2020.00000000000,R1,power,1.10000000000,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000 +A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,13,2025.00000000000,R1,power,1.54333333333,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000 +A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,24,2020.00000000000,R1,power,1.10000000000,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2030.00000000000 +A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,25,2025.00000000000,R1,power,1.54333333333,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2030.00000000000 +A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,36,2020.00000000000,R1,power,1.10000000000,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000 +A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,37,2025.00000000000,R1,power,1.54333333333,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000 +A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,48,2020.00000000000,R1,power,1.10000000000,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000 +A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,49,2025.00000000000,R1,power,1.54333333333,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000 +A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,60,2020.00000000000,R1,power,1.10000000000,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000 +A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,61,2025.00000000000,R1,power,1.54333333333,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000 A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,0,2020.00000000000,R1,gas,0.26422222222,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000 A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,2,2020.00000000000,R1,gas,0.39633333333,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000 A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,4,2020.00000000000,R1,gas,0.26422222222,gassupply1,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2030.00000000000 @@ -125,24 +125,24 @@ A1,0.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,110,2025.00000000000,R1,residen A1,1.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,111,2025.00000000000,R1,residential,0.76666666667,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000 A1,2.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,112,2030.00000000000,R1,residential,2.77777777778,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000 A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,115,2025.00000000000,R1,residential,29.47900000000,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2035.00000000000 -A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,0,2020.00000000000,R1,power,0.18011035545,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000 -A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,1,2025.00000000000,R1,power,0.25270028658,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000 -A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,2,2030.00000000000,R1,power,0.27607824686,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000 -A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,16,2020.00000000000,R1,power,0.27016553317,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000 -A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,17,2025.00000000000,R1,power,0.37905042987,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000 -A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,18,2030.00000000000,R1,power,0.41411737029,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000 -A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,32,2020.00000000000,R1,power,0.18011035545,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000 -A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,33,2025.00000000000,R1,power,0.25270028658,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000 -A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,34,2030.00000000000,R1,power,0.27607824686,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000 -A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,48,2020.00000000000,R1,power,0.27016553317,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000 -A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,49,2025.00000000000,R1,power,0.37905042987,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000 -A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,50,2030.00000000000,R1,power,0.41411737029,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000 -A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,64,2020.00000000000,R1,power,0.54033106634,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000 -A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,65,2025.00000000000,R1,power,0.75810085975,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000 -A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,66,2030.00000000000,R1,power,0.82823474058,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000 -A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,80,2020.00000000000,R1,power,0.36022071089,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000 -A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,81,2025.00000000000,R1,power,0.50540057316,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000 -A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,82,2030.00000000000,R1,power,0.55215649372,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000 +A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,0,2020.00000000000,R1,power,1.10000000000,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000 +A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,1,2025.00000000000,R1,power,1.54333333333,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000 +A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,2,2030.00000000000,R1,power,1.68611111111,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000 +A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,16,2020.00000000000,R1,power,1.10000000000,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000 +A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,17,2025.00000000000,R1,power,1.54333333333,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000 +A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,18,2030.00000000000,R1,power,1.68611111111,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000 +A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,32,2020.00000000000,R1,power,1.10000000000,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000 +A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,33,2025.00000000000,R1,power,1.54333333333,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000 +A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,34,2030.00000000000,R1,power,1.68611111111,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000 +A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,48,2020.00000000000,R1,power,1.10000000000,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000 +A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,49,2025.00000000000,R1,power,1.54333333333,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000 +A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,50,2030.00000000000,R1,power,1.68611111111,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000 +A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,64,2020.00000000000,R1,power,1.10000000000,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000 +A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,65,2025.00000000000,R1,power,1.54333333333,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000 +A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,66,2030.00000000000,R1,power,1.68611111111,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000 +A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,80,2020.00000000000,R1,power,1.10000000000,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000 +A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,81,2025.00000000000,R1,power,1.54333333333,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000 +A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,82,2030.00000000000,R1,power,1.68611111111,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000 A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,0,2020.00000000000,R1,gas,0.12888888889,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000 A1,1.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,1,2030.00000000000,R1,gas,0.13533333333,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000 A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,2,2020.00000000000,R1,gas,0.19333333333,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000 @@ -179,30 +179,30 @@ A1,0.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,88,2030.00000000000,R1,resident A1,1.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,89,2035.00000000000,R1,residential,0.10111111111,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000 A1,2.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,90,2035.00000000000,R1,residential,1.78777777778,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000 A1,1.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,93,2035.00000000000,R1,residential,6.54290000000,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2040.00000000000 -A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,0,2020.00000000000,R1,power,0.15824641356,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000 -A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,1,2025.00000000000,R1,power,0.22202451357,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000 -A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,2,2030.00000000000,R1,power,0.24256457836,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000 -A1,3.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,3,2035.00000000000,R1,power,0.29027560563,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000 -A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,20,2020.00000000000,R1,power,0.23736962033,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000 -A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,21,2025.00000000000,R1,power,0.33303677035,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000 -A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,22,2030.00000000000,R1,power,0.36384686753,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000 -A1,3.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,23,2035.00000000000,R1,power,0.43541340845,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000 -A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,40,2020.00000000000,R1,power,0.15824641356,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000 -A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,41,2025.00000000000,R1,power,0.22202451357,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000 -A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,42,2030.00000000000,R1,power,0.24256457836,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000 -A1,3.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,43,2035.00000000000,R1,power,0.29027560563,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000 -A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,60,2020.00000000000,R1,power,0.23736962033,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000 -A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,61,2025.00000000000,R1,power,0.33303677035,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000 -A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,62,2030.00000000000,R1,power,0.36384686753,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000 -A1,3.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,63,2035.00000000000,R1,power,0.43541340845,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000 -A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,80,2020.00000000000,R1,power,0.47473924067,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000 -A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,81,2025.00000000000,R1,power,0.66607354070,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000 -A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,82,2030.00000000000,R1,power,0.72769373507,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000 -A1,3.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,83,2035.00000000000,R1,power,0.87082681690,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000 -A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,100,2020.00000000000,R1,power,0.31649282711,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000 -A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,101,2025.00000000000,R1,power,0.44404902713,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000 -A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,102,2030.00000000000,R1,power,0.48512915671,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000 -A1,3.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,103,2035.00000000000,R1,power,0.58055121127,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000 +A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,0,2020.00000000000,R1,power,1.10000000000,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000 +A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,1,2025.00000000000,R1,power,1.54333333333,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000 +A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,2,2030.00000000000,R1,power,1.68611111111,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000 +A1,3.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,3,2035.00000000000,R1,power,2.01775925926,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000 +A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,20,2020.00000000000,R1,power,1.10000000000,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000 +A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,21,2025.00000000000,R1,power,1.54333333333,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000 +A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,22,2030.00000000000,R1,power,1.68611111111,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000 +A1,3.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,23,2035.00000000000,R1,power,2.01775925926,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000 +A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,40,2020.00000000000,R1,power,1.10000000000,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000 +A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,41,2025.00000000000,R1,power,1.54333333333,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000 +A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,42,2030.00000000000,R1,power,1.68611111111,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000 +A1,3.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,43,2035.00000000000,R1,power,2.01775925926,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000 +A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,60,2020.00000000000,R1,power,1.10000000000,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000 +A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,61,2025.00000000000,R1,power,1.54333333333,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000 +A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,62,2030.00000000000,R1,power,1.68611111111,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000 +A1,3.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,63,2035.00000000000,R1,power,2.01775925926,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000 +A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,80,2020.00000000000,R1,power,1.10000000000,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000 +A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,81,2025.00000000000,R1,power,1.54333333333,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000 +A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,82,2030.00000000000,R1,power,1.68611111111,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000 +A1,3.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,83,2035.00000000000,R1,power,2.01775925926,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000 +A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,100,2020.00000000000,R1,power,1.10000000000,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000 +A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,101,2025.00000000000,R1,power,1.54333333333,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000 +A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,102,2030.00000000000,R1,power,1.68611111111,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000 +A1,3.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,103,2035.00000000000,R1,power,2.01775925926,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000 A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,0,2020.00000000000,R1,gas,0.02860704607,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000 A1,1.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,1,2030.00000000000,R1,gas,0.03003739837,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000 A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,2,2020.00000000000,R1,gas,0.04291056911,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000 @@ -239,36 +239,36 @@ A1,0.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,88,2035.00000000000,R1,resident A1,1.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,89,2035.00000000000,R1,residential,1.78777777778,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000 A1,2.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,90,2040.00000000000,R1,residential,3.44444444444,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000 A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,92,2035.00000000000,R1,residential,6.54290000000,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2045.00000000000 -A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,0,2020.00000000000,R1,power,0.13656827502,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000 -A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,1,2025.00000000000,R1,power,0.19160942829,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000 -A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,2,2030.00000000000,R1,power,0.20933571449,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000 -A1,3.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,3,2035.00000000000,R1,power,0.25051081949,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000 -A1,4.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,4,2040.00000000000,R1,power,0.25842020716,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000 -A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,24,2020.00000000000,R1,power,0.20485241253,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000 -A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,25,2025.00000000000,R1,power,0.28741414243,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000 -A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,26,2030.00000000000,R1,power,0.31400357173,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000 -A1,3.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,27,2035.00000000000,R1,power,0.37576622924,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000 -A1,4.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,28,2040.00000000000,R1,power,0.38763031074,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000 -A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,48,2020.00000000000,R1,power,0.13656827502,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000 -A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,49,2025.00000000000,R1,power,0.19160942829,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000 -A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,50,2030.00000000000,R1,power,0.20933571449,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000 -A1,3.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,51,2035.00000000000,R1,power,0.25051081949,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000 -A1,4.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,52,2040.00000000000,R1,power,0.25842020716,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000 -A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,72,2020.00000000000,R1,power,0.20485241253,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000 -A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,73,2025.00000000000,R1,power,0.28741414243,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000 -A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,74,2030.00000000000,R1,power,0.31400357173,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000 -A1,3.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,75,2035.00000000000,R1,power,0.37576622924,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000 -A1,4.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,76,2040.00000000000,R1,power,0.38763031074,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000 -A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,96,2020.00000000000,R1,power,0.40970482506,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000 -A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,97,2025.00000000000,R1,power,0.57482828486,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000 -A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,98,2030.00000000000,R1,power,0.62800714346,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000 -A1,3.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,99,2035.00000000000,R1,power,0.75153245848,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000 -A1,4.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,100,2040.00000000000,R1,power,0.77526062148,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000 -A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,120,2020.00000000000,R1,power,0.27313655004,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000 -A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,121,2025.00000000000,R1,power,0.38321885657,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000 -A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,122,2030.00000000000,R1,power,0.41867142897,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000 -A1,3.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,123,2035.00000000000,R1,power,0.50102163899,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000 -A1,4.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,124,2040.00000000000,R1,power,0.51684041432,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000 +A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,0,2020.00000000000,R1,power,1.10000000000,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000 +A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,1,2025.00000000000,R1,power,1.54333333333,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000 +A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,2,2030.00000000000,R1,power,1.68611111111,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000 +A1,3.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,3,2035.00000000000,R1,power,2.01775925926,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000 +A1,4.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,4,2040.00000000000,R1,power,2.08146604938,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000 +A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,24,2020.00000000000,R1,power,1.10000000000,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000 +A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,25,2025.00000000000,R1,power,1.54333333333,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000 +A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,26,2030.00000000000,R1,power,1.68611111111,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000 +A1,3.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,27,2035.00000000000,R1,power,2.01775925926,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000 +A1,4.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,28,2040.00000000000,R1,power,2.08146604938,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000 +A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,48,2020.00000000000,R1,power,1.10000000000,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000 +A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,49,2025.00000000000,R1,power,1.54333333333,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000 +A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,50,2030.00000000000,R1,power,1.68611111111,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000 +A1,3.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,51,2035.00000000000,R1,power,2.01775925926,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000 +A1,4.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,52,2040.00000000000,R1,power,2.08146604938,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000 +A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,72,2020.00000000000,R1,power,1.10000000000,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000 +A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,73,2025.00000000000,R1,power,1.54333333333,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000 +A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,74,2030.00000000000,R1,power,1.68611111111,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000 +A1,3.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,75,2035.00000000000,R1,power,2.01775925926,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000 +A1,4.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,76,2040.00000000000,R1,power,2.08146604938,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000 +A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,96,2020.00000000000,R1,power,1.10000000000,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000 +A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,97,2025.00000000000,R1,power,1.54333333333,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000 +A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,98,2030.00000000000,R1,power,1.68611111111,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000 +A1,3.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,99,2035.00000000000,R1,power,2.01775925926,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000 +A1,4.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,100,2040.00000000000,R1,power,2.08146604938,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000 +A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,120,2020.00000000000,R1,power,1.10000000000,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000 +A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,121,2025.00000000000,R1,power,1.54333333333,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000 +A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,122,2030.00000000000,R1,power,1.68611111111,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000 +A1,3.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,123,2035.00000000000,R1,power,2.01775925926,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000 +A1,4.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,124,2040.00000000000,R1,power,2.08146604938,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000 A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,0,2020.00000000000,R1,gas,0.02860704607,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000 A1,1.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,1,2030.00000000000,R1,gas,0.03003739837,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000 A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,2,2020.00000000000,R1,gas,0.04291056911,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000 @@ -293,33 +293,33 @@ A1,0.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,54,2040.00000000000,R1,resident A1,1.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,55,2045.00000000000,R1,residential,3.83333333333,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000 A1,0.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,66,2040.00000000000,R1,residential,3.44444444444,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000 A1,1.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,67,2045.00000000000,R1,residential,2.55555555556,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000 -A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,0,2025.00000000000,R1,power,0.19078573323,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000 -A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,1,2030.00000000000,R1,power,0.20843581726,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000 -A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,2,2035.00000000000,R1,power,0.24943391777,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000 -A1,3.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,3,2040.00000000000,R1,power,0.25730930438,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000 -A1,4.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,4,2045.00000000000,R1,power,0.29403522736,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000 -A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,24,2025.00000000000,R1,power,0.28617859985,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000 -A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,25,2030.00000000000,R1,power,0.31265372589,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000 -A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,26,2035.00000000000,R1,power,0.37415087666,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000 -A1,3.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,27,2040.00000000000,R1,power,0.38596395657,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000 -A1,4.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,28,2045.00000000000,R1,power,0.44105284104,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000 -A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,48,2025.00000000000,R1,power,0.19078573323,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000 -A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,49,2030.00000000000,R1,power,0.20843581726,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000 -A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,50,2035.00000000000,R1,power,0.24943391777,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000 -A1,3.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,51,2040.00000000000,R1,power,0.25730930438,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000 -A1,4.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,52,2045.00000000000,R1,power,0.29403522736,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000 -A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,72,2025.00000000000,R1,power,0.28617859985,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000 -A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,73,2030.00000000000,R1,power,0.31265372589,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000 -A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,74,2035.00000000000,R1,power,0.37415087666,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000 -A1,3.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,75,2040.00000000000,R1,power,0.38596395657,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000 -A1,4.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,76,2045.00000000000,R1,power,0.44105284104,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000 -A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,96,2025.00000000000,R1,power,0.57235719969,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000 -A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,97,2030.00000000000,R1,power,0.62530745179,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000 -A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,98,2035.00000000000,R1,power,0.74830175331,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000 -A1,3.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,99,2040.00000000000,R1,power,0.77192791314,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000 -A1,4.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,100,2045.00000000000,R1,power,0.88210568207,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000 -A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,120,2025.00000000000,R1,power,0.38157146646,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000 -A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,121,2030.00000000000,R1,power,0.41687163452,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000 -A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,122,2035.00000000000,R1,power,0.49886783554,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000 -A1,3.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,123,2040.00000000000,R1,power,0.51461860876,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000 -A1,4.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,124,2045.00000000000,R1,power,0.58807045471,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000 +A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,0,2025.00000000000,R1,power,1.54333333333,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000 +A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,1,2030.00000000000,R1,power,1.68611111111,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000 +A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,2,2035.00000000000,R1,power,2.01775925926,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000 +A1,3.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,3,2040.00000000000,R1,power,2.08146604938,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000 +A1,4.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,4,2045.00000000000,R1,power,2.37855504115,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000 +A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,24,2025.00000000000,R1,power,1.54333333333,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000 +A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,25,2030.00000000000,R1,power,1.68611111111,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000 +A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,26,2035.00000000000,R1,power,2.01775925926,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000 +A1,3.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,27,2040.00000000000,R1,power,2.08146604938,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000 +A1,4.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,28,2045.00000000000,R1,power,2.37855504115,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000 +A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,48,2025.00000000000,R1,power,1.54333333333,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000 +A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,49,2030.00000000000,R1,power,1.68611111111,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000 +A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,50,2035.00000000000,R1,power,2.01775925926,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000 +A1,3.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,51,2040.00000000000,R1,power,2.08146604938,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000 +A1,4.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,52,2045.00000000000,R1,power,2.37855504115,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000 +A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,72,2025.00000000000,R1,power,1.54333333333,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000 +A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,73,2030.00000000000,R1,power,1.68611111111,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000 +A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,74,2035.00000000000,R1,power,2.01775925926,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000 +A1,3.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,75,2040.00000000000,R1,power,2.08146604938,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000 +A1,4.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,76,2045.00000000000,R1,power,2.37855504115,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000 +A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,96,2025.00000000000,R1,power,1.54333333333,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000 +A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,97,2030.00000000000,R1,power,1.68611111111,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000 +A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,98,2035.00000000000,R1,power,2.01775925926,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000 +A1,3.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,99,2040.00000000000,R1,power,2.08146604938,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000 +A1,4.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,100,2045.00000000000,R1,power,2.37855504115,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000 +A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,120,2025.00000000000,R1,power,1.54333333333,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000 +A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,121,2030.00000000000,R1,power,1.68611111111,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000 +A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,122,2035.00000000000,R1,power,2.01775925926,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000 +A1,3.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,123,2040.00000000000,R1,power,2.08146604938,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000 +A1,4.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,124,2045.00000000000,R1,power,2.37855504115,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000 From 70ae3d5085bfe5f28173d7b0cdb50096abac51c9 Mon Sep 17 00:00:00 2001 From: Diego Alonso Alvarez Date: Fri, 21 Jun 2024 13:44:59 +0100 Subject: [PATCH 04/12] Update minimum_service example --- .../minimum_service/Industry/Supply/2050.csv | 12 ++--- .../minimum_service/MCAMetric_Supply.csv | 48 +++++++++---------- 2 files changed, 30 insertions(+), 30 deletions(-) diff --git a/tests/example_outputs/minimum_service/Industry/Supply/2050.csv b/tests/example_outputs/minimum_service/Industry/Supply/2050.csv index 5c1490c8b..5171d3819 100644 --- a/tests/example_outputs/minimum_service/Industry/Supply/2050.csv +++ b/tests/example_outputs/minimum_service/Industry/Supply/2050.csv @@ -6,7 +6,7 @@ timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply 0,CO2f,2055,5,R1,winter,all-week,all-day,procammonia_1,2035,18228.27250000000 0,CO2f,2055,6,R1,winter,all-week,all-day,procammonia_1,2040,7892.26240000000 0,CO2f,2055,7,R1,winter,all-week,all-day,procammonia_1,2045,7828.40920000000 -0,CO2f,2055,8,R1,winter,all-week,all-day,procammonia_1,2050,20214.22470000000 +0,CO2f,2055,8,R1,winter,all-week,all-day,procammonia_1,2050,21831.36270000000 0,ammonia,2050,4,R1,winter,all-week,all-day,procammonia_1,2030,5.16890000000 0,ammonia,2050,5,R1,winter,all-week,all-day,procammonia_1,2035,4.54880000000 0,ammonia,2050,6,R1,winter,all-week,all-day,procammonia_1,2040,1.98540000000 @@ -14,7 +14,7 @@ timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply 0,ammonia,2055,5,R1,winter,all-week,all-day,procammonia_1,2035,4.54880000000 0,ammonia,2055,6,R1,winter,all-week,all-day,procammonia_1,2040,1.98540000000 0,ammonia,2055,7,R1,winter,all-week,all-day,procammonia_1,2045,1.98540000000 -0,ammonia,2055,8,R1,winter,all-week,all-day,procammonia_1,2050,5.16890000000 +0,ammonia,2055,8,R1,winter,all-week,all-day,procammonia_1,2050,5.58240000000 1,CO2f,2050,4,R1,summer,all-week,all-day,procammonia_1,2030,21511.86840000000 1,CO2f,2050,5,R1,summer,all-week,all-day,procammonia_1,2035,18780.64440000000 1,CO2f,2050,6,R1,summer,all-week,all-day,procammonia_1,2040,8131.42190000000 @@ -22,7 +22,7 @@ timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply 1,CO2f,2055,5,R1,summer,all-week,all-day,procammonia_1,2035,18780.64440000000 1,CO2f,2055,6,R1,summer,all-week,all-day,procammonia_1,2040,8131.42190000000 1,CO2f,2055,7,R1,summer,all-week,all-day,procammonia_1,2045,8065.63370000000 -1,CO2f,2055,8,R1,summer,all-week,all-day,procammonia_1,2050,20826.77700000000 +1,CO2f,2055,8,R1,summer,all-week,all-day,procammonia_1,2050,22492.91920000000 1,ammonia,2050,4,R1,summer,all-week,all-day,procammonia_1,2030,5.32550000000 1,ammonia,2050,5,R1,summer,all-week,all-day,procammonia_1,2035,4.68670000000 1,ammonia,2050,6,R1,summer,all-week,all-day,procammonia_1,2040,2.04560000000 @@ -30,7 +30,7 @@ timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply 1,ammonia,2055,5,R1,summer,all-week,all-day,procammonia_1,2035,4.68670000000 1,ammonia,2055,6,R1,summer,all-week,all-day,procammonia_1,2040,2.04560000000 1,ammonia,2055,7,R1,summer,all-week,all-day,procammonia_1,2045,2.04560000000 -1,ammonia,2055,8,R1,summer,all-week,all-day,procammonia_1,2050,5.32550000000 +1,ammonia,2055,8,R1,summer,all-week,all-day,procammonia_1,2050,5.75150000000 2,CO2f,2050,4,R1,spring-autumn,all-week,all-day,procammonia_1,2030,20879.16640000000 2,CO2f,2050,5,R1,spring-autumn,all-week,all-day,procammonia_1,2035,18228.27250000000 2,CO2f,2050,6,R1,spring-autumn,all-week,all-day,procammonia_1,2040,7892.26240000000 @@ -38,7 +38,7 @@ timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply 2,CO2f,2055,5,R1,spring-autumn,all-week,all-day,procammonia_1,2035,18228.27250000000 2,CO2f,2055,6,R1,spring-autumn,all-week,all-day,procammonia_1,2040,7892.26240000000 2,CO2f,2055,7,R1,spring-autumn,all-week,all-day,procammonia_1,2045,7828.40920000000 -2,CO2f,2055,8,R1,spring-autumn,all-week,all-day,procammonia_1,2050,20214.22470000000 +2,CO2f,2055,8,R1,spring-autumn,all-week,all-day,procammonia_1,2050,21831.36270000000 2,ammonia,2050,4,R1,spring-autumn,all-week,all-day,procammonia_1,2030,5.16890000000 2,ammonia,2050,5,R1,spring-autumn,all-week,all-day,procammonia_1,2035,4.54880000000 2,ammonia,2050,6,R1,spring-autumn,all-week,all-day,procammonia_1,2040,1.98540000000 @@ -46,4 +46,4 @@ timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply 2,ammonia,2055,5,R1,spring-autumn,all-week,all-day,procammonia_1,2035,4.54880000000 2,ammonia,2055,6,R1,spring-autumn,all-week,all-day,procammonia_1,2040,1.98540000000 2,ammonia,2055,7,R1,spring-autumn,all-week,all-day,procammonia_1,2045,1.98540000000 -2,ammonia,2055,8,R1,spring-autumn,all-week,all-day,procammonia_1,2050,5.16890000000 +2,ammonia,2055,8,R1,spring-autumn,all-week,all-day,procammonia_1,2050,5.58240000000 diff --git a/tests/example_outputs/minimum_service/MCAMetric_Supply.csv b/tests/example_outputs/minimum_service/MCAMetric_Supply.csv index 9cf2795af..a2808d321 100644 --- a/tests/example_outputs/minimum_service/MCAMetric_Supply.csv +++ b/tests/example_outputs/minimum_service/MCAMetric_Supply.csv @@ -179,27 +179,27 @@ 21,A1,1.00000000000,retrofit,PRODUCT,ammonia,R1,56,2030.00000000000,R1,industry,5.16885744266,procammonia_1,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/Mt,2045.00000000000 22,A1,2.00000000000,retrofit,PRODUCT,ammonia,R1,57,2035.00000000000,R1,industry,4.54881745172,procammonia_1,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/Mt,2045.00000000000 23,A1,3.00000000000,retrofit,PRODUCT,ammonia,R1,58,2040.00000000000,R1,industry,1.98542773684,procammonia_1,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/Mt,2045.00000000000 -0,A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,0,2030.00000000000,R1,industry,20214.22474762099,procammonia_1,"('winter', 'all-week', 'all-day')",MUS$2010/kt,2050.00000000000 -1,A1,1.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,1,2035.00000000000,R1,industry,17789.38949756446,procammonia_1,"('winter', 'all-week', 'all-day')",MUS$2010/kt,2050.00000000000 -2,A1,2.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,2,2040.00000000000,R1,industry,7764.55588836946,procammonia_1,"('winter', 'all-week', 'all-day')",MUS$2010/kt,2050.00000000000 -3,A1,3.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,3,2045.00000000000,R1,industry,7764.55589482224,procammonia_1,"('winter', 'all-week', 'all-day')",MUS$2010/kt,2050.00000000000 -4,A1,0.00000000000,retrofit,PRODUCT,ammonia,R1,5,2030.00000000000,R1,industry,5.16885744278,procammonia_1,"('winter', 'all-week', 'all-day')",MUS$2010/Mt,2050.00000000000 -5,A1,1.00000000000,retrofit,PRODUCT,ammonia,R1,6,2035.00000000000,R1,industry,4.54881745182,procammonia_1,"('winter', 'all-week', 'all-day')",MUS$2010/Mt,2050.00000000000 -6,A1,2.00000000000,retrofit,PRODUCT,ammonia,R1,7,2040.00000000000,R1,industry,1.98542773688,procammonia_1,"('winter', 'all-week', 'all-day')",MUS$2010/Mt,2050.00000000000 -7,A1,3.00000000000,retrofit,PRODUCT,ammonia,R1,8,2045.00000000000,R1,industry,1.98542773853,procammonia_1,"('winter', 'all-week', 'all-day')",MUS$2010/Mt,2050.00000000000 -8,A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,25,2030.00000000000,R1,industry,20826.77701180542,procammonia_1,"('summer', 'all-week', 'all-day')",MUS$2010/kt,2050.00000000000 -9,A1,1.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,26,2035.00000000000,R1,industry,18328.46190579394,procammonia_1,"('summer', 'all-week', 'all-day')",MUS$2010/kt,2050.00000000000 -10,A1,2.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,27,2040.00000000000,R1,industry,7999.84546040052,procammonia_1,"('summer', 'all-week', 'all-day')",MUS$2010/kt,2050.00000000000 -11,A1,3.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,28,2045.00000000000,R1,industry,7999.84546704883,procammonia_1,"('summer', 'all-week', 'all-day')",MUS$2010/kt,2050.00000000000 -12,A1,0.00000000000,retrofit,PRODUCT,ammonia,R1,30,2030.00000000000,R1,industry,5.32548948627,procammonia_1,"('summer', 'all-week', 'all-day')",MUS$2010/Mt,2050.00000000000 -13,A1,1.00000000000,retrofit,PRODUCT,ammonia,R1,31,2035.00000000000,R1,industry,4.68666040470,procammonia_1,"('summer', 'all-week', 'all-day')",MUS$2010/Mt,2050.00000000000 -14,A1,2.00000000000,retrofit,PRODUCT,ammonia,R1,32,2040.00000000000,R1,industry,2.04559221367,procammonia_1,"('summer', 'all-week', 'all-day')",MUS$2010/Mt,2050.00000000000 -15,A1,3.00000000000,retrofit,PRODUCT,ammonia,R1,33,2045.00000000000,R1,industry,2.04559221537,procammonia_1,"('summer', 'all-week', 'all-day')",MUS$2010/Mt,2050.00000000000 -16,A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,50,2030.00000000000,R1,industry,20214.22474762099,procammonia_1,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/kt,2050.00000000000 -17,A1,1.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,51,2035.00000000000,R1,industry,17789.38949756446,procammonia_1,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/kt,2050.00000000000 -18,A1,2.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,52,2040.00000000000,R1,industry,7764.55588836946,procammonia_1,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/kt,2050.00000000000 -19,A1,3.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,53,2045.00000000000,R1,industry,7764.55589482224,procammonia_1,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/kt,2050.00000000000 -20,A1,0.00000000000,retrofit,PRODUCT,ammonia,R1,55,2030.00000000000,R1,industry,5.16885744278,procammonia_1,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/Mt,2050.00000000000 -21,A1,1.00000000000,retrofit,PRODUCT,ammonia,R1,56,2035.00000000000,R1,industry,4.54881745182,procammonia_1,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/Mt,2050.00000000000 -22,A1,2.00000000000,retrofit,PRODUCT,ammonia,R1,57,2040.00000000000,R1,industry,1.98542773688,procammonia_1,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/Mt,2050.00000000000 -23,A1,3.00000000000,retrofit,PRODUCT,ammonia,R1,58,2045.00000000000,R1,industry,1.98542773853,procammonia_1,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/Mt,2050.00000000000 +0,A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,0,2030.00000000000,R1,industry,21831.36272681149,procammonia_1,"('winter', 'all-week', 'all-day')",MUS$2010/kt,2050.00000000000 +1,A1,1.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,1,2035.00000000000,R1,industry,19212.54065682471,procammonia_1,"('winter', 'all-week', 'all-day')",MUS$2010/kt,2050.00000000000 +2,A1,2.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,2,2040.00000000000,R1,industry,8385.72035920118,procammonia_1,"('winter', 'all-week', 'all-day')",MUS$2010/kt,2050.00000000000 +3,A1,3.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,3,2045.00000000000,R1,industry,8385.72036617018,procammonia_1,"('winter', 'all-week', 'all-day')",MUS$2010/kt,2050.00000000000 +4,A1,0.00000000000,retrofit,PRODUCT,ammonia,R1,5,2030.00000000000,R1,industry,5.58236603804,procammonia_1,"('winter', 'all-week', 'all-day')",MUS$2010/Mt,2050.00000000000 +5,A1,1.00000000000,retrofit,PRODUCT,ammonia,R1,6,2035.00000000000,R1,industry,4.91272284782,procammonia_1,"('winter', 'all-week', 'all-day')",MUS$2010/Mt,2050.00000000000 +6,A1,2.00000000000,retrofit,PRODUCT,ammonia,R1,7,2040.00000000000,R1,industry,2.14426195577,procammonia_1,"('winter', 'all-week', 'all-day')",MUS$2010/Mt,2050.00000000000 +7,A1,3.00000000000,retrofit,PRODUCT,ammonia,R1,8,2045.00000000000,R1,industry,2.14426195755,procammonia_1,"('winter', 'all-week', 'all-day')",MUS$2010/Mt,2050.00000000000 +8,A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,25,2030.00000000000,R1,industry,22492.91917211192,procammonia_1,"('summer', 'all-week', 'all-day')",MUS$2010/kt,2050.00000000000 +9,A1,1.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,26,2035.00000000000,R1,industry,19794.73885769603,procammonia_1,"('summer', 'all-week', 'all-day')",MUS$2010/kt,2050.00000000000 +10,A1,2.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,27,2040.00000000000,R1,industry,8639.83309698752,procammonia_1,"('summer', 'all-week', 'all-day')",MUS$2010/kt,2050.00000000000 +11,A1,3.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,28,2045.00000000000,R1,industry,8639.83310416770,procammonia_1,"('summer', 'all-week', 'all-day')",MUS$2010/kt,2050.00000000000 +12,A1,0.00000000000,retrofit,PRODUCT,ammonia,R1,30,2030.00000000000,R1,industry,5.75152864500,procammonia_1,"('summer', 'all-week', 'all-day')",MUS$2010/Mt,2050.00000000000 +13,A1,1.00000000000,retrofit,PRODUCT,ammonia,R1,31,2035.00000000000,R1,industry,5.06159323693,procammonia_1,"('summer', 'all-week', 'all-day')",MUS$2010/Mt,2050.00000000000 +14,A1,2.00000000000,retrofit,PRODUCT,ammonia,R1,32,2040.00000000000,R1,industry,2.20923959070,procammonia_1,"('summer', 'all-week', 'all-day')",MUS$2010/Mt,2050.00000000000 +15,A1,3.00000000000,retrofit,PRODUCT,ammonia,R1,33,2045.00000000000,R1,industry,2.20923959253,procammonia_1,"('summer', 'all-week', 'all-day')",MUS$2010/Mt,2050.00000000000 +16,A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,50,2030.00000000000,R1,industry,21831.36272681149,procammonia_1,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/kt,2050.00000000000 +17,A1,1.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,51,2035.00000000000,R1,industry,19212.54065682471,procammonia_1,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/kt,2050.00000000000 +18,A1,2.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,52,2040.00000000000,R1,industry,8385.72035920118,procammonia_1,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/kt,2050.00000000000 +19,A1,3.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,53,2045.00000000000,R1,industry,8385.72036617018,procammonia_1,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/kt,2050.00000000000 +20,A1,0.00000000000,retrofit,PRODUCT,ammonia,R1,55,2030.00000000000,R1,industry,5.58236603804,procammonia_1,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/Mt,2050.00000000000 +21,A1,1.00000000000,retrofit,PRODUCT,ammonia,R1,56,2035.00000000000,R1,industry,4.91272284782,procammonia_1,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/Mt,2050.00000000000 +22,A1,2.00000000000,retrofit,PRODUCT,ammonia,R1,57,2040.00000000000,R1,industry,2.14426195577,procammonia_1,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/Mt,2050.00000000000 +23,A1,3.00000000000,retrofit,PRODUCT,ammonia,R1,58,2045.00000000000,R1,industry,2.14426195755,procammonia_1,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/Mt,2050.00000000000 From e20473d5d262e6d35298aaaeed79a50dc310c98d Mon Sep 17 00:00:00 2001 From: Diego Alonso Alvarez Date: Fri, 21 Jun 2024 13:55:09 +0100 Subject: [PATCH 05/12] Update docs\tutorial-code\7-min-max-timeslice-constraints\2-max-constraint --- .../Results/MCAMetric_Consumption.csv | 12 +++++----- .../Results/MCAMetric_Supply.csv | 24 +++++++++---------- 2 files changed, 18 insertions(+), 18 deletions(-) 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 index 203194bce..04c3fdae1 100644 --- 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 @@ -17,17 +17,17 @@ A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.96666666667,R1,65,2020.0000000 A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,1.26666666667,R1,68,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000 A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.64444444444,R1,81,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000 A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.84444444444,R1,84,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000 -A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.29933962264,R1,1,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000 +A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.33400000000,R1,1,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000 A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.24297693920,R1,7,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2025.00000000000 -A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.63039735099,R1,13,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000 +A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.66800000000,R1,13,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000 A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.25584988962,R1,19,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2025.00000000000 -A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.42026490066,R1,25,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2025.00000000000 +A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,1.00200000000,R1,25,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2025.00000000000 A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.17056659308,R1,31,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2025.00000000000 -A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.44900943396,R1,37,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000 +A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.66800000000,R1,37,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000 A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.36446540881,R1,43,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2025.00000000000 -A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.89801886792,R1,49,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000 +A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,1.33600000000,R1,49,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000 A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.72893081761,R1,55,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2025.00000000000 -A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.59867924528,R1,61,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000 +A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,1.67000000000,R1,61,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000 A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.48595387841,R1,67,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2025.00000000000 A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.42222222222,R1,0,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000 A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.26422222222,R1,5,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000 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 index d24d8c309..ea3063a4b 100644 --- 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 @@ -35,24 +35,24 @@ A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,76,2020.00000000000,R1,r A1,0.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,88,2020.00000000000,R1,residential,0.55555555556,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000 A1,1.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,89,2020.00000000000,R1,residential,2.11111111111,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000 A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,92,2020.00000000000,R1,residential,35.95000000000,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2025.00000000000 -A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,0,2020.00000000000,R1,power,0.17924528302,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000 +A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,0,2020.00000000000,R1,power,0.20000000000,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000 A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,1,2020.00000000000,R1,power,0.24297693920,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000 -A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,6,2020.00000000000,R1,power,16.43141509434,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/kt,2025.00000000000 -A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,12,2020.00000000000,R1,power,0.37748344371,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000 +A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,6,2020.00000000000,R1,power,18.33400000000,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/kt,2025.00000000000 +A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,12,2020.00000000000,R1,power,0.40000000000,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000 A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,13,2020.00000000000,R1,power,0.25584988962,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000 -A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,18,2020.00000000000,R1,power,34.60390728477,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2025.00000000000 -A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,24,2020.00000000000,R1,power,0.25165562914,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2025.00000000000 +A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,18,2020.00000000000,R1,power,36.66800000000,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2025.00000000000 +A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,24,2020.00000000000,R1,power,0.60000000000,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2025.00000000000 A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,25,2020.00000000000,R1,power,0.17056659308,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2025.00000000000 -A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,30,2020.00000000000,R1,power,23.06927152318,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2025.00000000000 -A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,36,2020.00000000000,R1,power,0.26886792453,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000 +A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,30,2020.00000000000,R1,power,55.00200000000,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2025.00000000000 +A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,36,2020.00000000000,R1,power,0.40000000000,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000 A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,37,2020.00000000000,R1,power,0.36446540881,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000 -A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,42,2020.00000000000,R1,power,24.64712264151,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2025.00000000000 -A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,48,2020.00000000000,R1,power,0.53773584906,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000 +A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,42,2020.00000000000,R1,power,36.66800000000,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2025.00000000000 +A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,48,2020.00000000000,R1,power,0.80000000000,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000 A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,49,2020.00000000000,R1,power,0.72893081761,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000 -A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,54,2020.00000000000,R1,power,49.29424528302,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2025.00000000000 -A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,60,2020.00000000000,R1,power,0.35849056604,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000 +A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,54,2020.00000000000,R1,power,73.33600000000,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2025.00000000000 +A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,60,2020.00000000000,R1,power,1.00000000000,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000 A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,61,2020.00000000000,R1,power,0.48595387841,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000 -A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,66,2020.00000000000,R1,power,32.86283018868,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2025.00000000000 +A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,66,2020.00000000000,R1,power,91.67000000000,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2025.00000000000 A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,0,2020.00000000000,R1,gas,0.65622222222,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000 A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,1,2020.00000000000,R1,gas,1.15133333333,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000 A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,2,2020.00000000000,R1,gas,1.32422222222,gassupply1,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2025.00000000000 From 64d148fead0121ce854d511f8f3124a396f832de Mon Sep 17 00:00:00 2001 From: Diego Alonso Alvarez Date: Fri, 21 Jun 2024 13:59:44 +0100 Subject: [PATCH 06/12] update docs\tutorial-code\7-min-max-timeslice-constraints\1-min-constraint\settings.toml --- .../Results/MCAMetric_Consumption.csv | 10 +++++----- .../Results/MCAMetric_Supply.csv | 20 +++++++++---------- 2 files changed, 15 insertions(+), 15 deletions(-) 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 index 69eb3a4f7..b0f56626a 100644 --- 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 @@ -19,15 +19,15 @@ A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.64444444444,R1,81,2020.0000000 A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.84444444444,R1,84,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000 A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.33576719577,R1,1,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000 A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.22116402116,R1,7,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2025.00000000000 -A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.50365079365,R1,13,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000 +A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.66800000000,R1,13,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000 A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.33174603175,R1,19,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2025.00000000000 -A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.33576719577,R1,25,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2025.00000000000 +A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,1.00200000000,R1,25,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2025.00000000000 A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.22116402116,R1,31,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2025.00000000000 -A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.50365079365,R1,37,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000 +A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.66800000000,R1,37,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000 A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.33174603175,R1,43,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2025.00000000000 -A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,1.00730158730,R1,49,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000 +A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,1.33600000000,R1,49,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000 A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.66349206349,R1,55,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2025.00000000000 -A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.67153439153,R1,61,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000 +A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,1.67000000000,R1,61,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000 A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.44232804233,R1,67,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2025.00000000000 A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.42222222222,R1,0,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000 A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.26422222222,R1,5,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000 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 index e5a087bcc..401fc436f 100644 --- 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 @@ -38,21 +38,21 @@ A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,92,2020.00000000000,R1,r A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,0,2020.00000000000,R1,power,0.20105820106,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000 A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,1,2020.00000000000,R1,power,0.22116402116,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000 A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,6,2020.00000000000,R1,power,18.43100529101,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/kt,2025.00000000000 -A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,12,2020.00000000000,R1,power,0.30158730159,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000 +A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,12,2020.00000000000,R1,power,0.40000000000,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000 A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,13,2020.00000000000,R1,power,0.33174603175,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000 -A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,18,2020.00000000000,R1,power,27.64650793651,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2025.00000000000 -A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,24,2020.00000000000,R1,power,0.20105820106,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2025.00000000000 +A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,18,2020.00000000000,R1,power,36.66800000000,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2025.00000000000 +A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,24,2020.00000000000,R1,power,0.60000000000,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2025.00000000000 A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,25,2020.00000000000,R1,power,0.22116402116,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2025.00000000000 -A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,30,2020.00000000000,R1,power,18.43100529101,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2025.00000000000 -A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,36,2020.00000000000,R1,power,0.30158730159,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000 +A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,30,2020.00000000000,R1,power,55.00200000000,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2025.00000000000 +A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,36,2020.00000000000,R1,power,0.40000000000,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000 A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,37,2020.00000000000,R1,power,0.33174603175,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000 -A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,42,2020.00000000000,R1,power,27.64650793651,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2025.00000000000 -A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,48,2020.00000000000,R1,power,0.60317460317,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000 +A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,42,2020.00000000000,R1,power,36.66800000000,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2025.00000000000 +A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,48,2020.00000000000,R1,power,0.80000000000,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000 A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,49,2020.00000000000,R1,power,0.66349206349,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000 -A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,54,2020.00000000000,R1,power,55.29301587302,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2025.00000000000 -A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,60,2020.00000000000,R1,power,0.40211640212,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000 +A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,54,2020.00000000000,R1,power,73.33600000000,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2025.00000000000 +A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,60,2020.00000000000,R1,power,1.00000000000,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000 A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,61,2020.00000000000,R1,power,0.44232804233,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000 -A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,66,2020.00000000000,R1,power,36.86201058201,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2025.00000000000 +A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,66,2020.00000000000,R1,power,91.67000000000,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2025.00000000000 A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,0,2020.00000000000,R1,gas,0.65622222222,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000 A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,1,2020.00000000000,R1,gas,1.15133333333,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000 A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,2,2020.00000000000,R1,gas,1.32422222222,gassupply1,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2025.00000000000 From 25de8cf1685c43870074d0395202bb6d627d4138 Mon Sep 17 00:00:00 2001 From: Diego Alonso Alvarez Date: Fri, 21 Jun 2024 14:12:40 +0100 Subject: [PATCH 07/12] Add test_min_production --- tests/test_quantities.py | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/tests/test_quantities.py b/tests/test_quantities.py index 74439b1b0..94df921a3 100644 --- a/tests/test_quantities.py +++ b/tests/test_quantities.py @@ -613,3 +613,20 @@ def test_costed_production_with_minimum_service(market, capacity, technologies, assert (actual[dim] == maxdemand[dim]).all() assert (actual >= 0.9 * maxdemand - 1e-8).all() assert (result >= minprod - 1e-8).all() + + +def test_min_production(technologies, capacity): + """Test minimum production quantity.""" + from muse.quantities import maximum_production, minimum_production + + # If no minimum service factor is defined, the minimum production is zero + assert "minimum_service_factor" not in technologies + production = minimum_production(technologies, capacity) + assert (production == 0).all() + + # If minimum service factor is defined, then the minimum production is not zero + # and it is less than the maximum production + technologies["minimum_service_factor"] = 0.5 + production = minimum_production(technologies, capacity) + assert not (production == 0).all() + assert (production <= maximum_production(technologies, capacity)).all() From 964f676d092bceaf98fc56ed1a0a496953605acd Mon Sep 17 00:00:00 2001 From: Diego Alonso Alvarez Date: Fri, 21 Jun 2024 14:56:38 +0100 Subject: [PATCH 08/12] Add test_supply_capped_by_min_service --- src/muse/quantities.py | 1 + tests/test_quantities.py | 15 +++++++++++++++ 2 files changed, 16 insertions(+) diff --git a/src/muse/quantities.py b/src/muse/quantities.py index e36b17bee..36d0f011e 100644 --- a/src/muse/quantities.py +++ b/src/muse/quantities.py @@ -48,6 +48,7 @@ def supply( maxprod = production_method(technologies, capacity) minprod = minimum_production(technologies, capacity) + assert (minprod <= maxprod).all(), "Minimum production exceeds maximum production" size = np.array(maxprod.region).size # in presence of trade demand needs to map maxprod dst_region if ( diff --git a/tests/test_quantities.py b/tests/test_quantities.py index 94df921a3..dd043f2ec 100644 --- a/tests/test_quantities.py +++ b/tests/test_quantities.py @@ -630,3 +630,18 @@ def test_min_production(technologies, capacity): production = minimum_production(technologies, capacity) assert not (production == 0).all() assert (production <= maximum_production(technologies, capacity)).all() + + +def test_supply_capped_by_min_service(technologies, capacity): + """Test supply is capped by the minimum service.""" + from muse.quantities import maximum_production, supply + + prod = maximum_production(technologies, capacity) + + assert "minimum_service_factor" not in technologies + spl = supply(capacity, prod.sum("asset") * 0.0, technologies) + assert (spl == 0).all() + + technologies["minimum_service_factor"] = 0.1 + spl = supply(capacity, prod.sum("asset") * 0.0, technologies) + assert not (spl == 0).all() From e3d028d15a39331f697ec41a1ebf2640e0297151 Mon Sep 17 00:00:00 2001 From: Diego Alonso Alvarez Date: Mon, 24 Jun 2024 07:09:43 +0100 Subject: [PATCH 09/12] Add test supply limitted by service factor --- tests/test_quantities.py | 38 ++++++++++++++++++++++++++++++-------- 1 file changed, 30 insertions(+), 8 deletions(-) diff --git a/tests/test_quantities.py b/tests/test_quantities.py index dd043f2ec..067c12a8e 100644 --- a/tests/test_quantities.py +++ b/tests/test_quantities.py @@ -634,14 +634,36 @@ def test_min_production(technologies, capacity): def test_supply_capped_by_min_service(technologies, capacity): """Test supply is capped by the minimum service.""" - from muse.quantities import maximum_production, supply + from muse.commodities import CommodityUsage + from muse.quantities import minimum_production, supply - prod = maximum_production(technologies, capacity) + technologies["minimum_service_factor"] = 0.3 + minprod = minimum_production(technologies, capacity) - assert "minimum_service_factor" not in technologies - spl = supply(capacity, prod.sum("asset") * 0.0, technologies) - assert (spl == 0).all() + # If minimum service factor is defined, then the minimum production is not zero + assert not (minprod == 0).all() - technologies["minimum_service_factor"] = 0.1 - spl = supply(capacity, prod.sum("asset") * 0.0, technologies) - assert not (spl == 0).all() + # And even if the demand is smaller than the minimum production, the supply + # should be equal to the minimum production + demand = minprod / 2 + spl = supply(capacity, demand, technologies) + spl = spl.sel(commodity=spl.comm_usage == CommodityUsage.PRODUCT).sum( + ["year", "asset"] + ) + minprod = minprod.sel(commodity=minprod.comm_usage == CommodityUsage.PRODUCT).sum( + ["year", "asset"] + ) + assert (spl == approx(minprod)).all() + + # But if there is not minimum service factor, the supply should be equal to the + # demand and should not be capped by the minimum production + del technologies["minimum_service_factor"] + spl = supply(capacity, demand, technologies) + spl = spl.sel(commodity=spl.comm_usage == CommodityUsage.PRODUCT).sum( + ["year", "asset"] + ) + demand = demand.sel(commodity=demand.comm_usage == CommodityUsage.PRODUCT).sum( + ["year", "asset"] + ) + assert (spl == approx(demand)).all() + assert (spl <= minprod).all() From b6425f2e909595d21453cadc9a3095f1aa0889d5 Mon Sep 17 00:00:00 2001 From: Diego Alonso Alvarez Date: Mon, 24 Jun 2024 07:28:29 +0100 Subject: [PATCH 10/12] Remove unnecessary check --- src/muse/quantities.py | 1 - 1 file changed, 1 deletion(-) diff --git a/src/muse/quantities.py b/src/muse/quantities.py index 36d0f011e..e36b17bee 100644 --- a/src/muse/quantities.py +++ b/src/muse/quantities.py @@ -48,7 +48,6 @@ def supply( maxprod = production_method(technologies, capacity) minprod = minimum_production(technologies, capacity) - assert (minprod <= maxprod).all(), "Minimum production exceeds maximum production" size = np.array(maxprod.region).size # in presence of trade demand needs to map maxprod dst_region if ( From 7b522aadcc150dcf5a39f6c338efa1e6f5740d94 Mon Sep 17 00:00:00 2001 From: Diego Alonso Alvarez Date: Mon, 24 Jun 2024 07:44:07 +0100 Subject: [PATCH 11/12] Update output data --- src/muse/quantities.py | 14 +++++- .../minimum_service/Industry/Supply/2050.csv | 12 ++--- .../minimum_service/MCAMetric_Supply.csv | 48 +++++++++---------- 3 files changed, 42 insertions(+), 32 deletions(-) diff --git a/src/muse/quantities.py b/src/muse/quantities.py index e36b17bee..e8b0ea0c1 100644 --- a/src/muse/quantities.py +++ b/src/muse/quantities.py @@ -707,11 +707,21 @@ def minimum_production(technologies: xr.Dataset, capacity: xr.DataArray, **filte return xr.zeros_like(capa) btechs = broadcast_techs( # type: ignore - cast(xr.Dataset, technologies[["fixed_outputs", "minimum_service_factor"]]), + cast( + xr.Dataset, + technologies[ + ["fixed_outputs", "minimum_service_factor", "utilization_factor"] + ], + ), capa, ) ftechs = filter_input( btechs, **{k: v for k, v in filters.items() if k in btechs.dims} ) - result = capa * ftechs.fixed_outputs * ftechs.minimum_service_factor + result = ( + capa + * ftechs.fixed_outputs + * ftechs.minimum_service_factor + * ftechs.utilization_factor + ) return result.where(is_enduse(result.comm_usage), 0) diff --git a/tests/example_outputs/minimum_service/Industry/Supply/2050.csv b/tests/example_outputs/minimum_service/Industry/Supply/2050.csv index 5171d3819..5c1490c8b 100644 --- a/tests/example_outputs/minimum_service/Industry/Supply/2050.csv +++ b/tests/example_outputs/minimum_service/Industry/Supply/2050.csv @@ -6,7 +6,7 @@ timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply 0,CO2f,2055,5,R1,winter,all-week,all-day,procammonia_1,2035,18228.27250000000 0,CO2f,2055,6,R1,winter,all-week,all-day,procammonia_1,2040,7892.26240000000 0,CO2f,2055,7,R1,winter,all-week,all-day,procammonia_1,2045,7828.40920000000 -0,CO2f,2055,8,R1,winter,all-week,all-day,procammonia_1,2050,21831.36270000000 +0,CO2f,2055,8,R1,winter,all-week,all-day,procammonia_1,2050,20214.22470000000 0,ammonia,2050,4,R1,winter,all-week,all-day,procammonia_1,2030,5.16890000000 0,ammonia,2050,5,R1,winter,all-week,all-day,procammonia_1,2035,4.54880000000 0,ammonia,2050,6,R1,winter,all-week,all-day,procammonia_1,2040,1.98540000000 @@ -14,7 +14,7 @@ timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply 0,ammonia,2055,5,R1,winter,all-week,all-day,procammonia_1,2035,4.54880000000 0,ammonia,2055,6,R1,winter,all-week,all-day,procammonia_1,2040,1.98540000000 0,ammonia,2055,7,R1,winter,all-week,all-day,procammonia_1,2045,1.98540000000 -0,ammonia,2055,8,R1,winter,all-week,all-day,procammonia_1,2050,5.58240000000 +0,ammonia,2055,8,R1,winter,all-week,all-day,procammonia_1,2050,5.16890000000 1,CO2f,2050,4,R1,summer,all-week,all-day,procammonia_1,2030,21511.86840000000 1,CO2f,2050,5,R1,summer,all-week,all-day,procammonia_1,2035,18780.64440000000 1,CO2f,2050,6,R1,summer,all-week,all-day,procammonia_1,2040,8131.42190000000 @@ -22,7 +22,7 @@ timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply 1,CO2f,2055,5,R1,summer,all-week,all-day,procammonia_1,2035,18780.64440000000 1,CO2f,2055,6,R1,summer,all-week,all-day,procammonia_1,2040,8131.42190000000 1,CO2f,2055,7,R1,summer,all-week,all-day,procammonia_1,2045,8065.63370000000 -1,CO2f,2055,8,R1,summer,all-week,all-day,procammonia_1,2050,22492.91920000000 +1,CO2f,2055,8,R1,summer,all-week,all-day,procammonia_1,2050,20826.77700000000 1,ammonia,2050,4,R1,summer,all-week,all-day,procammonia_1,2030,5.32550000000 1,ammonia,2050,5,R1,summer,all-week,all-day,procammonia_1,2035,4.68670000000 1,ammonia,2050,6,R1,summer,all-week,all-day,procammonia_1,2040,2.04560000000 @@ -30,7 +30,7 @@ timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply 1,ammonia,2055,5,R1,summer,all-week,all-day,procammonia_1,2035,4.68670000000 1,ammonia,2055,6,R1,summer,all-week,all-day,procammonia_1,2040,2.04560000000 1,ammonia,2055,7,R1,summer,all-week,all-day,procammonia_1,2045,2.04560000000 -1,ammonia,2055,8,R1,summer,all-week,all-day,procammonia_1,2050,5.75150000000 +1,ammonia,2055,8,R1,summer,all-week,all-day,procammonia_1,2050,5.32550000000 2,CO2f,2050,4,R1,spring-autumn,all-week,all-day,procammonia_1,2030,20879.16640000000 2,CO2f,2050,5,R1,spring-autumn,all-week,all-day,procammonia_1,2035,18228.27250000000 2,CO2f,2050,6,R1,spring-autumn,all-week,all-day,procammonia_1,2040,7892.26240000000 @@ -38,7 +38,7 @@ timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply 2,CO2f,2055,5,R1,spring-autumn,all-week,all-day,procammonia_1,2035,18228.27250000000 2,CO2f,2055,6,R1,spring-autumn,all-week,all-day,procammonia_1,2040,7892.26240000000 2,CO2f,2055,7,R1,spring-autumn,all-week,all-day,procammonia_1,2045,7828.40920000000 -2,CO2f,2055,8,R1,spring-autumn,all-week,all-day,procammonia_1,2050,21831.36270000000 +2,CO2f,2055,8,R1,spring-autumn,all-week,all-day,procammonia_1,2050,20214.22470000000 2,ammonia,2050,4,R1,spring-autumn,all-week,all-day,procammonia_1,2030,5.16890000000 2,ammonia,2050,5,R1,spring-autumn,all-week,all-day,procammonia_1,2035,4.54880000000 2,ammonia,2050,6,R1,spring-autumn,all-week,all-day,procammonia_1,2040,1.98540000000 @@ -46,4 +46,4 @@ timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply 2,ammonia,2055,5,R1,spring-autumn,all-week,all-day,procammonia_1,2035,4.54880000000 2,ammonia,2055,6,R1,spring-autumn,all-week,all-day,procammonia_1,2040,1.98540000000 2,ammonia,2055,7,R1,spring-autumn,all-week,all-day,procammonia_1,2045,1.98540000000 -2,ammonia,2055,8,R1,spring-autumn,all-week,all-day,procammonia_1,2050,5.58240000000 +2,ammonia,2055,8,R1,spring-autumn,all-week,all-day,procammonia_1,2050,5.16890000000 diff --git a/tests/example_outputs/minimum_service/MCAMetric_Supply.csv b/tests/example_outputs/minimum_service/MCAMetric_Supply.csv index a2808d321..9cf2795af 100644 --- a/tests/example_outputs/minimum_service/MCAMetric_Supply.csv +++ b/tests/example_outputs/minimum_service/MCAMetric_Supply.csv @@ -179,27 +179,27 @@ 21,A1,1.00000000000,retrofit,PRODUCT,ammonia,R1,56,2030.00000000000,R1,industry,5.16885744266,procammonia_1,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/Mt,2045.00000000000 22,A1,2.00000000000,retrofit,PRODUCT,ammonia,R1,57,2035.00000000000,R1,industry,4.54881745172,procammonia_1,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/Mt,2045.00000000000 23,A1,3.00000000000,retrofit,PRODUCT,ammonia,R1,58,2040.00000000000,R1,industry,1.98542773684,procammonia_1,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/Mt,2045.00000000000 -0,A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,0,2030.00000000000,R1,industry,21831.36272681149,procammonia_1,"('winter', 'all-week', 'all-day')",MUS$2010/kt,2050.00000000000 -1,A1,1.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,1,2035.00000000000,R1,industry,19212.54065682471,procammonia_1,"('winter', 'all-week', 'all-day')",MUS$2010/kt,2050.00000000000 -2,A1,2.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,2,2040.00000000000,R1,industry,8385.72035920118,procammonia_1,"('winter', 'all-week', 'all-day')",MUS$2010/kt,2050.00000000000 -3,A1,3.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,3,2045.00000000000,R1,industry,8385.72036617018,procammonia_1,"('winter', 'all-week', 'all-day')",MUS$2010/kt,2050.00000000000 -4,A1,0.00000000000,retrofit,PRODUCT,ammonia,R1,5,2030.00000000000,R1,industry,5.58236603804,procammonia_1,"('winter', 'all-week', 'all-day')",MUS$2010/Mt,2050.00000000000 -5,A1,1.00000000000,retrofit,PRODUCT,ammonia,R1,6,2035.00000000000,R1,industry,4.91272284782,procammonia_1,"('winter', 'all-week', 'all-day')",MUS$2010/Mt,2050.00000000000 -6,A1,2.00000000000,retrofit,PRODUCT,ammonia,R1,7,2040.00000000000,R1,industry,2.14426195577,procammonia_1,"('winter', 'all-week', 'all-day')",MUS$2010/Mt,2050.00000000000 -7,A1,3.00000000000,retrofit,PRODUCT,ammonia,R1,8,2045.00000000000,R1,industry,2.14426195755,procammonia_1,"('winter', 'all-week', 'all-day')",MUS$2010/Mt,2050.00000000000 -8,A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,25,2030.00000000000,R1,industry,22492.91917211192,procammonia_1,"('summer', 'all-week', 'all-day')",MUS$2010/kt,2050.00000000000 -9,A1,1.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,26,2035.00000000000,R1,industry,19794.73885769603,procammonia_1,"('summer', 'all-week', 'all-day')",MUS$2010/kt,2050.00000000000 -10,A1,2.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,27,2040.00000000000,R1,industry,8639.83309698752,procammonia_1,"('summer', 'all-week', 'all-day')",MUS$2010/kt,2050.00000000000 -11,A1,3.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,28,2045.00000000000,R1,industry,8639.83310416770,procammonia_1,"('summer', 'all-week', 'all-day')",MUS$2010/kt,2050.00000000000 -12,A1,0.00000000000,retrofit,PRODUCT,ammonia,R1,30,2030.00000000000,R1,industry,5.75152864500,procammonia_1,"('summer', 'all-week', 'all-day')",MUS$2010/Mt,2050.00000000000 -13,A1,1.00000000000,retrofit,PRODUCT,ammonia,R1,31,2035.00000000000,R1,industry,5.06159323693,procammonia_1,"('summer', 'all-week', 'all-day')",MUS$2010/Mt,2050.00000000000 -14,A1,2.00000000000,retrofit,PRODUCT,ammonia,R1,32,2040.00000000000,R1,industry,2.20923959070,procammonia_1,"('summer', 'all-week', 'all-day')",MUS$2010/Mt,2050.00000000000 -15,A1,3.00000000000,retrofit,PRODUCT,ammonia,R1,33,2045.00000000000,R1,industry,2.20923959253,procammonia_1,"('summer', 'all-week', 'all-day')",MUS$2010/Mt,2050.00000000000 -16,A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,50,2030.00000000000,R1,industry,21831.36272681149,procammonia_1,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/kt,2050.00000000000 -17,A1,1.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,51,2035.00000000000,R1,industry,19212.54065682471,procammonia_1,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/kt,2050.00000000000 -18,A1,2.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,52,2040.00000000000,R1,industry,8385.72035920118,procammonia_1,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/kt,2050.00000000000 -19,A1,3.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,53,2045.00000000000,R1,industry,8385.72036617018,procammonia_1,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/kt,2050.00000000000 -20,A1,0.00000000000,retrofit,PRODUCT,ammonia,R1,55,2030.00000000000,R1,industry,5.58236603804,procammonia_1,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/Mt,2050.00000000000 -21,A1,1.00000000000,retrofit,PRODUCT,ammonia,R1,56,2035.00000000000,R1,industry,4.91272284782,procammonia_1,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/Mt,2050.00000000000 -22,A1,2.00000000000,retrofit,PRODUCT,ammonia,R1,57,2040.00000000000,R1,industry,2.14426195577,procammonia_1,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/Mt,2050.00000000000 -23,A1,3.00000000000,retrofit,PRODUCT,ammonia,R1,58,2045.00000000000,R1,industry,2.14426195755,procammonia_1,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/Mt,2050.00000000000 +0,A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,0,2030.00000000000,R1,industry,20214.22474762099,procammonia_1,"('winter', 'all-week', 'all-day')",MUS$2010/kt,2050.00000000000 +1,A1,1.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,1,2035.00000000000,R1,industry,17789.38949756446,procammonia_1,"('winter', 'all-week', 'all-day')",MUS$2010/kt,2050.00000000000 +2,A1,2.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,2,2040.00000000000,R1,industry,7764.55588836946,procammonia_1,"('winter', 'all-week', 'all-day')",MUS$2010/kt,2050.00000000000 +3,A1,3.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,3,2045.00000000000,R1,industry,7764.55589482224,procammonia_1,"('winter', 'all-week', 'all-day')",MUS$2010/kt,2050.00000000000 +4,A1,0.00000000000,retrofit,PRODUCT,ammonia,R1,5,2030.00000000000,R1,industry,5.16885744278,procammonia_1,"('winter', 'all-week', 'all-day')",MUS$2010/Mt,2050.00000000000 +5,A1,1.00000000000,retrofit,PRODUCT,ammonia,R1,6,2035.00000000000,R1,industry,4.54881745182,procammonia_1,"('winter', 'all-week', 'all-day')",MUS$2010/Mt,2050.00000000000 +6,A1,2.00000000000,retrofit,PRODUCT,ammonia,R1,7,2040.00000000000,R1,industry,1.98542773688,procammonia_1,"('winter', 'all-week', 'all-day')",MUS$2010/Mt,2050.00000000000 +7,A1,3.00000000000,retrofit,PRODUCT,ammonia,R1,8,2045.00000000000,R1,industry,1.98542773853,procammonia_1,"('winter', 'all-week', 'all-day')",MUS$2010/Mt,2050.00000000000 +8,A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,25,2030.00000000000,R1,industry,20826.77701180542,procammonia_1,"('summer', 'all-week', 'all-day')",MUS$2010/kt,2050.00000000000 +9,A1,1.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,26,2035.00000000000,R1,industry,18328.46190579394,procammonia_1,"('summer', 'all-week', 'all-day')",MUS$2010/kt,2050.00000000000 +10,A1,2.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,27,2040.00000000000,R1,industry,7999.84546040052,procammonia_1,"('summer', 'all-week', 'all-day')",MUS$2010/kt,2050.00000000000 +11,A1,3.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,28,2045.00000000000,R1,industry,7999.84546704883,procammonia_1,"('summer', 'all-week', 'all-day')",MUS$2010/kt,2050.00000000000 +12,A1,0.00000000000,retrofit,PRODUCT,ammonia,R1,30,2030.00000000000,R1,industry,5.32548948627,procammonia_1,"('summer', 'all-week', 'all-day')",MUS$2010/Mt,2050.00000000000 +13,A1,1.00000000000,retrofit,PRODUCT,ammonia,R1,31,2035.00000000000,R1,industry,4.68666040470,procammonia_1,"('summer', 'all-week', 'all-day')",MUS$2010/Mt,2050.00000000000 +14,A1,2.00000000000,retrofit,PRODUCT,ammonia,R1,32,2040.00000000000,R1,industry,2.04559221367,procammonia_1,"('summer', 'all-week', 'all-day')",MUS$2010/Mt,2050.00000000000 +15,A1,3.00000000000,retrofit,PRODUCT,ammonia,R1,33,2045.00000000000,R1,industry,2.04559221537,procammonia_1,"('summer', 'all-week', 'all-day')",MUS$2010/Mt,2050.00000000000 +16,A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,50,2030.00000000000,R1,industry,20214.22474762099,procammonia_1,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/kt,2050.00000000000 +17,A1,1.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,51,2035.00000000000,R1,industry,17789.38949756446,procammonia_1,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/kt,2050.00000000000 +18,A1,2.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,52,2040.00000000000,R1,industry,7764.55588836946,procammonia_1,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/kt,2050.00000000000 +19,A1,3.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,53,2045.00000000000,R1,industry,7764.55589482224,procammonia_1,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/kt,2050.00000000000 +20,A1,0.00000000000,retrofit,PRODUCT,ammonia,R1,55,2030.00000000000,R1,industry,5.16885744278,procammonia_1,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/Mt,2050.00000000000 +21,A1,1.00000000000,retrofit,PRODUCT,ammonia,R1,56,2035.00000000000,R1,industry,4.54881745182,procammonia_1,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/Mt,2050.00000000000 +22,A1,2.00000000000,retrofit,PRODUCT,ammonia,R1,57,2040.00000000000,R1,industry,1.98542773688,procammonia_1,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/Mt,2050.00000000000 +23,A1,3.00000000000,retrofit,PRODUCT,ammonia,R1,58,2045.00000000000,R1,industry,1.98542773853,procammonia_1,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/Mt,2050.00000000000 From 537b4bdb527c39d2bf41d4beb6d1dc52167c720b Mon Sep 17 00:00:00 2001 From: Tom Bland Date: Thu, 17 Oct 2024 18:28:48 +0100 Subject: [PATCH 12/12] Fix error in supply calculation --- src/muse/quantities.py | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/src/muse/quantities.py b/src/muse/quantities.py index 1c0bb8484..016be9fc0 100644 --- a/src/muse/quantities.py +++ b/src/muse/quantities.py @@ -548,7 +548,7 @@ def minimum_production(technologies: xr.Dataset, capacity: xr.DataArray, **filte refer to asset capacity, the max capacity, or the capacity-in-use. technologies: xr.Dataset describing the features of the technologies of interests. It should contain `fixed_outputs` and `minimum_service_factor`. - It's shape is matched to `capacity` using `muse.utilities.broadcast_techs`. + Its shape is matched to `capacity` using `muse.utilities.broadcast_techs`. filters: keyword arguments are used to filter down the capacity and technologies. Filters not relevant to the quantities of interest, i.e. filters that are not a dimension of `capacity` or `technologies`, are @@ -571,21 +571,14 @@ def minimum_production(technologies: xr.Dataset, capacity: xr.DataArray, **filte btechs = broadcast_techs( # type: ignore cast( xr.Dataset, - technologies[ - ["fixed_outputs", "minimum_service_factor", "utilization_factor"] - ], + technologies[["fixed_outputs", "minimum_service_factor"]], ), capa, ) ftechs = filter_input( btechs, **{k: v for k, v in filters.items() if k in btechs.dims} ) - result = ( - capa - * ftechs.fixed_outputs - * ftechs.minimum_service_factor - * ftechs.utilization_factor - ) + result = capa * ftechs.fixed_outputs * ftechs.minimum_service_factor return result.where(is_enduse(result.comm_usage), 0)