From 51eb90c971b9afb5bf4d30edb72efcfc27f6bed6 Mon Sep 17 00:00:00 2001 From: Tom Bland Date: Fri, 17 Jan 2025 12:55:59 +0000 Subject: [PATCH 01/18] Capital/fixed/variable costs split by production --- src/muse/costs.py | 143 ++++++++++++++++++------------------- src/muse/objectives.py | 8 +-- src/muse/quantities.py | 8 +-- src/muse/sectors/sector.py | 1 - src/muse/timeslices.py | 12 +++- tests/test_costs.py | 30 +++----- 6 files changed, 95 insertions(+), 107 deletions(-) diff --git a/src/muse/costs.py b/src/muse/costs.py index 21bb21a53..945c918e8 100644 --- a/src/muse/costs.py +++ b/src/muse/costs.py @@ -6,7 +6,6 @@ - capacity: xr.DataArray with the capacity of the technologies - production: xr.DataArray with commodity production by the technologies - consumption: xr.DataArray with commodity consumption by the technologies -- timeslice_level: the desired timeslice level of the result (e.g. "hour", "day") - method: "lifetime" or "annual" Data should only be provided for a single year (i.e. no "year" dimension in any of the @@ -14,10 +13,6 @@ (i.e. have a "timeslice" dimension). Technology parameters may also be specified at the timeslice level, but capacity should not be. -`timeslice_level` is given as an argument to some functions, but in this case it must -match the timeslice level of any timesliced inputs, so is generally not configurable, -but only included to ensure consistency and provide explicitness. - The `technologies` input will usually contain data for multiple technologies and have a "technology" dimension (sometimes called "asset" or "replacement"). In this case, it's important that the `capacity`, `production`, and `consumption` inputs have a @@ -34,8 +29,8 @@ Some functions have a `method` argument, which can be "annual" or "lifetime": Costs can either be annual or lifetime: -- annual: calculates the cost for each timeslice in a single year -- lifetime: calculates the total cost in each timeslice over the lifetime of the +- annual: calculates the cost in a single year +- lifetime: calculates the total cost over the lifetime of the technology, using the `technical_life` attribute from the `technologies` dataset. - In this case, technology parameters, production, consumption, capacity and prices are assumed to be constant over the lifetime of the technology. The cost in each @@ -58,7 +53,7 @@ from muse.commodities import is_enduse, is_fuel, is_material, is_pollutant from muse.quantities import production_amplitude -from muse.timeslices import broadcast_timeslice, distribute_timeslice +from muse.timeslices import broadcast_timeslice, distribute_timeslice, get_level from muse.utilities import filter_input @@ -70,7 +65,6 @@ def wrapper(*args, **kwargs): result = func(*args, **kwargs) assert "year" not in result.dims assert "commodity" not in result.dims - assert "timeslice" in result.dims return result return wrapper @@ -80,7 +74,6 @@ def wrapper(*args, **kwargs): def capital_costs( technologies: xr.Dataset, capacity: xr.DataArray, - timeslice_level: str | None = None, method: str = "lifetime", ): """Calculate capital costs for the relevant technologies. @@ -92,20 +85,15 @@ def capital_costs( - lifetime: returns the full capital costs - annual: total capital costs are multiplied by the capital recovery factor to get annualized costs - - Costs are distributed uniformly over timeslices, with the timeslice level specified """ if method not in ["lifetime", "annual"]: raise ValueError("method must be either 'lifetime' or 'annual'.") - _capital_costs = distribute_timeslice( - technologies.cap_par * (capacity**technologies.cap_exp), level=timeslice_level - ) + _capital_costs = technologies.cap_par * (capacity**technologies.cap_exp) if method == "annual": crf = capital_recovery_factor(technologies) - _capital_costs = _capital_costs * broadcast_timeslice( - crf, level=timeslice_level - ) + _capital_costs = _capital_costs * crf + assert "timeslice" not in _capital_costs.dims return _capital_costs @@ -113,66 +101,66 @@ def capital_costs( def environmental_costs( technologies: xr.Dataset, prices: xr.DataArray, production: xr.DataArray ) -> xr.DataArray: - """Calculate annual environmental costs for the relevant technologies. + """Calculate timeslice-level environmental costs for the relevant technologies. This is the total production of pollutants (commodities flagged by `is_pollutant`) multiplied by their prices. """ environmentals = is_pollutant(technologies.comm_usage) prices_environmental = filter_input(prices, commodity=environmentals) - return (production * prices_environmental).sum("commodity") + result = (production * prices_environmental).sum("commodity") + assert "timeslice" in result.dims + return result @cost def fuel_costs( technologies: xr.Dataset, prices: xr.DataArray, consumption: xr.DataArray ) -> xr.DataArray: - """Calculate annual fuel costs for the relevant technologies. + """Calculate timeslice-level fuel costs for the relevant technologies. This is the total consumption of fuels (commodities flagged by `is_fuel`) multiplied by their prices. """ fuels = is_fuel(technologies.comm_usage) prices_fuel = filter_input(prices, commodity=fuels) - return (consumption * prices_fuel).sum("commodity") + result = (consumption * prices_fuel).sum("commodity") + assert "timeslice" in result.dims + return result @cost def material_costs( technologies: xr.Dataset, prices: xr.DataArray, consumption: xr.DataArray ) -> xr.DataArray: - """Calculate annual material costs for the relevant technologies. + """Calculate timeslice-level material costs for the relevant technologies. This is the total consumption of materials (commodities flagged by `is_material`) multiplied by their prices. """ material = is_material(technologies.comm_usage) prices_material = filter_input(prices, commodity=material) - return (consumption * prices_material).sum("commodity") + result = (consumption * prices_material).sum("commodity") + assert "timeslice" in result.dims + return result @cost -def fixed_costs( - technologies: xr.Dataset, capacity: xr.DataArray, timeslice_level: str | None = None -) -> xr.DataArray: +def fixed_costs(technologies: xr.Dataset, capacity: xr.DataArray) -> xr.DataArray: """Calculate annual fixed costs for the relevant technologies. This is the fixed running cost over the course of a year corresponding to the `fix_par` and `fix_exp` technology parameters. - - This cost is scaled by the capacity of the technology and distributed uniformly - over the timeslices, with the timeslice level specified """ - return distribute_timeslice( - technologies.fix_par * (capacity**technologies.fix_exp), level=timeslice_level - ) + result = technologies.fix_par * (capacity**technologies.fix_exp) + assert "timeslice" not in result.dims + return result @cost def variable_costs( technologies: xr.Dataset, production: xr.DataArray, - timeslice_level: str | None = None, ) -> xr.DataArray: """Calculate annual variable costs for the relevant technologies. @@ -180,15 +168,11 @@ def variable_costs( parameters. The `production_amplitude` function is first used to calculate technology activity - in each timeslice based on `production`. This is then used to scale the variable - costs. + based on `production`. This is then used to scale the variable costs. """ - tech_activity = production_amplitude(production, technologies, timeslice_level) - result = broadcast_timeslice( - technologies.var_par, level=timeslice_level - ) * tech_activity ** broadcast_timeslice( - technologies.var_exp, level=timeslice_level - ) + tech_activity = production_amplitude(production, technologies).sum("timeslice") + result = technologies.var_par * tech_activity**technologies.var_exp + assert "timeslice" not in result.dims return result @@ -199,7 +183,6 @@ def running_costs( capacity: xr.DataArray, production: xr.DataArray, consumption: xr.DataArray, - timeslice_level: str | None = None, ) -> xr.DataArray: """Total annual running costs (excluding capital costs). @@ -212,11 +195,24 @@ def running_costs( :py:func:`fixed_costs` :py:func:`variable_costs` """ + # Costs associated with commodity inputs and outputs (timeslice-level) _environmental_costs = environmental_costs(technologies, prices, production) _fuel_costs = fuel_costs(technologies, prices, consumption) _material_costs = material_costs(technologies, prices, consumption) - _fixed_costs = fixed_costs(technologies, capacity, timeslice_level) - _variable_costs = variable_costs(technologies, production, timeslice_level) + + # Costs associated with capacity and production level (annual) + _fixed_costs = fixed_costs(technologies, capacity) + _variable_costs = variable_costs(technologies, production) + + # Split fixed/variable across timeslices in proportion to production + timeslice_level = get_level(production) + tech_activity = production_amplitude(production, technologies) + _fixed_costs = distribute_timeslice( + _fixed_costs, ts=tech_activity, level=timeslice_level + ) + _variable_costs = distribute_timeslice( + _variable_costs, ts=tech_activity, level=timeslice_level + ) # Total running costs result = ( @@ -236,7 +232,6 @@ def net_present_value( capacity: xr.DataArray, production: xr.DataArray, consumption: xr.DataArray, - timeslice_level: str | None = None, ) -> xr.DataArray: """Net present value (NPV) of the relevant technologies. @@ -264,14 +259,17 @@ def net_present_value( production: xr.DataArray with commodity production by the relevant technologies consumption: xr.DataArray with commodity consumption by the relevant technologies - timeslice_level: the desired timeslice level of the result (e.g. "hour", "day") Return: xr.DataArray with the NPV calculated for the relevant technologies """ # Capital costs (lifetime) - _capital_costs = capital_costs( - technologies, capacity, timeslice_level, method="lifetime" + _capital_costs = capital_costs(technologies, capacity, method="lifetime") + + # Distribute capital costs across timeslices in proportion to production + tech_activity = production_amplitude(production, technologies) + _capital_costs = distribute_timeslice( + _capital_costs, ts=tech_activity, level=get_level(production) ) # Revenue (annual) @@ -281,12 +279,16 @@ def net_present_value( # Running costs (annual) _running_costs = running_costs( - technologies, prices, capacity, production, consumption, timeslice_level + technologies, + prices, + capacity, + production, + consumption, ) # Calculate running costs and revenues over lifetime - _running_costs = annual_to_lifetime(_running_costs, technologies, timeslice_level) - revenues = annual_to_lifetime(revenues, technologies, timeslice_level) + _running_costs = annual_to_lifetime(_running_costs, technologies) + revenues = annual_to_lifetime(revenues, technologies) # Net present value result = revenues - (_capital_costs + _running_costs) @@ -300,7 +302,6 @@ def net_present_cost( capacity: xr.DataArray, production: xr.DataArray, consumption: xr.DataArray, - timeslice_level: str | None = None, ) -> xr.DataArray: """Net present cost (NPC) of the relevant technologies. @@ -318,14 +319,11 @@ def net_present_cost( production: xr.DataArray with commodity production by the relevant technologies consumption: xr.DataArray with commodity consumption by the relevant technologies - timeslice_level: the desired timeslice level of the result (e.g. "hour", "day") Return: xr.DataArray with the NPC calculated for the relevant technologies """ - result = -net_present_value( - technologies, prices, capacity, production, consumption, timeslice_level - ) + result = -net_present_value(technologies, prices, capacity, production, consumption) return result @@ -336,7 +334,6 @@ def equivalent_annual_cost( capacity: xr.DataArray, production: xr.DataArray, consumption: xr.DataArray, - timeslice_level: str | None = None, ) -> xr.DataArray: """Equivalent annual costs (or annualized cost) of a technology. @@ -358,7 +355,6 @@ def equivalent_annual_cost( production: xr.DataArray with commodity production by the relevant technologies consumption: xr.DataArray with commodity consumption by the relevant technologies - timeslice_level: the desired timeslice level of the result (e.g. "hour", "day") Return: xr.DataArray with the EAC calculated for the relevant technologies @@ -369,10 +365,9 @@ def equivalent_annual_cost( capacity, production, consumption, - timeslice_level=timeslice_level, ) crf = capital_recovery_factor(technologies) - result = npc * broadcast_timeslice(crf, level=timeslice_level) + result = npc * broadcast_timeslice(crf, level=get_level(production)) return result @@ -383,7 +378,6 @@ def levelized_cost_of_energy( capacity: xr.DataArray, production: xr.DataArray, consumption: xr.DataArray, - timeslice_level: str | None = None, method: str = "lifetime", ) -> xr.DataArray: """Levelized cost of energy (LCOE) of technologies over their lifetime. @@ -414,7 +408,6 @@ def levelized_cost_of_energy( production: xr.DataArray with commodity production by the relevant technologies consumption: xr.DataArray with commodity consumption by the relevant technologies - timeslice_level: the desired timeslice level of the result (e.g. "hour", "day") method: "lifetime" or "annual" Return: @@ -424,11 +417,17 @@ def levelized_cost_of_energy( raise ValueError("method must be either 'lifetime' or 'annual'.") # Capital costs (lifetime or annual depending on method) - _capital_costs = capital_costs(technologies, capacity, timeslice_level, method) + _capital_costs = capital_costs(technologies, capacity, method) + + # Split capital costs across timeslices in proporion to production + tech_activity = production_amplitude(production, technologies) + _capital_costs = distribute_timeslice( + _capital_costs, ts=tech_activity, level=get_level(production) + ) # Running costs (annual) _running_costs = running_costs( - technologies, prices, capacity, production, consumption, timeslice_level + technologies, prices, capacity, production, consumption ) # Production (annual) @@ -443,13 +442,12 @@ def levelized_cost_of_energy( # If method is lifetime, have to adjust running costs and production if method == "lifetime": - _running_costs = annual_to_lifetime( - _running_costs, technologies, timeslice_level - ) - prod = annual_to_lifetime(prod, technologies, timeslice_level) + _running_costs = annual_to_lifetime(_running_costs, technologies) + prod = annual_to_lifetime(prod, technologies) # LCOE result = (_capital_costs + _running_costs) / prod + assert "timeslice" in result.dims return result @@ -503,9 +501,7 @@ def capital_recovery_factor(technologies: xr.Dataset) -> xr.DataArray: return crf -def annual_to_lifetime( - costs: xr.DataArray, technologies: xr.Dataset, timeslice_level: str | None = None -): +def annual_to_lifetime(costs: xr.DataArray, technologies: xr.Dataset): """Convert annual costs to lifetime costs. Costs are provided for a single year. These same costs are assumed to apply for the @@ -515,7 +511,6 @@ def annual_to_lifetime( Args: costs: xr.DataArray of costs for a single year. technologies: xr.Dataset of technology parameters - timeslice_level: the desired timeslice level of the result (e.g. "hour", "day") """ assert "year" not in costs.dims assert "year" not in technologies.dims @@ -528,7 +523,7 @@ def annual_to_lifetime( interest_rate=technologies.interest_rate, mask=years <= life, ) - rates = broadcast_timeslice(rates, level=timeslice_level) + rates = broadcast_timeslice(rates, level=get_level(costs)) return (costs * rates).sum("year") diff --git a/src/muse/objectives.py b/src/muse/objectives.py index e068f1c61..b5ba0cd22 100644 --- a/src/muse/objectives.py +++ b/src/muse/objectives.py @@ -308,7 +308,7 @@ def fixed_costs( from muse.costs import fixed_costs capacity = capacity_to_service_demand(technologies, demand) - result = fixed_costs(technologies, capacity).sum("timeslice") + result = fixed_costs(technologies, capacity) return result @@ -329,7 +329,7 @@ def capital_costs( from muse.costs import capital_costs capacity = capacity_to_service_demand(technologies, demand) - result = capital_costs(technologies, capacity, method="lifetime").sum("timeslice") + result = capital_costs(technologies, capacity, method="lifetime") result = xr.broadcast(result, demand.asset)[0] return result @@ -436,7 +436,6 @@ def annual_levelized_cost_of_energy( capacity=capacity, production=production, consumption=consump, - timeslice_level=timeslice_level, method="annual", ) @@ -483,7 +482,6 @@ def lifetime_levelized_cost_of_energy( capacity=capacity, production=production, consumption=consump, - timeslice_level=timeslice_level, method="lifetime", ) @@ -525,7 +523,6 @@ def net_present_value( capacity=capacity, production=production, consumption=consump, - timeslice_level=timeslice_level, ) return results @@ -604,6 +601,5 @@ def equivalent_annual_cost( capacity=capacity, production=production, consumption=consump, - timeslice_level=timeslice_level, ) return results diff --git a/src/muse/quantities.py b/src/muse/quantities.py index 09d02b5c9..a4b382d45 100644 --- a/src/muse/quantities.py +++ b/src/muse/quantities.py @@ -274,9 +274,7 @@ def consumption( ) # Calculate degree of technology activity - prod_amplitude = production_amplitude( - production, params, timeslice_level=timeslice_level - ) + prod_amplitude = production_amplitude(production, params) # Calculate consumption of fixed commodities consumption_fixed = prod_amplitude * broadcast_timeslice( @@ -509,7 +507,6 @@ def capacity_to_service_demand( def production_amplitude( production: xr.DataArray, technologies: xr.Dataset, - timeslice_level: str | None = None, ) -> xr.DataArray: """Calculates the degree of technology activity based on production data. @@ -534,7 +531,10 @@ def production_amplitude( DataArray with production amplitudes for each technology in each timeslice. Will have the same dimensions as `production`, minus the `commodity` dimension. """ + from muse.timeslices import get_level + assert set(technologies.dims).issubset(set(production.dims)) + timeslice_level = get_level(production) return ( production diff --git a/src/muse/sectors/sector.py b/src/muse/sectors/sector.py index 83684f02a..a8d44e33b 100644 --- a/src/muse/sectors/sector.py +++ b/src/muse/sectors/sector.py @@ -321,7 +321,6 @@ def market_variables(self, market: xr.Dataset, technologies: xr.Dataset) -> Any: capacity=capacity.isel(year=1), production=supply.isel(year=1), consumption=consume.isel(year=1), - timeslice_level=self.timeslice_level, method="annual", ) diff --git a/src/muse/timeslices.py b/src/muse/timeslices.py index dad644003..3a67e7a4f 100644 --- a/src/muse/timeslices.py +++ b/src/muse/timeslices.py @@ -106,7 +106,9 @@ def broadcast_timeslice( # If data already has timeslices, check that it matches the reference timeslice. if "timeslice" in data.dims: - if data.timeslice.reset_coords(drop=True).equals(ts.timeslice): + if data.timeslice.reset_coords(drop=True).equals( + ts.timeslice.reset_coords(drop=True) + ): return data raise ValueError( "Data is already timesliced, but does not match the reference." @@ -141,7 +143,9 @@ def distribute_timeslice( # If data already has timeslices, check that it matches the reference timeslice. if "timeslice" in data.dims: - if data.timeslice.reset_coords(drop=True).equals(ts.timeslice): + if data.timeslice.reset_coords(drop=True).equals( + ts.timeslice.reset_coords(drop=True) + ): return data raise ValueError( "Data is already timesliced, but does not match the reference." @@ -178,7 +182,9 @@ def compress_timeslice( # Raise error if data is not timesliced appropriately if "timeslice" not in data.dims: raise ValueError("Data must have a 'timeslice' dimension.") - if not data.timeslice.reset_coords(drop=True).equals(ts.timeslice): + if not data.timeslice.reset_coords(drop=True).equals( + ts.timeslice.reset_coords(drop=True) + ): raise ValueError("Data has incompatible timeslicing with reference.") # If level is not specified, don't compress diff --git a/tests/test_costs.py b/tests/test_costs.py index 3369a4fb4..8ba6d1135 100644 --- a/tests/test_costs.py +++ b/tests/test_costs.py @@ -3,14 +3,6 @@ YEAR = 2030 -"""Expected dimensions for the output data of the cost functions. - -This should be the same for all cost functions. In general, this is the sum of all -dimensions from the input data, minus "commodity", plus "timeslice" (if not already -present). -""" -EXPECTED_DIMS = {"asset", "region", "technology", "timeslice"} - @fixture def _prices(market): @@ -79,49 +71,49 @@ def test_capital_costs(_technologies, _capacity): from muse.costs import capital_costs result = capital_costs(_technologies, _capacity) - assert set(result.dims) == EXPECTED_DIMS + assert set(result.dims) == {"asset", "region", "technology"} def test_environmental_costs(_technologies, _prices, _production): from muse.costs import environmental_costs result = environmental_costs(_technologies, _prices, _production) - assert set(result.dims) == EXPECTED_DIMS + assert set(result.dims) == {"asset", "region", "technology", "timeslice"} def test_fuel_costs(_technologies, _prices, _consumption): from muse.costs import fuel_costs result = fuel_costs(_technologies, _prices, _consumption) - assert set(result.dims) == EXPECTED_DIMS + assert set(result.dims) == {"asset", "region", "technology", "timeslice"} def test_material_costs(_technologies, _prices, _consumption): from muse.costs import material_costs result = material_costs(_technologies, _prices, _consumption) - assert set(result.dims) == EXPECTED_DIMS + assert set(result.dims) == {"asset", "region", "technology", "timeslice"} def test_fixed_costs(_technologies, _capacity): from muse.costs import fixed_costs result = fixed_costs(_technologies, _capacity) - assert set(result.dims) == EXPECTED_DIMS + assert set(result.dims) == {"asset", "region", "technology"} def test_variable_costs(_technologies, _production): from muse.costs import variable_costs result = variable_costs(_technologies, _production) - assert set(result.dims) == EXPECTED_DIMS + assert set(result.dims) == {"asset", "region", "technology"} def test_running_costs(_technologies, _prices, _capacity, _production, _consumption): from muse.costs import running_costs result = running_costs(_technologies, _prices, _capacity, _production, _consumption) - assert set(result.dims) == EXPECTED_DIMS + assert set(result.dims) == {"asset", "region", "technology", "timeslice"} def test_net_present_value( @@ -132,7 +124,7 @@ def test_net_present_value( result = net_present_value( _technologies, _prices, _capacity, _production, _consumption ) - assert set(result.dims) == EXPECTED_DIMS + assert set(result.dims) == {"asset", "region", "technology", "timeslice"} def test_net_present_cost(_technologies, _prices, _capacity, _production, _consumption): @@ -141,7 +133,7 @@ def test_net_present_cost(_technologies, _prices, _capacity, _production, _consu result = net_present_cost( _technologies, _prices, _capacity, _production, _consumption ) - assert set(result.dims) == EXPECTED_DIMS + assert set(result.dims) == {"asset", "region", "technology", "timeslice"} def test_equivalent_annual_cost( @@ -152,7 +144,7 @@ def test_equivalent_annual_cost( result = equivalent_annual_cost( _technologies, _prices, _capacity, _production, _consumption ) - assert set(result.dims) == EXPECTED_DIMS + assert set(result.dims) == {"asset", "region", "technology", "timeslice"} @mark.parametrize("method", ["annual", "lifetime"]) @@ -164,7 +156,7 @@ def test_levelized_cost_of_energy( result = levelized_cost_of_energy( _technologies, _prices, _capacity, _production, _consumption, method=method ) - assert set(result.dims) == EXPECTED_DIMS + assert set(result.dims) == {"asset", "region", "technology", "timeslice"} def test_supply_cost(_technologies, _prices, _capacity, _production, _consumption): From 94c195012eab89b8a55c868a2815db3f7a525e2e Mon Sep 17 00:00:00 2001 From: Tom Bland Date: Fri, 17 Jan 2025 13:39:21 +0000 Subject: [PATCH 02/18] Fix error in `timeslices` module --- src/muse/timeslices.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/muse/timeslices.py b/src/muse/timeslices.py index 3a67e7a4f..852964117 100644 --- a/src/muse/timeslices.py +++ b/src/muse/timeslices.py @@ -152,7 +152,7 @@ def distribute_timeslice( ) broadcasted = broadcast_timeslice(data, ts=ts) - timeslice_fractions = ts / broadcast_timeslice(ts.sum(), ts=ts) + timeslice_fractions = ts / broadcast_timeslice(ts.sum("timeslice"), ts=ts) return broadcasted * timeslice_fractions @@ -338,5 +338,5 @@ def timeslice_max(data: DataArray, ts: DataArray | None = None) -> DataArray: timeslice_level = get_level(data) timeslice_fractions = compress_timeslice( ts, ts=ts, level=timeslice_level, operation="sum" - ) / broadcast_timeslice(ts.sum(), ts=ts, level=timeslice_level) + ) / broadcast_timeslice(ts.sum("timeslice"), ts=ts, level=timeslice_level) return (data / timeslice_fractions).max("timeslice") From 029abb00fa7ddcaed033977c0dc7e77120270b87 Mon Sep 17 00:00:00 2001 From: Tom Bland Date: Fri, 17 Jan 2025 13:44:29 +0000 Subject: [PATCH 03/18] Update results files --- .../Results/MCACapacity.csv | 117 ++++--- .../1-single-objective/Results/MCAPrices.csv | 144 ++++---- .../Results/MCACapacity.csv | 133 +++++--- .../Results/MCAPrices.csv | 144 ++++---- .../1-correlation/Results/MCACapacity.csv | 44 +-- .../1-correlation/Results/MCAPrices.csv | 144 ++++---- .../1-introduction/Results/MCAPrices.csv | 144 ++++---- .../2-scenario/Results/MCACapacity.csv | 56 +-- .../2-scenario/Results/MCAPrices.csv | 144 ++++---- .../1-new-region/Results/MCACapacity.csv | 54 +-- .../1-new-region/Results/MCAPrices.csv | 288 ++++++++-------- .../Results/MCACapacity.csv | 71 ++-- .../1-exogenous-demand/Results/MCAPrices.csv | 216 ++++++------ .../1-carbon-budget/Results/MCACapacity.csv | 12 +- .../1-carbon-budget/Results/MCAPrices.csv | 90 ++--- .../1-carbon-budget/Results/MCASupply.csv | 72 ++-- .../1-min-constraint/Results/MCAPrices.csv | 144 ++++---- .../2-max-constraint/Results/MCAPrices.csv | 144 ++++---- .../Results/MCACapacity.csv | 51 +-- .../1-modify-timeslices/Results/MCAPrices.csv | 192 +++++------ .../Results/MCACapacity.csv | 189 +++++++---- .../Results/MCAPrices.csv | 320 +++++++++--------- .../new-decision-metric/Results/MCAPrices.csv | 144 ++++---- .../default/Results/MCACapacity.csv | 66 ++-- .../default/Results/MCAPrices.csv | 144 ++++---- .../default_retro/Results/MCACapacity.csv | 49 +-- .../default_retro/Results/MCAPrices.csv | 144 ++++---- .../default_timeslice/Results/MCAPrices.csv | 144 ++++---- .../medium/Results/MCACapacity.csv | 85 +++-- .../medium/Results/MCAPrices.csv | 216 ++++++------ .../minimum_service/Results/MCAPrices.csv | 48 +-- .../multiple_agents/Results/MCACapacity.csv | 86 +++-- .../multiple_agents/Results/MCAPrices.csv | 144 ++++---- .../trade/Results/MCAPrices.csv | 216 ++++++------ 34 files changed, 2277 insertions(+), 2122 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 eca09d4a7..d3f0aeb81 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 @@ -6,96 +6,115 @@ A2,0.50000000000,R1,2020,R1,power,gasCCGT,newcapa,2020 A1,7.50000000000,R1,2020,R1,gas,gassupply1,newcapa,2020 A2,7.50000000000,R1,2020,R1,gas,gassupply1,newcapa,2020 A1,2.50000000000,R1,2020,R1,residential,gasboiler,newcapa,2025 -A1,9.50000000000,R1,2025,R1,residential,gasboiler,newcapa,2025 +A1,9.50000000000,R1,2025,R1,residential,heatpump,newcapa,2025 A2,2.50000000000,R1,2020,R1,residential,gasboiler,newcapa,2025 A2,9.50000000000,R1,2025,R1,residential,gasboiler,newcapa,2025 A1,0.50000000000,R1,2020,R1,power,gasCCGT,newcapa,2025 +A1,1.61110000000,R1,2025,R1,power,gasCCGT,newcapa,2025 A2,0.50000000000,R1,2020,R1,power,gasCCGT,newcapa,2025 +A2,3.62500000000,R1,2025,R1,power,windturbine,newcapa,2025 A1,7.50000000000,R1,2020,R1,gas,gassupply1,newcapa,2025 -A1,7.96670000000,R1,2025,R1,gas,gassupply1,newcapa,2025 +A1,4.02470000000,R1,2025,R1,gas,gassupply1,newcapa,2025 A2,7.50000000000,R1,2020,R1,gas,gassupply1,newcapa,2025 -A2,7.96670000000,R1,2025,R1,gas,gassupply1,newcapa,2025 -A1,9.50000000000,R1,2025,R1,residential,gasboiler,newcapa,2030 +A2,4.02470000000,R1,2025,R1,gas,gassupply1,newcapa,2025 +A1,9.50000000000,R1,2025,R1,residential,heatpump,newcapa,2030 A1,5.50000000000,R1,2030,R1,residential,heatpump,newcapa,2030 A2,9.50000000000,R1,2025,R1,residential,gasboiler,newcapa,2030 A2,5.50000000000,R1,2030,R1,residential,gasboiler,newcapa,2030 -A1,2.75000000000,R1,2030,R1,power,windturbine,newcapa,2030 -A2,2.75000000000,R1,2030,R1,power,windturbine,newcapa,2030 +A1,1.61110000000,R1,2025,R1,power,gasCCGT,newcapa,2030 +A1,3.87500000000,R1,2030,R1,power,windturbine,newcapa,2030 +A2,3.62500000000,R1,2025,R1,power,windturbine,newcapa,2030 +A2,3.87500000000,R1,2030,R1,power,windturbine,newcapa,2030 A1,3.75000000000,R1,2020,R1,gas,gassupply1,newcapa,2030 -A1,7.96670000000,R1,2025,R1,gas,gassupply1,newcapa,2030 -A1,4.07220000000,R1,2030,R1,gas,gassupply1,newcapa,2030 +A1,4.02470000000,R1,2025,R1,gas,gassupply1,newcapa,2030 +A1,3.23720000000,R1,2030,R1,gas,gassupply1,newcapa,2030 A2,3.75000000000,R1,2020,R1,gas,gassupply1,newcapa,2030 -A2,7.96670000000,R1,2025,R1,gas,gassupply1,newcapa,2030 -A2,4.07220000000,R1,2030,R1,gas,gassupply1,newcapa,2030 +A2,4.02470000000,R1,2025,R1,gas,gassupply1,newcapa,2030 +A2,3.23720000000,R1,2030,R1,gas,gassupply1,newcapa,2030 A1,5.50000000000,R1,2030,R1,residential,heatpump,newcapa,2035 A1,12.50000000000,R1,2035,R1,residential,heatpump,newcapa,2035 A2,5.50000000000,R1,2030,R1,residential,gasboiler,newcapa,2035 A2,12.50000000000,R1,2035,R1,residential,gasboiler,newcapa,2035 -A1,2.75000000000,R1,2030,R1,power,windturbine,newcapa,2035 -A1,6.25000000000,R1,2035,R1,power,windturbine,newcapa,2035 -A2,2.75000000000,R1,2030,R1,power,windturbine,newcapa,2035 -A2,6.25000000000,R1,2035,R1,power,windturbine,newcapa,2035 -A1,7.96670000000,R1,2025,R1,gas,gassupply1,newcapa,2035 -A1,4.07220000000,R1,2030,R1,gas,gassupply1,newcapa,2035 -A2,7.96670000000,R1,2025,R1,gas,gassupply1,newcapa,2035 -A2,4.07220000000,R1,2030,R1,gas,gassupply1,newcapa,2035 +A1,1.61110000000,R1,2025,R1,power,gasCCGT,newcapa,2035 +A1,3.87500000000,R1,2030,R1,power,windturbine,newcapa,2035 +A1,1.50000000000,R1,2035,R1,power,windturbine,newcapa,2035 +A2,3.62500000000,R1,2025,R1,power,windturbine,newcapa,2035 +A2,3.87500000000,R1,2030,R1,power,windturbine,newcapa,2035 +A2,1.50000000000,R1,2035,R1,power,windturbine,newcapa,2035 +A1,4.02470000000,R1,2025,R1,gas,gassupply1,newcapa,2035 +A1,3.23720000000,R1,2030,R1,gas,gassupply1,newcapa,2035 +A1,5.68330000000,R1,2035,R1,gas,gassupply1,newcapa,2035 +A2,4.02470000000,R1,2025,R1,gas,gassupply1,newcapa,2035 +A2,3.23720000000,R1,2030,R1,gas,gassupply1,newcapa,2035 +A2,5.68330000000,R1,2035,R1,gas,gassupply1,newcapa,2035 A1,12.50000000000,R1,2035,R1,residential,heatpump,newcapa,2040 A1,8.50000000000,R1,2040,R1,residential,heatpump,newcapa,2040 A2,12.50000000000,R1,2035,R1,residential,gasboiler,newcapa,2040 A2,8.50000000000,R1,2040,R1,residential,gasboiler,newcapa,2040 -A1,2.75000000000,R1,2030,R1,power,windturbine,newcapa,2040 -A1,6.25000000000,R1,2035,R1,power,windturbine,newcapa,2040 +A1,1.61110000000,R1,2025,R1,power,gasCCGT,newcapa,2040 +A1,3.87500000000,R1,2030,R1,power,windturbine,newcapa,2040 +A1,1.50000000000,R1,2035,R1,power,windturbine,newcapa,2040 A1,1.50000000000,R1,2040,R1,power,windturbine,newcapa,2040 -A2,2.75000000000,R1,2030,R1,power,windturbine,newcapa,2040 -A2,6.25000000000,R1,2035,R1,power,windturbine,newcapa,2040 +A2,3.62500000000,R1,2025,R1,power,windturbine,newcapa,2040 +A2,3.87500000000,R1,2030,R1,power,windturbine,newcapa,2040 +A2,1.50000000000,R1,2035,R1,power,windturbine,newcapa,2040 A2,1.50000000000,R1,2040,R1,power,windturbine,newcapa,2040 -A1,7.96670000000,R1,2025,R1,gas,gassupply1,newcapa,2040 -A1,4.07220000000,R1,2030,R1,gas,gassupply1,newcapa,2040 -A1,1.49440000000,R1,2040,R1,gas,gassupply1,newcapa,2040 -A2,7.96670000000,R1,2025,R1,gas,gassupply1,newcapa,2040 -A2,4.07220000000,R1,2030,R1,gas,gassupply1,newcapa,2040 -A2,1.49440000000,R1,2040,R1,gas,gassupply1,newcapa,2040 +A1,4.02470000000,R1,2025,R1,gas,gassupply1,newcapa,2040 +A1,3.23720000000,R1,2030,R1,gas,gassupply1,newcapa,2040 +A1,5.68330000000,R1,2035,R1,gas,gassupply1,newcapa,2040 +A1,1.93330000000,R1,2040,R1,gas,gassupply1,newcapa,2040 +A2,4.02470000000,R1,2025,R1,gas,gassupply1,newcapa,2040 +A2,3.23720000000,R1,2030,R1,gas,gassupply1,newcapa,2040 +A2,5.68330000000,R1,2035,R1,gas,gassupply1,newcapa,2040 +A2,1.93330000000,R1,2040,R1,gas,gassupply1,newcapa,2040 A1,8.50000000000,R1,2040,R1,residential,heatpump,newcapa,2045 A1,15.50000000000,R1,2045,R1,residential,heatpump,newcapa,2045 A2,8.50000000000,R1,2040,R1,residential,gasboiler,newcapa,2045 A2,15.50000000000,R1,2045,R1,residential,gasboiler,newcapa,2045 -A1,2.75000000000,R1,2030,R1,power,windturbine,newcapa,2045 -A1,6.25000000000,R1,2035,R1,power,windturbine,newcapa,2045 +A1,1.61110000000,R1,2025,R1,power,gasCCGT,newcapa,2045 +A1,3.87500000000,R1,2030,R1,power,windturbine,newcapa,2045 +A1,1.50000000000,R1,2035,R1,power,windturbine,newcapa,2045 A1,1.50000000000,R1,2040,R1,power,windturbine,newcapa,2045 A1,1.50000000000,R1,2045,R1,power,windturbine,newcapa,2045 -A2,2.75000000000,R1,2030,R1,power,windturbine,newcapa,2045 -A2,6.25000000000,R1,2035,R1,power,windturbine,newcapa,2045 +A2,3.62500000000,R1,2025,R1,power,windturbine,newcapa,2045 +A2,3.87500000000,R1,2030,R1,power,windturbine,newcapa,2045 +A2,1.50000000000,R1,2035,R1,power,windturbine,newcapa,2045 A2,1.50000000000,R1,2040,R1,power,windturbine,newcapa,2045 A2,1.50000000000,R1,2045,R1,power,windturbine,newcapa,2045 -A1,7.96670000000,R1,2025,R1,gas,gassupply1,newcapa,2045 -A1,4.07220000000,R1,2030,R1,gas,gassupply1,newcapa,2045 -A1,1.49440000000,R1,2040,R1,gas,gassupply1,newcapa,2045 +A1,4.02470000000,R1,2025,R1,gas,gassupply1,newcapa,2045 +A1,3.23720000000,R1,2030,R1,gas,gassupply1,newcapa,2045 +A1,5.68330000000,R1,2035,R1,gas,gassupply1,newcapa,2045 +A1,1.93330000000,R1,2040,R1,gas,gassupply1,newcapa,2045 A1,1.93330000000,R1,2045,R1,gas,gassupply1,newcapa,2045 -A2,7.96670000000,R1,2025,R1,gas,gassupply1,newcapa,2045 -A2,4.07220000000,R1,2030,R1,gas,gassupply1,newcapa,2045 -A2,1.49440000000,R1,2040,R1,gas,gassupply1,newcapa,2045 +A2,4.02470000000,R1,2025,R1,gas,gassupply1,newcapa,2045 +A2,3.23720000000,R1,2030,R1,gas,gassupply1,newcapa,2045 +A2,5.68330000000,R1,2035,R1,gas,gassupply1,newcapa,2045 +A2,1.93330000000,R1,2040,R1,gas,gassupply1,newcapa,2045 A2,1.93330000000,R1,2045,R1,gas,gassupply1,newcapa,2045 A1,15.50000000000,R1,2045,R1,residential,heatpump,newcapa,2050 A1,11.50000000000,R1,2050,R1,residential,heatpump,newcapa,2050 A2,15.50000000000,R1,2045,R1,residential,gasboiler,newcapa,2050 A2,11.50000000000,R1,2050,R1,residential,gasboiler,newcapa,2050 -A1,2.75000000000,R1,2030,R1,power,windturbine,newcapa,2050 -A1,6.25000000000,R1,2035,R1,power,windturbine,newcapa,2050 +A1,1.61110000000,R1,2025,R1,power,gasCCGT,newcapa,2050 +A1,3.87500000000,R1,2030,R1,power,windturbine,newcapa,2050 +A1,1.50000000000,R1,2035,R1,power,windturbine,newcapa,2050 A1,1.50000000000,R1,2040,R1,power,windturbine,newcapa,2050 A1,1.50000000000,R1,2045,R1,power,windturbine,newcapa,2050 A1,1.50000000000,R1,2050,R1,power,windturbine,newcapa,2050 -A2,2.75000000000,R1,2030,R1,power,windturbine,newcapa,2050 -A2,6.25000000000,R1,2035,R1,power,windturbine,newcapa,2050 +A2,3.87500000000,R1,2030,R1,power,windturbine,newcapa,2050 +A2,1.50000000000,R1,2035,R1,power,windturbine,newcapa,2050 A2,1.50000000000,R1,2040,R1,power,windturbine,newcapa,2050 A2,1.50000000000,R1,2045,R1,power,windturbine,newcapa,2050 -A2,1.50000000000,R1,2050,R1,power,windturbine,newcapa,2050 -A1,7.96670000000,R1,2025,R1,gas,gassupply1,newcapa,2050 -A1,4.07220000000,R1,2030,R1,gas,gassupply1,newcapa,2050 -A1,1.49440000000,R1,2040,R1,gas,gassupply1,newcapa,2050 +A2,3.31250000000,R1,2050,R1,power,windturbine,newcapa,2050 +A1,4.02470000000,R1,2025,R1,gas,gassupply1,newcapa,2050 +A1,3.23720000000,R1,2030,R1,gas,gassupply1,newcapa,2050 +A1,5.68330000000,R1,2035,R1,gas,gassupply1,newcapa,2050 +A1,1.93330000000,R1,2040,R1,gas,gassupply1,newcapa,2050 A1,1.93330000000,R1,2045,R1,gas,gassupply1,newcapa,2050 A1,1.93330000000,R1,2050,R1,gas,gassupply1,newcapa,2050 -A2,7.96670000000,R1,2025,R1,gas,gassupply1,newcapa,2050 -A2,4.07220000000,R1,2030,R1,gas,gassupply1,newcapa,2050 -A2,1.49440000000,R1,2040,R1,gas,gassupply1,newcapa,2050 +A2,4.02470000000,R1,2025,R1,gas,gassupply1,newcapa,2050 +A2,3.23720000000,R1,2030,R1,gas,gassupply1,newcapa,2050 +A2,5.68330000000,R1,2035,R1,gas,gassupply1,newcapa,2050 +A2,1.93330000000,R1,2040,R1,gas,gassupply1,newcapa,2050 A2,1.93330000000,R1,2045,R1,gas,gassupply1,newcapa,2050 A2,1.93330000000,R1,2050,R1,gas,gassupply1,newcapa,2050 diff --git a/docs/tutorial-code/add-agent/1-single-objective/Results/MCAPrices.csv b/docs/tutorial-code/add-agent/1-single-objective/Results/MCAPrices.csv index 07d033d8b..94c5c0571 100644 --- a/docs/tutorial-code/add-agent/1-single-objective/Results/MCAPrices.csv +++ b/docs/tutorial-code/add-agent/1-single-objective/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,30.32710000000,R1,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,19.35880000000,R1,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,12.58300000000,R1,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,11.24720000000,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,21.18690000000,R1,1,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,19.35880000000,R1,1,MUS$2010/PJ,2025 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,11.96460000000,R1,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,11.24720000000,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,30.32710000000,R1,2,MUS$2010/PJ,2025 +electricity,all-week,afternoon,all-year,19.35880000000,R1,2,MUS$2010/PJ,2025 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2025 -heat,all-week,afternoon,all-year,12.58300000000,R1,2,MUS$2010/PJ,2025 +heat,all-week,afternoon,all-year,11.24720000000,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.18690000000,R1,3,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,19.35880000000,R1,3,MUS$2010/PJ,2025 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,11.96460000000,R1,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,11.24720000000,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.04670000000,R1,4,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,19.35880000000,R1,4,MUS$2010/PJ,2025 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,11.34610000000,R1,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,11.24720000000,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,16.61680000000,R1,5,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,19.35880000000,R1,5,MUS$2010/PJ,2025 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,11.65540000000,R1,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,11.24720000000,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,29.99960000000,R1,0,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,19.34890000000,R1,0,MUS$2010/PJ,2030 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,15.22130000000,R1,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,12.28380000000,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,19.99980000000,R1,1,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,19.34890000000,R1,1,MUS$2010/PJ,2030 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,13.71840000000,R1,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,12.28380000000,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,29.99960000000,R1,2,MUS$2010/PJ,2030 +electricity,all-week,afternoon,all-year,19.34890000000,R1,2,MUS$2010/PJ,2030 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,15.22130000000,R1,2,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,12.28380000000,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,19.99980000000,R1,3,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,19.34890000000,R1,3,MUS$2010/PJ,2030 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,13.71840000000,R1,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,12.28380000000,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,9.99990000000,R1,4,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,19.34890000000,R1,4,MUS$2010/PJ,2030 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,12.21540000000,R1,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,12.28380000000,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,14.99980000000,R1,5,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,19.34890000000,R1,5,MUS$2010/PJ,2030 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,12.96690000000,R1,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,12.28380000000,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,29.99960000000,R1,0,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,20.19260000000,R1,0,MUS$2010/PJ,2035 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,17.52350000000,R1,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,14.32520000000,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.99980000000,R1,1,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,20.19260000000,R1,1,MUS$2010/PJ,2035 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,14.49280000000,R1,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,14.32520000000,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,29.99960000000,R1,2,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,20.19260000000,R1,2,MUS$2010/PJ,2035 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,17.52350000000,R1,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,14.32520000000,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,19.99980000000,R1,3,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,20.19260000000,R1,3,MUS$2010/PJ,2035 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,14.49280000000,R1,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,14.32520000000,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,9.99990000000,R1,4,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,20.19260000000,R1,4,MUS$2010/PJ,2035 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,11.46210000000,R1,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,14.32520000000,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.99980000000,R1,5,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,20.19260000000,R1,5,MUS$2010/PJ,2035 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,12.97740000000,R1,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,14.32520000000,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,29.99960000000,R1,0,MUS$2010/PJ,2040 +electricity,all-week,night,all-year,20.79520000000,R1,0,MUS$2010/PJ,2040 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,19.39610000000,R1,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,16.31840000000,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,19.99980000000,R1,1,MUS$2010/PJ,2040 +electricity,all-week,morning,all-year,20.79520000000,R1,1,MUS$2010/PJ,2040 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,16.36540000000,R1,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,16.31840000000,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,29.99960000000,R1,2,MUS$2010/PJ,2040 +electricity,all-week,afternoon,all-year,20.79520000000,R1,2,MUS$2010/PJ,2040 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2040 -heat,all-week,afternoon,all-year,19.39610000000,R1,2,MUS$2010/PJ,2040 +heat,all-week,afternoon,all-year,16.31840000000,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,19.99980000000,R1,3,MUS$2010/PJ,2040 +electricity,all-week,early-peak,all-year,20.79520000000,R1,3,MUS$2010/PJ,2040 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,16.36540000000,R1,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,16.31840000000,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,9.99990000000,R1,4,MUS$2010/PJ,2040 +electricity,all-week,late-peak,all-year,20.79520000000,R1,4,MUS$2010/PJ,2040 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,13.33470000000,R1,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,16.31840000000,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,14.99980000000,R1,5,MUS$2010/PJ,2040 +electricity,all-week,evening,all-year,20.79520000000,R1,5,MUS$2010/PJ,2040 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,14.85010000000,R1,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,16.31840000000,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,29.99960000000,R1,0,MUS$2010/PJ,2045 +electricity,all-week,night,all-year,21.57000000000,R1,0,MUS$2010/PJ,2045 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2045 -heat,all-week,night,all-year,22.02310000000,R1,0,MUS$2010/PJ,2045 +heat,all-week,night,all-year,19.10030000000,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.99980000000,R1,1,MUS$2010/PJ,2045 +electricity,all-week,morning,all-year,21.57000000000,R1,1,MUS$2010/PJ,2045 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2045 -heat,all-week,morning,all-year,18.99240000000,R1,1,MUS$2010/PJ,2045 +heat,all-week,morning,all-year,19.10030000000,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,29.99960000000,R1,2,MUS$2010/PJ,2045 +electricity,all-week,afternoon,all-year,21.57000000000,R1,2,MUS$2010/PJ,2045 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2045 -heat,all-week,afternoon,all-year,22.02310000000,R1,2,MUS$2010/PJ,2045 +heat,all-week,afternoon,all-year,19.10030000000,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,19.99980000000,R1,3,MUS$2010/PJ,2045 +electricity,all-week,early-peak,all-year,21.57000000000,R1,3,MUS$2010/PJ,2045 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2045 -heat,all-week,early-peak,all-year,18.99240000000,R1,3,MUS$2010/PJ,2045 +heat,all-week,early-peak,all-year,19.10030000000,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,9.99990000000,R1,4,MUS$2010/PJ,2045 +electricity,all-week,late-peak,all-year,21.57000000000,R1,4,MUS$2010/PJ,2045 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2045 -heat,all-week,late-peak,all-year,15.96170000000,R1,4,MUS$2010/PJ,2045 +heat,all-week,late-peak,all-year,19.10030000000,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,14.99980000000,R1,5,MUS$2010/PJ,2045 +electricity,all-week,evening,all-year,21.57000000000,R1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2045 -heat,all-week,evening,all-year,17.47700000000,R1,5,MUS$2010/PJ,2045 +heat,all-week,evening,all-year,19.10030000000,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,29.99960000000,R1,0,MUS$2010/PJ,2050 +electricity,all-week,night,all-year,21.69980000000,R1,0,MUS$2010/PJ,2050 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,24.65000000000,R1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,21.75320000000,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.99980000000,R1,1,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,21.69980000000,R1,1,MUS$2010/PJ,2050 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,21.61930000000,R1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,21.75320000000,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,29.99960000000,R1,2,MUS$2010/PJ,2050 +electricity,all-week,afternoon,all-year,21.69980000000,R1,2,MUS$2010/PJ,2050 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,24.65000000000,R1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,21.75320000000,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.99980000000,R1,3,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,21.69980000000,R1,3,MUS$2010/PJ,2050 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,21.61930000000,R1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,21.75320000000,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.99990000000,R1,4,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,21.69980000000,R1,4,MUS$2010/PJ,2050 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,18.58860000000,R1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,21.75320000000,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,14.99980000000,R1,5,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,21.69980000000,R1,5,MUS$2010/PJ,2050 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,20.10400000000,R1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,21.75320000000,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-agent/2-multiple-objective/Results/MCACapacity.csv b/docs/tutorial-code/add-agent/2-multiple-objective/Results/MCACapacity.csv index 08be8ae02..08471d84e 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 @@ -6,90 +6,113 @@ A2,0.50000000000,R1,2020,R1,power,gasCCGT,newcapa,2020 A1,7.50000000000,R1,2020,R1,gas,gassupply1,newcapa,2020 A2,7.50000000000,R1,2020,R1,gas,gassupply1,newcapa,2020 A1,2.50000000000,R1,2020,R1,residential,gasboiler,newcapa,2025 -A1,9.50000000000,R1,2025,R1,residential,gasboiler,newcapa,2025 +A1,9.50000000000,R1,2025,R1,residential,heatpump,newcapa,2025 A2,2.50000000000,R1,2020,R1,residential,gasboiler,newcapa,2025 A2,9.50000000000,R1,2025,R1,residential,gasboiler,newcapa,2025 A1,0.50000000000,R1,2020,R1,power,gasCCGT,newcapa,2025 +A1,1.61110000000,R1,2025,R1,power,gasCCGT,newcapa,2025 A2,0.50000000000,R1,2020,R1,power,gasCCGT,newcapa,2025 +A2,3.62500000000,R1,2025,R1,power,windturbine,newcapa,2025 A1,7.50000000000,R1,2020,R1,gas,gassupply1,newcapa,2025 -A1,7.96670000000,R1,2025,R1,gas,gassupply1,newcapa,2025 +A1,4.02470000000,R1,2025,R1,gas,gassupply1,newcapa,2025 A2,7.50000000000,R1,2020,R1,gas,gassupply1,newcapa,2025 -A2,7.96670000000,R1,2025,R1,gas,gassupply1,newcapa,2025 -A1,9.50000000000,R1,2025,R1,residential,gasboiler,newcapa,2030 +A2,4.02470000000,R1,2025,R1,gas,gassupply1,newcapa,2025 +A1,9.50000000000,R1,2025,R1,residential,heatpump,newcapa,2030 A1,5.50000000000,R1,2030,R1,residential,heatpump,newcapa,2030 A2,9.50000000000,R1,2025,R1,residential,gasboiler,newcapa,2030 A2,5.50000000000,R1,2030,R1,residential,gasboiler,newcapa,2030 -A1,2.75000000000,R1,2030,R1,power,windturbine,newcapa,2030 -A2,2.75000000000,R1,2030,R1,power,windturbine,newcapa,2030 +A1,1.61110000000,R1,2025,R1,power,gasCCGT,newcapa,2030 +A1,3.87500000000,R1,2030,R1,power,windturbine,newcapa,2030 +A2,3.62500000000,R1,2025,R1,power,windturbine,newcapa,2030 +A2,3.87500000000,R1,2030,R1,power,windturbine,newcapa,2030 A1,3.75000000000,R1,2020,R1,gas,gassupply1,newcapa,2030 -A1,7.96670000000,R1,2025,R1,gas,gassupply1,newcapa,2030 -A1,4.07220000000,R1,2030,R1,gas,gassupply1,newcapa,2030 +A1,4.02470000000,R1,2025,R1,gas,gassupply1,newcapa,2030 +A1,3.23720000000,R1,2030,R1,gas,gassupply1,newcapa,2030 A2,3.75000000000,R1,2020,R1,gas,gassupply1,newcapa,2030 -A2,7.96670000000,R1,2025,R1,gas,gassupply1,newcapa,2030 -A2,4.07220000000,R1,2030,R1,gas,gassupply1,newcapa,2030 +A2,4.02470000000,R1,2025,R1,gas,gassupply1,newcapa,2030 +A2,3.23720000000,R1,2030,R1,gas,gassupply1,newcapa,2030 A1,5.50000000000,R1,2030,R1,residential,heatpump,newcapa,2035 A1,12.50000000000,R1,2035,R1,residential,heatpump,newcapa,2035 A2,5.50000000000,R1,2030,R1,residential,gasboiler,newcapa,2035 A2,12.50000000000,R1,2035,R1,residential,gasboiler,newcapa,2035 -A1,2.75000000000,R1,2030,R1,power,windturbine,newcapa,2035 -A1,6.25000000000,R1,2035,R1,power,windturbine,newcapa,2035 -A2,2.75000000000,R1,2030,R1,power,windturbine,newcapa,2035 -A2,6.25000000000,R1,2035,R1,power,windturbine,newcapa,2035 -A1,7.96670000000,R1,2025,R1,gas,gassupply1,newcapa,2035 -A1,4.07220000000,R1,2030,R1,gas,gassupply1,newcapa,2035 -A2,7.96670000000,R1,2025,R1,gas,gassupply1,newcapa,2035 -A2,4.07220000000,R1,2030,R1,gas,gassupply1,newcapa,2035 +A1,1.61110000000,R1,2025,R1,power,gasCCGT,newcapa,2035 +A1,3.87500000000,R1,2030,R1,power,windturbine,newcapa,2035 +A1,1.50000000000,R1,2035,R1,power,windturbine,newcapa,2035 +A2,3.62500000000,R1,2025,R1,power,windturbine,newcapa,2035 +A2,3.87500000000,R1,2030,R1,power,windturbine,newcapa,2035 +A2,1.50000000000,R1,2035,R1,power,windturbine,newcapa,2035 +A1,4.02470000000,R1,2025,R1,gas,gassupply1,newcapa,2035 +A1,3.23720000000,R1,2030,R1,gas,gassupply1,newcapa,2035 +A1,5.68330000000,R1,2035,R1,gas,gassupply1,newcapa,2035 +A2,4.02470000000,R1,2025,R1,gas,gassupply1,newcapa,2035 +A2,3.23720000000,R1,2030,R1,gas,gassupply1,newcapa,2035 +A2,5.68330000000,R1,2035,R1,gas,gassupply1,newcapa,2035 A1,12.50000000000,R1,2035,R1,residential,heatpump,newcapa,2040 A1,8.50000000000,R1,2040,R1,residential,heatpump,newcapa,2040 A2,12.50000000000,R1,2035,R1,residential,gasboiler,newcapa,2040 A2,8.50000000000,R1,2040,R1,residential,gasboiler,newcapa,2040 -A1,2.75000000000,R1,2030,R1,power,windturbine,newcapa,2040 -A1,6.25000000000,R1,2035,R1,power,windturbine,newcapa,2040 +A1,1.61110000000,R1,2025,R1,power,gasCCGT,newcapa,2040 +A1,3.87500000000,R1,2030,R1,power,windturbine,newcapa,2040 +A1,1.50000000000,R1,2035,R1,power,windturbine,newcapa,2040 A1,1.50000000000,R1,2040,R1,power,windturbine,newcapa,2040 -A2,2.75000000000,R1,2030,R1,power,windturbine,newcapa,2040 -A2,6.25000000000,R1,2035,R1,power,windturbine,newcapa,2040 +A2,3.62500000000,R1,2025,R1,power,windturbine,newcapa,2040 +A2,3.87500000000,R1,2030,R1,power,windturbine,newcapa,2040 +A2,1.50000000000,R1,2035,R1,power,windturbine,newcapa,2040 A2,1.50000000000,R1,2040,R1,power,windturbine,newcapa,2040 -A1,7.96670000000,R1,2025,R1,gas,gassupply1,newcapa,2040 -A1,4.07220000000,R1,2030,R1,gas,gassupply1,newcapa,2040 -A1,1.49440000000,R1,2040,R1,gas,gassupply1,newcapa,2040 -A2,7.96670000000,R1,2025,R1,gas,gassupply1,newcapa,2040 -A2,4.07220000000,R1,2030,R1,gas,gassupply1,newcapa,2040 -A2,1.49440000000,R1,2040,R1,gas,gassupply1,newcapa,2040 +A1,4.02470000000,R1,2025,R1,gas,gassupply1,newcapa,2040 +A1,3.23720000000,R1,2030,R1,gas,gassupply1,newcapa,2040 +A1,5.68330000000,R1,2035,R1,gas,gassupply1,newcapa,2040 +A1,1.93330000000,R1,2040,R1,gas,gassupply1,newcapa,2040 +A2,4.02470000000,R1,2025,R1,gas,gassupply1,newcapa,2040 +A2,3.23720000000,R1,2030,R1,gas,gassupply1,newcapa,2040 +A2,5.68330000000,R1,2035,R1,gas,gassupply1,newcapa,2040 +A2,1.93330000000,R1,2040,R1,gas,gassupply1,newcapa,2040 A1,8.50000000000,R1,2040,R1,residential,heatpump,newcapa,2045 A1,15.50000000000,R1,2045,R1,residential,heatpump,newcapa,2045 A2,8.50000000000,R1,2040,R1,residential,gasboiler,newcapa,2045 -A2,15.50000000000,R1,2045,R1,residential,heatpump,newcapa,2045 -A1,2.75000000000,R1,2030,R1,power,windturbine,newcapa,2045 -A1,6.25000000000,R1,2035,R1,power,windturbine,newcapa,2045 +A2,15.50000000000,R1,2045,R1,residential,gasboiler,newcapa,2045 +A1,1.61110000000,R1,2025,R1,power,gasCCGT,newcapa,2045 +A1,3.87500000000,R1,2030,R1,power,windturbine,newcapa,2045 +A1,1.50000000000,R1,2035,R1,power,windturbine,newcapa,2045 A1,1.50000000000,R1,2040,R1,power,windturbine,newcapa,2045 -A1,9.25000000000,R1,2045,R1,power,windturbine,newcapa,2045 -A2,2.75000000000,R1,2030,R1,power,windturbine,newcapa,2045 -A2,6.25000000000,R1,2035,R1,power,windturbine,newcapa,2045 +A1,1.50000000000,R1,2045,R1,power,windturbine,newcapa,2045 +A2,3.62500000000,R1,2025,R1,power,windturbine,newcapa,2045 +A2,3.87500000000,R1,2030,R1,power,windturbine,newcapa,2045 +A2,1.50000000000,R1,2035,R1,power,windturbine,newcapa,2045 A2,1.50000000000,R1,2040,R1,power,windturbine,newcapa,2045 -A2,9.25000000000,R1,2045,R1,power,windturbine,newcapa,2045 -A1,7.96670000000,R1,2025,R1,gas,gassupply1,newcapa,2045 -A1,4.07220000000,R1,2030,R1,gas,gassupply1,newcapa,2045 -A1,1.49440000000,R1,2040,R1,gas,gassupply1,newcapa,2045 -A2,7.96670000000,R1,2025,R1,gas,gassupply1,newcapa,2045 -A2,4.07220000000,R1,2030,R1,gas,gassupply1,newcapa,2045 -A2,1.49440000000,R1,2040,R1,gas,gassupply1,newcapa,2045 +A2,1.50000000000,R1,2045,R1,power,windturbine,newcapa,2045 +A1,4.02470000000,R1,2025,R1,gas,gassupply1,newcapa,2045 +A1,3.23720000000,R1,2030,R1,gas,gassupply1,newcapa,2045 +A1,5.68330000000,R1,2035,R1,gas,gassupply1,newcapa,2045 +A1,1.93330000000,R1,2040,R1,gas,gassupply1,newcapa,2045 +A1,1.93330000000,R1,2045,R1,gas,gassupply1,newcapa,2045 +A2,4.02470000000,R1,2025,R1,gas,gassupply1,newcapa,2045 +A2,3.23720000000,R1,2030,R1,gas,gassupply1,newcapa,2045 +A2,5.68330000000,R1,2035,R1,gas,gassupply1,newcapa,2045 +A2,1.93330000000,R1,2040,R1,gas,gassupply1,newcapa,2045 +A2,1.93330000000,R1,2045,R1,gas,gassupply1,newcapa,2045 A1,15.50000000000,R1,2045,R1,residential,heatpump,newcapa,2050 A1,11.50000000000,R1,2050,R1,residential,heatpump,newcapa,2050 -A2,15.50000000000,R1,2045,R1,residential,heatpump,newcapa,2050 +A2,15.50000000000,R1,2045,R1,residential,gasboiler,newcapa,2050 A2,11.50000000000,R1,2050,R1,residential,heatpump,newcapa,2050 -A1,2.75000000000,R1,2030,R1,power,windturbine,newcapa,2050 -A1,6.25000000000,R1,2035,R1,power,windturbine,newcapa,2050 +A1,1.61110000000,R1,2025,R1,power,gasCCGT,newcapa,2050 +A1,3.87500000000,R1,2030,R1,power,windturbine,newcapa,2050 +A1,1.50000000000,R1,2035,R1,power,windturbine,newcapa,2050 A1,1.50000000000,R1,2040,R1,power,windturbine,newcapa,2050 -A1,9.25000000000,R1,2045,R1,power,windturbine,newcapa,2050 +A1,1.50000000000,R1,2045,R1,power,windturbine,newcapa,2050 A1,7.25000000000,R1,2050,R1,power,windturbine,newcapa,2050 -A2,2.75000000000,R1,2030,R1,power,windturbine,newcapa,2050 -A2,6.25000000000,R1,2035,R1,power,windturbine,newcapa,2050 +A2,3.87500000000,R1,2030,R1,power,windturbine,newcapa,2050 +A2,1.50000000000,R1,2035,R1,power,windturbine,newcapa,2050 A2,1.50000000000,R1,2040,R1,power,windturbine,newcapa,2050 -A2,9.25000000000,R1,2045,R1,power,windturbine,newcapa,2050 -A2,7.25000000000,R1,2050,R1,power,windturbine,newcapa,2050 -A1,7.96670000000,R1,2025,R1,gas,gassupply1,newcapa,2050 -A1,4.07220000000,R1,2030,R1,gas,gassupply1,newcapa,2050 -A1,1.49440000000,R1,2040,R1,gas,gassupply1,newcapa,2050 -A2,7.96670000000,R1,2025,R1,gas,gassupply1,newcapa,2050 -A2,4.07220000000,R1,2030,R1,gas,gassupply1,newcapa,2050 -A2,1.49440000000,R1,2040,R1,gas,gassupply1,newcapa,2050 +A2,1.50000000000,R1,2045,R1,power,windturbine,newcapa,2050 +A2,9.06250000000,R1,2050,R1,power,windturbine,newcapa,2050 +A1,4.02470000000,R1,2025,R1,gas,gassupply1,newcapa,2050 +A1,3.23720000000,R1,2030,R1,gas,gassupply1,newcapa,2050 +A1,5.68330000000,R1,2035,R1,gas,gassupply1,newcapa,2050 +A1,1.93330000000,R1,2040,R1,gas,gassupply1,newcapa,2050 +A1,1.93330000000,R1,2045,R1,gas,gassupply1,newcapa,2050 +A2,4.02470000000,R1,2025,R1,gas,gassupply1,newcapa,2050 +A2,3.23720000000,R1,2030,R1,gas,gassupply1,newcapa,2050 +A2,5.68330000000,R1,2035,R1,gas,gassupply1,newcapa,2050 +A2,1.93330000000,R1,2040,R1,gas,gassupply1,newcapa,2050 +A2,1.93330000000,R1,2045,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 6aaa9d4f2..ba2ac2718 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 @@ -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,30.32710000000,R1,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,19.35880000000,R1,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,12.58300000000,R1,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,11.24720000000,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,21.18690000000,R1,1,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,19.35880000000,R1,1,MUS$2010/PJ,2025 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,11.96460000000,R1,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,11.24720000000,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,30.32710000000,R1,2,MUS$2010/PJ,2025 +electricity,all-week,afternoon,all-year,19.35880000000,R1,2,MUS$2010/PJ,2025 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2025 -heat,all-week,afternoon,all-year,12.58300000000,R1,2,MUS$2010/PJ,2025 +heat,all-week,afternoon,all-year,11.24720000000,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.18690000000,R1,3,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,19.35880000000,R1,3,MUS$2010/PJ,2025 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,11.96460000000,R1,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,11.24720000000,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.04670000000,R1,4,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,19.35880000000,R1,4,MUS$2010/PJ,2025 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,11.34610000000,R1,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,11.24720000000,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,16.61680000000,R1,5,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,19.35880000000,R1,5,MUS$2010/PJ,2025 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,11.65540000000,R1,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,11.24720000000,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,29.99960000000,R1,0,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,19.34890000000,R1,0,MUS$2010/PJ,2030 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,15.22130000000,R1,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,12.28380000000,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,19.99980000000,R1,1,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,19.34890000000,R1,1,MUS$2010/PJ,2030 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,13.71840000000,R1,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,12.28380000000,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,29.99960000000,R1,2,MUS$2010/PJ,2030 +electricity,all-week,afternoon,all-year,19.34890000000,R1,2,MUS$2010/PJ,2030 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,15.22130000000,R1,2,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,12.28380000000,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,19.99980000000,R1,3,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,19.34890000000,R1,3,MUS$2010/PJ,2030 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,13.71840000000,R1,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,12.28380000000,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,9.99990000000,R1,4,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,19.34890000000,R1,4,MUS$2010/PJ,2030 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,12.21540000000,R1,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,12.28380000000,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,14.99980000000,R1,5,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,19.34890000000,R1,5,MUS$2010/PJ,2030 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,12.96690000000,R1,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,12.28380000000,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,29.99960000000,R1,0,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,20.19260000000,R1,0,MUS$2010/PJ,2035 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,17.52350000000,R1,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,14.32520000000,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.99980000000,R1,1,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,20.19260000000,R1,1,MUS$2010/PJ,2035 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,14.49280000000,R1,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,14.32520000000,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,29.99960000000,R1,2,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,20.19260000000,R1,2,MUS$2010/PJ,2035 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,17.52350000000,R1,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,14.32520000000,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,19.99980000000,R1,3,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,20.19260000000,R1,3,MUS$2010/PJ,2035 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,14.49280000000,R1,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,14.32520000000,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,9.99990000000,R1,4,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,20.19260000000,R1,4,MUS$2010/PJ,2035 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,11.46210000000,R1,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,14.32520000000,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.99980000000,R1,5,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,20.19260000000,R1,5,MUS$2010/PJ,2035 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,12.97740000000,R1,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,14.32520000000,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,29.99960000000,R1,0,MUS$2010/PJ,2040 +electricity,all-week,night,all-year,20.79520000000,R1,0,MUS$2010/PJ,2040 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,19.39610000000,R1,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,16.31840000000,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,19.99980000000,R1,1,MUS$2010/PJ,2040 +electricity,all-week,morning,all-year,20.79520000000,R1,1,MUS$2010/PJ,2040 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,16.36540000000,R1,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,16.31840000000,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,29.99960000000,R1,2,MUS$2010/PJ,2040 +electricity,all-week,afternoon,all-year,20.79520000000,R1,2,MUS$2010/PJ,2040 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2040 -heat,all-week,afternoon,all-year,19.39610000000,R1,2,MUS$2010/PJ,2040 +heat,all-week,afternoon,all-year,16.31840000000,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,19.99980000000,R1,3,MUS$2010/PJ,2040 +electricity,all-week,early-peak,all-year,20.79520000000,R1,3,MUS$2010/PJ,2040 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,16.36540000000,R1,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,16.31840000000,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,9.99990000000,R1,4,MUS$2010/PJ,2040 +electricity,all-week,late-peak,all-year,20.79520000000,R1,4,MUS$2010/PJ,2040 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,13.33470000000,R1,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,16.31840000000,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,14.99980000000,R1,5,MUS$2010/PJ,2040 +electricity,all-week,evening,all-year,20.79520000000,R1,5,MUS$2010/PJ,2040 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,14.85010000000,R1,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,16.31840000000,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,29.99960000000,R1,0,MUS$2010/PJ,2045 +electricity,all-week,night,all-year,21.57000000000,R1,0,MUS$2010/PJ,2045 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2045 -heat,all-week,night,all-year,18.34560000000,R1,0,MUS$2010/PJ,2045 +heat,all-week,night,all-year,19.10030000000,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.99980000000,R1,1,MUS$2010/PJ,2045 +electricity,all-week,morning,all-year,21.57000000000,R1,1,MUS$2010/PJ,2045 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2045 -heat,all-week,morning,all-year,13.75700000000,R1,1,MUS$2010/PJ,2045 +heat,all-week,morning,all-year,19.10030000000,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,29.99960000000,R1,2,MUS$2010/PJ,2045 +electricity,all-week,afternoon,all-year,21.57000000000,R1,2,MUS$2010/PJ,2045 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2045 -heat,all-week,afternoon,all-year,18.34560000000,R1,2,MUS$2010/PJ,2045 +heat,all-week,afternoon,all-year,19.10030000000,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,19.99980000000,R1,3,MUS$2010/PJ,2045 +electricity,all-week,early-peak,all-year,21.57000000000,R1,3,MUS$2010/PJ,2045 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2045 -heat,all-week,early-peak,all-year,13.75700000000,R1,3,MUS$2010/PJ,2045 +heat,all-week,early-peak,all-year,19.10030000000,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,9.99990000000,R1,4,MUS$2010/PJ,2045 +electricity,all-week,late-peak,all-year,21.57000000000,R1,4,MUS$2010/PJ,2045 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2045 -heat,all-week,late-peak,all-year,9.16830000000,R1,4,MUS$2010/PJ,2045 +heat,all-week,late-peak,all-year,19.10030000000,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,14.99980000000,R1,5,MUS$2010/PJ,2045 +electricity,all-week,evening,all-year,21.57000000000,R1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2045 -heat,all-week,evening,all-year,11.46260000000,R1,5,MUS$2010/PJ,2045 +heat,all-week,evening,all-year,19.10030000000,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,29.99960000000,R1,0,MUS$2010/PJ,2050 +electricity,all-week,night,all-year,20.51220000000,R1,0,MUS$2010/PJ,2050 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,16.32890000000,R1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,16.95260000000,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.99980000000,R1,1,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,20.51220000000,R1,1,MUS$2010/PJ,2050 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,10.88590000000,R1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,16.95260000000,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,29.99960000000,R1,2,MUS$2010/PJ,2050 +electricity,all-week,afternoon,all-year,20.51220000000,R1,2,MUS$2010/PJ,2050 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,16.32890000000,R1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,16.95260000000,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.99980000000,R1,3,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,20.51220000000,R1,3,MUS$2010/PJ,2050 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,10.88590000000,R1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,16.95260000000,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.99990000000,R1,4,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,20.51220000000,R1,4,MUS$2010/PJ,2050 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,5.44300000000,R1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,16.95260000000,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,14.99980000000,R1,5,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,20.51220000000,R1,5,MUS$2010/PJ,2050 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,8.16440000000,R1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,16.95260000000,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 4dd6319e6..626f22110 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 @@ -3,37 +3,37 @@ 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,11.00000000000,R1,2025,R1,residential,gasboiler,newcapa,2025 +A1,11.00000000000,R1,2025,R1,residential,heatpump,newcapa,2025 A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2025 +A1,3.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2025 A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2025 -A1,5.62220000000,R1,2025,R1,gas,gassupply1,newcapa,2025 -A1,11.00000000000,R1,2025,R1,residential,gasboiler,newcapa,2030 +A1,11.00000000000,R1,2025,R1,residential,heatpump,newcapa,2030 A1,6.00000000000,R1,2030,R1,residential,heatpump,newcapa,2030 -A1,6.00000000000,R1,2030,R1,power,windturbine,newcapa,2030 +A1,3.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2030 +A1,10.00000000000,R1,2030,R1,power,windturbine,newcapa,2030 A1,7.50000000000,R1,2020,R1,gas,gassupply1,newcapa,2030 -A1,5.62220000000,R1,2025,R1,gas,gassupply1,newcapa,2030 -A1,1.05560000000,R1,2030,R1,gas,gassupply1,newcapa,2030 A1,6.00000000000,R1,2030,R1,residential,heatpump,newcapa,2035 A1,12.00000000000,R1,2035,R1,residential,heatpump,newcapa,2035 -A1,6.00000000000,R1,2030,R1,power,windturbine,newcapa,2035 -A1,12.00000000000,R1,2035,R1,power,windturbine,newcapa,2035 -A1,5.62220000000,R1,2025,R1,gas,gassupply1,newcapa,2035 -A1,1.05560000000,R1,2030,R1,gas,gassupply1,newcapa,2035 +A1,3.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2035 +A1,10.00000000000,R1,2030,R1,power,windturbine,newcapa,2035 +A1,1.00000000000,R1,2035,R1,power,windturbine,newcapa,2035 +A1,5.01000000000,R1,2035,R1,gas,gassupply1,newcapa,2035 A1,12.00000000000,R1,2035,R1,residential,heatpump,newcapa,2040 A1,6.00000000000,R1,2040,R1,residential,heatpump,newcapa,2040 -A1,6.00000000000,R1,2030,R1,power,windturbine,newcapa,2040 -A1,12.00000000000,R1,2035,R1,power,windturbine,newcapa,2040 -A1,5.62220000000,R1,2025,R1,gas,gassupply1,newcapa,2040 -A1,1.05560000000,R1,2030,R1,gas,gassupply1,newcapa,2040 +A1,3.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2040 +A1,10.00000000000,R1,2030,R1,power,windturbine,newcapa,2040 +A1,1.00000000000,R1,2035,R1,power,windturbine,newcapa,2040 +A1,5.01000000000,R1,2035,R1,gas,gassupply1,newcapa,2040 A1,6.00000000000,R1,2040,R1,residential,heatpump,newcapa,2045 A1,12.00000000000,R1,2045,R1,residential,heatpump,newcapa,2045 -A1,6.00000000000,R1,2030,R1,power,windturbine,newcapa,2045 -A1,12.00000000000,R1,2035,R1,power,windturbine,newcapa,2045 -A1,5.62220000000,R1,2025,R1,gas,gassupply1,newcapa,2045 -A1,1.05560000000,R1,2030,R1,gas,gassupply1,newcapa,2045 +A1,3.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2045 +A1,10.00000000000,R1,2030,R1,power,windturbine,newcapa,2045 +A1,1.00000000000,R1,2035,R1,power,windturbine,newcapa,2045 +A1,5.01000000000,R1,2035,R1,gas,gassupply1,newcapa,2045 A1,12.00000000000,R1,2045,R1,residential,heatpump,newcapa,2050 A1,7.00000000000,R1,2050,R1,residential,heatpump,newcapa,2050 -A1,6.00000000000,R1,2030,R1,power,windturbine,newcapa,2050 -A1,12.00000000000,R1,2035,R1,power,windturbine,newcapa,2050 -A1,5.62220000000,R1,2025,R1,gas,gassupply1,newcapa,2050 -A1,1.05560000000,R1,2030,R1,gas,gassupply1,newcapa,2050 +A1,3.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2050 +A1,10.00000000000,R1,2030,R1,power,windturbine,newcapa,2050 +A1,1.00000000000,R1,2035,R1,power,windturbine,newcapa,2050 +A1,1.00000000000,R1,2050,R1,power,windturbine,newcapa,2050 +A1,5.01000000000,R1,2035,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 be5fc8b12..c8b006471 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 @@ -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,27.78890000000,R1,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,19.37150000000,R1,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,12.49630000000,R1,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,10.73650000000,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,20.25210000000,R1,1,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,19.37150000000,R1,1,MUS$2010/PJ,2025 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,11.90130000000,R1,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,10.73650000000,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,27.78890000000,R1,2,MUS$2010/PJ,2025 +electricity,all-week,afternoon,all-year,19.37150000000,R1,2,MUS$2010/PJ,2025 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2025 -heat,all-week,afternoon,all-year,12.49630000000,R1,2,MUS$2010/PJ,2025 +heat,all-week,afternoon,all-year,10.73650000000,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,20.25210000000,R1,3,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,19.37150000000,R1,3,MUS$2010/PJ,2025 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,11.90130000000,R1,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,10.73650000000,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,13.79410000000,R1,4,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,19.37150000000,R1,4,MUS$2010/PJ,2025 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,11.34610000000,R1,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,10.73650000000,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,16.51000000000,R1,5,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,19.37150000000,R1,5,MUS$2010/PJ,2025 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,11.60580000000,R1,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,10.73650000000,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,29.23940000000,R1,0,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,19.85650000000,R1,0,MUS$2010/PJ,2030 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,15.27490000000,R1,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,10.48640000000,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,19.40190000000,R1,1,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,19.85650000000,R1,1,MUS$2010/PJ,2030 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,12.99130000000,R1,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,10.48640000000,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,29.23940000000,R1,2,MUS$2010/PJ,2030 +electricity,all-week,afternoon,all-year,19.85650000000,R1,2,MUS$2010/PJ,2030 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,15.27490000000,R1,2,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,10.48640000000,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,19.40190000000,R1,3,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,19.85650000000,R1,3,MUS$2010/PJ,2030 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,12.99130000000,R1,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,10.48640000000,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,9.99990000000,R1,4,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,19.85650000000,R1,4,MUS$2010/PJ,2030 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,10.80890000000,R1,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,10.48640000000,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,14.51750000000,R1,5,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,19.85650000000,R1,5,MUS$2010/PJ,2030 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,11.85760000000,R1,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,10.48640000000,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,30.11110000000,R1,0,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,22.01050000000,R1,0,MUS$2010/PJ,2035 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,16.04090000000,R1,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,11.40110000000,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.98030000000,R1,1,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,22.01050000000,R1,1,MUS$2010/PJ,2035 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,10.64400000000,R1,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,11.40110000000,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,30.11110000000,R1,2,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,22.01050000000,R1,2,MUS$2010/PJ,2035 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,16.04090000000,R1,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,11.40110000000,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,19.98030000000,R1,3,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,22.01050000000,R1,3,MUS$2010/PJ,2035 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,10.64400000000,R1,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,11.40110000000,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,9.99990000000,R1,4,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,22.01050000000,R1,4,MUS$2010/PJ,2035 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,5.44300000000,R1,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,11.40110000000,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.95030000000,R1,5,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,22.01050000000,R1,5,MUS$2010/PJ,2035 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,7.96440000000,R1,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,11.40110000000,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,29.31080000000,R1,0,MUS$2010/PJ,2040 +electricity,all-week,night,all-year,23.78520000000,R1,0,MUS$2010/PJ,2040 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,16.27410000000,R1,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,12.06220000000,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,19.44920000000,R1,1,MUS$2010/PJ,2040 +electricity,all-week,morning,all-year,23.78520000000,R1,1,MUS$2010/PJ,2040 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,10.79870000000,R1,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,12.06220000000,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,29.31080000000,R1,2,MUS$2010/PJ,2040 +electricity,all-week,afternoon,all-year,23.78520000000,R1,2,MUS$2010/PJ,2040 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2040 -heat,all-week,afternoon,all-year,16.27410000000,R1,2,MUS$2010/PJ,2040 +heat,all-week,afternoon,all-year,12.06220000000,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,19.44920000000,R1,3,MUS$2010/PJ,2040 +electricity,all-week,early-peak,all-year,23.78520000000,R1,3,MUS$2010/PJ,2040 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,10.79870000000,R1,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,12.06220000000,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,9.99990000000,R1,4,MUS$2010/PJ,2040 +electricity,all-week,late-peak,all-year,23.78520000000,R1,4,MUS$2010/PJ,2040 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,5.44300000000,R1,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,12.06220000000,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,14.55290000000,R1,5,MUS$2010/PJ,2040 +electricity,all-week,evening,all-year,23.78520000000,R1,5,MUS$2010/PJ,2040 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,8.08010000000,R1,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,12.06220000000,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.81720000000,R1,0,MUS$2010/PJ,2045 +electricity,all-week,night,all-year,26.46380000000,R1,0,MUS$2010/PJ,2045 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2045 -heat,all-week,night,all-year,15.68530000000,R1,0,MUS$2010/PJ,2045 +heat,all-week,night,all-year,13.10320000000,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.12170000000,R1,1,MUS$2010/PJ,2045 +electricity,all-week,morning,all-year,26.46380000000,R1,1,MUS$2010/PJ,2045 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2045 -heat,all-week,morning,all-year,10.40800000000,R1,1,MUS$2010/PJ,2045 +heat,all-week,morning,all-year,13.10320000000,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.81720000000,R1,2,MUS$2010/PJ,2045 +electricity,all-week,afternoon,all-year,26.46380000000,R1,2,MUS$2010/PJ,2045 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2045 -heat,all-week,afternoon,all-year,15.68530000000,R1,2,MUS$2010/PJ,2045 +heat,all-week,afternoon,all-year,13.10320000000,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,19.12170000000,R1,3,MUS$2010/PJ,2045 +electricity,all-week,early-peak,all-year,26.46380000000,R1,3,MUS$2010/PJ,2045 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2045 -heat,all-week,early-peak,all-year,10.40800000000,R1,3,MUS$2010/PJ,2045 +heat,all-week,early-peak,all-year,13.10320000000,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,9.99990000000,R1,4,MUS$2010/PJ,2045 +electricity,all-week,late-peak,all-year,26.46380000000,R1,4,MUS$2010/PJ,2045 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2045 -heat,all-week,late-peak,all-year,5.44300000000,R1,4,MUS$2010/PJ,2045 +heat,all-week,late-peak,all-year,13.10320000000,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,14.30790000000,R1,5,MUS$2010/PJ,2045 +electricity,all-week,evening,all-year,26.46380000000,R1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2045 -heat,all-week,evening,all-year,7.78780000000,R1,5,MUS$2010/PJ,2045 +heat,all-week,evening,all-year,13.10320000000,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,28.34170000000,R1,0,MUS$2010/PJ,2050 +electricity,all-week,night,all-year,29.00280000000,R1,0,MUS$2010/PJ,2050 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,15.84390000000,R1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,14.18620000000,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,18.80620000000,R1,1,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,29.00280000000,R1,1,MUS$2010/PJ,2050 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,10.51320000000,R1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,14.18620000000,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,28.34170000000,R1,2,MUS$2010/PJ,2050 +electricity,all-week,afternoon,all-year,29.00280000000,R1,2,MUS$2010/PJ,2050 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,15.84390000000,R1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,14.18620000000,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,18.80620000000,R1,3,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,29.00280000000,R1,3,MUS$2010/PJ,2050 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,10.51320000000,R1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,14.18620000000,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.99990000000,R1,4,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,29.00280000000,R1,4,MUS$2010/PJ,2050 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,5.44300000000,R1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,14.18620000000,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,14.07180000000,R1,5,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,29.00280000000,R1,5,MUS$2010/PJ,2050 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,7.86650000000,R1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,14.18620000000,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/1-introduction/Results/MCAPrices.csv b/docs/tutorial-code/add-new-technology/1-introduction/Results/MCAPrices.csv index 0ec311526..aceb7479f 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 @@ -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,23.72940000000,R1,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,15.14750000000,R1,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,13.92520000000,R1,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,9.68210000000,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,16.44690000000,R1,1,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,15.14750000000,R1,1,MUS$2010/PJ,2025 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,10.34790000000,R1,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,9.68210000000,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.72940000000,R1,2,MUS$2010/PJ,2025 +electricity,all-week,afternoon,all-year,15.14750000000,R1,2,MUS$2010/PJ,2025 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2025 -heat,all-week,afternoon,all-year,13.92520000000,R1,2,MUS$2010/PJ,2025 +heat,all-week,afternoon,all-year,9.68210000000,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,16.44690000000,R1,3,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,15.14750000000,R1,3,MUS$2010/PJ,2025 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,10.34790000000,R1,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,9.68210000000,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,9.46380000000,R1,4,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,15.14750000000,R1,4,MUS$2010/PJ,2025 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,6.86530000000,R1,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,9.68210000000,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.80570000000,R1,5,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,15.14750000000,R1,5,MUS$2010/PJ,2025 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,8.55920000000,R1,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,9.68210000000,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,24.78780000000,R1,0,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,14.87270000000,R1,0,MUS$2010/PJ,2030 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,13.82080000000,R1,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,8.65640000000,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,16.52520000000,R1,1,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,14.87270000000,R1,1,MUS$2010/PJ,2030 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,9.46480000000,R1,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,8.65640000000,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,24.78780000000,R1,2,MUS$2010/PJ,2030 +electricity,all-week,afternoon,all-year,14.87270000000,R1,2,MUS$2010/PJ,2030 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,13.82080000000,R1,2,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,8.65640000000,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,16.52520000000,R1,3,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,14.87270000000,R1,3,MUS$2010/PJ,2030 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,9.46480000000,R1,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,8.65640000000,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,8.26260000000,R1,4,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,14.87270000000,R1,4,MUS$2010/PJ,2030 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,5.22850000000,R1,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,8.65640000000,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,12.39390000000,R1,5,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,14.87270000000,R1,5,MUS$2010/PJ,2030 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,7.28680000000,R1,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,8.65640000000,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,24.09930000000,R1,0,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,14.58110000000,R1,0,MUS$2010/PJ,2035 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,14.24420000000,R1,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,8.54650000000,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,16.06620000000,R1,1,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,14.58110000000,R1,1,MUS$2010/PJ,2035 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,9.49610000000,R1,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,8.54650000000,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,24.09930000000,R1,2,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,14.58110000000,R1,2,MUS$2010/PJ,2035 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,14.24420000000,R1,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,8.54650000000,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,16.06620000000,R1,3,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,14.58110000000,R1,3,MUS$2010/PJ,2035 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,9.49610000000,R1,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,8.54650000000,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,8.26260000000,R1,4,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,14.58110000000,R1,4,MUS$2010/PJ,2035 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,4.74810000000,R1,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,8.54650000000,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,12.04960000000,R1,5,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,14.58110000000,R1,5,MUS$2010/PJ,2035 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,7.12210000000,R1,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,8.54650000000,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,24.19760000000,R1,0,MUS$2010/PJ,2040 +electricity,all-week,night,all-year,14.62300000000,R1,0,MUS$2010/PJ,2040 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,13.96870000000,R1,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,8.42980000000,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.13180000000,R1,1,MUS$2010/PJ,2040 +electricity,all-week,morning,all-year,14.62300000000,R1,1,MUS$2010/PJ,2040 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,9.31250000000,R1,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,8.42980000000,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,24.19760000000,R1,2,MUS$2010/PJ,2040 +electricity,all-week,afternoon,all-year,14.62300000000,R1,2,MUS$2010/PJ,2040 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2040 -heat,all-week,afternoon,all-year,13.96870000000,R1,2,MUS$2010/PJ,2040 +heat,all-week,afternoon,all-year,8.42980000000,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.13180000000,R1,3,MUS$2010/PJ,2040 +electricity,all-week,early-peak,all-year,14.62300000000,R1,3,MUS$2010/PJ,2040 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,9.31250000000,R1,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,8.42980000000,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,8.26260000000,R1,4,MUS$2010/PJ,2040 +electricity,all-week,late-peak,all-year,14.62300000000,R1,4,MUS$2010/PJ,2040 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,4.74810000000,R1,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,8.42980000000,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,12.09880000000,R1,5,MUS$2010/PJ,2040 +electricity,all-week,evening,all-year,14.62300000000,R1,5,MUS$2010/PJ,2040 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,6.98440000000,R1,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,8.42980000000,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,24.27140000000,R1,0,MUS$2010/PJ,2045 +electricity,all-week,night,all-year,14.65440000000,R1,0,MUS$2010/PJ,2045 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2045 -heat,all-week,night,all-year,14.00810000000,R1,0,MUS$2010/PJ,2045 +heat,all-week,night,all-year,8.44660000000,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,16.18090000000,R1,1,MUS$2010/PJ,2045 +electricity,all-week,morning,all-year,14.65440000000,R1,1,MUS$2010/PJ,2045 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2045 -heat,all-week,morning,all-year,9.33870000000,R1,1,MUS$2010/PJ,2045 +heat,all-week,morning,all-year,8.44660000000,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,24.27140000000,R1,2,MUS$2010/PJ,2045 +electricity,all-week,afternoon,all-year,14.65440000000,R1,2,MUS$2010/PJ,2045 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2045 -heat,all-week,afternoon,all-year,14.00810000000,R1,2,MUS$2010/PJ,2045 +heat,all-week,afternoon,all-year,8.44660000000,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,16.18090000000,R1,3,MUS$2010/PJ,2045 +electricity,all-week,early-peak,all-year,14.65440000000,R1,3,MUS$2010/PJ,2045 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2045 -heat,all-week,early-peak,all-year,9.33870000000,R1,3,MUS$2010/PJ,2045 +heat,all-week,early-peak,all-year,8.44660000000,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.26260000000,R1,4,MUS$2010/PJ,2045 +electricity,all-week,late-peak,all-year,14.65440000000,R1,4,MUS$2010/PJ,2045 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2045 -heat,all-week,late-peak,all-year,4.74810000000,R1,4,MUS$2010/PJ,2045 +heat,all-week,late-peak,all-year,8.44660000000,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,12.13570000000,R1,5,MUS$2010/PJ,2045 +electricity,all-week,evening,all-year,14.65440000000,R1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2045 -heat,all-week,evening,all-year,7.00400000000,R1,5,MUS$2010/PJ,2045 +heat,all-week,evening,all-year,8.44660000000,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,24.78780000000,R1,0,MUS$2010/PJ,2050 +electricity,all-week,night,all-year,14.87270000000,R1,0,MUS$2010/PJ,2050 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,14.03760000000,R1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,8.45920000000,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,16.52520000000,R1,1,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,14.87270000000,R1,1,MUS$2010/PJ,2050 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,9.35840000000,R1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,8.45920000000,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,24.78780000000,R1,2,MUS$2010/PJ,2050 +electricity,all-week,afternoon,all-year,14.87270000000,R1,2,MUS$2010/PJ,2050 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,14.03760000000,R1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,8.45920000000,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,16.52520000000,R1,3,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,14.87270000000,R1,3,MUS$2010/PJ,2050 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,9.35840000000,R1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,8.45920000000,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,8.26260000000,R1,4,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,14.87270000000,R1,4,MUS$2010/PJ,2050 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,4.74810000000,R1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,8.45920000000,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,12.39390000000,R1,5,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,14.87270000000,R1,5,MUS$2010/PJ,2050 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,7.01880000000,R1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,8.45920000000,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 babf458b7..1d0a03115 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 @@ -3,43 +3,53 @@ 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,2025,R1,residential,gasboiler,newcapa,2025 +A1,19.00000000000,R1,2025,R1,residential,heatpump,newcapa,2025 A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2025 +A1,6.59380000000,R1,2025,R1,power,gasCCGT,newcapa,2025 +A1,1.91410000000,R1,2025,R1,power,windturbine,newcapa,2025 A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2025 -A1,15.93330000000,R1,2025,R1,gas,gassupply1,newcapa,2025 -A1,19.00000000000,R1,2025,R1,residential,gasboiler,newcapa,2030 +A1,4.12600000000,R1,2025,R1,gas,gassupply1,newcapa,2025 +A1,19.00000000000,R1,2025,R1,residential,heatpump,newcapa,2030 A1,11.00000000000,R1,2030,R1,residential,heatpump,newcapa,2030 -A1,11.00000000000,R1,2030,R1,power,solarPV,newcapa,2030 +A1,6.59380000000,R1,2025,R1,power,gasCCGT,newcapa,2030 +A1,13.25000000000,R1,2030,R1,power,solarPV,newcapa,2030 +A1,1.91410000000,R1,2025,R1,power,windturbine,newcapa,2030 A1,7.50000000000,R1,2020,R1,gas,gassupply1,newcapa,2030 -A1,15.93330000000,R1,2025,R1,gas,gassupply1,newcapa,2030 -A1,1.05560000000,R1,2030,R1,gas,gassupply1,newcapa,2030 +A1,4.12600000000,R1,2025,R1,gas,gassupply1,newcapa,2030 A1,11.00000000000,R1,2030,R1,residential,heatpump,newcapa,2035 A1,25.00000000000,R1,2035,R1,residential,heatpump,newcapa,2035 -A1,11.00000000000,R1,2030,R1,power,solarPV,newcapa,2035 -A1,25.00000000000,R1,2035,R1,power,solarPV,newcapa,2035 -A1,15.93330000000,R1,2025,R1,gas,gassupply1,newcapa,2035 -A1,1.05560000000,R1,2030,R1,gas,gassupply1,newcapa,2035 +A1,6.59380000000,R1,2025,R1,power,gasCCGT,newcapa,2035 +A1,13.25000000000,R1,2030,R1,power,solarPV,newcapa,2035 +A1,6.00000000000,R1,2035,R1,power,solarPV,newcapa,2035 +A1,1.91410000000,R1,2025,R1,power,windturbine,newcapa,2035 +A1,4.12600000000,R1,2025,R1,gas,gassupply1,newcapa,2035 +A1,6.88560000000,R1,2035,R1,gas,gassupply1,newcapa,2035 A1,25.00000000000,R1,2035,R1,residential,heatpump,newcapa,2040 A1,17.00000000000,R1,2040,R1,residential,heatpump,newcapa,2040 -A1,11.00000000000,R1,2030,R1,power,solarPV,newcapa,2040 -A1,25.00000000000,R1,2035,R1,power,solarPV,newcapa,2040 +A1,6.59380000000,R1,2025,R1,power,gasCCGT,newcapa,2040 +A1,13.25000000000,R1,2030,R1,power,solarPV,newcapa,2040 +A1,6.00000000000,R1,2035,R1,power,solarPV,newcapa,2040 A1,6.00000000000,R1,2040,R1,power,solarPV,newcapa,2040 -A1,15.93330000000,R1,2025,R1,gas,gassupply1,newcapa,2040 -A1,1.05560000000,R1,2030,R1,gas,gassupply1,newcapa,2040 +A1,1.91410000000,R1,2025,R1,power,windturbine,newcapa,2040 +A1,4.12600000000,R1,2025,R1,gas,gassupply1,newcapa,2040 +A1,6.88560000000,R1,2035,R1,gas,gassupply1,newcapa,2040 A1,17.00000000000,R1,2040,R1,residential,heatpump,newcapa,2045 A1,31.00000000000,R1,2045,R1,residential,heatpump,newcapa,2045 -A1,11.00000000000,R1,2030,R1,power,solarPV,newcapa,2045 -A1,25.00000000000,R1,2035,R1,power,solarPV,newcapa,2045 +A1,6.59380000000,R1,2025,R1,power,gasCCGT,newcapa,2045 +A1,13.25000000000,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,6.00000000000,R1,2045,R1,power,solarPV,newcapa,2045 -A1,15.93330000000,R1,2025,R1,gas,gassupply1,newcapa,2045 -A1,1.05560000000,R1,2030,R1,gas,gassupply1,newcapa,2045 +A1,1.91410000000,R1,2025,R1,power,windturbine,newcapa,2045 +A1,4.12600000000,R1,2025,R1,gas,gassupply1,newcapa,2045 +A1,6.88560000000,R1,2035,R1,gas,gassupply1,newcapa,2045 A1,31.00000000000,R1,2045,R1,residential,heatpump,newcapa,2050 A1,23.00000000000,R1,2050,R1,residential,heatpump,newcapa,2050 -A1,11.00000000000,R1,2030,R1,power,solarPV,newcapa,2050 -A1,25.00000000000,R1,2035,R1,power,solarPV,newcapa,2050 +A1,6.59380000000,R1,2025,R1,power,gasCCGT,newcapa,2050 +A1,13.25000000000,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,6.00000000000,R1,2045,R1,power,solarPV,newcapa,2050 -A1,6.00000000000,R1,2050,R1,power,solarPV,newcapa,2050 -A1,15.93330000000,R1,2025,R1,gas,gassupply1,newcapa,2050 -A1,1.05560000000,R1,2030,R1,gas,gassupply1,newcapa,2050 +A1,7.91410000000,R1,2050,R1,power,solarPV,newcapa,2050 +A1,4.12600000000,R1,2025,R1,gas,gassupply1,newcapa,2050 +A1,6.88560000000,R1,2035,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 1cdb41290..5147a8c94 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 @@ -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,30.32710000000,R1,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,19.97590000000,R1,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,12.58300000000,R1,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,10.84880000000,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,21.18690000000,R1,1,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,19.97590000000,R1,1,MUS$2010/PJ,2025 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,11.96460000000,R1,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,10.84880000000,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,30.32710000000,R1,2,MUS$2010/PJ,2025 +electricity,all-week,afternoon,all-year,19.97590000000,R1,2,MUS$2010/PJ,2025 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2025 -heat,all-week,afternoon,all-year,12.58300000000,R1,2,MUS$2010/PJ,2025 +heat,all-week,afternoon,all-year,10.84880000000,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.18690000000,R1,3,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,19.97590000000,R1,3,MUS$2010/PJ,2025 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,11.96460000000,R1,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,10.84880000000,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.04670000000,R1,4,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,19.97590000000,R1,4,MUS$2010/PJ,2025 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,11.34610000000,R1,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,10.84880000000,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,16.61680000000,R1,5,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,19.97590000000,R1,5,MUS$2010/PJ,2025 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,11.65540000000,R1,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,10.84880000000,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,28.91910000000,R1,0,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,20.47430000000,R1,0,MUS$2010/PJ,2030 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,15.31150000000,R1,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,10.78710000000,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,19.27940000000,R1,1,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,20.47430000000,R1,1,MUS$2010/PJ,2030 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,12.97690000000,R1,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,10.78710000000,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,28.91910000000,R1,2,MUS$2010/PJ,2030 +electricity,all-week,afternoon,all-year,20.47430000000,R1,2,MUS$2010/PJ,2030 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,15.31150000000,R1,2,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,10.78710000000,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,19.27940000000,R1,3,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,20.47430000000,R1,3,MUS$2010/PJ,2030 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,12.97690000000,R1,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,10.78710000000,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,9.63970000000,R1,4,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,20.47430000000,R1,4,MUS$2010/PJ,2030 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,10.64230000000,R1,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,10.78710000000,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,14.45960000000,R1,5,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,20.47430000000,R1,5,MUS$2010/PJ,2030 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,11.80960000000,R1,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,10.78710000000,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,27.48460000000,R1,0,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,21.93380000000,R1,0,MUS$2010/PJ,2035 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,15.89670000000,R1,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,11.37090000000,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,18.32310000000,R1,1,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,21.93380000000,R1,1,MUS$2010/PJ,2035 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,10.59780000000,R1,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,11.37090000000,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,27.48460000000,R1,2,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,21.93380000000,R1,2,MUS$2010/PJ,2035 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,15.89670000000,R1,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,11.37090000000,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.32310000000,R1,3,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,21.93380000000,R1,3,MUS$2010/PJ,2035 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,10.59780000000,R1,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,11.37090000000,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,9.16150000000,R1,4,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,21.93380000000,R1,4,MUS$2010/PJ,2035 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,5.29890000000,R1,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,11.37090000000,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,13.74230000000,R1,5,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,21.93380000000,R1,5,MUS$2010/PJ,2035 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,7.94830000000,R1,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,11.37090000000,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,27.09940000000,R1,0,MUS$2010/PJ,2040 +electricity,all-week,night,all-year,22.79930000000,R1,0,MUS$2010/PJ,2040 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,15.32290000000,R1,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,11.71710000000,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.06630000000,R1,1,MUS$2010/PJ,2040 +electricity,all-week,morning,all-year,22.79930000000,R1,1,MUS$2010/PJ,2040 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,10.21530000000,R1,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,11.71710000000,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,27.09940000000,R1,2,MUS$2010/PJ,2040 +electricity,all-week,afternoon,all-year,22.79930000000,R1,2,MUS$2010/PJ,2040 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2040 -heat,all-week,afternoon,all-year,15.32290000000,R1,2,MUS$2010/PJ,2040 +heat,all-week,afternoon,all-year,11.71710000000,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,18.06630000000,R1,3,MUS$2010/PJ,2040 +electricity,all-week,early-peak,all-year,22.79930000000,R1,3,MUS$2010/PJ,2040 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,10.21530000000,R1,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,11.71710000000,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,9.03310000000,R1,4,MUS$2010/PJ,2040 +electricity,all-week,late-peak,all-year,22.79930000000,R1,4,MUS$2010/PJ,2040 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,5.10760000000,R1,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,11.71710000000,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,13.54970000000,R1,5,MUS$2010/PJ,2040 +electricity,all-week,evening,all-year,22.79930000000,R1,5,MUS$2010/PJ,2040 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,7.66140000000,R1,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,11.71710000000,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,26.81040000000,R1,0,MUS$2010/PJ,2045 +electricity,all-week,night,all-year,24.10890000000,R1,0,MUS$2010/PJ,2045 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2045 -heat,all-week,night,all-year,15.16880000000,R1,0,MUS$2010/PJ,2045 +heat,all-week,night,all-year,12.24100000000,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.87360000000,R1,1,MUS$2010/PJ,2045 +electricity,all-week,morning,all-year,24.10890000000,R1,1,MUS$2010/PJ,2045 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2045 -heat,all-week,morning,all-year,10.11250000000,R1,1,MUS$2010/PJ,2045 +heat,all-week,morning,all-year,12.24100000000,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,26.81040000000,R1,2,MUS$2010/PJ,2045 +electricity,all-week,afternoon,all-year,24.10890000000,R1,2,MUS$2010/PJ,2045 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2045 -heat,all-week,afternoon,all-year,15.16880000000,R1,2,MUS$2010/PJ,2045 +heat,all-week,afternoon,all-year,12.24100000000,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.87360000000,R1,3,MUS$2010/PJ,2045 +electricity,all-week,early-peak,all-year,24.10890000000,R1,3,MUS$2010/PJ,2045 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2045 -heat,all-week,early-peak,all-year,10.11250000000,R1,3,MUS$2010/PJ,2045 +heat,all-week,early-peak,all-year,12.24100000000,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.93680000000,R1,4,MUS$2010/PJ,2045 +electricity,all-week,late-peak,all-year,24.10890000000,R1,4,MUS$2010/PJ,2045 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2045 -heat,all-week,late-peak,all-year,5.05630000000,R1,4,MUS$2010/PJ,2045 +heat,all-week,late-peak,all-year,12.24100000000,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,13.40520000000,R1,5,MUS$2010/PJ,2045 +electricity,all-week,evening,all-year,24.10890000000,R1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2045 -heat,all-week,evening,all-year,7.58440000000,R1,5,MUS$2010/PJ,2045 +heat,all-week,evening,all-year,12.24100000000,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,26.58570000000,R1,0,MUS$2010/PJ,2050 +electricity,all-week,night,all-year,25.01660000000,R1,0,MUS$2010/PJ,2050 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,15.05320000000,R1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,12.60410000000,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,17.72380000000,R1,1,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,25.01660000000,R1,1,MUS$2010/PJ,2050 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,10.03550000000,R1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,12.60410000000,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,26.58570000000,R1,2,MUS$2010/PJ,2050 +electricity,all-week,afternoon,all-year,25.01660000000,R1,2,MUS$2010/PJ,2050 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,15.05320000000,R1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,12.60410000000,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,17.72380000000,R1,3,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,25.01660000000,R1,3,MUS$2010/PJ,2050 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,10.03550000000,R1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,12.60410000000,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,8.86190000000,R1,4,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,25.01660000000,R1,4,MUS$2010/PJ,2050 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,5.01770000000,R1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,12.60410000000,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,13.29280000000,R1,5,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,25.01660000000,R1,5,MUS$2010/PJ,2050 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,7.52660000000,R1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,12.60410000000,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 2881acd56..689c4ec6c 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 @@ -26,56 +26,58 @@ A1,7.50000000000,R2,2020,R2,gas,gassupply1,newcapa,2030 A1,15.93330000000,R2,2025,R2,gas,gassupply1,newcapa,2030 A1,15.23330000000,R2,2030,R2,gas,gassupply1,newcapa,2030 A1,11.00000000000,R1,2030,R1,residential,gasboiler,newcapa,2035 -A1,25.00000000000,R1,2035,R1,residential,gasboiler,newcapa,2035 +A1,25.00000000000,R1,2035,R1,residential,heatpump,newcapa,2035 A1,11.00000000000,R2,2030,R2,residential,gasboiler,newcapa,2035 -A1,25.00000000000,R2,2035,R2,residential,gasboiler,newcapa,2035 +A1,5.00000000000,R2,2035,R2,residential,gasboiler,newcapa,2035 +A1,20.00000000000,R2,2035,R2,residential,heatpump,newcapa,2035 +A1,22.00000000000,R1,2035,R1,power,windturbine,newcapa,2035 +A1,22.00000000000,R2,2035,R2,power,windturbine,newcapa,2035 A1,15.93330000000,R1,2025,R1,gas,gassupply1,newcapa,2035 A1,15.23330000000,R1,2030,R1,gas,gassupply1,newcapa,2035 -A1,15.23330000000,R1,2035,R1,gas,gassupply1,newcapa,2035 A1,15.93330000000,R2,2025,R2,gas,gassupply1,newcapa,2035 A1,15.23330000000,R2,2030,R2,gas,gassupply1,newcapa,2035 -A1,15.23330000000,R2,2035,R2,gas,gassupply1,newcapa,2035 -A1,25.00000000000,R1,2035,R1,residential,gasboiler,newcapa,2040 -A1,17.00000000000,R1,2040,R1,residential,gasboiler,newcapa,2040 -A1,25.00000000000,R2,2035,R2,residential,gasboiler,newcapa,2040 +A1,25.00000000000,R1,2035,R1,residential,heatpump,newcapa,2040 +A1,17.00000000000,R1,2040,R1,residential,heatpump,newcapa,2040 +A1,5.00000000000,R2,2035,R2,residential,gasboiler,newcapa,2040 A1,17.00000000000,R2,2040,R2,residential,gasboiler,newcapa,2040 +A1,20.00000000000,R2,2035,R2,residential,heatpump,newcapa,2040 +A1,22.00000000000,R1,2035,R1,power,windturbine,newcapa,2040 +A1,8.00000000000,R1,2040,R1,power,windturbine,newcapa,2040 +A1,22.00000000000,R2,2035,R2,power,windturbine,newcapa,2040 +A1,8.00000000000,R2,2040,R2,power,windturbine,newcapa,2040 A1,15.93330000000,R1,2025,R1,gas,gassupply1,newcapa,2040 A1,15.23330000000,R1,2030,R1,gas,gassupply1,newcapa,2040 -A1,15.23330000000,R1,2035,R1,gas,gassupply1,newcapa,2040 -A1,7.73330000000,R1,2040,R1,gas,gassupply1,newcapa,2040 A1,15.93330000000,R2,2025,R2,gas,gassupply1,newcapa,2040 A1,15.23330000000,R2,2030,R2,gas,gassupply1,newcapa,2040 -A1,15.23330000000,R2,2035,R2,gas,gassupply1,newcapa,2040 -A1,7.73330000000,R2,2040,R2,gas,gassupply1,newcapa,2040 -A1,17.00000000000,R1,2040,R1,residential,gasboiler,newcapa,2045 +A1,17.00000000000,R1,2040,R1,residential,heatpump,newcapa,2045 A1,31.00000000000,R1,2045,R1,residential,heatpump,newcapa,2045 A1,17.00000000000,R2,2040,R2,residential,gasboiler,newcapa,2045 A1,11.00000000000,R2,2045,R2,residential,gasboiler,newcapa,2045 A1,20.00000000000,R2,2045,R2,residential,heatpump,newcapa,2045 -A1,25.00000000000,R1,2045,R1,power,windturbine,newcapa,2045 -A1,25.00000000000,R2,2045,R2,power,windturbine,newcapa,2045 +A1,22.00000000000,R1,2035,R1,power,windturbine,newcapa,2045 +A1,8.00000000000,R1,2040,R1,power,windturbine,newcapa,2045 +A1,3.00000000000,R1,2045,R1,power,windturbine,newcapa,2045 +A1,22.00000000000,R2,2035,R2,power,windturbine,newcapa,2045 +A1,8.00000000000,R2,2040,R2,power,windturbine,newcapa,2045 +A1,3.00000000000,R2,2045,R2,power,windturbine,newcapa,2045 A1,15.93330000000,R1,2025,R1,gas,gassupply1,newcapa,2045 A1,15.23330000000,R1,2030,R1,gas,gassupply1,newcapa,2045 -A1,15.23330000000,R1,2035,R1,gas,gassupply1,newcapa,2045 -A1,7.73330000000,R1,2040,R1,gas,gassupply1,newcapa,2045 A1,15.93330000000,R2,2025,R2,gas,gassupply1,newcapa,2045 A1,15.23330000000,R2,2030,R2,gas,gassupply1,newcapa,2045 -A1,15.23330000000,R2,2035,R2,gas,gassupply1,newcapa,2045 -A1,7.73330000000,R2,2040,R2,gas,gassupply1,newcapa,2045 A1,31.00000000000,R1,2045,R1,residential,heatpump,newcapa,2050 A1,23.00000000000,R1,2050,R1,residential,heatpump,newcapa,2050 A1,11.00000000000,R2,2045,R2,residential,gasboiler,newcapa,2050 A1,23.00000000000,R2,2050,R2,residential,gasboiler,newcapa,2050 A1,20.00000000000,R2,2045,R2,residential,heatpump,newcapa,2050 -A1,25.00000000000,R1,2045,R1,power,windturbine,newcapa,2050 -A1,11.00000000000,R1,2050,R1,power,windturbine,newcapa,2050 -A1,25.00000000000,R2,2045,R2,power,windturbine,newcapa,2050 -A1,11.00000000000,R2,2050,R2,power,windturbine,newcapa,2050 +A1,22.00000000000,R1,2035,R1,power,windturbine,newcapa,2050 +A1,8.00000000000,R1,2040,R1,power,windturbine,newcapa,2050 +A1,3.00000000000,R1,2045,R1,power,windturbine,newcapa,2050 +A1,3.00000000000,R1,2050,R1,power,windturbine,newcapa,2050 +A1,22.00000000000,R2,2035,R2,power,windturbine,newcapa,2050 +A1,8.00000000000,R2,2040,R2,power,windturbine,newcapa,2050 +A1,3.00000000000,R2,2045,R2,power,windturbine,newcapa,2050 +A1,3.00000000000,R2,2050,R2,power,windturbine,newcapa,2050 A1,15.93330000000,R1,2025,R1,gas,gassupply1,newcapa,2050 A1,15.23330000000,R1,2030,R1,gas,gassupply1,newcapa,2050 -A1,15.23330000000,R1,2035,R1,gas,gassupply1,newcapa,2050 -A1,7.73330000000,R1,2040,R1,gas,gassupply1,newcapa,2050 A1,15.93330000000,R2,2025,R2,gas,gassupply1,newcapa,2050 A1,15.23330000000,R2,2030,R2,gas,gassupply1,newcapa,2050 -A1,15.23330000000,R2,2035,R2,gas,gassupply1,newcapa,2050 -A1,7.73330000000,R2,2040,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 8ec897105..1e09b3a54 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 @@ -47,291 +47,291 @@ heat,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020 heat,all-week,evening,all-year,100.00000000000,R2,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.08310000000,R1,5,MUS$2010/kt,2020 CO2f,all-week,evening,all-year,0.08310000000,R2,5,MUS$2010/kt,2020 -electricity,all-week,night,all-year,55.49860000000,R1,0,MUS$2010/PJ,2025 -electricity,all-week,night,all-year,55.49860000000,R2,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,34.88690000000,R1,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,34.88690000000,R2,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,2.55000000000,R2,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,14.43830000000,R1,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,14.43830000000,R2,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,12.95410000000,R1,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,12.95410000000,R2,0,MUS$2010/PJ,2025 CO2f,all-week,night,all-year,0.12010000000,R1,0,MUS$2010/kt,2025 CO2f,all-week,night,all-year,0.12010000000,R2,0,MUS$2010/kt,2025 -electricity,all-week,morning,all-year,38.00770000000,R1,1,MUS$2010/PJ,2025 -electricity,all-week,morning,all-year,38.00770000000,R2,1,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,34.88690000000,R1,1,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,34.88690000000,R2,1,MUS$2010/PJ,2025 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2025 gas,all-week,morning,all-year,2.55000000000,R2,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,13.20140000000,R1,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,13.20140000000,R2,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,12.95410000000,R1,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,12.95410000000,R2,1,MUS$2010/PJ,2025 CO2f,all-week,morning,all-year,0.12010000000,R1,1,MUS$2010/kt,2025 CO2f,all-week,morning,all-year,0.12010000000,R2,1,MUS$2010/kt,2025 -electricity,all-week,afternoon,all-year,55.49860000000,R1,2,MUS$2010/PJ,2025 -electricity,all-week,afternoon,all-year,55.49860000000,R2,2,MUS$2010/PJ,2025 +electricity,all-week,afternoon,all-year,34.88690000000,R1,2,MUS$2010/PJ,2025 +electricity,all-week,afternoon,all-year,34.88690000000,R2,2,MUS$2010/PJ,2025 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2025 gas,all-week,afternoon,all-year,2.55000000000,R2,2,MUS$2010/PJ,2025 -heat,all-week,afternoon,all-year,14.43830000000,R1,2,MUS$2010/PJ,2025 -heat,all-week,afternoon,all-year,14.43830000000,R2,2,MUS$2010/PJ,2025 +heat,all-week,afternoon,all-year,12.95410000000,R1,2,MUS$2010/PJ,2025 +heat,all-week,afternoon,all-year,12.95410000000,R2,2,MUS$2010/PJ,2025 CO2f,all-week,afternoon,all-year,0.12010000000,R1,2,MUS$2010/kt,2025 CO2f,all-week,afternoon,all-year,0.12010000000,R2,2,MUS$2010/kt,2025 -electricity,all-week,early-peak,all-year,38.00770000000,R1,3,MUS$2010/PJ,2025 -electricity,all-week,early-peak,all-year,38.00770000000,R2,3,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,34.88690000000,R1,3,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,34.88690000000,R2,3,MUS$2010/PJ,2025 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2025 gas,all-week,early-peak,all-year,2.55000000000,R2,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,13.20140000000,R1,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,13.20140000000,R2,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,12.95410000000,R1,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,12.95410000000,R2,3,MUS$2010/PJ,2025 CO2f,all-week,early-peak,all-year,0.12010000000,R1,3,MUS$2010/kt,2025 CO2f,all-week,early-peak,all-year,0.12010000000,R2,3,MUS$2010/kt,2025 -electricity,all-week,late-peak,all-year,21.23570000000,R1,4,MUS$2010/PJ,2025 -electricity,all-week,late-peak,all-year,21.23570000000,R2,4,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,34.88690000000,R1,4,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,34.88690000000,R2,4,MUS$2010/PJ,2025 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2025 gas,all-week,late-peak,all-year,2.55000000000,R2,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,11.96460000000,R1,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,11.96460000000,R2,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,12.95410000000,R1,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,12.95410000000,R2,4,MUS$2010/PJ,2025 CO2f,all-week,late-peak,all-year,0.12010000000,R1,4,MUS$2010/kt,2025 CO2f,all-week,late-peak,all-year,0.12010000000,R2,4,MUS$2010/kt,2025 -electricity,all-week,evening,all-year,29.26230000000,R1,5,MUS$2010/PJ,2025 -electricity,all-week,evening,all-year,29.26230000000,R2,5,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,34.88690000000,R1,5,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,34.88690000000,R2,5,MUS$2010/PJ,2025 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2025 gas,all-week,evening,all-year,2.55000000000,R2,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,12.58300000000,R1,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,12.58300000000,R2,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,12.95410000000,R1,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,12.95410000000,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,55.49860000000,R1,0,MUS$2010/PJ,2030 -electricity,all-week,night,all-year,55.49860000000,R2,0,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,34.88690000000,R1,0,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,34.88690000000,R2,0,MUS$2010/PJ,2030 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2030 gas,all-week,night,all-year,2.55000000000,R2,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,16.82800000000,R1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,16.82800000000,R2,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,15.34370000000,R1,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,15.34370000000,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,38.00770000000,R1,1,MUS$2010/PJ,2030 -electricity,all-week,morning,all-year,38.00770000000,R2,1,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,34.88690000000,R1,1,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,34.88690000000,R2,1,MUS$2010/PJ,2030 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2030 gas,all-week,morning,all-year,2.55000000000,R2,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,15.59110000000,R1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,15.59110000000,R2,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,15.34370000000,R1,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,15.34370000000,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,55.49860000000,R1,2,MUS$2010/PJ,2030 -electricity,all-week,afternoon,all-year,55.49860000000,R2,2,MUS$2010/PJ,2030 +electricity,all-week,afternoon,all-year,34.88690000000,R1,2,MUS$2010/PJ,2030 +electricity,all-week,afternoon,all-year,34.88690000000,R2,2,MUS$2010/PJ,2030 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2030 gas,all-week,afternoon,all-year,2.55000000000,R2,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,16.82800000000,R1,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,16.82800000000,R2,2,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,15.34370000000,R1,2,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,15.34370000000,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,38.00770000000,R1,3,MUS$2010/PJ,2030 -electricity,all-week,early-peak,all-year,38.00770000000,R2,3,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,34.88690000000,R1,3,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,34.88690000000,R2,3,MUS$2010/PJ,2030 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2030 gas,all-week,early-peak,all-year,2.55000000000,R2,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,15.59110000000,R1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,15.59110000000,R2,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,15.34370000000,R1,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,15.34370000000,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,21.23570000000,R1,4,MUS$2010/PJ,2030 -electricity,all-week,late-peak,all-year,21.23570000000,R2,4,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,34.88690000000,R1,4,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,34.88690000000,R2,4,MUS$2010/PJ,2030 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2030 gas,all-week,late-peak,all-year,2.55000000000,R2,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,14.35420000000,R1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,14.35420000000,R2,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,15.34370000000,R1,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,15.34370000000,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,29.26230000000,R1,5,MUS$2010/PJ,2030 -electricity,all-week,evening,all-year,29.26230000000,R2,5,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,34.88690000000,R1,5,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,34.88690000000,R2,5,MUS$2010/PJ,2030 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2030 gas,all-week,evening,all-year,2.55000000000,R2,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,14.97270000000,R1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,14.97270000000,R2,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,15.34370000000,R1,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,15.34370000000,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,55.49860000000,R1,0,MUS$2010/PJ,2035 -electricity,all-week,night,all-year,55.49860000000,R2,0,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,35.43580000000,R1,0,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,35.43580000000,R2,0,MUS$2010/PJ,2035 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2035 gas,all-week,night,all-year,2.55000000000,R2,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,20.57330000000,R1,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,20.57330000000,R2,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,19.26410000000,R1,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,19.26410000000,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,38.00770000000,R1,1,MUS$2010/PJ,2035 -electricity,all-week,morning,all-year,38.00770000000,R2,1,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,35.43580000000,R1,1,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,35.43580000000,R2,1,MUS$2010/PJ,2035 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2035 gas,all-week,morning,all-year,2.55000000000,R2,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,19.33650000000,R1,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,19.33650000000,R2,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,19.26410000000,R1,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,19.26410000000,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,55.49860000000,R1,2,MUS$2010/PJ,2035 -electricity,all-week,afternoon,all-year,55.49860000000,R2,2,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,35.43580000000,R1,2,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,35.43580000000,R2,2,MUS$2010/PJ,2035 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2035 gas,all-week,afternoon,all-year,2.55000000000,R2,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,20.57330000000,R1,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,20.57330000000,R2,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,19.26410000000,R1,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,19.26410000000,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,38.00770000000,R1,3,MUS$2010/PJ,2035 -electricity,all-week,early-peak,all-year,38.00770000000,R2,3,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,35.43580000000,R1,3,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,35.43580000000,R2,3,MUS$2010/PJ,2035 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2035 gas,all-week,early-peak,all-year,2.55000000000,R2,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,19.33650000000,R1,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,19.33650000000,R2,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,19.26410000000,R1,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,19.26410000000,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,21.23570000000,R1,4,MUS$2010/PJ,2035 -electricity,all-week,late-peak,all-year,21.23570000000,R2,4,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,35.43580000000,R1,4,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,35.43580000000,R2,4,MUS$2010/PJ,2035 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2035 gas,all-week,late-peak,all-year,2.55000000000,R2,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,18.09960000000,R1,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,18.09960000000,R2,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,19.26410000000,R1,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,19.26410000000,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,29.26230000000,R1,5,MUS$2010/PJ,2035 -electricity,all-week,evening,all-year,29.26230000000,R2,5,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,35.43580000000,R1,5,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,35.43580000000,R2,5,MUS$2010/PJ,2035 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2035 gas,all-week,evening,all-year,2.55000000000,R2,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,18.71800000000,R1,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,18.71800000000,R2,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,19.26410000000,R1,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,19.26410000000,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,55.49860000000,R1,0,MUS$2010/PJ,2040 -electricity,all-week,night,all-year,55.49860000000,R2,0,MUS$2010/PJ,2040 +electricity,all-week,night,all-year,35.17870000000,R1,0,MUS$2010/PJ,2040 +electricity,all-week,night,all-year,35.17870000000,R2,0,MUS$2010/PJ,2040 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2040 gas,all-week,night,all-year,2.55000000000,R2,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,24.31870000000,R1,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,24.31870000000,R2,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,20.20080000000,R1,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,20.20080000000,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,38.00770000000,R1,1,MUS$2010/PJ,2040 -electricity,all-week,morning,all-year,38.00770000000,R2,1,MUS$2010/PJ,2040 +electricity,all-week,morning,all-year,35.17870000000,R1,1,MUS$2010/PJ,2040 +electricity,all-week,morning,all-year,35.17870000000,R2,1,MUS$2010/PJ,2040 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2040 gas,all-week,morning,all-year,2.55000000000,R2,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,23.08180000000,R1,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,23.08180000000,R2,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,20.20080000000,R1,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,20.20080000000,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,55.49860000000,R1,2,MUS$2010/PJ,2040 -electricity,all-week,afternoon,all-year,55.49860000000,R2,2,MUS$2010/PJ,2040 +electricity,all-week,afternoon,all-year,35.17870000000,R1,2,MUS$2010/PJ,2040 +electricity,all-week,afternoon,all-year,35.17870000000,R2,2,MUS$2010/PJ,2040 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2040 gas,all-week,afternoon,all-year,2.55000000000,R2,2,MUS$2010/PJ,2040 -heat,all-week,afternoon,all-year,24.31870000000,R1,2,MUS$2010/PJ,2040 -heat,all-week,afternoon,all-year,24.31870000000,R2,2,MUS$2010/PJ,2040 +heat,all-week,afternoon,all-year,20.20080000000,R1,2,MUS$2010/PJ,2040 +heat,all-week,afternoon,all-year,20.20080000000,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,38.00770000000,R1,3,MUS$2010/PJ,2040 -electricity,all-week,early-peak,all-year,38.00770000000,R2,3,MUS$2010/PJ,2040 +electricity,all-week,early-peak,all-year,35.17870000000,R1,3,MUS$2010/PJ,2040 +electricity,all-week,early-peak,all-year,35.17870000000,R2,3,MUS$2010/PJ,2040 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2040 gas,all-week,early-peak,all-year,2.55000000000,R2,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,23.08180000000,R1,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,23.08180000000,R2,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,20.20080000000,R1,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,20.20080000000,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,21.23570000000,R1,4,MUS$2010/PJ,2040 -electricity,all-week,late-peak,all-year,21.23570000000,R2,4,MUS$2010/PJ,2040 +electricity,all-week,late-peak,all-year,35.17870000000,R1,4,MUS$2010/PJ,2040 +electricity,all-week,late-peak,all-year,35.17870000000,R2,4,MUS$2010/PJ,2040 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2040 gas,all-week,late-peak,all-year,2.55000000000,R2,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,21.84500000000,R1,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,21.84500000000,R2,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,20.20080000000,R1,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,20.20080000000,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,29.26230000000,R1,5,MUS$2010/PJ,2040 -electricity,all-week,evening,all-year,29.26230000000,R2,5,MUS$2010/PJ,2040 +electricity,all-week,evening,all-year,35.17870000000,R1,5,MUS$2010/PJ,2040 +electricity,all-week,evening,all-year,35.17870000000,R2,5,MUS$2010/PJ,2040 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2040 gas,all-week,evening,all-year,2.55000000000,R2,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,22.46340000000,R1,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,22.46340000000,R2,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,20.20080000000,R1,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,20.20080000000,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,58.82280000000,R1,0,MUS$2010/PJ,2045 -electricity,all-week,night,all-year,58.82280000000,R2,0,MUS$2010/PJ,2045 +electricity,all-week,night,all-year,35.25180000000,R1,0,MUS$2010/PJ,2045 +electricity,all-week,night,all-year,35.25180000000,R2,0,MUS$2010/PJ,2045 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2045 gas,all-week,night,all-year,2.55000000000,R2,0,MUS$2010/PJ,2045 -heat,all-week,night,all-year,30.96160000000,R1,0,MUS$2010/PJ,2045 -heat,all-week,night,all-year,30.96160000000,R2,0,MUS$2010/PJ,2045 +heat,all-week,night,all-year,21.86010000000,R1,0,MUS$2010/PJ,2045 +heat,all-week,night,all-year,21.86010000000,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,39.21520000000,R1,1,MUS$2010/PJ,2045 -electricity,all-week,morning,all-year,39.21520000000,R2,1,MUS$2010/PJ,2045 +electricity,all-week,morning,all-year,35.25180000000,R1,1,MUS$2010/PJ,2045 +electricity,all-week,morning,all-year,35.25180000000,R2,1,MUS$2010/PJ,2045 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2045 gas,all-week,morning,all-year,2.55000000000,R2,1,MUS$2010/PJ,2045 -heat,all-week,morning,all-year,24.68200000000,R1,1,MUS$2010/PJ,2045 -heat,all-week,morning,all-year,24.68200000000,R2,1,MUS$2010/PJ,2045 +heat,all-week,morning,all-year,21.86010000000,R1,1,MUS$2010/PJ,2045 +heat,all-week,morning,all-year,21.86010000000,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,58.82280000000,R1,2,MUS$2010/PJ,2045 -electricity,all-week,afternoon,all-year,58.82280000000,R2,2,MUS$2010/PJ,2045 +electricity,all-week,afternoon,all-year,35.25180000000,R1,2,MUS$2010/PJ,2045 +electricity,all-week,afternoon,all-year,35.25180000000,R2,2,MUS$2010/PJ,2045 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2045 gas,all-week,afternoon,all-year,2.55000000000,R2,2,MUS$2010/PJ,2045 -heat,all-week,afternoon,all-year,30.96160000000,R1,2,MUS$2010/PJ,2045 -heat,all-week,afternoon,all-year,30.96160000000,R2,2,MUS$2010/PJ,2045 +heat,all-week,afternoon,all-year,21.86010000000,R1,2,MUS$2010/PJ,2045 +heat,all-week,afternoon,all-year,21.86010000000,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,39.21520000000,R1,3,MUS$2010/PJ,2045 -electricity,all-week,early-peak,all-year,39.21520000000,R2,3,MUS$2010/PJ,2045 +electricity,all-week,early-peak,all-year,35.25180000000,R1,3,MUS$2010/PJ,2045 +electricity,all-week,early-peak,all-year,35.25180000000,R2,3,MUS$2010/PJ,2045 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2045 gas,all-week,early-peak,all-year,2.55000000000,R2,3,MUS$2010/PJ,2045 -heat,all-week,early-peak,all-year,24.68200000000,R1,3,MUS$2010/PJ,2045 -heat,all-week,early-peak,all-year,24.68200000000,R2,3,MUS$2010/PJ,2045 +heat,all-week,early-peak,all-year,21.86010000000,R1,3,MUS$2010/PJ,2045 +heat,all-week,early-peak,all-year,21.86010000000,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,19.99980000000,R1,4,MUS$2010/PJ,2045 -electricity,all-week,late-peak,all-year,19.99980000000,R2,4,MUS$2010/PJ,2045 +electricity,all-week,late-peak,all-year,35.25180000000,R1,4,MUS$2010/PJ,2045 +electricity,all-week,late-peak,all-year,35.25180000000,R2,4,MUS$2010/PJ,2045 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2045 gas,all-week,late-peak,all-year,2.55000000000,R2,4,MUS$2010/PJ,2045 -heat,all-week,late-peak,all-year,18.48570000000,R1,4,MUS$2010/PJ,2045 -heat,all-week,late-peak,all-year,18.48570000000,R2,4,MUS$2010/PJ,2045 +heat,all-week,late-peak,all-year,21.86010000000,R1,4,MUS$2010/PJ,2045 +heat,all-week,late-peak,all-year,21.86010000000,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,29.41140000000,R1,5,MUS$2010/PJ,2045 -electricity,all-week,evening,all-year,29.41140000000,R2,5,MUS$2010/PJ,2045 +electricity,all-week,evening,all-year,35.25180000000,R1,5,MUS$2010/PJ,2045 +electricity,all-week,evening,all-year,35.25180000000,R2,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,2.55000000000,R2,5,MUS$2010/PJ,2045 -heat,all-week,evening,all-year,21.54220000000,R1,5,MUS$2010/PJ,2045 -heat,all-week,evening,all-year,21.54220000000,R2,5,MUS$2010/PJ,2045 +heat,all-week,evening,all-year,21.86010000000,R1,5,MUS$2010/PJ,2045 +heat,all-week,evening,all-year,21.86010000000,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,58.37770000000,R1,0,MUS$2010/PJ,2050 -electricity,all-week,night,all-year,58.37770000000,R2,0,MUS$2010/PJ,2050 +electricity,all-week,night,all-year,35.31290000000,R1,0,MUS$2010/PJ,2050 +electricity,all-week,night,all-year,35.31290000000,R2,0,MUS$2010/PJ,2050 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050 gas,all-week,night,all-year,2.55000000000,R2,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,32.89610000000,R1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,32.89610000000,R2,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,23.73440000000,R1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,23.73440000000,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,38.91840000000,R1,1,MUS$2010/PJ,2050 -electricity,all-week,morning,all-year,38.91840000000,R2,1,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,35.31290000000,R1,1,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,35.31290000000,R2,1,MUS$2010/PJ,2050 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050 gas,all-week,morning,all-year,2.55000000000,R2,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,25.19600000000,R1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,25.19600000000,R2,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,23.73440000000,R1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,23.73440000000,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,58.37770000000,R1,2,MUS$2010/PJ,2050 -electricity,all-week,afternoon,all-year,58.37770000000,R2,2,MUS$2010/PJ,2050 +electricity,all-week,afternoon,all-year,35.31290000000,R1,2,MUS$2010/PJ,2050 +electricity,all-week,afternoon,all-year,35.31290000000,R2,2,MUS$2010/PJ,2050 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050 gas,all-week,afternoon,all-year,2.55000000000,R2,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,32.89610000000,R1,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,32.89610000000,R2,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,23.73440000000,R1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,23.73440000000,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,38.91840000000,R1,3,MUS$2010/PJ,2050 -electricity,all-week,early-peak,all-year,38.91840000000,R2,3,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,35.31290000000,R1,3,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,35.31290000000,R2,3,MUS$2010/PJ,2050 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050 gas,all-week,early-peak,all-year,2.55000000000,R2,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,25.19600000000,R1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,25.19600000000,R2,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,23.73440000000,R1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,23.73440000000,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,19.99980000000,R1,4,MUS$2010/PJ,2050 -electricity,all-week,late-peak,all-year,19.99980000000,R2,4,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,35.31290000000,R1,4,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,35.31290000000,R2,4,MUS$2010/PJ,2050 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050 gas,all-week,late-peak,all-year,2.55000000000,R2,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,17.64400000000,R1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,17.64400000000,R2,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,23.73440000000,R1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,23.73440000000,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,29.18880000000,R1,5,MUS$2010/PJ,2050 -electricity,all-week,evening,all-year,29.18880000000,R2,5,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,35.31290000000,R1,5,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,35.31290000000,R2,5,MUS$2010/PJ,2050 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050 gas,all-week,evening,all-year,2.55000000000,R2,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,21.34590000000,R1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,21.34590000000,R2,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,23.73440000000,R1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,23.73440000000,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 f29871b3e..add429e03 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 @@ -3,57 +3,66 @@ A1,10.00000000000,R1,2020,R1,residential,gas_stove,newcapa,2020 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,19.00000000000,R1,2025,R1,residential,electric_stove,newcapa,2025 A1,5.00000000000,R1,2020,R1,residential,gas_stove,newcapa,2025 -A1,19.00000000000,R1,2025,R1,residential,gas_stove,newcapa,2025 A1,5.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2025 -A1,19.00000000000,R1,2025,R1,residential,gasboiler,newcapa,2025 +A1,19.00000000000,R1,2025,R1,residential,heatpump,newcapa,2025 A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2025 +A1,6.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2025 +A1,20.00000000000,R1,2025,R1,power,windturbine,newcapa,2025 A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2025 -A1,46.86670000000,R1,2025,R1,gas,gassupply1,newcapa,2025 -A1,19.00000000000,R1,2025,R1,residential,gas_stove,newcapa,2030 -A1,11.00000000000,R1,2030,R1,residential,gas_stove,newcapa,2030 -A1,19.00000000000,R1,2025,R1,residential,gasboiler,newcapa,2030 +A1,9.57890000000,R1,2025,R1,gas,gassupply1,newcapa,2025 +A1,19.00000000000,R1,2025,R1,residential,electric_stove,newcapa,2030 +A1,11.00000000000,R1,2030,R1,residential,electric_stove,newcapa,2030 +A1,19.00000000000,R1,2025,R1,residential,heatpump,newcapa,2030 A1,11.00000000000,R1,2030,R1,residential,heatpump,newcapa,2030 -A1,11.00000000000,R1,2030,R1,power,windturbine,newcapa,2030 +A1,6.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2030 +A1,20.00000000000,R1,2025,R1,power,windturbine,newcapa,2030 +A1,26.00000000000,R1,2030,R1,power,windturbine,newcapa,2030 A1,7.50000000000,R1,2020,R1,gas,gassupply1,newcapa,2030 -A1,46.86670000000,R1,2025,R1,gas,gassupply1,newcapa,2030 -A1,8.78890000000,R1,2030,R1,gas,gassupply1,newcapa,2030 +A1,9.57890000000,R1,2025,R1,gas,gassupply1,newcapa,2030 +A1,11.00000000000,R1,2030,R1,residential,electric_stove,newcapa,2035 A1,25.00000000000,R1,2035,R1,residential,electric_stove,newcapa,2035 -A1,11.00000000000,R1,2030,R1,residential,gas_stove,newcapa,2035 A1,11.00000000000,R1,2030,R1,residential,heatpump,newcapa,2035 A1,25.00000000000,R1,2035,R1,residential,heatpump,newcapa,2035 -A1,11.00000000000,R1,2030,R1,power,windturbine,newcapa,2035 -A1,49.00000000000,R1,2035,R1,power,windturbine,newcapa,2035 -A1,46.86670000000,R1,2025,R1,gas,gassupply1,newcapa,2035 -A1,8.78890000000,R1,2030,R1,gas,gassupply1,newcapa,2035 +A1,6.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2035 +A1,20.00000000000,R1,2025,R1,power,windturbine,newcapa,2035 +A1,26.00000000000,R1,2030,R1,power,windturbine,newcapa,2035 +A1,12.00000000000,R1,2035,R1,power,windturbine,newcapa,2035 +A1,9.57890000000,R1,2025,R1,gas,gassupply1,newcapa,2035 +A1,0.44110000000,R1,2035,R1,gas,gassupply1,newcapa,2035 A1,25.00000000000,R1,2035,R1,residential,electric_stove,newcapa,2040 A1,17.00000000000,R1,2040,R1,residential,electric_stove,newcapa,2040 A1,25.00000000000,R1,2035,R1,residential,heatpump,newcapa,2040 A1,17.00000000000,R1,2040,R1,residential,heatpump,newcapa,2040 -A1,11.00000000000,R1,2030,R1,power,windturbine,newcapa,2040 -A1,49.00000000000,R1,2035,R1,power,windturbine,newcapa,2040 -A1,23.00000000000,R1,2040,R1,power,windturbine,newcapa,2040 -A1,46.86670000000,R1,2025,R1,gas,gassupply1,newcapa,2040 -A1,8.78890000000,R1,2030,R1,gas,gassupply1,newcapa,2040 +A1,6.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2040 +A1,20.00000000000,R1,2025,R1,power,windturbine,newcapa,2040 +A1,26.00000000000,R1,2030,R1,power,windturbine,newcapa,2040 +A1,12.00000000000,R1,2035,R1,power,windturbine,newcapa,2040 +A1,12.00000000000,R1,2040,R1,power,windturbine,newcapa,2040 +A1,9.57890000000,R1,2025,R1,gas,gassupply1,newcapa,2040 +A1,0.44110000000,R1,2035,R1,gas,gassupply1,newcapa,2040 A1,17.00000000000,R1,2040,R1,residential,electric_stove,newcapa,2045 A1,31.00000000000,R1,2045,R1,residential,electric_stove,newcapa,2045 A1,17.00000000000,R1,2040,R1,residential,heatpump,newcapa,2045 A1,31.00000000000,R1,2045,R1,residential,heatpump,newcapa,2045 -A1,11.00000000000,R1,2030,R1,power,windturbine,newcapa,2045 -A1,49.00000000000,R1,2035,R1,power,windturbine,newcapa,2045 -A1,23.00000000000,R1,2040,R1,power,windturbine,newcapa,2045 +A1,6.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2045 +A1,20.00000000000,R1,2025,R1,power,windturbine,newcapa,2045 +A1,26.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,12.00000000000,R1,2045,R1,power,windturbine,newcapa,2045 -A1,46.86670000000,R1,2025,R1,gas,gassupply1,newcapa,2045 -A1,8.78890000000,R1,2030,R1,gas,gassupply1,newcapa,2045 +A1,9.57890000000,R1,2025,R1,gas,gassupply1,newcapa,2045 +A1,0.44110000000,R1,2035,R1,gas,gassupply1,newcapa,2045 A1,31.00000000000,R1,2045,R1,residential,electric_stove,newcapa,2050 A1,23.00000000000,R1,2050,R1,residential,electric_stove,newcapa,2050 A1,31.00000000000,R1,2045,R1,residential,heatpump,newcapa,2050 A1,23.00000000000,R1,2050,R1,residential,heatpump,newcapa,2050 -A1,3.00000000000,R1,2050,R1,power,gasCCGT,newcapa,2050 -A1,11.00000000000,R1,2030,R1,power,windturbine,newcapa,2050 -A1,49.00000000000,R1,2035,R1,power,windturbine,newcapa,2050 -A1,23.00000000000,R1,2040,R1,power,windturbine,newcapa,2050 +A1,6.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2050 +A1,26.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,12.00000000000,R1,2045,R1,power,windturbine,newcapa,2050 -A1,5.00000000000,R1,2050,R1,power,windturbine,newcapa,2050 -A1,46.86670000000,R1,2025,R1,gas,gassupply1,newcapa,2050 -A1,8.78890000000,R1,2030,R1,gas,gassupply1,newcapa,2050 +A1,32.00000000000,R1,2050,R1,power,windturbine,newcapa,2050 +A1,9.57890000000,R1,2025,R1,gas,gassupply1,newcapa,2050 +A1,0.44110000000,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 7ae137db7..b000d0a0c 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 @@ -29,183 +29,183 @@ 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 cook,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020 -electricity,all-week,night,all-year,29.60050000000,R1,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,18.45130000000,R1,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,12.58300000000,R1,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,10.36600000000,R1,0,MUS$2010/PJ,2025 CO2f,all-week,night,all-year,0.12010000000,R1,0,MUS$2010/kt,2025 -cook,all-week,night,all-year,10.81680000000,R1,0,MUS$2010/PJ,2025 -electricity,all-week,morning,all-year,20.22790000000,R1,1,MUS$2010/PJ,2025 +cook,all-week,night,all-year,9.99810000000,R1,0,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,18.45130000000,R1,1,MUS$2010/PJ,2025 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,11.96460000000,R1,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,10.36600000000,R1,1,MUS$2010/PJ,2025 CO2f,all-week,morning,all-year,0.12010000000,R1,1,MUS$2010/kt,2025 -cook,all-week,morning,all-year,10.19830000000,R1,1,MUS$2010/PJ,2025 -electricity,all-week,afternoon,all-year,29.60050000000,R1,2,MUS$2010/PJ,2025 +cook,all-week,morning,all-year,9.99810000000,R1,1,MUS$2010/PJ,2025 +electricity,all-week,afternoon,all-year,18.45130000000,R1,2,MUS$2010/PJ,2025 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2025 -heat,all-week,afternoon,all-year,12.58300000000,R1,2,MUS$2010/PJ,2025 +heat,all-week,afternoon,all-year,10.36600000000,R1,2,MUS$2010/PJ,2025 CO2f,all-week,afternoon,all-year,0.12010000000,R1,2,MUS$2010/kt,2025 -cook,all-week,afternoon,all-year,10.81680000000,R1,2,MUS$2010/PJ,2025 -electricity,all-week,early-peak,all-year,20.22790000000,R1,3,MUS$2010/PJ,2025 +cook,all-week,afternoon,all-year,9.99810000000,R1,2,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,18.45130000000,R1,3,MUS$2010/PJ,2025 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,11.96460000000,R1,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,10.36600000000,R1,3,MUS$2010/PJ,2025 CO2f,all-week,early-peak,all-year,0.12010000000,R1,3,MUS$2010/kt,2025 -cook,all-week,early-peak,all-year,10.19830000000,R1,3,MUS$2010/PJ,2025 -electricity,all-week,late-peak,all-year,11.04390000000,R1,4,MUS$2010/PJ,2025 +cook,all-week,early-peak,all-year,9.99810000000,R1,3,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,18.45130000000,R1,4,MUS$2010/PJ,2025 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,11.34610000000,R1,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,10.36600000000,R1,4,MUS$2010/PJ,2025 CO2f,all-week,late-peak,all-year,0.12010000000,R1,4,MUS$2010/kt,2025 -cook,all-week,late-peak,all-year,9.57990000000,R1,4,MUS$2010/PJ,2025 -electricity,all-week,evening,all-year,15.54150000000,R1,5,MUS$2010/PJ,2025 +cook,all-week,late-peak,all-year,9.99810000000,R1,4,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,18.45130000000,R1,5,MUS$2010/PJ,2025 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,11.65540000000,R1,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,10.36600000000,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,9.88910000000,R1,5,MUS$2010/PJ,2025 -electricity,all-week,night,all-year,29.99960000000,R1,0,MUS$2010/PJ,2030 +cook,all-week,evening,all-year,9.99810000000,R1,5,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,19.17850000000,R1,0,MUS$2010/PJ,2030 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,15.46990000000,R1,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,10.26880000000,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,12.66320000000,R1,0,MUS$2010/PJ,2030 -electricity,all-week,morning,all-year,19.99980000000,R1,1,MUS$2010/PJ,2030 +cook,all-week,night,all-year,10.26880000000,R1,0,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,19.17850000000,R1,1,MUS$2010/PJ,2030 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,13.08250000000,R1,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,10.26880000000,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,12.04480000000,R1,1,MUS$2010/PJ,2030 -electricity,all-week,afternoon,all-year,29.99960000000,R1,2,MUS$2010/PJ,2030 +cook,all-week,morning,all-year,10.26880000000,R1,1,MUS$2010/PJ,2030 +electricity,all-week,afternoon,all-year,19.17850000000,R1,2,MUS$2010/PJ,2030 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,15.46990000000,R1,2,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,10.26880000000,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,12.66320000000,R1,2,MUS$2010/PJ,2030 -electricity,all-week,early-peak,all-year,19.99980000000,R1,3,MUS$2010/PJ,2030 +cook,all-week,afternoon,all-year,10.26880000000,R1,2,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,19.17850000000,R1,3,MUS$2010/PJ,2030 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,13.08250000000,R1,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,10.26880000000,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,12.04480000000,R1,3,MUS$2010/PJ,2030 -electricity,all-week,late-peak,all-year,9.99990000000,R1,4,MUS$2010/PJ,2030 +cook,all-week,early-peak,all-year,10.26880000000,R1,3,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,19.17850000000,R1,4,MUS$2010/PJ,2030 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,10.69510000000,R1,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,10.26880000000,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,11.42630000000,R1,4,MUS$2010/PJ,2030 -electricity,all-week,evening,all-year,14.99980000000,R1,5,MUS$2010/PJ,2030 +cook,all-week,late-peak,all-year,10.26880000000,R1,4,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,19.17850000000,R1,5,MUS$2010/PJ,2030 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,11.88880000000,R1,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,10.26880000000,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,11.73560000000,R1,5,MUS$2010/PJ,2030 -electricity,all-week,night,all-year,29.50780000000,R1,0,MUS$2010/PJ,2035 +cook,all-week,evening,all-year,10.26880000000,R1,5,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,19.98000000000,R1,0,MUS$2010/PJ,2035 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,16.13210000000,R1,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,10.58940000000,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,15.95650000000,R1,0,MUS$2010/PJ,2035 -electricity,all-week,morning,all-year,19.67190000000,R1,1,MUS$2010/PJ,2035 +cook,all-week,night,all-year,10.58940000000,R1,0,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,19.98000000000,R1,1,MUS$2010/PJ,2035 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,10.75480000000,R1,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,10.58940000000,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,12.03320000000,R1,1,MUS$2010/PJ,2035 -electricity,all-week,afternoon,all-year,29.50780000000,R1,2,MUS$2010/PJ,2035 +cook,all-week,morning,all-year,10.58940000000,R1,1,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,19.98000000000,R1,2,MUS$2010/PJ,2035 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,16.13210000000,R1,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,10.58940000000,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,15.95650000000,R1,2,MUS$2010/PJ,2035 -electricity,all-week,early-peak,all-year,19.67190000000,R1,3,MUS$2010/PJ,2035 +cook,all-week,afternoon,all-year,10.58940000000,R1,2,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,19.98000000000,R1,3,MUS$2010/PJ,2035 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,10.75480000000,R1,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,10.58940000000,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,12.03320000000,R1,3,MUS$2010/PJ,2035 -electricity,all-week,late-peak,all-year,9.99990000000,R1,4,MUS$2010/PJ,2035 +cook,all-week,early-peak,all-year,10.58940000000,R1,3,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,19.98000000000,R1,4,MUS$2010/PJ,2035 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,5.44300000000,R1,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,10.58940000000,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,8.15550000000,R1,4,MUS$2010/PJ,2035 -electricity,all-week,evening,all-year,14.75390000000,R1,5,MUS$2010/PJ,2035 +cook,all-week,late-peak,all-year,10.58940000000,R1,4,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,19.98000000000,R1,5,MUS$2010/PJ,2035 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,8.06610000000,R1,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,10.58940000000,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,10.07160000000,R1,5,MUS$2010/PJ,2035 -electricity,all-week,night,all-year,29.64250000000,R1,0,MUS$2010/PJ,2040 +cook,all-week,evening,all-year,10.58940000000,R1,5,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,20.55170000000,R1,0,MUS$2010/PJ,2040 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,16.13210000000,R1,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,10.81810000000,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,16.13210000000,R1,0,MUS$2010/PJ,2040 -electricity,all-week,morning,all-year,19.76170000000,R1,1,MUS$2010/PJ,2040 +cook,all-week,night,all-year,10.81810000000,R1,0,MUS$2010/PJ,2040 +electricity,all-week,morning,all-year,20.55170000000,R1,1,MUS$2010/PJ,2040 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,10.75480000000,R1,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,10.81810000000,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,10.75480000000,R1,1,MUS$2010/PJ,2040 -electricity,all-week,afternoon,all-year,29.64250000000,R1,2,MUS$2010/PJ,2040 +cook,all-week,morning,all-year,10.81810000000,R1,1,MUS$2010/PJ,2040 +electricity,all-week,afternoon,all-year,20.55170000000,R1,2,MUS$2010/PJ,2040 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2040 -heat,all-week,afternoon,all-year,16.13210000000,R1,2,MUS$2010/PJ,2040 +heat,all-week,afternoon,all-year,10.81810000000,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,16.13210000000,R1,2,MUS$2010/PJ,2040 -electricity,all-week,early-peak,all-year,19.76170000000,R1,3,MUS$2010/PJ,2040 +cook,all-week,afternoon,all-year,10.81810000000,R1,2,MUS$2010/PJ,2040 +electricity,all-week,early-peak,all-year,20.55170000000,R1,3,MUS$2010/PJ,2040 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,10.75480000000,R1,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,10.81810000000,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,10.75480000000,R1,3,MUS$2010/PJ,2040 -electricity,all-week,late-peak,all-year,9.99990000000,R1,4,MUS$2010/PJ,2040 +cook,all-week,early-peak,all-year,10.81810000000,R1,3,MUS$2010/PJ,2040 +electricity,all-week,late-peak,all-year,20.55170000000,R1,4,MUS$2010/PJ,2040 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,5.44300000000,R1,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,10.81810000000,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.44300000000,R1,4,MUS$2010/PJ,2040 -electricity,all-week,evening,all-year,14.82120000000,R1,5,MUS$2010/PJ,2040 +cook,all-week,late-peak,all-year,10.81810000000,R1,4,MUS$2010/PJ,2040 +electricity,all-week,evening,all-year,20.55170000000,R1,5,MUS$2010/PJ,2040 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,8.06610000000,R1,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,10.81810000000,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,8.06610000000,R1,5,MUS$2010/PJ,2040 -electricity,all-week,night,all-year,29.68710000000,R1,0,MUS$2010/PJ,2045 +cook,all-week,evening,all-year,10.81810000000,R1,5,MUS$2010/PJ,2040 +electricity,all-week,night,all-year,21.28220000000,R1,0,MUS$2010/PJ,2045 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2045 -heat,all-week,night,all-year,16.18600000000,R1,0,MUS$2010/PJ,2045 +heat,all-week,night,all-year,11.11030000000,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,16.18600000000,R1,0,MUS$2010/PJ,2045 -electricity,all-week,morning,all-year,19.79140000000,R1,1,MUS$2010/PJ,2045 +cook,all-week,night,all-year,11.11030000000,R1,0,MUS$2010/PJ,2045 +electricity,all-week,morning,all-year,21.28220000000,R1,1,MUS$2010/PJ,2045 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2045 -heat,all-week,morning,all-year,10.79070000000,R1,1,MUS$2010/PJ,2045 +heat,all-week,morning,all-year,11.11030000000,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,10.79070000000,R1,1,MUS$2010/PJ,2045 -electricity,all-week,afternoon,all-year,29.68710000000,R1,2,MUS$2010/PJ,2045 +cook,all-week,morning,all-year,11.11030000000,R1,1,MUS$2010/PJ,2045 +electricity,all-week,afternoon,all-year,21.28220000000,R1,2,MUS$2010/PJ,2045 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2045 -heat,all-week,afternoon,all-year,16.18600000000,R1,2,MUS$2010/PJ,2045 +heat,all-week,afternoon,all-year,11.11030000000,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,16.18600000000,R1,2,MUS$2010/PJ,2045 -electricity,all-week,early-peak,all-year,19.79140000000,R1,3,MUS$2010/PJ,2045 +cook,all-week,afternoon,all-year,11.11030000000,R1,2,MUS$2010/PJ,2045 +electricity,all-week,early-peak,all-year,21.28220000000,R1,3,MUS$2010/PJ,2045 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2045 -heat,all-week,early-peak,all-year,10.79070000000,R1,3,MUS$2010/PJ,2045 +heat,all-week,early-peak,all-year,11.11030000000,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,10.79070000000,R1,3,MUS$2010/PJ,2045 -electricity,all-week,late-peak,all-year,9.99990000000,R1,4,MUS$2010/PJ,2045 +cook,all-week,early-peak,all-year,11.11030000000,R1,3,MUS$2010/PJ,2045 +electricity,all-week,late-peak,all-year,21.28220000000,R1,4,MUS$2010/PJ,2045 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2045 -heat,all-week,late-peak,all-year,5.44300000000,R1,4,MUS$2010/PJ,2045 +heat,all-week,late-peak,all-year,11.11030000000,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.44300000000,R1,4,MUS$2010/PJ,2045 -electricity,all-week,evening,all-year,14.84360000000,R1,5,MUS$2010/PJ,2045 +cook,all-week,late-peak,all-year,11.11030000000,R1,4,MUS$2010/PJ,2045 +electricity,all-week,evening,all-year,21.28220000000,R1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2045 -heat,all-week,evening,all-year,8.09300000000,R1,5,MUS$2010/PJ,2045 +heat,all-week,evening,all-year,11.11030000000,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,8.09300000000,R1,5,MUS$2010/PJ,2045 -electricity,all-week,night,all-year,31.08270000000,R1,0,MUS$2010/PJ,2050 +cook,all-week,evening,all-year,11.11030000000,R1,5,MUS$2010/PJ,2045 +electricity,all-week,night,all-year,21.84970000000,R1,0,MUS$2010/PJ,2050 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,16.76210000000,R1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,11.33730000000,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,16.76210000000,R1,0,MUS$2010/PJ,2050 -electricity,all-week,morning,all-year,21.65230000000,R1,1,MUS$2010/PJ,2050 +cook,all-week,night,all-year,11.33730000000,R1,0,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,21.84970000000,R1,1,MUS$2010/PJ,2050 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,11.54690000000,R1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,11.33730000000,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,11.54690000000,R1,1,MUS$2010/PJ,2050 -electricity,all-week,afternoon,all-year,31.08270000000,R1,2,MUS$2010/PJ,2050 +cook,all-week,morning,all-year,11.33730000000,R1,1,MUS$2010/PJ,2050 +electricity,all-week,afternoon,all-year,21.84970000000,R1,2,MUS$2010/PJ,2050 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,16.76210000000,R1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,11.33730000000,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,16.76210000000,R1,2,MUS$2010/PJ,2050 -electricity,all-week,early-peak,all-year,21.65230000000,R1,3,MUS$2010/PJ,2050 +cook,all-week,afternoon,all-year,11.33730000000,R1,2,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,21.84970000000,R1,3,MUS$2010/PJ,2050 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,11.54690000000,R1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,11.33730000000,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,11.54690000000,R1,3,MUS$2010/PJ,2050 -electricity,all-week,late-peak,all-year,12.33240000000,R1,4,MUS$2010/PJ,2050 +cook,all-week,early-peak,all-year,11.33730000000,R1,3,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,21.84970000000,R1,4,MUS$2010/PJ,2050 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,6.37600000000,R1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,11.33730000000,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.37600000000,R1,4,MUS$2010/PJ,2050 -electricity,all-week,evening,all-year,16.93710000000,R1,5,MUS$2010/PJ,2050 +cook,all-week,late-peak,all-year,11.33730000000,R1,4,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,21.84970000000,R1,5,MUS$2010/PJ,2050 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,8.93940000000,R1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,11.33730000000,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,8.93940000000,R1,5,MUS$2010/PJ,2050 +cook,all-week,evening,all-year,11.33730000000,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 ce5572414..ea846bfd2 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 @@ -7,16 +7,16 @@ A1,19.00000000000,R1,2025,R1,residential,heatpump,newcapa,2025 A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2025 A1,16.00000000000,R1,2025,R1,power,windturbine,newcapa,2025 A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2025 -A1,11.00000000000,R1,2030,R1,residential,gasboiler,newcapa,2030 A1,19.00000000000,R1,2025,R1,residential,heatpump,newcapa,2030 -A1,1.00000000000,R1,2030,R1,power,gasCCGT,newcapa,2030 +A1,11.00000000000,R1,2030,R1,residential,heatpump,newcapa,2030 +A1,6.00000000000,R1,2030,R1,power,gasCCGT,newcapa,2030 A1,16.00000000000,R1,2025,R1,power,windturbine,newcapa,2030 A1,7.50000000000,R1,2020,R1,gas,gassupply1,newcapa,2030 -A1,8.34780000000,R1,2030,R1,gas,gassupply1,newcapa,2030 -A1,11.00000000000,R1,2030,R1,residential,gasboiler,newcapa,2035 +A1,2.52000000000,R1,2030,R1,gas,gassupply1,newcapa,2030 +A1,11.00000000000,R1,2030,R1,residential,heatpump,newcapa,2035 A1,25.00000000000,R1,2035,R1,residential,heatpump,newcapa,2035 -A1,1.00000000000,R1,2030,R1,power,gasCCGT,newcapa,2035 +A1,6.00000000000,R1,2030,R1,power,gasCCGT,newcapa,2035 A1,16.00000000000,R1,2025,R1,power,windturbine,newcapa,2035 A1,6.00000000000,R1,2035,R1,power,windturbine,newcapa,2035 -A1,8.34780000000,R1,2030,R1,gas,gassupply1,newcapa,2035 +A1,2.52000000000,R1,2030,R1,gas,gassupply1,newcapa,2035 A1,7.50000000000,R1,2035,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 2b3f5f2b1..ca616acb3 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 @@ -23,69 +23,75 @@ 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,28.45650000000,R1,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,18.15070000000,R1,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,15.82560000000,R1,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,11.03660000000,R1,0,MUS$2010/PJ,2025 CO2f,all-week,night,all-year,0.15000000000,R1,0,MUS$2010/kt,2025 -electricity,all-week,morning,all-year,19.71110000000,R1,1,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,18.15070000000,R1,1,MUS$2010/PJ,2025 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,11.78500000000,R1,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,11.03660000000,R1,1,MUS$2010/PJ,2025 CO2f,all-week,morning,all-year,0.15000000000,R1,1,MUS$2010/kt,2025 -electricity,all-week,afternoon,all-year,28.45650000000,R1,2,MUS$2010/PJ,2025 +electricity,all-week,afternoon,all-year,18.15070000000,R1,2,MUS$2010/PJ,2025 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2025 -heat,all-week,afternoon,all-year,15.82560000000,R1,2,MUS$2010/PJ,2025 +heat,all-week,afternoon,all-year,11.03660000000,R1,2,MUS$2010/PJ,2025 CO2f,all-week,afternoon,all-year,0.15000000000,R1,2,MUS$2010/kt,2025 -electricity,all-week,early-peak,all-year,19.71110000000,R1,3,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,18.15070000000,R1,3,MUS$2010/PJ,2025 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,11.78500000000,R1,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,11.03660000000,R1,3,MUS$2010/PJ,2025 CO2f,all-week,early-peak,all-year,0.15000000000,R1,3,MUS$2010/kt,2025 -electricity,all-week,late-peak,all-year,11.32510000000,R1,4,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,18.15070000000,R1,4,MUS$2010/PJ,2025 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,7.85820000000,R1,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,11.03660000000,R1,4,MUS$2010/PJ,2025 CO2f,all-week,late-peak,all-year,0.15000000000,R1,4,MUS$2010/kt,2025 -electricity,all-week,evening,all-year,15.33840000000,R1,5,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,18.15070000000,R1,5,MUS$2010/PJ,2025 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,9.76470000000,R1,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,11.03660000000,R1,5,MUS$2010/PJ,2025 CO2f,all-week,evening,all-year,0.15000000000,R1,5,MUS$2010/kt,2025 -electricity,all-week,night,all-year,26.76130000000,R1,0,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,18.86150000000,R1,0,MUS$2010/PJ,2030 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,11.28610000000,R1,0,MUS$2010/PJ,2030 -electricity,all-week,morning,all-year,18.01590000000,R1,1,MUS$2010/PJ,2030 +heat,all-week,night,all-year,10.14200000000,R1,0,MUS$2010/PJ,2030 +CO2f,all-week,night,all-year,0.12000000000,R1,0,MUS$2010/kt,2030 +electricity,all-week,morning,all-year,18.86150000000,R1,1,MUS$2010/PJ,2030 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,7.92990000000,R1,1,MUS$2010/PJ,2030 -electricity,all-week,afternoon,all-year,26.76130000000,R1,2,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,10.14200000000,R1,1,MUS$2010/PJ,2030 +CO2f,all-week,morning,all-year,0.12000000000,R1,1,MUS$2010/kt,2030 +electricity,all-week,afternoon,all-year,18.86150000000,R1,2,MUS$2010/PJ,2030 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,11.28610000000,R1,2,MUS$2010/PJ,2030 -electricity,all-week,early-peak,all-year,18.01590000000,R1,3,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,10.14200000000,R1,2,MUS$2010/PJ,2030 +CO2f,all-week,afternoon,all-year,0.12000000000,R1,2,MUS$2010/kt,2030 +electricity,all-week,early-peak,all-year,18.86150000000,R1,3,MUS$2010/PJ,2030 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,7.92990000000,R1,3,MUS$2010/PJ,2030 -electricity,all-week,late-peak,all-year,9.62980000000,R1,4,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,10.14200000000,R1,3,MUS$2010/PJ,2030 +CO2f,all-week,early-peak,all-year,0.12000000000,R1,3,MUS$2010/kt,2030 +electricity,all-week,late-peak,all-year,18.86150000000,R1,4,MUS$2010/PJ,2030 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,4.66480000000,R1,4,MUS$2010/PJ,2030 -electricity,all-week,evening,all-year,13.64320000000,R1,5,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,10.14200000000,R1,4,MUS$2010/PJ,2030 +CO2f,all-week,late-peak,all-year,0.12000000000,R1,4,MUS$2010/kt,2030 +electricity,all-week,evening,all-year,18.86150000000,R1,5,MUS$2010/PJ,2030 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,6.25190000000,R1,5,MUS$2010/PJ,2030 -electricity,all-week,night,all-year,30.76670000000,R1,0,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,10.14200000000,R1,5,MUS$2010/PJ,2030 +CO2f,all-week,evening,all-year,0.12000000000,R1,5,MUS$2010/kt,2030 +electricity,all-week,night,all-year,21.14600000000,R1,0,MUS$2010/PJ,2035 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,20.53680000000,R1,0,MUS$2010/PJ,2035 -CO2f,all-week,night,all-year,0.38000000000,R1,0,MUS$2010/kt,2035 -electricity,all-week,morning,all-year,21.72020000000,R1,1,MUS$2010/PJ,2035 +heat,all-week,night,all-year,11.05580000000,R1,0,MUS$2010/PJ,2035 +CO2f,all-week,night,all-year,0.19000000000,R1,0,MUS$2010/kt,2035 +electricity,all-week,morning,all-year,21.14600000000,R1,1,MUS$2010/PJ,2035 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,16.83290000000,R1,1,MUS$2010/PJ,2035 -CO2f,all-week,morning,all-year,0.38000000000,R1,1,MUS$2010/kt,2035 -electricity,all-week,afternoon,all-year,30.76670000000,R1,2,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,11.05580000000,R1,1,MUS$2010/PJ,2035 +CO2f,all-week,morning,all-year,0.19000000000,R1,1,MUS$2010/kt,2035 +electricity,all-week,afternoon,all-year,21.14600000000,R1,2,MUS$2010/PJ,2035 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,20.53680000000,R1,2,MUS$2010/PJ,2035 -CO2f,all-week,afternoon,all-year,0.38000000000,R1,2,MUS$2010/kt,2035 -electricity,all-week,early-peak,all-year,21.72020000000,R1,3,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,11.05580000000,R1,2,MUS$2010/PJ,2035 +CO2f,all-week,afternoon,all-year,0.19000000000,R1,2,MUS$2010/kt,2035 +electricity,all-week,early-peak,all-year,21.14600000000,R1,3,MUS$2010/PJ,2035 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,16.83290000000,R1,3,MUS$2010/PJ,2035 -CO2f,all-week,early-peak,all-year,0.38000000000,R1,3,MUS$2010/kt,2035 -electricity,all-week,late-peak,all-year,12.95350000000,R1,4,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,11.05580000000,R1,3,MUS$2010/PJ,2035 +CO2f,all-week,early-peak,all-year,0.19000000000,R1,3,MUS$2010/kt,2035 +electricity,all-week,late-peak,all-year,21.14600000000,R1,4,MUS$2010/PJ,2035 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,13.20660000000,R1,4,MUS$2010/PJ,2035 -CO2f,all-week,late-peak,all-year,0.38000000000,R1,4,MUS$2010/kt,2035 -electricity,all-week,evening,all-year,17.19690000000,R1,5,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,11.05580000000,R1,4,MUS$2010/PJ,2035 +CO2f,all-week,late-peak,all-year,0.19000000000,R1,4,MUS$2010/kt,2035 +electricity,all-week,evening,all-year,21.14600000000,R1,5,MUS$2010/PJ,2035 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,14.98090000000,R1,5,MUS$2010/PJ,2035 -CO2f,all-week,evening,all-year,0.38000000000,R1,5,MUS$2010/kt,2035 +heat,all-week,evening,all-year,11.05580000000,R1,5,MUS$2010/PJ,2035 +CO2f,all-week,evening,all-year,0.19000000000,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 56de82ab7..190708970 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 @@ -41,51 +41,51 @@ 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.42220000000,0,MUS$2010/PJ,2030 -gas,all-week,night,all-year,R1,0.79580000000,0,MUS$2010/PJ,2030 +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 heat,all-week,night,all-year,R1,1.66670000000,0,MUS$2010/PJ,2030 -CO2f,all-week,night,all-year,R1,44.31690000000,0,MUS$2010/kt,2030 -electricity,all-week,morning,all-year,R1,0.63330000000,1,MUS$2010/PJ,2030 -gas,all-week,morning,all-year,R1,1.19370000000,1,MUS$2010/PJ,2030 +CO2f,all-week,night,all-year,R1,27.96710000000,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 heat,all-week,morning,all-year,R1,2.50000000000,1,MUS$2010/PJ,2030 -CO2f,all-week,morning,all-year,R1,66.47530000000,1,MUS$2010/kt,2030 -electricity,all-week,afternoon,all-year,R1,0.42220000000,2,MUS$2010/PJ,2030 -gas,all-week,afternoon,all-year,R1,0.79580000000,2,MUS$2010/PJ,2030 +CO2f,all-week,morning,all-year,R1,41.95070000000,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 heat,all-week,afternoon,all-year,R1,1.66670000000,2,MUS$2010/PJ,2030 -CO2f,all-week,afternoon,all-year,R1,44.31690000000,2,MUS$2010/kt,2030 -electricity,all-week,early-peak,all-year,R1,0.63330000000,3,MUS$2010/PJ,2030 -gas,all-week,early-peak,all-year,R1,1.19370000000,3,MUS$2010/PJ,2030 +CO2f,all-week,afternoon,all-year,R1,27.96710000000,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 heat,all-week,early-peak,all-year,R1,2.50000000000,3,MUS$2010/PJ,2030 -CO2f,all-week,early-peak,all-year,R1,66.47530000000,3,MUS$2010/kt,2030 -electricity,all-week,late-peak,all-year,R1,1.21670000000,4,MUS$2010/PJ,2030 -gas,all-week,late-peak,all-year,R1,2.37720000000,4,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,1.96670000000,4,MUS$2010/PJ,2030 +gas,all-week,late-peak,all-year,R1,1.50300000000,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,132.38550000000,4,MUS$2010/kt,2030 -electricity,all-week,evening,all-year,R1,0.84440000000,5,MUS$2010/PJ,2030 -gas,all-week,evening,all-year,R1,1.59160000000,5,MUS$2010/PJ,2030 +CO2f,all-week,late-peak,all-year,R1,82.50300000000,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 heat,all-week,evening,all-year,R1,3.33330000000,5,MUS$2010/PJ,2030 -CO2f,all-week,evening,all-year,R1,88.63370000000,5,MUS$2010/kt,2030 -electricity,all-week,night,all-year,R1,0.55560000000,0,MUS$2010/PJ,2035 -gas,all-week,night,all-year,R1,0.79500000000,0,MUS$2010/PJ,2035 +CO2f,all-week,evening,all-year,R1,55.93420000000,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 heat,all-week,night,all-year,R1,2.00000000000,0,MUS$2010/PJ,2035 -CO2f,all-week,night,all-year,R1,44.27030000000,0,MUS$2010/kt,2035 -electricity,all-week,morning,all-year,R1,0.83330000000,1,MUS$2010/PJ,2035 -gas,all-week,morning,all-year,R1,1.19250000000,1,MUS$2010/PJ,2035 +CO2f,all-week,night,all-year,R1,27.88830000000,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 heat,all-week,morning,all-year,R1,3.00000000000,1,MUS$2010/PJ,2035 -CO2f,all-week,morning,all-year,R1,66.40540000000,1,MUS$2010/kt,2035 -electricity,all-week,afternoon,all-year,R1,0.55560000000,2,MUS$2010/PJ,2035 -gas,all-week,afternoon,all-year,R1,0.79500000000,2,MUS$2010/PJ,2035 +CO2f,all-week,morning,all-year,R1,41.83250000000,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 heat,all-week,afternoon,all-year,R1,2.00000000000,2,MUS$2010/PJ,2035 -CO2f,all-week,afternoon,all-year,R1,44.27030000000,2,MUS$2010/kt,2035 -electricity,all-week,early-peak,all-year,R1,0.83330000000,3,MUS$2010/PJ,2035 -gas,all-week,early-peak,all-year,R1,1.19250000000,3,MUS$2010/PJ,2035 +CO2f,all-week,afternoon,all-year,R1,27.88830000000,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 heat,all-week,early-peak,all-year,R1,3.00000000000,3,MUS$2010/PJ,2035 -CO2f,all-week,early-peak,all-year,R1,66.40540000000,3,MUS$2010/kt,2035 -electricity,all-week,late-peak,all-year,R1,1.61670000000,4,MUS$2010/PJ,2035 -gas,all-week,late-peak,all-year,R1,2.37720000000,4,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.36670000000,4,MUS$2010/PJ,2035 +gas,all-week,late-peak,all-year,R1,1.50300000000,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,132.38550000000,4,MUS$2010/kt,2035 -electricity,all-week,evening,all-year,R1,1.11110000000,5,MUS$2010/PJ,2035 -gas,all-week,evening,all-year,R1,1.58990000000,5,MUS$2010/PJ,2035 +CO2f,all-week,late-peak,all-year,R1,82.50300000000,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 heat,all-week,evening,all-year,R1,4.00000000000,5,MUS$2010/PJ,2035 -CO2f,all-week,evening,all-year,R1,88.54050000000,5,MUS$2010/kt,2035 +CO2f,all-week,evening,all-year,R1,55.77670000000,5,MUS$2010/kt,2035 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 2c586712f..905c47137 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,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.62770000000,R1,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,8.52500000000,R1,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,10.46720000000,R1,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,7.64250000000,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,9.14540000000,R1,1,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,8.52500000000,R1,1,MUS$2010/PJ,2025 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,8.09320000000,R1,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,7.64250000000,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.85430000000,R1,2,MUS$2010/PJ,2025 +electricity,all-week,afternoon,all-year,9.41810000000,R1,2,MUS$2010/PJ,2025 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2025 -heat,all-week,afternoon,all-year,10.75530000000,R1,2,MUS$2010/PJ,2025 +heat,all-week,afternoon,all-year,8.14170000000,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.14540000000,R1,3,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,8.52500000000,R1,3,MUS$2010/PJ,2025 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,8.09320000000,R1,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,7.64250000000,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.96160000000,R1,4,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,8.52500000000,R1,4,MUS$2010/PJ,2025 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,5.81380000000,R1,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,7.64250000000,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.81060000000,R1,5,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,9.06240000000,R1,5,MUS$2010/PJ,2025 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,7.16510000000,R1,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,7.94290000000,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.99990000000,R1,0,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,7.19990000000,R1,0,MUS$2010/PJ,2030 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,9.38010000000,R1,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,6.00740000000,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,7.99990000000,R1,1,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,7.19990000000,R1,1,MUS$2010/PJ,2030 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,6.54420000000,R1,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,6.00740000000,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,11.99990000000,R1,2,MUS$2010/PJ,2030 +electricity,all-week,afternoon,all-year,7.19990000000,R1,2,MUS$2010/PJ,2030 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,9.47080000000,R1,2,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,6.36470000000,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,7.99990000000,R1,3,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,7.19990000000,R1,3,MUS$2010/PJ,2030 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,6.54420000000,R1,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,6.00740000000,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,4.00000000000,R1,4,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,7.19990000000,R1,4,MUS$2010/PJ,2030 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,3.82760000000,R1,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,6.00740000000,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.99990000000,R1,5,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,7.19990000000,R1,5,MUS$2010/PJ,2030 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,5.28880000000,R1,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,6.22240000000,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,11.66650000000,R1,0,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,7.05870000000,R1,0,MUS$2010/PJ,2035 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,9.12900000000,R1,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,5.47740000000,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,7.77770000000,R1,1,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,7.05870000000,R1,1,MUS$2010/PJ,2035 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,6.08600000000,R1,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,5.47740000000,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,11.66650000000,R1,2,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,7.05870000000,R1,2,MUS$2010/PJ,2035 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,9.12900000000,R1,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,5.47740000000,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,7.77770000000,R1,3,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,7.05870000000,R1,3,MUS$2010/PJ,2035 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,6.08600000000,R1,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,5.47740000000,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,4.00000000000,R1,4,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,7.05870000000,R1,4,MUS$2010/PJ,2035 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,3.04300000000,R1,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,5.47740000000,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,5.83330000000,R1,5,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,7.05870000000,R1,5,MUS$2010/PJ,2035 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,4.56450000000,R1,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,5.47740000000,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,11.42840000000,R1,0,MUS$2010/PJ,2040 +electricity,all-week,night,all-year,6.95640000000,R1,0,MUS$2010/PJ,2040 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,8.90040000000,R1,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,5.38000000000,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,7.61900000000,R1,1,MUS$2010/PJ,2040 +electricity,all-week,morning,all-year,6.95640000000,R1,1,MUS$2010/PJ,2040 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,5.93360000000,R1,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,5.38000000000,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,11.42840000000,R1,2,MUS$2010/PJ,2040 +electricity,all-week,afternoon,all-year,6.95640000000,R1,2,MUS$2010/PJ,2040 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2040 -heat,all-week,afternoon,all-year,8.90040000000,R1,2,MUS$2010/PJ,2040 +heat,all-week,afternoon,all-year,5.38000000000,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,7.61900000000,R1,3,MUS$2010/PJ,2040 +electricity,all-week,early-peak,all-year,6.95640000000,R1,3,MUS$2010/PJ,2040 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,5.93360000000,R1,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,5.38000000000,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,4.00000000000,R1,4,MUS$2010/PJ,2040 +electricity,all-week,late-peak,all-year,6.95640000000,R1,4,MUS$2010/PJ,2040 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,3.04300000000,R1,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,5.38000000000,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,5.71420000000,R1,5,MUS$2010/PJ,2040 +electricity,all-week,evening,all-year,6.95640000000,R1,5,MUS$2010/PJ,2040 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,4.45020000000,R1,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,5.38000000000,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,11.87490000000,R1,0,MUS$2010/PJ,2045 +electricity,all-week,night,all-year,7.14720000000,R1,0,MUS$2010/PJ,2045 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2045 -heat,all-week,night,all-year,8.90040000000,R1,0,MUS$2010/PJ,2045 +heat,all-week,night,all-year,5.38000000000,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,7.91660000000,R1,1,MUS$2010/PJ,2045 +electricity,all-week,morning,all-year,7.14720000000,R1,1,MUS$2010/PJ,2045 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2045 -heat,all-week,morning,all-year,5.93360000000,R1,1,MUS$2010/PJ,2045 +heat,all-week,morning,all-year,5.38000000000,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,11.87490000000,R1,2,MUS$2010/PJ,2045 +electricity,all-week,afternoon,all-year,7.14720000000,R1,2,MUS$2010/PJ,2045 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2045 -heat,all-week,afternoon,all-year,8.90040000000,R1,2,MUS$2010/PJ,2045 +heat,all-week,afternoon,all-year,5.38000000000,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,7.91660000000,R1,3,MUS$2010/PJ,2045 +electricity,all-week,early-peak,all-year,7.14720000000,R1,3,MUS$2010/PJ,2045 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2045 -heat,all-week,early-peak,all-year,5.93360000000,R1,3,MUS$2010/PJ,2045 +heat,all-week,early-peak,all-year,5.38000000000,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,4.00000000000,R1,4,MUS$2010/PJ,2045 +electricity,all-week,late-peak,all-year,7.14720000000,R1,4,MUS$2010/PJ,2045 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2045 -heat,all-week,late-peak,all-year,3.04300000000,R1,4,MUS$2010/PJ,2045 +heat,all-week,late-peak,all-year,5.38000000000,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,5.93740000000,R1,5,MUS$2010/PJ,2045 +electricity,all-week,evening,all-year,7.14720000000,R1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2045 -heat,all-week,evening,all-year,4.45020000000,R1,5,MUS$2010/PJ,2045 +heat,all-week,evening,all-year,5.38000000000,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,11.66650000000,R1,0,MUS$2010/PJ,2050 +electricity,all-week,night,all-year,7.05870000000,R1,0,MUS$2010/PJ,2050 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,9.07900000000,R1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,5.45630000000,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,7.77770000000,R1,1,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,7.05870000000,R1,1,MUS$2010/PJ,2050 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,6.05260000000,R1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,5.45630000000,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,11.66650000000,R1,2,MUS$2010/PJ,2050 +electricity,all-week,afternoon,all-year,7.05870000000,R1,2,MUS$2010/PJ,2050 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,9.07900000000,R1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,5.45630000000,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,7.77770000000,R1,3,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,7.05870000000,R1,3,MUS$2010/PJ,2050 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,6.05260000000,R1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,5.45630000000,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,4.00000000000,R1,4,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,7.05870000000,R1,4,MUS$2010/PJ,2050 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,3.04300000000,R1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,5.45630000000,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,5.83330000000,R1,5,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,7.05870000000,R1,5,MUS$2010/PJ,2050 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,4.53950000000,R1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,5.45630000000,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/MCAPrices.csv b/docs/tutorial-code/min-max-timeslice-constraints/2-max-constraint/Results/MCAPrices.csv index 250387a2f..2f457b05a 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,13.93410000000,R1,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,9.03590000000,R1,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,10.82840000000,R1,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,7.75180000000,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,9.92540000000,R1,1,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,9.03590000000,R1,1,MUS$2010/PJ,2025 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,8.28770000000,R1,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,7.75180000000,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,14.06800000000,R1,2,MUS$2010/PJ,2025 +electricity,all-week,afternoon,all-year,10.21280000000,R1,2,MUS$2010/PJ,2025 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2025 -heat,all-week,afternoon,all-year,11.12940000000,R1,2,MUS$2010/PJ,2025 +heat,all-week,afternoon,all-year,8.38310000000,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.92540000000,R1,3,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,9.03590000000,R1,3,MUS$2010/PJ,2025 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,8.28770000000,R1,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,7.75180000000,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.07980000000,R1,4,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,8.25580000000,R1,4,MUS$2010/PJ,2025 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,5.31070000000,R1,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,7.33340000000,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.03060000000,R1,5,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,8.25580000000,R1,5,MUS$2010/PJ,2025 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,6.56400000000,R1,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,7.33340000000,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.99990000000,R1,0,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,7.19990000000,R1,0,MUS$2010/PJ,2030 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,9.90270000000,R1,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,6.21180000000,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,7.99990000000,R1,1,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,7.19990000000,R1,1,MUS$2010/PJ,2030 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,6.85620000000,R1,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,6.21180000000,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,11.99990000000,R1,2,MUS$2010/PJ,2030 +electricity,all-week,afternoon,all-year,7.19990000000,R1,2,MUS$2010/PJ,2030 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,9.95620000000,R1,2,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,6.68250000000,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,7.99990000000,R1,3,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,7.19990000000,R1,3,MUS$2010/PJ,2030 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,6.85620000000,R1,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,6.21180000000,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,4.00000000000,R1,4,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,7.19990000000,R1,4,MUS$2010/PJ,2030 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,3.47490000000,R1,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,5.89980000000,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.99990000000,R1,5,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,7.19990000000,R1,5,MUS$2010/PJ,2030 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,4.97680000000,R1,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,5.89980000000,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,11.66650000000,R1,0,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,7.05870000000,R1,0,MUS$2010/PJ,2035 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,9.12900000000,R1,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,5.47740000000,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,7.77770000000,R1,1,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,7.05870000000,R1,1,MUS$2010/PJ,2035 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,6.08600000000,R1,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,5.47740000000,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,11.66650000000,R1,2,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,7.05870000000,R1,2,MUS$2010/PJ,2035 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,9.12900000000,R1,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,5.47740000000,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,7.77770000000,R1,3,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,7.05870000000,R1,3,MUS$2010/PJ,2035 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,6.08600000000,R1,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,5.47740000000,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,4.00000000000,R1,4,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,7.05870000000,R1,4,MUS$2010/PJ,2035 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,3.04300000000,R1,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,5.47740000000,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,5.83330000000,R1,5,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,7.05870000000,R1,5,MUS$2010/PJ,2035 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,4.56450000000,R1,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,5.47740000000,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,11.42840000000,R1,0,MUS$2010/PJ,2040 +electricity,all-week,night,all-year,6.95640000000,R1,0,MUS$2010/PJ,2040 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,8.90040000000,R1,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,5.38000000000,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,7.61900000000,R1,1,MUS$2010/PJ,2040 +electricity,all-week,morning,all-year,6.95640000000,R1,1,MUS$2010/PJ,2040 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,5.93360000000,R1,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,5.38000000000,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,11.42840000000,R1,2,MUS$2010/PJ,2040 +electricity,all-week,afternoon,all-year,6.95640000000,R1,2,MUS$2010/PJ,2040 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2040 -heat,all-week,afternoon,all-year,8.90040000000,R1,2,MUS$2010/PJ,2040 +heat,all-week,afternoon,all-year,5.38000000000,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,7.61900000000,R1,3,MUS$2010/PJ,2040 +electricity,all-week,early-peak,all-year,6.95640000000,R1,3,MUS$2010/PJ,2040 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,5.93360000000,R1,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,5.38000000000,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,4.00000000000,R1,4,MUS$2010/PJ,2040 +electricity,all-week,late-peak,all-year,6.95640000000,R1,4,MUS$2010/PJ,2040 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,3.04300000000,R1,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,5.38000000000,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,5.71420000000,R1,5,MUS$2010/PJ,2040 +electricity,all-week,evening,all-year,6.95640000000,R1,5,MUS$2010/PJ,2040 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,4.45020000000,R1,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,5.38000000000,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,11.87490000000,R1,0,MUS$2010/PJ,2045 +electricity,all-week,night,all-year,7.14720000000,R1,0,MUS$2010/PJ,2045 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2045 -heat,all-week,night,all-year,8.90040000000,R1,0,MUS$2010/PJ,2045 +heat,all-week,night,all-year,5.38000000000,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,7.91660000000,R1,1,MUS$2010/PJ,2045 +electricity,all-week,morning,all-year,7.14720000000,R1,1,MUS$2010/PJ,2045 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2045 -heat,all-week,morning,all-year,5.93360000000,R1,1,MUS$2010/PJ,2045 +heat,all-week,morning,all-year,5.38000000000,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,11.87490000000,R1,2,MUS$2010/PJ,2045 +electricity,all-week,afternoon,all-year,7.14720000000,R1,2,MUS$2010/PJ,2045 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2045 -heat,all-week,afternoon,all-year,8.90040000000,R1,2,MUS$2010/PJ,2045 +heat,all-week,afternoon,all-year,5.38000000000,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,7.91660000000,R1,3,MUS$2010/PJ,2045 +electricity,all-week,early-peak,all-year,7.14720000000,R1,3,MUS$2010/PJ,2045 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2045 -heat,all-week,early-peak,all-year,5.93360000000,R1,3,MUS$2010/PJ,2045 +heat,all-week,early-peak,all-year,5.38000000000,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,4.00000000000,R1,4,MUS$2010/PJ,2045 +electricity,all-week,late-peak,all-year,7.14720000000,R1,4,MUS$2010/PJ,2045 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2045 -heat,all-week,late-peak,all-year,3.04300000000,R1,4,MUS$2010/PJ,2045 +heat,all-week,late-peak,all-year,5.38000000000,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,5.93740000000,R1,5,MUS$2010/PJ,2045 +electricity,all-week,evening,all-year,7.14720000000,R1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2045 -heat,all-week,evening,all-year,4.45020000000,R1,5,MUS$2010/PJ,2045 +heat,all-week,evening,all-year,5.38000000000,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,11.66650000000,R1,0,MUS$2010/PJ,2050 +electricity,all-week,night,all-year,7.05870000000,R1,0,MUS$2010/PJ,2050 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,9.07900000000,R1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,5.45630000000,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,7.77770000000,R1,1,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,7.05870000000,R1,1,MUS$2010/PJ,2050 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,6.05260000000,R1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,5.45630000000,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,11.66650000000,R1,2,MUS$2010/PJ,2050 +electricity,all-week,afternoon,all-year,7.05870000000,R1,2,MUS$2010/PJ,2050 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,9.07900000000,R1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,5.45630000000,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,7.77770000000,R1,3,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,7.05870000000,R1,3,MUS$2010/PJ,2050 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,6.05260000000,R1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,5.45630000000,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,4.00000000000,R1,4,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,7.05870000000,R1,4,MUS$2010/PJ,2050 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,3.04300000000,R1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,5.45630000000,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,5.83330000000,R1,5,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,7.05870000000,R1,5,MUS$2010/PJ,2050 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,4.53950000000,R1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,5.45630000000,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/modify-timing-data/1-modify-timeslices/Results/MCACapacity.csv b/docs/tutorial-code/modify-timing-data/1-modify-timeslices/Results/MCACapacity.csv index 3bb091777..799e4deb5 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 @@ -3,43 +3,48 @@ 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,17.00000000000,R1,2025,R1,residential,gasboiler,newcapa,2025 +A1,17.00000000000,R1,2025,R1,residential,heatpump,newcapa,2025 A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2025 +A1,6.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2025 A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2025 -A1,13.35560000000,R1,2025,R1,gas,gassupply1,newcapa,2025 -A1,17.00000000000,R1,2025,R1,residential,gasboiler,newcapa,2030 +A1,3.13440000000,R1,2025,R1,gas,gassupply1,newcapa,2025 +A1,17.00000000000,R1,2025,R1,residential,heatpump,newcapa,2030 A1,11.00000000000,R1,2030,R1,residential,heatpump,newcapa,2030 -A1,11.00000000000,R1,2030,R1,power,windturbine,newcapa,2030 +A1,6.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2030 +A1,14.00000000000,R1,2030,R1,power,windturbine,newcapa,2030 A1,7.50000000000,R1,2020,R1,gas,gassupply1,newcapa,2030 -A1,13.35560000000,R1,2025,R1,gas,gassupply1,newcapa,2030 -A1,1.05560000000,R1,2030,R1,gas,gassupply1,newcapa,2030 +A1,3.13440000000,R1,2025,R1,gas,gassupply1,newcapa,2030 A1,11.00000000000,R1,2030,R1,residential,heatpump,newcapa,2035 A1,22.00000000000,R1,2035,R1,residential,heatpump,newcapa,2035 -A1,11.00000000000,R1,2030,R1,power,windturbine,newcapa,2035 -A1,22.00000000000,R1,2035,R1,power,windturbine,newcapa,2035 -A1,13.35560000000,R1,2025,R1,gas,gassupply1,newcapa,2035 -A1,1.05560000000,R1,2030,R1,gas,gassupply1,newcapa,2035 +A1,6.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2035 +A1,14.00000000000,R1,2030,R1,power,windturbine,newcapa,2035 +A1,5.00000000000,R1,2035,R1,power,windturbine,newcapa,2035 +A1,3.13440000000,R1,2025,R1,gas,gassupply1,newcapa,2035 +A1,6.88560000000,R1,2035,R1,gas,gassupply1,newcapa,2035 A1,22.00000000000,R1,2035,R1,residential,heatpump,newcapa,2040 A1,17.00000000000,R1,2040,R1,residential,heatpump,newcapa,2040 -A1,11.00000000000,R1,2030,R1,power,windturbine,newcapa,2040 -A1,22.00000000000,R1,2035,R1,power,windturbine,newcapa,2040 +A1,6.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2040 +A1,14.00000000000,R1,2030,R1,power,windturbine,newcapa,2040 +A1,5.00000000000,R1,2035,R1,power,windturbine,newcapa,2040 A1,6.00000000000,R1,2040,R1,power,windturbine,newcapa,2040 -A1,13.35560000000,R1,2025,R1,gas,gassupply1,newcapa,2040 -A1,1.05560000000,R1,2030,R1,gas,gassupply1,newcapa,2040 +A1,3.13440000000,R1,2025,R1,gas,gassupply1,newcapa,2040 +A1,6.88560000000,R1,2035,R1,gas,gassupply1,newcapa,2040 A1,17.00000000000,R1,2040,R1,residential,heatpump,newcapa,2045 A1,27.00000000000,R1,2045,R1,residential,heatpump,newcapa,2045 -A1,11.00000000000,R1,2030,R1,power,windturbine,newcapa,2045 -A1,22.00000000000,R1,2035,R1,power,windturbine,newcapa,2045 +A1,6.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2045 +A1,14.00000000000,R1,2030,R1,power,windturbine,newcapa,2045 +A1,5.00000000000,R1,2035,R1,power,windturbine,newcapa,2045 A1,6.00000000000,R1,2040,R1,power,windturbine,newcapa,2045 A1,5.00000000000,R1,2045,R1,power,windturbine,newcapa,2045 -A1,13.35560000000,R1,2025,R1,gas,gassupply1,newcapa,2045 -A1,1.05560000000,R1,2030,R1,gas,gassupply1,newcapa,2045 +A1,3.13440000000,R1,2025,R1,gas,gassupply1,newcapa,2045 +A1,6.88560000000,R1,2035,R1,gas,gassupply1,newcapa,2045 A1,27.00000000000,R1,2045,R1,residential,heatpump,newcapa,2050 A1,23.00000000000,R1,2050,R1,residential,heatpump,newcapa,2050 -A1,11.00000000000,R1,2030,R1,power,windturbine,newcapa,2050 -A1,22.00000000000,R1,2035,R1,power,windturbine,newcapa,2050 +A1,6.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2050 +A1,14.00000000000,R1,2030,R1,power,windturbine,newcapa,2050 +A1,5.00000000000,R1,2035,R1,power,windturbine,newcapa,2050 A1,6.00000000000,R1,2040,R1,power,windturbine,newcapa,2050 A1,5.00000000000,R1,2045,R1,power,windturbine,newcapa,2050 -A1,5.00000000000,R1,2050,R1,power,windturbine,newcapa,2050 -A1,13.35560000000,R1,2025,R1,gas,gassupply1,newcapa,2050 -A1,1.05560000000,R1,2030,R1,gas,gassupply1,newcapa,2050 +A1,6.00000000000,R1,2050,R1,power,windturbine,newcapa,2050 +A1,3.13440000000,R1,2025,R1,gas,gassupply1,newcapa,2050 +A1,6.88560000000,R1,2035,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 5a6369539..e6051e7d2 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 @@ -31,195 +31,195 @@ electricity,all-week,late-afternoon,all-year,19.50000000000,R1,7,MUS$2010/PJ,202 gas,all-week,late-afternoon,all-year,7.15280000000,R1,7,MUS$2010/PJ,2020 heat,all-week,late-afternoon,all-year,100.00000000000,R1,7,MUS$2010/PJ,2020 CO2f,all-week,late-afternoon,all-year,0.08310000000,R1,7,MUS$2010/kt,2020 -electricity,all-week,night,all-year,28.73140000000,R1,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,19.66930000000,R1,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,12.54990000000,R1,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,10.66180000000,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,21.13150000000,R1,1,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,19.66930000000,R1,1,MUS$2010/PJ,2025 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,12.00320000000,R1,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,10.66180000000,R1,1,MUS$2010/PJ,2025 CO2f,all-week,morning,all-year,0.12010000000,R1,1,MUS$2010/kt,2025 -electricity,all-week,mid-afternoon,all-year,28.73140000000,R1,2,MUS$2010/PJ,2025 +electricity,all-week,mid-afternoon,all-year,19.66930000000,R1,2,MUS$2010/PJ,2025 gas,all-week,mid-afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2025 -heat,all-week,mid-afternoon,all-year,12.54990000000,R1,2,MUS$2010/PJ,2025 +heat,all-week,mid-afternoon,all-year,10.66180000000,R1,2,MUS$2010/PJ,2025 CO2f,all-week,mid-afternoon,all-year,0.12010000000,R1,2,MUS$2010/kt,2025 -electricity,all-week,early-peak,all-year,21.13150000000,R1,3,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,19.66930000000,R1,3,MUS$2010/PJ,2025 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,12.00320000000,R1,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,10.66180000000,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.39310000000,R1,4,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,19.66930000000,R1,4,MUS$2010/PJ,2025 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,11.34610000000,R1,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,10.66180000000,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,16.06490000000,R1,5,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,19.66930000000,R1,5,MUS$2010/PJ,2025 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,11.63880000000,R1,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,10.66180000000,R1,5,MUS$2010/PJ,2025 CO2f,all-week,evening,all-year,0.12010000000,R1,5,MUS$2010/kt,2025 -electricity,all-week,early-morning,all-year,16.06490000000,R1,6,MUS$2010/PJ,2025 +electricity,all-week,early-morning,all-year,19.66930000000,R1,6,MUS$2010/PJ,2025 gas,all-week,early-morning,all-year,2.55000000000,R1,6,MUS$2010/PJ,2025 -heat,all-week,early-morning,all-year,11.63880000000,R1,6,MUS$2010/PJ,2025 +heat,all-week,early-morning,all-year,10.66180000000,R1,6,MUS$2010/PJ,2025 CO2f,all-week,early-morning,all-year,0.12010000000,R1,6,MUS$2010/kt,2025 -electricity,all-week,late-afternoon,all-year,16.06490000000,R1,7,MUS$2010/PJ,2025 +electricity,all-week,late-afternoon,all-year,19.66930000000,R1,7,MUS$2010/PJ,2025 gas,all-week,late-afternoon,all-year,2.55000000000,R1,7,MUS$2010/PJ,2025 -heat,all-week,late-afternoon,all-year,11.63880000000,R1,7,MUS$2010/PJ,2025 +heat,all-week,late-afternoon,all-year,10.66180000000,R1,7,MUS$2010/PJ,2025 CO2f,all-week,late-afternoon,all-year,0.12010000000,R1,7,MUS$2010/kt,2025 -electricity,all-week,night,all-year,29.99960000000,R1,0,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,20.14590000000,R1,0,MUS$2010/PJ,2030 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,15.50550000000,R1,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,10.55760000000,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,20.99970000000,R1,1,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,20.14590000000,R1,1,MUS$2010/PJ,2030 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,13.24310000000,R1,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,10.55760000000,R1,1,MUS$2010/PJ,2030 CO2f,all-week,morning,all-year,0.15700000000,R1,1,MUS$2010/kt,2030 -electricity,all-week,mid-afternoon,all-year,29.99960000000,R1,2,MUS$2010/PJ,2030 +electricity,all-week,mid-afternoon,all-year,20.14590000000,R1,2,MUS$2010/PJ,2030 gas,all-week,mid-afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2030 -heat,all-week,mid-afternoon,all-year,15.50550000000,R1,2,MUS$2010/PJ,2030 +heat,all-week,mid-afternoon,all-year,10.55760000000,R1,2,MUS$2010/PJ,2030 CO2f,all-week,mid-afternoon,all-year,0.15700000000,R1,2,MUS$2010/kt,2030 -electricity,all-week,early-peak,all-year,20.99970000000,R1,3,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,20.14590000000,R1,3,MUS$2010/PJ,2030 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,13.24310000000,R1,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,10.55760000000,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,9.99990000000,R1,4,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,20.14590000000,R1,4,MUS$2010/PJ,2030 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,10.47790000000,R1,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,10.55760000000,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,14.99980000000,R1,5,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,20.14590000000,R1,5,MUS$2010/PJ,2030 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,11.73480000000,R1,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,10.55760000000,R1,5,MUS$2010/PJ,2030 CO2f,all-week,evening,all-year,0.15700000000,R1,5,MUS$2010/kt,2030 -electricity,all-week,early-morning,all-year,14.99980000000,R1,6,MUS$2010/PJ,2030 +electricity,all-week,early-morning,all-year,20.14590000000,R1,6,MUS$2010/PJ,2030 gas,all-week,early-morning,all-year,2.55000000000,R1,6,MUS$2010/PJ,2030 -heat,all-week,early-morning,all-year,11.73480000000,R1,6,MUS$2010/PJ,2030 +heat,all-week,early-morning,all-year,10.55760000000,R1,6,MUS$2010/PJ,2030 CO2f,all-week,early-morning,all-year,0.15700000000,R1,6,MUS$2010/kt,2030 -electricity,all-week,late-afternoon,all-year,14.99980000000,R1,7,MUS$2010/PJ,2030 +electricity,all-week,late-afternoon,all-year,20.14590000000,R1,7,MUS$2010/PJ,2030 gas,all-week,late-afternoon,all-year,2.55000000000,R1,7,MUS$2010/PJ,2030 -heat,all-week,late-afternoon,all-year,11.73480000000,R1,7,MUS$2010/PJ,2030 +heat,all-week,late-afternoon,all-year,10.55760000000,R1,7,MUS$2010/PJ,2030 CO2f,all-week,late-afternoon,all-year,0.15700000000,R1,7,MUS$2010/kt,2030 -electricity,all-week,night,all-year,29.46390000000,R1,0,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,21.73500000000,R1,0,MUS$2010/PJ,2035 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,16.25160000000,R1,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,11.15810000000,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.62470000000,R1,1,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,21.73500000000,R1,1,MUS$2010/PJ,2035 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,11.37610000000,R1,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,11.15810000000,R1,1,MUS$2010/PJ,2035 CO2f,all-week,morning,all-year,0.21490000000,R1,1,MUS$2010/kt,2035 -electricity,all-week,mid-afternoon,all-year,29.46390000000,R1,2,MUS$2010/PJ,2035 +electricity,all-week,mid-afternoon,all-year,21.73500000000,R1,2,MUS$2010/PJ,2035 gas,all-week,mid-afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2035 -heat,all-week,mid-afternoon,all-year,16.25160000000,R1,2,MUS$2010/PJ,2035 +heat,all-week,mid-afternoon,all-year,11.15810000000,R1,2,MUS$2010/PJ,2035 CO2f,all-week,mid-afternoon,all-year,0.21490000000,R1,2,MUS$2010/kt,2035 -electricity,all-week,early-peak,all-year,20.62470000000,R1,3,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,21.73500000000,R1,3,MUS$2010/PJ,2035 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,11.37610000000,R1,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,11.15810000000,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,9.99990000000,R1,4,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,21.73500000000,R1,4,MUS$2010/PJ,2035 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,5.44300000000,R1,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,11.15810000000,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.73200000000,R1,5,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,21.73500000000,R1,5,MUS$2010/PJ,2035 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,8.12580000000,R1,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,11.15810000000,R1,5,MUS$2010/PJ,2035 CO2f,all-week,evening,all-year,0.21490000000,R1,5,MUS$2010/kt,2035 -electricity,all-week,early-morning,all-year,14.73200000000,R1,6,MUS$2010/PJ,2035 +electricity,all-week,early-morning,all-year,21.73500000000,R1,6,MUS$2010/PJ,2035 gas,all-week,early-morning,all-year,2.55000000000,R1,6,MUS$2010/PJ,2035 -heat,all-week,early-morning,all-year,8.12580000000,R1,6,MUS$2010/PJ,2035 +heat,all-week,early-morning,all-year,11.15810000000,R1,6,MUS$2010/PJ,2035 CO2f,all-week,early-morning,all-year,0.21490000000,R1,6,MUS$2010/kt,2035 -electricity,all-week,late-afternoon,all-year,14.73200000000,R1,7,MUS$2010/PJ,2035 +electricity,all-week,late-afternoon,all-year,21.73500000000,R1,7,MUS$2010/PJ,2035 gas,all-week,late-afternoon,all-year,2.55000000000,R1,7,MUS$2010/PJ,2035 -heat,all-week,late-afternoon,all-year,8.12580000000,R1,7,MUS$2010/PJ,2035 +heat,all-week,late-afternoon,all-year,11.15810000000,R1,7,MUS$2010/PJ,2035 CO2f,all-week,late-afternoon,all-year,0.21490000000,R1,7,MUS$2010/kt,2035 -electricity,all-week,night,all-year,29.84660000000,R1,0,MUS$2010/PJ,2040 +electricity,all-week,night,all-year,22.98980000000,R1,0,MUS$2010/PJ,2040 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,16.09250000000,R1,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,11.68510000000,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,20.89260000000,R1,1,MUS$2010/PJ,2040 +electricity,all-week,morning,all-year,22.98980000000,R1,1,MUS$2010/PJ,2040 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,11.26480000000,R1,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,11.68510000000,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,29.84660000000,R1,2,MUS$2010/PJ,2040 +electricity,all-week,mid-afternoon,all-year,22.98980000000,R1,2,MUS$2010/PJ,2040 gas,all-week,mid-afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2040 -heat,all-week,mid-afternoon,all-year,16.09250000000,R1,2,MUS$2010/PJ,2040 +heat,all-week,mid-afternoon,all-year,11.68510000000,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,20.89260000000,R1,3,MUS$2010/PJ,2040 +electricity,all-week,early-peak,all-year,22.98980000000,R1,3,MUS$2010/PJ,2040 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,11.26480000000,R1,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,11.68510000000,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,9.99990000000,R1,4,MUS$2010/PJ,2040 +electricity,all-week,late-peak,all-year,22.98980000000,R1,4,MUS$2010/PJ,2040 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,5.44300000000,R1,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,11.68510000000,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,14.92330000000,R1,5,MUS$2010/PJ,2040 +electricity,all-week,evening,all-year,22.98980000000,R1,5,MUS$2010/PJ,2040 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,8.04630000000,R1,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,11.68510000000,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,14.92330000000,R1,6,MUS$2010/PJ,2040 +electricity,all-week,early-morning,all-year,22.98980000000,R1,6,MUS$2010/PJ,2040 gas,all-week,early-morning,all-year,2.55000000000,R1,6,MUS$2010/PJ,2040 -heat,all-week,early-morning,all-year,8.04630000000,R1,6,MUS$2010/PJ,2040 +heat,all-week,early-morning,all-year,11.68510000000,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,14.92330000000,R1,7,MUS$2010/PJ,2040 +electricity,all-week,late-afternoon,all-year,22.98980000000,R1,7,MUS$2010/PJ,2040 gas,all-week,late-afternoon,all-year,2.55000000000,R1,7,MUS$2010/PJ,2040 -heat,all-week,late-afternoon,all-year,8.04630000000,R1,7,MUS$2010/PJ,2040 +heat,all-week,late-afternoon,all-year,11.68510000000,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,29.46390000000,R1,0,MUS$2010/PJ,2045 +electricity,all-week,night,all-year,24.50140000000,R1,0,MUS$2010/PJ,2045 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2045 -heat,all-week,night,all-year,16.19040000000,R1,0,MUS$2010/PJ,2045 +heat,all-week,night,all-year,12.26470000000,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,20.62470000000,R1,1,MUS$2010/PJ,2045 +electricity,all-week,morning,all-year,24.50140000000,R1,1,MUS$2010/PJ,2045 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2045 -heat,all-week,morning,all-year,11.33320000000,R1,1,MUS$2010/PJ,2045 +heat,all-week,morning,all-year,12.26470000000,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,29.46390000000,R1,2,MUS$2010/PJ,2045 +electricity,all-week,mid-afternoon,all-year,24.50140000000,R1,2,MUS$2010/PJ,2045 gas,all-week,mid-afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2045 -heat,all-week,mid-afternoon,all-year,16.19040000000,R1,2,MUS$2010/PJ,2045 +heat,all-week,mid-afternoon,all-year,12.26470000000,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,20.62470000000,R1,3,MUS$2010/PJ,2045 +electricity,all-week,early-peak,all-year,24.50140000000,R1,3,MUS$2010/PJ,2045 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2045 -heat,all-week,early-peak,all-year,11.33320000000,R1,3,MUS$2010/PJ,2045 +heat,all-week,early-peak,all-year,12.26470000000,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,9.99990000000,R1,4,MUS$2010/PJ,2045 +electricity,all-week,late-peak,all-year,24.50140000000,R1,4,MUS$2010/PJ,2045 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2045 -heat,all-week,late-peak,all-year,5.44300000000,R1,4,MUS$2010/PJ,2045 +heat,all-week,late-peak,all-year,12.26470000000,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,14.73200000000,R1,5,MUS$2010/PJ,2045 +electricity,all-week,evening,all-year,24.50140000000,R1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2045 -heat,all-week,evening,all-year,8.09520000000,R1,5,MUS$2010/PJ,2045 +heat,all-week,evening,all-year,12.26470000000,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,14.73200000000,R1,6,MUS$2010/PJ,2045 +electricity,all-week,early-morning,all-year,24.50140000000,R1,6,MUS$2010/PJ,2045 gas,all-week,early-morning,all-year,2.55000000000,R1,6,MUS$2010/PJ,2045 -heat,all-week,early-morning,all-year,8.09520000000,R1,6,MUS$2010/PJ,2045 +heat,all-week,early-morning,all-year,12.26470000000,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,14.73200000000,R1,7,MUS$2010/PJ,2045 +electricity,all-week,late-afternoon,all-year,24.50140000000,R1,7,MUS$2010/PJ,2045 gas,all-week,late-afternoon,all-year,2.55000000000,R1,7,MUS$2010/PJ,2045 -heat,all-week,late-afternoon,all-year,8.09520000000,R1,7,MUS$2010/PJ,2045 +heat,all-week,late-afternoon,all-year,12.26470000000,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,29.16630000000,R1,0,MUS$2010/PJ,2050 +electricity,all-week,night,all-year,25.73530000000,R1,0,MUS$2010/PJ,2050 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,16.08020000000,R1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,12.77780000000,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,20.41640000000,R1,1,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,25.73530000000,R1,1,MUS$2010/PJ,2050 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,11.25620000000,R1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,12.77780000000,R1,1,MUS$2010/PJ,2050 CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050 -electricity,all-week,mid-afternoon,all-year,29.16630000000,R1,2,MUS$2010/PJ,2050 +electricity,all-week,mid-afternoon,all-year,25.73530000000,R1,2,MUS$2010/PJ,2050 gas,all-week,mid-afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050 -heat,all-week,mid-afternoon,all-year,16.08020000000,R1,2,MUS$2010/PJ,2050 +heat,all-week,mid-afternoon,all-year,12.77780000000,R1,2,MUS$2010/PJ,2050 CO2f,all-week,mid-afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050 -electricity,all-week,early-peak,all-year,20.41640000000,R1,3,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,25.73530000000,R1,3,MUS$2010/PJ,2050 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,11.25620000000,R1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,12.77780000000,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.99990000000,R1,4,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,25.73530000000,R1,4,MUS$2010/PJ,2050 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,5.44300000000,R1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,12.77780000000,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,14.58320000000,R1,5,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,25.73530000000,R1,5,MUS$2010/PJ,2050 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,8.04010000000,R1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,12.77780000000,R1,5,MUS$2010/PJ,2050 CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050 -electricity,all-week,early-morning,all-year,14.58320000000,R1,6,MUS$2010/PJ,2050 +electricity,all-week,early-morning,all-year,25.73530000000,R1,6,MUS$2010/PJ,2050 gas,all-week,early-morning,all-year,2.55000000000,R1,6,MUS$2010/PJ,2050 -heat,all-week,early-morning,all-year,8.04010000000,R1,6,MUS$2010/PJ,2050 +heat,all-week,early-morning,all-year,12.77780000000,R1,6,MUS$2010/PJ,2050 CO2f,all-week,early-morning,all-year,0.43510000000,R1,6,MUS$2010/kt,2050 -electricity,all-week,late-afternoon,all-year,14.58320000000,R1,7,MUS$2010/PJ,2050 +electricity,all-week,late-afternoon,all-year,25.73530000000,R1,7,MUS$2010/PJ,2050 gas,all-week,late-afternoon,all-year,2.55000000000,R1,7,MUS$2010/PJ,2050 -heat,all-week,late-afternoon,all-year,8.04010000000,R1,7,MUS$2010/PJ,2050 +heat,all-week,late-afternoon,all-year,12.77780000000,R1,7,MUS$2010/PJ,2050 CO2f,all-week,late-afternoon,all-year,0.43510000000,R1,7,MUS$2010/kt,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 54eb2a17c..6381411b9 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 @@ -3,104 +3,145 @@ 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,8.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2022 -A1,11.00000000000,R1,2022,R1,residential,gasboiler,newcapa,2022 +A1,11.00000000000,R1,2022,R1,residential,heatpump,newcapa,2022 +A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2022 +A1,3.00000000000,R1,2022,R1,power,gasCCGT,newcapa,2022 +A1,2.00000000000,R1,2022,R1,power,windturbine,newcapa,2022 A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2022 -A1,9.48890000000,R1,2022,R1,gas,gassupply1,newcapa,2022 +A1,1.99110000000,R1,2022,R1,gas,gassupply1,newcapa,2022 A1,6.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2024 -A1,11.00000000000,R1,2022,R1,residential,gasboiler,newcapa,2024 -A1,4.00000000000,R1,2024,R1,residential,gasboiler,newcapa,2024 -A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2024 -A1,9.48890000000,R1,2022,R1,gas,gassupply1,newcapa,2024 -A1,2.57780000000,R1,2024,R1,gas,gassupply1,newcapa,2024 +A1,11.00000000000,R1,2022,R1,residential,heatpump,newcapa,2024 +A1,4.00000000000,R1,2024,R1,residential,heatpump,newcapa,2024 +A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2024 +A1,3.00000000000,R1,2022,R1,power,gasCCGT,newcapa,2024 +A1,1.00000000000,R1,2024,R1,power,gasCCGT,newcapa,2024 +A1,2.00000000000,R1,2022,R1,power,windturbine,newcapa,2024 A1,4.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2026 -A1,11.00000000000,R1,2022,R1,residential,gasboiler,newcapa,2026 -A1,4.00000000000,R1,2024,R1,residential,gasboiler,newcapa,2026 -A1,4.00000000000,R1,2026,R1,residential,gasboiler,newcapa,2026 -A1,13.50000000000,R1,2020,R1,gas,gassupply1,newcapa,2026 -A1,9.48890000000,R1,2022,R1,gas,gassupply1,newcapa,2026 -A1,2.57780000000,R1,2024,R1,gas,gassupply1,newcapa,2026 -A1,4.07780000000,R1,2026,R1,gas,gassupply1,newcapa,2026 +A1,11.00000000000,R1,2022,R1,residential,heatpump,newcapa,2026 +A1,4.00000000000,R1,2024,R1,residential,heatpump,newcapa,2026 +A1,4.00000000000,R1,2026,R1,residential,heatpump,newcapa,2026 +A1,3.00000000000,R1,2022,R1,power,gasCCGT,newcapa,2026 +A1,1.00000000000,R1,2024,R1,power,gasCCGT,newcapa,2026 +A1,2.00000000000,R1,2026,R1,power,gasCCGT,newcapa,2026 +A1,2.00000000000,R1,2022,R1,power,windturbine,newcapa,2026 A1,2.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2028 -A1,11.00000000000,R1,2022,R1,residential,gasboiler,newcapa,2028 -A1,4.00000000000,R1,2024,R1,residential,gasboiler,newcapa,2028 -A1,4.00000000000,R1,2026,R1,residential,gasboiler,newcapa,2028 +A1,11.00000000000,R1,2022,R1,residential,heatpump,newcapa,2028 +A1,4.00000000000,R1,2024,R1,residential,heatpump,newcapa,2028 +A1,4.00000000000,R1,2026,R1,residential,heatpump,newcapa,2028 A1,4.00000000000,R1,2028,R1,residential,heatpump,newcapa,2028 -A1,1.00000000000,R1,2028,R1,power,gasCCGT,newcapa,2028 +A1,3.00000000000,R1,2022,R1,power,gasCCGT,newcapa,2028 +A1,1.00000000000,R1,2024,R1,power,gasCCGT,newcapa,2028 +A1,2.00000000000,R1,2026,R1,power,gasCCGT,newcapa,2028 +A1,3.00000000000,R1,2028,R1,power,gasCCGT,newcapa,2028 +A1,2.00000000000,R1,2022,R1,power,windturbine,newcapa,2028 A1,10.50000000000,R1,2020,R1,gas,gassupply1,newcapa,2028 -A1,9.48890000000,R1,2022,R1,gas,gassupply1,newcapa,2028 -A1,2.57780000000,R1,2024,R1,gas,gassupply1,newcapa,2028 -A1,4.07780000000,R1,2026,R1,gas,gassupply1,newcapa,2028 -A1,2.09220000000,R1,2028,R1,gas,gassupply1,newcapa,2028 -A1,11.00000000000,R1,2022,R1,residential,gasboiler,newcapa,2030 -A1,4.00000000000,R1,2024,R1,residential,gasboiler,newcapa,2030 -A1,4.00000000000,R1,2026,R1,residential,gasboiler,newcapa,2030 +A1,1.99110000000,R1,2022,R1,gas,gassupply1,newcapa,2028 +A1,5.11670000000,R1,2028,R1,gas,gassupply1,newcapa,2028 +A1,11.00000000000,R1,2022,R1,residential,heatpump,newcapa,2030 +A1,4.00000000000,R1,2024,R1,residential,heatpump,newcapa,2030 +A1,4.00000000000,R1,2026,R1,residential,heatpump,newcapa,2030 A1,4.00000000000,R1,2028,R1,residential,heatpump,newcapa,2030 A1,5.00000000000,R1,2030,R1,residential,heatpump,newcapa,2030 -A1,1.00000000000,R1,2028,R1,power,gasCCGT,newcapa,2030 -A1,6.00000000000,R1,2030,R1,power,windturbine,newcapa,2030 +A1,3.00000000000,R1,2022,R1,power,gasCCGT,newcapa,2030 +A1,1.00000000000,R1,2024,R1,power,gasCCGT,newcapa,2030 +A1,2.00000000000,R1,2026,R1,power,gasCCGT,newcapa,2030 +A1,3.00000000000,R1,2028,R1,power,gasCCGT,newcapa,2030 +A1,2.00000000000,R1,2022,R1,power,windturbine,newcapa,2030 +A1,5.00000000000,R1,2030,R1,power,windturbine,newcapa,2030 A1,7.50000000000,R1,2020,R1,gas,gassupply1,newcapa,2030 -A1,9.48890000000,R1,2022,R1,gas,gassupply1,newcapa,2030 -A1,2.57780000000,R1,2024,R1,gas,gassupply1,newcapa,2030 -A1,4.07780000000,R1,2026,R1,gas,gassupply1,newcapa,2030 -A1,2.09220000000,R1,2028,R1,gas,gassupply1,newcapa,2030 +A1,1.99110000000,R1,2022,R1,gas,gassupply1,newcapa,2030 +A1,5.11670000000,R1,2028,R1,gas,gassupply1,newcapa,2030 A1,0.42220000000,R1,2030,R1,gas,gassupply1,newcapa,2030 -A1,4.00000000000,R1,2024,R1,residential,gasboiler,newcapa,2032 -A1,4.00000000000,R1,2026,R1,residential,gasboiler,newcapa,2032 -A1,1.00000000000,R1,2032,R1,residential,gasboiler,newcapa,2032 +A1,4.00000000000,R1,2024,R1,residential,heatpump,newcapa,2032 +A1,4.00000000000,R1,2026,R1,residential,heatpump,newcapa,2032 A1,4.00000000000,R1,2028,R1,residential,heatpump,newcapa,2032 A1,5.00000000000,R1,2030,R1,residential,heatpump,newcapa,2032 -A1,11.00000000000,R1,2032,R1,residential,heatpump,newcapa,2032 -A1,1.00000000000,R1,2028,R1,power,gasCCGT,newcapa,2032 -A1,6.00000000000,R1,2030,R1,power,windturbine,newcapa,2032 -A1,11.00000000000,R1,2032,R1,power,windturbine,newcapa,2032 -A1,4.00000000000,R1,2026,R1,residential,gasboiler,newcapa,2034 -A1,1.00000000000,R1,2032,R1,residential,gasboiler,newcapa,2034 +A1,13.00000000000,R1,2032,R1,residential,heatpump,newcapa,2032 +A1,3.00000000000,R1,2022,R1,power,gasCCGT,newcapa,2032 +A1,1.00000000000,R1,2024,R1,power,gasCCGT,newcapa,2032 +A1,2.00000000000,R1,2026,R1,power,gasCCGT,newcapa,2032 +A1,3.00000000000,R1,2028,R1,power,gasCCGT,newcapa,2032 +A1,2.00000000000,R1,2022,R1,power,windturbine,newcapa,2032 +A1,5.00000000000,R1,2030,R1,power,windturbine,newcapa,2032 +A1,2.00000000000,R1,2032,R1,power,windturbine,newcapa,2032 +A1,4.50000000000,R1,2020,R1,gas,gassupply1,newcapa,2032 +A1,1.99110000000,R1,2022,R1,gas,gassupply1,newcapa,2032 +A1,5.11670000000,R1,2028,R1,gas,gassupply1,newcapa,2032 +A1,0.42220000000,R1,2030,R1,gas,gassupply1,newcapa,2032 +A1,3.00000000000,R1,2032,R1,gas,gassupply1,newcapa,2032 +A1,4.00000000000,R1,2026,R1,residential,heatpump,newcapa,2034 A1,4.00000000000,R1,2028,R1,residential,heatpump,newcapa,2034 A1,5.00000000000,R1,2030,R1,residential,heatpump,newcapa,2034 -A1,11.00000000000,R1,2032,R1,residential,heatpump,newcapa,2034 -A1,7.00000000000,R1,2034,R1,residential,heatpump,newcapa,2034 -A1,1.00000000000,R1,2028,R1,power,gasCCGT,newcapa,2034 -A1,6.00000000000,R1,2030,R1,power,windturbine,newcapa,2034 -A1,11.00000000000,R1,2032,R1,power,windturbine,newcapa,2034 -A1,7.00000000000,R1,2034,R1,power,windturbine,newcapa,2034 -A1,1.00000000000,R1,2032,R1,residential,gasboiler,newcapa,2036 +A1,13.00000000000,R1,2032,R1,residential,heatpump,newcapa,2034 +A1,6.00000000000,R1,2034,R1,residential,heatpump,newcapa,2034 +A1,3.00000000000,R1,2022,R1,power,gasCCGT,newcapa,2034 +A1,1.00000000000,R1,2024,R1,power,gasCCGT,newcapa,2034 +A1,2.00000000000,R1,2026,R1,power,gasCCGT,newcapa,2034 +A1,3.00000000000,R1,2028,R1,power,gasCCGT,newcapa,2034 +A1,2.00000000000,R1,2022,R1,power,windturbine,newcapa,2034 +A1,5.00000000000,R1,2030,R1,power,windturbine,newcapa,2034 +A1,2.00000000000,R1,2032,R1,power,windturbine,newcapa,2034 +A1,2.00000000000,R1,2034,R1,power,windturbine,newcapa,2034 +A1,1.50000000000,R1,2020,R1,gas,gassupply1,newcapa,2034 +A1,1.99110000000,R1,2022,R1,gas,gassupply1,newcapa,2034 +A1,5.11670000000,R1,2028,R1,gas,gassupply1,newcapa,2034 +A1,0.42220000000,R1,2030,R1,gas,gassupply1,newcapa,2034 +A1,3.00000000000,R1,2032,R1,gas,gassupply1,newcapa,2034 +A1,3.00000000000,R1,2034,R1,gas,gassupply1,newcapa,2034 A1,4.00000000000,R1,2028,R1,residential,heatpump,newcapa,2036 A1,5.00000000000,R1,2030,R1,residential,heatpump,newcapa,2036 -A1,11.00000000000,R1,2032,R1,residential,heatpump,newcapa,2036 -A1,7.00000000000,R1,2034,R1,residential,heatpump,newcapa,2036 +A1,13.00000000000,R1,2032,R1,residential,heatpump,newcapa,2036 +A1,6.00000000000,R1,2034,R1,residential,heatpump,newcapa,2036 A1,6.00000000000,R1,2036,R1,residential,heatpump,newcapa,2036 -A1,1.00000000000,R1,2028,R1,power,gasCCGT,newcapa,2036 -A1,6.00000000000,R1,2030,R1,power,windturbine,newcapa,2036 -A1,11.00000000000,R1,2032,R1,power,windturbine,newcapa,2036 -A1,7.00000000000,R1,2034,R1,power,windturbine,newcapa,2036 -A1,6.00000000000,R1,2036,R1,power,windturbine,newcapa,2036 -A1,1.00000000000,R1,2032,R1,residential,gasboiler,newcapa,2038 +A1,3.00000000000,R1,2022,R1,power,gasCCGT,newcapa,2036 +A1,1.00000000000,R1,2024,R1,power,gasCCGT,newcapa,2036 +A1,2.00000000000,R1,2026,R1,power,gasCCGT,newcapa,2036 +A1,3.00000000000,R1,2028,R1,power,gasCCGT,newcapa,2036 +A1,2.00000000000,R1,2022,R1,power,windturbine,newcapa,2036 +A1,5.00000000000,R1,2030,R1,power,windturbine,newcapa,2036 +A1,2.00000000000,R1,2032,R1,power,windturbine,newcapa,2036 +A1,2.00000000000,R1,2034,R1,power,windturbine,newcapa,2036 +A1,2.00000000000,R1,2036,R1,power,windturbine,newcapa,2036 +A1,1.99110000000,R1,2022,R1,gas,gassupply1,newcapa,2036 +A1,5.11670000000,R1,2028,R1,gas,gassupply1,newcapa,2036 +A1,0.42220000000,R1,2030,R1,gas,gassupply1,newcapa,2036 +A1,3.00000000000,R1,2032,R1,gas,gassupply1,newcapa,2036 +A1,3.00000000000,R1,2034,R1,gas,gassupply1,newcapa,2036 +A1,1.50000000000,R1,2036,R1,gas,gassupply1,newcapa,2036 A1,5.00000000000,R1,2030,R1,residential,heatpump,newcapa,2038 -A1,11.00000000000,R1,2032,R1,residential,heatpump,newcapa,2038 -A1,7.00000000000,R1,2034,R1,residential,heatpump,newcapa,2038 +A1,13.00000000000,R1,2032,R1,residential,heatpump,newcapa,2038 +A1,6.00000000000,R1,2034,R1,residential,heatpump,newcapa,2038 A1,6.00000000000,R1,2036,R1,residential,heatpump,newcapa,2038 A1,6.00000000000,R1,2038,R1,residential,heatpump,newcapa,2038 -A1,1.00000000000,R1,2028,R1,power,gasCCGT,newcapa,2038 -A1,6.00000000000,R1,2030,R1,power,windturbine,newcapa,2038 -A1,11.00000000000,R1,2032,R1,power,windturbine,newcapa,2038 -A1,7.00000000000,R1,2034,R1,power,windturbine,newcapa,2038 -A1,6.00000000000,R1,2036,R1,power,windturbine,newcapa,2038 +A1,3.00000000000,R1,2022,R1,power,gasCCGT,newcapa,2038 +A1,1.00000000000,R1,2024,R1,power,gasCCGT,newcapa,2038 +A1,2.00000000000,R1,2026,R1,power,gasCCGT,newcapa,2038 +A1,3.00000000000,R1,2028,R1,power,gasCCGT,newcapa,2038 +A1,2.00000000000,R1,2022,R1,power,windturbine,newcapa,2038 +A1,5.00000000000,R1,2030,R1,power,windturbine,newcapa,2038 +A1,2.00000000000,R1,2032,R1,power,windturbine,newcapa,2038 +A1,2.00000000000,R1,2034,R1,power,windturbine,newcapa,2038 +A1,2.00000000000,R1,2036,R1,power,windturbine,newcapa,2038 A1,2.00000000000,R1,2038,R1,power,windturbine,newcapa,2038 -A1,1.00000000000,R1,2032,R1,residential,gasboiler,newcapa,2040 -A1,11.00000000000,R1,2032,R1,residential,heatpump,newcapa,2040 -A1,7.00000000000,R1,2034,R1,residential,heatpump,newcapa,2040 +A1,13.00000000000,R1,2032,R1,residential,heatpump,newcapa,2040 +A1,6.00000000000,R1,2034,R1,residential,heatpump,newcapa,2040 A1,6.00000000000,R1,2036,R1,residential,heatpump,newcapa,2040 A1,6.00000000000,R1,2038,R1,residential,heatpump,newcapa,2040 A1,8.00000000000,R1,2040,R1,residential,heatpump,newcapa,2040 -A1,1.00000000000,R1,2028,R1,power,gasCCGT,newcapa,2040 -A1,6.00000000000,R1,2030,R1,power,windturbine,newcapa,2040 -A1,11.00000000000,R1,2032,R1,power,windturbine,newcapa,2040 -A1,7.00000000000,R1,2034,R1,power,windturbine,newcapa,2040 -A1,6.00000000000,R1,2036,R1,power,windturbine,newcapa,2040 +A1,3.00000000000,R1,2022,R1,power,gasCCGT,newcapa,2040 +A1,1.00000000000,R1,2024,R1,power,gasCCGT,newcapa,2040 +A1,2.00000000000,R1,2026,R1,power,gasCCGT,newcapa,2040 +A1,3.00000000000,R1,2028,R1,power,gasCCGT,newcapa,2040 +A1,2.00000000000,R1,2022,R1,power,windturbine,newcapa,2040 +A1,5.00000000000,R1,2030,R1,power,windturbine,newcapa,2040 +A1,2.00000000000,R1,2032,R1,power,windturbine,newcapa,2040 +A1,2.00000000000,R1,2034,R1,power,windturbine,newcapa,2040 +A1,2.00000000000,R1,2036,R1,power,windturbine,newcapa,2040 A1,2.00000000000,R1,2038,R1,power,windturbine,newcapa,2040 A1,3.00000000000,R1,2040,R1,power,windturbine,newcapa,2040 -A1,9.48890000000,R1,2022,R1,gas,gassupply1,newcapa,2040 -A1,2.57780000000,R1,2024,R1,gas,gassupply1,newcapa,2040 -A1,4.07780000000,R1,2026,R1,gas,gassupply1,newcapa,2040 -A1,2.09220000000,R1,2028,R1,gas,gassupply1,newcapa,2040 +A1,1.99110000000,R1,2022,R1,gas,gassupply1,newcapa,2040 +A1,5.11670000000,R1,2028,R1,gas,gassupply1,newcapa,2040 A1,0.42220000000,R1,2030,R1,gas,gassupply1,newcapa,2040 +A1,3.00000000000,R1,2032,R1,gas,gassupply1,newcapa,2040 +A1,3.00000000000,R1,2034,R1,gas,gassupply1,newcapa,2040 +A1,1.50000000000,R1,2036,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 21a1723f6..66e93afd5 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 @@ -31,323 +31,323 @@ electricity,all-week,late-afternoon,all-year,19.50000000000,R1,7,MUS$2010/PJ,202 gas,all-week,late-afternoon,all-year,7.15280000000,R1,7,MUS$2010/PJ,2020 heat,all-week,late-afternoon,all-year,100.00000000000,R1,7,MUS$2010/PJ,2020 CO2f,all-week,late-afternoon,all-year,0.08310000000,R1,7,MUS$2010/kt,2020 -electricity,all-week,night,all-year,28.18210000000,R1,0,MUS$2010/PJ,2022 +electricity,all-week,night,all-year,17.84810000000,R1,0,MUS$2010/PJ,2022 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2022 -heat,all-week,night,all-year,11.14530000000,R1,0,MUS$2010/PJ,2022 +heat,all-week,night,all-year,9.94130000000,R1,0,MUS$2010/PJ,2022 CO2f,all-week,night,all-year,0.09790000000,R1,0,MUS$2010/kt,2022 -electricity,all-week,morning,all-year,21.14710000000,R1,1,MUS$2010/PJ,2022 +electricity,all-week,morning,all-year,17.84810000000,R1,1,MUS$2010/PJ,2022 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2022 -heat,all-week,morning,all-year,10.58990000000,R1,1,MUS$2010/PJ,2022 +heat,all-week,morning,all-year,9.94130000000,R1,1,MUS$2010/PJ,2022 CO2f,all-week,morning,all-year,0.09790000000,R1,1,MUS$2010/kt,2022 -electricity,all-week,mid-afternoon,all-year,28.18210000000,R1,2,MUS$2010/PJ,2022 +electricity,all-week,mid-afternoon,all-year,17.84810000000,R1,2,MUS$2010/PJ,2022 gas,all-week,mid-afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2022 -heat,all-week,mid-afternoon,all-year,11.14530000000,R1,2,MUS$2010/PJ,2022 +heat,all-week,mid-afternoon,all-year,9.94130000000,R1,2,MUS$2010/PJ,2022 CO2f,all-week,mid-afternoon,all-year,0.09790000000,R1,2,MUS$2010/kt,2022 -electricity,all-week,early-peak,all-year,21.14710000000,R1,3,MUS$2010/PJ,2022 +electricity,all-week,early-peak,all-year,17.84810000000,R1,3,MUS$2010/PJ,2022 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2022 -heat,all-week,early-peak,all-year,10.58990000000,R1,3,MUS$2010/PJ,2022 +heat,all-week,early-peak,all-year,9.94130000000,R1,3,MUS$2010/PJ,2022 CO2f,all-week,early-peak,all-year,0.09790000000,R1,3,MUS$2010/kt,2022 -electricity,all-week,late-peak,all-year,13.13840000000,R1,4,MUS$2010/PJ,2022 +electricity,all-week,late-peak,all-year,17.84810000000,R1,4,MUS$2010/PJ,2022 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2022 -heat,all-week,late-peak,all-year,9.91240000000,R1,4,MUS$2010/PJ,2022 +heat,all-week,late-peak,all-year,9.94130000000,R1,4,MUS$2010/PJ,2022 CO2f,all-week,late-peak,all-year,0.09790000000,R1,4,MUS$2010/kt,2022 -electricity,all-week,evening,all-year,16.45720000000,R1,5,MUS$2010/PJ,2022 +electricity,all-week,evening,all-year,17.84810000000,R1,5,MUS$2010/PJ,2022 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2022 -heat,all-week,evening,all-year,10.21960000000,R1,5,MUS$2010/PJ,2022 +heat,all-week,evening,all-year,9.94130000000,R1,5,MUS$2010/PJ,2022 CO2f,all-week,evening,all-year,0.09790000000,R1,5,MUS$2010/kt,2022 -electricity,all-week,early-morning,all-year,16.45720000000,R1,6,MUS$2010/PJ,2022 +electricity,all-week,early-morning,all-year,17.84810000000,R1,6,MUS$2010/PJ,2022 gas,all-week,early-morning,all-year,2.55000000000,R1,6,MUS$2010/PJ,2022 -heat,all-week,early-morning,all-year,10.21960000000,R1,6,MUS$2010/PJ,2022 +heat,all-week,early-morning,all-year,9.94130000000,R1,6,MUS$2010/PJ,2022 CO2f,all-week,early-morning,all-year,0.09790000000,R1,6,MUS$2010/kt,2022 -electricity,all-week,late-afternoon,all-year,16.45720000000,R1,7,MUS$2010/PJ,2022 +electricity,all-week,late-afternoon,all-year,17.84810000000,R1,7,MUS$2010/PJ,2022 gas,all-week,late-afternoon,all-year,2.55000000000,R1,7,MUS$2010/PJ,2022 -heat,all-week,late-afternoon,all-year,10.21960000000,R1,7,MUS$2010/PJ,2022 +heat,all-week,late-afternoon,all-year,9.94130000000,R1,7,MUS$2010/PJ,2022 CO2f,all-week,late-afternoon,all-year,0.09790000000,R1,7,MUS$2010/kt,2022 -electricity,all-week,night,all-year,28.18210000000,R1,0,MUS$2010/PJ,2024 +electricity,all-week,night,all-year,18.34290000000,R1,0,MUS$2010/PJ,2024 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2024 -heat,all-week,night,all-year,12.08070000000,R1,0,MUS$2010/PJ,2024 +heat,all-week,night,all-year,10.23890000000,R1,0,MUS$2010/PJ,2024 CO2f,all-week,night,all-year,0.11270000000,R1,0,MUS$2010/kt,2024 -electricity,all-week,morning,all-year,21.14710000000,R1,1,MUS$2010/PJ,2024 +electricity,all-week,morning,all-year,18.34290000000,R1,1,MUS$2010/PJ,2024 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2024 -heat,all-week,morning,all-year,11.53140000000,R1,1,MUS$2010/PJ,2024 +heat,all-week,morning,all-year,10.23890000000,R1,1,MUS$2010/PJ,2024 CO2f,all-week,morning,all-year,0.11270000000,R1,1,MUS$2010/kt,2024 -electricity,all-week,mid-afternoon,all-year,28.18210000000,R1,2,MUS$2010/PJ,2024 +electricity,all-week,mid-afternoon,all-year,18.34290000000,R1,2,MUS$2010/PJ,2024 gas,all-week,mid-afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2024 -heat,all-week,mid-afternoon,all-year,12.08070000000,R1,2,MUS$2010/PJ,2024 +heat,all-week,mid-afternoon,all-year,10.23890000000,R1,2,MUS$2010/PJ,2024 CO2f,all-week,mid-afternoon,all-year,0.11270000000,R1,2,MUS$2010/kt,2024 -electricity,all-week,early-peak,all-year,21.14710000000,R1,3,MUS$2010/PJ,2024 +electricity,all-week,early-peak,all-year,18.34290000000,R1,3,MUS$2010/PJ,2024 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2024 -heat,all-week,early-peak,all-year,11.53140000000,R1,3,MUS$2010/PJ,2024 +heat,all-week,early-peak,all-year,10.23890000000,R1,3,MUS$2010/PJ,2024 CO2f,all-week,early-peak,all-year,0.11270000000,R1,3,MUS$2010/kt,2024 -electricity,all-week,late-peak,all-year,13.13840000000,R1,4,MUS$2010/PJ,2024 +electricity,all-week,late-peak,all-year,18.34290000000,R1,4,MUS$2010/PJ,2024 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2024 -heat,all-week,late-peak,all-year,10.86820000000,R1,4,MUS$2010/PJ,2024 +heat,all-week,late-peak,all-year,10.23890000000,R1,4,MUS$2010/PJ,2024 CO2f,all-week,late-peak,all-year,0.11270000000,R1,4,MUS$2010/kt,2024 -electricity,all-week,evening,all-year,16.45720000000,R1,5,MUS$2010/PJ,2024 +electricity,all-week,evening,all-year,18.34290000000,R1,5,MUS$2010/PJ,2024 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2024 -heat,all-week,evening,all-year,11.16520000000,R1,5,MUS$2010/PJ,2024 +heat,all-week,evening,all-year,10.23890000000,R1,5,MUS$2010/PJ,2024 CO2f,all-week,evening,all-year,0.11270000000,R1,5,MUS$2010/kt,2024 -electricity,all-week,early-morning,all-year,16.45720000000,R1,6,MUS$2010/PJ,2024 +electricity,all-week,early-morning,all-year,18.34290000000,R1,6,MUS$2010/PJ,2024 gas,all-week,early-morning,all-year,2.55000000000,R1,6,MUS$2010/PJ,2024 -heat,all-week,early-morning,all-year,11.16520000000,R1,6,MUS$2010/PJ,2024 +heat,all-week,early-morning,all-year,10.23890000000,R1,6,MUS$2010/PJ,2024 CO2f,all-week,early-morning,all-year,0.11270000000,R1,6,MUS$2010/kt,2024 -electricity,all-week,late-afternoon,all-year,16.45720000000,R1,7,MUS$2010/PJ,2024 +electricity,all-week,late-afternoon,all-year,18.34290000000,R1,7,MUS$2010/PJ,2024 gas,all-week,late-afternoon,all-year,2.55000000000,R1,7,MUS$2010/PJ,2024 -heat,all-week,late-afternoon,all-year,11.16520000000,R1,7,MUS$2010/PJ,2024 +heat,all-week,late-afternoon,all-year,10.23890000000,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,28.18210000000,R1,0,MUS$2010/PJ,2026 +electricity,all-week,night,all-year,19.19800000000,R1,0,MUS$2010/PJ,2026 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2026 -heat,all-week,night,all-year,13.01990000000,R1,0,MUS$2010/PJ,2026 +heat,all-week,night,all-year,10.50420000000,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,21.14710000000,R1,1,MUS$2010/PJ,2026 +electricity,all-week,morning,all-year,19.19800000000,R1,1,MUS$2010/PJ,2026 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2026 -heat,all-week,morning,all-year,12.47560000000,R1,1,MUS$2010/PJ,2026 +heat,all-week,morning,all-year,10.50420000000,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,28.18210000000,R1,2,MUS$2010/PJ,2026 +electricity,all-week,mid-afternoon,all-year,19.19800000000,R1,2,MUS$2010/PJ,2026 gas,all-week,mid-afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2026 -heat,all-week,mid-afternoon,all-year,13.01990000000,R1,2,MUS$2010/PJ,2026 +heat,all-week,mid-afternoon,all-year,10.50420000000,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,21.14710000000,R1,3,MUS$2010/PJ,2026 +electricity,all-week,early-peak,all-year,19.19800000000,R1,3,MUS$2010/PJ,2026 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2026 -heat,all-week,early-peak,all-year,12.47560000000,R1,3,MUS$2010/PJ,2026 +heat,all-week,early-peak,all-year,10.50420000000,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,13.13840000000,R1,4,MUS$2010/PJ,2026 +electricity,all-week,late-peak,all-year,19.19800000000,R1,4,MUS$2010/PJ,2026 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2026 -heat,all-week,late-peak,all-year,11.82410000000,R1,4,MUS$2010/PJ,2026 +heat,all-week,late-peak,all-year,10.50420000000,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,16.45720000000,R1,5,MUS$2010/PJ,2026 +electricity,all-week,evening,all-year,19.19800000000,R1,5,MUS$2010/PJ,2026 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2026 -heat,all-week,evening,all-year,12.11280000000,R1,5,MUS$2010/PJ,2026 +heat,all-week,evening,all-year,10.50420000000,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,16.45720000000,R1,6,MUS$2010/PJ,2026 +electricity,all-week,early-morning,all-year,19.19800000000,R1,6,MUS$2010/PJ,2026 gas,all-week,early-morning,all-year,2.55000000000,R1,6,MUS$2010/PJ,2026 -heat,all-week,early-morning,all-year,12.11280000000,R1,6,MUS$2010/PJ,2026 +heat,all-week,early-morning,all-year,10.50420000000,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,16.45720000000,R1,7,MUS$2010/PJ,2026 +electricity,all-week,late-afternoon,all-year,19.19800000000,R1,7,MUS$2010/PJ,2026 gas,all-week,late-afternoon,all-year,2.55000000000,R1,7,MUS$2010/PJ,2026 -heat,all-week,late-afternoon,all-year,12.11280000000,R1,7,MUS$2010/PJ,2026 +heat,all-week,late-afternoon,all-year,10.50420000000,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,21.78380000000,R1,0,MUS$2010/PJ,2028 +electricity,all-week,night,all-year,21.33220000000,R1,0,MUS$2010/PJ,2028 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2028 -heat,all-week,night,all-year,13.79450000000,R1,0,MUS$2010/PJ,2028 +heat,all-week,night,all-year,11.15270000000,R1,0,MUS$2010/PJ,2028 CO2f,all-week,night,all-year,0.14220000000,R1,0,MUS$2010/kt,2028 -electricity,all-week,morning,all-year,20.43760000000,R1,1,MUS$2010/PJ,2028 +electricity,all-week,morning,all-year,21.33220000000,R1,1,MUS$2010/PJ,2028 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2028 -heat,all-week,morning,all-year,13.05290000000,R1,1,MUS$2010/PJ,2028 +heat,all-week,morning,all-year,11.15270000000,R1,1,MUS$2010/PJ,2028 CO2f,all-week,morning,all-year,0.14220000000,R1,1,MUS$2010/kt,2028 -electricity,all-week,mid-afternoon,all-year,21.78380000000,R1,2,MUS$2010/PJ,2028 +electricity,all-week,mid-afternoon,all-year,21.33220000000,R1,2,MUS$2010/PJ,2028 gas,all-week,mid-afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2028 -heat,all-week,mid-afternoon,all-year,13.79450000000,R1,2,MUS$2010/PJ,2028 +heat,all-week,mid-afternoon,all-year,11.15270000000,R1,2,MUS$2010/PJ,2028 CO2f,all-week,mid-afternoon,all-year,0.14220000000,R1,2,MUS$2010/kt,2028 -electricity,all-week,early-peak,all-year,20.43760000000,R1,3,MUS$2010/PJ,2028 +electricity,all-week,early-peak,all-year,21.33220000000,R1,3,MUS$2010/PJ,2028 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2028 -heat,all-week,early-peak,all-year,13.05290000000,R1,3,MUS$2010/PJ,2028 +heat,all-week,early-peak,all-year,11.15270000000,R1,3,MUS$2010/PJ,2028 CO2f,all-week,early-peak,all-year,0.14220000000,R1,3,MUS$2010/kt,2028 -electricity,all-week,late-peak,all-year,20.03640000000,R1,4,MUS$2010/PJ,2028 +electricity,all-week,late-peak,all-year,21.33220000000,R1,4,MUS$2010/PJ,2028 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2028 -heat,all-week,late-peak,all-year,12.24840000000,R1,4,MUS$2010/PJ,2028 +heat,all-week,late-peak,all-year,11.15270000000,R1,4,MUS$2010/PJ,2028 CO2f,all-week,late-peak,all-year,0.14220000000,R1,4,MUS$2010/kt,2028 -electricity,all-week,evening,all-year,20.03640000000,R1,5,MUS$2010/PJ,2028 +electricity,all-week,evening,all-year,21.33220000000,R1,5,MUS$2010/PJ,2028 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2028 -heat,all-week,evening,all-year,12.59030000000,R1,5,MUS$2010/PJ,2028 +heat,all-week,evening,all-year,11.15270000000,R1,5,MUS$2010/PJ,2028 CO2f,all-week,evening,all-year,0.14220000000,R1,5,MUS$2010/kt,2028 -electricity,all-week,early-morning,all-year,20.03640000000,R1,6,MUS$2010/PJ,2028 +electricity,all-week,early-morning,all-year,21.33220000000,R1,6,MUS$2010/PJ,2028 gas,all-week,early-morning,all-year,2.55000000000,R1,6,MUS$2010/PJ,2028 -heat,all-week,early-morning,all-year,12.59030000000,R1,6,MUS$2010/PJ,2028 +heat,all-week,early-morning,all-year,11.15270000000,R1,6,MUS$2010/PJ,2028 CO2f,all-week,early-morning,all-year,0.14220000000,R1,6,MUS$2010/kt,2028 -electricity,all-week,late-afternoon,all-year,20.03640000000,R1,7,MUS$2010/PJ,2028 +electricity,all-week,late-afternoon,all-year,21.33220000000,R1,7,MUS$2010/PJ,2028 gas,all-week,late-afternoon,all-year,2.55000000000,R1,7,MUS$2010/PJ,2028 -heat,all-week,late-afternoon,all-year,12.59030000000,R1,7,MUS$2010/PJ,2028 +heat,all-week,late-afternoon,all-year,11.15270000000,R1,7,MUS$2010/PJ,2028 CO2f,all-week,late-afternoon,all-year,0.14220000000,R1,7,MUS$2010/kt,2028 -electricity,all-week,night,all-year,27.14130000000,R1,0,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,21.66670000000,R1,0,MUS$2010/PJ,2030 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,15.04110000000,R1,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,11.16590000000,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,20.52480000000,R1,1,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,21.66670000000,R1,1,MUS$2010/PJ,2030 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,13.39530000000,R1,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,11.16590000000,R1,1,MUS$2010/PJ,2030 CO2f,all-week,morning,all-year,0.15700000000,R1,1,MUS$2010/kt,2030 -electricity,all-week,mid-afternoon,all-year,27.14130000000,R1,2,MUS$2010/PJ,2030 +electricity,all-week,mid-afternoon,all-year,21.66670000000,R1,2,MUS$2010/PJ,2030 gas,all-week,mid-afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2030 -heat,all-week,mid-afternoon,all-year,15.04110000000,R1,2,MUS$2010/PJ,2030 +heat,all-week,mid-afternoon,all-year,11.16590000000,R1,2,MUS$2010/PJ,2030 CO2f,all-week,mid-afternoon,all-year,0.15700000000,R1,2,MUS$2010/kt,2030 -electricity,all-week,early-peak,all-year,20.52480000000,R1,3,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,21.66670000000,R1,3,MUS$2010/PJ,2030 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,13.39530000000,R1,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,11.16590000000,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.10640000000,R1,4,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,21.66670000000,R1,4,MUS$2010/PJ,2030 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,11.46970000000,R1,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,11.16590000000,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,16.11390000000,R1,5,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,21.66670000000,R1,5,MUS$2010/PJ,2030 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,12.29810000000,R1,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,11.16590000000,R1,5,MUS$2010/PJ,2030 CO2f,all-week,evening,all-year,0.15700000000,R1,5,MUS$2010/kt,2030 -electricity,all-week,early-morning,all-year,16.11390000000,R1,6,MUS$2010/PJ,2030 +electricity,all-week,early-morning,all-year,21.66670000000,R1,6,MUS$2010/PJ,2030 gas,all-week,early-morning,all-year,2.55000000000,R1,6,MUS$2010/PJ,2030 -heat,all-week,early-morning,all-year,12.29810000000,R1,6,MUS$2010/PJ,2030 +heat,all-week,early-morning,all-year,11.16590000000,R1,6,MUS$2010/PJ,2030 CO2f,all-week,early-morning,all-year,0.15700000000,R1,6,MUS$2010/kt,2030 -electricity,all-week,late-afternoon,all-year,16.11390000000,R1,7,MUS$2010/PJ,2030 +electricity,all-week,late-afternoon,all-year,21.66670000000,R1,7,MUS$2010/PJ,2030 gas,all-week,late-afternoon,all-year,2.55000000000,R1,7,MUS$2010/PJ,2030 -heat,all-week,late-afternoon,all-year,12.29810000000,R1,7,MUS$2010/PJ,2030 +heat,all-week,late-afternoon,all-year,11.16590000000,R1,7,MUS$2010/PJ,2030 CO2f,all-week,late-afternoon,all-year,0.15700000000,R1,7,MUS$2010/kt,2030 -electricity,all-week,night,all-year,27.76890000000,R1,0,MUS$2010/PJ,2032 +electricity,all-week,night,all-year,22.77310000000,R1,0,MUS$2010/PJ,2032 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2032 -heat,all-week,night,all-year,15.61150000000,R1,0,MUS$2010/PJ,2032 +heat,all-week,night,all-year,11.59290000000,R1,0,MUS$2010/PJ,2032 CO2f,all-week,night,all-year,0.18020000000,R1,0,MUS$2010/kt,2032 -electricity,all-week,morning,all-year,20.16660000000,R1,1,MUS$2010/PJ,2032 +electricity,all-week,morning,all-year,22.77310000000,R1,1,MUS$2010/PJ,2032 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2032 -heat,all-week,morning,all-year,12.48980000000,R1,1,MUS$2010/PJ,2032 +heat,all-week,morning,all-year,11.59290000000,R1,1,MUS$2010/PJ,2032 CO2f,all-week,morning,all-year,0.18020000000,R1,1,MUS$2010/kt,2032 -electricity,all-week,mid-afternoon,all-year,27.76890000000,R1,2,MUS$2010/PJ,2032 +electricity,all-week,mid-afternoon,all-year,22.77310000000,R1,2,MUS$2010/PJ,2032 gas,all-week,mid-afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2032 -heat,all-week,mid-afternoon,all-year,15.61150000000,R1,2,MUS$2010/PJ,2032 +heat,all-week,mid-afternoon,all-year,11.59290000000,R1,2,MUS$2010/PJ,2032 CO2f,all-week,mid-afternoon,all-year,0.18020000000,R1,2,MUS$2010/kt,2032 -electricity,all-week,early-peak,all-year,20.16660000000,R1,3,MUS$2010/PJ,2032 +electricity,all-week,early-peak,all-year,22.77310000000,R1,3,MUS$2010/PJ,2032 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2032 -heat,all-week,early-peak,all-year,12.48980000000,R1,3,MUS$2010/PJ,2032 +heat,all-week,early-peak,all-year,11.59290000000,R1,3,MUS$2010/PJ,2032 CO2f,all-week,early-peak,all-year,0.18020000000,R1,3,MUS$2010/kt,2032 -electricity,all-week,late-peak,all-year,11.57930000000,R1,4,MUS$2010/PJ,2032 +electricity,all-week,late-peak,all-year,22.77310000000,R1,4,MUS$2010/PJ,2032 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2032 -heat,all-week,late-peak,all-year,8.91720000000,R1,4,MUS$2010/PJ,2032 +heat,all-week,late-peak,all-year,11.59290000000,R1,4,MUS$2010/PJ,2032 CO2f,all-week,late-peak,all-year,0.18020000000,R1,4,MUS$2010/kt,2032 -electricity,all-week,evening,all-year,15.09840000000,R1,5,MUS$2010/PJ,2032 +electricity,all-week,evening,all-year,22.77310000000,R1,5,MUS$2010/PJ,2032 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2032 -heat,all-week,evening,all-year,10.40860000000,R1,5,MUS$2010/PJ,2032 +heat,all-week,evening,all-year,11.59290000000,R1,5,MUS$2010/PJ,2032 CO2f,all-week,evening,all-year,0.18020000000,R1,5,MUS$2010/kt,2032 -electricity,all-week,early-morning,all-year,15.09840000000,R1,6,MUS$2010/PJ,2032 +electricity,all-week,early-morning,all-year,22.77310000000,R1,6,MUS$2010/PJ,2032 gas,all-week,early-morning,all-year,2.55000000000,R1,6,MUS$2010/PJ,2032 -heat,all-week,early-morning,all-year,10.40860000000,R1,6,MUS$2010/PJ,2032 +heat,all-week,early-morning,all-year,11.59290000000,R1,6,MUS$2010/PJ,2032 CO2f,all-week,early-morning,all-year,0.18020000000,R1,6,MUS$2010/kt,2032 -electricity,all-week,late-afternoon,all-year,15.09840000000,R1,7,MUS$2010/PJ,2032 +electricity,all-week,late-afternoon,all-year,22.77310000000,R1,7,MUS$2010/PJ,2032 gas,all-week,late-afternoon,all-year,2.55000000000,R1,7,MUS$2010/PJ,2032 -heat,all-week,late-afternoon,all-year,10.40860000000,R1,7,MUS$2010/PJ,2032 +heat,all-week,late-afternoon,all-year,11.59290000000,R1,7,MUS$2010/PJ,2032 CO2f,all-week,late-afternoon,all-year,0.18020000000,R1,7,MUS$2010/kt,2032 -electricity,all-week,night,all-year,28.90960000000,R1,0,MUS$2010/PJ,2034 +electricity,all-week,night,all-year,23.73320000000,R1,0,MUS$2010/PJ,2034 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2034 -heat,all-week,night,all-year,16.15900000000,R1,0,MUS$2010/PJ,2034 +heat,all-week,night,all-year,11.96350000000,R1,0,MUS$2010/PJ,2034 CO2f,all-week,night,all-year,0.20330000000,R1,0,MUS$2010/kt,2034 -electricity,all-week,morning,all-year,20.82540000000,R1,1,MUS$2010/PJ,2034 +electricity,all-week,morning,all-year,23.73320000000,R1,1,MUS$2010/PJ,2034 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2034 -heat,all-week,morning,all-year,12.26530000000,R1,1,MUS$2010/PJ,2034 +heat,all-week,morning,all-year,11.96350000000,R1,1,MUS$2010/PJ,2034 CO2f,all-week,morning,all-year,0.20330000000,R1,1,MUS$2010/kt,2034 -electricity,all-week,mid-afternoon,all-year,28.90960000000,R1,2,MUS$2010/PJ,2034 +electricity,all-week,mid-afternoon,all-year,23.73320000000,R1,2,MUS$2010/PJ,2034 gas,all-week,mid-afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2034 -heat,all-week,mid-afternoon,all-year,16.15900000000,R1,2,MUS$2010/PJ,2034 +heat,all-week,mid-afternoon,all-year,11.96350000000,R1,2,MUS$2010/PJ,2034 CO2f,all-week,mid-afternoon,all-year,0.20330000000,R1,2,MUS$2010/kt,2034 -electricity,all-week,early-peak,all-year,20.82540000000,R1,3,MUS$2010/PJ,2034 +electricity,all-week,early-peak,all-year,23.73320000000,R1,3,MUS$2010/PJ,2034 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2034 -heat,all-week,early-peak,all-year,12.26530000000,R1,3,MUS$2010/PJ,2034 +heat,all-week,early-peak,all-year,11.96350000000,R1,3,MUS$2010/PJ,2034 CO2f,all-week,early-peak,all-year,0.20330000000,R1,3,MUS$2010/kt,2034 -electricity,all-week,late-peak,all-year,11.34000000000,R1,4,MUS$2010/PJ,2034 +electricity,all-week,late-peak,all-year,23.73320000000,R1,4,MUS$2010/PJ,2034 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2034 -heat,all-week,late-peak,all-year,7.65920000000,R1,4,MUS$2010/PJ,2034 +heat,all-week,late-peak,all-year,11.96350000000,R1,4,MUS$2010/PJ,2034 CO2f,all-week,late-peak,all-year,0.20330000000,R1,4,MUS$2010/kt,2034 -electricity,all-week,evening,all-year,15.43600000000,R1,5,MUS$2010/PJ,2034 +electricity,all-week,evening,all-year,23.73320000000,R1,5,MUS$2010/PJ,2034 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2034 -heat,all-week,evening,all-year,9.66950000000,R1,5,MUS$2010/PJ,2034 +heat,all-week,evening,all-year,11.96350000000,R1,5,MUS$2010/PJ,2034 CO2f,all-week,evening,all-year,0.20330000000,R1,5,MUS$2010/kt,2034 -electricity,all-week,early-morning,all-year,15.43600000000,R1,6,MUS$2010/PJ,2034 +electricity,all-week,early-morning,all-year,23.73320000000,R1,6,MUS$2010/PJ,2034 gas,all-week,early-morning,all-year,2.55000000000,R1,6,MUS$2010/PJ,2034 -heat,all-week,early-morning,all-year,9.66950000000,R1,6,MUS$2010/PJ,2034 +heat,all-week,early-morning,all-year,11.96350000000,R1,6,MUS$2010/PJ,2034 CO2f,all-week,early-morning,all-year,0.20330000000,R1,6,MUS$2010/kt,2034 -electricity,all-week,late-afternoon,all-year,15.43600000000,R1,7,MUS$2010/PJ,2034 +electricity,all-week,late-afternoon,all-year,23.73320000000,R1,7,MUS$2010/PJ,2034 gas,all-week,late-afternoon,all-year,2.55000000000,R1,7,MUS$2010/PJ,2034 -heat,all-week,late-afternoon,all-year,9.66950000000,R1,7,MUS$2010/PJ,2034 +heat,all-week,late-afternoon,all-year,11.96350000000,R1,7,MUS$2010/PJ,2034 CO2f,all-week,late-afternoon,all-year,0.20330000000,R1,7,MUS$2010/kt,2034 -electricity,all-week,night,all-year,29.00110000000,R1,0,MUS$2010/PJ,2036 +electricity,all-week,night,all-year,24.57440000000,R1,0,MUS$2010/PJ,2036 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2036 -heat,all-week,night,all-year,15.94520000000,R1,0,MUS$2010/PJ,2036 +heat,all-week,night,all-year,12.28820000000,R1,0,MUS$2010/PJ,2036 CO2f,all-week,night,all-year,0.22650000000,R1,0,MUS$2010/kt,2036 -electricity,all-week,morning,all-year,20.82440000000,R1,1,MUS$2010/PJ,2036 +electricity,all-week,morning,all-year,24.57440000000,R1,1,MUS$2010/PJ,2036 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2036 -heat,all-week,morning,all-year,11.52040000000,R1,1,MUS$2010/PJ,2036 +heat,all-week,morning,all-year,12.28820000000,R1,1,MUS$2010/PJ,2036 CO2f,all-week,morning,all-year,0.22650000000,R1,1,MUS$2010/kt,2036 -electricity,all-week,mid-afternoon,all-year,29.00110000000,R1,2,MUS$2010/PJ,2036 +electricity,all-week,mid-afternoon,all-year,24.57440000000,R1,2,MUS$2010/PJ,2036 gas,all-week,mid-afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2036 -heat,all-week,mid-afternoon,all-year,15.94520000000,R1,2,MUS$2010/PJ,2036 +heat,all-week,mid-afternoon,all-year,12.28820000000,R1,2,MUS$2010/PJ,2036 CO2f,all-week,mid-afternoon,all-year,0.22650000000,R1,2,MUS$2010/kt,2036 -electricity,all-week,early-peak,all-year,20.82440000000,R1,3,MUS$2010/PJ,2036 +electricity,all-week,early-peak,all-year,24.57440000000,R1,3,MUS$2010/PJ,2036 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2036 -heat,all-week,early-peak,all-year,11.52040000000,R1,3,MUS$2010/PJ,2036 +heat,all-week,early-peak,all-year,12.28820000000,R1,3,MUS$2010/PJ,2036 CO2f,all-week,early-peak,all-year,0.22650000000,R1,3,MUS$2010/kt,2036 -electricity,all-week,late-peak,all-year,11.23880000000,R1,4,MUS$2010/PJ,2036 +electricity,all-week,late-peak,all-year,24.57440000000,R1,4,MUS$2010/PJ,2036 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2036 -heat,all-week,late-peak,all-year,6.30000000000,R1,4,MUS$2010/PJ,2036 +heat,all-week,late-peak,all-year,12.28820000000,R1,4,MUS$2010/PJ,2036 CO2f,all-week,late-peak,all-year,0.22650000000,R1,4,MUS$2010/kt,2036 -electricity,all-week,evening,all-year,15.37320000000,R1,5,MUS$2010/PJ,2036 +electricity,all-week,evening,all-year,24.57440000000,R1,5,MUS$2010/PJ,2036 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2036 -heat,all-week,evening,all-year,8.57040000000,R1,5,MUS$2010/PJ,2036 +heat,all-week,evening,all-year,12.28820000000,R1,5,MUS$2010/PJ,2036 CO2f,all-week,evening,all-year,0.22650000000,R1,5,MUS$2010/kt,2036 -electricity,all-week,early-morning,all-year,15.37320000000,R1,6,MUS$2010/PJ,2036 +electricity,all-week,early-morning,all-year,24.57440000000,R1,6,MUS$2010/PJ,2036 gas,all-week,early-morning,all-year,2.55000000000,R1,6,MUS$2010/PJ,2036 -heat,all-week,early-morning,all-year,8.57040000000,R1,6,MUS$2010/PJ,2036 +heat,all-week,early-morning,all-year,12.28820000000,R1,6,MUS$2010/PJ,2036 CO2f,all-week,early-morning,all-year,0.22650000000,R1,6,MUS$2010/kt,2036 -electricity,all-week,late-afternoon,all-year,15.37320000000,R1,7,MUS$2010/PJ,2036 +electricity,all-week,late-afternoon,all-year,24.57440000000,R1,7,MUS$2010/PJ,2036 gas,all-week,late-afternoon,all-year,2.55000000000,R1,7,MUS$2010/PJ,2036 -heat,all-week,late-afternoon,all-year,8.57040000000,R1,7,MUS$2010/PJ,2036 +heat,all-week,late-afternoon,all-year,12.28820000000,R1,7,MUS$2010/PJ,2036 CO2f,all-week,late-afternoon,all-year,0.22650000000,R1,7,MUS$2010/kt,2036 -electricity,all-week,night,all-year,29.01340000000,R1,0,MUS$2010/PJ,2038 +electricity,all-week,night,all-year,25.31740000000,R1,0,MUS$2010/PJ,2038 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2038 -heat,all-week,night,all-year,15.96350000000,R1,0,MUS$2010/PJ,2038 +heat,all-week,night,all-year,12.57500000000,R1,0,MUS$2010/PJ,2038 CO2f,all-week,night,all-year,0.24960000000,R1,0,MUS$2010/kt,2038 -electricity,all-week,morning,all-year,20.84430000000,R1,1,MUS$2010/PJ,2038 +electricity,all-week,morning,all-year,25.31740000000,R1,1,MUS$2010/PJ,2038 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2038 -heat,all-week,morning,all-year,11.54170000000,R1,1,MUS$2010/PJ,2038 +heat,all-week,morning,all-year,12.57500000000,R1,1,MUS$2010/PJ,2038 CO2f,all-week,morning,all-year,0.24960000000,R1,1,MUS$2010/kt,2038 -electricity,all-week,mid-afternoon,all-year,29.01340000000,R1,2,MUS$2010/PJ,2038 +electricity,all-week,mid-afternoon,all-year,25.31740000000,R1,2,MUS$2010/PJ,2038 gas,all-week,mid-afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2038 -heat,all-week,mid-afternoon,all-year,15.96350000000,R1,2,MUS$2010/PJ,2038 +heat,all-week,mid-afternoon,all-year,12.57500000000,R1,2,MUS$2010/PJ,2038 CO2f,all-week,mid-afternoon,all-year,0.24960000000,R1,2,MUS$2010/kt,2038 -electricity,all-week,early-peak,all-year,20.84430000000,R1,3,MUS$2010/PJ,2038 +electricity,all-week,early-peak,all-year,25.31740000000,R1,3,MUS$2010/PJ,2038 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2038 -heat,all-week,early-peak,all-year,11.54170000000,R1,3,MUS$2010/PJ,2038 +heat,all-week,early-peak,all-year,12.57500000000,R1,3,MUS$2010/PJ,2038 CO2f,all-week,early-peak,all-year,0.24960000000,R1,3,MUS$2010/kt,2038 -electricity,all-week,late-peak,all-year,11.30590000000,R1,4,MUS$2010/PJ,2038 +electricity,all-week,late-peak,all-year,25.31740000000,R1,4,MUS$2010/PJ,2038 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2038 -heat,all-week,late-peak,all-year,6.34770000000,R1,4,MUS$2010/PJ,2038 +heat,all-week,late-peak,all-year,12.57500000000,R1,4,MUS$2010/PJ,2038 CO2f,all-week,late-peak,all-year,0.24960000000,R1,4,MUS$2010/kt,2038 -electricity,all-week,evening,all-year,15.39820000000,R1,5,MUS$2010/PJ,2038 +electricity,all-week,evening,all-year,25.31740000000,R1,5,MUS$2010/PJ,2038 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2038 -heat,all-week,evening,all-year,8.59380000000,R1,5,MUS$2010/PJ,2038 +heat,all-week,evening,all-year,12.57500000000,R1,5,MUS$2010/PJ,2038 CO2f,all-week,evening,all-year,0.24960000000,R1,5,MUS$2010/kt,2038 -electricity,all-week,early-morning,all-year,15.39820000000,R1,6,MUS$2010/PJ,2038 +electricity,all-week,early-morning,all-year,25.31740000000,R1,6,MUS$2010/PJ,2038 gas,all-week,early-morning,all-year,2.55000000000,R1,6,MUS$2010/PJ,2038 -heat,all-week,early-morning,all-year,8.59380000000,R1,6,MUS$2010/PJ,2038 +heat,all-week,early-morning,all-year,12.57500000000,R1,6,MUS$2010/PJ,2038 CO2f,all-week,early-morning,all-year,0.24960000000,R1,6,MUS$2010/kt,2038 -electricity,all-week,late-afternoon,all-year,15.39820000000,R1,7,MUS$2010/PJ,2038 +electricity,all-week,late-afternoon,all-year,25.31740000000,R1,7,MUS$2010/PJ,2038 gas,all-week,late-afternoon,all-year,2.55000000000,R1,7,MUS$2010/PJ,2038 -heat,all-week,late-afternoon,all-year,8.59380000000,R1,7,MUS$2010/PJ,2038 +heat,all-week,late-afternoon,all-year,12.57500000000,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,29.74200000000,R1,0,MUS$2010/PJ,2040 +electricity,all-week,night,all-year,25.95080000000,R1,0,MUS$2010/PJ,2040 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,16.36400000000,R1,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,12.86960000000,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,21.34970000000,R1,1,MUS$2010/PJ,2040 +electricity,all-week,morning,all-year,25.95080000000,R1,1,MUS$2010/PJ,2040 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,11.82000000000,R1,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,12.86960000000,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,29.74200000000,R1,2,MUS$2010/PJ,2040 +electricity,all-week,mid-afternoon,all-year,25.95080000000,R1,2,MUS$2010/PJ,2040 gas,all-week,mid-afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2040 -heat,all-week,mid-afternoon,all-year,16.36400000000,R1,2,MUS$2010/PJ,2040 +heat,all-week,mid-afternoon,all-year,12.86960000000,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,21.34970000000,R1,3,MUS$2010/PJ,2040 +electricity,all-week,early-peak,all-year,25.95080000000,R1,3,MUS$2010/PJ,2040 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,11.82000000000,R1,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,12.86960000000,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,11.32890000000,R1,4,MUS$2010/PJ,2040 +electricity,all-week,late-peak,all-year,25.95080000000,R1,4,MUS$2010/PJ,2040 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,6.36560000000,R1,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,12.86960000000,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.75480000000,R1,5,MUS$2010/PJ,2040 +electricity,all-week,evening,all-year,25.95080000000,R1,5,MUS$2010/PJ,2040 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,8.79060000000,R1,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,12.86960000000,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,15.75480000000,R1,6,MUS$2010/PJ,2040 +electricity,all-week,early-morning,all-year,25.95080000000,R1,6,MUS$2010/PJ,2040 gas,all-week,early-morning,all-year,2.55000000000,R1,6,MUS$2010/PJ,2040 -heat,all-week,early-morning,all-year,8.79060000000,R1,6,MUS$2010/PJ,2040 +heat,all-week,early-morning,all-year,12.86960000000,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,15.75480000000,R1,7,MUS$2010/PJ,2040 +electricity,all-week,late-afternoon,all-year,25.95080000000,R1,7,MUS$2010/PJ,2040 gas,all-week,late-afternoon,all-year,2.55000000000,R1,7,MUS$2010/PJ,2040 -heat,all-week,late-afternoon,all-year,8.79060000000,R1,7,MUS$2010/PJ,2040 +heat,all-week,late-afternoon,all-year,12.86960000000,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/MCAPrices.csv b/docs/tutorial-code/new-decision-metric/Results/MCAPrices.csv index 1373ae1fc..3f213f3aa 100644 --- a/docs/tutorial-code/new-decision-metric/Results/MCAPrices.csv +++ b/docs/tutorial-code/new-decision-metric/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,23.65520000000,R1,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,16.05040000000,R1,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,13.53940000000,R1,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,9.60580000000,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,17.07860000000,R1,1,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,16.05040000000,R1,1,MUS$2010/PJ,2025 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,10.18560000000,R1,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,9.60580000000,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.65520000000,R1,2,MUS$2010/PJ,2025 +electricity,all-week,afternoon,all-year,16.05040000000,R1,2,MUS$2010/PJ,2025 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2025 -heat,all-week,afternoon,all-year,13.53940000000,R1,2,MUS$2010/PJ,2025 +heat,all-week,afternoon,all-year,9.60580000000,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,17.07860000000,R1,3,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,16.05040000000,R1,3,MUS$2010/PJ,2025 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,10.18560000000,R1,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,9.60580000000,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,11.06570000000,R1,4,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,16.05040000000,R1,4,MUS$2010/PJ,2025 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,7.01030000000,R1,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,9.60580000000,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,13.79030000000,R1,5,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,16.05040000000,R1,5,MUS$2010/PJ,2025 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,8.50870000000,R1,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,9.60580000000,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,25.57630000000,R1,0,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,16.02910000000,R1,0,MUS$2010/PJ,2030 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,14.55950000000,R1,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,9.00910000000,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,17.52910000000,R1,1,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,16.02910000000,R1,1,MUS$2010/PJ,2030 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,9.89760000000,R1,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,9.00910000000,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,25.57630000000,R1,2,MUS$2010/PJ,2030 +electricity,all-week,afternoon,all-year,16.02910000000,R1,2,MUS$2010/PJ,2030 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,14.55950000000,R1,2,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,9.00910000000,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,17.52910000000,R1,3,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,16.02910000000,R1,3,MUS$2010/PJ,2030 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,9.89760000000,R1,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,9.00910000000,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,9.68820000000,R1,4,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,16.02910000000,R1,4,MUS$2010/PJ,2030 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,5.31830000000,R1,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,9.00910000000,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.50550000000,R1,5,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,16.02910000000,R1,5,MUS$2010/PJ,2030 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,7.56670000000,R1,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,9.00910000000,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,25.77840000000,R1,0,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,16.17020000000,R1,0,MUS$2010/PJ,2035 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,14.64040000000,R1,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,9.06550000000,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,17.69530000000,R1,1,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,16.17020000000,R1,1,MUS$2010/PJ,2035 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,9.96420000000,R1,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,9.06550000000,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,25.77840000000,R1,2,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,16.17020000000,R1,2,MUS$2010/PJ,2035 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,14.64040000000,R1,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,9.06550000000,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,17.69530000000,R1,3,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,16.17020000000,R1,3,MUS$2010/PJ,2035 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,9.96420000000,R1,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,9.06550000000,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,9.78420000000,R1,4,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,16.17020000000,R1,4,MUS$2010/PJ,2035 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,5.35670000000,R1,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,9.06550000000,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,13.65380000000,R1,5,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,16.17020000000,R1,5,MUS$2010/PJ,2035 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,7.62600000000,R1,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,9.06550000000,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,25.92240000000,R1,0,MUS$2010/PJ,2040 +electricity,all-week,night,all-year,16.27050000000,R1,0,MUS$2010/PJ,2040 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,14.69800000000,R1,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,9.10560000000,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,17.81360000000,R1,1,MUS$2010/PJ,2040 +electricity,all-week,morning,all-year,16.27050000000,R1,1,MUS$2010/PJ,2040 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,10.01150000000,R1,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,9.10560000000,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,25.92240000000,R1,2,MUS$2010/PJ,2040 +electricity,all-week,afternoon,all-year,16.27050000000,R1,2,MUS$2010/PJ,2040 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2040 -heat,all-week,afternoon,all-year,14.69800000000,R1,2,MUS$2010/PJ,2040 +heat,all-week,afternoon,all-year,9.10560000000,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,17.81360000000,R1,3,MUS$2010/PJ,2040 +electricity,all-week,early-peak,all-year,16.27050000000,R1,3,MUS$2010/PJ,2040 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,10.01150000000,R1,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,9.10560000000,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,9.85230000000,R1,4,MUS$2010/PJ,2040 +electricity,all-week,late-peak,all-year,16.27050000000,R1,4,MUS$2010/PJ,2040 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,5.38390000000,R1,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,9.10560000000,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,13.75920000000,R1,5,MUS$2010/PJ,2040 +electricity,all-week,evening,all-year,16.27050000000,R1,5,MUS$2010/PJ,2040 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,7.66820000000,R1,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,9.10560000000,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,26.13180000000,R1,0,MUS$2010/PJ,2045 +electricity,all-week,night,all-year,16.44710000000,R1,0,MUS$2010/PJ,2045 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2045 -heat,all-week,night,all-year,14.78170000000,R1,0,MUS$2010/PJ,2045 +heat,all-week,night,all-year,9.17630000000,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.00380000000,R1,1,MUS$2010/PJ,2045 +electricity,all-week,morning,all-year,16.44710000000,R1,1,MUS$2010/PJ,2045 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2045 -heat,all-week,morning,all-year,10.08750000000,R1,1,MUS$2010/PJ,2045 +heat,all-week,morning,all-year,9.17630000000,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,26.13180000000,R1,2,MUS$2010/PJ,2045 +electricity,all-week,afternoon,all-year,16.44710000000,R1,2,MUS$2010/PJ,2045 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2045 -heat,all-week,afternoon,all-year,14.78170000000,R1,2,MUS$2010/PJ,2045 +heat,all-week,afternoon,all-year,9.17630000000,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.00380000000,R1,3,MUS$2010/PJ,2045 +electricity,all-week,early-peak,all-year,16.44710000000,R1,3,MUS$2010/PJ,2045 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2045 -heat,all-week,early-peak,all-year,10.08750000000,R1,3,MUS$2010/PJ,2045 +heat,all-week,early-peak,all-year,9.17630000000,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,10.00480000000,R1,4,MUS$2010/PJ,2045 +electricity,all-week,late-peak,all-year,16.44710000000,R1,4,MUS$2010/PJ,2045 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2045 -heat,all-week,late-peak,all-year,5.44490000000,R1,4,MUS$2010/PJ,2045 +heat,all-week,late-peak,all-year,9.17630000000,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,13.93980000000,R1,5,MUS$2010/PJ,2045 +electricity,all-week,evening,all-year,16.44710000000,R1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2045 -heat,all-week,evening,all-year,7.74040000000,R1,5,MUS$2010/PJ,2045 +heat,all-week,evening,all-year,9.17630000000,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,26.87330000000,R1,0,MUS$2010/PJ,2050 +electricity,all-week,night,all-year,16.93290000000,R1,0,MUS$2010/PJ,2050 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,15.07830000000,R1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,9.37060000000,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,18.53730000000,R1,1,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,16.93290000000,R1,1,MUS$2010/PJ,2050 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,10.30100000000,R1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,9.37060000000,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,26.87330000000,R1,2,MUS$2010/PJ,2050 +electricity,all-week,afternoon,all-year,16.93290000000,R1,2,MUS$2010/PJ,2050 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,15.07830000000,R1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,9.37060000000,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,18.53730000000,R1,3,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,16.93290000000,R1,3,MUS$2010/PJ,2050 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,10.30100000000,R1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,9.37060000000,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,10.31880000000,R1,4,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,16.93290000000,R1,4,MUS$2010/PJ,2050 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,5.57050000000,R1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,9.37060000000,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,14.36940000000,R1,5,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,16.93290000000,R1,5,MUS$2010/PJ,2050 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,7.91230000000,R1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,9.37060000000,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/Results/MCACapacity.csv b/tests/example_outputs/default/Results/MCACapacity.csv index 53ad47409..6a813b9dd 100644 --- a/tests/example_outputs/default/Results/MCACapacity.csv +++ b/tests/example_outputs/default/Results/MCACapacity.csv @@ -3,43 +3,63 @@ 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,2025,R1,residential,gasboiler,newcapa,2025 +A1,19.00000000000,R1,2025,R1,residential,heatpump,newcapa,2025 A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2025 +A1,6.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2025 +A1,1.00000000000,R1,2025,R1,power,windturbine,newcapa,2025 A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2025 -A1,15.93330000000,R1,2025,R1,gas,gassupply1,newcapa,2025 -A1,19.00000000000,R1,2025,R1,residential,gasboiler,newcapa,2030 +A1,3.13440000000,R1,2025,R1,gas,gassupply1,newcapa,2025 +A1,19.00000000000,R1,2025,R1,residential,heatpump,newcapa,2030 A1,11.00000000000,R1,2030,R1,residential,heatpump,newcapa,2030 -A1,11.00000000000,R1,2030,R1,power,windturbine,newcapa,2030 +A1,6.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2030 +A1,3.00000000000,R1,2030,R1,power,gasCCGT,newcapa,2030 +A1,1.00000000000,R1,2025,R1,power,windturbine,newcapa,2030 +A1,6.00000000000,R1,2030,R1,power,windturbine,newcapa,2030 A1,7.50000000000,R1,2020,R1,gas,gassupply1,newcapa,2030 -A1,15.93330000000,R1,2025,R1,gas,gassupply1,newcapa,2030 -A1,1.05560000000,R1,2030,R1,gas,gassupply1,newcapa,2030 +A1,3.13440000000,R1,2025,R1,gas,gassupply1,newcapa,2030 +A1,4.39560000000,R1,2030,R1,gas,gassupply1,newcapa,2030 A1,11.00000000000,R1,2030,R1,residential,heatpump,newcapa,2035 A1,25.00000000000,R1,2035,R1,residential,heatpump,newcapa,2035 -A1,11.00000000000,R1,2030,R1,power,windturbine,newcapa,2035 -A1,24.00000000000,R1,2035,R1,power,windturbine,newcapa,2035 -A1,15.93330000000,R1,2025,R1,gas,gassupply1,newcapa,2035 -A1,1.05560000000,R1,2030,R1,gas,gassupply1,newcapa,2035 +A1,6.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2035 +A1,3.00000000000,R1,2030,R1,power,gasCCGT,newcapa,2035 +A1,1.00000000000,R1,2025,R1,power,windturbine,newcapa,2035 +A1,6.00000000000,R1,2030,R1,power,windturbine,newcapa,2035 +A1,8.00000000000,R1,2035,R1,power,windturbine,newcapa,2035 +A1,3.13440000000,R1,2025,R1,gas,gassupply1,newcapa,2035 +A1,4.39560000000,R1,2030,R1,gas,gassupply1,newcapa,2035 +A1,7.50000000000,R1,2035,R1,gas,gassupply1,newcapa,2035 A1,25.00000000000,R1,2035,R1,residential,heatpump,newcapa,2040 A1,17.00000000000,R1,2040,R1,residential,heatpump,newcapa,2040 -A1,11.00000000000,R1,2030,R1,power,windturbine,newcapa,2040 -A1,24.00000000000,R1,2035,R1,power,windturbine,newcapa,2040 +A1,6.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2040 +A1,3.00000000000,R1,2030,R1,power,gasCCGT,newcapa,2040 +A1,1.00000000000,R1,2025,R1,power,windturbine,newcapa,2040 +A1,6.00000000000,R1,2030,R1,power,windturbine,newcapa,2040 +A1,8.00000000000,R1,2035,R1,power,windturbine,newcapa,2040 A1,6.00000000000,R1,2040,R1,power,windturbine,newcapa,2040 -A1,15.93330000000,R1,2025,R1,gas,gassupply1,newcapa,2040 -A1,1.05560000000,R1,2030,R1,gas,gassupply1,newcapa,2040 +A1,3.13440000000,R1,2025,R1,gas,gassupply1,newcapa,2040 +A1,4.39560000000,R1,2030,R1,gas,gassupply1,newcapa,2040 +A1,7.50000000000,R1,2035,R1,gas,gassupply1,newcapa,2040 A1,17.00000000000,R1,2040,R1,residential,heatpump,newcapa,2045 A1,31.00000000000,R1,2045,R1,residential,heatpump,newcapa,2045 -A1,11.00000000000,R1,2030,R1,power,windturbine,newcapa,2045 -A1,24.00000000000,R1,2035,R1,power,windturbine,newcapa,2045 +A1,6.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2045 +A1,3.00000000000,R1,2030,R1,power,gasCCGT,newcapa,2045 +A1,1.00000000000,R1,2025,R1,power,windturbine,newcapa,2045 +A1,6.00000000000,R1,2030,R1,power,windturbine,newcapa,2045 +A1,8.00000000000,R1,2035,R1,power,windturbine,newcapa,2045 A1,6.00000000000,R1,2040,R1,power,windturbine,newcapa,2045 A1,6.00000000000,R1,2045,R1,power,windturbine,newcapa,2045 -A1,15.93330000000,R1,2025,R1,gas,gassupply1,newcapa,2045 -A1,1.05560000000,R1,2030,R1,gas,gassupply1,newcapa,2045 +A1,3.13440000000,R1,2025,R1,gas,gassupply1,newcapa,2045 +A1,4.39560000000,R1,2030,R1,gas,gassupply1,newcapa,2045 +A1,7.50000000000,R1,2035,R1,gas,gassupply1,newcapa,2045 A1,31.00000000000,R1,2045,R1,residential,heatpump,newcapa,2050 A1,23.00000000000,R1,2050,R1,residential,heatpump,newcapa,2050 -A1,11.00000000000,R1,2030,R1,power,windturbine,newcapa,2050 -A1,24.00000000000,R1,2035,R1,power,windturbine,newcapa,2050 +A1,6.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2050 +A1,3.00000000000,R1,2030,R1,power,gasCCGT,newcapa,2050 +A1,6.00000000000,R1,2030,R1,power,windturbine,newcapa,2050 +A1,8.00000000000,R1,2035,R1,power,windturbine,newcapa,2050 A1,6.00000000000,R1,2040,R1,power,windturbine,newcapa,2050 A1,6.00000000000,R1,2045,R1,power,windturbine,newcapa,2050 -A1,6.00000000000,R1,2050,R1,power,windturbine,newcapa,2050 -A1,15.93330000000,R1,2025,R1,gas,gassupply1,newcapa,2050 -A1,1.05560000000,R1,2030,R1,gas,gassupply1,newcapa,2050 +A1,7.00000000000,R1,2050,R1,power,windturbine,newcapa,2050 +A1,3.13440000000,R1,2025,R1,gas,gassupply1,newcapa,2050 +A1,4.39560000000,R1,2030,R1,gas,gassupply1,newcapa,2050 +A1,7.50000000000,R1,2035,R1,gas,gassupply1,newcapa,2050 diff --git a/tests/example_outputs/default/Results/MCAPrices.csv b/tests/example_outputs/default/Results/MCAPrices.csv index d024aae2b..6b2d01f5b 100644 --- a/tests/example_outputs/default/Results/MCAPrices.csv +++ b/tests/example_outputs/default/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,29.26230000000,R1,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,19.57510000000,R1,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,12.58300000000,R1,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,10.72190000000,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,20.51690000000,R1,1,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,19.57510000000,R1,1,MUS$2010/PJ,2025 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,11.96460000000,R1,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,10.72190000000,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,29.26230000000,R1,2,MUS$2010/PJ,2025 +electricity,all-week,afternoon,all-year,19.57510000000,R1,2,MUS$2010/PJ,2025 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2025 -heat,all-week,afternoon,all-year,12.58300000000,R1,2,MUS$2010/PJ,2025 +heat,all-week,afternoon,all-year,10.72190000000,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,20.51690000000,R1,3,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,19.57510000000,R1,3,MUS$2010/PJ,2025 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,11.96460000000,R1,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,10.72190000000,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.13090000000,R1,4,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,19.57510000000,R1,4,MUS$2010/PJ,2025 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,11.34610000000,R1,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,10.72190000000,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,16.14420000000,R1,5,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,19.57510000000,R1,5,MUS$2010/PJ,2025 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,11.65540000000,R1,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,10.72190000000,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,29.99960000000,R1,0,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,21.60150000000,R1,0,MUS$2010/PJ,2030 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,15.46990000000,R1,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,11.23800000000,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,19.99980000000,R1,1,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,21.60150000000,R1,1,MUS$2010/PJ,2030 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,13.08250000000,R1,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,11.23800000000,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,29.99960000000,R1,2,MUS$2010/PJ,2030 +electricity,all-week,afternoon,all-year,21.60150000000,R1,2,MUS$2010/PJ,2030 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,15.46990000000,R1,2,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,11.23800000000,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,19.99980000000,R1,3,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,21.60150000000,R1,3,MUS$2010/PJ,2030 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,13.08250000000,R1,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,11.23800000000,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,9.99990000000,R1,4,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,21.60150000000,R1,4,MUS$2010/PJ,2030 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,10.69510000000,R1,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,11.23800000000,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,14.99980000000,R1,5,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,21.60150000000,R1,5,MUS$2010/PJ,2030 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,11.88880000000,R1,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,11.23800000000,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,29.16630000000,R1,0,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,24.10090000000,R1,0,MUS$2010/PJ,2035 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,16.32890000000,R1,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,12.23780000000,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.44420000000,R1,1,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,24.10090000000,R1,1,MUS$2010/PJ,2035 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,10.88590000000,R1,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,12.23780000000,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,29.16630000000,R1,2,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,24.10090000000,R1,2,MUS$2010/PJ,2035 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,16.32890000000,R1,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,12.23780000000,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,19.44420000000,R1,3,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,24.10090000000,R1,3,MUS$2010/PJ,2035 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,10.88590000000,R1,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,12.23780000000,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,9.99990000000,R1,4,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,24.10090000000,R1,4,MUS$2010/PJ,2035 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,5.44300000000,R1,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,12.23780000000,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.58320000000,R1,5,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,24.10090000000,R1,5,MUS$2010/PJ,2035 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,8.16440000000,R1,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,12.23780000000,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,29.28540000000,R1,0,MUS$2010/PJ,2040 +electricity,all-week,night,all-year,25.80410000000,R1,0,MUS$2010/PJ,2040 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,15.99560000000,R1,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,12.91910000000,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,19.52360000000,R1,1,MUS$2010/PJ,2040 +electricity,all-week,morning,all-year,25.80410000000,R1,1,MUS$2010/PJ,2040 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,10.66370000000,R1,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,12.91910000000,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,29.28540000000,R1,2,MUS$2010/PJ,2040 +electricity,all-week,afternoon,all-year,25.80410000000,R1,2,MUS$2010/PJ,2040 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2040 -heat,all-week,afternoon,all-year,15.99560000000,R1,2,MUS$2010/PJ,2040 +heat,all-week,afternoon,all-year,12.91910000000,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,19.52360000000,R1,3,MUS$2010/PJ,2040 +electricity,all-week,early-peak,all-year,25.80410000000,R1,3,MUS$2010/PJ,2040 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,10.66370000000,R1,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,12.91910000000,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,9.99990000000,R1,4,MUS$2010/PJ,2040 +electricity,all-week,late-peak,all-year,25.80410000000,R1,4,MUS$2010/PJ,2040 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,5.44300000000,R1,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,12.91910000000,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,14.64270000000,R1,5,MUS$2010/PJ,2040 +electricity,all-week,evening,all-year,25.80410000000,R1,5,MUS$2010/PJ,2040 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,7.99780000000,R1,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,12.91910000000,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,29.37460000000,R1,0,MUS$2010/PJ,2045 +electricity,all-week,night,all-year,27.99370000000,R1,0,MUS$2010/PJ,2045 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2045 -heat,all-week,night,all-year,16.04320000000,R1,0,MUS$2010/PJ,2045 +heat,all-week,night,all-year,13.79490000000,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.58310000000,R1,1,MUS$2010/PJ,2045 +electricity,all-week,morning,all-year,27.99370000000,R1,1,MUS$2010/PJ,2045 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2045 -heat,all-week,morning,all-year,10.69540000000,R1,1,MUS$2010/PJ,2045 +heat,all-week,morning,all-year,13.79490000000,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,29.37460000000,R1,2,MUS$2010/PJ,2045 +electricity,all-week,afternoon,all-year,27.99370000000,R1,2,MUS$2010/PJ,2045 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2045 -heat,all-week,afternoon,all-year,16.04320000000,R1,2,MUS$2010/PJ,2045 +heat,all-week,afternoon,all-year,13.79490000000,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,19.58310000000,R1,3,MUS$2010/PJ,2045 +electricity,all-week,early-peak,all-year,27.99370000000,R1,3,MUS$2010/PJ,2045 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2045 -heat,all-week,early-peak,all-year,10.69540000000,R1,3,MUS$2010/PJ,2045 +heat,all-week,early-peak,all-year,13.79490000000,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,9.99990000000,R1,4,MUS$2010/PJ,2045 +electricity,all-week,late-peak,all-year,27.99370000000,R1,4,MUS$2010/PJ,2045 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2045 -heat,all-week,late-peak,all-year,5.44300000000,R1,4,MUS$2010/PJ,2045 +heat,all-week,late-peak,all-year,13.79490000000,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,14.68730000000,R1,5,MUS$2010/PJ,2045 +electricity,all-week,evening,all-year,27.99370000000,R1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2045 -heat,all-week,evening,all-year,8.02160000000,R1,5,MUS$2010/PJ,2045 +heat,all-week,evening,all-year,13.79490000000,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,29.44410000000,R1,0,MUS$2010/PJ,2050 +electricity,all-week,night,all-year,29.69170000000,R1,0,MUS$2010/PJ,2050 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,16.07890000000,R1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,14.47410000000,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.62940000000,R1,1,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,29.69170000000,R1,1,MUS$2010/PJ,2050 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,10.71930000000,R1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,14.47410000000,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,29.44410000000,R1,2,MUS$2010/PJ,2050 +electricity,all-week,afternoon,all-year,29.69170000000,R1,2,MUS$2010/PJ,2050 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,16.07890000000,R1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,14.47410000000,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.62940000000,R1,3,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,29.69170000000,R1,3,MUS$2010/PJ,2050 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,10.71930000000,R1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,14.47410000000,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.99990000000,R1,4,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,29.69170000000,R1,4,MUS$2010/PJ,2050 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,5.44300000000,R1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,14.47410000000,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,14.72200000000,R1,5,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,29.69170000000,R1,5,MUS$2010/PJ,2050 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,8.03940000000,R1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,14.47410000000,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_retro/Results/MCACapacity.csv b/tests/example_outputs/default_retro/Results/MCACapacity.csv index 8565e4ad7..ca280d002 100644 --- a/tests/example_outputs/default_retro/Results/MCACapacity.csv +++ b/tests/example_outputs/default_retro/Results/MCACapacity.csv @@ -3,43 +3,48 @@ A1,10.00000000000,R1,2020,R1,residential,gasboiler,retrofit,2020 A1,1.00000000000,R1,2020,R1,power,gasCCGT,retrofit,2020 A1,15.00000000000,R1,2020,R1,gas,gassupply1,retrofit,2020 A1,5.00000000000,R1,2020,R1,residential,gasboiler,retrofit,2025 -A1,19.00000000000,R1,2025,R1,residential,gasboiler,retrofit,2025 +A1,19.00000000000,R1,2025,R1,residential,heatpump,retrofit,2025 A1,1.00000000000,R1,2020,R1,power,gasCCGT,retrofit,2025 +A1,7.44440000000,R1,2025,R1,power,gasCCGT,retrofit,2025 A1,15.00000000000,R1,2020,R1,gas,gassupply1,retrofit,2025 -A1,15.93330000000,R1,2025,R1,gas,gassupply1,retrofit,2025 -A1,19.00000000000,R1,2025,R1,residential,gasboiler,retrofit,2030 +A1,5.54670000000,R1,2025,R1,gas,gassupply1,retrofit,2025 +A1,19.00000000000,R1,2025,R1,residential,heatpump,retrofit,2030 A1,11.00000000000,R1,2030,R1,residential,heatpump,retrofit,2030 -A1,11.00000000000,R1,2030,R1,power,windturbine,retrofit,2030 +A1,7.44440000000,R1,2025,R1,power,gasCCGT,retrofit,2030 +A1,13.25000000000,R1,2030,R1,power,windturbine,retrofit,2030 A1,7.50000000000,R1,2020,R1,gas,gassupply1,retrofit,2030 -A1,15.93330000000,R1,2025,R1,gas,gassupply1,retrofit,2030 -A1,1.05560000000,R1,2030,R1,gas,gassupply1,retrofit,2030 +A1,5.54670000000,R1,2025,R1,gas,gassupply1,retrofit,2030 A1,11.00000000000,R1,2030,R1,residential,heatpump,retrofit,2035 A1,25.00000000000,R1,2035,R1,residential,heatpump,retrofit,2035 -A1,11.00000000000,R1,2030,R1,power,windturbine,retrofit,2035 -A1,25.00000000000,R1,2035,R1,power,windturbine,retrofit,2035 -A1,15.93330000000,R1,2025,R1,gas,gassupply1,retrofit,2035 -A1,1.05560000000,R1,2030,R1,gas,gassupply1,retrofit,2035 +A1,7.44440000000,R1,2025,R1,power,gasCCGT,retrofit,2035 +A1,13.25000000000,R1,2030,R1,power,windturbine,retrofit,2035 +A1,6.00000000000,R1,2035,R1,power,windturbine,retrofit,2035 +A1,5.54670000000,R1,2025,R1,gas,gassupply1,retrofit,2035 +A1,6.88560000000,R1,2035,R1,gas,gassupply1,retrofit,2035 A1,25.00000000000,R1,2035,R1,residential,heatpump,retrofit,2040 A1,17.00000000000,R1,2040,R1,residential,heatpump,retrofit,2040 -A1,11.00000000000,R1,2030,R1,power,windturbine,retrofit,2040 -A1,25.00000000000,R1,2035,R1,power,windturbine,retrofit,2040 +A1,7.44440000000,R1,2025,R1,power,gasCCGT,retrofit,2040 +A1,13.25000000000,R1,2030,R1,power,windturbine,retrofit,2040 +A1,6.00000000000,R1,2035,R1,power,windturbine,retrofit,2040 A1,6.00000000000,R1,2040,R1,power,windturbine,retrofit,2040 -A1,15.93330000000,R1,2025,R1,gas,gassupply1,retrofit,2040 -A1,1.05560000000,R1,2030,R1,gas,gassupply1,retrofit,2040 +A1,5.54670000000,R1,2025,R1,gas,gassupply1,retrofit,2040 +A1,6.88560000000,R1,2035,R1,gas,gassupply1,retrofit,2040 A1,17.00000000000,R1,2040,R1,residential,heatpump,retrofit,2045 A1,31.00000000000,R1,2045,R1,residential,heatpump,retrofit,2045 -A1,11.00000000000,R1,2030,R1,power,windturbine,retrofit,2045 -A1,25.00000000000,R1,2035,R1,power,windturbine,retrofit,2045 +A1,7.44440000000,R1,2025,R1,power,gasCCGT,retrofit,2045 +A1,13.25000000000,R1,2030,R1,power,windturbine,retrofit,2045 +A1,6.00000000000,R1,2035,R1,power,windturbine,retrofit,2045 A1,6.00000000000,R1,2040,R1,power,windturbine,retrofit,2045 A1,6.00000000000,R1,2045,R1,power,windturbine,retrofit,2045 -A1,15.93330000000,R1,2025,R1,gas,gassupply1,retrofit,2045 -A1,1.05560000000,R1,2030,R1,gas,gassupply1,retrofit,2045 +A1,5.54670000000,R1,2025,R1,gas,gassupply1,retrofit,2045 +A1,6.88560000000,R1,2035,R1,gas,gassupply1,retrofit,2045 A1,31.00000000000,R1,2045,R1,residential,heatpump,retrofit,2050 A1,23.00000000000,R1,2050,R1,residential,heatpump,retrofit,2050 -A1,11.00000000000,R1,2030,R1,power,windturbine,retrofit,2050 -A1,25.00000000000,R1,2035,R1,power,windturbine,retrofit,2050 +A1,7.44440000000,R1,2025,R1,power,gasCCGT,retrofit,2050 +A1,13.25000000000,R1,2030,R1,power,windturbine,retrofit,2050 +A1,6.00000000000,R1,2035,R1,power,windturbine,retrofit,2050 A1,6.00000000000,R1,2040,R1,power,windturbine,retrofit,2050 A1,6.00000000000,R1,2045,R1,power,windturbine,retrofit,2050 A1,6.00000000000,R1,2050,R1,power,windturbine,retrofit,2050 -A1,15.93330000000,R1,2025,R1,gas,gassupply1,retrofit,2050 -A1,1.05560000000,R1,2030,R1,gas,gassupply1,retrofit,2050 +A1,5.54670000000,R1,2025,R1,gas,gassupply1,retrofit,2050 +A1,6.88560000000,R1,2035,R1,gas,gassupply1,retrofit,2050 diff --git a/tests/example_outputs/default_retro/Results/MCAPrices.csv b/tests/example_outputs/default_retro/Results/MCAPrices.csv index 89d70fbf7..a42f1fbfa 100644 --- a/tests/example_outputs/default_retro/Results/MCAPrices.csv +++ b/tests/example_outputs/default_retro/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,30.32710000000,R1,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,20.19730000000,R1,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,12.58300000000,R1,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,10.91890000000,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,21.18690000000,R1,1,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,20.19730000000,R1,1,MUS$2010/PJ,2025 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,11.96460000000,R1,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,10.91890000000,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,30.32710000000,R1,2,MUS$2010/PJ,2025 +electricity,all-week,afternoon,all-year,20.19730000000,R1,2,MUS$2010/PJ,2025 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2025 -heat,all-week,afternoon,all-year,12.58300000000,R1,2,MUS$2010/PJ,2025 +heat,all-week,afternoon,all-year,10.91890000000,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.18690000000,R1,3,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,20.19730000000,R1,3,MUS$2010/PJ,2025 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,11.96460000000,R1,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,10.91890000000,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.04670000000,R1,4,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,20.19730000000,R1,4,MUS$2010/PJ,2025 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,11.34610000000,R1,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,10.91890000000,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,16.61680000000,R1,5,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,20.19730000000,R1,5,MUS$2010/PJ,2025 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,11.65540000000,R1,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,10.91890000000,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,29.99960000000,R1,0,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,21.11680000000,R1,0,MUS$2010/PJ,2030 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,15.46990000000,R1,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,11.04410000000,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,19.99980000000,R1,1,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,21.11680000000,R1,1,MUS$2010/PJ,2030 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,13.08250000000,R1,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,11.04410000000,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,29.99960000000,R1,2,MUS$2010/PJ,2030 +electricity,all-week,afternoon,all-year,21.11680000000,R1,2,MUS$2010/PJ,2030 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,15.46990000000,R1,2,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,11.04410000000,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,19.99980000000,R1,3,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,21.11680000000,R1,3,MUS$2010/PJ,2030 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,13.08250000000,R1,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,11.04410000000,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,9.99990000000,R1,4,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,21.11680000000,R1,4,MUS$2010/PJ,2030 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,10.69510000000,R1,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,11.04410000000,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,14.99980000000,R1,5,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,21.11680000000,R1,5,MUS$2010/PJ,2030 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,11.88880000000,R1,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,11.04410000000,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,29.99960000000,R1,0,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,23.06600000000,R1,0,MUS$2010/PJ,2035 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,16.32890000000,R1,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,11.82380000000,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.99980000000,R1,1,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,23.06600000000,R1,1,MUS$2010/PJ,2035 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,10.88590000000,R1,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,11.82380000000,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,29.99960000000,R1,2,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,23.06600000000,R1,2,MUS$2010/PJ,2035 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,16.32890000000,R1,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,11.82380000000,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,19.99980000000,R1,3,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,23.06600000000,R1,3,MUS$2010/PJ,2035 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,10.88590000000,R1,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,11.82380000000,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,9.99990000000,R1,4,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,23.06600000000,R1,4,MUS$2010/PJ,2035 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,5.44300000000,R1,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,11.82380000000,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.99980000000,R1,5,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,23.06600000000,R1,5,MUS$2010/PJ,2035 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,8.16440000000,R1,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,11.82380000000,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,29.99960000000,R1,0,MUS$2010/PJ,2040 +electricity,all-week,night,all-year,24.45820000000,R1,0,MUS$2010/PJ,2040 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,16.32890000000,R1,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,12.38070000000,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,19.99980000000,R1,1,MUS$2010/PJ,2040 +electricity,all-week,morning,all-year,24.45820000000,R1,1,MUS$2010/PJ,2040 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,10.88590000000,R1,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,12.38070000000,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,29.99960000000,R1,2,MUS$2010/PJ,2040 +electricity,all-week,afternoon,all-year,24.45820000000,R1,2,MUS$2010/PJ,2040 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2040 -heat,all-week,afternoon,all-year,16.32890000000,R1,2,MUS$2010/PJ,2040 +heat,all-week,afternoon,all-year,12.38070000000,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,19.99980000000,R1,3,MUS$2010/PJ,2040 +electricity,all-week,early-peak,all-year,24.45820000000,R1,3,MUS$2010/PJ,2040 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,10.88590000000,R1,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,12.38070000000,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,9.99990000000,R1,4,MUS$2010/PJ,2040 +electricity,all-week,late-peak,all-year,24.45820000000,R1,4,MUS$2010/PJ,2040 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,5.44300000000,R1,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,12.38070000000,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,14.99980000000,R1,5,MUS$2010/PJ,2040 +electricity,all-week,evening,all-year,24.45820000000,R1,5,MUS$2010/PJ,2040 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,8.16440000000,R1,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,12.38070000000,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,29.99960000000,R1,0,MUS$2010/PJ,2045 +electricity,all-week,night,all-year,26.24810000000,R1,0,MUS$2010/PJ,2045 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2045 -heat,all-week,night,all-year,16.32890000000,R1,0,MUS$2010/PJ,2045 +heat,all-week,night,all-year,13.09670000000,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.99980000000,R1,1,MUS$2010/PJ,2045 +electricity,all-week,morning,all-year,26.24810000000,R1,1,MUS$2010/PJ,2045 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2045 -heat,all-week,morning,all-year,10.88590000000,R1,1,MUS$2010/PJ,2045 +heat,all-week,morning,all-year,13.09670000000,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,29.99960000000,R1,2,MUS$2010/PJ,2045 +electricity,all-week,afternoon,all-year,26.24810000000,R1,2,MUS$2010/PJ,2045 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2045 -heat,all-week,afternoon,all-year,16.32890000000,R1,2,MUS$2010/PJ,2045 +heat,all-week,afternoon,all-year,13.09670000000,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,19.99980000000,R1,3,MUS$2010/PJ,2045 +electricity,all-week,early-peak,all-year,26.24810000000,R1,3,MUS$2010/PJ,2045 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2045 -heat,all-week,early-peak,all-year,10.88590000000,R1,3,MUS$2010/PJ,2045 +heat,all-week,early-peak,all-year,13.09670000000,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,9.99990000000,R1,4,MUS$2010/PJ,2045 +electricity,all-week,late-peak,all-year,26.24810000000,R1,4,MUS$2010/PJ,2045 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2045 -heat,all-week,late-peak,all-year,5.44300000000,R1,4,MUS$2010/PJ,2045 +heat,all-week,late-peak,all-year,13.09670000000,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,14.99980000000,R1,5,MUS$2010/PJ,2045 +electricity,all-week,evening,all-year,26.24810000000,R1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2045 -heat,all-week,evening,all-year,8.16440000000,R1,5,MUS$2010/PJ,2045 +heat,all-week,evening,all-year,13.09670000000,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,29.99960000000,R1,0,MUS$2010/PJ,2050 +electricity,all-week,night,all-year,27.64030000000,R1,0,MUS$2010/PJ,2050 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,16.32890000000,R1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,13.65350000000,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.99980000000,R1,1,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,27.64030000000,R1,1,MUS$2010/PJ,2050 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,10.88590000000,R1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,13.65350000000,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,29.99960000000,R1,2,MUS$2010/PJ,2050 +electricity,all-week,afternoon,all-year,27.64030000000,R1,2,MUS$2010/PJ,2050 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,16.32890000000,R1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,13.65350000000,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.99980000000,R1,3,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,27.64030000000,R1,3,MUS$2010/PJ,2050 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,10.88590000000,R1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,13.65350000000,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.99990000000,R1,4,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,27.64030000000,R1,4,MUS$2010/PJ,2050 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,5.44300000000,R1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,13.65350000000,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,14.99980000000,R1,5,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,27.64030000000,R1,5,MUS$2010/PJ,2050 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,8.16440000000,R1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,13.65350000000,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/Results/MCAPrices.csv b/tests/example_outputs/default_timeslice/Results/MCAPrices.csv index f7850c152..99e3d7a83 100644 --- a/tests/example_outputs/default_timeslice/Results/MCAPrices.csv +++ b/tests/example_outputs/default_timeslice/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.62770000000,R1,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,8.60100000000,R1,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,10.46720000000,R1,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,7.66660000000,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,9.14540000000,R1,1,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,8.60100000000,R1,1,MUS$2010/PJ,2025 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,8.09320000000,R1,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,7.66660000000,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.62770000000,R1,2,MUS$2010/PJ,2025 +electricity,all-week,afternoon,all-year,8.60100000000,R1,2,MUS$2010/PJ,2025 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2025 -heat,all-week,afternoon,all-year,10.46720000000,R1,2,MUS$2010/PJ,2025 +heat,all-week,afternoon,all-year,7.66660000000,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.14540000000,R1,3,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,8.60100000000,R1,3,MUS$2010/PJ,2025 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,8.09320000000,R1,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,7.66660000000,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.96160000000,R1,4,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,8.60100000000,R1,4,MUS$2010/PJ,2025 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,5.81380000000,R1,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,7.66660000000,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.40420000000,R1,5,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,8.60100000000,R1,5,MUS$2010/PJ,2025 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,6.90620000000,R1,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,7.66660000000,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.99990000000,R1,0,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,7.19990000000,R1,0,MUS$2010/PJ,2030 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,9.38010000000,R1,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,6.03780000000,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,7.99990000000,R1,1,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,7.19990000000,R1,1,MUS$2010/PJ,2030 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,6.54420000000,R1,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,6.03780000000,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,11.99990000000,R1,2,MUS$2010/PJ,2030 +electricity,all-week,afternoon,all-year,7.19990000000,R1,2,MUS$2010/PJ,2030 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,9.38010000000,R1,2,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,6.03780000000,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,7.99990000000,R1,3,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,7.19990000000,R1,3,MUS$2010/PJ,2030 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,6.54420000000,R1,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,6.03780000000,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,4.00000000000,R1,4,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,7.19990000000,R1,4,MUS$2010/PJ,2030 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,3.82760000000,R1,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,6.03780000000,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.99990000000,R1,5,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,7.19990000000,R1,5,MUS$2010/PJ,2030 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,5.12620000000,R1,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,6.03780000000,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,11.66650000000,R1,0,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,7.05870000000,R1,0,MUS$2010/PJ,2035 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,9.12900000000,R1,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,5.47740000000,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,7.77770000000,R1,1,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,7.05870000000,R1,1,MUS$2010/PJ,2035 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,6.08600000000,R1,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,5.47740000000,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,11.66650000000,R1,2,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,7.05870000000,R1,2,MUS$2010/PJ,2035 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,9.12900000000,R1,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,5.47740000000,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,7.77770000000,R1,3,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,7.05870000000,R1,3,MUS$2010/PJ,2035 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,6.08600000000,R1,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,5.47740000000,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,4.00000000000,R1,4,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,7.05870000000,R1,4,MUS$2010/PJ,2035 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,3.04300000000,R1,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,5.47740000000,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,5.83330000000,R1,5,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,7.05870000000,R1,5,MUS$2010/PJ,2035 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,4.56450000000,R1,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,5.47740000000,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,11.42840000000,R1,0,MUS$2010/PJ,2040 +electricity,all-week,night,all-year,6.95640000000,R1,0,MUS$2010/PJ,2040 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,8.90040000000,R1,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,5.38000000000,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,7.61900000000,R1,1,MUS$2010/PJ,2040 +electricity,all-week,morning,all-year,6.95640000000,R1,1,MUS$2010/PJ,2040 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,5.93360000000,R1,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,5.38000000000,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,11.42840000000,R1,2,MUS$2010/PJ,2040 +electricity,all-week,afternoon,all-year,6.95640000000,R1,2,MUS$2010/PJ,2040 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2040 -heat,all-week,afternoon,all-year,8.90040000000,R1,2,MUS$2010/PJ,2040 +heat,all-week,afternoon,all-year,5.38000000000,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,7.61900000000,R1,3,MUS$2010/PJ,2040 +electricity,all-week,early-peak,all-year,6.95640000000,R1,3,MUS$2010/PJ,2040 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,5.93360000000,R1,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,5.38000000000,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,4.00000000000,R1,4,MUS$2010/PJ,2040 +electricity,all-week,late-peak,all-year,6.95640000000,R1,4,MUS$2010/PJ,2040 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,3.04300000000,R1,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,5.38000000000,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,5.71420000000,R1,5,MUS$2010/PJ,2040 +electricity,all-week,evening,all-year,6.95640000000,R1,5,MUS$2010/PJ,2040 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,4.45020000000,R1,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,5.38000000000,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,11.87490000000,R1,0,MUS$2010/PJ,2045 +electricity,all-week,night,all-year,7.14720000000,R1,0,MUS$2010/PJ,2045 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2045 -heat,all-week,night,all-year,8.90040000000,R1,0,MUS$2010/PJ,2045 +heat,all-week,night,all-year,5.38000000000,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,7.91660000000,R1,1,MUS$2010/PJ,2045 +electricity,all-week,morning,all-year,7.14720000000,R1,1,MUS$2010/PJ,2045 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2045 -heat,all-week,morning,all-year,5.93360000000,R1,1,MUS$2010/PJ,2045 +heat,all-week,morning,all-year,5.38000000000,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,11.87490000000,R1,2,MUS$2010/PJ,2045 +electricity,all-week,afternoon,all-year,7.14720000000,R1,2,MUS$2010/PJ,2045 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2045 -heat,all-week,afternoon,all-year,8.90040000000,R1,2,MUS$2010/PJ,2045 +heat,all-week,afternoon,all-year,5.38000000000,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,7.91660000000,R1,3,MUS$2010/PJ,2045 +electricity,all-week,early-peak,all-year,7.14720000000,R1,3,MUS$2010/PJ,2045 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2045 -heat,all-week,early-peak,all-year,5.93360000000,R1,3,MUS$2010/PJ,2045 +heat,all-week,early-peak,all-year,5.38000000000,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,4.00000000000,R1,4,MUS$2010/PJ,2045 +electricity,all-week,late-peak,all-year,7.14720000000,R1,4,MUS$2010/PJ,2045 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2045 -heat,all-week,late-peak,all-year,3.04300000000,R1,4,MUS$2010/PJ,2045 +heat,all-week,late-peak,all-year,5.38000000000,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,5.93740000000,R1,5,MUS$2010/PJ,2045 +electricity,all-week,evening,all-year,7.14720000000,R1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2045 -heat,all-week,evening,all-year,4.45020000000,R1,5,MUS$2010/PJ,2045 +heat,all-week,evening,all-year,5.38000000000,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,11.66650000000,R1,0,MUS$2010/PJ,2050 +electricity,all-week,night,all-year,7.05870000000,R1,0,MUS$2010/PJ,2050 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,9.07900000000,R1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,5.45630000000,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,7.77770000000,R1,1,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,7.05870000000,R1,1,MUS$2010/PJ,2050 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,6.05260000000,R1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,5.45630000000,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,11.66650000000,R1,2,MUS$2010/PJ,2050 +electricity,all-week,afternoon,all-year,7.05870000000,R1,2,MUS$2010/PJ,2050 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,9.07900000000,R1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,5.45630000000,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,7.77770000000,R1,3,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,7.05870000000,R1,3,MUS$2010/PJ,2050 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,6.05260000000,R1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,5.45630000000,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,4.00000000000,R1,4,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,7.05870000000,R1,4,MUS$2010/PJ,2050 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,3.04300000000,R1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,5.45630000000,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,5.83330000000,R1,5,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,7.05870000000,R1,5,MUS$2010/PJ,2050 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,4.53950000000,R1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,5.45630000000,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/medium/Results/MCACapacity.csv b/tests/example_outputs/medium/Results/MCACapacity.csv index fa434346f..a4970d35e 100644 --- a/tests/example_outputs/medium/Results/MCACapacity.csv +++ b/tests/example_outputs/medium/Results/MCACapacity.csv @@ -4,65 +4,64 @@ A1,10.00000000000,R1,2020,R1,residential,gasstove,newcapa,2020 A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2020 A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2020 A1,8.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2025 -A1,4.00000000000,R1,2025,R1,residential,gasboiler,newcapa,2025 A1,8.00000000000,R1,2020,R1,residential,gasstove,newcapa,2025 A1,4.00000000000,R1,2025,R1,residential,gasstove,newcapa,2025 +A1,4.00000000000,R1,2025,R1,residential,heatpump,newcapa,2025 A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2025 A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2025 -A1,13.83720000000,R1,2025,R1,gas,gassupply1,newcapa,2025 -A1,4.00000000000,R1,2025,R1,residential,gasboiler,newcapa,2030 +A1,10.33930000000,R1,2025,R1,gas,gassupply1,newcapa,2025 +A1,5.00000000000,R1,2030,R1,residential,gasboiler,newcapa,2030 A1,4.00000000000,R1,2025,R1,residential,gasstove,newcapa,2030 A1,11.00000000000,R1,2030,R1,residential,gasstove,newcapa,2030 -A1,11.00000000000,R1,2030,R1,residential,heatpump,newcapa,2030 -A1,11.00000000000,R1,2030,R1,power,windturbine,newcapa,2030 +A1,4.00000000000,R1,2025,R1,residential,heatpump,newcapa,2030 +A1,5.00000000000,R1,2030,R1,residential,heatpump,newcapa,2030 +A1,9.00000000000,R1,2030,R1,power,windturbine,newcapa,2030 A1,7.50000000000,R1,2020,R1,gas,gassupply1,newcapa,2030 -A1,13.83720000000,R1,2025,R1,gas,gassupply1,newcapa,2030 -A1,0.49740000000,R1,2030,R1,gas,gassupply1,newcapa,2030 +A1,10.33930000000,R1,2025,R1,gas,gassupply1,newcapa,2030 +A1,5.28740000000,R1,2030,R1,gas,gassupply1,newcapa,2030 +A1,5.00000000000,R1,2030,R1,residential,gasboiler,newcapa,2035 A1,11.00000000000,R1,2030,R1,residential,gasstove,newcapa,2035 A1,7.00000000000,R1,2035,R1,residential,gasstove,newcapa,2035 -A1,11.00000000000,R1,2030,R1,residential,heatpump,newcapa,2035 -A1,7.00000000000,R1,2035,R1,residential,heatpump,newcapa,2035 -A1,11.00000000000,R1,2030,R1,power,windturbine,newcapa,2035 -A1,6.00000000000,R1,2035,R1,power,windturbine,newcapa,2035 -A1,13.83720000000,R1,2025,R1,gas,gassupply1,newcapa,2035 -A1,0.49740000000,R1,2030,R1,gas,gassupply1,newcapa,2035 -A1,5.66540000000,R1,2035,R1,gas,gassupply1,newcapa,2035 +A1,5.00000000000,R1,2030,R1,residential,heatpump,newcapa,2035 +A1,8.00000000000,R1,2035,R1,residential,heatpump,newcapa,2035 +A1,9.00000000000,R1,2030,R1,power,windturbine,newcapa,2035 +A1,3.00000000000,R1,2035,R1,power,windturbine,newcapa,2035 +A1,10.33930000000,R1,2025,R1,gas,gassupply1,newcapa,2035 +A1,5.28740000000,R1,2030,R1,gas,gassupply1,newcapa,2035 +A1,10.83330000000,R1,2035,R1,gas,gassupply1,newcapa,2035 A1,7.00000000000,R1,2035,R1,residential,gasstove,newcapa,2040 A1,14.00000000000,R1,2040,R1,residential,gasstove,newcapa,2040 -A1,7.00000000000,R1,2035,R1,residential,heatpump,newcapa,2040 -A1,14.00000000000,R1,2040,R1,residential,heatpump,newcapa,2040 -A1,11.00000000000,R1,2030,R1,power,windturbine,newcapa,2040 -A1,6.00000000000,R1,2035,R1,power,windturbine,newcapa,2040 -A1,3.00000000000,R1,2040,R1,power,windturbine,newcapa,2040 -A1,13.83720000000,R1,2025,R1,gas,gassupply1,newcapa,2040 -A1,0.49740000000,R1,2030,R1,gas,gassupply1,newcapa,2040 -A1,5.66540000000,R1,2035,R1,gas,gassupply1,newcapa,2040 -A1,3.33330000000,R1,2040,R1,gas,gassupply1,newcapa,2040 +A1,8.00000000000,R1,2035,R1,residential,heatpump,newcapa,2040 +A1,13.00000000000,R1,2040,R1,residential,heatpump,newcapa,2040 +A1,9.00000000000,R1,2030,R1,power,windturbine,newcapa,2040 +A1,3.00000000000,R1,2035,R1,power,windturbine,newcapa,2040 +A1,8.00000000000,R1,2040,R1,power,windturbine,newcapa,2040 +A1,10.33930000000,R1,2025,R1,gas,gassupply1,newcapa,2040 +A1,5.28740000000,R1,2030,R1,gas,gassupply1,newcapa,2040 +A1,10.83330000000,R1,2035,R1,gas,gassupply1,newcapa,2040 A1,14.00000000000,R1,2040,R1,residential,gasstove,newcapa,2045 A1,10.00000000000,R1,2045,R1,residential,gasstove,newcapa,2045 -A1,14.00000000000,R1,2040,R1,residential,heatpump,newcapa,2045 -A1,10.00000000000,R1,2045,R1,residential,heatpump,newcapa,2045 -A1,11.00000000000,R1,2030,R1,power,windturbine,newcapa,2045 -A1,6.00000000000,R1,2035,R1,power,windturbine,newcapa,2045 -A1,3.00000000000,R1,2040,R1,power,windturbine,newcapa,2045 +A1,13.00000000000,R1,2040,R1,residential,heatpump,newcapa,2045 +A1,11.00000000000,R1,2045,R1,residential,heatpump,newcapa,2045 +A1,9.00000000000,R1,2030,R1,power,windturbine,newcapa,2045 +A1,3.00000000000,R1,2035,R1,power,windturbine,newcapa,2045 +A1,8.00000000000,R1,2040,R1,power,windturbine,newcapa,2045 A1,3.00000000000,R1,2045,R1,power,windturbine,newcapa,2045 -A1,13.83720000000,R1,2025,R1,gas,gassupply1,newcapa,2045 -A1,0.49740000000,R1,2030,R1,gas,gassupply1,newcapa,2045 -A1,5.66540000000,R1,2035,R1,gas,gassupply1,newcapa,2045 -A1,3.33330000000,R1,2040,R1,gas,gassupply1,newcapa,2045 -A1,3.33330000000,R1,2045,R1,gas,gassupply1,newcapa,2045 +A1,10.33930000000,R1,2025,R1,gas,gassupply1,newcapa,2045 +A1,5.28740000000,R1,2030,R1,gas,gassupply1,newcapa,2045 +A1,10.83330000000,R1,2035,R1,gas,gassupply1,newcapa,2045 +A1,0.20670000000,R1,2045,R1,gas,gassupply1,newcapa,2045 A1,10.00000000000,R1,2045,R1,residential,gasstove,newcapa,2050 A1,17.00000000000,R1,2050,R1,residential,gasstove,newcapa,2050 -A1,10.00000000000,R1,2045,R1,residential,heatpump,newcapa,2050 -A1,17.00000000000,R1,2050,R1,residential,heatpump,newcapa,2050 -A1,11.00000000000,R1,2030,R1,power,windturbine,newcapa,2050 -A1,6.00000000000,R1,2035,R1,power,windturbine,newcapa,2050 -A1,3.00000000000,R1,2040,R1,power,windturbine,newcapa,2050 +A1,11.00000000000,R1,2045,R1,residential,heatpump,newcapa,2050 +A1,16.00000000000,R1,2050,R1,residential,heatpump,newcapa,2050 +A1,9.00000000000,R1,2030,R1,power,windturbine,newcapa,2050 +A1,3.00000000000,R1,2035,R1,power,windturbine,newcapa,2050 +A1,8.00000000000,R1,2040,R1,power,windturbine,newcapa,2050 A1,3.00000000000,R1,2045,R1,power,windturbine,newcapa,2050 A1,3.00000000000,R1,2050,R1,power,windturbine,newcapa,2050 -A1,13.83720000000,R1,2025,R1,gas,gassupply1,newcapa,2050 -A1,0.49740000000,R1,2030,R1,gas,gassupply1,newcapa,2050 -A1,5.66540000000,R1,2035,R1,gas,gassupply1,newcapa,2050 -A1,3.33330000000,R1,2040,R1,gas,gassupply1,newcapa,2050 -A1,3.33330000000,R1,2045,R1,gas,gassupply1,newcapa,2050 +A1,10.33930000000,R1,2025,R1,gas,gassupply1,newcapa,2050 +A1,5.28740000000,R1,2030,R1,gas,gassupply1,newcapa,2050 +A1,10.83330000000,R1,2035,R1,gas,gassupply1,newcapa,2050 +A1,0.20670000000,R1,2045,R1,gas,gassupply1,newcapa,2050 A1,3.33330000000,R1,2050,R1,gas,gassupply1,newcapa,2050 diff --git a/tests/example_outputs/medium/Results/MCAPrices.csv b/tests/example_outputs/medium/Results/MCAPrices.csv index 646a3c9aa..2dd86a3d7 100644 --- a/tests/example_outputs/medium/Results/MCAPrices.csv +++ b/tests/example_outputs/medium/Results/MCAPrices.csv @@ -29,183 +29,183 @@ 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 cook,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020 -electricity,all-week,night,all-year,29.11600000000,R1,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,18.57780000000,R1,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,12.58960000000,R1,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,11.24120000000,R1,0,MUS$2010/PJ,2025 CO2f,all-week,night,all-year,0.12010000000,R1,0,MUS$2010/kt,2025 -cook,all-week,night,all-year,6.87900000000,R1,0,MUS$2010/PJ,2025 -electricity,all-week,morning,all-year,25.07480000000,R1,1,MUS$2010/PJ,2025 +cook,all-week,night,all-year,5.14740000000,R1,0,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,18.57780000000,R1,1,MUS$2010/PJ,2025 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,11.97120000000,R1,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,11.24120000000,R1,1,MUS$2010/PJ,2025 CO2f,all-week,morning,all-year,0.12010000000,R1,1,MUS$2010/kt,2025 -cook,all-week,morning,all-year,5.43600000000,R1,1,MUS$2010/PJ,2025 -electricity,all-week,afternoon,all-year,29.11600000000,R1,2,MUS$2010/PJ,2025 +cook,all-week,morning,all-year,5.14740000000,R1,1,MUS$2010/PJ,2025 +electricity,all-week,afternoon,all-year,18.57780000000,R1,2,MUS$2010/PJ,2025 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2025 -heat,all-week,afternoon,all-year,12.58960000000,R1,2,MUS$2010/PJ,2025 +heat,all-week,afternoon,all-year,11.24120000000,R1,2,MUS$2010/PJ,2025 CO2f,all-week,afternoon,all-year,0.12010000000,R1,2,MUS$2010/kt,2025 -cook,all-week,afternoon,all-year,6.87900000000,R1,2,MUS$2010/PJ,2025 -electricity,all-week,early-peak,all-year,25.07480000000,R1,3,MUS$2010/PJ,2025 +cook,all-week,afternoon,all-year,5.14740000000,R1,2,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,18.57780000000,R1,3,MUS$2010/PJ,2025 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,11.97120000000,R1,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,11.24120000000,R1,3,MUS$2010/PJ,2025 CO2f,all-week,early-peak,all-year,0.12010000000,R1,3,MUS$2010/kt,2025 -cook,all-week,early-peak,all-year,5.43600000000,R1,3,MUS$2010/PJ,2025 -electricity,all-week,late-peak,all-year,21.96620000000,R1,4,MUS$2010/PJ,2025 +cook,all-week,early-peak,all-year,5.14740000000,R1,3,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,18.57780000000,R1,4,MUS$2010/PJ,2025 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,11.35280000000,R1,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,11.24120000000,R1,4,MUS$2010/PJ,2025 CO2f,all-week,late-peak,all-year,0.12010000000,R1,4,MUS$2010/kt,2025 -cook,all-week,late-peak,all-year,3.99300000000,R1,4,MUS$2010/PJ,2025 -electricity,all-week,evening,all-year,23.05420000000,R1,5,MUS$2010/PJ,2025 +cook,all-week,late-peak,all-year,5.14740000000,R1,4,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,18.57780000000,R1,5,MUS$2010/PJ,2025 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,11.66200000000,R1,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,11.24120000000,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,4.71450000000,R1,5,MUS$2010/PJ,2025 -electricity,all-week,night,all-year,29.99960000000,R1,0,MUS$2010/PJ,2030 +cook,all-week,evening,all-year,5.14740000000,R1,5,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,17.14260000000,R1,0,MUS$2010/PJ,2030 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,15.96890000000,R1,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,11.06400000000,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,6.87900000000,R1,0,MUS$2010/PJ,2030 -electricity,all-week,morning,all-year,19.99980000000,R1,1,MUS$2010/PJ,2030 +cook,all-week,night,all-year,5.14740000000,R1,0,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,17.14260000000,R1,1,MUS$2010/PJ,2030 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,11.81250000000,R1,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,11.06410000000,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,5.43600000000,R1,1,MUS$2010/PJ,2030 -electricity,all-week,afternoon,all-year,29.99960000000,R1,2,MUS$2010/PJ,2030 +cook,all-week,morning,all-year,5.14740000000,R1,1,MUS$2010/PJ,2030 +electricity,all-week,afternoon,all-year,17.14260000000,R1,2,MUS$2010/PJ,2030 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,15.96890000000,R1,2,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,11.06400000000,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,6.87900000000,R1,2,MUS$2010/PJ,2030 -electricity,all-week,early-peak,all-year,19.99980000000,R1,3,MUS$2010/PJ,2030 +cook,all-week,afternoon,all-year,5.14740000000,R1,2,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,17.14260000000,R1,3,MUS$2010/PJ,2030 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,11.81250000000,R1,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,11.06410000000,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,5.43600000000,R1,3,MUS$2010/PJ,2030 -electricity,all-week,late-peak,all-year,9.99990000000,R1,4,MUS$2010/PJ,2030 +cook,all-week,early-peak,all-year,5.14740000000,R1,3,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,17.14260000000,R1,4,MUS$2010/PJ,2030 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,7.65610000000,R1,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,11.06410000000,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,3.99300000000,R1,4,MUS$2010/PJ,2030 -electricity,all-week,evening,all-year,14.99980000000,R1,5,MUS$2010/PJ,2030 +cook,all-week,late-peak,all-year,5.14740000000,R1,4,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,17.14260000000,R1,5,MUS$2010/PJ,2030 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,9.73430000000,R1,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,11.06410000000,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.71450000000,R1,5,MUS$2010/PJ,2030 -electricity,all-week,night,all-year,28.33300000000,R1,0,MUS$2010/PJ,2035 +cook,all-week,evening,all-year,5.14740000000,R1,5,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,17.00770000000,R1,0,MUS$2010/PJ,2035 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,16.32880000000,R1,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,11.78420000000,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,6.87900000000,R1,0,MUS$2010/PJ,2035 -electricity,all-week,morning,all-year,18.88870000000,R1,1,MUS$2010/PJ,2035 +cook,all-week,night,all-year,5.14740000000,R1,0,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,17.00770000000,R1,1,MUS$2010/PJ,2035 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,10.88590000000,R1,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,11.78430000000,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,5.43600000000,R1,1,MUS$2010/PJ,2035 -electricity,all-week,afternoon,all-year,28.33300000000,R1,2,MUS$2010/PJ,2035 +cook,all-week,morning,all-year,5.14740000000,R1,1,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,17.00770000000,R1,2,MUS$2010/PJ,2035 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,16.32880000000,R1,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,11.78420000000,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,6.87900000000,R1,2,MUS$2010/PJ,2035 -electricity,all-week,early-peak,all-year,18.88870000000,R1,3,MUS$2010/PJ,2035 +cook,all-week,afternoon,all-year,5.14740000000,R1,2,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,17.00770000000,R1,3,MUS$2010/PJ,2035 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,10.88590000000,R1,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,11.78430000000,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,5.43600000000,R1,3,MUS$2010/PJ,2035 -electricity,all-week,late-peak,all-year,9.99990000000,R1,4,MUS$2010/PJ,2035 +cook,all-week,early-peak,all-year,5.14740000000,R1,3,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,17.00770000000,R1,4,MUS$2010/PJ,2035 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,5.44300000000,R1,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,11.78430000000,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,3.99300000000,R1,4,MUS$2010/PJ,2035 -electricity,all-week,evening,all-year,14.16650000000,R1,5,MUS$2010/PJ,2035 +cook,all-week,late-peak,all-year,5.14740000000,R1,4,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,17.00770000000,R1,5,MUS$2010/PJ,2035 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,8.16440000000,R1,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,11.78430000000,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.71450000000,R1,5,MUS$2010/PJ,2035 -electricity,all-week,night,all-year,28.57110000000,R1,0,MUS$2010/PJ,2040 +cook,all-week,evening,all-year,5.14740000000,R1,5,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,17.39110000000,R1,0,MUS$2010/PJ,2040 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,15.66220000000,R1,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,9.40050000000,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,6.87900000000,R1,0,MUS$2010/PJ,2040 -electricity,all-week,morning,all-year,19.04740000000,R1,1,MUS$2010/PJ,2040 +cook,all-week,night,all-year,5.14740000000,R1,0,MUS$2010/PJ,2040 +electricity,all-week,morning,all-year,17.39110000000,R1,1,MUS$2010/PJ,2040 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,10.44150000000,R1,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,9.40050000000,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.43600000000,R1,1,MUS$2010/PJ,2040 -electricity,all-week,afternoon,all-year,28.57110000000,R1,2,MUS$2010/PJ,2040 +cook,all-week,morning,all-year,5.14740000000,R1,1,MUS$2010/PJ,2040 +electricity,all-week,afternoon,all-year,17.39110000000,R1,2,MUS$2010/PJ,2040 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2040 -heat,all-week,afternoon,all-year,15.66220000000,R1,2,MUS$2010/PJ,2040 +heat,all-week,afternoon,all-year,9.40050000000,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,6.87900000000,R1,2,MUS$2010/PJ,2040 -electricity,all-week,early-peak,all-year,19.04740000000,R1,3,MUS$2010/PJ,2040 +cook,all-week,afternoon,all-year,5.14740000000,R1,2,MUS$2010/PJ,2040 +electricity,all-week,early-peak,all-year,17.39110000000,R1,3,MUS$2010/PJ,2040 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,10.44150000000,R1,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,9.40050000000,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.43600000000,R1,3,MUS$2010/PJ,2040 -electricity,all-week,late-peak,all-year,9.99990000000,R1,4,MUS$2010/PJ,2040 +cook,all-week,early-peak,all-year,5.14740000000,R1,3,MUS$2010/PJ,2040 +electricity,all-week,late-peak,all-year,17.39110000000,R1,4,MUS$2010/PJ,2040 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,5.44300000000,R1,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,9.40050000000,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,3.99300000000,R1,4,MUS$2010/PJ,2040 -electricity,all-week,evening,all-year,14.28550000000,R1,5,MUS$2010/PJ,2040 +cook,all-week,late-peak,all-year,5.14740000000,R1,4,MUS$2010/PJ,2040 +electricity,all-week,evening,all-year,17.39110000000,R1,5,MUS$2010/PJ,2040 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,7.83110000000,R1,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,9.40050000000,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,4.71450000000,R1,5,MUS$2010/PJ,2040 -electricity,all-week,night,all-year,28.74960000000,R1,0,MUS$2010/PJ,2045 +cook,all-week,evening,all-year,5.14740000000,R1,5,MUS$2010/PJ,2040 +electricity,all-week,night,all-year,17.46810000000,R1,0,MUS$2010/PJ,2045 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2045 -heat,all-week,night,all-year,15.75740000000,R1,0,MUS$2010/PJ,2045 +heat,all-week,night,all-year,9.55380000000,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,6.87900000000,R1,0,MUS$2010/PJ,2045 -electricity,all-week,morning,all-year,19.16640000000,R1,1,MUS$2010/PJ,2045 +cook,all-week,night,all-year,5.14740000000,R1,0,MUS$2010/PJ,2045 +electricity,all-week,morning,all-year,17.46810000000,R1,1,MUS$2010/PJ,2045 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2045 -heat,all-week,morning,all-year,10.50500000000,R1,1,MUS$2010/PJ,2045 +heat,all-week,morning,all-year,9.55380000000,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.43600000000,R1,1,MUS$2010/PJ,2045 -electricity,all-week,afternoon,all-year,28.74960000000,R1,2,MUS$2010/PJ,2045 +cook,all-week,morning,all-year,5.14740000000,R1,1,MUS$2010/PJ,2045 +electricity,all-week,afternoon,all-year,17.46810000000,R1,2,MUS$2010/PJ,2045 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2045 -heat,all-week,afternoon,all-year,15.75740000000,R1,2,MUS$2010/PJ,2045 +heat,all-week,afternoon,all-year,9.55380000000,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,6.87900000000,R1,2,MUS$2010/PJ,2045 -electricity,all-week,early-peak,all-year,19.16640000000,R1,3,MUS$2010/PJ,2045 +cook,all-week,afternoon,all-year,5.14740000000,R1,2,MUS$2010/PJ,2045 +electricity,all-week,early-peak,all-year,17.46810000000,R1,3,MUS$2010/PJ,2045 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2045 -heat,all-week,early-peak,all-year,10.50500000000,R1,3,MUS$2010/PJ,2045 +heat,all-week,early-peak,all-year,9.55380000000,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.43600000000,R1,3,MUS$2010/PJ,2045 -electricity,all-week,late-peak,all-year,9.99990000000,R1,4,MUS$2010/PJ,2045 +cook,all-week,early-peak,all-year,5.14740000000,R1,3,MUS$2010/PJ,2045 +electricity,all-week,late-peak,all-year,17.46810000000,R1,4,MUS$2010/PJ,2045 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2045 -heat,all-week,late-peak,all-year,5.44300000000,R1,4,MUS$2010/PJ,2045 +heat,all-week,late-peak,all-year,9.55380000000,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,3.99300000000,R1,4,MUS$2010/PJ,2045 -electricity,all-week,evening,all-year,14.37480000000,R1,5,MUS$2010/PJ,2045 +cook,all-week,late-peak,all-year,5.14740000000,R1,4,MUS$2010/PJ,2045 +electricity,all-week,evening,all-year,17.46810000000,R1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2045 -heat,all-week,evening,all-year,7.87870000000,R1,5,MUS$2010/PJ,2045 +heat,all-week,evening,all-year,9.55380000000,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,4.71450000000,R1,5,MUS$2010/PJ,2045 -electricity,all-week,night,all-year,28.88850000000,R1,0,MUS$2010/PJ,2050 +cook,all-week,evening,all-year,5.14740000000,R1,5,MUS$2010/PJ,2045 +electricity,all-week,night,all-year,17.52790000000,R1,0,MUS$2010/PJ,2050 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,15.82890000000,R1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,9.58470000000,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.87900000000,R1,0,MUS$2010/PJ,2050 -electricity,all-week,morning,all-year,19.25900000000,R1,1,MUS$2010/PJ,2050 +cook,all-week,night,all-year,5.14740000000,R1,0,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,17.52790000000,R1,1,MUS$2010/PJ,2050 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,10.55260000000,R1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,9.58470000000,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,5.43600000000,R1,1,MUS$2010/PJ,2050 -electricity,all-week,afternoon,all-year,28.88850000000,R1,2,MUS$2010/PJ,2050 +cook,all-week,morning,all-year,5.14740000000,R1,1,MUS$2010/PJ,2050 +electricity,all-week,afternoon,all-year,17.52790000000,R1,2,MUS$2010/PJ,2050 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,15.82890000000,R1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,9.58470000000,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.87900000000,R1,2,MUS$2010/PJ,2050 -electricity,all-week,early-peak,all-year,19.25900000000,R1,3,MUS$2010/PJ,2050 +cook,all-week,afternoon,all-year,5.14740000000,R1,2,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,17.52790000000,R1,3,MUS$2010/PJ,2050 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,10.55260000000,R1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,9.58470000000,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,5.43600000000,R1,3,MUS$2010/PJ,2050 -electricity,all-week,late-peak,all-year,9.99990000000,R1,4,MUS$2010/PJ,2050 +cook,all-week,early-peak,all-year,5.14740000000,R1,3,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,17.52790000000,R1,4,MUS$2010/PJ,2050 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,5.44300000000,R1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,9.58470000000,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,3.99300000000,R1,4,MUS$2010/PJ,2050 -electricity,all-week,evening,all-year,14.44430000000,R1,5,MUS$2010/PJ,2050 +cook,all-week,late-peak,all-year,5.14740000000,R1,4,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,17.52790000000,R1,5,MUS$2010/PJ,2050 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,7.91440000000,R1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,9.58470000000,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,4.71450000000,R1,5,MUS$2010/PJ,2050 +cook,all-week,evening,all-year,5.14740000000,R1,5,MUS$2010/PJ,2050 diff --git a/tests/example_outputs/minimum_service/Results/MCAPrices.csv b/tests/example_outputs/minimum_service/Results/MCAPrices.csv index bddc01fb6..0d4aa4dd2 100644 --- a/tests/example_outputs/minimum_service/Results/MCAPrices.csv +++ b/tests/example_outputs/minimum_service/Results/MCAPrices.csv @@ -14,96 +14,96 @@ ammonia,all-week,all-day,spring-autumn,321.15000000000,R1,2,MUS$2010/Mt,2010 fuel3,all-week,all-day,winter,0.06170000000,R1,0,MUS$2010/PJ,2015 fuel1,all-week,all-day,winter,1.08770000000,R1,0,MUS$2010/PJ,2015 fuel2,all-week,all-day,winter,9.51690000000,R1,0,MUS$2010/PJ,2015 -ammonia,all-week,all-day,winter,393.10270000000,R1,0,MUS$2010/Mt,2015 +ammonia,all-week,all-day,winter,392.95590000000,R1,0,MUS$2010/Mt,2015 fuel3,all-week,all-day,summer,0.06170000000,R1,1,MUS$2010/PJ,2015 fuel1,all-week,all-day,summer,1.08770000000,R1,1,MUS$2010/PJ,2015 fuel2,all-week,all-day,summer,9.51690000000,R1,1,MUS$2010/PJ,2015 -ammonia,all-week,all-day,summer,392.67100000000,R1,1,MUS$2010/Mt,2015 +ammonia,all-week,all-day,summer,392.95590000000,R1,1,MUS$2010/Mt,2015 fuel3,all-week,all-day,spring-autumn,0.06170000000,R1,2,MUS$2010/PJ,2015 fuel1,all-week,all-day,spring-autumn,1.08770000000,R1,2,MUS$2010/PJ,2015 fuel2,all-week,all-day,spring-autumn,9.51690000000,R1,2,MUS$2010/PJ,2015 -ammonia,all-week,all-day,spring-autumn,393.10270000000,R1,2,MUS$2010/Mt,2015 +ammonia,all-week,all-day,spring-autumn,392.95590000000,R1,2,MUS$2010/Mt,2015 fuel3,all-week,all-day,winter,0.07020000000,R1,0,MUS$2010/PJ,2020 fuel1,all-week,all-day,winter,1.17540000000,R1,0,MUS$2010/PJ,2020 fuel2,all-week,all-day,winter,9.48260000000,R1,0,MUS$2010/PJ,2020 -ammonia,all-week,all-day,winter,415.57970000000,R1,0,MUS$2010/Mt,2020 +ammonia,all-week,all-day,winter,415.43260000000,R1,0,MUS$2010/Mt,2020 fuel3,all-week,all-day,summer,0.07020000000,R1,1,MUS$2010/PJ,2020 fuel1,all-week,all-day,summer,1.17540000000,R1,1,MUS$2010/PJ,2020 fuel2,all-week,all-day,summer,9.48260000000,R1,1,MUS$2010/PJ,2020 -ammonia,all-week,all-day,summer,415.14710000000,R1,1,MUS$2010/Mt,2020 +ammonia,all-week,all-day,summer,415.43260000000,R1,1,MUS$2010/Mt,2020 fuel3,all-week,all-day,spring-autumn,0.07020000000,R1,2,MUS$2010/PJ,2020 fuel1,all-week,all-day,spring-autumn,1.17540000000,R1,2,MUS$2010/PJ,2020 fuel2,all-week,all-day,spring-autumn,9.48260000000,R1,2,MUS$2010/PJ,2020 -ammonia,all-week,all-day,spring-autumn,415.57970000000,R1,2,MUS$2010/Mt,2020 +ammonia,all-week,all-day,spring-autumn,415.43260000000,R1,2,MUS$2010/Mt,2020 fuel3,all-week,all-day,winter,0.08280000000,R1,0,MUS$2010/PJ,2025 fuel1,all-week,all-day,winter,1.16670000000,R1,0,MUS$2010/PJ,2025 fuel2,all-week,all-day,winter,10.71080000000,R1,0,MUS$2010/PJ,2025 -ammonia,all-week,all-day,winter,469.98020000000,R1,0,MUS$2010/Mt,2025 +ammonia,all-week,all-day,winter,469.83280000000,R1,0,MUS$2010/Mt,2025 fuel3,all-week,all-day,summer,0.08280000000,R1,1,MUS$2010/PJ,2025 fuel1,all-week,all-day,summer,1.16670000000,R1,1,MUS$2010/PJ,2025 fuel2,all-week,all-day,summer,10.71080000000,R1,1,MUS$2010/PJ,2025 -ammonia,all-week,all-day,summer,469.54670000000,R1,1,MUS$2010/Mt,2025 +ammonia,all-week,all-day,summer,469.83280000000,R1,1,MUS$2010/Mt,2025 fuel3,all-week,all-day,spring-autumn,0.08280000000,R1,2,MUS$2010/PJ,2025 fuel1,all-week,all-day,spring-autumn,1.16670000000,R1,2,MUS$2010/PJ,2025 fuel2,all-week,all-day,spring-autumn,10.71080000000,R1,2,MUS$2010/PJ,2025 -ammonia,all-week,all-day,spring-autumn,469.98020000000,R1,2,MUS$2010/Mt,2025 +ammonia,all-week,all-day,spring-autumn,469.83280000000,R1,2,MUS$2010/Mt,2025 fuel3,all-week,all-day,winter,0.09540000000,R1,0,MUS$2010/PJ,2030 fuel1,all-week,all-day,winter,1.15790000000,R1,0,MUS$2010/PJ,2030 fuel2,all-week,all-day,winter,11.93900000000,R1,0,MUS$2010/PJ,2030 -ammonia,all-week,all-day,winter,523.71380000000,R1,0,MUS$2010/Mt,2030 +ammonia,all-week,all-day,winter,523.56610000000,R1,0,MUS$2010/Mt,2030 fuel3,all-week,all-day,summer,0.09540000000,R1,1,MUS$2010/PJ,2030 fuel1,all-week,all-day,summer,1.15790000000,R1,1,MUS$2010/PJ,2030 fuel2,all-week,all-day,summer,11.93900000000,R1,1,MUS$2010/PJ,2030 -ammonia,all-week,all-day,summer,523.27950000000,R1,1,MUS$2010/Mt,2030 +ammonia,all-week,all-day,summer,523.56610000000,R1,1,MUS$2010/Mt,2030 fuel3,all-week,all-day,spring-autumn,0.09540000000,R1,2,MUS$2010/PJ,2030 fuel1,all-week,all-day,spring-autumn,1.15790000000,R1,2,MUS$2010/PJ,2030 fuel2,all-week,all-day,spring-autumn,11.93900000000,R1,2,MUS$2010/PJ,2030 -ammonia,all-week,all-day,spring-autumn,523.71380000000,R1,2,MUS$2010/Mt,2030 +ammonia,all-week,all-day,spring-autumn,523.56610000000,R1,2,MUS$2010/Mt,2030 fuel3,all-week,all-day,winter,0.09070000000,R1,0,MUS$2010/PJ,2035 fuel1,all-week,all-day,winter,1.14910000000,R1,0,MUS$2010/PJ,2035 fuel2,all-week,all-day,winter,11.81550000000,R1,0,MUS$2010/PJ,2035 -ammonia,all-week,all-day,winter,492.41310000000,R1,0,MUS$2010/Mt,2035 +ammonia,all-week,all-day,winter,492.26500000000,R1,0,MUS$2010/Mt,2035 fuel3,all-week,all-day,summer,0.09070000000,R1,1,MUS$2010/PJ,2035 fuel1,all-week,all-day,summer,1.14910000000,R1,1,MUS$2010/PJ,2035 fuel2,all-week,all-day,summer,11.81550000000,R1,1,MUS$2010/PJ,2035 -ammonia,all-week,all-day,summer,491.97740000000,R1,1,MUS$2010/Mt,2035 +ammonia,all-week,all-day,summer,492.26500000000,R1,1,MUS$2010/Mt,2035 fuel3,all-week,all-day,spring-autumn,0.09070000000,R1,2,MUS$2010/PJ,2035 fuel1,all-week,all-day,spring-autumn,1.14910000000,R1,2,MUS$2010/PJ,2035 fuel2,all-week,all-day,spring-autumn,11.81550000000,R1,2,MUS$2010/PJ,2035 -ammonia,all-week,all-day,spring-autumn,492.41310000000,R1,2,MUS$2010/Mt,2035 +ammonia,all-week,all-day,spring-autumn,492.26500000000,R1,2,MUS$2010/Mt,2035 fuel3,all-week,all-day,winter,0.08600000000,R1,0,MUS$2010/PJ,2040 fuel1,all-week,all-day,winter,1.14040000000,R1,0,MUS$2010/PJ,2040 fuel2,all-week,all-day,winter,11.69200000000,R1,0,MUS$2010/PJ,2040 -ammonia,all-week,all-day,winter,460.56570000000,R1,0,MUS$2010/Mt,2040 +ammonia,all-week,all-day,winter,460.41730000000,R1,0,MUS$2010/Mt,2040 fuel3,all-week,all-day,summer,0.08600000000,R1,1,MUS$2010/PJ,2040 fuel1,all-week,all-day,summer,1.14040000000,R1,1,MUS$2010/PJ,2040 fuel2,all-week,all-day,summer,11.69200000000,R1,1,MUS$2010/PJ,2040 -ammonia,all-week,all-day,summer,460.12910000000,R1,1,MUS$2010/Mt,2040 +ammonia,all-week,all-day,summer,460.41730000000,R1,1,MUS$2010/Mt,2040 fuel3,all-week,all-day,spring-autumn,0.08600000000,R1,2,MUS$2010/PJ,2040 fuel1,all-week,all-day,spring-autumn,1.14040000000,R1,2,MUS$2010/PJ,2040 fuel2,all-week,all-day,spring-autumn,11.69200000000,R1,2,MUS$2010/PJ,2040 -ammonia,all-week,all-day,spring-autumn,460.56570000000,R1,2,MUS$2010/Mt,2040 +ammonia,all-week,all-day,spring-autumn,460.41730000000,R1,2,MUS$2010/Mt,2040 fuel3,all-week,all-day,winter,0.08600000000,R1,0,MUS$2010/PJ,2045 fuel1,all-week,all-day,winter,1.14040000000,R1,0,MUS$2010/PJ,2045 fuel2,all-week,all-day,winter,11.69200000000,R1,0,MUS$2010/PJ,2045 -ammonia,all-week,all-day,winter,458.36510000000,R1,0,MUS$2010/Mt,2045 +ammonia,all-week,all-day,winter,458.21660000000,R1,0,MUS$2010/Mt,2045 fuel3,all-week,all-day,summer,0.08600000000,R1,1,MUS$2010/PJ,2045 fuel1,all-week,all-day,summer,1.14040000000,R1,1,MUS$2010/PJ,2045 fuel2,all-week,all-day,summer,11.69200000000,R1,1,MUS$2010/PJ,2045 -ammonia,all-week,all-day,summer,457.92850000000,R1,1,MUS$2010/Mt,2045 +ammonia,all-week,all-day,summer,458.21660000000,R1,1,MUS$2010/Mt,2045 fuel3,all-week,all-day,spring-autumn,0.08600000000,R1,2,MUS$2010/PJ,2045 fuel1,all-week,all-day,spring-autumn,1.14040000000,R1,2,MUS$2010/PJ,2045 fuel2,all-week,all-day,spring-autumn,11.69200000000,R1,2,MUS$2010/PJ,2045 -ammonia,all-week,all-day,spring-autumn,458.36510000000,R1,2,MUS$2010/Mt,2045 +ammonia,all-week,all-day,spring-autumn,458.21660000000,R1,2,MUS$2010/Mt,2045 fuel3,all-week,all-day,winter,0.08600000000,R1,0,MUS$2010/PJ,2050 fuel1,all-week,all-day,winter,1.14040000000,R1,0,MUS$2010/PJ,2050 fuel2,all-week,all-day,winter,11.69200000000,R1,0,MUS$2010/PJ,2050 -ammonia,all-week,all-day,winter,456.04430000000,R1,0,MUS$2010/Mt,2050 +ammonia,all-week,all-day,winter,455.91800000000,R1,0,MUS$2010/Mt,2050 fuel3,all-week,all-day,summer,0.08600000000,R1,1,MUS$2010/PJ,2050 fuel1,all-week,all-day,summer,1.14040000000,R1,1,MUS$2010/PJ,2050 fuel2,all-week,all-day,summer,11.69200000000,R1,1,MUS$2010/PJ,2050 -ammonia,all-week,all-day,summer,455.70310000000,R1,1,MUS$2010/Mt,2050 +ammonia,all-week,all-day,summer,455.94940000000,R1,1,MUS$2010/Mt,2050 fuel3,all-week,all-day,spring-autumn,0.08600000000,R1,2,MUS$2010/PJ,2050 fuel1,all-week,all-day,spring-autumn,1.14040000000,R1,2,MUS$2010/PJ,2050 fuel2,all-week,all-day,spring-autumn,11.69200000000,R1,2,MUS$2010/PJ,2050 -ammonia,all-week,all-day,spring-autumn,456.04430000000,R1,2,MUS$2010/Mt,2050 +ammonia,all-week,all-day,spring-autumn,455.91800000000,R1,2,MUS$2010/Mt,2050 diff --git a/tests/example_outputs/multiple_agents/Results/MCACapacity.csv b/tests/example_outputs/multiple_agents/Results/MCACapacity.csv index d7bc3404b..f1e0d53a3 100644 --- a/tests/example_outputs/multiple_agents/Results/MCACapacity.csv +++ b/tests/example_outputs/multiple_agents/Results/MCACapacity.csv @@ -4,59 +4,75 @@ A2,5.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,2.50000000000,R1,2020,R1,residential,gasboiler,newcapa,2025 -A1,9.50000000000,R1,2025,R1,residential,gasboiler,newcapa,2025 +A1,9.50000000000,R1,2025,R1,residential,heatpump,newcapa,2025 A2,2.50000000000,R1,2020,R1,residential,gasboiler,newcapa,2025 -A2,9.50000000000,R1,2025,R1,residential,gasboiler,newcapa,2025 +A2,9.50000000000,R1,2025,R1,residential,heatpump,newcapa,2025 A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2025 +A1,6.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2025 +A1,1.00000000000,R1,2025,R1,power,windturbine,newcapa,2025 A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2025 -A1,15.93330000000,R1,2025,R1,gas,gassupply1,newcapa,2025 -A1,9.50000000000,R1,2025,R1,residential,gasboiler,newcapa,2030 +A1,3.13440000000,R1,2025,R1,gas,gassupply1,newcapa,2025 +A1,9.50000000000,R1,2025,R1,residential,heatpump,newcapa,2030 A1,5.50000000000,R1,2030,R1,residential,heatpump,newcapa,2030 -A2,9.50000000000,R1,2025,R1,residential,gasboiler,newcapa,2030 +A2,9.50000000000,R1,2025,R1,residential,heatpump,newcapa,2030 A2,5.50000000000,R1,2030,R1,residential,heatpump,newcapa,2030 -A1,10.00000000000,R1,2030,R1,power,windturbine,newcapa,2030 +A1,6.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2030 +A1,3.00000000000,R1,2030,R1,power,gasCCGT,newcapa,2030 +A1,1.00000000000,R1,2025,R1,power,windturbine,newcapa,2030 +A1,6.00000000000,R1,2030,R1,power,windturbine,newcapa,2030 A1,7.50000000000,R1,2020,R1,gas,gassupply1,newcapa,2030 -A1,15.93330000000,R1,2025,R1,gas,gassupply1,newcapa,2030 -A1,1.05560000000,R1,2030,R1,gas,gassupply1,newcapa,2030 -A1,4.31420000000,R1,2035,R1,residential,gasboiler,newcapa,2035 +A1,3.13440000000,R1,2025,R1,gas,gassupply1,newcapa,2030 +A1,4.39560000000,R1,2030,R1,gas,gassupply1,newcapa,2030 A1,5.50000000000,R1,2030,R1,residential,heatpump,newcapa,2035 -A1,8.18580000000,R1,2035,R1,residential,heatpump,newcapa,2035 -A2,4.31420000000,R1,2035,R1,residential,gasboiler,newcapa,2035 +A1,12.50000000000,R1,2035,R1,residential,heatpump,newcapa,2035 A2,5.50000000000,R1,2030,R1,residential,heatpump,newcapa,2035 -A2,8.18580000000,R1,2035,R1,residential,heatpump,newcapa,2035 -A1,10.00000000000,R1,2030,R1,power,windturbine,newcapa,2035 -A1,17.00000000000,R1,2035,R1,power,windturbine,newcapa,2035 -A1,15.93330000000,R1,2025,R1,gas,gassupply1,newcapa,2035 -A1,1.05560000000,R1,2030,R1,gas,gassupply1,newcapa,2035 -A1,4.31420000000,R1,2035,R1,residential,gasboiler,newcapa,2040 -A1,8.18580000000,R1,2035,R1,residential,heatpump,newcapa,2040 +A2,12.50000000000,R1,2035,R1,residential,heatpump,newcapa,2035 +A1,6.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2035 +A1,3.00000000000,R1,2030,R1,power,gasCCGT,newcapa,2035 +A1,1.00000000000,R1,2025,R1,power,windturbine,newcapa,2035 +A1,6.00000000000,R1,2030,R1,power,windturbine,newcapa,2035 +A1,8.00000000000,R1,2035,R1,power,windturbine,newcapa,2035 +A1,3.13440000000,R1,2025,R1,gas,gassupply1,newcapa,2035 +A1,4.39560000000,R1,2030,R1,gas,gassupply1,newcapa,2035 +A1,7.50000000000,R1,2035,R1,gas,gassupply1,newcapa,2035 +A1,12.50000000000,R1,2035,R1,residential,heatpump,newcapa,2040 A1,8.50000000000,R1,2040,R1,residential,heatpump,newcapa,2040 -A2,4.31420000000,R1,2035,R1,residential,gasboiler,newcapa,2040 -A2,8.18580000000,R1,2035,R1,residential,heatpump,newcapa,2040 +A2,12.50000000000,R1,2035,R1,residential,heatpump,newcapa,2040 A2,8.50000000000,R1,2040,R1,residential,heatpump,newcapa,2040 -A1,10.00000000000,R1,2030,R1,power,windturbine,newcapa,2040 -A1,17.00000000000,R1,2035,R1,power,windturbine,newcapa,2040 +A1,6.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2040 +A1,3.00000000000,R1,2030,R1,power,gasCCGT,newcapa,2040 +A1,1.00000000000,R1,2025,R1,power,windturbine,newcapa,2040 +A1,6.00000000000,R1,2030,R1,power,windturbine,newcapa,2040 +A1,8.00000000000,R1,2035,R1,power,windturbine,newcapa,2040 A1,6.00000000000,R1,2040,R1,power,windturbine,newcapa,2040 -A1,15.93330000000,R1,2025,R1,gas,gassupply1,newcapa,2040 -A1,1.05560000000,R1,2030,R1,gas,gassupply1,newcapa,2040 +A1,3.13440000000,R1,2025,R1,gas,gassupply1,newcapa,2040 +A1,4.39560000000,R1,2030,R1,gas,gassupply1,newcapa,2040 +A1,7.50000000000,R1,2035,R1,gas,gassupply1,newcapa,2040 A1,8.50000000000,R1,2040,R1,residential,heatpump,newcapa,2045 A1,15.50000000000,R1,2045,R1,residential,heatpump,newcapa,2045 A2,8.50000000000,R1,2040,R1,residential,heatpump,newcapa,2045 A2,15.50000000000,R1,2045,R1,residential,heatpump,newcapa,2045 -A1,10.00000000000,R1,2030,R1,power,windturbine,newcapa,2045 -A1,17.00000000000,R1,2035,R1,power,windturbine,newcapa,2045 +A1,6.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2045 +A1,3.00000000000,R1,2030,R1,power,gasCCGT,newcapa,2045 +A1,1.00000000000,R1,2025,R1,power,windturbine,newcapa,2045 +A1,6.00000000000,R1,2030,R1,power,windturbine,newcapa,2045 +A1,8.00000000000,R1,2035,R1,power,windturbine,newcapa,2045 A1,6.00000000000,R1,2040,R1,power,windturbine,newcapa,2045 -A1,15.00000000000,R1,2045,R1,power,windturbine,newcapa,2045 -A1,15.93330000000,R1,2025,R1,gas,gassupply1,newcapa,2045 -A1,1.05560000000,R1,2030,R1,gas,gassupply1,newcapa,2045 +A1,6.00000000000,R1,2045,R1,power,windturbine,newcapa,2045 +A1,3.13440000000,R1,2025,R1,gas,gassupply1,newcapa,2045 +A1,4.39560000000,R1,2030,R1,gas,gassupply1,newcapa,2045 +A1,7.50000000000,R1,2035,R1,gas,gassupply1,newcapa,2045 A1,15.50000000000,R1,2045,R1,residential,heatpump,newcapa,2050 A1,11.50000000000,R1,2050,R1,residential,heatpump,newcapa,2050 A2,15.50000000000,R1,2045,R1,residential,heatpump,newcapa,2050 A2,11.50000000000,R1,2050,R1,residential,heatpump,newcapa,2050 -A1,10.00000000000,R1,2030,R1,power,windturbine,newcapa,2050 -A1,17.00000000000,R1,2035,R1,power,windturbine,newcapa,2050 +A1,6.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2050 +A1,3.00000000000,R1,2030,R1,power,gasCCGT,newcapa,2050 +A1,6.00000000000,R1,2030,R1,power,windturbine,newcapa,2050 +A1,8.00000000000,R1,2035,R1,power,windturbine,newcapa,2050 A1,6.00000000000,R1,2040,R1,power,windturbine,newcapa,2050 -A1,15.00000000000,R1,2045,R1,power,windturbine,newcapa,2050 -A1,6.00000000000,R1,2050,R1,power,windturbine,newcapa,2050 -A1,15.93330000000,R1,2025,R1,gas,gassupply1,newcapa,2050 -A1,1.05560000000,R1,2030,R1,gas,gassupply1,newcapa,2050 +A1,6.00000000000,R1,2045,R1,power,windturbine,newcapa,2050 +A1,7.00000000000,R1,2050,R1,power,windturbine,newcapa,2050 +A1,3.13440000000,R1,2025,R1,gas,gassupply1,newcapa,2050 +A1,4.39560000000,R1,2030,R1,gas,gassupply1,newcapa,2050 +A1,7.50000000000,R1,2035,R1,gas,gassupply1,newcapa,2050 diff --git a/tests/example_outputs/multiple_agents/Results/MCAPrices.csv b/tests/example_outputs/multiple_agents/Results/MCAPrices.csv index 23c05a431..6b2d01f5b 100644 --- a/tests/example_outputs/multiple_agents/Results/MCAPrices.csv +++ b/tests/example_outputs/multiple_agents/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,29.26230000000,R1,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,19.57510000000,R1,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,12.58300000000,R1,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,10.72190000000,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,20.51690000000,R1,1,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,19.57510000000,R1,1,MUS$2010/PJ,2025 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,11.96460000000,R1,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,10.72190000000,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,29.26230000000,R1,2,MUS$2010/PJ,2025 +electricity,all-week,afternoon,all-year,19.57510000000,R1,2,MUS$2010/PJ,2025 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2025 -heat,all-week,afternoon,all-year,12.58300000000,R1,2,MUS$2010/PJ,2025 +heat,all-week,afternoon,all-year,10.72190000000,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,20.51690000000,R1,3,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,19.57510000000,R1,3,MUS$2010/PJ,2025 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,11.96460000000,R1,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,10.72190000000,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.13090000000,R1,4,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,19.57510000000,R1,4,MUS$2010/PJ,2025 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,11.34610000000,R1,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,10.72190000000,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,16.14420000000,R1,5,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,19.57510000000,R1,5,MUS$2010/PJ,2025 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,11.65540000000,R1,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,10.72190000000,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,27.27240000000,R1,0,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,21.60150000000,R1,0,MUS$2010/PJ,2030 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,15.06990000000,R1,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,11.23800000000,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,18.18160000000,R1,1,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,21.60150000000,R1,1,MUS$2010/PJ,2030 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,12.81590000000,R1,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,11.23800000000,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,27.27240000000,R1,2,MUS$2010/PJ,2030 +electricity,all-week,afternoon,all-year,21.60150000000,R1,2,MUS$2010/PJ,2030 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,15.06990000000,R1,2,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,11.23800000000,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,18.18160000000,R1,3,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,21.60150000000,R1,3,MUS$2010/PJ,2030 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,12.81590000000,R1,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,11.23800000000,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,9.99990000000,R1,4,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,21.60150000000,R1,4,MUS$2010/PJ,2030 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,10.69510000000,R1,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,11.23800000000,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.63620000000,R1,5,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,21.60150000000,R1,5,MUS$2010/PJ,2030 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,11.68880000000,R1,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,11.23800000000,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,29.59240000000,R1,0,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,24.10090000000,R1,0,MUS$2010/PJ,2035 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,16.77770000000,R1,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,12.23780000000,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.72830000000,R1,1,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,24.10090000000,R1,1,MUS$2010/PJ,2035 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,12.53230000000,R1,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,12.23780000000,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,29.59240000000,R1,2,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,24.10090000000,R1,2,MUS$2010/PJ,2035 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,16.77770000000,R1,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,12.23780000000,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,19.72830000000,R1,3,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,24.10090000000,R1,3,MUS$2010/PJ,2035 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,12.53230000000,R1,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,12.23780000000,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,9.99990000000,R1,4,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,24.10090000000,R1,4,MUS$2010/PJ,2035 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,8.32830000000,R1,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,12.23780000000,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.79620000000,R1,5,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,24.10090000000,R1,5,MUS$2010/PJ,2035 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,10.40970000000,R1,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,12.23780000000,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,29.66560000000,R1,0,MUS$2010/PJ,2040 +electricity,all-week,night,all-year,25.80410000000,R1,0,MUS$2010/PJ,2040 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,17.48300000000,R1,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,12.91910000000,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,19.77710000000,R1,1,MUS$2010/PJ,2040 +electricity,all-week,morning,all-year,25.80410000000,R1,1,MUS$2010/PJ,2040 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,13.06660000000,R1,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,12.91910000000,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,29.66560000000,R1,2,MUS$2010/PJ,2040 +electricity,all-week,afternoon,all-year,25.80410000000,R1,2,MUS$2010/PJ,2040 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2040 -heat,all-week,afternoon,all-year,17.48300000000,R1,2,MUS$2010/PJ,2040 +heat,all-week,afternoon,all-year,12.91910000000,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,19.77710000000,R1,3,MUS$2010/PJ,2040 +electricity,all-week,early-peak,all-year,25.80410000000,R1,3,MUS$2010/PJ,2040 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,13.06660000000,R1,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,12.91910000000,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,9.99990000000,R1,4,MUS$2010/PJ,2040 +electricity,all-week,late-peak,all-year,25.80410000000,R1,4,MUS$2010/PJ,2040 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,8.68550000000,R1,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,12.91910000000,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,14.83280000000,R1,5,MUS$2010/PJ,2040 +electricity,all-week,evening,all-year,25.80410000000,R1,5,MUS$2010/PJ,2040 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,10.85840000000,R1,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,12.91910000000,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,29.99960000000,R1,0,MUS$2010/PJ,2045 +electricity,all-week,night,all-year,27.99370000000,R1,0,MUS$2010/PJ,2045 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2045 -heat,all-week,night,all-year,16.19530000000,R1,0,MUS$2010/PJ,2045 +heat,all-week,night,all-year,13.79490000000,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.99980000000,R1,1,MUS$2010/PJ,2045 +electricity,all-week,morning,all-year,27.99370000000,R1,1,MUS$2010/PJ,2045 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2045 -heat,all-week,morning,all-year,10.79690000000,R1,1,MUS$2010/PJ,2045 +heat,all-week,morning,all-year,13.79490000000,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,29.99960000000,R1,2,MUS$2010/PJ,2045 +electricity,all-week,afternoon,all-year,27.99370000000,R1,2,MUS$2010/PJ,2045 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2045 -heat,all-week,afternoon,all-year,16.19530000000,R1,2,MUS$2010/PJ,2045 +heat,all-week,afternoon,all-year,13.79490000000,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,19.99980000000,R1,3,MUS$2010/PJ,2045 +electricity,all-week,early-peak,all-year,27.99370000000,R1,3,MUS$2010/PJ,2045 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2045 -heat,all-week,early-peak,all-year,10.79690000000,R1,3,MUS$2010/PJ,2045 +heat,all-week,early-peak,all-year,13.79490000000,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,9.99990000000,R1,4,MUS$2010/PJ,2045 +electricity,all-week,late-peak,all-year,27.99370000000,R1,4,MUS$2010/PJ,2045 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2045 -heat,all-week,late-peak,all-year,5.44300000000,R1,4,MUS$2010/PJ,2045 +heat,all-week,late-peak,all-year,13.79490000000,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,14.99980000000,R1,5,MUS$2010/PJ,2045 +electricity,all-week,evening,all-year,27.99370000000,R1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2045 -heat,all-week,evening,all-year,8.09760000000,R1,5,MUS$2010/PJ,2045 +heat,all-week,evening,all-year,13.79490000000,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,29.99960000000,R1,0,MUS$2010/PJ,2050 +electricity,all-week,night,all-year,29.69170000000,R1,0,MUS$2010/PJ,2050 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,16.32890000000,R1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,14.47410000000,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.99980000000,R1,1,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,29.69170000000,R1,1,MUS$2010/PJ,2050 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,10.88590000000,R1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,14.47410000000,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,29.99960000000,R1,2,MUS$2010/PJ,2050 +electricity,all-week,afternoon,all-year,29.69170000000,R1,2,MUS$2010/PJ,2050 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,16.32890000000,R1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,14.47410000000,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.99980000000,R1,3,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,29.69170000000,R1,3,MUS$2010/PJ,2050 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,10.88590000000,R1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,14.47410000000,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.99990000000,R1,4,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,29.69170000000,R1,4,MUS$2010/PJ,2050 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,5.44300000000,R1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,14.47410000000,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,14.99980000000,R1,5,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,29.69170000000,R1,5,MUS$2010/PJ,2050 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,8.16440000000,R1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,14.47410000000,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/trade/Results/MCAPrices.csv b/tests/example_outputs/trade/Results/MCAPrices.csv index df717c78a..118984620 100644 --- a/tests/example_outputs/trade/Results/MCAPrices.csv +++ b/tests/example_outputs/trade/Results/MCAPrices.csv @@ -23,111 +23,111 @@ electricity,all-week,evening,all-year,13.98150000000,R1,5,MUS$2010/PJ,2020 electricity,all-week,evening,all-year,19.13890000000,R2,5,MUS$2010/PJ,2020 gas,all-week,evening,all-year,4.71680000000,R1,5,MUS$2010/PJ,2020 gas,all-week,evening,all-year,4.71680000000,R2,5,MUS$2010/PJ,2020 -electricity,all-week,night,all-year,117.23020000000,R1,0,MUS$2010/PJ,2025 -electricity,all-week,night,all-year,117.23020000000,R2,0,MUS$2010/PJ,2025 -gas,all-week,night,all-year,23.60400000000,R1,0,MUS$2010/PJ,2025 -gas,all-week,night,all-year,114.76360000000,R2,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,23.36440000000,R1,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,174.63580000000,R2,0,MUS$2010/PJ,2025 -electricity,all-week,morning,all-year,105.45240000000,R1,1,MUS$2010/PJ,2025 -electricity,all-week,morning,all-year,105.45240000000,R2,1,MUS$2010/PJ,2025 -gas,all-week,morning,all-year,19.95270000000,R1,1,MUS$2010/PJ,2025 -gas,all-week,morning,all-year,105.34210000000,R2,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,19.80280000000,R1,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,159.98100000000,R2,1,MUS$2010/PJ,2025 -electricity,all-week,afternoon,all-year,126.35930000000,R1,2,MUS$2010/PJ,2025 -electricity,all-week,afternoon,all-year,126.35930000000,R2,2,MUS$2010/PJ,2025 -gas,all-week,afternoon,all-year,22.89470000000,R1,2,MUS$2010/PJ,2025 -gas,all-week,afternoon,all-year,126.27890000000,R2,2,MUS$2010/PJ,2025 -heat,all-week,afternoon,all-year,22.67250000000,R1,2,MUS$2010/PJ,2025 -heat,all-week,afternoon,all-year,192.54730000000,R2,2,MUS$2010/PJ,2025 -electricity,all-week,early-peak,all-year,126.35930000000,R1,3,MUS$2010/PJ,2025 -electricity,all-week,early-peak,all-year,126.35930000000,R2,3,MUS$2010/PJ,2025 -gas,all-week,early-peak,all-year,22.89470000000,R1,3,MUS$2010/PJ,2025 -gas,all-week,early-peak,all-year,126.27890000000,R2,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,22.67250000000,R1,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,192.54730000000,R2,3,MUS$2010/PJ,2025 -electricity,all-week,late-peak,all-year,101.25670000000,R1,4,MUS$2010/PJ,2025 -electricity,all-week,late-peak,all-year,101.25670000000,R2,4,MUS$2010/PJ,2025 -gas,all-week,late-peak,all-year,19.27370000000,R1,4,MUS$2010/PJ,2025 -gas,all-week,late-peak,all-year,101.24580000000,R2,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,19.14060000000,R1,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,153.60930000000,R2,4,MUS$2010/PJ,2025 -electricity,all-week,evening,all-year,126.39030000000,R1,5,MUS$2010/PJ,2025 -electricity,all-week,evening,all-year,126.39030000000,R2,5,MUS$2010/PJ,2025 -gas,all-week,evening,all-year,22.92520000000,R1,5,MUS$2010/PJ,2025 -gas,all-week,evening,all-year,126.27890000000,R2,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,22.70220000000,R1,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,192.54730000000,R2,5,MUS$2010/PJ,2025 -electricity,all-week,night,all-year,117.23020000000,R1,0,MUS$2010/PJ,2030 -electricity,all-week,night,all-year,117.23020000000,R2,0,MUS$2010/PJ,2030 -gas,all-week,night,all-year,32.84270000000,R1,0,MUS$2010/PJ,2030 -gas,all-week,night,all-year,163.53120000000,R2,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,34.10390000000,R1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,245.46200000000,R2,0,MUS$2010/PJ,2030 -electricity,all-week,morning,all-year,105.45240000000,R1,1,MUS$2010/PJ,2030 -electricity,all-week,morning,all-year,105.45240000000,R2,1,MUS$2010/PJ,2030 -gas,all-week,morning,all-year,27.36570000000,R1,1,MUS$2010/PJ,2030 -gas,all-week,morning,all-year,149.94900000000,R2,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,28.42040000000,R1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,224.74900000000,R2,1,MUS$2010/PJ,2030 -electricity,all-week,afternoon,all-year,126.35930000000,R1,2,MUS$2010/PJ,2030 -electricity,all-week,afternoon,all-year,126.35930000000,R2,2,MUS$2010/PJ,2030 -gas,all-week,afternoon,all-year,31.77870000000,R1,2,MUS$2010/PJ,2030 -gas,all-week,afternoon,all-year,180.13170000000,R2,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,32.99980000000,R1,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,270.77800000000,R2,2,MUS$2010/PJ,2030 -electricity,all-week,early-peak,all-year,126.35930000000,R1,3,MUS$2010/PJ,2030 -electricity,all-week,early-peak,all-year,126.35930000000,R2,3,MUS$2010/PJ,2030 -gas,all-week,early-peak,all-year,31.77870000000,R1,3,MUS$2010/PJ,2030 -gas,all-week,early-peak,all-year,180.13170000000,R2,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,32.99980000000,R1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,270.77800000000,R2,3,MUS$2010/PJ,2030 -electricity,all-week,late-peak,all-year,101.25670000000,R1,4,MUS$2010/PJ,2030 -electricity,all-week,late-peak,all-year,101.25670000000,R2,4,MUS$2010/PJ,2030 -gas,all-week,late-peak,all-year,26.34730000000,R1,4,MUS$2010/PJ,2030 -gas,all-week,late-peak,all-year,144.04360000000,R2,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,27.36360000000,R1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,215.74330000000,R2,4,MUS$2010/PJ,2030 -electricity,all-week,evening,all-year,126.39030000000,R1,5,MUS$2010/PJ,2030 -electricity,all-week,evening,all-year,126.39030000000,R2,5,MUS$2010/PJ,2030 -gas,all-week,evening,all-year,31.82450000000,R1,5,MUS$2010/PJ,2030 -gas,all-week,evening,all-year,180.13170000000,R2,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,33.04730000000,R1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,270.77800000000,R2,5,MUS$2010/PJ,2030 -electricity,all-week,night,all-year,8685.55900000000,R1,0,MUS$2010/PJ,2035 -electricity,all-week,night,all-year,8685.55900000000,R2,0,MUS$2010/PJ,2035 -gas,all-week,night,all-year,46.70080000000,R1,0,MUS$2010/PJ,2035 -gas,all-week,night,all-year,215.11500000000,R2,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,50.20940000000,R1,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,327.13430000000,R2,0,MUS$2010/PJ,2035 -electricity,all-week,morning,all-year,7800.08140000000,R1,1,MUS$2010/PJ,2035 -electricity,all-week,morning,all-year,7800.08140000000,R2,1,MUS$2010/PJ,2035 -gas,all-week,morning,all-year,38.48530000000,R1,1,MUS$2010/PJ,2035 -gas,all-week,morning,all-year,197.25240000000,R2,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,41.34410000000,R1,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,299.56730000000,R2,1,MUS$2010/PJ,2035 -electricity,all-week,afternoon,all-year,9566.88680000000,R1,2,MUS$2010/PJ,2035 -electricity,all-week,afternoon,all-year,9566.88680000000,R2,2,MUS$2010/PJ,2035 -gas,all-week,afternoon,all-year,45.10480000000,R1,2,MUS$2010/PJ,2035 -gas,all-week,afternoon,all-year,236.94710000000,R2,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,48.48720000000,R1,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,360.82720000000,R2,2,MUS$2010/PJ,2035 -electricity,all-week,early-peak,all-year,9566.88680000000,R1,3,MUS$2010/PJ,2035 -electricity,all-week,early-peak,all-year,9566.88680000000,R2,3,MUS$2010/PJ,2035 -gas,all-week,early-peak,all-year,45.10480000000,R1,3,MUS$2010/PJ,2035 -gas,all-week,early-peak,all-year,236.94710000000,R2,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,48.48720000000,R1,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,360.82720000000,R2,3,MUS$2010/PJ,2035 -electricity,all-week,late-peak,all-year,7450.38850000000,R1,4,MUS$2010/PJ,2035 -electricity,all-week,late-peak,all-year,7450.38850000000,R2,4,MUS$2010/PJ,2035 -gas,all-week,late-peak,all-year,36.95770000000,R1,4,MUS$2010/PJ,2035 -gas,all-week,late-peak,all-year,189.48610000000,R2,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,39.69570000000,R1,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,287.58170000000,R2,4,MUS$2010/PJ,2035 -electricity,all-week,evening,all-year,9568.07120000000,R1,5,MUS$2010/PJ,2035 -electricity,all-week,evening,all-year,9568.07120000000,R2,5,MUS$2010/PJ,2035 -gas,all-week,evening,all-year,45.17340000000,R1,5,MUS$2010/PJ,2035 -gas,all-week,evening,all-year,236.94710000000,R2,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,48.56120000000,R1,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,360.82720000000,R2,5,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,115.97190000000,R1,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,115.97190000000,R2,0,MUS$2010/PJ,2025 +gas,all-week,night,all-year,21.63640000000,R1,0,MUS$2010/PJ,2025 +gas,all-week,night,all-year,115.63450000000,R2,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,21.44510000000,R1,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,175.99040000000,R2,0,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,115.97190000000,R1,1,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,115.97190000000,R2,1,MUS$2010/PJ,2025 +gas,all-week,morning,all-year,21.63640000000,R1,1,MUS$2010/PJ,2025 +gas,all-week,morning,all-year,115.63450000000,R2,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,21.44510000000,R1,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,175.99040000000,R2,1,MUS$2010/PJ,2025 +electricity,all-week,afternoon,all-year,115.97190000000,R1,2,MUS$2010/PJ,2025 +electricity,all-week,afternoon,all-year,115.97190000000,R2,2,MUS$2010/PJ,2025 +gas,all-week,afternoon,all-year,21.63640000000,R1,2,MUS$2010/PJ,2025 +gas,all-week,afternoon,all-year,115.63450000000,R2,2,MUS$2010/PJ,2025 +heat,all-week,afternoon,all-year,21.44510000000,R1,2,MUS$2010/PJ,2025 +heat,all-week,afternoon,all-year,175.99040000000,R2,2,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,115.97190000000,R1,3,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,115.97190000000,R2,3,MUS$2010/PJ,2025 +gas,all-week,early-peak,all-year,21.63640000000,R1,3,MUS$2010/PJ,2025 +gas,all-week,early-peak,all-year,115.63450000000,R2,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,21.44510000000,R1,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,175.99040000000,R2,3,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,115.97190000000,R1,4,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,115.97190000000,R2,4,MUS$2010/PJ,2025 +gas,all-week,late-peak,all-year,21.63640000000,R1,4,MUS$2010/PJ,2025 +gas,all-week,late-peak,all-year,115.63450000000,R2,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,21.44510000000,R1,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,175.99040000000,R2,4,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,115.97190000000,R1,5,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,115.97190000000,R2,5,MUS$2010/PJ,2025 +gas,all-week,evening,all-year,21.63640000000,R1,5,MUS$2010/PJ,2025 +gas,all-week,evening,all-year,115.63450000000,R2,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,21.44510000000,R1,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,175.99040000000,R2,5,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,115.97190000000,R1,0,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,115.97190000000,R2,0,MUS$2010/PJ,2030 +gas,all-week,night,all-year,29.89130000000,R1,0,MUS$2010/PJ,2030 +gas,all-week,night,all-year,164.78670000000,R2,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,31.04120000000,R1,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,247.37670000000,R2,0,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,115.97190000000,R1,1,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,115.97190000000,R2,1,MUS$2010/PJ,2030 +gas,all-week,morning,all-year,29.89130000000,R1,1,MUS$2010/PJ,2030 +gas,all-week,morning,all-year,164.78670000000,R2,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,31.04120000000,R1,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,247.37670000000,R2,1,MUS$2010/PJ,2030 +electricity,all-week,afternoon,all-year,115.97190000000,R1,2,MUS$2010/PJ,2030 +electricity,all-week,afternoon,all-year,115.97190000000,R2,2,MUS$2010/PJ,2030 +gas,all-week,afternoon,all-year,29.89130000000,R1,2,MUS$2010/PJ,2030 +gas,all-week,afternoon,all-year,164.78670000000,R2,2,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,31.04120000000,R1,2,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,247.37670000000,R2,2,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,115.97190000000,R1,3,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,115.97190000000,R2,3,MUS$2010/PJ,2030 +gas,all-week,early-peak,all-year,29.89130000000,R1,3,MUS$2010/PJ,2030 +gas,all-week,early-peak,all-year,164.78670000000,R2,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,31.04120000000,R1,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,247.37670000000,R2,3,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,115.97190000000,R1,4,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,115.97190000000,R2,4,MUS$2010/PJ,2030 +gas,all-week,late-peak,all-year,29.89130000000,R1,4,MUS$2010/PJ,2030 +gas,all-week,late-peak,all-year,164.78670000000,R2,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,31.04120000000,R1,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,247.37670000000,R2,4,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,115.97190000000,R1,5,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,115.97190000000,R2,5,MUS$2010/PJ,2030 +gas,all-week,evening,all-year,29.89130000000,R1,5,MUS$2010/PJ,2030 +gas,all-week,evening,all-year,164.78670000000,R2,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,31.04120000000,R1,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,247.37670000000,R2,5,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,8677.86150000000,R1,0,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,8677.86150000000,R2,0,MUS$2010/PJ,2035 +gas,all-week,night,all-year,42.27370000000,R1,0,MUS$2010/PJ,2035 +gas,all-week,night,all-year,216.76620000000,R2,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,45.43210000000,R1,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,329.68250000000,R2,0,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,8677.86150000000,R1,1,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,8677.86150000000,R2,1,MUS$2010/PJ,2035 +gas,all-week,morning,all-year,42.27370000000,R1,1,MUS$2010/PJ,2035 +gas,all-week,morning,all-year,216.76620000000,R2,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,45.43210000000,R1,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,329.68250000000,R2,1,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,8677.86150000000,R1,2,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,8677.86150000000,R2,2,MUS$2010/PJ,2035 +gas,all-week,afternoon,all-year,42.27370000000,R1,2,MUS$2010/PJ,2035 +gas,all-week,afternoon,all-year,216.76620000000,R2,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,45.43210000000,R1,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,329.68250000000,R2,2,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,8677.86150000000,R1,3,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,8677.86150000000,R2,3,MUS$2010/PJ,2035 +gas,all-week,early-peak,all-year,42.27370000000,R1,3,MUS$2010/PJ,2035 +gas,all-week,early-peak,all-year,216.76620000000,R2,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,45.43210000000,R1,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,329.68250000000,R2,3,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,8677.86150000000,R1,4,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,8677.86150000000,R2,4,MUS$2010/PJ,2035 +gas,all-week,late-peak,all-year,42.27370000000,R1,4,MUS$2010/PJ,2035 +gas,all-week,late-peak,all-year,216.76620000000,R2,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,45.43210000000,R1,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,329.68250000000,R2,4,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,8677.86150000000,R1,5,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,8677.86150000000,R2,5,MUS$2010/PJ,2035 +gas,all-week,evening,all-year,42.27370000000,R1,5,MUS$2010/PJ,2035 +gas,all-week,evening,all-year,216.76620000000,R2,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,45.43210000000,R1,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,329.68250000000,R2,5,MUS$2010/PJ,2035 From 01fb399f2ed4175166e4625649c4f230e9121e4f Mon Sep 17 00:00:00 2001 From: Tom Bland Date: Mon, 20 Jan 2025 14:12:14 +0000 Subject: [PATCH 04/18] Add tests --- src/muse/costs.py | 2 +- tests/test_costs.py | 52 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 53 insertions(+), 1 deletion(-) diff --git a/src/muse/costs.py b/src/muse/costs.py index 945c918e8..6f3bbc69c 100644 --- a/src/muse/costs.py +++ b/src/muse/costs.py @@ -419,7 +419,7 @@ def levelized_cost_of_energy( # Capital costs (lifetime or annual depending on method) _capital_costs = capital_costs(technologies, capacity, method) - # Split capital costs across timeslices in proporion to production + # Split capital costs across timeslices in proportion to production tech_activity = production_amplitude(production, technologies) _capital_costs = distribute_timeslice( _capital_costs, ts=tech_activity, level=get_level(production) diff --git a/tests/test_costs.py b/tests/test_costs.py index 8ba6d1135..22eb18f2a 100644 --- a/tests/test_costs.py +++ b/tests/test_costs.py @@ -262,3 +262,55 @@ def test_lcoe_prod_scaling( method=method, ) assert isclose(lcoe1, lcoe2).all() + + +@mark.parametrize("method", ["annual", "lifetime"]) +def test_lcoe_equal_prices( + _technologies, _prices, _capacity, _production, _consumption, method +): + """If commodity prices are equal in every timeslice, LCOE should always be equal.""" + from muse.costs import levelized_cost_of_energy + from muse.timeslices import broadcast_timeslice + + # LCOE with original inputs -> should vary between timeslices + lcoe1 = levelized_cost_of_energy( + _technologies, _prices, _capacity, _production, _consumption, method=method + ) + assert ( + not (lcoe1 - broadcast_timeslice(lcoe1.isel(timeslice=0, drop=True))).max() + < 1e-3 + ) + + # LCOE with uniform prices -> should be the same for all timeslices + _prices = broadcast_timeslice(_prices.mean("timeslice")) + lcoe2 = levelized_cost_of_energy( + _technologies, _prices, _capacity, _production, _consumption, method=method + ) + assert ( + lcoe2 - broadcast_timeslice(lcoe2.isel(timeslice=0, drop=True)) + ).max() < 1e-3 + + +@mark.parametrize("method", ["annual", "lifetime"]) +def test_lcoe_zero_production( + _technologies, _prices, _capacity, _production, _consumption, method +): + """If production and consumption are zero, LCOE should always be zero. + + Note: if production/consumption are zero in every timeslice, LCOE is undefined (nan) + """ + from muse.costs import levelized_cost_of_energy + + # LCOE with original inputs + lcoe1 = levelized_cost_of_energy( + _technologies, _prices, _capacity, _production, _consumption, method=method + ) + assert not (lcoe1.isel(timeslice=0) == 0).all() + + # LCOE with zero production/consumption in first timeslice -> LCOE should be zero + _production.isel(timeslice=0)[:] = 0 + _consumption.isel(timeslice=0)[:] = 0 + lcoe2 = levelized_cost_of_energy( + _technologies, _prices, _capacity, _production, _consumption, method=method + ) + assert (lcoe2.isel(timeslice=0) == 0).all() From 28cc3f47b349d095cdd816870ca6b2741d40ebe9 Mon Sep 17 00:00:00 2001 From: Tom Bland Date: Mon, 20 Jan 2025 16:07:59 +0000 Subject: [PATCH 05/18] Aggregate LCOE over timeslices for objectives --- src/muse/costs.py | 9 +++++++++ src/muse/objectives.py | 2 ++ 2 files changed, 11 insertions(+) diff --git a/src/muse/costs.py b/src/muse/costs.py index 6f3bbc69c..a664ffc4f 100644 --- a/src/muse/costs.py +++ b/src/muse/costs.py @@ -379,6 +379,7 @@ def levelized_cost_of_energy( production: xr.DataArray, consumption: xr.DataArray, method: str = "lifetime", + aggregate_timeslices: bool = False, ) -> xr.DataArray: """Levelized cost of energy (LCOE) of technologies over their lifetime. @@ -409,6 +410,8 @@ def levelized_cost_of_energy( consumption: xr.DataArray with commodity consumption by the relevant technologies method: "lifetime" or "annual" + aggregate_timeslices: If True, the LCOE is aggregated over timeslices (result + will not have a "timeslice" dimension) Return: xr.DataArray with the LCOE calculated for the relevant technologies @@ -448,6 +451,12 @@ def levelized_cost_of_energy( # LCOE result = (_capital_costs + _running_costs) / prod assert "timeslice" in result.dims + + # Aggregate timeslices + if aggregate_timeslices: + result = (result * prod).sum("timeslice") / prod.sum("timeslice") + assert "timeslice" not in result.dims + return result diff --git a/src/muse/objectives.py b/src/muse/objectives.py index b5ba0cd22..73083e86a 100644 --- a/src/muse/objectives.py +++ b/src/muse/objectives.py @@ -437,6 +437,7 @@ def annual_levelized_cost_of_energy( production=production, consumption=consump, method="annual", + aggregate_timeslices=True, ) return results.where(np.isfinite(results)).fillna(0.0) @@ -483,6 +484,7 @@ def lifetime_levelized_cost_of_energy( production=production, consumption=consump, method="lifetime", + aggregate_timeslices=True, ) return results.where(np.isfinite(results)).fillna(0.0) From 7376eaf4eb1057e15e709bc23f3a0e9b9f921b8b Mon Sep 17 00:00:00 2001 From: Tom Bland Date: Mon, 20 Jan 2025 16:18:24 +0000 Subject: [PATCH 06/18] Update tests --- tests/test_objectives.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/test_objectives.py b/tests/test_objectives.py index 31db80af9..7d013b6ed 100644 --- a/tests/test_objectives.py +++ b/tests/test_objectives.py @@ -179,14 +179,14 @@ def test_annual_levelized_cost_of_energy(_technologies, _demand, _prices): from muse.objectives import annual_levelized_cost_of_energy result = annual_levelized_cost_of_energy(_technologies, _demand, _prices) - assert set(result.dims) == {"replacement", "asset", "timeslice"} + assert set(result.dims) == {"replacement", "asset"} def test_lifetime_levelized_cost_of_energy(_technologies, _demand, _prices): from muse.objectives import lifetime_levelized_cost_of_energy result = lifetime_levelized_cost_of_energy(_technologies, _demand, _prices) - assert set(result.dims) == {"replacement", "asset", "timeslice"} + assert set(result.dims) == {"replacement", "asset"} def test_net_present_value(_technologies, _demand, _prices): From ad33b874cdcc8d84531cb30eafeb41ab2d515a75 Mon Sep 17 00:00:00 2001 From: Tom Bland Date: Tue, 21 Jan 2025 08:55:10 +0000 Subject: [PATCH 07/18] Better test condition --- tests/test_costs.py | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/tests/test_costs.py b/tests/test_costs.py index 22eb18f2a..1e3508d66 100644 --- a/tests/test_costs.py +++ b/tests/test_costs.py @@ -1,5 +1,5 @@ from numpy import isclose -from pytest import fixture, mark +from pytest import fixture, mark, raises YEAR = 2030 @@ -269,6 +269,8 @@ def test_lcoe_equal_prices( _technologies, _prices, _capacity, _production, _consumption, method ): """If commodity prices are equal in every timeslice, LCOE should always be equal.""" + from xarray.testing import assert_allclose + from muse.costs import levelized_cost_of_energy from muse.timeslices import broadcast_timeslice @@ -276,19 +278,15 @@ def test_lcoe_equal_prices( lcoe1 = levelized_cost_of_energy( _technologies, _prices, _capacity, _production, _consumption, method=method ) - assert ( - not (lcoe1 - broadcast_timeslice(lcoe1.isel(timeslice=0, drop=True))).max() - < 1e-3 - ) + with raises(AssertionError): + assert_allclose(lcoe1, broadcast_timeslice(lcoe1.isel(timeslice=0))) # LCOE with uniform prices -> should be the same for all timeslices _prices = broadcast_timeslice(_prices.mean("timeslice")) lcoe2 = levelized_cost_of_energy( _technologies, _prices, _capacity, _production, _consumption, method=method ) - assert ( - lcoe2 - broadcast_timeslice(lcoe2.isel(timeslice=0, drop=True)) - ).max() < 1e-3 + assert_allclose(lcoe2, broadcast_timeslice(lcoe2.isel(timeslice=0))) @mark.parametrize("method", ["annual", "lifetime"]) From 60621c550d17421fecfe5f2a9e50d2ab0038b9a1 Mon Sep 17 00:00:00 2001 From: Tom Bland Date: Tue, 21 Jan 2025 11:27:58 +0000 Subject: [PATCH 08/18] Check cost results for infs or nans --- src/muse/costs.py | 6 ++++++ src/muse/objectives.py | 3 +-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/muse/costs.py b/src/muse/costs.py index 6f3bbc69c..d807fd745 100644 --- a/src/muse/costs.py +++ b/src/muse/costs.py @@ -63,8 +63,14 @@ def cost(func): @wraps(func) def wrapper(*args, **kwargs): result = func(*args, **kwargs) + + # Check dimensions of the result assert "year" not in result.dims assert "commodity" not in result.dims + + # Check that there are no infs or nans in the result + assert not result.isnull().any() + assert not np.isinf(result).any() return result return wrapper diff --git a/src/muse/objectives.py b/src/muse/objectives.py index b5ba0cd22..cbd4e2d78 100644 --- a/src/muse/objectives.py +++ b/src/muse/objectives.py @@ -484,8 +484,7 @@ def lifetime_levelized_cost_of_energy( consumption=consump, method="lifetime", ) - - return results.where(np.isfinite(results)).fillna(0.0) + return results @register_objective(name="NPV") From f1d54cafab23b925d7a9c099e0e7928eb80e65ca Mon Sep 17 00:00:00 2001 From: Tom Bland Date: Tue, 21 Jan 2025 11:47:29 +0000 Subject: [PATCH 09/18] Fix zero division error in timeslices module --- src/muse/timeslices.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/muse/timeslices.py b/src/muse/timeslices.py index 852964117..5b0868e92 100644 --- a/src/muse/timeslices.py +++ b/src/muse/timeslices.py @@ -152,7 +152,8 @@ def distribute_timeslice( ) broadcasted = broadcast_timeslice(data, ts=ts) - timeslice_fractions = ts / broadcast_timeslice(ts.sum("timeslice"), ts=ts) + timeslice_sum = ts.sum("timeslice").clip(1e-6) # prevents zero division + timeslice_fractions = ts / broadcast_timeslice(timeslice_sum, ts=ts) return broadcasted * timeslice_fractions @@ -336,7 +337,8 @@ def timeslice_max(data: DataArray, ts: DataArray | None = None) -> DataArray: ts = TIMESLICE timeslice_level = get_level(data) + timeslice_sum = ts.sum("timeslice").clip(1e-6) # prevents zero division timeslice_fractions = compress_timeslice( ts, ts=ts, level=timeslice_level, operation="sum" - ) / broadcast_timeslice(ts.sum("timeslice"), ts=ts, level=timeslice_level) + ) / broadcast_timeslice(timeslice_sum, ts=ts, level=timeslice_level) return (data / timeslice_fractions).max("timeslice") From 7b90d1f26af9bdfa356122c5ab400f1a9d51e7c4 Mon Sep 17 00:00:00 2001 From: Tom Bland Date: Tue, 21 Jan 2025 13:01:51 +0000 Subject: [PATCH 10/18] Similar change to annual lcoe --- src/muse/objectives.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/muse/objectives.py b/src/muse/objectives.py index cbd4e2d78..1803dec30 100644 --- a/src/muse/objectives.py +++ b/src/muse/objectives.py @@ -438,8 +438,7 @@ def annual_levelized_cost_of_energy( consumption=consump, method="annual", ) - - return results.where(np.isfinite(results)).fillna(0.0) + return results @register_objective(name=["LCOE", "LLCOE"]) From 33cd5244b5e31118b2007baa4939a9a3db2f3b90 Mon Sep 17 00:00:00 2001 From: Tom Bland Date: Tue, 21 Jan 2025 14:16:58 +0000 Subject: [PATCH 11/18] Less convoluted way of aggregating timeslices --- src/muse/costs.py | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/src/muse/costs.py b/src/muse/costs.py index b072b1ba9..4254d4181 100644 --- a/src/muse/costs.py +++ b/src/muse/costs.py @@ -429,17 +429,18 @@ def levelized_cost_of_energy( _capital_costs = capital_costs(technologies, capacity, method) # Split capital costs across timeslices in proportion to production - tech_activity = production_amplitude(production, technologies) - _capital_costs = distribute_timeslice( - _capital_costs, ts=tech_activity, level=get_level(production) - ) + if not aggregate_timeslices: + tech_activity = production_amplitude(production, technologies) + _capital_costs = distribute_timeslice( + _capital_costs, ts=tech_activity, level=get_level(production) + ) - # Running costs (annual) + # Running costs (annual, timesliced) _running_costs = running_costs( technologies, prices, capacity, production, consumption ) - # Production (annual) + # Production (annual, timesliced) products = is_enduse(technologies.comm_usage) prod = ( production.where(production > 0.0, 1e-6) @@ -454,15 +455,13 @@ def levelized_cost_of_energy( _running_costs = annual_to_lifetime(_running_costs, technologies) prod = annual_to_lifetime(prod, technologies) - # LCOE - result = (_capital_costs + _running_costs) / prod - assert "timeslice" in result.dims - # Aggregate timeslices if aggregate_timeslices: - result = (result * prod).sum("timeslice") / prod.sum("timeslice") - assert "timeslice" not in result.dims + _running_costs = _running_costs.sum("timeslice") + prod = prod.sum("timeslice") + # LCOE + result = (_capital_costs + _running_costs) / prod return result From cfdbf60c1e0b4481d2cf53260b2b384558c5da37 Mon Sep 17 00:00:00 2001 From: Tom Bland Date: Tue, 21 Jan 2025 14:21:35 +0000 Subject: [PATCH 12/18] Add test --- tests/test_costs.py | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/tests/test_costs.py b/tests/test_costs.py index 1e3508d66..ff70792b5 100644 --- a/tests/test_costs.py +++ b/tests/test_costs.py @@ -312,3 +312,21 @@ def test_lcoe_zero_production( _technologies, _prices, _capacity, _production, _consumption, method=method ) assert (lcoe2.isel(timeslice=0) == 0).all() + + +@mark.parametrize("method", ["annual", "lifetime"]) +def test_lcoe_aggregate( + _technologies, _prices, _capacity, _production, _consumption, method +): + from muse.costs import levelized_cost_of_energy + + result = levelized_cost_of_energy( + _technologies, + _prices, + _capacity, + _production, + _consumption, + method=method, + aggregate_timeslices=True, + ) + assert set(result.dims) == {"asset", "region", "technology"} # no timeslice dim From e2214e9cab43fbcb031e331835ff5a3b6f57ea0f Mon Sep 17 00:00:00 2001 From: Tom Bland Date: Wed, 22 Jan 2025 10:29:54 +0000 Subject: [PATCH 13/18] Add tests for multi-dimensional timeslice weights --- tests/test_timeslices.py | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/tests/test_timeslices.py b/tests/test_timeslices.py index 0a3ae55a2..283dfc636 100644 --- a/tests/test_timeslices.py +++ b/tests/test_timeslices.py @@ -10,12 +10,21 @@ def non_timesliced_dataarray(): return DataArray([1, 2, 3], dims=["x"]) -@fixture -def timeslice(): +@fixture(params=[False, True]) +def timeslice(request): + """Fixture to generate a timeslice DataArray. + + Creates two versions: + - A one-dimensional DataArray with a single "timeslice" dimension representing the + weights of each timeslice. + - A two-dimensional DataArray with an additional "x" dimension. This allows each "x" + coordinate to have different timeslice weights. + """ from toml import loads from muse.timeslices import read_timeslices + # Define timeslice inputs inputs = loads( """ [timeslices] @@ -40,9 +49,17 @@ def timeslice(): """ ) + # Read timeslices ts = read_timeslices(inputs) assert isinstance(ts, DataArray) assert "timeslice" in ts.coords + + # Expand dimensions if requested + if request.param: + ts = ts.expand_dims({"x": 3}) + # Add some randomization so that each "x" coord has different timeslice weights + ts = ts + np.random.randint(0, 10, ts.shape) + return ts From b9fc6b3b730e502df99987debc76c91ca2b7c1d7 Mon Sep 17 00:00:00 2001 From: Tom Bland Date: Wed, 22 Jan 2025 10:30:13 +0000 Subject: [PATCH 14/18] Remove parameter from docstring --- src/muse/quantities.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/muse/quantities.py b/src/muse/quantities.py index a4b382d45..94c77ec32 100644 --- a/src/muse/quantities.py +++ b/src/muse/quantities.py @@ -524,8 +524,6 @@ def production_amplitude( Must have `timeslice` and `commodity` dimensions. May also have other dimensions e.g. `region`, `year`, etc. technologies: Dataset of technology parameters - timeslice_level: the desired timeslice level of the result (e.g. "hour", "day"). - Must match the timeslice level of `production` Returns: DataArray with production amplitudes for each technology in each timeslice. From 8d2f824627298e4a633df1e8f225eaeb23b71dbc Mon Sep 17 00:00:00 2001 From: Tom Bland Date: Wed, 22 Jan 2025 10:33:51 +0000 Subject: [PATCH 15/18] Clarify docstrings in timeslice module --- src/muse/timeslices.py | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/src/muse/timeslices.py b/src/muse/timeslices.py index 5b0868e92..ac1b43e9d 100644 --- a/src/muse/timeslices.py +++ b/src/muse/timeslices.py @@ -92,7 +92,7 @@ def broadcast_timeslice( Args: data: Array to broadcast. - ts: Dataarray with timeslice lengths. If None, defaults to the global timeslice. + ts: Dataarray with timeslice weights. If None, defaults to the global timeslice. level: Level to broadcast to. If None, use the finest level of ts. """ @@ -126,12 +126,14 @@ def distribute_timeslice( ) -> DataArray: """Convert a non-timesliced array to a timesliced array by distribution. - If data is already timesliced in the appropriate scheme, it will be returned - unchanged. + Takes non-timesliced data and distributes it over the timeslice dimension according + to the timeslice weights in `ts`. The sum of the output over all timeslices will be + equal to the input. If data is already timesliced in the appropriate scheme, it will + be returned unchanged. Args: data: Array to distribute. - ts: Dataarray with timeslice lengths. If None, defaults to the global timeslice. + ts: Dataarray with timeslice weights. If None, defaults to the global timeslice. level: Level to distribute to. If None, use the finest level of ts. """ @@ -168,11 +170,11 @@ def compress_timeslice( The operation can be either 'sum', or 'mean': - sum: sum values at each compressed timeslice level - mean: take a weighted average of values at each compressed timeslice level, - according to timeslice length + according to the timeslice weights in ts Args: data: Timesliced array to compress. Must have the same timeslicing as ts. - ts: Dataarray with timeslice lengths. If None, defaults to the global timeslice. + ts: Dataarray with timeslice weights. If None, defaults to the global timeslice. level: Level to compress to. If None, don't compress. operation: Operation to perform ("sum" or "mean"). Defaults to "sum". @@ -228,13 +230,13 @@ def expand_timeslice( The operation can be either 'distribute', or 'broadcast' - distribute: distribute values over the new timeslice level(s) according to - timeslice lengths, such that the sum of the output over all timeslices is equal - to the sum of the input + timeslice weights in `ts`, such that the sum of the output over all timeslices + is equal to the sum of the input - broadcast: broadcast values across over the new timeslice level(s) Args: data: Timesliced array to expand. - ts: Dataarray with timeslice lengths. If None, defaults to the global timeslice. + ts: Dataarray with timeslice weights. If None, defaults to the global timeslice. operation: Operation to perform ("distribute" or "broadcast"). Defaults to "distribute". @@ -331,7 +333,8 @@ def timeslice_max(data: DataArray, ts: DataArray | None = None) -> DataArray: Args: data: Timesliced DataArray to find the max of. - ts: Dataarray with timeslice lengths. If None, defaults to the global timeslice. + ts: Dataarray with relative timeslice lengths. If None, defaults to the global + timeslice. """ if ts is None: ts = TIMESLICE From 61fe655a16d47a609a674040c356081373a5c5a9 Mon Sep 17 00:00:00 2001 From: Tom Bland Date: Wed, 22 Jan 2025 11:01:43 +0000 Subject: [PATCH 16/18] Add test for NPV --- tests/test_costs.py | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/tests/test_costs.py b/tests/test_costs.py index 1e3508d66..05f14a56f 100644 --- a/tests/test_costs.py +++ b/tests/test_costs.py @@ -289,6 +289,36 @@ def test_lcoe_equal_prices( assert_allclose(lcoe2, broadcast_timeslice(lcoe2.isel(timeslice=0))) +def test_npv_equal_prices(_technologies, _prices, _capacity, _production, _consumption): + """Test NPV with equal commodity prices in every timeslice. + + If commodity prices are equal in every timeslice, NPV should be proportional to + production. + """ + from xarray.testing import assert_allclose + + from muse.costs import net_present_value + from muse.quantities import production_amplitude + from muse.timeslices import broadcast_timeslice + + # NPV with original inputs -> should not be linear with production + npv1 = net_present_value( + _technologies, _prices, _capacity, _production, _consumption + ) + tech_activity = production_amplitude(_production, _technologies) + npv1_scaled = npv1 / tech_activity + with raises(AssertionError): + assert_allclose(npv1_scaled, broadcast_timeslice(npv1_scaled.isel(timeslice=0))) + + # NPV with uniform prices -> should be linear with production + _prices = broadcast_timeslice(_prices.mean("timeslice")) + npv2 = net_present_value( + _technologies, _prices, _capacity, _production, _consumption + ) + npv2_scaled = npv2 / tech_activity + assert_allclose(npv2_scaled, broadcast_timeslice(npv2_scaled.isel(timeslice=0))) + + @mark.parametrize("method", ["annual", "lifetime"]) def test_lcoe_zero_production( _technologies, _prices, _capacity, _production, _consumption, method From 4e86e198c2e42385b035554d8a2524afacd1ca99 Mon Sep 17 00:00:00 2001 From: Tom Bland Date: Wed, 22 Jan 2025 11:43:27 +0000 Subject: [PATCH 17/18] Extend to NPV --- src/muse/costs.py | 82 +++++++++++++++++++++++++++------------- src/muse/objectives.py | 3 ++ tests/test_objectives.py | 6 +-- 3 files changed, 61 insertions(+), 30 deletions(-) diff --git a/src/muse/costs.py b/src/muse/costs.py index 4254d4181..73172bcd9 100644 --- a/src/muse/costs.py +++ b/src/muse/costs.py @@ -189,6 +189,7 @@ def running_costs( capacity: xr.DataArray, production: xr.DataArray, consumption: xr.DataArray, + aggregate_timeslices: bool = False, ) -> xr.DataArray: """Total annual running costs (excluding capital costs). @@ -206,19 +207,26 @@ def running_costs( _fuel_costs = fuel_costs(technologies, prices, consumption) _material_costs = material_costs(technologies, prices, consumption) + # Aggregate over timeslices (if required) + if aggregate_timeslices: + _environmental_costs = _environmental_costs.sum("timeslice") + _fuel_costs = _fuel_costs.sum("timeslice") + _material_costs = _material_costs.sum("timeslice") + # Costs associated with capacity and production level (annual) _fixed_costs = fixed_costs(technologies, capacity) _variable_costs = variable_costs(technologies, production) - # Split fixed/variable across timeslices in proportion to production - timeslice_level = get_level(production) - tech_activity = production_amplitude(production, technologies) - _fixed_costs = distribute_timeslice( - _fixed_costs, ts=tech_activity, level=timeslice_level - ) - _variable_costs = distribute_timeslice( - _variable_costs, ts=tech_activity, level=timeslice_level - ) + # Split fixed/variable across timeslices in proportion to production (if required) + if not aggregate_timeslices: + timeslice_level = get_level(production) + tech_activity = production_amplitude(production, technologies) + _fixed_costs = distribute_timeslice( + _fixed_costs, ts=tech_activity, level=timeslice_level + ) + _variable_costs = distribute_timeslice( + _variable_costs, ts=tech_activity, level=timeslice_level + ) # Total running costs result = ( @@ -238,6 +246,7 @@ def net_present_value( capacity: xr.DataArray, production: xr.DataArray, consumption: xr.DataArray, + aggregate_timeslices: bool = False, ) -> xr.DataArray: """Net present value (NPV) of the relevant technologies. @@ -265,6 +274,8 @@ def net_present_value( production: xr.DataArray with commodity production by the relevant technologies consumption: xr.DataArray with commodity consumption by the relevant technologies + aggregate_timeslices: If True, the LCOE is aggregated over timeslices (result + will not have a "timeslice" dimension) Return: xr.DataArray with the NPV calculated for the relevant technologies @@ -272,16 +283,19 @@ def net_present_value( # Capital costs (lifetime) _capital_costs = capital_costs(technologies, capacity, method="lifetime") - # Distribute capital costs across timeslices in proportion to production - tech_activity = production_amplitude(production, technologies) - _capital_costs = distribute_timeslice( - _capital_costs, ts=tech_activity, level=get_level(production) - ) + # Split capital costs across timeslices in proportion to production (if required) + if not aggregate_timeslices: + tech_activity = production_amplitude(production, technologies) + _capital_costs = distribute_timeslice( + _capital_costs, ts=tech_activity, level=get_level(production) + ) # Revenue (annual) products = is_enduse(technologies.comm_usage) prices_non_env = filter_input(prices, commodity=products) revenues = (production * prices_non_env).sum("commodity") + if aggregate_timeslices: + revenues = revenues.sum("timeslice") # Running costs (annual) _running_costs = running_costs( @@ -290,6 +304,7 @@ def net_present_value( capacity, production, consumption, + aggregate_timeslices, ) # Calculate running costs and revenues over lifetime @@ -308,6 +323,7 @@ def net_present_cost( capacity: xr.DataArray, production: xr.DataArray, consumption: xr.DataArray, + aggregate_timeslices: bool = False, ) -> xr.DataArray: """Net present cost (NPC) of the relevant technologies. @@ -325,11 +341,20 @@ def net_present_cost( production: xr.DataArray with commodity production by the relevant technologies consumption: xr.DataArray with commodity consumption by the relevant technologies + aggregate_timeslices: If True, the LCOE is aggregated over timeslices (result + will not have a "timeslice" dimension) Return: xr.DataArray with the NPC calculated for the relevant technologies """ - result = -net_present_value(technologies, prices, capacity, production, consumption) + result = -net_present_value( + technologies, + prices, + capacity, + production, + consumption, + aggregate_timeslices, + ) return result @@ -340,6 +365,7 @@ def equivalent_annual_cost( capacity: xr.DataArray, production: xr.DataArray, consumption: xr.DataArray, + aggregate_timeslices: bool = False, ) -> xr.DataArray: """Equivalent annual costs (or annualized cost) of a technology. @@ -361,6 +387,8 @@ def equivalent_annual_cost( production: xr.DataArray with commodity production by the relevant technologies consumption: xr.DataArray with commodity consumption by the relevant technologies + aggregate_timeslices: If True, the LCOE is aggregated over timeslices (result + will not have a "timeslice" dimension) Return: xr.DataArray with the EAC calculated for the relevant technologies @@ -371,9 +399,12 @@ def equivalent_annual_cost( capacity, production, consumption, + aggregate_timeslices, ) crf = capital_recovery_factor(technologies) - result = npc * broadcast_timeslice(crf, level=get_level(production)) + if not aggregate_timeslices: + crf = broadcast_timeslice(crf, level=get_level(production)) + result = npc * crf return result @@ -428,19 +459,19 @@ def levelized_cost_of_energy( # Capital costs (lifetime or annual depending on method) _capital_costs = capital_costs(technologies, capacity, method) - # Split capital costs across timeslices in proportion to production + # Split capital costs across timeslices in proportion to production (if required) if not aggregate_timeslices: tech_activity = production_amplitude(production, technologies) _capital_costs = distribute_timeslice( _capital_costs, ts=tech_activity, level=get_level(production) ) - # Running costs (annual, timesliced) + # Running costs (annual) _running_costs = running_costs( - technologies, prices, capacity, production, consumption + technologies, prices, capacity, production, consumption, aggregate_timeslices ) - # Production (annual, timesliced) + # Production (annual) products = is_enduse(technologies.comm_usage) prod = ( production.where(production > 0.0, 1e-6) @@ -449,17 +480,14 @@ def levelized_cost_of_energy( "commodity" ) # TODO: is this the correct way to deal with multiple products? ) + if aggregate_timeslices: + prod = prod.sum("timeslice") # If method is lifetime, have to adjust running costs and production if method == "lifetime": _running_costs = annual_to_lifetime(_running_costs, technologies) prod = annual_to_lifetime(prod, technologies) - # Aggregate timeslices - if aggregate_timeslices: - _running_costs = _running_costs.sum("timeslice") - prod = prod.sum("timeslice") - # LCOE result = (_capital_costs + _running_costs) / prod return result @@ -528,7 +556,6 @@ def annual_to_lifetime(costs: xr.DataArray, technologies: xr.Dataset): """ assert "year" not in costs.dims assert "year" not in technologies.dims - assert "timeslice" in costs.dims life = technologies.technical_life.astype(int) iyears = range(life.values.max()) years = xr.DataArray(iyears, coords={"year": iyears}, dims="year") @@ -537,7 +564,8 @@ def annual_to_lifetime(costs: xr.DataArray, technologies: xr.Dataset): interest_rate=technologies.interest_rate, mask=years <= life, ) - rates = broadcast_timeslice(rates, level=get_level(costs)) + if "timeslice" in costs.dims: + rates = broadcast_timeslice(rates, level=get_level(costs)) return (costs * rates).sum("year") diff --git a/src/muse/objectives.py b/src/muse/objectives.py index 8c6803953..0f5cabc7b 100644 --- a/src/muse/objectives.py +++ b/src/muse/objectives.py @@ -523,6 +523,7 @@ def net_present_value( capacity=capacity, production=production, consumption=consump, + aggregate_timeslices=True, ) return results @@ -562,6 +563,7 @@ def net_present_cost( capacity=capacity, production=production, consumption=consump, + aggregate_timeslices=True, ) return results @@ -601,5 +603,6 @@ def equivalent_annual_cost( capacity=capacity, production=production, consumption=consump, + aggregate_timeslices=True, ) return results diff --git a/tests/test_objectives.py b/tests/test_objectives.py index 7d013b6ed..9f56aadc5 100644 --- a/tests/test_objectives.py +++ b/tests/test_objectives.py @@ -193,21 +193,21 @@ def test_net_present_value(_technologies, _demand, _prices): from muse.objectives import net_present_value result = net_present_value(_technologies, _demand, _prices) - assert set(result.dims) == {"replacement", "asset", "timeslice"} + assert set(result.dims) == {"replacement", "asset"} def test_net_present_cost(_technologies, _demand, _prices): from muse.objectives import net_present_cost result = net_present_cost(_technologies, _demand, _prices) - assert set(result.dims) == {"replacement", "asset", "timeslice"} + assert set(result.dims) == {"replacement", "asset"} def test_equivalent_annual_cost(_technologies, _demand, _prices): from muse.objectives import equivalent_annual_cost result = equivalent_annual_cost(_technologies, _demand, _prices) - assert set(result.dims) == {"replacement", "asset", "timeslice"} + assert set(result.dims) == {"replacement", "asset"} def add_var(coordinates, *dims, factor=100.0): From 6d44a6d085bbccda6fe93b253e269c16625c6408 Mon Sep 17 00:00:00 2001 From: Tom Bland Date: Wed, 22 Jan 2025 11:56:00 +0000 Subject: [PATCH 18/18] Add test for npv --- tests/test_costs.py | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/tests/test_costs.py b/tests/test_costs.py index 8bbcf2b87..2e2cb86ee 100644 --- a/tests/test_costs.py +++ b/tests/test_costs.py @@ -360,3 +360,17 @@ def test_lcoe_aggregate( aggregate_timeslices=True, ) assert set(result.dims) == {"asset", "region", "technology"} # no timeslice dim + + +def test_npv_aggregate(_technologies, _prices, _capacity, _production, _consumption): + from muse.costs import net_present_value + + result = net_present_value( + _technologies, + _prices, + _capacity, + _production, + _consumption, + aggregate_timeslices=True, + ) + assert set(result.dims) == {"asset", "region", "technology"} # no timeslice dim