From 7defafb678cac101385d3d63704b81bd06fe435e Mon Sep 17 00:00:00 2001 From: Tom Bland Date: Wed, 9 Oct 2024 15:36:18 +0100 Subject: [PATCH 01/18] Fix use of UF and MSF in constraints --- src/muse/constraints.py | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/src/muse/constraints.py b/src/muse/constraints.py index 74a55b843..5a9826e0f 100644 --- a/src/muse/constraints.py +++ b/src/muse/constraints.py @@ -465,11 +465,15 @@ def max_production( .sel(**kwargs) .drop_vars("technology") ) - capacity = convert_timeslice( - techs.fixed_outputs * techs.utilization_factor, - market.timeslice, - QuantityType.EXTENSIVE, + capacity = ( + convert_timeslice( + techs.fixed_outputs, + market.timeslice, + QuantityType.EXTENSIVE, + ) + * techs.utilization_factor ) + if "asset" not in capacity.dims and "asset" in search_space.dims: capacity = capacity.expand_dims(asset=search_space.asset) production = ones_like(capacity) @@ -751,10 +755,13 @@ def minimum_service( .sel(**kwargs) .drop_vars("technology") ) - capacity = convert_timeslice( - techs.fixed_outputs * techs.minimum_service_factor, - market.timeslice, - QuantityType.EXTENSIVE, + capacity = ( + convert_timeslice( + techs.fixed_outputs, + market.timeslice, + QuantityType.EXTENSIVE, + ) + * techs.minimum_service_factor ) if "asset" not in capacity.dims: capacity = capacity.expand_dims(asset=search_space.asset) From b332cd9cafecdaf9f1baea6fb5f868ae0c33a236 Mon Sep 17 00:00:00 2001 From: Tom Bland Date: Wed, 9 Oct 2024 16:18:48 +0100 Subject: [PATCH 02/18] Fix a few more UF/MSF occurences --- src/muse/objectives.py | 36 ++++++++++++++++++++++++++++-------- src/muse/outputs/mca.py | 26 ++++++++++++++++---------- tests/test_costs.py | 9 +++++---- 3 files changed, 49 insertions(+), 22 deletions(-) diff --git a/src/muse/objectives.py b/src/muse/objectives.py index 13639bca9..13189183f 100644 --- a/src/muse/objectives.py +++ b/src/muse/objectives.py @@ -391,8 +391,13 @@ def lifetime_levelized_cost_of_energy( from muse.timeslices import QuantityType, convert_timeslice capacity = capacity_to_service_demand(technologies, demand) - production = capacity * technologies.fixed_outputs * technologies.utilization_factor - production = convert_timeslice(production, demand.timeslice, QuantityType.EXTENSIVE) + production = ( + capacity + * convert_timeslice( + technologies.fixed_outputs, demand.timeslice, QuantityType.EXTENSIVE + ) + * technologies.utilization_factor + ) results = LCOE( technologies=technologies, @@ -421,8 +426,13 @@ def net_present_value( from muse.timeslices import QuantityType, convert_timeslice capacity = capacity_to_service_demand(technologies, demand) - production = capacity * technologies.fixed_outputs * technologies.utilization_factor - production = convert_timeslice(production, demand.timeslice, QuantityType.EXTENSIVE) + production = ( + capacity + * convert_timeslice( + technologies.fixed_outputs, demand.timeslice, QuantityType.EXTENSIVE + ) + * technologies.utilization_factor + ) results = NPV( technologies=technologies, @@ -450,8 +460,13 @@ def net_present_cost( from muse.timeslices import QuantityType, convert_timeslice capacity = capacity_to_service_demand(technologies, demand) - production = capacity * technologies.fixed_outputs * technologies.utilization_factor - production = convert_timeslice(production, demand.timeslice, QuantityType.EXTENSIVE) + production = ( + capacity + * convert_timeslice( + technologies.fixed_outputs, demand.timeslice, QuantityType.EXTENSIVE + ) + * technologies.utilization_factor + ) results = NPC( technologies=technologies, @@ -479,8 +494,13 @@ def equivalent_annual_cost( from muse.timeslices import QuantityType, convert_timeslice capacity = capacity_to_service_demand(technologies, demand) - production = capacity * technologies.fixed_outputs * technologies.utilization_factor - production = convert_timeslice(production, demand.timeslice, QuantityType.EXTENSIVE) + production = ( + capacity + * convert_timeslice( + technologies.fixed_outputs, demand.timeslice, QuantityType.EXTENSIVE + ) + * technologies.utilization_factor + ) results = EAC( technologies=technologies, diff --git a/src/muse/outputs/mca.py b/src/muse/outputs/mca.py index adabf600f..10068afdf 100644 --- a/src/muse/outputs/mca.py +++ b/src/muse/outputs/mca.py @@ -918,11 +918,14 @@ def sector_lcoe(sector: AbstractSector, market: xr.Dataset, **kwargs) -> pd.Data prices = agent_market["prices"].sel(commodity=techs.commodity) demand = agent_market.consumption.sel(commodity=included) capacity = agent.filter_input(capacity_to_service_demand(demand, techs)) - production = capacity * techs.fixed_outputs * techs.utilization_factor - production = convert_timeslice( - production, - demand.timeslice, - QuantityType.EXTENSIVE, + production = ( + capacity + * convert_timeslice( + techs.fixed_outputs, + demand.timeslice, + QuantityType.EXTENSIVE, + ) + * techs.utilization_factor ) result = LCOE( @@ -996,11 +999,14 @@ def sector_eac(sector: AbstractSector, market: xr.Dataset, **kwargs) -> pd.DataF prices = agent_market["prices"].sel(commodity=techs.commodity) demand = agent_market.consumption.sel(commodity=included) capacity = agent.filter_input(capacity_to_service_demand(demand, techs)) - production = capacity * techs.fixed_outputs * techs.utilization_factor - production = convert_timeslice( - production, - demand.timeslice, - QuantityType.EXTENSIVE, + production = ( + capacity + * convert_timeslice( + techs.fixed_outputs, + demand.timeslice, + QuantityType.EXTENSIVE, + ) + * techs.utilization_factor ) result = EAC( diff --git a/tests/test_costs.py b/tests/test_costs.py index 4270d5b2a..66c89fa79 100644 --- a/tests/test_costs.py +++ b/tests/test_costs.py @@ -22,10 +22,11 @@ def _production(technologies, _capacity, demand_share): from muse.timeslices import QuantityType, convert_timeslice production = ( - _capacity * technologies.fixed_outputs * technologies.utilization_factor - ) - production = convert_timeslice( - production, demand_share.timeslice, QuantityType.EXTENSIVE + _capacity + * convert_timeslice( + technologies.fixed_outputs, demand_share.timeslice, QuantityType.EXTENSIVE + ) + * technologies.utilization_factor ) return production From 2ebb8a3c703aa670dd500ec27785aaf041851a3e Mon Sep 17 00:00:00 2001 From: Tom Bland Date: Wed, 9 Oct 2024 16:50:35 +0100 Subject: [PATCH 03/18] Bump version --- .bumpversion.cfg | 2 +- CITATION.cff | 2 +- docs/conf.py | 2 +- src/muse/__init__.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 962d72fe3..f68ee3914 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 1.2.1 +current_version = 1.2.2rc1 commit = True tag = True diff --git a/CITATION.cff b/CITATION.cff index 4cea3542a..327dfb6b3 100644 --- a/CITATION.cff +++ b/CITATION.cff @@ -9,5 +9,5 @@ authors: given-names: Adam title: MUSE_OS -version: v1.2.1 +version: v1.2.2rc1 date-released: 2024-08-13 diff --git a/docs/conf.py b/docs/conf.py index bdeb7d4a1..d83b45e15 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -8,7 +8,7 @@ project = "MUSE" copyright = "2024, Imperial College London" author = "Imperial College London" -release = "1.2.1" +release = "1.2.2rc1" version = ".".join(release.split(".")[:2]) # -- General configuration --------------------------------------------------- diff --git a/src/muse/__init__.py b/src/muse/__init__.py index dff12e09a..73433737b 100644 --- a/src/muse/__init__.py +++ b/src/muse/__init__.py @@ -2,7 +2,7 @@ import os -VERSION = "1.2.1" +VERSION = "1.2.2rc1" def _create_logger(color: bool = True): From a61a036f8405b58a9df2039a79b4f875ac1019ad Mon Sep 17 00:00:00 2001 From: Tom Bland Date: Wed, 16 Oct 2024 12:05:20 +0100 Subject: [PATCH 04/18] Fix max_production function --- src/muse/demand_share.py | 33 +++++++++------------------------ src/muse/quantities.py | 14 +++++++------- 2 files changed, 16 insertions(+), 31 deletions(-) diff --git a/src/muse/demand_share.py b/src/muse/demand_share.py index f95e43f30..6dd540e3f 100644 --- a/src/muse/demand_share.py +++ b/src/muse/demand_share.py @@ -560,26 +560,17 @@ def new_consumption( """ from numpy import minimum - from muse.timeslices import QuantityType, convert_timeslice - if current_year is None: current_year = market.year.min() - ts_capa = convert_timeslice( - capacity.interp(year=current_year), market.timeslice, QuantityType.EXTENSIVE - ) - ts_capa = convert_timeslice( - capacity.interp(year=current_year + forecast), - market.timeslice, - QuantityType.EXTENSIVE, - ) - assert isinstance(ts_capa, xr.DataArray) + capa = capacity.interp(year=current_year + forecast) + assert isinstance(capa, xr.DataArray) market = market.interp(year=[current_year, current_year + forecast]) current = market.sel(year=current_year, drop=True) forecasted = market.sel(year=current_year + forecast, drop=True) delta = (forecasted.consumption - current.consumption).clip(min=0) - missing = unmet_demand(current, ts_capa, technologies) + missing = unmet_demand(current, capa, technologies) consumption = minimum(delta, missing) return consumption @@ -605,7 +596,6 @@ def new_and_retro_demands( from numpy import minimum from muse.production import factory as prod_factory - from muse.timeslices import QuantityType, convert_timeslice production_method = production if callable(production) else prod_factory(production) assert callable(production_method) @@ -613,18 +603,13 @@ def new_and_retro_demands( current_year = market.year.min() smarket: xr.Dataset = market.interp(year=[current_year, current_year + forecast]) - ts_capa = convert_timeslice( - capacity.interp(year=[current_year, current_year + forecast]), - market.timeslice, - QuantityType.EXTENSIVE, - ) - - assert isinstance(ts_capa, xr.DataArray) - if hasattr(ts_capa, "region") and ts_capa.region.dims == (): - ts_capa["region"] = "asset", [str(ts_capa.region.values)] * len(ts_capa.asset) + capa = capacity.interp(year=[current_year, current_year + forecast]) + assert isinstance(capa, xr.DataArray) + if hasattr(capa, "region") and capa.region.dims == (): + capa["region"] = "asset", [str(capa.region.values)] * len(capa.asset) new_demand = new_consumption( - ts_capa, smarket, technologies, current_year=current_year, forecast=forecast + capa, smarket, technologies, current_year=current_year, forecast=forecast ) if "year" in new_demand.dims: new_demand = new_demand.squeeze("year") @@ -632,7 +617,7 @@ def new_and_retro_demands( service = ( production_method( smarket.sel(year=current_year + forecast), - ts_capa.sel(year=current_year + forecast), + capa.sel(year=current_year + forecast), technologies, ) .groupby("region") diff --git a/src/muse/quantities.py b/src/muse/quantities.py index 7daf87b15..f741819c9 100644 --- a/src/muse/quantities.py +++ b/src/muse/quantities.py @@ -344,6 +344,7 @@ def maximum_production(technologies: xr.Dataset, capacity: xr.DataArray, **filte filters and the set of technologies in `capacity`. """ from muse.commodities import is_enduse + from muse.timeslices import TIMESLICE, QuantityType, convert_timeslice from muse.utilities import broadcast_techs, filter_input capa = filter_input( @@ -355,7 +356,11 @@ def maximum_production(technologies: xr.Dataset, capacity: xr.DataArray, **filte ftechs = filter_input( btechs, **{k: v for k, v in filters.items() if k in btechs.dims} ) - result = capa * ftechs.fixed_outputs * ftechs.utilization_factor + result = ( + capa + * convert_timeslice(ftechs.fixed_outputs, TIMESLICE, QuantityType.EXTENSIVE) + * ftechs.utilization_factor + ) return result.where(is_enduse(result.comm_usage), 0) @@ -457,7 +462,6 @@ def costed_production( service is applied first. """ from muse.quantities import maximum_production - from muse.timeslices import QuantityType, convert_timeslice from muse.utilities import broadcast_techs technodata = cast(xr.Dataset, broadcast_techs(technologies, capacity)) @@ -473,11 +477,7 @@ def group_assets(x: xr.DataArray) -> xr.DataArray: return xr.Dataset(dict(x=x)).groupby("region").sum("asset").x ranking = costs.rank("asset") - maxprod = convert_timeslice( - maximum_production(technodata, capacity), - demand.timeslice, - QuantityType.EXTENSIVE, - ) + maxprod = maximum_production(technodata, capacity) commodity = (maxprod > 0).any([i for i in maxprod.dims if i != "commodity"]) commodity = commodity.drop_vars( [u for u in commodity.coords if u not in commodity.dims] From b7eb0ded11f01f0fc144a15a9826a6aec0b06b1a Mon Sep 17 00:00:00 2001 From: Tom Bland Date: Wed, 16 Oct 2024 12:05:41 +0100 Subject: [PATCH 05/18] FIx timeslice reader --- src/muse/readers/csv.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/muse/readers/csv.py b/src/muse/readers/csv.py index b8ab7fce9..09cd84d6a 100644 --- a/src/muse/readers/csv.py +++ b/src/muse/readers/csv.py @@ -137,6 +137,7 @@ def to_agent_share(name): def read_technodata_timeslices(filename: Union[str, Path]) -> xr.Dataset: from muse.readers import camel_to_snake + from muse.timeslices import TIMESLICE, convert_timeslice csv = pd.read_csv(filename, float_precision="high", low_memory=False) csv = csv.rename(columns=camel_to_snake) @@ -162,7 +163,7 @@ def read_technodata_timeslices(filename: Union[str, Path]) -> xr.Dataset: data = data.filter(["utilization_factor", "minimum_service_factor"]) - result = xr.Dataset.from_dataframe(data.sort_index()) + result = xr.Dataset.from_dataframe(data) timeslice_levels = [ item @@ -170,6 +171,8 @@ def read_technodata_timeslices(filename: Union[str, Path]) -> xr.Dataset: if item not in ["technology", "region", "year"] ] result = result.stack(timeslice=timeslice_levels) + result = convert_timeslice(result, TIMESLICE) + # sorts timeslices into the correct order return result From cd630fe40c24fbc5d4250a9ce02973cf2d6b1f00 Mon Sep 17 00:00:00 2001 From: Tom Bland Date: Wed, 16 Oct 2024 12:23:46 +0100 Subject: [PATCH 06/18] Update results files --- .../Results/MCACapacity.csv | 84 ++-- .../Results/MCACapacity.csv | 78 ++-- .../Results/MCAPrices.csv | 48 +-- .../1-correlation/Results/MCACapacity.csv | 54 ++- .../1-correlation/Results/MCAPrices.csv | 24 +- .../1-introduction/Results/MCACapacity.csv | 48 +-- .../1-introduction/Results/MCAPrices.csv | 120 +++--- .../2-scenario/Results/MCACapacity.csv | 28 +- .../2-scenario/Results/MCAPrices.csv | 120 +++--- .../1-new-region/Results/MCACapacity.csv | 120 +++--- .../1-new-region/Results/MCAPrices.csv | 240 ++++++------ .../Results/MCACapacity.csv | 55 ++- .../1-exogenous-demand/Results/MCAPrices.csv | 180 ++++----- .../1-carbon-budget/Results/MCACapacity.csv | 12 +- .../1-carbon-budget/Results/MCAPrices.csv | 60 +-- .../1-carbon-budget/Results/MCASupply.csv | 72 ++-- .../1-min-constraint/Results/MCACapacity.csv | 42 +- .../1-min-constraint/Results/MCAPrices.csv | 36 +- .../1-min-constraint/Results/Power_Supply.csv | 284 +++++++------- .../2-max-constraint/Results/MCACapacity.csv | 66 ++-- .../2-max-constraint/Results/MCAPrices.csv | 136 +++---- .../2-max-constraint/Results/Power_Supply.csv | 366 ++++++++++++------ .../Results/MCACapacity.csv | 36 +- .../1-modify-timeslices/Results/MCAPrices.csv | 32 +- .../Results/MCACapacity.csv | 113 ++---- .../Results/MCAPrices.csv | 64 +-- .../Results/MCACapacity.csv | 22 +- .../Results/MCAMetric_Consumption.csv | 184 ++++----- .../Results/MCAMetric_Supply.csv | 290 +++++++------- .../new-decision-metric/Results/MCAPrices.csv | 24 +- 30 files changed, 1568 insertions(+), 1470 deletions(-) diff --git a/docs/tutorial-code/add-agent/1-single-objective/Results/MCACapacity.csv b/docs/tutorial-code/add-agent/1-single-objective/Results/MCACapacity.csv index 2386fb466..a299a2d97 100644 --- a/docs/tutorial-code/add-agent/1-single-objective/Results/MCACapacity.csv +++ b/docs/tutorial-code/add-agent/1-single-objective/Results/MCACapacity.csv @@ -11,8 +11,8 @@ A2,12.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2025 A1,1.30560000000,R1,2020,R1,power,gasCCGT,newcapa,2025 A2,0.50000000000,R1,2020,R1,power,gasCCGT,newcapa,2025 A2,1.81250000000,R1,2020,R1,power,windturbine,newcapa,2025 -A1,9.73230000000,R1,2020,R1,gas,gassupply1,newcapa,2025 -A2,9.73230000000,R1,2020,R1,gas,gassupply1,newcapa,2025 +A1,9.17600000000,R1,2020,R1,gas,gassupply1,newcapa,2025 +A2,9.17600000000,R1,2020,R1,gas,gassupply1,newcapa,2025 A1,9.50000000000,R1,2020,R1,residential,heatpump,newcapa,2030 A1,5.50000000000,R1,2025,R1,residential,heatpump,newcapa,2030 A2,9.50000000000,R1,2020,R1,residential,gasboiler,newcapa,2030 @@ -21,10 +21,10 @@ A1,0.80560000000,R1,2020,R1,power,gasCCGT,newcapa,2030 A1,2.52780000000,R1,2025,R1,power,gasCCGT,newcapa,2030 A2,1.81250000000,R1,2020,R1,power,windturbine,newcapa,2030 A2,5.68750000000,R1,2025,R1,power,windturbine,newcapa,2030 -A1,5.98230000000,R1,2020,R1,gas,gassupply1,newcapa,2030 -A1,6.46770000000,R1,2025,R1,gas,gassupply1,newcapa,2030 -A2,5.98230000000,R1,2020,R1,gas,gassupply1,newcapa,2030 -A2,6.46770000000,R1,2025,R1,gas,gassupply1,newcapa,2030 +A1,5.42600000000,R1,2020,R1,gas,gassupply1,newcapa,2030 +A1,7.02400000000,R1,2025,R1,gas,gassupply1,newcapa,2030 +A2,5.42600000000,R1,2020,R1,gas,gassupply1,newcapa,2030 +A2,7.02400000000,R1,2025,R1,gas,gassupply1,newcapa,2030 A1,5.50000000000,R1,2025,R1,residential,heatpump,newcapa,2035 A1,12.50000000000,R1,2030,R1,residential,heatpump,newcapa,2035 A2,5.50000000000,R1,2025,R1,residential,gasboiler,newcapa,2035 @@ -35,12 +35,12 @@ A1,0.37500000000,R1,2030,R1,power,windturbine,newcapa,2035 A2,1.81250000000,R1,2020,R1,power,windturbine,newcapa,2035 A2,5.68750000000,R1,2025,R1,power,windturbine,newcapa,2035 A2,0.75000000000,R1,2030,R1,power,windturbine,newcapa,2035 -A1,2.23230000000,R1,2020,R1,gas,gassupply1,newcapa,2035 -A1,6.46770000000,R1,2025,R1,gas,gassupply1,newcapa,2035 -A1,6.00700000000,R1,2030,R1,gas,gassupply1,newcapa,2035 -A2,2.23230000000,R1,2020,R1,gas,gassupply1,newcapa,2035 -A2,6.46770000000,R1,2025,R1,gas,gassupply1,newcapa,2035 -A2,6.00700000000,R1,2030,R1,gas,gassupply1,newcapa,2035 +A1,1.67600000000,R1,2020,R1,gas,gassupply1,newcapa,2035 +A1,7.02400000000,R1,2025,R1,gas,gassupply1,newcapa,2035 +A1,5.68330000000,R1,2030,R1,gas,gassupply1,newcapa,2035 +A2,1.67600000000,R1,2020,R1,gas,gassupply1,newcapa,2035 +A2,7.02400000000,R1,2025,R1,gas,gassupply1,newcapa,2035 +A2,5.68330000000,R1,2030,R1,gas,gassupply1,newcapa,2035 A1,12.50000000000,R1,2030,R1,residential,heatpump,newcapa,2040 A1,8.50000000000,R1,2035,R1,residential,heatpump,newcapa,2040 A2,12.50000000000,R1,2030,R1,residential,gasboiler,newcapa,2040 @@ -53,14 +53,14 @@ A2,1.81250000000,R1,2020,R1,power,windturbine,newcapa,2040 A2,5.68750000000,R1,2025,R1,power,windturbine,newcapa,2040 A2,0.75000000000,R1,2030,R1,power,windturbine,newcapa,2040 A2,1.68750000000,R1,2035,R1,power,windturbine,newcapa,2040 -A1,2.23230000000,R1,2020,R1,gas,gassupply1,newcapa,2040 -A1,6.46770000000,R1,2025,R1,gas,gassupply1,newcapa,2040 -A1,6.00700000000,R1,2030,R1,gas,gassupply1,newcapa,2040 -A1,0.91190000000,R1,2035,R1,gas,gassupply1,newcapa,2040 -A2,2.23230000000,R1,2020,R1,gas,gassupply1,newcapa,2040 -A2,6.46770000000,R1,2025,R1,gas,gassupply1,newcapa,2040 -A2,6.00700000000,R1,2030,R1,gas,gassupply1,newcapa,2040 -A2,0.91190000000,R1,2035,R1,gas,gassupply1,newcapa,2040 +A1,1.67600000000,R1,2020,R1,gas,gassupply1,newcapa,2040 +A1,7.02400000000,R1,2025,R1,gas,gassupply1,newcapa,2040 +A1,5.68330000000,R1,2030,R1,gas,gassupply1,newcapa,2040 +A1,2.90000000000,R1,2035,R1,gas,gassupply1,newcapa,2040 +A2,1.67600000000,R1,2020,R1,gas,gassupply1,newcapa,2040 +A2,7.02400000000,R1,2025,R1,gas,gassupply1,newcapa,2040 +A2,5.68330000000,R1,2030,R1,gas,gassupply1,newcapa,2040 +A2,2.90000000000,R1,2035,R1,gas,gassupply1,newcapa,2040 A1,8.50000000000,R1,2035,R1,residential,heatpump,newcapa,2045 A1,15.50000000000,R1,2040,R1,residential,heatpump,newcapa,2045 A2,8.50000000000,R1,2035,R1,residential,gasboiler,newcapa,2045 @@ -75,16 +75,16 @@ A2,5.68750000000,R1,2025,R1,power,windturbine,newcapa,2045 A2,0.75000000000,R1,2030,R1,power,windturbine,newcapa,2045 A2,1.68750000000,R1,2035,R1,power,windturbine,newcapa,2045 A2,1.50000000000,R1,2040,R1,power,windturbine,newcapa,2045 -A1,2.23230000000,R1,2020,R1,gas,gassupply1,newcapa,2045 -A1,6.46770000000,R1,2025,R1,gas,gassupply1,newcapa,2045 -A1,6.00700000000,R1,2030,R1,gas,gassupply1,newcapa,2045 -A1,0.91190000000,R1,2035,R1,gas,gassupply1,newcapa,2045 -A1,1.86430000000,R1,2040,R1,gas,gassupply1,newcapa,2045 -A2,2.23230000000,R1,2020,R1,gas,gassupply1,newcapa,2045 -A2,6.46770000000,R1,2025,R1,gas,gassupply1,newcapa,2045 -A2,6.00700000000,R1,2030,R1,gas,gassupply1,newcapa,2045 -A2,0.91190000000,R1,2035,R1,gas,gassupply1,newcapa,2045 -A2,1.86430000000,R1,2040,R1,gas,gassupply1,newcapa,2045 +A1,1.67600000000,R1,2020,R1,gas,gassupply1,newcapa,2045 +A1,7.02400000000,R1,2025,R1,gas,gassupply1,newcapa,2045 +A1,5.68330000000,R1,2030,R1,gas,gassupply1,newcapa,2045 +A1,2.90000000000,R1,2035,R1,gas,gassupply1,newcapa,2045 +A1,0.48330000000,R1,2040,R1,gas,gassupply1,newcapa,2045 +A2,1.67600000000,R1,2020,R1,gas,gassupply1,newcapa,2045 +A2,7.02400000000,R1,2025,R1,gas,gassupply1,newcapa,2045 +A2,5.68330000000,R1,2030,R1,gas,gassupply1,newcapa,2045 +A2,2.90000000000,R1,2035,R1,gas,gassupply1,newcapa,2045 +A2,0.48330000000,R1,2040,R1,gas,gassupply1,newcapa,2045 A1,15.50000000000,R1,2040,R1,residential,heatpump,newcapa,2050 A1,11.50000000000,R1,2045,R1,residential,heatpump,newcapa,2050 A2,15.50000000000,R1,2040,R1,residential,gasboiler,newcapa,2050 @@ -100,15 +100,15 @@ A2,0.75000000000,R1,2030,R1,power,windturbine,newcapa,2050 A2,1.68750000000,R1,2035,R1,power,windturbine,newcapa,2050 A2,1.50000000000,R1,2040,R1,power,windturbine,newcapa,2050 A2,3.15630000000,R1,2045,R1,power,windturbine,newcapa,2050 -A1,2.23230000000,R1,2020,R1,gas,gassupply1,newcapa,2050 -A1,6.46770000000,R1,2025,R1,gas,gassupply1,newcapa,2050 -A1,6.00700000000,R1,2030,R1,gas,gassupply1,newcapa,2050 -A1,0.91190000000,R1,2035,R1,gas,gassupply1,newcapa,2050 -A1,1.86430000000,R1,2040,R1,gas,gassupply1,newcapa,2050 -A1,1.91720000000,R1,2045,R1,gas,gassupply1,newcapa,2050 -A2,2.23230000000,R1,2020,R1,gas,gassupply1,newcapa,2050 -A2,6.46770000000,R1,2025,R1,gas,gassupply1,newcapa,2050 -A2,6.00700000000,R1,2030,R1,gas,gassupply1,newcapa,2050 -A2,0.91190000000,R1,2035,R1,gas,gassupply1,newcapa,2050 -A2,1.86430000000,R1,2040,R1,gas,gassupply1,newcapa,2050 -A2,1.91720000000,R1,2045,R1,gas,gassupply1,newcapa,2050 +A1,1.67600000000,R1,2020,R1,gas,gassupply1,newcapa,2050 +A1,7.02400000000,R1,2025,R1,gas,gassupply1,newcapa,2050 +A1,5.68330000000,R1,2030,R1,gas,gassupply1,newcapa,2050 +A1,2.90000000000,R1,2035,R1,gas,gassupply1,newcapa,2050 +A1,0.48330000000,R1,2040,R1,gas,gassupply1,newcapa,2050 +A1,1.45000000000,R1,2045,R1,gas,gassupply1,newcapa,2050 +A2,1.67600000000,R1,2020,R1,gas,gassupply1,newcapa,2050 +A2,7.02400000000,R1,2025,R1,gas,gassupply1,newcapa,2050 +A2,5.68330000000,R1,2030,R1,gas,gassupply1,newcapa,2050 +A2,2.90000000000,R1,2035,R1,gas,gassupply1,newcapa,2050 +A2,0.48330000000,R1,2040,R1,gas,gassupply1,newcapa,2050 +A2,1.45000000000,R1,2045,R1,gas,gassupply1,newcapa,2050 diff --git a/docs/tutorial-code/add-agent/2-multiple-objective/Results/MCACapacity.csv b/docs/tutorial-code/add-agent/2-multiple-objective/Results/MCACapacity.csv index 545131719..65efa5671 100644 --- a/docs/tutorial-code/add-agent/2-multiple-objective/Results/MCACapacity.csv +++ b/docs/tutorial-code/add-agent/2-multiple-objective/Results/MCACapacity.csv @@ -11,8 +11,8 @@ A2,12.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2025 A1,1.30560000000,R1,2020,R1,power,gasCCGT,newcapa,2025 A2,0.50000000000,R1,2020,R1,power,gasCCGT,newcapa,2025 A2,1.81250000000,R1,2020,R1,power,windturbine,newcapa,2025 -A1,9.73230000000,R1,2020,R1,gas,gassupply1,newcapa,2025 -A2,9.73230000000,R1,2020,R1,gas,gassupply1,newcapa,2025 +A1,9.17600000000,R1,2020,R1,gas,gassupply1,newcapa,2025 +A2,9.17600000000,R1,2020,R1,gas,gassupply1,newcapa,2025 A1,9.50000000000,R1,2020,R1,residential,heatpump,newcapa,2030 A1,5.50000000000,R1,2025,R1,residential,heatpump,newcapa,2030 A2,9.50000000000,R1,2020,R1,residential,gasboiler,newcapa,2030 @@ -21,10 +21,10 @@ A1,0.80560000000,R1,2020,R1,power,gasCCGT,newcapa,2030 A1,3.75000000000,R1,2025,R1,power,gasCCGT,newcapa,2030 A2,1.81250000000,R1,2020,R1,power,windturbine,newcapa,2030 A2,8.43750000000,R1,2025,R1,power,windturbine,newcapa,2030 -A1,5.98230000000,R1,2020,R1,gas,gassupply1,newcapa,2030 -A1,3.94380000000,R1,2025,R1,gas,gassupply1,newcapa,2030 -A2,5.98230000000,R1,2020,R1,gas,gassupply1,newcapa,2030 -A2,3.94380000000,R1,2025,R1,gas,gassupply1,newcapa,2030 +A1,5.42600000000,R1,2020,R1,gas,gassupply1,newcapa,2030 +A1,4.50010000000,R1,2025,R1,gas,gassupply1,newcapa,2030 +A2,5.42600000000,R1,2020,R1,gas,gassupply1,newcapa,2030 +A2,4.50010000000,R1,2025,R1,gas,gassupply1,newcapa,2030 A1,5.50000000000,R1,2025,R1,residential,heatpump,newcapa,2035 A1,12.50000000000,R1,2030,R1,residential,heatpump,newcapa,2035 A2,11.40000000000,R1,2030,R1,residential,gasboiler,newcapa,2035 @@ -36,12 +36,12 @@ A1,0.51250000000,R1,2030,R1,power,windturbine,newcapa,2035 A2,1.81250000000,R1,2020,R1,power,windturbine,newcapa,2035 A2,8.43750000000,R1,2025,R1,power,windturbine,newcapa,2035 A2,1.02500000000,R1,2030,R1,power,windturbine,newcapa,2035 -A1,2.23230000000,R1,2020,R1,gas,gassupply1,newcapa,2035 -A1,3.94380000000,R1,2025,R1,gas,gassupply1,newcapa,2035 -A1,5.41680000000,R1,2030,R1,gas,gassupply1,newcapa,2035 -A2,2.23230000000,R1,2020,R1,gas,gassupply1,newcapa,2035 -A2,3.94380000000,R1,2025,R1,gas,gassupply1,newcapa,2035 -A2,5.41680000000,R1,2030,R1,gas,gassupply1,newcapa,2035 +A1,1.67600000000,R1,2020,R1,gas,gassupply1,newcapa,2035 +A1,4.50010000000,R1,2025,R1,gas,gassupply1,newcapa,2035 +A1,4.97440000000,R1,2030,R1,gas,gassupply1,newcapa,2035 +A2,1.67600000000,R1,2020,R1,gas,gassupply1,newcapa,2035 +A2,4.50010000000,R1,2025,R1,gas,gassupply1,newcapa,2035 +A2,4.97440000000,R1,2030,R1,gas,gassupply1,newcapa,2035 A1,12.50000000000,R1,2030,R1,residential,heatpump,newcapa,2040 A1,8.50000000000,R1,2035,R1,residential,heatpump,newcapa,2040 A2,11.40000000000,R1,2030,R1,residential,gasboiler,newcapa,2040 @@ -56,14 +56,14 @@ A2,1.81250000000,R1,2020,R1,power,windturbine,newcapa,2040 A2,8.43750000000,R1,2025,R1,power,windturbine,newcapa,2040 A2,1.02500000000,R1,2030,R1,power,windturbine,newcapa,2040 A2,2.78130000000,R1,2035,R1,power,windturbine,newcapa,2040 -A1,2.23230000000,R1,2020,R1,gas,gassupply1,newcapa,2040 -A1,3.94380000000,R1,2025,R1,gas,gassupply1,newcapa,2040 -A1,5.41680000000,R1,2030,R1,gas,gassupply1,newcapa,2040 -A1,0.03060000000,R1,2035,R1,gas,gassupply1,newcapa,2040 -A2,2.23230000000,R1,2020,R1,gas,gassupply1,newcapa,2040 -A2,3.94380000000,R1,2025,R1,gas,gassupply1,newcapa,2040 -A2,5.41680000000,R1,2030,R1,gas,gassupply1,newcapa,2040 -A2,0.03060000000,R1,2035,R1,gas,gassupply1,newcapa,2040 +A1,1.67600000000,R1,2020,R1,gas,gassupply1,newcapa,2040 +A1,4.50010000000,R1,2025,R1,gas,gassupply1,newcapa,2040 +A1,4.97440000000,R1,2030,R1,gas,gassupply1,newcapa,2040 +A1,0.12180000000,R1,2035,R1,gas,gassupply1,newcapa,2040 +A2,1.67600000000,R1,2020,R1,gas,gassupply1,newcapa,2040 +A2,4.50010000000,R1,2025,R1,gas,gassupply1,newcapa,2040 +A2,4.97440000000,R1,2030,R1,gas,gassupply1,newcapa,2040 +A2,0.12180000000,R1,2035,R1,gas,gassupply1,newcapa,2040 A1,8.50000000000,R1,2035,R1,residential,heatpump,newcapa,2045 A1,15.50000000000,R1,2040,R1,residential,heatpump,newcapa,2045 A2,8.50000000000,R1,2035,R1,residential,heatpump,newcapa,2045 @@ -78,15 +78,15 @@ A2,1.81250000000,R1,2020,R1,power,windturbine,newcapa,2045 A2,8.43750000000,R1,2025,R1,power,windturbine,newcapa,2045 A2,1.02500000000,R1,2030,R1,power,windturbine,newcapa,2045 A2,2.78130000000,R1,2035,R1,power,windturbine,newcapa,2045 -A2,5.85000000000,R1,2040,R1,power,windturbine,newcapa,2045 -A1,2.23230000000,R1,2020,R1,gas,gassupply1,newcapa,2045 -A1,3.94380000000,R1,2025,R1,gas,gassupply1,newcapa,2045 -A1,5.41680000000,R1,2030,R1,gas,gassupply1,newcapa,2045 -A1,0.03060000000,R1,2035,R1,gas,gassupply1,newcapa,2045 -A2,2.23230000000,R1,2020,R1,gas,gassupply1,newcapa,2045 -A2,3.94380000000,R1,2025,R1,gas,gassupply1,newcapa,2045 -A2,5.41680000000,R1,2030,R1,gas,gassupply1,newcapa,2045 -A2,0.03060000000,R1,2035,R1,gas,gassupply1,newcapa,2045 +A2,14.55000000000,R1,2040,R1,power,windturbine,newcapa,2045 +A1,1.67600000000,R1,2020,R1,gas,gassupply1,newcapa,2045 +A1,4.50010000000,R1,2025,R1,gas,gassupply1,newcapa,2045 +A1,4.97440000000,R1,2030,R1,gas,gassupply1,newcapa,2045 +A1,0.12180000000,R1,2035,R1,gas,gassupply1,newcapa,2045 +A2,1.67600000000,R1,2020,R1,gas,gassupply1,newcapa,2045 +A2,4.50010000000,R1,2025,R1,gas,gassupply1,newcapa,2045 +A2,4.97440000000,R1,2030,R1,gas,gassupply1,newcapa,2045 +A2,0.12180000000,R1,2035,R1,gas,gassupply1,newcapa,2045 A1,15.50000000000,R1,2040,R1,residential,heatpump,newcapa,2050 A1,11.50000000000,R1,2045,R1,residential,heatpump,newcapa,2050 A2,15.50000000000,R1,2040,R1,residential,heatpump,newcapa,2050 @@ -97,17 +97,15 @@ A1,0.09720000000,R1,2035,R1,power,gasCCGT,newcapa,2050 A1,0.51250000000,R1,2030,R1,power,windturbine,newcapa,2050 A1,2.56250000000,R1,2035,R1,power,windturbine,newcapa,2050 A1,14.55000000000,R1,2040,R1,power,windturbine,newcapa,2050 -A1,0.90630000000,R1,2045,R1,power,windturbine,newcapa,2050 A2,8.43750000000,R1,2025,R1,power,windturbine,newcapa,2050 A2,1.02500000000,R1,2030,R1,power,windturbine,newcapa,2050 A2,2.78130000000,R1,2035,R1,power,windturbine,newcapa,2050 -A2,5.85000000000,R1,2040,R1,power,windturbine,newcapa,2050 -A2,3.90630000000,R1,2045,R1,power,windturbine,newcapa,2050 -A1,2.23230000000,R1,2020,R1,gas,gassupply1,newcapa,2050 -A1,3.94380000000,R1,2025,R1,gas,gassupply1,newcapa,2050 -A1,5.41680000000,R1,2030,R1,gas,gassupply1,newcapa,2050 -A1,0.03060000000,R1,2035,R1,gas,gassupply1,newcapa,2050 -A2,2.23230000000,R1,2020,R1,gas,gassupply1,newcapa,2050 -A2,3.94380000000,R1,2025,R1,gas,gassupply1,newcapa,2050 -A2,5.41680000000,R1,2030,R1,gas,gassupply1,newcapa,2050 -A2,0.03060000000,R1,2035,R1,gas,gassupply1,newcapa,2050 +A2,14.55000000000,R1,2040,R1,power,windturbine,newcapa,2050 +A1,1.67600000000,R1,2020,R1,gas,gassupply1,newcapa,2050 +A1,4.50010000000,R1,2025,R1,gas,gassupply1,newcapa,2050 +A1,4.97440000000,R1,2030,R1,gas,gassupply1,newcapa,2050 +A1,0.12180000000,R1,2035,R1,gas,gassupply1,newcapa,2050 +A2,1.67600000000,R1,2020,R1,gas,gassupply1,newcapa,2050 +A2,4.50010000000,R1,2025,R1,gas,gassupply1,newcapa,2050 +A2,4.97440000000,R1,2030,R1,gas,gassupply1,newcapa,2050 +A2,0.12180000000,R1,2035,R1,gas,gassupply1,newcapa,2050 diff --git a/docs/tutorial-code/add-agent/2-multiple-objective/Results/MCAPrices.csv b/docs/tutorial-code/add-agent/2-multiple-objective/Results/MCAPrices.csv index 0f7a7f862..d707dfe8c 100644 --- a/docs/tutorial-code/add-agent/2-multiple-objective/Results/MCAPrices.csv +++ b/docs/tutorial-code/add-agent/2-multiple-objective/Results/MCAPrices.csv @@ -119,51 +119,51 @@ electricity,all-week,evening,all-year,10.99080000000,R1,5,MUS$2010/PJ,2040 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2040 heat,all-week,evening,all-year,8.34560000000,R1,5,MUS$2010/PJ,2040 CO2f,all-week,evening,all-year,0.27280000000,R1,5,MUS$2010/kt,2040 -electricity,all-week,night,all-year,8.65130000000,R1,0,MUS$2010/PJ,2045 +electricity,all-week,night,all-year,7.57960000000,R1,0,MUS$2010/PJ,2045 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2045 -heat,all-week,night,all-year,3.70100000000,R1,0,MUS$2010/PJ,2045 +heat,all-week,night,all-year,3.27230000000,R1,0,MUS$2010/PJ,2045 CO2f,all-week,night,all-year,0.35390000000,R1,0,MUS$2010/kt,2045 -electricity,all-week,morning,all-year,8.65130000000,R1,1,MUS$2010/PJ,2045 +electricity,all-week,morning,all-year,7.57960000000,R1,1,MUS$2010/PJ,2045 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2045 -heat,all-week,morning,all-year,3.70100000000,R1,1,MUS$2010/PJ,2045 +heat,all-week,morning,all-year,3.27230000000,R1,1,MUS$2010/PJ,2045 CO2f,all-week,morning,all-year,0.35390000000,R1,1,MUS$2010/kt,2045 -electricity,all-week,afternoon,all-year,8.65130000000,R1,2,MUS$2010/PJ,2045 +electricity,all-week,afternoon,all-year,7.57960000000,R1,2,MUS$2010/PJ,2045 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2045 -heat,all-week,afternoon,all-year,3.70100000000,R1,2,MUS$2010/PJ,2045 +heat,all-week,afternoon,all-year,3.27230000000,R1,2,MUS$2010/PJ,2045 CO2f,all-week,afternoon,all-year,0.35390000000,R1,2,MUS$2010/kt,2045 -electricity,all-week,early-peak,all-year,8.65130000000,R1,3,MUS$2010/PJ,2045 +electricity,all-week,early-peak,all-year,7.57960000000,R1,3,MUS$2010/PJ,2045 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2045 -heat,all-week,early-peak,all-year,3.70100000000,R1,3,MUS$2010/PJ,2045 +heat,all-week,early-peak,all-year,3.27230000000,R1,3,MUS$2010/PJ,2045 CO2f,all-week,early-peak,all-year,0.35390000000,R1,3,MUS$2010/kt,2045 -electricity,all-week,late-peak,all-year,8.65130000000,R1,4,MUS$2010/PJ,2045 +electricity,all-week,late-peak,all-year,7.57960000000,R1,4,MUS$2010/PJ,2045 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2045 -heat,all-week,late-peak,all-year,3.70100000000,R1,4,MUS$2010/PJ,2045 +heat,all-week,late-peak,all-year,3.27230000000,R1,4,MUS$2010/PJ,2045 CO2f,all-week,late-peak,all-year,0.35390000000,R1,4,MUS$2010/kt,2045 -electricity,all-week,evening,all-year,8.65130000000,R1,5,MUS$2010/PJ,2045 +electricity,all-week,evening,all-year,7.57960000000,R1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2045 -heat,all-week,evening,all-year,3.70100000000,R1,5,MUS$2010/PJ,2045 +heat,all-week,evening,all-year,3.27230000000,R1,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045 -electricity,all-week,night,all-year,9.76820000000,R1,0,MUS$2010/PJ,2050 +electricity,all-week,night,all-year,9.19440000000,R1,0,MUS$2010/PJ,2050 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,4.14780000000,R1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,3.91830000000,R1,0,MUS$2010/PJ,2050 CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050 -electricity,all-week,morning,all-year,9.76820000000,R1,1,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,9.19440000000,R1,1,MUS$2010/PJ,2050 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,4.14780000000,R1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,3.91830000000,R1,1,MUS$2010/PJ,2050 CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050 -electricity,all-week,afternoon,all-year,9.76820000000,R1,2,MUS$2010/PJ,2050 +electricity,all-week,afternoon,all-year,9.19440000000,R1,2,MUS$2010/PJ,2050 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,4.14780000000,R1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,3.91830000000,R1,2,MUS$2010/PJ,2050 CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050 -electricity,all-week,early-peak,all-year,9.76820000000,R1,3,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,9.19440000000,R1,3,MUS$2010/PJ,2050 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,4.14780000000,R1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,3.91830000000,R1,3,MUS$2010/PJ,2050 CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050 -electricity,all-week,late-peak,all-year,9.76820000000,R1,4,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,9.19440000000,R1,4,MUS$2010/PJ,2050 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,4.14780000000,R1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,3.91830000000,R1,4,MUS$2010/PJ,2050 CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050 -electricity,all-week,evening,all-year,9.76820000000,R1,5,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,9.19440000000,R1,5,MUS$2010/PJ,2050 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,4.14780000000,R1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,3.91830000000,R1,5,MUS$2010/PJ,2050 CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050 diff --git a/docs/tutorial-code/add-correlation-demand/1-correlation/Results/MCACapacity.csv b/docs/tutorial-code/add-correlation-demand/1-correlation/Results/MCACapacity.csv index 91324c571..637d5a297 100644 --- a/docs/tutorial-code/add-correlation-demand/1-correlation/Results/MCACapacity.csv +++ b/docs/tutorial-code/add-correlation-demand/1-correlation/Results/MCACapacity.csv @@ -4,48 +4,40 @@ A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2020 A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2020 A1,5.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2025 A1,11.00000000000,R1,2020,R1,residential,heatpump,newcapa,2025 -A1,5.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2025 -A1,15.39710000000,R1,2020,R1,gas,gassupply1,newcapa,2025 +A1,4.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2025 +A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2025 A1,11.00000000000,R1,2020,R1,residential,heatpump,newcapa,2030 A1,6.00000000000,R1,2025,R1,residential,heatpump,newcapa,2030 -A1,4.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2030 -A1,3.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2030 -A1,7.89710000000,R1,2020,R1,gas,gassupply1,newcapa,2030 -A1,5.10950000000,R1,2025,R1,gas,gassupply1,newcapa,2030 +A1,3.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2030 +A1,4.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2030 +A1,7.50000000000,R1,2020,R1,gas,gassupply1,newcapa,2030 +A1,4.19000000000,R1,2025,R1,gas,gassupply1,newcapa,2030 A1,6.00000000000,R1,2025,R1,residential,heatpump,newcapa,2035 A1,12.00000000000,R1,2030,R1,residential,heatpump,newcapa,2035 -A1,4.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2035 -A1,3.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2035 +A1,3.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2035 +A1,4.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2035 A1,2.00000000000,R1,2030,R1,power,windturbine,newcapa,2035 -A1,0.39710000000,R1,2020,R1,gas,gassupply1,newcapa,2035 -A1,5.10950000000,R1,2025,R1,gas,gassupply1,newcapa,2035 -A1,6.35960000000,R1,2030,R1,gas,gassupply1,newcapa,2035 +A1,4.19000000000,R1,2025,R1,gas,gassupply1,newcapa,2035 +A1,7.50000000000,R1,2030,R1,gas,gassupply1,newcapa,2035 A1,12.00000000000,R1,2030,R1,residential,heatpump,newcapa,2040 A1,6.00000000000,R1,2035,R1,residential,heatpump,newcapa,2040 -A1,4.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2040 -A1,3.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2040 +A1,3.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2040 +A1,4.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2040 A1,2.00000000000,R1,2030,R1,power,windturbine,newcapa,2040 -A1,0.39710000000,R1,2020,R1,gas,gassupply1,newcapa,2040 -A1,5.10950000000,R1,2025,R1,gas,gassupply1,newcapa,2040 -A1,6.35960000000,R1,2030,R1,gas,gassupply1,newcapa,2040 -A1,0.32400000000,R1,2035,R1,gas,gassupply1,newcapa,2040 +A1,4.19000000000,R1,2025,R1,gas,gassupply1,newcapa,2040 +A1,7.50000000000,R1,2030,R1,gas,gassupply1,newcapa,2040 A1,6.00000000000,R1,2035,R1,residential,heatpump,newcapa,2045 A1,12.00000000000,R1,2040,R1,residential,heatpump,newcapa,2045 -A1,4.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2045 -A1,3.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2045 +A1,3.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2045 +A1,4.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2045 A1,2.00000000000,R1,2030,R1,power,windturbine,newcapa,2045 -A1,1.00000000000,R1,2040,R1,power,windturbine,newcapa,2045 -A1,0.39710000000,R1,2020,R1,gas,gassupply1,newcapa,2045 -A1,5.10950000000,R1,2025,R1,gas,gassupply1,newcapa,2045 -A1,6.35960000000,R1,2030,R1,gas,gassupply1,newcapa,2045 -A1,0.32400000000,R1,2035,R1,gas,gassupply1,newcapa,2045 +A1,4.19000000000,R1,2025,R1,gas,gassupply1,newcapa,2045 +A1,7.50000000000,R1,2030,R1,gas,gassupply1,newcapa,2045 A1,12.00000000000,R1,2040,R1,residential,heatpump,newcapa,2050 A1,7.00000000000,R1,2045,R1,residential,heatpump,newcapa,2050 -A1,4.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2050 -A1,3.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2050 +A1,3.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2050 +A1,4.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2050 A1,2.00000000000,R1,2030,R1,power,windturbine,newcapa,2050 -A1,1.00000000000,R1,2040,R1,power,windturbine,newcapa,2050 -A1,0.39710000000,R1,2020,R1,gas,gassupply1,newcapa,2050 -A1,5.10950000000,R1,2025,R1,gas,gassupply1,newcapa,2050 -A1,6.35960000000,R1,2030,R1,gas,gassupply1,newcapa,2050 -A1,0.32400000000,R1,2035,R1,gas,gassupply1,newcapa,2050 +A1,1.00000000000,R1,2045,R1,power,windturbine,newcapa,2050 +A1,4.19000000000,R1,2025,R1,gas,gassupply1,newcapa,2050 +A1,7.50000000000,R1,2030,R1,gas,gassupply1,newcapa,2050 diff --git a/docs/tutorial-code/add-correlation-demand/1-correlation/Results/MCAPrices.csv b/docs/tutorial-code/add-correlation-demand/1-correlation/Results/MCAPrices.csv index 69423d7ff..34704e6f3 100644 --- a/docs/tutorial-code/add-correlation-demand/1-correlation/Results/MCAPrices.csv +++ b/docs/tutorial-code/add-correlation-demand/1-correlation/Results/MCAPrices.csv @@ -119,29 +119,29 @@ electricity,all-week,evening,all-year,23.47910000000,R1,5,MUS$2010/PJ,2040 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2040 heat,all-week,evening,all-year,9.63210000000,R1,5,MUS$2010/PJ,2040 CO2f,all-week,evening,all-year,0.27280000000,R1,5,MUS$2010/kt,2040 -electricity,all-week,night,all-year,28.56770000000,R1,0,MUS$2010/PJ,2045 +electricity,all-week,night,all-year,30.08320000000,R1,0,MUS$2010/PJ,2045 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2045 -heat,all-week,night,all-year,11.66760000000,R1,0,MUS$2010/PJ,2045 +heat,all-week,night,all-year,12.27380000000,R1,0,MUS$2010/PJ,2045 CO2f,all-week,night,all-year,0.35390000000,R1,0,MUS$2010/kt,2045 -electricity,all-week,morning,all-year,28.56770000000,R1,1,MUS$2010/PJ,2045 +electricity,all-week,morning,all-year,30.08320000000,R1,1,MUS$2010/PJ,2045 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2045 -heat,all-week,morning,all-year,11.66760000000,R1,1,MUS$2010/PJ,2045 +heat,all-week,morning,all-year,12.27380000000,R1,1,MUS$2010/PJ,2045 CO2f,all-week,morning,all-year,0.35390000000,R1,1,MUS$2010/kt,2045 -electricity,all-week,afternoon,all-year,28.56770000000,R1,2,MUS$2010/PJ,2045 +electricity,all-week,afternoon,all-year,30.08320000000,R1,2,MUS$2010/PJ,2045 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2045 -heat,all-week,afternoon,all-year,11.66760000000,R1,2,MUS$2010/PJ,2045 +heat,all-week,afternoon,all-year,12.27380000000,R1,2,MUS$2010/PJ,2045 CO2f,all-week,afternoon,all-year,0.35390000000,R1,2,MUS$2010/kt,2045 -electricity,all-week,early-peak,all-year,28.56770000000,R1,3,MUS$2010/PJ,2045 +electricity,all-week,early-peak,all-year,30.08320000000,R1,3,MUS$2010/PJ,2045 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2045 -heat,all-week,early-peak,all-year,11.66760000000,R1,3,MUS$2010/PJ,2045 +heat,all-week,early-peak,all-year,12.27380000000,R1,3,MUS$2010/PJ,2045 CO2f,all-week,early-peak,all-year,0.35390000000,R1,3,MUS$2010/kt,2045 -electricity,all-week,late-peak,all-year,28.56770000000,R1,4,MUS$2010/PJ,2045 +electricity,all-week,late-peak,all-year,30.08320000000,R1,4,MUS$2010/PJ,2045 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2045 -heat,all-week,late-peak,all-year,11.66760000000,R1,4,MUS$2010/PJ,2045 +heat,all-week,late-peak,all-year,12.27380000000,R1,4,MUS$2010/PJ,2045 CO2f,all-week,late-peak,all-year,0.35390000000,R1,4,MUS$2010/kt,2045 -electricity,all-week,evening,all-year,28.56770000000,R1,5,MUS$2010/PJ,2045 +electricity,all-week,evening,all-year,30.08320000000,R1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2045 -heat,all-week,evening,all-year,11.66760000000,R1,5,MUS$2010/PJ,2045 +heat,all-week,evening,all-year,12.27380000000,R1,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045 electricity,all-week,night,all-year,34.81960000000,R1,0,MUS$2010/PJ,2050 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2050 diff --git a/docs/tutorial-code/add-new-technology/1-introduction/Results/MCACapacity.csv b/docs/tutorial-code/add-new-technology/1-introduction/Results/MCACapacity.csv index 1235fb7bf..7dff3bd21 100644 --- a/docs/tutorial-code/add-new-technology/1-introduction/Results/MCACapacity.csv +++ b/docs/tutorial-code/add-new-technology/1-introduction/Results/MCACapacity.csv @@ -6,52 +6,52 @@ A1,5.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2025 A1,19.00000000000,R1,2020,R1,residential,heatpump,newcapa,2025 A1,6.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2025 A1,5.00000000000,R1,2020,R1,power,solarPV,newcapa,2025 -A1,16.73530000000,R1,2020,R1,gas,gassupply1,newcapa,2025 +A1,16.46440000000,R1,2020,R1,gas,gassupply1,newcapa,2025 A1,19.00000000000,R1,2020,R1,residential,heatpump,newcapa,2030 A1,10.00000000000,R1,2025,R1,residential,heatpump,newcapa,2030 A1,5.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2030 -A1,6.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2030 +A1,5.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2030 A1,5.00000000000,R1,2020,R1,power,solarPV,newcapa,2030 -A1,9.23530000000,R1,2020,R1,gas,gassupply1,newcapa,2030 -A1,9.28910000000,R1,2025,R1,gas,gassupply1,newcapa,2030 +A1,8.96440000000,R1,2020,R1,gas,gassupply1,newcapa,2030 +A1,7.73560000000,R1,2025,R1,gas,gassupply1,newcapa,2030 A1,10.00000000000,R1,2025,R1,residential,heatpump,newcapa,2035 A1,26.00000000000,R1,2030,R1,residential,heatpump,newcapa,2035 A1,5.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2035 -A1,6.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2035 +A1,5.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2035 A1,5.00000000000,R1,2020,R1,power,solarPV,newcapa,2035 -A1,6.00000000000,R1,2030,R1,power,solarPV,newcapa,2035 -A1,1.73530000000,R1,2020,R1,gas,gassupply1,newcapa,2035 -A1,9.28910000000,R1,2025,R1,gas,gassupply1,newcapa,2035 -A1,7.47410000000,R1,2030,R1,gas,gassupply1,newcapa,2035 +A1,8.00000000000,R1,2030,R1,power,solarPV,newcapa,2035 +A1,1.46440000000,R1,2020,R1,gas,gassupply1,newcapa,2035 +A1,7.73560000000,R1,2025,R1,gas,gassupply1,newcapa,2035 +A1,7.50000000000,R1,2030,R1,gas,gassupply1,newcapa,2035 A1,26.00000000000,R1,2030,R1,residential,heatpump,newcapa,2040 A1,16.00000000000,R1,2035,R1,residential,heatpump,newcapa,2040 A1,5.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2040 -A1,6.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2040 +A1,5.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2040 A1,5.00000000000,R1,2020,R1,power,solarPV,newcapa,2040 -A1,6.00000000000,R1,2030,R1,power,solarPV,newcapa,2040 +A1,8.00000000000,R1,2030,R1,power,solarPV,newcapa,2040 A1,6.00000000000,R1,2035,R1,power,solarPV,newcapa,2040 -A1,1.73530000000,R1,2020,R1,gas,gassupply1,newcapa,2040 -A1,9.28910000000,R1,2025,R1,gas,gassupply1,newcapa,2040 -A1,7.47410000000,R1,2030,R1,gas,gassupply1,newcapa,2040 +A1,1.46440000000,R1,2020,R1,gas,gassupply1,newcapa,2040 +A1,7.73560000000,R1,2025,R1,gas,gassupply1,newcapa,2040 +A1,7.50000000000,R1,2030,R1,gas,gassupply1,newcapa,2040 A1,16.00000000000,R1,2035,R1,residential,heatpump,newcapa,2045 A1,32.00000000000,R1,2040,R1,residential,heatpump,newcapa,2045 A1,5.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2045 -A1,6.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2045 +A1,5.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2045 A1,5.00000000000,R1,2020,R1,power,solarPV,newcapa,2045 -A1,6.00000000000,R1,2030,R1,power,solarPV,newcapa,2045 +A1,8.00000000000,R1,2030,R1,power,solarPV,newcapa,2045 A1,6.00000000000,R1,2035,R1,power,solarPV,newcapa,2045 A1,6.00000000000,R1,2040,R1,power,solarPV,newcapa,2045 -A1,1.73530000000,R1,2020,R1,gas,gassupply1,newcapa,2045 -A1,9.28910000000,R1,2025,R1,gas,gassupply1,newcapa,2045 -A1,7.47410000000,R1,2030,R1,gas,gassupply1,newcapa,2045 +A1,1.46440000000,R1,2020,R1,gas,gassupply1,newcapa,2045 +A1,7.73560000000,R1,2025,R1,gas,gassupply1,newcapa,2045 +A1,7.50000000000,R1,2030,R1,gas,gassupply1,newcapa,2045 A1,32.00000000000,R1,2040,R1,residential,heatpump,newcapa,2050 A1,22.00000000000,R1,2045,R1,residential,heatpump,newcapa,2050 A1,5.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2050 -A1,6.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2050 -A1,6.00000000000,R1,2030,R1,power,solarPV,newcapa,2050 +A1,5.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2050 +A1,8.00000000000,R1,2030,R1,power,solarPV,newcapa,2050 A1,6.00000000000,R1,2035,R1,power,solarPV,newcapa,2050 A1,6.00000000000,R1,2040,R1,power,solarPV,newcapa,2050 A1,11.00000000000,R1,2045,R1,power,solarPV,newcapa,2050 -A1,1.73530000000,R1,2020,R1,gas,gassupply1,newcapa,2050 -A1,9.28910000000,R1,2025,R1,gas,gassupply1,newcapa,2050 -A1,7.47410000000,R1,2030,R1,gas,gassupply1,newcapa,2050 +A1,1.46440000000,R1,2020,R1,gas,gassupply1,newcapa,2050 +A1,7.73560000000,R1,2025,R1,gas,gassupply1,newcapa,2050 +A1,7.50000000000,R1,2030,R1,gas,gassupply1,newcapa,2050 diff --git a/docs/tutorial-code/add-new-technology/1-introduction/Results/MCAPrices.csv b/docs/tutorial-code/add-new-technology/1-introduction/Results/MCAPrices.csv index 02c5dadd6..f027dd045 100644 --- a/docs/tutorial-code/add-new-technology/1-introduction/Results/MCAPrices.csv +++ b/docs/tutorial-code/add-new-technology/1-introduction/Results/MCAPrices.csv @@ -47,123 +47,123 @@ electricity,all-week,evening,all-year,9.31290000000,R1,5,MUS$2010/PJ,2025 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2025 heat,all-week,evening,all-year,4.89380000000,R1,5,MUS$2010/PJ,2025 CO2f,all-week,evening,all-year,0.12010000000,R1,5,MUS$2010/kt,2025 -electricity,all-week,night,all-year,13.24060000000,R1,0,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,13.04460000000,R1,0,MUS$2010/PJ,2030 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,5.53680000000,R1,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,5.45830000000,R1,0,MUS$2010/PJ,2030 CO2f,all-week,night,all-year,0.15700000000,R1,0,MUS$2010/kt,2030 -electricity,all-week,morning,all-year,13.24060000000,R1,1,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,13.04460000000,R1,1,MUS$2010/PJ,2030 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,5.53680000000,R1,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,5.45830000000,R1,1,MUS$2010/PJ,2030 CO2f,all-week,morning,all-year,0.15700000000,R1,1,MUS$2010/kt,2030 -electricity,all-week,afternoon,all-year,13.24060000000,R1,2,MUS$2010/PJ,2030 +electricity,all-week,afternoon,all-year,13.04460000000,R1,2,MUS$2010/PJ,2030 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,5.53680000000,R1,2,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,5.45830000000,R1,2,MUS$2010/PJ,2030 CO2f,all-week,afternoon,all-year,0.15700000000,R1,2,MUS$2010/kt,2030 -electricity,all-week,early-peak,all-year,13.24060000000,R1,3,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,13.04460000000,R1,3,MUS$2010/PJ,2030 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,5.53680000000,R1,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,5.45830000000,R1,3,MUS$2010/PJ,2030 CO2f,all-week,early-peak,all-year,0.15700000000,R1,3,MUS$2010/kt,2030 -electricity,all-week,late-peak,all-year,13.24060000000,R1,4,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,13.04460000000,R1,4,MUS$2010/PJ,2030 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,5.53680000000,R1,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,5.45830000000,R1,4,MUS$2010/PJ,2030 CO2f,all-week,late-peak,all-year,0.15700000000,R1,4,MUS$2010/kt,2030 -electricity,all-week,evening,all-year,13.24060000000,R1,5,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,13.04460000000,R1,5,MUS$2010/PJ,2030 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,5.53680000000,R1,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,5.45830000000,R1,5,MUS$2010/PJ,2030 CO2f,all-week,evening,all-year,0.15700000000,R1,5,MUS$2010/kt,2030 -electricity,all-week,night,all-year,14.92280000000,R1,0,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,13.77810000000,R1,0,MUS$2010/PJ,2035 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,6.20960000000,R1,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,5.75170000000,R1,0,MUS$2010/PJ,2035 CO2f,all-week,night,all-year,0.21490000000,R1,0,MUS$2010/kt,2035 -electricity,all-week,morning,all-year,14.92280000000,R1,1,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,13.77810000000,R1,1,MUS$2010/PJ,2035 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,6.20960000000,R1,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,5.75170000000,R1,1,MUS$2010/PJ,2035 CO2f,all-week,morning,all-year,0.21490000000,R1,1,MUS$2010/kt,2035 -electricity,all-week,afternoon,all-year,14.92280000000,R1,2,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,13.77810000000,R1,2,MUS$2010/PJ,2035 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,6.20960000000,R1,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,5.75170000000,R1,2,MUS$2010/PJ,2035 CO2f,all-week,afternoon,all-year,0.21490000000,R1,2,MUS$2010/kt,2035 -electricity,all-week,early-peak,all-year,14.92280000000,R1,3,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,13.77810000000,R1,3,MUS$2010/PJ,2035 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,6.20960000000,R1,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,5.75170000000,R1,3,MUS$2010/PJ,2035 CO2f,all-week,early-peak,all-year,0.21490000000,R1,3,MUS$2010/kt,2035 -electricity,all-week,late-peak,all-year,14.92280000000,R1,4,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,13.77810000000,R1,4,MUS$2010/PJ,2035 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,6.20960000000,R1,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,5.75170000000,R1,4,MUS$2010/PJ,2035 CO2f,all-week,late-peak,all-year,0.21490000000,R1,4,MUS$2010/kt,2035 -electricity,all-week,evening,all-year,14.92280000000,R1,5,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,13.77810000000,R1,5,MUS$2010/PJ,2035 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,6.20960000000,R1,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,5.75170000000,R1,5,MUS$2010/PJ,2035 CO2f,all-week,evening,all-year,0.21490000000,R1,5,MUS$2010/kt,2035 -electricity,all-week,night,all-year,16.12150000000,R1,0,MUS$2010/PJ,2040 +electricity,all-week,night,all-year,14.86180000000,R1,0,MUS$2010/PJ,2040 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,6.68910000000,R1,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,6.18520000000,R1,0,MUS$2010/PJ,2040 CO2f,all-week,night,all-year,0.27280000000,R1,0,MUS$2010/kt,2040 -electricity,all-week,morning,all-year,16.12150000000,R1,1,MUS$2010/PJ,2040 +electricity,all-week,morning,all-year,14.86180000000,R1,1,MUS$2010/PJ,2040 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,6.68910000000,R1,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,6.18520000000,R1,1,MUS$2010/PJ,2040 CO2f,all-week,morning,all-year,0.27280000000,R1,1,MUS$2010/kt,2040 -electricity,all-week,afternoon,all-year,16.12150000000,R1,2,MUS$2010/PJ,2040 +electricity,all-week,afternoon,all-year,14.86180000000,R1,2,MUS$2010/PJ,2040 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2040 -heat,all-week,afternoon,all-year,6.68910000000,R1,2,MUS$2010/PJ,2040 +heat,all-week,afternoon,all-year,6.18520000000,R1,2,MUS$2010/PJ,2040 CO2f,all-week,afternoon,all-year,0.27280000000,R1,2,MUS$2010/kt,2040 -electricity,all-week,early-peak,all-year,16.12150000000,R1,3,MUS$2010/PJ,2040 +electricity,all-week,early-peak,all-year,14.86180000000,R1,3,MUS$2010/PJ,2040 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,6.68910000000,R1,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,6.18520000000,R1,3,MUS$2010/PJ,2040 CO2f,all-week,early-peak,all-year,0.27280000000,R1,3,MUS$2010/kt,2040 -electricity,all-week,late-peak,all-year,16.12150000000,R1,4,MUS$2010/PJ,2040 +electricity,all-week,late-peak,all-year,14.86180000000,R1,4,MUS$2010/PJ,2040 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,6.68910000000,R1,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,6.18520000000,R1,4,MUS$2010/PJ,2040 CO2f,all-week,late-peak,all-year,0.27280000000,R1,4,MUS$2010/kt,2040 -electricity,all-week,evening,all-year,16.12150000000,R1,5,MUS$2010/PJ,2040 +electricity,all-week,evening,all-year,14.86180000000,R1,5,MUS$2010/PJ,2040 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,6.68910000000,R1,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,6.18520000000,R1,5,MUS$2010/PJ,2040 CO2f,all-week,evening,all-year,0.27280000000,R1,5,MUS$2010/kt,2040 -electricity,all-week,night,all-year,18.12650000000,R1,0,MUS$2010/PJ,2045 +electricity,all-week,night,all-year,16.68400000000,R1,0,MUS$2010/PJ,2045 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2045 -heat,all-week,night,all-year,7.49110000000,R1,0,MUS$2010/PJ,2045 +heat,all-week,night,all-year,6.91410000000,R1,0,MUS$2010/PJ,2045 CO2f,all-week,night,all-year,0.35390000000,R1,0,MUS$2010/kt,2045 -electricity,all-week,morning,all-year,18.12650000000,R1,1,MUS$2010/PJ,2045 +electricity,all-week,morning,all-year,16.68400000000,R1,1,MUS$2010/PJ,2045 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2045 -heat,all-week,morning,all-year,7.49110000000,R1,1,MUS$2010/PJ,2045 +heat,all-week,morning,all-year,6.91410000000,R1,1,MUS$2010/PJ,2045 CO2f,all-week,morning,all-year,0.35390000000,R1,1,MUS$2010/kt,2045 -electricity,all-week,afternoon,all-year,18.12650000000,R1,2,MUS$2010/PJ,2045 +electricity,all-week,afternoon,all-year,16.68400000000,R1,2,MUS$2010/PJ,2045 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2045 -heat,all-week,afternoon,all-year,7.49110000000,R1,2,MUS$2010/PJ,2045 +heat,all-week,afternoon,all-year,6.91410000000,R1,2,MUS$2010/PJ,2045 CO2f,all-week,afternoon,all-year,0.35390000000,R1,2,MUS$2010/kt,2045 -electricity,all-week,early-peak,all-year,18.12650000000,R1,3,MUS$2010/PJ,2045 +electricity,all-week,early-peak,all-year,16.68400000000,R1,3,MUS$2010/PJ,2045 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2045 -heat,all-week,early-peak,all-year,7.49110000000,R1,3,MUS$2010/PJ,2045 +heat,all-week,early-peak,all-year,6.91410000000,R1,3,MUS$2010/PJ,2045 CO2f,all-week,early-peak,all-year,0.35390000000,R1,3,MUS$2010/kt,2045 -electricity,all-week,late-peak,all-year,18.12650000000,R1,4,MUS$2010/PJ,2045 +electricity,all-week,late-peak,all-year,16.68400000000,R1,4,MUS$2010/PJ,2045 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2045 -heat,all-week,late-peak,all-year,7.49110000000,R1,4,MUS$2010/PJ,2045 +heat,all-week,late-peak,all-year,6.91410000000,R1,4,MUS$2010/PJ,2045 CO2f,all-week,late-peak,all-year,0.35390000000,R1,4,MUS$2010/kt,2045 -electricity,all-week,evening,all-year,18.12650000000,R1,5,MUS$2010/PJ,2045 +electricity,all-week,evening,all-year,16.68400000000,R1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2045 -heat,all-week,evening,all-year,7.49110000000,R1,5,MUS$2010/PJ,2045 +heat,all-week,evening,all-year,6.91410000000,R1,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045 -electricity,all-week,night,all-year,19.68400000000,R1,0,MUS$2010/PJ,2050 +electricity,all-week,night,all-year,18.09750000000,R1,0,MUS$2010/PJ,2050 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,8.11410000000,R1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,7.47950000000,R1,0,MUS$2010/PJ,2050 CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050 -electricity,all-week,morning,all-year,19.68400000000,R1,1,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,18.09750000000,R1,1,MUS$2010/PJ,2050 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,8.11410000000,R1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,7.47950000000,R1,1,MUS$2010/PJ,2050 CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050 -electricity,all-week,afternoon,all-year,19.68400000000,R1,2,MUS$2010/PJ,2050 +electricity,all-week,afternoon,all-year,18.09750000000,R1,2,MUS$2010/PJ,2050 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,8.11410000000,R1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,7.47950000000,R1,2,MUS$2010/PJ,2050 CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050 -electricity,all-week,early-peak,all-year,19.68400000000,R1,3,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,18.09750000000,R1,3,MUS$2010/PJ,2050 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,8.11410000000,R1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,7.47950000000,R1,3,MUS$2010/PJ,2050 CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050 -electricity,all-week,late-peak,all-year,19.68400000000,R1,4,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,18.09750000000,R1,4,MUS$2010/PJ,2050 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,8.11410000000,R1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,7.47950000000,R1,4,MUS$2010/PJ,2050 CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050 -electricity,all-week,evening,all-year,19.68400000000,R1,5,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,18.09750000000,R1,5,MUS$2010/PJ,2050 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,8.11410000000,R1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,7.47950000000,R1,5,MUS$2010/PJ,2050 CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050 diff --git a/docs/tutorial-code/add-new-technology/2-scenario/Results/MCACapacity.csv b/docs/tutorial-code/add-new-technology/2-scenario/Results/MCACapacity.csv index d4f05f407..f70714dd2 100644 --- a/docs/tutorial-code/add-new-technology/2-scenario/Results/MCACapacity.csv +++ b/docs/tutorial-code/add-new-technology/2-scenario/Results/MCACapacity.csv @@ -10,48 +10,48 @@ A1,16.46440000000,R1,2020,R1,gas,gassupply1,newcapa,2025 A1,19.00000000000,R1,2020,R1,residential,heatpump,newcapa,2030 A1,10.00000000000,R1,2025,R1,residential,heatpump,newcapa,2030 A1,5.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2030 -A1,5.88890000000,R1,2025,R1,power,gasCCGT,newcapa,2030 +A1,5.44440000000,R1,2025,R1,power,gasCCGT,newcapa,2030 A1,5.50000000000,R1,2020,R1,power,windturbine,newcapa,2030 A1,8.96440000000,R1,2020,R1,gas,gassupply1,newcapa,2030 -A1,9.22000000000,R1,2025,R1,gas,gassupply1,newcapa,2030 +A1,8.47780000000,R1,2025,R1,gas,gassupply1,newcapa,2030 A1,10.00000000000,R1,2025,R1,residential,heatpump,newcapa,2035 A1,26.00000000000,R1,2030,R1,residential,heatpump,newcapa,2035 A1,5.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2035 -A1,5.88890000000,R1,2025,R1,power,gasCCGT,newcapa,2035 -A1,6.00000000000,R1,2030,R1,power,solarPV,newcapa,2035 +A1,5.44440000000,R1,2025,R1,power,gasCCGT,newcapa,2035 +A1,7.00000000000,R1,2030,R1,power,solarPV,newcapa,2035 A1,5.50000000000,R1,2020,R1,power,windturbine,newcapa,2035 A1,1.46440000000,R1,2020,R1,gas,gassupply1,newcapa,2035 -A1,9.22000000000,R1,2025,R1,gas,gassupply1,newcapa,2035 +A1,8.47780000000,R1,2025,R1,gas,gassupply1,newcapa,2035 A1,7.50000000000,R1,2030,R1,gas,gassupply1,newcapa,2035 A1,26.00000000000,R1,2030,R1,residential,heatpump,newcapa,2040 A1,16.00000000000,R1,2035,R1,residential,heatpump,newcapa,2040 A1,5.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2040 -A1,5.88890000000,R1,2025,R1,power,gasCCGT,newcapa,2040 -A1,6.00000000000,R1,2030,R1,power,solarPV,newcapa,2040 +A1,5.44440000000,R1,2025,R1,power,gasCCGT,newcapa,2040 +A1,7.00000000000,R1,2030,R1,power,solarPV,newcapa,2040 A1,6.00000000000,R1,2035,R1,power,solarPV,newcapa,2040 A1,5.50000000000,R1,2020,R1,power,windturbine,newcapa,2040 A1,1.46440000000,R1,2020,R1,gas,gassupply1,newcapa,2040 -A1,9.22000000000,R1,2025,R1,gas,gassupply1,newcapa,2040 +A1,8.47780000000,R1,2025,R1,gas,gassupply1,newcapa,2040 A1,7.50000000000,R1,2030,R1,gas,gassupply1,newcapa,2040 A1,16.00000000000,R1,2035,R1,residential,heatpump,newcapa,2045 A1,32.00000000000,R1,2040,R1,residential,heatpump,newcapa,2045 A1,5.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2045 -A1,5.88890000000,R1,2025,R1,power,gasCCGT,newcapa,2045 -A1,6.00000000000,R1,2030,R1,power,solarPV,newcapa,2045 +A1,5.44440000000,R1,2025,R1,power,gasCCGT,newcapa,2045 +A1,7.00000000000,R1,2030,R1,power,solarPV,newcapa,2045 A1,6.00000000000,R1,2035,R1,power,solarPV,newcapa,2045 A1,6.00000000000,R1,2040,R1,power,solarPV,newcapa,2045 A1,5.50000000000,R1,2020,R1,power,windturbine,newcapa,2045 A1,1.46440000000,R1,2020,R1,gas,gassupply1,newcapa,2045 -A1,9.22000000000,R1,2025,R1,gas,gassupply1,newcapa,2045 +A1,8.47780000000,R1,2025,R1,gas,gassupply1,newcapa,2045 A1,7.50000000000,R1,2030,R1,gas,gassupply1,newcapa,2045 A1,32.00000000000,R1,2040,R1,residential,heatpump,newcapa,2050 A1,22.00000000000,R1,2045,R1,residential,heatpump,newcapa,2050 A1,5.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2050 -A1,5.88890000000,R1,2025,R1,power,gasCCGT,newcapa,2050 -A1,6.00000000000,R1,2030,R1,power,solarPV,newcapa,2050 +A1,5.44440000000,R1,2025,R1,power,gasCCGT,newcapa,2050 +A1,7.00000000000,R1,2030,R1,power,solarPV,newcapa,2050 A1,6.00000000000,R1,2035,R1,power,solarPV,newcapa,2050 A1,6.00000000000,R1,2040,R1,power,solarPV,newcapa,2050 A1,11.50000000000,R1,2045,R1,power,solarPV,newcapa,2050 A1,1.46440000000,R1,2020,R1,gas,gassupply1,newcapa,2050 -A1,9.22000000000,R1,2025,R1,gas,gassupply1,newcapa,2050 +A1,8.47780000000,R1,2025,R1,gas,gassupply1,newcapa,2050 A1,7.50000000000,R1,2030,R1,gas,gassupply1,newcapa,2050 diff --git a/docs/tutorial-code/add-new-technology/2-scenario/Results/MCAPrices.csv b/docs/tutorial-code/add-new-technology/2-scenario/Results/MCAPrices.csv index cb50efbc2..7e7d41844 100644 --- a/docs/tutorial-code/add-new-technology/2-scenario/Results/MCAPrices.csv +++ b/docs/tutorial-code/add-new-technology/2-scenario/Results/MCAPrices.csv @@ -47,123 +47,123 @@ electricity,all-week,evening,all-year,9.18790000000,R1,5,MUS$2010/PJ,2025 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2025 heat,all-week,evening,all-year,4.85420000000,R1,5,MUS$2010/PJ,2025 CO2f,all-week,evening,all-year,0.12010000000,R1,5,MUS$2010/kt,2025 -electricity,all-week,night,all-year,13.07600000000,R1,0,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,12.98770000000,R1,0,MUS$2010/PJ,2030 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,5.47090000000,R1,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,5.43560000000,R1,0,MUS$2010/PJ,2030 CO2f,all-week,night,all-year,0.15700000000,R1,0,MUS$2010/kt,2030 -electricity,all-week,morning,all-year,13.07600000000,R1,1,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,12.98770000000,R1,1,MUS$2010/PJ,2030 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,5.47090000000,R1,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,5.43560000000,R1,1,MUS$2010/PJ,2030 CO2f,all-week,morning,all-year,0.15700000000,R1,1,MUS$2010/kt,2030 -electricity,all-week,afternoon,all-year,13.07600000000,R1,2,MUS$2010/PJ,2030 +electricity,all-week,afternoon,all-year,12.98770000000,R1,2,MUS$2010/PJ,2030 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,5.47090000000,R1,2,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,5.43560000000,R1,2,MUS$2010/PJ,2030 CO2f,all-week,afternoon,all-year,0.15700000000,R1,2,MUS$2010/kt,2030 -electricity,all-week,early-peak,all-year,13.07600000000,R1,3,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,12.98770000000,R1,3,MUS$2010/PJ,2030 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,5.47090000000,R1,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,5.43560000000,R1,3,MUS$2010/PJ,2030 CO2f,all-week,early-peak,all-year,0.15700000000,R1,3,MUS$2010/kt,2030 -electricity,all-week,late-peak,all-year,13.07600000000,R1,4,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,12.98770000000,R1,4,MUS$2010/PJ,2030 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,5.47090000000,R1,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,5.43560000000,R1,4,MUS$2010/PJ,2030 CO2f,all-week,late-peak,all-year,0.15700000000,R1,4,MUS$2010/kt,2030 -electricity,all-week,evening,all-year,13.07600000000,R1,5,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,12.98770000000,R1,5,MUS$2010/PJ,2030 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,5.47090000000,R1,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,5.43560000000,R1,5,MUS$2010/PJ,2030 CO2f,all-week,evening,all-year,0.15700000000,R1,5,MUS$2010/kt,2030 -electricity,all-week,night,all-year,14.77530000000,R1,0,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,14.23820000000,R1,0,MUS$2010/PJ,2035 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,6.15060000000,R1,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,5.93580000000,R1,0,MUS$2010/PJ,2035 CO2f,all-week,night,all-year,0.21490000000,R1,0,MUS$2010/kt,2035 -electricity,all-week,morning,all-year,14.77530000000,R1,1,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,14.23820000000,R1,1,MUS$2010/PJ,2035 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,6.15060000000,R1,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,5.93580000000,R1,1,MUS$2010/PJ,2035 CO2f,all-week,morning,all-year,0.21490000000,R1,1,MUS$2010/kt,2035 -electricity,all-week,afternoon,all-year,14.77530000000,R1,2,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,14.23820000000,R1,2,MUS$2010/PJ,2035 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,6.15060000000,R1,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,5.93580000000,R1,2,MUS$2010/PJ,2035 CO2f,all-week,afternoon,all-year,0.21490000000,R1,2,MUS$2010/kt,2035 -electricity,all-week,early-peak,all-year,14.77530000000,R1,3,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,14.23820000000,R1,3,MUS$2010/PJ,2035 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,6.15060000000,R1,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,5.93580000000,R1,3,MUS$2010/PJ,2035 CO2f,all-week,early-peak,all-year,0.21490000000,R1,3,MUS$2010/kt,2035 -electricity,all-week,late-peak,all-year,14.77530000000,R1,4,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,14.23820000000,R1,4,MUS$2010/PJ,2035 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,6.15060000000,R1,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,5.93580000000,R1,4,MUS$2010/PJ,2035 CO2f,all-week,late-peak,all-year,0.21490000000,R1,4,MUS$2010/kt,2035 -electricity,all-week,evening,all-year,14.77530000000,R1,5,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,14.23820000000,R1,5,MUS$2010/PJ,2035 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,6.15060000000,R1,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,5.93580000000,R1,5,MUS$2010/PJ,2035 CO2f,all-week,evening,all-year,0.21490000000,R1,5,MUS$2010/kt,2035 -electricity,all-week,night,all-year,15.97270000000,R1,0,MUS$2010/PJ,2040 +electricity,all-week,night,all-year,15.38600000000,R1,0,MUS$2010/PJ,2040 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,6.62960000000,R1,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,6.39490000000,R1,0,MUS$2010/PJ,2040 CO2f,all-week,night,all-year,0.27280000000,R1,0,MUS$2010/kt,2040 -electricity,all-week,morning,all-year,15.97270000000,R1,1,MUS$2010/PJ,2040 +electricity,all-week,morning,all-year,15.38600000000,R1,1,MUS$2010/PJ,2040 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,6.62960000000,R1,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,6.39490000000,R1,1,MUS$2010/PJ,2040 CO2f,all-week,morning,all-year,0.27280000000,R1,1,MUS$2010/kt,2040 -electricity,all-week,afternoon,all-year,15.97270000000,R1,2,MUS$2010/PJ,2040 +electricity,all-week,afternoon,all-year,15.38600000000,R1,2,MUS$2010/PJ,2040 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2040 -heat,all-week,afternoon,all-year,6.62960000000,R1,2,MUS$2010/PJ,2040 +heat,all-week,afternoon,all-year,6.39490000000,R1,2,MUS$2010/PJ,2040 CO2f,all-week,afternoon,all-year,0.27280000000,R1,2,MUS$2010/kt,2040 -electricity,all-week,early-peak,all-year,15.97270000000,R1,3,MUS$2010/PJ,2040 +electricity,all-week,early-peak,all-year,15.38600000000,R1,3,MUS$2010/PJ,2040 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,6.62960000000,R1,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,6.39490000000,R1,3,MUS$2010/PJ,2040 CO2f,all-week,early-peak,all-year,0.27280000000,R1,3,MUS$2010/kt,2040 -electricity,all-week,late-peak,all-year,15.97270000000,R1,4,MUS$2010/PJ,2040 +electricity,all-week,late-peak,all-year,15.38600000000,R1,4,MUS$2010/PJ,2040 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,6.62960000000,R1,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,6.39490000000,R1,4,MUS$2010/PJ,2040 CO2f,all-week,late-peak,all-year,0.27280000000,R1,4,MUS$2010/kt,2040 -electricity,all-week,evening,all-year,15.97270000000,R1,5,MUS$2010/PJ,2040 +electricity,all-week,evening,all-year,15.38600000000,R1,5,MUS$2010/PJ,2040 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,6.62960000000,R1,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,6.39490000000,R1,5,MUS$2010/PJ,2040 CO2f,all-week,evening,all-year,0.27280000000,R1,5,MUS$2010/kt,2040 -electricity,all-week,night,all-year,17.94720000000,R1,0,MUS$2010/PJ,2045 +electricity,all-week,night,all-year,17.27880000000,R1,0,MUS$2010/PJ,2045 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2045 -heat,all-week,night,all-year,7.41940000000,R1,0,MUS$2010/PJ,2045 +heat,all-week,night,all-year,7.15200000000,R1,0,MUS$2010/PJ,2045 CO2f,all-week,night,all-year,0.35390000000,R1,0,MUS$2010/kt,2045 -electricity,all-week,morning,all-year,17.94720000000,R1,1,MUS$2010/PJ,2045 +electricity,all-week,morning,all-year,17.27880000000,R1,1,MUS$2010/PJ,2045 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2045 -heat,all-week,morning,all-year,7.41940000000,R1,1,MUS$2010/PJ,2045 +heat,all-week,morning,all-year,7.15200000000,R1,1,MUS$2010/PJ,2045 CO2f,all-week,morning,all-year,0.35390000000,R1,1,MUS$2010/kt,2045 -electricity,all-week,afternoon,all-year,17.94720000000,R1,2,MUS$2010/PJ,2045 +electricity,all-week,afternoon,all-year,17.27880000000,R1,2,MUS$2010/PJ,2045 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2045 -heat,all-week,afternoon,all-year,7.41940000000,R1,2,MUS$2010/PJ,2045 +heat,all-week,afternoon,all-year,7.15200000000,R1,2,MUS$2010/PJ,2045 CO2f,all-week,afternoon,all-year,0.35390000000,R1,2,MUS$2010/kt,2045 -electricity,all-week,early-peak,all-year,17.94720000000,R1,3,MUS$2010/PJ,2045 +electricity,all-week,early-peak,all-year,17.27880000000,R1,3,MUS$2010/PJ,2045 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2045 -heat,all-week,early-peak,all-year,7.41940000000,R1,3,MUS$2010/PJ,2045 +heat,all-week,early-peak,all-year,7.15200000000,R1,3,MUS$2010/PJ,2045 CO2f,all-week,early-peak,all-year,0.35390000000,R1,3,MUS$2010/kt,2045 -electricity,all-week,late-peak,all-year,17.94720000000,R1,4,MUS$2010/PJ,2045 +electricity,all-week,late-peak,all-year,17.27880000000,R1,4,MUS$2010/PJ,2045 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2045 -heat,all-week,late-peak,all-year,7.41940000000,R1,4,MUS$2010/PJ,2045 +heat,all-week,late-peak,all-year,7.15200000000,R1,4,MUS$2010/PJ,2045 CO2f,all-week,late-peak,all-year,0.35390000000,R1,4,MUS$2010/kt,2045 -electricity,all-week,evening,all-year,17.94720000000,R1,5,MUS$2010/PJ,2045 +electricity,all-week,evening,all-year,17.27880000000,R1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2045 -heat,all-week,evening,all-year,7.41940000000,R1,5,MUS$2010/PJ,2045 +heat,all-week,evening,all-year,7.15200000000,R1,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045 -electricity,all-week,night,all-year,19.45340000000,R1,0,MUS$2010/PJ,2050 +electricity,all-week,night,all-year,18.72140000000,R1,0,MUS$2010/PJ,2050 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,8.02190000000,R1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,7.72910000000,R1,0,MUS$2010/PJ,2050 CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050 -electricity,all-week,morning,all-year,19.45340000000,R1,1,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,18.72140000000,R1,1,MUS$2010/PJ,2050 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,8.02190000000,R1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,7.72910000000,R1,1,MUS$2010/PJ,2050 CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050 -electricity,all-week,afternoon,all-year,19.45340000000,R1,2,MUS$2010/PJ,2050 +electricity,all-week,afternoon,all-year,18.72140000000,R1,2,MUS$2010/PJ,2050 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,8.02190000000,R1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,7.72910000000,R1,2,MUS$2010/PJ,2050 CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050 -electricity,all-week,early-peak,all-year,19.45340000000,R1,3,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,18.72140000000,R1,3,MUS$2010/PJ,2050 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,8.02190000000,R1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,7.72910000000,R1,3,MUS$2010/PJ,2050 CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050 -electricity,all-week,late-peak,all-year,19.45340000000,R1,4,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,18.72140000000,R1,4,MUS$2010/PJ,2050 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,8.02190000000,R1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,7.72910000000,R1,4,MUS$2010/PJ,2050 CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050 -electricity,all-week,evening,all-year,19.45340000000,R1,5,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,18.72140000000,R1,5,MUS$2010/PJ,2050 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,8.02190000000,R1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,7.72910000000,R1,5,MUS$2010/PJ,2050 CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050 diff --git a/docs/tutorial-code/add-region/1-new-region/Results/MCACapacity.csv b/docs/tutorial-code/add-region/1-new-region/Results/MCACapacity.csv index 8dee5e361..2cab9137a 100644 --- a/docs/tutorial-code/add-region/1-new-region/Results/MCACapacity.csv +++ b/docs/tutorial-code/add-region/1-new-region/Results/MCACapacity.csv @@ -13,23 +13,23 @@ A1,6.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2025 A1,5.00000000000,R1,2020,R1,power,windturbine,newcapa,2025 A1,6.00000000000,R2,2020,R2,power,gasCCGT,newcapa,2025 A1,5.00000000000,R2,2020,R2,power,windturbine,newcapa,2025 -A1,16.73530000000,R1,2020,R1,gas,gassupply1,newcapa,2025 -A1,16.73530000000,R2,2020,R2,gas,gassupply1,newcapa,2025 +A1,16.46440000000,R1,2020,R1,gas,gassupply1,newcapa,2025 +A1,16.46440000000,R2,2020,R2,gas,gassupply1,newcapa,2025 A1,19.00000000000,R1,2020,R1,residential,heatpump,newcapa,2030 A1,10.00000000000,R1,2025,R1,residential,heatpump,newcapa,2030 A1,9.00000000000,R2,2025,R2,residential,gasboiler,newcapa,2030 A1,19.00000000000,R2,2020,R2,residential,heatpump,newcapa,2030 A1,1.00000000000,R2,2025,R2,residential,heatpump,newcapa,2030 A1,5.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2030 -A1,4.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2030 +A1,3.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2030 A1,5.00000000000,R1,2020,R1,power,windturbine,newcapa,2030 A1,5.00000000000,R2,2020,R2,power,gasCCGT,newcapa,2030 -A1,4.00000000000,R2,2025,R2,power,gasCCGT,newcapa,2030 +A1,3.00000000000,R2,2025,R2,power,gasCCGT,newcapa,2030 A1,5.00000000000,R2,2020,R2,power,windturbine,newcapa,2030 -A1,9.23530000000,R1,2020,R1,gas,gassupply1,newcapa,2030 -A1,11.85120000000,R1,2025,R1,gas,gassupply1,newcapa,2030 -A1,9.23530000000,R2,2020,R2,gas,gassupply1,newcapa,2030 -A1,11.85120000000,R2,2025,R2,gas,gassupply1,newcapa,2030 +A1,8.96440000000,R1,2020,R1,gas,gassupply1,newcapa,2030 +A1,10.19560000000,R1,2025,R1,gas,gassupply1,newcapa,2030 +A1,8.96440000000,R2,2020,R2,gas,gassupply1,newcapa,2030 +A1,10.19560000000,R2,2025,R2,gas,gassupply1,newcapa,2030 A1,10.00000000000,R1,2025,R1,residential,heatpump,newcapa,2035 A1,26.00000000000,R1,2030,R1,residential,heatpump,newcapa,2035 A1,9.00000000000,R2,2025,R2,residential,gasboiler,newcapa,2035 @@ -37,19 +37,19 @@ A1,6.00000000000,R2,2030,R2,residential,gasboiler,newcapa,2035 A1,1.00000000000,R2,2025,R2,residential,heatpump,newcapa,2035 A1,19.00000000000,R2,2030,R2,residential,heatpump,newcapa,2035 A1,5.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2035 -A1,4.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2035 +A1,3.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2035 A1,5.00000000000,R1,2020,R1,power,windturbine,newcapa,2035 -A1,3.00000000000,R1,2030,R1,power,windturbine,newcapa,2035 +A1,5.00000000000,R1,2030,R1,power,windturbine,newcapa,2035 A1,5.00000000000,R2,2020,R2,power,gasCCGT,newcapa,2035 -A1,4.00000000000,R2,2025,R2,power,gasCCGT,newcapa,2035 +A1,3.00000000000,R2,2025,R2,power,gasCCGT,newcapa,2035 A1,5.00000000000,R2,2020,R2,power,windturbine,newcapa,2035 -A1,3.00000000000,R2,2030,R2,power,windturbine,newcapa,2035 -A1,1.73530000000,R1,2020,R1,gas,gassupply1,newcapa,2035 -A1,11.85120000000,R1,2025,R1,gas,gassupply1,newcapa,2035 -A1,11.32320000000,R1,2030,R1,gas,gassupply1,newcapa,2035 -A1,1.73530000000,R2,2020,R2,gas,gassupply1,newcapa,2035 -A1,11.85120000000,R2,2025,R2,gas,gassupply1,newcapa,2035 -A1,11.32320000000,R2,2030,R2,gas,gassupply1,newcapa,2035 +A1,5.00000000000,R2,2030,R2,power,windturbine,newcapa,2035 +A1,1.46440000000,R1,2020,R1,gas,gassupply1,newcapa,2035 +A1,10.19560000000,R1,2025,R1,gas,gassupply1,newcapa,2035 +A1,11.36670000000,R1,2030,R1,gas,gassupply1,newcapa,2035 +A1,1.46440000000,R2,2020,R2,gas,gassupply1,newcapa,2035 +A1,10.19560000000,R2,2025,R2,gas,gassupply1,newcapa,2035 +A1,11.36670000000,R2,2030,R2,gas,gassupply1,newcapa,2035 A1,26.00000000000,R1,2030,R1,residential,heatpump,newcapa,2040 A1,16.00000000000,R1,2035,R1,residential,heatpump,newcapa,2040 A1,6.00000000000,R2,2030,R2,residential,gasboiler,newcapa,2040 @@ -57,23 +57,23 @@ A1,16.00000000000,R2,2035,R2,residential,gasboiler,newcapa,2040 A1,19.00000000000,R2,2030,R2,residential,heatpump,newcapa,2040 A1,1.00000000000,R2,2035,R2,residential,heatpump,newcapa,2040 A1,5.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2040 -A1,4.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2040 +A1,3.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2040 A1,5.00000000000,R1,2020,R1,power,windturbine,newcapa,2040 -A1,3.00000000000,R1,2030,R1,power,windturbine,newcapa,2040 +A1,5.00000000000,R1,2030,R1,power,windturbine,newcapa,2040 A1,2.00000000000,R1,2035,R1,power,windturbine,newcapa,2040 A1,5.00000000000,R2,2020,R2,power,gasCCGT,newcapa,2040 -A1,4.00000000000,R2,2025,R2,power,gasCCGT,newcapa,2040 +A1,3.00000000000,R2,2025,R2,power,gasCCGT,newcapa,2040 A1,5.00000000000,R2,2020,R2,power,windturbine,newcapa,2040 -A1,3.00000000000,R2,2030,R2,power,windturbine,newcapa,2040 +A1,5.00000000000,R2,2030,R2,power,windturbine,newcapa,2040 A1,2.00000000000,R2,2035,R2,power,windturbine,newcapa,2040 -A1,1.73530000000,R1,2020,R1,gas,gassupply1,newcapa,2040 -A1,11.85120000000,R1,2025,R1,gas,gassupply1,newcapa,2040 -A1,11.32320000000,R1,2030,R1,gas,gassupply1,newcapa,2040 -A1,9.34160000000,R1,2035,R1,gas,gassupply1,newcapa,2040 -A1,1.73530000000,R2,2020,R2,gas,gassupply1,newcapa,2040 -A1,11.85120000000,R2,2025,R2,gas,gassupply1,newcapa,2040 -A1,11.32320000000,R2,2030,R2,gas,gassupply1,newcapa,2040 -A1,9.34160000000,R2,2035,R2,gas,gassupply1,newcapa,2040 +A1,1.46440000000,R1,2020,R1,gas,gassupply1,newcapa,2040 +A1,10.19560000000,R1,2025,R1,gas,gassupply1,newcapa,2040 +A1,11.36670000000,R1,2030,R1,gas,gassupply1,newcapa,2040 +A1,9.02220000000,R1,2035,R1,gas,gassupply1,newcapa,2040 +A1,1.46440000000,R2,2020,R2,gas,gassupply1,newcapa,2040 +A1,10.19560000000,R2,2025,R2,gas,gassupply1,newcapa,2040 +A1,11.36670000000,R2,2030,R2,gas,gassupply1,newcapa,2040 +A1,9.02220000000,R2,2035,R2,gas,gassupply1,newcapa,2040 A1,16.00000000000,R1,2035,R1,residential,heatpump,newcapa,2045 A1,32.00000000000,R1,2040,R1,residential,heatpump,newcapa,2045 A1,16.00000000000,R2,2035,R2,residential,gasboiler,newcapa,2045 @@ -81,25 +81,25 @@ A1,12.00000000000,R2,2040,R2,residential,gasboiler,newcapa,2045 A1,1.00000000000,R2,2035,R2,residential,heatpump,newcapa,2045 A1,19.00000000000,R2,2040,R2,residential,heatpump,newcapa,2045 A1,5.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2045 -A1,4.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2045 +A1,3.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2045 A1,5.00000000000,R1,2020,R1,power,windturbine,newcapa,2045 -A1,3.00000000000,R1,2030,R1,power,windturbine,newcapa,2045 +A1,5.00000000000,R1,2030,R1,power,windturbine,newcapa,2045 A1,2.00000000000,R1,2035,R1,power,windturbine,newcapa,2045 -A1,3.00000000000,R1,2040,R1,power,windturbine,newcapa,2045 +A1,4.00000000000,R1,2040,R1,power,windturbine,newcapa,2045 A1,5.00000000000,R2,2020,R2,power,gasCCGT,newcapa,2045 -A1,4.00000000000,R2,2025,R2,power,gasCCGT,newcapa,2045 +A1,3.00000000000,R2,2025,R2,power,gasCCGT,newcapa,2045 A1,5.00000000000,R2,2020,R2,power,windturbine,newcapa,2045 -A1,3.00000000000,R2,2030,R2,power,windturbine,newcapa,2045 +A1,5.00000000000,R2,2030,R2,power,windturbine,newcapa,2045 A1,2.00000000000,R2,2035,R2,power,windturbine,newcapa,2045 -A1,3.00000000000,R2,2040,R2,power,windturbine,newcapa,2045 -A1,1.73530000000,R1,2020,R1,gas,gassupply1,newcapa,2045 -A1,11.85120000000,R1,2025,R1,gas,gassupply1,newcapa,2045 -A1,11.32320000000,R1,2030,R1,gas,gassupply1,newcapa,2045 -A1,9.34160000000,R1,2035,R1,gas,gassupply1,newcapa,2045 -A1,1.73530000000,R2,2020,R2,gas,gassupply1,newcapa,2045 -A1,11.85120000000,R2,2025,R2,gas,gassupply1,newcapa,2045 -A1,11.32320000000,R2,2030,R2,gas,gassupply1,newcapa,2045 -A1,9.34160000000,R2,2035,R2,gas,gassupply1,newcapa,2045 +A1,4.00000000000,R2,2040,R2,power,windturbine,newcapa,2045 +A1,1.46440000000,R1,2020,R1,gas,gassupply1,newcapa,2045 +A1,10.19560000000,R1,2025,R1,gas,gassupply1,newcapa,2045 +A1,11.36670000000,R1,2030,R1,gas,gassupply1,newcapa,2045 +A1,9.02220000000,R1,2035,R1,gas,gassupply1,newcapa,2045 +A1,1.46440000000,R2,2020,R2,gas,gassupply1,newcapa,2045 +A1,10.19560000000,R2,2025,R2,gas,gassupply1,newcapa,2045 +A1,11.36670000000,R2,2030,R2,gas,gassupply1,newcapa,2045 +A1,9.02220000000,R2,2035,R2,gas,gassupply1,newcapa,2045 A1,32.00000000000,R1,2040,R1,residential,heatpump,newcapa,2050 A1,22.00000000000,R1,2045,R1,residential,heatpump,newcapa,2050 A1,12.00000000000,R2,2040,R2,residential,gasboiler,newcapa,2050 @@ -107,24 +107,24 @@ A1,22.00000000000,R2,2045,R2,residential,gasboiler,newcapa,2050 A1,19.00000000000,R2,2040,R2,residential,heatpump,newcapa,2050 A1,1.00000000000,R2,2045,R2,residential,heatpump,newcapa,2050 A1,5.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2050 -A1,4.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2050 -A1,3.00000000000,R1,2030,R1,power,windturbine,newcapa,2050 +A1,3.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2050 +A1,5.00000000000,R1,2030,R1,power,windturbine,newcapa,2050 A1,2.00000000000,R1,2035,R1,power,windturbine,newcapa,2050 -A1,3.00000000000,R1,2040,R1,power,windturbine,newcapa,2050 +A1,4.00000000000,R1,2040,R1,power,windturbine,newcapa,2050 A1,8.00000000000,R1,2045,R1,power,windturbine,newcapa,2050 A1,5.00000000000,R2,2020,R2,power,gasCCGT,newcapa,2050 -A1,4.00000000000,R2,2025,R2,power,gasCCGT,newcapa,2050 -A1,3.00000000000,R2,2030,R2,power,windturbine,newcapa,2050 +A1,3.00000000000,R2,2025,R2,power,gasCCGT,newcapa,2050 +A1,5.00000000000,R2,2030,R2,power,windturbine,newcapa,2050 A1,2.00000000000,R2,2035,R2,power,windturbine,newcapa,2050 -A1,3.00000000000,R2,2040,R2,power,windturbine,newcapa,2050 +A1,4.00000000000,R2,2040,R2,power,windturbine,newcapa,2050 A1,8.00000000000,R2,2045,R2,power,windturbine,newcapa,2050 -A1,1.73530000000,R1,2020,R1,gas,gassupply1,newcapa,2050 -A1,11.85120000000,R1,2025,R1,gas,gassupply1,newcapa,2050 -A1,11.32320000000,R1,2030,R1,gas,gassupply1,newcapa,2050 -A1,9.34160000000,R1,2035,R1,gas,gassupply1,newcapa,2050 -A1,3.00090000000,R1,2045,R1,gas,gassupply1,newcapa,2050 -A1,1.73530000000,R2,2020,R2,gas,gassupply1,newcapa,2050 -A1,11.85120000000,R2,2025,R2,gas,gassupply1,newcapa,2050 -A1,11.32320000000,R2,2030,R2,gas,gassupply1,newcapa,2050 -A1,9.34160000000,R2,2035,R2,gas,gassupply1,newcapa,2050 -A1,3.00090000000,R2,2045,R2,gas,gassupply1,newcapa,2050 +A1,1.46440000000,R1,2020,R1,gas,gassupply1,newcapa,2050 +A1,10.19560000000,R1,2025,R1,gas,gassupply1,newcapa,2050 +A1,11.36670000000,R1,2030,R1,gas,gassupply1,newcapa,2050 +A1,9.02220000000,R1,2035,R1,gas,gassupply1,newcapa,2050 +A1,3.22220000000,R1,2045,R1,gas,gassupply1,newcapa,2050 +A1,1.46440000000,R2,2020,R2,gas,gassupply1,newcapa,2050 +A1,10.19560000000,R2,2025,R2,gas,gassupply1,newcapa,2050 +A1,11.36670000000,R2,2030,R2,gas,gassupply1,newcapa,2050 +A1,9.02220000000,R2,2035,R2,gas,gassupply1,newcapa,2050 +A1,3.22220000000,R2,2045,R2,gas,gassupply1,newcapa,2050 diff --git a/docs/tutorial-code/add-region/1-new-region/Results/MCAPrices.csv b/docs/tutorial-code/add-region/1-new-region/Results/MCAPrices.csv index 2af48ed09..3ad18a847 100644 --- a/docs/tutorial-code/add-region/1-new-region/Results/MCAPrices.csv +++ b/docs/tutorial-code/add-region/1-new-region/Results/MCAPrices.csv @@ -95,243 +95,243 @@ heat,all-week,evening,all-year,4.91850000000,R1,5,MUS$2010/PJ,2025 heat,all-week,evening,all-year,4.91850000000,R2,5,MUS$2010/PJ,2025 CO2f,all-week,evening,all-year,0.12010000000,R1,5,MUS$2010/kt,2025 CO2f,all-week,evening,all-year,0.12010000000,R2,5,MUS$2010/kt,2025 -electricity,all-week,night,all-year,12.87080000000,R1,0,MUS$2010/PJ,2030 -electricity,all-week,night,all-year,12.87080000000,R2,0,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,12.60020000000,R1,0,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,12.60020000000,R2,0,MUS$2010/PJ,2030 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2030 gas,all-week,night,all-year,0.47220000000,R2,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,6.23010000000,R1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,6.23010000000,R2,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,6.13860000000,R1,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,6.13860000000,R2,0,MUS$2010/PJ,2030 CO2f,all-week,night,all-year,0.15700000000,R1,0,MUS$2010/kt,2030 CO2f,all-week,night,all-year,0.15700000000,R2,0,MUS$2010/kt,2030 -electricity,all-week,morning,all-year,12.87080000000,R1,1,MUS$2010/PJ,2030 -electricity,all-week,morning,all-year,12.87080000000,R2,1,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,12.60020000000,R1,1,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,12.60020000000,R2,1,MUS$2010/PJ,2030 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2030 gas,all-week,morning,all-year,0.47220000000,R2,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,6.23010000000,R1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,6.23010000000,R2,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,6.13860000000,R1,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,6.13860000000,R2,1,MUS$2010/PJ,2030 CO2f,all-week,morning,all-year,0.15700000000,R1,1,MUS$2010/kt,2030 CO2f,all-week,morning,all-year,0.15700000000,R2,1,MUS$2010/kt,2030 -electricity,all-week,afternoon,all-year,12.87080000000,R1,2,MUS$2010/PJ,2030 -electricity,all-week,afternoon,all-year,12.87080000000,R2,2,MUS$2010/PJ,2030 +electricity,all-week,afternoon,all-year,12.60020000000,R1,2,MUS$2010/PJ,2030 +electricity,all-week,afternoon,all-year,12.60020000000,R2,2,MUS$2010/PJ,2030 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2030 gas,all-week,afternoon,all-year,0.47220000000,R2,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,6.23010000000,R1,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,6.23010000000,R2,2,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,6.13860000000,R1,2,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,6.13860000000,R2,2,MUS$2010/PJ,2030 CO2f,all-week,afternoon,all-year,0.15700000000,R1,2,MUS$2010/kt,2030 CO2f,all-week,afternoon,all-year,0.15700000000,R2,2,MUS$2010/kt,2030 -electricity,all-week,early-peak,all-year,12.87080000000,R1,3,MUS$2010/PJ,2030 -electricity,all-week,early-peak,all-year,12.87080000000,R2,3,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,12.60020000000,R1,3,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,12.60020000000,R2,3,MUS$2010/PJ,2030 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2030 gas,all-week,early-peak,all-year,0.47220000000,R2,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,6.23010000000,R1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,6.23010000000,R2,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,6.13860000000,R1,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,6.13860000000,R2,3,MUS$2010/PJ,2030 CO2f,all-week,early-peak,all-year,0.15700000000,R1,3,MUS$2010/kt,2030 CO2f,all-week,early-peak,all-year,0.15700000000,R2,3,MUS$2010/kt,2030 -electricity,all-week,late-peak,all-year,12.87080000000,R1,4,MUS$2010/PJ,2030 -electricity,all-week,late-peak,all-year,12.87080000000,R2,4,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,12.60020000000,R1,4,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,12.60020000000,R2,4,MUS$2010/PJ,2030 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2030 gas,all-week,late-peak,all-year,0.47220000000,R2,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,6.23010000000,R1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,6.23010000000,R2,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,6.13860000000,R1,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,6.13860000000,R2,4,MUS$2010/PJ,2030 CO2f,all-week,late-peak,all-year,0.15700000000,R1,4,MUS$2010/kt,2030 CO2f,all-week,late-peak,all-year,0.15700000000,R2,4,MUS$2010/kt,2030 -electricity,all-week,evening,all-year,12.87080000000,R1,5,MUS$2010/PJ,2030 -electricity,all-week,evening,all-year,12.87080000000,R2,5,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,12.60020000000,R1,5,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,12.60020000000,R2,5,MUS$2010/PJ,2030 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2030 gas,all-week,evening,all-year,0.47220000000,R2,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,6.23010000000,R1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,6.23010000000,R2,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,6.13860000000,R1,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,6.13860000000,R2,5,MUS$2010/PJ,2030 CO2f,all-week,evening,all-year,0.15700000000,R1,5,MUS$2010/kt,2030 CO2f,all-week,evening,all-year,0.15700000000,R2,5,MUS$2010/kt,2030 -electricity,all-week,night,all-year,15.48430000000,R1,0,MUS$2010/PJ,2035 -electricity,all-week,night,all-year,15.48430000000,R2,0,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,14.05870000000,R1,0,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,14.05870000000,R2,0,MUS$2010/PJ,2035 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2035 gas,all-week,night,all-year,0.47220000000,R2,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,8.15000000000,R1,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,8.15000000000,R2,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,7.70020000000,R1,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,7.70020000000,R2,0,MUS$2010/PJ,2035 CO2f,all-week,night,all-year,0.21490000000,R1,0,MUS$2010/kt,2035 CO2f,all-week,night,all-year,0.21490000000,R2,0,MUS$2010/kt,2035 -electricity,all-week,morning,all-year,15.48430000000,R1,1,MUS$2010/PJ,2035 -electricity,all-week,morning,all-year,15.48430000000,R2,1,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,14.05870000000,R1,1,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,14.05870000000,R2,1,MUS$2010/PJ,2035 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2035 gas,all-week,morning,all-year,0.47220000000,R2,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,8.15000000000,R1,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,8.15000000000,R2,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,7.70020000000,R1,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,7.70020000000,R2,1,MUS$2010/PJ,2035 CO2f,all-week,morning,all-year,0.21490000000,R1,1,MUS$2010/kt,2035 CO2f,all-week,morning,all-year,0.21490000000,R2,1,MUS$2010/kt,2035 -electricity,all-week,afternoon,all-year,15.48430000000,R1,2,MUS$2010/PJ,2035 -electricity,all-week,afternoon,all-year,15.48430000000,R2,2,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,14.05870000000,R1,2,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,14.05870000000,R2,2,MUS$2010/PJ,2035 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2035 gas,all-week,afternoon,all-year,0.47220000000,R2,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,8.15000000000,R1,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,8.15000000000,R2,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,7.70020000000,R1,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,7.70020000000,R2,2,MUS$2010/PJ,2035 CO2f,all-week,afternoon,all-year,0.21490000000,R1,2,MUS$2010/kt,2035 CO2f,all-week,afternoon,all-year,0.21490000000,R2,2,MUS$2010/kt,2035 -electricity,all-week,early-peak,all-year,15.48430000000,R1,3,MUS$2010/PJ,2035 -electricity,all-week,early-peak,all-year,15.48430000000,R2,3,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,14.05870000000,R1,3,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,14.05870000000,R2,3,MUS$2010/PJ,2035 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2035 gas,all-week,early-peak,all-year,0.47220000000,R2,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,8.15000000000,R1,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,8.15000000000,R2,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,7.70020000000,R1,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,7.70020000000,R2,3,MUS$2010/PJ,2035 CO2f,all-week,early-peak,all-year,0.21490000000,R1,3,MUS$2010/kt,2035 CO2f,all-week,early-peak,all-year,0.21490000000,R2,3,MUS$2010/kt,2035 -electricity,all-week,late-peak,all-year,15.48430000000,R1,4,MUS$2010/PJ,2035 -electricity,all-week,late-peak,all-year,15.48430000000,R2,4,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,14.05870000000,R1,4,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,14.05870000000,R2,4,MUS$2010/PJ,2035 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2035 gas,all-week,late-peak,all-year,0.47220000000,R2,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,8.15000000000,R1,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,8.15000000000,R2,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,7.70020000000,R1,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,7.70020000000,R2,4,MUS$2010/PJ,2035 CO2f,all-week,late-peak,all-year,0.21490000000,R1,4,MUS$2010/kt,2035 CO2f,all-week,late-peak,all-year,0.21490000000,R2,4,MUS$2010/kt,2035 -electricity,all-week,evening,all-year,15.48430000000,R1,5,MUS$2010/PJ,2035 -electricity,all-week,evening,all-year,15.48430000000,R2,5,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,14.05870000000,R1,5,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,14.05870000000,R2,5,MUS$2010/PJ,2035 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2035 gas,all-week,evening,all-year,0.47220000000,R2,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,8.15000000000,R1,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,8.15000000000,R2,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,7.70020000000,R1,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,7.70020000000,R2,5,MUS$2010/PJ,2035 CO2f,all-week,evening,all-year,0.21490000000,R1,5,MUS$2010/kt,2035 CO2f,all-week,evening,all-year,0.21490000000,R2,5,MUS$2010/kt,2035 -electricity,all-week,night,all-year,18.12250000000,R1,0,MUS$2010/PJ,2040 -electricity,all-week,night,all-year,18.12250000000,R2,0,MUS$2010/PJ,2040 +electricity,all-week,night,all-year,16.41600000000,R1,0,MUS$2010/PJ,2040 +electricity,all-week,night,all-year,16.41600000000,R2,0,MUS$2010/PJ,2040 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2040 gas,all-week,night,all-year,0.47220000000,R2,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,10.32110000000,R1,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,10.32110000000,R2,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,9.81720000000,R1,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,9.81720000000,R2,0,MUS$2010/PJ,2040 CO2f,all-week,night,all-year,0.27280000000,R1,0,MUS$2010/kt,2040 CO2f,all-week,night,all-year,0.27280000000,R2,0,MUS$2010/kt,2040 -electricity,all-week,morning,all-year,18.12250000000,R1,1,MUS$2010/PJ,2040 -electricity,all-week,morning,all-year,18.12250000000,R2,1,MUS$2010/PJ,2040 +electricity,all-week,morning,all-year,16.41600000000,R1,1,MUS$2010/PJ,2040 +electricity,all-week,morning,all-year,16.41600000000,R2,1,MUS$2010/PJ,2040 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2040 gas,all-week,morning,all-year,0.47220000000,R2,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,10.32110000000,R1,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,10.32110000000,R2,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,9.81720000000,R1,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,9.81720000000,R2,1,MUS$2010/PJ,2040 CO2f,all-week,morning,all-year,0.27280000000,R1,1,MUS$2010/kt,2040 CO2f,all-week,morning,all-year,0.27280000000,R2,1,MUS$2010/kt,2040 -electricity,all-week,afternoon,all-year,18.12250000000,R1,2,MUS$2010/PJ,2040 -electricity,all-week,afternoon,all-year,18.12250000000,R2,2,MUS$2010/PJ,2040 +electricity,all-week,afternoon,all-year,16.41600000000,R1,2,MUS$2010/PJ,2040 +electricity,all-week,afternoon,all-year,16.41600000000,R2,2,MUS$2010/PJ,2040 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2040 gas,all-week,afternoon,all-year,0.47220000000,R2,2,MUS$2010/PJ,2040 -heat,all-week,afternoon,all-year,10.32110000000,R1,2,MUS$2010/PJ,2040 -heat,all-week,afternoon,all-year,10.32110000000,R2,2,MUS$2010/PJ,2040 +heat,all-week,afternoon,all-year,9.81720000000,R1,2,MUS$2010/PJ,2040 +heat,all-week,afternoon,all-year,9.81720000000,R2,2,MUS$2010/PJ,2040 CO2f,all-week,afternoon,all-year,0.27280000000,R1,2,MUS$2010/kt,2040 CO2f,all-week,afternoon,all-year,0.27280000000,R2,2,MUS$2010/kt,2040 -electricity,all-week,early-peak,all-year,18.12250000000,R1,3,MUS$2010/PJ,2040 -electricity,all-week,early-peak,all-year,18.12250000000,R2,3,MUS$2010/PJ,2040 +electricity,all-week,early-peak,all-year,16.41600000000,R1,3,MUS$2010/PJ,2040 +electricity,all-week,early-peak,all-year,16.41600000000,R2,3,MUS$2010/PJ,2040 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2040 gas,all-week,early-peak,all-year,0.47220000000,R2,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,10.32110000000,R1,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,10.32110000000,R2,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,9.81720000000,R1,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,9.81720000000,R2,3,MUS$2010/PJ,2040 CO2f,all-week,early-peak,all-year,0.27280000000,R1,3,MUS$2010/kt,2040 CO2f,all-week,early-peak,all-year,0.27280000000,R2,3,MUS$2010/kt,2040 -electricity,all-week,late-peak,all-year,18.12250000000,R1,4,MUS$2010/PJ,2040 -electricity,all-week,late-peak,all-year,18.12250000000,R2,4,MUS$2010/PJ,2040 +electricity,all-week,late-peak,all-year,16.41600000000,R1,4,MUS$2010/PJ,2040 +electricity,all-week,late-peak,all-year,16.41600000000,R2,4,MUS$2010/PJ,2040 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2040 gas,all-week,late-peak,all-year,0.47220000000,R2,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,10.32110000000,R1,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,10.32110000000,R2,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,9.81720000000,R1,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,9.81720000000,R2,4,MUS$2010/PJ,2040 CO2f,all-week,late-peak,all-year,0.27280000000,R1,4,MUS$2010/kt,2040 CO2f,all-week,late-peak,all-year,0.27280000000,R2,4,MUS$2010/kt,2040 -electricity,all-week,evening,all-year,18.12250000000,R1,5,MUS$2010/PJ,2040 -electricity,all-week,evening,all-year,18.12250000000,R2,5,MUS$2010/PJ,2040 +electricity,all-week,evening,all-year,16.41600000000,R1,5,MUS$2010/PJ,2040 +electricity,all-week,evening,all-year,16.41600000000,R2,5,MUS$2010/PJ,2040 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2040 gas,all-week,evening,all-year,0.47220000000,R2,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,10.32110000000,R1,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,10.32110000000,R2,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,9.81720000000,R1,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,9.81720000000,R2,5,MUS$2010/PJ,2040 CO2f,all-week,evening,all-year,0.27280000000,R1,5,MUS$2010/kt,2040 CO2f,all-week,evening,all-year,0.27280000000,R2,5,MUS$2010/kt,2040 -electricity,all-week,night,all-year,21.17060000000,R1,0,MUS$2010/PJ,2045 -electricity,all-week,night,all-year,21.17060000000,R2,0,MUS$2010/PJ,2045 +electricity,all-week,night,all-year,18.62110000000,R1,0,MUS$2010/PJ,2045 +electricity,all-week,night,all-year,18.62110000000,R2,0,MUS$2010/PJ,2045 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2045 gas,all-week,night,all-year,0.47220000000,R2,0,MUS$2010/PJ,2045 -heat,all-week,night,all-year,13.03890000000,R1,0,MUS$2010/PJ,2045 -heat,all-week,night,all-year,13.03890000000,R2,0,MUS$2010/PJ,2045 +heat,all-week,night,all-year,12.31650000000,R1,0,MUS$2010/PJ,2045 +heat,all-week,night,all-year,12.31650000000,R2,0,MUS$2010/PJ,2045 CO2f,all-week,night,all-year,0.35390000000,R1,0,MUS$2010/kt,2045 CO2f,all-week,night,all-year,0.35390000000,R2,0,MUS$2010/kt,2045 -electricity,all-week,morning,all-year,21.17060000000,R1,1,MUS$2010/PJ,2045 -electricity,all-week,morning,all-year,21.17060000000,R2,1,MUS$2010/PJ,2045 +electricity,all-week,morning,all-year,18.62110000000,R1,1,MUS$2010/PJ,2045 +electricity,all-week,morning,all-year,18.62110000000,R2,1,MUS$2010/PJ,2045 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2045 gas,all-week,morning,all-year,0.47220000000,R2,1,MUS$2010/PJ,2045 -heat,all-week,morning,all-year,13.03890000000,R1,1,MUS$2010/PJ,2045 -heat,all-week,morning,all-year,13.03890000000,R2,1,MUS$2010/PJ,2045 +heat,all-week,morning,all-year,12.31650000000,R1,1,MUS$2010/PJ,2045 +heat,all-week,morning,all-year,12.31650000000,R2,1,MUS$2010/PJ,2045 CO2f,all-week,morning,all-year,0.35390000000,R1,1,MUS$2010/kt,2045 CO2f,all-week,morning,all-year,0.35390000000,R2,1,MUS$2010/kt,2045 -electricity,all-week,afternoon,all-year,21.17060000000,R1,2,MUS$2010/PJ,2045 -electricity,all-week,afternoon,all-year,21.17060000000,R2,2,MUS$2010/PJ,2045 +electricity,all-week,afternoon,all-year,18.62110000000,R1,2,MUS$2010/PJ,2045 +electricity,all-week,afternoon,all-year,18.62110000000,R2,2,MUS$2010/PJ,2045 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2045 gas,all-week,afternoon,all-year,0.47220000000,R2,2,MUS$2010/PJ,2045 -heat,all-week,afternoon,all-year,13.03890000000,R1,2,MUS$2010/PJ,2045 -heat,all-week,afternoon,all-year,13.03890000000,R2,2,MUS$2010/PJ,2045 +heat,all-week,afternoon,all-year,12.31650000000,R1,2,MUS$2010/PJ,2045 +heat,all-week,afternoon,all-year,12.31650000000,R2,2,MUS$2010/PJ,2045 CO2f,all-week,afternoon,all-year,0.35390000000,R1,2,MUS$2010/kt,2045 CO2f,all-week,afternoon,all-year,0.35390000000,R2,2,MUS$2010/kt,2045 -electricity,all-week,early-peak,all-year,21.17060000000,R1,3,MUS$2010/PJ,2045 -electricity,all-week,early-peak,all-year,21.17060000000,R2,3,MUS$2010/PJ,2045 +electricity,all-week,early-peak,all-year,18.62110000000,R1,3,MUS$2010/PJ,2045 +electricity,all-week,early-peak,all-year,18.62110000000,R2,3,MUS$2010/PJ,2045 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2045 gas,all-week,early-peak,all-year,0.47220000000,R2,3,MUS$2010/PJ,2045 -heat,all-week,early-peak,all-year,13.03890000000,R1,3,MUS$2010/PJ,2045 -heat,all-week,early-peak,all-year,13.03890000000,R2,3,MUS$2010/PJ,2045 +heat,all-week,early-peak,all-year,12.31650000000,R1,3,MUS$2010/PJ,2045 +heat,all-week,early-peak,all-year,12.31650000000,R2,3,MUS$2010/PJ,2045 CO2f,all-week,early-peak,all-year,0.35390000000,R1,3,MUS$2010/kt,2045 CO2f,all-week,early-peak,all-year,0.35390000000,R2,3,MUS$2010/kt,2045 -electricity,all-week,late-peak,all-year,21.17060000000,R1,4,MUS$2010/PJ,2045 -electricity,all-week,late-peak,all-year,21.17060000000,R2,4,MUS$2010/PJ,2045 +electricity,all-week,late-peak,all-year,18.62110000000,R1,4,MUS$2010/PJ,2045 +electricity,all-week,late-peak,all-year,18.62110000000,R2,4,MUS$2010/PJ,2045 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2045 gas,all-week,late-peak,all-year,0.47220000000,R2,4,MUS$2010/PJ,2045 -heat,all-week,late-peak,all-year,13.03890000000,R1,4,MUS$2010/PJ,2045 -heat,all-week,late-peak,all-year,13.03890000000,R2,4,MUS$2010/PJ,2045 +heat,all-week,late-peak,all-year,12.31650000000,R1,4,MUS$2010/PJ,2045 +heat,all-week,late-peak,all-year,12.31650000000,R2,4,MUS$2010/PJ,2045 CO2f,all-week,late-peak,all-year,0.35390000000,R1,4,MUS$2010/kt,2045 CO2f,all-week,late-peak,all-year,0.35390000000,R2,4,MUS$2010/kt,2045 -electricity,all-week,evening,all-year,21.17060000000,R1,5,MUS$2010/PJ,2045 -electricity,all-week,evening,all-year,21.17060000000,R2,5,MUS$2010/PJ,2045 +electricity,all-week,evening,all-year,18.62110000000,R1,5,MUS$2010/PJ,2045 +electricity,all-week,evening,all-year,18.62110000000,R2,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,0.47220000000,R2,5,MUS$2010/PJ,2045 -heat,all-week,evening,all-year,13.03890000000,R1,5,MUS$2010/PJ,2045 -heat,all-week,evening,all-year,13.03890000000,R2,5,MUS$2010/PJ,2045 +heat,all-week,evening,all-year,12.31650000000,R1,5,MUS$2010/PJ,2045 +heat,all-week,evening,all-year,12.31650000000,R2,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045 CO2f,all-week,evening,all-year,0.35390000000,R2,5,MUS$2010/kt,2045 -electricity,all-week,night,all-year,23.71420000000,R1,0,MUS$2010/PJ,2050 -electricity,all-week,night,all-year,23.71420000000,R2,0,MUS$2010/PJ,2050 +electricity,all-week,night,all-year,20.86720000000,R1,0,MUS$2010/PJ,2050 +electricity,all-week,night,all-year,20.86720000000,R2,0,MUS$2010/PJ,2050 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2050 gas,all-week,night,all-year,0.47220000000,R2,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,15.73360000000,R1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,15.73360000000,R2,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,14.95340000000,R1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,14.95340000000,R2,0,MUS$2010/PJ,2050 CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050 CO2f,all-week,night,all-year,0.43510000000,R2,0,MUS$2010/kt,2050 -electricity,all-week,morning,all-year,23.71420000000,R1,1,MUS$2010/PJ,2050 -electricity,all-week,morning,all-year,23.71420000000,R2,1,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,20.86720000000,R1,1,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,20.86720000000,R2,1,MUS$2010/PJ,2050 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2050 gas,all-week,morning,all-year,0.47220000000,R2,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,15.73360000000,R1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,15.73360000000,R2,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,14.95340000000,R1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,14.95340000000,R2,1,MUS$2010/PJ,2050 CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050 CO2f,all-week,morning,all-year,0.43510000000,R2,1,MUS$2010/kt,2050 -electricity,all-week,afternoon,all-year,23.71420000000,R1,2,MUS$2010/PJ,2050 -electricity,all-week,afternoon,all-year,23.71420000000,R2,2,MUS$2010/PJ,2050 +electricity,all-week,afternoon,all-year,20.86720000000,R1,2,MUS$2010/PJ,2050 +electricity,all-week,afternoon,all-year,20.86720000000,R2,2,MUS$2010/PJ,2050 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2050 gas,all-week,afternoon,all-year,0.47220000000,R2,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,15.73360000000,R1,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,15.73360000000,R2,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,14.95340000000,R1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,14.95340000000,R2,2,MUS$2010/PJ,2050 CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050 CO2f,all-week,afternoon,all-year,0.43510000000,R2,2,MUS$2010/kt,2050 -electricity,all-week,early-peak,all-year,23.71420000000,R1,3,MUS$2010/PJ,2050 -electricity,all-week,early-peak,all-year,23.71420000000,R2,3,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,20.86720000000,R1,3,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,20.86720000000,R2,3,MUS$2010/PJ,2050 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2050 gas,all-week,early-peak,all-year,0.47220000000,R2,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,15.73360000000,R1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,15.73360000000,R2,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,14.95340000000,R1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,14.95340000000,R2,3,MUS$2010/PJ,2050 CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050 CO2f,all-week,early-peak,all-year,0.43510000000,R2,3,MUS$2010/kt,2050 -electricity,all-week,late-peak,all-year,23.71420000000,R1,4,MUS$2010/PJ,2050 -electricity,all-week,late-peak,all-year,23.71420000000,R2,4,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,20.86720000000,R1,4,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,20.86720000000,R2,4,MUS$2010/PJ,2050 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2050 gas,all-week,late-peak,all-year,0.47220000000,R2,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,15.73360000000,R1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,15.73360000000,R2,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,14.95340000000,R1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,14.95340000000,R2,4,MUS$2010/PJ,2050 CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050 CO2f,all-week,late-peak,all-year,0.43510000000,R2,4,MUS$2010/kt,2050 -electricity,all-week,evening,all-year,23.71420000000,R1,5,MUS$2010/PJ,2050 -electricity,all-week,evening,all-year,23.71420000000,R2,5,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,20.86720000000,R1,5,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,20.86720000000,R2,5,MUS$2010/PJ,2050 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2050 gas,all-week,evening,all-year,0.47220000000,R2,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,15.73360000000,R1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,15.73360000000,R2,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,14.95340000000,R1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,14.95340000000,R2,5,MUS$2010/PJ,2050 CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050 CO2f,all-week,evening,all-year,0.43510000000,R2,5,MUS$2010/kt,2050 diff --git a/docs/tutorial-code/add-service-demand/1-exogenous-demand/Results/MCACapacity.csv b/docs/tutorial-code/add-service-demand/1-exogenous-demand/Results/MCACapacity.csv index b80fab80a..9720e4033 100644 --- a/docs/tutorial-code/add-service-demand/1-exogenous-demand/Results/MCACapacity.csv +++ b/docs/tutorial-code/add-service-demand/1-exogenous-demand/Results/MCACapacity.csv @@ -9,65 +9,62 @@ A1,5.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2025 A1,19.00000000000,R1,2020,R1,residential,heatpump,newcapa,2025 A1,6.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2025 A1,24.00000000000,R1,2020,R1,power,windturbine,newcapa,2025 -A1,23.04250000000,R1,2020,R1,gas,gassupply1,newcapa,2025 +A1,22.90890000000,R1,2020,R1,gas,gassupply1,newcapa,2025 A1,19.00000000000,R1,2020,R1,residential,electric_stove,newcapa,2030 A1,10.00000000000,R1,2025,R1,residential,electric_stove,newcapa,2030 A1,19.00000000000,R1,2020,R1,residential,heatpump,newcapa,2030 A1,10.00000000000,R1,2025,R1,residential,heatpump,newcapa,2030 A1,5.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2030 -A1,11.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2030 +A1,10.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2030 A1,24.00000000000,R1,2020,R1,power,windturbine,newcapa,2030 -A1,15.54250000000,R1,2020,R1,gas,gassupply1,newcapa,2030 -A1,11.17750000000,R1,2025,R1,gas,gassupply1,newcapa,2030 +A1,15.40890000000,R1,2020,R1,gas,gassupply1,newcapa,2030 +A1,9.64110000000,R1,2025,R1,gas,gassupply1,newcapa,2030 A1,10.00000000000,R1,2025,R1,residential,electric_stove,newcapa,2035 A1,26.00000000000,R1,2030,R1,residential,electric_stove,newcapa,2035 A1,10.00000000000,R1,2025,R1,residential,heatpump,newcapa,2035 A1,26.00000000000,R1,2030,R1,residential,heatpump,newcapa,2035 A1,5.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2035 -A1,11.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2035 +A1,10.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2035 A1,24.00000000000,R1,2020,R1,power,windturbine,newcapa,2035 -A1,12.00000000000,R1,2030,R1,power,windturbine,newcapa,2035 -A1,8.04250000000,R1,2020,R1,gas,gassupply1,newcapa,2035 -A1,11.17750000000,R1,2025,R1,gas,gassupply1,newcapa,2035 +A1,14.00000000000,R1,2030,R1,power,windturbine,newcapa,2035 +A1,7.90890000000,R1,2020,R1,gas,gassupply1,newcapa,2035 +A1,9.64110000000,R1,2025,R1,gas,gassupply1,newcapa,2035 A1,7.50000000000,R1,2030,R1,gas,gassupply1,newcapa,2035 A1,26.00000000000,R1,2030,R1,residential,electric_stove,newcapa,2040 A1,16.00000000000,R1,2035,R1,residential,electric_stove,newcapa,2040 A1,26.00000000000,R1,2030,R1,residential,heatpump,newcapa,2040 A1,16.00000000000,R1,2035,R1,residential,heatpump,newcapa,2040 A1,5.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2040 -A1,11.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2040 +A1,10.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2040 A1,24.00000000000,R1,2020,R1,power,windturbine,newcapa,2040 -A1,12.00000000000,R1,2030,R1,power,windturbine,newcapa,2040 -A1,11.00000000000,R1,2035,R1,power,windturbine,newcapa,2040 -A1,8.04250000000,R1,2020,R1,gas,gassupply1,newcapa,2040 -A1,11.17750000000,R1,2025,R1,gas,gassupply1,newcapa,2040 +A1,14.00000000000,R1,2030,R1,power,windturbine,newcapa,2040 +A1,12.00000000000,R1,2035,R1,power,windturbine,newcapa,2040 +A1,7.90890000000,R1,2020,R1,gas,gassupply1,newcapa,2040 +A1,9.64110000000,R1,2025,R1,gas,gassupply1,newcapa,2040 A1,7.50000000000,R1,2030,R1,gas,gassupply1,newcapa,2040 -A1,0.64390000000,R1,2035,R1,gas,gassupply1,newcapa,2040 A1,16.00000000000,R1,2035,R1,residential,electric_stove,newcapa,2045 A1,32.00000000000,R1,2040,R1,residential,electric_stove,newcapa,2045 A1,16.00000000000,R1,2035,R1,residential,heatpump,newcapa,2045 A1,32.00000000000,R1,2040,R1,residential,heatpump,newcapa,2045 A1,5.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2045 -A1,11.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2045 +A1,10.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2045 A1,24.00000000000,R1,2020,R1,power,windturbine,newcapa,2045 -A1,12.00000000000,R1,2030,R1,power,windturbine,newcapa,2045 -A1,11.00000000000,R1,2035,R1,power,windturbine,newcapa,2045 -A1,13.00000000000,R1,2040,R1,power,windturbine,newcapa,2045 -A1,8.04250000000,R1,2020,R1,gas,gassupply1,newcapa,2045 -A1,11.17750000000,R1,2025,R1,gas,gassupply1,newcapa,2045 +A1,14.00000000000,R1,2030,R1,power,windturbine,newcapa,2045 +A1,12.00000000000,R1,2035,R1,power,windturbine,newcapa,2045 +A1,12.00000000000,R1,2040,R1,power,windturbine,newcapa,2045 +A1,7.90890000000,R1,2020,R1,gas,gassupply1,newcapa,2045 +A1,9.64110000000,R1,2025,R1,gas,gassupply1,newcapa,2045 A1,7.50000000000,R1,2030,R1,gas,gassupply1,newcapa,2045 -A1,0.64390000000,R1,2035,R1,gas,gassupply1,newcapa,2045 A1,32.00000000000,R1,2040,R1,residential,electric_stove,newcapa,2050 A1,22.00000000000,R1,2045,R1,residential,electric_stove,newcapa,2050 A1,32.00000000000,R1,2040,R1,residential,heatpump,newcapa,2050 A1,22.00000000000,R1,2045,R1,residential,heatpump,newcapa,2050 A1,5.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2050 -A1,11.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2050 -A1,12.00000000000,R1,2030,R1,power,windturbine,newcapa,2050 -A1,11.00000000000,R1,2035,R1,power,windturbine,newcapa,2050 -A1,13.00000000000,R1,2040,R1,power,windturbine,newcapa,2050 -A1,35.00000000000,R1,2045,R1,power,windturbine,newcapa,2050 -A1,8.04250000000,R1,2020,R1,gas,gassupply1,newcapa,2050 -A1,11.17750000000,R1,2025,R1,gas,gassupply1,newcapa,2050 +A1,10.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2050 +A1,14.00000000000,R1,2030,R1,power,windturbine,newcapa,2050 +A1,12.00000000000,R1,2035,R1,power,windturbine,newcapa,2050 +A1,12.00000000000,R1,2040,R1,power,windturbine,newcapa,2050 +A1,36.00000000000,R1,2045,R1,power,windturbine,newcapa,2050 +A1,7.90890000000,R1,2020,R1,gas,gassupply1,newcapa,2050 +A1,9.64110000000,R1,2025,R1,gas,gassupply1,newcapa,2050 A1,7.50000000000,R1,2030,R1,gas,gassupply1,newcapa,2050 -A1,0.64390000000,R1,2035,R1,gas,gassupply1,newcapa,2050 diff --git a/docs/tutorial-code/add-service-demand/1-exogenous-demand/Results/MCAPrices.csv b/docs/tutorial-code/add-service-demand/1-exogenous-demand/Results/MCAPrices.csv index 89307a3c4..3e8507dff 100644 --- a/docs/tutorial-code/add-service-demand/1-exogenous-demand/Results/MCAPrices.csv +++ b/docs/tutorial-code/add-service-demand/1-exogenous-demand/Results/MCAPrices.csv @@ -59,153 +59,153 @@ gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2025 heat,all-week,evening,all-year,3.67920000000,R1,5,MUS$2010/PJ,2025 CO2f,all-week,evening,all-year,0.12010000000,R1,5,MUS$2010/kt,2025 cook,all-week,evening,all-year,3.31120000000,R1,5,MUS$2010/PJ,2025 -electricity,all-week,night,all-year,10.04900000000,R1,0,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,9.83130000000,R1,0,MUS$2010/PJ,2030 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,4.26010000000,R1,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,4.17300000000,R1,0,MUS$2010/PJ,2030 CO2f,all-week,night,all-year,0.15700000000,R1,0,MUS$2010/kt,2030 -cook,all-week,night,all-year,4.26010000000,R1,0,MUS$2010/PJ,2030 -electricity,all-week,morning,all-year,10.04900000000,R1,1,MUS$2010/PJ,2030 +cook,all-week,night,all-year,4.17300000000,R1,0,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,9.83130000000,R1,1,MUS$2010/PJ,2030 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,4.26010000000,R1,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,4.17300000000,R1,1,MUS$2010/PJ,2030 CO2f,all-week,morning,all-year,0.15700000000,R1,1,MUS$2010/kt,2030 -cook,all-week,morning,all-year,4.26010000000,R1,1,MUS$2010/PJ,2030 -electricity,all-week,afternoon,all-year,10.04900000000,R1,2,MUS$2010/PJ,2030 +cook,all-week,morning,all-year,4.17300000000,R1,1,MUS$2010/PJ,2030 +electricity,all-week,afternoon,all-year,9.83130000000,R1,2,MUS$2010/PJ,2030 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,4.26010000000,R1,2,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,4.17300000000,R1,2,MUS$2010/PJ,2030 CO2f,all-week,afternoon,all-year,0.15700000000,R1,2,MUS$2010/kt,2030 -cook,all-week,afternoon,all-year,4.26010000000,R1,2,MUS$2010/PJ,2030 -electricity,all-week,early-peak,all-year,10.04900000000,R1,3,MUS$2010/PJ,2030 +cook,all-week,afternoon,all-year,4.17300000000,R1,2,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,9.83130000000,R1,3,MUS$2010/PJ,2030 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,4.26010000000,R1,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,4.17300000000,R1,3,MUS$2010/PJ,2030 CO2f,all-week,early-peak,all-year,0.15700000000,R1,3,MUS$2010/kt,2030 -cook,all-week,early-peak,all-year,4.26010000000,R1,3,MUS$2010/PJ,2030 -electricity,all-week,late-peak,all-year,10.04900000000,R1,4,MUS$2010/PJ,2030 +cook,all-week,early-peak,all-year,4.17300000000,R1,3,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,9.83130000000,R1,4,MUS$2010/PJ,2030 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,4.26010000000,R1,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,4.17300000000,R1,4,MUS$2010/PJ,2030 CO2f,all-week,late-peak,all-year,0.15700000000,R1,4,MUS$2010/kt,2030 -cook,all-week,late-peak,all-year,4.26010000000,R1,4,MUS$2010/PJ,2030 -electricity,all-week,evening,all-year,10.04900000000,R1,5,MUS$2010/PJ,2030 +cook,all-week,late-peak,all-year,4.17300000000,R1,4,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,9.83130000000,R1,5,MUS$2010/PJ,2030 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,4.26010000000,R1,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,4.17300000000,R1,5,MUS$2010/PJ,2030 CO2f,all-week,evening,all-year,0.15700000000,R1,5,MUS$2010/kt,2030 -cook,all-week,evening,all-year,4.26010000000,R1,5,MUS$2010/PJ,2030 -electricity,all-week,night,all-year,11.30490000000,R1,0,MUS$2010/PJ,2035 +cook,all-week,evening,all-year,4.17300000000,R1,5,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,10.73400000000,R1,0,MUS$2010/PJ,2035 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,4.76250000000,R1,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,4.53410000000,R1,0,MUS$2010/PJ,2035 CO2f,all-week,night,all-year,0.21490000000,R1,0,MUS$2010/kt,2035 -cook,all-week,night,all-year,4.76250000000,R1,0,MUS$2010/PJ,2035 -electricity,all-week,morning,all-year,11.30490000000,R1,1,MUS$2010/PJ,2035 +cook,all-week,night,all-year,4.53410000000,R1,0,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,10.73400000000,R1,1,MUS$2010/PJ,2035 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,4.76250000000,R1,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,4.53410000000,R1,1,MUS$2010/PJ,2035 CO2f,all-week,morning,all-year,0.21490000000,R1,1,MUS$2010/kt,2035 -cook,all-week,morning,all-year,4.76250000000,R1,1,MUS$2010/PJ,2035 -electricity,all-week,afternoon,all-year,11.30490000000,R1,2,MUS$2010/PJ,2035 +cook,all-week,morning,all-year,4.53410000000,R1,1,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,10.73400000000,R1,2,MUS$2010/PJ,2035 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,4.76250000000,R1,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,4.53410000000,R1,2,MUS$2010/PJ,2035 CO2f,all-week,afternoon,all-year,0.21490000000,R1,2,MUS$2010/kt,2035 -cook,all-week,afternoon,all-year,4.76250000000,R1,2,MUS$2010/PJ,2035 -electricity,all-week,early-peak,all-year,11.30490000000,R1,3,MUS$2010/PJ,2035 +cook,all-week,afternoon,all-year,4.53410000000,R1,2,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,10.73400000000,R1,3,MUS$2010/PJ,2035 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,4.76250000000,R1,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,4.53410000000,R1,3,MUS$2010/PJ,2035 CO2f,all-week,early-peak,all-year,0.21490000000,R1,3,MUS$2010/kt,2035 -cook,all-week,early-peak,all-year,4.76250000000,R1,3,MUS$2010/PJ,2035 -electricity,all-week,late-peak,all-year,11.30490000000,R1,4,MUS$2010/PJ,2035 +cook,all-week,early-peak,all-year,4.53410000000,R1,3,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,10.73400000000,R1,4,MUS$2010/PJ,2035 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,4.76250000000,R1,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,4.53410000000,R1,4,MUS$2010/PJ,2035 CO2f,all-week,late-peak,all-year,0.21490000000,R1,4,MUS$2010/kt,2035 -cook,all-week,late-peak,all-year,4.76250000000,R1,4,MUS$2010/PJ,2035 -electricity,all-week,evening,all-year,11.30490000000,R1,5,MUS$2010/PJ,2035 +cook,all-week,late-peak,all-year,4.53410000000,R1,4,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,10.73400000000,R1,5,MUS$2010/PJ,2035 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,4.76250000000,R1,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,4.53410000000,R1,5,MUS$2010/PJ,2035 CO2f,all-week,evening,all-year,0.21490000000,R1,5,MUS$2010/kt,2035 -cook,all-week,evening,all-year,4.76250000000,R1,5,MUS$2010/PJ,2035 -electricity,all-week,night,all-year,12.32880000000,R1,0,MUS$2010/PJ,2040 +cook,all-week,evening,all-year,4.53410000000,R1,5,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,11.57290000000,R1,0,MUS$2010/PJ,2040 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,5.17200000000,R1,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,4.86970000000,R1,0,MUS$2010/PJ,2040 CO2f,all-week,night,all-year,0.27280000000,R1,0,MUS$2010/kt,2040 -cook,all-week,night,all-year,5.17200000000,R1,0,MUS$2010/PJ,2040 -electricity,all-week,morning,all-year,12.32880000000,R1,1,MUS$2010/PJ,2040 +cook,all-week,night,all-year,4.86970000000,R1,0,MUS$2010/PJ,2040 +electricity,all-week,morning,all-year,11.57290000000,R1,1,MUS$2010/PJ,2040 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,5.17200000000,R1,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,4.86970000000,R1,1,MUS$2010/PJ,2040 CO2f,all-week,morning,all-year,0.27280000000,R1,1,MUS$2010/kt,2040 -cook,all-week,morning,all-year,5.17200000000,R1,1,MUS$2010/PJ,2040 -electricity,all-week,afternoon,all-year,12.32880000000,R1,2,MUS$2010/PJ,2040 +cook,all-week,morning,all-year,4.86970000000,R1,1,MUS$2010/PJ,2040 +electricity,all-week,afternoon,all-year,11.57290000000,R1,2,MUS$2010/PJ,2040 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2040 -heat,all-week,afternoon,all-year,5.17200000000,R1,2,MUS$2010/PJ,2040 +heat,all-week,afternoon,all-year,4.86970000000,R1,2,MUS$2010/PJ,2040 CO2f,all-week,afternoon,all-year,0.27280000000,R1,2,MUS$2010/kt,2040 -cook,all-week,afternoon,all-year,5.17200000000,R1,2,MUS$2010/PJ,2040 -electricity,all-week,early-peak,all-year,12.32880000000,R1,3,MUS$2010/PJ,2040 +cook,all-week,afternoon,all-year,4.86970000000,R1,2,MUS$2010/PJ,2040 +electricity,all-week,early-peak,all-year,11.57290000000,R1,3,MUS$2010/PJ,2040 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,5.17200000000,R1,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,4.86970000000,R1,3,MUS$2010/PJ,2040 CO2f,all-week,early-peak,all-year,0.27280000000,R1,3,MUS$2010/kt,2040 -cook,all-week,early-peak,all-year,5.17200000000,R1,3,MUS$2010/PJ,2040 -electricity,all-week,late-peak,all-year,12.32880000000,R1,4,MUS$2010/PJ,2040 +cook,all-week,early-peak,all-year,4.86970000000,R1,3,MUS$2010/PJ,2040 +electricity,all-week,late-peak,all-year,11.57290000000,R1,4,MUS$2010/PJ,2040 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,5.17200000000,R1,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,4.86970000000,R1,4,MUS$2010/PJ,2040 CO2f,all-week,late-peak,all-year,0.27280000000,R1,4,MUS$2010/kt,2040 -cook,all-week,late-peak,all-year,5.17200000000,R1,4,MUS$2010/PJ,2040 -electricity,all-week,evening,all-year,12.32880000000,R1,5,MUS$2010/PJ,2040 +cook,all-week,late-peak,all-year,4.86970000000,R1,4,MUS$2010/PJ,2040 +electricity,all-week,evening,all-year,11.57290000000,R1,5,MUS$2010/PJ,2040 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,5.17200000000,R1,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,4.86970000000,R1,5,MUS$2010/PJ,2040 CO2f,all-week,evening,all-year,0.27280000000,R1,5,MUS$2010/kt,2040 -cook,all-week,evening,all-year,5.17200000000,R1,5,MUS$2010/PJ,2040 -electricity,all-week,night,all-year,13.67600000000,R1,0,MUS$2010/PJ,2045 +cook,all-week,evening,all-year,4.86970000000,R1,5,MUS$2010/PJ,2040 +electricity,all-week,night,all-year,12.95480000000,R1,0,MUS$2010/PJ,2045 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2045 -heat,all-week,night,all-year,5.71090000000,R1,0,MUS$2010/PJ,2045 +heat,all-week,night,all-year,5.42240000000,R1,0,MUS$2010/PJ,2045 CO2f,all-week,night,all-year,0.35390000000,R1,0,MUS$2010/kt,2045 -cook,all-week,night,all-year,5.71090000000,R1,0,MUS$2010/PJ,2045 -electricity,all-week,morning,all-year,13.67600000000,R1,1,MUS$2010/PJ,2045 +cook,all-week,night,all-year,5.42240000000,R1,0,MUS$2010/PJ,2045 +electricity,all-week,morning,all-year,12.95480000000,R1,1,MUS$2010/PJ,2045 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2045 -heat,all-week,morning,all-year,5.71090000000,R1,1,MUS$2010/PJ,2045 +heat,all-week,morning,all-year,5.42240000000,R1,1,MUS$2010/PJ,2045 CO2f,all-week,morning,all-year,0.35390000000,R1,1,MUS$2010/kt,2045 -cook,all-week,morning,all-year,5.71090000000,R1,1,MUS$2010/PJ,2045 -electricity,all-week,afternoon,all-year,13.67600000000,R1,2,MUS$2010/PJ,2045 +cook,all-week,morning,all-year,5.42240000000,R1,1,MUS$2010/PJ,2045 +electricity,all-week,afternoon,all-year,12.95480000000,R1,2,MUS$2010/PJ,2045 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2045 -heat,all-week,afternoon,all-year,5.71090000000,R1,2,MUS$2010/PJ,2045 +heat,all-week,afternoon,all-year,5.42240000000,R1,2,MUS$2010/PJ,2045 CO2f,all-week,afternoon,all-year,0.35390000000,R1,2,MUS$2010/kt,2045 -cook,all-week,afternoon,all-year,5.71090000000,R1,2,MUS$2010/PJ,2045 -electricity,all-week,early-peak,all-year,13.67600000000,R1,3,MUS$2010/PJ,2045 +cook,all-week,afternoon,all-year,5.42240000000,R1,2,MUS$2010/PJ,2045 +electricity,all-week,early-peak,all-year,12.95480000000,R1,3,MUS$2010/PJ,2045 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2045 -heat,all-week,early-peak,all-year,5.71090000000,R1,3,MUS$2010/PJ,2045 +heat,all-week,early-peak,all-year,5.42240000000,R1,3,MUS$2010/PJ,2045 CO2f,all-week,early-peak,all-year,0.35390000000,R1,3,MUS$2010/kt,2045 -cook,all-week,early-peak,all-year,5.71090000000,R1,3,MUS$2010/PJ,2045 -electricity,all-week,late-peak,all-year,13.67600000000,R1,4,MUS$2010/PJ,2045 +cook,all-week,early-peak,all-year,5.42240000000,R1,3,MUS$2010/PJ,2045 +electricity,all-week,late-peak,all-year,12.95480000000,R1,4,MUS$2010/PJ,2045 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2045 -heat,all-week,late-peak,all-year,5.71090000000,R1,4,MUS$2010/PJ,2045 +heat,all-week,late-peak,all-year,5.42240000000,R1,4,MUS$2010/PJ,2045 CO2f,all-week,late-peak,all-year,0.35390000000,R1,4,MUS$2010/kt,2045 -cook,all-week,late-peak,all-year,5.71090000000,R1,4,MUS$2010/PJ,2045 -electricity,all-week,evening,all-year,13.67600000000,R1,5,MUS$2010/PJ,2045 +cook,all-week,late-peak,all-year,5.42240000000,R1,4,MUS$2010/PJ,2045 +electricity,all-week,evening,all-year,12.95480000000,R1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2045 -heat,all-week,evening,all-year,5.71090000000,R1,5,MUS$2010/PJ,2045 +heat,all-week,evening,all-year,5.42240000000,R1,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045 -cook,all-week,evening,all-year,5.71090000000,R1,5,MUS$2010/PJ,2045 -electricity,all-week,night,all-year,14.94550000000,R1,0,MUS$2010/PJ,2050 +cook,all-week,evening,all-year,5.42240000000,R1,5,MUS$2010/PJ,2045 +electricity,all-week,night,all-year,14.02900000000,R1,0,MUS$2010/PJ,2050 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,6.21870000000,R1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,5.85210000000,R1,0,MUS$2010/PJ,2050 CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050 -cook,all-week,night,all-year,6.21870000000,R1,0,MUS$2010/PJ,2050 -electricity,all-week,morning,all-year,14.94550000000,R1,1,MUS$2010/PJ,2050 +cook,all-week,night,all-year,5.85210000000,R1,0,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,14.02900000000,R1,1,MUS$2010/PJ,2050 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,6.21870000000,R1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,5.85210000000,R1,1,MUS$2010/PJ,2050 CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050 -cook,all-week,morning,all-year,6.21870000000,R1,1,MUS$2010/PJ,2050 -electricity,all-week,afternoon,all-year,14.94550000000,R1,2,MUS$2010/PJ,2050 +cook,all-week,morning,all-year,5.85210000000,R1,1,MUS$2010/PJ,2050 +electricity,all-week,afternoon,all-year,14.02900000000,R1,2,MUS$2010/PJ,2050 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,6.21870000000,R1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,5.85210000000,R1,2,MUS$2010/PJ,2050 CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050 -cook,all-week,afternoon,all-year,6.21870000000,R1,2,MUS$2010/PJ,2050 -electricity,all-week,early-peak,all-year,14.94550000000,R1,3,MUS$2010/PJ,2050 +cook,all-week,afternoon,all-year,5.85210000000,R1,2,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,14.02900000000,R1,3,MUS$2010/PJ,2050 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,6.21870000000,R1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,5.85210000000,R1,3,MUS$2010/PJ,2050 CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050 -cook,all-week,early-peak,all-year,6.21870000000,R1,3,MUS$2010/PJ,2050 -electricity,all-week,late-peak,all-year,14.94550000000,R1,4,MUS$2010/PJ,2050 +cook,all-week,early-peak,all-year,5.85210000000,R1,3,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,14.02900000000,R1,4,MUS$2010/PJ,2050 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,6.21870000000,R1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,5.85210000000,R1,4,MUS$2010/PJ,2050 CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050 -cook,all-week,late-peak,all-year,6.21870000000,R1,4,MUS$2010/PJ,2050 -electricity,all-week,evening,all-year,14.94550000000,R1,5,MUS$2010/PJ,2050 +cook,all-week,late-peak,all-year,5.85210000000,R1,4,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,14.02900000000,R1,5,MUS$2010/PJ,2050 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,6.21870000000,R1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,5.85210000000,R1,5,MUS$2010/PJ,2050 CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050 -cook,all-week,evening,all-year,6.21870000000,R1,5,MUS$2010/PJ,2050 +cook,all-week,evening,all-year,5.85210000000,R1,5,MUS$2010/PJ,2050 diff --git a/docs/tutorial-code/carbon-budget/1-carbon-budget/Results/MCACapacity.csv b/docs/tutorial-code/carbon-budget/1-carbon-budget/Results/MCACapacity.csv index e424745fc..d510ee1e9 100644 --- a/docs/tutorial-code/carbon-budget/1-carbon-budget/Results/MCACapacity.csv +++ b/docs/tutorial-code/carbon-budget/1-carbon-budget/Results/MCACapacity.csv @@ -9,14 +9,14 @@ A1,16.00000000000,R1,2020,R1,power,windturbine,newcapa,2025 A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2025 A1,19.00000000000,R1,2020,R1,residential,heatpump,newcapa,2030 A1,10.00000000000,R1,2025,R1,residential,heatpump,newcapa,2030 -A1,6.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2030 +A1,5.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2030 A1,16.00000000000,R1,2020,R1,power,windturbine,newcapa,2030 A1,7.50000000000,R1,2020,R1,gas,gassupply1,newcapa,2030 -A1,2.68980000000,R1,2025,R1,gas,gassupply1,newcapa,2030 +A1,0.85000000000,R1,2025,R1,gas,gassupply1,newcapa,2030 A1,10.00000000000,R1,2025,R1,residential,heatpump,newcapa,2035 A1,26.00000000000,R1,2030,R1,residential,heatpump,newcapa,2035 -A1,6.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2035 +A1,5.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2035 A1,16.00000000000,R1,2020,R1,power,windturbine,newcapa,2035 -A1,6.00000000000,R1,2030,R1,power,windturbine,newcapa,2035 -A1,2.68980000000,R1,2025,R1,gas,gassupply1,newcapa,2035 -A1,7.47130000000,R1,2030,R1,gas,gassupply1,newcapa,2035 +A1,8.00000000000,R1,2030,R1,power,windturbine,newcapa,2035 +A1,0.85000000000,R1,2025,R1,gas,gassupply1,newcapa,2035 +A1,7.50000000000,R1,2030,R1,gas,gassupply1,newcapa,2035 diff --git a/docs/tutorial-code/carbon-budget/1-carbon-budget/Results/MCAPrices.csv b/docs/tutorial-code/carbon-budget/1-carbon-budget/Results/MCAPrices.csv index e17f0f067..aba9340e5 100644 --- a/docs/tutorial-code/carbon-budget/1-carbon-budget/Results/MCAPrices.csv +++ b/docs/tutorial-code/carbon-budget/1-carbon-budget/Results/MCAPrices.csv @@ -47,51 +47,51 @@ electricity,all-week,evening,all-year,3.98810000000,R1,5,MUS$2010/PJ,2025 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2025 heat,all-week,evening,all-year,4.91770000000,R1,5,MUS$2010/PJ,2025 CO2f,all-week,evening,all-year,0.21000000000,R1,5,MUS$2010/kt,2025 -electricity,all-week,night,all-year,8.60540000000,R1,0,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,7.92640000000,R1,0,MUS$2010/PJ,2030 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,3.68270000000,R1,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,3.41110000000,R1,0,MUS$2010/PJ,2030 CO2f,all-week,night,all-year,0.17000000000,R1,0,MUS$2010/kt,2030 -electricity,all-week,morning,all-year,8.60540000000,R1,1,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,7.92640000000,R1,1,MUS$2010/PJ,2030 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,3.68270000000,R1,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,3.41110000000,R1,1,MUS$2010/PJ,2030 CO2f,all-week,morning,all-year,0.17000000000,R1,1,MUS$2010/kt,2030 -electricity,all-week,afternoon,all-year,8.60540000000,R1,2,MUS$2010/PJ,2030 +electricity,all-week,afternoon,all-year,7.92640000000,R1,2,MUS$2010/PJ,2030 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,3.68270000000,R1,2,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,3.41110000000,R1,2,MUS$2010/PJ,2030 CO2f,all-week,afternoon,all-year,0.17000000000,R1,2,MUS$2010/kt,2030 -electricity,all-week,early-peak,all-year,8.60540000000,R1,3,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,7.92640000000,R1,3,MUS$2010/PJ,2030 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,3.68270000000,R1,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,3.41110000000,R1,3,MUS$2010/PJ,2030 CO2f,all-week,early-peak,all-year,0.17000000000,R1,3,MUS$2010/kt,2030 -electricity,all-week,late-peak,all-year,8.60540000000,R1,4,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,7.92640000000,R1,4,MUS$2010/PJ,2030 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,3.68270000000,R1,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,3.41110000000,R1,4,MUS$2010/PJ,2030 CO2f,all-week,late-peak,all-year,0.17000000000,R1,4,MUS$2010/kt,2030 -electricity,all-week,evening,all-year,8.60540000000,R1,5,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,7.92640000000,R1,5,MUS$2010/PJ,2030 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,3.68270000000,R1,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,3.41110000000,R1,5,MUS$2010/PJ,2030 CO2f,all-week,evening,all-year,0.17000000000,R1,5,MUS$2010/kt,2030 -electricity,all-week,night,all-year,10.91870000000,R1,0,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,7.67600000000,R1,0,MUS$2010/PJ,2035 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,4.60800000000,R1,0,MUS$2010/PJ,2035 -CO2f,all-week,night,all-year,0.27000000000,R1,0,MUS$2010/kt,2035 -electricity,all-week,morning,all-year,10.91870000000,R1,1,MUS$2010/PJ,2035 +heat,all-week,night,all-year,3.31090000000,R1,0,MUS$2010/PJ,2035 +CO2f,all-week,night,all-year,0.21000000000,R1,0,MUS$2010/kt,2035 +electricity,all-week,morning,all-year,7.67600000000,R1,1,MUS$2010/PJ,2035 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,4.60800000000,R1,1,MUS$2010/PJ,2035 -CO2f,all-week,morning,all-year,0.27000000000,R1,1,MUS$2010/kt,2035 -electricity,all-week,afternoon,all-year,10.91870000000,R1,2,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,3.31090000000,R1,1,MUS$2010/PJ,2035 +CO2f,all-week,morning,all-year,0.21000000000,R1,1,MUS$2010/kt,2035 +electricity,all-week,afternoon,all-year,7.67600000000,R1,2,MUS$2010/PJ,2035 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,4.60800000000,R1,2,MUS$2010/PJ,2035 -CO2f,all-week,afternoon,all-year,0.27000000000,R1,2,MUS$2010/kt,2035 -electricity,all-week,early-peak,all-year,10.91870000000,R1,3,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,3.31090000000,R1,2,MUS$2010/PJ,2035 +CO2f,all-week,afternoon,all-year,0.21000000000,R1,2,MUS$2010/kt,2035 +electricity,all-week,early-peak,all-year,7.67600000000,R1,3,MUS$2010/PJ,2035 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,4.60800000000,R1,3,MUS$2010/PJ,2035 -CO2f,all-week,early-peak,all-year,0.27000000000,R1,3,MUS$2010/kt,2035 -electricity,all-week,late-peak,all-year,10.91870000000,R1,4,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,3.31090000000,R1,3,MUS$2010/PJ,2035 +CO2f,all-week,early-peak,all-year,0.21000000000,R1,3,MUS$2010/kt,2035 +electricity,all-week,late-peak,all-year,7.67600000000,R1,4,MUS$2010/PJ,2035 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,4.60800000000,R1,4,MUS$2010/PJ,2035 -CO2f,all-week,late-peak,all-year,0.27000000000,R1,4,MUS$2010/kt,2035 -electricity,all-week,evening,all-year,10.91870000000,R1,5,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,3.31090000000,R1,4,MUS$2010/PJ,2035 +CO2f,all-week,late-peak,all-year,0.21000000000,R1,4,MUS$2010/kt,2035 +electricity,all-week,evening,all-year,7.67600000000,R1,5,MUS$2010/PJ,2035 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,4.60800000000,R1,5,MUS$2010/PJ,2035 -CO2f,all-week,evening,all-year,0.27000000000,R1,5,MUS$2010/kt,2035 +heat,all-week,evening,all-year,3.31090000000,R1,5,MUS$2010/PJ,2035 +CO2f,all-week,evening,all-year,0.21000000000,R1,5,MUS$2010/kt,2035 diff --git a/docs/tutorial-code/carbon-budget/1-carbon-budget/Results/MCASupply.csv b/docs/tutorial-code/carbon-budget/1-carbon-budget/Results/MCASupply.csv index a38003b13..3aa01963a 100644 --- a/docs/tutorial-code/carbon-budget/1-carbon-budget/Results/MCASupply.csv +++ b/docs/tutorial-code/carbon-budget/1-carbon-budget/Results/MCASupply.csv @@ -11,12 +11,12 @@ CO2f,all-week,afternoon,all-year,R1,64.71000000000,2,MUS$2010/kt,2020 gas,all-week,early-peak,all-year,R1,1.74000000000,3,MUS$2010/PJ,2020 heat,all-week,early-peak,all-year,R1,1.50000000000,3,MUS$2010/PJ,2020 CO2f,all-week,early-peak,all-year,R1,97.06500000000,3,MUS$2010/kt,2020 -gas,all-week,late-peak,all-year,R1,3.48000000000,4,MUS$2010/PJ,2020 -heat,all-week,late-peak,all-year,R1,3.00000000000,4,MUS$2010/PJ,2020 -CO2f,all-week,late-peak,all-year,R1,194.13000000000,4,MUS$2010/kt,2020 -gas,all-week,evening,all-year,R1,2.32000000000,5,MUS$2010/PJ,2020 -heat,all-week,evening,all-year,R1,2.00000000000,5,MUS$2010/PJ,2020 -CO2f,all-week,evening,all-year,R1,129.42000000000,5,MUS$2010/kt,2020 +gas,all-week,late-peak,all-year,R1,1.93330000000,4,MUS$2010/PJ,2020 +heat,all-week,late-peak,all-year,R1,1.66670000000,4,MUS$2010/PJ,2020 +CO2f,all-week,late-peak,all-year,R1,107.85000000000,4,MUS$2010/kt,2020 +gas,all-week,evening,all-year,R1,1.93330000000,5,MUS$2010/PJ,2020 +heat,all-week,evening,all-year,R1,1.66670000000,5,MUS$2010/PJ,2020 +CO2f,all-week,evening,all-year,R1,107.85000000000,5,MUS$2010/kt,2020 electricity,all-week,night,all-year,R1,0.42220000000,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,R1,0.40920000000,0,MUS$2010/PJ,2025 heat,all-week,night,all-year,R1,1.33330000000,0,MUS$2010/PJ,2025 @@ -33,59 +33,59 @@ electricity,all-week,early-peak,all-year,R1,0.63330000000,3,MUS$2010/PJ,2025 gas,all-week,early-peak,all-year,R1,0.61370000000,3,MUS$2010/PJ,2025 heat,all-week,early-peak,all-year,R1,2.00000000000,3,MUS$2010/PJ,2025 CO2f,all-week,early-peak,all-year,R1,34.12030000000,3,MUS$2010/kt,2025 -electricity,all-week,late-peak,all-year,R1,1.26670000000,4,MUS$2010/PJ,2025 -gas,all-week,late-peak,all-year,R1,1.22750000000,4,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,R1,1.21670000000,4,MUS$2010/PJ,2025 +gas,all-week,late-peak,all-year,R1,1.21720000000,4,MUS$2010/PJ,2025 heat,all-week,late-peak,all-year,R1,4.00000000000,4,MUS$2010/PJ,2025 -CO2f,all-week,late-peak,all-year,R1,68.24060000000,4,MUS$2010/kt,2025 +CO2f,all-week,late-peak,all-year,R1,67.67550000000,4,MUS$2010/kt,2025 electricity,all-week,evening,all-year,R1,0.84440000000,5,MUS$2010/PJ,2025 gas,all-week,evening,all-year,R1,0.81830000000,5,MUS$2010/PJ,2025 heat,all-week,evening,all-year,R1,2.66670000000,5,MUS$2010/PJ,2025 CO2f,all-week,evening,all-year,R1,45.49370000000,5,MUS$2010/kt,2025 electricity,all-week,night,all-year,R1,0.66670000000,0,MUS$2010/PJ,2030 -gas,all-week,night,all-year,R1,0.50950000000,0,MUS$2010/PJ,2030 +gas,all-week,night,all-year,R1,0.45960000000,0,MUS$2010/PJ,2030 heat,all-week,night,all-year,R1,1.66670000000,0,MUS$2010/PJ,2030 -CO2f,all-week,night,all-year,R1,27.96710000000,0,MUS$2010/kt,2030 +CO2f,all-week,night,all-year,R1,25.23030000000,0,MUS$2010/kt,2030 electricity,all-week,morning,all-year,R1,1.00000000000,1,MUS$2010/PJ,2030 -gas,all-week,morning,all-year,R1,0.76420000000,1,MUS$2010/PJ,2030 +gas,all-week,morning,all-year,R1,0.68940000000,1,MUS$2010/PJ,2030 heat,all-week,morning,all-year,R1,2.50000000000,1,MUS$2010/PJ,2030 -CO2f,all-week,morning,all-year,R1,41.95070000000,1,MUS$2010/kt,2030 +CO2f,all-week,morning,all-year,R1,37.84540000000,1,MUS$2010/kt,2030 electricity,all-week,afternoon,all-year,R1,0.66670000000,2,MUS$2010/PJ,2030 -gas,all-week,afternoon,all-year,R1,0.50950000000,2,MUS$2010/PJ,2030 +gas,all-week,afternoon,all-year,R1,0.45960000000,2,MUS$2010/PJ,2030 heat,all-week,afternoon,all-year,R1,1.66670000000,2,MUS$2010/PJ,2030 -CO2f,all-week,afternoon,all-year,R1,27.96710000000,2,MUS$2010/kt,2030 +CO2f,all-week,afternoon,all-year,R1,25.23030000000,2,MUS$2010/kt,2030 electricity,all-week,early-peak,all-year,R1,1.00000000000,3,MUS$2010/PJ,2030 -gas,all-week,early-peak,all-year,R1,0.76420000000,3,MUS$2010/PJ,2030 +gas,all-week,early-peak,all-year,R1,0.68940000000,3,MUS$2010/PJ,2030 heat,all-week,early-peak,all-year,R1,2.50000000000,3,MUS$2010/PJ,2030 -CO2f,all-week,early-peak,all-year,R1,41.95070000000,3,MUS$2010/kt,2030 -electricity,all-week,late-peak,all-year,R1,2.00000000000,4,MUS$2010/PJ,2030 -gas,all-week,late-peak,all-year,R1,1.52850000000,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,R1,5.00000000000,4,MUS$2010/PJ,2030 -CO2f,all-week,late-peak,all-year,R1,83.90140000000,4,MUS$2010/kt,2030 +CO2f,all-week,early-peak,all-year,R1,37.84540000000,3,MUS$2010/kt,2030 +electricity,all-week,late-peak,all-year,R1,1.81670000000,4,MUS$2010/PJ,2030 +gas,all-week,late-peak,all-year,R1,1.25250000000,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,R1,4.83330000000,4,MUS$2010/PJ,2030 +CO2f,all-week,late-peak,all-year,R1,68.75250000000,4,MUS$2010/kt,2030 electricity,all-week,evening,all-year,R1,1.33330000000,5,MUS$2010/PJ,2030 -gas,all-week,evening,all-year,R1,1.01900000000,5,MUS$2010/PJ,2030 +gas,all-week,evening,all-year,R1,0.91930000000,5,MUS$2010/PJ,2030 heat,all-week,evening,all-year,R1,3.33330000000,5,MUS$2010/PJ,2030 -CO2f,all-week,evening,all-year,R1,55.93420000000,5,MUS$2010/kt,2030 +CO2f,all-week,evening,all-year,R1,50.46060000000,5,MUS$2010/kt,2030 electricity,all-week,night,all-year,R1,0.80000000000,0,MUS$2010/PJ,2035 -gas,all-week,night,all-year,R1,0.50810000000,0,MUS$2010/PJ,2035 +gas,all-week,night,all-year,R1,0.42640000000,0,MUS$2010/PJ,2035 heat,all-week,night,all-year,R1,2.00000000000,0,MUS$2010/PJ,2035 -CO2f,all-week,night,all-year,R1,27.88830000000,0,MUS$2010/kt,2035 +CO2f,all-week,night,all-year,R1,23.40510000000,0,MUS$2010/kt,2035 electricity,all-week,morning,all-year,R1,1.20000000000,1,MUS$2010/PJ,2035 -gas,all-week,morning,all-year,R1,0.76210000000,1,MUS$2010/PJ,2035 +gas,all-week,morning,all-year,R1,0.63960000000,1,MUS$2010/PJ,2035 heat,all-week,morning,all-year,R1,3.00000000000,1,MUS$2010/PJ,2035 -CO2f,all-week,morning,all-year,R1,41.83250000000,1,MUS$2010/kt,2035 +CO2f,all-week,morning,all-year,R1,35.10770000000,1,MUS$2010/kt,2035 electricity,all-week,afternoon,all-year,R1,0.80000000000,2,MUS$2010/PJ,2035 -gas,all-week,afternoon,all-year,R1,0.50810000000,2,MUS$2010/PJ,2035 +gas,all-week,afternoon,all-year,R1,0.42640000000,2,MUS$2010/PJ,2035 heat,all-week,afternoon,all-year,R1,2.00000000000,2,MUS$2010/PJ,2035 -CO2f,all-week,afternoon,all-year,R1,27.88830000000,2,MUS$2010/kt,2035 +CO2f,all-week,afternoon,all-year,R1,23.40510000000,2,MUS$2010/kt,2035 electricity,all-week,early-peak,all-year,R1,1.20000000000,3,MUS$2010/PJ,2035 -gas,all-week,early-peak,all-year,R1,0.76210000000,3,MUS$2010/PJ,2035 +gas,all-week,early-peak,all-year,R1,0.63960000000,3,MUS$2010/PJ,2035 heat,all-week,early-peak,all-year,R1,3.00000000000,3,MUS$2010/PJ,2035 -CO2f,all-week,early-peak,all-year,R1,41.83250000000,3,MUS$2010/kt,2035 -electricity,all-week,late-peak,all-year,R1,2.40000000000,4,MUS$2010/PJ,2035 -gas,all-week,late-peak,all-year,R1,1.52420000000,4,MUS$2010/PJ,2035 +CO2f,all-week,early-peak,all-year,R1,35.10770000000,3,MUS$2010/kt,2035 +electricity,all-week,late-peak,all-year,R1,2.35000000000,4,MUS$2010/PJ,2035 +gas,all-week,late-peak,all-year,R1,1.25250000000,4,MUS$2010/PJ,2035 heat,all-week,late-peak,all-year,R1,6.00000000000,4,MUS$2010/PJ,2035 -CO2f,all-week,late-peak,all-year,R1,83.66500000000,4,MUS$2010/kt,2035 +CO2f,all-week,late-peak,all-year,R1,68.75250000000,4,MUS$2010/kt,2035 electricity,all-week,evening,all-year,R1,1.60000000000,5,MUS$2010/PJ,2035 -gas,all-week,evening,all-year,R1,1.01610000000,5,MUS$2010/PJ,2035 +gas,all-week,evening,all-year,R1,0.85280000000,5,MUS$2010/PJ,2035 heat,all-week,evening,all-year,R1,4.00000000000,5,MUS$2010/PJ,2035 -CO2f,all-week,evening,all-year,R1,55.77670000000,5,MUS$2010/kt,2035 +CO2f,all-week,evening,all-year,R1,46.81020000000,5,MUS$2010/kt,2035 diff --git a/docs/tutorial-code/min-max-timeslice-constraints/1-min-constraint/Results/MCACapacity.csv b/docs/tutorial-code/min-max-timeslice-constraints/1-min-constraint/Results/MCACapacity.csv index 5e4f24722..bfd4187ff 100644 --- a/docs/tutorial-code/min-max-timeslice-constraints/1-min-constraint/Results/MCACapacity.csv +++ b/docs/tutorial-code/min-max-timeslice-constraints/1-min-constraint/Results/MCACapacity.csv @@ -5,39 +5,35 @@ A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2020 A1,5.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2025 A1,19.00000000000,R1,2020,R1,residential,heatpump,newcapa,2025 A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2025 -A1,1.00000000000,R1,2020,R1,power,windturbine,newcapa,2025 -A1,15.42960000000,R1,2020,R1,gas,gassupply1,newcapa,2025 +A1,6.00000000000,R1,2020,R1,power,windturbine,newcapa,2025 +A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2025 A1,19.00000000000,R1,2020,R1,residential,heatpump,newcapa,2030 A1,10.00000000000,R1,2025,R1,residential,heatpump,newcapa,2030 -A1,1.00000000000,R1,2020,R1,power,windturbine,newcapa,2030 -A1,1.00000000000,R1,2025,R1,power,windturbine,newcapa,2030 -A1,7.92960000000,R1,2020,R1,gas,gassupply1,newcapa,2030 +A1,6.00000000000,R1,2020,R1,power,windturbine,newcapa,2030 +A1,5.00000000000,R1,2025,R1,power,windturbine,newcapa,2030 +A1,7.50000000000,R1,2020,R1,gas,gassupply1,newcapa,2030 A1,10.00000000000,R1,2025,R1,residential,heatpump,newcapa,2035 A1,26.00000000000,R1,2030,R1,residential,heatpump,newcapa,2035 -A1,1.00000000000,R1,2020,R1,power,windturbine,newcapa,2035 -A1,1.00000000000,R1,2025,R1,power,windturbine,newcapa,2035 -A1,2.00000000000,R1,2030,R1,power,windturbine,newcapa,2035 -A1,0.42960000000,R1,2020,R1,gas,gassupply1,newcapa,2035 +A1,6.00000000000,R1,2020,R1,power,windturbine,newcapa,2035 +A1,5.00000000000,R1,2025,R1,power,windturbine,newcapa,2035 +A1,3.00000000000,R1,2030,R1,power,windturbine,newcapa,2035 A1,26.00000000000,R1,2030,R1,residential,heatpump,newcapa,2040 A1,16.00000000000,R1,2035,R1,residential,heatpump,newcapa,2040 -A1,1.00000000000,R1,2020,R1,power,windturbine,newcapa,2040 -A1,1.00000000000,R1,2025,R1,power,windturbine,newcapa,2040 -A1,2.00000000000,R1,2030,R1,power,windturbine,newcapa,2040 +A1,6.00000000000,R1,2020,R1,power,windturbine,newcapa,2040 +A1,5.00000000000,R1,2025,R1,power,windturbine,newcapa,2040 +A1,3.00000000000,R1,2030,R1,power,windturbine,newcapa,2040 A1,2.00000000000,R1,2035,R1,power,windturbine,newcapa,2040 -A1,0.42960000000,R1,2020,R1,gas,gassupply1,newcapa,2040 A1,16.00000000000,R1,2035,R1,residential,heatpump,newcapa,2045 A1,32.00000000000,R1,2040,R1,residential,heatpump,newcapa,2045 -A1,1.00000000000,R1,2020,R1,power,windturbine,newcapa,2045 -A1,1.00000000000,R1,2025,R1,power,windturbine,newcapa,2045 -A1,2.00000000000,R1,2030,R1,power,windturbine,newcapa,2045 +A1,6.00000000000,R1,2020,R1,power,windturbine,newcapa,2045 +A1,5.00000000000,R1,2025,R1,power,windturbine,newcapa,2045 +A1,3.00000000000,R1,2030,R1,power,windturbine,newcapa,2045 A1,2.00000000000,R1,2035,R1,power,windturbine,newcapa,2045 -A1,2.00000000000,R1,2040,R1,power,windturbine,newcapa,2045 -A1,0.42960000000,R1,2020,R1,gas,gassupply1,newcapa,2045 +A1,3.00000000000,R1,2040,R1,power,windturbine,newcapa,2045 A1,32.00000000000,R1,2040,R1,residential,heatpump,newcapa,2050 A1,22.00000000000,R1,2045,R1,residential,heatpump,newcapa,2050 -A1,1.00000000000,R1,2025,R1,power,windturbine,newcapa,2050 -A1,2.00000000000,R1,2030,R1,power,windturbine,newcapa,2050 +A1,5.00000000000,R1,2025,R1,power,windturbine,newcapa,2050 +A1,3.00000000000,R1,2030,R1,power,windturbine,newcapa,2050 A1,2.00000000000,R1,2035,R1,power,windturbine,newcapa,2050 -A1,2.00000000000,R1,2040,R1,power,windturbine,newcapa,2050 -A1,2.00000000000,R1,2045,R1,power,windturbine,newcapa,2050 -A1,0.42960000000,R1,2020,R1,gas,gassupply1,newcapa,2050 +A1,3.00000000000,R1,2040,R1,power,windturbine,newcapa,2050 +A1,8.00000000000,R1,2045,R1,power,windturbine,newcapa,2050 diff --git a/docs/tutorial-code/min-max-timeslice-constraints/1-min-constraint/Results/MCAPrices.csv b/docs/tutorial-code/min-max-timeslice-constraints/1-min-constraint/Results/MCAPrices.csv index cb4249e0f..3f68ede79 100644 --- a/docs/tutorial-code/min-max-timeslice-constraints/1-min-constraint/Results/MCAPrices.csv +++ b/docs/tutorial-code/min-max-timeslice-constraints/1-min-constraint/Results/MCAPrices.csv @@ -23,53 +23,53 @@ electricity,all-week,evening,all-year,19.50000000000,R1,5,MUS$2010/PJ,2020 gas,all-week,evening,all-year,7.15280000000,R1,5,MUS$2010/PJ,2020 heat,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.08310000000,R1,5,MUS$2010/kt,2020 -electricity,all-week,night,all-year,6.13290000000,R1,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,1.57770000000,R1,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,3.88680000000,R1,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,2.76300000000,R1,0,MUS$2010/PJ,2025 CO2f,all-week,night,all-year,0.12010000000,R1,0,MUS$2010/kt,2025 -electricity,all-week,morning,all-year,7.95490000000,R1,1,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,1.88140000000,R1,1,MUS$2010/PJ,2025 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,4.46370000000,R1,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,2.96540000000,R1,1,MUS$2010/PJ,2025 CO2f,all-week,morning,all-year,0.12010000000,R1,1,MUS$2010/kt,2025 -electricity,all-week,afternoon,all-year,12.20640000000,R1,2,MUS$2010/PJ,2025 +electricity,all-week,afternoon,all-year,3.39980000000,R1,2,MUS$2010/PJ,2025 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2025 -heat,all-week,afternoon,all-year,5.81000000000,R1,2,MUS$2010/PJ,2025 +heat,all-week,afternoon,all-year,3.97750000000,R1,2,MUS$2010/PJ,2025 CO2f,all-week,afternoon,all-year,0.12010000000,R1,2,MUS$2010/kt,2025 -electricity,all-week,early-peak,all-year,7.95490000000,R1,3,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,1.88140000000,R1,3,MUS$2010/PJ,2025 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,4.46370000000,R1,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,2.96540000000,R1,3,MUS$2010/PJ,2025 CO2f,all-week,early-peak,all-year,0.12010000000,R1,3,MUS$2010/kt,2025 -electricity,all-week,late-peak,all-year,7.95490000000,R1,4,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,3.09610000000,R1,4,MUS$2010/PJ,2025 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,4.46370000000,R1,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,3.77510000000,R1,4,MUS$2010/PJ,2025 CO2f,all-week,late-peak,all-year,0.12010000000,R1,4,MUS$2010/kt,2025 -electricity,all-week,evening,all-year,12.20640000000,R1,5,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,2.94420000000,R1,5,MUS$2010/PJ,2025 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,5.81000000000,R1,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,3.67380000000,R1,5,MUS$2010/PJ,2025 CO2f,all-week,evening,all-year,0.12010000000,R1,5,MUS$2010/kt,2025 electricity,all-week,night,all-year,0.66670000000,R1,0,MUS$2010/PJ,2030 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,2.69360000000,R1,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,0.50720000000,R1,0,MUS$2010/PJ,2030 CO2f,all-week,night,all-year,0.15700000000,R1,0,MUS$2010/kt,2030 electricity,all-week,morning,all-year,0.66670000000,R1,1,MUS$2010/PJ,2030 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,3.42250000000,R1,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,0.50720000000,R1,1,MUS$2010/PJ,2030 CO2f,all-week,morning,all-year,0.15700000000,R1,1,MUS$2010/kt,2030 electricity,all-week,afternoon,all-year,0.66670000000,R1,2,MUS$2010/PJ,2030 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,5.12310000000,R1,2,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,0.50720000000,R1,2,MUS$2010/PJ,2030 CO2f,all-week,afternoon,all-year,0.15700000000,R1,2,MUS$2010/kt,2030 electricity,all-week,early-peak,all-year,0.66670000000,R1,3,MUS$2010/PJ,2030 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,3.42250000000,R1,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,0.50720000000,R1,3,MUS$2010/PJ,2030 CO2f,all-week,early-peak,all-year,0.15700000000,R1,3,MUS$2010/kt,2030 electricity,all-week,late-peak,all-year,0.66670000000,R1,4,MUS$2010/PJ,2030 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,3.42250000000,R1,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,0.50720000000,R1,4,MUS$2010/PJ,2030 CO2f,all-week,late-peak,all-year,0.15700000000,R1,4,MUS$2010/kt,2030 electricity,all-week,evening,all-year,0.66670000000,R1,5,MUS$2010/PJ,2030 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,5.12310000000,R1,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,0.50720000000,R1,5,MUS$2010/PJ,2030 CO2f,all-week,evening,all-year,0.15700000000,R1,5,MUS$2010/kt,2030 electricity,all-week,night,all-year,0.66670000000,R1,0,MUS$2010/PJ,2035 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2035 diff --git a/docs/tutorial-code/min-max-timeslice-constraints/1-min-constraint/Results/Power_Supply.csv b/docs/tutorial-code/min-max-timeslice-constraints/1-min-constraint/Results/Power_Supply.csv index ff56d993c..8356fca63 100644 --- a/docs/tutorial-code/min-max-timeslice-constraints/1-min-constraint/Results/Power_Supply.csv +++ b/docs/tutorial-code/min-max-timeslice-constraints/1-min-constraint/Results/Power_Supply.csv @@ -1,143 +1,145 @@ asset,comm_usage,commodity,day,hour,installed,month,region,supply,technology,timeslice,year -0,10,electricity,all-week,night,2020,all-year,R1,0.20000000000,gasCCGT,0,2020 -0,6,CO2f,all-week,night,2020,all-year,R1,18.33400000000,gasCCGT,0,2020 -0,10,electricity,all-week,morning,2020,all-year,R1,0.40000000000,gasCCGT,1,2020 -0,6,CO2f,all-week,morning,2020,all-year,R1,36.66800000000,gasCCGT,1,2020 -0,10,electricity,all-week,afternoon,2020,all-year,R1,0.60000000000,gasCCGT,2,2020 -0,6,CO2f,all-week,afternoon,2020,all-year,R1,55.00200000000,gasCCGT,2,2020 -0,10,electricity,all-week,early-peak,2020,all-year,R1,0.40000000000,gasCCGT,3,2020 -0,6,CO2f,all-week,early-peak,2020,all-year,R1,36.66800000000,gasCCGT,3,2020 -0,10,electricity,all-week,late-peak,2020,all-year,R1,0.80000000000,gasCCGT,4,2020 -0,6,CO2f,all-week,late-peak,2020,all-year,R1,73.33600000000,gasCCGT,4,2020 -0,10,electricity,all-week,evening,2020,all-year,R1,1.00000000000,gasCCGT,5,2020 -0,6,CO2f,all-week,evening,2020,all-year,R1,91.67000000000,gasCCGT,5,2020 -0,10,electricity,all-week,night,2020,all-year,R1,0.20000000000,gasCCGT,0,2025 -0,6,CO2f,all-week,night,2020,all-year,R1,18.33400000000,gasCCGT,0,2025 -1,10,electricity,all-week,night,2020,all-year,R1,0.22220000000,windturbine,0,2025 -0,10,electricity,all-week,morning,2020,all-year,R1,0.40000000000,gasCCGT,1,2025 -0,6,CO2f,all-week,morning,2020,all-year,R1,36.66800000000,gasCCGT,1,2025 -1,10,electricity,all-week,morning,2020,all-year,R1,0.23330000000,windturbine,1,2025 -0,10,electricity,all-week,afternoon,2020,all-year,R1,0.60000000000,gasCCGT,2,2025 -0,6,CO2f,all-week,afternoon,2020,all-year,R1,55.00200000000,gasCCGT,2,2025 -0,10,electricity,all-week,early-peak,2020,all-year,R1,0.40000000000,gasCCGT,3,2025 -0,6,CO2f,all-week,early-peak,2020,all-year,R1,36.66800000000,gasCCGT,3,2025 -1,10,electricity,all-week,early-peak,2020,all-year,R1,0.23330000000,windturbine,3,2025 -0,10,electricity,all-week,late-peak,2020,all-year,R1,0.80000000000,gasCCGT,4,2025 -0,6,CO2f,all-week,late-peak,2020,all-year,R1,73.33600000000,gasCCGT,4,2025 -1,10,electricity,all-week,late-peak,2020,all-year,R1,0.46670000000,windturbine,4,2025 -0,10,electricity,all-week,evening,2020,all-year,R1,1.00000000000,gasCCGT,5,2025 -0,6,CO2f,all-week,evening,2020,all-year,R1,91.67000000000,gasCCGT,5,2025 -1,10,electricity,all-week,night,2020,all-year,R1,0.33330000000,windturbine,0,2030 -2,10,electricity,all-week,night,2025,all-year,R1,0.33330000000,windturbine,0,2030 -1,10,electricity,all-week,morning,2020,all-year,R1,0.50000000000,windturbine,1,2030 -2,10,electricity,all-week,morning,2025,all-year,R1,0.50000000000,windturbine,1,2030 -1,10,electricity,all-week,afternoon,2020,all-year,R1,0.33330000000,windturbine,2,2030 -2,10,electricity,all-week,afternoon,2025,all-year,R1,0.33330000000,windturbine,2,2030 -1,10,electricity,all-week,early-peak,2020,all-year,R1,0.50000000000,windturbine,3,2030 -2,10,electricity,all-week,early-peak,2025,all-year,R1,0.50000000000,windturbine,3,2030 +0,10,electricity,all-week,night,2020,all-year,R1,0.03330000000,gasCCGT,0,2020 +0,6,CO2f,all-week,night,2020,all-year,R1,3.05570000000,gasCCGT,0,2020 +0,10,electricity,all-week,morning,2020,all-year,R1,0.06670000000,gasCCGT,1,2020 +0,6,CO2f,all-week,morning,2020,all-year,R1,6.11130000000,gasCCGT,1,2020 +0,10,electricity,all-week,afternoon,2020,all-year,R1,0.10000000000,gasCCGT,2,2020 +0,6,CO2f,all-week,afternoon,2020,all-year,R1,9.16700000000,gasCCGT,2,2020 +0,10,electricity,all-week,early-peak,2020,all-year,R1,0.06670000000,gasCCGT,3,2020 +0,6,CO2f,all-week,early-peak,2020,all-year,R1,6.11130000000,gasCCGT,3,2020 +0,10,electricity,all-week,late-peak,2020,all-year,R1,0.13330000000,gasCCGT,4,2020 +0,6,CO2f,all-week,late-peak,2020,all-year,R1,12.22270000000,gasCCGT,4,2020 +0,10,electricity,all-week,evening,2020,all-year,R1,0.16670000000,gasCCGT,5,2020 +0,6,CO2f,all-week,evening,2020,all-year,R1,15.27830000000,gasCCGT,5,2020 +0,10,electricity,all-week,night,2020,all-year,R1,0.03330000000,gasCCGT,0,2025 +0,6,CO2f,all-week,night,2020,all-year,R1,3.05570000000,gasCCGT,0,2025 +0,10,electricity,all-week,morning,2020,all-year,R1,0.06670000000,gasCCGT,1,2025 +0,6,CO2f,all-week,morning,2020,all-year,R1,6.11130000000,gasCCGT,1,2025 +0,10,electricity,all-week,afternoon,2020,all-year,R1,0.10000000000,gasCCGT,2,2025 +0,6,CO2f,all-week,afternoon,2020,all-year,R1,9.16700000000,gasCCGT,2,2025 +0,10,electricity,all-week,early-peak,2020,all-year,R1,0.06670000000,gasCCGT,3,2025 +0,6,CO2f,all-week,early-peak,2020,all-year,R1,6.11130000000,gasCCGT,3,2025 +0,10,electricity,all-week,late-peak,2020,all-year,R1,0.26670000000,gasCCGT,4,2025 +0,6,CO2f,all-week,late-peak,2020,all-year,R1,24.44530000000,gasCCGT,4,2025 +0,10,electricity,all-week,evening,2020,all-year,R1,0.16670000000,gasCCGT,5,2025 +0,6,CO2f,all-week,evening,2020,all-year,R1,15.27830000000,gasCCGT,5,2025 +1,10,electricity,all-week,night,2020,all-year,R1,0.38890000000,windturbine,0,2025 +1,10,electricity,all-week,morning,2020,all-year,R1,0.56670000000,windturbine,1,2025 +1,10,electricity,all-week,afternoon,2020,all-year,R1,0.32220000000,windturbine,2,2025 +1,10,electricity,all-week,early-peak,2020,all-year,R1,0.56670000000,windturbine,3,2025 +1,10,electricity,all-week,late-peak,2020,all-year,R1,1.00000000000,windturbine,4,2025 +1,10,electricity,all-week,evening,2020,all-year,R1,0.67780000000,windturbine,5,2025 +1,10,electricity,all-week,night,2020,all-year,R1,0.36360000000,windturbine,0,2030 +1,10,electricity,all-week,morning,2020,all-year,R1,0.54550000000,windturbine,1,2030 +1,10,electricity,all-week,afternoon,2020,all-year,R1,0.36360000000,windturbine,2,2030 +1,10,electricity,all-week,early-peak,2020,all-year,R1,0.54550000000,windturbine,3,2030 1,10,electricity,all-week,late-peak,2020,all-year,R1,1.00000000000,windturbine,4,2030 -2,10,electricity,all-week,late-peak,2025,all-year,R1,1.00000000000,windturbine,4,2030 -1,10,electricity,all-week,evening,2020,all-year,R1,0.66670000000,windturbine,5,2030 -2,10,electricity,all-week,evening,2025,all-year,R1,0.66670000000,windturbine,5,2030 -1,10,electricity,all-week,night,2020,all-year,R1,0.20000000000,windturbine,0,2035 -2,10,electricity,all-week,night,2025,all-year,R1,0.20000000000,windturbine,0,2035 -3,10,electricity,all-week,night,2030,all-year,R1,0.40000000000,windturbine,0,2035 -1,10,electricity,all-week,morning,2020,all-year,R1,0.30000000000,windturbine,1,2035 -2,10,electricity,all-week,morning,2025,all-year,R1,0.30000000000,windturbine,1,2035 -3,10,electricity,all-week,morning,2030,all-year,R1,0.60000000000,windturbine,1,2035 -1,10,electricity,all-week,afternoon,2020,all-year,R1,0.20000000000,windturbine,2,2035 -2,10,electricity,all-week,afternoon,2025,all-year,R1,0.20000000000,windturbine,2,2035 -3,10,electricity,all-week,afternoon,2030,all-year,R1,0.40000000000,windturbine,2,2035 -1,10,electricity,all-week,early-peak,2020,all-year,R1,0.30000000000,windturbine,3,2035 -2,10,electricity,all-week,early-peak,2025,all-year,R1,0.30000000000,windturbine,3,2035 -3,10,electricity,all-week,early-peak,2030,all-year,R1,0.60000000000,windturbine,3,2035 -1,10,electricity,all-week,late-peak,2020,all-year,R1,0.60000000000,windturbine,4,2035 -2,10,electricity,all-week,late-peak,2025,all-year,R1,0.60000000000,windturbine,4,2035 -3,10,electricity,all-week,late-peak,2030,all-year,R1,1.20000000000,windturbine,4,2035 -1,10,electricity,all-week,evening,2020,all-year,R1,0.40000000000,windturbine,5,2035 -2,10,electricity,all-week,evening,2025,all-year,R1,0.40000000000,windturbine,5,2035 -3,10,electricity,all-week,evening,2030,all-year,R1,0.80000000000,windturbine,5,2035 -1,10,electricity,all-week,night,2020,all-year,R1,0.15560000000,windturbine,0,2040 -2,10,electricity,all-week,night,2025,all-year,R1,0.15560000000,windturbine,0,2040 -3,10,electricity,all-week,night,2030,all-year,R1,0.31110000000,windturbine,0,2040 -4,10,electricity,all-week,night,2035,all-year,R1,0.31110000000,windturbine,0,2040 -1,10,electricity,all-week,morning,2020,all-year,R1,0.23330000000,windturbine,1,2040 -2,10,electricity,all-week,morning,2025,all-year,R1,0.23330000000,windturbine,1,2040 -3,10,electricity,all-week,morning,2030,all-year,R1,0.46670000000,windturbine,1,2040 -4,10,electricity,all-week,morning,2035,all-year,R1,0.46670000000,windturbine,1,2040 -1,10,electricity,all-week,afternoon,2020,all-year,R1,0.15560000000,windturbine,2,2040 -2,10,electricity,all-week,afternoon,2025,all-year,R1,0.15560000000,windturbine,2,2040 -3,10,electricity,all-week,afternoon,2030,all-year,R1,0.31110000000,windturbine,2,2040 -4,10,electricity,all-week,afternoon,2035,all-year,R1,0.31110000000,windturbine,2,2040 -1,10,electricity,all-week,early-peak,2020,all-year,R1,0.23330000000,windturbine,3,2040 -2,10,electricity,all-week,early-peak,2025,all-year,R1,0.23330000000,windturbine,3,2040 -3,10,electricity,all-week,early-peak,2030,all-year,R1,0.46670000000,windturbine,3,2040 -4,10,electricity,all-week,early-peak,2035,all-year,R1,0.46670000000,windturbine,3,2040 -1,10,electricity,all-week,late-peak,2020,all-year,R1,0.46670000000,windturbine,4,2040 -2,10,electricity,all-week,late-peak,2025,all-year,R1,0.46670000000,windturbine,4,2040 -3,10,electricity,all-week,late-peak,2030,all-year,R1,0.93330000000,windturbine,4,2040 -4,10,electricity,all-week,late-peak,2035,all-year,R1,0.93330000000,windturbine,4,2040 -1,10,electricity,all-week,evening,2020,all-year,R1,0.31110000000,windturbine,5,2040 -2,10,electricity,all-week,evening,2025,all-year,R1,0.31110000000,windturbine,5,2040 -3,10,electricity,all-week,evening,2030,all-year,R1,0.62220000000,windturbine,5,2040 -4,10,electricity,all-week,evening,2035,all-year,R1,0.62220000000,windturbine,5,2040 -1,10,electricity,all-week,night,2020,all-year,R1,0.13330000000,windturbine,0,2045 -2,10,electricity,all-week,night,2025,all-year,R1,0.13330000000,windturbine,0,2045 -3,10,electricity,all-week,night,2030,all-year,R1,0.26670000000,windturbine,0,2045 -4,10,electricity,all-week,night,2035,all-year,R1,0.26670000000,windturbine,0,2045 -5,10,electricity,all-week,night,2040,all-year,R1,0.26670000000,windturbine,0,2045 -1,10,electricity,all-week,morning,2020,all-year,R1,0.20000000000,windturbine,1,2045 -2,10,electricity,all-week,morning,2025,all-year,R1,0.20000000000,windturbine,1,2045 -3,10,electricity,all-week,morning,2030,all-year,R1,0.40000000000,windturbine,1,2045 -4,10,electricity,all-week,morning,2035,all-year,R1,0.40000000000,windturbine,1,2045 -5,10,electricity,all-week,morning,2040,all-year,R1,0.40000000000,windturbine,1,2045 -1,10,electricity,all-week,afternoon,2020,all-year,R1,0.13330000000,windturbine,2,2045 -2,10,electricity,all-week,afternoon,2025,all-year,R1,0.13330000000,windturbine,2,2045 -3,10,electricity,all-week,afternoon,2030,all-year,R1,0.26670000000,windturbine,2,2045 -4,10,electricity,all-week,afternoon,2035,all-year,R1,0.26670000000,windturbine,2,2045 -5,10,electricity,all-week,afternoon,2040,all-year,R1,0.26670000000,windturbine,2,2045 -1,10,electricity,all-week,early-peak,2020,all-year,R1,0.20000000000,windturbine,3,2045 -2,10,electricity,all-week,early-peak,2025,all-year,R1,0.20000000000,windturbine,3,2045 -3,10,electricity,all-week,early-peak,2030,all-year,R1,0.40000000000,windturbine,3,2045 -4,10,electricity,all-week,early-peak,2035,all-year,R1,0.40000000000,windturbine,3,2045 -5,10,electricity,all-week,early-peak,2040,all-year,R1,0.40000000000,windturbine,3,2045 -1,10,electricity,all-week,late-peak,2020,all-year,R1,0.40000000000,windturbine,4,2045 -2,10,electricity,all-week,late-peak,2025,all-year,R1,0.40000000000,windturbine,4,2045 -3,10,electricity,all-week,late-peak,2030,all-year,R1,0.80000000000,windturbine,4,2045 -4,10,electricity,all-week,late-peak,2035,all-year,R1,0.80000000000,windturbine,4,2045 -5,10,electricity,all-week,late-peak,2040,all-year,R1,0.80000000000,windturbine,4,2045 -1,10,electricity,all-week,evening,2020,all-year,R1,0.26670000000,windturbine,5,2045 -2,10,electricity,all-week,evening,2025,all-year,R1,0.26670000000,windturbine,5,2045 -3,10,electricity,all-week,evening,2030,all-year,R1,0.53330000000,windturbine,5,2045 -4,10,electricity,all-week,evening,2035,all-year,R1,0.53330000000,windturbine,5,2045 -5,10,electricity,all-week,evening,2040,all-year,R1,0.53330000000,windturbine,5,2045 -2,10,electricity,all-week,night,2025,all-year,R1,0.13330000000,windturbine,0,2050 -3,10,electricity,all-week,night,2030,all-year,R1,0.26670000000,windturbine,0,2050 -4,10,electricity,all-week,night,2035,all-year,R1,0.26670000000,windturbine,0,2050 -5,10,electricity,all-week,night,2040,all-year,R1,0.26670000000,windturbine,0,2050 -6,10,electricity,all-week,night,2045,all-year,R1,0.26670000000,windturbine,0,2050 -2,10,electricity,all-week,morning,2025,all-year,R1,0.20000000000,windturbine,1,2050 -3,10,electricity,all-week,morning,2030,all-year,R1,0.40000000000,windturbine,1,2050 -4,10,electricity,all-week,morning,2035,all-year,R1,0.40000000000,windturbine,1,2050 -5,10,electricity,all-week,morning,2040,all-year,R1,0.40000000000,windturbine,1,2050 -6,10,electricity,all-week,morning,2045,all-year,R1,0.40000000000,windturbine,1,2050 -2,10,electricity,all-week,afternoon,2025,all-year,R1,0.13330000000,windturbine,2,2050 -3,10,electricity,all-week,afternoon,2030,all-year,R1,0.26670000000,windturbine,2,2050 -4,10,electricity,all-week,afternoon,2035,all-year,R1,0.26670000000,windturbine,2,2050 -5,10,electricity,all-week,afternoon,2040,all-year,R1,0.26670000000,windturbine,2,2050 -6,10,electricity,all-week,afternoon,2045,all-year,R1,0.26670000000,windturbine,2,2050 -2,10,electricity,all-week,early-peak,2025,all-year,R1,0.20000000000,windturbine,3,2050 -3,10,electricity,all-week,early-peak,2030,all-year,R1,0.40000000000,windturbine,3,2050 -4,10,electricity,all-week,early-peak,2035,all-year,R1,0.40000000000,windturbine,3,2050 -5,10,electricity,all-week,early-peak,2040,all-year,R1,0.40000000000,windturbine,3,2050 -6,10,electricity,all-week,early-peak,2045,all-year,R1,0.40000000000,windturbine,3,2050 -2,10,electricity,all-week,late-peak,2025,all-year,R1,0.40000000000,windturbine,4,2050 -3,10,electricity,all-week,late-peak,2030,all-year,R1,0.80000000000,windturbine,4,2050 -4,10,electricity,all-week,late-peak,2035,all-year,R1,0.80000000000,windturbine,4,2050 -5,10,electricity,all-week,late-peak,2040,all-year,R1,0.80000000000,windturbine,4,2050 -6,10,electricity,all-week,late-peak,2045,all-year,R1,0.80000000000,windturbine,4,2050 -2,10,electricity,all-week,evening,2025,all-year,R1,0.26670000000,windturbine,5,2050 -3,10,electricity,all-week,evening,2030,all-year,R1,0.53330000000,windturbine,5,2050 -4,10,electricity,all-week,evening,2035,all-year,R1,0.53330000000,windturbine,5,2050 -5,10,electricity,all-week,evening,2040,all-year,R1,0.53330000000,windturbine,5,2050 -6,10,electricity,all-week,evening,2045,all-year,R1,0.53330000000,windturbine,5,2050 +1,10,electricity,all-week,evening,2020,all-year,R1,0.72730000000,windturbine,5,2030 +2,10,electricity,all-week,night,2025,all-year,R1,0.30300000000,windturbine,0,2030 +2,10,electricity,all-week,morning,2025,all-year,R1,0.45450000000,windturbine,1,2030 +2,10,electricity,all-week,afternoon,2025,all-year,R1,0.30300000000,windturbine,2,2030 +2,10,electricity,all-week,early-peak,2025,all-year,R1,0.45450000000,windturbine,3,2030 +2,10,electricity,all-week,late-peak,2025,all-year,R1,0.83330000000,windturbine,4,2030 +2,10,electricity,all-week,evening,2025,all-year,R1,0.60610000000,windturbine,5,2030 +1,10,electricity,all-week,night,2020,all-year,R1,0.34290000000,windturbine,0,2035 +1,10,electricity,all-week,morning,2020,all-year,R1,0.51430000000,windturbine,1,2035 +1,10,electricity,all-week,afternoon,2020,all-year,R1,0.34290000000,windturbine,2,2035 +1,10,electricity,all-week,early-peak,2020,all-year,R1,0.51430000000,windturbine,3,2035 +1,10,electricity,all-week,late-peak,2020,all-year,R1,1.00000000000,windturbine,4,2035 +1,10,electricity,all-week,evening,2020,all-year,R1,0.68570000000,windturbine,5,2035 +2,10,electricity,all-week,night,2025,all-year,R1,0.28570000000,windturbine,0,2035 +2,10,electricity,all-week,morning,2025,all-year,R1,0.42860000000,windturbine,1,2035 +2,10,electricity,all-week,afternoon,2025,all-year,R1,0.28570000000,windturbine,2,2035 +2,10,electricity,all-week,early-peak,2025,all-year,R1,0.42860000000,windturbine,3,2035 +2,10,electricity,all-week,late-peak,2025,all-year,R1,0.83330000000,windturbine,4,2035 +2,10,electricity,all-week,evening,2025,all-year,R1,0.57140000000,windturbine,5,2035 +3,10,electricity,all-week,night,2030,all-year,R1,0.17140000000,windturbine,0,2035 +3,10,electricity,all-week,morning,2030,all-year,R1,0.25710000000,windturbine,1,2035 +3,10,electricity,all-week,afternoon,2030,all-year,R1,0.17140000000,windturbine,2,2035 +3,10,electricity,all-week,early-peak,2030,all-year,R1,0.25710000000,windturbine,3,2035 +3,10,electricity,all-week,late-peak,2030,all-year,R1,0.50000000000,windturbine,4,2035 +3,10,electricity,all-week,evening,2030,all-year,R1,0.34290000000,windturbine,5,2035 +1,10,electricity,all-week,night,2020,all-year,R1,0.35000000000,windturbine,0,2040 +1,10,electricity,all-week,morning,2020,all-year,R1,0.52500000000,windturbine,1,2040 +1,10,electricity,all-week,afternoon,2020,all-year,R1,0.35000000000,windturbine,2,2040 +1,10,electricity,all-week,early-peak,2020,all-year,R1,0.52500000000,windturbine,3,2040 +1,10,electricity,all-week,late-peak,2020,all-year,R1,1.00000000000,windturbine,4,2040 +1,10,electricity,all-week,evening,2020,all-year,R1,0.70000000000,windturbine,5,2040 +2,10,electricity,all-week,night,2025,all-year,R1,0.29170000000,windturbine,0,2040 +2,10,electricity,all-week,morning,2025,all-year,R1,0.43750000000,windturbine,1,2040 +2,10,electricity,all-week,afternoon,2025,all-year,R1,0.29170000000,windturbine,2,2040 +2,10,electricity,all-week,early-peak,2025,all-year,R1,0.43750000000,windturbine,3,2040 +2,10,electricity,all-week,late-peak,2025,all-year,R1,0.83330000000,windturbine,4,2040 +2,10,electricity,all-week,evening,2025,all-year,R1,0.58330000000,windturbine,5,2040 +3,10,electricity,all-week,night,2030,all-year,R1,0.17500000000,windturbine,0,2040 +3,10,electricity,all-week,morning,2030,all-year,R1,0.26250000000,windturbine,1,2040 +3,10,electricity,all-week,afternoon,2030,all-year,R1,0.17500000000,windturbine,2,2040 +3,10,electricity,all-week,early-peak,2030,all-year,R1,0.26250000000,windturbine,3,2040 +3,10,electricity,all-week,late-peak,2030,all-year,R1,0.50000000000,windturbine,4,2040 +3,10,electricity,all-week,evening,2030,all-year,R1,0.35000000000,windturbine,5,2040 +4,10,electricity,all-week,night,2035,all-year,R1,0.11670000000,windturbine,0,2040 +4,10,electricity,all-week,morning,2035,all-year,R1,0.17500000000,windturbine,1,2040 +4,10,electricity,all-week,afternoon,2035,all-year,R1,0.11670000000,windturbine,2,2040 +4,10,electricity,all-week,early-peak,2035,all-year,R1,0.17500000000,windturbine,3,2040 +4,10,electricity,all-week,late-peak,2035,all-year,R1,0.33330000000,windturbine,4,2040 +4,10,electricity,all-week,evening,2035,all-year,R1,0.23330000000,windturbine,5,2040 +1,10,electricity,all-week,night,2020,all-year,R1,0.33680000000,windturbine,0,2045 +1,10,electricity,all-week,morning,2020,all-year,R1,0.50530000000,windturbine,1,2045 +1,10,electricity,all-week,afternoon,2020,all-year,R1,0.33680000000,windturbine,2,2045 +1,10,electricity,all-week,early-peak,2020,all-year,R1,0.50530000000,windturbine,3,2045 +1,10,electricity,all-week,late-peak,2020,all-year,R1,1.00000000000,windturbine,4,2045 +1,10,electricity,all-week,evening,2020,all-year,R1,0.67370000000,windturbine,5,2045 +2,10,electricity,all-week,night,2025,all-year,R1,0.28070000000,windturbine,0,2045 +2,10,electricity,all-week,morning,2025,all-year,R1,0.42110000000,windturbine,1,2045 +2,10,electricity,all-week,afternoon,2025,all-year,R1,0.28070000000,windturbine,2,2045 +2,10,electricity,all-week,early-peak,2025,all-year,R1,0.42110000000,windturbine,3,2045 +2,10,electricity,all-week,late-peak,2025,all-year,R1,0.83330000000,windturbine,4,2045 +2,10,electricity,all-week,evening,2025,all-year,R1,0.56140000000,windturbine,5,2045 +3,10,electricity,all-week,night,2030,all-year,R1,0.16840000000,windturbine,0,2045 +3,10,electricity,all-week,morning,2030,all-year,R1,0.25260000000,windturbine,1,2045 +3,10,electricity,all-week,afternoon,2030,all-year,R1,0.16840000000,windturbine,2,2045 +3,10,electricity,all-week,early-peak,2030,all-year,R1,0.25260000000,windturbine,3,2045 +3,10,electricity,all-week,late-peak,2030,all-year,R1,0.50000000000,windturbine,4,2045 +3,10,electricity,all-week,evening,2030,all-year,R1,0.33680000000,windturbine,5,2045 +4,10,electricity,all-week,night,2035,all-year,R1,0.11230000000,windturbine,0,2045 +4,10,electricity,all-week,morning,2035,all-year,R1,0.16840000000,windturbine,1,2045 +4,10,electricity,all-week,afternoon,2035,all-year,R1,0.11230000000,windturbine,2,2045 +4,10,electricity,all-week,early-peak,2035,all-year,R1,0.16840000000,windturbine,3,2045 +4,10,electricity,all-week,late-peak,2035,all-year,R1,0.33330000000,windturbine,4,2045 +4,10,electricity,all-week,evening,2035,all-year,R1,0.22460000000,windturbine,5,2045 +5,10,electricity,all-week,night,2040,all-year,R1,0.16840000000,windturbine,0,2045 +5,10,electricity,all-week,morning,2040,all-year,R1,0.25260000000,windturbine,1,2045 +5,10,electricity,all-week,afternoon,2040,all-year,R1,0.16840000000,windturbine,2,2045 +5,10,electricity,all-week,early-peak,2040,all-year,R1,0.25260000000,windturbine,3,2045 +5,10,electricity,all-week,late-peak,2040,all-year,R1,0.50000000000,windturbine,4,2045 +5,10,electricity,all-week,evening,2040,all-year,R1,0.33680000000,windturbine,5,2045 +2,10,electricity,all-week,night,2025,all-year,R1,0.28570000000,windturbine,0,2050 +2,10,electricity,all-week,morning,2025,all-year,R1,0.42860000000,windturbine,1,2050 +2,10,electricity,all-week,afternoon,2025,all-year,R1,0.28570000000,windturbine,2,2050 +2,10,electricity,all-week,early-peak,2025,all-year,R1,0.42860000000,windturbine,3,2050 +2,10,electricity,all-week,late-peak,2025,all-year,R1,0.83330000000,windturbine,4,2050 +2,10,electricity,all-week,evening,2025,all-year,R1,0.57140000000,windturbine,5,2050 +3,10,electricity,all-week,night,2030,all-year,R1,0.17140000000,windturbine,0,2050 +3,10,electricity,all-week,morning,2030,all-year,R1,0.25710000000,windturbine,1,2050 +3,10,electricity,all-week,afternoon,2030,all-year,R1,0.17140000000,windturbine,2,2050 +3,10,electricity,all-week,early-peak,2030,all-year,R1,0.25710000000,windturbine,3,2050 +3,10,electricity,all-week,late-peak,2030,all-year,R1,0.50000000000,windturbine,4,2050 +3,10,electricity,all-week,evening,2030,all-year,R1,0.34290000000,windturbine,5,2050 +4,10,electricity,all-week,night,2035,all-year,R1,0.11430000000,windturbine,0,2050 +4,10,electricity,all-week,morning,2035,all-year,R1,0.17140000000,windturbine,1,2050 +4,10,electricity,all-week,afternoon,2035,all-year,R1,0.11430000000,windturbine,2,2050 +4,10,electricity,all-week,early-peak,2035,all-year,R1,0.17140000000,windturbine,3,2050 +4,10,electricity,all-week,late-peak,2035,all-year,R1,0.33330000000,windturbine,4,2050 +4,10,electricity,all-week,evening,2035,all-year,R1,0.22860000000,windturbine,5,2050 +5,10,electricity,all-week,night,2040,all-year,R1,0.17140000000,windturbine,0,2050 +5,10,electricity,all-week,morning,2040,all-year,R1,0.25710000000,windturbine,1,2050 +5,10,electricity,all-week,afternoon,2040,all-year,R1,0.17140000000,windturbine,2,2050 +5,10,electricity,all-week,early-peak,2040,all-year,R1,0.25710000000,windturbine,3,2050 +5,10,electricity,all-week,late-peak,2040,all-year,R1,0.50000000000,windturbine,4,2050 +5,10,electricity,all-week,evening,2040,all-year,R1,0.34290000000,windturbine,5,2050 +6,10,electricity,all-week,night,2045,all-year,R1,0.45710000000,windturbine,0,2050 +6,10,electricity,all-week,morning,2045,all-year,R1,0.68570000000,windturbine,1,2050 +6,10,electricity,all-week,afternoon,2045,all-year,R1,0.45710000000,windturbine,2,2050 +6,10,electricity,all-week,early-peak,2045,all-year,R1,0.68570000000,windturbine,3,2050 +6,10,electricity,all-week,late-peak,2045,all-year,R1,1.33330000000,windturbine,4,2050 +6,10,electricity,all-week,evening,2045,all-year,R1,0.91430000000,windturbine,5,2050 diff --git a/docs/tutorial-code/min-max-timeslice-constraints/2-max-constraint/Results/MCACapacity.csv b/docs/tutorial-code/min-max-timeslice-constraints/2-max-constraint/Results/MCACapacity.csv index aada2b7b5..d48ab6c91 100644 --- a/docs/tutorial-code/min-max-timeslice-constraints/2-max-constraint/Results/MCACapacity.csv +++ b/docs/tutorial-code/min-max-timeslice-constraints/2-max-constraint/Results/MCACapacity.csv @@ -4,35 +4,57 @@ A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2020 A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2020 A1,5.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2025 A1,19.00000000000,R1,2020,R1,residential,heatpump,newcapa,2025 -A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2025 -A1,20.54670000000,R1,2020,R1,gas,gassupply1,newcapa,2025 +A1,6.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2025 +A1,1.00000000000,R1,2020,R1,power,windturbine,newcapa,2025 +A1,18.69110000000,R1,2020,R1,gas,gassupply1,newcapa,2025 A1,19.00000000000,R1,2020,R1,residential,heatpump,newcapa,2030 A1,10.00000000000,R1,2025,R1,residential,heatpump,newcapa,2030 -A1,1.00000000000,R1,2025,R1,power,windturbine,newcapa,2030 -A1,13.04670000000,R1,2020,R1,gas,gassupply1,newcapa,2030 +A1,5.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2030 +A1,5.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2030 +A1,1.00000000000,R1,2020,R1,power,windturbine,newcapa,2030 +A1,11.19110000000,R1,2020,R1,gas,gassupply1,newcapa,2030 +A1,8.47780000000,R1,2025,R1,gas,gassupply1,newcapa,2030 A1,10.00000000000,R1,2025,R1,residential,heatpump,newcapa,2035 A1,26.00000000000,R1,2030,R1,residential,heatpump,newcapa,2035 -A1,1.00000000000,R1,2025,R1,power,windturbine,newcapa,2035 -A1,1.00000000000,R1,2030,R1,power,windturbine,newcapa,2035 -A1,5.54670000000,R1,2020,R1,gas,gassupply1,newcapa,2035 +A1,5.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2035 +A1,5.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2035 +A1,3.00000000000,R1,2030,R1,power,gasCCGT,newcapa,2035 +A1,1.00000000000,R1,2020,R1,power,windturbine,newcapa,2035 +A1,3.69110000000,R1,2020,R1,gas,gassupply1,newcapa,2035 +A1,8.47780000000,R1,2025,R1,gas,gassupply1,newcapa,2035 +A1,12.69560000000,R1,2030,R1,gas,gassupply1,newcapa,2035 A1,26.00000000000,R1,2030,R1,residential,heatpump,newcapa,2040 A1,16.00000000000,R1,2035,R1,residential,heatpump,newcapa,2040 -A1,1.00000000000,R1,2025,R1,power,windturbine,newcapa,2040 -A1,1.00000000000,R1,2030,R1,power,windturbine,newcapa,2040 -A1,1.00000000000,R1,2035,R1,power,windturbine,newcapa,2040 -A1,5.54670000000,R1,2020,R1,gas,gassupply1,newcapa,2040 +A1,5.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2040 +A1,5.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2040 +A1,3.00000000000,R1,2030,R1,power,gasCCGT,newcapa,2040 +A1,2.00000000000,R1,2035,R1,power,gasCCGT,newcapa,2040 +A1,1.00000000000,R1,2020,R1,power,windturbine,newcapa,2040 +A1,3.69110000000,R1,2020,R1,gas,gassupply1,newcapa,2040 +A1,8.47780000000,R1,2025,R1,gas,gassupply1,newcapa,2040 +A1,12.69560000000,R1,2030,R1,gas,gassupply1,newcapa,2040 +A1,8.90670000000,R1,2035,R1,gas,gassupply1,newcapa,2040 A1,16.00000000000,R1,2035,R1,residential,heatpump,newcapa,2045 A1,32.00000000000,R1,2040,R1,residential,heatpump,newcapa,2045 -A1,1.00000000000,R1,2025,R1,power,windturbine,newcapa,2045 -A1,1.00000000000,R1,2030,R1,power,windturbine,newcapa,2045 -A1,1.00000000000,R1,2035,R1,power,windturbine,newcapa,2045 -A1,2.00000000000,R1,2040,R1,power,windturbine,newcapa,2045 -A1,5.54670000000,R1,2020,R1,gas,gassupply1,newcapa,2045 +A1,5.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2045 +A1,5.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2045 +A1,3.00000000000,R1,2030,R1,power,gasCCGT,newcapa,2045 +A1,2.00000000000,R1,2035,R1,power,gasCCGT,newcapa,2045 +A1,1.00000000000,R1,2020,R1,power,windturbine,newcapa,2045 +A1,3.00000000000,R1,2040,R1,power,windturbine,newcapa,2045 +A1,3.69110000000,R1,2020,R1,gas,gassupply1,newcapa,2045 +A1,8.47780000000,R1,2025,R1,gas,gassupply1,newcapa,2045 +A1,12.69560000000,R1,2030,R1,gas,gassupply1,newcapa,2045 +A1,8.90670000000,R1,2035,R1,gas,gassupply1,newcapa,2045 A1,32.00000000000,R1,2040,R1,residential,heatpump,newcapa,2050 A1,22.00000000000,R1,2045,R1,residential,heatpump,newcapa,2050 -A1,1.00000000000,R1,2025,R1,power,windturbine,newcapa,2050 -A1,1.00000000000,R1,2030,R1,power,windturbine,newcapa,2050 -A1,1.00000000000,R1,2035,R1,power,windturbine,newcapa,2050 -A1,2.00000000000,R1,2040,R1,power,windturbine,newcapa,2050 -A1,2.00000000000,R1,2045,R1,power,windturbine,newcapa,2050 -A1,5.54670000000,R1,2020,R1,gas,gassupply1,newcapa,2050 +A1,5.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2050 +A1,5.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2050 +A1,3.00000000000,R1,2030,R1,power,gasCCGT,newcapa,2050 +A1,2.00000000000,R1,2035,R1,power,gasCCGT,newcapa,2050 +A1,3.00000000000,R1,2040,R1,power,windturbine,newcapa,2050 +A1,3.00000000000,R1,2045,R1,power,windturbine,newcapa,2050 +A1,3.69110000000,R1,2020,R1,gas,gassupply1,newcapa,2050 +A1,8.47780000000,R1,2025,R1,gas,gassupply1,newcapa,2050 +A1,12.69560000000,R1,2030,R1,gas,gassupply1,newcapa,2050 +A1,8.90670000000,R1,2035,R1,gas,gassupply1,newcapa,2050 diff --git a/docs/tutorial-code/min-max-timeslice-constraints/2-max-constraint/Results/MCAPrices.csv b/docs/tutorial-code/min-max-timeslice-constraints/2-max-constraint/Results/MCAPrices.csv index 1994c078f..827883027 100644 --- a/docs/tutorial-code/min-max-timeslice-constraints/2-max-constraint/Results/MCAPrices.csv +++ b/docs/tutorial-code/min-max-timeslice-constraints/2-max-constraint/Results/MCAPrices.csv @@ -23,147 +23,147 @@ electricity,all-week,evening,all-year,19.50000000000,R1,5,MUS$2010/PJ,2020 gas,all-week,evening,all-year,7.15280000000,R1,5,MUS$2010/PJ,2020 heat,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.08310000000,R1,5,MUS$2010/kt,2020 -electricity,all-week,night,all-year,12.20640000000,R1,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,7.65120000000,R1,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,5.81000000000,R1,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,4.36760000000,R1,0,MUS$2010/PJ,2025 CO2f,all-week,night,all-year,0.12010000000,R1,0,MUS$2010/kt,2025 -electricity,all-week,morning,all-year,12.20640000000,R1,1,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,10.77570000000,R1,1,MUS$2010/PJ,2025 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,5.81000000000,R1,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,5.35700000000,R1,1,MUS$2010/PJ,2025 CO2f,all-week,morning,all-year,0.12010000000,R1,1,MUS$2010/kt,2025 electricity,all-week,afternoon,all-year,12.20640000000,R1,2,MUS$2010/PJ,2025 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2025 heat,all-week,afternoon,all-year,5.81000000000,R1,2,MUS$2010/PJ,2025 CO2f,all-week,afternoon,all-year,0.12010000000,R1,2,MUS$2010/kt,2025 -electricity,all-week,early-peak,all-year,12.20640000000,R1,3,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,9.16960000000,R1,3,MUS$2010/PJ,2025 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,5.81000000000,R1,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,4.84840000000,R1,3,MUS$2010/PJ,2025 CO2f,all-week,early-peak,all-year,0.12010000000,R1,3,MUS$2010/kt,2025 -electricity,all-week,late-peak,all-year,12.20640000000,R1,4,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,10.68800000000,R1,4,MUS$2010/PJ,2025 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,5.81000000000,R1,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,5.32920000000,R1,4,MUS$2010/PJ,2025 CO2f,all-week,late-peak,all-year,0.12010000000,R1,4,MUS$2010/kt,2025 electricity,all-week,evening,all-year,12.20640000000,R1,5,MUS$2010/PJ,2025 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2025 heat,all-week,evening,all-year,5.81000000000,R1,5,MUS$2010/PJ,2025 CO2f,all-week,evening,all-year,0.12010000000,R1,5,MUS$2010/kt,2025 -electricity,all-week,night,all-year,0.66670000000,R1,0,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,11.86040000000,R1,0,MUS$2010/PJ,2030 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,0.50720000000,R1,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,4.98470000000,R1,0,MUS$2010/PJ,2030 CO2f,all-week,night,all-year,0.15700000000,R1,0,MUS$2010/kt,2030 -electricity,all-week,morning,all-year,1.33330000000,R1,1,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,14.40350000000,R1,1,MUS$2010/PJ,2030 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,0.77380000000,R1,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,6.00190000000,R1,1,MUS$2010/PJ,2030 CO2f,all-week,morning,all-year,0.15700000000,R1,1,MUS$2010/kt,2030 -electricity,all-week,afternoon,all-year,1.33330000000,R1,2,MUS$2010/PJ,2030 +electricity,all-week,afternoon,all-year,15.59170000000,R1,2,MUS$2010/PJ,2030 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,0.77380000000,R1,2,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,6.47720000000,R1,2,MUS$2010/PJ,2030 CO2f,all-week,afternoon,all-year,0.15700000000,R1,2,MUS$2010/kt,2030 -electricity,all-week,early-peak,all-year,0.66670000000,R1,3,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,13.10420000000,R1,3,MUS$2010/PJ,2030 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,0.50720000000,R1,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,5.48220000000,R1,3,MUS$2010/PJ,2030 CO2f,all-week,early-peak,all-year,0.15700000000,R1,3,MUS$2010/kt,2030 -electricity,all-week,late-peak,all-year,0.66670000000,R1,4,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,14.30500000000,R1,4,MUS$2010/PJ,2030 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,0.50720000000,R1,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,5.96250000000,R1,4,MUS$2010/PJ,2030 CO2f,all-week,late-peak,all-year,0.15700000000,R1,4,MUS$2010/kt,2030 -electricity,all-week,evening,all-year,0.66670000000,R1,5,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,15.59170000000,R1,5,MUS$2010/PJ,2030 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,0.50720000000,R1,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,6.47720000000,R1,5,MUS$2010/PJ,2030 CO2f,all-week,evening,all-year,0.15700000000,R1,5,MUS$2010/kt,2030 -electricity,all-week,night,all-year,0.66670000000,R1,0,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,16.68270000000,R1,0,MUS$2010/PJ,2035 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,0.50720000000,R1,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,6.91360000000,R1,0,MUS$2010/PJ,2035 CO2f,all-week,night,all-year,0.21490000000,R1,0,MUS$2010/kt,2035 -electricity,all-week,morning,all-year,1.33330000000,R1,1,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,19.53880000000,R1,1,MUS$2010/PJ,2035 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,0.77380000000,R1,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,8.05600000000,R1,1,MUS$2010/PJ,2035 CO2f,all-week,morning,all-year,0.21490000000,R1,1,MUS$2010/kt,2035 -electricity,all-week,afternoon,all-year,1.33330000000,R1,2,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,20.89740000000,R1,2,MUS$2010/PJ,2035 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,0.77380000000,R1,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,8.59950000000,R1,2,MUS$2010/PJ,2035 CO2f,all-week,afternoon,all-year,0.21490000000,R1,2,MUS$2010/kt,2035 -electricity,all-week,early-peak,all-year,0.66670000000,R1,3,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,18.08760000000,R1,3,MUS$2010/PJ,2035 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,0.50720000000,R1,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,7.47550000000,R1,3,MUS$2010/PJ,2035 CO2f,all-week,early-peak,all-year,0.21490000000,R1,3,MUS$2010/kt,2035 -electricity,all-week,late-peak,all-year,0.66670000000,R1,4,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,19.49250000000,R1,4,MUS$2010/PJ,2035 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,0.50720000000,R1,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,8.03750000000,R1,4,MUS$2010/PJ,2035 CO2f,all-week,late-peak,all-year,0.21490000000,R1,4,MUS$2010/kt,2035 -electricity,all-week,evening,all-year,0.66670000000,R1,5,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,20.89740000000,R1,5,MUS$2010/PJ,2035 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,0.50720000000,R1,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,8.59950000000,R1,5,MUS$2010/PJ,2035 CO2f,all-week,evening,all-year,0.21490000000,R1,5,MUS$2010/kt,2035 -electricity,all-week,night,all-year,0.66670000000,R1,0,MUS$2010/PJ,2040 +electricity,all-week,night,all-year,21.64310000000,R1,0,MUS$2010/PJ,2040 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,0.50720000000,R1,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,8.89770000000,R1,0,MUS$2010/PJ,2040 CO2f,all-week,night,all-year,0.27280000000,R1,0,MUS$2010/kt,2040 -electricity,all-week,morning,all-year,1.33330000000,R1,1,MUS$2010/PJ,2040 +electricity,all-week,morning,all-year,24.72290000000,R1,1,MUS$2010/PJ,2040 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,0.77380000000,R1,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,10.12960000000,R1,1,MUS$2010/PJ,2040 CO2f,all-week,morning,all-year,0.27280000000,R1,1,MUS$2010/kt,2040 -electricity,all-week,afternoon,all-year,1.33330000000,R1,2,MUS$2010/PJ,2040 +electricity,all-week,afternoon,all-year,26.20320000000,R1,2,MUS$2010/PJ,2040 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2040 -heat,all-week,afternoon,all-year,0.77380000000,R1,2,MUS$2010/PJ,2040 +heat,all-week,afternoon,all-year,10.72180000000,R1,2,MUS$2010/PJ,2040 CO2f,all-week,afternoon,all-year,0.27280000000,R1,2,MUS$2010/kt,2040 -electricity,all-week,early-peak,all-year,0.66670000000,R1,3,MUS$2010/PJ,2040 +electricity,all-week,early-peak,all-year,23.16320000000,R1,3,MUS$2010/PJ,2040 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,0.50720000000,R1,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,9.50580000000,R1,3,MUS$2010/PJ,2040 CO2f,all-week,early-peak,all-year,0.27280000000,R1,3,MUS$2010/kt,2040 -electricity,all-week,late-peak,all-year,0.66670000000,R1,4,MUS$2010/PJ,2040 +electricity,all-week,late-peak,all-year,24.68320000000,R1,4,MUS$2010/PJ,2040 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,0.50720000000,R1,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,10.11380000000,R1,4,MUS$2010/PJ,2040 CO2f,all-week,late-peak,all-year,0.27280000000,R1,4,MUS$2010/kt,2040 -electricity,all-week,evening,all-year,0.66670000000,R1,5,MUS$2010/PJ,2040 +electricity,all-week,evening,all-year,26.20320000000,R1,5,MUS$2010/PJ,2040 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,0.50720000000,R1,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,10.72180000000,R1,5,MUS$2010/PJ,2040 CO2f,all-week,evening,all-year,0.27280000000,R1,5,MUS$2010/kt,2040 -electricity,all-week,night,all-year,0.66670000000,R1,0,MUS$2010/PJ,2045 +electricity,all-week,night,all-year,16.12570000000,R1,0,MUS$2010/PJ,2045 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2045 -heat,all-week,night,all-year,0.50720000000,R1,0,MUS$2010/PJ,2045 +heat,all-week,night,all-year,6.69080000000,R1,0,MUS$2010/PJ,2045 CO2f,all-week,night,all-year,0.35390000000,R1,0,MUS$2010/kt,2045 -electricity,all-week,morning,all-year,1.33330000000,R1,1,MUS$2010/PJ,2045 +electricity,all-week,morning,all-year,26.91420000000,R1,1,MUS$2010/PJ,2045 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2045 -heat,all-week,morning,all-year,0.77380000000,R1,1,MUS$2010/PJ,2045 +heat,all-week,morning,all-year,11.00620000000,R1,1,MUS$2010/PJ,2045 CO2f,all-week,morning,all-year,0.35390000000,R1,1,MUS$2010/kt,2045 -electricity,all-week,afternoon,all-year,1.33330000000,R1,2,MUS$2010/PJ,2045 +electricity,all-week,afternoon,all-year,33.64600000000,R1,2,MUS$2010/PJ,2045 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2045 -heat,all-week,afternoon,all-year,0.77380000000,R1,2,MUS$2010/PJ,2045 +heat,all-week,afternoon,all-year,13.69890000000,R1,2,MUS$2010/PJ,2045 CO2f,all-week,afternoon,all-year,0.35390000000,R1,2,MUS$2010/kt,2045 -electricity,all-week,early-peak,all-year,0.66670000000,R1,3,MUS$2010/PJ,2045 +electricity,all-week,early-peak,all-year,21.27880000000,R1,3,MUS$2010/PJ,2045 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2045 -heat,all-week,early-peak,all-year,0.50720000000,R1,3,MUS$2010/PJ,2045 +heat,all-week,early-peak,all-year,8.75200000000,R1,3,MUS$2010/PJ,2045 CO2f,all-week,early-peak,all-year,0.35390000000,R1,3,MUS$2010/kt,2045 -electricity,all-week,late-peak,all-year,0.66670000000,R1,4,MUS$2010/PJ,2045 +electricity,all-week,late-peak,all-year,26.77530000000,R1,4,MUS$2010/PJ,2045 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2045 -heat,all-week,late-peak,all-year,0.50720000000,R1,4,MUS$2010/PJ,2045 +heat,all-week,late-peak,all-year,10.95060000000,R1,4,MUS$2010/PJ,2045 CO2f,all-week,late-peak,all-year,0.35390000000,R1,4,MUS$2010/kt,2045 -electricity,all-week,evening,all-year,0.66670000000,R1,5,MUS$2010/PJ,2045 +electricity,all-week,evening,all-year,33.64600000000,R1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2045 -heat,all-week,evening,all-year,0.50720000000,R1,5,MUS$2010/PJ,2045 +heat,all-week,evening,all-year,13.69890000000,R1,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045 -electricity,all-week,night,all-year,0.66670000000,R1,0,MUS$2010/PJ,2050 +electricity,all-week,night,all-year,17.50920000000,R1,0,MUS$2010/PJ,2050 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,0.50720000000,R1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,7.24420000000,R1,0,MUS$2010/PJ,2050 CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050 -electricity,all-week,morning,all-year,1.33330000000,R1,1,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,30.04560000000,R1,1,MUS$2010/PJ,2050 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,0.77380000000,R1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,12.25880000000,R1,1,MUS$2010/PJ,2050 CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050 -electricity,all-week,afternoon,all-year,1.33330000000,R1,2,MUS$2010/PJ,2050 +electricity,all-week,afternoon,all-year,41.08880000000,R1,2,MUS$2010/PJ,2050 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,0.77380000000,R1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,16.67600000000,R1,2,MUS$2010/PJ,2050 CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050 -electricity,all-week,early-peak,all-year,0.66670000000,R1,3,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,23.12340000000,R1,3,MUS$2010/PJ,2050 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,0.50720000000,R1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,9.48990000000,R1,3,MUS$2010/PJ,2050 CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050 -electricity,all-week,late-peak,all-year,0.66670000000,R1,4,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,29.86040000000,R1,4,MUS$2010/PJ,2050 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,0.50720000000,R1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,12.18470000000,R1,4,MUS$2010/PJ,2050 CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050 -electricity,all-week,evening,all-year,0.66670000000,R1,5,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,41.08880000000,R1,5,MUS$2010/PJ,2050 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,0.50720000000,R1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,16.67600000000,R1,5,MUS$2010/PJ,2050 CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050 diff --git a/docs/tutorial-code/min-max-timeslice-constraints/2-max-constraint/Results/Power_Supply.csv b/docs/tutorial-code/min-max-timeslice-constraints/2-max-constraint/Results/Power_Supply.csv index 173adbe8e..963f75463 100644 --- a/docs/tutorial-code/min-max-timeslice-constraints/2-max-constraint/Results/Power_Supply.csv +++ b/docs/tutorial-code/min-max-timeslice-constraints/2-max-constraint/Results/Power_Supply.csv @@ -1,115 +1,261 @@ asset,comm_usage,commodity,day,hour,installed,month,region,supply,technology,timeslice,year -0,10,electricity,all-week,night,2020,all-year,R1,0.20000000000,gasCCGT,0,2020 -0,6,CO2f,all-week,night,2020,all-year,R1,18.33400000000,gasCCGT,0,2020 -0,10,electricity,all-week,morning,2020,all-year,R1,0.40000000000,gasCCGT,1,2020 -0,6,CO2f,all-week,morning,2020,all-year,R1,36.66800000000,gasCCGT,1,2020 -0,10,electricity,all-week,afternoon,2020,all-year,R1,0.60000000000,gasCCGT,2,2020 -0,6,CO2f,all-week,afternoon,2020,all-year,R1,55.00200000000,gasCCGT,2,2020 -0,10,electricity,all-week,early-peak,2020,all-year,R1,0.40000000000,gasCCGT,3,2020 -0,6,CO2f,all-week,early-peak,2020,all-year,R1,36.66800000000,gasCCGT,3,2020 -0,10,electricity,all-week,late-peak,2020,all-year,R1,0.80000000000,gasCCGT,4,2020 -0,6,CO2f,all-week,late-peak,2020,all-year,R1,73.33600000000,gasCCGT,4,2020 -0,10,electricity,all-week,evening,2020,all-year,R1,1.00000000000,gasCCGT,5,2020 -0,6,CO2f,all-week,evening,2020,all-year,R1,91.67000000000,gasCCGT,5,2020 -0,10,electricity,all-week,night,2020,all-year,R1,0.42220000000,gasCCGT,0,2025 -0,6,CO2f,all-week,night,2020,all-year,R1,38.70510000000,gasCCGT,0,2025 -0,10,electricity,all-week,morning,2020,all-year,R1,0.63330000000,gasCCGT,1,2025 -0,6,CO2f,all-week,morning,2020,all-year,R1,58.05770000000,gasCCGT,1,2025 +0,10,electricity,all-week,night,2020,all-year,R1,0.03330000000,gasCCGT,0,2020 +0,6,CO2f,all-week,night,2020,all-year,R1,3.05570000000,gasCCGT,0,2020 +0,10,electricity,all-week,morning,2020,all-year,R1,0.06670000000,gasCCGT,1,2020 +0,6,CO2f,all-week,morning,2020,all-year,R1,6.11130000000,gasCCGT,1,2020 +0,10,electricity,all-week,afternoon,2020,all-year,R1,0.10000000000,gasCCGT,2,2020 +0,6,CO2f,all-week,afternoon,2020,all-year,R1,9.16700000000,gasCCGT,2,2020 +0,10,electricity,all-week,early-peak,2020,all-year,R1,0.06670000000,gasCCGT,3,2020 +0,6,CO2f,all-week,early-peak,2020,all-year,R1,6.11130000000,gasCCGT,3,2020 +0,10,electricity,all-week,late-peak,2020,all-year,R1,0.13330000000,gasCCGT,4,2020 +0,6,CO2f,all-week,late-peak,2020,all-year,R1,12.22270000000,gasCCGT,4,2020 +0,10,electricity,all-week,evening,2020,all-year,R1,0.16670000000,gasCCGT,5,2020 +0,6,CO2f,all-week,evening,2020,all-year,R1,15.27830000000,gasCCGT,5,2020 +0,10,electricity,all-week,night,2020,all-year,R1,0.25560000000,gasCCGT,0,2025 +0,6,CO2f,all-week,night,2020,all-year,R1,23.42680000000,gasCCGT,0,2025 +0,10,electricity,all-week,morning,2020,all-year,R1,0.55000000000,gasCCGT,1,2025 +0,6,CO2f,all-week,morning,2020,all-year,R1,50.41850000000,gasCCGT,1,2025 0,10,electricity,all-week,afternoon,2020,all-year,R1,0.60000000000,gasCCGT,2,2025 0,6,CO2f,all-week,afternoon,2020,all-year,R1,55.00200000000,gasCCGT,2,2025 -0,10,electricity,all-week,early-peak,2020,all-year,R1,0.63330000000,gasCCGT,3,2025 -0,6,CO2f,all-week,early-peak,2020,all-year,R1,58.05770000000,gasCCGT,3,2025 -0,10,electricity,all-week,late-peak,2020,all-year,R1,1.26670000000,gasCCGT,4,2025 -0,6,CO2f,all-week,late-peak,2020,all-year,R1,116.11530000000,gasCCGT,4,2025 +0,10,electricity,all-week,early-peak,2020,all-year,R1,0.46670000000,gasCCGT,3,2025 +0,6,CO2f,all-week,early-peak,2020,all-year,R1,42.77930000000,gasCCGT,3,2025 +0,10,electricity,all-week,late-peak,2020,all-year,R1,1.10000000000,gasCCGT,4,2025 +0,6,CO2f,all-week,late-peak,2020,all-year,R1,100.83700000000,gasCCGT,4,2025 0,10,electricity,all-week,evening,2020,all-year,R1,1.00000000000,gasCCGT,5,2025 0,6,CO2f,all-week,evening,2020,all-year,R1,91.67000000000,gasCCGT,5,2025 -4,10,electricity,all-week,night,2025,all-year,R1,0.66670000000,windturbine,0,2030 -4,10,electricity,all-week,morning,2025,all-year,R1,0.50000000000,windturbine,1,2030 -4,10,electricity,all-week,afternoon,2025,all-year,R1,0.50000000000,windturbine,2,2030 -4,10,electricity,all-week,early-peak,2025,all-year,R1,1.00000000000,windturbine,3,2030 -4,10,electricity,all-week,late-peak,2025,all-year,R1,1.00000000000,windturbine,4,2030 -4,10,electricity,all-week,evening,2025,all-year,R1,1.00000000000,windturbine,5,2030 -5,10,electricity,all-week,night,2025,all-year,R1,0.40000000000,windturbine,0,2035 -6,10,electricity,all-week,night,2030,all-year,R1,0.40000000000,windturbine,0,2035 -5,10,electricity,all-week,morning,2025,all-year,R1,0.50000000000,windturbine,1,2035 -6,10,electricity,all-week,morning,2030,all-year,R1,0.50000000000,windturbine,1,2035 -5,10,electricity,all-week,afternoon,2025,all-year,R1,0.40000000000,windturbine,2,2035 -6,10,electricity,all-week,afternoon,2030,all-year,R1,0.40000000000,windturbine,2,2035 -5,10,electricity,all-week,early-peak,2025,all-year,R1,0.60000000000,windturbine,3,2035 -6,10,electricity,all-week,early-peak,2030,all-year,R1,0.60000000000,windturbine,3,2035 -5,10,electricity,all-week,late-peak,2025,all-year,R1,1.00000000000,windturbine,4,2035 -6,10,electricity,all-week,late-peak,2030,all-year,R1,1.00000000000,windturbine,4,2035 -5,10,electricity,all-week,evening,2025,all-year,R1,0.80000000000,windturbine,5,2035 -6,10,electricity,all-week,evening,2030,all-year,R1,0.80000000000,windturbine,5,2035 -6,10,electricity,all-week,night,2025,all-year,R1,0.31110000000,windturbine,0,2040 -7,10,electricity,all-week,night,2030,all-year,R1,0.31110000000,windturbine,0,2040 -8,10,electricity,all-week,night,2035,all-year,R1,0.31110000000,windturbine,0,2040 -6,10,electricity,all-week,morning,2025,all-year,R1,0.46670000000,windturbine,1,2040 -7,10,electricity,all-week,morning,2030,all-year,R1,0.46670000000,windturbine,1,2040 -8,10,electricity,all-week,morning,2035,all-year,R1,0.46670000000,windturbine,1,2040 -6,10,electricity,all-week,afternoon,2025,all-year,R1,0.31110000000,windturbine,2,2040 -7,10,electricity,all-week,afternoon,2030,all-year,R1,0.31110000000,windturbine,2,2040 -8,10,electricity,all-week,afternoon,2035,all-year,R1,0.31110000000,windturbine,2,2040 -6,10,electricity,all-week,early-peak,2025,all-year,R1,0.46670000000,windturbine,3,2040 -7,10,electricity,all-week,early-peak,2030,all-year,R1,0.46670000000,windturbine,3,2040 -8,10,electricity,all-week,early-peak,2035,all-year,R1,0.46670000000,windturbine,3,2040 -6,10,electricity,all-week,late-peak,2025,all-year,R1,0.93330000000,windturbine,4,2040 -7,10,electricity,all-week,late-peak,2030,all-year,R1,0.93330000000,windturbine,4,2040 -8,10,electricity,all-week,late-peak,2035,all-year,R1,0.93330000000,windturbine,4,2040 -6,10,electricity,all-week,evening,2025,all-year,R1,0.62220000000,windturbine,5,2040 -7,10,electricity,all-week,evening,2030,all-year,R1,0.62220000000,windturbine,5,2040 -8,10,electricity,all-week,evening,2035,all-year,R1,0.62220000000,windturbine,5,2040 -7,10,electricity,all-week,night,2025,all-year,R1,0.21330000000,windturbine,0,2045 -8,10,electricity,all-week,night,2030,all-year,R1,0.21330000000,windturbine,0,2045 -9,10,electricity,all-week,night,2035,all-year,R1,0.21330000000,windturbine,0,2045 -10,10,electricity,all-week,night,2040,all-year,R1,0.42670000000,windturbine,0,2045 -7,10,electricity,all-week,morning,2025,all-year,R1,0.32000000000,windturbine,1,2045 -8,10,electricity,all-week,morning,2030,all-year,R1,0.32000000000,windturbine,1,2045 -9,10,electricity,all-week,morning,2035,all-year,R1,0.32000000000,windturbine,1,2045 -10,10,electricity,all-week,morning,2040,all-year,R1,0.64000000000,windturbine,1,2045 -7,10,electricity,all-week,afternoon,2025,all-year,R1,0.21330000000,windturbine,2,2045 -8,10,electricity,all-week,afternoon,2030,all-year,R1,0.21330000000,windturbine,2,2045 -9,10,electricity,all-week,afternoon,2035,all-year,R1,0.21330000000,windturbine,2,2045 -10,10,electricity,all-week,afternoon,2040,all-year,R1,0.42670000000,windturbine,2,2045 -7,10,electricity,all-week,early-peak,2025,all-year,R1,0.32000000000,windturbine,3,2045 -8,10,electricity,all-week,early-peak,2030,all-year,R1,0.32000000000,windturbine,3,2045 -9,10,electricity,all-week,early-peak,2035,all-year,R1,0.32000000000,windturbine,3,2045 -10,10,electricity,all-week,early-peak,2040,all-year,R1,0.64000000000,windturbine,3,2045 -7,10,electricity,all-week,late-peak,2025,all-year,R1,0.64000000000,windturbine,4,2045 -8,10,electricity,all-week,late-peak,2030,all-year,R1,0.64000000000,windturbine,4,2045 -9,10,electricity,all-week,late-peak,2035,all-year,R1,0.64000000000,windturbine,4,2045 -10,10,electricity,all-week,late-peak,2040,all-year,R1,1.28000000000,windturbine,4,2045 -7,10,electricity,all-week,evening,2025,all-year,R1,0.42670000000,windturbine,5,2045 -8,10,electricity,all-week,evening,2030,all-year,R1,0.42670000000,windturbine,5,2045 -9,10,electricity,all-week,evening,2035,all-year,R1,0.42670000000,windturbine,5,2045 -10,10,electricity,all-week,evening,2040,all-year,R1,0.85330000000,windturbine,5,2045 -8,10,electricity,all-week,night,2025,all-year,R1,0.17140000000,windturbine,0,2050 -9,10,electricity,all-week,night,2030,all-year,R1,0.17140000000,windturbine,0,2050 -10,10,electricity,all-week,night,2035,all-year,R1,0.17140000000,windturbine,0,2050 -11,10,electricity,all-week,night,2040,all-year,R1,0.34290000000,windturbine,0,2050 -12,10,electricity,all-week,night,2045,all-year,R1,0.34290000000,windturbine,0,2050 -8,10,electricity,all-week,morning,2025,all-year,R1,0.25710000000,windturbine,1,2050 -9,10,electricity,all-week,morning,2030,all-year,R1,0.25710000000,windturbine,1,2050 -10,10,electricity,all-week,morning,2035,all-year,R1,0.25710000000,windturbine,1,2050 -11,10,electricity,all-week,morning,2040,all-year,R1,0.51430000000,windturbine,1,2050 -12,10,electricity,all-week,morning,2045,all-year,R1,0.51430000000,windturbine,1,2050 -8,10,electricity,all-week,afternoon,2025,all-year,R1,0.17140000000,windturbine,2,2050 -9,10,electricity,all-week,afternoon,2030,all-year,R1,0.17140000000,windturbine,2,2050 -10,10,electricity,all-week,afternoon,2035,all-year,R1,0.17140000000,windturbine,2,2050 -11,10,electricity,all-week,afternoon,2040,all-year,R1,0.34290000000,windturbine,2,2050 -12,10,electricity,all-week,afternoon,2045,all-year,R1,0.34290000000,windturbine,2,2050 -8,10,electricity,all-week,early-peak,2025,all-year,R1,0.25710000000,windturbine,3,2050 -9,10,electricity,all-week,early-peak,2030,all-year,R1,0.25710000000,windturbine,3,2050 -10,10,electricity,all-week,early-peak,2035,all-year,R1,0.25710000000,windturbine,3,2050 -11,10,electricity,all-week,early-peak,2040,all-year,R1,0.51430000000,windturbine,3,2050 -12,10,electricity,all-week,early-peak,2045,all-year,R1,0.51430000000,windturbine,3,2050 -8,10,electricity,all-week,late-peak,2025,all-year,R1,0.51430000000,windturbine,4,2050 -9,10,electricity,all-week,late-peak,2030,all-year,R1,0.51430000000,windturbine,4,2050 -10,10,electricity,all-week,late-peak,2035,all-year,R1,0.51430000000,windturbine,4,2050 -11,10,electricity,all-week,late-peak,2040,all-year,R1,1.02860000000,windturbine,4,2050 -12,10,electricity,all-week,late-peak,2045,all-year,R1,1.02860000000,windturbine,4,2050 -8,10,electricity,all-week,evening,2025,all-year,R1,0.34290000000,windturbine,5,2050 -9,10,electricity,all-week,evening,2030,all-year,R1,0.34290000000,windturbine,5,2050 -10,10,electricity,all-week,evening,2035,all-year,R1,0.34290000000,windturbine,5,2050 -11,10,electricity,all-week,evening,2040,all-year,R1,0.68570000000,windturbine,5,2050 -12,10,electricity,all-week,evening,2045,all-year,R1,0.68570000000,windturbine,5,2050 +2,10,electricity,all-week,night,2020,all-year,R1,0.16670000000,windturbine,0,2025 +2,10,electricity,all-week,morning,2020,all-year,R1,0.08330000000,windturbine,1,2025 +2,10,electricity,all-week,early-peak,2020,all-year,R1,0.16670000000,windturbine,3,2025 +2,10,electricity,all-week,late-peak,2020,all-year,R1,0.16670000000,windturbine,4,2025 +0,10,electricity,all-week,night,2020,all-year,R1,0.25000000000,gasCCGT,0,2030 +0,6,CO2f,all-week,night,2020,all-year,R1,22.91750000000,gasCCGT,0,2030 +0,10,electricity,all-week,morning,2020,all-year,R1,0.45830000000,gasCCGT,1,2030 +0,6,CO2f,all-week,morning,2020,all-year,R1,42.01540000000,gasCCGT,1,2030 +0,10,electricity,all-week,afternoon,2020,all-year,R1,0.50000000000,gasCCGT,2,2030 +0,6,CO2f,all-week,afternoon,2020,all-year,R1,45.83500000000,gasCCGT,2,2030 +0,10,electricity,all-week,early-peak,2020,all-year,R1,0.41670000000,gasCCGT,3,2030 +0,6,CO2f,all-week,early-peak,2020,all-year,R1,38.19580000000,gasCCGT,3,2030 +0,10,electricity,all-week,late-peak,2020,all-year,R1,0.88330000000,gasCCGT,4,2030 +0,6,CO2f,all-week,late-peak,2020,all-year,R1,80.97520000000,gasCCGT,4,2030 +0,10,electricity,all-week,evening,2020,all-year,R1,0.83330000000,gasCCGT,5,2030 +0,6,CO2f,all-week,evening,2020,all-year,R1,76.39170000000,gasCCGT,5,2030 +1,10,electricity,all-week,night,2025,all-year,R1,0.25000000000,gasCCGT,0,2030 +1,6,CO2f,all-week,night,2025,all-year,R1,22.91750000000,gasCCGT,0,2030 +1,10,electricity,all-week,morning,2025,all-year,R1,0.45830000000,gasCCGT,1,2030 +1,6,CO2f,all-week,morning,2025,all-year,R1,42.01540000000,gasCCGT,1,2030 +1,10,electricity,all-week,afternoon,2025,all-year,R1,0.50000000000,gasCCGT,2,2030 +1,6,CO2f,all-week,afternoon,2025,all-year,R1,45.83500000000,gasCCGT,2,2030 +1,10,electricity,all-week,early-peak,2025,all-year,R1,0.41670000000,gasCCGT,3,2030 +1,6,CO2f,all-week,early-peak,2025,all-year,R1,38.19580000000,gasCCGT,3,2030 +1,10,electricity,all-week,late-peak,2025,all-year,R1,0.88330000000,gasCCGT,4,2030 +1,6,CO2f,all-week,late-peak,2025,all-year,R1,80.97520000000,gasCCGT,4,2030 +1,10,electricity,all-week,evening,2025,all-year,R1,0.83330000000,gasCCGT,5,2030 +1,6,CO2f,all-week,evening,2025,all-year,R1,76.39170000000,gasCCGT,5,2030 +3,10,electricity,all-week,night,2020,all-year,R1,0.16670000000,windturbine,0,2030 +3,10,electricity,all-week,morning,2020,all-year,R1,0.08330000000,windturbine,1,2030 +3,10,electricity,all-week,early-peak,2020,all-year,R1,0.16670000000,windturbine,3,2030 +3,10,electricity,all-week,late-peak,2020,all-year,R1,0.16670000000,windturbine,4,2030 +0,10,electricity,all-week,night,2020,all-year,R1,0.24360000000,gasCCGT,0,2035 +0,6,CO2f,all-week,night,2020,all-year,R1,22.32990000000,gasCCGT,0,2035 +0,10,electricity,all-week,morning,2020,all-year,R1,0.42950000000,gasCCGT,1,2035 +0,6,CO2f,all-week,morning,2020,all-year,R1,39.37110000000,gasCCGT,1,2035 +0,10,electricity,all-week,afternoon,2020,all-year,R1,0.50000000000,gasCCGT,2,2035 +0,6,CO2f,all-week,afternoon,2020,all-year,R1,45.83500000000,gasCCGT,2,2035 +0,10,electricity,all-week,early-peak,2020,all-year,R1,0.39740000000,gasCCGT,3,2035 +0,6,CO2f,all-week,early-peak,2020,all-year,R1,36.43290000000,gasCCGT,3,2035 +0,10,electricity,all-week,late-peak,2020,all-year,R1,0.85900000000,gasCCGT,4,2035 +0,6,CO2f,all-week,late-peak,2020,all-year,R1,78.74220000000,gasCCGT,4,2035 +0,10,electricity,all-week,evening,2020,all-year,R1,0.83330000000,gasCCGT,5,2035 +0,6,CO2f,all-week,evening,2020,all-year,R1,76.39170000000,gasCCGT,5,2035 +1,10,electricity,all-week,night,2025,all-year,R1,0.24360000000,gasCCGT,0,2035 +1,6,CO2f,all-week,night,2025,all-year,R1,22.32990000000,gasCCGT,0,2035 +1,10,electricity,all-week,morning,2025,all-year,R1,0.42950000000,gasCCGT,1,2035 +1,6,CO2f,all-week,morning,2025,all-year,R1,39.37110000000,gasCCGT,1,2035 +1,10,electricity,all-week,afternoon,2025,all-year,R1,0.50000000000,gasCCGT,2,2035 +1,6,CO2f,all-week,afternoon,2025,all-year,R1,45.83500000000,gasCCGT,2,2035 +1,10,electricity,all-week,early-peak,2025,all-year,R1,0.39740000000,gasCCGT,3,2035 +1,6,CO2f,all-week,early-peak,2025,all-year,R1,36.43290000000,gasCCGT,3,2035 +1,10,electricity,all-week,late-peak,2025,all-year,R1,0.85900000000,gasCCGT,4,2035 +1,6,CO2f,all-week,late-peak,2025,all-year,R1,78.74220000000,gasCCGT,4,2035 +1,10,electricity,all-week,evening,2025,all-year,R1,0.83330000000,gasCCGT,5,2035 +1,6,CO2f,all-week,evening,2025,all-year,R1,76.39170000000,gasCCGT,5,2035 +2,10,electricity,all-week,night,2030,all-year,R1,0.14620000000,gasCCGT,0,2035 +2,6,CO2f,all-week,night,2030,all-year,R1,13.39790000000,gasCCGT,0,2035 +2,10,electricity,all-week,morning,2030,all-year,R1,0.25770000000,gasCCGT,1,2035 +2,6,CO2f,all-week,morning,2030,all-year,R1,23.62270000000,gasCCGT,1,2035 +2,10,electricity,all-week,afternoon,2030,all-year,R1,0.30000000000,gasCCGT,2,2035 +2,6,CO2f,all-week,afternoon,2030,all-year,R1,27.50100000000,gasCCGT,2,2035 +2,10,electricity,all-week,early-peak,2030,all-year,R1,0.23850000000,gasCCGT,3,2035 +2,6,CO2f,all-week,early-peak,2030,all-year,R1,21.85980000000,gasCCGT,3,2035 +2,10,electricity,all-week,late-peak,2030,all-year,R1,0.51540000000,gasCCGT,4,2035 +2,6,CO2f,all-week,late-peak,2030,all-year,R1,47.24530000000,gasCCGT,4,2035 +2,10,electricity,all-week,evening,2030,all-year,R1,0.50000000000,gasCCGT,5,2035 +2,6,CO2f,all-week,evening,2030,all-year,R1,45.83500000000,gasCCGT,5,2035 +4,10,electricity,all-week,night,2020,all-year,R1,0.16670000000,windturbine,0,2035 +4,10,electricity,all-week,morning,2020,all-year,R1,0.08330000000,windturbine,1,2035 +4,10,electricity,all-week,early-peak,2020,all-year,R1,0.16670000000,windturbine,3,2035 +4,10,electricity,all-week,late-peak,2020,all-year,R1,0.16670000000,windturbine,4,2035 +0,10,electricity,all-week,night,2020,all-year,R1,0.25560000000,gasCCGT,0,2040 +0,6,CO2f,all-week,night,2020,all-year,R1,23.42680000000,gasCCGT,0,2040 +0,10,electricity,all-week,morning,2020,all-year,R1,0.43890000000,gasCCGT,1,2040 +0,6,CO2f,all-week,morning,2020,all-year,R1,40.23290000000,gasCCGT,1,2040 +0,10,electricity,all-week,afternoon,2020,all-year,R1,0.50000000000,gasCCGT,2,2040 +0,6,CO2f,all-week,afternoon,2020,all-year,R1,45.83500000000,gasCCGT,2,2040 +0,10,electricity,all-week,early-peak,2020,all-year,R1,0.41110000000,gasCCGT,3,2040 +0,6,CO2f,all-week,early-peak,2020,all-year,R1,37.68660000000,gasCCGT,3,2040 +0,10,electricity,all-week,late-peak,2020,all-year,R1,0.87780000000,gasCCGT,4,2040 +0,6,CO2f,all-week,late-peak,2020,all-year,R1,80.46590000000,gasCCGT,4,2040 +0,10,electricity,all-week,evening,2020,all-year,R1,0.83330000000,gasCCGT,5,2040 +0,6,CO2f,all-week,evening,2020,all-year,R1,76.39170000000,gasCCGT,5,2040 +1,10,electricity,all-week,night,2025,all-year,R1,0.25560000000,gasCCGT,0,2040 +1,6,CO2f,all-week,night,2025,all-year,R1,23.42680000000,gasCCGT,0,2040 +1,10,electricity,all-week,morning,2025,all-year,R1,0.43890000000,gasCCGT,1,2040 +1,6,CO2f,all-week,morning,2025,all-year,R1,40.23290000000,gasCCGT,1,2040 +1,10,electricity,all-week,afternoon,2025,all-year,R1,0.50000000000,gasCCGT,2,2040 +1,6,CO2f,all-week,afternoon,2025,all-year,R1,45.83500000000,gasCCGT,2,2040 +1,10,electricity,all-week,early-peak,2025,all-year,R1,0.41110000000,gasCCGT,3,2040 +1,6,CO2f,all-week,early-peak,2025,all-year,R1,37.68660000000,gasCCGT,3,2040 +1,10,electricity,all-week,late-peak,2025,all-year,R1,0.87780000000,gasCCGT,4,2040 +1,6,CO2f,all-week,late-peak,2025,all-year,R1,80.46590000000,gasCCGT,4,2040 +1,10,electricity,all-week,evening,2025,all-year,R1,0.83330000000,gasCCGT,5,2040 +1,6,CO2f,all-week,evening,2025,all-year,R1,76.39170000000,gasCCGT,5,2040 +2,10,electricity,all-week,night,2030,all-year,R1,0.15330000000,gasCCGT,0,2040 +2,6,CO2f,all-week,night,2030,all-year,R1,14.05610000000,gasCCGT,0,2040 +2,10,electricity,all-week,morning,2030,all-year,R1,0.26330000000,gasCCGT,1,2040 +2,6,CO2f,all-week,morning,2030,all-year,R1,24.13980000000,gasCCGT,1,2040 +2,10,electricity,all-week,afternoon,2030,all-year,R1,0.30000000000,gasCCGT,2,2040 +2,6,CO2f,all-week,afternoon,2030,all-year,R1,27.50100000000,gasCCGT,2,2040 +2,10,electricity,all-week,early-peak,2030,all-year,R1,0.24670000000,gasCCGT,3,2040 +2,6,CO2f,all-week,early-peak,2030,all-year,R1,22.61190000000,gasCCGT,3,2040 +2,10,electricity,all-week,late-peak,2030,all-year,R1,0.52670000000,gasCCGT,4,2040 +2,6,CO2f,all-week,late-peak,2030,all-year,R1,48.27950000000,gasCCGT,4,2040 +2,10,electricity,all-week,evening,2030,all-year,R1,0.50000000000,gasCCGT,5,2040 +2,6,CO2f,all-week,evening,2030,all-year,R1,45.83500000000,gasCCGT,5,2040 +3,10,electricity,all-week,night,2035,all-year,R1,0.10220000000,gasCCGT,0,2040 +3,6,CO2f,all-week,night,2035,all-year,R1,9.37070000000,gasCCGT,0,2040 +3,10,electricity,all-week,morning,2035,all-year,R1,0.17560000000,gasCCGT,1,2040 +3,6,CO2f,all-week,morning,2035,all-year,R1,16.09320000000,gasCCGT,1,2040 +3,10,electricity,all-week,afternoon,2035,all-year,R1,0.20000000000,gasCCGT,2,2040 +3,6,CO2f,all-week,afternoon,2035,all-year,R1,18.33400000000,gasCCGT,2,2040 +3,10,electricity,all-week,early-peak,2035,all-year,R1,0.16440000000,gasCCGT,3,2040 +3,6,CO2f,all-week,early-peak,2035,all-year,R1,15.07460000000,gasCCGT,3,2040 +3,10,electricity,all-week,late-peak,2035,all-year,R1,0.35110000000,gasCCGT,4,2040 +3,6,CO2f,all-week,late-peak,2035,all-year,R1,32.18640000000,gasCCGT,4,2040 +3,10,electricity,all-week,evening,2035,all-year,R1,0.33330000000,gasCCGT,5,2040 +3,6,CO2f,all-week,evening,2035,all-year,R1,30.55670000000,gasCCGT,5,2040 +4,10,electricity,all-week,night,2020,all-year,R1,0.16670000000,windturbine,0,2040 +4,10,electricity,all-week,morning,2020,all-year,R1,0.08330000000,windturbine,1,2040 +4,10,electricity,all-week,early-peak,2020,all-year,R1,0.16670000000,windturbine,3,2040 +4,10,electricity,all-week,late-peak,2020,all-year,R1,0.16670000000,windturbine,4,2040 +0,10,electricity,all-week,night,2020,all-year,R1,0.16670000000,gasCCGT,0,2045 +0,6,CO2f,all-week,night,2020,all-year,R1,15.27830000000,gasCCGT,0,2045 +0,10,electricity,all-week,morning,2020,all-year,R1,0.42220000000,gasCCGT,1,2045 +0,6,CO2f,all-week,morning,2020,all-year,R1,38.70510000000,gasCCGT,1,2045 +0,10,electricity,all-week,afternoon,2020,all-year,R1,0.50000000000,gasCCGT,2,2045 +0,6,CO2f,all-week,afternoon,2020,all-year,R1,45.83500000000,gasCCGT,2,2045 +0,10,electricity,all-week,early-peak,2020,all-year,R1,0.33330000000,gasCCGT,3,2045 +0,6,CO2f,all-week,early-peak,2020,all-year,R1,30.55670000000,gasCCGT,3,2045 +0,10,electricity,all-week,late-peak,2020,all-year,R1,0.84440000000,gasCCGT,4,2045 +0,6,CO2f,all-week,late-peak,2020,all-year,R1,77.41020000000,gasCCGT,4,2045 +0,10,electricity,all-week,evening,2020,all-year,R1,0.83330000000,gasCCGT,5,2045 +0,6,CO2f,all-week,evening,2020,all-year,R1,76.39170000000,gasCCGT,5,2045 +1,10,electricity,all-week,night,2025,all-year,R1,0.16670000000,gasCCGT,0,2045 +1,6,CO2f,all-week,night,2025,all-year,R1,15.27830000000,gasCCGT,0,2045 +1,10,electricity,all-week,morning,2025,all-year,R1,0.42220000000,gasCCGT,1,2045 +1,6,CO2f,all-week,morning,2025,all-year,R1,38.70510000000,gasCCGT,1,2045 +1,10,electricity,all-week,afternoon,2025,all-year,R1,0.50000000000,gasCCGT,2,2045 +1,6,CO2f,all-week,afternoon,2025,all-year,R1,45.83500000000,gasCCGT,2,2045 +1,10,electricity,all-week,early-peak,2025,all-year,R1,0.33330000000,gasCCGT,3,2045 +1,6,CO2f,all-week,early-peak,2025,all-year,R1,30.55670000000,gasCCGT,3,2045 +1,10,electricity,all-week,late-peak,2025,all-year,R1,0.84440000000,gasCCGT,4,2045 +1,6,CO2f,all-week,late-peak,2025,all-year,R1,77.41020000000,gasCCGT,4,2045 +1,10,electricity,all-week,evening,2025,all-year,R1,0.83330000000,gasCCGT,5,2045 +1,6,CO2f,all-week,evening,2025,all-year,R1,76.39170000000,gasCCGT,5,2045 +2,10,electricity,all-week,night,2030,all-year,R1,0.10000000000,gasCCGT,0,2045 +2,6,CO2f,all-week,night,2030,all-year,R1,9.16700000000,gasCCGT,0,2045 +2,10,electricity,all-week,morning,2030,all-year,R1,0.25330000000,gasCCGT,1,2045 +2,6,CO2f,all-week,morning,2030,all-year,R1,23.22310000000,gasCCGT,1,2045 +2,10,electricity,all-week,afternoon,2030,all-year,R1,0.30000000000,gasCCGT,2,2045 +2,6,CO2f,all-week,afternoon,2030,all-year,R1,27.50100000000,gasCCGT,2,2045 +2,10,electricity,all-week,early-peak,2030,all-year,R1,0.20000000000,gasCCGT,3,2045 +2,6,CO2f,all-week,early-peak,2030,all-year,R1,18.33400000000,gasCCGT,3,2045 +2,10,electricity,all-week,late-peak,2030,all-year,R1,0.50670000000,gasCCGT,4,2045 +2,6,CO2f,all-week,late-peak,2030,all-year,R1,46.44610000000,gasCCGT,4,2045 +2,10,electricity,all-week,evening,2030,all-year,R1,0.50000000000,gasCCGT,5,2045 +2,6,CO2f,all-week,evening,2030,all-year,R1,45.83500000000,gasCCGT,5,2045 +3,10,electricity,all-week,night,2035,all-year,R1,0.06670000000,gasCCGT,0,2045 +3,6,CO2f,all-week,night,2035,all-year,R1,6.11130000000,gasCCGT,0,2045 +3,10,electricity,all-week,morning,2035,all-year,R1,0.16890000000,gasCCGT,1,2045 +3,6,CO2f,all-week,morning,2035,all-year,R1,15.48200000000,gasCCGT,1,2045 +3,10,electricity,all-week,afternoon,2035,all-year,R1,0.20000000000,gasCCGT,2,2045 +3,6,CO2f,all-week,afternoon,2035,all-year,R1,18.33400000000,gasCCGT,2,2045 +3,10,electricity,all-week,early-peak,2035,all-year,R1,0.13330000000,gasCCGT,3,2045 +3,6,CO2f,all-week,early-peak,2035,all-year,R1,12.22270000000,gasCCGT,3,2045 +3,10,electricity,all-week,late-peak,2035,all-year,R1,0.33780000000,gasCCGT,4,2045 +3,6,CO2f,all-week,late-peak,2035,all-year,R1,30.96410000000,gasCCGT,4,2045 +3,10,electricity,all-week,evening,2035,all-year,R1,0.33330000000,gasCCGT,5,2045 +3,6,CO2f,all-week,evening,2035,all-year,R1,30.55670000000,gasCCGT,5,2045 +4,10,electricity,all-week,night,2020,all-year,R1,0.14170000000,windturbine,0,2045 +4,10,electricity,all-week,morning,2020,all-year,R1,0.08330000000,windturbine,1,2045 +4,10,electricity,all-week,early-peak,2020,all-year,R1,0.15000000000,windturbine,3,2045 +4,10,electricity,all-week,late-peak,2020,all-year,R1,0.16670000000,windturbine,4,2045 +5,10,electricity,all-week,night,2040,all-year,R1,0.42500000000,windturbine,0,2045 +5,10,electricity,all-week,morning,2040,all-year,R1,0.25000000000,windturbine,1,2045 +5,10,electricity,all-week,early-peak,2040,all-year,R1,0.45000000000,windturbine,3,2045 +5,10,electricity,all-week,late-peak,2040,all-year,R1,0.50000000000,windturbine,4,2045 +0,10,electricity,all-week,night,2020,all-year,R1,0.16670000000,gasCCGT,0,2050 +0,6,CO2f,all-week,night,2020,all-year,R1,15.27830000000,gasCCGT,0,2050 +0,10,electricity,all-week,morning,2020,all-year,R1,0.43330000000,gasCCGT,1,2050 +0,6,CO2f,all-week,morning,2020,all-year,R1,39.72370000000,gasCCGT,1,2050 +0,10,electricity,all-week,afternoon,2020,all-year,R1,0.50000000000,gasCCGT,2,2050 +0,6,CO2f,all-week,afternoon,2020,all-year,R1,45.83500000000,gasCCGT,2,2050 +0,10,electricity,all-week,early-peak,2020,all-year,R1,0.33330000000,gasCCGT,3,2050 +0,6,CO2f,all-week,early-peak,2020,all-year,R1,30.55670000000,gasCCGT,3,2050 +0,10,electricity,all-week,late-peak,2020,all-year,R1,0.86670000000,gasCCGT,4,2050 +0,6,CO2f,all-week,late-peak,2020,all-year,R1,79.44730000000,gasCCGT,4,2050 +0,10,electricity,all-week,evening,2020,all-year,R1,0.83330000000,gasCCGT,5,2050 +0,6,CO2f,all-week,evening,2020,all-year,R1,76.39170000000,gasCCGT,5,2050 +1,10,electricity,all-week,night,2025,all-year,R1,0.16670000000,gasCCGT,0,2050 +1,6,CO2f,all-week,night,2025,all-year,R1,15.27830000000,gasCCGT,0,2050 +1,10,electricity,all-week,morning,2025,all-year,R1,0.43330000000,gasCCGT,1,2050 +1,6,CO2f,all-week,morning,2025,all-year,R1,39.72370000000,gasCCGT,1,2050 +1,10,electricity,all-week,afternoon,2025,all-year,R1,0.50000000000,gasCCGT,2,2050 +1,6,CO2f,all-week,afternoon,2025,all-year,R1,45.83500000000,gasCCGT,2,2050 +1,10,electricity,all-week,early-peak,2025,all-year,R1,0.33330000000,gasCCGT,3,2050 +1,6,CO2f,all-week,early-peak,2025,all-year,R1,30.55670000000,gasCCGT,3,2050 +1,10,electricity,all-week,late-peak,2025,all-year,R1,0.86670000000,gasCCGT,4,2050 +1,6,CO2f,all-week,late-peak,2025,all-year,R1,79.44730000000,gasCCGT,4,2050 +1,10,electricity,all-week,evening,2025,all-year,R1,0.83330000000,gasCCGT,5,2050 +1,6,CO2f,all-week,evening,2025,all-year,R1,76.39170000000,gasCCGT,5,2050 +2,10,electricity,all-week,night,2030,all-year,R1,0.10000000000,gasCCGT,0,2050 +2,6,CO2f,all-week,night,2030,all-year,R1,9.16700000000,gasCCGT,0,2050 +2,10,electricity,all-week,morning,2030,all-year,R1,0.26000000000,gasCCGT,1,2050 +2,6,CO2f,all-week,morning,2030,all-year,R1,23.83420000000,gasCCGT,1,2050 +2,10,electricity,all-week,afternoon,2030,all-year,R1,0.30000000000,gasCCGT,2,2050 +2,6,CO2f,all-week,afternoon,2030,all-year,R1,27.50100000000,gasCCGT,2,2050 +2,10,electricity,all-week,early-peak,2030,all-year,R1,0.20000000000,gasCCGT,3,2050 +2,6,CO2f,all-week,early-peak,2030,all-year,R1,18.33400000000,gasCCGT,3,2050 +2,10,electricity,all-week,late-peak,2030,all-year,R1,0.52000000000,gasCCGT,4,2050 +2,6,CO2f,all-week,late-peak,2030,all-year,R1,47.66840000000,gasCCGT,4,2050 +2,10,electricity,all-week,evening,2030,all-year,R1,0.50000000000,gasCCGT,5,2050 +2,6,CO2f,all-week,evening,2030,all-year,R1,45.83500000000,gasCCGT,5,2050 +3,10,electricity,all-week,night,2035,all-year,R1,0.06670000000,gasCCGT,0,2050 +3,6,CO2f,all-week,night,2035,all-year,R1,6.11130000000,gasCCGT,0,2050 +3,10,electricity,all-week,morning,2035,all-year,R1,0.17330000000,gasCCGT,1,2050 +3,6,CO2f,all-week,morning,2035,all-year,R1,15.88950000000,gasCCGT,1,2050 +3,10,electricity,all-week,afternoon,2035,all-year,R1,0.20000000000,gasCCGT,2,2050 +3,6,CO2f,all-week,afternoon,2035,all-year,R1,18.33400000000,gasCCGT,2,2050 +3,10,electricity,all-week,early-peak,2035,all-year,R1,0.13330000000,gasCCGT,3,2050 +3,6,CO2f,all-week,early-peak,2035,all-year,R1,12.22270000000,gasCCGT,3,2050 +3,10,electricity,all-week,late-peak,2035,all-year,R1,0.34670000000,gasCCGT,4,2050 +3,6,CO2f,all-week,late-peak,2035,all-year,R1,31.77890000000,gasCCGT,4,2050 +3,10,electricity,all-week,evening,2035,all-year,R1,0.33330000000,gasCCGT,5,2050 +3,6,CO2f,all-week,evening,2035,all-year,R1,30.55670000000,gasCCGT,5,2050 +5,10,electricity,all-week,night,2040,all-year,R1,0.35000000000,windturbine,0,2050 +5,10,electricity,all-week,morning,2040,all-year,R1,0.25000000000,windturbine,1,2050 +5,10,electricity,all-week,early-peak,2040,all-year,R1,0.40000000000,windturbine,3,2050 +5,10,electricity,all-week,late-peak,2040,all-year,R1,0.50000000000,windturbine,4,2050 +6,10,electricity,all-week,night,2045,all-year,R1,0.35000000000,windturbine,0,2050 +6,10,electricity,all-week,morning,2045,all-year,R1,0.25000000000,windturbine,1,2050 +6,10,electricity,all-week,early-peak,2045,all-year,R1,0.40000000000,windturbine,3,2050 +6,10,electricity,all-week,late-peak,2045,all-year,R1,0.50000000000,windturbine,4,2050 diff --git a/docs/tutorial-code/modify-timing-data/1-modify-timeslices/Results/MCACapacity.csv b/docs/tutorial-code/modify-timing-data/1-modify-timeslices/Results/MCACapacity.csv index 432f0ba0c..22e129c33 100644 --- a/docs/tutorial-code/modify-timing-data/1-modify-timeslices/Results/MCACapacity.csv +++ b/docs/tutorial-code/modify-timing-data/1-modify-timeslices/Results/MCACapacity.csv @@ -6,23 +6,23 @@ A1,5.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2025 A1,17.00000000000,R1,2020,R1,residential,heatpump,newcapa,2025 A1,6.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2025 A1,3.00000000000,R1,2020,R1,power,windturbine,newcapa,2025 -A1,17.07300000000,R1,2020,R1,gas,gassupply1,newcapa,2025 +A1,16.46440000000,R1,2020,R1,gas,gassupply1,newcapa,2025 A1,17.00000000000,R1,2020,R1,residential,heatpump,newcapa,2030 A1,11.00000000000,R1,2025,R1,residential,heatpump,newcapa,2030 A1,5.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2030 A1,6.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2030 A1,3.00000000000,R1,2020,R1,power,windturbine,newcapa,2030 -A1,9.57300000000,R1,2020,R1,gas,gassupply1,newcapa,2030 -A1,8.96250000000,R1,2025,R1,gas,gassupply1,newcapa,2030 +A1,8.96440000000,R1,2020,R1,gas,gassupply1,newcapa,2030 +A1,9.40560000000,R1,2025,R1,gas,gassupply1,newcapa,2030 A1,11.00000000000,R1,2025,R1,residential,heatpump,newcapa,2035 A1,22.00000000000,R1,2030,R1,residential,heatpump,newcapa,2035 A1,5.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2035 A1,6.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2035 A1,3.00000000000,R1,2020,R1,power,windturbine,newcapa,2035 A1,5.00000000000,R1,2030,R1,power,windturbine,newcapa,2035 -A1,2.07300000000,R1,2020,R1,gas,gassupply1,newcapa,2035 -A1,8.96250000000,R1,2025,R1,gas,gassupply1,newcapa,2035 -A1,7.81130000000,R1,2030,R1,gas,gassupply1,newcapa,2035 +A1,1.46440000000,R1,2020,R1,gas,gassupply1,newcapa,2035 +A1,9.40560000000,R1,2025,R1,gas,gassupply1,newcapa,2035 +A1,7.50000000000,R1,2030,R1,gas,gassupply1,newcapa,2035 A1,22.00000000000,R1,2030,R1,residential,heatpump,newcapa,2040 A1,17.00000000000,R1,2035,R1,residential,heatpump,newcapa,2040 A1,5.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2040 @@ -30,9 +30,9 @@ A1,6.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2040 A1,3.00000000000,R1,2020,R1,power,windturbine,newcapa,2040 A1,5.00000000000,R1,2030,R1,power,windturbine,newcapa,2040 A1,6.00000000000,R1,2035,R1,power,windturbine,newcapa,2040 -A1,2.07300000000,R1,2020,R1,gas,gassupply1,newcapa,2040 -A1,8.96250000000,R1,2025,R1,gas,gassupply1,newcapa,2040 -A1,7.81130000000,R1,2030,R1,gas,gassupply1,newcapa,2040 +A1,1.46440000000,R1,2020,R1,gas,gassupply1,newcapa,2040 +A1,9.40560000000,R1,2025,R1,gas,gassupply1,newcapa,2040 +A1,7.50000000000,R1,2030,R1,gas,gassupply1,newcapa,2040 A1,17.00000000000,R1,2035,R1,residential,heatpump,newcapa,2045 A1,27.00000000000,R1,2040,R1,residential,heatpump,newcapa,2045 A1,5.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2045 @@ -40,18 +40,18 @@ A1,6.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2045 A1,3.00000000000,R1,2020,R1,power,windturbine,newcapa,2045 A1,5.00000000000,R1,2030,R1,power,windturbine,newcapa,2045 A1,6.00000000000,R1,2035,R1,power,windturbine,newcapa,2045 -A1,6.00000000000,R1,2040,R1,power,windturbine,newcapa,2045 -A1,2.07300000000,R1,2020,R1,gas,gassupply1,newcapa,2045 -A1,8.96250000000,R1,2025,R1,gas,gassupply1,newcapa,2045 -A1,7.81130000000,R1,2030,R1,gas,gassupply1,newcapa,2045 +A1,5.00000000000,R1,2040,R1,power,windturbine,newcapa,2045 +A1,1.46440000000,R1,2020,R1,gas,gassupply1,newcapa,2045 +A1,9.40560000000,R1,2025,R1,gas,gassupply1,newcapa,2045 +A1,7.50000000000,R1,2030,R1,gas,gassupply1,newcapa,2045 A1,27.00000000000,R1,2040,R1,residential,heatpump,newcapa,2050 A1,23.00000000000,R1,2045,R1,residential,heatpump,newcapa,2050 A1,5.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2050 A1,6.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2050 A1,5.00000000000,R1,2030,R1,power,windturbine,newcapa,2050 A1,6.00000000000,R1,2035,R1,power,windturbine,newcapa,2050 -A1,6.00000000000,R1,2040,R1,power,windturbine,newcapa,2050 -A1,8.00000000000,R1,2045,R1,power,windturbine,newcapa,2050 -A1,2.07300000000,R1,2020,R1,gas,gassupply1,newcapa,2050 -A1,8.96250000000,R1,2025,R1,gas,gassupply1,newcapa,2050 -A1,7.81130000000,R1,2030,R1,gas,gassupply1,newcapa,2050 +A1,5.00000000000,R1,2040,R1,power,windturbine,newcapa,2050 +A1,9.00000000000,R1,2045,R1,power,windturbine,newcapa,2050 +A1,1.46440000000,R1,2020,R1,gas,gassupply1,newcapa,2050 +A1,9.40560000000,R1,2025,R1,gas,gassupply1,newcapa,2050 +A1,7.50000000000,R1,2030,R1,gas,gassupply1,newcapa,2050 diff --git a/docs/tutorial-code/modify-timing-data/1-modify-timeslices/Results/MCAPrices.csv b/docs/tutorial-code/modify-timing-data/1-modify-timeslices/Results/MCAPrices.csv index 372af7073..42ef4fa7d 100644 --- a/docs/tutorial-code/modify-timing-data/1-modify-timeslices/Results/MCAPrices.csv +++ b/docs/tutorial-code/modify-timing-data/1-modify-timeslices/Results/MCAPrices.csv @@ -159,37 +159,37 @@ electricity,all-week,late-afternoon,all-year,17.01820000000,R1,7,MUS$2010/PJ,204 gas,all-week,late-afternoon,all-year,0.35420000000,R1,7,MUS$2010/PJ,2040 heat,all-week,late-afternoon,all-year,6.98760000000,R1,7,MUS$2010/PJ,2040 CO2f,all-week,late-afternoon,all-year,0.27280000000,R1,7,MUS$2010/kt,2040 -electricity,all-week,night,all-year,19.02040000000,R1,0,MUS$2010/PJ,2045 +electricity,all-week,night,all-year,19.42660000000,R1,0,MUS$2010/PJ,2045 gas,all-week,night,all-year,0.35420000000,R1,0,MUS$2010/PJ,2045 -heat,all-week,night,all-year,7.78850000000,R1,0,MUS$2010/PJ,2045 +heat,all-week,night,all-year,7.95100000000,R1,0,MUS$2010/PJ,2045 CO2f,all-week,night,all-year,0.35390000000,R1,0,MUS$2010/kt,2045 -electricity,all-week,morning,all-year,19.02040000000,R1,1,MUS$2010/PJ,2045 +electricity,all-week,morning,all-year,19.42660000000,R1,1,MUS$2010/PJ,2045 gas,all-week,morning,all-year,0.35420000000,R1,1,MUS$2010/PJ,2045 -heat,all-week,morning,all-year,7.78850000000,R1,1,MUS$2010/PJ,2045 +heat,all-week,morning,all-year,7.95100000000,R1,1,MUS$2010/PJ,2045 CO2f,all-week,morning,all-year,0.35390000000,R1,1,MUS$2010/kt,2045 -electricity,all-week,mid-afternoon,all-year,19.02040000000,R1,2,MUS$2010/PJ,2045 +electricity,all-week,mid-afternoon,all-year,19.42660000000,R1,2,MUS$2010/PJ,2045 gas,all-week,mid-afternoon,all-year,0.35420000000,R1,2,MUS$2010/PJ,2045 -heat,all-week,mid-afternoon,all-year,7.78850000000,R1,2,MUS$2010/PJ,2045 +heat,all-week,mid-afternoon,all-year,7.95100000000,R1,2,MUS$2010/PJ,2045 CO2f,all-week,mid-afternoon,all-year,0.35390000000,R1,2,MUS$2010/kt,2045 -electricity,all-week,early-peak,all-year,19.02040000000,R1,3,MUS$2010/PJ,2045 +electricity,all-week,early-peak,all-year,19.42660000000,R1,3,MUS$2010/PJ,2045 gas,all-week,early-peak,all-year,0.35420000000,R1,3,MUS$2010/PJ,2045 -heat,all-week,early-peak,all-year,7.78850000000,R1,3,MUS$2010/PJ,2045 +heat,all-week,early-peak,all-year,7.95100000000,R1,3,MUS$2010/PJ,2045 CO2f,all-week,early-peak,all-year,0.35390000000,R1,3,MUS$2010/kt,2045 -electricity,all-week,late-peak,all-year,19.02040000000,R1,4,MUS$2010/PJ,2045 +electricity,all-week,late-peak,all-year,19.42660000000,R1,4,MUS$2010/PJ,2045 gas,all-week,late-peak,all-year,0.35420000000,R1,4,MUS$2010/PJ,2045 -heat,all-week,late-peak,all-year,7.78850000000,R1,4,MUS$2010/PJ,2045 +heat,all-week,late-peak,all-year,7.95100000000,R1,4,MUS$2010/PJ,2045 CO2f,all-week,late-peak,all-year,0.35390000000,R1,4,MUS$2010/kt,2045 -electricity,all-week,evening,all-year,19.02040000000,R1,5,MUS$2010/PJ,2045 +electricity,all-week,evening,all-year,19.42660000000,R1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,0.35420000000,R1,5,MUS$2010/PJ,2045 -heat,all-week,evening,all-year,7.78850000000,R1,5,MUS$2010/PJ,2045 +heat,all-week,evening,all-year,7.95100000000,R1,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045 -electricity,all-week,early-morning,all-year,19.02040000000,R1,6,MUS$2010/PJ,2045 +electricity,all-week,early-morning,all-year,19.42660000000,R1,6,MUS$2010/PJ,2045 gas,all-week,early-morning,all-year,0.35420000000,R1,6,MUS$2010/PJ,2045 -heat,all-week,early-morning,all-year,7.78850000000,R1,6,MUS$2010/PJ,2045 +heat,all-week,early-morning,all-year,7.95100000000,R1,6,MUS$2010/PJ,2045 CO2f,all-week,early-morning,all-year,0.35390000000,R1,6,MUS$2010/kt,2045 -electricity,all-week,late-afternoon,all-year,19.02040000000,R1,7,MUS$2010/PJ,2045 +electricity,all-week,late-afternoon,all-year,19.42660000000,R1,7,MUS$2010/PJ,2045 gas,all-week,late-afternoon,all-year,0.35420000000,R1,7,MUS$2010/PJ,2045 -heat,all-week,late-afternoon,all-year,7.78850000000,R1,7,MUS$2010/PJ,2045 +heat,all-week,late-afternoon,all-year,7.95100000000,R1,7,MUS$2010/PJ,2045 CO2f,all-week,late-afternoon,all-year,0.35390000000,R1,7,MUS$2010/kt,2045 electricity,all-week,night,all-year,20.93710000000,R1,0,MUS$2010/PJ,2050 gas,all-week,night,all-year,0.35420000000,R1,0,MUS$2010/PJ,2050 diff --git a/docs/tutorial-code/modify-timing-data/2-modify-time-framework/Results/MCACapacity.csv b/docs/tutorial-code/modify-timing-data/2-modify-time-framework/Results/MCACapacity.csv index 5ab29d31f..3592cafdb 100644 --- a/docs/tutorial-code/modify-timing-data/2-modify-time-framework/Results/MCACapacity.csv +++ b/docs/tutorial-code/modify-timing-data/2-modify-time-framework/Results/MCACapacity.csv @@ -6,26 +6,21 @@ A1,8.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2022 A1,11.00000000000,R1,2020,R1,residential,heatpump,newcapa,2022 A1,3.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2022 A1,4.00000000000,R1,2020,R1,power,windturbine,newcapa,2022 -A1,15.47010000000,R1,2020,R1,gas,gassupply1,newcapa,2022 +A1,15.32110000000,R1,2020,R1,gas,gassupply1,newcapa,2022 A1,6.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2024 A1,11.00000000000,R1,2020,R1,residential,heatpump,newcapa,2024 A1,4.00000000000,R1,2022,R1,residential,heatpump,newcapa,2024 A1,3.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2024 A1,1.00000000000,R1,2022,R1,power,gasCCGT,newcapa,2024 A1,4.00000000000,R1,2020,R1,power,windturbine,newcapa,2024 -A1,15.47010000000,R1,2020,R1,gas,gassupply1,newcapa,2024 -A1,0.17680000000,R1,2022,R1,gas,gassupply1,newcapa,2024 A1,4.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2026 A1,11.00000000000,R1,2020,R1,residential,heatpump,newcapa,2026 A1,4.00000000000,R1,2022,R1,residential,heatpump,newcapa,2026 A1,4.00000000000,R1,2024,R1,residential,heatpump,newcapa,2026 A1,2.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2026 A1,1.00000000000,R1,2022,R1,power,gasCCGT,newcapa,2026 -A1,3.00000000000,R1,2024,R1,power,gasCCGT,newcapa,2026 +A1,2.00000000000,R1,2024,R1,power,gasCCGT,newcapa,2026 A1,4.00000000000,R1,2020,R1,power,windturbine,newcapa,2026 -A1,13.97010000000,R1,2020,R1,gas,gassupply1,newcapa,2026 -A1,0.17680000000,R1,2022,R1,gas,gassupply1,newcapa,2026 -A1,2.25000000000,R1,2024,R1,gas,gassupply1,newcapa,2026 A1,2.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2028 A1,11.00000000000,R1,2020,R1,residential,heatpump,newcapa,2028 A1,4.00000000000,R1,2022,R1,residential,heatpump,newcapa,2028 @@ -33,13 +28,11 @@ A1,4.00000000000,R1,2024,R1,residential,heatpump,newcapa,2028 A1,4.00000000000,R1,2026,R1,residential,heatpump,newcapa,2028 A1,2.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2028 A1,1.00000000000,R1,2022,R1,power,gasCCGT,newcapa,2028 -A1,3.00000000000,R1,2024,R1,power,gasCCGT,newcapa,2028 -A1,2.00000000000,R1,2026,R1,power,gasCCGT,newcapa,2028 +A1,2.00000000000,R1,2024,R1,power,gasCCGT,newcapa,2028 +A1,3.00000000000,R1,2026,R1,power,gasCCGT,newcapa,2028 A1,4.00000000000,R1,2020,R1,power,windturbine,newcapa,2028 -A1,10.97010000000,R1,2020,R1,gas,gassupply1,newcapa,2028 -A1,0.17680000000,R1,2022,R1,gas,gassupply1,newcapa,2028 -A1,2.25000000000,R1,2024,R1,gas,gassupply1,newcapa,2028 -A1,3.65110000000,R1,2026,R1,gas,gassupply1,newcapa,2028 +A1,10.82110000000,R1,2020,R1,gas,gassupply1,newcapa,2028 +A1,5.11670000000,R1,2026,R1,gas,gassupply1,newcapa,2028 A1,11.00000000000,R1,2020,R1,residential,heatpump,newcapa,2030 A1,4.00000000000,R1,2022,R1,residential,heatpump,newcapa,2030 A1,4.00000000000,R1,2024,R1,residential,heatpump,newcapa,2030 @@ -47,15 +40,13 @@ A1,4.00000000000,R1,2026,R1,residential,heatpump,newcapa,2030 A1,5.00000000000,R1,2028,R1,residential,heatpump,newcapa,2030 A1,2.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2030 A1,1.00000000000,R1,2022,R1,power,gasCCGT,newcapa,2030 -A1,3.00000000000,R1,2024,R1,power,gasCCGT,newcapa,2030 -A1,2.00000000000,R1,2026,R1,power,gasCCGT,newcapa,2030 +A1,2.00000000000,R1,2024,R1,power,gasCCGT,newcapa,2030 +A1,3.00000000000,R1,2026,R1,power,gasCCGT,newcapa,2030 A1,2.00000000000,R1,2028,R1,power,gasCCGT,newcapa,2030 A1,4.00000000000,R1,2020,R1,power,windturbine,newcapa,2030 -A1,7.97010000000,R1,2020,R1,gas,gassupply1,newcapa,2030 -A1,0.17680000000,R1,2022,R1,gas,gassupply1,newcapa,2030 -A1,2.25000000000,R1,2024,R1,gas,gassupply1,newcapa,2030 -A1,3.65110000000,R1,2026,R1,gas,gassupply1,newcapa,2030 -A1,3.59730000000,R1,2028,R1,gas,gassupply1,newcapa,2030 +A1,7.82110000000,R1,2020,R1,gas,gassupply1,newcapa,2030 +A1,5.11670000000,R1,2026,R1,gas,gassupply1,newcapa,2030 +A1,3.76220000000,R1,2028,R1,gas,gassupply1,newcapa,2030 A1,4.00000000000,R1,2022,R1,residential,heatpump,newcapa,2032 A1,4.00000000000,R1,2024,R1,residential,heatpump,newcapa,2032 A1,4.00000000000,R1,2026,R1,residential,heatpump,newcapa,2032 @@ -63,17 +54,15 @@ A1,5.00000000000,R1,2028,R1,residential,heatpump,newcapa,2032 A1,13.00000000000,R1,2030,R1,residential,heatpump,newcapa,2032 A1,2.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2032 A1,1.00000000000,R1,2022,R1,power,gasCCGT,newcapa,2032 -A1,3.00000000000,R1,2024,R1,power,gasCCGT,newcapa,2032 -A1,2.00000000000,R1,2026,R1,power,gasCCGT,newcapa,2032 +A1,2.00000000000,R1,2024,R1,power,gasCCGT,newcapa,2032 +A1,3.00000000000,R1,2026,R1,power,gasCCGT,newcapa,2032 A1,2.00000000000,R1,2028,R1,power,gasCCGT,newcapa,2032 A1,1.00000000000,R1,2030,R1,power,gasCCGT,newcapa,2032 A1,4.00000000000,R1,2020,R1,power,windturbine,newcapa,2032 -A1,4.97010000000,R1,2020,R1,gas,gassupply1,newcapa,2032 -A1,0.17680000000,R1,2022,R1,gas,gassupply1,newcapa,2032 -A1,2.25000000000,R1,2024,R1,gas,gassupply1,newcapa,2032 -A1,3.65110000000,R1,2026,R1,gas,gassupply1,newcapa,2032 -A1,3.59730000000,R1,2028,R1,gas,gassupply1,newcapa,2032 -A1,4.67680000000,R1,2030,R1,gas,gassupply1,newcapa,2032 +A1,4.82110000000,R1,2020,R1,gas,gassupply1,newcapa,2032 +A1,5.11670000000,R1,2026,R1,gas,gassupply1,newcapa,2032 +A1,3.76220000000,R1,2028,R1,gas,gassupply1,newcapa,2032 +A1,4.67000000000,R1,2030,R1,gas,gassupply1,newcapa,2032 A1,4.00000000000,R1,2024,R1,residential,heatpump,newcapa,2034 A1,4.00000000000,R1,2026,R1,residential,heatpump,newcapa,2034 A1,5.00000000000,R1,2028,R1,residential,heatpump,newcapa,2034 @@ -81,19 +70,17 @@ A1,13.00000000000,R1,2030,R1,residential,heatpump,newcapa,2034 A1,6.00000000000,R1,2032,R1,residential,heatpump,newcapa,2034 A1,2.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2034 A1,1.00000000000,R1,2022,R1,power,gasCCGT,newcapa,2034 -A1,3.00000000000,R1,2024,R1,power,gasCCGT,newcapa,2034 -A1,2.00000000000,R1,2026,R1,power,gasCCGT,newcapa,2034 +A1,2.00000000000,R1,2024,R1,power,gasCCGT,newcapa,2034 +A1,3.00000000000,R1,2026,R1,power,gasCCGT,newcapa,2034 A1,2.00000000000,R1,2028,R1,power,gasCCGT,newcapa,2034 A1,1.00000000000,R1,2030,R1,power,gasCCGT,newcapa,2034 A1,1.00000000000,R1,2032,R1,power,gasCCGT,newcapa,2034 A1,4.00000000000,R1,2020,R1,power,windturbine,newcapa,2034 -A1,1.97010000000,R1,2020,R1,gas,gassupply1,newcapa,2034 -A1,0.17680000000,R1,2022,R1,gas,gassupply1,newcapa,2034 -A1,2.25000000000,R1,2024,R1,gas,gassupply1,newcapa,2034 -A1,3.65110000000,R1,2026,R1,gas,gassupply1,newcapa,2034 -A1,3.59730000000,R1,2028,R1,gas,gassupply1,newcapa,2034 -A1,4.67680000000,R1,2030,R1,gas,gassupply1,newcapa,2034 -A1,4.67470000000,R1,2032,R1,gas,gassupply1,newcapa,2034 +A1,1.82110000000,R1,2020,R1,gas,gassupply1,newcapa,2034 +A1,5.11670000000,R1,2026,R1,gas,gassupply1,newcapa,2034 +A1,3.76220000000,R1,2028,R1,gas,gassupply1,newcapa,2034 +A1,4.67000000000,R1,2030,R1,gas,gassupply1,newcapa,2034 +A1,4.67000000000,R1,2032,R1,gas,gassupply1,newcapa,2034 A1,4.00000000000,R1,2026,R1,residential,heatpump,newcapa,2036 A1,5.00000000000,R1,2028,R1,residential,heatpump,newcapa,2036 A1,13.00000000000,R1,2030,R1,residential,heatpump,newcapa,2036 @@ -101,21 +88,19 @@ A1,6.00000000000,R1,2032,R1,residential,heatpump,newcapa,2036 A1,6.00000000000,R1,2034,R1,residential,heatpump,newcapa,2036 A1,2.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2036 A1,1.00000000000,R1,2022,R1,power,gasCCGT,newcapa,2036 -A1,3.00000000000,R1,2024,R1,power,gasCCGT,newcapa,2036 -A1,2.00000000000,R1,2026,R1,power,gasCCGT,newcapa,2036 +A1,2.00000000000,R1,2024,R1,power,gasCCGT,newcapa,2036 +A1,3.00000000000,R1,2026,R1,power,gasCCGT,newcapa,2036 A1,2.00000000000,R1,2028,R1,power,gasCCGT,newcapa,2036 A1,1.00000000000,R1,2030,R1,power,gasCCGT,newcapa,2036 A1,1.00000000000,R1,2032,R1,power,gasCCGT,newcapa,2036 A1,4.00000000000,R1,2020,R1,power,windturbine,newcapa,2036 A1,3.00000000000,R1,2034,R1,power,windturbine,newcapa,2036 -A1,0.47010000000,R1,2020,R1,gas,gassupply1,newcapa,2036 -A1,0.17680000000,R1,2022,R1,gas,gassupply1,newcapa,2036 -A1,2.25000000000,R1,2024,R1,gas,gassupply1,newcapa,2036 -A1,3.65110000000,R1,2026,R1,gas,gassupply1,newcapa,2036 -A1,3.59730000000,R1,2028,R1,gas,gassupply1,newcapa,2036 -A1,4.67680000000,R1,2030,R1,gas,gassupply1,newcapa,2036 -A1,4.67470000000,R1,2032,R1,gas,gassupply1,newcapa,2036 -A1,0.96760000000,R1,2034,R1,gas,gassupply1,newcapa,2036 +A1,0.32110000000,R1,2020,R1,gas,gassupply1,newcapa,2036 +A1,5.11670000000,R1,2026,R1,gas,gassupply1,newcapa,2036 +A1,3.76220000000,R1,2028,R1,gas,gassupply1,newcapa,2036 +A1,4.67000000000,R1,2030,R1,gas,gassupply1,newcapa,2036 +A1,4.67000000000,R1,2032,R1,gas,gassupply1,newcapa,2036 +A1,1.50000000000,R1,2034,R1,gas,gassupply1,newcapa,2036 A1,5.00000000000,R1,2028,R1,residential,heatpump,newcapa,2038 A1,13.00000000000,R1,2030,R1,residential,heatpump,newcapa,2038 A1,6.00000000000,R1,2032,R1,residential,heatpump,newcapa,2038 @@ -123,23 +108,14 @@ A1,6.00000000000,R1,2034,R1,residential,heatpump,newcapa,2038 A1,6.00000000000,R1,2036,R1,residential,heatpump,newcapa,2038 A1,2.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2038 A1,1.00000000000,R1,2022,R1,power,gasCCGT,newcapa,2038 -A1,3.00000000000,R1,2024,R1,power,gasCCGT,newcapa,2038 -A1,2.00000000000,R1,2026,R1,power,gasCCGT,newcapa,2038 +A1,2.00000000000,R1,2024,R1,power,gasCCGT,newcapa,2038 +A1,3.00000000000,R1,2026,R1,power,gasCCGT,newcapa,2038 A1,2.00000000000,R1,2028,R1,power,gasCCGT,newcapa,2038 A1,1.00000000000,R1,2030,R1,power,gasCCGT,newcapa,2038 A1,1.00000000000,R1,2032,R1,power,gasCCGT,newcapa,2038 A1,4.00000000000,R1,2020,R1,power,windturbine,newcapa,2038 A1,3.00000000000,R1,2034,R1,power,windturbine,newcapa,2038 A1,2.00000000000,R1,2036,R1,power,windturbine,newcapa,2038 -A1,0.47010000000,R1,2020,R1,gas,gassupply1,newcapa,2038 -A1,0.17680000000,R1,2022,R1,gas,gassupply1,newcapa,2038 -A1,2.25000000000,R1,2024,R1,gas,gassupply1,newcapa,2038 -A1,3.65110000000,R1,2026,R1,gas,gassupply1,newcapa,2038 -A1,3.59730000000,R1,2028,R1,gas,gassupply1,newcapa,2038 -A1,4.67680000000,R1,2030,R1,gas,gassupply1,newcapa,2038 -A1,4.67470000000,R1,2032,R1,gas,gassupply1,newcapa,2038 -A1,0.96760000000,R1,2034,R1,gas,gassupply1,newcapa,2038 -A1,0.11000000000,R1,2036,R1,gas,gassupply1,newcapa,2038 A1,13.00000000000,R1,2030,R1,residential,heatpump,newcapa,2040 A1,6.00000000000,R1,2032,R1,residential,heatpump,newcapa,2040 A1,6.00000000000,R1,2034,R1,residential,heatpump,newcapa,2040 @@ -147,21 +123,18 @@ A1,6.00000000000,R1,2036,R1,residential,heatpump,newcapa,2040 A1,8.00000000000,R1,2038,R1,residential,heatpump,newcapa,2040 A1,2.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2040 A1,1.00000000000,R1,2022,R1,power,gasCCGT,newcapa,2040 -A1,3.00000000000,R1,2024,R1,power,gasCCGT,newcapa,2040 -A1,2.00000000000,R1,2026,R1,power,gasCCGT,newcapa,2040 +A1,2.00000000000,R1,2024,R1,power,gasCCGT,newcapa,2040 +A1,3.00000000000,R1,2026,R1,power,gasCCGT,newcapa,2040 A1,2.00000000000,R1,2028,R1,power,gasCCGT,newcapa,2040 A1,1.00000000000,R1,2030,R1,power,gasCCGT,newcapa,2040 A1,1.00000000000,R1,2032,R1,power,gasCCGT,newcapa,2040 A1,4.00000000000,R1,2020,R1,power,windturbine,newcapa,2040 A1,3.00000000000,R1,2034,R1,power,windturbine,newcapa,2040 A1,2.00000000000,R1,2036,R1,power,windturbine,newcapa,2040 -A1,3.00000000000,R1,2038,R1,power,windturbine,newcapa,2040 -A1,0.47010000000,R1,2020,R1,gas,gassupply1,newcapa,2040 -A1,0.17680000000,R1,2022,R1,gas,gassupply1,newcapa,2040 -A1,2.25000000000,R1,2024,R1,gas,gassupply1,newcapa,2040 -A1,3.65110000000,R1,2026,R1,gas,gassupply1,newcapa,2040 -A1,3.59730000000,R1,2028,R1,gas,gassupply1,newcapa,2040 -A1,4.67680000000,R1,2030,R1,gas,gassupply1,newcapa,2040 -A1,4.67470000000,R1,2032,R1,gas,gassupply1,newcapa,2040 -A1,0.96760000000,R1,2034,R1,gas,gassupply1,newcapa,2040 -A1,0.11000000000,R1,2036,R1,gas,gassupply1,newcapa,2040 +A1,2.00000000000,R1,2038,R1,power,windturbine,newcapa,2040 +A1,0.32110000000,R1,2020,R1,gas,gassupply1,newcapa,2040 +A1,5.11670000000,R1,2026,R1,gas,gassupply1,newcapa,2040 +A1,3.76220000000,R1,2028,R1,gas,gassupply1,newcapa,2040 +A1,4.67000000000,R1,2030,R1,gas,gassupply1,newcapa,2040 +A1,4.67000000000,R1,2032,R1,gas,gassupply1,newcapa,2040 +A1,1.50000000000,R1,2034,R1,gas,gassupply1,newcapa,2040 diff --git a/docs/tutorial-code/modify-timing-data/2-modify-time-framework/Results/MCAPrices.csv b/docs/tutorial-code/modify-timing-data/2-modify-time-framework/Results/MCAPrices.csv index 0bab2dc2a..627e0edce 100644 --- a/docs/tutorial-code/modify-timing-data/2-modify-time-framework/Results/MCAPrices.csv +++ b/docs/tutorial-code/modify-timing-data/2-modify-time-framework/Results/MCAPrices.csv @@ -95,37 +95,37 @@ electricity,all-week,late-afternoon,all-year,8.18260000000,R1,7,MUS$2010/PJ,2024 gas,all-week,late-afternoon,all-year,0.35420000000,R1,7,MUS$2010/PJ,2024 heat,all-week,late-afternoon,all-year,4.68950000000,R1,7,MUS$2010/PJ,2024 CO2f,all-week,late-afternoon,all-year,0.11270000000,R1,7,MUS$2010/kt,2024 -electricity,all-week,night,all-year,10.01940000000,R1,0,MUS$2010/PJ,2026 +electricity,all-week,night,all-year,9.63610000000,R1,0,MUS$2010/PJ,2026 gas,all-week,night,all-year,0.35420000000,R1,0,MUS$2010/PJ,2026 -heat,all-week,night,all-year,4.97900000000,R1,0,MUS$2010/PJ,2026 +heat,all-week,night,all-year,4.85240000000,R1,0,MUS$2010/PJ,2026 CO2f,all-week,night,all-year,0.12750000000,R1,0,MUS$2010/kt,2026 -electricity,all-week,morning,all-year,10.01940000000,R1,1,MUS$2010/PJ,2026 +electricity,all-week,morning,all-year,9.63610000000,R1,1,MUS$2010/PJ,2026 gas,all-week,morning,all-year,0.35420000000,R1,1,MUS$2010/PJ,2026 -heat,all-week,morning,all-year,4.97900000000,R1,1,MUS$2010/PJ,2026 +heat,all-week,morning,all-year,4.85240000000,R1,1,MUS$2010/PJ,2026 CO2f,all-week,morning,all-year,0.12750000000,R1,1,MUS$2010/kt,2026 -electricity,all-week,mid-afternoon,all-year,10.01940000000,R1,2,MUS$2010/PJ,2026 +electricity,all-week,mid-afternoon,all-year,9.63610000000,R1,2,MUS$2010/PJ,2026 gas,all-week,mid-afternoon,all-year,0.35420000000,R1,2,MUS$2010/PJ,2026 -heat,all-week,mid-afternoon,all-year,4.97900000000,R1,2,MUS$2010/PJ,2026 +heat,all-week,mid-afternoon,all-year,4.85240000000,R1,2,MUS$2010/PJ,2026 CO2f,all-week,mid-afternoon,all-year,0.12750000000,R1,2,MUS$2010/kt,2026 -electricity,all-week,early-peak,all-year,10.01940000000,R1,3,MUS$2010/PJ,2026 +electricity,all-week,early-peak,all-year,9.63610000000,R1,3,MUS$2010/PJ,2026 gas,all-week,early-peak,all-year,0.35420000000,R1,3,MUS$2010/PJ,2026 -heat,all-week,early-peak,all-year,4.97900000000,R1,3,MUS$2010/PJ,2026 +heat,all-week,early-peak,all-year,4.85240000000,R1,3,MUS$2010/PJ,2026 CO2f,all-week,early-peak,all-year,0.12750000000,R1,3,MUS$2010/kt,2026 -electricity,all-week,late-peak,all-year,10.01940000000,R1,4,MUS$2010/PJ,2026 +electricity,all-week,late-peak,all-year,9.63610000000,R1,4,MUS$2010/PJ,2026 gas,all-week,late-peak,all-year,0.35420000000,R1,4,MUS$2010/PJ,2026 -heat,all-week,late-peak,all-year,4.97900000000,R1,4,MUS$2010/PJ,2026 +heat,all-week,late-peak,all-year,4.85240000000,R1,4,MUS$2010/PJ,2026 CO2f,all-week,late-peak,all-year,0.12750000000,R1,4,MUS$2010/kt,2026 -electricity,all-week,evening,all-year,10.01940000000,R1,5,MUS$2010/PJ,2026 +electricity,all-week,evening,all-year,9.63610000000,R1,5,MUS$2010/PJ,2026 gas,all-week,evening,all-year,0.35420000000,R1,5,MUS$2010/PJ,2026 -heat,all-week,evening,all-year,4.97900000000,R1,5,MUS$2010/PJ,2026 +heat,all-week,evening,all-year,4.85240000000,R1,5,MUS$2010/PJ,2026 CO2f,all-week,evening,all-year,0.12750000000,R1,5,MUS$2010/kt,2026 -electricity,all-week,early-morning,all-year,10.01940000000,R1,6,MUS$2010/PJ,2026 +electricity,all-week,early-morning,all-year,9.63610000000,R1,6,MUS$2010/PJ,2026 gas,all-week,early-morning,all-year,0.35420000000,R1,6,MUS$2010/PJ,2026 -heat,all-week,early-morning,all-year,4.97900000000,R1,6,MUS$2010/PJ,2026 +heat,all-week,early-morning,all-year,4.85240000000,R1,6,MUS$2010/PJ,2026 CO2f,all-week,early-morning,all-year,0.12750000000,R1,6,MUS$2010/kt,2026 -electricity,all-week,late-afternoon,all-year,10.01940000000,R1,7,MUS$2010/PJ,2026 +electricity,all-week,late-afternoon,all-year,9.63610000000,R1,7,MUS$2010/PJ,2026 gas,all-week,late-afternoon,all-year,0.35420000000,R1,7,MUS$2010/PJ,2026 -heat,all-week,late-afternoon,all-year,4.97900000000,R1,7,MUS$2010/PJ,2026 +heat,all-week,late-afternoon,all-year,4.85240000000,R1,7,MUS$2010/PJ,2026 CO2f,all-week,late-afternoon,all-year,0.12750000000,R1,7,MUS$2010/kt,2026 electricity,all-week,night,all-year,11.65880000000,R1,0,MUS$2010/PJ,2028 gas,all-week,night,all-year,0.35420000000,R1,0,MUS$2010/PJ,2028 @@ -319,35 +319,35 @@ electricity,all-week,late-afternoon,all-year,18.17390000000,R1,7,MUS$2010/PJ,203 gas,all-week,late-afternoon,all-year,0.35420000000,R1,7,MUS$2010/PJ,2038 heat,all-week,late-afternoon,all-year,7.45000000000,R1,7,MUS$2010/PJ,2038 CO2f,all-week,late-afternoon,all-year,0.24960000000,R1,7,MUS$2010/kt,2038 -electricity,all-week,night,all-year,18.34140000000,R1,0,MUS$2010/PJ,2040 +electricity,all-week,night,all-year,18.79120000000,R1,0,MUS$2010/PJ,2040 gas,all-week,night,all-year,0.35420000000,R1,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,7.51690000000,R1,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,7.69680000000,R1,0,MUS$2010/PJ,2040 CO2f,all-week,night,all-year,0.27280000000,R1,0,MUS$2010/kt,2040 -electricity,all-week,morning,all-year,18.34140000000,R1,1,MUS$2010/PJ,2040 +electricity,all-week,morning,all-year,18.79120000000,R1,1,MUS$2010/PJ,2040 gas,all-week,morning,all-year,0.35420000000,R1,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,7.51690000000,R1,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,7.69680000000,R1,1,MUS$2010/PJ,2040 CO2f,all-week,morning,all-year,0.27280000000,R1,1,MUS$2010/kt,2040 -electricity,all-week,mid-afternoon,all-year,18.34140000000,R1,2,MUS$2010/PJ,2040 +electricity,all-week,mid-afternoon,all-year,18.79120000000,R1,2,MUS$2010/PJ,2040 gas,all-week,mid-afternoon,all-year,0.35420000000,R1,2,MUS$2010/PJ,2040 -heat,all-week,mid-afternoon,all-year,7.51690000000,R1,2,MUS$2010/PJ,2040 +heat,all-week,mid-afternoon,all-year,7.69680000000,R1,2,MUS$2010/PJ,2040 CO2f,all-week,mid-afternoon,all-year,0.27280000000,R1,2,MUS$2010/kt,2040 -electricity,all-week,early-peak,all-year,18.34140000000,R1,3,MUS$2010/PJ,2040 +electricity,all-week,early-peak,all-year,18.79120000000,R1,3,MUS$2010/PJ,2040 gas,all-week,early-peak,all-year,0.35420000000,R1,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,7.51690000000,R1,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,7.69680000000,R1,3,MUS$2010/PJ,2040 CO2f,all-week,early-peak,all-year,0.27280000000,R1,3,MUS$2010/kt,2040 -electricity,all-week,late-peak,all-year,18.34140000000,R1,4,MUS$2010/PJ,2040 +electricity,all-week,late-peak,all-year,18.79120000000,R1,4,MUS$2010/PJ,2040 gas,all-week,late-peak,all-year,0.35420000000,R1,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,7.51690000000,R1,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,7.69680000000,R1,4,MUS$2010/PJ,2040 CO2f,all-week,late-peak,all-year,0.27280000000,R1,4,MUS$2010/kt,2040 -electricity,all-week,evening,all-year,18.34140000000,R1,5,MUS$2010/PJ,2040 +electricity,all-week,evening,all-year,18.79120000000,R1,5,MUS$2010/PJ,2040 gas,all-week,evening,all-year,0.35420000000,R1,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,7.51690000000,R1,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,7.69680000000,R1,5,MUS$2010/PJ,2040 CO2f,all-week,evening,all-year,0.27280000000,R1,5,MUS$2010/kt,2040 -electricity,all-week,early-morning,all-year,18.34140000000,R1,6,MUS$2010/PJ,2040 +electricity,all-week,early-morning,all-year,18.79120000000,R1,6,MUS$2010/PJ,2040 gas,all-week,early-morning,all-year,0.35420000000,R1,6,MUS$2010/PJ,2040 -heat,all-week,early-morning,all-year,7.51690000000,R1,6,MUS$2010/PJ,2040 +heat,all-week,early-morning,all-year,7.69680000000,R1,6,MUS$2010/PJ,2040 CO2f,all-week,early-morning,all-year,0.27280000000,R1,6,MUS$2010/kt,2040 -electricity,all-week,late-afternoon,all-year,18.34140000000,R1,7,MUS$2010/PJ,2040 +electricity,all-week,late-afternoon,all-year,18.79120000000,R1,7,MUS$2010/PJ,2040 gas,all-week,late-afternoon,all-year,0.35420000000,R1,7,MUS$2010/PJ,2040 -heat,all-week,late-afternoon,all-year,7.51690000000,R1,7,MUS$2010/PJ,2040 +heat,all-week,late-afternoon,all-year,7.69680000000,R1,7,MUS$2010/PJ,2040 CO2f,all-week,late-afternoon,all-year,0.27280000000,R1,7,MUS$2010/kt,2040 diff --git a/docs/tutorial-code/new-decision-metric/Results/MCACapacity.csv b/docs/tutorial-code/new-decision-metric/Results/MCACapacity.csv index 8c4ad6fea..8688d5698 100644 --- a/docs/tutorial-code/new-decision-metric/Results/MCACapacity.csv +++ b/docs/tutorial-code/new-decision-metric/Results/MCACapacity.csv @@ -13,7 +13,7 @@ A1,10.00000000000,R1,2025,R1,residential,heatpump,newcapa,2030 A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2030 A1,3.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2030 A1,10.00000000000,R1,2020,R1,power,solarPV,newcapa,2030 -A1,7.00000000000,R1,2025,R1,power,solarPV,newcapa,2030 +A1,5.00000000000,R1,2025,R1,power,solarPV,newcapa,2030 A1,4.00000000000,R1,2020,R1,power,windturbine,newcapa,2030 A1,7.50000000000,R1,2020,R1,gas,gassupply1,newcapa,2030 A1,10.00000000000,R1,2025,R1,residential,heatpump,newcapa,2035 @@ -21,8 +21,8 @@ A1,26.00000000000,R1,2030,R1,residential,heatpump,newcapa,2035 A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2035 A1,3.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2035 A1,10.00000000000,R1,2020,R1,power,solarPV,newcapa,2035 -A1,7.00000000000,R1,2025,R1,power,solarPV,newcapa,2035 -A1,6.00000000000,R1,2030,R1,power,solarPV,newcapa,2035 +A1,5.00000000000,R1,2025,R1,power,solarPV,newcapa,2035 +A1,8.00000000000,R1,2030,R1,power,solarPV,newcapa,2035 A1,4.00000000000,R1,2020,R1,power,windturbine,newcapa,2035 A1,6.68000000000,R1,2030,R1,gas,gassupply1,newcapa,2035 A1,26.00000000000,R1,2030,R1,residential,heatpump,newcapa,2040 @@ -30,34 +30,30 @@ A1,16.00000000000,R1,2035,R1,residential,heatpump,newcapa,2040 A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2040 A1,3.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2040 A1,10.00000000000,R1,2020,R1,power,solarPV,newcapa,2040 -A1,7.00000000000,R1,2025,R1,power,solarPV,newcapa,2040 -A1,6.00000000000,R1,2030,R1,power,solarPV,newcapa,2040 +A1,5.00000000000,R1,2025,R1,power,solarPV,newcapa,2040 +A1,8.00000000000,R1,2030,R1,power,solarPV,newcapa,2040 A1,5.00000000000,R1,2035,R1,power,solarPV,newcapa,2040 A1,4.00000000000,R1,2020,R1,power,windturbine,newcapa,2040 A1,6.68000000000,R1,2030,R1,gas,gassupply1,newcapa,2040 -A1,0.16290000000,R1,2035,R1,gas,gassupply1,newcapa,2040 A1,16.00000000000,R1,2035,R1,residential,heatpump,newcapa,2045 A1,32.00000000000,R1,2040,R1,residential,heatpump,newcapa,2045 A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2045 A1,3.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2045 A1,10.00000000000,R1,2020,R1,power,solarPV,newcapa,2045 -A1,7.00000000000,R1,2025,R1,power,solarPV,newcapa,2045 -A1,6.00000000000,R1,2030,R1,power,solarPV,newcapa,2045 +A1,5.00000000000,R1,2025,R1,power,solarPV,newcapa,2045 +A1,8.00000000000,R1,2030,R1,power,solarPV,newcapa,2045 A1,5.00000000000,R1,2035,R1,power,solarPV,newcapa,2045 A1,7.00000000000,R1,2040,R1,power,solarPV,newcapa,2045 A1,4.00000000000,R1,2020,R1,power,windturbine,newcapa,2045 A1,6.68000000000,R1,2030,R1,gas,gassupply1,newcapa,2045 -A1,0.16290000000,R1,2035,R1,gas,gassupply1,newcapa,2045 A1,32.00000000000,R1,2040,R1,residential,heatpump,newcapa,2050 A1,22.00000000000,R1,2045,R1,residential,heatpump,newcapa,2050 A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2050 A1,3.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2050 -A1,7.00000000000,R1,2025,R1,power,solarPV,newcapa,2050 -A1,6.00000000000,R1,2030,R1,power,solarPV,newcapa,2050 +A1,5.00000000000,R1,2025,R1,power,solarPV,newcapa,2050 +A1,8.00000000000,R1,2030,R1,power,solarPV,newcapa,2050 A1,5.00000000000,R1,2035,R1,power,solarPV,newcapa,2050 A1,7.00000000000,R1,2040,R1,power,solarPV,newcapa,2050 A1,10.00000000000,R1,2045,R1,power,solarPV,newcapa,2050 A1,8.00000000000,R1,2045,R1,power,windturbine,newcapa,2050 A1,6.68000000000,R1,2030,R1,gas,gassupply1,newcapa,2050 -A1,0.16290000000,R1,2035,R1,gas,gassupply1,newcapa,2050 -A1,0.09400000000,R1,2045,R1,gas,gassupply1,newcapa,2050 diff --git a/docs/tutorial-code/new-decision-metric/Results/MCAMetric_Consumption.csv b/docs/tutorial-code/new-decision-metric/Results/MCAMetric_Consumption.csv index bdfe6e0eb..94ed7168e 100644 --- a/docs/tutorial-code/new-decision-metric/Results/MCAMetric_Consumption.csv +++ b/docs/tutorial-code/new-decision-metric/Results/MCAMetric_Consumption.csv @@ -3,8 +3,8 @@ A1,0,newcapa,CONSUMABLE|ENERGY,gas,1.16000000000,all-week,R1,night,2020,all-year A1,0,newcapa,CONSUMABLE|ENERGY,gas,1.74000000000,all-week,R1,morning,2020,all-year,R1,residential,gasboiler,1,MUS$2010/PJ,2020 A1,0,newcapa,CONSUMABLE|ENERGY,gas,1.16000000000,all-week,R1,afternoon,2020,all-year,R1,residential,gasboiler,2,MUS$2010/PJ,2020 A1,0,newcapa,CONSUMABLE|ENERGY,gas,1.74000000000,all-week,R1,early-peak,2020,all-year,R1,residential,gasboiler,3,MUS$2010/PJ,2020 -A1,0,newcapa,CONSUMABLE|ENERGY,gas,3.48000000000,all-week,R1,late-peak,2020,all-year,R1,residential,gasboiler,4,MUS$2010/PJ,2020 -A1,0,newcapa,CONSUMABLE|ENERGY,gas,2.32000000000,all-week,R1,evening,2020,all-year,R1,residential,gasboiler,5,MUS$2010/PJ,2020 +A1,0,newcapa,CONSUMABLE|ENERGY,gas,1.93333333333,all-week,R1,late-peak,2020,all-year,R1,residential,gasboiler,4,MUS$2010/PJ,2020 +A1,0,newcapa,CONSUMABLE|ENERGY,gas,1.93333333333,all-week,R1,evening,2020,all-year,R1,residential,gasboiler,5,MUS$2010/PJ,2020 A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.32222222222,all-week,R1,night,2020,all-year,R1,residential,gasboiler,0,MUS$2010/PJ,2025 A1,1,newcapa,CONSUMABLE|ENERGY,electricity,0.42222222222,all-week,R1,night,2020,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2025 A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.48333333333,all-week,R1,morning,2020,all-year,R1,residential,gasboiler,1,MUS$2010/PJ,2025 @@ -29,9 +29,9 @@ A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.09129129129,all-week,R1,afternoon,2020,all A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.25727027027,all-week,R1,early-peak,2020,all-year,R1,power,gasCCGT,3,MUS$2010/PJ,2025 A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.34234234234,all-week,R1,early-peak,2020,all-year,R1,power,solarPV,3,MUS$2010/kt,2025 A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.13693693694,all-week,R1,early-peak,2020,all-year,R1,power,windturbine,3,MUS$2010/kt,2025 -A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.51454054054,all-week,R1,late-peak,2020,all-year,R1,power,gasCCGT,4,MUS$2010/PJ,2025 -A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.68468468468,all-week,R1,late-peak,2020,all-year,R1,power,solarPV,4,MUS$2010/kt,2025 -A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.27387387387,all-week,R1,late-peak,2020,all-year,R1,power,windturbine,4,MUS$2010/kt,2025 +A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.50100000000,all-week,R1,late-peak,2020,all-year,R1,power,gasCCGT,4,MUS$2010/PJ,2025 +A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.66666666667,all-week,R1,late-peak,2020,all-year,R1,power,solarPV,4,MUS$2010/kt,2025 +A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.26666666667,all-week,R1,late-peak,2020,all-year,R1,power,windturbine,4,MUS$2010/kt,2025 A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.34302702703,all-week,R1,evening,2020,all-year,R1,power,gasCCGT,5,MUS$2010/PJ,2025 A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.45645645646,all-week,R1,evening,2020,all-year,R1,power,solarPV,5,MUS$2010/kt,2025 A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.18258258258,all-week,R1,evening,2020,all-year,R1,power,windturbine,5,MUS$2010/kt,2025 @@ -43,40 +43,40 @@ A1,1,newcapa,CONSUMABLE|ENERGY,electricity,0.43678160920,all-week,R1,afternoon,2 A1,2,newcapa,CONSUMABLE|ENERGY,electricity,0.22988505747,all-week,R1,afternoon,2025,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2030 A1,1,newcapa,CONSUMABLE|ENERGY,electricity,0.65517241379,all-week,R1,early-peak,2020,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2030 A1,2,newcapa,CONSUMABLE|ENERGY,electricity,0.34482758621,all-week,R1,early-peak,2025,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2030 -A1,1,newcapa,CONSUMABLE|ENERGY,electricity,1.31034482759,all-week,R1,late-peak,2020,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2030 -A1,2,newcapa,CONSUMABLE|ENERGY,electricity,0.68965517241,all-week,R1,late-peak,2025,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2030 +A1,1,newcapa,CONSUMABLE|ENERGY,electricity,1.26666666667,all-week,R1,late-peak,2020,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2030 +A1,2,newcapa,CONSUMABLE|ENERGY,electricity,0.66666666667,all-week,R1,late-peak,2025,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2030 A1,1,newcapa,CONSUMABLE|ENERGY,electricity,0.87356321839,all-week,R1,evening,2020,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2030 A1,2,newcapa,CONSUMABLE|ENERGY,electricity,0.45977011494,all-week,R1,evening,2025,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2030 -A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.08350000000,all-week,R1,night,2020,all-year,R1,power,gasCCGT,0,MUS$2010/PJ,2030 -A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.22222222222,all-week,R1,night,2020,all-year,R1,power,solarPV,0,MUS$2010/kt,2030 -A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.08888888889,all-week,R1,night,2020,all-year,R1,power,windturbine,0,MUS$2010/kt,2030 -A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.25050000000,all-week,R1,night,2025,all-year,R1,power,gasCCGT,0,MUS$2010/PJ,2030 -A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.15555555556,all-week,R1,night,2025,all-year,R1,power,solarPV,0,MUS$2010/kt,2030 -A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.12525000000,all-week,R1,morning,2020,all-year,R1,power,gasCCGT,1,MUS$2010/PJ,2030 -A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.33333333333,all-week,R1,morning,2020,all-year,R1,power,solarPV,1,MUS$2010/kt,2030 -A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.13333333333,all-week,R1,morning,2020,all-year,R1,power,windturbine,1,MUS$2010/kt,2030 -A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.37575000000,all-week,R1,morning,2025,all-year,R1,power,gasCCGT,1,MUS$2010/PJ,2030 -A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.23333333333,all-week,R1,morning,2025,all-year,R1,power,solarPV,1,MUS$2010/kt,2030 -A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.08350000000,all-week,R1,afternoon,2020,all-year,R1,power,gasCCGT,2,MUS$2010/PJ,2030 -A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.22222222222,all-week,R1,afternoon,2020,all-year,R1,power,solarPV,2,MUS$2010/kt,2030 -A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.08888888889,all-week,R1,afternoon,2020,all-year,R1,power,windturbine,2,MUS$2010/kt,2030 -A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.25050000000,all-week,R1,afternoon,2025,all-year,R1,power,gasCCGT,2,MUS$2010/PJ,2030 -A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.15555555556,all-week,R1,afternoon,2025,all-year,R1,power,solarPV,2,MUS$2010/kt,2030 -A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.12525000000,all-week,R1,early-peak,2020,all-year,R1,power,gasCCGT,3,MUS$2010/PJ,2030 -A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.33333333333,all-week,R1,early-peak,2020,all-year,R1,power,solarPV,3,MUS$2010/kt,2030 -A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.13333333333,all-week,R1,early-peak,2020,all-year,R1,power,windturbine,3,MUS$2010/kt,2030 -A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.37575000000,all-week,R1,early-peak,2025,all-year,R1,power,gasCCGT,3,MUS$2010/PJ,2030 -A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.23333333333,all-week,R1,early-peak,2025,all-year,R1,power,solarPV,3,MUS$2010/kt,2030 +A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.08946428571,all-week,R1,night,2020,all-year,R1,power,gasCCGT,0,MUS$2010/PJ,2030 +A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.23809523810,all-week,R1,night,2020,all-year,R1,power,solarPV,0,MUS$2010/kt,2030 +A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.09523809524,all-week,R1,night,2020,all-year,R1,power,windturbine,0,MUS$2010/kt,2030 +A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.26839285714,all-week,R1,night,2025,all-year,R1,power,gasCCGT,0,MUS$2010/PJ,2030 +A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.11904761905,all-week,R1,night,2025,all-year,R1,power,solarPV,0,MUS$2010/kt,2030 +A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.13419642857,all-week,R1,morning,2020,all-year,R1,power,gasCCGT,1,MUS$2010/PJ,2030 +A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.35714285714,all-week,R1,morning,2020,all-year,R1,power,solarPV,1,MUS$2010/kt,2030 +A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.14285714286,all-week,R1,morning,2020,all-year,R1,power,windturbine,1,MUS$2010/kt,2030 +A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.40258928571,all-week,R1,morning,2025,all-year,R1,power,gasCCGT,1,MUS$2010/PJ,2030 +A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.17857142857,all-week,R1,morning,2025,all-year,R1,power,solarPV,1,MUS$2010/kt,2030 +A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.08946428571,all-week,R1,afternoon,2020,all-year,R1,power,gasCCGT,2,MUS$2010/PJ,2030 +A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.23809523810,all-week,R1,afternoon,2020,all-year,R1,power,solarPV,2,MUS$2010/kt,2030 +A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.09523809524,all-week,R1,afternoon,2020,all-year,R1,power,windturbine,2,MUS$2010/kt,2030 +A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.26839285714,all-week,R1,afternoon,2025,all-year,R1,power,gasCCGT,2,MUS$2010/PJ,2030 +A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.11904761905,all-week,R1,afternoon,2025,all-year,R1,power,solarPV,2,MUS$2010/kt,2030 +A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.13419642857,all-week,R1,early-peak,2020,all-year,R1,power,gasCCGT,3,MUS$2010/PJ,2030 +A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.35714285714,all-week,R1,early-peak,2020,all-year,R1,power,solarPV,3,MUS$2010/kt,2030 +A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.14285714286,all-week,R1,early-peak,2020,all-year,R1,power,windturbine,3,MUS$2010/kt,2030 +A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.40258928571,all-week,R1,early-peak,2025,all-year,R1,power,gasCCGT,3,MUS$2010/PJ,2030 +A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.17857142857,all-week,R1,early-peak,2025,all-year,R1,power,solarPV,3,MUS$2010/kt,2030 A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.25050000000,all-week,R1,late-peak,2020,all-year,R1,power,gasCCGT,4,MUS$2010/PJ,2030 A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.66666666667,all-week,R1,late-peak,2020,all-year,R1,power,solarPV,4,MUS$2010/kt,2030 A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.26666666667,all-week,R1,late-peak,2020,all-year,R1,power,windturbine,4,MUS$2010/kt,2030 A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.75150000000,all-week,R1,late-peak,2025,all-year,R1,power,gasCCGT,4,MUS$2010/PJ,2030 -A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.46666666667,all-week,R1,late-peak,2025,all-year,R1,power,solarPV,4,MUS$2010/kt,2030 -A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.16700000000,all-week,R1,evening,2020,all-year,R1,power,gasCCGT,5,MUS$2010/PJ,2030 -A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.44444444444,all-week,R1,evening,2020,all-year,R1,power,solarPV,5,MUS$2010/kt,2030 -A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.17777777778,all-week,R1,evening,2020,all-year,R1,power,windturbine,5,MUS$2010/kt,2030 -A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.50100000000,all-week,R1,evening,2025,all-year,R1,power,gasCCGT,5,MUS$2010/PJ,2030 -A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.31111111111,all-week,R1,evening,2025,all-year,R1,power,solarPV,5,MUS$2010/kt,2030 +A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.33333333333,all-week,R1,late-peak,2025,all-year,R1,power,solarPV,4,MUS$2010/kt,2030 +A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.17892857143,all-week,R1,evening,2020,all-year,R1,power,gasCCGT,5,MUS$2010/PJ,2030 +A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.47619047619,all-week,R1,evening,2020,all-year,R1,power,solarPV,5,MUS$2010/kt,2030 +A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.19047619048,all-week,R1,evening,2020,all-year,R1,power,windturbine,5,MUS$2010/kt,2030 +A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.53678571429,all-week,R1,evening,2025,all-year,R1,power,gasCCGT,5,MUS$2010/PJ,2030 +A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.23809523810,all-week,R1,evening,2025,all-year,R1,power,solarPV,5,MUS$2010/kt,2030 A1,2,newcapa,CONSUMABLE|ENERGY,electricity,0.22222222222,all-week,R1,night,2025,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2035 A1,3,newcapa,CONSUMABLE|ENERGY,electricity,0.57777777778,all-week,R1,night,2030,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2035 A1,2,newcapa,CONSUMABLE|ENERGY,electricity,0.33333333333,all-week,R1,morning,2025,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2035 @@ -93,38 +93,38 @@ A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.08350000000,all-week,R1,night,2020,all-year A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.22222222222,all-week,R1,night,2020,all-year,R1,power,solarPV,0,MUS$2010/kt,2035 A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.08888888889,all-week,R1,night,2020,all-year,R1,power,windturbine,0,MUS$2010/kt,2035 A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.25050000000,all-week,R1,night,2025,all-year,R1,power,gasCCGT,0,MUS$2010/PJ,2035 -A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.15555555556,all-week,R1,night,2025,all-year,R1,power,solarPV,0,MUS$2010/kt,2035 -A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.13333333333,all-week,R1,night,2030,all-year,R1,power,solarPV,0,MUS$2010/kt,2035 +A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.11111111111,all-week,R1,night,2025,all-year,R1,power,solarPV,0,MUS$2010/kt,2035 +A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.17777777778,all-week,R1,night,2030,all-year,R1,power,solarPV,0,MUS$2010/kt,2035 A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.12525000000,all-week,R1,morning,2020,all-year,R1,power,gasCCGT,1,MUS$2010/PJ,2035 A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.33333333333,all-week,R1,morning,2020,all-year,R1,power,solarPV,1,MUS$2010/kt,2035 A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.13333333333,all-week,R1,morning,2020,all-year,R1,power,windturbine,1,MUS$2010/kt,2035 A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.37575000000,all-week,R1,morning,2025,all-year,R1,power,gasCCGT,1,MUS$2010/PJ,2035 -A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.23333333333,all-week,R1,morning,2025,all-year,R1,power,solarPV,1,MUS$2010/kt,2035 -A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.20000000000,all-week,R1,morning,2030,all-year,R1,power,solarPV,1,MUS$2010/kt,2035 +A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.16666666667,all-week,R1,morning,2025,all-year,R1,power,solarPV,1,MUS$2010/kt,2035 +A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.26666666667,all-week,R1,morning,2030,all-year,R1,power,solarPV,1,MUS$2010/kt,2035 A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.08350000000,all-week,R1,afternoon,2020,all-year,R1,power,gasCCGT,2,MUS$2010/PJ,2035 A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.22222222222,all-week,R1,afternoon,2020,all-year,R1,power,solarPV,2,MUS$2010/kt,2035 A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.08888888889,all-week,R1,afternoon,2020,all-year,R1,power,windturbine,2,MUS$2010/kt,2035 A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.25050000000,all-week,R1,afternoon,2025,all-year,R1,power,gasCCGT,2,MUS$2010/PJ,2035 -A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.15555555556,all-week,R1,afternoon,2025,all-year,R1,power,solarPV,2,MUS$2010/kt,2035 -A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.13333333333,all-week,R1,afternoon,2030,all-year,R1,power,solarPV,2,MUS$2010/kt,2035 +A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.11111111111,all-week,R1,afternoon,2025,all-year,R1,power,solarPV,2,MUS$2010/kt,2035 +A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.17777777778,all-week,R1,afternoon,2030,all-year,R1,power,solarPV,2,MUS$2010/kt,2035 A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.12525000000,all-week,R1,early-peak,2020,all-year,R1,power,gasCCGT,3,MUS$2010/PJ,2035 A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.33333333333,all-week,R1,early-peak,2020,all-year,R1,power,solarPV,3,MUS$2010/kt,2035 A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.13333333333,all-week,R1,early-peak,2020,all-year,R1,power,windturbine,3,MUS$2010/kt,2035 A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.37575000000,all-week,R1,early-peak,2025,all-year,R1,power,gasCCGT,3,MUS$2010/PJ,2035 -A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.23333333333,all-week,R1,early-peak,2025,all-year,R1,power,solarPV,3,MUS$2010/kt,2035 -A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.20000000000,all-week,R1,early-peak,2030,all-year,R1,power,solarPV,3,MUS$2010/kt,2035 +A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.16666666667,all-week,R1,early-peak,2025,all-year,R1,power,solarPV,3,MUS$2010/kt,2035 +A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.26666666667,all-week,R1,early-peak,2030,all-year,R1,power,solarPV,3,MUS$2010/kt,2035 A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.25050000000,all-week,R1,late-peak,2020,all-year,R1,power,gasCCGT,4,MUS$2010/PJ,2035 A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.66666666667,all-week,R1,late-peak,2020,all-year,R1,power,solarPV,4,MUS$2010/kt,2035 A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.26666666667,all-week,R1,late-peak,2020,all-year,R1,power,windturbine,4,MUS$2010/kt,2035 A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.75150000000,all-week,R1,late-peak,2025,all-year,R1,power,gasCCGT,4,MUS$2010/PJ,2035 -A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.46666666667,all-week,R1,late-peak,2025,all-year,R1,power,solarPV,4,MUS$2010/kt,2035 -A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.40000000000,all-week,R1,late-peak,2030,all-year,R1,power,solarPV,4,MUS$2010/kt,2035 +A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.33333333333,all-week,R1,late-peak,2025,all-year,R1,power,solarPV,4,MUS$2010/kt,2035 +A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.53333333333,all-week,R1,late-peak,2030,all-year,R1,power,solarPV,4,MUS$2010/kt,2035 A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.16700000000,all-week,R1,evening,2020,all-year,R1,power,gasCCGT,5,MUS$2010/PJ,2035 A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.44444444444,all-week,R1,evening,2020,all-year,R1,power,solarPV,5,MUS$2010/kt,2035 A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.17777777778,all-week,R1,evening,2020,all-year,R1,power,windturbine,5,MUS$2010/kt,2035 A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.50100000000,all-week,R1,evening,2025,all-year,R1,power,gasCCGT,5,MUS$2010/PJ,2035 -A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.31111111111,all-week,R1,evening,2025,all-year,R1,power,solarPV,5,MUS$2010/kt,2035 -A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.26666666667,all-week,R1,evening,2030,all-year,R1,power,solarPV,5,MUS$2010/kt,2035 +A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.22222222222,all-week,R1,evening,2025,all-year,R1,power,solarPV,5,MUS$2010/kt,2035 +A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.35555555556,all-week,R1,evening,2030,all-year,R1,power,solarPV,5,MUS$2010/kt,2035 A1,3,newcapa,CONSUMABLE|ENERGY,electricity,0.57777777778,all-week,R1,night,2030,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2040 A1,4,newcapa,CONSUMABLE|ENERGY,electricity,0.35555555556,all-week,R1,night,2035,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2040 A1,3,newcapa,CONSUMABLE|ENERGY,electricity,0.86666666667,all-week,R1,morning,2030,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2040 @@ -141,43 +141,43 @@ A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.08553658537,all-week,R1,night,2020,all-year A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.22764227642,all-week,R1,night,2020,all-year,R1,power,solarPV,0,MUS$2010/kt,2040 A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.09105691057,all-week,R1,night,2020,all-year,R1,power,windturbine,0,MUS$2010/kt,2040 A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.25660975610,all-week,R1,night,2025,all-year,R1,power,gasCCGT,0,MUS$2010/PJ,2040 -A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.15934959350,all-week,R1,night,2025,all-year,R1,power,solarPV,0,MUS$2010/kt,2040 -A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.13658536585,all-week,R1,night,2030,all-year,R1,power,solarPV,0,MUS$2010/kt,2040 +A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.11382113821,all-week,R1,night,2025,all-year,R1,power,solarPV,0,MUS$2010/kt,2040 +A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.18211382114,all-week,R1,night,2030,all-year,R1,power,solarPV,0,MUS$2010/kt,2040 A1,6,newcapa,CONSUMABLE|ENERGY,solar,0.11382113821,all-week,R1,night,2035,all-year,R1,power,solarPV,0,MUS$2010/kt,2040 A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.12830487805,all-week,R1,morning,2020,all-year,R1,power,gasCCGT,1,MUS$2010/PJ,2040 A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.34146341463,all-week,R1,morning,2020,all-year,R1,power,solarPV,1,MUS$2010/kt,2040 A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.13658536585,all-week,R1,morning,2020,all-year,R1,power,windturbine,1,MUS$2010/kt,2040 A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.38491463415,all-week,R1,morning,2025,all-year,R1,power,gasCCGT,1,MUS$2010/PJ,2040 -A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.23902439024,all-week,R1,morning,2025,all-year,R1,power,solarPV,1,MUS$2010/kt,2040 -A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.20487804878,all-week,R1,morning,2030,all-year,R1,power,solarPV,1,MUS$2010/kt,2040 +A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.17073170732,all-week,R1,morning,2025,all-year,R1,power,solarPV,1,MUS$2010/kt,2040 +A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.27317073171,all-week,R1,morning,2030,all-year,R1,power,solarPV,1,MUS$2010/kt,2040 A1,6,newcapa,CONSUMABLE|ENERGY,solar,0.17073170732,all-week,R1,morning,2035,all-year,R1,power,solarPV,1,MUS$2010/kt,2040 A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.08553658537,all-week,R1,afternoon,2020,all-year,R1,power,gasCCGT,2,MUS$2010/PJ,2040 A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.22764227642,all-week,R1,afternoon,2020,all-year,R1,power,solarPV,2,MUS$2010/kt,2040 A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.09105691057,all-week,R1,afternoon,2020,all-year,R1,power,windturbine,2,MUS$2010/kt,2040 A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.25660975610,all-week,R1,afternoon,2025,all-year,R1,power,gasCCGT,2,MUS$2010/PJ,2040 -A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.15934959350,all-week,R1,afternoon,2025,all-year,R1,power,solarPV,2,MUS$2010/kt,2040 -A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.13658536585,all-week,R1,afternoon,2030,all-year,R1,power,solarPV,2,MUS$2010/kt,2040 +A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.11382113821,all-week,R1,afternoon,2025,all-year,R1,power,solarPV,2,MUS$2010/kt,2040 +A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.18211382114,all-week,R1,afternoon,2030,all-year,R1,power,solarPV,2,MUS$2010/kt,2040 A1,6,newcapa,CONSUMABLE|ENERGY,solar,0.11382113821,all-week,R1,afternoon,2035,all-year,R1,power,solarPV,2,MUS$2010/kt,2040 A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.12830487805,all-week,R1,early-peak,2020,all-year,R1,power,gasCCGT,3,MUS$2010/PJ,2040 A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.34146341463,all-week,R1,early-peak,2020,all-year,R1,power,solarPV,3,MUS$2010/kt,2040 A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.13658536585,all-week,R1,early-peak,2020,all-year,R1,power,windturbine,3,MUS$2010/kt,2040 A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.38491463415,all-week,R1,early-peak,2025,all-year,R1,power,gasCCGT,3,MUS$2010/PJ,2040 -A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.23902439024,all-week,R1,early-peak,2025,all-year,R1,power,solarPV,3,MUS$2010/kt,2040 -A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.20487804878,all-week,R1,early-peak,2030,all-year,R1,power,solarPV,3,MUS$2010/kt,2040 +A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.17073170732,all-week,R1,early-peak,2025,all-year,R1,power,solarPV,3,MUS$2010/kt,2040 +A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.27317073171,all-week,R1,early-peak,2030,all-year,R1,power,solarPV,3,MUS$2010/kt,2040 A1,6,newcapa,CONSUMABLE|ENERGY,solar,0.17073170732,all-week,R1,early-peak,2035,all-year,R1,power,solarPV,3,MUS$2010/kt,2040 -A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.25660975610,all-week,R1,late-peak,2020,all-year,R1,power,gasCCGT,4,MUS$2010/PJ,2040 -A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.68292682927,all-week,R1,late-peak,2020,all-year,R1,power,solarPV,4,MUS$2010/kt,2040 -A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.27317073171,all-week,R1,late-peak,2020,all-year,R1,power,windturbine,4,MUS$2010/kt,2040 -A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.76982926829,all-week,R1,late-peak,2025,all-year,R1,power,gasCCGT,4,MUS$2010/PJ,2040 -A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.47804878049,all-week,R1,late-peak,2025,all-year,R1,power,solarPV,4,MUS$2010/kt,2040 -A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.40975609756,all-week,R1,late-peak,2030,all-year,R1,power,solarPV,4,MUS$2010/kt,2040 -A1,6,newcapa,CONSUMABLE|ENERGY,solar,0.34146341463,all-week,R1,late-peak,2035,all-year,R1,power,solarPV,4,MUS$2010/kt,2040 +A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.25050000000,all-week,R1,late-peak,2020,all-year,R1,power,gasCCGT,4,MUS$2010/PJ,2040 +A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.66666666667,all-week,R1,late-peak,2020,all-year,R1,power,solarPV,4,MUS$2010/kt,2040 +A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.26666666667,all-week,R1,late-peak,2020,all-year,R1,power,windturbine,4,MUS$2010/kt,2040 +A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.75150000000,all-week,R1,late-peak,2025,all-year,R1,power,gasCCGT,4,MUS$2010/PJ,2040 +A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.33333333333,all-week,R1,late-peak,2025,all-year,R1,power,solarPV,4,MUS$2010/kt,2040 +A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.53333333333,all-week,R1,late-peak,2030,all-year,R1,power,solarPV,4,MUS$2010/kt,2040 +A1,6,newcapa,CONSUMABLE|ENERGY,solar,0.33333333333,all-week,R1,late-peak,2035,all-year,R1,power,solarPV,4,MUS$2010/kt,2040 A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.17107317073,all-week,R1,evening,2020,all-year,R1,power,gasCCGT,5,MUS$2010/PJ,2040 A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.45528455285,all-week,R1,evening,2020,all-year,R1,power,solarPV,5,MUS$2010/kt,2040 A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.18211382114,all-week,R1,evening,2020,all-year,R1,power,windturbine,5,MUS$2010/kt,2040 A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.51321951220,all-week,R1,evening,2025,all-year,R1,power,gasCCGT,5,MUS$2010/PJ,2040 -A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.31869918699,all-week,R1,evening,2025,all-year,R1,power,solarPV,5,MUS$2010/kt,2040 -A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.27317073171,all-week,R1,evening,2030,all-year,R1,power,solarPV,5,MUS$2010/kt,2040 +A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.22764227642,all-week,R1,evening,2025,all-year,R1,power,solarPV,5,MUS$2010/kt,2040 +A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.36422764228,all-week,R1,evening,2030,all-year,R1,power,solarPV,5,MUS$2010/kt,2040 A1,6,newcapa,CONSUMABLE|ENERGY,solar,0.22764227642,all-week,R1,evening,2035,all-year,R1,power,solarPV,5,MUS$2010/kt,2040 A1,4,newcapa,CONSUMABLE|ENERGY,electricity,0.35555555556,all-week,R1,night,2035,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2045 A1,5,newcapa,CONSUMABLE|ENERGY,electricity,0.71111111111,all-week,R1,night,2040,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2045 @@ -195,48 +195,48 @@ A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.08350000000,all-week,R1,night,2020,all-year A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.22222222222,all-week,R1,night,2020,all-year,R1,power,solarPV,0,MUS$2010/kt,2045 A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.08888888889,all-week,R1,night,2020,all-year,R1,power,windturbine,0,MUS$2010/kt,2045 A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.25050000000,all-week,R1,night,2025,all-year,R1,power,gasCCGT,0,MUS$2010/PJ,2045 -A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.15555555556,all-week,R1,night,2025,all-year,R1,power,solarPV,0,MUS$2010/kt,2045 -A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.13333333333,all-week,R1,night,2030,all-year,R1,power,solarPV,0,MUS$2010/kt,2045 +A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.11111111111,all-week,R1,night,2025,all-year,R1,power,solarPV,0,MUS$2010/kt,2045 +A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.17777777778,all-week,R1,night,2030,all-year,R1,power,solarPV,0,MUS$2010/kt,2045 A1,6,newcapa,CONSUMABLE|ENERGY,solar,0.11111111111,all-week,R1,night,2035,all-year,R1,power,solarPV,0,MUS$2010/kt,2045 A1,7,newcapa,CONSUMABLE|ENERGY,solar,0.15555555556,all-week,R1,night,2040,all-year,R1,power,solarPV,0,MUS$2010/kt,2045 A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.12525000000,all-week,R1,morning,2020,all-year,R1,power,gasCCGT,1,MUS$2010/PJ,2045 A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.33333333333,all-week,R1,morning,2020,all-year,R1,power,solarPV,1,MUS$2010/kt,2045 A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.13333333333,all-week,R1,morning,2020,all-year,R1,power,windturbine,1,MUS$2010/kt,2045 A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.37575000000,all-week,R1,morning,2025,all-year,R1,power,gasCCGT,1,MUS$2010/PJ,2045 -A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.23333333333,all-week,R1,morning,2025,all-year,R1,power,solarPV,1,MUS$2010/kt,2045 -A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.20000000000,all-week,R1,morning,2030,all-year,R1,power,solarPV,1,MUS$2010/kt,2045 +A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.16666666667,all-week,R1,morning,2025,all-year,R1,power,solarPV,1,MUS$2010/kt,2045 +A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.26666666667,all-week,R1,morning,2030,all-year,R1,power,solarPV,1,MUS$2010/kt,2045 A1,6,newcapa,CONSUMABLE|ENERGY,solar,0.16666666667,all-week,R1,morning,2035,all-year,R1,power,solarPV,1,MUS$2010/kt,2045 A1,7,newcapa,CONSUMABLE|ENERGY,solar,0.23333333333,all-week,R1,morning,2040,all-year,R1,power,solarPV,1,MUS$2010/kt,2045 A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.08350000000,all-week,R1,afternoon,2020,all-year,R1,power,gasCCGT,2,MUS$2010/PJ,2045 A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.22222222222,all-week,R1,afternoon,2020,all-year,R1,power,solarPV,2,MUS$2010/kt,2045 A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.08888888889,all-week,R1,afternoon,2020,all-year,R1,power,windturbine,2,MUS$2010/kt,2045 A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.25050000000,all-week,R1,afternoon,2025,all-year,R1,power,gasCCGT,2,MUS$2010/PJ,2045 -A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.15555555556,all-week,R1,afternoon,2025,all-year,R1,power,solarPV,2,MUS$2010/kt,2045 -A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.13333333333,all-week,R1,afternoon,2030,all-year,R1,power,solarPV,2,MUS$2010/kt,2045 +A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.11111111111,all-week,R1,afternoon,2025,all-year,R1,power,solarPV,2,MUS$2010/kt,2045 +A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.17777777778,all-week,R1,afternoon,2030,all-year,R1,power,solarPV,2,MUS$2010/kt,2045 A1,6,newcapa,CONSUMABLE|ENERGY,solar,0.11111111111,all-week,R1,afternoon,2035,all-year,R1,power,solarPV,2,MUS$2010/kt,2045 A1,7,newcapa,CONSUMABLE|ENERGY,solar,0.15555555556,all-week,R1,afternoon,2040,all-year,R1,power,solarPV,2,MUS$2010/kt,2045 A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.12525000000,all-week,R1,early-peak,2020,all-year,R1,power,gasCCGT,3,MUS$2010/PJ,2045 A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.33333333333,all-week,R1,early-peak,2020,all-year,R1,power,solarPV,3,MUS$2010/kt,2045 A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.13333333333,all-week,R1,early-peak,2020,all-year,R1,power,windturbine,3,MUS$2010/kt,2045 A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.37575000000,all-week,R1,early-peak,2025,all-year,R1,power,gasCCGT,3,MUS$2010/PJ,2045 -A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.23333333333,all-week,R1,early-peak,2025,all-year,R1,power,solarPV,3,MUS$2010/kt,2045 -A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.20000000000,all-week,R1,early-peak,2030,all-year,R1,power,solarPV,3,MUS$2010/kt,2045 +A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.16666666667,all-week,R1,early-peak,2025,all-year,R1,power,solarPV,3,MUS$2010/kt,2045 +A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.26666666667,all-week,R1,early-peak,2030,all-year,R1,power,solarPV,3,MUS$2010/kt,2045 A1,6,newcapa,CONSUMABLE|ENERGY,solar,0.16666666667,all-week,R1,early-peak,2035,all-year,R1,power,solarPV,3,MUS$2010/kt,2045 A1,7,newcapa,CONSUMABLE|ENERGY,solar,0.23333333333,all-week,R1,early-peak,2040,all-year,R1,power,solarPV,3,MUS$2010/kt,2045 A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.25050000000,all-week,R1,late-peak,2020,all-year,R1,power,gasCCGT,4,MUS$2010/PJ,2045 A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.66666666667,all-week,R1,late-peak,2020,all-year,R1,power,solarPV,4,MUS$2010/kt,2045 A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.26666666667,all-week,R1,late-peak,2020,all-year,R1,power,windturbine,4,MUS$2010/kt,2045 A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.75150000000,all-week,R1,late-peak,2025,all-year,R1,power,gasCCGT,4,MUS$2010/PJ,2045 -A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.46666666667,all-week,R1,late-peak,2025,all-year,R1,power,solarPV,4,MUS$2010/kt,2045 -A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.40000000000,all-week,R1,late-peak,2030,all-year,R1,power,solarPV,4,MUS$2010/kt,2045 +A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.33333333333,all-week,R1,late-peak,2025,all-year,R1,power,solarPV,4,MUS$2010/kt,2045 +A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.53333333333,all-week,R1,late-peak,2030,all-year,R1,power,solarPV,4,MUS$2010/kt,2045 A1,6,newcapa,CONSUMABLE|ENERGY,solar,0.33333333333,all-week,R1,late-peak,2035,all-year,R1,power,solarPV,4,MUS$2010/kt,2045 A1,7,newcapa,CONSUMABLE|ENERGY,solar,0.46666666667,all-week,R1,late-peak,2040,all-year,R1,power,solarPV,4,MUS$2010/kt,2045 A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.16700000000,all-week,R1,evening,2020,all-year,R1,power,gasCCGT,5,MUS$2010/PJ,2045 A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.44444444444,all-week,R1,evening,2020,all-year,R1,power,solarPV,5,MUS$2010/kt,2045 A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.17777777778,all-week,R1,evening,2020,all-year,R1,power,windturbine,5,MUS$2010/kt,2045 A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.50100000000,all-week,R1,evening,2025,all-year,R1,power,gasCCGT,5,MUS$2010/PJ,2045 -A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.31111111111,all-week,R1,evening,2025,all-year,R1,power,solarPV,5,MUS$2010/kt,2045 -A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.26666666667,all-week,R1,evening,2030,all-year,R1,power,solarPV,5,MUS$2010/kt,2045 +A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.22222222222,all-week,R1,evening,2025,all-year,R1,power,solarPV,5,MUS$2010/kt,2045 +A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.35555555556,all-week,R1,evening,2030,all-year,R1,power,solarPV,5,MUS$2010/kt,2045 A1,6,newcapa,CONSUMABLE|ENERGY,solar,0.22222222222,all-week,R1,evening,2035,all-year,R1,power,solarPV,5,MUS$2010/kt,2045 A1,7,newcapa,CONSUMABLE|ENERGY,solar,0.31111111111,all-week,R1,evening,2040,all-year,R1,power,solarPV,5,MUS$2010/kt,2045 A1,5,newcapa,CONSUMABLE|ENERGY,electricity,0.71111111111,all-week,R1,night,2040,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2050 @@ -253,48 +253,48 @@ A1,5,newcapa,CONSUMABLE|ENERGY,electricity,1.42222222222,all-week,R1,evening,204 A1,6,newcapa,CONSUMABLE|ENERGY,electricity,0.97777777778,all-week,R1,evening,2045,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2050 A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.08671153846,all-week,R1,night,2020,all-year,R1,power,gasCCGT,0,MUS$2010/PJ,2050 A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.26013461538,all-week,R1,night,2025,all-year,R1,power,gasCCGT,0,MUS$2010/PJ,2050 -A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.16153846154,all-week,R1,night,2025,all-year,R1,power,solarPV,0,MUS$2010/kt,2050 -A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.13846153846,all-week,R1,night,2030,all-year,R1,power,solarPV,0,MUS$2010/kt,2050 +A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.11538461538,all-week,R1,night,2025,all-year,R1,power,solarPV,0,MUS$2010/kt,2050 +A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.18461538462,all-week,R1,night,2030,all-year,R1,power,solarPV,0,MUS$2010/kt,2050 A1,6,newcapa,CONSUMABLE|ENERGY,solar,0.11538461538,all-week,R1,night,2035,all-year,R1,power,solarPV,0,MUS$2010/kt,2050 A1,7,newcapa,CONSUMABLE|ENERGY,solar,0.16153846154,all-week,R1,night,2040,all-year,R1,power,solarPV,0,MUS$2010/kt,2050 A1,9,newcapa,CONSUMABLE|ENERGY,solar,0.23076923077,all-week,R1,night,2045,all-year,R1,power,solarPV,0,MUS$2010/kt,2050 A1,10,newcapa,CONSUMABLE|ENERGY,wind,0.18461538462,all-week,R1,night,2045,all-year,R1,power,windturbine,0,MUS$2010/kt,2050 A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.13006730769,all-week,R1,morning,2020,all-year,R1,power,gasCCGT,1,MUS$2010/PJ,2050 A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.39020192308,all-week,R1,morning,2025,all-year,R1,power,gasCCGT,1,MUS$2010/PJ,2050 -A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.24230769231,all-week,R1,morning,2025,all-year,R1,power,solarPV,1,MUS$2010/kt,2050 -A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.20769230769,all-week,R1,morning,2030,all-year,R1,power,solarPV,1,MUS$2010/kt,2050 +A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.17307692308,all-week,R1,morning,2025,all-year,R1,power,solarPV,1,MUS$2010/kt,2050 +A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.27692307692,all-week,R1,morning,2030,all-year,R1,power,solarPV,1,MUS$2010/kt,2050 A1,6,newcapa,CONSUMABLE|ENERGY,solar,0.17307692308,all-week,R1,morning,2035,all-year,R1,power,solarPV,1,MUS$2010/kt,2050 A1,7,newcapa,CONSUMABLE|ENERGY,solar,0.24230769231,all-week,R1,morning,2040,all-year,R1,power,solarPV,1,MUS$2010/kt,2050 A1,9,newcapa,CONSUMABLE|ENERGY,solar,0.34615384615,all-week,R1,morning,2045,all-year,R1,power,solarPV,1,MUS$2010/kt,2050 A1,10,newcapa,CONSUMABLE|ENERGY,wind,0.27692307692,all-week,R1,morning,2045,all-year,R1,power,windturbine,1,MUS$2010/kt,2050 A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.08671153846,all-week,R1,afternoon,2020,all-year,R1,power,gasCCGT,2,MUS$2010/PJ,2050 A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.26013461538,all-week,R1,afternoon,2025,all-year,R1,power,gasCCGT,2,MUS$2010/PJ,2050 -A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.16153846154,all-week,R1,afternoon,2025,all-year,R1,power,solarPV,2,MUS$2010/kt,2050 -A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.13846153846,all-week,R1,afternoon,2030,all-year,R1,power,solarPV,2,MUS$2010/kt,2050 +A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.11538461538,all-week,R1,afternoon,2025,all-year,R1,power,solarPV,2,MUS$2010/kt,2050 +A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.18461538462,all-week,R1,afternoon,2030,all-year,R1,power,solarPV,2,MUS$2010/kt,2050 A1,6,newcapa,CONSUMABLE|ENERGY,solar,0.11538461538,all-week,R1,afternoon,2035,all-year,R1,power,solarPV,2,MUS$2010/kt,2050 A1,7,newcapa,CONSUMABLE|ENERGY,solar,0.16153846154,all-week,R1,afternoon,2040,all-year,R1,power,solarPV,2,MUS$2010/kt,2050 A1,9,newcapa,CONSUMABLE|ENERGY,solar,0.23076923077,all-week,R1,afternoon,2045,all-year,R1,power,solarPV,2,MUS$2010/kt,2050 A1,10,newcapa,CONSUMABLE|ENERGY,wind,0.18461538462,all-week,R1,afternoon,2045,all-year,R1,power,windturbine,2,MUS$2010/kt,2050 A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.13006730769,all-week,R1,early-peak,2020,all-year,R1,power,gasCCGT,3,MUS$2010/PJ,2050 A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.39020192308,all-week,R1,early-peak,2025,all-year,R1,power,gasCCGT,3,MUS$2010/PJ,2050 -A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.24230769231,all-week,R1,early-peak,2025,all-year,R1,power,solarPV,3,MUS$2010/kt,2050 -A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.20769230769,all-week,R1,early-peak,2030,all-year,R1,power,solarPV,3,MUS$2010/kt,2050 +A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.17307692308,all-week,R1,early-peak,2025,all-year,R1,power,solarPV,3,MUS$2010/kt,2050 +A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.27692307692,all-week,R1,early-peak,2030,all-year,R1,power,solarPV,3,MUS$2010/kt,2050 A1,6,newcapa,CONSUMABLE|ENERGY,solar,0.17307692308,all-week,R1,early-peak,2035,all-year,R1,power,solarPV,3,MUS$2010/kt,2050 A1,7,newcapa,CONSUMABLE|ENERGY,solar,0.24230769231,all-week,R1,early-peak,2040,all-year,R1,power,solarPV,3,MUS$2010/kt,2050 A1,9,newcapa,CONSUMABLE|ENERGY,solar,0.34615384615,all-week,R1,early-peak,2045,all-year,R1,power,solarPV,3,MUS$2010/kt,2050 A1,10,newcapa,CONSUMABLE|ENERGY,wind,0.27692307692,all-week,R1,early-peak,2045,all-year,R1,power,windturbine,3,MUS$2010/kt,2050 -A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.26013461538,all-week,R1,late-peak,2020,all-year,R1,power,gasCCGT,4,MUS$2010/PJ,2050 -A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.78040384615,all-week,R1,late-peak,2025,all-year,R1,power,gasCCGT,4,MUS$2010/PJ,2050 -A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.48461538462,all-week,R1,late-peak,2025,all-year,R1,power,solarPV,4,MUS$2010/kt,2050 -A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.41538461538,all-week,R1,late-peak,2030,all-year,R1,power,solarPV,4,MUS$2010/kt,2050 -A1,6,newcapa,CONSUMABLE|ENERGY,solar,0.34615384615,all-week,R1,late-peak,2035,all-year,R1,power,solarPV,4,MUS$2010/kt,2050 -A1,7,newcapa,CONSUMABLE|ENERGY,solar,0.48461538462,all-week,R1,late-peak,2040,all-year,R1,power,solarPV,4,MUS$2010/kt,2050 -A1,9,newcapa,CONSUMABLE|ENERGY,solar,0.69230769231,all-week,R1,late-peak,2045,all-year,R1,power,solarPV,4,MUS$2010/kt,2050 -A1,10,newcapa,CONSUMABLE|ENERGY,wind,0.55384615385,all-week,R1,late-peak,2045,all-year,R1,power,windturbine,4,MUS$2010/kt,2050 +A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.25050000000,all-week,R1,late-peak,2020,all-year,R1,power,gasCCGT,4,MUS$2010/PJ,2050 +A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.75150000000,all-week,R1,late-peak,2025,all-year,R1,power,gasCCGT,4,MUS$2010/PJ,2050 +A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.33333333333,all-week,R1,late-peak,2025,all-year,R1,power,solarPV,4,MUS$2010/kt,2050 +A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.53333333333,all-week,R1,late-peak,2030,all-year,R1,power,solarPV,4,MUS$2010/kt,2050 +A1,6,newcapa,CONSUMABLE|ENERGY,solar,0.33333333333,all-week,R1,late-peak,2035,all-year,R1,power,solarPV,4,MUS$2010/kt,2050 +A1,7,newcapa,CONSUMABLE|ENERGY,solar,0.46666666667,all-week,R1,late-peak,2040,all-year,R1,power,solarPV,4,MUS$2010/kt,2050 +A1,9,newcapa,CONSUMABLE|ENERGY,solar,0.66666666667,all-week,R1,late-peak,2045,all-year,R1,power,solarPV,4,MUS$2010/kt,2050 +A1,10,newcapa,CONSUMABLE|ENERGY,wind,0.53333333333,all-week,R1,late-peak,2045,all-year,R1,power,windturbine,4,MUS$2010/kt,2050 A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.17342307692,all-week,R1,evening,2020,all-year,R1,power,gasCCGT,5,MUS$2010/PJ,2050 A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.52026923077,all-week,R1,evening,2025,all-year,R1,power,gasCCGT,5,MUS$2010/PJ,2050 -A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.32307692308,all-week,R1,evening,2025,all-year,R1,power,solarPV,5,MUS$2010/kt,2050 -A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.27692307692,all-week,R1,evening,2030,all-year,R1,power,solarPV,5,MUS$2010/kt,2050 +A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.23076923077,all-week,R1,evening,2025,all-year,R1,power,solarPV,5,MUS$2010/kt,2050 +A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.36923076923,all-week,R1,evening,2030,all-year,R1,power,solarPV,5,MUS$2010/kt,2050 A1,6,newcapa,CONSUMABLE|ENERGY,solar,0.23076923077,all-week,R1,evening,2035,all-year,R1,power,solarPV,5,MUS$2010/kt,2050 A1,7,newcapa,CONSUMABLE|ENERGY,solar,0.32307692308,all-week,R1,evening,2040,all-year,R1,power,solarPV,5,MUS$2010/kt,2050 A1,9,newcapa,CONSUMABLE|ENERGY,solar,0.46153846154,all-week,R1,evening,2045,all-year,R1,power,solarPV,5,MUS$2010/kt,2050 diff --git a/docs/tutorial-code/new-decision-metric/Results/MCAMetric_Supply.csv b/docs/tutorial-code/new-decision-metric/Results/MCAMetric_Supply.csv index 5e70b8b8e..cdf8c23d2 100644 --- a/docs/tutorial-code/new-decision-metric/Results/MCAMetric_Supply.csv +++ b/docs/tutorial-code/new-decision-metric/Results/MCAMetric_Supply.csv @@ -7,16 +7,16 @@ A1,0,newcapa,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2020,all-year,R1,resident A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2020,all-year,R1,residential,64.71000000000,gasboiler,2,MUS$2010/kt,2020 A1,0,newcapa,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2020,all-year,R1,residential,1.50000000000,gasboiler,3,MUS$2010/PJ,2020 A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2020,all-year,R1,residential,97.06500000000,gasboiler,3,MUS$2010/kt,2020 -A1,0,newcapa,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2020,all-year,R1,residential,3.00000000000,gasboiler,4,MUS$2010/PJ,2020 -A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2020,all-year,R1,residential,194.13000000000,gasboiler,4,MUS$2010/kt,2020 -A1,0,newcapa,PRODUCT|ENERGY,heat,all-week,R1,evening,2020,all-year,R1,residential,2.00000000000,gasboiler,5,MUS$2010/PJ,2020 -A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2020,all-year,R1,residential,129.42000000000,gasboiler,5,MUS$2010/kt,2020 +A1,0,newcapa,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2020,all-year,R1,residential,1.66666666667,gasboiler,4,MUS$2010/PJ,2020 +A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2020,all-year,R1,residential,107.85000000000,gasboiler,4,MUS$2010/kt,2020 +A1,0,newcapa,PRODUCT|ENERGY,heat,all-week,R1,evening,2020,all-year,R1,residential,1.66666666667,gasboiler,5,MUS$2010/PJ,2020 +A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2020,all-year,R1,residential,107.85000000000,gasboiler,5,MUS$2010/kt,2020 A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,night,2020,all-year,R1,gas,1.16000000000,gassupply1,0,MUS$2010/PJ,2020 A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,morning,2020,all-year,R1,gas,1.74000000000,gassupply1,1,MUS$2010/PJ,2020 A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2020,all-year,R1,gas,1.16000000000,gassupply1,2,MUS$2010/PJ,2020 A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2020,all-year,R1,gas,1.74000000000,gassupply1,3,MUS$2010/PJ,2020 -A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2020,all-year,R1,gas,3.48000000000,gassupply1,4,MUS$2010/PJ,2020 -A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,evening,2020,all-year,R1,gas,2.32000000000,gassupply1,5,MUS$2010/PJ,2020 +A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2020,all-year,R1,gas,1.93333333333,gassupply1,4,MUS$2010/PJ,2020 +A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,evening,2020,all-year,R1,gas,1.93333333333,gassupply1,5,MUS$2010/PJ,2020 A1,0,newcapa,PRODUCT|ENERGY,heat,all-week,R1,night,2020,all-year,R1,residential,0.27777777778,gasboiler,0,MUS$2010/PJ,2025 A1,1,newcapa,PRODUCT|ENERGY,heat,all-week,R1,night,2020,all-year,R1,residential,1.05555555556,heatpump,0,MUS$2010/PJ,2025 A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2020,all-year,R1,residential,17.97500000000,gasboiler,0,MUS$2010/kt,2025 @@ -51,10 +51,10 @@ A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1, A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.34234234234,solarPV,3,MUS$2010/PJ,2025 A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.13693693694,windturbine,3,MUS$2010/PJ,2025 A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2020,all-year,R1,power,14.12213513514,gasCCGT,3,MUS$2010/kt,2025 -A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.30810810811,gasCCGT,4,MUS$2010/PJ,2025 -A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.68468468468,solarPV,4,MUS$2010/PJ,2025 -A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.27387387387,windturbine,4,MUS$2010/PJ,2025 -A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2020,all-year,R1,power,28.24427027027,gasCCGT,4,MUS$2010/kt,2025 +A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.30000000000,gasCCGT,4,MUS$2010/PJ,2025 +A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.66666666667,solarPV,4,MUS$2010/PJ,2025 +A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.26666666667,windturbine,4,MUS$2010/PJ,2025 +A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2020,all-year,R1,power,27.50100000000,gasCCGT,4,MUS$2010/kt,2025 A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.20540540541,gasCCGT,5,MUS$2010/PJ,2025 A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.45645645646,solarPV,5,MUS$2010/PJ,2025 A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.18258258258,windturbine,5,MUS$2010/PJ,2025 @@ -63,7 +63,7 @@ A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,night,2020,all-year,R1,gas,0.4937357 A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,morning,2020,all-year,R1,gas,0.74060360360,gassupply1,1,MUS$2010/PJ,2025 A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2020,all-year,R1,gas,0.49373573574,gassupply1,2,MUS$2010/PJ,2025 A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2020,all-year,R1,gas,0.74060360360,gassupply1,3,MUS$2010/PJ,2025 -A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2020,all-year,R1,gas,1.48120720721,gassupply1,4,MUS$2010/PJ,2025 +A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2020,all-year,R1,gas,1.46766666667,gassupply1,4,MUS$2010/PJ,2025 A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,evening,2020,all-year,R1,gas,0.98747147147,gassupply1,5,MUS$2010/PJ,2025 A1,1,newcapa,PRODUCT|ENERGY,heat,all-week,R1,night,2020,all-year,R1,residential,1.09195402299,heatpump,0,MUS$2010/PJ,2030 A1,2,newcapa,PRODUCT|ENERGY,heat,all-week,R1,night,2025,all-year,R1,residential,0.57471264368,heatpump,0,MUS$2010/PJ,2030 @@ -73,58 +73,58 @@ A1,1,newcapa,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2020,all-year,R1,resident A1,2,newcapa,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2025,all-year,R1,residential,0.57471264368,heatpump,2,MUS$2010/PJ,2030 A1,1,newcapa,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2020,all-year,R1,residential,1.63793103448,heatpump,3,MUS$2010/PJ,2030 A1,2,newcapa,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2025,all-year,R1,residential,0.86206896552,heatpump,3,MUS$2010/PJ,2030 -A1,1,newcapa,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2020,all-year,R1,residential,3.27586206897,heatpump,4,MUS$2010/PJ,2030 -A1,2,newcapa,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2025,all-year,R1,residential,1.72413793103,heatpump,4,MUS$2010/PJ,2030 +A1,1,newcapa,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2020,all-year,R1,residential,3.16666666667,heatpump,4,MUS$2010/PJ,2030 +A1,2,newcapa,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2025,all-year,R1,residential,1.66666666667,heatpump,4,MUS$2010/PJ,2030 A1,1,newcapa,PRODUCT|ENERGY,heat,all-week,R1,evening,2020,all-year,R1,residential,2.18390804598,heatpump,5,MUS$2010/PJ,2030 A1,2,newcapa,PRODUCT|ENERGY,heat,all-week,R1,evening,2025,all-year,R1,residential,1.14942528736,heatpump,5,MUS$2010/PJ,2030 -A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.05000000000,gasCCGT,0,MUS$2010/PJ,2030 -A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.22222222222,solarPV,0,MUS$2010/PJ,2030 -A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.08888888889,windturbine,0,MUS$2010/PJ,2030 -A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.15000000000,gasCCGT,0,MUS$2010/PJ,2030 -A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.15555555556,solarPV,0,MUS$2010/PJ,2030 -A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2020,all-year,R1,power,4.58350000000,gasCCGT,0,MUS$2010/kt,2030 -A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2025,all-year,R1,power,13.75050000000,gasCCGT,0,MUS$2010/kt,2030 -A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.07500000000,gasCCGT,1,MUS$2010/PJ,2030 -A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.33333333333,solarPV,1,MUS$2010/PJ,2030 -A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.13333333333,windturbine,1,MUS$2010/PJ,2030 -A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.22500000000,gasCCGT,1,MUS$2010/PJ,2030 -A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.23333333333,solarPV,1,MUS$2010/PJ,2030 -A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2020,all-year,R1,power,6.87525000000,gasCCGT,1,MUS$2010/kt,2030 -A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2025,all-year,R1,power,20.62575000000,gasCCGT,1,MUS$2010/kt,2030 -A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.05000000000,gasCCGT,2,MUS$2010/PJ,2030 -A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.22222222222,solarPV,2,MUS$2010/PJ,2030 -A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.08888888889,windturbine,2,MUS$2010/PJ,2030 -A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.15000000000,gasCCGT,2,MUS$2010/PJ,2030 -A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.15555555556,solarPV,2,MUS$2010/PJ,2030 -A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2020,all-year,R1,power,4.58350000000,gasCCGT,2,MUS$2010/kt,2030 -A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2025,all-year,R1,power,13.75050000000,gasCCGT,2,MUS$2010/kt,2030 -A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.07500000000,gasCCGT,3,MUS$2010/PJ,2030 -A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.33333333333,solarPV,3,MUS$2010/PJ,2030 -A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.13333333333,windturbine,3,MUS$2010/PJ,2030 -A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.22500000000,gasCCGT,3,MUS$2010/PJ,2030 -A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.23333333333,solarPV,3,MUS$2010/PJ,2030 -A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2020,all-year,R1,power,6.87525000000,gasCCGT,3,MUS$2010/kt,2030 -A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2025,all-year,R1,power,20.62575000000,gasCCGT,3,MUS$2010/kt,2030 +A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.05357142857,gasCCGT,0,MUS$2010/PJ,2030 +A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.23809523810,solarPV,0,MUS$2010/PJ,2030 +A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.09523809524,windturbine,0,MUS$2010/PJ,2030 +A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.16071428571,gasCCGT,0,MUS$2010/PJ,2030 +A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.11904761905,solarPV,0,MUS$2010/PJ,2030 +A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2020,all-year,R1,power,4.91089285714,gasCCGT,0,MUS$2010/kt,2030 +A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2025,all-year,R1,power,14.73267857143,gasCCGT,0,MUS$2010/kt,2030 +A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.08035714286,gasCCGT,1,MUS$2010/PJ,2030 +A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.35714285714,solarPV,1,MUS$2010/PJ,2030 +A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.14285714286,windturbine,1,MUS$2010/PJ,2030 +A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.24107142857,gasCCGT,1,MUS$2010/PJ,2030 +A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.17857142857,solarPV,1,MUS$2010/PJ,2030 +A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2020,all-year,R1,power,7.36633928571,gasCCGT,1,MUS$2010/kt,2030 +A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2025,all-year,R1,power,22.09901785714,gasCCGT,1,MUS$2010/kt,2030 +A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.05357142857,gasCCGT,2,MUS$2010/PJ,2030 +A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.23809523810,solarPV,2,MUS$2010/PJ,2030 +A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.09523809524,windturbine,2,MUS$2010/PJ,2030 +A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.16071428571,gasCCGT,2,MUS$2010/PJ,2030 +A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.11904761905,solarPV,2,MUS$2010/PJ,2030 +A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2020,all-year,R1,power,4.91089285714,gasCCGT,2,MUS$2010/kt,2030 +A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2025,all-year,R1,power,14.73267857143,gasCCGT,2,MUS$2010/kt,2030 +A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.08035714286,gasCCGT,3,MUS$2010/PJ,2030 +A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.35714285714,solarPV,3,MUS$2010/PJ,2030 +A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.14285714286,windturbine,3,MUS$2010/PJ,2030 +A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.24107142857,gasCCGT,3,MUS$2010/PJ,2030 +A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.17857142857,solarPV,3,MUS$2010/PJ,2030 +A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2020,all-year,R1,power,7.36633928571,gasCCGT,3,MUS$2010/kt,2030 +A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2025,all-year,R1,power,22.09901785714,gasCCGT,3,MUS$2010/kt,2030 A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.15000000000,gasCCGT,4,MUS$2010/PJ,2030 A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.66666666667,solarPV,4,MUS$2010/PJ,2030 A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.26666666667,windturbine,4,MUS$2010/PJ,2030 A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.45000000000,gasCCGT,4,MUS$2010/PJ,2030 -A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.46666666667,solarPV,4,MUS$2010/PJ,2030 +A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.33333333333,solarPV,4,MUS$2010/PJ,2030 A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2020,all-year,R1,power,13.75050000000,gasCCGT,4,MUS$2010/kt,2030 A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2025,all-year,R1,power,41.25150000000,gasCCGT,4,MUS$2010/kt,2030 -A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.10000000000,gasCCGT,5,MUS$2010/PJ,2030 -A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.44444444444,solarPV,5,MUS$2010/PJ,2030 -A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.17777777778,windturbine,5,MUS$2010/PJ,2030 -A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.30000000000,gasCCGT,5,MUS$2010/PJ,2030 -A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.31111111111,solarPV,5,MUS$2010/PJ,2030 -A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2020,all-year,R1,power,9.16700000000,gasCCGT,5,MUS$2010/kt,2030 -A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2025,all-year,R1,power,27.50100000000,gasCCGT,5,MUS$2010/kt,2030 -A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,night,2020,all-year,R1,gas,0.33400000000,gassupply1,0,MUS$2010/PJ,2030 -A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,morning,2020,all-year,R1,gas,0.50100000000,gassupply1,1,MUS$2010/PJ,2030 -A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2020,all-year,R1,gas,0.33400000000,gassupply1,2,MUS$2010/PJ,2030 -A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2020,all-year,R1,gas,0.50100000000,gassupply1,3,MUS$2010/PJ,2030 +A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.10714285714,gasCCGT,5,MUS$2010/PJ,2030 +A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.47619047619,solarPV,5,MUS$2010/PJ,2030 +A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.19047619048,windturbine,5,MUS$2010/PJ,2030 +A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.32142857143,gasCCGT,5,MUS$2010/PJ,2030 +A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.23809523810,solarPV,5,MUS$2010/PJ,2030 +A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2020,all-year,R1,power,9.82178571429,gasCCGT,5,MUS$2010/kt,2030 +A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2025,all-year,R1,power,29.46535714286,gasCCGT,5,MUS$2010/kt,2030 +A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,night,2020,all-year,R1,gas,0.35785714286,gassupply1,0,MUS$2010/PJ,2030 +A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,morning,2020,all-year,R1,gas,0.53678571429,gassupply1,1,MUS$2010/PJ,2030 +A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2020,all-year,R1,gas,0.35785714286,gassupply1,2,MUS$2010/PJ,2030 +A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2020,all-year,R1,gas,0.53678571429,gassupply1,3,MUS$2010/PJ,2030 A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2020,all-year,R1,gas,1.00200000000,gassupply1,4,MUS$2010/PJ,2030 -A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,evening,2020,all-year,R1,gas,0.66800000000,gassupply1,5,MUS$2010/PJ,2030 +A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,evening,2020,all-year,R1,gas,0.71571428571,gassupply1,5,MUS$2010/PJ,2030 A1,2,newcapa,PRODUCT|ENERGY,heat,all-week,R1,night,2025,all-year,R1,residential,0.55555555556,heatpump,0,MUS$2010/PJ,2035 A1,3,newcapa,PRODUCT|ENERGY,heat,all-week,R1,night,2030,all-year,R1,residential,1.44444444444,heatpump,0,MUS$2010/PJ,2035 A1,2,newcapa,PRODUCT|ENERGY,heat,all-week,R1,morning,2025,all-year,R1,residential,0.83333333333,heatpump,1,MUS$2010/PJ,2035 @@ -141,48 +141,48 @@ A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.22222222222,solarPV,0,MUS$2010/PJ,2035 A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.08888888889,windturbine,0,MUS$2010/PJ,2035 A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.15000000000,gasCCGT,0,MUS$2010/PJ,2035 -A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.15555555556,solarPV,0,MUS$2010/PJ,2035 -A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2030,all-year,R1,power,0.13333333333,solarPV,0,MUS$2010/PJ,2035 +A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.11111111111,solarPV,0,MUS$2010/PJ,2035 +A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2030,all-year,R1,power,0.17777777778,solarPV,0,MUS$2010/PJ,2035 A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2020,all-year,R1,power,4.58350000000,gasCCGT,0,MUS$2010/kt,2035 A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2025,all-year,R1,power,13.75050000000,gasCCGT,0,MUS$2010/kt,2035 A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.07500000000,gasCCGT,1,MUS$2010/PJ,2035 A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.33333333333,solarPV,1,MUS$2010/PJ,2035 A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.13333333333,windturbine,1,MUS$2010/PJ,2035 A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.22500000000,gasCCGT,1,MUS$2010/PJ,2035 -A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.23333333333,solarPV,1,MUS$2010/PJ,2035 -A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2030,all-year,R1,power,0.20000000000,solarPV,1,MUS$2010/PJ,2035 +A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.16666666667,solarPV,1,MUS$2010/PJ,2035 +A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2030,all-year,R1,power,0.26666666667,solarPV,1,MUS$2010/PJ,2035 A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2020,all-year,R1,power,6.87525000000,gasCCGT,1,MUS$2010/kt,2035 A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2025,all-year,R1,power,20.62575000000,gasCCGT,1,MUS$2010/kt,2035 A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.05000000000,gasCCGT,2,MUS$2010/PJ,2035 A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.22222222222,solarPV,2,MUS$2010/PJ,2035 A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.08888888889,windturbine,2,MUS$2010/PJ,2035 A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.15000000000,gasCCGT,2,MUS$2010/PJ,2035 -A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.15555555556,solarPV,2,MUS$2010/PJ,2035 -A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2030,all-year,R1,power,0.13333333333,solarPV,2,MUS$2010/PJ,2035 +A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.11111111111,solarPV,2,MUS$2010/PJ,2035 +A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2030,all-year,R1,power,0.17777777778,solarPV,2,MUS$2010/PJ,2035 A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2020,all-year,R1,power,4.58350000000,gasCCGT,2,MUS$2010/kt,2035 A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2025,all-year,R1,power,13.75050000000,gasCCGT,2,MUS$2010/kt,2035 A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.07500000000,gasCCGT,3,MUS$2010/PJ,2035 A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.33333333333,solarPV,3,MUS$2010/PJ,2035 A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.13333333333,windturbine,3,MUS$2010/PJ,2035 A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.22500000000,gasCCGT,3,MUS$2010/PJ,2035 -A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.23333333333,solarPV,3,MUS$2010/PJ,2035 -A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2030,all-year,R1,power,0.20000000000,solarPV,3,MUS$2010/PJ,2035 +A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.16666666667,solarPV,3,MUS$2010/PJ,2035 +A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2030,all-year,R1,power,0.26666666667,solarPV,3,MUS$2010/PJ,2035 A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2020,all-year,R1,power,6.87525000000,gasCCGT,3,MUS$2010/kt,2035 A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2025,all-year,R1,power,20.62575000000,gasCCGT,3,MUS$2010/kt,2035 A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.15000000000,gasCCGT,4,MUS$2010/PJ,2035 A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.66666666667,solarPV,4,MUS$2010/PJ,2035 A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.26666666667,windturbine,4,MUS$2010/PJ,2035 A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.45000000000,gasCCGT,4,MUS$2010/PJ,2035 -A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.46666666667,solarPV,4,MUS$2010/PJ,2035 -A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2030,all-year,R1,power,0.40000000000,solarPV,4,MUS$2010/PJ,2035 +A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.33333333333,solarPV,4,MUS$2010/PJ,2035 +A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2030,all-year,R1,power,0.53333333333,solarPV,4,MUS$2010/PJ,2035 A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2020,all-year,R1,power,13.75050000000,gasCCGT,4,MUS$2010/kt,2035 A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2025,all-year,R1,power,41.25150000000,gasCCGT,4,MUS$2010/kt,2035 A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.10000000000,gasCCGT,5,MUS$2010/PJ,2035 A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.44444444444,solarPV,5,MUS$2010/PJ,2035 A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.17777777778,windturbine,5,MUS$2010/PJ,2035 A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.30000000000,gasCCGT,5,MUS$2010/PJ,2035 -A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.31111111111,solarPV,5,MUS$2010/PJ,2035 -A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2030,all-year,R1,power,0.26666666667,solarPV,5,MUS$2010/PJ,2035 +A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.22222222222,solarPV,5,MUS$2010/PJ,2035 +A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2030,all-year,R1,power,0.35555555556,solarPV,5,MUS$2010/PJ,2035 A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2020,all-year,R1,power,9.16700000000,gasCCGT,5,MUS$2010/kt,2035 A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2025,all-year,R1,power,27.50100000000,gasCCGT,5,MUS$2010/kt,2035 A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,night,2030,all-year,R1,gas,0.33400000000,gassupply1,0,MUS$2010/PJ,2035 @@ -207,8 +207,8 @@ A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.22764227642,solarPV,0,MUS$2010/PJ,2040 A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.09105691057,windturbine,0,MUS$2010/PJ,2040 A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.15365853659,gasCCGT,0,MUS$2010/PJ,2040 -A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.15934959350,solarPV,0,MUS$2010/PJ,2040 -A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2030,all-year,R1,power,0.13658536585,solarPV,0,MUS$2010/PJ,2040 +A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.11382113821,solarPV,0,MUS$2010/PJ,2040 +A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2030,all-year,R1,power,0.18211382114,solarPV,0,MUS$2010/PJ,2040 A1,6,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2035,all-year,R1,power,0.11382113821,solarPV,0,MUS$2010/PJ,2040 A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2020,all-year,R1,power,4.69529268293,gasCCGT,0,MUS$2010/kt,2040 A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2025,all-year,R1,power,14.08587804878,gasCCGT,0,MUS$2010/kt,2040 @@ -216,8 +216,8 @@ A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,pow A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.34146341463,solarPV,1,MUS$2010/PJ,2040 A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.13658536585,windturbine,1,MUS$2010/PJ,2040 A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.23048780488,gasCCGT,1,MUS$2010/PJ,2040 -A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.23902439024,solarPV,1,MUS$2010/PJ,2040 -A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2030,all-year,R1,power,0.20487804878,solarPV,1,MUS$2010/PJ,2040 +A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.17073170732,solarPV,1,MUS$2010/PJ,2040 +A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2030,all-year,R1,power,0.27317073171,solarPV,1,MUS$2010/PJ,2040 A1,6,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2035,all-year,R1,power,0.17073170732,solarPV,1,MUS$2010/PJ,2040 A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2020,all-year,R1,power,7.04293902439,gasCCGT,1,MUS$2010/kt,2040 A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2025,all-year,R1,power,21.12881707317,gasCCGT,1,MUS$2010/kt,2040 @@ -225,8 +225,8 @@ A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,p A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.22764227642,solarPV,2,MUS$2010/PJ,2040 A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.09105691057,windturbine,2,MUS$2010/PJ,2040 A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.15365853659,gasCCGT,2,MUS$2010/PJ,2040 -A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.15934959350,solarPV,2,MUS$2010/PJ,2040 -A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2030,all-year,R1,power,0.13658536585,solarPV,2,MUS$2010/PJ,2040 +A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.11382113821,solarPV,2,MUS$2010/PJ,2040 +A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2030,all-year,R1,power,0.18211382114,solarPV,2,MUS$2010/PJ,2040 A1,6,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2035,all-year,R1,power,0.11382113821,solarPV,2,MUS$2010/PJ,2040 A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2020,all-year,R1,power,4.69529268293,gasCCGT,2,MUS$2010/kt,2040 A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2025,all-year,R1,power,14.08587804878,gasCCGT,2,MUS$2010/kt,2040 @@ -234,41 +234,35 @@ A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1, A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.34146341463,solarPV,3,MUS$2010/PJ,2040 A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.13658536585,windturbine,3,MUS$2010/PJ,2040 A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.23048780488,gasCCGT,3,MUS$2010/PJ,2040 -A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.23902439024,solarPV,3,MUS$2010/PJ,2040 -A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2030,all-year,R1,power,0.20487804878,solarPV,3,MUS$2010/PJ,2040 +A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.17073170732,solarPV,3,MUS$2010/PJ,2040 +A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2030,all-year,R1,power,0.27317073171,solarPV,3,MUS$2010/PJ,2040 A1,6,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2035,all-year,R1,power,0.17073170732,solarPV,3,MUS$2010/PJ,2040 A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2020,all-year,R1,power,7.04293902439,gasCCGT,3,MUS$2010/kt,2040 A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2025,all-year,R1,power,21.12881707317,gasCCGT,3,MUS$2010/kt,2040 -A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.15365853659,gasCCGT,4,MUS$2010/PJ,2040 -A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.68292682927,solarPV,4,MUS$2010/PJ,2040 -A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.27317073171,windturbine,4,MUS$2010/PJ,2040 -A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.46097560976,gasCCGT,4,MUS$2010/PJ,2040 -A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.47804878049,solarPV,4,MUS$2010/PJ,2040 -A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2030,all-year,R1,power,0.40975609756,solarPV,4,MUS$2010/PJ,2040 -A1,6,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2035,all-year,R1,power,0.34146341463,solarPV,4,MUS$2010/PJ,2040 -A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2020,all-year,R1,power,14.08587804878,gasCCGT,4,MUS$2010/kt,2040 -A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2025,all-year,R1,power,42.25763414634,gasCCGT,4,MUS$2010/kt,2040 +A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.15000000000,gasCCGT,4,MUS$2010/PJ,2040 +A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.66666666667,solarPV,4,MUS$2010/PJ,2040 +A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.26666666667,windturbine,4,MUS$2010/PJ,2040 +A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.45000000000,gasCCGT,4,MUS$2010/PJ,2040 +A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.33333333333,solarPV,4,MUS$2010/PJ,2040 +A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2030,all-year,R1,power,0.53333333333,solarPV,4,MUS$2010/PJ,2040 +A1,6,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2035,all-year,R1,power,0.33333333333,solarPV,4,MUS$2010/PJ,2040 +A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2020,all-year,R1,power,13.75050000000,gasCCGT,4,MUS$2010/kt,2040 +A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2025,all-year,R1,power,41.25150000000,gasCCGT,4,MUS$2010/kt,2040 A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.10243902439,gasCCGT,5,MUS$2010/PJ,2040 A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.45528455285,solarPV,5,MUS$2010/PJ,2040 A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.18211382114,windturbine,5,MUS$2010/PJ,2040 A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.30731707317,gasCCGT,5,MUS$2010/PJ,2040 -A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.31869918699,solarPV,5,MUS$2010/PJ,2040 -A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2030,all-year,R1,power,0.27317073171,solarPV,5,MUS$2010/PJ,2040 +A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.22764227642,solarPV,5,MUS$2010/PJ,2040 +A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2030,all-year,R1,power,0.36422764228,solarPV,5,MUS$2010/PJ,2040 A1,6,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2035,all-year,R1,power,0.22764227642,solarPV,5,MUS$2010/PJ,2040 A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2020,all-year,R1,power,9.39058536585,gasCCGT,5,MUS$2010/kt,2040 A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2025,all-year,R1,power,28.17175609756,gasCCGT,5,MUS$2010/kt,2040 -A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,night,2030,all-year,R1,gas,0.33400000000,gassupply1,0,MUS$2010/PJ,2040 -A1,2,newcapa,PRODUCT|ENERGY,gas,all-week,R1,night,2035,all-year,R1,gas,0.00814634146,gassupply1,0,MUS$2010/PJ,2040 -A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,morning,2030,all-year,R1,gas,0.50100000000,gassupply1,1,MUS$2010/PJ,2040 -A1,2,newcapa,PRODUCT|ENERGY,gas,all-week,R1,morning,2035,all-year,R1,gas,0.01221951220,gassupply1,1,MUS$2010/PJ,2040 -A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2030,all-year,R1,gas,0.33400000000,gassupply1,2,MUS$2010/PJ,2040 -A1,2,newcapa,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2035,all-year,R1,gas,0.00814634146,gassupply1,2,MUS$2010/PJ,2040 -A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2030,all-year,R1,gas,0.50100000000,gassupply1,3,MUS$2010/PJ,2040 -A1,2,newcapa,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2035,all-year,R1,gas,0.01221951220,gassupply1,3,MUS$2010/PJ,2040 +A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,night,2030,all-year,R1,gas,0.34214634146,gassupply1,0,MUS$2010/PJ,2040 +A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,morning,2030,all-year,R1,gas,0.51321951220,gassupply1,1,MUS$2010/PJ,2040 +A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2030,all-year,R1,gas,0.34214634146,gassupply1,2,MUS$2010/PJ,2040 +A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2030,all-year,R1,gas,0.51321951220,gassupply1,3,MUS$2010/PJ,2040 A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2030,all-year,R1,gas,1.00200000000,gassupply1,4,MUS$2010/PJ,2040 -A1,2,newcapa,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2035,all-year,R1,gas,0.02443902439,gassupply1,4,MUS$2010/PJ,2040 -A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,evening,2030,all-year,R1,gas,0.66800000000,gassupply1,5,MUS$2010/PJ,2040 -A1,2,newcapa,PRODUCT|ENERGY,gas,all-week,R1,evening,2035,all-year,R1,gas,0.01629268293,gassupply1,5,MUS$2010/PJ,2040 +A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,evening,2030,all-year,R1,gas,0.68429268293,gassupply1,5,MUS$2010/PJ,2040 A1,4,newcapa,PRODUCT|ENERGY,heat,all-week,R1,night,2035,all-year,R1,residential,0.88888888889,heatpump,0,MUS$2010/PJ,2045 A1,5,newcapa,PRODUCT|ENERGY,heat,all-week,R1,night,2040,all-year,R1,residential,1.77777777778,heatpump,0,MUS$2010/PJ,2045 A1,4,newcapa,PRODUCT|ENERGY,heat,all-week,R1,morning,2035,all-year,R1,residential,1.33333333333,heatpump,1,MUS$2010/PJ,2045 @@ -285,8 +279,8 @@ A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.22222222222,solarPV,0,MUS$2010/PJ,2045 A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.08888888889,windturbine,0,MUS$2010/PJ,2045 A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.15000000000,gasCCGT,0,MUS$2010/PJ,2045 -A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.15555555556,solarPV,0,MUS$2010/PJ,2045 -A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2030,all-year,R1,power,0.13333333333,solarPV,0,MUS$2010/PJ,2045 +A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.11111111111,solarPV,0,MUS$2010/PJ,2045 +A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2030,all-year,R1,power,0.17777777778,solarPV,0,MUS$2010/PJ,2045 A1,6,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2035,all-year,R1,power,0.11111111111,solarPV,0,MUS$2010/PJ,2045 A1,7,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2040,all-year,R1,power,0.15555555556,solarPV,0,MUS$2010/PJ,2045 A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2020,all-year,R1,power,4.58350000000,gasCCGT,0,MUS$2010/kt,2045 @@ -295,8 +289,8 @@ A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,pow A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.33333333333,solarPV,1,MUS$2010/PJ,2045 A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.13333333333,windturbine,1,MUS$2010/PJ,2045 A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.22500000000,gasCCGT,1,MUS$2010/PJ,2045 -A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.23333333333,solarPV,1,MUS$2010/PJ,2045 -A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2030,all-year,R1,power,0.20000000000,solarPV,1,MUS$2010/PJ,2045 +A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.16666666667,solarPV,1,MUS$2010/PJ,2045 +A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2030,all-year,R1,power,0.26666666667,solarPV,1,MUS$2010/PJ,2045 A1,6,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2035,all-year,R1,power,0.16666666667,solarPV,1,MUS$2010/PJ,2045 A1,7,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2040,all-year,R1,power,0.23333333333,solarPV,1,MUS$2010/PJ,2045 A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2020,all-year,R1,power,6.87525000000,gasCCGT,1,MUS$2010/kt,2045 @@ -305,8 +299,8 @@ A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,p A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.22222222222,solarPV,2,MUS$2010/PJ,2045 A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.08888888889,windturbine,2,MUS$2010/PJ,2045 A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.15000000000,gasCCGT,2,MUS$2010/PJ,2045 -A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.15555555556,solarPV,2,MUS$2010/PJ,2045 -A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2030,all-year,R1,power,0.13333333333,solarPV,2,MUS$2010/PJ,2045 +A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.11111111111,solarPV,2,MUS$2010/PJ,2045 +A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2030,all-year,R1,power,0.17777777778,solarPV,2,MUS$2010/PJ,2045 A1,6,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2035,all-year,R1,power,0.11111111111,solarPV,2,MUS$2010/PJ,2045 A1,7,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2040,all-year,R1,power,0.15555555556,solarPV,2,MUS$2010/PJ,2045 A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2020,all-year,R1,power,4.58350000000,gasCCGT,2,MUS$2010/kt,2045 @@ -315,8 +309,8 @@ A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1, A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.33333333333,solarPV,3,MUS$2010/PJ,2045 A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.13333333333,windturbine,3,MUS$2010/PJ,2045 A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.22500000000,gasCCGT,3,MUS$2010/PJ,2045 -A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.23333333333,solarPV,3,MUS$2010/PJ,2045 -A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2030,all-year,R1,power,0.20000000000,solarPV,3,MUS$2010/PJ,2045 +A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.16666666667,solarPV,3,MUS$2010/PJ,2045 +A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2030,all-year,R1,power,0.26666666667,solarPV,3,MUS$2010/PJ,2045 A1,6,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2035,all-year,R1,power,0.16666666667,solarPV,3,MUS$2010/PJ,2045 A1,7,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2040,all-year,R1,power,0.23333333333,solarPV,3,MUS$2010/PJ,2045 A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2020,all-year,R1,power,6.87525000000,gasCCGT,3,MUS$2010/kt,2045 @@ -325,8 +319,8 @@ A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,p A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.66666666667,solarPV,4,MUS$2010/PJ,2045 A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.26666666667,windturbine,4,MUS$2010/PJ,2045 A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.45000000000,gasCCGT,4,MUS$2010/PJ,2045 -A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.46666666667,solarPV,4,MUS$2010/PJ,2045 -A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2030,all-year,R1,power,0.40000000000,solarPV,4,MUS$2010/PJ,2045 +A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.33333333333,solarPV,4,MUS$2010/PJ,2045 +A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2030,all-year,R1,power,0.53333333333,solarPV,4,MUS$2010/PJ,2045 A1,6,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2035,all-year,R1,power,0.33333333333,solarPV,4,MUS$2010/PJ,2045 A1,7,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2040,all-year,R1,power,0.46666666667,solarPV,4,MUS$2010/PJ,2045 A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2020,all-year,R1,power,13.75050000000,gasCCGT,4,MUS$2010/kt,2045 @@ -335,24 +329,18 @@ A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,pow A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.44444444444,solarPV,5,MUS$2010/PJ,2045 A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.17777777778,windturbine,5,MUS$2010/PJ,2045 A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.30000000000,gasCCGT,5,MUS$2010/PJ,2045 -A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.31111111111,solarPV,5,MUS$2010/PJ,2045 -A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2030,all-year,R1,power,0.26666666667,solarPV,5,MUS$2010/PJ,2045 +A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.22222222222,solarPV,5,MUS$2010/PJ,2045 +A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2030,all-year,R1,power,0.35555555556,solarPV,5,MUS$2010/PJ,2045 A1,6,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2035,all-year,R1,power,0.22222222222,solarPV,5,MUS$2010/PJ,2045 A1,7,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2040,all-year,R1,power,0.31111111111,solarPV,5,MUS$2010/PJ,2045 A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2020,all-year,R1,power,9.16700000000,gasCCGT,5,MUS$2010/kt,2045 A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2025,all-year,R1,power,27.50100000000,gasCCGT,5,MUS$2010/kt,2045 -A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,night,2030,all-year,R1,gas,0.32604761905,gassupply1,0,MUS$2010/PJ,2045 -A1,2,newcapa,PRODUCT|ENERGY,gas,all-week,R1,night,2035,all-year,R1,gas,0.00795238095,gassupply1,0,MUS$2010/PJ,2045 -A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,morning,2030,all-year,R1,gas,0.48907142857,gassupply1,1,MUS$2010/PJ,2045 -A1,2,newcapa,PRODUCT|ENERGY,gas,all-week,R1,morning,2035,all-year,R1,gas,0.01192857143,gassupply1,1,MUS$2010/PJ,2045 -A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2030,all-year,R1,gas,0.32604761905,gassupply1,2,MUS$2010/PJ,2045 -A1,2,newcapa,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2035,all-year,R1,gas,0.00795238095,gassupply1,2,MUS$2010/PJ,2045 -A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2030,all-year,R1,gas,0.48907142857,gassupply1,3,MUS$2010/PJ,2045 -A1,2,newcapa,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2035,all-year,R1,gas,0.01192857143,gassupply1,3,MUS$2010/PJ,2045 -A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2030,all-year,R1,gas,0.97814285714,gassupply1,4,MUS$2010/PJ,2045 -A1,2,newcapa,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2035,all-year,R1,gas,0.02385714286,gassupply1,4,MUS$2010/PJ,2045 -A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,evening,2030,all-year,R1,gas,0.65209523810,gassupply1,5,MUS$2010/PJ,2045 -A1,2,newcapa,PRODUCT|ENERGY,gas,all-week,R1,evening,2035,all-year,R1,gas,0.01590476190,gassupply1,5,MUS$2010/PJ,2045 +A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,night,2030,all-year,R1,gas,0.33400000000,gassupply1,0,MUS$2010/PJ,2045 +A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,morning,2030,all-year,R1,gas,0.50100000000,gassupply1,1,MUS$2010/PJ,2045 +A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2030,all-year,R1,gas,0.33400000000,gassupply1,2,MUS$2010/PJ,2045 +A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2030,all-year,R1,gas,0.50100000000,gassupply1,3,MUS$2010/PJ,2045 +A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2030,all-year,R1,gas,1.00200000000,gassupply1,4,MUS$2010/PJ,2045 +A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,evening,2030,all-year,R1,gas,0.66800000000,gassupply1,5,MUS$2010/PJ,2045 A1,5,newcapa,PRODUCT|ENERGY,heat,all-week,R1,night,2040,all-year,R1,residential,1.77777777778,heatpump,0,MUS$2010/PJ,2050 A1,6,newcapa,PRODUCT|ENERGY,heat,all-week,R1,night,2045,all-year,R1,residential,1.22222222222,heatpump,0,MUS$2010/PJ,2050 A1,5,newcapa,PRODUCT|ENERGY,heat,all-week,R1,morning,2040,all-year,R1,residential,2.66666666667,heatpump,1,MUS$2010/PJ,2050 @@ -367,8 +355,8 @@ A1,5,newcapa,PRODUCT|ENERGY,heat,all-week,R1,evening,2040,all-year,R1,residentia A1,6,newcapa,PRODUCT|ENERGY,heat,all-week,R1,evening,2045,all-year,R1,residential,2.44444444444,heatpump,5,MUS$2010/PJ,2050 A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.05192307692,gasCCGT,0,MUS$2010/PJ,2050 A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.15576923077,gasCCGT,0,MUS$2010/PJ,2050 -A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.16153846154,solarPV,0,MUS$2010/PJ,2050 -A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2030,all-year,R1,power,0.13846153846,solarPV,0,MUS$2010/PJ,2050 +A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.11538461538,solarPV,0,MUS$2010/PJ,2050 +A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2030,all-year,R1,power,0.18461538462,solarPV,0,MUS$2010/PJ,2050 A1,6,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2035,all-year,R1,power,0.11538461538,solarPV,0,MUS$2010/PJ,2050 A1,7,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2040,all-year,R1,power,0.16153846154,solarPV,0,MUS$2010/PJ,2050 A1,9,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2045,all-year,R1,power,0.23076923077,solarPV,0,MUS$2010/PJ,2050 @@ -377,8 +365,8 @@ A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2020,all-year,R1,power A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2025,all-year,R1,power,14.27936538462,gasCCGT,0,MUS$2010/kt,2050 A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.07788461538,gasCCGT,1,MUS$2010/PJ,2050 A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.23365384615,gasCCGT,1,MUS$2010/PJ,2050 -A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.24230769231,solarPV,1,MUS$2010/PJ,2050 -A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2030,all-year,R1,power,0.20769230769,solarPV,1,MUS$2010/PJ,2050 +A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.17307692308,solarPV,1,MUS$2010/PJ,2050 +A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2030,all-year,R1,power,0.27692307692,solarPV,1,MUS$2010/PJ,2050 A1,6,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2035,all-year,R1,power,0.17307692308,solarPV,1,MUS$2010/PJ,2050 A1,7,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2040,all-year,R1,power,0.24230769231,solarPV,1,MUS$2010/PJ,2050 A1,9,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2045,all-year,R1,power,0.34615384615,solarPV,1,MUS$2010/PJ,2050 @@ -387,8 +375,8 @@ A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2020,all-year,R1,pow A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2025,all-year,R1,power,21.41904807692,gasCCGT,1,MUS$2010/kt,2050 A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.05192307692,gasCCGT,2,MUS$2010/PJ,2050 A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.15576923077,gasCCGT,2,MUS$2010/PJ,2050 -A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.16153846154,solarPV,2,MUS$2010/PJ,2050 -A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2030,all-year,R1,power,0.13846153846,solarPV,2,MUS$2010/PJ,2050 +A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.11538461538,solarPV,2,MUS$2010/PJ,2050 +A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2030,all-year,R1,power,0.18461538462,solarPV,2,MUS$2010/PJ,2050 A1,6,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2035,all-year,R1,power,0.11538461538,solarPV,2,MUS$2010/PJ,2050 A1,7,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2040,all-year,R1,power,0.16153846154,solarPV,2,MUS$2010/PJ,2050 A1,9,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2045,all-year,R1,power,0.23076923077,solarPV,2,MUS$2010/PJ,2050 @@ -397,49 +385,37 @@ A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2020,all-year,R1,p A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2025,all-year,R1,power,14.27936538462,gasCCGT,2,MUS$2010/kt,2050 A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.07788461538,gasCCGT,3,MUS$2010/PJ,2050 A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.23365384615,gasCCGT,3,MUS$2010/PJ,2050 -A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.24230769231,solarPV,3,MUS$2010/PJ,2050 -A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2030,all-year,R1,power,0.20769230769,solarPV,3,MUS$2010/PJ,2050 +A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.17307692308,solarPV,3,MUS$2010/PJ,2050 +A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2030,all-year,R1,power,0.27692307692,solarPV,3,MUS$2010/PJ,2050 A1,6,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2035,all-year,R1,power,0.17307692308,solarPV,3,MUS$2010/PJ,2050 A1,7,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2040,all-year,R1,power,0.24230769231,solarPV,3,MUS$2010/PJ,2050 A1,9,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2045,all-year,R1,power,0.34615384615,solarPV,3,MUS$2010/PJ,2050 A1,10,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2045,all-year,R1,power,0.27692307692,windturbine,3,MUS$2010/PJ,2050 A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2020,all-year,R1,power,7.13968269231,gasCCGT,3,MUS$2010/kt,2050 A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2025,all-year,R1,power,21.41904807692,gasCCGT,3,MUS$2010/kt,2050 -A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.15576923077,gasCCGT,4,MUS$2010/PJ,2050 -A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.46730769231,gasCCGT,4,MUS$2010/PJ,2050 -A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.48461538462,solarPV,4,MUS$2010/PJ,2050 -A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2030,all-year,R1,power,0.41538461538,solarPV,4,MUS$2010/PJ,2050 -A1,6,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2035,all-year,R1,power,0.34615384615,solarPV,4,MUS$2010/PJ,2050 -A1,7,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2040,all-year,R1,power,0.48461538462,solarPV,4,MUS$2010/PJ,2050 -A1,9,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2045,all-year,R1,power,0.69230769231,solarPV,4,MUS$2010/PJ,2050 -A1,10,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2045,all-year,R1,power,0.55384615385,windturbine,4,MUS$2010/PJ,2050 -A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2020,all-year,R1,power,14.27936538462,gasCCGT,4,MUS$2010/kt,2050 -A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2025,all-year,R1,power,42.83809615385,gasCCGT,4,MUS$2010/kt,2050 +A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.15000000000,gasCCGT,4,MUS$2010/PJ,2050 +A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.45000000000,gasCCGT,4,MUS$2010/PJ,2050 +A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.33333333333,solarPV,4,MUS$2010/PJ,2050 +A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2030,all-year,R1,power,0.53333333333,solarPV,4,MUS$2010/PJ,2050 +A1,6,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2035,all-year,R1,power,0.33333333333,solarPV,4,MUS$2010/PJ,2050 +A1,7,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2040,all-year,R1,power,0.46666666667,solarPV,4,MUS$2010/PJ,2050 +A1,9,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2045,all-year,R1,power,0.66666666667,solarPV,4,MUS$2010/PJ,2050 +A1,10,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2045,all-year,R1,power,0.53333333333,windturbine,4,MUS$2010/PJ,2050 +A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2020,all-year,R1,power,13.75050000000,gasCCGT,4,MUS$2010/kt,2050 +A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2025,all-year,R1,power,41.25150000000,gasCCGT,4,MUS$2010/kt,2050 A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.10384615385,gasCCGT,5,MUS$2010/PJ,2050 A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.31153846154,gasCCGT,5,MUS$2010/PJ,2050 -A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.32307692308,solarPV,5,MUS$2010/PJ,2050 -A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2030,all-year,R1,power,0.27692307692,solarPV,5,MUS$2010/PJ,2050 +A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.23076923077,solarPV,5,MUS$2010/PJ,2050 +A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2030,all-year,R1,power,0.36923076923,solarPV,5,MUS$2010/PJ,2050 A1,6,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2035,all-year,R1,power,0.23076923077,solarPV,5,MUS$2010/PJ,2050 A1,7,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2040,all-year,R1,power,0.32307692308,solarPV,5,MUS$2010/PJ,2050 A1,9,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2045,all-year,R1,power,0.46153846154,solarPV,5,MUS$2010/PJ,2050 A1,10,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2045,all-year,R1,power,0.36923076923,windturbine,5,MUS$2010/PJ,2050 A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2020,all-year,R1,power,9.51957692308,gasCCGT,5,MUS$2010/kt,2050 A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2025,all-year,R1,power,28.55873076923,gasCCGT,5,MUS$2010/kt,2050 -A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,night,2030,all-year,R1,gas,0.33400000000,gassupply1,0,MUS$2010/PJ,2050 -A1,2,newcapa,PRODUCT|ENERGY,gas,all-week,R1,night,2035,all-year,R1,gas,0.00814634146,gassupply1,0,MUS$2010/PJ,2050 -A1,3,newcapa,PRODUCT|ENERGY,gas,all-week,R1,night,2045,all-year,R1,gas,0.00469981238,gassupply1,0,MUS$2010/PJ,2050 -A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,morning,2030,all-year,R1,gas,0.50100000000,gassupply1,1,MUS$2010/PJ,2050 -A1,2,newcapa,PRODUCT|ENERGY,gas,all-week,R1,morning,2035,all-year,R1,gas,0.01221951220,gassupply1,1,MUS$2010/PJ,2050 -A1,3,newcapa,PRODUCT|ENERGY,gas,all-week,R1,morning,2045,all-year,R1,gas,0.00704971857,gassupply1,1,MUS$2010/PJ,2050 -A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2030,all-year,R1,gas,0.33400000000,gassupply1,2,MUS$2010/PJ,2050 -A1,2,newcapa,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2035,all-year,R1,gas,0.00814634146,gassupply1,2,MUS$2010/PJ,2050 -A1,3,newcapa,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2045,all-year,R1,gas,0.00469981238,gassupply1,2,MUS$2010/PJ,2050 -A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2030,all-year,R1,gas,0.50100000000,gassupply1,3,MUS$2010/PJ,2050 -A1,2,newcapa,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2035,all-year,R1,gas,0.01221951220,gassupply1,3,MUS$2010/PJ,2050 -A1,3,newcapa,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2045,all-year,R1,gas,0.00704971857,gassupply1,3,MUS$2010/PJ,2050 +A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,night,2030,all-year,R1,gas,0.34684615385,gassupply1,0,MUS$2010/PJ,2050 +A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,morning,2030,all-year,R1,gas,0.52026923077,gassupply1,1,MUS$2010/PJ,2050 +A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2030,all-year,R1,gas,0.34684615385,gassupply1,2,MUS$2010/PJ,2050 +A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2030,all-year,R1,gas,0.52026923077,gassupply1,3,MUS$2010/PJ,2050 A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2030,all-year,R1,gas,1.00200000000,gassupply1,4,MUS$2010/PJ,2050 -A1,2,newcapa,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2035,all-year,R1,gas,0.02443902439,gassupply1,4,MUS$2010/PJ,2050 -A1,3,newcapa,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2045,all-year,R1,gas,0.01409943715,gassupply1,4,MUS$2010/PJ,2050 -A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,evening,2030,all-year,R1,gas,0.66800000000,gassupply1,5,MUS$2010/PJ,2050 -A1,2,newcapa,PRODUCT|ENERGY,gas,all-week,R1,evening,2035,all-year,R1,gas,0.01629268293,gassupply1,5,MUS$2010/PJ,2050 -A1,3,newcapa,PRODUCT|ENERGY,gas,all-week,R1,evening,2045,all-year,R1,gas,0.00939962477,gassupply1,5,MUS$2010/PJ,2050 +A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,evening,2030,all-year,R1,gas,0.69369230769,gassupply1,5,MUS$2010/PJ,2050 diff --git a/docs/tutorial-code/new-decision-metric/Results/MCAPrices.csv b/docs/tutorial-code/new-decision-metric/Results/MCAPrices.csv index de955c5dc..e6b1be9bd 100644 --- a/docs/tutorial-code/new-decision-metric/Results/MCAPrices.csv +++ b/docs/tutorial-code/new-decision-metric/Results/MCAPrices.csv @@ -47,29 +47,29 @@ electricity,all-week,evening,all-year,4.08500000000,R1,5,MUS$2010/PJ,2025 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2025 heat,all-week,evening,all-year,3.23830000000,R1,5,MUS$2010/PJ,2025 CO2f,all-week,evening,all-year,0.12010000000,R1,5,MUS$2010/kt,2025 -electricity,all-week,night,all-year,5.69380000000,R1,0,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,6.00210000000,R1,0,MUS$2010/PJ,2030 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,2.51800000000,R1,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,2.64130000000,R1,0,MUS$2010/PJ,2030 CO2f,all-week,night,all-year,0.15700000000,R1,0,MUS$2010/kt,2030 -electricity,all-week,morning,all-year,5.69380000000,R1,1,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,6.00210000000,R1,1,MUS$2010/PJ,2030 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,2.51800000000,R1,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,2.64130000000,R1,1,MUS$2010/PJ,2030 CO2f,all-week,morning,all-year,0.15700000000,R1,1,MUS$2010/kt,2030 -electricity,all-week,afternoon,all-year,5.69380000000,R1,2,MUS$2010/PJ,2030 +electricity,all-week,afternoon,all-year,6.00210000000,R1,2,MUS$2010/PJ,2030 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,2.51800000000,R1,2,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,2.64130000000,R1,2,MUS$2010/PJ,2030 CO2f,all-week,afternoon,all-year,0.15700000000,R1,2,MUS$2010/kt,2030 -electricity,all-week,early-peak,all-year,5.69380000000,R1,3,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,6.00210000000,R1,3,MUS$2010/PJ,2030 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,2.51800000000,R1,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,2.64130000000,R1,3,MUS$2010/PJ,2030 CO2f,all-week,early-peak,all-year,0.15700000000,R1,3,MUS$2010/kt,2030 -electricity,all-week,late-peak,all-year,5.69380000000,R1,4,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,6.00210000000,R1,4,MUS$2010/PJ,2030 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,2.51800000000,R1,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,2.64130000000,R1,4,MUS$2010/PJ,2030 CO2f,all-week,late-peak,all-year,0.15700000000,R1,4,MUS$2010/kt,2030 -electricity,all-week,evening,all-year,5.69380000000,R1,5,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,6.00210000000,R1,5,MUS$2010/PJ,2030 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,2.51800000000,R1,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,2.64130000000,R1,5,MUS$2010/PJ,2030 CO2f,all-week,evening,all-year,0.15700000000,R1,5,MUS$2010/kt,2030 electricity,all-week,night,all-year,6.30080000000,R1,0,MUS$2010/PJ,2035 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2035 From 8f2d7fe5b3333b0b74cbb1b02b3379ecb25fa14c Mon Sep 17 00:00:00 2001 From: Tom Bland Date: Wed, 16 Oct 2024 13:30:05 +0100 Subject: [PATCH 07/18] Update example results --- tests/example_outputs/default/MCACapacity.csv | 48 +++---- tests/example_outputs/default/MCAPrices.csv | 120 ++++++++--------- .../default_timeslice/MCACapacity.csv | 34 ++--- .../default_timeslice/MCAPrices.csv | 6 +- .../default_timeslice/Power_Supply.csv | 123 ++++++++++++++++++ tests/example_outputs/medium/MCACapacity.csv | 32 ++--- .../minimum_service/MCASupply.csv | 12 +- .../multiple_agents/MCACapacity.csv | 30 ++--- 8 files changed, 264 insertions(+), 141 deletions(-) create mode 100644 tests/example_outputs/default_timeslice/Power_Supply.csv diff --git a/tests/example_outputs/default/MCACapacity.csv b/tests/example_outputs/default/MCACapacity.csv index f797d4286..e10aa3a43 100644 --- a/tests/example_outputs/default/MCACapacity.csv +++ b/tests/example_outputs/default/MCACapacity.csv @@ -6,52 +6,52 @@ A1,5.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2025 A1,19.00000000000,R1,2020,R1,residential,heatpump,newcapa,2025 A1,6.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2025 A1,5.00000000000,R1,2020,R1,power,windturbine,newcapa,2025 -A1,16.73530000000,R1,2020,R1,gas,gassupply1,newcapa,2025 +A1,16.46440000000,R1,2020,R1,gas,gassupply1,newcapa,2025 A1,19.00000000000,R1,2020,R1,residential,heatpump,newcapa,2030 A1,10.00000000000,R1,2025,R1,residential,heatpump,newcapa,2030 A1,5.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2030 -A1,6.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2030 +A1,5.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2030 A1,5.00000000000,R1,2020,R1,power,windturbine,newcapa,2030 -A1,9.23530000000,R1,2020,R1,gas,gassupply1,newcapa,2030 -A1,9.28910000000,R1,2025,R1,gas,gassupply1,newcapa,2030 +A1,8.96440000000,R1,2020,R1,gas,gassupply1,newcapa,2030 +A1,7.73560000000,R1,2025,R1,gas,gassupply1,newcapa,2030 A1,10.00000000000,R1,2025,R1,residential,heatpump,newcapa,2035 A1,26.00000000000,R1,2030,R1,residential,heatpump,newcapa,2035 A1,5.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2035 -A1,6.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2035 +A1,5.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2035 A1,5.00000000000,R1,2020,R1,power,windturbine,newcapa,2035 -A1,6.00000000000,R1,2030,R1,power,windturbine,newcapa,2035 -A1,1.73530000000,R1,2020,R1,gas,gassupply1,newcapa,2035 -A1,9.28910000000,R1,2025,R1,gas,gassupply1,newcapa,2035 -A1,7.47410000000,R1,2030,R1,gas,gassupply1,newcapa,2035 +A1,8.00000000000,R1,2030,R1,power,windturbine,newcapa,2035 +A1,1.46440000000,R1,2020,R1,gas,gassupply1,newcapa,2035 +A1,7.73560000000,R1,2025,R1,gas,gassupply1,newcapa,2035 +A1,7.50000000000,R1,2030,R1,gas,gassupply1,newcapa,2035 A1,26.00000000000,R1,2030,R1,residential,heatpump,newcapa,2040 A1,16.00000000000,R1,2035,R1,residential,heatpump,newcapa,2040 A1,5.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2040 -A1,6.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2040 +A1,5.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2040 A1,5.00000000000,R1,2020,R1,power,windturbine,newcapa,2040 -A1,6.00000000000,R1,2030,R1,power,windturbine,newcapa,2040 +A1,8.00000000000,R1,2030,R1,power,windturbine,newcapa,2040 A1,6.00000000000,R1,2035,R1,power,windturbine,newcapa,2040 -A1,1.73530000000,R1,2020,R1,gas,gassupply1,newcapa,2040 -A1,9.28910000000,R1,2025,R1,gas,gassupply1,newcapa,2040 -A1,7.47410000000,R1,2030,R1,gas,gassupply1,newcapa,2040 +A1,1.46440000000,R1,2020,R1,gas,gassupply1,newcapa,2040 +A1,7.73560000000,R1,2025,R1,gas,gassupply1,newcapa,2040 +A1,7.50000000000,R1,2030,R1,gas,gassupply1,newcapa,2040 A1,16.00000000000,R1,2035,R1,residential,heatpump,newcapa,2045 A1,32.00000000000,R1,2040,R1,residential,heatpump,newcapa,2045 A1,5.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2045 -A1,6.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2045 +A1,5.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2045 A1,5.00000000000,R1,2020,R1,power,windturbine,newcapa,2045 -A1,6.00000000000,R1,2030,R1,power,windturbine,newcapa,2045 +A1,8.00000000000,R1,2030,R1,power,windturbine,newcapa,2045 A1,6.00000000000,R1,2035,R1,power,windturbine,newcapa,2045 A1,6.00000000000,R1,2040,R1,power,windturbine,newcapa,2045 -A1,1.73530000000,R1,2020,R1,gas,gassupply1,newcapa,2045 -A1,9.28910000000,R1,2025,R1,gas,gassupply1,newcapa,2045 -A1,7.47410000000,R1,2030,R1,gas,gassupply1,newcapa,2045 +A1,1.46440000000,R1,2020,R1,gas,gassupply1,newcapa,2045 +A1,7.73560000000,R1,2025,R1,gas,gassupply1,newcapa,2045 +A1,7.50000000000,R1,2030,R1,gas,gassupply1,newcapa,2045 A1,32.00000000000,R1,2040,R1,residential,heatpump,newcapa,2050 A1,22.00000000000,R1,2045,R1,residential,heatpump,newcapa,2050 A1,5.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2050 -A1,6.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2050 -A1,6.00000000000,R1,2030,R1,power,windturbine,newcapa,2050 +A1,5.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2050 +A1,8.00000000000,R1,2030,R1,power,windturbine,newcapa,2050 A1,6.00000000000,R1,2035,R1,power,windturbine,newcapa,2050 A1,6.00000000000,R1,2040,R1,power,windturbine,newcapa,2050 A1,11.00000000000,R1,2045,R1,power,windturbine,newcapa,2050 -A1,1.73530000000,R1,2020,R1,gas,gassupply1,newcapa,2050 -A1,9.28910000000,R1,2025,R1,gas,gassupply1,newcapa,2050 -A1,7.47410000000,R1,2030,R1,gas,gassupply1,newcapa,2050 +A1,1.46440000000,R1,2020,R1,gas,gassupply1,newcapa,2050 +A1,7.73560000000,R1,2025,R1,gas,gassupply1,newcapa,2050 +A1,7.50000000000,R1,2030,R1,gas,gassupply1,newcapa,2050 diff --git a/tests/example_outputs/default/MCAPrices.csv b/tests/example_outputs/default/MCAPrices.csv index 20946c704..054bc9742 100644 --- a/tests/example_outputs/default/MCAPrices.csv +++ b/tests/example_outputs/default/MCAPrices.csv @@ -47,123 +47,123 @@ electricity,all-week,evening,all-year,9.39110000000,R1,5,MUS$2010/PJ,2025 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2025 heat,all-week,evening,all-year,4.91850000000,R1,5,MUS$2010/PJ,2025 CO2f,all-week,evening,all-year,0.12010000000,R1,5,MUS$2010/kt,2025 -electricity,all-week,night,all-year,13.28930000000,R1,0,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,13.09720000000,R1,0,MUS$2010/PJ,2030 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,5.55620000000,R1,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,5.47940000000,R1,0,MUS$2010/PJ,2030 CO2f,all-week,night,all-year,0.15700000000,R1,0,MUS$2010/kt,2030 -electricity,all-week,morning,all-year,13.28930000000,R1,1,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,13.09720000000,R1,1,MUS$2010/PJ,2030 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,5.55620000000,R1,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,5.47940000000,R1,1,MUS$2010/PJ,2030 CO2f,all-week,morning,all-year,0.15700000000,R1,1,MUS$2010/kt,2030 -electricity,all-week,afternoon,all-year,13.28930000000,R1,2,MUS$2010/PJ,2030 +electricity,all-week,afternoon,all-year,13.09720000000,R1,2,MUS$2010/PJ,2030 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,5.55620000000,R1,2,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,5.47940000000,R1,2,MUS$2010/PJ,2030 CO2f,all-week,afternoon,all-year,0.15700000000,R1,2,MUS$2010/kt,2030 -electricity,all-week,early-peak,all-year,13.28930000000,R1,3,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,13.09720000000,R1,3,MUS$2010/PJ,2030 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,5.55620000000,R1,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,5.47940000000,R1,3,MUS$2010/PJ,2030 CO2f,all-week,early-peak,all-year,0.15700000000,R1,3,MUS$2010/kt,2030 -electricity,all-week,late-peak,all-year,13.28930000000,R1,4,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,13.09720000000,R1,4,MUS$2010/PJ,2030 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,5.55620000000,R1,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,5.47940000000,R1,4,MUS$2010/PJ,2030 CO2f,all-week,late-peak,all-year,0.15700000000,R1,4,MUS$2010/kt,2030 -electricity,all-week,evening,all-year,13.28930000000,R1,5,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,13.09720000000,R1,5,MUS$2010/PJ,2030 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,5.55620000000,R1,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,5.47940000000,R1,5,MUS$2010/PJ,2030 CO2f,all-week,evening,all-year,0.15700000000,R1,5,MUS$2010/kt,2030 -electricity,all-week,night,all-year,15.01190000000,R1,0,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,13.88410000000,R1,0,MUS$2010/PJ,2035 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,6.24530000000,R1,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,5.79410000000,R1,0,MUS$2010/PJ,2035 CO2f,all-week,night,all-year,0.21490000000,R1,0,MUS$2010/kt,2035 -electricity,all-week,morning,all-year,15.01190000000,R1,1,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,13.88410000000,R1,1,MUS$2010/PJ,2035 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,6.24530000000,R1,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,5.79410000000,R1,1,MUS$2010/PJ,2035 CO2f,all-week,morning,all-year,0.21490000000,R1,1,MUS$2010/kt,2035 -electricity,all-week,afternoon,all-year,15.01190000000,R1,2,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,13.88410000000,R1,2,MUS$2010/PJ,2035 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,6.24530000000,R1,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,5.79410000000,R1,2,MUS$2010/PJ,2035 CO2f,all-week,afternoon,all-year,0.21490000000,R1,2,MUS$2010/kt,2035 -electricity,all-week,early-peak,all-year,15.01190000000,R1,3,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,13.88410000000,R1,3,MUS$2010/PJ,2035 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,6.24530000000,R1,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,5.79410000000,R1,3,MUS$2010/PJ,2035 CO2f,all-week,early-peak,all-year,0.21490000000,R1,3,MUS$2010/kt,2035 -electricity,all-week,late-peak,all-year,15.01190000000,R1,4,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,13.88410000000,R1,4,MUS$2010/PJ,2035 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,6.24530000000,R1,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,5.79410000000,R1,4,MUS$2010/PJ,2035 CO2f,all-week,late-peak,all-year,0.21490000000,R1,4,MUS$2010/kt,2035 -electricity,all-week,evening,all-year,15.01190000000,R1,5,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,13.88410000000,R1,5,MUS$2010/PJ,2035 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,6.24530000000,R1,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,5.79410000000,R1,5,MUS$2010/PJ,2035 CO2f,all-week,evening,all-year,0.21490000000,R1,5,MUS$2010/kt,2035 -electricity,all-week,night,all-year,16.23940000000,R1,0,MUS$2010/PJ,2040 +electricity,all-week,night,all-year,14.99440000000,R1,0,MUS$2010/PJ,2040 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,6.73620000000,R1,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,6.23820000000,R1,0,MUS$2010/PJ,2040 CO2f,all-week,night,all-year,0.27280000000,R1,0,MUS$2010/kt,2040 -electricity,all-week,morning,all-year,16.23940000000,R1,1,MUS$2010/PJ,2040 +electricity,all-week,morning,all-year,14.99440000000,R1,1,MUS$2010/PJ,2040 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,6.73620000000,R1,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,6.23820000000,R1,1,MUS$2010/PJ,2040 CO2f,all-week,morning,all-year,0.27280000000,R1,1,MUS$2010/kt,2040 -electricity,all-week,afternoon,all-year,16.23940000000,R1,2,MUS$2010/PJ,2040 +electricity,all-week,afternoon,all-year,14.99440000000,R1,2,MUS$2010/PJ,2040 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2040 -heat,all-week,afternoon,all-year,6.73620000000,R1,2,MUS$2010/PJ,2040 +heat,all-week,afternoon,all-year,6.23820000000,R1,2,MUS$2010/PJ,2040 CO2f,all-week,afternoon,all-year,0.27280000000,R1,2,MUS$2010/kt,2040 -electricity,all-week,early-peak,all-year,16.23940000000,R1,3,MUS$2010/PJ,2040 +electricity,all-week,early-peak,all-year,14.99440000000,R1,3,MUS$2010/PJ,2040 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,6.73620000000,R1,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,6.23820000000,R1,3,MUS$2010/PJ,2040 CO2f,all-week,early-peak,all-year,0.27280000000,R1,3,MUS$2010/kt,2040 -electricity,all-week,late-peak,all-year,16.23940000000,R1,4,MUS$2010/PJ,2040 +electricity,all-week,late-peak,all-year,14.99440000000,R1,4,MUS$2010/PJ,2040 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,6.73620000000,R1,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,6.23820000000,R1,4,MUS$2010/PJ,2040 CO2f,all-week,late-peak,all-year,0.27280000000,R1,4,MUS$2010/kt,2040 -electricity,all-week,evening,all-year,16.23940000000,R1,5,MUS$2010/PJ,2040 +electricity,all-week,evening,all-year,14.99440000000,R1,5,MUS$2010/PJ,2040 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,6.73620000000,R1,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,6.23820000000,R1,5,MUS$2010/PJ,2040 CO2f,all-week,evening,all-year,0.27280000000,R1,5,MUS$2010/kt,2040 -electricity,all-week,night,all-year,18.26600000000,R1,0,MUS$2010/PJ,2045 +electricity,all-week,night,all-year,16.83640000000,R1,0,MUS$2010/PJ,2045 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2045 -heat,all-week,night,all-year,7.54690000000,R1,0,MUS$2010/PJ,2045 +heat,all-week,night,all-year,6.97510000000,R1,0,MUS$2010/PJ,2045 CO2f,all-week,night,all-year,0.35390000000,R1,0,MUS$2010/kt,2045 -electricity,all-week,morning,all-year,18.26600000000,R1,1,MUS$2010/PJ,2045 +electricity,all-week,morning,all-year,16.83640000000,R1,1,MUS$2010/PJ,2045 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2045 -heat,all-week,morning,all-year,7.54690000000,R1,1,MUS$2010/PJ,2045 +heat,all-week,morning,all-year,6.97510000000,R1,1,MUS$2010/PJ,2045 CO2f,all-week,morning,all-year,0.35390000000,R1,1,MUS$2010/kt,2045 -electricity,all-week,afternoon,all-year,18.26600000000,R1,2,MUS$2010/PJ,2045 +electricity,all-week,afternoon,all-year,16.83640000000,R1,2,MUS$2010/PJ,2045 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2045 -heat,all-week,afternoon,all-year,7.54690000000,R1,2,MUS$2010/PJ,2045 +heat,all-week,afternoon,all-year,6.97510000000,R1,2,MUS$2010/PJ,2045 CO2f,all-week,afternoon,all-year,0.35390000000,R1,2,MUS$2010/kt,2045 -electricity,all-week,early-peak,all-year,18.26600000000,R1,3,MUS$2010/PJ,2045 +electricity,all-week,early-peak,all-year,16.83640000000,R1,3,MUS$2010/PJ,2045 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2045 -heat,all-week,early-peak,all-year,7.54690000000,R1,3,MUS$2010/PJ,2045 +heat,all-week,early-peak,all-year,6.97510000000,R1,3,MUS$2010/PJ,2045 CO2f,all-week,early-peak,all-year,0.35390000000,R1,3,MUS$2010/kt,2045 -electricity,all-week,late-peak,all-year,18.26600000000,R1,4,MUS$2010/PJ,2045 +electricity,all-week,late-peak,all-year,16.83640000000,R1,4,MUS$2010/PJ,2045 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2045 -heat,all-week,late-peak,all-year,7.54690000000,R1,4,MUS$2010/PJ,2045 +heat,all-week,late-peak,all-year,6.97510000000,R1,4,MUS$2010/PJ,2045 CO2f,all-week,late-peak,all-year,0.35390000000,R1,4,MUS$2010/kt,2045 -electricity,all-week,evening,all-year,18.26600000000,R1,5,MUS$2010/PJ,2045 +electricity,all-week,evening,all-year,16.83640000000,R1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2045 -heat,all-week,evening,all-year,7.54690000000,R1,5,MUS$2010/PJ,2045 +heat,all-week,evening,all-year,6.97510000000,R1,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045 -electricity,all-week,night,all-year,19.84020000000,R1,0,MUS$2010/PJ,2050 +electricity,all-week,night,all-year,18.26530000000,R1,0,MUS$2010/PJ,2050 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,8.17660000000,R1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,7.54660000000,R1,0,MUS$2010/PJ,2050 CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050 -electricity,all-week,morning,all-year,19.84020000000,R1,1,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,18.26530000000,R1,1,MUS$2010/PJ,2050 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,8.17660000000,R1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,7.54660000000,R1,1,MUS$2010/PJ,2050 CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050 -electricity,all-week,afternoon,all-year,19.84020000000,R1,2,MUS$2010/PJ,2050 +electricity,all-week,afternoon,all-year,18.26530000000,R1,2,MUS$2010/PJ,2050 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,8.17660000000,R1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,7.54660000000,R1,2,MUS$2010/PJ,2050 CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050 -electricity,all-week,early-peak,all-year,19.84020000000,R1,3,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,18.26530000000,R1,3,MUS$2010/PJ,2050 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,8.17660000000,R1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,7.54660000000,R1,3,MUS$2010/PJ,2050 CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050 -electricity,all-week,late-peak,all-year,19.84020000000,R1,4,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,18.26530000000,R1,4,MUS$2010/PJ,2050 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,8.17660000000,R1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,7.54660000000,R1,4,MUS$2010/PJ,2050 CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050 -electricity,all-week,evening,all-year,19.84020000000,R1,5,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,18.26530000000,R1,5,MUS$2010/PJ,2050 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,8.17660000000,R1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,7.54660000000,R1,5,MUS$2010/PJ,2050 CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050 diff --git a/tests/example_outputs/default_timeslice/MCACapacity.csv b/tests/example_outputs/default_timeslice/MCACapacity.csv index c36c539e0..bfd4187ff 100644 --- a/tests/example_outputs/default_timeslice/MCACapacity.csv +++ b/tests/example_outputs/default_timeslice/MCACapacity.csv @@ -5,35 +5,35 @@ A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2020 A1,5.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2025 A1,19.00000000000,R1,2020,R1,residential,heatpump,newcapa,2025 A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2025 -A1,1.00000000000,R1,2020,R1,power,windturbine,newcapa,2025 +A1,6.00000000000,R1,2020,R1,power,windturbine,newcapa,2025 A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2025 A1,19.00000000000,R1,2020,R1,residential,heatpump,newcapa,2030 A1,10.00000000000,R1,2025,R1,residential,heatpump,newcapa,2030 -A1,1.00000000000,R1,2020,R1,power,windturbine,newcapa,2030 -A1,1.00000000000,R1,2025,R1,power,windturbine,newcapa,2030 +A1,6.00000000000,R1,2020,R1,power,windturbine,newcapa,2030 +A1,5.00000000000,R1,2025,R1,power,windturbine,newcapa,2030 A1,7.50000000000,R1,2020,R1,gas,gassupply1,newcapa,2030 A1,10.00000000000,R1,2025,R1,residential,heatpump,newcapa,2035 A1,26.00000000000,R1,2030,R1,residential,heatpump,newcapa,2035 -A1,1.00000000000,R1,2020,R1,power,windturbine,newcapa,2035 -A1,1.00000000000,R1,2025,R1,power,windturbine,newcapa,2035 -A1,2.00000000000,R1,2030,R1,power,windturbine,newcapa,2035 +A1,6.00000000000,R1,2020,R1,power,windturbine,newcapa,2035 +A1,5.00000000000,R1,2025,R1,power,windturbine,newcapa,2035 +A1,3.00000000000,R1,2030,R1,power,windturbine,newcapa,2035 A1,26.00000000000,R1,2030,R1,residential,heatpump,newcapa,2040 A1,16.00000000000,R1,2035,R1,residential,heatpump,newcapa,2040 -A1,1.00000000000,R1,2020,R1,power,windturbine,newcapa,2040 -A1,1.00000000000,R1,2025,R1,power,windturbine,newcapa,2040 -A1,2.00000000000,R1,2030,R1,power,windturbine,newcapa,2040 +A1,6.00000000000,R1,2020,R1,power,windturbine,newcapa,2040 +A1,5.00000000000,R1,2025,R1,power,windturbine,newcapa,2040 +A1,3.00000000000,R1,2030,R1,power,windturbine,newcapa,2040 A1,2.00000000000,R1,2035,R1,power,windturbine,newcapa,2040 A1,16.00000000000,R1,2035,R1,residential,heatpump,newcapa,2045 A1,32.00000000000,R1,2040,R1,residential,heatpump,newcapa,2045 -A1,1.00000000000,R1,2020,R1,power,windturbine,newcapa,2045 -A1,1.00000000000,R1,2025,R1,power,windturbine,newcapa,2045 -A1,2.00000000000,R1,2030,R1,power,windturbine,newcapa,2045 +A1,6.00000000000,R1,2020,R1,power,windturbine,newcapa,2045 +A1,5.00000000000,R1,2025,R1,power,windturbine,newcapa,2045 +A1,3.00000000000,R1,2030,R1,power,windturbine,newcapa,2045 A1,2.00000000000,R1,2035,R1,power,windturbine,newcapa,2045 -A1,2.00000000000,R1,2040,R1,power,windturbine,newcapa,2045 +A1,3.00000000000,R1,2040,R1,power,windturbine,newcapa,2045 A1,32.00000000000,R1,2040,R1,residential,heatpump,newcapa,2050 A1,22.00000000000,R1,2045,R1,residential,heatpump,newcapa,2050 -A1,1.00000000000,R1,2025,R1,power,windturbine,newcapa,2050 -A1,2.00000000000,R1,2030,R1,power,windturbine,newcapa,2050 +A1,5.00000000000,R1,2025,R1,power,windturbine,newcapa,2050 +A1,3.00000000000,R1,2030,R1,power,windturbine,newcapa,2050 A1,2.00000000000,R1,2035,R1,power,windturbine,newcapa,2050 -A1,2.00000000000,R1,2040,R1,power,windturbine,newcapa,2050 -A1,2.00000000000,R1,2045,R1,power,windturbine,newcapa,2050 +A1,3.00000000000,R1,2040,R1,power,windturbine,newcapa,2050 +A1,8.00000000000,R1,2045,R1,power,windturbine,newcapa,2050 diff --git a/tests/example_outputs/default_timeslice/MCAPrices.csv b/tests/example_outputs/default_timeslice/MCAPrices.csv index 557f60617..50b23bf33 100644 --- a/tests/example_outputs/default_timeslice/MCAPrices.csv +++ b/tests/example_outputs/default_timeslice/MCAPrices.csv @@ -39,9 +39,9 @@ electricity,all-week,early-peak,all-year,0.66670000000,R1,3,MUS$2010/PJ,2025 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2025 heat,all-week,early-peak,all-year,2.15580000000,R1,3,MUS$2010/PJ,2025 CO2f,all-week,early-peak,all-year,0.12010000000,R1,3,MUS$2010/kt,2025 -electricity,all-week,late-peak,all-year,3.09610000000,R1,4,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,2.31520000000,R1,4,MUS$2010/PJ,2025 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,3.77510000000,R1,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,3.25460000000,R1,4,MUS$2010/PJ,2025 CO2f,all-week,late-peak,all-year,0.12010000000,R1,4,MUS$2010/kt,2025 electricity,all-week,evening,all-year,0.66670000000,R1,5,MUS$2010/PJ,2025 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2025 @@ -65,7 +65,7 @@ heat,all-week,early-peak,all-year,0.50720000000,R1,3,MUS$2010/PJ,2030 CO2f,all-week,early-peak,all-year,0.15700000000,R1,3,MUS$2010/kt,2030 electricity,all-week,late-peak,all-year,0.66670000000,R1,4,MUS$2010/PJ,2030 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,1.47890000000,R1,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,0.50720000000,R1,4,MUS$2010/PJ,2030 CO2f,all-week,late-peak,all-year,0.15700000000,R1,4,MUS$2010/kt,2030 electricity,all-week,evening,all-year,0.66670000000,R1,5,MUS$2010/PJ,2030 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2030 diff --git a/tests/example_outputs/default_timeslice/Power_Supply.csv b/tests/example_outputs/default_timeslice/Power_Supply.csv new file mode 100644 index 000000000..6b6aeb5e1 --- /dev/null +++ b/tests/example_outputs/default_timeslice/Power_Supply.csv @@ -0,0 +1,123 @@ +asset,comm_usage,commodity,day,hour,installed,month,region,supply,technology,timeslice,year +0,10,electricity,all-week,late-peak,2020,all-year,R1,0.16670000000,gasCCGT,4,2025 +0,6,CO2f,all-week,late-peak,2020,all-year,R1,15.27830000000,gasCCGT,4,2025 +1,10,electricity,all-week,night,2020,all-year,R1,0.42220000000,windturbine,0,2025 +1,10,electricity,all-week,morning,2020,all-year,R1,0.63330000000,windturbine,1,2025 +1,10,electricity,all-week,afternoon,2020,all-year,R1,0.42220000000,windturbine,2,2025 +1,10,electricity,all-week,early-peak,2020,all-year,R1,0.63330000000,windturbine,3,2025 +1,10,electricity,all-week,late-peak,2020,all-year,R1,1.00000000000,windturbine,4,2025 +1,10,electricity,all-week,evening,2020,all-year,R1,0.84440000000,windturbine,5,2025 +1,10,electricity,all-week,night,2020,all-year,R1,0.36360000000,windturbine,0,2030 +1,10,electricity,all-week,morning,2020,all-year,R1,0.54550000000,windturbine,1,2030 +1,10,electricity,all-week,afternoon,2020,all-year,R1,0.36360000000,windturbine,2,2030 +1,10,electricity,all-week,early-peak,2020,all-year,R1,0.54550000000,windturbine,3,2030 +1,10,electricity,all-week,late-peak,2020,all-year,R1,1.00000000000,windturbine,4,2030 +1,10,electricity,all-week,evening,2020,all-year,R1,0.72730000000,windturbine,5,2030 +2,10,electricity,all-week,night,2025,all-year,R1,0.30300000000,windturbine,0,2030 +2,10,electricity,all-week,morning,2025,all-year,R1,0.45450000000,windturbine,1,2030 +2,10,electricity,all-week,afternoon,2025,all-year,R1,0.30300000000,windturbine,2,2030 +2,10,electricity,all-week,early-peak,2025,all-year,R1,0.45450000000,windturbine,3,2030 +2,10,electricity,all-week,late-peak,2025,all-year,R1,0.83330000000,windturbine,4,2030 +2,10,electricity,all-week,evening,2025,all-year,R1,0.60610000000,windturbine,5,2030 +1,10,electricity,all-week,night,2020,all-year,R1,0.34290000000,windturbine,0,2035 +1,10,electricity,all-week,morning,2020,all-year,R1,0.51430000000,windturbine,1,2035 +1,10,electricity,all-week,afternoon,2020,all-year,R1,0.34290000000,windturbine,2,2035 +1,10,electricity,all-week,early-peak,2020,all-year,R1,0.51430000000,windturbine,3,2035 +1,10,electricity,all-week,late-peak,2020,all-year,R1,1.00000000000,windturbine,4,2035 +1,10,electricity,all-week,evening,2020,all-year,R1,0.68570000000,windturbine,5,2035 +2,10,electricity,all-week,night,2025,all-year,R1,0.28570000000,windturbine,0,2035 +2,10,electricity,all-week,morning,2025,all-year,R1,0.42860000000,windturbine,1,2035 +2,10,electricity,all-week,afternoon,2025,all-year,R1,0.28570000000,windturbine,2,2035 +2,10,electricity,all-week,early-peak,2025,all-year,R1,0.42860000000,windturbine,3,2035 +2,10,electricity,all-week,late-peak,2025,all-year,R1,0.83330000000,windturbine,4,2035 +2,10,electricity,all-week,evening,2025,all-year,R1,0.57140000000,windturbine,5,2035 +3,10,electricity,all-week,night,2030,all-year,R1,0.17140000000,windturbine,0,2035 +3,10,electricity,all-week,morning,2030,all-year,R1,0.25710000000,windturbine,1,2035 +3,10,electricity,all-week,afternoon,2030,all-year,R1,0.17140000000,windturbine,2,2035 +3,10,electricity,all-week,early-peak,2030,all-year,R1,0.25710000000,windturbine,3,2035 +3,10,electricity,all-week,late-peak,2030,all-year,R1,0.50000000000,windturbine,4,2035 +3,10,electricity,all-week,evening,2030,all-year,R1,0.34290000000,windturbine,5,2035 +1,10,electricity,all-week,night,2020,all-year,R1,0.35000000000,windturbine,0,2040 +1,10,electricity,all-week,morning,2020,all-year,R1,0.52500000000,windturbine,1,2040 +1,10,electricity,all-week,afternoon,2020,all-year,R1,0.35000000000,windturbine,2,2040 +1,10,electricity,all-week,early-peak,2020,all-year,R1,0.52500000000,windturbine,3,2040 +1,10,electricity,all-week,late-peak,2020,all-year,R1,1.00000000000,windturbine,4,2040 +1,10,electricity,all-week,evening,2020,all-year,R1,0.70000000000,windturbine,5,2040 +2,10,electricity,all-week,night,2025,all-year,R1,0.29170000000,windturbine,0,2040 +2,10,electricity,all-week,morning,2025,all-year,R1,0.43750000000,windturbine,1,2040 +2,10,electricity,all-week,afternoon,2025,all-year,R1,0.29170000000,windturbine,2,2040 +2,10,electricity,all-week,early-peak,2025,all-year,R1,0.43750000000,windturbine,3,2040 +2,10,electricity,all-week,late-peak,2025,all-year,R1,0.83330000000,windturbine,4,2040 +2,10,electricity,all-week,evening,2025,all-year,R1,0.58330000000,windturbine,5,2040 +3,10,electricity,all-week,night,2030,all-year,R1,0.17500000000,windturbine,0,2040 +3,10,electricity,all-week,morning,2030,all-year,R1,0.26250000000,windturbine,1,2040 +3,10,electricity,all-week,afternoon,2030,all-year,R1,0.17500000000,windturbine,2,2040 +3,10,electricity,all-week,early-peak,2030,all-year,R1,0.26250000000,windturbine,3,2040 +3,10,electricity,all-week,late-peak,2030,all-year,R1,0.50000000000,windturbine,4,2040 +3,10,electricity,all-week,evening,2030,all-year,R1,0.35000000000,windturbine,5,2040 +4,10,electricity,all-week,night,2035,all-year,R1,0.11670000000,windturbine,0,2040 +4,10,electricity,all-week,morning,2035,all-year,R1,0.17500000000,windturbine,1,2040 +4,10,electricity,all-week,afternoon,2035,all-year,R1,0.11670000000,windturbine,2,2040 +4,10,electricity,all-week,early-peak,2035,all-year,R1,0.17500000000,windturbine,3,2040 +4,10,electricity,all-week,late-peak,2035,all-year,R1,0.33330000000,windturbine,4,2040 +4,10,electricity,all-week,evening,2035,all-year,R1,0.23330000000,windturbine,5,2040 +1,10,electricity,all-week,night,2020,all-year,R1,0.33680000000,windturbine,0,2045 +1,10,electricity,all-week,morning,2020,all-year,R1,0.50530000000,windturbine,1,2045 +1,10,electricity,all-week,afternoon,2020,all-year,R1,0.33680000000,windturbine,2,2045 +1,10,electricity,all-week,early-peak,2020,all-year,R1,0.50530000000,windturbine,3,2045 +1,10,electricity,all-week,late-peak,2020,all-year,R1,1.00000000000,windturbine,4,2045 +1,10,electricity,all-week,evening,2020,all-year,R1,0.67370000000,windturbine,5,2045 +2,10,electricity,all-week,night,2025,all-year,R1,0.28070000000,windturbine,0,2045 +2,10,electricity,all-week,morning,2025,all-year,R1,0.42110000000,windturbine,1,2045 +2,10,electricity,all-week,afternoon,2025,all-year,R1,0.28070000000,windturbine,2,2045 +2,10,electricity,all-week,early-peak,2025,all-year,R1,0.42110000000,windturbine,3,2045 +2,10,electricity,all-week,late-peak,2025,all-year,R1,0.83330000000,windturbine,4,2045 +2,10,electricity,all-week,evening,2025,all-year,R1,0.56140000000,windturbine,5,2045 +3,10,electricity,all-week,night,2030,all-year,R1,0.16840000000,windturbine,0,2045 +3,10,electricity,all-week,morning,2030,all-year,R1,0.25260000000,windturbine,1,2045 +3,10,electricity,all-week,afternoon,2030,all-year,R1,0.16840000000,windturbine,2,2045 +3,10,electricity,all-week,early-peak,2030,all-year,R1,0.25260000000,windturbine,3,2045 +3,10,electricity,all-week,late-peak,2030,all-year,R1,0.50000000000,windturbine,4,2045 +3,10,electricity,all-week,evening,2030,all-year,R1,0.33680000000,windturbine,5,2045 +4,10,electricity,all-week,night,2035,all-year,R1,0.11230000000,windturbine,0,2045 +4,10,electricity,all-week,morning,2035,all-year,R1,0.16840000000,windturbine,1,2045 +4,10,electricity,all-week,afternoon,2035,all-year,R1,0.11230000000,windturbine,2,2045 +4,10,electricity,all-week,early-peak,2035,all-year,R1,0.16840000000,windturbine,3,2045 +4,10,electricity,all-week,late-peak,2035,all-year,R1,0.33330000000,windturbine,4,2045 +4,10,electricity,all-week,evening,2035,all-year,R1,0.22460000000,windturbine,5,2045 +5,10,electricity,all-week,night,2040,all-year,R1,0.16840000000,windturbine,0,2045 +5,10,electricity,all-week,morning,2040,all-year,R1,0.25260000000,windturbine,1,2045 +5,10,electricity,all-week,afternoon,2040,all-year,R1,0.16840000000,windturbine,2,2045 +5,10,electricity,all-week,early-peak,2040,all-year,R1,0.25260000000,windturbine,3,2045 +5,10,electricity,all-week,late-peak,2040,all-year,R1,0.50000000000,windturbine,4,2045 +5,10,electricity,all-week,evening,2040,all-year,R1,0.33680000000,windturbine,5,2045 +2,10,electricity,all-week,night,2025,all-year,R1,0.28570000000,windturbine,0,2050 +2,10,electricity,all-week,morning,2025,all-year,R1,0.42860000000,windturbine,1,2050 +2,10,electricity,all-week,afternoon,2025,all-year,R1,0.28570000000,windturbine,2,2050 +2,10,electricity,all-week,early-peak,2025,all-year,R1,0.42860000000,windturbine,3,2050 +2,10,electricity,all-week,late-peak,2025,all-year,R1,0.83330000000,windturbine,4,2050 +2,10,electricity,all-week,evening,2025,all-year,R1,0.57140000000,windturbine,5,2050 +3,10,electricity,all-week,night,2030,all-year,R1,0.17140000000,windturbine,0,2050 +3,10,electricity,all-week,morning,2030,all-year,R1,0.25710000000,windturbine,1,2050 +3,10,electricity,all-week,afternoon,2030,all-year,R1,0.17140000000,windturbine,2,2050 +3,10,electricity,all-week,early-peak,2030,all-year,R1,0.25710000000,windturbine,3,2050 +3,10,electricity,all-week,late-peak,2030,all-year,R1,0.50000000000,windturbine,4,2050 +3,10,electricity,all-week,evening,2030,all-year,R1,0.34290000000,windturbine,5,2050 +4,10,electricity,all-week,night,2035,all-year,R1,0.11430000000,windturbine,0,2050 +4,10,electricity,all-week,morning,2035,all-year,R1,0.17140000000,windturbine,1,2050 +4,10,electricity,all-week,afternoon,2035,all-year,R1,0.11430000000,windturbine,2,2050 +4,10,electricity,all-week,early-peak,2035,all-year,R1,0.17140000000,windturbine,3,2050 +4,10,electricity,all-week,late-peak,2035,all-year,R1,0.33330000000,windturbine,4,2050 +4,10,electricity,all-week,evening,2035,all-year,R1,0.22860000000,windturbine,5,2050 +5,10,electricity,all-week,night,2040,all-year,R1,0.17140000000,windturbine,0,2050 +5,10,electricity,all-week,morning,2040,all-year,R1,0.25710000000,windturbine,1,2050 +5,10,electricity,all-week,afternoon,2040,all-year,R1,0.17140000000,windturbine,2,2050 +5,10,electricity,all-week,early-peak,2040,all-year,R1,0.25710000000,windturbine,3,2050 +5,10,electricity,all-week,late-peak,2040,all-year,R1,0.50000000000,windturbine,4,2050 +5,10,electricity,all-week,evening,2040,all-year,R1,0.34290000000,windturbine,5,2050 +6,10,electricity,all-week,night,2045,all-year,R1,0.45710000000,windturbine,0,2050 +6,10,electricity,all-week,morning,2045,all-year,R1,0.68570000000,windturbine,1,2050 +6,10,electricity,all-week,afternoon,2045,all-year,R1,0.45710000000,windturbine,2,2050 +6,10,electricity,all-week,early-peak,2045,all-year,R1,0.68570000000,windturbine,3,2050 +6,10,electricity,all-week,late-peak,2045,all-year,R1,1.33330000000,windturbine,4,2050 +6,10,electricity,all-week,evening,2045,all-year,R1,0.91430000000,windturbine,5,2050 diff --git a/tests/example_outputs/medium/MCACapacity.csv b/tests/example_outputs/medium/MCACapacity.csv index ea849e502..eb32a99d0 100644 --- a/tests/example_outputs/medium/MCACapacity.csv +++ b/tests/example_outputs/medium/MCACapacity.csv @@ -7,15 +7,15 @@ A1,8.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2025 A1,12.00000000000,R1,2020,R1,residential,gasstove,newcapa,2025 A1,4.00000000000,R1,2020,R1,residential,heatpump,newcapa,2025 A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2025 -A1,26.63810000000,R1,2020,R1,gas,gassupply1,newcapa,2025 +A1,25.33930000000,R1,2020,R1,gas,gassupply1,newcapa,2025 A1,7.00000000000,R1,2025,R1,residential,gasboiler,newcapa,2030 A1,4.00000000000,R1,2020,R1,residential,gasstove,newcapa,2030 A1,11.00000000000,R1,2025,R1,residential,gasstove,newcapa,2030 A1,4.00000000000,R1,2020,R1,residential,heatpump,newcapa,2030 A1,4.00000000000,R1,2025,R1,residential,heatpump,newcapa,2030 A1,3.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2030 -A1,19.13810000000,R1,2020,R1,gas,gassupply1,newcapa,2030 -A1,12.51020000000,R1,2025,R1,gas,gassupply1,newcapa,2030 +A1,17.83930000000,R1,2020,R1,gas,gassupply1,newcapa,2030 +A1,12.88130000000,R1,2025,R1,gas,gassupply1,newcapa,2030 A1,7.00000000000,R1,2025,R1,residential,gasboiler,newcapa,2035 A1,11.00000000000,R1,2025,R1,residential,gasstove,newcapa,2035 A1,7.00000000000,R1,2030,R1,residential,gasstove,newcapa,2035 @@ -23,9 +23,9 @@ A1,4.00000000000,R1,2025,R1,residential,heatpump,newcapa,2035 A1,7.00000000000,R1,2030,R1,residential,heatpump,newcapa,2035 A1,3.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2035 A1,4.00000000000,R1,2030,R1,power,windturbine,newcapa,2035 -A1,11.63810000000,R1,2020,R1,gas,gassupply1,newcapa,2035 -A1,12.51020000000,R1,2025,R1,gas,gassupply1,newcapa,2035 -A1,10.02210000000,R1,2030,R1,gas,gassupply1,newcapa,2035 +A1,10.33930000000,R1,2020,R1,gas,gassupply1,newcapa,2035 +A1,12.88130000000,R1,2025,R1,gas,gassupply1,newcapa,2035 +A1,10.83330000000,R1,2030,R1,gas,gassupply1,newcapa,2035 A1,7.00000000000,R1,2030,R1,residential,gasstove,newcapa,2040 A1,14.00000000000,R1,2035,R1,residential,gasstove,newcapa,2040 A1,7.00000000000,R1,2030,R1,residential,heatpump,newcapa,2040 @@ -33,9 +33,9 @@ A1,14.00000000000,R1,2035,R1,residential,heatpump,newcapa,2040 A1,3.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2040 A1,4.00000000000,R1,2030,R1,power,windturbine,newcapa,2040 A1,10.00000000000,R1,2035,R1,power,windturbine,newcapa,2040 -A1,11.63810000000,R1,2020,R1,gas,gassupply1,newcapa,2040 -A1,12.51020000000,R1,2025,R1,gas,gassupply1,newcapa,2040 -A1,10.02210000000,R1,2030,R1,gas,gassupply1,newcapa,2040 +A1,10.33930000000,R1,2020,R1,gas,gassupply1,newcapa,2040 +A1,12.88130000000,R1,2025,R1,gas,gassupply1,newcapa,2040 +A1,10.83330000000,R1,2030,R1,gas,gassupply1,newcapa,2040 A1,14.00000000000,R1,2035,R1,residential,gasstove,newcapa,2045 A1,10.00000000000,R1,2040,R1,residential,gasstove,newcapa,2045 A1,14.00000000000,R1,2035,R1,residential,heatpump,newcapa,2045 @@ -44,9 +44,9 @@ A1,3.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2045 A1,4.00000000000,R1,2030,R1,power,windturbine,newcapa,2045 A1,10.00000000000,R1,2035,R1,power,windturbine,newcapa,2045 A1,3.00000000000,R1,2040,R1,power,windturbine,newcapa,2045 -A1,11.63810000000,R1,2020,R1,gas,gassupply1,newcapa,2045 -A1,12.51020000000,R1,2025,R1,gas,gassupply1,newcapa,2045 -A1,10.02210000000,R1,2030,R1,gas,gassupply1,newcapa,2045 +A1,10.33930000000,R1,2020,R1,gas,gassupply1,newcapa,2045 +A1,12.88130000000,R1,2025,R1,gas,gassupply1,newcapa,2045 +A1,10.83330000000,R1,2030,R1,gas,gassupply1,newcapa,2045 A1,10.00000000000,R1,2040,R1,residential,gasstove,newcapa,2050 A1,17.00000000000,R1,2045,R1,residential,gasstove,newcapa,2050 A1,10.00000000000,R1,2040,R1,residential,heatpump,newcapa,2050 @@ -56,7 +56,7 @@ A1,4.00000000000,R1,2030,R1,power,windturbine,newcapa,2050 A1,10.00000000000,R1,2035,R1,power,windturbine,newcapa,2050 A1,3.00000000000,R1,2040,R1,power,windturbine,newcapa,2050 A1,3.00000000000,R1,2045,R1,power,windturbine,newcapa,2050 -A1,11.63810000000,R1,2020,R1,gas,gassupply1,newcapa,2050 -A1,12.51020000000,R1,2025,R1,gas,gassupply1,newcapa,2050 -A1,10.02210000000,R1,2030,R1,gas,gassupply1,newcapa,2050 -A1,0.88640000000,R1,2045,R1,gas,gassupply1,newcapa,2050 +A1,10.33930000000,R1,2020,R1,gas,gassupply1,newcapa,2050 +A1,12.88130000000,R1,2025,R1,gas,gassupply1,newcapa,2050 +A1,10.83330000000,R1,2030,R1,gas,gassupply1,newcapa,2050 +A1,0.95610000000,R1,2045,R1,gas,gassupply1,newcapa,2050 diff --git a/tests/example_outputs/minimum_service/MCASupply.csv b/tests/example_outputs/minimum_service/MCASupply.csv index 099a575b8..504d560dd 100644 --- a/tests/example_outputs/minimum_service/MCASupply.csv +++ b/tests/example_outputs/minimum_service/MCASupply.csv @@ -1,10 +1,10 @@ commodity,day,hour,month,region,supply,timeslice,units_prices,year -ammonia,all-week,all-day,winter,R1,14.58600000000,0,MUS$2010/Mt,2010 -CO2f,all-week,all-day,winter,R1,53092.27940000000,0,MUS$2010/kt,2010 -ammonia,all-week,all-day,summer,R1,15.02800000000,1,MUS$2010/Mt,2010 -CO2f,all-week,all-day,summer,R1,54701.13630000000,1,MUS$2010/kt,2010 -ammonia,all-week,all-day,spring-autumn,R1,14.58600000000,2,MUS$2010/Mt,2010 -CO2f,all-week,all-day,spring-autumn,R1,53092.27940000000,2,MUS$2010/kt,2010 +ammonia,all-week,all-day,winter,R1,14.73330000000,0,MUS$2010/Mt,2010 +CO2f,all-week,all-day,winter,R1,53628.56500000000,0,MUS$2010/kt,2010 +ammonia,all-week,all-day,summer,R1,14.73330000000,1,MUS$2010/Mt,2010 +CO2f,all-week,all-day,summer,R1,53628.56500000000,1,MUS$2010/kt,2010 +ammonia,all-week,all-day,spring-autumn,R1,14.73330000000,2,MUS$2010/Mt,2010 +CO2f,all-week,all-day,spring-autumn,R1,53628.56500000000,2,MUS$2010/kt,2010 ammonia,all-week,all-day,winter,R1,14.92000000000,0,MUS$2010/Mt,2015 CO2f,all-week,all-day,winter,R1,55113.51750000000,0,MUS$2010/kt,2015 ammonia,all-week,all-day,summer,R1,15.37220000000,1,MUS$2010/Mt,2015 diff --git a/tests/example_outputs/multiple_agents/MCACapacity.csv b/tests/example_outputs/multiple_agents/MCACapacity.csv index 2258c64d7..196ce9360 100644 --- a/tests/example_outputs/multiple_agents/MCACapacity.csv +++ b/tests/example_outputs/multiple_agents/MCACapacity.csv @@ -9,7 +9,7 @@ A2,2.50000000000,R1,2020,R1,residential,gasboiler,newcapa,2025 A2,9.50000000000,R1,2020,R1,residential,heatpump,newcapa,2025 A1,6.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2025 A1,5.00000000000,R1,2020,R1,power,windturbine,newcapa,2025 -A1,16.73530000000,R1,2020,R1,gas,gassupply1,newcapa,2025 +A1,16.46440000000,R1,2020,R1,gas,gassupply1,newcapa,2025 A1,9.50000000000,R1,2020,R1,residential,heatpump,newcapa,2030 A1,5.50000000000,R1,2025,R1,residential,heatpump,newcapa,2030 A2,9.50000000000,R1,2020,R1,residential,heatpump,newcapa,2030 @@ -17,8 +17,8 @@ A2,5.50000000000,R1,2025,R1,residential,heatpump,newcapa,2030 A1,5.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2030 A1,6.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2030 A1,5.00000000000,R1,2020,R1,power,windturbine,newcapa,2030 -A1,9.23530000000,R1,2020,R1,gas,gassupply1,newcapa,2030 -A1,9.28910000000,R1,2025,R1,gas,gassupply1,newcapa,2030 +A1,8.96440000000,R1,2020,R1,gas,gassupply1,newcapa,2030 +A1,9.40560000000,R1,2025,R1,gas,gassupply1,newcapa,2030 A1,5.50000000000,R1,2025,R1,residential,heatpump,newcapa,2035 A1,12.50000000000,R1,2030,R1,residential,heatpump,newcapa,2035 A2,5.50000000000,R1,2025,R1,residential,heatpump,newcapa,2035 @@ -27,9 +27,9 @@ A1,5.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2035 A1,6.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2035 A1,5.00000000000,R1,2020,R1,power,windturbine,newcapa,2035 A1,6.00000000000,R1,2030,R1,power,windturbine,newcapa,2035 -A1,1.73530000000,R1,2020,R1,gas,gassupply1,newcapa,2035 -A1,9.28910000000,R1,2025,R1,gas,gassupply1,newcapa,2035 -A1,7.47410000000,R1,2030,R1,gas,gassupply1,newcapa,2035 +A1,1.46440000000,R1,2020,R1,gas,gassupply1,newcapa,2035 +A1,9.40560000000,R1,2025,R1,gas,gassupply1,newcapa,2035 +A1,7.50000000000,R1,2030,R1,gas,gassupply1,newcapa,2035 A1,12.50000000000,R1,2030,R1,residential,heatpump,newcapa,2040 A1,8.50000000000,R1,2035,R1,residential,heatpump,newcapa,2040 A2,12.50000000000,R1,2030,R1,residential,heatpump,newcapa,2040 @@ -39,9 +39,9 @@ A1,6.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2040 A1,5.00000000000,R1,2020,R1,power,windturbine,newcapa,2040 A1,6.00000000000,R1,2030,R1,power,windturbine,newcapa,2040 A1,6.00000000000,R1,2035,R1,power,windturbine,newcapa,2040 -A1,1.73530000000,R1,2020,R1,gas,gassupply1,newcapa,2040 -A1,9.28910000000,R1,2025,R1,gas,gassupply1,newcapa,2040 -A1,7.47410000000,R1,2030,R1,gas,gassupply1,newcapa,2040 +A1,1.46440000000,R1,2020,R1,gas,gassupply1,newcapa,2040 +A1,9.40560000000,R1,2025,R1,gas,gassupply1,newcapa,2040 +A1,7.50000000000,R1,2030,R1,gas,gassupply1,newcapa,2040 A1,8.50000000000,R1,2035,R1,residential,heatpump,newcapa,2045 A1,15.50000000000,R1,2040,R1,residential,heatpump,newcapa,2045 A2,8.50000000000,R1,2035,R1,residential,heatpump,newcapa,2045 @@ -52,9 +52,9 @@ A1,5.00000000000,R1,2020,R1,power,windturbine,newcapa,2045 A1,6.00000000000,R1,2030,R1,power,windturbine,newcapa,2045 A1,6.00000000000,R1,2035,R1,power,windturbine,newcapa,2045 A1,6.00000000000,R1,2040,R1,power,windturbine,newcapa,2045 -A1,1.73530000000,R1,2020,R1,gas,gassupply1,newcapa,2045 -A1,9.28910000000,R1,2025,R1,gas,gassupply1,newcapa,2045 -A1,7.47410000000,R1,2030,R1,gas,gassupply1,newcapa,2045 +A1,1.46440000000,R1,2020,R1,gas,gassupply1,newcapa,2045 +A1,9.40560000000,R1,2025,R1,gas,gassupply1,newcapa,2045 +A1,7.50000000000,R1,2030,R1,gas,gassupply1,newcapa,2045 A1,15.50000000000,R1,2040,R1,residential,heatpump,newcapa,2050 A1,11.50000000000,R1,2045,R1,residential,heatpump,newcapa,2050 A2,15.50000000000,R1,2040,R1,residential,heatpump,newcapa,2050 @@ -65,6 +65,6 @@ A1,6.00000000000,R1,2030,R1,power,windturbine,newcapa,2050 A1,6.00000000000,R1,2035,R1,power,windturbine,newcapa,2050 A1,6.00000000000,R1,2040,R1,power,windturbine,newcapa,2050 A1,11.00000000000,R1,2045,R1,power,windturbine,newcapa,2050 -A1,1.73530000000,R1,2020,R1,gas,gassupply1,newcapa,2050 -A1,9.28910000000,R1,2025,R1,gas,gassupply1,newcapa,2050 -A1,7.47410000000,R1,2030,R1,gas,gassupply1,newcapa,2050 +A1,1.46440000000,R1,2020,R1,gas,gassupply1,newcapa,2050 +A1,9.40560000000,R1,2025,R1,gas,gassupply1,newcapa,2050 +A1,7.50000000000,R1,2030,R1,gas,gassupply1,newcapa,2050 From 333f147c2cafc998c3f45511b9ca5e6ba1a64814 Mon Sep 17 00:00:00 2001 From: Tom Bland Date: Thu, 17 Oct 2024 19:06:52 +0100 Subject: [PATCH 08/18] Fix minimum_production function --- src/muse/quantities.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/muse/quantities.py b/src/muse/quantities.py index 42887c7c7..bc4dd27a0 100644 --- a/src/muse/quantities.py +++ b/src/muse/quantities.py @@ -559,6 +559,7 @@ def minimum_production(technologies: xr.Dataset, capacity: xr.DataArray, **filte the filters and the set of technologies in `capacity`. """ from muse.commodities import is_enduse + from muse.timeslices import TIMESLICE, QuantityType, convert_timeslice from muse.utilities import broadcast_techs, filter_input capa = filter_input( @@ -578,7 +579,11 @@ def minimum_production(technologies: xr.Dataset, capacity: xr.DataArray, **filte 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 + * convert_timeslice(ftechs.fixed_outputs, TIMESLICE, QuantityType.EXTENSIVE) + * ftechs.minimum_service_factor + ) return result.where(is_enduse(result.comm_usage), 0) From 268877abb586df86e794edfd047b1cf3147e2a05 Mon Sep 17 00:00:00 2001 From: Tom Bland Date: Thu, 17 Oct 2024 19:12:19 +0100 Subject: [PATCH 09/18] Update results files --- .../1-min-constraint/Results/MCACapacity.csv | 8 +- .../1-min-constraint/Results/MCAPrices.csv | 24 +- .../1-min-constraint/Results/Power_Supply.csv | 278 ++++++------ .../2-max-constraint/Results/MCACapacity.csv | 63 ++- .../2-max-constraint/Results/MCAPrices.csv | 124 ++--- .../2-max-constraint/Results/Power_Supply.csv | 424 +++++++----------- .../min-max-timeslice-constraints.ipynb | 8 +- .../default_timeslice/MCAPrices.csv | 20 +- .../default_timeslice/Power_Supply.csv | 256 ++++++----- 9 files changed, 549 insertions(+), 656 deletions(-) diff --git a/docs/tutorial-code/min-max-timeslice-constraints/1-min-constraint/Results/MCACapacity.csv b/docs/tutorial-code/min-max-timeslice-constraints/1-min-constraint/Results/MCACapacity.csv index bfd4187ff..bbba70582 100644 --- a/docs/tutorial-code/min-max-timeslice-constraints/1-min-constraint/Results/MCACapacity.csv +++ b/docs/tutorial-code/min-max-timeslice-constraints/1-min-constraint/Results/MCACapacity.csv @@ -6,23 +6,25 @@ A1,5.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2025 A1,19.00000000000,R1,2020,R1,residential,heatpump,newcapa,2025 A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2025 A1,6.00000000000,R1,2020,R1,power,windturbine,newcapa,2025 -A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2025 +A1,15.42960000000,R1,2020,R1,gas,gassupply1,newcapa,2025 A1,19.00000000000,R1,2020,R1,residential,heatpump,newcapa,2030 A1,10.00000000000,R1,2025,R1,residential,heatpump,newcapa,2030 A1,6.00000000000,R1,2020,R1,power,windturbine,newcapa,2030 A1,5.00000000000,R1,2025,R1,power,windturbine,newcapa,2030 -A1,7.50000000000,R1,2020,R1,gas,gassupply1,newcapa,2030 +A1,7.92960000000,R1,2020,R1,gas,gassupply1,newcapa,2030 A1,10.00000000000,R1,2025,R1,residential,heatpump,newcapa,2035 A1,26.00000000000,R1,2030,R1,residential,heatpump,newcapa,2035 A1,6.00000000000,R1,2020,R1,power,windturbine,newcapa,2035 A1,5.00000000000,R1,2025,R1,power,windturbine,newcapa,2035 A1,3.00000000000,R1,2030,R1,power,windturbine,newcapa,2035 +A1,0.42960000000,R1,2020,R1,gas,gassupply1,newcapa,2035 A1,26.00000000000,R1,2030,R1,residential,heatpump,newcapa,2040 A1,16.00000000000,R1,2035,R1,residential,heatpump,newcapa,2040 A1,6.00000000000,R1,2020,R1,power,windturbine,newcapa,2040 A1,5.00000000000,R1,2025,R1,power,windturbine,newcapa,2040 A1,3.00000000000,R1,2030,R1,power,windturbine,newcapa,2040 A1,2.00000000000,R1,2035,R1,power,windturbine,newcapa,2040 +A1,0.42960000000,R1,2020,R1,gas,gassupply1,newcapa,2040 A1,16.00000000000,R1,2035,R1,residential,heatpump,newcapa,2045 A1,32.00000000000,R1,2040,R1,residential,heatpump,newcapa,2045 A1,6.00000000000,R1,2020,R1,power,windturbine,newcapa,2045 @@ -30,6 +32,7 @@ A1,5.00000000000,R1,2025,R1,power,windturbine,newcapa,2045 A1,3.00000000000,R1,2030,R1,power,windturbine,newcapa,2045 A1,2.00000000000,R1,2035,R1,power,windturbine,newcapa,2045 A1,3.00000000000,R1,2040,R1,power,windturbine,newcapa,2045 +A1,0.42960000000,R1,2020,R1,gas,gassupply1,newcapa,2045 A1,32.00000000000,R1,2040,R1,residential,heatpump,newcapa,2050 A1,22.00000000000,R1,2045,R1,residential,heatpump,newcapa,2050 A1,5.00000000000,R1,2025,R1,power,windturbine,newcapa,2050 @@ -37,3 +40,4 @@ A1,3.00000000000,R1,2030,R1,power,windturbine,newcapa,2050 A1,2.00000000000,R1,2035,R1,power,windturbine,newcapa,2050 A1,3.00000000000,R1,2040,R1,power,windturbine,newcapa,2050 A1,8.00000000000,R1,2045,R1,power,windturbine,newcapa,2050 +A1,0.42960000000,R1,2020,R1,gas,gassupply1,newcapa,2050 diff --git a/docs/tutorial-code/min-max-timeslice-constraints/1-min-constraint/Results/MCAPrices.csv b/docs/tutorial-code/min-max-timeslice-constraints/1-min-constraint/Results/MCAPrices.csv index 3f68ede79..0ec153c2b 100644 --- a/docs/tutorial-code/min-max-timeslice-constraints/1-min-constraint/Results/MCAPrices.csv +++ b/docs/tutorial-code/min-max-timeslice-constraints/1-min-constraint/Results/MCAPrices.csv @@ -23,29 +23,29 @@ electricity,all-week,evening,all-year,19.50000000000,R1,5,MUS$2010/PJ,2020 gas,all-week,evening,all-year,7.15280000000,R1,5,MUS$2010/PJ,2020 heat,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.08310000000,R1,5,MUS$2010/kt,2020 -electricity,all-week,night,all-year,1.57770000000,R1,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,4.77400000000,R1,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,2.76300000000,R1,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,4.89340000000,R1,0,MUS$2010/PJ,2025 CO2f,all-week,night,all-year,0.12010000000,R1,0,MUS$2010/kt,2025 -electricity,all-week,morning,all-year,1.88140000000,R1,1,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,5.56230000000,R1,1,MUS$2010/PJ,2025 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,2.96540000000,R1,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,5.41880000000,R1,1,MUS$2010/PJ,2025 CO2f,all-week,morning,all-year,0.12010000000,R1,1,MUS$2010/kt,2025 -electricity,all-week,afternoon,all-year,3.39980000000,R1,2,MUS$2010/PJ,2025 +electricity,all-week,afternoon,all-year,7.86470000000,R1,2,MUS$2010/PJ,2025 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2025 -heat,all-week,afternoon,all-year,3.97750000000,R1,2,MUS$2010/PJ,2025 +heat,all-week,afternoon,all-year,6.95350000000,R1,2,MUS$2010/PJ,2025 CO2f,all-week,afternoon,all-year,0.12010000000,R1,2,MUS$2010/kt,2025 -electricity,all-week,early-peak,all-year,1.88140000000,R1,3,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,5.56230000000,R1,3,MUS$2010/PJ,2025 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,2.96540000000,R1,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,5.41880000000,R1,3,MUS$2010/PJ,2025 CO2f,all-week,early-peak,all-year,0.12010000000,R1,3,MUS$2010/kt,2025 -electricity,all-week,late-peak,all-year,3.09610000000,R1,4,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,5.79540000000,R1,4,MUS$2010/PJ,2025 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,3.77510000000,R1,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,5.57420000000,R1,4,MUS$2010/PJ,2025 CO2f,all-week,late-peak,all-year,0.12010000000,R1,4,MUS$2010/kt,2025 -electricity,all-week,evening,all-year,2.94420000000,R1,5,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,7.36100000000,R1,5,MUS$2010/PJ,2025 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,3.67380000000,R1,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,6.61770000000,R1,5,MUS$2010/PJ,2025 CO2f,all-week,evening,all-year,0.12010000000,R1,5,MUS$2010/kt,2025 electricity,all-week,night,all-year,0.66670000000,R1,0,MUS$2010/PJ,2030 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2030 diff --git a/docs/tutorial-code/min-max-timeslice-constraints/1-min-constraint/Results/Power_Supply.csv b/docs/tutorial-code/min-max-timeslice-constraints/1-min-constraint/Results/Power_Supply.csv index 8356fca63..b1cfbdf0f 100644 --- a/docs/tutorial-code/min-max-timeslice-constraints/1-min-constraint/Results/Power_Supply.csv +++ b/docs/tutorial-code/min-max-timeslice-constraints/1-min-constraint/Results/Power_Supply.csv @@ -1,145 +1,133 @@ -asset,comm_usage,commodity,day,hour,installed,month,region,supply,technology,timeslice,year -0,10,electricity,all-week,night,2020,all-year,R1,0.03330000000,gasCCGT,0,2020 -0,6,CO2f,all-week,night,2020,all-year,R1,3.05570000000,gasCCGT,0,2020 -0,10,electricity,all-week,morning,2020,all-year,R1,0.06670000000,gasCCGT,1,2020 -0,6,CO2f,all-week,morning,2020,all-year,R1,6.11130000000,gasCCGT,1,2020 -0,10,electricity,all-week,afternoon,2020,all-year,R1,0.10000000000,gasCCGT,2,2020 -0,6,CO2f,all-week,afternoon,2020,all-year,R1,9.16700000000,gasCCGT,2,2020 -0,10,electricity,all-week,early-peak,2020,all-year,R1,0.06670000000,gasCCGT,3,2020 -0,6,CO2f,all-week,early-peak,2020,all-year,R1,6.11130000000,gasCCGT,3,2020 -0,10,electricity,all-week,late-peak,2020,all-year,R1,0.13330000000,gasCCGT,4,2020 -0,6,CO2f,all-week,late-peak,2020,all-year,R1,12.22270000000,gasCCGT,4,2020 -0,10,electricity,all-week,evening,2020,all-year,R1,0.16670000000,gasCCGT,5,2020 -0,6,CO2f,all-week,evening,2020,all-year,R1,15.27830000000,gasCCGT,5,2020 -0,10,electricity,all-week,night,2020,all-year,R1,0.03330000000,gasCCGT,0,2025 -0,6,CO2f,all-week,night,2020,all-year,R1,3.05570000000,gasCCGT,0,2025 -0,10,electricity,all-week,morning,2020,all-year,R1,0.06670000000,gasCCGT,1,2025 -0,6,CO2f,all-week,morning,2020,all-year,R1,6.11130000000,gasCCGT,1,2025 -0,10,electricity,all-week,afternoon,2020,all-year,R1,0.10000000000,gasCCGT,2,2025 -0,6,CO2f,all-week,afternoon,2020,all-year,R1,9.16700000000,gasCCGT,2,2025 -0,10,electricity,all-week,early-peak,2020,all-year,R1,0.06670000000,gasCCGT,3,2025 -0,6,CO2f,all-week,early-peak,2020,all-year,R1,6.11130000000,gasCCGT,3,2025 -0,10,electricity,all-week,late-peak,2020,all-year,R1,0.26670000000,gasCCGT,4,2025 -0,6,CO2f,all-week,late-peak,2020,all-year,R1,24.44530000000,gasCCGT,4,2025 -0,10,electricity,all-week,evening,2020,all-year,R1,0.16670000000,gasCCGT,5,2025 -0,6,CO2f,all-week,evening,2020,all-year,R1,15.27830000000,gasCCGT,5,2025 -1,10,electricity,all-week,night,2020,all-year,R1,0.38890000000,windturbine,0,2025 -1,10,electricity,all-week,morning,2020,all-year,R1,0.56670000000,windturbine,1,2025 -1,10,electricity,all-week,afternoon,2020,all-year,R1,0.32220000000,windturbine,2,2025 -1,10,electricity,all-week,early-peak,2020,all-year,R1,0.56670000000,windturbine,3,2025 -1,10,electricity,all-week,late-peak,2020,all-year,R1,1.00000000000,windturbine,4,2025 -1,10,electricity,all-week,evening,2020,all-year,R1,0.67780000000,windturbine,5,2025 -1,10,electricity,all-week,night,2020,all-year,R1,0.36360000000,windturbine,0,2030 -1,10,electricity,all-week,morning,2020,all-year,R1,0.54550000000,windturbine,1,2030 -1,10,electricity,all-week,afternoon,2020,all-year,R1,0.36360000000,windturbine,2,2030 -1,10,electricity,all-week,early-peak,2020,all-year,R1,0.54550000000,windturbine,3,2030 -1,10,electricity,all-week,late-peak,2020,all-year,R1,1.00000000000,windturbine,4,2030 -1,10,electricity,all-week,evening,2020,all-year,R1,0.72730000000,windturbine,5,2030 -2,10,electricity,all-week,night,2025,all-year,R1,0.30300000000,windturbine,0,2030 -2,10,electricity,all-week,morning,2025,all-year,R1,0.45450000000,windturbine,1,2030 -2,10,electricity,all-week,afternoon,2025,all-year,R1,0.30300000000,windturbine,2,2030 -2,10,electricity,all-week,early-peak,2025,all-year,R1,0.45450000000,windturbine,3,2030 -2,10,electricity,all-week,late-peak,2025,all-year,R1,0.83330000000,windturbine,4,2030 -2,10,electricity,all-week,evening,2025,all-year,R1,0.60610000000,windturbine,5,2030 -1,10,electricity,all-week,night,2020,all-year,R1,0.34290000000,windturbine,0,2035 -1,10,electricity,all-week,morning,2020,all-year,R1,0.51430000000,windturbine,1,2035 -1,10,electricity,all-week,afternoon,2020,all-year,R1,0.34290000000,windturbine,2,2035 -1,10,electricity,all-week,early-peak,2020,all-year,R1,0.51430000000,windturbine,3,2035 -1,10,electricity,all-week,late-peak,2020,all-year,R1,1.00000000000,windturbine,4,2035 -1,10,electricity,all-week,evening,2020,all-year,R1,0.68570000000,windturbine,5,2035 -2,10,electricity,all-week,night,2025,all-year,R1,0.28570000000,windturbine,0,2035 -2,10,electricity,all-week,morning,2025,all-year,R1,0.42860000000,windturbine,1,2035 -2,10,electricity,all-week,afternoon,2025,all-year,R1,0.28570000000,windturbine,2,2035 -2,10,electricity,all-week,early-peak,2025,all-year,R1,0.42860000000,windturbine,3,2035 -2,10,electricity,all-week,late-peak,2025,all-year,R1,0.83330000000,windturbine,4,2035 -2,10,electricity,all-week,evening,2025,all-year,R1,0.57140000000,windturbine,5,2035 -3,10,electricity,all-week,night,2030,all-year,R1,0.17140000000,windturbine,0,2035 -3,10,electricity,all-week,morning,2030,all-year,R1,0.25710000000,windturbine,1,2035 -3,10,electricity,all-week,afternoon,2030,all-year,R1,0.17140000000,windturbine,2,2035 -3,10,electricity,all-week,early-peak,2030,all-year,R1,0.25710000000,windturbine,3,2035 -3,10,electricity,all-week,late-peak,2030,all-year,R1,0.50000000000,windturbine,4,2035 -3,10,electricity,all-week,evening,2030,all-year,R1,0.34290000000,windturbine,5,2035 -1,10,electricity,all-week,night,2020,all-year,R1,0.35000000000,windturbine,0,2040 -1,10,electricity,all-week,morning,2020,all-year,R1,0.52500000000,windturbine,1,2040 -1,10,electricity,all-week,afternoon,2020,all-year,R1,0.35000000000,windturbine,2,2040 -1,10,electricity,all-week,early-peak,2020,all-year,R1,0.52500000000,windturbine,3,2040 -1,10,electricity,all-week,late-peak,2020,all-year,R1,1.00000000000,windturbine,4,2040 -1,10,electricity,all-week,evening,2020,all-year,R1,0.70000000000,windturbine,5,2040 -2,10,electricity,all-week,night,2025,all-year,R1,0.29170000000,windturbine,0,2040 -2,10,electricity,all-week,morning,2025,all-year,R1,0.43750000000,windturbine,1,2040 -2,10,electricity,all-week,afternoon,2025,all-year,R1,0.29170000000,windturbine,2,2040 -2,10,electricity,all-week,early-peak,2025,all-year,R1,0.43750000000,windturbine,3,2040 -2,10,electricity,all-week,late-peak,2025,all-year,R1,0.83330000000,windturbine,4,2040 -2,10,electricity,all-week,evening,2025,all-year,R1,0.58330000000,windturbine,5,2040 -3,10,electricity,all-week,night,2030,all-year,R1,0.17500000000,windturbine,0,2040 -3,10,electricity,all-week,morning,2030,all-year,R1,0.26250000000,windturbine,1,2040 -3,10,electricity,all-week,afternoon,2030,all-year,R1,0.17500000000,windturbine,2,2040 -3,10,electricity,all-week,early-peak,2030,all-year,R1,0.26250000000,windturbine,3,2040 -3,10,electricity,all-week,late-peak,2030,all-year,R1,0.50000000000,windturbine,4,2040 -3,10,electricity,all-week,evening,2030,all-year,R1,0.35000000000,windturbine,5,2040 -4,10,electricity,all-week,night,2035,all-year,R1,0.11670000000,windturbine,0,2040 -4,10,electricity,all-week,morning,2035,all-year,R1,0.17500000000,windturbine,1,2040 -4,10,electricity,all-week,afternoon,2035,all-year,R1,0.11670000000,windturbine,2,2040 -4,10,electricity,all-week,early-peak,2035,all-year,R1,0.17500000000,windturbine,3,2040 -4,10,electricity,all-week,late-peak,2035,all-year,R1,0.33330000000,windturbine,4,2040 -4,10,electricity,all-week,evening,2035,all-year,R1,0.23330000000,windturbine,5,2040 -1,10,electricity,all-week,night,2020,all-year,R1,0.33680000000,windturbine,0,2045 -1,10,electricity,all-week,morning,2020,all-year,R1,0.50530000000,windturbine,1,2045 -1,10,electricity,all-week,afternoon,2020,all-year,R1,0.33680000000,windturbine,2,2045 -1,10,electricity,all-week,early-peak,2020,all-year,R1,0.50530000000,windturbine,3,2045 -1,10,electricity,all-week,late-peak,2020,all-year,R1,1.00000000000,windturbine,4,2045 -1,10,electricity,all-week,evening,2020,all-year,R1,0.67370000000,windturbine,5,2045 -2,10,electricity,all-week,night,2025,all-year,R1,0.28070000000,windturbine,0,2045 -2,10,electricity,all-week,morning,2025,all-year,R1,0.42110000000,windturbine,1,2045 -2,10,electricity,all-week,afternoon,2025,all-year,R1,0.28070000000,windturbine,2,2045 -2,10,electricity,all-week,early-peak,2025,all-year,R1,0.42110000000,windturbine,3,2045 -2,10,electricity,all-week,late-peak,2025,all-year,R1,0.83330000000,windturbine,4,2045 -2,10,electricity,all-week,evening,2025,all-year,R1,0.56140000000,windturbine,5,2045 -3,10,electricity,all-week,night,2030,all-year,R1,0.16840000000,windturbine,0,2045 -3,10,electricity,all-week,morning,2030,all-year,R1,0.25260000000,windturbine,1,2045 -3,10,electricity,all-week,afternoon,2030,all-year,R1,0.16840000000,windturbine,2,2045 -3,10,electricity,all-week,early-peak,2030,all-year,R1,0.25260000000,windturbine,3,2045 -3,10,electricity,all-week,late-peak,2030,all-year,R1,0.50000000000,windturbine,4,2045 -3,10,electricity,all-week,evening,2030,all-year,R1,0.33680000000,windturbine,5,2045 -4,10,electricity,all-week,night,2035,all-year,R1,0.11230000000,windturbine,0,2045 -4,10,electricity,all-week,morning,2035,all-year,R1,0.16840000000,windturbine,1,2045 -4,10,electricity,all-week,afternoon,2035,all-year,R1,0.11230000000,windturbine,2,2045 -4,10,electricity,all-week,early-peak,2035,all-year,R1,0.16840000000,windturbine,3,2045 -4,10,electricity,all-week,late-peak,2035,all-year,R1,0.33330000000,windturbine,4,2045 -4,10,electricity,all-week,evening,2035,all-year,R1,0.22460000000,windturbine,5,2045 -5,10,electricity,all-week,night,2040,all-year,R1,0.16840000000,windturbine,0,2045 -5,10,electricity,all-week,morning,2040,all-year,R1,0.25260000000,windturbine,1,2045 -5,10,electricity,all-week,afternoon,2040,all-year,R1,0.16840000000,windturbine,2,2045 -5,10,electricity,all-week,early-peak,2040,all-year,R1,0.25260000000,windturbine,3,2045 -5,10,electricity,all-week,late-peak,2040,all-year,R1,0.50000000000,windturbine,4,2045 -5,10,electricity,all-week,evening,2040,all-year,R1,0.33680000000,windturbine,5,2045 -2,10,electricity,all-week,night,2025,all-year,R1,0.28570000000,windturbine,0,2050 -2,10,electricity,all-week,morning,2025,all-year,R1,0.42860000000,windturbine,1,2050 -2,10,electricity,all-week,afternoon,2025,all-year,R1,0.28570000000,windturbine,2,2050 -2,10,electricity,all-week,early-peak,2025,all-year,R1,0.42860000000,windturbine,3,2050 -2,10,electricity,all-week,late-peak,2025,all-year,R1,0.83330000000,windturbine,4,2050 -2,10,electricity,all-week,evening,2025,all-year,R1,0.57140000000,windturbine,5,2050 -3,10,electricity,all-week,night,2030,all-year,R1,0.17140000000,windturbine,0,2050 -3,10,electricity,all-week,morning,2030,all-year,R1,0.25710000000,windturbine,1,2050 -3,10,electricity,all-week,afternoon,2030,all-year,R1,0.17140000000,windturbine,2,2050 -3,10,electricity,all-week,early-peak,2030,all-year,R1,0.25710000000,windturbine,3,2050 -3,10,electricity,all-week,late-peak,2030,all-year,R1,0.50000000000,windturbine,4,2050 -3,10,electricity,all-week,evening,2030,all-year,R1,0.34290000000,windturbine,5,2050 -4,10,electricity,all-week,night,2035,all-year,R1,0.11430000000,windturbine,0,2050 -4,10,electricity,all-week,morning,2035,all-year,R1,0.17140000000,windturbine,1,2050 -4,10,electricity,all-week,afternoon,2035,all-year,R1,0.11430000000,windturbine,2,2050 -4,10,electricity,all-week,early-peak,2035,all-year,R1,0.17140000000,windturbine,3,2050 -4,10,electricity,all-week,late-peak,2035,all-year,R1,0.33330000000,windturbine,4,2050 -4,10,electricity,all-week,evening,2035,all-year,R1,0.22860000000,windturbine,5,2050 -5,10,electricity,all-week,night,2040,all-year,R1,0.17140000000,windturbine,0,2050 -5,10,electricity,all-week,morning,2040,all-year,R1,0.25710000000,windturbine,1,2050 -5,10,electricity,all-week,afternoon,2040,all-year,R1,0.17140000000,windturbine,2,2050 -5,10,electricity,all-week,early-peak,2040,all-year,R1,0.25710000000,windturbine,3,2050 -5,10,electricity,all-week,late-peak,2040,all-year,R1,0.50000000000,windturbine,4,2050 -5,10,electricity,all-week,evening,2040,all-year,R1,0.34290000000,windturbine,5,2050 -6,10,electricity,all-week,night,2045,all-year,R1,0.45710000000,windturbine,0,2050 -6,10,electricity,all-week,morning,2045,all-year,R1,0.68570000000,windturbine,1,2050 -6,10,electricity,all-week,afternoon,2045,all-year,R1,0.45710000000,windturbine,2,2050 -6,10,electricity,all-week,early-peak,2045,all-year,R1,0.68570000000,windturbine,3,2050 -6,10,electricity,all-week,late-peak,2045,all-year,R1,1.33330000000,windturbine,4,2050 -6,10,electricity,all-week,evening,2045,all-year,R1,0.91430000000,windturbine,5,2050 +asset,comm_usage,commodity,day,hour,installed,month,region,supply,technology,timeslice,units_prices,year +0,10,electricity,all-week,night,2020,all-year,R1,0.20000000000,gasCCGT,0,MUS$2010/PJ,2025 +1,10,electricity,all-week,night,2020,all-year,R1,0.36190000000,windturbine,0,MUS$2010/PJ,2025 +0,6,CO2f,all-week,night,2020,all-year,R1,18.33400000000,gasCCGT,0,MUS$2010/kt,2025 +0,10,electricity,all-week,morning,2020,all-year,R1,0.40000000000,gasCCGT,1,MUS$2010/PJ,2025 +1,10,electricity,all-week,morning,2020,all-year,R1,0.54290000000,windturbine,1,MUS$2010/PJ,2025 +0,6,CO2f,all-week,morning,2020,all-year,R1,36.66800000000,gasCCGT,1,MUS$2010/kt,2025 +0,10,electricity,all-week,afternoon,2020,all-year,R1,0.60000000000,gasCCGT,2,MUS$2010/PJ,2025 +1,10,electricity,all-week,afternoon,2020,all-year,R1,0.36190000000,windturbine,2,MUS$2010/PJ,2025 +0,6,CO2f,all-week,afternoon,2020,all-year,R1,55.00200000000,gasCCGT,2,MUS$2010/kt,2025 +0,10,electricity,all-week,early-peak,2020,all-year,R1,0.40000000000,gasCCGT,3,MUS$2010/PJ,2025 +1,10,electricity,all-week,early-peak,2020,all-year,R1,0.54290000000,windturbine,3,MUS$2010/PJ,2025 +0,6,CO2f,all-week,early-peak,2020,all-year,R1,36.66800000000,gasCCGT,3,MUS$2010/kt,2025 +0,10,electricity,all-week,late-peak,2020,all-year,R1,0.80000000000,gasCCGT,4,MUS$2010/PJ,2025 +1,10,electricity,all-week,late-peak,2020,all-year,R1,1.00000000000,windturbine,4,MUS$2010/PJ,2025 +0,6,CO2f,all-week,late-peak,2020,all-year,R1,73.33600000000,gasCCGT,4,MUS$2010/kt,2025 +0,10,electricity,all-week,evening,2020,all-year,R1,1.00000000000,gasCCGT,5,MUS$2010/PJ,2025 +1,10,electricity,all-week,evening,2020,all-year,R1,0.72380000000,windturbine,5,MUS$2010/PJ,2025 +0,6,CO2f,all-week,evening,2020,all-year,R1,91.67000000000,gasCCGT,5,MUS$2010/kt,2025 +1,10,electricity,all-week,night,2020,all-year,R1,0.36360000000,windturbine,0,MUS$2010/PJ,2030 +2,10,electricity,all-week,night,2025,all-year,R1,0.30300000000,windturbine,0,MUS$2010/PJ,2030 +1,10,electricity,all-week,morning,2020,all-year,R1,0.54550000000,windturbine,1,MUS$2010/PJ,2030 +2,10,electricity,all-week,morning,2025,all-year,R1,0.45450000000,windturbine,1,MUS$2010/PJ,2030 +1,10,electricity,all-week,afternoon,2020,all-year,R1,0.36360000000,windturbine,2,MUS$2010/PJ,2030 +2,10,electricity,all-week,afternoon,2025,all-year,R1,0.30300000000,windturbine,2,MUS$2010/PJ,2030 +1,10,electricity,all-week,early-peak,2020,all-year,R1,0.54550000000,windturbine,3,MUS$2010/PJ,2030 +2,10,electricity,all-week,early-peak,2025,all-year,R1,0.45450000000,windturbine,3,MUS$2010/PJ,2030 +1,10,electricity,all-week,late-peak,2020,all-year,R1,1.00000000000,windturbine,4,MUS$2010/PJ,2030 +2,10,electricity,all-week,late-peak,2025,all-year,R1,0.83330000000,windturbine,4,MUS$2010/PJ,2030 +1,10,electricity,all-week,evening,2020,all-year,R1,0.72730000000,windturbine,5,MUS$2010/PJ,2030 +2,10,electricity,all-week,evening,2025,all-year,R1,0.60610000000,windturbine,5,MUS$2010/PJ,2030 +1,10,electricity,all-week,night,2020,all-year,R1,0.34290000000,windturbine,0,MUS$2010/PJ,2035 +2,10,electricity,all-week,night,2025,all-year,R1,0.28570000000,windturbine,0,MUS$2010/PJ,2035 +3,10,electricity,all-week,night,2030,all-year,R1,0.17140000000,windturbine,0,MUS$2010/PJ,2035 +1,10,electricity,all-week,morning,2020,all-year,R1,0.51430000000,windturbine,1,MUS$2010/PJ,2035 +2,10,electricity,all-week,morning,2025,all-year,R1,0.42860000000,windturbine,1,MUS$2010/PJ,2035 +3,10,electricity,all-week,morning,2030,all-year,R1,0.25710000000,windturbine,1,MUS$2010/PJ,2035 +1,10,electricity,all-week,afternoon,2020,all-year,R1,0.34290000000,windturbine,2,MUS$2010/PJ,2035 +2,10,electricity,all-week,afternoon,2025,all-year,R1,0.28570000000,windturbine,2,MUS$2010/PJ,2035 +3,10,electricity,all-week,afternoon,2030,all-year,R1,0.17140000000,windturbine,2,MUS$2010/PJ,2035 +1,10,electricity,all-week,early-peak,2020,all-year,R1,0.51430000000,windturbine,3,MUS$2010/PJ,2035 +2,10,electricity,all-week,early-peak,2025,all-year,R1,0.42860000000,windturbine,3,MUS$2010/PJ,2035 +3,10,electricity,all-week,early-peak,2030,all-year,R1,0.25710000000,windturbine,3,MUS$2010/PJ,2035 +1,10,electricity,all-week,late-peak,2020,all-year,R1,1.00000000000,windturbine,4,MUS$2010/PJ,2035 +2,10,electricity,all-week,late-peak,2025,all-year,R1,0.83330000000,windturbine,4,MUS$2010/PJ,2035 +3,10,electricity,all-week,late-peak,2030,all-year,R1,0.50000000000,windturbine,4,MUS$2010/PJ,2035 +1,10,electricity,all-week,evening,2020,all-year,R1,0.68570000000,windturbine,5,MUS$2010/PJ,2035 +2,10,electricity,all-week,evening,2025,all-year,R1,0.57140000000,windturbine,5,MUS$2010/PJ,2035 +3,10,electricity,all-week,evening,2030,all-year,R1,0.34290000000,windturbine,5,MUS$2010/PJ,2035 +1,10,electricity,all-week,night,2020,all-year,R1,0.35000000000,windturbine,0,MUS$2010/PJ,2040 +2,10,electricity,all-week,night,2025,all-year,R1,0.29170000000,windturbine,0,MUS$2010/PJ,2040 +3,10,electricity,all-week,night,2030,all-year,R1,0.17500000000,windturbine,0,MUS$2010/PJ,2040 +4,10,electricity,all-week,night,2035,all-year,R1,0.11670000000,windturbine,0,MUS$2010/PJ,2040 +1,10,electricity,all-week,morning,2020,all-year,R1,0.52500000000,windturbine,1,MUS$2010/PJ,2040 +2,10,electricity,all-week,morning,2025,all-year,R1,0.43750000000,windturbine,1,MUS$2010/PJ,2040 +3,10,electricity,all-week,morning,2030,all-year,R1,0.26250000000,windturbine,1,MUS$2010/PJ,2040 +4,10,electricity,all-week,morning,2035,all-year,R1,0.17500000000,windturbine,1,MUS$2010/PJ,2040 +1,10,electricity,all-week,afternoon,2020,all-year,R1,0.35000000000,windturbine,2,MUS$2010/PJ,2040 +2,10,electricity,all-week,afternoon,2025,all-year,R1,0.29170000000,windturbine,2,MUS$2010/PJ,2040 +3,10,electricity,all-week,afternoon,2030,all-year,R1,0.17500000000,windturbine,2,MUS$2010/PJ,2040 +4,10,electricity,all-week,afternoon,2035,all-year,R1,0.11670000000,windturbine,2,MUS$2010/PJ,2040 +1,10,electricity,all-week,early-peak,2020,all-year,R1,0.52500000000,windturbine,3,MUS$2010/PJ,2040 +2,10,electricity,all-week,early-peak,2025,all-year,R1,0.43750000000,windturbine,3,MUS$2010/PJ,2040 +3,10,electricity,all-week,early-peak,2030,all-year,R1,0.26250000000,windturbine,3,MUS$2010/PJ,2040 +4,10,electricity,all-week,early-peak,2035,all-year,R1,0.17500000000,windturbine,3,MUS$2010/PJ,2040 +1,10,electricity,all-week,late-peak,2020,all-year,R1,1.00000000000,windturbine,4,MUS$2010/PJ,2040 +2,10,electricity,all-week,late-peak,2025,all-year,R1,0.83330000000,windturbine,4,MUS$2010/PJ,2040 +3,10,electricity,all-week,late-peak,2030,all-year,R1,0.50000000000,windturbine,4,MUS$2010/PJ,2040 +4,10,electricity,all-week,late-peak,2035,all-year,R1,0.33330000000,windturbine,4,MUS$2010/PJ,2040 +1,10,electricity,all-week,evening,2020,all-year,R1,0.70000000000,windturbine,5,MUS$2010/PJ,2040 +2,10,electricity,all-week,evening,2025,all-year,R1,0.58330000000,windturbine,5,MUS$2010/PJ,2040 +3,10,electricity,all-week,evening,2030,all-year,R1,0.35000000000,windturbine,5,MUS$2010/PJ,2040 +4,10,electricity,all-week,evening,2035,all-year,R1,0.23330000000,windturbine,5,MUS$2010/PJ,2040 +1,10,electricity,all-week,night,2020,all-year,R1,0.33680000000,windturbine,0,MUS$2010/PJ,2045 +2,10,electricity,all-week,night,2025,all-year,R1,0.28070000000,windturbine,0,MUS$2010/PJ,2045 +3,10,electricity,all-week,night,2030,all-year,R1,0.16840000000,windturbine,0,MUS$2010/PJ,2045 +4,10,electricity,all-week,night,2035,all-year,R1,0.11230000000,windturbine,0,MUS$2010/PJ,2045 +5,10,electricity,all-week,night,2040,all-year,R1,0.16840000000,windturbine,0,MUS$2010/PJ,2045 +1,10,electricity,all-week,morning,2020,all-year,R1,0.50530000000,windturbine,1,MUS$2010/PJ,2045 +2,10,electricity,all-week,morning,2025,all-year,R1,0.42110000000,windturbine,1,MUS$2010/PJ,2045 +3,10,electricity,all-week,morning,2030,all-year,R1,0.25260000000,windturbine,1,MUS$2010/PJ,2045 +4,10,electricity,all-week,morning,2035,all-year,R1,0.16840000000,windturbine,1,MUS$2010/PJ,2045 +5,10,electricity,all-week,morning,2040,all-year,R1,0.25260000000,windturbine,1,MUS$2010/PJ,2045 +1,10,electricity,all-week,afternoon,2020,all-year,R1,0.33680000000,windturbine,2,MUS$2010/PJ,2045 +2,10,electricity,all-week,afternoon,2025,all-year,R1,0.28070000000,windturbine,2,MUS$2010/PJ,2045 +3,10,electricity,all-week,afternoon,2030,all-year,R1,0.16840000000,windturbine,2,MUS$2010/PJ,2045 +4,10,electricity,all-week,afternoon,2035,all-year,R1,0.11230000000,windturbine,2,MUS$2010/PJ,2045 +5,10,electricity,all-week,afternoon,2040,all-year,R1,0.16840000000,windturbine,2,MUS$2010/PJ,2045 +1,10,electricity,all-week,early-peak,2020,all-year,R1,0.50530000000,windturbine,3,MUS$2010/PJ,2045 +2,10,electricity,all-week,early-peak,2025,all-year,R1,0.42110000000,windturbine,3,MUS$2010/PJ,2045 +3,10,electricity,all-week,early-peak,2030,all-year,R1,0.25260000000,windturbine,3,MUS$2010/PJ,2045 +4,10,electricity,all-week,early-peak,2035,all-year,R1,0.16840000000,windturbine,3,MUS$2010/PJ,2045 +5,10,electricity,all-week,early-peak,2040,all-year,R1,0.25260000000,windturbine,3,MUS$2010/PJ,2045 +1,10,electricity,all-week,late-peak,2020,all-year,R1,1.00000000000,windturbine,4,MUS$2010/PJ,2045 +2,10,electricity,all-week,late-peak,2025,all-year,R1,0.83330000000,windturbine,4,MUS$2010/PJ,2045 +3,10,electricity,all-week,late-peak,2030,all-year,R1,0.50000000000,windturbine,4,MUS$2010/PJ,2045 +4,10,electricity,all-week,late-peak,2035,all-year,R1,0.33330000000,windturbine,4,MUS$2010/PJ,2045 +5,10,electricity,all-week,late-peak,2040,all-year,R1,0.50000000000,windturbine,4,MUS$2010/PJ,2045 +1,10,electricity,all-week,evening,2020,all-year,R1,0.67370000000,windturbine,5,MUS$2010/PJ,2045 +2,10,electricity,all-week,evening,2025,all-year,R1,0.56140000000,windturbine,5,MUS$2010/PJ,2045 +3,10,electricity,all-week,evening,2030,all-year,R1,0.33680000000,windturbine,5,MUS$2010/PJ,2045 +4,10,electricity,all-week,evening,2035,all-year,R1,0.22460000000,windturbine,5,MUS$2010/PJ,2045 +5,10,electricity,all-week,evening,2040,all-year,R1,0.33680000000,windturbine,5,MUS$2010/PJ,2045 +2,10,electricity,all-week,night,2025,all-year,R1,0.28570000000,windturbine,0,MUS$2010/PJ,2050 +3,10,electricity,all-week,night,2030,all-year,R1,0.17140000000,windturbine,0,MUS$2010/PJ,2050 +4,10,electricity,all-week,night,2035,all-year,R1,0.11430000000,windturbine,0,MUS$2010/PJ,2050 +5,10,electricity,all-week,night,2040,all-year,R1,0.17140000000,windturbine,0,MUS$2010/PJ,2050 +6,10,electricity,all-week,night,2045,all-year,R1,0.45710000000,windturbine,0,MUS$2010/PJ,2050 +2,10,electricity,all-week,morning,2025,all-year,R1,0.42860000000,windturbine,1,MUS$2010/PJ,2050 +3,10,electricity,all-week,morning,2030,all-year,R1,0.25710000000,windturbine,1,MUS$2010/PJ,2050 +4,10,electricity,all-week,morning,2035,all-year,R1,0.17140000000,windturbine,1,MUS$2010/PJ,2050 +5,10,electricity,all-week,morning,2040,all-year,R1,0.25710000000,windturbine,1,MUS$2010/PJ,2050 +6,10,electricity,all-week,morning,2045,all-year,R1,0.68570000000,windturbine,1,MUS$2010/PJ,2050 +2,10,electricity,all-week,afternoon,2025,all-year,R1,0.28570000000,windturbine,2,MUS$2010/PJ,2050 +3,10,electricity,all-week,afternoon,2030,all-year,R1,0.17140000000,windturbine,2,MUS$2010/PJ,2050 +4,10,electricity,all-week,afternoon,2035,all-year,R1,0.11430000000,windturbine,2,MUS$2010/PJ,2050 +5,10,electricity,all-week,afternoon,2040,all-year,R1,0.17140000000,windturbine,2,MUS$2010/PJ,2050 +6,10,electricity,all-week,afternoon,2045,all-year,R1,0.45710000000,windturbine,2,MUS$2010/PJ,2050 +2,10,electricity,all-week,early-peak,2025,all-year,R1,0.42860000000,windturbine,3,MUS$2010/PJ,2050 +3,10,electricity,all-week,early-peak,2030,all-year,R1,0.25710000000,windturbine,3,MUS$2010/PJ,2050 +4,10,electricity,all-week,early-peak,2035,all-year,R1,0.17140000000,windturbine,3,MUS$2010/PJ,2050 +5,10,electricity,all-week,early-peak,2040,all-year,R1,0.25710000000,windturbine,3,MUS$2010/PJ,2050 +6,10,electricity,all-week,early-peak,2045,all-year,R1,0.68570000000,windturbine,3,MUS$2010/PJ,2050 +2,10,electricity,all-week,late-peak,2025,all-year,R1,0.83330000000,windturbine,4,MUS$2010/PJ,2050 +3,10,electricity,all-week,late-peak,2030,all-year,R1,0.50000000000,windturbine,4,MUS$2010/PJ,2050 +4,10,electricity,all-week,late-peak,2035,all-year,R1,0.33330000000,windturbine,4,MUS$2010/PJ,2050 +5,10,electricity,all-week,late-peak,2040,all-year,R1,0.50000000000,windturbine,4,MUS$2010/PJ,2050 +6,10,electricity,all-week,late-peak,2045,all-year,R1,1.33330000000,windturbine,4,MUS$2010/PJ,2050 +2,10,electricity,all-week,evening,2025,all-year,R1,0.57140000000,windturbine,5,MUS$2010/PJ,2050 +3,10,electricity,all-week,evening,2030,all-year,R1,0.34290000000,windturbine,5,MUS$2010/PJ,2050 +4,10,electricity,all-week,evening,2035,all-year,R1,0.22860000000,windturbine,5,MUS$2010/PJ,2050 +5,10,electricity,all-week,evening,2040,all-year,R1,0.34290000000,windturbine,5,MUS$2010/PJ,2050 +6,10,electricity,all-week,evening,2045,all-year,R1,0.91430000000,windturbine,5,MUS$2010/PJ,2050 diff --git a/docs/tutorial-code/min-max-timeslice-constraints/2-max-constraint/Results/MCACapacity.csv b/docs/tutorial-code/min-max-timeslice-constraints/2-max-constraint/Results/MCACapacity.csv index d48ab6c91..3293c1b6a 100644 --- a/docs/tutorial-code/min-max-timeslice-constraints/2-max-constraint/Results/MCACapacity.csv +++ b/docs/tutorial-code/min-max-timeslice-constraints/2-max-constraint/Results/MCACapacity.csv @@ -2,59 +2,48 @@ agent,capacity,dst_region,installed,region,sector,technology,type,year A1,10.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2020 A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2020 A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2020 -A1,5.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2025 -A1,19.00000000000,R1,2020,R1,residential,heatpump,newcapa,2025 -A1,6.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2025 -A1,1.00000000000,R1,2020,R1,power,windturbine,newcapa,2025 -A1,18.69110000000,R1,2020,R1,gas,gassupply1,newcapa,2025 -A1,19.00000000000,R1,2020,R1,residential,heatpump,newcapa,2030 +A1,24.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2025 +A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2025 +A1,30.93330000000,R1,2020,R1,gas,gassupply1,newcapa,2025 +A1,19.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2030 A1,10.00000000000,R1,2025,R1,residential,heatpump,newcapa,2030 -A1,5.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2030 -A1,5.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2030 -A1,1.00000000000,R1,2020,R1,power,windturbine,newcapa,2030 -A1,11.19110000000,R1,2020,R1,gas,gassupply1,newcapa,2030 +A1,4.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2030 +A1,23.43330000000,R1,2020,R1,gas,gassupply1,newcapa,2030 A1,8.47780000000,R1,2025,R1,gas,gassupply1,newcapa,2030 A1,10.00000000000,R1,2025,R1,residential,heatpump,newcapa,2035 A1,26.00000000000,R1,2030,R1,residential,heatpump,newcapa,2035 -A1,5.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2035 -A1,5.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2035 -A1,3.00000000000,R1,2030,R1,power,gasCCGT,newcapa,2035 -A1,1.00000000000,R1,2020,R1,power,windturbine,newcapa,2035 -A1,3.69110000000,R1,2020,R1,gas,gassupply1,newcapa,2035 +A1,4.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2035 +A1,10.00000000000,R1,2030,R1,power,gasCCGT,newcapa,2035 +A1,15.93330000000,R1,2020,R1,gas,gassupply1,newcapa,2035 A1,8.47780000000,R1,2025,R1,gas,gassupply1,newcapa,2035 -A1,12.69560000000,R1,2030,R1,gas,gassupply1,newcapa,2035 +A1,1.56670000000,R1,2030,R1,gas,gassupply1,newcapa,2035 A1,26.00000000000,R1,2030,R1,residential,heatpump,newcapa,2040 A1,16.00000000000,R1,2035,R1,residential,heatpump,newcapa,2040 -A1,5.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2040 -A1,5.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2040 -A1,3.00000000000,R1,2030,R1,power,gasCCGT,newcapa,2040 +A1,4.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2040 +A1,10.00000000000,R1,2030,R1,power,gasCCGT,newcapa,2040 A1,2.00000000000,R1,2035,R1,power,gasCCGT,newcapa,2040 -A1,1.00000000000,R1,2020,R1,power,windturbine,newcapa,2040 -A1,3.69110000000,R1,2020,R1,gas,gassupply1,newcapa,2040 +A1,15.93330000000,R1,2020,R1,gas,gassupply1,newcapa,2040 A1,8.47780000000,R1,2025,R1,gas,gassupply1,newcapa,2040 -A1,12.69560000000,R1,2030,R1,gas,gassupply1,newcapa,2040 -A1,8.90670000000,R1,2035,R1,gas,gassupply1,newcapa,2040 +A1,1.56670000000,R1,2030,R1,gas,gassupply1,newcapa,2040 +A1,3.71110000000,R1,2035,R1,gas,gassupply1,newcapa,2040 A1,16.00000000000,R1,2035,R1,residential,heatpump,newcapa,2045 A1,32.00000000000,R1,2040,R1,residential,heatpump,newcapa,2045 -A1,5.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2045 -A1,5.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2045 -A1,3.00000000000,R1,2030,R1,power,gasCCGT,newcapa,2045 +A1,4.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2045 +A1,10.00000000000,R1,2030,R1,power,gasCCGT,newcapa,2045 A1,2.00000000000,R1,2035,R1,power,gasCCGT,newcapa,2045 -A1,1.00000000000,R1,2020,R1,power,windturbine,newcapa,2045 A1,3.00000000000,R1,2040,R1,power,windturbine,newcapa,2045 -A1,3.69110000000,R1,2020,R1,gas,gassupply1,newcapa,2045 +A1,15.93330000000,R1,2020,R1,gas,gassupply1,newcapa,2045 A1,8.47780000000,R1,2025,R1,gas,gassupply1,newcapa,2045 -A1,12.69560000000,R1,2030,R1,gas,gassupply1,newcapa,2045 -A1,8.90670000000,R1,2035,R1,gas,gassupply1,newcapa,2045 +A1,1.56670000000,R1,2030,R1,gas,gassupply1,newcapa,2045 +A1,3.71110000000,R1,2035,R1,gas,gassupply1,newcapa,2045 A1,32.00000000000,R1,2040,R1,residential,heatpump,newcapa,2050 A1,22.00000000000,R1,2045,R1,residential,heatpump,newcapa,2050 -A1,5.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2050 -A1,5.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2050 -A1,3.00000000000,R1,2030,R1,power,gasCCGT,newcapa,2050 +A1,4.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2050 +A1,10.00000000000,R1,2030,R1,power,gasCCGT,newcapa,2050 A1,2.00000000000,R1,2035,R1,power,gasCCGT,newcapa,2050 A1,3.00000000000,R1,2040,R1,power,windturbine,newcapa,2050 -A1,3.00000000000,R1,2045,R1,power,windturbine,newcapa,2050 -A1,3.69110000000,R1,2020,R1,gas,gassupply1,newcapa,2050 +A1,2.00000000000,R1,2045,R1,power,windturbine,newcapa,2050 +A1,15.93330000000,R1,2020,R1,gas,gassupply1,newcapa,2050 A1,8.47780000000,R1,2025,R1,gas,gassupply1,newcapa,2050 -A1,12.69560000000,R1,2030,R1,gas,gassupply1,newcapa,2050 -A1,8.90670000000,R1,2035,R1,gas,gassupply1,newcapa,2050 +A1,1.56670000000,R1,2030,R1,gas,gassupply1,newcapa,2050 +A1,3.71110000000,R1,2035,R1,gas,gassupply1,newcapa,2050 diff --git a/docs/tutorial-code/min-max-timeslice-constraints/2-max-constraint/Results/MCAPrices.csv b/docs/tutorial-code/min-max-timeslice-constraints/2-max-constraint/Results/MCAPrices.csv index 827883027..21e5a0172 100644 --- a/docs/tutorial-code/min-max-timeslice-constraints/2-max-constraint/Results/MCAPrices.csv +++ b/docs/tutorial-code/min-max-timeslice-constraints/2-max-constraint/Results/MCAPrices.csv @@ -23,147 +23,147 @@ electricity,all-week,evening,all-year,19.50000000000,R1,5,MUS$2010/PJ,2020 gas,all-week,evening,all-year,7.15280000000,R1,5,MUS$2010/PJ,2020 heat,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.08310000000,R1,5,MUS$2010/kt,2020 -electricity,all-week,night,all-year,7.65120000000,R1,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,21.48570000000,R1,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,4.36760000000,R1,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,8.42060000000,R1,0,MUS$2010/PJ,2025 CO2f,all-week,night,all-year,0.12010000000,R1,0,MUS$2010/kt,2025 -electricity,all-week,morning,all-year,10.77570000000,R1,1,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,23.13850000000,R1,1,MUS$2010/PJ,2025 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,5.35700000000,R1,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,8.42060000000,R1,1,MUS$2010/PJ,2025 CO2f,all-week,morning,all-year,0.12010000000,R1,1,MUS$2010/kt,2025 -electricity,all-week,afternoon,all-year,12.20640000000,R1,2,MUS$2010/PJ,2025 +electricity,all-week,afternoon,all-year,23.74250000000,R1,2,MUS$2010/PJ,2025 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2025 -heat,all-week,afternoon,all-year,5.81000000000,R1,2,MUS$2010/PJ,2025 +heat,all-week,afternoon,all-year,8.42060000000,R1,2,MUS$2010/PJ,2025 CO2f,all-week,afternoon,all-year,0.12010000000,R1,2,MUS$2010/kt,2025 -electricity,all-week,early-peak,all-year,9.16960000000,R1,3,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,21.48570000000,R1,3,MUS$2010/PJ,2025 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,4.84840000000,R1,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,8.42060000000,R1,3,MUS$2010/PJ,2025 CO2f,all-week,early-peak,all-year,0.12010000000,R1,3,MUS$2010/kt,2025 -electricity,all-week,late-peak,all-year,10.68800000000,R1,4,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,21.48570000000,R1,4,MUS$2010/PJ,2025 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,5.32920000000,R1,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,8.42060000000,R1,4,MUS$2010/PJ,2025 CO2f,all-week,late-peak,all-year,0.12010000000,R1,4,MUS$2010/kt,2025 -electricity,all-week,evening,all-year,12.20640000000,R1,5,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,22.34090000000,R1,5,MUS$2010/PJ,2025 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,5.81000000000,R1,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,8.42060000000,R1,5,MUS$2010/PJ,2025 CO2f,all-week,evening,all-year,0.12010000000,R1,5,MUS$2010/kt,2025 -electricity,all-week,night,all-year,11.86040000000,R1,0,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,15.59170000000,R1,0,MUS$2010/PJ,2030 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,4.98470000000,R1,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,9.31610000000,R1,0,MUS$2010/PJ,2030 CO2f,all-week,night,all-year,0.15700000000,R1,0,MUS$2010/kt,2030 -electricity,all-week,morning,all-year,14.40350000000,R1,1,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,15.59170000000,R1,1,MUS$2010/PJ,2030 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,6.00190000000,R1,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,9.31610000000,R1,1,MUS$2010/PJ,2030 CO2f,all-week,morning,all-year,0.15700000000,R1,1,MUS$2010/kt,2030 electricity,all-week,afternoon,all-year,15.59170000000,R1,2,MUS$2010/PJ,2030 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,6.47720000000,R1,2,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,9.31610000000,R1,2,MUS$2010/PJ,2030 CO2f,all-week,afternoon,all-year,0.15700000000,R1,2,MUS$2010/kt,2030 -electricity,all-week,early-peak,all-year,13.10420000000,R1,3,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,15.59170000000,R1,3,MUS$2010/PJ,2030 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,5.48220000000,R1,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,9.31610000000,R1,3,MUS$2010/PJ,2030 CO2f,all-week,early-peak,all-year,0.15700000000,R1,3,MUS$2010/kt,2030 -electricity,all-week,late-peak,all-year,14.30500000000,R1,4,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,15.59170000000,R1,4,MUS$2010/PJ,2030 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,5.96250000000,R1,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,9.31610000000,R1,4,MUS$2010/PJ,2030 CO2f,all-week,late-peak,all-year,0.15700000000,R1,4,MUS$2010/kt,2030 electricity,all-week,evening,all-year,15.59170000000,R1,5,MUS$2010/PJ,2030 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,6.47720000000,R1,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,9.31610000000,R1,5,MUS$2010/PJ,2030 CO2f,all-week,evening,all-year,0.15700000000,R1,5,MUS$2010/kt,2030 -electricity,all-week,night,all-year,16.68270000000,R1,0,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,20.89740000000,R1,0,MUS$2010/PJ,2035 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,6.91360000000,R1,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,8.59950000000,R1,0,MUS$2010/PJ,2035 CO2f,all-week,night,all-year,0.21490000000,R1,0,MUS$2010/kt,2035 -electricity,all-week,morning,all-year,19.53880000000,R1,1,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,20.89740000000,R1,1,MUS$2010/PJ,2035 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,8.05600000000,R1,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,8.59950000000,R1,1,MUS$2010/PJ,2035 CO2f,all-week,morning,all-year,0.21490000000,R1,1,MUS$2010/kt,2035 electricity,all-week,afternoon,all-year,20.89740000000,R1,2,MUS$2010/PJ,2035 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2035 heat,all-week,afternoon,all-year,8.59950000000,R1,2,MUS$2010/PJ,2035 CO2f,all-week,afternoon,all-year,0.21490000000,R1,2,MUS$2010/kt,2035 -electricity,all-week,early-peak,all-year,18.08760000000,R1,3,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,20.89740000000,R1,3,MUS$2010/PJ,2035 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,7.47550000000,R1,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,8.59950000000,R1,3,MUS$2010/PJ,2035 CO2f,all-week,early-peak,all-year,0.21490000000,R1,3,MUS$2010/kt,2035 -electricity,all-week,late-peak,all-year,19.49250000000,R1,4,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,20.89740000000,R1,4,MUS$2010/PJ,2035 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,8.03750000000,R1,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,8.59950000000,R1,4,MUS$2010/PJ,2035 CO2f,all-week,late-peak,all-year,0.21490000000,R1,4,MUS$2010/kt,2035 electricity,all-week,evening,all-year,20.89740000000,R1,5,MUS$2010/PJ,2035 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2035 heat,all-week,evening,all-year,8.59950000000,R1,5,MUS$2010/PJ,2035 CO2f,all-week,evening,all-year,0.21490000000,R1,5,MUS$2010/kt,2035 -electricity,all-week,night,all-year,21.64310000000,R1,0,MUS$2010/PJ,2040 +electricity,all-week,night,all-year,26.20320000000,R1,0,MUS$2010/PJ,2040 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,8.89770000000,R1,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,10.72180000000,R1,0,MUS$2010/PJ,2040 CO2f,all-week,night,all-year,0.27280000000,R1,0,MUS$2010/kt,2040 -electricity,all-week,morning,all-year,24.72290000000,R1,1,MUS$2010/PJ,2040 +electricity,all-week,morning,all-year,26.20320000000,R1,1,MUS$2010/PJ,2040 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,10.12960000000,R1,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,10.72180000000,R1,1,MUS$2010/PJ,2040 CO2f,all-week,morning,all-year,0.27280000000,R1,1,MUS$2010/kt,2040 electricity,all-week,afternoon,all-year,26.20320000000,R1,2,MUS$2010/PJ,2040 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2040 heat,all-week,afternoon,all-year,10.72180000000,R1,2,MUS$2010/PJ,2040 CO2f,all-week,afternoon,all-year,0.27280000000,R1,2,MUS$2010/kt,2040 -electricity,all-week,early-peak,all-year,23.16320000000,R1,3,MUS$2010/PJ,2040 +electricity,all-week,early-peak,all-year,26.20320000000,R1,3,MUS$2010/PJ,2040 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,9.50580000000,R1,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,10.72180000000,R1,3,MUS$2010/PJ,2040 CO2f,all-week,early-peak,all-year,0.27280000000,R1,3,MUS$2010/kt,2040 -electricity,all-week,late-peak,all-year,24.68320000000,R1,4,MUS$2010/PJ,2040 +electricity,all-week,late-peak,all-year,26.20320000000,R1,4,MUS$2010/PJ,2040 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,10.11380000000,R1,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,10.72180000000,R1,4,MUS$2010/PJ,2040 CO2f,all-week,late-peak,all-year,0.27280000000,R1,4,MUS$2010/kt,2040 electricity,all-week,evening,all-year,26.20320000000,R1,5,MUS$2010/PJ,2040 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2040 heat,all-week,evening,all-year,10.72180000000,R1,5,MUS$2010/PJ,2040 CO2f,all-week,evening,all-year,0.27280000000,R1,5,MUS$2010/kt,2040 -electricity,all-week,night,all-year,16.12570000000,R1,0,MUS$2010/PJ,2045 +electricity,all-week,night,all-year,28.43880000000,R1,0,MUS$2010/PJ,2045 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2045 -heat,all-week,night,all-year,6.69080000000,R1,0,MUS$2010/PJ,2045 +heat,all-week,night,all-year,11.61600000000,R1,0,MUS$2010/PJ,2045 CO2f,all-week,night,all-year,0.35390000000,R1,0,MUS$2010/kt,2045 -electricity,all-week,morning,all-year,26.91420000000,R1,1,MUS$2010/PJ,2045 +electricity,all-week,morning,all-year,30.87640000000,R1,1,MUS$2010/PJ,2045 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2045 -heat,all-week,morning,all-year,11.00620000000,R1,1,MUS$2010/PJ,2045 +heat,all-week,morning,all-year,12.59100000000,R1,1,MUS$2010/PJ,2045 CO2f,all-week,morning,all-year,0.35390000000,R1,1,MUS$2010/kt,2045 -electricity,all-week,afternoon,all-year,33.64600000000,R1,2,MUS$2010/PJ,2045 +electricity,all-week,afternoon,all-year,31.89940000000,R1,2,MUS$2010/PJ,2045 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2045 -heat,all-week,afternoon,all-year,13.69890000000,R1,2,MUS$2010/PJ,2045 +heat,all-week,afternoon,all-year,13.00030000000,R1,2,MUS$2010/PJ,2045 CO2f,all-week,afternoon,all-year,0.35390000000,R1,2,MUS$2010/kt,2045 -electricity,all-week,early-peak,all-year,21.27880000000,R1,3,MUS$2010/PJ,2045 +electricity,all-week,early-peak,all-year,28.43880000000,R1,3,MUS$2010/PJ,2045 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2045 -heat,all-week,early-peak,all-year,8.75200000000,R1,3,MUS$2010/PJ,2045 +heat,all-week,early-peak,all-year,11.61600000000,R1,3,MUS$2010/PJ,2045 CO2f,all-week,early-peak,all-year,0.35390000000,R1,3,MUS$2010/kt,2045 -electricity,all-week,late-peak,all-year,26.77530000000,R1,4,MUS$2010/PJ,2045 +electricity,all-week,late-peak,all-year,28.43880000000,R1,4,MUS$2010/PJ,2045 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2045 -heat,all-week,late-peak,all-year,10.95060000000,R1,4,MUS$2010/PJ,2045 +heat,all-week,late-peak,all-year,11.61600000000,R1,4,MUS$2010/PJ,2045 CO2f,all-week,late-peak,all-year,0.35390000000,R1,4,MUS$2010/kt,2045 -electricity,all-week,evening,all-year,33.64600000000,R1,5,MUS$2010/PJ,2045 +electricity,all-week,evening,all-year,29.94740000000,R1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2045 -heat,all-week,evening,all-year,13.69890000000,R1,5,MUS$2010/PJ,2045 +heat,all-week,evening,all-year,12.21950000000,R1,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045 -electricity,all-week,night,all-year,17.50920000000,R1,0,MUS$2010/PJ,2050 +electricity,all-week,night,all-year,31.46450000000,R1,0,MUS$2010/PJ,2050 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,7.24420000000,R1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,12.82630000000,R1,0,MUS$2010/PJ,2050 CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050 -electricity,all-week,morning,all-year,30.04560000000,R1,1,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,35.71650000000,R1,1,MUS$2010/PJ,2050 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,12.25880000000,R1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,14.52710000000,R1,1,MUS$2010/PJ,2050 CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050 -electricity,all-week,afternoon,all-year,41.08880000000,R1,2,MUS$2010/PJ,2050 +electricity,all-week,afternoon,all-year,37.43030000000,R1,2,MUS$2010/PJ,2050 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,16.67600000000,R1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,15.21260000000,R1,2,MUS$2010/PJ,2050 CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050 -electricity,all-week,early-peak,all-year,23.12340000000,R1,3,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,31.46450000000,R1,3,MUS$2010/PJ,2050 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,9.48990000000,R1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,12.82630000000,R1,3,MUS$2010/PJ,2050 CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050 -electricity,all-week,late-peak,all-year,29.86040000000,R1,4,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,31.46450000000,R1,4,MUS$2010/PJ,2050 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,12.18470000000,R1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,12.82630000000,R1,4,MUS$2010/PJ,2050 CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050 -electricity,all-week,evening,all-year,41.08880000000,R1,5,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,33.95550000000,R1,5,MUS$2010/PJ,2050 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,16.67600000000,R1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,13.82270000000,R1,5,MUS$2010/PJ,2050 CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050 diff --git a/docs/tutorial-code/min-max-timeslice-constraints/2-max-constraint/Results/Power_Supply.csv b/docs/tutorial-code/min-max-timeslice-constraints/2-max-constraint/Results/Power_Supply.csv index 963f75463..59dbca940 100644 --- a/docs/tutorial-code/min-max-timeslice-constraints/2-max-constraint/Results/Power_Supply.csv +++ b/docs/tutorial-code/min-max-timeslice-constraints/2-max-constraint/Results/Power_Supply.csv @@ -1,261 +1,163 @@ -asset,comm_usage,commodity,day,hour,installed,month,region,supply,technology,timeslice,year -0,10,electricity,all-week,night,2020,all-year,R1,0.03330000000,gasCCGT,0,2020 -0,6,CO2f,all-week,night,2020,all-year,R1,3.05570000000,gasCCGT,0,2020 -0,10,electricity,all-week,morning,2020,all-year,R1,0.06670000000,gasCCGT,1,2020 -0,6,CO2f,all-week,morning,2020,all-year,R1,6.11130000000,gasCCGT,1,2020 -0,10,electricity,all-week,afternoon,2020,all-year,R1,0.10000000000,gasCCGT,2,2020 -0,6,CO2f,all-week,afternoon,2020,all-year,R1,9.16700000000,gasCCGT,2,2020 -0,10,electricity,all-week,early-peak,2020,all-year,R1,0.06670000000,gasCCGT,3,2020 -0,6,CO2f,all-week,early-peak,2020,all-year,R1,6.11130000000,gasCCGT,3,2020 -0,10,electricity,all-week,late-peak,2020,all-year,R1,0.13330000000,gasCCGT,4,2020 -0,6,CO2f,all-week,late-peak,2020,all-year,R1,12.22270000000,gasCCGT,4,2020 -0,10,electricity,all-week,evening,2020,all-year,R1,0.16670000000,gasCCGT,5,2020 -0,6,CO2f,all-week,evening,2020,all-year,R1,15.27830000000,gasCCGT,5,2020 -0,10,electricity,all-week,night,2020,all-year,R1,0.25560000000,gasCCGT,0,2025 -0,6,CO2f,all-week,night,2020,all-year,R1,23.42680000000,gasCCGT,0,2025 -0,10,electricity,all-week,morning,2020,all-year,R1,0.55000000000,gasCCGT,1,2025 -0,6,CO2f,all-week,morning,2020,all-year,R1,50.41850000000,gasCCGT,1,2025 -0,10,electricity,all-week,afternoon,2020,all-year,R1,0.60000000000,gasCCGT,2,2025 -0,6,CO2f,all-week,afternoon,2020,all-year,R1,55.00200000000,gasCCGT,2,2025 -0,10,electricity,all-week,early-peak,2020,all-year,R1,0.46670000000,gasCCGT,3,2025 -0,6,CO2f,all-week,early-peak,2020,all-year,R1,42.77930000000,gasCCGT,3,2025 -0,10,electricity,all-week,late-peak,2020,all-year,R1,1.10000000000,gasCCGT,4,2025 -0,6,CO2f,all-week,late-peak,2020,all-year,R1,100.83700000000,gasCCGT,4,2025 -0,10,electricity,all-week,evening,2020,all-year,R1,1.00000000000,gasCCGT,5,2025 -0,6,CO2f,all-week,evening,2020,all-year,R1,91.67000000000,gasCCGT,5,2025 -2,10,electricity,all-week,night,2020,all-year,R1,0.16670000000,windturbine,0,2025 -2,10,electricity,all-week,morning,2020,all-year,R1,0.08330000000,windturbine,1,2025 -2,10,electricity,all-week,early-peak,2020,all-year,R1,0.16670000000,windturbine,3,2025 -2,10,electricity,all-week,late-peak,2020,all-year,R1,0.16670000000,windturbine,4,2025 -0,10,electricity,all-week,night,2020,all-year,R1,0.25000000000,gasCCGT,0,2030 -0,6,CO2f,all-week,night,2020,all-year,R1,22.91750000000,gasCCGT,0,2030 -0,10,electricity,all-week,morning,2020,all-year,R1,0.45830000000,gasCCGT,1,2030 -0,6,CO2f,all-week,morning,2020,all-year,R1,42.01540000000,gasCCGT,1,2030 -0,10,electricity,all-week,afternoon,2020,all-year,R1,0.50000000000,gasCCGT,2,2030 -0,6,CO2f,all-week,afternoon,2020,all-year,R1,45.83500000000,gasCCGT,2,2030 -0,10,electricity,all-week,early-peak,2020,all-year,R1,0.41670000000,gasCCGT,3,2030 -0,6,CO2f,all-week,early-peak,2020,all-year,R1,38.19580000000,gasCCGT,3,2030 -0,10,electricity,all-week,late-peak,2020,all-year,R1,0.88330000000,gasCCGT,4,2030 -0,6,CO2f,all-week,late-peak,2020,all-year,R1,80.97520000000,gasCCGT,4,2030 -0,10,electricity,all-week,evening,2020,all-year,R1,0.83330000000,gasCCGT,5,2030 -0,6,CO2f,all-week,evening,2020,all-year,R1,76.39170000000,gasCCGT,5,2030 -1,10,electricity,all-week,night,2025,all-year,R1,0.25000000000,gasCCGT,0,2030 -1,6,CO2f,all-week,night,2025,all-year,R1,22.91750000000,gasCCGT,0,2030 -1,10,electricity,all-week,morning,2025,all-year,R1,0.45830000000,gasCCGT,1,2030 -1,6,CO2f,all-week,morning,2025,all-year,R1,42.01540000000,gasCCGT,1,2030 -1,10,electricity,all-week,afternoon,2025,all-year,R1,0.50000000000,gasCCGT,2,2030 -1,6,CO2f,all-week,afternoon,2025,all-year,R1,45.83500000000,gasCCGT,2,2030 -1,10,electricity,all-week,early-peak,2025,all-year,R1,0.41670000000,gasCCGT,3,2030 -1,6,CO2f,all-week,early-peak,2025,all-year,R1,38.19580000000,gasCCGT,3,2030 -1,10,electricity,all-week,late-peak,2025,all-year,R1,0.88330000000,gasCCGT,4,2030 -1,6,CO2f,all-week,late-peak,2025,all-year,R1,80.97520000000,gasCCGT,4,2030 -1,10,electricity,all-week,evening,2025,all-year,R1,0.83330000000,gasCCGT,5,2030 -1,6,CO2f,all-week,evening,2025,all-year,R1,76.39170000000,gasCCGT,5,2030 -3,10,electricity,all-week,night,2020,all-year,R1,0.16670000000,windturbine,0,2030 -3,10,electricity,all-week,morning,2020,all-year,R1,0.08330000000,windturbine,1,2030 -3,10,electricity,all-week,early-peak,2020,all-year,R1,0.16670000000,windturbine,3,2030 -3,10,electricity,all-week,late-peak,2020,all-year,R1,0.16670000000,windturbine,4,2030 -0,10,electricity,all-week,night,2020,all-year,R1,0.24360000000,gasCCGT,0,2035 -0,6,CO2f,all-week,night,2020,all-year,R1,22.32990000000,gasCCGT,0,2035 -0,10,electricity,all-week,morning,2020,all-year,R1,0.42950000000,gasCCGT,1,2035 -0,6,CO2f,all-week,morning,2020,all-year,R1,39.37110000000,gasCCGT,1,2035 -0,10,electricity,all-week,afternoon,2020,all-year,R1,0.50000000000,gasCCGT,2,2035 -0,6,CO2f,all-week,afternoon,2020,all-year,R1,45.83500000000,gasCCGT,2,2035 -0,10,electricity,all-week,early-peak,2020,all-year,R1,0.39740000000,gasCCGT,3,2035 -0,6,CO2f,all-week,early-peak,2020,all-year,R1,36.43290000000,gasCCGT,3,2035 -0,10,electricity,all-week,late-peak,2020,all-year,R1,0.85900000000,gasCCGT,4,2035 -0,6,CO2f,all-week,late-peak,2020,all-year,R1,78.74220000000,gasCCGT,4,2035 -0,10,electricity,all-week,evening,2020,all-year,R1,0.83330000000,gasCCGT,5,2035 -0,6,CO2f,all-week,evening,2020,all-year,R1,76.39170000000,gasCCGT,5,2035 -1,10,electricity,all-week,night,2025,all-year,R1,0.24360000000,gasCCGT,0,2035 -1,6,CO2f,all-week,night,2025,all-year,R1,22.32990000000,gasCCGT,0,2035 -1,10,electricity,all-week,morning,2025,all-year,R1,0.42950000000,gasCCGT,1,2035 -1,6,CO2f,all-week,morning,2025,all-year,R1,39.37110000000,gasCCGT,1,2035 -1,10,electricity,all-week,afternoon,2025,all-year,R1,0.50000000000,gasCCGT,2,2035 -1,6,CO2f,all-week,afternoon,2025,all-year,R1,45.83500000000,gasCCGT,2,2035 -1,10,electricity,all-week,early-peak,2025,all-year,R1,0.39740000000,gasCCGT,3,2035 -1,6,CO2f,all-week,early-peak,2025,all-year,R1,36.43290000000,gasCCGT,3,2035 -1,10,electricity,all-week,late-peak,2025,all-year,R1,0.85900000000,gasCCGT,4,2035 -1,6,CO2f,all-week,late-peak,2025,all-year,R1,78.74220000000,gasCCGT,4,2035 -1,10,electricity,all-week,evening,2025,all-year,R1,0.83330000000,gasCCGT,5,2035 -1,6,CO2f,all-week,evening,2025,all-year,R1,76.39170000000,gasCCGT,5,2035 -2,10,electricity,all-week,night,2030,all-year,R1,0.14620000000,gasCCGT,0,2035 -2,6,CO2f,all-week,night,2030,all-year,R1,13.39790000000,gasCCGT,0,2035 -2,10,electricity,all-week,morning,2030,all-year,R1,0.25770000000,gasCCGT,1,2035 -2,6,CO2f,all-week,morning,2030,all-year,R1,23.62270000000,gasCCGT,1,2035 -2,10,electricity,all-week,afternoon,2030,all-year,R1,0.30000000000,gasCCGT,2,2035 -2,6,CO2f,all-week,afternoon,2030,all-year,R1,27.50100000000,gasCCGT,2,2035 -2,10,electricity,all-week,early-peak,2030,all-year,R1,0.23850000000,gasCCGT,3,2035 -2,6,CO2f,all-week,early-peak,2030,all-year,R1,21.85980000000,gasCCGT,3,2035 -2,10,electricity,all-week,late-peak,2030,all-year,R1,0.51540000000,gasCCGT,4,2035 -2,6,CO2f,all-week,late-peak,2030,all-year,R1,47.24530000000,gasCCGT,4,2035 -2,10,electricity,all-week,evening,2030,all-year,R1,0.50000000000,gasCCGT,5,2035 -2,6,CO2f,all-week,evening,2030,all-year,R1,45.83500000000,gasCCGT,5,2035 -4,10,electricity,all-week,night,2020,all-year,R1,0.16670000000,windturbine,0,2035 -4,10,electricity,all-week,morning,2020,all-year,R1,0.08330000000,windturbine,1,2035 -4,10,electricity,all-week,early-peak,2020,all-year,R1,0.16670000000,windturbine,3,2035 -4,10,electricity,all-week,late-peak,2020,all-year,R1,0.16670000000,windturbine,4,2035 -0,10,electricity,all-week,night,2020,all-year,R1,0.25560000000,gasCCGT,0,2040 -0,6,CO2f,all-week,night,2020,all-year,R1,23.42680000000,gasCCGT,0,2040 -0,10,electricity,all-week,morning,2020,all-year,R1,0.43890000000,gasCCGT,1,2040 -0,6,CO2f,all-week,morning,2020,all-year,R1,40.23290000000,gasCCGT,1,2040 -0,10,electricity,all-week,afternoon,2020,all-year,R1,0.50000000000,gasCCGT,2,2040 -0,6,CO2f,all-week,afternoon,2020,all-year,R1,45.83500000000,gasCCGT,2,2040 -0,10,electricity,all-week,early-peak,2020,all-year,R1,0.41110000000,gasCCGT,3,2040 -0,6,CO2f,all-week,early-peak,2020,all-year,R1,37.68660000000,gasCCGT,3,2040 -0,10,electricity,all-week,late-peak,2020,all-year,R1,0.87780000000,gasCCGT,4,2040 -0,6,CO2f,all-week,late-peak,2020,all-year,R1,80.46590000000,gasCCGT,4,2040 -0,10,electricity,all-week,evening,2020,all-year,R1,0.83330000000,gasCCGT,5,2040 -0,6,CO2f,all-week,evening,2020,all-year,R1,76.39170000000,gasCCGT,5,2040 -1,10,electricity,all-week,night,2025,all-year,R1,0.25560000000,gasCCGT,0,2040 -1,6,CO2f,all-week,night,2025,all-year,R1,23.42680000000,gasCCGT,0,2040 -1,10,electricity,all-week,morning,2025,all-year,R1,0.43890000000,gasCCGT,1,2040 -1,6,CO2f,all-week,morning,2025,all-year,R1,40.23290000000,gasCCGT,1,2040 -1,10,electricity,all-week,afternoon,2025,all-year,R1,0.50000000000,gasCCGT,2,2040 -1,6,CO2f,all-week,afternoon,2025,all-year,R1,45.83500000000,gasCCGT,2,2040 -1,10,electricity,all-week,early-peak,2025,all-year,R1,0.41110000000,gasCCGT,3,2040 -1,6,CO2f,all-week,early-peak,2025,all-year,R1,37.68660000000,gasCCGT,3,2040 -1,10,electricity,all-week,late-peak,2025,all-year,R1,0.87780000000,gasCCGT,4,2040 -1,6,CO2f,all-week,late-peak,2025,all-year,R1,80.46590000000,gasCCGT,4,2040 -1,10,electricity,all-week,evening,2025,all-year,R1,0.83330000000,gasCCGT,5,2040 -1,6,CO2f,all-week,evening,2025,all-year,R1,76.39170000000,gasCCGT,5,2040 -2,10,electricity,all-week,night,2030,all-year,R1,0.15330000000,gasCCGT,0,2040 -2,6,CO2f,all-week,night,2030,all-year,R1,14.05610000000,gasCCGT,0,2040 -2,10,electricity,all-week,morning,2030,all-year,R1,0.26330000000,gasCCGT,1,2040 -2,6,CO2f,all-week,morning,2030,all-year,R1,24.13980000000,gasCCGT,1,2040 -2,10,electricity,all-week,afternoon,2030,all-year,R1,0.30000000000,gasCCGT,2,2040 -2,6,CO2f,all-week,afternoon,2030,all-year,R1,27.50100000000,gasCCGT,2,2040 -2,10,electricity,all-week,early-peak,2030,all-year,R1,0.24670000000,gasCCGT,3,2040 -2,6,CO2f,all-week,early-peak,2030,all-year,R1,22.61190000000,gasCCGT,3,2040 -2,10,electricity,all-week,late-peak,2030,all-year,R1,0.52670000000,gasCCGT,4,2040 -2,6,CO2f,all-week,late-peak,2030,all-year,R1,48.27950000000,gasCCGT,4,2040 -2,10,electricity,all-week,evening,2030,all-year,R1,0.50000000000,gasCCGT,5,2040 -2,6,CO2f,all-week,evening,2030,all-year,R1,45.83500000000,gasCCGT,5,2040 -3,10,electricity,all-week,night,2035,all-year,R1,0.10220000000,gasCCGT,0,2040 -3,6,CO2f,all-week,night,2035,all-year,R1,9.37070000000,gasCCGT,0,2040 -3,10,electricity,all-week,morning,2035,all-year,R1,0.17560000000,gasCCGT,1,2040 -3,6,CO2f,all-week,morning,2035,all-year,R1,16.09320000000,gasCCGT,1,2040 -3,10,electricity,all-week,afternoon,2035,all-year,R1,0.20000000000,gasCCGT,2,2040 -3,6,CO2f,all-week,afternoon,2035,all-year,R1,18.33400000000,gasCCGT,2,2040 -3,10,electricity,all-week,early-peak,2035,all-year,R1,0.16440000000,gasCCGT,3,2040 -3,6,CO2f,all-week,early-peak,2035,all-year,R1,15.07460000000,gasCCGT,3,2040 -3,10,electricity,all-week,late-peak,2035,all-year,R1,0.35110000000,gasCCGT,4,2040 -3,6,CO2f,all-week,late-peak,2035,all-year,R1,32.18640000000,gasCCGT,4,2040 -3,10,electricity,all-week,evening,2035,all-year,R1,0.33330000000,gasCCGT,5,2040 -3,6,CO2f,all-week,evening,2035,all-year,R1,30.55670000000,gasCCGT,5,2040 -4,10,electricity,all-week,night,2020,all-year,R1,0.16670000000,windturbine,0,2040 -4,10,electricity,all-week,morning,2020,all-year,R1,0.08330000000,windturbine,1,2040 -4,10,electricity,all-week,early-peak,2020,all-year,R1,0.16670000000,windturbine,3,2040 -4,10,electricity,all-week,late-peak,2020,all-year,R1,0.16670000000,windturbine,4,2040 -0,10,electricity,all-week,night,2020,all-year,R1,0.16670000000,gasCCGT,0,2045 -0,6,CO2f,all-week,night,2020,all-year,R1,15.27830000000,gasCCGT,0,2045 -0,10,electricity,all-week,morning,2020,all-year,R1,0.42220000000,gasCCGT,1,2045 -0,6,CO2f,all-week,morning,2020,all-year,R1,38.70510000000,gasCCGT,1,2045 -0,10,electricity,all-week,afternoon,2020,all-year,R1,0.50000000000,gasCCGT,2,2045 -0,6,CO2f,all-week,afternoon,2020,all-year,R1,45.83500000000,gasCCGT,2,2045 -0,10,electricity,all-week,early-peak,2020,all-year,R1,0.33330000000,gasCCGT,3,2045 -0,6,CO2f,all-week,early-peak,2020,all-year,R1,30.55670000000,gasCCGT,3,2045 -0,10,electricity,all-week,late-peak,2020,all-year,R1,0.84440000000,gasCCGT,4,2045 -0,6,CO2f,all-week,late-peak,2020,all-year,R1,77.41020000000,gasCCGT,4,2045 -0,10,electricity,all-week,evening,2020,all-year,R1,0.83330000000,gasCCGT,5,2045 -0,6,CO2f,all-week,evening,2020,all-year,R1,76.39170000000,gasCCGT,5,2045 -1,10,electricity,all-week,night,2025,all-year,R1,0.16670000000,gasCCGT,0,2045 -1,6,CO2f,all-week,night,2025,all-year,R1,15.27830000000,gasCCGT,0,2045 -1,10,electricity,all-week,morning,2025,all-year,R1,0.42220000000,gasCCGT,1,2045 -1,6,CO2f,all-week,morning,2025,all-year,R1,38.70510000000,gasCCGT,1,2045 -1,10,electricity,all-week,afternoon,2025,all-year,R1,0.50000000000,gasCCGT,2,2045 -1,6,CO2f,all-week,afternoon,2025,all-year,R1,45.83500000000,gasCCGT,2,2045 -1,10,electricity,all-week,early-peak,2025,all-year,R1,0.33330000000,gasCCGT,3,2045 -1,6,CO2f,all-week,early-peak,2025,all-year,R1,30.55670000000,gasCCGT,3,2045 -1,10,electricity,all-week,late-peak,2025,all-year,R1,0.84440000000,gasCCGT,4,2045 -1,6,CO2f,all-week,late-peak,2025,all-year,R1,77.41020000000,gasCCGT,4,2045 -1,10,electricity,all-week,evening,2025,all-year,R1,0.83330000000,gasCCGT,5,2045 -1,6,CO2f,all-week,evening,2025,all-year,R1,76.39170000000,gasCCGT,5,2045 -2,10,electricity,all-week,night,2030,all-year,R1,0.10000000000,gasCCGT,0,2045 -2,6,CO2f,all-week,night,2030,all-year,R1,9.16700000000,gasCCGT,0,2045 -2,10,electricity,all-week,morning,2030,all-year,R1,0.25330000000,gasCCGT,1,2045 -2,6,CO2f,all-week,morning,2030,all-year,R1,23.22310000000,gasCCGT,1,2045 -2,10,electricity,all-week,afternoon,2030,all-year,R1,0.30000000000,gasCCGT,2,2045 -2,6,CO2f,all-week,afternoon,2030,all-year,R1,27.50100000000,gasCCGT,2,2045 -2,10,electricity,all-week,early-peak,2030,all-year,R1,0.20000000000,gasCCGT,3,2045 -2,6,CO2f,all-week,early-peak,2030,all-year,R1,18.33400000000,gasCCGT,3,2045 -2,10,electricity,all-week,late-peak,2030,all-year,R1,0.50670000000,gasCCGT,4,2045 -2,6,CO2f,all-week,late-peak,2030,all-year,R1,46.44610000000,gasCCGT,4,2045 -2,10,electricity,all-week,evening,2030,all-year,R1,0.50000000000,gasCCGT,5,2045 -2,6,CO2f,all-week,evening,2030,all-year,R1,45.83500000000,gasCCGT,5,2045 -3,10,electricity,all-week,night,2035,all-year,R1,0.06670000000,gasCCGT,0,2045 -3,6,CO2f,all-week,night,2035,all-year,R1,6.11130000000,gasCCGT,0,2045 -3,10,electricity,all-week,morning,2035,all-year,R1,0.16890000000,gasCCGT,1,2045 -3,6,CO2f,all-week,morning,2035,all-year,R1,15.48200000000,gasCCGT,1,2045 -3,10,electricity,all-week,afternoon,2035,all-year,R1,0.20000000000,gasCCGT,2,2045 -3,6,CO2f,all-week,afternoon,2035,all-year,R1,18.33400000000,gasCCGT,2,2045 -3,10,electricity,all-week,early-peak,2035,all-year,R1,0.13330000000,gasCCGT,3,2045 -3,6,CO2f,all-week,early-peak,2035,all-year,R1,12.22270000000,gasCCGT,3,2045 -3,10,electricity,all-week,late-peak,2035,all-year,R1,0.33780000000,gasCCGT,4,2045 -3,6,CO2f,all-week,late-peak,2035,all-year,R1,30.96410000000,gasCCGT,4,2045 -3,10,electricity,all-week,evening,2035,all-year,R1,0.33330000000,gasCCGT,5,2045 -3,6,CO2f,all-week,evening,2035,all-year,R1,30.55670000000,gasCCGT,5,2045 -4,10,electricity,all-week,night,2020,all-year,R1,0.14170000000,windturbine,0,2045 -4,10,electricity,all-week,morning,2020,all-year,R1,0.08330000000,windturbine,1,2045 -4,10,electricity,all-week,early-peak,2020,all-year,R1,0.15000000000,windturbine,3,2045 -4,10,electricity,all-week,late-peak,2020,all-year,R1,0.16670000000,windturbine,4,2045 -5,10,electricity,all-week,night,2040,all-year,R1,0.42500000000,windturbine,0,2045 -5,10,electricity,all-week,morning,2040,all-year,R1,0.25000000000,windturbine,1,2045 -5,10,electricity,all-week,early-peak,2040,all-year,R1,0.45000000000,windturbine,3,2045 -5,10,electricity,all-week,late-peak,2040,all-year,R1,0.50000000000,windturbine,4,2045 -0,10,electricity,all-week,night,2020,all-year,R1,0.16670000000,gasCCGT,0,2050 -0,6,CO2f,all-week,night,2020,all-year,R1,15.27830000000,gasCCGT,0,2050 -0,10,electricity,all-week,morning,2020,all-year,R1,0.43330000000,gasCCGT,1,2050 -0,6,CO2f,all-week,morning,2020,all-year,R1,39.72370000000,gasCCGT,1,2050 -0,10,electricity,all-week,afternoon,2020,all-year,R1,0.50000000000,gasCCGT,2,2050 -0,6,CO2f,all-week,afternoon,2020,all-year,R1,45.83500000000,gasCCGT,2,2050 -0,10,electricity,all-week,early-peak,2020,all-year,R1,0.33330000000,gasCCGT,3,2050 -0,6,CO2f,all-week,early-peak,2020,all-year,R1,30.55670000000,gasCCGT,3,2050 -0,10,electricity,all-week,late-peak,2020,all-year,R1,0.86670000000,gasCCGT,4,2050 -0,6,CO2f,all-week,late-peak,2020,all-year,R1,79.44730000000,gasCCGT,4,2050 -0,10,electricity,all-week,evening,2020,all-year,R1,0.83330000000,gasCCGT,5,2050 -0,6,CO2f,all-week,evening,2020,all-year,R1,76.39170000000,gasCCGT,5,2050 -1,10,electricity,all-week,night,2025,all-year,R1,0.16670000000,gasCCGT,0,2050 -1,6,CO2f,all-week,night,2025,all-year,R1,15.27830000000,gasCCGT,0,2050 -1,10,electricity,all-week,morning,2025,all-year,R1,0.43330000000,gasCCGT,1,2050 -1,6,CO2f,all-week,morning,2025,all-year,R1,39.72370000000,gasCCGT,1,2050 -1,10,electricity,all-week,afternoon,2025,all-year,R1,0.50000000000,gasCCGT,2,2050 -1,6,CO2f,all-week,afternoon,2025,all-year,R1,45.83500000000,gasCCGT,2,2050 -1,10,electricity,all-week,early-peak,2025,all-year,R1,0.33330000000,gasCCGT,3,2050 -1,6,CO2f,all-week,early-peak,2025,all-year,R1,30.55670000000,gasCCGT,3,2050 -1,10,electricity,all-week,late-peak,2025,all-year,R1,0.86670000000,gasCCGT,4,2050 -1,6,CO2f,all-week,late-peak,2025,all-year,R1,79.44730000000,gasCCGT,4,2050 -1,10,electricity,all-week,evening,2025,all-year,R1,0.83330000000,gasCCGT,5,2050 -1,6,CO2f,all-week,evening,2025,all-year,R1,76.39170000000,gasCCGT,5,2050 -2,10,electricity,all-week,night,2030,all-year,R1,0.10000000000,gasCCGT,0,2050 -2,6,CO2f,all-week,night,2030,all-year,R1,9.16700000000,gasCCGT,0,2050 -2,10,electricity,all-week,morning,2030,all-year,R1,0.26000000000,gasCCGT,1,2050 -2,6,CO2f,all-week,morning,2030,all-year,R1,23.83420000000,gasCCGT,1,2050 -2,10,electricity,all-week,afternoon,2030,all-year,R1,0.30000000000,gasCCGT,2,2050 -2,6,CO2f,all-week,afternoon,2030,all-year,R1,27.50100000000,gasCCGT,2,2050 -2,10,electricity,all-week,early-peak,2030,all-year,R1,0.20000000000,gasCCGT,3,2050 -2,6,CO2f,all-week,early-peak,2030,all-year,R1,18.33400000000,gasCCGT,3,2050 -2,10,electricity,all-week,late-peak,2030,all-year,R1,0.52000000000,gasCCGT,4,2050 -2,6,CO2f,all-week,late-peak,2030,all-year,R1,47.66840000000,gasCCGT,4,2050 -2,10,electricity,all-week,evening,2030,all-year,R1,0.50000000000,gasCCGT,5,2050 -2,6,CO2f,all-week,evening,2030,all-year,R1,45.83500000000,gasCCGT,5,2050 -3,10,electricity,all-week,night,2035,all-year,R1,0.06670000000,gasCCGT,0,2050 -3,6,CO2f,all-week,night,2035,all-year,R1,6.11130000000,gasCCGT,0,2050 -3,10,electricity,all-week,morning,2035,all-year,R1,0.17330000000,gasCCGT,1,2050 -3,6,CO2f,all-week,morning,2035,all-year,R1,15.88950000000,gasCCGT,1,2050 -3,10,electricity,all-week,afternoon,2035,all-year,R1,0.20000000000,gasCCGT,2,2050 -3,6,CO2f,all-week,afternoon,2035,all-year,R1,18.33400000000,gasCCGT,2,2050 -3,10,electricity,all-week,early-peak,2035,all-year,R1,0.13330000000,gasCCGT,3,2050 -3,6,CO2f,all-week,early-peak,2035,all-year,R1,12.22270000000,gasCCGT,3,2050 -3,10,electricity,all-week,late-peak,2035,all-year,R1,0.34670000000,gasCCGT,4,2050 -3,6,CO2f,all-week,late-peak,2035,all-year,R1,31.77890000000,gasCCGT,4,2050 -3,10,electricity,all-week,evening,2035,all-year,R1,0.33330000000,gasCCGT,5,2050 -3,6,CO2f,all-week,evening,2035,all-year,R1,30.55670000000,gasCCGT,5,2050 -5,10,electricity,all-week,night,2040,all-year,R1,0.35000000000,windturbine,0,2050 -5,10,electricity,all-week,morning,2040,all-year,R1,0.25000000000,windturbine,1,2050 -5,10,electricity,all-week,early-peak,2040,all-year,R1,0.40000000000,windturbine,3,2050 -5,10,electricity,all-week,late-peak,2040,all-year,R1,0.50000000000,windturbine,4,2050 -6,10,electricity,all-week,night,2045,all-year,R1,0.35000000000,windturbine,0,2050 -6,10,electricity,all-week,morning,2045,all-year,R1,0.25000000000,windturbine,1,2050 -6,10,electricity,all-week,early-peak,2045,all-year,R1,0.40000000000,windturbine,3,2050 -6,10,electricity,all-week,late-peak,2045,all-year,R1,0.50000000000,windturbine,4,2050 +asset,comm_usage,commodity,day,hour,installed,month,region,supply,technology,timeslice,units_prices,year +1,10,electricity,all-week,night,2025,all-year,R1,0.22990000000,gasCCGT,0,MUS$2010/PJ,2030 +1,6,CO2f,all-week,night,2025,all-year,R1,21.07360000000,gasCCGT,0,MUS$2010/kt,2030 +1,10,electricity,all-week,morning,2025,all-year,R1,0.34480000000,gasCCGT,1,MUS$2010/PJ,2030 +1,6,CO2f,all-week,morning,2025,all-year,R1,31.61030000000,gasCCGT,1,MUS$2010/kt,2030 +1,10,electricity,all-week,afternoon,2025,all-year,R1,0.40000000000,gasCCGT,2,MUS$2010/PJ,2030 +1,6,CO2f,all-week,afternoon,2025,all-year,R1,36.66800000000,gasCCGT,2,MUS$2010/kt,2030 +1,10,electricity,all-week,early-peak,2025,all-year,R1,0.34480000000,gasCCGT,3,MUS$2010/PJ,2030 +1,6,CO2f,all-week,early-peak,2025,all-year,R1,31.61030000000,gasCCGT,3,MUS$2010/kt,2030 +1,10,electricity,all-week,late-peak,2025,all-year,R1,0.66670000000,gasCCGT,4,MUS$2010/PJ,2030 +1,6,CO2f,all-week,late-peak,2025,all-year,R1,61.11330000000,gasCCGT,4,MUS$2010/kt,2030 +1,10,electricity,all-week,evening,2025,all-year,R1,0.66670000000,gasCCGT,5,MUS$2010/PJ,2030 +1,6,CO2f,all-week,evening,2025,all-year,R1,61.11330000000,gasCCGT,5,MUS$2010/kt,2030 +1,10,electricity,all-week,night,2025,all-year,R1,0.22860000000,gasCCGT,0,MUS$2010/PJ,2035 +2,10,electricity,all-week,night,2030,all-year,R1,0.57140000000,gasCCGT,0,MUS$2010/PJ,2035 +1,6,CO2f,all-week,night,2025,all-year,R1,20.95310000000,gasCCGT,0,MUS$2010/kt,2035 +2,6,CO2f,all-week,night,2030,all-year,R1,52.38290000000,gasCCGT,0,MUS$2010/kt,2035 +1,10,electricity,all-week,morning,2025,all-year,R1,0.34290000000,gasCCGT,1,MUS$2010/PJ,2035 +2,10,electricity,all-week,morning,2030,all-year,R1,0.85710000000,gasCCGT,1,MUS$2010/PJ,2035 +1,6,CO2f,all-week,morning,2025,all-year,R1,31.42970000000,gasCCGT,1,MUS$2010/kt,2035 +2,6,CO2f,all-week,morning,2030,all-year,R1,78.57430000000,gasCCGT,1,MUS$2010/kt,2035 +1,10,electricity,all-week,afternoon,2025,all-year,R1,0.40000000000,gasCCGT,2,MUS$2010/PJ,2035 +2,10,electricity,all-week,afternoon,2030,all-year,R1,1.00000000000,gasCCGT,2,MUS$2010/PJ,2035 +1,6,CO2f,all-week,afternoon,2025,all-year,R1,36.66800000000,gasCCGT,2,MUS$2010/kt,2035 +2,6,CO2f,all-week,afternoon,2030,all-year,R1,91.67000000000,gasCCGT,2,MUS$2010/kt,2035 +1,10,electricity,all-week,early-peak,2025,all-year,R1,0.34290000000,gasCCGT,3,MUS$2010/PJ,2035 +2,10,electricity,all-week,early-peak,2030,all-year,R1,0.85710000000,gasCCGT,3,MUS$2010/PJ,2035 +1,6,CO2f,all-week,early-peak,2025,all-year,R1,31.42970000000,gasCCGT,3,MUS$2010/kt,2035 +2,6,CO2f,all-week,early-peak,2030,all-year,R1,78.57430000000,gasCCGT,3,MUS$2010/kt,2035 +1,10,electricity,all-week,late-peak,2025,all-year,R1,0.66670000000,gasCCGT,4,MUS$2010/PJ,2035 +2,10,electricity,all-week,late-peak,2030,all-year,R1,1.66670000000,gasCCGT,4,MUS$2010/PJ,2035 +1,6,CO2f,all-week,late-peak,2025,all-year,R1,61.11330000000,gasCCGT,4,MUS$2010/kt,2035 +2,6,CO2f,all-week,late-peak,2030,all-year,R1,152.78330000000,gasCCGT,4,MUS$2010/kt,2035 +1,10,electricity,all-week,evening,2025,all-year,R1,0.66670000000,gasCCGT,5,MUS$2010/PJ,2035 +2,10,electricity,all-week,evening,2030,all-year,R1,1.66670000000,gasCCGT,5,MUS$2010/PJ,2035 +1,6,CO2f,all-week,evening,2025,all-year,R1,61.11330000000,gasCCGT,5,MUS$2010/kt,2035 +2,6,CO2f,all-week,evening,2030,all-year,R1,152.78330000000,gasCCGT,5,MUS$2010/kt,2035 +1,10,electricity,all-week,night,2025,all-year,R1,0.23330000000,gasCCGT,0,MUS$2010/PJ,2040 +2,10,electricity,all-week,night,2030,all-year,R1,0.58330000000,gasCCGT,0,MUS$2010/PJ,2040 +3,10,electricity,all-week,night,2035,all-year,R1,0.11670000000,gasCCGT,0,MUS$2010/PJ,2040 +1,6,CO2f,all-week,night,2025,all-year,R1,21.38970000000,gasCCGT,0,MUS$2010/kt,2040 +2,6,CO2f,all-week,night,2030,all-year,R1,53.47420000000,gasCCGT,0,MUS$2010/kt,2040 +3,6,CO2f,all-week,night,2035,all-year,R1,10.69480000000,gasCCGT,0,MUS$2010/kt,2040 +1,10,electricity,all-week,morning,2025,all-year,R1,0.35000000000,gasCCGT,1,MUS$2010/PJ,2040 +2,10,electricity,all-week,morning,2030,all-year,R1,0.87500000000,gasCCGT,1,MUS$2010/PJ,2040 +3,10,electricity,all-week,morning,2035,all-year,R1,0.17500000000,gasCCGT,1,MUS$2010/PJ,2040 +1,6,CO2f,all-week,morning,2025,all-year,R1,32.08450000000,gasCCGT,1,MUS$2010/kt,2040 +2,6,CO2f,all-week,morning,2030,all-year,R1,80.21120000000,gasCCGT,1,MUS$2010/kt,2040 +3,6,CO2f,all-week,morning,2035,all-year,R1,16.04220000000,gasCCGT,1,MUS$2010/kt,2040 +1,10,electricity,all-week,afternoon,2025,all-year,R1,0.40000000000,gasCCGT,2,MUS$2010/PJ,2040 +2,10,electricity,all-week,afternoon,2030,all-year,R1,1.00000000000,gasCCGT,2,MUS$2010/PJ,2040 +3,10,electricity,all-week,afternoon,2035,all-year,R1,0.20000000000,gasCCGT,2,MUS$2010/PJ,2040 +1,6,CO2f,all-week,afternoon,2025,all-year,R1,36.66800000000,gasCCGT,2,MUS$2010/kt,2040 +2,6,CO2f,all-week,afternoon,2030,all-year,R1,91.67000000000,gasCCGT,2,MUS$2010/kt,2040 +3,6,CO2f,all-week,afternoon,2035,all-year,R1,18.33400000000,gasCCGT,2,MUS$2010/kt,2040 +1,10,electricity,all-week,early-peak,2025,all-year,R1,0.35000000000,gasCCGT,3,MUS$2010/PJ,2040 +2,10,electricity,all-week,early-peak,2030,all-year,R1,0.87500000000,gasCCGT,3,MUS$2010/PJ,2040 +3,10,electricity,all-week,early-peak,2035,all-year,R1,0.17500000000,gasCCGT,3,MUS$2010/PJ,2040 +1,6,CO2f,all-week,early-peak,2025,all-year,R1,32.08450000000,gasCCGT,3,MUS$2010/kt,2040 +2,6,CO2f,all-week,early-peak,2030,all-year,R1,80.21120000000,gasCCGT,3,MUS$2010/kt,2040 +3,6,CO2f,all-week,early-peak,2035,all-year,R1,16.04220000000,gasCCGT,3,MUS$2010/kt,2040 +1,10,electricity,all-week,late-peak,2025,all-year,R1,0.66670000000,gasCCGT,4,MUS$2010/PJ,2040 +2,10,electricity,all-week,late-peak,2030,all-year,R1,1.66670000000,gasCCGT,4,MUS$2010/PJ,2040 +3,10,electricity,all-week,late-peak,2035,all-year,R1,0.33330000000,gasCCGT,4,MUS$2010/PJ,2040 +1,6,CO2f,all-week,late-peak,2025,all-year,R1,61.11330000000,gasCCGT,4,MUS$2010/kt,2040 +2,6,CO2f,all-week,late-peak,2030,all-year,R1,152.78330000000,gasCCGT,4,MUS$2010/kt,2040 +3,6,CO2f,all-week,late-peak,2035,all-year,R1,30.55670000000,gasCCGT,4,MUS$2010/kt,2040 +1,10,electricity,all-week,evening,2025,all-year,R1,0.66670000000,gasCCGT,5,MUS$2010/PJ,2040 +2,10,electricity,all-week,evening,2030,all-year,R1,1.66670000000,gasCCGT,5,MUS$2010/PJ,2040 +3,10,electricity,all-week,evening,2035,all-year,R1,0.33330000000,gasCCGT,5,MUS$2010/PJ,2040 +1,6,CO2f,all-week,evening,2025,all-year,R1,61.11330000000,gasCCGT,5,MUS$2010/kt,2040 +2,6,CO2f,all-week,evening,2030,all-year,R1,152.78330000000,gasCCGT,5,MUS$2010/kt,2040 +3,6,CO2f,all-week,evening,2035,all-year,R1,30.55670000000,gasCCGT,5,MUS$2010/kt,2040 +1,10,electricity,all-week,night,2025,all-year,R1,0.22460000000,gasCCGT,0,MUS$2010/PJ,2045 +2,10,electricity,all-week,night,2030,all-year,R1,0.56140000000,gasCCGT,0,MUS$2010/PJ,2045 +3,10,electricity,all-week,night,2035,all-year,R1,0.11230000000,gasCCGT,0,MUS$2010/PJ,2045 +4,10,electricity,all-week,night,2040,all-year,R1,0.16840000000,windturbine,0,MUS$2010/PJ,2045 +1,6,CO2f,all-week,night,2025,all-year,R1,20.58550000000,gasCCGT,0,MUS$2010/kt,2045 +2,6,CO2f,all-week,night,2030,all-year,R1,51.46390000000,gasCCGT,0,MUS$2010/kt,2045 +3,6,CO2f,all-week,night,2035,all-year,R1,10.29280000000,gasCCGT,0,MUS$2010/kt,2045 +1,10,electricity,all-week,morning,2025,all-year,R1,0.36570000000,gasCCGT,1,MUS$2010/PJ,2045 +2,10,electricity,all-week,morning,2030,all-year,R1,0.91430000000,gasCCGT,1,MUS$2010/PJ,2045 +3,10,electricity,all-week,morning,2035,all-year,R1,0.18290000000,gasCCGT,1,MUS$2010/PJ,2045 +4,10,electricity,all-week,morning,2040,all-year,R1,0.13710000000,windturbine,1,MUS$2010/PJ,2045 +1,6,CO2f,all-week,morning,2025,all-year,R1,33.52500000000,gasCCGT,1,MUS$2010/kt,2045 +2,6,CO2f,all-week,morning,2030,all-year,R1,83.81260000000,gasCCGT,1,MUS$2010/kt,2045 +3,6,CO2f,all-week,morning,2035,all-year,R1,16.76250000000,gasCCGT,1,MUS$2010/kt,2045 +1,10,electricity,all-week,afternoon,2025,all-year,R1,0.40000000000,gasCCGT,2,MUS$2010/PJ,2045 +2,10,electricity,all-week,afternoon,2030,all-year,R1,1.00000000000,gasCCGT,2,MUS$2010/PJ,2045 +3,10,electricity,all-week,afternoon,2035,all-year,R1,0.20000000000,gasCCGT,2,MUS$2010/PJ,2045 +4,10,electricity,all-week,afternoon,2040,all-year,R1,0.09140000000,windturbine,2,MUS$2010/PJ,2045 +1,6,CO2f,all-week,afternoon,2025,all-year,R1,36.66800000000,gasCCGT,2,MUS$2010/kt,2045 +2,6,CO2f,all-week,afternoon,2030,all-year,R1,91.67000000000,gasCCGT,2,MUS$2010/kt,2045 +3,6,CO2f,all-week,afternoon,2035,all-year,R1,18.33400000000,gasCCGT,2,MUS$2010/kt,2045 +1,10,electricity,all-week,early-peak,2025,all-year,R1,0.33680000000,gasCCGT,3,MUS$2010/PJ,2045 +2,10,electricity,all-week,early-peak,2030,all-year,R1,0.84210000000,gasCCGT,3,MUS$2010/PJ,2045 +3,10,electricity,all-week,early-peak,2035,all-year,R1,0.16840000000,gasCCGT,3,MUS$2010/PJ,2045 +4,10,electricity,all-week,early-peak,2040,all-year,R1,0.25260000000,windturbine,3,MUS$2010/PJ,2045 +1,6,CO2f,all-week,early-peak,2025,all-year,R1,30.87830000000,gasCCGT,3,MUS$2010/kt,2045 +2,6,CO2f,all-week,early-peak,2030,all-year,R1,77.19580000000,gasCCGT,3,MUS$2010/kt,2045 +3,6,CO2f,all-week,early-peak,2035,all-year,R1,15.43920000000,gasCCGT,3,MUS$2010/kt,2045 +1,10,electricity,all-week,late-peak,2025,all-year,R1,0.66670000000,gasCCGT,4,MUS$2010/PJ,2045 +2,10,electricity,all-week,late-peak,2030,all-year,R1,1.66670000000,gasCCGT,4,MUS$2010/PJ,2045 +3,10,electricity,all-week,late-peak,2035,all-year,R1,0.33330000000,gasCCGT,4,MUS$2010/PJ,2045 +4,10,electricity,all-week,late-peak,2040,all-year,R1,0.50000000000,windturbine,4,MUS$2010/PJ,2045 +1,6,CO2f,all-week,late-peak,2025,all-year,R1,61.11330000000,gasCCGT,4,MUS$2010/kt,2045 +2,6,CO2f,all-week,late-peak,2030,all-year,R1,152.78330000000,gasCCGT,4,MUS$2010/kt,2045 +3,6,CO2f,all-week,late-peak,2035,all-year,R1,30.55670000000,gasCCGT,4,MUS$2010/kt,2045 +1,10,electricity,all-week,evening,2025,all-year,R1,0.66670000000,gasCCGT,5,MUS$2010/PJ,2045 +2,10,electricity,all-week,evening,2030,all-year,R1,1.66670000000,gasCCGT,5,MUS$2010/PJ,2045 +3,10,electricity,all-week,evening,2035,all-year,R1,0.33330000000,gasCCGT,5,MUS$2010/PJ,2045 +4,10,electricity,all-week,evening,2040,all-year,R1,0.33680000000,windturbine,5,MUS$2010/PJ,2045 +1,6,CO2f,all-week,evening,2025,all-year,R1,61.11330000000,gasCCGT,5,MUS$2010/kt,2045 +2,6,CO2f,all-week,evening,2030,all-year,R1,152.78330000000,gasCCGT,5,MUS$2010/kt,2045 +3,6,CO2f,all-week,evening,2035,all-year,R1,30.55670000000,gasCCGT,5,MUS$2010/kt,2045 +1,10,electricity,all-week,night,2025,all-year,R1,0.22860000000,gasCCGT,0,MUS$2010/PJ,2050 +2,10,electricity,all-week,night,2030,all-year,R1,0.57140000000,gasCCGT,0,MUS$2010/PJ,2050 +3,10,electricity,all-week,night,2035,all-year,R1,0.11430000000,gasCCGT,0,MUS$2010/PJ,2050 +4,10,electricity,all-week,night,2040,all-year,R1,0.17140000000,windturbine,0,MUS$2010/PJ,2050 +5,10,electricity,all-week,night,2045,all-year,R1,0.11430000000,windturbine,0,MUS$2010/PJ,2050 +1,6,CO2f,all-week,night,2025,all-year,R1,20.95310000000,gasCCGT,0,MUS$2010/kt,2050 +2,6,CO2f,all-week,night,2030,all-year,R1,52.38290000000,gasCCGT,0,MUS$2010/kt,2050 +3,6,CO2f,all-week,night,2035,all-year,R1,10.47660000000,gasCCGT,0,MUS$2010/kt,2050 +1,10,electricity,all-week,morning,2025,all-year,R1,0.38920000000,gasCCGT,1,MUS$2010/PJ,2050 +2,10,electricity,all-week,morning,2030,all-year,R1,0.97300000000,gasCCGT,1,MUS$2010/PJ,2050 +3,10,electricity,all-week,morning,2035,all-year,R1,0.19460000000,gasCCGT,1,MUS$2010/PJ,2050 +4,10,electricity,all-week,morning,2040,all-year,R1,0.14590000000,windturbine,1,MUS$2010/PJ,2050 +5,10,electricity,all-week,morning,2045,all-year,R1,0.09730000000,windturbine,1,MUS$2010/PJ,2050 +1,6,CO2f,all-week,morning,2025,all-year,R1,35.67700000000,gasCCGT,1,MUS$2010/kt,2050 +2,6,CO2f,all-week,morning,2030,all-year,R1,89.19240000000,gasCCGT,1,MUS$2010/kt,2050 +3,6,CO2f,all-week,morning,2035,all-year,R1,17.83850000000,gasCCGT,1,MUS$2010/kt,2050 +1,10,electricity,all-week,afternoon,2025,all-year,R1,0.40000000000,gasCCGT,2,MUS$2010/PJ,2050 +2,10,electricity,all-week,afternoon,2030,all-year,R1,1.00000000000,gasCCGT,2,MUS$2010/PJ,2050 +3,10,electricity,all-week,afternoon,2035,all-year,R1,0.20000000000,gasCCGT,2,MUS$2010/PJ,2050 +4,10,electricity,all-week,afternoon,2040,all-year,R1,0.09730000000,windturbine,2,MUS$2010/PJ,2050 +5,10,electricity,all-week,afternoon,2045,all-year,R1,0.06490000000,windturbine,2,MUS$2010/PJ,2050 +1,6,CO2f,all-week,afternoon,2025,all-year,R1,36.66800000000,gasCCGT,2,MUS$2010/kt,2050 +2,6,CO2f,all-week,afternoon,2030,all-year,R1,91.67000000000,gasCCGT,2,MUS$2010/kt,2050 +3,6,CO2f,all-week,afternoon,2035,all-year,R1,18.33400000000,gasCCGT,2,MUS$2010/kt,2050 +1,10,electricity,all-week,early-peak,2025,all-year,R1,0.34290000000,gasCCGT,3,MUS$2010/PJ,2050 +2,10,electricity,all-week,early-peak,2030,all-year,R1,0.85710000000,gasCCGT,3,MUS$2010/PJ,2050 +3,10,electricity,all-week,early-peak,2035,all-year,R1,0.17140000000,gasCCGT,3,MUS$2010/PJ,2050 +4,10,electricity,all-week,early-peak,2040,all-year,R1,0.25710000000,windturbine,3,MUS$2010/PJ,2050 +5,10,electricity,all-week,early-peak,2045,all-year,R1,0.17140000000,windturbine,3,MUS$2010/PJ,2050 +1,6,CO2f,all-week,early-peak,2025,all-year,R1,31.42970000000,gasCCGT,3,MUS$2010/kt,2050 +2,6,CO2f,all-week,early-peak,2030,all-year,R1,78.57430000000,gasCCGT,3,MUS$2010/kt,2050 +3,6,CO2f,all-week,early-peak,2035,all-year,R1,15.71490000000,gasCCGT,3,MUS$2010/kt,2050 +1,10,electricity,all-week,late-peak,2025,all-year,R1,0.66670000000,gasCCGT,4,MUS$2010/PJ,2050 +2,10,electricity,all-week,late-peak,2030,all-year,R1,1.66670000000,gasCCGT,4,MUS$2010/PJ,2050 +3,10,electricity,all-week,late-peak,2035,all-year,R1,0.33330000000,gasCCGT,4,MUS$2010/PJ,2050 +4,10,electricity,all-week,late-peak,2040,all-year,R1,0.50000000000,windturbine,4,MUS$2010/PJ,2050 +5,10,electricity,all-week,late-peak,2045,all-year,R1,0.33330000000,windturbine,4,MUS$2010/PJ,2050 +1,6,CO2f,all-week,late-peak,2025,all-year,R1,61.11330000000,gasCCGT,4,MUS$2010/kt,2050 +2,6,CO2f,all-week,late-peak,2030,all-year,R1,152.78330000000,gasCCGT,4,MUS$2010/kt,2050 +3,6,CO2f,all-week,late-peak,2035,all-year,R1,30.55670000000,gasCCGT,4,MUS$2010/kt,2050 +1,10,electricity,all-week,evening,2025,all-year,R1,0.66670000000,gasCCGT,5,MUS$2010/PJ,2050 +2,10,electricity,all-week,evening,2030,all-year,R1,1.66670000000,gasCCGT,5,MUS$2010/PJ,2050 +3,10,electricity,all-week,evening,2035,all-year,R1,0.33330000000,gasCCGT,5,MUS$2010/PJ,2050 +4,10,electricity,all-week,evening,2040,all-year,R1,0.34290000000,windturbine,5,MUS$2010/PJ,2050 +5,10,electricity,all-week,evening,2045,all-year,R1,0.22860000000,windturbine,5,MUS$2010/PJ,2050 +1,6,CO2f,all-week,evening,2025,all-year,R1,61.11330000000,gasCCGT,5,MUS$2010/kt,2050 +2,6,CO2f,all-week,evening,2030,all-year,R1,152.78330000000,gasCCGT,5,MUS$2010/kt,2050 +3,6,CO2f,all-week,evening,2035,all-year,R1,30.55670000000,gasCCGT,5,MUS$2010/kt,2050 diff --git a/docs/user-guide/min-max-timeslice-constraints.ipynb b/docs/user-guide/min-max-timeslice-constraints.ipynb index d46948a05..02b01bfb3 100644 --- a/docs/user-guide/min-max-timeslice-constraints.ipynb +++ b/docs/user-guide/min-max-timeslice-constraints.ipynb @@ -193,11 +193,11 @@ "power_supply = pd.read_csv(\n", " \"../tutorial-code/min-max-timeslice-constraints/2-max-constraint/Results/Power_Supply.csv\"\n", ")\n", - "windturbine_electricity_supply_2035 = (\n", + "windturbine_electricity_supply_2050 = (\n", " power_supply[\n", " (power_supply.technology == \"windturbine\")\n", " & (power_supply.commodity == \"electricity\")\n", - " & (power_supply.year == 2035)\n", + " & (power_supply.year == 2050)\n", " ]\n", " .groupby([\"timeslice\", \"technology\"])\n", " .sum()\n", @@ -205,12 +205,12 @@ ")\n", "\n", "ax = sns.barplot(\n", - " data=windturbine_electricity_supply_2035,\n", + " data=windturbine_electricity_supply_2050,\n", " x=\"timeslice\",\n", " y=\"supply\",\n", " hue=\"technology\",\n", ")\n", - "ax.set_title(\"Electricity supply from windturbine in 2035\")" + "ax.set_title(\"Electricity supply from windturbine in 2050\")" ] }, { diff --git a/tests/example_outputs/default_timeslice/MCAPrices.csv b/tests/example_outputs/default_timeslice/MCAPrices.csv index 50b23bf33..ee2ed867b 100644 --- a/tests/example_outputs/default_timeslice/MCAPrices.csv +++ b/tests/example_outputs/default_timeslice/MCAPrices.csv @@ -23,29 +23,29 @@ electricity,all-week,evening,all-year,19.50000000000,R1,5,MUS$2010/PJ,2020 gas,all-week,evening,all-year,7.15280000000,R1,5,MUS$2010/PJ,2020 heat,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.08310000000,R1,5,MUS$2010/kt,2020 -electricity,all-week,night,all-year,0.66670000000,R1,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,2.31520000000,R1,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,2.15580000000,R1,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,3.25460000000,R1,0,MUS$2010/PJ,2025 CO2f,all-week,night,all-year,0.12010000000,R1,0,MUS$2010/kt,2025 -electricity,all-week,morning,all-year,0.66670000000,R1,1,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,2.31520000000,R1,1,MUS$2010/PJ,2025 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,2.15580000000,R1,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,3.25460000000,R1,1,MUS$2010/PJ,2025 CO2f,all-week,morning,all-year,0.12010000000,R1,1,MUS$2010/kt,2025 -electricity,all-week,afternoon,all-year,0.66670000000,R1,2,MUS$2010/PJ,2025 +electricity,all-week,afternoon,all-year,2.31520000000,R1,2,MUS$2010/PJ,2025 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2025 -heat,all-week,afternoon,all-year,2.15580000000,R1,2,MUS$2010/PJ,2025 +heat,all-week,afternoon,all-year,3.25460000000,R1,2,MUS$2010/PJ,2025 CO2f,all-week,afternoon,all-year,0.12010000000,R1,2,MUS$2010/kt,2025 -electricity,all-week,early-peak,all-year,0.66670000000,R1,3,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,2.31520000000,R1,3,MUS$2010/PJ,2025 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,2.15580000000,R1,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,3.25460000000,R1,3,MUS$2010/PJ,2025 CO2f,all-week,early-peak,all-year,0.12010000000,R1,3,MUS$2010/kt,2025 electricity,all-week,late-peak,all-year,2.31520000000,R1,4,MUS$2010/PJ,2025 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2025 heat,all-week,late-peak,all-year,3.25460000000,R1,4,MUS$2010/PJ,2025 CO2f,all-week,late-peak,all-year,0.12010000000,R1,4,MUS$2010/kt,2025 -electricity,all-week,evening,all-year,0.66670000000,R1,5,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,2.31520000000,R1,5,MUS$2010/PJ,2025 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,2.15580000000,R1,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,3.25460000000,R1,5,MUS$2010/PJ,2025 CO2f,all-week,evening,all-year,0.12010000000,R1,5,MUS$2010/kt,2025 electricity,all-week,night,all-year,0.66670000000,R1,0,MUS$2010/PJ,2030 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2030 diff --git a/tests/example_outputs/default_timeslice/Power_Supply.csv b/tests/example_outputs/default_timeslice/Power_Supply.csv index 6b6aeb5e1..628fcd016 100644 --- a/tests/example_outputs/default_timeslice/Power_Supply.csv +++ b/tests/example_outputs/default_timeslice/Power_Supply.csv @@ -1,123 +1,133 @@ -asset,comm_usage,commodity,day,hour,installed,month,region,supply,technology,timeslice,year -0,10,electricity,all-week,late-peak,2020,all-year,R1,0.16670000000,gasCCGT,4,2025 -0,6,CO2f,all-week,late-peak,2020,all-year,R1,15.27830000000,gasCCGT,4,2025 -1,10,electricity,all-week,night,2020,all-year,R1,0.42220000000,windturbine,0,2025 -1,10,electricity,all-week,morning,2020,all-year,R1,0.63330000000,windturbine,1,2025 -1,10,electricity,all-week,afternoon,2020,all-year,R1,0.42220000000,windturbine,2,2025 -1,10,electricity,all-week,early-peak,2020,all-year,R1,0.63330000000,windturbine,3,2025 -1,10,electricity,all-week,late-peak,2020,all-year,R1,1.00000000000,windturbine,4,2025 -1,10,electricity,all-week,evening,2020,all-year,R1,0.84440000000,windturbine,5,2025 -1,10,electricity,all-week,night,2020,all-year,R1,0.36360000000,windturbine,0,2030 -1,10,electricity,all-week,morning,2020,all-year,R1,0.54550000000,windturbine,1,2030 -1,10,electricity,all-week,afternoon,2020,all-year,R1,0.36360000000,windturbine,2,2030 -1,10,electricity,all-week,early-peak,2020,all-year,R1,0.54550000000,windturbine,3,2030 -1,10,electricity,all-week,late-peak,2020,all-year,R1,1.00000000000,windturbine,4,2030 -1,10,electricity,all-week,evening,2020,all-year,R1,0.72730000000,windturbine,5,2030 -2,10,electricity,all-week,night,2025,all-year,R1,0.30300000000,windturbine,0,2030 -2,10,electricity,all-week,morning,2025,all-year,R1,0.45450000000,windturbine,1,2030 -2,10,electricity,all-week,afternoon,2025,all-year,R1,0.30300000000,windturbine,2,2030 -2,10,electricity,all-week,early-peak,2025,all-year,R1,0.45450000000,windturbine,3,2030 -2,10,electricity,all-week,late-peak,2025,all-year,R1,0.83330000000,windturbine,4,2030 -2,10,electricity,all-week,evening,2025,all-year,R1,0.60610000000,windturbine,5,2030 -1,10,electricity,all-week,night,2020,all-year,R1,0.34290000000,windturbine,0,2035 -1,10,electricity,all-week,morning,2020,all-year,R1,0.51430000000,windturbine,1,2035 -1,10,electricity,all-week,afternoon,2020,all-year,R1,0.34290000000,windturbine,2,2035 -1,10,electricity,all-week,early-peak,2020,all-year,R1,0.51430000000,windturbine,3,2035 -1,10,electricity,all-week,late-peak,2020,all-year,R1,1.00000000000,windturbine,4,2035 -1,10,electricity,all-week,evening,2020,all-year,R1,0.68570000000,windturbine,5,2035 -2,10,electricity,all-week,night,2025,all-year,R1,0.28570000000,windturbine,0,2035 -2,10,electricity,all-week,morning,2025,all-year,R1,0.42860000000,windturbine,1,2035 -2,10,electricity,all-week,afternoon,2025,all-year,R1,0.28570000000,windturbine,2,2035 -2,10,electricity,all-week,early-peak,2025,all-year,R1,0.42860000000,windturbine,3,2035 -2,10,electricity,all-week,late-peak,2025,all-year,R1,0.83330000000,windturbine,4,2035 -2,10,electricity,all-week,evening,2025,all-year,R1,0.57140000000,windturbine,5,2035 -3,10,electricity,all-week,night,2030,all-year,R1,0.17140000000,windturbine,0,2035 -3,10,electricity,all-week,morning,2030,all-year,R1,0.25710000000,windturbine,1,2035 -3,10,electricity,all-week,afternoon,2030,all-year,R1,0.17140000000,windturbine,2,2035 -3,10,electricity,all-week,early-peak,2030,all-year,R1,0.25710000000,windturbine,3,2035 -3,10,electricity,all-week,late-peak,2030,all-year,R1,0.50000000000,windturbine,4,2035 -3,10,electricity,all-week,evening,2030,all-year,R1,0.34290000000,windturbine,5,2035 -1,10,electricity,all-week,night,2020,all-year,R1,0.35000000000,windturbine,0,2040 -1,10,electricity,all-week,morning,2020,all-year,R1,0.52500000000,windturbine,1,2040 -1,10,electricity,all-week,afternoon,2020,all-year,R1,0.35000000000,windturbine,2,2040 -1,10,electricity,all-week,early-peak,2020,all-year,R1,0.52500000000,windturbine,3,2040 -1,10,electricity,all-week,late-peak,2020,all-year,R1,1.00000000000,windturbine,4,2040 -1,10,electricity,all-week,evening,2020,all-year,R1,0.70000000000,windturbine,5,2040 -2,10,electricity,all-week,night,2025,all-year,R1,0.29170000000,windturbine,0,2040 -2,10,electricity,all-week,morning,2025,all-year,R1,0.43750000000,windturbine,1,2040 -2,10,electricity,all-week,afternoon,2025,all-year,R1,0.29170000000,windturbine,2,2040 -2,10,electricity,all-week,early-peak,2025,all-year,R1,0.43750000000,windturbine,3,2040 -2,10,electricity,all-week,late-peak,2025,all-year,R1,0.83330000000,windturbine,4,2040 -2,10,electricity,all-week,evening,2025,all-year,R1,0.58330000000,windturbine,5,2040 -3,10,electricity,all-week,night,2030,all-year,R1,0.17500000000,windturbine,0,2040 -3,10,electricity,all-week,morning,2030,all-year,R1,0.26250000000,windturbine,1,2040 -3,10,electricity,all-week,afternoon,2030,all-year,R1,0.17500000000,windturbine,2,2040 -3,10,electricity,all-week,early-peak,2030,all-year,R1,0.26250000000,windturbine,3,2040 -3,10,electricity,all-week,late-peak,2030,all-year,R1,0.50000000000,windturbine,4,2040 -3,10,electricity,all-week,evening,2030,all-year,R1,0.35000000000,windturbine,5,2040 -4,10,electricity,all-week,night,2035,all-year,R1,0.11670000000,windturbine,0,2040 -4,10,electricity,all-week,morning,2035,all-year,R1,0.17500000000,windturbine,1,2040 -4,10,electricity,all-week,afternoon,2035,all-year,R1,0.11670000000,windturbine,2,2040 -4,10,electricity,all-week,early-peak,2035,all-year,R1,0.17500000000,windturbine,3,2040 -4,10,electricity,all-week,late-peak,2035,all-year,R1,0.33330000000,windturbine,4,2040 -4,10,electricity,all-week,evening,2035,all-year,R1,0.23330000000,windturbine,5,2040 -1,10,electricity,all-week,night,2020,all-year,R1,0.33680000000,windturbine,0,2045 -1,10,electricity,all-week,morning,2020,all-year,R1,0.50530000000,windturbine,1,2045 -1,10,electricity,all-week,afternoon,2020,all-year,R1,0.33680000000,windturbine,2,2045 -1,10,electricity,all-week,early-peak,2020,all-year,R1,0.50530000000,windturbine,3,2045 -1,10,electricity,all-week,late-peak,2020,all-year,R1,1.00000000000,windturbine,4,2045 -1,10,electricity,all-week,evening,2020,all-year,R1,0.67370000000,windturbine,5,2045 -2,10,electricity,all-week,night,2025,all-year,R1,0.28070000000,windturbine,0,2045 -2,10,electricity,all-week,morning,2025,all-year,R1,0.42110000000,windturbine,1,2045 -2,10,electricity,all-week,afternoon,2025,all-year,R1,0.28070000000,windturbine,2,2045 -2,10,electricity,all-week,early-peak,2025,all-year,R1,0.42110000000,windturbine,3,2045 -2,10,electricity,all-week,late-peak,2025,all-year,R1,0.83330000000,windturbine,4,2045 -2,10,electricity,all-week,evening,2025,all-year,R1,0.56140000000,windturbine,5,2045 -3,10,electricity,all-week,night,2030,all-year,R1,0.16840000000,windturbine,0,2045 -3,10,electricity,all-week,morning,2030,all-year,R1,0.25260000000,windturbine,1,2045 -3,10,electricity,all-week,afternoon,2030,all-year,R1,0.16840000000,windturbine,2,2045 -3,10,electricity,all-week,early-peak,2030,all-year,R1,0.25260000000,windturbine,3,2045 -3,10,electricity,all-week,late-peak,2030,all-year,R1,0.50000000000,windturbine,4,2045 -3,10,electricity,all-week,evening,2030,all-year,R1,0.33680000000,windturbine,5,2045 -4,10,electricity,all-week,night,2035,all-year,R1,0.11230000000,windturbine,0,2045 -4,10,electricity,all-week,morning,2035,all-year,R1,0.16840000000,windturbine,1,2045 -4,10,electricity,all-week,afternoon,2035,all-year,R1,0.11230000000,windturbine,2,2045 -4,10,electricity,all-week,early-peak,2035,all-year,R1,0.16840000000,windturbine,3,2045 -4,10,electricity,all-week,late-peak,2035,all-year,R1,0.33330000000,windturbine,4,2045 -4,10,electricity,all-week,evening,2035,all-year,R1,0.22460000000,windturbine,5,2045 -5,10,electricity,all-week,night,2040,all-year,R1,0.16840000000,windturbine,0,2045 -5,10,electricity,all-week,morning,2040,all-year,R1,0.25260000000,windturbine,1,2045 -5,10,electricity,all-week,afternoon,2040,all-year,R1,0.16840000000,windturbine,2,2045 -5,10,electricity,all-week,early-peak,2040,all-year,R1,0.25260000000,windturbine,3,2045 -5,10,electricity,all-week,late-peak,2040,all-year,R1,0.50000000000,windturbine,4,2045 -5,10,electricity,all-week,evening,2040,all-year,R1,0.33680000000,windturbine,5,2045 -2,10,electricity,all-week,night,2025,all-year,R1,0.28570000000,windturbine,0,2050 -2,10,electricity,all-week,morning,2025,all-year,R1,0.42860000000,windturbine,1,2050 -2,10,electricity,all-week,afternoon,2025,all-year,R1,0.28570000000,windturbine,2,2050 -2,10,electricity,all-week,early-peak,2025,all-year,R1,0.42860000000,windturbine,3,2050 -2,10,electricity,all-week,late-peak,2025,all-year,R1,0.83330000000,windturbine,4,2050 -2,10,electricity,all-week,evening,2025,all-year,R1,0.57140000000,windturbine,5,2050 -3,10,electricity,all-week,night,2030,all-year,R1,0.17140000000,windturbine,0,2050 -3,10,electricity,all-week,morning,2030,all-year,R1,0.25710000000,windturbine,1,2050 -3,10,electricity,all-week,afternoon,2030,all-year,R1,0.17140000000,windturbine,2,2050 -3,10,electricity,all-week,early-peak,2030,all-year,R1,0.25710000000,windturbine,3,2050 -3,10,electricity,all-week,late-peak,2030,all-year,R1,0.50000000000,windturbine,4,2050 -3,10,electricity,all-week,evening,2030,all-year,R1,0.34290000000,windturbine,5,2050 -4,10,electricity,all-week,night,2035,all-year,R1,0.11430000000,windturbine,0,2050 -4,10,electricity,all-week,morning,2035,all-year,R1,0.17140000000,windturbine,1,2050 -4,10,electricity,all-week,afternoon,2035,all-year,R1,0.11430000000,windturbine,2,2050 -4,10,electricity,all-week,early-peak,2035,all-year,R1,0.17140000000,windturbine,3,2050 -4,10,electricity,all-week,late-peak,2035,all-year,R1,0.33330000000,windturbine,4,2050 -4,10,electricity,all-week,evening,2035,all-year,R1,0.22860000000,windturbine,5,2050 -5,10,electricity,all-week,night,2040,all-year,R1,0.17140000000,windturbine,0,2050 -5,10,electricity,all-week,morning,2040,all-year,R1,0.25710000000,windturbine,1,2050 -5,10,electricity,all-week,afternoon,2040,all-year,R1,0.17140000000,windturbine,2,2050 -5,10,electricity,all-week,early-peak,2040,all-year,R1,0.25710000000,windturbine,3,2050 -5,10,electricity,all-week,late-peak,2040,all-year,R1,0.50000000000,windturbine,4,2050 -5,10,electricity,all-week,evening,2040,all-year,R1,0.34290000000,windturbine,5,2050 -6,10,electricity,all-week,night,2045,all-year,R1,0.45710000000,windturbine,0,2050 -6,10,electricity,all-week,morning,2045,all-year,R1,0.68570000000,windturbine,1,2050 -6,10,electricity,all-week,afternoon,2045,all-year,R1,0.45710000000,windturbine,2,2050 -6,10,electricity,all-week,early-peak,2045,all-year,R1,0.68570000000,windturbine,3,2050 -6,10,electricity,all-week,late-peak,2045,all-year,R1,1.33330000000,windturbine,4,2050 -6,10,electricity,all-week,evening,2045,all-year,R1,0.91430000000,windturbine,5,2050 +asset,comm_usage,commodity,day,hour,installed,month,region,supply,technology,timeslice,units_prices,year +0,10,electricity,all-week,night,2020,all-year,R1,0.06030000000,gasCCGT,0,MUS$2010/PJ,2025 +1,10,electricity,all-week,night,2020,all-year,R1,0.36190000000,windturbine,0,MUS$2010/PJ,2025 +0,6,CO2f,all-week,night,2020,all-year,R1,5.52930000000,gasCCGT,0,MUS$2010/kt,2025 +0,10,electricity,all-week,morning,2020,all-year,R1,0.09050000000,gasCCGT,1,MUS$2010/PJ,2025 +1,10,electricity,all-week,morning,2020,all-year,R1,0.54290000000,windturbine,1,MUS$2010/PJ,2025 +0,6,CO2f,all-week,morning,2020,all-year,R1,8.29400000000,gasCCGT,1,MUS$2010/kt,2025 +0,10,electricity,all-week,afternoon,2020,all-year,R1,0.06030000000,gasCCGT,2,MUS$2010/PJ,2025 +1,10,electricity,all-week,afternoon,2020,all-year,R1,0.36190000000,windturbine,2,MUS$2010/PJ,2025 +0,6,CO2f,all-week,afternoon,2020,all-year,R1,5.52930000000,gasCCGT,2,MUS$2010/kt,2025 +0,10,electricity,all-week,early-peak,2020,all-year,R1,0.09050000000,gasCCGT,3,MUS$2010/PJ,2025 +1,10,electricity,all-week,early-peak,2020,all-year,R1,0.54290000000,windturbine,3,MUS$2010/PJ,2025 +0,6,CO2f,all-week,early-peak,2020,all-year,R1,8.29400000000,gasCCGT,3,MUS$2010/kt,2025 +0,10,electricity,all-week,late-peak,2020,all-year,R1,0.16670000000,gasCCGT,4,MUS$2010/PJ,2025 +1,10,electricity,all-week,late-peak,2020,all-year,R1,1.00000000000,windturbine,4,MUS$2010/PJ,2025 +0,6,CO2f,all-week,late-peak,2020,all-year,R1,15.27830000000,gasCCGT,4,MUS$2010/kt,2025 +0,10,electricity,all-week,evening,2020,all-year,R1,0.12060000000,gasCCGT,5,MUS$2010/PJ,2025 +1,10,electricity,all-week,evening,2020,all-year,R1,0.72380000000,windturbine,5,MUS$2010/PJ,2025 +0,6,CO2f,all-week,evening,2020,all-year,R1,11.05860000000,gasCCGT,5,MUS$2010/kt,2025 +1,10,electricity,all-week,night,2020,all-year,R1,0.36360000000,windturbine,0,MUS$2010/PJ,2030 +2,10,electricity,all-week,night,2025,all-year,R1,0.30300000000,windturbine,0,MUS$2010/PJ,2030 +1,10,electricity,all-week,morning,2020,all-year,R1,0.54550000000,windturbine,1,MUS$2010/PJ,2030 +2,10,electricity,all-week,morning,2025,all-year,R1,0.45450000000,windturbine,1,MUS$2010/PJ,2030 +1,10,electricity,all-week,afternoon,2020,all-year,R1,0.36360000000,windturbine,2,MUS$2010/PJ,2030 +2,10,electricity,all-week,afternoon,2025,all-year,R1,0.30300000000,windturbine,2,MUS$2010/PJ,2030 +1,10,electricity,all-week,early-peak,2020,all-year,R1,0.54550000000,windturbine,3,MUS$2010/PJ,2030 +2,10,electricity,all-week,early-peak,2025,all-year,R1,0.45450000000,windturbine,3,MUS$2010/PJ,2030 +1,10,electricity,all-week,late-peak,2020,all-year,R1,1.00000000000,windturbine,4,MUS$2010/PJ,2030 +2,10,electricity,all-week,late-peak,2025,all-year,R1,0.83330000000,windturbine,4,MUS$2010/PJ,2030 +1,10,electricity,all-week,evening,2020,all-year,R1,0.72730000000,windturbine,5,MUS$2010/PJ,2030 +2,10,electricity,all-week,evening,2025,all-year,R1,0.60610000000,windturbine,5,MUS$2010/PJ,2030 +1,10,electricity,all-week,night,2020,all-year,R1,0.34290000000,windturbine,0,MUS$2010/PJ,2035 +2,10,electricity,all-week,night,2025,all-year,R1,0.28570000000,windturbine,0,MUS$2010/PJ,2035 +3,10,electricity,all-week,night,2030,all-year,R1,0.17140000000,windturbine,0,MUS$2010/PJ,2035 +1,10,electricity,all-week,morning,2020,all-year,R1,0.51430000000,windturbine,1,MUS$2010/PJ,2035 +2,10,electricity,all-week,morning,2025,all-year,R1,0.42860000000,windturbine,1,MUS$2010/PJ,2035 +3,10,electricity,all-week,morning,2030,all-year,R1,0.25710000000,windturbine,1,MUS$2010/PJ,2035 +1,10,electricity,all-week,afternoon,2020,all-year,R1,0.34290000000,windturbine,2,MUS$2010/PJ,2035 +2,10,electricity,all-week,afternoon,2025,all-year,R1,0.28570000000,windturbine,2,MUS$2010/PJ,2035 +3,10,electricity,all-week,afternoon,2030,all-year,R1,0.17140000000,windturbine,2,MUS$2010/PJ,2035 +1,10,electricity,all-week,early-peak,2020,all-year,R1,0.51430000000,windturbine,3,MUS$2010/PJ,2035 +2,10,electricity,all-week,early-peak,2025,all-year,R1,0.42860000000,windturbine,3,MUS$2010/PJ,2035 +3,10,electricity,all-week,early-peak,2030,all-year,R1,0.25710000000,windturbine,3,MUS$2010/PJ,2035 +1,10,electricity,all-week,late-peak,2020,all-year,R1,1.00000000000,windturbine,4,MUS$2010/PJ,2035 +2,10,electricity,all-week,late-peak,2025,all-year,R1,0.83330000000,windturbine,4,MUS$2010/PJ,2035 +3,10,electricity,all-week,late-peak,2030,all-year,R1,0.50000000000,windturbine,4,MUS$2010/PJ,2035 +1,10,electricity,all-week,evening,2020,all-year,R1,0.68570000000,windturbine,5,MUS$2010/PJ,2035 +2,10,electricity,all-week,evening,2025,all-year,R1,0.57140000000,windturbine,5,MUS$2010/PJ,2035 +3,10,electricity,all-week,evening,2030,all-year,R1,0.34290000000,windturbine,5,MUS$2010/PJ,2035 +1,10,electricity,all-week,night,2020,all-year,R1,0.35000000000,windturbine,0,MUS$2010/PJ,2040 +2,10,electricity,all-week,night,2025,all-year,R1,0.29170000000,windturbine,0,MUS$2010/PJ,2040 +3,10,electricity,all-week,night,2030,all-year,R1,0.17500000000,windturbine,0,MUS$2010/PJ,2040 +4,10,electricity,all-week,night,2035,all-year,R1,0.11670000000,windturbine,0,MUS$2010/PJ,2040 +1,10,electricity,all-week,morning,2020,all-year,R1,0.52500000000,windturbine,1,MUS$2010/PJ,2040 +2,10,electricity,all-week,morning,2025,all-year,R1,0.43750000000,windturbine,1,MUS$2010/PJ,2040 +3,10,electricity,all-week,morning,2030,all-year,R1,0.26250000000,windturbine,1,MUS$2010/PJ,2040 +4,10,electricity,all-week,morning,2035,all-year,R1,0.17500000000,windturbine,1,MUS$2010/PJ,2040 +1,10,electricity,all-week,afternoon,2020,all-year,R1,0.35000000000,windturbine,2,MUS$2010/PJ,2040 +2,10,electricity,all-week,afternoon,2025,all-year,R1,0.29170000000,windturbine,2,MUS$2010/PJ,2040 +3,10,electricity,all-week,afternoon,2030,all-year,R1,0.17500000000,windturbine,2,MUS$2010/PJ,2040 +4,10,electricity,all-week,afternoon,2035,all-year,R1,0.11670000000,windturbine,2,MUS$2010/PJ,2040 +1,10,electricity,all-week,early-peak,2020,all-year,R1,0.52500000000,windturbine,3,MUS$2010/PJ,2040 +2,10,electricity,all-week,early-peak,2025,all-year,R1,0.43750000000,windturbine,3,MUS$2010/PJ,2040 +3,10,electricity,all-week,early-peak,2030,all-year,R1,0.26250000000,windturbine,3,MUS$2010/PJ,2040 +4,10,electricity,all-week,early-peak,2035,all-year,R1,0.17500000000,windturbine,3,MUS$2010/PJ,2040 +1,10,electricity,all-week,late-peak,2020,all-year,R1,1.00000000000,windturbine,4,MUS$2010/PJ,2040 +2,10,electricity,all-week,late-peak,2025,all-year,R1,0.83330000000,windturbine,4,MUS$2010/PJ,2040 +3,10,electricity,all-week,late-peak,2030,all-year,R1,0.50000000000,windturbine,4,MUS$2010/PJ,2040 +4,10,electricity,all-week,late-peak,2035,all-year,R1,0.33330000000,windturbine,4,MUS$2010/PJ,2040 +1,10,electricity,all-week,evening,2020,all-year,R1,0.70000000000,windturbine,5,MUS$2010/PJ,2040 +2,10,electricity,all-week,evening,2025,all-year,R1,0.58330000000,windturbine,5,MUS$2010/PJ,2040 +3,10,electricity,all-week,evening,2030,all-year,R1,0.35000000000,windturbine,5,MUS$2010/PJ,2040 +4,10,electricity,all-week,evening,2035,all-year,R1,0.23330000000,windturbine,5,MUS$2010/PJ,2040 +1,10,electricity,all-week,night,2020,all-year,R1,0.33680000000,windturbine,0,MUS$2010/PJ,2045 +2,10,electricity,all-week,night,2025,all-year,R1,0.28070000000,windturbine,0,MUS$2010/PJ,2045 +3,10,electricity,all-week,night,2030,all-year,R1,0.16840000000,windturbine,0,MUS$2010/PJ,2045 +4,10,electricity,all-week,night,2035,all-year,R1,0.11230000000,windturbine,0,MUS$2010/PJ,2045 +5,10,electricity,all-week,night,2040,all-year,R1,0.16840000000,windturbine,0,MUS$2010/PJ,2045 +1,10,electricity,all-week,morning,2020,all-year,R1,0.50530000000,windturbine,1,MUS$2010/PJ,2045 +2,10,electricity,all-week,morning,2025,all-year,R1,0.42110000000,windturbine,1,MUS$2010/PJ,2045 +3,10,electricity,all-week,morning,2030,all-year,R1,0.25260000000,windturbine,1,MUS$2010/PJ,2045 +4,10,electricity,all-week,morning,2035,all-year,R1,0.16840000000,windturbine,1,MUS$2010/PJ,2045 +5,10,electricity,all-week,morning,2040,all-year,R1,0.25260000000,windturbine,1,MUS$2010/PJ,2045 +1,10,electricity,all-week,afternoon,2020,all-year,R1,0.33680000000,windturbine,2,MUS$2010/PJ,2045 +2,10,electricity,all-week,afternoon,2025,all-year,R1,0.28070000000,windturbine,2,MUS$2010/PJ,2045 +3,10,electricity,all-week,afternoon,2030,all-year,R1,0.16840000000,windturbine,2,MUS$2010/PJ,2045 +4,10,electricity,all-week,afternoon,2035,all-year,R1,0.11230000000,windturbine,2,MUS$2010/PJ,2045 +5,10,electricity,all-week,afternoon,2040,all-year,R1,0.16840000000,windturbine,2,MUS$2010/PJ,2045 +1,10,electricity,all-week,early-peak,2020,all-year,R1,0.50530000000,windturbine,3,MUS$2010/PJ,2045 +2,10,electricity,all-week,early-peak,2025,all-year,R1,0.42110000000,windturbine,3,MUS$2010/PJ,2045 +3,10,electricity,all-week,early-peak,2030,all-year,R1,0.25260000000,windturbine,3,MUS$2010/PJ,2045 +4,10,electricity,all-week,early-peak,2035,all-year,R1,0.16840000000,windturbine,3,MUS$2010/PJ,2045 +5,10,electricity,all-week,early-peak,2040,all-year,R1,0.25260000000,windturbine,3,MUS$2010/PJ,2045 +1,10,electricity,all-week,late-peak,2020,all-year,R1,1.00000000000,windturbine,4,MUS$2010/PJ,2045 +2,10,electricity,all-week,late-peak,2025,all-year,R1,0.83330000000,windturbine,4,MUS$2010/PJ,2045 +3,10,electricity,all-week,late-peak,2030,all-year,R1,0.50000000000,windturbine,4,MUS$2010/PJ,2045 +4,10,electricity,all-week,late-peak,2035,all-year,R1,0.33330000000,windturbine,4,MUS$2010/PJ,2045 +5,10,electricity,all-week,late-peak,2040,all-year,R1,0.50000000000,windturbine,4,MUS$2010/PJ,2045 +1,10,electricity,all-week,evening,2020,all-year,R1,0.67370000000,windturbine,5,MUS$2010/PJ,2045 +2,10,electricity,all-week,evening,2025,all-year,R1,0.56140000000,windturbine,5,MUS$2010/PJ,2045 +3,10,electricity,all-week,evening,2030,all-year,R1,0.33680000000,windturbine,5,MUS$2010/PJ,2045 +4,10,electricity,all-week,evening,2035,all-year,R1,0.22460000000,windturbine,5,MUS$2010/PJ,2045 +5,10,electricity,all-week,evening,2040,all-year,R1,0.33680000000,windturbine,5,MUS$2010/PJ,2045 +2,10,electricity,all-week,night,2025,all-year,R1,0.28570000000,windturbine,0,MUS$2010/PJ,2050 +3,10,electricity,all-week,night,2030,all-year,R1,0.17140000000,windturbine,0,MUS$2010/PJ,2050 +4,10,electricity,all-week,night,2035,all-year,R1,0.11430000000,windturbine,0,MUS$2010/PJ,2050 +5,10,electricity,all-week,night,2040,all-year,R1,0.17140000000,windturbine,0,MUS$2010/PJ,2050 +6,10,electricity,all-week,night,2045,all-year,R1,0.45710000000,windturbine,0,MUS$2010/PJ,2050 +2,10,electricity,all-week,morning,2025,all-year,R1,0.42860000000,windturbine,1,MUS$2010/PJ,2050 +3,10,electricity,all-week,morning,2030,all-year,R1,0.25710000000,windturbine,1,MUS$2010/PJ,2050 +4,10,electricity,all-week,morning,2035,all-year,R1,0.17140000000,windturbine,1,MUS$2010/PJ,2050 +5,10,electricity,all-week,morning,2040,all-year,R1,0.25710000000,windturbine,1,MUS$2010/PJ,2050 +6,10,electricity,all-week,morning,2045,all-year,R1,0.68570000000,windturbine,1,MUS$2010/PJ,2050 +2,10,electricity,all-week,afternoon,2025,all-year,R1,0.28570000000,windturbine,2,MUS$2010/PJ,2050 +3,10,electricity,all-week,afternoon,2030,all-year,R1,0.17140000000,windturbine,2,MUS$2010/PJ,2050 +4,10,electricity,all-week,afternoon,2035,all-year,R1,0.11430000000,windturbine,2,MUS$2010/PJ,2050 +5,10,electricity,all-week,afternoon,2040,all-year,R1,0.17140000000,windturbine,2,MUS$2010/PJ,2050 +6,10,electricity,all-week,afternoon,2045,all-year,R1,0.45710000000,windturbine,2,MUS$2010/PJ,2050 +2,10,electricity,all-week,early-peak,2025,all-year,R1,0.42860000000,windturbine,3,MUS$2010/PJ,2050 +3,10,electricity,all-week,early-peak,2030,all-year,R1,0.25710000000,windturbine,3,MUS$2010/PJ,2050 +4,10,electricity,all-week,early-peak,2035,all-year,R1,0.17140000000,windturbine,3,MUS$2010/PJ,2050 +5,10,electricity,all-week,early-peak,2040,all-year,R1,0.25710000000,windturbine,3,MUS$2010/PJ,2050 +6,10,electricity,all-week,early-peak,2045,all-year,R1,0.68570000000,windturbine,3,MUS$2010/PJ,2050 +2,10,electricity,all-week,late-peak,2025,all-year,R1,0.83330000000,windturbine,4,MUS$2010/PJ,2050 +3,10,electricity,all-week,late-peak,2030,all-year,R1,0.50000000000,windturbine,4,MUS$2010/PJ,2050 +4,10,electricity,all-week,late-peak,2035,all-year,R1,0.33330000000,windturbine,4,MUS$2010/PJ,2050 +5,10,electricity,all-week,late-peak,2040,all-year,R1,0.50000000000,windturbine,4,MUS$2010/PJ,2050 +6,10,electricity,all-week,late-peak,2045,all-year,R1,1.33330000000,windturbine,4,MUS$2010/PJ,2050 +2,10,electricity,all-week,evening,2025,all-year,R1,0.57140000000,windturbine,5,MUS$2010/PJ,2050 +3,10,electricity,all-week,evening,2030,all-year,R1,0.34290000000,windturbine,5,MUS$2010/PJ,2050 +4,10,electricity,all-week,evening,2035,all-year,R1,0.22860000000,windturbine,5,MUS$2010/PJ,2050 +5,10,electricity,all-week,evening,2040,all-year,R1,0.34290000000,windturbine,5,MUS$2010/PJ,2050 +6,10,electricity,all-week,evening,2045,all-year,R1,0.91430000000,windturbine,5,MUS$2010/PJ,2050 From 98d1bd3e7134edef2ae5ed58c673dfb6868852a7 Mon Sep 17 00:00:00 2001 From: Tom Bland Date: Fri, 18 Oct 2024 09:07:52 +0100 Subject: [PATCH 10/18] Update results files --- .../1-min-constraint/Results/MCACapacity.csv | 8 ++----- .../1-min-constraint/Results/MCAPrices.csv | 24 +++++++++---------- .../1-min-constraint/Results/Power_Supply.csv | 24 +++++++++---------- 3 files changed, 26 insertions(+), 30 deletions(-) diff --git a/docs/tutorial-code/min-max-timeslice-constraints/1-min-constraint/Results/MCACapacity.csv b/docs/tutorial-code/min-max-timeslice-constraints/1-min-constraint/Results/MCACapacity.csv index bbba70582..bfd4187ff 100644 --- a/docs/tutorial-code/min-max-timeslice-constraints/1-min-constraint/Results/MCACapacity.csv +++ b/docs/tutorial-code/min-max-timeslice-constraints/1-min-constraint/Results/MCACapacity.csv @@ -6,25 +6,23 @@ A1,5.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2025 A1,19.00000000000,R1,2020,R1,residential,heatpump,newcapa,2025 A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2025 A1,6.00000000000,R1,2020,R1,power,windturbine,newcapa,2025 -A1,15.42960000000,R1,2020,R1,gas,gassupply1,newcapa,2025 +A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2025 A1,19.00000000000,R1,2020,R1,residential,heatpump,newcapa,2030 A1,10.00000000000,R1,2025,R1,residential,heatpump,newcapa,2030 A1,6.00000000000,R1,2020,R1,power,windturbine,newcapa,2030 A1,5.00000000000,R1,2025,R1,power,windturbine,newcapa,2030 -A1,7.92960000000,R1,2020,R1,gas,gassupply1,newcapa,2030 +A1,7.50000000000,R1,2020,R1,gas,gassupply1,newcapa,2030 A1,10.00000000000,R1,2025,R1,residential,heatpump,newcapa,2035 A1,26.00000000000,R1,2030,R1,residential,heatpump,newcapa,2035 A1,6.00000000000,R1,2020,R1,power,windturbine,newcapa,2035 A1,5.00000000000,R1,2025,R1,power,windturbine,newcapa,2035 A1,3.00000000000,R1,2030,R1,power,windturbine,newcapa,2035 -A1,0.42960000000,R1,2020,R1,gas,gassupply1,newcapa,2035 A1,26.00000000000,R1,2030,R1,residential,heatpump,newcapa,2040 A1,16.00000000000,R1,2035,R1,residential,heatpump,newcapa,2040 A1,6.00000000000,R1,2020,R1,power,windturbine,newcapa,2040 A1,5.00000000000,R1,2025,R1,power,windturbine,newcapa,2040 A1,3.00000000000,R1,2030,R1,power,windturbine,newcapa,2040 A1,2.00000000000,R1,2035,R1,power,windturbine,newcapa,2040 -A1,0.42960000000,R1,2020,R1,gas,gassupply1,newcapa,2040 A1,16.00000000000,R1,2035,R1,residential,heatpump,newcapa,2045 A1,32.00000000000,R1,2040,R1,residential,heatpump,newcapa,2045 A1,6.00000000000,R1,2020,R1,power,windturbine,newcapa,2045 @@ -32,7 +30,6 @@ A1,5.00000000000,R1,2025,R1,power,windturbine,newcapa,2045 A1,3.00000000000,R1,2030,R1,power,windturbine,newcapa,2045 A1,2.00000000000,R1,2035,R1,power,windturbine,newcapa,2045 A1,3.00000000000,R1,2040,R1,power,windturbine,newcapa,2045 -A1,0.42960000000,R1,2020,R1,gas,gassupply1,newcapa,2045 A1,32.00000000000,R1,2040,R1,residential,heatpump,newcapa,2050 A1,22.00000000000,R1,2045,R1,residential,heatpump,newcapa,2050 A1,5.00000000000,R1,2025,R1,power,windturbine,newcapa,2050 @@ -40,4 +37,3 @@ A1,3.00000000000,R1,2030,R1,power,windturbine,newcapa,2050 A1,2.00000000000,R1,2035,R1,power,windturbine,newcapa,2050 A1,3.00000000000,R1,2040,R1,power,windturbine,newcapa,2050 A1,8.00000000000,R1,2045,R1,power,windturbine,newcapa,2050 -A1,0.42960000000,R1,2020,R1,gas,gassupply1,newcapa,2050 diff --git a/docs/tutorial-code/min-max-timeslice-constraints/1-min-constraint/Results/MCAPrices.csv b/docs/tutorial-code/min-max-timeslice-constraints/1-min-constraint/Results/MCAPrices.csv index 0ec153c2b..a560bcff2 100644 --- a/docs/tutorial-code/min-max-timeslice-constraints/1-min-constraint/Results/MCAPrices.csv +++ b/docs/tutorial-code/min-max-timeslice-constraints/1-min-constraint/Results/MCAPrices.csv @@ -23,29 +23,29 @@ electricity,all-week,evening,all-year,19.50000000000,R1,5,MUS$2010/PJ,2020 gas,all-week,evening,all-year,7.15280000000,R1,5,MUS$2010/PJ,2020 heat,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.08310000000,R1,5,MUS$2010/kt,2020 -electricity,all-week,night,all-year,4.77400000000,R1,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,2.31520000000,R1,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,4.89340000000,R1,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,3.25460000000,R1,0,MUS$2010/PJ,2025 CO2f,all-week,night,all-year,0.12010000000,R1,0,MUS$2010/kt,2025 -electricity,all-week,morning,all-year,5.56230000000,R1,1,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,2.31520000000,R1,1,MUS$2010/PJ,2025 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,5.41880000000,R1,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,3.25460000000,R1,1,MUS$2010/PJ,2025 CO2f,all-week,morning,all-year,0.12010000000,R1,1,MUS$2010/kt,2025 -electricity,all-week,afternoon,all-year,7.86470000000,R1,2,MUS$2010/PJ,2025 +electricity,all-week,afternoon,all-year,3.16500000000,R1,2,MUS$2010/PJ,2025 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2025 -heat,all-week,afternoon,all-year,6.95350000000,R1,2,MUS$2010/PJ,2025 +heat,all-week,afternoon,all-year,3.82100000000,R1,2,MUS$2010/PJ,2025 CO2f,all-week,afternoon,all-year,0.12010000000,R1,2,MUS$2010/kt,2025 -electricity,all-week,early-peak,all-year,5.56230000000,R1,3,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,2.31520000000,R1,3,MUS$2010/PJ,2025 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,5.41880000000,R1,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,3.25460000000,R1,3,MUS$2010/PJ,2025 CO2f,all-week,early-peak,all-year,0.12010000000,R1,3,MUS$2010/kt,2025 -electricity,all-week,late-peak,all-year,5.79540000000,R1,4,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,2.31520000000,R1,4,MUS$2010/PJ,2025 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,5.57420000000,R1,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,3.25460000000,R1,4,MUS$2010/PJ,2025 CO2f,all-week,late-peak,all-year,0.12010000000,R1,4,MUS$2010/kt,2025 -electricity,all-week,evening,all-year,7.36100000000,R1,5,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,2.82650000000,R1,5,MUS$2010/PJ,2025 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,6.61770000000,R1,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,3.59540000000,R1,5,MUS$2010/PJ,2025 CO2f,all-week,evening,all-year,0.12010000000,R1,5,MUS$2010/kt,2025 electricity,all-week,night,all-year,0.66670000000,R1,0,MUS$2010/PJ,2030 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2030 diff --git a/docs/tutorial-code/min-max-timeslice-constraints/1-min-constraint/Results/Power_Supply.csv b/docs/tutorial-code/min-max-timeslice-constraints/1-min-constraint/Results/Power_Supply.csv index b1cfbdf0f..e765e8f11 100644 --- a/docs/tutorial-code/min-max-timeslice-constraints/1-min-constraint/Results/Power_Supply.csv +++ b/docs/tutorial-code/min-max-timeslice-constraints/1-min-constraint/Results/Power_Supply.csv @@ -1,22 +1,22 @@ asset,comm_usage,commodity,day,hour,installed,month,region,supply,technology,timeslice,units_prices,year -0,10,electricity,all-week,night,2020,all-year,R1,0.20000000000,gasCCGT,0,MUS$2010/PJ,2025 +0,10,electricity,all-week,night,2020,all-year,R1,0.06030000000,gasCCGT,0,MUS$2010/PJ,2025 1,10,electricity,all-week,night,2020,all-year,R1,0.36190000000,windturbine,0,MUS$2010/PJ,2025 -0,6,CO2f,all-week,night,2020,all-year,R1,18.33400000000,gasCCGT,0,MUS$2010/kt,2025 -0,10,electricity,all-week,morning,2020,all-year,R1,0.40000000000,gasCCGT,1,MUS$2010/PJ,2025 +0,6,CO2f,all-week,night,2020,all-year,R1,5.52930000000,gasCCGT,0,MUS$2010/kt,2025 +0,10,electricity,all-week,morning,2020,all-year,R1,0.09050000000,gasCCGT,1,MUS$2010/PJ,2025 1,10,electricity,all-week,morning,2020,all-year,R1,0.54290000000,windturbine,1,MUS$2010/PJ,2025 -0,6,CO2f,all-week,morning,2020,all-year,R1,36.66800000000,gasCCGT,1,MUS$2010/kt,2025 -0,10,electricity,all-week,afternoon,2020,all-year,R1,0.60000000000,gasCCGT,2,MUS$2010/PJ,2025 +0,6,CO2f,all-week,morning,2020,all-year,R1,8.29400000000,gasCCGT,1,MUS$2010/kt,2025 +0,10,electricity,all-week,afternoon,2020,all-year,R1,0.10000000000,gasCCGT,2,MUS$2010/PJ,2025 1,10,electricity,all-week,afternoon,2020,all-year,R1,0.36190000000,windturbine,2,MUS$2010/PJ,2025 -0,6,CO2f,all-week,afternoon,2020,all-year,R1,55.00200000000,gasCCGT,2,MUS$2010/kt,2025 -0,10,electricity,all-week,early-peak,2020,all-year,R1,0.40000000000,gasCCGT,3,MUS$2010/PJ,2025 +0,6,CO2f,all-week,afternoon,2020,all-year,R1,9.16700000000,gasCCGT,2,MUS$2010/kt,2025 +0,10,electricity,all-week,early-peak,2020,all-year,R1,0.09050000000,gasCCGT,3,MUS$2010/PJ,2025 1,10,electricity,all-week,early-peak,2020,all-year,R1,0.54290000000,windturbine,3,MUS$2010/PJ,2025 -0,6,CO2f,all-week,early-peak,2020,all-year,R1,36.66800000000,gasCCGT,3,MUS$2010/kt,2025 -0,10,electricity,all-week,late-peak,2020,all-year,R1,0.80000000000,gasCCGT,4,MUS$2010/PJ,2025 +0,6,CO2f,all-week,early-peak,2020,all-year,R1,8.29400000000,gasCCGT,3,MUS$2010/kt,2025 +0,10,electricity,all-week,late-peak,2020,all-year,R1,0.16670000000,gasCCGT,4,MUS$2010/PJ,2025 1,10,electricity,all-week,late-peak,2020,all-year,R1,1.00000000000,windturbine,4,MUS$2010/PJ,2025 -0,6,CO2f,all-week,late-peak,2020,all-year,R1,73.33600000000,gasCCGT,4,MUS$2010/kt,2025 -0,10,electricity,all-week,evening,2020,all-year,R1,1.00000000000,gasCCGT,5,MUS$2010/PJ,2025 +0,6,CO2f,all-week,late-peak,2020,all-year,R1,15.27830000000,gasCCGT,4,MUS$2010/kt,2025 +0,10,electricity,all-week,evening,2020,all-year,R1,0.16670000000,gasCCGT,5,MUS$2010/PJ,2025 1,10,electricity,all-week,evening,2020,all-year,R1,0.72380000000,windturbine,5,MUS$2010/PJ,2025 -0,6,CO2f,all-week,evening,2020,all-year,R1,91.67000000000,gasCCGT,5,MUS$2010/kt,2025 +0,6,CO2f,all-week,evening,2020,all-year,R1,15.27830000000,gasCCGT,5,MUS$2010/kt,2025 1,10,electricity,all-week,night,2020,all-year,R1,0.36360000000,windturbine,0,MUS$2010/PJ,2030 2,10,electricity,all-week,night,2025,all-year,R1,0.30300000000,windturbine,0,MUS$2010/PJ,2030 1,10,electricity,all-week,morning,2020,all-year,R1,0.54550000000,windturbine,1,MUS$2010/PJ,2030 From c7f49dd9a5670a2b3603fe2bcd84241968c0321b Mon Sep 17 00:00:00 2001 From: Tom Bland Date: Fri, 18 Oct 2024 09:22:25 +0100 Subject: [PATCH 11/18] Remove redundant convert_timeslice calls from tests --- tests/test_constraints.py | 6 +----- tests/test_demand_share.py | 14 +++---------- tests/test_quantities.py | 40 +++++++++----------------------------- 3 files changed, 13 insertions(+), 47 deletions(-) diff --git a/tests/test_constraints.py b/tests/test_constraints.py index 0f307f321..50b9a9621 100644 --- a/tests/test_constraints.py +++ b/tests/test_constraints.py @@ -73,14 +73,10 @@ def assets(residential): @fixture def market_demand(assets, technologies, market): from muse.quantities import maximum_production - from muse.timeslices import convert_timeslice return 0.8 * maximum_production( technologies.interp(year=2025), - convert_timeslice( - assets.capacity.sel(year=2025).groupby("technology").sum("asset"), - market, - ), + assets.capacity.sel(year=2025).groupby("technology").sum("asset"), ).rename(technology="asset") diff --git a/tests/test_demand_share.py b/tests/test_demand_share.py index 9661a180b..ea4f5e620 100644 --- a/tests/test_demand_share.py +++ b/tests/test_demand_share.py @@ -19,14 +19,9 @@ def _matching_market(technologies, stock, timeslice): from numpy.random import random from muse.quantities import consumption, maximum_production - from muse.timeslices import QuantityType, convert_timeslice market = xr.Dataset() - production = convert_timeslice( - maximum_production(technologies, stock.capacity), - timeslice, - QuantityType.EXTENSIVE, - ) + production = maximum_production(technologies, stock.capacity) market["supply"] = production.sum("asset") market["consumption"] = drop_timeslice( consumption(technologies, production).sum("asset") + market.supply @@ -126,7 +121,6 @@ def test_new_retro_split_zero_new_unmet(technologies, stock, matching_market): def test_new_retro_accounting_identity(technologies, stock, market): from muse.demand_share import new_and_retro_demands from muse.production import factory - from muse.timeslices import QuantityType, convert_timeslice share = new_and_retro_demands( stock.capacity, market, technologies, current_year=2010, forecast=5 @@ -134,14 +128,12 @@ def test_new_retro_accounting_identity(technologies, stock, market): assert (share >= 0).all() production_method = factory() - serviced = convert_timeslice( + serviced = ( production_method( market.interp(year=2015), stock.capacity.interp(year=2015), technologies ) .groupby("region") - .sum("asset"), - market.timeslice, - QuantityType.EXTENSIVE, + .sum("asset") ) consumption = market.consumption.interp(year=2015) diff --git a/tests/test_quantities.py b/tests/test_quantities.py index f0cf73072..2954a9ada 100644 --- a/tests/test_quantities.py +++ b/tests/test_quantities.py @@ -403,7 +403,6 @@ def test_demand_matched_production( ): from muse.commodities import CommodityUsage, is_enduse from muse.quantities import demand_matched_production, maximum_production - from muse.timeslices import QuantityType, convert_timeslice # try and make sure we have a few more outputs than the default fixture technologies.comm_usage[:] = np.random.choice( @@ -414,11 +413,7 @@ def test_demand_matched_production( technologies.fixed_outputs[:] *= is_enduse(technologies.comm_usage) capacity = capacity.sel(year=capacity.year.min(), drop=True) - max_prod = convert_timeslice( - maximum_production(technologies, capacity), - demand.timeslice, - QuantityType.EXTENSIVE, - ) + max_prod = maximum_production(technologies, capacity) demand = max_prod.sum("asset") demand[:] *= np.random.choice([0, 1, 1 / 2, 1 / 3, 1 / 10], demand.shape) prices = xr.zeros_like(demand) @@ -434,7 +429,6 @@ def test_costed_production_exact_match(market, capacity, technologies): costed_production, maximum_production, ) - from muse.timeslices import QuantityType, convert_timeslice from muse.utilities import broadcast_techs if set(capacity.region.values) != set(market.region.values): @@ -445,13 +439,11 @@ def test_costed_production_exact_match(market, capacity, technologies): costs = annual_levelized_cost_of_energy( prices=market.prices.sel(region=technodata.region), technologies=technodata ) - maxdemand = convert_timeslice( + maxdemand = ( xr.Dataset(dict(mp=maximum_production(technologies, capacity))) .groupby("region") .sum("asset") - .mp, - market, - QuantityType.EXTENSIVE, + .mp ) market["consumption"] = drop_timeslice(maxdemand) result = costed_production(market.consumption, costs, capacity, technologies) @@ -469,17 +461,12 @@ def test_costed_production_single_region(market, capacity, technologies): costed_production, maximum_production, ) - from muse.timeslices import QuantityType, convert_timeslice from muse.utilities import broadcast_techs capacity = capacity.drop_vars("region") capacity["region"] = "USA" market = market.sel(region=[capacity.region.values]) - maxdemand = convert_timeslice( - maximum_production(technologies, capacity).sum("asset"), - market, - QuantityType.EXTENSIVE, - ) + maxdemand = maximum_production(technologies, capacity).sum("asset") market["consumption"] = drop_timeslice(0.9 * maxdemand) technodata = broadcast_techs(technologies, capacity) costs = annual_levelized_cost_of_energy( @@ -500,18 +487,15 @@ def test_costed_production_single_year(market, capacity, technologies): costed_production, maximum_production, ) - from muse.timeslices import QuantityType, convert_timeslice from muse.utilities import broadcast_techs capacity = capacity.sel(year=2010) market = market.sel(year=2010) - maxdemand = convert_timeslice( + maxdemand = ( xr.Dataset(dict(mp=maximum_production(technologies, capacity))) .groupby("region") .sum("asset") - .mp, - market, - QuantityType.EXTENSIVE, + .mp ) market["consumption"] = drop_timeslice(0.9 * maxdemand) technodata = broadcast_techs(technologies, capacity) @@ -533,7 +517,6 @@ def test_costed_production_over_capacity(market, capacity, technologies): costed_production, maximum_production, ) - from muse.timeslices import QuantityType, convert_timeslice from muse.utilities import broadcast_techs capacity = capacity.isel(asset=[0, 1, 2]) @@ -541,13 +524,11 @@ def test_costed_production_over_capacity(market, capacity, technologies): capacity.region.values[: len(set(market.region.values))] = list( set(market.region.values) ) - maxdemand = convert_timeslice( + maxdemand = ( xr.Dataset(dict(mp=maximum_production(technologies, capacity))) .groupby("region") .sum("asset") - .mp, - market, - QuantityType.EXTENSIVE, + .mp ) market["consumption"] = drop_timeslice(maxdemand * 0.9) technodata = broadcast_techs(technologies, capacity) @@ -569,7 +550,6 @@ def test_costed_production_with_minimum_service(market, capacity, technologies, costed_production, maximum_production, ) - from muse.timeslices import QuantityType, convert_timeslice from muse.utilities import broadcast_techs if set(capacity.region.values) != set(market.region.values): @@ -580,9 +560,7 @@ def test_costed_production_with_minimum_service(market, capacity, technologies, technologies.utilization_factor.dims, rng.uniform(low=0.5, high=0.9, size=technologies.utilization_factor.shape), ) - maxprod = convert_timeslice( - maximum_production(technologies, capacity), market, QuantityType.EXTENSIVE - ) + maxprod = maximum_production(technologies, capacity) minprod = maxprod * broadcast_techs(technologies.minimum_service_factor, maxprod) maxdemand = xr.Dataset(dict(mp=minprod)).groupby("region").sum("asset").mp market["consumption"] = drop_timeslice(maxdemand * 0.9) From 51bc7a9292b8bd85568c6def85136a04bc4c2cc6 Mon Sep 17 00:00:00 2001 From: Tom Bland Date: Fri, 18 Oct 2024 10:31:51 +0100 Subject: [PATCH 12/18] Fix some tests --- tests/conftest.py | 15 +++++++-------- tests/test_quantities.py | 38 +++++++++++++++++++++----------------- 2 files changed, 28 insertions(+), 25 deletions(-) diff --git a/tests/conftest.py b/tests/conftest.py index 0443eb8a3..37c187102 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -161,17 +161,17 @@ def save_timeslice_globals(): @fixture -def default_timeslice_globals(save_timeslice_globals): - from muse import timeslices +def default_timeslice_globals(): + from muse.timeslices import DEFAULT_TIMESLICE_DESCRIPTION, setup_module - timeslices.setup_module(timeslices.DEFAULT_TIMESLICE_DESCRIPTION) + setup_module(DEFAULT_TIMESLICE_DESCRIPTION) @fixture def timeslice(default_timeslice_globals) -> Dataset: - from muse.readers.toml import read_timeslices + from muse.timeslices import TIMESLICE - return read_timeslices(dict(hour=["all-day"])) + return TIMESLICE @fixture @@ -328,7 +328,7 @@ def var(*dims, factor=100.0): def agent_market(coords, technologies, timeslice) -> Dataset: from numpy.random import rand - result = timeslice.copy() + result = Dataset(coords=timeslice.coords) result["commodity"] = "commodity", coords["commodity"] result["region"] = "region", coords["region"] result["technology"] = "technology", coords["technology"] @@ -350,7 +350,7 @@ def var(*dims, factor=100.0): def market(coords, technologies, timeslice) -> Dataset: from numpy.random import rand - result = timeslice.copy() + result = Dataset(coords=timeslice.coords) result["commodity"] = "commodity", coords["commodity"] result["region"] = "region", coords["region"] result["year"] = "year", coords["year"] @@ -515,7 +515,6 @@ def demand_share(coords, timeslice): } shape = len(axes["commodity"]), len(axes["asset"]), len(axes["timeslice"]) result = DataArray(rand(*shape), coords=axes, dims=axes.keys(), name="demand_share") - result.coords["represent_hours"] = timeslice.represent_hours return result diff --git a/tests/test_quantities.py b/tests/test_quantities.py index 2954a9ada..fdf8cba35 100644 --- a/tests/test_quantities.py +++ b/tests/test_quantities.py @@ -59,14 +59,14 @@ def test_supply_enduse(technologies, capacity, timeslice): spl = supply(capacity, demand, technologies).where( is_enduse(technologies.comm_usage), 0 ) - assert (abs(spl.sum("timeslice") - production) < 1e-12).all() + assert (abs(spl - production) < 1e-12).all() assert (spl.sum("asset") < demand).all() demand = production.sum("asset") * 0.7 * share / share.sum() spl = supply(capacity, demand, technologies).where( is_enduse(technologies.comm_usage), 0 ) - assert (spl.sum("timeslice") <= production + 1e-12).all() + assert (spl <= production + 1e-12).all() assert ( abs(spl.sum("asset") - demand.where(production.sum("asset") > 0, 0)) < 1e-12 ).all() @@ -89,6 +89,7 @@ def test_supply_emissions(technologies, capacity): def test_gross_margin(technologies, capacity, market): from muse.commodities import is_enduse, is_fuel, is_pollutant from muse.quantities import gross_margin + from muse.timeslices import TIMESLICE, QuantityType, convert_timeslice """ Gross margin refers to the calculation @@ -118,11 +119,8 @@ def test_gross_margin(technologies, capacity, market): revenues = prices * prod * sum(is_enduse(usage)) env_costs = env_prices * envs * sum(is_pollutant(usage)) cons_costs = prices * fuels * sum(is_fuel(usage)) - var_costs = ( - vp - * ((prod * sum(is_enduse(usage))) ** ve) - * market.represent_hours - / sum(market.represent_hours) + var_costs = convert_timeslice( + vp * ((prod * sum(is_enduse(usage))) ** ve), TIMESLICE, QuantityType.EXTENSIVE ) expected = revenues - env_costs - cons_costs - var_costs @@ -143,10 +141,10 @@ def test_decommissioning_demand(technologies, capacity): technologies.fixed_outputs[:] = fouts = 0.5 technologies.utilization_factor[:] = ufac = 0.4 decom = decommissioning_demand(technologies, capacity, years) - assert set(decom.dims) == {"asset", "commodity", "year"} - assert decom.sel(commodity=is_enduse(technologies.comm_usage)).values == approx( - ufac * fouts * (current - forecast) - ) + assert set(decom.dims) == {"asset", "commodity", "year", "timeslice"} + assert decom.sel(commodity=is_enduse(technologies.comm_usage)).sum( + "timeslice" + ).values == approx(ufac * fouts * (current - forecast)) def test_consumption_no_flex(technologies, production, market): @@ -276,25 +274,31 @@ def test_production_aggregate_asset_view( technologies.fixed_outputs[:] = 1 technologies.utilization_factor[:] = 1 prod = maximum_production(technologies, capacity) - assert set(prod.dims) == set(capacity.dims).union({"commodity"}) + assert set(prod.dims) == set(capacity.dims).union({"commodity", "timeslice"}) assert prod.sel(commodity=~enduses).values == approx(0) - prod, expected = xr.broadcast(prod.sel(commodity=enduses), capacity) + prod, expected = xr.broadcast( + prod.sel(commodity=enduses).sum("timeslice"), capacity + ) assert prod.values == approx(expected.values) technologies.fixed_outputs[:] = fouts = 2 technologies.utilization_factor[:] = ufact = 0.5 prod = maximum_production(technologies, capacity) assert prod.sel(commodity=~enduses).values == approx(0) - assert set(prod.dims) == set(capacity.dims).union({"commodity"}) - prod, expected = xr.broadcast(prod.sel(commodity=enduses), capacity) + assert set(prod.dims) == set(capacity.dims).union({"commodity", "timeslice"}) + prod, expected = xr.broadcast( + prod.sel(commodity=enduses).sum("timeslice"), capacity + ) assert prod.values == approx(fouts * ufact * expected.values) technologies.fixed_outputs[:] = fouts = 3 technologies.utilization_factor[:] = ufact = 0.5 prod = maximum_production(technologies, capacity) assert prod.sel(commodity=~enduses).values == approx(0) - assert set(prod.dims) == set(capacity.dims).union({"commodity"}) - prod, expected = xr.broadcast(prod.sel(commodity=enduses), capacity) + assert set(prod.dims) == set(capacity.dims).union({"commodity", "timeslice"}) + prod, expected = xr.broadcast( + prod.sel(commodity=enduses).sum("timeslice"), capacity + ) assert prod.values == approx(fouts * ufact * expected.values) From 4f057a42bf3fce776de784624a865844464e622e Mon Sep 17 00:00:00 2001 From: Tom Bland Date: Fri, 18 Oct 2024 13:13:53 +0100 Subject: [PATCH 13/18] Fix some more tests --- tests/test_quantities.py | 19 ++++++++----------- tests/test_readers.py | 18 +++++++++++------- 2 files changed, 19 insertions(+), 18 deletions(-) diff --git a/tests/test_quantities.py b/tests/test_quantities.py index fdf8cba35..b7196222c 100644 --- a/tests/test_quantities.py +++ b/tests/test_quantities.py @@ -29,12 +29,14 @@ def demand( def production(technologies: xr.Dataset, capacity: xr.DataArray) -> xr.DataArray: from numpy.random import random + from muse.timeslices import TIMESLICE, QuantityType, convert_timeslice + comms = xr.DataArray( random(len(technologies.commodity)), coords={"commodity": technologies.commodity}, dims="commodity", ) - return capacity * comms + return capacity * convert_timeslice(comms, TIMESLICE, QuantityType.EXTENSIVE) def make_array(array): @@ -169,14 +171,10 @@ def test_consumption_no_flex(technologies, production, market): actual = consumption(technologies, production) assert set(actual.dims) == set(expected.dims) - assert "timeslice" not in actual.dims - actual, expected = xr.broadcast(actual, expected) assert actual.values == approx(expected.values) technologies.flexible_inputs[:] = 0 actual = consumption(technologies, production, market.prices) - expected = expected * market.represent_hours / market.represent_hours.sum() - actual, expected = xr.broadcast(actual, expected) assert actual.values == approx(expected.values) @@ -185,6 +183,7 @@ def test_consumption_with_flex(technologies, production, market): from muse.commodities import is_enduse, is_fuel from muse.quantities import consumption + from muse.timeslices import TIMESLICE, QuantityType, convert_timeslice techs = technologies.copy() techs.fixed_inputs[:] = 0 @@ -209,13 +208,13 @@ def one_dim(dimension): region = one_dim(market.region) timeslice = one_dim(market.timeslice) commodity = one_dim(market.commodity) - hours = market.represent_hours / market.represent_hours.sum() prices = timeslice + commodity + year * region assert set(prices.dims) == set(market.prices.dims) - assert set((asset + year + commodity).dims) == set(production.dims) noenduse = ~is_enduse(techs.comm_usage) - production = asset * year + commodity + production = convert_timeslice( + asset * year + commodity, TIMESLICE, QuantityType.EXTENSIVE + ) production.loc[{"commodity": noenduse}] = 0 actual = consumption(technologies, production, prices) @@ -248,9 +247,7 @@ def one_dim(dimension): assert actual.sel(coords).values == approx(0) continue prod = production.sel(asset=asset, year=year).sum("commodity") - expected = ( - prod * hours.sel(timeslice=ts) / ncomms * flexs.sel(commodity=comm) - ) + expected = prod.sel(timeslice=ts) / ncomms * flexs.sel(commodity=comm) assert expected.values == approx(actual.sel(coords).values) diff --git a/tests/test_readers.py b/tests/test_readers.py index f98d2b6ae..a23fc1650 100644 --- a/tests/test_readers.py +++ b/tests/test_readers.py @@ -479,16 +479,20 @@ def test_read_technodictionary(default_model): def test_read_technodata_timeslices(tmp_path): from muse.examples import copy_model from muse.readers.csv import read_technodata_timeslices + from muse.timeslices import setup_module copy_model("default_timeslice", tmp_path) - path = tmp_path / "model" / "technodata" / "power" / "TechnodataTimeslices.csv" - data = read_technodata_timeslices(path) + settings_path = tmp_path / "model" / "settings.toml" + settings = toml.load(settings_path) + setup_module(settings) # configure global timeslicing scheme + data_path = tmp_path / "model" / "technodata" / "power" / "TechnodataTimeslices.csv" + data = read_technodata_timeslices(data_path) assert isinstance(data, xr.Dataset) assert set(data.dims) == {"technology", "region", "year", "timeslice"} assert dict(data.dtypes) == dict( - utilization_factor=np.int64, - minimum_service_factor=np.int64, + utilization_factor=np.float64, + minimum_service_factor=np.float64, ) assert list(data.coords["technology"].values) == ["gasCCGT", "windturbine"] assert list(data.coords["region"].values) == ["R1"] @@ -496,12 +500,12 @@ def test_read_technodata_timeslices(tmp_path): month_values = ["all-year"] * 6 day_values = ["all-week"] * 6 hour_values = [ + "night", + "morning", "afternoon", "early-peak", - "evening", "late-peak", - "morning", - "night", + "evening", ] assert list(data.coords["timeslice"].values) == list( From dcc14e9daae934e9d085dbaab63ddffae8652c79 Mon Sep 17 00:00:00 2001 From: Tom Bland Date: Fri, 18 Oct 2024 13:31:13 +0100 Subject: [PATCH 14/18] Fix error in unmet_forecasted_demand --- src/muse/demand_share.py | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/src/muse/demand_share.py b/src/muse/demand_share.py index 6dd540e3f..7e424f171 100644 --- a/src/muse/demand_share.py +++ b/src/muse/demand_share.py @@ -433,7 +433,6 @@ def unmet_forecasted_demand( ) -> xr.DataArray: """Forecast demand that cannot be serviced by non-decommissioned current assets.""" from muse.commodities import is_enduse - from muse.timeslices import QuantityType, convert_timeslice from muse.utilities import reduce_assets if current_year is None: @@ -443,12 +442,8 @@ def unmet_forecasted_demand( comm_usage = technologies.comm_usage.sel(commodity=market.commodity) smarket: xr.Dataset = market.where(is_enduse(comm_usage), 0).interp(year=year) capacity = reduce_assets([u.assets.capacity.interp(year=year) for u in agents]) - ts_capacity = cast( - xr.DataArray, - convert_timeslice(capacity, market.timeslice, QuantityType.EXTENSIVE), - ) - - result = unmet_demand(smarket, ts_capacity, technologies, production) + capacity = cast(xr.DataArray, capacity) + result = unmet_demand(smarket, capacity, technologies, production) if "year" in result.dims: result = result.squeeze("year") return result From 9030be14540ce246dc6c63092a5cd921099baec3 Mon Sep 17 00:00:00 2001 From: Tom Bland Date: Fri, 18 Oct 2024 13:31:32 +0100 Subject: [PATCH 15/18] Fix remaining tests --- tests/test_quantities.py | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/tests/test_quantities.py b/tests/test_quantities.py index b7196222c..0538ff861 100644 --- a/tests/test_quantities.py +++ b/tests/test_quantities.py @@ -26,17 +26,19 @@ def demand( @fixture -def production(technologies: xr.Dataset, capacity: xr.DataArray) -> xr.DataArray: +def production( + technologies: xr.Dataset, capacity: xr.DataArray, timeslice +) -> xr.DataArray: from numpy.random import random - from muse.timeslices import TIMESLICE, QuantityType, convert_timeslice + from muse.timeslices import QuantityType, convert_timeslice comms = xr.DataArray( random(len(technologies.commodity)), coords={"commodity": technologies.commodity}, dims="commodity", ) - return capacity * convert_timeslice(comms, TIMESLICE, QuantityType.EXTENSIVE) + return capacity * convert_timeslice(comms, timeslice, QuantityType.EXTENSIVE) def make_array(array): @@ -46,25 +48,23 @@ def make_array(array): def test_supply_enduse(technologies, capacity, timeslice): """End-use part of supply.""" - from numpy.random import random - from muse.commodities import is_enduse from muse.quantities import maximum_production, supply + from muse.timeslices import QuantityType, convert_timeslice production = maximum_production(technologies, capacity) - share = xr.DataArray( - random(timeslice.timeslice.shape), - coords={"timeslice": timeslice.timeslice}, - dims="timeslice", + demand = convert_timeslice( + production.sum("asset") + 1, timeslice, QuantityType.EXTENSIVE ) - demand = (production.sum("asset") + 1) * share / share.sum() spl = supply(capacity, demand, technologies).where( is_enduse(technologies.comm_usage), 0 ) assert (abs(spl - production) < 1e-12).all() assert (spl.sum("asset") < demand).all() - demand = production.sum("asset") * 0.7 * share / share.sum() + demand = convert_timeslice( + production.sum("asset") * 0.7, timeslice, QuantityType.EXTENSIVE + ) spl = supply(capacity, demand, technologies).where( is_enduse(technologies.comm_usage), 0 ) @@ -88,10 +88,10 @@ def test_supply_emissions(technologies, capacity): assert actual.values == approx(expected.values) -def test_gross_margin(technologies, capacity, market): +def test_gross_margin(technologies, capacity, market, timeslice): from muse.commodities import is_enduse, is_fuel, is_pollutant from muse.quantities import gross_margin - from muse.timeslices import TIMESLICE, QuantityType, convert_timeslice + from muse.timeslices import QuantityType, convert_timeslice """ Gross margin refers to the calculation @@ -122,7 +122,7 @@ def test_gross_margin(technologies, capacity, market): env_costs = env_prices * envs * sum(is_pollutant(usage)) cons_costs = prices * fuels * sum(is_fuel(usage)) var_costs = convert_timeslice( - vp * ((prod * sum(is_enduse(usage))) ** ve), TIMESLICE, QuantityType.EXTENSIVE + vp * ((prod * sum(is_enduse(usage))) ** ve), timeslice, QuantityType.EXTENSIVE ) expected = revenues - env_costs - cons_costs - var_costs @@ -178,12 +178,12 @@ def test_consumption_no_flex(technologies, production, market): assert actual.values == approx(expected.values) -def test_consumption_with_flex(technologies, production, market): +def test_consumption_with_flex(technologies, production, market, timeslice): from itertools import product from muse.commodities import is_enduse, is_fuel from muse.quantities import consumption - from muse.timeslices import TIMESLICE, QuantityType, convert_timeslice + from muse.timeslices import QuantityType, convert_timeslice techs = technologies.copy() techs.fixed_inputs[:] = 0 @@ -213,7 +213,7 @@ def one_dim(dimension): assert set(prices.dims) == set(market.prices.dims) noenduse = ~is_enduse(techs.comm_usage) production = convert_timeslice( - asset * year + commodity, TIMESLICE, QuantityType.EXTENSIVE + asset * year + commodity, timeslice, QuantityType.EXTENSIVE ) production.loc[{"commodity": noenduse}] = 0 From 8e8b5bfe346efa198e89bfe3188f7bfd89c90b72 Mon Sep 17 00:00:00 2001 From: Tom Bland Date: Fri, 18 Oct 2024 15:19:20 +0100 Subject: [PATCH 16/18] Update tutorial --- .../2-max-constraint/Results/MCACapacity.csv | 56 ++-- .../2-max-constraint/Results/MCAPrices.csv | 144 ++++----- .../2-max-constraint/Results/Power_Supply.csv | 294 ++++++++---------- .../technodata/power/TechnodataTimeslices.csv | 8 +- .../generate_models.py | 21 +- .../min-max-timeslice-constraints.ipynb | 123 ++++---- src/muse/constraints.py | 5 +- 7 files changed, 311 insertions(+), 340 deletions(-) diff --git a/docs/tutorial-code/min-max-timeslice-constraints/2-max-constraint/Results/MCACapacity.csv b/docs/tutorial-code/min-max-timeslice-constraints/2-max-constraint/Results/MCACapacity.csv index 3293c1b6a..6a8af7e39 100644 --- a/docs/tutorial-code/min-max-timeslice-constraints/2-max-constraint/Results/MCACapacity.csv +++ b/docs/tutorial-code/min-max-timeslice-constraints/2-max-constraint/Results/MCACapacity.csv @@ -2,48 +2,38 @@ agent,capacity,dst_region,installed,region,sector,technology,type,year A1,10.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2020 A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2020 A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2020 -A1,24.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2025 +A1,5.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2025 +A1,19.00000000000,R1,2020,R1,residential,heatpump,newcapa,2025 A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2025 -A1,30.93330000000,R1,2020,R1,gas,gassupply1,newcapa,2025 -A1,19.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2030 +A1,7.00000000000,R1,2020,R1,power,windturbine,newcapa,2025 +A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2025 +A1,19.00000000000,R1,2020,R1,residential,heatpump,newcapa,2030 A1,10.00000000000,R1,2025,R1,residential,heatpump,newcapa,2030 -A1,4.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2030 -A1,23.43330000000,R1,2020,R1,gas,gassupply1,newcapa,2030 -A1,8.47780000000,R1,2025,R1,gas,gassupply1,newcapa,2030 +A1,7.00000000000,R1,2020,R1,power,windturbine,newcapa,2030 +A1,4.00000000000,R1,2025,R1,power,windturbine,newcapa,2030 +A1,7.50000000000,R1,2020,R1,gas,gassupply1,newcapa,2030 A1,10.00000000000,R1,2025,R1,residential,heatpump,newcapa,2035 A1,26.00000000000,R1,2030,R1,residential,heatpump,newcapa,2035 -A1,4.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2035 -A1,10.00000000000,R1,2030,R1,power,gasCCGT,newcapa,2035 -A1,15.93330000000,R1,2020,R1,gas,gassupply1,newcapa,2035 -A1,8.47780000000,R1,2025,R1,gas,gassupply1,newcapa,2035 -A1,1.56670000000,R1,2030,R1,gas,gassupply1,newcapa,2035 +A1,7.00000000000,R1,2020,R1,power,windturbine,newcapa,2035 +A1,4.00000000000,R1,2025,R1,power,windturbine,newcapa,2035 +A1,3.00000000000,R1,2030,R1,power,windturbine,newcapa,2035 A1,26.00000000000,R1,2030,R1,residential,heatpump,newcapa,2040 A1,16.00000000000,R1,2035,R1,residential,heatpump,newcapa,2040 -A1,4.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2040 -A1,10.00000000000,R1,2030,R1,power,gasCCGT,newcapa,2040 -A1,2.00000000000,R1,2035,R1,power,gasCCGT,newcapa,2040 -A1,15.93330000000,R1,2020,R1,gas,gassupply1,newcapa,2040 -A1,8.47780000000,R1,2025,R1,gas,gassupply1,newcapa,2040 -A1,1.56670000000,R1,2030,R1,gas,gassupply1,newcapa,2040 -A1,3.71110000000,R1,2035,R1,gas,gassupply1,newcapa,2040 +A1,7.00000000000,R1,2020,R1,power,windturbine,newcapa,2040 +A1,4.00000000000,R1,2025,R1,power,windturbine,newcapa,2040 +A1,3.00000000000,R1,2030,R1,power,windturbine,newcapa,2040 +A1,2.00000000000,R1,2035,R1,power,windturbine,newcapa,2040 A1,16.00000000000,R1,2035,R1,residential,heatpump,newcapa,2045 A1,32.00000000000,R1,2040,R1,residential,heatpump,newcapa,2045 -A1,4.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2045 -A1,10.00000000000,R1,2030,R1,power,gasCCGT,newcapa,2045 -A1,2.00000000000,R1,2035,R1,power,gasCCGT,newcapa,2045 +A1,7.00000000000,R1,2020,R1,power,windturbine,newcapa,2045 +A1,4.00000000000,R1,2025,R1,power,windturbine,newcapa,2045 +A1,3.00000000000,R1,2030,R1,power,windturbine,newcapa,2045 +A1,2.00000000000,R1,2035,R1,power,windturbine,newcapa,2045 A1,3.00000000000,R1,2040,R1,power,windturbine,newcapa,2045 -A1,15.93330000000,R1,2020,R1,gas,gassupply1,newcapa,2045 -A1,8.47780000000,R1,2025,R1,gas,gassupply1,newcapa,2045 -A1,1.56670000000,R1,2030,R1,gas,gassupply1,newcapa,2045 -A1,3.71110000000,R1,2035,R1,gas,gassupply1,newcapa,2045 A1,32.00000000000,R1,2040,R1,residential,heatpump,newcapa,2050 A1,22.00000000000,R1,2045,R1,residential,heatpump,newcapa,2050 -A1,4.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2050 -A1,10.00000000000,R1,2030,R1,power,gasCCGT,newcapa,2050 -A1,2.00000000000,R1,2035,R1,power,gasCCGT,newcapa,2050 +A1,4.00000000000,R1,2025,R1,power,windturbine,newcapa,2050 +A1,3.00000000000,R1,2030,R1,power,windturbine,newcapa,2050 +A1,2.00000000000,R1,2035,R1,power,windturbine,newcapa,2050 A1,3.00000000000,R1,2040,R1,power,windturbine,newcapa,2050 -A1,2.00000000000,R1,2045,R1,power,windturbine,newcapa,2050 -A1,15.93330000000,R1,2020,R1,gas,gassupply1,newcapa,2050 -A1,8.47780000000,R1,2025,R1,gas,gassupply1,newcapa,2050 -A1,1.56670000000,R1,2030,R1,gas,gassupply1,newcapa,2050 -A1,3.71110000000,R1,2035,R1,gas,gassupply1,newcapa,2050 +A1,9.00000000000,R1,2045,R1,power,windturbine,newcapa,2050 diff --git a/docs/tutorial-code/min-max-timeslice-constraints/2-max-constraint/Results/MCAPrices.csv b/docs/tutorial-code/min-max-timeslice-constraints/2-max-constraint/Results/MCAPrices.csv index 21e5a0172..9d33aaf90 100644 --- a/docs/tutorial-code/min-max-timeslice-constraints/2-max-constraint/Results/MCAPrices.csv +++ b/docs/tutorial-code/min-max-timeslice-constraints/2-max-constraint/Results/MCAPrices.csv @@ -23,147 +23,147 @@ electricity,all-week,evening,all-year,19.50000000000,R1,5,MUS$2010/PJ,2020 gas,all-week,evening,all-year,7.15280000000,R1,5,MUS$2010/PJ,2020 heat,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.08310000000,R1,5,MUS$2010/kt,2020 -electricity,all-week,night,all-year,21.48570000000,R1,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,2.10910000000,R1,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,8.42060000000,R1,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,3.11720000000,R1,0,MUS$2010/PJ,2025 CO2f,all-week,night,all-year,0.12010000000,R1,0,MUS$2010/kt,2025 -electricity,all-week,morning,all-year,23.13850000000,R1,1,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,2.10910000000,R1,1,MUS$2010/PJ,2025 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,8.42060000000,R1,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,3.11720000000,R1,1,MUS$2010/PJ,2025 CO2f,all-week,morning,all-year,0.12010000000,R1,1,MUS$2010/kt,2025 -electricity,all-week,afternoon,all-year,23.74250000000,R1,2,MUS$2010/PJ,2025 +electricity,all-week,afternoon,all-year,3.12480000000,R1,2,MUS$2010/PJ,2025 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2025 -heat,all-week,afternoon,all-year,8.42060000000,R1,2,MUS$2010/PJ,2025 +heat,all-week,afternoon,all-year,3.79420000000,R1,2,MUS$2010/PJ,2025 CO2f,all-week,afternoon,all-year,0.12010000000,R1,2,MUS$2010/kt,2025 -electricity,all-week,early-peak,all-year,21.48570000000,R1,3,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,2.10910000000,R1,3,MUS$2010/PJ,2025 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,8.42060000000,R1,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,3.11720000000,R1,3,MUS$2010/PJ,2025 CO2f,all-week,early-peak,all-year,0.12010000000,R1,3,MUS$2010/kt,2025 -electricity,all-week,late-peak,all-year,21.48570000000,R1,4,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,1.46340000000,R1,4,MUS$2010/PJ,2025 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,8.42060000000,R1,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,2.67720000000,R1,4,MUS$2010/PJ,2025 CO2f,all-week,late-peak,all-year,0.12010000000,R1,4,MUS$2010/kt,2025 -electricity,all-week,evening,all-year,22.34090000000,R1,5,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,1.46340000000,R1,5,MUS$2010/PJ,2025 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,8.42060000000,R1,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,2.67720000000,R1,5,MUS$2010/PJ,2025 CO2f,all-week,evening,all-year,0.12010000000,R1,5,MUS$2010/kt,2025 -electricity,all-week,night,all-year,15.59170000000,R1,0,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,0.66670000000,R1,0,MUS$2010/PJ,2030 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,9.31610000000,R1,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,0.50720000000,R1,0,MUS$2010/PJ,2030 CO2f,all-week,night,all-year,0.15700000000,R1,0,MUS$2010/kt,2030 -electricity,all-week,morning,all-year,15.59170000000,R1,1,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,0.66670000000,R1,1,MUS$2010/PJ,2030 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,9.31610000000,R1,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,0.50720000000,R1,1,MUS$2010/PJ,2030 CO2f,all-week,morning,all-year,0.15700000000,R1,1,MUS$2010/kt,2030 -electricity,all-week,afternoon,all-year,15.59170000000,R1,2,MUS$2010/PJ,2030 +electricity,all-week,afternoon,all-year,0.66670000000,R1,2,MUS$2010/PJ,2030 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,9.31610000000,R1,2,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,0.50720000000,R1,2,MUS$2010/PJ,2030 CO2f,all-week,afternoon,all-year,0.15700000000,R1,2,MUS$2010/kt,2030 -electricity,all-week,early-peak,all-year,15.59170000000,R1,3,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,0.66670000000,R1,3,MUS$2010/PJ,2030 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,9.31610000000,R1,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,0.50720000000,R1,3,MUS$2010/PJ,2030 CO2f,all-week,early-peak,all-year,0.15700000000,R1,3,MUS$2010/kt,2030 -electricity,all-week,late-peak,all-year,15.59170000000,R1,4,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,0.66670000000,R1,4,MUS$2010/PJ,2030 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,9.31610000000,R1,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,0.50720000000,R1,4,MUS$2010/PJ,2030 CO2f,all-week,late-peak,all-year,0.15700000000,R1,4,MUS$2010/kt,2030 -electricity,all-week,evening,all-year,15.59170000000,R1,5,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,0.66670000000,R1,5,MUS$2010/PJ,2030 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,9.31610000000,R1,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,0.50720000000,R1,5,MUS$2010/PJ,2030 CO2f,all-week,evening,all-year,0.15700000000,R1,5,MUS$2010/kt,2030 -electricity,all-week,night,all-year,20.89740000000,R1,0,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,0.66670000000,R1,0,MUS$2010/PJ,2035 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,8.59950000000,R1,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,0.50720000000,R1,0,MUS$2010/PJ,2035 CO2f,all-week,night,all-year,0.21490000000,R1,0,MUS$2010/kt,2035 -electricity,all-week,morning,all-year,20.89740000000,R1,1,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,0.66670000000,R1,1,MUS$2010/PJ,2035 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,8.59950000000,R1,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,0.50720000000,R1,1,MUS$2010/PJ,2035 CO2f,all-week,morning,all-year,0.21490000000,R1,1,MUS$2010/kt,2035 -electricity,all-week,afternoon,all-year,20.89740000000,R1,2,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,0.66670000000,R1,2,MUS$2010/PJ,2035 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,8.59950000000,R1,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,0.50720000000,R1,2,MUS$2010/PJ,2035 CO2f,all-week,afternoon,all-year,0.21490000000,R1,2,MUS$2010/kt,2035 -electricity,all-week,early-peak,all-year,20.89740000000,R1,3,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,0.66670000000,R1,3,MUS$2010/PJ,2035 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,8.59950000000,R1,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,0.50720000000,R1,3,MUS$2010/PJ,2035 CO2f,all-week,early-peak,all-year,0.21490000000,R1,3,MUS$2010/kt,2035 -electricity,all-week,late-peak,all-year,20.89740000000,R1,4,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,0.66670000000,R1,4,MUS$2010/PJ,2035 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,8.59950000000,R1,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,0.50720000000,R1,4,MUS$2010/PJ,2035 CO2f,all-week,late-peak,all-year,0.21490000000,R1,4,MUS$2010/kt,2035 -electricity,all-week,evening,all-year,20.89740000000,R1,5,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,0.66670000000,R1,5,MUS$2010/PJ,2035 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,8.59950000000,R1,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,0.50720000000,R1,5,MUS$2010/PJ,2035 CO2f,all-week,evening,all-year,0.21490000000,R1,5,MUS$2010/kt,2035 -electricity,all-week,night,all-year,26.20320000000,R1,0,MUS$2010/PJ,2040 +electricity,all-week,night,all-year,0.66670000000,R1,0,MUS$2010/PJ,2040 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,10.72180000000,R1,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,0.50720000000,R1,0,MUS$2010/PJ,2040 CO2f,all-week,night,all-year,0.27280000000,R1,0,MUS$2010/kt,2040 -electricity,all-week,morning,all-year,26.20320000000,R1,1,MUS$2010/PJ,2040 +electricity,all-week,morning,all-year,0.66670000000,R1,1,MUS$2010/PJ,2040 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,10.72180000000,R1,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,0.50720000000,R1,1,MUS$2010/PJ,2040 CO2f,all-week,morning,all-year,0.27280000000,R1,1,MUS$2010/kt,2040 -electricity,all-week,afternoon,all-year,26.20320000000,R1,2,MUS$2010/PJ,2040 +electricity,all-week,afternoon,all-year,0.66670000000,R1,2,MUS$2010/PJ,2040 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2040 -heat,all-week,afternoon,all-year,10.72180000000,R1,2,MUS$2010/PJ,2040 +heat,all-week,afternoon,all-year,0.50720000000,R1,2,MUS$2010/PJ,2040 CO2f,all-week,afternoon,all-year,0.27280000000,R1,2,MUS$2010/kt,2040 -electricity,all-week,early-peak,all-year,26.20320000000,R1,3,MUS$2010/PJ,2040 +electricity,all-week,early-peak,all-year,0.66670000000,R1,3,MUS$2010/PJ,2040 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,10.72180000000,R1,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,0.50720000000,R1,3,MUS$2010/PJ,2040 CO2f,all-week,early-peak,all-year,0.27280000000,R1,3,MUS$2010/kt,2040 -electricity,all-week,late-peak,all-year,26.20320000000,R1,4,MUS$2010/PJ,2040 +electricity,all-week,late-peak,all-year,0.66670000000,R1,4,MUS$2010/PJ,2040 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,10.72180000000,R1,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,0.50720000000,R1,4,MUS$2010/PJ,2040 CO2f,all-week,late-peak,all-year,0.27280000000,R1,4,MUS$2010/kt,2040 -electricity,all-week,evening,all-year,26.20320000000,R1,5,MUS$2010/PJ,2040 +electricity,all-week,evening,all-year,0.66670000000,R1,5,MUS$2010/PJ,2040 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,10.72180000000,R1,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,0.50720000000,R1,5,MUS$2010/PJ,2040 CO2f,all-week,evening,all-year,0.27280000000,R1,5,MUS$2010/kt,2040 -electricity,all-week,night,all-year,28.43880000000,R1,0,MUS$2010/PJ,2045 +electricity,all-week,night,all-year,0.66670000000,R1,0,MUS$2010/PJ,2045 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2045 -heat,all-week,night,all-year,11.61600000000,R1,0,MUS$2010/PJ,2045 +heat,all-week,night,all-year,0.50720000000,R1,0,MUS$2010/PJ,2045 CO2f,all-week,night,all-year,0.35390000000,R1,0,MUS$2010/kt,2045 -electricity,all-week,morning,all-year,30.87640000000,R1,1,MUS$2010/PJ,2045 +electricity,all-week,morning,all-year,0.66670000000,R1,1,MUS$2010/PJ,2045 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2045 -heat,all-week,morning,all-year,12.59100000000,R1,1,MUS$2010/PJ,2045 +heat,all-week,morning,all-year,0.50720000000,R1,1,MUS$2010/PJ,2045 CO2f,all-week,morning,all-year,0.35390000000,R1,1,MUS$2010/kt,2045 -electricity,all-week,afternoon,all-year,31.89940000000,R1,2,MUS$2010/PJ,2045 +electricity,all-week,afternoon,all-year,0.66670000000,R1,2,MUS$2010/PJ,2045 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2045 -heat,all-week,afternoon,all-year,13.00030000000,R1,2,MUS$2010/PJ,2045 +heat,all-week,afternoon,all-year,0.50720000000,R1,2,MUS$2010/PJ,2045 CO2f,all-week,afternoon,all-year,0.35390000000,R1,2,MUS$2010/kt,2045 -electricity,all-week,early-peak,all-year,28.43880000000,R1,3,MUS$2010/PJ,2045 +electricity,all-week,early-peak,all-year,0.66670000000,R1,3,MUS$2010/PJ,2045 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2045 -heat,all-week,early-peak,all-year,11.61600000000,R1,3,MUS$2010/PJ,2045 +heat,all-week,early-peak,all-year,0.50720000000,R1,3,MUS$2010/PJ,2045 CO2f,all-week,early-peak,all-year,0.35390000000,R1,3,MUS$2010/kt,2045 -electricity,all-week,late-peak,all-year,28.43880000000,R1,4,MUS$2010/PJ,2045 +electricity,all-week,late-peak,all-year,0.66670000000,R1,4,MUS$2010/PJ,2045 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2045 -heat,all-week,late-peak,all-year,11.61600000000,R1,4,MUS$2010/PJ,2045 +heat,all-week,late-peak,all-year,0.50720000000,R1,4,MUS$2010/PJ,2045 CO2f,all-week,late-peak,all-year,0.35390000000,R1,4,MUS$2010/kt,2045 -electricity,all-week,evening,all-year,29.94740000000,R1,5,MUS$2010/PJ,2045 +electricity,all-week,evening,all-year,0.66670000000,R1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2045 -heat,all-week,evening,all-year,12.21950000000,R1,5,MUS$2010/PJ,2045 +heat,all-week,evening,all-year,0.50720000000,R1,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045 -electricity,all-week,night,all-year,31.46450000000,R1,0,MUS$2010/PJ,2050 +electricity,all-week,night,all-year,0.66670000000,R1,0,MUS$2010/PJ,2050 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,12.82630000000,R1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,0.50720000000,R1,0,MUS$2010/PJ,2050 CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050 -electricity,all-week,morning,all-year,35.71650000000,R1,1,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,0.66670000000,R1,1,MUS$2010/PJ,2050 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,14.52710000000,R1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,0.50720000000,R1,1,MUS$2010/PJ,2050 CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050 -electricity,all-week,afternoon,all-year,37.43030000000,R1,2,MUS$2010/PJ,2050 +electricity,all-week,afternoon,all-year,0.66670000000,R1,2,MUS$2010/PJ,2050 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,15.21260000000,R1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,0.50720000000,R1,2,MUS$2010/PJ,2050 CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050 -electricity,all-week,early-peak,all-year,31.46450000000,R1,3,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,0.66670000000,R1,3,MUS$2010/PJ,2050 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,12.82630000000,R1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,0.50720000000,R1,3,MUS$2010/PJ,2050 CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050 -electricity,all-week,late-peak,all-year,31.46450000000,R1,4,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,0.66670000000,R1,4,MUS$2010/PJ,2050 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,12.82630000000,R1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,0.50720000000,R1,4,MUS$2010/PJ,2050 CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050 -electricity,all-week,evening,all-year,33.95550000000,R1,5,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,0.66670000000,R1,5,MUS$2010/PJ,2050 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,13.82270000000,R1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,0.50720000000,R1,5,MUS$2010/PJ,2050 CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050 diff --git a/docs/tutorial-code/min-max-timeslice-constraints/2-max-constraint/Results/Power_Supply.csv b/docs/tutorial-code/min-max-timeslice-constraints/2-max-constraint/Results/Power_Supply.csv index 59dbca940..27829bc3c 100644 --- a/docs/tutorial-code/min-max-timeslice-constraints/2-max-constraint/Results/Power_Supply.csv +++ b/docs/tutorial-code/min-max-timeslice-constraints/2-max-constraint/Results/Power_Supply.csv @@ -1,163 +1,133 @@ asset,comm_usage,commodity,day,hour,installed,month,region,supply,technology,timeslice,units_prices,year -1,10,electricity,all-week,night,2025,all-year,R1,0.22990000000,gasCCGT,0,MUS$2010/PJ,2030 -1,6,CO2f,all-week,night,2025,all-year,R1,21.07360000000,gasCCGT,0,MUS$2010/kt,2030 -1,10,electricity,all-week,morning,2025,all-year,R1,0.34480000000,gasCCGT,1,MUS$2010/PJ,2030 -1,6,CO2f,all-week,morning,2025,all-year,R1,31.61030000000,gasCCGT,1,MUS$2010/kt,2030 -1,10,electricity,all-week,afternoon,2025,all-year,R1,0.40000000000,gasCCGT,2,MUS$2010/PJ,2030 -1,6,CO2f,all-week,afternoon,2025,all-year,R1,36.66800000000,gasCCGT,2,MUS$2010/kt,2030 -1,10,electricity,all-week,early-peak,2025,all-year,R1,0.34480000000,gasCCGT,3,MUS$2010/PJ,2030 -1,6,CO2f,all-week,early-peak,2025,all-year,R1,31.61030000000,gasCCGT,3,MUS$2010/kt,2030 -1,10,electricity,all-week,late-peak,2025,all-year,R1,0.66670000000,gasCCGT,4,MUS$2010/PJ,2030 -1,6,CO2f,all-week,late-peak,2025,all-year,R1,61.11330000000,gasCCGT,4,MUS$2010/kt,2030 -1,10,electricity,all-week,evening,2025,all-year,R1,0.66670000000,gasCCGT,5,MUS$2010/PJ,2030 -1,6,CO2f,all-week,evening,2025,all-year,R1,61.11330000000,gasCCGT,5,MUS$2010/kt,2030 -1,10,electricity,all-week,night,2025,all-year,R1,0.22860000000,gasCCGT,0,MUS$2010/PJ,2035 -2,10,electricity,all-week,night,2030,all-year,R1,0.57140000000,gasCCGT,0,MUS$2010/PJ,2035 -1,6,CO2f,all-week,night,2025,all-year,R1,20.95310000000,gasCCGT,0,MUS$2010/kt,2035 -2,6,CO2f,all-week,night,2030,all-year,R1,52.38290000000,gasCCGT,0,MUS$2010/kt,2035 -1,10,electricity,all-week,morning,2025,all-year,R1,0.34290000000,gasCCGT,1,MUS$2010/PJ,2035 -2,10,electricity,all-week,morning,2030,all-year,R1,0.85710000000,gasCCGT,1,MUS$2010/PJ,2035 -1,6,CO2f,all-week,morning,2025,all-year,R1,31.42970000000,gasCCGT,1,MUS$2010/kt,2035 -2,6,CO2f,all-week,morning,2030,all-year,R1,78.57430000000,gasCCGT,1,MUS$2010/kt,2035 -1,10,electricity,all-week,afternoon,2025,all-year,R1,0.40000000000,gasCCGT,2,MUS$2010/PJ,2035 -2,10,electricity,all-week,afternoon,2030,all-year,R1,1.00000000000,gasCCGT,2,MUS$2010/PJ,2035 -1,6,CO2f,all-week,afternoon,2025,all-year,R1,36.66800000000,gasCCGT,2,MUS$2010/kt,2035 -2,6,CO2f,all-week,afternoon,2030,all-year,R1,91.67000000000,gasCCGT,2,MUS$2010/kt,2035 -1,10,electricity,all-week,early-peak,2025,all-year,R1,0.34290000000,gasCCGT,3,MUS$2010/PJ,2035 -2,10,electricity,all-week,early-peak,2030,all-year,R1,0.85710000000,gasCCGT,3,MUS$2010/PJ,2035 -1,6,CO2f,all-week,early-peak,2025,all-year,R1,31.42970000000,gasCCGT,3,MUS$2010/kt,2035 -2,6,CO2f,all-week,early-peak,2030,all-year,R1,78.57430000000,gasCCGT,3,MUS$2010/kt,2035 -1,10,electricity,all-week,late-peak,2025,all-year,R1,0.66670000000,gasCCGT,4,MUS$2010/PJ,2035 -2,10,electricity,all-week,late-peak,2030,all-year,R1,1.66670000000,gasCCGT,4,MUS$2010/PJ,2035 -1,6,CO2f,all-week,late-peak,2025,all-year,R1,61.11330000000,gasCCGT,4,MUS$2010/kt,2035 -2,6,CO2f,all-week,late-peak,2030,all-year,R1,152.78330000000,gasCCGT,4,MUS$2010/kt,2035 -1,10,electricity,all-week,evening,2025,all-year,R1,0.66670000000,gasCCGT,5,MUS$2010/PJ,2035 -2,10,electricity,all-week,evening,2030,all-year,R1,1.66670000000,gasCCGT,5,MUS$2010/PJ,2035 -1,6,CO2f,all-week,evening,2025,all-year,R1,61.11330000000,gasCCGT,5,MUS$2010/kt,2035 -2,6,CO2f,all-week,evening,2030,all-year,R1,152.78330000000,gasCCGT,5,MUS$2010/kt,2035 -1,10,electricity,all-week,night,2025,all-year,R1,0.23330000000,gasCCGT,0,MUS$2010/PJ,2040 -2,10,electricity,all-week,night,2030,all-year,R1,0.58330000000,gasCCGT,0,MUS$2010/PJ,2040 -3,10,electricity,all-week,night,2035,all-year,R1,0.11670000000,gasCCGT,0,MUS$2010/PJ,2040 -1,6,CO2f,all-week,night,2025,all-year,R1,21.38970000000,gasCCGT,0,MUS$2010/kt,2040 -2,6,CO2f,all-week,night,2030,all-year,R1,53.47420000000,gasCCGT,0,MUS$2010/kt,2040 -3,6,CO2f,all-week,night,2035,all-year,R1,10.69480000000,gasCCGT,0,MUS$2010/kt,2040 -1,10,electricity,all-week,morning,2025,all-year,R1,0.35000000000,gasCCGT,1,MUS$2010/PJ,2040 -2,10,electricity,all-week,morning,2030,all-year,R1,0.87500000000,gasCCGT,1,MUS$2010/PJ,2040 -3,10,electricity,all-week,morning,2035,all-year,R1,0.17500000000,gasCCGT,1,MUS$2010/PJ,2040 -1,6,CO2f,all-week,morning,2025,all-year,R1,32.08450000000,gasCCGT,1,MUS$2010/kt,2040 -2,6,CO2f,all-week,morning,2030,all-year,R1,80.21120000000,gasCCGT,1,MUS$2010/kt,2040 -3,6,CO2f,all-week,morning,2035,all-year,R1,16.04220000000,gasCCGT,1,MUS$2010/kt,2040 -1,10,electricity,all-week,afternoon,2025,all-year,R1,0.40000000000,gasCCGT,2,MUS$2010/PJ,2040 -2,10,electricity,all-week,afternoon,2030,all-year,R1,1.00000000000,gasCCGT,2,MUS$2010/PJ,2040 -3,10,electricity,all-week,afternoon,2035,all-year,R1,0.20000000000,gasCCGT,2,MUS$2010/PJ,2040 -1,6,CO2f,all-week,afternoon,2025,all-year,R1,36.66800000000,gasCCGT,2,MUS$2010/kt,2040 -2,6,CO2f,all-week,afternoon,2030,all-year,R1,91.67000000000,gasCCGT,2,MUS$2010/kt,2040 -3,6,CO2f,all-week,afternoon,2035,all-year,R1,18.33400000000,gasCCGT,2,MUS$2010/kt,2040 -1,10,electricity,all-week,early-peak,2025,all-year,R1,0.35000000000,gasCCGT,3,MUS$2010/PJ,2040 -2,10,electricity,all-week,early-peak,2030,all-year,R1,0.87500000000,gasCCGT,3,MUS$2010/PJ,2040 -3,10,electricity,all-week,early-peak,2035,all-year,R1,0.17500000000,gasCCGT,3,MUS$2010/PJ,2040 -1,6,CO2f,all-week,early-peak,2025,all-year,R1,32.08450000000,gasCCGT,3,MUS$2010/kt,2040 -2,6,CO2f,all-week,early-peak,2030,all-year,R1,80.21120000000,gasCCGT,3,MUS$2010/kt,2040 -3,6,CO2f,all-week,early-peak,2035,all-year,R1,16.04220000000,gasCCGT,3,MUS$2010/kt,2040 -1,10,electricity,all-week,late-peak,2025,all-year,R1,0.66670000000,gasCCGT,4,MUS$2010/PJ,2040 -2,10,electricity,all-week,late-peak,2030,all-year,R1,1.66670000000,gasCCGT,4,MUS$2010/PJ,2040 -3,10,electricity,all-week,late-peak,2035,all-year,R1,0.33330000000,gasCCGT,4,MUS$2010/PJ,2040 -1,6,CO2f,all-week,late-peak,2025,all-year,R1,61.11330000000,gasCCGT,4,MUS$2010/kt,2040 -2,6,CO2f,all-week,late-peak,2030,all-year,R1,152.78330000000,gasCCGT,4,MUS$2010/kt,2040 -3,6,CO2f,all-week,late-peak,2035,all-year,R1,30.55670000000,gasCCGT,4,MUS$2010/kt,2040 -1,10,electricity,all-week,evening,2025,all-year,R1,0.66670000000,gasCCGT,5,MUS$2010/PJ,2040 -2,10,electricity,all-week,evening,2030,all-year,R1,1.66670000000,gasCCGT,5,MUS$2010/PJ,2040 -3,10,electricity,all-week,evening,2035,all-year,R1,0.33330000000,gasCCGT,5,MUS$2010/PJ,2040 -1,6,CO2f,all-week,evening,2025,all-year,R1,61.11330000000,gasCCGT,5,MUS$2010/kt,2040 -2,6,CO2f,all-week,evening,2030,all-year,R1,152.78330000000,gasCCGT,5,MUS$2010/kt,2040 -3,6,CO2f,all-week,evening,2035,all-year,R1,30.55670000000,gasCCGT,5,MUS$2010/kt,2040 -1,10,electricity,all-week,night,2025,all-year,R1,0.22460000000,gasCCGT,0,MUS$2010/PJ,2045 -2,10,electricity,all-week,night,2030,all-year,R1,0.56140000000,gasCCGT,0,MUS$2010/PJ,2045 -3,10,electricity,all-week,night,2035,all-year,R1,0.11230000000,gasCCGT,0,MUS$2010/PJ,2045 -4,10,electricity,all-week,night,2040,all-year,R1,0.16840000000,windturbine,0,MUS$2010/PJ,2045 -1,6,CO2f,all-week,night,2025,all-year,R1,20.58550000000,gasCCGT,0,MUS$2010/kt,2045 -2,6,CO2f,all-week,night,2030,all-year,R1,51.46390000000,gasCCGT,0,MUS$2010/kt,2045 -3,6,CO2f,all-week,night,2035,all-year,R1,10.29280000000,gasCCGT,0,MUS$2010/kt,2045 -1,10,electricity,all-week,morning,2025,all-year,R1,0.36570000000,gasCCGT,1,MUS$2010/PJ,2045 -2,10,electricity,all-week,morning,2030,all-year,R1,0.91430000000,gasCCGT,1,MUS$2010/PJ,2045 -3,10,electricity,all-week,morning,2035,all-year,R1,0.18290000000,gasCCGT,1,MUS$2010/PJ,2045 -4,10,electricity,all-week,morning,2040,all-year,R1,0.13710000000,windturbine,1,MUS$2010/PJ,2045 -1,6,CO2f,all-week,morning,2025,all-year,R1,33.52500000000,gasCCGT,1,MUS$2010/kt,2045 -2,6,CO2f,all-week,morning,2030,all-year,R1,83.81260000000,gasCCGT,1,MUS$2010/kt,2045 -3,6,CO2f,all-week,morning,2035,all-year,R1,16.76250000000,gasCCGT,1,MUS$2010/kt,2045 -1,10,electricity,all-week,afternoon,2025,all-year,R1,0.40000000000,gasCCGT,2,MUS$2010/PJ,2045 -2,10,electricity,all-week,afternoon,2030,all-year,R1,1.00000000000,gasCCGT,2,MUS$2010/PJ,2045 -3,10,electricity,all-week,afternoon,2035,all-year,R1,0.20000000000,gasCCGT,2,MUS$2010/PJ,2045 -4,10,electricity,all-week,afternoon,2040,all-year,R1,0.09140000000,windturbine,2,MUS$2010/PJ,2045 -1,6,CO2f,all-week,afternoon,2025,all-year,R1,36.66800000000,gasCCGT,2,MUS$2010/kt,2045 -2,6,CO2f,all-week,afternoon,2030,all-year,R1,91.67000000000,gasCCGT,2,MUS$2010/kt,2045 -3,6,CO2f,all-week,afternoon,2035,all-year,R1,18.33400000000,gasCCGT,2,MUS$2010/kt,2045 -1,10,electricity,all-week,early-peak,2025,all-year,R1,0.33680000000,gasCCGT,3,MUS$2010/PJ,2045 -2,10,electricity,all-week,early-peak,2030,all-year,R1,0.84210000000,gasCCGT,3,MUS$2010/PJ,2045 -3,10,electricity,all-week,early-peak,2035,all-year,R1,0.16840000000,gasCCGT,3,MUS$2010/PJ,2045 -4,10,electricity,all-week,early-peak,2040,all-year,R1,0.25260000000,windturbine,3,MUS$2010/PJ,2045 -1,6,CO2f,all-week,early-peak,2025,all-year,R1,30.87830000000,gasCCGT,3,MUS$2010/kt,2045 -2,6,CO2f,all-week,early-peak,2030,all-year,R1,77.19580000000,gasCCGT,3,MUS$2010/kt,2045 -3,6,CO2f,all-week,early-peak,2035,all-year,R1,15.43920000000,gasCCGT,3,MUS$2010/kt,2045 -1,10,electricity,all-week,late-peak,2025,all-year,R1,0.66670000000,gasCCGT,4,MUS$2010/PJ,2045 -2,10,electricity,all-week,late-peak,2030,all-year,R1,1.66670000000,gasCCGT,4,MUS$2010/PJ,2045 -3,10,electricity,all-week,late-peak,2035,all-year,R1,0.33330000000,gasCCGT,4,MUS$2010/PJ,2045 -4,10,electricity,all-week,late-peak,2040,all-year,R1,0.50000000000,windturbine,4,MUS$2010/PJ,2045 -1,6,CO2f,all-week,late-peak,2025,all-year,R1,61.11330000000,gasCCGT,4,MUS$2010/kt,2045 -2,6,CO2f,all-week,late-peak,2030,all-year,R1,152.78330000000,gasCCGT,4,MUS$2010/kt,2045 -3,6,CO2f,all-week,late-peak,2035,all-year,R1,30.55670000000,gasCCGT,4,MUS$2010/kt,2045 -1,10,electricity,all-week,evening,2025,all-year,R1,0.66670000000,gasCCGT,5,MUS$2010/PJ,2045 -2,10,electricity,all-week,evening,2030,all-year,R1,1.66670000000,gasCCGT,5,MUS$2010/PJ,2045 -3,10,electricity,all-week,evening,2035,all-year,R1,0.33330000000,gasCCGT,5,MUS$2010/PJ,2045 -4,10,electricity,all-week,evening,2040,all-year,R1,0.33680000000,windturbine,5,MUS$2010/PJ,2045 -1,6,CO2f,all-week,evening,2025,all-year,R1,61.11330000000,gasCCGT,5,MUS$2010/kt,2045 -2,6,CO2f,all-week,evening,2030,all-year,R1,152.78330000000,gasCCGT,5,MUS$2010/kt,2045 -3,6,CO2f,all-week,evening,2035,all-year,R1,30.55670000000,gasCCGT,5,MUS$2010/kt,2045 -1,10,electricity,all-week,night,2025,all-year,R1,0.22860000000,gasCCGT,0,MUS$2010/PJ,2050 -2,10,electricity,all-week,night,2030,all-year,R1,0.57140000000,gasCCGT,0,MUS$2010/PJ,2050 -3,10,electricity,all-week,night,2035,all-year,R1,0.11430000000,gasCCGT,0,MUS$2010/PJ,2050 -4,10,electricity,all-week,night,2040,all-year,R1,0.17140000000,windturbine,0,MUS$2010/PJ,2050 -5,10,electricity,all-week,night,2045,all-year,R1,0.11430000000,windturbine,0,MUS$2010/PJ,2050 -1,6,CO2f,all-week,night,2025,all-year,R1,20.95310000000,gasCCGT,0,MUS$2010/kt,2050 -2,6,CO2f,all-week,night,2030,all-year,R1,52.38290000000,gasCCGT,0,MUS$2010/kt,2050 -3,6,CO2f,all-week,night,2035,all-year,R1,10.47660000000,gasCCGT,0,MUS$2010/kt,2050 -1,10,electricity,all-week,morning,2025,all-year,R1,0.38920000000,gasCCGT,1,MUS$2010/PJ,2050 -2,10,electricity,all-week,morning,2030,all-year,R1,0.97300000000,gasCCGT,1,MUS$2010/PJ,2050 -3,10,electricity,all-week,morning,2035,all-year,R1,0.19460000000,gasCCGT,1,MUS$2010/PJ,2050 -4,10,electricity,all-week,morning,2040,all-year,R1,0.14590000000,windturbine,1,MUS$2010/PJ,2050 -5,10,electricity,all-week,morning,2045,all-year,R1,0.09730000000,windturbine,1,MUS$2010/PJ,2050 -1,6,CO2f,all-week,morning,2025,all-year,R1,35.67700000000,gasCCGT,1,MUS$2010/kt,2050 -2,6,CO2f,all-week,morning,2030,all-year,R1,89.19240000000,gasCCGT,1,MUS$2010/kt,2050 -3,6,CO2f,all-week,morning,2035,all-year,R1,17.83850000000,gasCCGT,1,MUS$2010/kt,2050 -1,10,electricity,all-week,afternoon,2025,all-year,R1,0.40000000000,gasCCGT,2,MUS$2010/PJ,2050 -2,10,electricity,all-week,afternoon,2030,all-year,R1,1.00000000000,gasCCGT,2,MUS$2010/PJ,2050 -3,10,electricity,all-week,afternoon,2035,all-year,R1,0.20000000000,gasCCGT,2,MUS$2010/PJ,2050 -4,10,electricity,all-week,afternoon,2040,all-year,R1,0.09730000000,windturbine,2,MUS$2010/PJ,2050 -5,10,electricity,all-week,afternoon,2045,all-year,R1,0.06490000000,windturbine,2,MUS$2010/PJ,2050 -1,6,CO2f,all-week,afternoon,2025,all-year,R1,36.66800000000,gasCCGT,2,MUS$2010/kt,2050 -2,6,CO2f,all-week,afternoon,2030,all-year,R1,91.67000000000,gasCCGT,2,MUS$2010/kt,2050 -3,6,CO2f,all-week,afternoon,2035,all-year,R1,18.33400000000,gasCCGT,2,MUS$2010/kt,2050 -1,10,electricity,all-week,early-peak,2025,all-year,R1,0.34290000000,gasCCGT,3,MUS$2010/PJ,2050 -2,10,electricity,all-week,early-peak,2030,all-year,R1,0.85710000000,gasCCGT,3,MUS$2010/PJ,2050 -3,10,electricity,all-week,early-peak,2035,all-year,R1,0.17140000000,gasCCGT,3,MUS$2010/PJ,2050 -4,10,electricity,all-week,early-peak,2040,all-year,R1,0.25710000000,windturbine,3,MUS$2010/PJ,2050 -5,10,electricity,all-week,early-peak,2045,all-year,R1,0.17140000000,windturbine,3,MUS$2010/PJ,2050 -1,6,CO2f,all-week,early-peak,2025,all-year,R1,31.42970000000,gasCCGT,3,MUS$2010/kt,2050 -2,6,CO2f,all-week,early-peak,2030,all-year,R1,78.57430000000,gasCCGT,3,MUS$2010/kt,2050 -3,6,CO2f,all-week,early-peak,2035,all-year,R1,15.71490000000,gasCCGT,3,MUS$2010/kt,2050 -1,10,electricity,all-week,late-peak,2025,all-year,R1,0.66670000000,gasCCGT,4,MUS$2010/PJ,2050 -2,10,electricity,all-week,late-peak,2030,all-year,R1,1.66670000000,gasCCGT,4,MUS$2010/PJ,2050 -3,10,electricity,all-week,late-peak,2035,all-year,R1,0.33330000000,gasCCGT,4,MUS$2010/PJ,2050 -4,10,electricity,all-week,late-peak,2040,all-year,R1,0.50000000000,windturbine,4,MUS$2010/PJ,2050 -5,10,electricity,all-week,late-peak,2045,all-year,R1,0.33330000000,windturbine,4,MUS$2010/PJ,2050 -1,6,CO2f,all-week,late-peak,2025,all-year,R1,61.11330000000,gasCCGT,4,MUS$2010/kt,2050 -2,6,CO2f,all-week,late-peak,2030,all-year,R1,152.78330000000,gasCCGT,4,MUS$2010/kt,2050 -3,6,CO2f,all-week,late-peak,2035,all-year,R1,30.55670000000,gasCCGT,4,MUS$2010/kt,2050 -1,10,electricity,all-week,evening,2025,all-year,R1,0.66670000000,gasCCGT,5,MUS$2010/PJ,2050 -2,10,electricity,all-week,evening,2030,all-year,R1,1.66670000000,gasCCGT,5,MUS$2010/PJ,2050 -3,10,electricity,all-week,evening,2035,all-year,R1,0.33330000000,gasCCGT,5,MUS$2010/PJ,2050 -4,10,electricity,all-week,evening,2040,all-year,R1,0.34290000000,windturbine,5,MUS$2010/PJ,2050 -5,10,electricity,all-week,evening,2045,all-year,R1,0.22860000000,windturbine,5,MUS$2010/PJ,2050 -1,6,CO2f,all-week,evening,2025,all-year,R1,61.11330000000,gasCCGT,5,MUS$2010/kt,2050 -2,6,CO2f,all-week,evening,2030,all-year,R1,152.78330000000,gasCCGT,5,MUS$2010/kt,2050 -3,6,CO2f,all-week,evening,2035,all-year,R1,30.55670000000,gasCCGT,5,MUS$2010/kt,2050 +0,10,electricity,all-week,night,2020,all-year,R1,0.05280000000,gasCCGT,0,MUS$2010/PJ,2025 +1,10,electricity,all-week,night,2020,all-year,R1,0.36940000000,windturbine,0,MUS$2010/PJ,2025 +0,6,CO2f,all-week,night,2020,all-year,R1,4.83810000000,gasCCGT,0,MUS$2010/kt,2025 +0,10,electricity,all-week,morning,2020,all-year,R1,0.07920000000,gasCCGT,1,MUS$2010/PJ,2025 +1,10,electricity,all-week,morning,2020,all-year,R1,0.55420000000,windturbine,1,MUS$2010/PJ,2025 +0,6,CO2f,all-week,morning,2020,all-year,R1,7.25720000000,gasCCGT,1,MUS$2010/kt,2025 +0,10,electricity,all-week,afternoon,2020,all-year,R1,0.10000000000,gasCCGT,2,MUS$2010/PJ,2025 +1,10,electricity,all-week,afternoon,2020,all-year,R1,0.36940000000,windturbine,2,MUS$2010/PJ,2025 +0,6,CO2f,all-week,afternoon,2020,all-year,R1,9.16700000000,gasCCGT,2,MUS$2010/kt,2025 +0,10,electricity,all-week,early-peak,2020,all-year,R1,0.07920000000,gasCCGT,3,MUS$2010/PJ,2025 +1,10,electricity,all-week,early-peak,2020,all-year,R1,0.55420000000,windturbine,3,MUS$2010/PJ,2025 +0,6,CO2f,all-week,early-peak,2020,all-year,R1,7.25720000000,gasCCGT,3,MUS$2010/kt,2025 +0,10,electricity,all-week,late-peak,2020,all-year,R1,0.08330000000,gasCCGT,4,MUS$2010/PJ,2025 +1,10,electricity,all-week,late-peak,2020,all-year,R1,1.16670000000,windturbine,4,MUS$2010/PJ,2025 +0,6,CO2f,all-week,late-peak,2020,all-year,R1,7.63920000000,gasCCGT,4,MUS$2010/kt,2025 +0,10,electricity,all-week,evening,2020,all-year,R1,0.05630000000,gasCCGT,5,MUS$2010/PJ,2025 +1,10,electricity,all-week,evening,2020,all-year,R1,0.78810000000,windturbine,5,MUS$2010/PJ,2025 +0,6,CO2f,all-week,evening,2020,all-year,R1,5.16070000000,gasCCGT,5,MUS$2010/kt,2025 +1,10,electricity,all-week,night,2020,all-year,R1,0.42420000000,windturbine,0,MUS$2010/PJ,2030 +2,10,electricity,all-week,night,2025,all-year,R1,0.24240000000,windturbine,0,MUS$2010/PJ,2030 +1,10,electricity,all-week,morning,2020,all-year,R1,0.63640000000,windturbine,1,MUS$2010/PJ,2030 +2,10,electricity,all-week,morning,2025,all-year,R1,0.36360000000,windturbine,1,MUS$2010/PJ,2030 +1,10,electricity,all-week,afternoon,2020,all-year,R1,0.42420000000,windturbine,2,MUS$2010/PJ,2030 +2,10,electricity,all-week,afternoon,2025,all-year,R1,0.24240000000,windturbine,2,MUS$2010/PJ,2030 +1,10,electricity,all-week,early-peak,2020,all-year,R1,0.63640000000,windturbine,3,MUS$2010/PJ,2030 +2,10,electricity,all-week,early-peak,2025,all-year,R1,0.36360000000,windturbine,3,MUS$2010/PJ,2030 +1,10,electricity,all-week,late-peak,2020,all-year,R1,1.16670000000,windturbine,4,MUS$2010/PJ,2030 +2,10,electricity,all-week,late-peak,2025,all-year,R1,0.66670000000,windturbine,4,MUS$2010/PJ,2030 +1,10,electricity,all-week,evening,2020,all-year,R1,0.84850000000,windturbine,5,MUS$2010/PJ,2030 +2,10,electricity,all-week,evening,2025,all-year,R1,0.48480000000,windturbine,5,MUS$2010/PJ,2030 +1,10,electricity,all-week,night,2020,all-year,R1,0.40000000000,windturbine,0,MUS$2010/PJ,2035 +2,10,electricity,all-week,night,2025,all-year,R1,0.22860000000,windturbine,0,MUS$2010/PJ,2035 +3,10,electricity,all-week,night,2030,all-year,R1,0.17140000000,windturbine,0,MUS$2010/PJ,2035 +1,10,electricity,all-week,morning,2020,all-year,R1,0.60000000000,windturbine,1,MUS$2010/PJ,2035 +2,10,electricity,all-week,morning,2025,all-year,R1,0.34290000000,windturbine,1,MUS$2010/PJ,2035 +3,10,electricity,all-week,morning,2030,all-year,R1,0.25710000000,windturbine,1,MUS$2010/PJ,2035 +1,10,electricity,all-week,afternoon,2020,all-year,R1,0.40000000000,windturbine,2,MUS$2010/PJ,2035 +2,10,electricity,all-week,afternoon,2025,all-year,R1,0.22860000000,windturbine,2,MUS$2010/PJ,2035 +3,10,electricity,all-week,afternoon,2030,all-year,R1,0.17140000000,windturbine,2,MUS$2010/PJ,2035 +1,10,electricity,all-week,early-peak,2020,all-year,R1,0.60000000000,windturbine,3,MUS$2010/PJ,2035 +2,10,electricity,all-week,early-peak,2025,all-year,R1,0.34290000000,windturbine,3,MUS$2010/PJ,2035 +3,10,electricity,all-week,early-peak,2030,all-year,R1,0.25710000000,windturbine,3,MUS$2010/PJ,2035 +1,10,electricity,all-week,late-peak,2020,all-year,R1,1.16670000000,windturbine,4,MUS$2010/PJ,2035 +2,10,electricity,all-week,late-peak,2025,all-year,R1,0.66670000000,windturbine,4,MUS$2010/PJ,2035 +3,10,electricity,all-week,late-peak,2030,all-year,R1,0.50000000000,windturbine,4,MUS$2010/PJ,2035 +1,10,electricity,all-week,evening,2020,all-year,R1,0.80000000000,windturbine,5,MUS$2010/PJ,2035 +2,10,electricity,all-week,evening,2025,all-year,R1,0.45710000000,windturbine,5,MUS$2010/PJ,2035 +3,10,electricity,all-week,evening,2030,all-year,R1,0.34290000000,windturbine,5,MUS$2010/PJ,2035 +1,10,electricity,all-week,night,2020,all-year,R1,0.40830000000,windturbine,0,MUS$2010/PJ,2040 +2,10,electricity,all-week,night,2025,all-year,R1,0.23330000000,windturbine,0,MUS$2010/PJ,2040 +3,10,electricity,all-week,night,2030,all-year,R1,0.17500000000,windturbine,0,MUS$2010/PJ,2040 +4,10,electricity,all-week,night,2035,all-year,R1,0.11670000000,windturbine,0,MUS$2010/PJ,2040 +1,10,electricity,all-week,morning,2020,all-year,R1,0.61250000000,windturbine,1,MUS$2010/PJ,2040 +2,10,electricity,all-week,morning,2025,all-year,R1,0.35000000000,windturbine,1,MUS$2010/PJ,2040 +3,10,electricity,all-week,morning,2030,all-year,R1,0.26250000000,windturbine,1,MUS$2010/PJ,2040 +4,10,electricity,all-week,morning,2035,all-year,R1,0.17500000000,windturbine,1,MUS$2010/PJ,2040 +1,10,electricity,all-week,afternoon,2020,all-year,R1,0.40830000000,windturbine,2,MUS$2010/PJ,2040 +2,10,electricity,all-week,afternoon,2025,all-year,R1,0.23330000000,windturbine,2,MUS$2010/PJ,2040 +3,10,electricity,all-week,afternoon,2030,all-year,R1,0.17500000000,windturbine,2,MUS$2010/PJ,2040 +4,10,electricity,all-week,afternoon,2035,all-year,R1,0.11670000000,windturbine,2,MUS$2010/PJ,2040 +1,10,electricity,all-week,early-peak,2020,all-year,R1,0.61250000000,windturbine,3,MUS$2010/PJ,2040 +2,10,electricity,all-week,early-peak,2025,all-year,R1,0.35000000000,windturbine,3,MUS$2010/PJ,2040 +3,10,electricity,all-week,early-peak,2030,all-year,R1,0.26250000000,windturbine,3,MUS$2010/PJ,2040 +4,10,electricity,all-week,early-peak,2035,all-year,R1,0.17500000000,windturbine,3,MUS$2010/PJ,2040 +1,10,electricity,all-week,late-peak,2020,all-year,R1,1.16670000000,windturbine,4,MUS$2010/PJ,2040 +2,10,electricity,all-week,late-peak,2025,all-year,R1,0.66670000000,windturbine,4,MUS$2010/PJ,2040 +3,10,electricity,all-week,late-peak,2030,all-year,R1,0.50000000000,windturbine,4,MUS$2010/PJ,2040 +4,10,electricity,all-week,late-peak,2035,all-year,R1,0.33330000000,windturbine,4,MUS$2010/PJ,2040 +1,10,electricity,all-week,evening,2020,all-year,R1,0.81670000000,windturbine,5,MUS$2010/PJ,2040 +2,10,electricity,all-week,evening,2025,all-year,R1,0.46670000000,windturbine,5,MUS$2010/PJ,2040 +3,10,electricity,all-week,evening,2030,all-year,R1,0.35000000000,windturbine,5,MUS$2010/PJ,2040 +4,10,electricity,all-week,evening,2035,all-year,R1,0.23330000000,windturbine,5,MUS$2010/PJ,2040 +1,10,electricity,all-week,night,2020,all-year,R1,0.39300000000,windturbine,0,MUS$2010/PJ,2045 +2,10,electricity,all-week,night,2025,all-year,R1,0.22460000000,windturbine,0,MUS$2010/PJ,2045 +3,10,electricity,all-week,night,2030,all-year,R1,0.16840000000,windturbine,0,MUS$2010/PJ,2045 +4,10,electricity,all-week,night,2035,all-year,R1,0.11230000000,windturbine,0,MUS$2010/PJ,2045 +5,10,electricity,all-week,night,2040,all-year,R1,0.16840000000,windturbine,0,MUS$2010/PJ,2045 +1,10,electricity,all-week,morning,2020,all-year,R1,0.58950000000,windturbine,1,MUS$2010/PJ,2045 +2,10,electricity,all-week,morning,2025,all-year,R1,0.33680000000,windturbine,1,MUS$2010/PJ,2045 +3,10,electricity,all-week,morning,2030,all-year,R1,0.25260000000,windturbine,1,MUS$2010/PJ,2045 +4,10,electricity,all-week,morning,2035,all-year,R1,0.16840000000,windturbine,1,MUS$2010/PJ,2045 +5,10,electricity,all-week,morning,2040,all-year,R1,0.25260000000,windturbine,1,MUS$2010/PJ,2045 +1,10,electricity,all-week,afternoon,2020,all-year,R1,0.39300000000,windturbine,2,MUS$2010/PJ,2045 +2,10,electricity,all-week,afternoon,2025,all-year,R1,0.22460000000,windturbine,2,MUS$2010/PJ,2045 +3,10,electricity,all-week,afternoon,2030,all-year,R1,0.16840000000,windturbine,2,MUS$2010/PJ,2045 +4,10,electricity,all-week,afternoon,2035,all-year,R1,0.11230000000,windturbine,2,MUS$2010/PJ,2045 +5,10,electricity,all-week,afternoon,2040,all-year,R1,0.16840000000,windturbine,2,MUS$2010/PJ,2045 +1,10,electricity,all-week,early-peak,2020,all-year,R1,0.58950000000,windturbine,3,MUS$2010/PJ,2045 +2,10,electricity,all-week,early-peak,2025,all-year,R1,0.33680000000,windturbine,3,MUS$2010/PJ,2045 +3,10,electricity,all-week,early-peak,2030,all-year,R1,0.25260000000,windturbine,3,MUS$2010/PJ,2045 +4,10,electricity,all-week,early-peak,2035,all-year,R1,0.16840000000,windturbine,3,MUS$2010/PJ,2045 +5,10,electricity,all-week,early-peak,2040,all-year,R1,0.25260000000,windturbine,3,MUS$2010/PJ,2045 +1,10,electricity,all-week,late-peak,2020,all-year,R1,1.16670000000,windturbine,4,MUS$2010/PJ,2045 +2,10,electricity,all-week,late-peak,2025,all-year,R1,0.66670000000,windturbine,4,MUS$2010/PJ,2045 +3,10,electricity,all-week,late-peak,2030,all-year,R1,0.50000000000,windturbine,4,MUS$2010/PJ,2045 +4,10,electricity,all-week,late-peak,2035,all-year,R1,0.33330000000,windturbine,4,MUS$2010/PJ,2045 +5,10,electricity,all-week,late-peak,2040,all-year,R1,0.50000000000,windturbine,4,MUS$2010/PJ,2045 +1,10,electricity,all-week,evening,2020,all-year,R1,0.78600000000,windturbine,5,MUS$2010/PJ,2045 +2,10,electricity,all-week,evening,2025,all-year,R1,0.44910000000,windturbine,5,MUS$2010/PJ,2045 +3,10,electricity,all-week,evening,2030,all-year,R1,0.33680000000,windturbine,5,MUS$2010/PJ,2045 +4,10,electricity,all-week,evening,2035,all-year,R1,0.22460000000,windturbine,5,MUS$2010/PJ,2045 +5,10,electricity,all-week,evening,2040,all-year,R1,0.33680000000,windturbine,5,MUS$2010/PJ,2045 +2,10,electricity,all-week,night,2025,all-year,R1,0.22860000000,windturbine,0,MUS$2010/PJ,2050 +3,10,electricity,all-week,night,2030,all-year,R1,0.17140000000,windturbine,0,MUS$2010/PJ,2050 +4,10,electricity,all-week,night,2035,all-year,R1,0.11430000000,windturbine,0,MUS$2010/PJ,2050 +5,10,electricity,all-week,night,2040,all-year,R1,0.17140000000,windturbine,0,MUS$2010/PJ,2050 +6,10,electricity,all-week,night,2045,all-year,R1,0.51430000000,windturbine,0,MUS$2010/PJ,2050 +2,10,electricity,all-week,morning,2025,all-year,R1,0.34290000000,windturbine,1,MUS$2010/PJ,2050 +3,10,electricity,all-week,morning,2030,all-year,R1,0.25710000000,windturbine,1,MUS$2010/PJ,2050 +4,10,electricity,all-week,morning,2035,all-year,R1,0.17140000000,windturbine,1,MUS$2010/PJ,2050 +5,10,electricity,all-week,morning,2040,all-year,R1,0.25710000000,windturbine,1,MUS$2010/PJ,2050 +6,10,electricity,all-week,morning,2045,all-year,R1,0.77140000000,windturbine,1,MUS$2010/PJ,2050 +2,10,electricity,all-week,afternoon,2025,all-year,R1,0.22860000000,windturbine,2,MUS$2010/PJ,2050 +3,10,electricity,all-week,afternoon,2030,all-year,R1,0.17140000000,windturbine,2,MUS$2010/PJ,2050 +4,10,electricity,all-week,afternoon,2035,all-year,R1,0.11430000000,windturbine,2,MUS$2010/PJ,2050 +5,10,electricity,all-week,afternoon,2040,all-year,R1,0.17140000000,windturbine,2,MUS$2010/PJ,2050 +6,10,electricity,all-week,afternoon,2045,all-year,R1,0.51430000000,windturbine,2,MUS$2010/PJ,2050 +2,10,electricity,all-week,early-peak,2025,all-year,R1,0.34290000000,windturbine,3,MUS$2010/PJ,2050 +3,10,electricity,all-week,early-peak,2030,all-year,R1,0.25710000000,windturbine,3,MUS$2010/PJ,2050 +4,10,electricity,all-week,early-peak,2035,all-year,R1,0.17140000000,windturbine,3,MUS$2010/PJ,2050 +5,10,electricity,all-week,early-peak,2040,all-year,R1,0.25710000000,windturbine,3,MUS$2010/PJ,2050 +6,10,electricity,all-week,early-peak,2045,all-year,R1,0.77140000000,windturbine,3,MUS$2010/PJ,2050 +2,10,electricity,all-week,late-peak,2025,all-year,R1,0.66670000000,windturbine,4,MUS$2010/PJ,2050 +3,10,electricity,all-week,late-peak,2030,all-year,R1,0.50000000000,windturbine,4,MUS$2010/PJ,2050 +4,10,electricity,all-week,late-peak,2035,all-year,R1,0.33330000000,windturbine,4,MUS$2010/PJ,2050 +5,10,electricity,all-week,late-peak,2040,all-year,R1,0.50000000000,windturbine,4,MUS$2010/PJ,2050 +6,10,electricity,all-week,late-peak,2045,all-year,R1,1.50000000000,windturbine,4,MUS$2010/PJ,2050 +2,10,electricity,all-week,evening,2025,all-year,R1,0.45710000000,windturbine,5,MUS$2010/PJ,2050 +3,10,electricity,all-week,evening,2030,all-year,R1,0.34290000000,windturbine,5,MUS$2010/PJ,2050 +4,10,electricity,all-week,evening,2035,all-year,R1,0.22860000000,windturbine,5,MUS$2010/PJ,2050 +5,10,electricity,all-week,evening,2040,all-year,R1,0.34290000000,windturbine,5,MUS$2010/PJ,2050 +6,10,electricity,all-week,evening,2045,all-year,R1,1.02860000000,windturbine,5,MUS$2010/PJ,2050 diff --git a/docs/tutorial-code/min-max-timeslice-constraints/2-max-constraint/technodata/power/TechnodataTimeslices.csv b/docs/tutorial-code/min-max-timeslice-constraints/2-max-constraint/technodata/power/TechnodataTimeslices.csv index 97c5bbe97..8dcd5f8ce 100644 --- a/docs/tutorial-code/min-max-timeslice-constraints/2-max-constraint/technodata/power/TechnodataTimeslices.csv +++ b/docs/tutorial-code/min-max-timeslice-constraints/2-max-constraint/technodata/power/TechnodataTimeslices.csv @@ -4,11 +4,11 @@ gasCCGT,R1,2020,upper,all-year,all-week,night,1,0.2 gasCCGT,R1,2020,upper,all-year,all-week,morning,1,0.4 gasCCGT,R1,2020,upper,all-year,all-week,afternoon,1,0.6 gasCCGT,R1,2020,upper,all-year,all-week,early-peak,1,0.4 -gasCCGT,R1,2020,upper,all-year,all-week,late-peak,1,0.8 -gasCCGT,R1,2020,upper,all-year,all-week,evening,1,1 +gasCCGT,R1,2020,upper,all-year,all-week,late-peak,0.5,0 +gasCCGT,R1,2020,upper,all-year,all-week,evening,0.5,0 windturbine,R1,2020,upper,all-year,all-week,night,1,0 -windturbine,R1,2020,upper,all-year,all-week,morning,0.5,0 -windturbine,R1,2020,upper,all-year,all-week,afternoon,0.5,0 +windturbine,R1,2020,upper,all-year,all-week,morning,1,0 +windturbine,R1,2020,upper,all-year,all-week,afternoon,1,0 windturbine,R1,2020,upper,all-year,all-week,early-peak,1,0 windturbine,R1,2020,upper,all-year,all-week,late-peak,1,0 windturbine,R1,2020,upper,all-year,all-week,evening,1,0 diff --git a/docs/tutorial-code/min-max-timeslice-constraints/generate_models.py b/docs/tutorial-code/min-max-timeslice-constraints/generate_models.py index 6cd61c927..5f0cffce2 100644 --- a/docs/tutorial-code/min-max-timeslice-constraints/generate_models.py +++ b/docs/tutorial-code/min-max-timeslice-constraints/generate_models.py @@ -58,11 +58,22 @@ def generate_model_2() -> None: # Modify UtilizationFactor and MinimumServiceFactor for windturbine timeslices_file = model_path / "technodata/power/TechnodataTimeslices.csv" df = pd.read_csv(timeslices_file) - df.loc[ - (df["ProcessName"] == "windturbine") - & (df["hour"].isin(["morning", "afternoon"])), - "UtilizationFactor", - ] = 0.5 + df.loc[df["ProcessName"] == "gasCCGT", "MinimumServiceFactor"] = [ + 0.2, + 0.4, + 0.6, + 0.4, + 0, + 0, + ] + df.loc[df["ProcessName"] == "gasCCGT", "UtilizationFactor"] = [ + 1, + 1, + 1, + 1, + 0.5, + 0.5, + ] df.to_csv(timeslices_file, index=False) diff --git a/docs/user-guide/min-max-timeslice-constraints.ipynb b/docs/user-guide/min-max-timeslice-constraints.ipynb index 57dfd2508..0d4d5f504 100644 --- a/docs/user-guide/min-max-timeslice-constraints.ipynb +++ b/docs/user-guide/min-max-timeslice-constraints.ipynb @@ -46,12 +46,8 @@ "| gasCCGT | R1 | 2020 | all-year | all-week | early-peak | 1 | **0.4** |\n", "| gasCCGT | R1 | 2020 | all-year | all-week | late-peak | 1 | **0.8** |\n", "| gasCCGT | R1 | 2020 | all-year | all-week | evening | 1 | **1** |\n", - "| windturbine | R1 | 2020 | all-year | all-week | night | 1 | 0 |\n", - "| windturbine | R1 | 2020 | all-year | all-week | morning | 1 | 0 |\n", - "| windturbine | R1 | 2020 | all-year | all-week | afternoon | 1 | 0 |\n", - "| windturbine | R1 | 2020 | all-year | all-week | early-peak | 1 | 0 |\n", - "| windturbine | R1 | 2020 | all-year | all-week | late-peak | 1 | 0 |\n", - "| windturbine | R1 | 2020 | all-year | all-week | evening | 1 | 0 |\n" + "\n", + "For example, if the capacity of `gasCCGT` in a given year is 1, and the minimum service factor in a timeslice is 0.5, then the minimum output in that timeslice will be capped at 0.083 (= (1 / 6) * 0.5), assuming there are 6 timeslices with equal length." ] }, { @@ -107,6 +103,9 @@ "metadata": {}, "outputs": [], "source": [ + "from pathlib import Path\n", + "\n", + "import numpy as np\n", "import pandas as pd\n", "import seaborn as sns" ] @@ -117,34 +116,55 @@ "metadata": {}, "outputs": [], "source": [ - "power_supply = pd.read_csv(\n", - " \"../tutorial-code/min-max-timeslice-constraints/1-min-constraint/Results/Power_Supply.csv\"\n", - ")\n", - "gassCCGT_electricity_supply_2025 = (\n", - " power_supply[\n", - " (power_supply.technology == \"gasCCGT\")\n", - " & (power_supply.commodity == \"electricity\")\n", - " & (power_supply.year == 2025)\n", - " ]\n", - " .groupby([\"timeslice\", \"technology\"])\n", - " .sum()\n", - " .reset_index()\n", - ")\n", + "def plot_supply(supply, capacity, technology, commodity, year, factor=None):\n", + " # Plot timeslice supply\n", + " tech_supply = (\n", + " supply[\n", + " (supply.technology == technology)\n", + " & (supply.commodity == commodity)\n", + " & (supply.year == year)\n", + " ]\n", + " .groupby([\"timeslice\", \"technology\"])\n", + " .sum()\n", + " .reset_index()\n", + " )\n", + "\n", + " ax = sns.barplot(\n", + " data=tech_supply,\n", + " x=\"timeslice\",\n", + " y=\"supply\",\n", + " hue=\"technology\",\n", + " )\n", + " ax.set_title(f\"{commodity} supply from {technology} in {year}\")\n", + "\n", + " # Add line for the expected minimum/maximum supply\n", + " if factor is not None:\n", + " tech_capa = capacity[\n", + " (capacity.technology == technology) & (capacity.year == year)\n", + " ].capacity.sum()\n", + " min_supply = (tech_capa / 6) * factor\n", + " ax.plot(min_supply, color=\"red\")\n", "\n", - "ax = sns.barplot(\n", - " data=gassCCGT_electricity_supply_2025,\n", - " x=\"timeslice\",\n", - " y=\"supply\",\n", - " hue=\"technology\",\n", - ")\n", - "ax.set_title(\"Electricity supply from gasCCGT in 2025\")" + "\n", + "path = Path(\"../tutorial-code/min-max-timeslice-constraints/1-min-constraint/Results/\")\n", + "supply = pd.read_csv(path / \"Power_Supply.csv\")\n", + "capacity = pd.read_csv(path / \"MCACapacity.csv\")\n", + "\n", + "plot_supply(\n", + " supply,\n", + " capacity,\n", + " \"gasCCGT\",\n", + " \"electricity\",\n", + " 2025,\n", + " np.array([0.2, 0.4, 0.6, 0.4, 0.8, 1]),\n", + ")" ] }, { "cell_type": "markdown", "metadata": {}, "source": [ - "Here, we can see that the supply of electricity by `gasCCGT` in 2025 perfectly matches the values that we inputted for the `MinimumServiceFactor`. Given the capacity of `gasCCGT` in this year of 1 (see the `MCACapacity.csv` file), this suggests that this technology is operating at its minimum permitted level in all timeslices." + "Here, we can see that the supply of electricity by `gasCCGT` in 2025 successfully exceeds the lower-bound cap (red line) in every timeslice." ] }, { @@ -158,7 +178,7 @@ "cell_type": "markdown", "metadata": {}, "source": [ - "Next, we want to ensure that the supply of `windturbine` does not exceed a certain value during the day. This may be because, for example, there is reduced wind during the day. We will, therefore, modify the `TechnodataTimeslices.csv` file by changing the `UtilizationFactor`, as shown:\n", + "Next, we will try removing the minimum constraint for the last two timeslices and instead imposing a maximum constraint using the UtilizationFactor parameter\n", "\n", "|ProcessName|RegionName|Time|month|day|hour|UtilizationFactor|MinimumServiceFactor|\n", "|-|-|-|-|-|-|-|-|\n", @@ -167,21 +187,15 @@ "|gasCCGT|R1|2020|all-year|all-week|morning|1|0.4|\n", "|gasCCGT|R1|2020|all-year|all-week|afternoon|1|0.6|\n", "|gasCCGT|R1|2020|all-year|all-week|early-peak|1|0.4|\n", - "|gasCCGT|R1|2020|all-year|all-week|late-peak|1|0.8|\n", - "|gasCCGT|R1|2020|all-year|all-week|evening|1|1|\n", - "|windturbine|R1|2020|all-year|all-week|night|1|**0**|\n", - "|windturbine|R1|2020|all-year|all-week|morning|**0.5**|**0**|\n", - "|windturbine|R1|2020|all-year|all-week|afternoon|**0.5**|**0**|\n", - "|windturbine|R1|2020|all-year|all-week|early-peak|1|**0**|\n", - "|windturbine|R1|2020|all-year|all-week|late-peak|1|**0**|\n", - "|windturbine|R1|2020|all-year|all-week|evening|1|**0**|\n" + "|gasCCGT|R1|2020|all-year|all-week|late-peak|**0.5**|**0**|\n", + "|gasCCGT|R1|2020|all-year|all-week|evening|**0.5**|**0**|" ] }, { "cell_type": "markdown", "metadata": {}, "source": [ - "Once this has been saved, we can run the model again (`python -m muse settings.toml`), and visualise our results as before. We should hopefully see a reduction in the output of `windturbine` in the 2nd and 3rd timeslices:" + "Once this has been saved, we can run the model again (`python -m muse settings.toml`), and visualise our results as before." ] }, { @@ -190,36 +204,25 @@ "metadata": {}, "outputs": [], "source": [ - "power_supply = pd.read_csv(\n", - " \"../tutorial-code/min-max-timeslice-constraints/2-max-constraint/Results/Power_Supply.csv\"\n", - ")\n", - "windturbine_electricity_supply_2050 = (\n", - " power_supply[\n", - " (power_supply.technology == \"windturbine\")\n", - " & (power_supply.commodity == \"electricity\")\n", - " & (power_supply.year == 2050)\n", - " ]\n", - " .groupby([\"timeslice\", \"technology\"])\n", - " .sum()\n", - " .reset_index()\n", - ")\n", + "path = Path(\"../tutorial-code/min-max-timeslice-constraints/2-max-constraint/Results/\")\n", + "supply = pd.read_csv(path / \"Power_Supply.csv\")\n", + "capacity = pd.read_csv(path / \"MCACapacity.csv\")\n", "\n", - "ax = sns.barplot(\n", - " data=windturbine_electricity_supply_2050,\n", - " x=\"timeslice\",\n", - " y=\"supply\",\n", - " hue=\"technology\",\n", - ")\n", - "ax.set_title(\"Electricity supply from windturbine in 2050\")" + "plot_supply(\n", + " supply,\n", + " capacity,\n", + " \"gasCCGT\",\n", + " \"electricity\",\n", + " 2025,\n", + " np.array([1, 1, 1, 1, 0.5, 0.5]),\n", + ")" ] }, { "cell_type": "markdown", "metadata": {}, "source": [ - "As expected, we can see an enforced reduction in `windturbine` output in the 2nd (1) and 3rd (2) timeslices.\n", - "\n", - "From the `MCACapacity.csv` file, we can see that the capacity of `windturbine` in this year is 1. Therefore, the results show that `windturbine` is operating at its maximum permitted level in all timeslices apart from the first, where it's operating below this level.\n", + "As expected, we can see an enforced reduction in supply in the final two timeslices, compared to the previous scenario.\n", "\n", "## Summary\n", "\n", diff --git a/src/muse/constraints.py b/src/muse/constraints.py index 5a9826e0f..a009b7d21 100644 --- a/src/muse/constraints.py +++ b/src/muse/constraints.py @@ -1106,10 +1106,7 @@ class ScipyAdapter: >>> assets = next(a.assets for a in res.agents) >>> market_demand = 0.8 * maximum_production( ... res.technologies.interp(year=2025), - ... convert_timeslice( - ... assets.capacity.sel(year=2025).groupby("technology").sum("asset"), - ... market.timeslice, - ... ), + ... assets.capacity.sel(year=2025).groupby("technology").sum("asset"), ... ).rename(technology="asset") >>> costs = search * np.arange(np.prod(search.shape)).reshape(search.shape) >>> constraint = cs.max_capacity_expansion( From b17a9b7c960e3ab863a05ddb2695085777b700f3 Mon Sep 17 00:00:00 2001 From: Tom Bland Date: Fri, 25 Oct 2024 12:07:51 +0100 Subject: [PATCH 17/18] Use local timesliced objects rather than TIMESLICE --- src/muse/demand_share.py | 18 ++++++++-- src/muse/examples.py | 7 ++-- src/muse/investments.py | 4 +-- src/muse/production.py | 2 +- src/muse/quantities.py | 46 +++++++++++++++++--------- tests/test_constraints.py | 1 + tests/test_demand_share.py | 12 +++++-- tests/test_quantities.py | 68 +++++++++++++++++++++++++------------- 8 files changed, 104 insertions(+), 54 deletions(-) diff --git a/src/muse/demand_share.py b/src/muse/demand_share.py index 7e424f171..b6a29b591 100644 --- a/src/muse/demand_share.py +++ b/src/muse/demand_share.py @@ -233,7 +233,10 @@ def decommissioning(capacity): from muse.quantities import decommissioning_demand return decommissioning_demand( - technologies, capacity, year=[current_year, current_year + forecast] + technologies, + capacity, + year=[current_year, current_year + forecast], + timeslices=market.timeslice, ).squeeze("year") if current_year is None: @@ -308,7 +311,12 @@ def decommissioning(capacity): new_demands = _inner_split( new_capacity, demands.new.sel(region=region), - partial(maximum_production, technologies=regional_techs, year=current_year), + partial( + maximum_production, + technologies=regional_techs, + timeslices=market.timeslice, + year=current_year, + ), id_to_nquantity, ) @@ -357,7 +365,10 @@ def decommissioning(capacity): from muse.quantities import decommissioning_demand return decommissioning_demand( - technologies, capacity, year=[current_year, current_year + forecast] + technologies, + capacity, + year=[current_year, current_year + forecast], + timeslices=market.timeslice, ).squeeze("year") if current_year is None: @@ -408,6 +419,7 @@ def decommissioning(capacity): partial( maximum_production, technologies=technologies.sel(region=region), + timeslices=market.timeslice, year=current_year, ), id_to_quantity, diff --git a/src/muse/examples.py b/src/muse/examples.py index e75823db7..2ccc37d59 100644 --- a/src/muse/examples.py +++ b/src/muse/examples.py @@ -242,7 +242,6 @@ def matching_market(sector: str, model: str = "default") -> xr.Dataset: from muse.examples import sector as load_sector from muse.quantities import consumption, maximum_production from muse.sectors import Sector - from muse.timeslices import QuantityType, convert_timeslice from muse.utilities import agent_concatenation loaded_sector = cast(Sector, load_sector(sector, model)) @@ -251,10 +250,8 @@ def matching_market(sector: str, model: str = "default") -> xr.Dataset: market = xr.Dataset() production = cast( xr.DataArray, - convert_timeslice( - maximum_production(loaded_sector.technologies, assets.capacity), - loaded_sector.timeslices, - QuantityType.EXTENSIVE, + maximum_production( + loaded_sector.technologies, assets.capacity, loaded_sector.timeslices ), ) market["supply"] = production.sum("asset") diff --git a/src/muse/investments.py b/src/muse/investments.py index 7d92e5c7b..bc5baed61 100644 --- a/src/muse/investments.py +++ b/src/muse/investments.py @@ -252,7 +252,6 @@ def adhoc_match_demand( ) -> xr.DataArray: from muse.demand_matching import demand_matching from muse.quantities import capacity_in_use, maximum_production - from muse.timeslices import QuantityType, convert_timeslice demand = next(c for c in constraints if c.name == "demand").b @@ -260,12 +259,11 @@ def adhoc_match_demand( max_prod = maximum_production( technologies, max_capacity, + timeslices=demand, year=year, technology=costs.replacement, commodity=demand.commodity, ).drop_vars("technology") - if "timeslice" in demand.dims and "timeslice" not in max_prod.dims: - max_prod = convert_timeslice(max_prod, demand, QuantityType.EXTENSIVE) # Push disabled techs to last rank. # Any production assigned to them by the demand-matching algorithm will be removed. diff --git a/src/muse/production.py b/src/muse/production.py index b23d4666d..ac5e9ac46 100644 --- a/src/muse/production.py +++ b/src/muse/production.py @@ -108,7 +108,7 @@ def maximum_production( """ from muse.quantities import maximum_production - return maximum_production(technologies, capacity) + return maximum_production(technologies, capacity, timeslices=market.timeslice) @register_production(name=("share", "shares")) diff --git a/src/muse/quantities.py b/src/muse/quantities.py index bc4dd27a0..179c5c7b0 100644 --- a/src/muse/quantities.py +++ b/src/muse/quantities.py @@ -48,8 +48,8 @@ def supply( if production_method is None: production_method = maximum_production - maxprod = production_method(technologies, capacity) - minprod = minimum_production(technologies, capacity) + maxprod = production_method(technologies, capacity, timeslices=demand) + minprod = minimum_production(technologies, capacity, timeslices=demand) size = np.array(maxprod.region).size # in presence of trade demand needs to map maxprod dst_region if ( @@ -218,6 +218,7 @@ def gross_margin( def decommissioning_demand( technologies: xr.Dataset, capacity: xr.DataArray, + timeslices: xr.DataArray, year: Optional[Sequence[int]] = None, ) -> xr.DataArray: r"""Computes demand from process decommissioning. @@ -254,7 +255,9 @@ def decommissioning_demand( dyears = [u for u in year if u != baseyear] return maximum_production( - technologies, capacity.sel(year=baseyear) - capacity.sel(year=dyears) + technologies, + capacity.sel(year=baseyear) - capacity.sel(year=dyears), + timeslices=timeslices, ).clip(min=0) @@ -315,7 +318,12 @@ def consumption( return consumption + flex * production -def maximum_production(technologies: xr.Dataset, capacity: xr.DataArray, **filters): +def maximum_production( + technologies: xr.Dataset, + capacity: xr.DataArray, + timeslices: xr.DataArray, + **filters, +): r"""Production for a given capacity. Given a capacity :math:`\mathcal{A}_{t, \iota}^r`, the utilization factor @@ -337,6 +345,8 @@ def maximum_production(technologies: xr.Dataset, capacity: xr.DataArray, **filte technologies: xr.Dataset describing the features of the technologies of interests. It should contain `fixed_outputs` and `utilization_factor`. It's shape is matched to `capacity` using `muse.utilities.broadcast_techs`. + timeslices: xr.DataArray of the timeslicing scheme. Production data will be + returned in this format. 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 @@ -347,7 +357,7 @@ def maximum_production(technologies: xr.Dataset, capacity: xr.DataArray, **filte filters and the set of technologies in `capacity`. """ from muse.commodities import is_enduse - from muse.timeslices import TIMESLICE, QuantityType, convert_timeslice + from muse.timeslices import QuantityType, convert_timeslice from muse.utilities import broadcast_techs, filter_input capa = filter_input( @@ -361,7 +371,7 @@ def maximum_production(technologies: xr.Dataset, capacity: xr.DataArray, **filte ) result = ( capa - * convert_timeslice(ftechs.fixed_outputs, TIMESLICE, QuantityType.EXTENSIVE) + * convert_timeslice(ftechs.fixed_outputs, timeslices, QuantityType.EXTENSIVE) * ftechs.utilization_factor ) return result.where(is_enduse(result.comm_usage), 0) @@ -386,17 +396,14 @@ def demand_matched_production( """ from muse.costs import annual_levelized_cost_of_energy as ALCOE from muse.demand_matching import demand_matching - from muse.timeslices import QuantityType, convert_timeslice from muse.utilities import broadcast_techs technodata = cast(xr.Dataset, broadcast_techs(technologies, capacity)) cost = ALCOE(prices=prices, technologies=technodata, **filters) - max_production = maximum_production(technodata, capacity, **filters) + max_production = maximum_production( + technodata, capacity, timeslices=demand, **filters + ) assert ("timeslice" in demand.dims) == ("timeslice" in cost.dims) - if "timeslice" in demand.dims and "timeslice" not in max_production.dims: - max_production = convert_timeslice( - max_production, demand.timeslice, QuantityType.EXTENSIVE - ) return demand_matching(demand, cost, max_production) @@ -480,7 +487,7 @@ def group_assets(x: xr.DataArray) -> xr.DataArray: return xr.Dataset(dict(x=x)).groupby("region").sum("asset").x ranking = costs.rank("asset") - maxprod = maximum_production(technodata, capacity) + maxprod = maximum_production(technodata, capacity, timeslices=demand.timeslice) commodity = (maxprod > 0).any([i for i in maxprod.dims if i != "commodity"]) commodity = commodity.drop_vars( [u for u in commodity.coords if u not in commodity.dims] @@ -527,7 +534,12 @@ def group_assets(x: xr.DataArray) -> xr.DataArray: return result -def minimum_production(technologies: xr.Dataset, capacity: xr.DataArray, **filters): +def minimum_production( + technologies: xr.Dataset, + capacity: xr.DataArray, + timeslices: xr.DataArray, + **filters, +): r"""Minimum production for a given capacity. Given a capacity :math:`\mathcal{A}_{t, \iota}^r`, the minimum service factor @@ -549,6 +561,8 @@ def minimum_production(technologies: xr.Dataset, capacity: xr.DataArray, **filte technologies: xr.Dataset describing the features of the technologies of interests. It should contain `fixed_outputs` and `minimum_service_factor`. Its shape is matched to `capacity` using `muse.utilities.broadcast_techs`. + timeslices: xr.DataArray of the timeslicing scheme. Production data will be + returned in this format. 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 @@ -559,7 +573,7 @@ def minimum_production(technologies: xr.Dataset, capacity: xr.DataArray, **filte the filters and the set of technologies in `capacity`. """ from muse.commodities import is_enduse - from muse.timeslices import TIMESLICE, QuantityType, convert_timeslice + from muse.timeslices import QuantityType, convert_timeslice from muse.utilities import broadcast_techs, filter_input capa = filter_input( @@ -581,7 +595,7 @@ def minimum_production(technologies: xr.Dataset, capacity: xr.DataArray, **filte ) result = ( capa - * convert_timeslice(ftechs.fixed_outputs, TIMESLICE, QuantityType.EXTENSIVE) + * convert_timeslice(ftechs.fixed_outputs, timeslices, QuantityType.EXTENSIVE) * ftechs.minimum_service_factor ) return result.where(is_enduse(result.comm_usage), 0) diff --git a/tests/test_constraints.py b/tests/test_constraints.py index 50b9a9621..20a433808 100644 --- a/tests/test_constraints.py +++ b/tests/test_constraints.py @@ -77,6 +77,7 @@ def market_demand(assets, technologies, market): return 0.8 * maximum_production( technologies.interp(year=2025), assets.capacity.sel(year=2025).groupby("technology").sum("asset"), + timeslices=market.timeslice, ).rename(technology="asset") diff --git a/tests/test_demand_share.py b/tests/test_demand_share.py index ea4f5e620..439d416e9 100644 --- a/tests/test_demand_share.py +++ b/tests/test_demand_share.py @@ -21,7 +21,7 @@ def _matching_market(technologies, stock, timeslice): from muse.quantities import consumption, maximum_production market = xr.Dataset() - production = maximum_production(technologies, stock.capacity) + production = maximum_production(technologies, stock.capacity, timeslices=timeslice) market["supply"] = production.sum("asset") market["consumption"] = drop_timeslice( consumption(technologies, production).sum("asset") + market.supply @@ -156,7 +156,10 @@ def method(capacity): from muse.quantities import decommissioning_demand return decommissioning_demand( - technologies.sel(region="USA"), capacity, year=[2012, 2017] + technologies.sel(region="USA"), + capacity, + matching_market.timeslice, + year=[2012, 2017], ) demand = matching_market.consumption.sel(year=2015, region="USA", drop=True).where( @@ -190,7 +193,10 @@ def method(capacity): from muse.quantities import decommissioning_demand return 0 * decommissioning_demand( - technologies.sel(region="USA"), capacity, year=[2012, 2017] + technologies.sel(region="USA"), + capacity, + matching_market.timeslice, + year=[2012, 2017], ) demand = matching_market.consumption.sel(year=2015, region="USA", drop=True).where( diff --git a/tests/test_quantities.py b/tests/test_quantities.py index 0538ff861..aefe3e6c4 100644 --- a/tests/test_quantities.py +++ b/tests/test_quantities.py @@ -52,7 +52,7 @@ def test_supply_enduse(technologies, capacity, timeslice): from muse.quantities import maximum_production, supply from muse.timeslices import QuantityType, convert_timeslice - production = maximum_production(technologies, capacity) + production = maximum_production(technologies, capacity, timeslice) demand = convert_timeslice( production.sum("asset") + 1, timeslice, QuantityType.EXTENSIVE ) @@ -74,12 +74,12 @@ def test_supply_enduse(technologies, capacity, timeslice): ).all() -def test_supply_emissions(technologies, capacity): +def test_supply_emissions(technologies, capacity, timeslice): """Emission part of supply.""" from muse.commodities import is_enduse, is_pollutant from muse.quantities import emission, maximum_production, supply - production = maximum_production(technologies, capacity) + production = maximum_production(technologies, capacity, timeslices=timeslice) spl = supply(capacity, production.sum("asset") + 1, technologies) msn = emission(spl.where(is_enduse(spl.comm_usage), 0), technologies.fixed_outputs) actual, expected = xr.broadcast( @@ -132,7 +132,7 @@ def test_gross_margin(technologies, capacity, market, timeslice): assert actual.values == approx(expected.values) -def test_decommissioning_demand(technologies, capacity): +def test_decommissioning_demand(technologies, capacity, timeslice): from muse.commodities import is_enduse from muse.quantities import decommissioning_demand @@ -142,7 +142,7 @@ def test_decommissioning_demand(technologies, capacity): capacity.loc[{"year": 2015}] = forecast = 1.0 technologies.fixed_outputs[:] = fouts = 0.5 technologies.utilization_factor[:] = ufac = 0.4 - decom = decommissioning_demand(technologies, capacity, years) + decom = decommissioning_demand(technologies, capacity, timeslice, years) assert set(decom.dims) == {"asset", "commodity", "year", "timeslice"} assert decom.sel(commodity=is_enduse(technologies.comm_usage)).sum( "timeslice" @@ -252,7 +252,7 @@ def one_dim(dimension): def test_production_aggregate_asset_view( - capacity: xr.DataArray, technologies: xr.Dataset + capacity: xr.DataArray, technologies: xr.Dataset, timeslice: xr.DataArray ): """Production when capacity has format of agent.sector. @@ -270,7 +270,7 @@ def test_production_aggregate_asset_view( technologies.fixed_outputs[:] = 1 technologies.utilization_factor[:] = 1 - prod = maximum_production(technologies, capacity) + prod = maximum_production(technologies, capacity, timeslices=timeslice) assert set(prod.dims) == set(capacity.dims).union({"commodity", "timeslice"}) assert prod.sel(commodity=~enduses).values == approx(0) prod, expected = xr.broadcast( @@ -280,7 +280,7 @@ def test_production_aggregate_asset_view( technologies.fixed_outputs[:] = fouts = 2 technologies.utilization_factor[:] = ufact = 0.5 - prod = maximum_production(technologies, capacity) + prod = maximum_production(technologies, capacity, timeslices=timeslice) assert prod.sel(commodity=~enduses).values == approx(0) assert set(prod.dims) == set(capacity.dims).union({"commodity", "timeslice"}) prod, expected = xr.broadcast( @@ -290,7 +290,7 @@ def test_production_aggregate_asset_view( technologies.fixed_outputs[:] = fouts = 3 technologies.utilization_factor[:] = ufact = 0.5 - prod = maximum_production(technologies, capacity) + prod = maximum_production(technologies, capacity, timeslices=timeslice) assert prod.sel(commodity=~enduses).values == approx(0) assert set(prod.dims) == set(capacity.dims).union({"commodity", "timeslice"}) prod, expected = xr.broadcast( @@ -299,12 +299,14 @@ def test_production_aggregate_asset_view( assert prod.values == approx(fouts * ufact * expected.values) -def test_production_agent_asset_view(capacity: xr.DataArray, technologies: xr.Dataset): +def test_production_agent_asset_view( + capacity: xr.DataArray, technologies: xr.Dataset, timeslice +): """Production when capacity has format of agent.assets.capacity.""" from muse.utilities import coords_to_multiindex, reduce_assets capacity = coords_to_multiindex(reduce_assets(capacity)).unstack("asset").fillna(0) - test_production_aggregate_asset_view(capacity, technologies) + test_production_aggregate_asset_view(capacity, technologies, timeslice) def test_capacity_in_use(production: xr.DataArray, technologies: xr.Dataset): @@ -414,7 +416,7 @@ def test_demand_matched_production( technologies.fixed_outputs[:] *= is_enduse(technologies.comm_usage) capacity = capacity.sel(year=capacity.year.min(), drop=True) - max_prod = maximum_production(technologies, capacity) + max_prod = maximum_production(technologies, capacity, timeslices=demand.timeslice) demand = max_prod.sum("asset") demand[:] *= np.random.choice([0, 1, 1 / 2, 1 / 3, 1 / 10], demand.shape) prices = xr.zeros_like(demand) @@ -441,7 +443,13 @@ def test_costed_production_exact_match(market, capacity, technologies): prices=market.prices.sel(region=technodata.region), technologies=technodata ) maxdemand = ( - xr.Dataset(dict(mp=maximum_production(technologies, capacity))) + xr.Dataset( + dict( + mp=maximum_production( + technologies, capacity, timeslices=market.timeslice + ) + ) + ) .groupby("region") .sum("asset") .mp @@ -467,7 +475,9 @@ def test_costed_production_single_region(market, capacity, technologies): capacity = capacity.drop_vars("region") capacity["region"] = "USA" market = market.sel(region=[capacity.region.values]) - maxdemand = maximum_production(technologies, capacity).sum("asset") + maxdemand = maximum_production( + technologies, capacity, timeslices=market.timeslice + ).sum("asset") market["consumption"] = drop_timeslice(0.9 * maxdemand) technodata = broadcast_techs(technologies, capacity) costs = annual_levelized_cost_of_energy( @@ -493,7 +503,13 @@ def test_costed_production_single_year(market, capacity, technologies): capacity = capacity.sel(year=2010) market = market.sel(year=2010) maxdemand = ( - xr.Dataset(dict(mp=maximum_production(technologies, capacity))) + xr.Dataset( + dict( + mp=maximum_production( + technologies, capacity, timeslices=market.timeslice + ) + ) + ) .groupby("region") .sum("asset") .mp @@ -526,7 +542,13 @@ def test_costed_production_over_capacity(market, capacity, technologies): set(market.region.values) ) maxdemand = ( - xr.Dataset(dict(mp=maximum_production(technologies, capacity))) + xr.Dataset( + dict( + mp=maximum_production( + technologies, capacity, timeslices=market.timeslice + ) + ) + ) .groupby("region") .sum("asset") .mp @@ -561,7 +583,7 @@ def test_costed_production_with_minimum_service(market, capacity, technologies, technologies.utilization_factor.dims, rng.uniform(low=0.5, high=0.9, size=technologies.utilization_factor.shape), ) - maxprod = maximum_production(technologies, capacity) + maxprod = maximum_production(technologies, capacity, timeslices=market.timeslice) minprod = maxprod * broadcast_techs(technologies.minimum_service_factor, maxprod) maxdemand = xr.Dataset(dict(mp=minprod)).groupby("region").sum("asset").mp market["consumption"] = drop_timeslice(maxdemand * 0.9) @@ -579,30 +601,30 @@ def test_costed_production_with_minimum_service(market, capacity, technologies, assert (result >= minprod - 1e-8).all() -def test_min_production(technologies, capacity): +def test_min_production(technologies, capacity, timeslice): """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) + production = minimum_production(technologies, capacity, timeslice) 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) + production = minimum_production(technologies, capacity, timeslice) assert not (production == 0).all() - assert (production <= maximum_production(technologies, capacity)).all() + assert (production <= maximum_production(technologies, capacity, timeslice)).all() -def test_supply_capped_by_min_service(technologies, capacity): +def test_supply_capped_by_min_service(technologies, capacity, timeslice): """Test supply is capped by the minimum service.""" from muse.commodities import CommodityUsage from muse.quantities import minimum_production, supply technologies["minimum_service_factor"] = 0.3 - minprod = minimum_production(technologies, capacity) + minprod = minimum_production(technologies, capacity, timeslice) # If minimum service factor is defined, then the minimum production is not zero assert not (minprod == 0).all() From 3407cfefa3e72949af104d97b14cbf4f4acfd7e2 Mon Sep 17 00:00:00 2001 From: Tom Bland Date: Fri, 25 Oct 2024 12:16:54 +0100 Subject: [PATCH 18/18] Fix doctest --- src/muse/constraints.py | 1 + 1 file changed, 1 insertion(+) diff --git a/src/muse/constraints.py b/src/muse/constraints.py index a009b7d21..40026e4a2 100644 --- a/src/muse/constraints.py +++ b/src/muse/constraints.py @@ -1107,6 +1107,7 @@ class ScipyAdapter: >>> market_demand = 0.8 * maximum_production( ... res.technologies.interp(year=2025), ... assets.capacity.sel(year=2025).groupby("technology").sum("asset"), + ... timeslices=market.timeslice, ... ).rename(technology="asset") >>> costs = search * np.arange(np.prod(search.shape)).reshape(search.shape) >>> constraint = cs.max_capacity_expansion(